Commit Graph

106866 Commits

Author SHA1 Message Date
NASDAMI Quatadah
7f86c53b3e fixing bug 20500 2022-06-09 13:15:40 +02:00
Laurent Destailleur
8280447f3e # WARNING: head commit changed in the meantime
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-06-09 03:09:37 +02:00
Laurent Destailleur
900c71b5d6 Fix can add an empty line in tmp edit mode of transation 2022-06-09 03:07:11 +02:00
Laurent Destailleur
e10d89dd36 Fix regression 2022-06-09 03:00:51 +02:00
Laurent Destailleur
9c71ae5f0c Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-06-09 02:59:10 +02:00
Laurent Destailleur
5fec04e3ae Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
	htdocs/societe/class/societe.class.php
2022-06-09 02:58:44 +02:00
bagtaib
7a20b3dcec FIX #21140
Conflicts:
	htdocs/societe/class/societe.class.php
2022-06-09 02:52:54 +02:00
Laurent Destailleur
79d3a35789
Merge pull request #21146 from FHenry/15_fix_filter_status_peruser
fix: filter status(Todo,Done,Imcomplete,...) do not work on peruser.php actioncomm view
2022-06-08 15:04:01 +02:00
Laurent Destailleur
fca92131b2
Merge pull request #21148 from ibuiv/15.0
Fix: rollback on success create_individual
2022-06-08 15:02:27 +02:00
Laurent Destailleur
871077d426
Merge pull request #21152 from daraelmin/patch-2
Fix #21150 - Regression Can't insert manual lines
2022-06-08 15:01:08 +02:00
Laurent Destailleur
a70bb9e9b1
Merge pull request #21164 from fappels/15_fix_customerprice_warning
FIX: Customer price non numeric warning when 0 vat.
2022-06-08 14:55:45 +02:00
Francis Appels
c9049a9c85 Fix non numeric warning 2022-06-08 12:38:50 +02:00
daraelmin
0641b66118
Clean code 2022-06-08 01:39:53 +02:00
daraelmin
f872585ea2
Fix #21150 - Regression Can't insert manual lines
Fix #21150 - Regression Can not insert manual lines for automatically created transactions to the general ledger, this was possible before.
2022-06-08 01:02:02 +02:00
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
antonin_tdj
48fdfe26fa
Fix: rollback on success create_individual
Fix:
Societe::create_individual rollback on success
2022-06-07 18:44:00 +02:00
Florian HENRY
70892c18c5 fix: filter status do not work on peruser action comm 2022-06-07 18:14:15 +02:00
Florian HENRY
0146be0d15 fix: filter status do not work on peruser action comm 2022-06-07 18:13:21 +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