Commit Graph

40549 Commits

Author SHA1 Message Date
ldestailleur
e1e47034d5 FIX webportal must not use resources out public dir neither external
files.
2025-09-15 13:26:47 +02:00
ldestailleur
bf3a2c1e01 CSS 2025-09-14 23:45:49 +02:00
Frédéric FRANCE
f14bc0bfbe clean code (#35340)
* clean code

* clean code

* clean code
2025-09-14 11:57:52 +02:00
ldestailleur
60f0813520 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-09-12 23:05:15 +02:00
Vincent Maury
e541438b7e Fix bug #35330 (#35331)
in table header, instead of extrafield filters, this message appears
ERROR : selectForForms: Error bad setup of field objectdescorig=
2025-09-12 18:57:44 +02:00
Frédéric FRANCE
1bc100a082 fix missing translation (#35323)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-09-12 18:56:54 +02:00
Frédéric FRANCE
9f90c9d371 Fix missing translation (#35322)
* fix missing translation

* fix missing translation

* fix missing translation

* fix missing translation
2025-09-12 15:17:18 +02:00
Frédéric FRANCE
7986c02711 fix CI (#35328)
* fix CI

* Update interfaces.class.php

* Update interfaces.class.php

* Update interfaces.class.php

* Update interfaces.class.php

* Update interfaces.class.php

* fix

* fix
2025-09-12 15:16:42 +02:00
Lucas Marcouiller
d0b7e27ca5 NEW Feature to merge duplicate members (#35308)
* New merge members

* fix fields

* add trans

* fix CI

* fix Ci

* fix Ci

* fix CI

* Fix CI

---------

Co-authored-by: Lucas Marcouiller <lmarcouiller@dolicloud.com>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-09-12 15:14:45 +02:00
Frédéric FRANCE
1bbbd96690 clean code (#35317)
* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code
2025-09-12 15:12:55 +02:00
ldestailleur
8b57bb2e41 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-09-12 13:30:12 +02:00
ldestailleur
13407fe5ee Prepare code for Loi Finance 2025-09-12 13:29:19 +02:00
Bradley Jarvis
89dda279a0 FIX: setShippingMethod tigger throwing error (#35320)
* FIX: setShippingMethod tigger throwing error

* Update commonobject.class.php

---------

Co-authored-by: brad <brad@endurotags.com.au>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-09-12 02:49:58 +02:00
Frédéric FRANCE
554d2baa32 clean code adherent (member) class (#35259)
* clean code adherent (member) class

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* fix

* fix

* fix

* fix

* fix

* fix

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-09-12 02:40:35 +02:00
ThomasNgr-OpenDSI
acc3a47272 NEW add fields usage_opportunity, usage_task, usage_bill_time for project import (#35301) 2025-09-12 02:29:43 +02:00
Eric - CAP-REL
1f8b5db2c7 exit code must be >= 0 (#35311) 2025-09-12 02:29:23 +02:00
Frédéric FRANCE
53e7810db4 fix missing translations (#35315)
* fix missing translations

* fix missing translations
2025-09-12 01:52:45 +02:00
Frédéric FRANCE
e4cafd3428 fix missing translation (#35314) 2025-09-12 01:52:18 +02:00
ldestailleur
e3de2dddb7 Fix spellcheck 2025-09-11 16:43:59 +02:00
ldestailleur
0919cc37e0 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-09-11 13:32:00 +02:00
ldestailleur
92ffba11ca Remove old lang files that are too small (moved into other lang files) 2025-09-11 13:31:34 +02:00
Liammer
d55551ee3c Add "__EVENT_DESCRIPTION__" variable (#35302)
To be able to add the event's description in reminder emails.
2025-09-11 12:52:22 +02:00
ldestailleur
b4a2e14fa8 Clean code 2025-09-11 12:32:01 +02:00
ldestailleur
6586feb3ef Clean code 2025-09-11 12:30:19 +02:00
HENRY Florian
6ee966d64d feat: Subtotal module (#35290) 2025-09-11 12:14:32 +02:00
HENRY Florian
214ab20b76 fix: with PRODUCT_USE_UNIT preset the unit in document (#35288) 2025-09-11 12:13:46 +02:00
Frédéric FRANCE
6378a99e5a add src and id when create ecmfiles (#35292) 2025-09-11 11:22:11 +02:00
ldestailleur
af74f2c057 Lang file paybox is too small for deprecated moduel. Moved inside
stripe.
2025-09-11 11:20:13 +02:00
Frédéric FRANCE
1263054fba fix doc (#35298) 2025-09-11 11:10:45 +02:00
ldestailleur
8f0d2b1f7b Fix missing __THIRDPARTY_URL__ 2025-09-10 12:59:01 +02:00
ldestailleur
b667bc0f13 Fix missing __THIRDPARTY_URL__ 2025-09-10 12:57:29 +02:00
ldestailleur
05e29b5ae6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-09-10 11:53:39 +02:00
ldestailleur
46276ba216 Doc 2025-09-10 11:53:17 +02:00
ldestailleur
fd08708d6a Doc 2025-09-10 11:50:46 +02:00
Frédéric FRANCE
e81d5378cd clean code contract class (#35245)
* clean code contract class

* clean code contract class

* clean code contract class

* clean code contract class

* clean code contract class

* clean code contract class

* clean code contract class

* clean code contract class

* clean code contract class

* clean code contract class

* clean code contract class

* clean code contract class

* clean code contract class

* clean code contract class

* clean code contract class

* clean code

* clean code

* clean code

* clean code

* clean code

* fix typo

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix
2025-09-10 11:13:18 +02:00
VIAL-GOUTEYRON Quentin
eb3d752047 Fix (ecm): support for custom entity in file operations (#35283)
* fix(ecm): add support for custom entity in file operations

This commit addresses missing support for specifying custom `entity` values during file operations, ensuring proper handling of multi-entity configurations. Changes include:

- Adding an `entity` parameter to the `fetch` method of `EcmFiles` and ensuring proper filtering based on the provided entity.
- Modifying `dol_move`, `deleteFilesIntoDatabaseIndex`, and other file-related functions to support the `entity` parameter.
- Ensuring entity propagation in operations like file indexing, renaming, and deletion.

This resolves issues where operations were limited to the default entity value (`$conf->entity`), improving flexibility and correctness in multi-entity setups.

* fix(ecm): improve code formatting for entity checks

Ensure consistent coding style for entity-related conditions across file operations by adding spacing around `empty()` calls.

This improves code readability and maintains uniformity in the handling of multi-entity configurations within the `EcmFiles` class and related modules.

* fix(ecm): cast entity to int in SQL queries

Ensure `entity` values are explicitly cast to integers in SQL conditions, improving type safety and preventing potential SQL injection vulnerabilities.

This change applies consistent casting in multiple entity-related checks within the `EcmFiles` class to enhance code security and reliability.
2025-09-10 10:59:09 +02:00
Frédéric FRANCE
0f7c375df7 fix CI (#35269)
* fix CI

* Update mod_codeproduct_elephant.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-09-10 10:53:28 +02:00
ldestailleur
328058c571 Fix ci 2025-09-09 19:36:08 +02:00
ldestailleur
d634d3fc4c Fix ci 2025-09-09 19:33:27 +02:00
ldestailleur
bce059e2fa Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-09-09 19:21:41 +02:00
ldestailleur
42e59c9370 Fix ci 2025-09-09 19:21:29 +02:00
Frédéric FRANCE
03fe13d93d fix template and fix CI (#35254)
* fix adminnotification

* Update notify.class.php

* Update html.formmail.class.php

* fix

* fix

* fix
2025-09-09 19:17:32 +02:00
ldestailleur
8dc1ac2cdc Fix order of product templates 2025-09-09 02:16:06 +02:00
ldestailleur
ef15577d40 Add br 2025-09-08 13:25:28 +02:00
ldestailleur
e2c317a7cd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-09-08 12:15:20 +02:00
ldestailleur
8fb71ef010 Clean setup page 2025-09-08 12:15:01 +02:00
ldestailleur
d27940dd8b NEW Can have a tooltip picto on title of column and keep autotruncation
of label. Tooltip is show at begin of text.
2025-09-08 11:58:32 +02:00
R0ck3n
6334fa5bea NEW: Add prepare() method to DoliDB class (rebuild) (#35249)
* feat:prepared sql for mysqli and postgres

* refactor:remove whitespace

* Update DoliDB.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-09-08 02:37:42 +02:00
PsyCrow
686de5271a Update admin.lib.php (#35246)
Fix PHP Error:
Undefined array key "login" (/admin/tools/listsessions.php:161)

The error is triggered when the user name conatins '_' or '.'

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-09-08 02:12:00 +02:00
Frédéric FRANCE
0e1478206a clean code (#35229)
* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-09-08 01:48:52 +02:00