Commit Graph

38011 Commits

Author SHA1 Message Date
Frédéric France
d6aa69a950 fix phpstan 2025-01-09 20:02:11 +01:00
Frédéric France
df23a371b7 fix phpstan 2025-01-09 18:22:53 +01:00
Frédéric France
cbefb5a2d8 fix phpstan 2025-01-09 18:18:23 +01:00
Laurent Destailleur (aka Eldy)
429f5db55a Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-09 14:09:33 +01:00
Laurent Destailleur (aka Eldy)
8fc73e0417 Add OVER on list of reserved words 2025-01-09 13:58:06 +01:00
Laurent Destailleur (aka Eldy)
58e42656c0 Fix regression after a fix 2025-01-09 13:54:25 +01:00
Laurent Destailleur (aka Eldy)
7b4946b146 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-09 13:03:44 +01:00
Laurent Destailleur (aka Eldy)
a7a50b39a9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-09 02:02:09 +01:00
Laurent Destailleur (aka Eldy)
de321e8f01 Fix typo 2025-01-09 02:01:49 +01:00
Laurent Destailleur
bd08efc497 Merge pull request #32575 from altairisfr/reception_picto
FIX: reception picto alignement in product menu
2025-01-09 01:48:42 +01:00
Laurent Destailleur
b9d35ff580 Merge pull request #32584 from hregis/fix_dev_avoid_warnings
FIX avoid warnings + debug
2025-01-09 01:44:28 +01:00
Laurent Destailleur (aka Eldy)
8e551100a1 Fix typo 2025-01-09 01:41:24 +01:00
Laurent Destailleur (aka Eldy)
3b45a24c07 Fix regression 2025-01-09 01:30:13 +01:00
Laurent Destailleur (aka Eldy)
d75e02fd43 Debug v21 2025-01-08 23:52:35 +01:00
Laurent Destailleur (aka Eldy)
08b77d174d Debug v21 2025-01-08 23:29:32 +01:00
Laurent Destailleur (aka Eldy)
0c58529d2d Debug v21 2025-01-08 23:29:04 +01:00
Regis Houssin
929aa8ee91 FIX avoid warnings + debug 2025-01-08 20:32:19 +01:00
Laurent Destailleur (aka Eldy)
599d891284 Restore lines commented for test 2025-01-08 18:24:46 +01:00
Laurent Destailleur (aka Eldy)
79ae59ee2a Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-08 17:54:13 +01:00
Laurent Destailleur (aka Eldy)
c0250e4c91 FIX CVE-2024-55227 CSRF when MAIN_RESTRICTHTML_ONLY_VALID_HTML_TIDY is
on (hidden option not on by default)
2025-01-08 17:41:45 +01:00
Noé Cendrier
fee2005faa FIX: reception picto alignement in product menu 2025-01-08 14:41:45 +01:00
Laurent Destailleur (aka Eldy)
8febf249ce Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-07 21:47:22 +01:00
Laurent Destailleur (aka Eldy)
710ed35a22 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-07 21:47:12 +01:00
Laurent Destailleur (aka Eldy)
a1003a1a90 Fix regression 2025-01-07 21:46:32 +01:00
Laurent Destailleur
de208ace1d Merge pull request #32567 from frederic34/mod_member
fix phpstan
2025-01-07 21:28:26 +01:00
Laurent Destailleur (aka Eldy)
badb23635b Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-07 21:03:59 +01:00
Laurent Destailleur (aka Eldy)
43e054d5e8 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-01-07 21:00:54 +01:00
Laurent Destailleur (aka Eldy)
c3f06059cb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-07 19:12:54 +01:00
Frédéric France
fa2be8a553 fix phpstan 2025-01-07 18:54:08 +01:00
Frédéric France
b6fc9f4d86 fix phpstan 2025-01-07 18:30:27 +01:00
Laurent Destailleur (aka Eldy)
e5bb7e48db Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-07 17:20:06 +01:00
Laurent Destailleur
1d8f9fd24b Update interface_50_modNotification_Notification.class.php 2025-01-07 16:00:31 +01:00
Laurent Destailleur
fc54c837fa Update interface_50_modNotification_Notification.class.php 2025-01-07 15:59:07 +01:00
Laurent Destailleur (aka Eldy)
c3dddfc96e Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-01-07 13:34:50 +01:00
Laurent Destailleur (aka Eldy)
6b94a458c0 Fix warning 2025-01-07 13:34:33 +01:00
Florian HENRY
daa18360d7 fix: manage error in Notification triggers 2025-01-07 13:16:32 +01:00
Laurent Destailleur
75c2c93d3b Prepare v21 2025-01-07 11:44:59 +01:00
Frédéric France
7b1c4e11e4 fix phpstan 2025-01-06 21:10:21 +01:00
Frédéric France
e2a6a94a52 fix phpstan 2025-01-06 21:02:02 +01:00
Frédéric France
ef103e55dd Merge remote-tracking branch 'upstream/develop' into fix_phpstan_2025_01_05_01 2025-01-06 20:45:37 +01:00
Laurent Destailleur
bd8a839d3e Merge pull request #32549 from Easya-Solutions/develop_odt_dimensions_substitutions
NEW Add 4 substitutions for ODTs.
2025-01-06 20:22:59 +01:00
Frédéric France
86e1625793 fix phpstan 2025-01-06 18:27:30 +01:00
Frédéric France
62a230b047 Merge remote-tracking branch 'upstream/develop' into fix_phpstan_2025_01_05_01 2025-01-06 18:09:12 +01:00
Laurent Destailleur (aka Eldy)
935e7e6d31 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-06 17:44:06 +01:00
tnegre
81298d6787 fix Phpstan 2025-01-06 17:09:45 +01:00
tnegre
86913a7681 Add 4 substitutions for ODTs. Reuse logic from PDF generator, but reformat to make it clearer. 2025-01-06 17:02:43 +01:00
Laurent Destailleur (aka Eldy)
b9f15e4c93 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-06 12:56:38 +01:00
Laurent Destailleur (aka Eldy)
3bfd6c1e30 Debug MAIN_RESTRICTHTML_ONLY_VALID_HTML_TIDY 2025-01-06 12:56:24 +01:00
Laurent Destailleur
c850581ad8 Debug v21 - Fix import 2025-01-06 02:47:32 +01:00
Laurent Destailleur
fde52c9ae7 FIX #32113 2025-01-06 01:28:01 +01:00