Commit graph

124012 commits

Author SHA1 Message Date
Laurent Destailleur
5b2012dba2 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-12-19 00:49:35 +01:00
Laurent Destailleur
aa1abf2b69 Fix trans 2023-12-19 00:49:08 +01:00
Laurent Destailleur
4dcd7955ef FIX Error on emailreminder not reported 2023-12-18 17:42:17 +01:00
Laurent Destailleur
4979b43ebc
Merge pull request #27124 from thibdrev/patch-1
fix #27123 - Missing translation key "ErrorStartDateGreaterEnd"
2023-12-17 23:09:03 +01:00
Laurent Destailleur
bb65d9520d Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0
Conflicts:
	htdocs/modulebuilder/template/myobject_list.php
2023-12-17 23:01:21 +01:00
Laurent Destailleur
22c93cb029 Fix phpcs 2023-12-17 22:59:15 +01:00
Laurent Destailleur
f7772ecb2b Fix phpcs 2023-12-17 22:55:46 +01:00
Laurent Destailleur
191b8f5205 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-12-17 22:51:58 +01:00
Laurent Destailleur
1661534d5a Fix set PROFID1 2023-12-17 22:51:13 +01:00
Laurent Destailleur
0c5769f329 Fix set of PROFID1 2023-12-17 22:50:23 +01:00
Laurent Destailleur
64b9414271 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0
Conflicts:
	htdocs/modulebuilder/template/myobject_list.php
2023-12-17 22:08:40 +01:00
Laurent Destailleur
8cb9bdd852 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0
Conflicts:
	htdocs/comm/action/list.php
	htdocs/compta/facture/list.php
	htdocs/modulebuilder/template/myobject_list.php
	htdocs/product/stock/movement_list.php
	htdocs/product/stock/productlot_list.php
	htdocs/ticket/list.php
2023-12-17 22:06:48 +01:00
Laurent Destailleur
438e922a75 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0
Conflicts:
	htdocs/master.inc.php
2023-12-17 21:49:42 +01:00
Laurent Destailleur
21b7d68f49 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
Conflicts:
	htdocs/comm/action/list.php
	htdocs/compta/facture/list.php
	htdocs/modulebuilder/template/myobject_list.php
	htdocs/product/stock/movement_list.php
	htdocs/product/stock/productlot_list.php
2023-12-17 21:49:08 +01:00
Laurent Destailleur
9160d49625
Merge pull request #27125 from atm-lena/17.0_FIX_Issue26045
17.0 fix issue 26045
2023-12-17 21:36:55 +01:00
atm-lena
97491b5446 FIX label 2023-12-15 15:48:38 +01:00
atm-lena
338f363fce Issue 26045 : force MAIN_PROFID1_IN_ADDRESS for fr soc 2023-12-15 15:45:52 +01:00
thibdrev
2245ea09d4
add ErrorStartDateGreaterEnd to /fr_FR/errors.lang 2023-12-15 14:24:00 +01:00
thibdrev
4eddee5b4d
add ErrorStartDateGreaterEnd to /en_US/errors.lang 2023-12-15 14:18:43 +01:00
Laurent Destailleur
24703a0f3d Prepare 18.0.4 2023-12-15 13:44:00 +01:00
Laurent Destailleur
396570e24e Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-12-14 12:44:24 +01:00
Laurent Destailleur
3dbfbe965a Merge v17 2023-12-14 12:44:15 +01:00
Laurent Destailleur
87627c6613 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-12-14 10:58:56 +01:00
Laurent Destailleur
a5977e75ce Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-12-14 10:58:46 +01:00
Laurent Destailleur
a534c8dbdb Fix phpcs 2023-12-14 10:56:25 +01:00
Laurent Destailleur
5eb47adef1
Merge pull request #27065 from atm-jonathan/FIX_add_trad_menu_left_recruitment
add trad menu left recuitment
2023-12-14 02:23:27 +01:00
Laurent Destailleur
c301241f23
Merge pull request #27073 from FHenry/17_fix_defaultexport_agenda_pastdelay
fix: defaulted value in configuration of agenda export make it always return no events
2023-12-14 01:56:05 +01:00
Laurent Destailleur
81156665f2
Merge pull request #27071 from FHenry/16_fix_search_product
FIX: 16.0 only, backport fix for SQL error on global search product
2023-12-14 01:37:46 +01:00
Laurent Destailleur
ebde4258a7
Merge pull request #27072 from frederic34/patch-3
fix error message
2023-12-14 01:35:54 +01:00
Laurent Destailleur
b5a1ebd01a
Merge pull request #27079 from atm-lena/16.0_FIX_AddContactToTask_FormConfirmGetTooLong
Add contact to project and tasks : formconfirm get url too long
2023-12-14 01:35:08 +01:00
Laurent Destailleur
51c8c4f737 Fix bad table name 2023-12-14 00:23:00 +01:00
atm-lena
ddf960e1c4 Add contact to project and tasks : formconfirm get url too long 2023-12-13 14:32:58 +01:00
Florian HENRY
bc048cac66 fix: MAIN_AGENDA_EXPORT_PAST_DELAY is defaulted to 0 to 'not isset' is always false 2023-12-13 09:37:45 +01:00
Frédéric FRANCE
ab7b9820d4
fix error message 2023-12-13 09:34:25 +01:00
Florian HENRY
b7defe95fc Merge branch '16.0' of https://github.com/Dolibarr/dolibarr into 16_fix_search_product 2023-12-13 08:57:33 +01:00
Florian HENRY
de7d7d8d66 FIX: backport SQL error on global search product 2023-12-13 08:50:33 +01:00
Jonathan Lescaut
2c23b8db03 add trad menu left recuitment 2023-12-12 15:11:04 +01:00
Laurent Destailleur
b4af7a0061 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-12-12 15:04:13 +01:00
Laurent Destailleur
77a22ea78e Fix table was renamed 2023-12-12 15:01:23 +01:00
Laurent Destailleur
bde53b1706
Merge pull request #27008 from ATM-Consulting/FIX_17_trigger_BILL_SUPPLIER_VALIDATE_cannot_modify_newref
FIX: possible inconsistency between llx_ecm_files and file system when BILL_SUPPLIER_VALIDATES changes ref
2023-12-12 01:06:06 +01:00
Laurent Destailleur
074ca4d63f
Merge pull request #27043 from Easya-Solutions/18.0_fix_fetch_societe
Manage ref_alias for fetch societe
2023-12-11 14:26:57 +01:00
tnegre
9aa1b32c07 Manage ref_alias for fetch societe 2023-12-11 09:54:50 +01:00
Laurent Destailleur
c5ccf54572
Merge pull request #26525 from marc-dll/15.0_FIX_sql_select_replacement
FIX: more correctly parse the select part to be replaced in sql queries
2023-12-09 00:17:42 +01:00
Laurent Destailleur
9c63dfbc6b
Merge pull request #27017 from bloxera/fix_linkedbom_output
Fix: centered output of BOM date in linked objects block
2023-12-08 01:14:56 +01:00
Laurent Destailleur
174a9a4cf8 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-12-07 16:20:43 +01:00
Laurent Destailleur
db71fd54cc Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-12-07 16:20:34 +01:00
Laurent Destailleur
c1d4d5aa63 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-12-07 16:20:02 +01:00
Laurent Destailleur
dfc79f3673 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-12-07 16:19:21 +01:00
Laurent Destailleur
b741db349e Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-12-07 16:18:31 +01:00
Laurent Destailleur
2eb2437793 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-12-07 16:17:39 +01:00