Commit Graph

74829 Commits

Author SHA1 Message Date
liAnGjiA
62767fc059
Update llx_10_c_regions.sql 2019-03-25 10:16:41 +08:00
leangjia
a207a699b6 Add China regions. 2019-03-25 00:21:09 +08:00
Laurent Destailleur
20f3af066c Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/tva/clients.php
2019-03-23 22:44:14 +01:00
Laurent Destailleur
79ed4bc80b Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
	htdocs/core/actions_massactions.inc.php
2019-03-23 22:36:04 +01:00
Laurent Destailleur
3ede626932 FIX If we build one invoice for several orders, we must put the ref of
order on the line to not lose information.

Conflicts:
	htdocs/commande/list.php
	htdocs/core/actions_massactions.inc.php
2019-03-23 22:34:10 +01:00
Laurent Destailleur
5666fbedac FIX If we build one invoice for several orders, we must put the ref of
order on the line to not lose information.
2019-03-23 22:30:52 +01:00
Laurent Destailleur
77843ddeba Allow use of log file or not for debugbar 2019-03-23 14:50:28 +01:00
Laurent Destailleur
df9e121ac6 Enhance the module debugbar. Do not scan the log anymore. 2019-03-23 14:37:54 +01:00
Laurent Destailleur
05c2ae6778 Remove warnings 2019-03-23 12:36:05 +01:00
Laurent Destailleur
ea010b9e01 Fix reduce side effects of debugbar 2019-03-23 12:15:42 +01:00
Laurent Destailleur
c569e71bc8 Fix remove warnings 2019-03-23 12:04:50 +01:00
Laurent Destailleur
82d90a201c WIP IFTTT setup 2019-03-22 19:20:54 +01:00
Laurent Destailleur
aab9734f52 WIP Save link to file in expensereport lines 2019-03-22 18:03:08 +01:00
Laurent Destailleur
8ca5b2e45f Rename field 2019-03-22 17:43:53 +01:00
Laurent Destailleur
7d54c7a480 Fix translation 2019-03-22 14:38:06 +01:00
Laurent Destailleur
cd6a0bacdd Look and feel v10 2019-03-22 14:32:15 +01:00
Laurent Destailleur
d79d5d5a23 Fix var name not defined 2019-03-22 13:20:37 +01:00
Laurent Destailleur
c1df84a165 Fix phpcs 2019-03-22 13:17:26 +01:00
Laurent Destailleur
2a1262eee4 Update doc 2019-03-22 13:03:05 +01:00
Laurent Destailleur
28fede950f Hidden option CHANGE_ORDER_CONCAT_DESCRIPTION were renamed into
MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION
2019-03-22 13:00:48 +01:00
Laurent Destailleur
a7181750c6
Merge pull request #10879 from altatof/noconcatdesc
NEW : add constant NO_CONCAT_DESCRIPTION
2019-03-22 12:56:46 +01:00
Laurent Destailleur
1b558d70c1 Fix menu translation 2019-03-22 12:42:23 +01:00
Laurent Destailleur
2b49c0f95e
Merge pull request #10904 from ATM-Nicolas/new_hidden_conf_edit_supplier_on_supplier_order
NEW Hidden option MAIN_CAN_EDIT_SUPPLIER_ON_SUPPLIER_ORDER to edit supplier on draft supplier order
2019-03-22 12:32:44 +01:00
Laurent Destailleur
438b20df42
Merge pull request #10903 from Tetras-Libre/AutoPrintTicketsOption
Automatically print receipt
2019-03-22 12:28:49 +01:00
Laurent Destailleur
4cdfad548c
Merge pull request #10902 from grandoc/new_branch_22_03_2019
translation
2019-03-22 12:28:21 +01:00
Laurent Destailleur
37cc5b7d35
Merge pull request #10901 from fmarcet/8.0
FIX: The minimum amount filter does not work in VAT report by customer
2019-03-22 12:27:30 +01:00
Laurent Destailleur
52d3e89276 FIX function not found 2019-03-22 12:21:31 +01:00
Laurent Destailleur
a92ff42be8 FIX function not found 2019-03-22 12:12:42 +01:00
Laurent Destailleur
d892b92450 git push origin developMerge branch 'atm-john-theme_top_menu_login' into develop 2019-03-22 11:49:42 +01:00
Laurent Destailleur
3b4ea82741 Some fix on MAIN_TOP_MENU_DROPDOWN option 2019-03-22 11:49:10 +01:00
Laurent Destailleur
c43cf843a9 Merge branch 'theme_top_menu_login' of https://github.com/atm-john/dolibarr into atm-john-theme_top_menu_login 2019-03-22 11:15:02 +01:00
ATM-Nicolas
742f1cb8af FIX : Show only suppliers 2019-03-22 10:55:49 +01:00
ATM-Nicolas
3149909896 FIX : Update ref_supplier too 2019-03-22 10:29:01 +01:00
ATM-Nicolas
0a23a1157f NEW : Can edit supplier on draft order supplier 2019-03-22 10:28:55 +01:00
Philippe GRAND
77d93099ef translation 2019-03-22 09:44:30 +01:00
Philippe GRAND
b8d04fa076 translation 2019-03-22 09:43:12 +01:00
Philippe GRAND
62d63e399e translation 2019-03-22 09:41:22 +01:00
Philippe GRAND
69906b9888 translation 2019-03-22 09:38:04 +01:00
David Beniamine
10ab6f480d
Automatically print receipt 2019-03-22 09:28:58 +01:00
Ferran Marcet
f37c1b9287 FIX: The minimum amount filter does not work in the VAT report per customer 2019-03-22 09:28:50 +01:00
Laurent Destailleur
48a0c447b4 Fix test on draft status regression 2019-03-21 21:00:06 +01:00
Laurent Destailleur
6e4d6c94dd FIX phpcs 2019-03-21 20:17:31 +01:00
Laurent Destailleur
ee4150665e Fix phpcs 2019-03-21 20:15:19 +01:00
Laurent Destailleur
78ca554240 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-03-21 19:28:20 +01:00
Laurent Destailleur
36f31230b3 FIX url to stripe payment modes card_... 2019-03-21 19:27:56 +01:00
Laurent Destailleur
d8e3624d65
Merge pull request #10851 from wdammak/patch-37
Add fk_project to product table
2019-03-21 18:32:49 +01:00
Laurent Destailleur
ae2f76f6bd
Update llx_product.sql 2019-03-21 18:32:40 +01:00
Laurent Destailleur
52b91499ba
Update 9.0.0-10.0.0.sql 2019-03-21 18:31:13 +01:00
Laurent Destailleur
5693fbfe97
Merge pull request #10898 from grandoc/new_branch_21_03_2019
add some comments
2019-03-21 18:29:11 +01:00
Laurent Destailleur
626e852888
Merge pull request #10892 from andreubisquerra/master
Fix a previous commit that causes TakePOS not work
2019-03-21 18:28:43 +01:00