Commit Graph

89109 Commits

Author SHA1 Message Date
Laurent Destailleur
c906ae3860 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-03-14 16:43:37 +01:00
Laurent Destailleur
cdf6e4b65a Fix some PSR rules 2019-03-14 16:43:27 +01:00
Laurent Destailleur
b1032f838c Fix some PSR rules 2019-03-14 16:43:19 +01:00
Frédéric FRANCE
321a919fb1
Update result.php 2019-03-14 16:42:35 +01:00
Frédéric FRANCE
1222d90537
phpcs fix 2019-03-14 16:40:44 +01:00
Regis Houssin
daa940d75b FIX multiple bugs for show products/categories 2019-03-14 16:35:36 +01:00
Laurent Destailleur
a0d8ba268e Update doc with the new menu entries 2019-03-14 16:28:32 +01:00
Laurent Destailleur
8410d59182 FIX Missing field "In sale" in list 2019-03-14 16:16:50 +01:00
John BOTELLA
31e588dbab fix hookmanager global 2019-03-14 16:13:32 +01:00
Laurent Destailleur
5ccfba1210 FIX Edit of personalized groups
Conflicts:
	htdocs/accountancy/admin/categories.php
2019-03-14 16:06:20 +01:00
Laurent Destailleur
3ab5c3e6ab FIX Edit of personalized groups 2019-03-14 16:03:37 +01:00
John BOTELLA
8bc795c055 Fix missing hook for export agenda 2019-03-14 15:19:38 +01:00
Christophe Battarel
1718d913a8 Merge https://github.com/Dolibarr/dolibarr into develop 2019-03-14 14:51:30 +01:00
Philippe GRAND
3d65b887a7 update with html5 compliant code 2019-03-14 14:34:33 +01:00
Philippe GRAND
719ecde6e9 update with html5 compliant code 2019-03-14 14:34:04 +01:00
Philippe GRAND
756bdfc6a8 update with html5 compliant code 2019-03-14 14:33:36 +01:00
Philippe GRAND
9ee27936f7 update with html5 compliant code 2019-03-14 14:33:00 +01:00
Philippe GRAND
ad9f75d3e9 update with html5 compliant code 2019-03-14 14:32:26 +01:00
Philippe GRAND
80858b39d9 update with html5 compliant code 2019-03-14 14:31:40 +01:00
Philippe GRAND
f71769e0e6 update with html5 compliant code 2019-03-14 14:31:08 +01:00
Philippe GRAND
f13d520830 update with html5 compliant code 2019-03-14 14:30:41 +01:00
Philippe GRAND
b4a9b3aa20 update with html5 compliant code 2019-03-14 14:30:08 +01:00
Philippe GRAND
5977cdad26 update with html5 compliant code 2019-03-14 14:29:16 +01:00
Laurent Destailleur
7f23a396a9
Merge pull request #10794 from aspangaro/10.0_AccountancyMenuV2
NEW: Accounting - More comprehensive menu
2019-03-14 14:29:01 +01:00
Philippe GRAND
6c4070eb87 update with html5 compliant code 2019-03-14 14:28:36 +01:00
Philippe GRAND
310670b3f6 update with html5 compliant code 2019-03-14 14:27:54 +01:00
Philippe GRAND
f082bd3e96 update with html5 compliant code 2019-03-14 14:27:16 +01:00
Philippe GRAND
af4edbba2b update with html5 compliant code 2019-03-14 14:26:43 +01:00
Philippe GRAND
d21dbe915b update with html5 compliant code 2019-03-14 14:26:08 +01:00
Philippe GRAND
6b878a2c64 update with html5 compliant code 2019-03-14 14:25:21 +01:00
Philippe GRAND
27b7ec8202 update with html5 compliant code 2019-03-14 14:24:17 +01:00
Laurent Destailleur
feaca165ad
Merge pull request #10809 from joanlouis/fix-extrafields-calls-from-cards-8
Fix extrafields calls from cards for Dolibarr 8 See #10803
2019-03-14 14:22:31 +01:00
Philippe GRAND
d506cf7700 update with html5 compliant code 2019-03-14 14:21:54 +01:00
Laurent Destailleur
77c69aa155
Merge pull request #10823 from joseplluis/patch-4
FIX: free product description not printed on receipt
2019-03-14 14:21:48 +01:00
Laurent Destailleur
58fa1292f2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-03-14 14:20:42 +01:00
Laurent Destailleur
39e6e71b0d Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/class/accountancyexport.class.php
2019-03-14 14:20:34 +01:00
Philippe GRAND
68c6c0513d update with html5 compliant code 2019-03-14 14:20:32 +01:00
Philippe GRAND
38822a9bb1 update with html5 compliant code 2019-03-14 14:18:44 +01:00
Laurent Destailleur
3073567763 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-03-14 14:17:52 +01:00
Laurent Destailleur
017b7d6696
Merge pull request #10814 from atm-florian/develop
fix missing test on method result
2019-03-14 14:16:59 +01:00
Laurent Destailleur
b65c791043 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-03-14 14:15:45 +01:00
Laurent Destailleur
d7735ff272 FIX #10822 2019-03-14 14:15:35 +01:00
Philippe GRAND
6984cd25d8 update with html5 compliant code 2019-03-14 14:11:43 +01:00
Philippe GRAND
0832e9873c update with html5 compliant code 2019-03-14 14:10:41 +01:00
Laurent Destailleur
3c40d5d30c
Merge pull request #10821 from OPEN-DSI/fix-select-measuring-units
Fix measure unit id in select options
2019-03-14 14:10:13 +01:00
Philippe GRAND
63b1a1459b update with html5 compliant code 2019-03-14 14:09:54 +01:00
Laurent Destailleur
993183aec6
Merge pull request #10817 from wdammak/patch-35
Fix Warning: Invalid argument - dynamic_price
2019-03-14 14:09:21 +01:00
Laurent Destailleur
7b8b6bb02f
Merge pull request #10804 from hregis/9.0_merge
FIX possibility to set up payment mode when invoice module is disabled
2019-03-14 14:09:00 +01:00
Philippe GRAND
43b827aae7 update with html5 compliant code 2019-03-14 14:07:26 +01:00
Laurent Destailleur
9e66e8329c
Merge pull request #10818 from defrance/patch-140
replace "brouillonner" by "setdraft"
2019-03-14 14:05:11 +01:00