Commit Graph

82764 Commits

Author SHA1 Message Date
Laurent Destailleur
ee21ea5ef8 Fix phpcs 2020-01-22 14:27:38 +01:00
Laurent Destailleur
57569604b2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-22 14:11:53 +01:00
Laurent Destailleur
d3411a79ef Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-22 14:11:44 +01:00
Laurent Destailleur
4686be34d2 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.form.class.php
	htdocs/product/class/product.class.php
	htdocs/stripe/charge.php
2020-01-22 14:10:46 +01:00
Laurent Destailleur
3c2d0b97f4
Merge pull request #12895 from atm-quentin/NEW_author_order_list
NEW author on order list
2020-01-22 13:58:53 +01:00
Laurent Destailleur
cb41168904
Merge pull request #12889 from mapiolca/patch-21
Fix double display of create credit note button
2020-01-22 13:57:47 +01:00
Laurent Destailleur
46df9e59ab
Merge pull request #12888 from andreubisquerra/master
Fix escpos DummyConnector
2020-01-22 13:56:43 +01:00
Laurent Destailleur
839f1b83fd
Merge pull request #12901 from OPEN-DSI/new-product-list-units-columns
NEW columns units in product list
2020-01-22 13:55:50 +01:00
Laurent Destailleur
0c4e736e13
Merge pull request #12893 from aspangaro/10.0_p33
Fix : Accounting - error on right
2020-01-22 13:54:45 +01:00
Laurent Destailleur
d141d9516b Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-01-22 13:53:31 +01:00
Laurent Destailleur
fc894d7a20 Fix for stripe connect 2020-01-22 13:53:20 +01:00
Laurent Destailleur
3d474d5174
Merge pull request #12902 from ptibogxiv/patch-293
fix stripe/charge.php for connect mode with payment intent
2020-01-22 13:53:04 +01:00
Laurent Destailleur
999e363446
Update charge.php 2020-01-22 13:52:37 +01:00
Laurent Destailleur
a1e3e44b1d
Merge pull request #12897 from homer8173/patch-16
FIX : multicompany, impossible to add second task
2020-01-22 13:49:46 +01:00
Laurent Destailleur
3bd4580e9b
Merge pull request #12904 from OPEN-DSI/v10-product-unit-length-update
FIX length, width and height units coherence in product table
2020-01-22 13:48:18 +01:00
Laurent Destailleur
e96ef17737
Merge pull request #12903 from atm-john/10.0_fix_dom_and_missing_param
FIX dom and missing param
2020-01-22 13:45:06 +01:00
Laurent Destailleur
443e4e2223
Update html.form.class.php 2020-01-22 13:44:42 +01:00
Laurent Destailleur
3c62dd0a3d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-22 13:41:17 +01:00
Laurent Destailleur
395b9bf7ac Fix syntax error 2020-01-22 13:41:05 +01:00
Laurent Destailleur
ee70e6fe36
Merge pull request #12906 from frederic34/patch-8
retrieve extrafields oldline when updating line
2020-01-22 13:39:17 +01:00
Laurent Destailleur
0456994f0d Responsive 2020-01-22 13:34:21 +01:00
Laurent Destailleur
d87419f3db FIX #11957 2020-01-22 13:34:07 +01:00
Laurent Destailleur
13a9a22cc5 Fix responsive demo 2020-01-22 13:02:50 +01:00
Laurent Destailleur
de99426247 Fix MRP 2020-01-22 12:53:51 +01:00
Laurent Destailleur
0c666ee73b Fix reponsive 2020-01-22 12:46:01 +01:00
Laurent Destailleur
7a0bff06b9 Fix reponsive 2020-01-22 12:44:10 +01:00
Frédéric FRANCE
3ce077320c
retrieve extrafields oldline when updating line 2020-01-22 10:23:31 +01:00
Laurent Destailleur
b6e7b228ee Removed useless vars in setup 2020-01-22 01:24:04 +01:00
Laurent Destailleur
f22ad9a9bf Add column eec in table of countries 2020-01-22 00:36:04 +01:00
Laurent Destailleur
d94e091951 Can exclude some countries from list 2020-01-21 23:49:04 +01:00
Laurent Destailleur
d329c4ad38 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-21 22:39:30 +01:00
Laurent Destailleur
edc79e7398 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/accountancy/admin/account.php
2020-01-21 22:39:01 +01:00
Laurent Destailleur
69fae5a679 Fix search on accounting account when option to padd 0 is on. 2020-01-21 22:38:03 +01:00
Laurent Destailleur
c7617279de Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-21 22:27:00 +01:00
Laurent Destailleur
80648db7fc Fix search on accounting account when option to padd 0 is on. 2020-01-21 22:26:37 +01:00
Laurent Destailleur
ff9a2608d8 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/admin/account.php
2020-01-21 22:22:16 +01:00
Laurent Destailleur
8f1737952d Fix search on accounting account when option to padd 0 is on. 2020-01-21 22:20:32 +01:00
Laurent Destailleur
e3a21c55d1 Fix label 2020-01-21 21:37:10 +01:00
Laurent Destailleur
a36b0ea4f5 Fix filter on parent account in list of accounting accounts 2020-01-21 21:36:40 +01:00
Laurent Destailleur
7e08dc17af Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-21 20:51:22 +01:00
Laurent Destailleur
fd02ed4317 Fix label 2020-01-21 20:50:58 +01:00
VESSILLER
c91ab621b8 FIX length, width and height coherence in product table 2020-01-21 17:49:27 +01:00
VESSILLER
8a348d533b NEW only show units columns in product list (not in service list) 2020-01-21 17:29:45 +01:00
Laurent Destailleur
8bd835d937 NEW Add option PDF_USE_ALSO_LANGUAGE_CODE to generate PDF in 2 languages
in same document.
2020-01-21 16:17:18 +01:00
Laurent Destailleur
4922567a27 Add .noexec extension for old php4, php5... files 2020-01-21 15:02:04 +01:00
Laurent Destailleur
4fdfba3867 Add .noexec extension for old php4, php5... files 2020-01-21 15:01:22 +01:00
John Botella
d6766af35d Fix dom and missing param 2020-01-21 14:17:53 +01:00
Laurent Destailleur
60a6dc5545 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-21 13:26:46 +01:00
Laurent Destailleur
6d50cc1899 Update demo profiles 2020-01-21 13:25:38 +01:00
Laurent Destailleur
b813a5a4e0 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-21 13:03:02 +01:00