Commit graph

151292 commits

Author SHA1 Message Date
Mohamed DAOUD
04672e1d80
fix use delivery date v21 (#34831) 2025-07-29 21:09:46 +02:00
boudet jean pascal
3b560cfa4a
New add printFieldListWhere hook in checkmargin.php (#34828)
* add where hook on checkmargin.php

* remove global

* change hookName

* add rector

* clean code

* mend

---------

Co-authored-by: jpb <jean-pascal.boudet@atm-consulting>
2025-07-29 21:09:29 +02:00
Frédéric FRANCE
935c326eee
Update box_produits.php (#34827) 2025-07-29 21:09:07 +02:00
Mohamed DAOUD
3fdc9de178
fix use delivery date (#34830) 2025-07-29 21:08:24 +02:00
ldestailleur
0a8fd7d0f1 Clean code 2025-07-29 15:47:33 +02:00
ldestailleur
3a303d4a83 Debug v22 2025-07-29 15:40:36 +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
ldestailleur
2e9c0ea3e6 Debug v22 2025-07-29 13:37:25 +02:00
ldestailleur
0860e8886c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-07-29 13:36:43 +02:00
ldestailleur
bdddb38878 Debug v22 2025-07-29 13:36:33 +02:00
Sébastien NASSIET
f4c6e2495c
Hook for getAvailableDiscounts (#34799)
* Update discount.class.php

Add a hook to change the sql request in function getAvailableDiscounts

* Update discount.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-07-29 13:25:07 +02:00
ldestailleur
0e3443a084 Debug v22 2025-07-29 13:22:36 +02:00
ldestailleur
8c155ab728 Fix warnings 2025-07-29 13:05:29 +02:00
ldestailleur
546c0ea3d8 Doc for 22.0 2025-07-29 13:02:14 +02:00
ldestailleur
f9a72ba2ac Add info into database to track api or token usage 2025-07-29 12:51:42 +02:00
ldestailleur
fd5e268783 Finish option API_ENABLE_COUNT_CALLS 2025-07-29 12:45:12 +02:00
ldestailleur
c791ea205e Fix warnings 2025-07-29 12:33:49 +02:00
ldestailleur
31d8bbc75c Fix CI 2025-07-29 12:03:53 +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
ldestailleur
6d791919ea Fix CI 2025-07-29 11:49:03 +02:00
ldestailleur
af1948b681 Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-07-29 11:34:16 +02:00
ldestailleur
b3b708ac67 Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-07-29 11:28:43 +02:00
ldestailleur
1fc810c501 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-07-29 11:28:36 +02:00
ldestailleur
0da16f967f Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-07-29 11:28:09 +02:00
ldestailleur
ce6fc756fa Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-07-29 11:27:58 +02:00
ldestailleur
d34e0b5305 Try fix CI 2025-07-29 11:04:32 +02:00
atm-corentin
5d22b46c68
FIX|Fix #Hide mandatory DLC/DLUO options when disabled in product configuration (#34790)
* Hide DLC/DLUO mandatory options in product form when disabled by configuration

* fix using constant

* Update card.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-07-29 02:59:43 +02:00
Laurent Destailleur
1f9ebb05fa Debug v22 2025-07-29 02:57:31 +02:00
Laurent Destailleur
246111732c Debug v22 2025-07-29 02:51:18 +02:00
Laurent Destailleur
60ecf8da6d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2025-07-29 02:41:07 +02:00
Laurent Destailleur
23d0879dde Fix regression on pass encryption in conf 2025-07-29 02:36:19 +02:00
Laurent Destailleur
5cf504fa90 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-07-29 02:24:47 +02:00
Laurent Destailleur
835cb2b244 Debug v22 2025-07-29 02:22:20 +02:00
Laurent Destailleur
149869ca5b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2025-07-29 01:51:08 +02:00
Laurent Destailleur
f64848921c Fix regression on pass encryption in conf 2025-07-29 01:46:04 +02:00
Laurent Destailleur
53badefb2d Fix regression on pass encryption in conf 2025-07-29 01:14:42 +02:00
Laurent Destailleur
dc7ad394ab Add tool to unobfuscate conf file. 2025-07-29 00:22:06 +02:00
Laurent Destailleur
9fe51c656a Add tool to unobfuscate conf file. 2025-07-29 00:00:53 +02:00
Alexandre SPANGARO
0165045524
Fix travis & uniformize (#34817)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-07-28 21:32:30 +02:00
ldestailleur
11abac1532 Fix CI 2025-07-28 19:01:18 +02:00
ldestailleur
ae8e509c9f Fix CI 2025-07-28 18:59:12 +02:00
ldestailleur
89f1b2f608 Fix CI 2025-07-28 18:55:03 +02:00
ldestailleur
a8c918a04a Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-07-28 18:52:34 +02:00
ldestailleur
b07614414c Fix CI 2025-07-28 18:51:29 +02:00
ldestailleur
5ea9be671c Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-07-28 18:42:58 +02:00
Alexandre SPANGARO
d8d1de1a4b
Accountancy - UX - Uniformize option overview of numbering module (#34816)
* Accountancy - UX - Uniformize option overview of numbering module

* Small ajust
2025-07-28 18:39:16 +02:00
ldestailleur
6d0277f2b8 Fix CI 2025-07-28 18:38:14 +02:00
ldestailleur
e6e3486f95 Fix CI 2025-07-28 17:29:51 +02:00
ldestailleur
e7eff817e9 Fix bad position of closing brackets. 2025-07-28 17:19:23 +02:00
ldestailleur
7c6a307a01 Fix CI 2025-07-28 17:18:38 +02:00