Laurent Destailleur
61bd956fe0
Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0
2026-01-07 18:40:40 +01:00
Laurent Destailleur
39fe5e85e5
Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0
2026-01-07 18:36:51 +01:00
Eric - CAP-REL
2e22f9e75a
fix concat for a undef entry of array ( #36754 )
2025-12-27 23:04:40 +01:00
Laurent Destailleur
e10354bed0
Merge pull request #36632 from braito4/patch-10
...
FIX Check if lines are structured HTML before processing
2025-12-16 02:29:37 +01:00
Braito
ab53b28c1b
Simplify lines substitution logic
...
Removed unnecessary check for structured HTML in default lines.
2025-12-15 16:30:16 +01:00
Braito
cf0642e53c
Remove unused variable 'linesisstructuredhtml'
2025-12-15 16:28:51 +01:00
Laurent Destailleur
3690babb73
Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0
2025-12-15 15:57:01 +01:00
Laurent Destailleur
e1b5e024f5
Merge
2025-12-15 15:56:34 +01:00
Braito
97043d0ce0
Fix HTML check for __LINES__ substitution
2025-12-13 12:34:09 +01:00
Braito
88760d71c3
Fix line formatting for HTML content handling
2025-12-13 12:29:16 +01:00
Braito
48bebca965
Check if lines are structured HTML before processing
2025-12-13 12:12:39 +01:00
Eric Seigne
18f85df343
remove spaces from prev fix
2025-12-11 10:11:58 +01:00
Eric Seigne
c6ed34ebcc
backport of PR36378 : Problem with deposit line on Type of operation
2025-12-05 09:32:03 +01:00
Laurent Destailleur
9d307a4238
Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0
2025-12-04 19:07:33 +01:00
Laurent Destailleur
222cd76799
Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0
2025-12-04 18:53:04 +01:00
Laurent Destailleur
aa8fac1deb
Merge pull request #36429 from atm-adrien/FIX/MulticompanyStockCompatibility
...
FIX : Implementation of multi-company compatibility with inventory/warehouse management
2025-12-04 10:42:35 +01:00
lvessiller-opendsi
ad37ece7bc
Merge pull request #36494 from atm-florianm/FIX/155/date/minute-second-vs-min-sec
...
FIX 18.0: `GETPOSTDATE()` and `buildParamDate()` assumed wrong HTTP param names
2025-12-04 09:27:44 +01:00
atm-florian
0e1c580f11
FIX 18.0: GETPOSTDATE and buildParamDate assumed HTTP param names 'minute' and 'second' instead of 'min' and 'sec'
2025-12-01 13:47:50 +01:00
VESSILLER
d16f8b68db
FIX not remove value of others extra-fields on update extras action
2025-12-01 11:14:16 +01:00
Laurent Destailleur
f4bcf47008
Merge pull request #36467 from emheyarssi/35061
...
FIX #35061
2025-11-29 11:28:03 +01:00
marc
5c6b4f62c8
FIX #35061
...
Signed-off-by: marc <marc.baur@ptmsoft.fr >
2025-11-28 18:25:00 +01:00
Adrien Raze
c1c2358e75
FIX : Implementation of multi-company compatibility with inventory/warehouse management
2025-11-26 12:30:22 +01:00
Jon Bendtsen
5044b3a102
Qual: Undefined variable $errormessage in /var/www/html/core/customreports.php on line 951 ( #36392 )
...
* checking if variable is set before testing the contents
* more PHP warnings fixes detected during #35096
* using the fixed set above
* backport eldy's fix
---------
Co-authored-by: Jon Bendtsen <xcodeauthor@jonb.dk >
2025-11-25 17:40:07 +01:00
Laurent Destailleur
71dc6dc1db
Fix #35096 #36393
2025-11-24 19:18:31 +01:00
Laurent Destailleur
b9e6243ec8
Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0
2025-11-24 16:16:00 +01:00
Laurent Destailleur
9394f24cf7
Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0
2025-11-24 16:15:26 +01:00
Laurent Destailleur
b1a4520059
Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0
2025-11-24 16:10:29 +01:00
Laurent Destailleur
2935a245a3
Merge branch '16.0' of git@github.com:/Dolibarr/dolibarr.git into 17.0
2025-11-24 16:07:46 +01:00
Laurent Destailleur
5589ed71b2
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
2025-11-24 16:07:22 +01:00
Laurent Destailleur
32f160355b
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2025-11-24 16:03:52 +01:00
Florian Mortgat
5a61cc9393
FIX DA027383: permissions not checked on HRM evaluation card ( #36328 ) ( #36399 )
...
Permissions involved:
- hrm->evaluation->readall: the user can view anyone's evaluations
- hrm->evaluation->read: the user can only view their or their subordinates' evaluations
2025-11-24 14:57:20 +01:00
iLLixM
0e8d4461c4
Fix: Prevent negative payment amount in EPC-QR Code ( #36364 )
2025-11-21 18:34:24 +01:00
Eric - CAP-REL
c8acd48e34
setErrors does not exists, same solution as dolibarr v19.0 ( #36107 )
...
* setErrors does not exists, same solution as dolibarr v19.0
* reload ci
* reload ci 2
---------
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr >
Co-authored-by: lvessiller-opendsi <lvessiller@open-dsi.fr >
2025-11-20 23:58:15 +01:00
ldestailleur
9e8460c3dc
Fix CI
2025-11-20 15:17:01 +01:00
ldestailleur
70f5e20572
Fix CI
2025-11-20 15:16:04 +01:00
Laurent Destailleur
ecda16a5f6
Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0
2025-11-20 11:48:23 +01:00
Laurent Destailleur
515a615915
Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0
2025-11-20 11:44:40 +01:00
lvessiller-opendsi
1f6cec841f
Merge pull request #35795 from hregis/fix_18_multicompany_compatibility
...
FIX Multicompany compatibility with "project_task"
2025-11-20 10:03:38 +01:00
iLLixM
8d038f32bc
FIX #33148 - partial payments are taken into account in EPC QR codes ( #36338 )
...
When generating EPC QR codes on an invoice, any partial payments already made are taken into account. The remaining balance (the value of "Remaining unpaid") is then entered as the amount in the EPC QR code.
2025-11-20 01:49:24 +01:00
Florian Mortgat
c0850d9a3f
FIX DA027383: permissions not checked on HRM evaluation card ( #36328 )
...
Permissions involved:
- hrm->evaluation->readall: the user can view anyone's evaluations
- hrm->evaluation->read: the user can only view their or their subordinates' evaluations
2025-11-19 19:19:55 +01:00
Florian Mortgat
8e30fc0bd1
FIX 19.0 - attachments upload dir for invoices not always determined correctly (doesn't always take multi-entity into account) ( #36302 )
2025-11-18 11:39:45 +01:00
Regis Houssin
2027f9c951
FIX avoid php warnings ( #36301 )
2025-11-18 11:31:38 +01:00
Regis Houssin
21843e68b0
FIX #36149 ( #36150 )
2025-11-18 10:12:05 +01:00
lvessiller-opendsi
30ecf80732
FIX keep user who validate proposal on update ( #36257 )
2025-11-14 15:53:31 +01:00
Laurent Destailleur
2db335dd0e
Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0
2025-11-12 21:51:30 +01:00
Laurent Destailleur
dba065c222
Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0
2025-11-12 21:50:04 +01:00
Laurent Destailleur
29edc77dd5
Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0
2025-11-12 21:46:53 +01:00
Laurent Destailleur
99fe044868
Merge branch '16.0' of git@github.com:/Dolibarr/dolibarr.git into 17.0
2025-11-12 21:44:49 +01:00
Ryad ABANI
ea28972862
FIX: dol_escape_htmltag in extrafields_view ( #36136 )
...
Co-authored-by: Ryad ABANI <ryad.abani@scopen.fr >
2025-11-12 15:44:40 +01:00
Regis Houssin
3ad30f8622
FIX use array_intersect instead in_array
2025-11-07 12:07:50 +01:00
