Commit Graph

106903 Commits

Author SHA1 Message Date
Laurent Destailleur
33beacdc7c Merge pull request #21285 from fappels/15_fix_module_builder
Fix module builder for object sharing
2022-06-17 14:30:47 +02:00
Francis Appels
8da6d4b637 Fix modulebuilder for object sharing. 2022-06-15 14:53:44 +02:00
Laurent Destailleur
d2970f7b5e Merge pull request #21230 from badre-agtaib/import2
FIX #21138
2022-06-14 16:18:25 +02:00
Laurent Destailleur
601b830f6e Merge pull request #21270 from Dolibarr/revert-21240-15.0_FIX_MissingTimeSpentListMenu
Revert "15.0 fix missing time spent list menu"
2022-06-14 14:41:47 +02:00
Laurent Destailleur
e62abce78c Revert "15.0 fix missing time spent list menu" 2022-06-14 14:41:16 +02:00
Laurent Destailleur
507e23c154 Merge pull request #21240 from atm-lena/15.0_FIX_MissingTimeSpentListMenu
15.0 fix missing time spent list menu
2022-06-14 14:39:21 +02:00
stickler-ci
fb0690d6ef Fixing style errors. 2022-06-13 12:38:14 +00:00
atm-lena
41db1c5359 Clean code 2022-06-13 14:31:19 +02:00
atm-lena
b230497e4b FIX : missins time spent list menu 2022-06-13 14:29:18 +02:00
Laurent Destailleur
d48477ab05 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-06-13 13:32:27 +02:00
Laurent Destailleur
12ee8eb40b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
	htdocs/core/class/commonobject.class.php
2022-06-13 13:32:11 +02:00
Laurent Destailleur
d44df3a440 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-06-13 13:27:50 +02:00
Laurent Destailleur
cedf6f8057 # WARNING: head commit changed in the meantime
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
2022-06-13 13:26:59 +02:00
Laurent Destailleur
2d9a9ddd22 Merge pull request #21235 from Silocan/payment-duplicate-bank-transaction
fix: remove duplication bank transaction
2022-06-13 12:42:42 +02:00
Nicolas F
5decd00149 fix: remove duplication bank transaction
do not duplicate previous bank transaction when value is 0
2022-06-13 10:40:41 +00:00
bagtaib
683cc5594f FIX #21138 2022-06-13 01:58:48 +02:00
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
88fc3a4d21 Merge pull request #21186 from Quatadah/fix18704
FIX #18704
2022-06-12 12:25:34 +02:00
Laurent Destailleur
8d2ae444ad Merge pull request #21193 from aspangaro/14p35
FIX #20527 Accountancy - Unbalanced entry proposed when an employee are declared on a social contribution
2022-06-12 11:57:50 +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
Alexandre SPANGARO
82d1cb4682 FIX #20527 Accountancy Unbalanced entry proposed when an employee are declared on social contribution 2022-06-09 17:30:16 +02:00
NASDAMI Quatadah
793e95d88c fixing bug (colspan should be int) 2022-06-09 14:04:32 +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