2
0
forked from Wavyzz/dolibarr
Commit Graph

11768 Commits

Author SHA1 Message Date
Laurent Destailleur (aka Eldy)
f11d701486 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-19 15:02:20 +01:00
Laurent Destailleur (aka Eldy)
998f0ce49b Debug v21 2025-01-17 17:55:13 +01:00
Laurent Destailleur (aka Eldy)
c898c52531 Fix iframe lost 2025-01-17 17:40:10 +01:00
Laurent Destailleur (aka Eldy)
9ed7ffd3a1 Add TODO 2025-01-17 01:39:14 +01:00
Laurent Destailleur (aka Eldy)
e925907b26 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-17 01:30:16 +01:00
Laurent Destailleur (aka Eldy)
d404ab6322 Doc 2025-01-17 01:05:11 +01:00
Laurent Destailleur (aka Eldy)
e87853c17b Doc 2025-01-17 01:03:35 +01:00
Laurent Destailleur (aka Eldy)
619392e25a Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-16 17:58:18 +01:00
Laurent Destailleur (aka Eldy)
a233abdcc5 Fix sql error 2025-01-16 15:33:00 +01:00
Laurent Destailleur (aka Eldy)
5e7ed6ba6d Try better fix for js warning 2025-01-16 15:32:08 +01:00
Laurent Destailleur (aka Eldy)
70a476a830 Fix js warning 2025-01-16 15:24:09 +01:00
Laurent Destailleur (aka Eldy)
3bb748a4ee Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-16 14:48:33 +01:00
Alexandre Janniaux
eaa51fed7b accounting: fix num_rows without call from $db
$res->num_rows will not work on PostgreSQL. $db->num_rows() must be used
instead to execute the correct procedure depending on the database
backend.
2025-01-16 14:47:59 +01:00
Laurent Destailleur (aka Eldy)
d85c39e77b Fix CI 2025-01-16 14:47:03 +01:00
Laurent Destailleur
72ef34f698 Merge branch 'develop' into accounting-num_rows_leftovers 2025-01-16 14:33:36 +01:00
Laurent Destailleur (aka Eldy)
683f4f931e Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-16 13:06:43 +01:00
Laurent Destailleur (aka Eldy)
0f0617f8f8 Debug v21 2025-01-16 02:09:34 +01:00
Alexandre Janniaux
f757f9c4cc accounting: fix num_rows without call from $db
$res->num_rows will not work on PostgreSQL. $db->num_rows() must be used
instead to execute the correct procedure depending on the database
backend.
2025-01-15 20:03:28 +01:00
Laurent Destailleur (aka Eldy)
f6f38aebb4 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-15 13:02:21 +01:00
Laurent Destailleur (aka Eldy)
cf62921762 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-01-15 13:01:03 +01:00
Laurent Destailleur (aka Eldy)
c58016c2cf Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-01-15 12:46:26 +01:00
Laurent Destailleur (aka Eldy)
9e8c52e296 Fix function not enabled 2025-01-15 12:10:36 +01:00
Laurent Destailleur (aka Eldy)
a8d99ed459 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-15 11:42:41 +01:00
Laurent Destailleur (aka Eldy)
761c04cc4d Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-15 11:42:32 +01:00
Laurent Destailleur
258411e870 Debug v21 2025-01-14 22:05:08 +01:00
MDW
0f0073b575 Qual: Improve phpdoc for phan notices
Also changed some `"$var"` to more efficient `(string) $var`.
2025-01-14 12:50:16 +01:00
MDW
620dea9e29 Qual: Fix ci by correcting PHPDoc typing
# Qual: Fix ci by correcting PHPDoc typing

Fix the return type, while reviewing the typing, also made some
PHPDoc more specific
2025-01-13 21:58:43 +01:00
Laurent Destailleur (aka Eldy)
682ba1099e Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-13 21:06:25 +01:00
Laurent Destailleur (aka Eldy)
b05478b273 Debug v21 2025-01-13 12:59:37 +01:00
Laurent Destailleur
54477083d4 Merge pull request #32507 from priojk/patch-14
FIX #29624 - substitution of __DATE_DELIVERY__
2025-01-13 02:44:24 +01:00
Laurent Destailleur
2980d8c773 Merge pull request #32633 from frederic34/patch-10
fix phpstan and phan
2025-01-13 02:18:04 +01:00
Laurent Destailleur (aka Eldy)
f6115ec70b Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-13 00:07:00 +01:00
Laurent Destailleur (aka Eldy)
4bdbf05eb7 Debug v21 2025-01-12 18:19:32 +01:00
Laurent Destailleur (aka Eldy)
0a47582428 Fix lang after html in website pages 2025-01-11 14:14:05 +01:00
Frédéric FRANCE
b0b02794ee fix phpstan and phan 2025-01-11 11:55:12 +01:00
Laurent Destailleur
fa16f56b32 Fix warning phpstan 2025-01-11 02:00:17 +01:00
Laurent Destailleur (aka Eldy)
5cca1c1dd6 Doc 2025-01-10 19:02:52 +01:00
Laurent Destailleur (aka Eldy)
d33e2748f1 Debug v21 - Fix for pb with different encoding rules 2025-01-10 18:24:50 +01:00
Laurent Destailleur (aka Eldy)
e37b6fac4d Fix pb in output of label of email 2025-01-09 20:26:22 +01:00
Maxime Kohlhaas
1dc3a9796f Merge branch '20.0' of github.com:Dolibarr/dolibarr into 21.0 2025-01-09 19:35:01 +01:00
Laurent Destailleur (aka Eldy)
802562a575 Fix regression after a fix 2025-01-09 19:35:01 +01:00
Laurent Destailleur (aka Eldy)
1def03d66f Fix regression 2025-01-09 19:35:01 +01:00
Laurent Destailleur (aka Eldy)
1f884b84ce Debug v21 2025-01-09 19:35:01 +01:00
Laurent Destailleur (aka Eldy)
06914d9099 Debug v21 2025-01-09 19:35:01 +01:00
Laurent Destailleur (aka Eldy)
0ffd31c1a1 Restore lines commented for test 2025-01-09 19:35:01 +01:00
Laurent Destailleur (aka Eldy)
56710ce9b7 FIX CVE-2024-55227 and CVE-2024-55228 CSRF when
MAIN_RESTRICTHTML_ONLY_VALID_HTML_TIDY is
on (hidden option not on by default)
2025-01-09 19:35:01 +01:00
Maxime Kohlhaas
76c98a4666 Merge branch '21.0' of github.com:Dolibarr/dolibarr into develop 2025-01-09 18:24:41 +01:00
Maxime Kohlhaas
751e21be44 Merge branch '20.0' of github.com:Dolibarr/dolibarr into 21.0 2025-01-09 18:23:38 +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)
58e42656c0 Fix regression after a fix 2025-01-09 13:54:25 +01:00