Commit Graph

106849 Commits

Author SHA1 Message Date
Laurent Destailleur
7ee4cccc84 FIX ODT tags for subobjects {object_subobject_yyy} was not working. 2022-06-07 19:59:33 +02:00
Laurent Destailleur
8303347ab8 FIX label and get_substitutionarray_each_var_object on ODT generation 2022-06-07 19:27:43 +02:00
Laurent Destailleur
c0ae41e2c3 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-06-07 19:08:56 +02:00
Laurent Destailleur
648a8f5c18 FIX xml file for company with special chars in name 2022-06-07 18:58:53 +02:00
Laurent Destailleur
78af5b9be7
Merge pull request #21108 from FHenry/15_fix_actioncomm_code_not_updated
fix: actioncomm.code have to be updated with correct c_actioncomm code (like in create)
2022-06-07 11:38:41 +02:00
Laurent Destailleur
4215237f64 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-06-03 14:09:00 +02:00
Laurent Destailleur
424d3e60da Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-06-03 14:08:50 +02:00
Laurent Destailleur
309eccc426 Fix phpcs 2022-06-03 14:08:04 +02:00
Laurent Destailleur
a19b5aafd8
Merge pull request #21114 from rycks/15_fix_collectormail
emailcollector.class.php : can't put a string in an array
2022-06-03 11:33:28 +02:00
Laurent Destailleur
303b6d6e9e Fix object not defined 2022-06-03 11:23:10 +02:00
Laurent Destailleur
b3d5258596
Merge pull request #21115 from rycks/15_fix_collectormail_hookmanager
emailcollector : hookmanager is null
2022-06-03 11:15:18 +02:00
Laurent Destailleur
be0123f8e1
Merge pull request #21119 from rycks/15_fix_emailcollector_scheduler
fix #21118: undefined function getAttachments
2022-06-03 11:14:00 +02:00
Eric Seigne
d950533bdb fix #21118: undefined function getAttachments 2022-06-02 23:55:58 +02:00
Eric Seigne
d15dee282e fix hookmanager is null 2022-06-02 22:24:22 +02:00
stickler-ci
e48ce5b159 Fixing style errors. 2022-06-02 19:34:39 +00:00
Florian HENRY
b482a78d31 better fix 2022-06-02 21:29:27 +02:00
Florian HENRY
7f38d55648 better fix 2022-06-02 21:28:17 +02:00
Laurent Destailleur
6f6d7d7f48 Fix ODT tags in BOM template
Conflicts:
	htdocs/core/class/commonobjectline.class.php
2022-06-02 20:18:11 +02:00
Laurent Destailleur
f53060fec3 FIX selection of type of invoice 2022-06-02 19:43:41 +02:00
Laurent Destailleur
f9f902f7f4 # WARNING: head commit changed in the meantime
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-06-02 19:37:47 +02:00
Laurent Destailleur
867168fcf4 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-06-02 19:35:58 +02:00
Laurent Destailleur
10aa1a66bc Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2022-06-02 19:35:17 +02:00
Laurent Destailleur
12f3c016d3 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2022-06-02 19:35:03 +02:00
Laurent Destailleur
4e033ba576 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-06-02 19:34:32 +02:00
Laurent Destailleur
ed5b8df385 FIX Bank account not set when creating invoice from order 2022-06-02 19:34:16 +02:00
Laurent Destailleur
c1637d9807 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-06-02 19:30:17 +02:00
Laurent Destailleur
10c101077b Fix auto check 2022-06-02 19:28:18 +02:00
Eric Seigne
d0101fdc90 errors is an array 2022-06-02 18:57:52 +02:00
stickler-ci
19dc0f124c Fixing style errors. 2022-06-02 13:37:55 +00:00
Florian HENRY
d5c4cac64b Merge branch '15_fix_actioncomm_code_not_updated' of github.com:FHenry/dolibarr into 15_fix_actioncomm_code_not_updated 2022-06-02 15:32:37 +02:00
Florian HENRY
43207429ae fix: actioncomm.code have to be updated with correct c_actioncomm code (like in create) until we decide to remove this column 2022-06-02 15:32:16 +02:00
stickler-ci
d73982d1eb Fixing style errors. 2022-06-02 13:26:06 +00:00
Florian HENRY
f6e53b40da fix: actioncomm.code have to be updated with correct c_actioncomm code (like in create) until we decide to remove this column 2022-06-02 15:20:00 +02:00
Laurent Destailleur
6115461b30
Merge pull request #21102 from jyhere/patch-3
FIX errors in getLinesArray()
2022-06-02 14:50:40 +02:00
Laurent Destailleur
2fb5cdbb78
Merge pull request #21099 from aspangaro/14a35
Typo in CSS class
2022-06-02 14:46:16 +02:00
jyhere
f582814c0f
Update bom.class.php 2022-06-02 09:46:26 +02:00
Alexandre SPANGARO
7b55676b56 Merge branch '14.0' into 14a35 2022-06-01 23:12:02 +02:00
Alexandre SPANGARO
1dcd4d0ab6 Typo in CSS class 2022-06-01 23:11:20 +02:00
Laurent Destailleur
958833484f Fix bad var 2022-06-01 22:01:03 +02:00
Laurent Destailleur
169ebdef10 FIX #21051 2022-06-01 21:46:07 +02:00
ptibogxiv
b5197a07c1 Fix API knowledgemanagement 2022-06-01 21:42:18 +02:00
Laurent Destailleur
62ee0ff29c
Merge pull request #21054 from frederic34/patch-1
force refresh css
2022-06-01 21:34:23 +02:00
Laurent Destailleur
8f33d91783
Merge pull request #21073 from fappels/15_fix_update_buyprice_packaging
FIX: sql error when PRODUCT_USE_SUPPLIER_PACKAGING enabled.
2022-06-01 21:01:19 +02:00
Laurent Destailleur
c55c150937
Merge pull request #21082 from manu8170/15.0
Fix a few CSS errors
2022-06-01 19:56:03 +02:00
Laurent Destailleur
c300437e2a
Merge pull request #21084 from Silocan/13.0
fix for issue #16985 on v13
2022-06-01 19:55:08 +02:00
Laurent Destailleur
edc8bebf10
Merge pull request #21090 from Hystepik/develop_v15#1
Fix #21037 : select extrafield in knowledgerecord_list
2022-06-01 19:33:20 +02:00
Laurent Destailleur
32f60e191f Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-06-01 15:57:35 +02:00
Laurent Destailleur
c3036d455a FIX #20902 2022-06-01 15:56:44 +02:00
lmarcouiller
67ac6b41f0 Fix #21037 : select extrafield in knowledgerecord_list 2022-06-01 15:07:14 +02:00
Nicolas
4696cd33d5 fix for issue #16985 2022-06-01 10:42:29 +02:00