Commit graph

154900 commits

Author SHA1 Message Date
Laurent Destailleur
00675ea965 Debug v24 2026-06-19 14:26:06 +02:00
Laurent Destailleur
09c8f86be2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2026-06-19 14:15:29 +02:00
Laurent Destailleur
73b86d073e Debug v24 2026-06-19 14:14:28 +02:00
Alexandre SPANGARO
25c26126c8
Merge pull request #38894 from aspangaro/24_multireport
24 multireport
2026-06-19 08:57:48 +02:00
Alexandre SPANGARO
942b5d68ec Fix column offset 2026-06-19 04:58:09 +02:00
Alexandre SPANGARO
60be09f759 FIX menu for multi-reports 2026-06-19 04:56:01 +02:00
Laurent Destailleur
1290b4eeb6 ci 2026-06-19 04:27:19 +02:00
Laurent Destailleur
7596dff855 CI 2026-06-19 04:26:09 +02:00
Laurent Destailleur
e952bf41ed ci 2026-06-19 04:16:57 +02:00
Laurent Destailleur
11c01adab8 Add missing token 2026-06-19 04:10:50 +02:00
Laurent Destailleur
212c199748 Automated merge from 23.0 to develop 2026-06-19 04:02:00 +02:00
Laurent Destailleur
81b0374728 Automated merge from 22.0 to 23.0 by tool pullmerge.sh 2026-06-19 04:01:57 +02:00
Laurent Destailleur
8a13055959 Automated merge from 21.0 to 22.0 by tool pullmerge.sh 2026-06-19 04:01:53 +02:00
Laurent Destailleur
46f8d4434d Automated merge from 20.0 to 21.0 by tool pullmerge.sh 2026-06-19 04:01:49 +02:00
Eric - CAP-REL
d500b8ca62
fix adherent table name (#38872)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2026-06-19 04:00:36 +02:00
Laurent Destailleur
9b3bebcd5e Automated merge from 23.0 to develop 2026-06-19 03:59:57 +02:00
Laurent Destailleur
6145707e56 Automated merge from 22.0 to 23.0 by tool pullmerge.sh 2026-06-19 03:49:56 +02:00
Laurent Destailleur
b243f14db6 Automated merge from 21.0 to 22.0 by tool pullmerge.sh 2026-06-19 03:43:14 +02:00
Laurent Destailleur
d0091363b8 Fix regression. It was not possible to create an intervention on a
partner not customer.
2026-06-19 03:40:50 +02:00
Laurent Destailleur
f553ff53af Automated merge from 19.0 to 20.0 by tool pullmerge.sh 2026-06-19 03:34:30 +02:00
Laurent Destailleur
d7e92bcd50 Automated merge from 18.0 to 19.0 by tool pullmerge.sh 2026-06-19 03:34:19 +02:00
Laurent Destailleur
594129161d Automated merge from 17.0 to 18.0 by tool pullmerge.sh 2026-06-19 03:34:05 +02:00
Laurent Destailleur
50ceefb2a4 Automated merge from 16.0 to 17.0 by tool pullmerge.sh 2026-06-19 03:28:40 +02:00
Laurent Destailleur
6993c665bf Automated merge from 15.0 to 16.0 by tool pullmerge.sh 2026-06-19 03:28:31 +02:00
Laurent Destailleur
4b22126e44 Automated merge from 14.0 to 15.0 by tool pullmerge.sh 2026-06-19 03:28:24 +02:00
Laurent Destailleur
c72af785c9 Fix ci 2026-06-19 03:22:18 +02:00
Eric - CAP-REL
1b4ece48e2
fix adherent table name (#38871) 2026-06-19 03:19:40 +02:00
w3houde
9c57cfee5f
Fix #38869 load line extrafields in SupplierProposal::fetch and getLinesArray (#38887)
Signed-off-by: Dolicraft <contact@dolicraft.com>
Co-authored-by: Dolicraft <contact@dolicraft.com>
2026-06-19 03:17:48 +02:00
w3houde
e7bd664590
Fix #38857 keep html links and block tags in ticket mail intro/signature (#38888)
The reply form serializes TICKET_MESSAGE_MAIL_INTRO and TICKET_MESSAGE_MAIL_SIGNATURE
through dolPrintHTMLForAttribute() which only allows br/b/font/hr/span, so anchors,
divs and strong are stripped before the email is sent. Pass an extended whitelist for
these two hidden transport inputs so admin formatted footers and intros survive.

Signed-off-by: Dolicraft <contact@dolicraft.com>
Co-authored-by: Dolicraft <contact@dolicraft.com>
2026-06-19 03:16:31 +02:00
w3houde
f66179a381
Fix #36312 refuse to set a category as its own parent (#38891)
llx_categorie.fk_parent had no application-level guard against fk_parent = rowid,
so a stray UPDATE (or future code path) could set a category as its own parent and
break the recursive tree walk in get_full_arbo / get_filles. Reject the case at
the start of Categorie::update() with a translated error and a syslog warning.

Signed-off-by: Dolicraft <contact@dolicraft.com>
Co-authored-by: Dolicraft <contact@dolicraft.com>
2026-06-19 03:13:46 +02:00
w3houde
57e3c37162
Fix #38863 enforce takepos editlines permission on delete-line button (#38889)
The trash button in takepos index.php was rendered without server-side check, and
the deleteline action in invoice.php only required 'takepos > run' which every POS
user has. Wrap the button with hasRight('takepos','editlines') and tighten the
action guard, so users without the edit-lines permission can no longer remove
ticket lines from the keypad before validation.

Signed-off-by: Dolicraft <contact@dolicraft.com>
Co-authored-by: Dolicraft <contact@dolicraft.com>
2026-06-19 03:13:04 +02:00
w3houde
c33e4f8365
Fix #36800 do not crash syslog admin page on stale handler files (#38890)
If old mod_syslog_chromephp.php / mod_syslog_firephp.php / logHandlerInterface.php
files are left over from a v9 install (e.g. when files were not cleaned by upgrade2),
their require_once or constructor breaks the admin/syslog.php page silently. Wrap
the handler load in a try/catch with a class_exists guard so the page keeps listing
the working handlers and just logs a warning for stale files.

Signed-off-by: Dolicraft <contact@dolicraft.com>
Co-authored-by: Dolicraft <contact@dolicraft.com>
2026-06-19 03:09:52 +02:00
w3houde
818c31bb28
Fix #34927 allow returning to floor 0 in TakePOS Bar/Restaurant (#38893)
floors.php hid the previous-floor arrow as soon as floor was 1 ("if ($floor > 1)"),
and the click-handler also fell back to 1 instead of decrementing past it, so users
could never get back to floor 0 once they navigated away. Lower both thresholds to
"$floor > 0" so the arrow stays visible at floor 1 and decrements to 0.

Signed-off-by: Dolicraft <contact@dolicraft.com>
Co-authored-by: Dolicraft <contact@dolicraft.com>
2026-06-19 02:51:48 +02:00
Laurent Destailleur
0233c8355f Debug v24 2026-06-19 00:28:16 +02:00
Laurent Destailleur
c7f4ddff24 Debug v24 2026-06-18 23:14:20 +02:00
Laurent Destailleur
115ce840a3 FIX The .end flag is now in db 2026-06-18 23:09:26 +02:00
Laurent Destailleur
b428dfc9e9 Debug v24 2026-06-18 20:53:27 +02:00
Laurent Destailleur
6eebb7f3d7 Doc 2026-06-18 19:40:33 +02:00
Laurent Destailleur
d10b9f95b6 Debug v24 2026-06-18 18:40:07 +02:00
Laurent Destailleur
7e7b0a3245 Debug 2026-06-18 17:28:14 +02:00
Laurent Destailleur
22147531cc Debug v24 2026-06-18 16:54:41 +02:00
Laurent Destailleur
c6d20def6e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2026-06-18 16:43:12 +02:00
Laurent Destailleur
dab4bfe128 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2026-06-18 16:37:47 +02:00
Laurent Destailleur
d0d3c2fa27 Clean code 2026-06-18 16:37:37 +02:00
Laurent Destailleur
3abef441b5 Debug 2026-06-18 16:35:18 +02:00
Laurent Destailleur
c6b91f7f64 Debug 2026-06-18 16:13:36 +02:00
Laurent Destailleur
dd7609b325 CI 2026-06-18 15:47:33 +02:00
Laurent Destailleur
4f5585eddf CI 2026-06-18 15:38:52 +02:00
Laurent Destailleur
4dc20eaaf0 Clean code 2026-06-18 15:31:25 +02:00
Laurent Destailleur
765c907d44 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2026-06-18 13:41:31 +02:00