Commit Graph

78950 Commits

Author SHA1 Message Date
Laurent Destailleur
c725db166d Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-06-21 11:26:44 +02:00
Laurent Destailleur
70c950bd7c Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
	htdocs/core/modules/modAdherent.class.php
2019-06-21 11:26:25 +02:00
Laurent Destailleur
9093be2f0a FIX Add missing end date of subscription in export 2019-06-21 11:23:49 +02:00
John Botella
e5298d0666 Fix send mail ancor 2019-06-21 11:20:04 +02:00
Laurent Destailleur
6f35c53f3a Prepare v11 2019-06-21 09:44:05 +02:00
Laurent Destailleur
b0c76f48e1 error management 2019-06-21 09:38:26 +02:00
Laurent Destailleur
b111636ed0 Fix trans 2019-06-20 18:32:25 +02:00
Laurent Destailleur
8da5794777 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/lib/accounting.lib.php
	htdocs/product/stock/class/entrepot.class.php
2019-06-20 18:24:43 +02:00
Laurent Destailleur
495604fa83 Fix phpunit 2019-06-20 18:16:49 +02:00
Laurent Destailleur
e28bf71964 Fix error management of warehouse->delete 2019-06-20 18:15:14 +02:00
Laurent Destailleur
d47cf87c00 Look and feel v10 2019-06-20 17:59:28 +02:00
Laurent Destailleur
6b5d477476 Fix search criteria lost after a delete 2019-06-20 17:14:04 +02:00
Laurent Destailleur
c521b9b8f8 Fix dispatch in ledger table of withdraw / direct debit payment 2019-06-20 16:58:51 +02:00
Laurent Destailleur
faadae8157 Code comment 2019-06-20 15:59:45 +02:00
Maxime Kohlhaas
b0229d1b9a Global task declared progression on project task tab 2019-06-20 14:07:44 +02:00
Laurent Destailleur
ff0f6295d8 Fix phpcs 2019-06-20 13:59:53 +02:00
Maxime Kohlhaas
476df203a7 Add global task declared progression 2019-06-20 13:59:08 +02:00
Laurent Destailleur
6975e18233 Fix phpcs 2019-06-20 13:59:04 +02:00
Laurent Destailleur
bb9b0d401e Fix phpcs 2019-06-20 13:56:20 +02:00
Laurent Destailleur
4f9aa4caac Fix phpcs 2019-06-20 13:53:31 +02:00
Laurent Destailleur
4ffa48d9bd Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-20 13:50:47 +02:00
Laurent Destailleur
29e3199639 Fix phpcs 2019-06-20 13:39:29 +02:00
Laurent Destailleur
afb6362317 Fix look and feel v10
Fix link to direct debit payment order
2019-06-20 13:37:06 +02:00
Laurent Destailleur
add36777ff Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-20 12:35:04 +02:00
Laurent Destailleur
bff6260983 Fix syntax error 2019-06-20 12:34:29 +02:00
Laurent Destailleur
e9da44e023 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-20 12:33:02 +02:00
Laurent Destailleur
6e069385bc Update doc 2019-06-20 12:32:38 +02:00
Laurent Destailleur
cb057e9c6d NEW Add hidden option to be ready for BREXIT 2019-06-20 12:32:14 +02:00
Laurent Destailleur
1a6dc83d4c Fix: default accounting account for eec and export sales were not used. 2019-06-20 12:25:58 +02:00
florian HENRY
0865bdb60f fix depending extrafeilds list 2019-06-20 12:16:48 +02:00
John Botella
b21006614c Fix substitutions null 2019-06-20 12:00:44 +02:00
John Botella
6a68c8cd99 Fix display option email per participient 2019-06-20 11:09:37 +02:00
John Botella
9305403bea Fix duplicate pdf in mass sendmail 2019-06-20 10:32:32 +02:00
John Botella
252bd6d9ba FIX condition 2019-06-20 09:48:08 +02:00
John Botella
7c29fb614c Fix replacement and vars names 2019-06-20 09:21:35 +02:00
Laurent Destailleur
e60020140d
Update societe.class.php 2019-06-20 04:11:10 +02:00
Laurent Destailleur
c0aabaa3cc Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-20 04:11:08 +02:00
Laurent Destailleur
d15a300f02 Removed not used var 2019-06-20 04:10:58 +02:00
Laurent Destailleur
06e5fbd649
Merge pull request #11132 from ptibogxiv/patch-174
NEW add API shipment mode dictionnary
2019-06-20 03:56:59 +02:00
Laurent Destailleur
77a45b878b Fix migration 2019-06-20 03:56:42 +02:00
Laurent Destailleur
40023c8ba2
Merge branch 'develop' into patch-174 2019-06-20 03:56:29 +02:00
Laurent Destailleur
5fe91afdc2
Update 9.0.0-10.0.0.sql 2019-06-20 03:54:50 +02:00
Laurent Destailleur
5d4d02f3b2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-20 03:54:20 +02:00
Laurent Destailleur
5f32b5e23e Prepare v11 alpha 2019-06-20 03:54:11 +02:00
Laurent Destailleur
d8c2007d92 Prepare v11 alpha 2019-06-20 03:53:33 +02:00
Laurent Destailleur
e64a4510d1
Merge pull request #11211 from atm-john/New_look_and_feel_form_validation
NEW: look and feel -> css for html5 ::invalid pseudo element
2019-06-20 03:48:56 +02:00
Laurent Destailleur
4a101a8e9f
Merge pull request #11161 from hregis/develop_bug
NEW add "printBucktrackInfo" hook, an external module can add info
2019-06-20 03:48:24 +02:00
Laurent Destailleur
0639313503
Merge branch 'develop' into develop_bug 2019-06-20 03:47:45 +02:00
Laurent Destailleur
a264a4766a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-20 03:45:04 +02:00
Laurent Destailleur
001da8b2fc Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-20 03:44:54 +02:00