Commit graph

140801 commits

Author SHA1 Message Date
Laurent Destailleur (aka Eldy)
de321e8f01 Fix typo 2025-01-09 02:01:49 +01:00
Laurent Destailleur (aka Eldy)
9fb463481e Sync transifex 2025-01-09 01:16:51 +01:00
Laurent Destailleur (aka Eldy)
0c58529d2d Debug v21 2025-01-08 23:29:04 +01:00
Laurent Destailleur (aka Eldy)
5fef2d7287 Debug v21 2025-01-08 21:31:07 +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)
13039a2942 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-01-08 17:45:45 +01:00
Laurent Destailleur (aka Eldy)
7f8295a30c Debug v21 2025-01-08 17:45:28 +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
Laurent Destailleur
2423ca87d3
Merge pull request #32561 from aspangaro/21PCG25
Update Chart of account FR_fr PCG14-DEV to PCG25-DEV
2025-01-07 21:50:25 +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)
2e3a925db0 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-01-07 21:00:29 +01:00
Laurent Destailleur (aka Eldy)
16683de9f3 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-01-07 21:00:15 +01:00
Laurent Destailleur (aka Eldy)
dd7b7a8584 FIX Bad calculation of the theoretical stock. Did not take into account
the inc/dec stock option.
2025-01-07 20:58:16 +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
d4714983f1
fix phpstan 2025-01-07 18:31:56 +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 (aka Eldy)
5422965972 Debug v21 2025-01-07 17:19:40 +01:00
Laurent Destailleur
973b6b8bdf
Merge pull request #32555 from FHenry/20.0_fix_catching_error_on_Notification
fix: manage error in Notification trigger
2025-01-07 16:00:52 +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
Alexandre SPANGARO
f90c1f7c51 Update Chart of account FR_fr PCG14-DEV to PCG25-DEV 2025-01-07 14:38:19 +01:00
Mohamed DAOUD
e7b87fa1d1 fix website purge function 2025-01-07 14:02:53 +01:00
Laurent Destailleur
afe3856d9d
Merge pull request #32554 from Daoud-mohamed/fix-website-purge-function
Fix Website Purge Function
2025-01-07 14:01:44 +01:00
Laurent Destailleur
31342b31eb
Merge pull request #32550 from aspangaro/21PCG25
Update Chart of account FR_fr PCG14-DEV to PCG25-DEV
2025-01-07 13:45:33 +01:00
Laurent Destailleur
3b480109c9
Merge pull request #32534 from frederic34/fix_phpstan_2025_01_05_01
fix phpstan
2025-01-07 13:41:30 +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
Mohamed DAOUD
75f23fca52 fix website purge function 2025-01-07 12:27:56 +01:00
Laurent Destailleur
6bb4ee81ca Debug v21 2025-01-07 12:13:05 +01:00
Laurent Destailleur
75c2c93d3b Prepare v21 2025-01-07 11:44:59 +01:00
Laurent Destailleur
1db2897531 Debug v21 2025-01-07 11:24:01 +01:00
Laurent Destailleur
fd97cee0ef Debug v21 2025-01-07 11:13:27 +01:00
Laurent Destailleur
3b605c2184 Debug v21 2025-01-07 10:43:45 +01:00
Alexandre SPANGARO
931081e645 Fix id_parent 2025-01-07 08:20:37 +01:00
Alexandre SPANGARO
c89398c9be Fix id_parent 2025-01-07 08:13:16 +01:00
Alexandre SPANGARO
aeb4537ef7 Update Chart of account FR_fr PCG14-DEV to PCG25-DEV 2025-01-06 23:50:39 +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
a5af79c230
Merge remote-tracking branch 'origin/fix_phpstan_2025_01_05_01' into fix_phpstan_2025_01_05_01 2025-01-06 18:10:01 +01:00