Commit Graph

12964 Commits

Author SHA1 Message Date
Laurent Destailleur
19af522109 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-07-31 23:54:30 +02:00
Laurent Destailleur
ad7807d045 Merge remote-tracking branch 'origin/19.0' into 20.0 2025-07-31 23:40:06 +02:00
Laurent Destailleur
8dc50b4c5a Merge remote-tracking branch 'origin/18.0' into 19.0 2025-07-31 23:16:27 +02:00
Laurent Destailleur
b226894e36 Merge remote-tracking branch 'origin/17.0' into 18.0 2025-07-31 23:14:31 +02:00
Laurent Destailleur
3b0a4c9fa9 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2025-07-31 23:11:32 +02:00
VIAL-GOUTEYRON Quentin
154a25f8cb Enhance working days calculation to incorporate half-day adjustments and optimize public holiday checks (#34552)
* "Enhance working days calculation to incorporate half-day adjustments and optimize public holiday checks"

* "Add test cases for num_open_day() to validate half-day and weekend boundary scenarios"

* "Update DateLibTest to include Saturday and Sunday as non-working days in test setup"
2025-07-31 22:59:29 +02:00
atm-GregM
b34ea62fd9 Fix detail qty if serial batch (#34844) 2025-07-31 21:23:53 +02:00
Frédéric FRANCE
7f173724ef NEW can admin payments extrafields (#34822)
* add admin for payments extrafields

* add admin for payments extrafields

* add admin for payments extrafields

* add admin for payments extrafields

* add admin for payments extrafields
2025-07-29 13:51:58 +02:00
Marc de Lima Lucio
fda975970c Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new-api-rest-tokens 2025-07-29 11:58:15 +02:00
Laurent Destailleur
23d0879dde Fix regression on pass encryption in conf 2025-07-29 02:36:19 +02:00
Laurent Destailleur
f64848921c Fix regression on pass encryption in conf 2025-07-29 01:46:04 +02:00
ldestailleur
89f1b2f608 Fix CI 2025-07-28 18:55:03 +02:00
ldestailleur
d96d61d161 Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-07-28 15:27:25 +02:00
Marc de Lima Lucio
bd89c1987f Merge branch 'develop' into new-api-rest-tokens 2025-07-28 09:22:30 +02:00
ldestailleur
357c1cd609 Fix getDomainFromURL when param is emails. 2025-07-28 01:47:34 +02:00
ldestailleur
8317bf0c29 FIX html title when using custom value 2025-07-27 13:54:02 +02:00
ldestailleur
b03f30c7e2 Sec: Remove functions accepting callable params - Reported by phdwg1410 2025-07-27 13:54:02 +02:00
ldestailleur
7b8c2c5e9c Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-07-26 13:16:15 +02:00
ldestailleur
e8de1b62d1 Debug v22 2025-07-26 11:38:27 +02:00
ldestailleur
3c8be27009 Debug v22 2025-07-26 11:18:48 +02:00
ldestailleur
7ea3c419aa Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-07-25 17:00:22 +02:00
ldestailleur
1f1e41ae7f Parenthesis 2025-07-25 01:45:15 +02:00
ldestailleur
9d32a5218e Add log 2025-07-25 01:37:48 +02:00
Laurent Destailleur
ea9dbec6cf Merge branch 'develop' into new-api-rest-tokens 2025-07-24 11:26:20 +02:00
ldestailleur
6a18353eb0 Fix CI 2025-07-24 11:00:42 +02:00
ldestailleur
b710c85b07 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-07-22 13:00:31 +02:00
ldestailleur
fa12e7ddeb Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-07-21 18:47:46 +02:00
ldestailleur
cf329df785 Debug v22 2025-07-21 18:02:50 +02:00
ldestailleur
2e47121024 Debug v22 2025-07-21 14:25:48 +02:00
moreauftheobald
d4f9fd424f QUAL: OpenID Setup fused in Security Setup + Module removed -- WIP (#34422)
* FIX: OpenID Setup fused in Security Setup + Module removed...

* FIX: OpenID Setup fused in Security Setup + Module removed... WIP

* FIX: OpenID Setup fused in Security Setup + Module removed... WIP

---------

Co-authored-by: Theobald <f.moreau@theobald-groupe.com>
2025-07-20 20:09:53 +02:00
ldestailleur
0277aff89d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2025-07-20 20:05:40 +02:00
ldestailleur
9195f9be36 Debug getWarningDelay 2025-07-20 19:57:15 +02:00
moreauftheobald
6c86ad3eae FIX-Develop correct getwarningdelay (#34497)
* replace $conf->module->XXX->gwarning_delay by new function getwarningdelay

* replace $conf->module->XXX->gwarning_delay by new function getwarningdelay

* replace $conf->module->XXX->gwarning_delay by new function getwarningdelay

* FIX- Correct function GetwarningDelay

---------

Co-authored-by: Theobald <f.moreau@theobald-groupe.com>
2025-07-20 19:54:06 +02:00
ldestailleur
5f70ad29a2 FIX html title when using custom value 2025-07-19 15:43:40 +02:00
Frédéric FRANCE
bb294eef95 NEW add hook getListOfModels (#34626)
* add hook getListOfModels

* Update functions2.lib.php

* Update functions2.lib.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-07-18 02:59:19 +02:00
F-Node-Karlsruhe
34634cd814 fix purchase order refernece key in pdf generation (#34757)
* fix refernece key in pdf generation

Signed-off-by: F-Node-Karlsruhe <christian.fries@eecc.de>

* Update pdf.lib.php

---------

Signed-off-by: F-Node-Karlsruhe <christian.fries@eecc.de>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-07-17 23:19:55 +02:00
F-Node-Karlsruhe
e59f2447e7 fix purchase order refernece key in pdf generation (#34757)
* fix refernece key in pdf generation

Signed-off-by: F-Node-Karlsruhe <christian.fries@eecc.de>

* Update pdf.lib.php

---------

Signed-off-by: F-Node-Karlsruhe <christian.fries@eecc.de>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-07-17 22:20:45 +02:00
ldestailleur
de8c7f3c6e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-07-17 21:48:55 +02:00
ldestailleur
487633c117 Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-07-17 21:48:46 +02:00
ldestailleur
49a834b08c Fix warning 2025-07-17 21:48:31 +02:00
Charlène Benke
2bd22cc7c6 NEW : add api_paiements.class.php (#34756)
* NEW : add api_paiements.class.php

* Update functions2.lib.php

add payement api folder

* Update api_paiements.class.php

* Update api_paiements.class.php
2025-07-17 21:34:26 +02:00
ldestailleur
a9c48a3e4d Debug v22 2025-07-17 21:04:59 +02:00
ldestailleur
54ba7c2672 FIX mass action "Merge PDF" with high number of objects. 2025-07-17 19:30:58 +02:00
ldestailleur
c0a0acf129 FIX #34746 2025-07-17 19:30:58 +02:00
ldestailleur
61dcd176e0 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-07-17 19:30:58 +02:00
ldestailleur
a4aa00c498 Sec: Remove all functions that accept callable params - CVE-2024-40137 2025-07-17 19:30:58 +02:00
ldestailleur
5f4ff4d472 Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-07-17 19:26:24 +02:00
ldestailleur
d8a07f6fd6 Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-07-17 19:26:24 +02:00
ldestailleur
f1cef8ec80 FIX mass action "Merge PDF" with high number of objects. 2025-07-17 19:26:24 +02:00
ldestailleur
f0a0aeb3a4 FIX #34746 - More complete fix for CVE-2024-40137 2025-07-17 19:26:24 +02:00