Commit Graph

105551 Commits

Author SHA1 Message Date
atm-lena
daccab5a07 Merge branch '17.0' of https://github.com/Dolibarr/dolibarr into 17.0_FIX_MultilangsTranslationPDFLinesDescription 2023-12-22 09:22:38 +01:00
Laurent Destailleur
65e9a31f22 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-12-21 19:40:33 +01:00
Laurent Destailleur
774af5c371
Merge pull request #27170 from Thomas905/fix/searchbyrefindonlist
FIX : search by ref & rowid in don list
2023-12-19 15:35:26 +01:00
Thomas905
11780b0f12 search by ref & rowid in don list 2023-12-19 08:58:02 +01:00
atm-lena
4d32d93ee2 Clean Travis 2023-12-18 17:28:41 +01:00
atm-lena
abc9eb7bdc Clean Code 2023-12-18 13:44:19 +01:00
atm-lena
ec19dcc8f8 Invoice 2023-12-18 13:34:50 +01:00
atm-lena
9051e411d0 FIX Multilangs : PDF lines description 2023-12-18 12:00:41 +01:00
Laurent Destailleur
0f456f7126
Merge pull request #27117 from ATM-Nicolas/fix_17_php8_error_converting_object_to_string
FIX : Fatal error converting object of class User to string (php8)
2023-12-17 23:13:58 +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
0c5769f329 Fix set of PROFID1 2023-12-17 22:50:23 +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
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
ATM-Nicolas
a5b95b7be3
FIX : Fatal error converting object of class User to string (php8) 2023-12-15 11:01:16 +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
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
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
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
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
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
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
Laurent Destailleur
0c2bcfa79e Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2023-12-07 16:16:34 +01:00
Laurent Destailleur
ea7afeb007 Fix warning 2023-12-07 16:16:22 +01:00
Joachim Kueter
c10c419bf6 fix output 2023-12-07 09:08:33 +01:00
atm-florian
5ced139e3b FIX: $this->newref already exists and could have been modified by trigger but we still use a local variable for the filesystem-based renaming 2023-12-06 17:51:43 +01:00
Laurent Destailleur
e732a3b989
Merge pull request #27000 from W1W1-M/fix-pdf-cornas-page-head-cell-width
FIX pdf cornas page head multicell width (backport v17)
2023-12-06 15:39:47 +01:00
William Mead
f74073f1a3 Added contributor details 2023-12-06 15:18:25 +01:00
William Mead
b53420e64e Refactored & adjusted page head width 2023-12-06 15:17:29 +01:00
Laurent Destailleur
388eb1119e Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-12-06 15:10:46 +01:00
Laurent Destailleur
ea0c97a5d5 FIX #26735 FIX #26994 2023-12-06 15:10:30 +01:00
Eric Seigne
5601fab14f fix sql error in case of balance is empty 2023-12-05 10:41:02 +01:00
Laurent Destailleur
2777cf843e FIX menu auguria 2023-12-04 20:57:35 +01:00
Laurent Destailleur
3d08acb69e Fix menu auguria 2023-12-04 20:55:30 +01:00
moreauf
97434c89bd 17.0: Correct bug in init_menu_auguria.sql Impossible to activate Menu 2023-12-04 12:29:22 +01:00
Laurent Destailleur
67dbfe118c Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-12-02 12:48:00 +01:00
Laurent Destailleur
bae5934af7 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-12-02 12:46:23 +01:00
Laurent Destailleur
09da842b68 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-12-02 12:44:33 +01:00
Eric Seigne
d6c97bd75e check if last_main_doc is not empty 2023-11-30 19:17:14 +01:00