Commit graph

151292 commits

Author SHA1 Message Date
Laurent Destailleur
69ac8cebbf Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2025-11-25 21:09:26 +01:00
Laurent Destailleur
1e16bf5160 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2025-11-25 21:09:04 +01:00
Frédéric France
9f03147a38
Merge remote-tracking branch 'upstream/develop' into clean_code_trigger 2025-11-25 21:06:36 +01:00
Frédéric France
1da3e19bc2
clean code trigger 2025-11-25 21:05:16 +01:00
Laurent Destailleur
332efe2434 Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-11-25 21:04:55 +01:00
Laurent Destailleur
cb221fa2b8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-11-25 21:04:24 +01:00
Laurent Destailleur
5e67e15e1b Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-11-25 21:04:09 +01:00
Laurent Destailleur
427122ce7c Fix merge 2025-11-25 21:03:52 +01:00
Laurent Destailleur
9abb1b7211 Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-11-25 21:03:02 +01:00
Laurent Destailleur
1b9dcf200a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-11-25 21:00:30 +01:00
Laurent Destailleur
955bf9db10 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2025-11-25 21:00:16 +01:00
Laurent Destailleur
8354d0a361 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-11-25 20:57:53 +01:00
Laurent Destailleur
adbcf9b2d8 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-11-25 20:57:32 +01:00
Laurent Destailleur
e920456149 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-11-25 20:57:22 +01:00
Laurent Destailleur
c77220da52 Doc 2025-11-25 20:42:28 +01:00
Laurent Destailleur
3218e19091 Debug v23 2025-11-25 19:51:09 +01:00
Laurent Destailleur
6d42410dac Debug v23 2025-11-25 19:39:21 +01:00
Jon Bendtsen
5a5764d73c remove whitespace 2025-11-25 19:28:34 +01:00
Regis Houssin
e4070aeb97
FIX avoid php warnings (or not ?) (#36411)
* FIX avoid php warnings (or not ?)

* FIX wrong check
2025-11-25 18:52:45 +01:00
Laurent Destailleur
e9a8a4efca Update security.lib.php 2025-11-25 18:50:47 +01:00
Jon Bendtsen
3f90e51792 fix too many parentasies 2025-11-25 18:50:47 +01:00
Jon Bendtsen
966a69bab0 Qual: DENY access to Thirdparty when module is enabled, but no permissions at all 2025-11-25 18:50:47 +01:00
Laurent Destailleur
9b0fd0ec5c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-11-25 18:30:42 +01:00
Laurent Destailleur
c5c0b85498 Debug v23 2025-11-25 18:18:02 +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
Regis Houssin
8621eb21fa FIX multicompany dictionary sharing 2025-11-25 14:58:33 +01:00
Regis Houssin
1e484dda55
NEW webportal member authentication only with WEBPORTAL_LOGIN_BY_MEMBER_ACCOUNT (#36259)
* NEW webportal member authentication only

* FIX missing translation

* FIX php-stan errors

* FIX php-stan : cryptType is always "auto" !

* FIX remove CrypType

* FIX php-stan error

* FIX phan error

* FIX CI versions

* FIX remove wrong fix

* FIX pre-commit error

* FIX phan error

* FIX php-stan error

* FIX avoid php warning

* FIXME this check is not valid
2025-11-25 14:39:30 +01:00
Jon Bendtsen
280ca20600
more API endpoints checks multicompany auth with the same error message (#36409)
Co-authored-by: Jon Bendtsen <xcodeauthor@jonb.dk>
2025-11-25 14:32:28 +01:00
Charlène Benke
712da5b172
NEW : api setup - Add dictionnary holiday lists (#36402)
* Add methods to retrieve holiday and public holiday lists

* Fix SQL query formatting in api_setup.class.php

* Add user permission checks for API access

Added permission checks for user access rights before fetching data for expense reports, holidays, and HR public holidays.
2025-11-25 14:21:58 +01:00
Alexandre SPANGARO
d9b8abe3e4
FIX #36310 Accountancy - Data - Wrong account labels (cache) on write bookkeeping action (#36410)
* FIX #36310 Accountancy - Data - Wrong account labels (cache) on writebookkeeping action (#36379)

* Fix
2025-11-25 14:20:05 +01:00
Florian Mortgat
7f27552a95
FIX: empty origin type passed to addline when creating invoices from expeditions using massaction (confirm_createbills) (#36413) 2025-11-25 14:18:12 +01:00
Jakub Stříbrný
244b6f0473 FIX do not force rowid to int (#36412)
* do not force rowid to int

* Update commonobject.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-11-25 14:16:13 +01:00
Jakub Stříbrný
d24b8b6221 FIX do not force rowid to int (#36412)
* do not force rowid to int

* Update commonobject.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-11-25 14:15:36 +01:00
Jakub Stříbrný
5377df3ba7
FIX do not force rowid to int (#36412)
* do not force rowid to int

* Update commonobject.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-11-25 14:14:58 +01:00
Laurent Destailleur
b739a69741 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-11-25 12:17:05 +01:00
Laurent Destailleur
2580d0dd7f Fix missing email 2025-11-25 12:16:55 +01:00
Laurent Destailleur
2fb94f3d18 Doc 2025-11-24 20:14:20 +01:00
Jon Bendtsen
a40c97ec9c
NEW: API set contact for any type in proposal, order or invoice dictionary (breaks API proposal) (#36269)
* NEW: Setting proposal contact to any in proposal contact dicitonary

* hurl tests and a little general cleanup of proposals api

* testing if the supplied type is in the dictionary

* Unique error codes

* Giving better error messages

* Making hurl tests reasonably identical for: proposals, orders and invoices

* BREAKING proposals, to make it identical with order and invoice + support for non default contacts for orders and invoices just like proposals

* adding the missing global  to order and invoice

---------

Co-authored-by: Jon Bendtsen <xcodeauthor@jonb.dk>
2025-11-24 20:12:35 +01:00
Jyhere
0ad7e52119
FIX : load_stats_commande() commande sql join (#36403) 2025-11-24 20:04:44 +01:00
Charlène Benke
3ddbcf8d9e
Continue Implement new title line addition for subtotals on interventional (#36376)
* Implement new title line addition for subtotals

Added functionality to handle adding a new title line for the subtotals module, including input processing and document generation.

* Add parameters to addline method in fichinter class

* Add special_code to fichinterligne class

* Update copyright notices in commonsubtotal.class.php

Added copyright notice for Charlene Benke for 2025.

* Remove extra blank line in fichinterligne.class.php

* Change special_code to be an integer in SQL query

* Refactor intervention detail display logic

Refactor code for better readability and maintainability by removing duplicate lines and organizing the logic for displaying intervention details.

* Decode extraparams to get subtotal options

* Change default value of special_code to 0
2025-11-24 19:47:07 +01:00
Frédéric FRANCE
d2ed8fed4f
can specify user timezone if no session (#36344)
* can specify user timezone if no session

* Update functions.lib.php

* Update functions.lib.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-11-24 19:43:48 +01:00
Alexandre SPANGARO
07f49f2a35
FIX #36310 Accountancy - Data - Wrong account labels (cache) on writebookkeeping action (#36379) 2025-11-24 19:36:00 +01:00
Evann DREUMONT
b6862f5f59
Add REST API support for listing template invoices (#36397) 2025-11-24 19:19:39 +01:00
Laurent Destailleur
71dc6dc1db Fix #35096 #36393 2025-11-24 19:18:31 +01:00
Regis Houssin
7d403a2fff
FIX getEntity use element instead table_element (#36405) 2025-11-24 19:15:04 +01:00
Laurent Destailleur
85b03e227d Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-11-24 19:13:58 +01:00
Laurent Destailleur
ca80d82248 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-11-24 19:13:37 +01:00
Laurent Destailleur
ca1a9c9155 Complete #35096 #36393 2025-11-24 19:13:13 +01:00
Laurent Destailleur
111ba82936 Debug v23 2025-11-24 18:58:50 +01:00
Laurent Destailleur
e707544cca Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-11-24 18:26:03 +01:00