Commit Graph

106883 Commits

Author SHA1 Message Date
Laurent Destailleur
fd92cfac07
Merge pull request #21223 from fboitel/fix#20444
Fix#20444
2022-06-12 19:02:55 +02:00
fboitel
7cc9dbe5d4
Merge branch 'Dolibarr:15.0' into 15.0 2022-06-12 14:48:39 +02:00
Laurent Destailleur
89e3a344ac
Merge pull request #21201 from fappels/15_reception_list_search_date
Fix reception list for search date extrafield
2022-06-12 11:54:19 +02:00
Laurent Destailleur
3a1c8206f1
Merge pull request #21203 from fboitel/fix#21093
FIX#21093
2022-06-12 11:48:14 +02:00
Faustin
71ef074987 FIX#21093 2022-06-11 00:41:15 +02:00
Faustin
ef959ecddd FIX#21093 2022-06-11 00:18:38 +02:00
Francis Appels
eb7fcb2f9b Fix reception list for search date extrafield 2022-06-10 13:24:39 +02:00
Laurent Destailleur
62d2084237 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-06-09 12:49:49 +02:00
Laurent Destailleur
974a1c2c6d Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-06-09 12:48:51 +02:00
Laurent Destailleur
a4ca81d4ce FIX #21174 2022-06-09 12:46:13 +02:00
Laurent Destailleur
aeb4287d25
Merge pull request #21143 from fboitel/14.0
FIX #20696
2022-06-09 03:11:23 +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
Faustin
f0a8765ee6 FIX #20696 2022-06-08 16:05:44 +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
fboitel
eb898eb526
Merge branch 'Dolibarr:15.0' into 15.0 2022-06-08 10:45:06 +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
Faustin
b6724f6061 FIX #20696 2022-06-07 16:43:49 +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
Faustin
9731f0658a FIX #20444 2022-06-07 11:23:50 +02:00
Faustin
cd17fec00e FIX #20444 2022-06-07 10:40:44 +02:00
stickler-ci
ccfc730786 Fixing style errors. 2022-06-05 12:56:26 +00:00
Faustin
88cf8187b8 FIX #20444 2022-06-05 14:32:21 +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