Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-07 16:41:48 +01:00
Code Issues Packages Projects Releases Wiki Activity
45,302 Commits 39 Branches 191 Tags
32d7dec87d9bf2fd6e397a052ebb2d2fed6095a3
Commit Graph

45302 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
frederic34
32d7dec87d Merge remote branch 'upstream/develop' into custom 2015-01-17 20:18:07 +01:00
Laurent Destailleur
1664b89cef Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-01-17 19:26:19 +01:00
Laurent Destailleur
ded86d4031 Merge branch 'GPCsolutions-review' into develop 2015-01-17 19:25:56 +01:00
Laurent Destailleur
007f18bcf7 Merge branch 'review' of https://github.com/GPCsolutions/dolibarr into 
GPCsolutions-review

Conflicts:
	htdocs/accountancy/journal/bankjournal.php
	htdocs/accountancy/journal/cashjournal.php
	htdocs/accountancy/journal/purchasesjournal.php
	htdocs/comm/action/peruser.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/accounting.lib.php
	htdocs/core/lib/report.lib.php
 2015-01-17 15:11:12 +01:00
Laurent Destailleur
eeeb6de8d9 Merge pull request #2020 from GPCsolutions/situationsinvoices 
Situations invoices support
 2015-01-17 14:44:05 +01:00
Laurent Destailleur
30abacd0a6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-01-17 14:42:42 +01:00
Laurent Destailleur
da269a15a3 Merge branch 'FHenry-develop_bank_extrafields' into develop 2015-01-17 14:42:23 +01:00
Laurent Destailleur
87a59ef527 Merge branch 'develop_bank_extrafields' of 
https://github.com/FHenry/dolibarr into FHenry-develop_bank_extrafields

Conflicts:
	htdocs/admin/bank.php
 2015-01-17 14:42:04 +01:00
Laurent Destailleur
8cd46e4830 Introduce option MAIN_HTML_TITLE to start to control format of html 
title content.
 2015-01-17 14:34:16 +01:00
Juanjo Menent
daf3df158d Merge pull request #2246 from frederic34/patch-1 
Typo
 2015-01-17 01:40:10 +01:00
Frédéric FRANCE
a7d263c14e Typo 2015-01-16 23:34:10 +01:00
frederic34
52a1e8a0f3 Merge remote branch 'upstream/develop' into custom 
Conflicts:
	htdocs/custom/.gitignore
 2015-01-16 23:09:43 +01:00
Juanjo Menent
26e5efd71d Improve code create function 2015-01-16 23:09:13 +01:00
Juanjo Menent
93d3ffb06f Fix: PostgreSQL compatibilty 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
 2015-01-16 18:03:55 +01:00
Laurent Destailleur
c5df4fd9b8 Merge pull request #2240 from genezys/develop 
Add support for configurable first day of week
 2015-01-16 12:09:21 +01:00
Laurent Destailleur
6a081fe883 Merge pull request #2229 from frederic34/getnextvalue 
Translation error messages numbering modules
 2015-01-16 12:08:53 +01:00
Laurent Destailleur
c54355b63a Merge remote-tracking branch 'origin/3.7' into develop 2015-01-16 10:44:41 +01:00
frederic34
2396ba833c Ignore content of directory custom 2015-01-15 17:36:13 +01:00
Vincent Robert
eb90e0124e Add support for configurable first day of week 
- Force loading of database configuration to retrieve the first day of week
- Order the day titles based on first day of week
- Change layout based on first day of week

Conflicts:
	htdocs/core/datepicker.php
 2015-01-15 12:43:13 +01:00
Juanjo Menent
1930d0677e Fix: withdrawal create error if in the same month are deleted previus 
withdrawals.

Conflicts:
	ChangeLog
 2015-01-15 10:02:42 +01:00
Juanjo Menent
f03ffaf5a3 Fix: withdrawal create error if in the same month are deleted previus 
withdrawals.

Conflicts:
	ChangeLog
 2015-01-15 10:00:52 +01:00
Laurent Destailleur
e20c1decdf Fixed: object instead of soc and vis versa. 2015-01-15 03:51:47 +01:00
Laurent Destailleur
c5a3b4481e Fixed: use object 2015-01-15 03:11:06 +01:00
Laurent Destailleur
d16ce7eb96 Fix: Bad var 2015-01-15 02:42:41 +01:00
Laurent Destailleur
362167f319 Fixed: Export was not using user assigned 2015-01-15 02:32:15 +01:00
Laurent Destailleur
4d67e6f4d4 Add ignore 2015-01-15 02:11:22 +01:00
Laurent Destailleur
ccfbd3614e Not nice looking 2015-01-15 02:09:28 +01:00
Laurent Destailleur
ba49cce47a Fix: The filter into event views on user must be done on assigned 
resource, not only owner.
 2015-01-15 02:06:04 +01:00
Laurent Destailleur
68441a563a Fixed: Avoid space into address string 2015-01-14 19:17:58 +01:00
Laurent Destailleur
4c64b8ceae Add menu image 2015-01-14 19:12:22 +01:00
Laurent Destailleur
e3f3956bed Sec: Bad security test 2015-01-14 19:11:56 +01:00
Laurent Destailleur
1d1970b5a1 Sec: Bad security test 2015-01-14 19:10:48 +01:00
Laurent Destailleur
a2c9d5bd4a Fixed balance of td introduced by MAX_TAB option. 2015-01-14 19:10:21 +01:00
Laurent Destailleur
e10b5637d4 Fixed: Avoid spaces into address string 2015-01-14 18:54:56 +01:00
Laurent Destailleur
806477977d Fix: css 2015-01-14 13:51:21 +01:00
Laurent Destailleur
f92bc7986b Add Weighted average price as default price for buying price for margin 
calculation. Add option MARGIN_PMP_AS_DEFAULT_BUY_PRICE to replace
with first supplier price.
 2015-01-14 10:46:50 +01:00
Laurent Destailleur
a886136e67 More comment and add a unit test to check that {t} tag is correctly 
supported.
 2015-01-13 22:13:15 +01:00
Laurent Destailleur
033e77c04a Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/product/stock/product.php
 2015-01-13 15:41:45 +01:00
Laurent Destailleur
8b3faf46db Add PMP into selection of buy price. 2015-01-13 15:38:59 +01:00
Laurent Destailleur
e6d016cc48 Fixed: pmp update after makign a stock move. 2015-01-12 20:55:15 +01:00
Laurent Destailleur
dc0d12eccd Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-01-12 19:00:29 +01:00
Laurent Destailleur
58e4e01db7 Sync transifex 2015-01-12 18:59:46 +01:00
Laurent Destailleur
31fd03790e Fixed: Prices visible into stock tab. 
Conflicts:
	htdocs/product/stock/product.php
 2015-01-12 18:26:11 +01:00
Laurent Destailleur
34a1ea4bb8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-01-12 18:16:41 +01:00
Laurent Destailleur
1d2c8bbd4d Fixed: Prices visible into stock tab. 2015-01-12 18:16:24 +01:00
Laurent Destailleur
f8b58605c6 Better organisation of entries into security setup area 2015-01-12 13:21:16 +01:00
Laurent Destailleur
13132ef2ed Better organisation of entries into security setup area 2015-01-12 13:20:27 +01:00
Laurent Destailleur
a77a604082 Fix: include custom dir so everybody has it. 2015-01-11 15:32:11 +01:00
Laurent Destailleur
6414f415a8 Files compatible with apache 2.4 2015-01-11 15:30:34 +01:00
Laurent Destailleur
c7b311349e Files compatible with apache 2.4 2015-01-11 15:16:55 +01:00