Commit graph

151682 commits

Author SHA1 Message Date
splohmer
adf9e3d270
FIX - show correct shippable icon if order has multiple lines with same product (#37656)
In the current implementation it checks only line by line against the stock. This can lead to not correct show of shippable orders icon as this can be incorrect due to multiple lines with the same product.
Example: Stock of product A is 2. There are two lines with this product A. In the previous implementation it will check the first line against the stock 2-2=0 -> ok and then the same result for the next line but this is not correct as it doesn't reflect previous lines.
2026-03-30 20:06:24 +02:00
Laurent Destailleur
7ecc96478a Fix symetric rule to encrypt/decrypt on var (not used yet) 2026-03-29 21:17:32 +02:00
Laurent Destailleur
3ccbc3d942 Doc 2026-03-29 20:50:41 +02:00
Laurent Destailleur
1b32fd27eb Merge branch '23.0' of git@github.com:Dolibarr/dolibarr.git into 23.0 2026-03-29 20:32:18 +02:00
Laurent Destailleur
ee8ded7c5e Fix #GHSA-5cfw-655w-vqp8 2026-03-29 20:31:54 +02:00
Francis Appels
26ed8cc492
Fix makepack-dolibarrmodule.pl (#37642)
* Fix Version detected for module in makepack-dolibarrmodule.pl

* Remove some warning

* Update makepack-dolibarrmodule.pl

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2026-03-29 16:27:50 +02:00
Laurent Destailleur
0523b3ecf9 Clean test files 2026-03-29 16:08:28 +02:00
Laurent Destailleur
7113794c89 Fix #GHSA-7mvq-p95c-38fx 2026-03-29 15:58:35 +02:00
Laurent Destailleur
03bbccf119 css 2026-03-28 22:53:36 +01:00
Laurent Destailleur
e263a85f89 FIX #GHSA-ph29-326p-chw4 - disable+sanitize deprecated load/save files 2026-03-26 21:16:46 +01:00
Laurent Destailleur
2bb779fe14 Automated merge from 22.0 to 23.0 by tool pullmerge.sh 2026-03-26 20:22:24 +01:00
Laurent Destailleur
451dcc99fa Automated merge from 21.0 to 22.0 by tool pullmerge.sh 2026-03-26 20:19:11 +01:00
Laurent Destailleur
9dbe9a9939 Automated merge from 20.0 to 21.0 by tool pullmerge.sh 2026-03-26 20:19:08 +01:00
Laurent Destailleur
271a7e6227 Automated merge from 19.0 to 20.0 by tool pullmerge.sh 2026-03-26 20:18:50 +01:00
Laurent Destailleur
acb103f94a Automated merge from 18.0 to 19.0 by tool pullmerge.sh 2026-03-26 20:17:37 +01:00
ThomasNgr-OpenDSI
fb251fee34
FIX #GHSA-39vm-9q4p-6jjg - force disabling module possible on demo only (#37629)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2026-03-26 17:28:28 +01:00
ThomasNgr-OpenDSI
1f1b6bf49b
FIX #GHSA-hh5p-m24x-fwx2 block ssrf when using webhooks (#37630)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2026-03-26 17:25:24 +01:00
ThomasNgr-OpenDSI
c83c133052
FIX #GHSA-v5fq-cf5m-vwv7 - Credit Grzegorz Tworek, Sec4check (#37632)
(grzegorz.tworek@sec4check.pl)

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2026-03-26 17:23:42 +01:00
ThomasNgr-OpenDSI
01297d0ed0
FIX #GHSA-crgg-h74r-2m8r (#37637)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2026-03-26 16:56:02 +01:00
Laurent Destailleur
1124439043 FIX #GHSA-qjj8-wpvx-p54j - test on hierarchy not done on some api 2026-03-26 16:54:45 +01:00
lvessiller-opendsi
bea0d2c73c
Prepare 18.0.9 (#37625)
* Prepare 18.0.9
2026-03-26 10:03:17 +01:00
Laurent Destailleur
e719cd3fe6 Fix GHSA-vpmc-jjmw-vhww 2026-03-26 02:56:50 +01:00
atm-jonathan
9a9b7ef491 Fix line ordering during situation or replacement invoice creation (#37613) 2026-03-26 02:38:25 +01:00
atm-jonathan
082c0ad43e
Fix line ordering during situation or replacement invoice creation (#37613) 2026-03-26 02:18:21 +01:00
Laurent Destailleur
6b52d317cd Automated merge from 22.0 to 23.0 by tool pullmerge.sh 2026-03-26 02:00:07 +01:00
Laurent Destailleur
5da56bd12c Automated merge from 21.0 to 22.0 by tool pullmerge.sh 2026-03-26 02:00:04 +01:00
Laurent Destailleur
33c0fc18fb Automated merge from 20.0 to 21.0 by tool pullmerge.sh 2026-03-26 02:00:01 +01:00
Laurent Destailleur
05dc9432f7 Merge branch '23.0' of git@github.com:Dolibarr/dolibarr.git into 23.0 2026-03-26 01:46:09 +01:00
Frédéric FRANCE
35b9ea9578
fix parameter (V20 fix) (#37616) 2026-03-26 01:44:20 +01:00
Frédéric FRANCE
826c9c75fc
fix parameter (#37615) 2026-03-26 01:43:57 +01:00
Laurent Destailleur
e208c86b34 Doc 2026-03-26 01:41:32 +01:00
Laurent Destailleur
1072e090ec FIX #GHSA-39vm-9q4p-6jjg - force disabling module possible on demo only 2026-03-25 23:46:45 +01:00
Laurent Destailleur
b565d497f9 FIX #GHSA-hh5p-m24x-fwx2 block ssrf when using webhooks 2026-03-25 22:49:00 +01:00
Laurent Destailleur
e9b2afa63c Fix remove button that is not valid 2026-03-25 22:40:56 +01:00
Laurent Destailleur
f98e60bd78 FIX #GHSA-7hqv-pvw6-cw54 2026-03-25 18:15:19 +01:00
Laurent Destailleur
6f425521b3 FIx #GHSA-vmvw-qq8w-wqhg 2026-03-25 16:40:45 +01:00
Laurent Destailleur
29c6375253 Fix #GHSA-mh66-3w5r-xg9j 2026-03-25 15:55:50 +01:00
Laurent Destailleur
40374ec141 FIX #GHSA-8qh8-6h88-q46p 2026-03-25 15:28:41 +01:00
Laurent Destailleur
85b5fb293c Automated merge from 22.0 to 23.0 by tool pullmerge.sh 2026-03-25 15:13:16 +01:00
Laurent Destailleur
8ab83f3b58 Backport fix #GHSA-3j3p-jjf7-hm9g 2026-03-25 15:07:57 +01:00
Frédéric FRANCE
93a9df2b13
fix delete all price by qty (#37612) 2026-03-25 14:11:44 +01:00
William Mead
c50dfad7f5
FIX intervention API update line (#37607)
* Fixed return

* Updated PHPDoc
2026-03-25 14:11:15 +01:00
Laurent Destailleur
584b25a6c8 Automated merge from 22.0 to 23.0 by tool pullmerge.sh 2026-03-25 14:00:51 +01:00
Laurent Destailleur
60353bd182 Automated merge from 21.0 to 22.0 by tool pullmerge.sh 2026-03-25 14:00:48 +01:00
Laurent Destailleur
9b567bff32 Automated merge from 20.0 to 21.0 by tool pullmerge.sh 2026-03-25 14:00:20 +01:00
Laurent Destailleur
3841d85fa8 Automated merge from 20.0 to 21.0 by tool pullmerge.sh 2026-03-25 13:59:05 +01:00
Laurent Destailleur
553f29e45b Fix what seems to be a regression when doing #37511 and #37461 2026-03-25 13:58:27 +01:00
Laurent Destailleur
58af7c2778 Automated merge from 19.0 to 20.0 by tool pullmerge.sh 2026-03-25 13:40:21 +01:00
Laurent Destailleur
16ac7c9834 Automated merge from 18.0 to 19.0 by tool pullmerge.sh 2026-03-25 13:40:17 +01:00
Laurent Destailleur
a4e883ecbc Automated merge from 17.0 to 18.0 by tool pullmerge.sh 2026-03-25 13:40:13 +01:00