Commit Graph

74693 Commits

Author SHA1 Message Date
Laurent Destailleur
4a9694782c phpcs 2019-03-14 17:08:45 +01:00
Laurent Destailleur
e414d210fb
Merge pull request #10837 from hregis/develop_takepos
FIX multiple bugs for show products/categories
2019-03-14 17:07:53 +01:00
Regis Houssin
fd393218d3 FIX you should prefer "elseif" than "else if" 2019-03-14 17:07:49 +01:00
gauthier
885797b748 FIX : useless join 2019-03-14 17:00:51 +01:00
Laurent Destailleur
8a752ae657
Merge pull request #10744 from OPEN-DSI/fix-show-action-done-sortfield
Fix sort by field in all events (action and emailing type)
2019-03-14 17:00:12 +01:00
Laurent Destailleur
be0535d11f
Merge pull request #10805 from frederic34/patch-2
update doc
2019-03-14 16:55:29 +01:00
Laurent Destailleur
42de3a0cde
Merge pull request #10838 from atm-john/9.0_missing_hook_export_agenda
FIX missing hook in agenda export
2019-03-14 16:54:55 +01:00
Frédéric FRANCE
b67429218d Update html.formmail.class.php
Conflicts:
	htdocs/core/class/html.formmail.class.php
2019-03-14 16:52:16 +01:00
Laurent Destailleur
965f4702b0
Merge pull request #10830 from frederic34/patch-4
Update html.formmail.class.php
2019-03-14 16:49:34 +01:00
Laurent Destailleur
09d015c14c
Merge pull request #10836 from frederic34/patch-5
phpcs fix
2019-03-14 16:47:16 +01:00
Laurent Destailleur
bcf0dd0168
Merge branch 'develop' into patch-5 2019-03-14 16:47:08 +01:00
Frédéric FRANCE
f25ce3b40c
Update facture.php 2019-03-14 16:43:52 +01:00
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
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