Commit Graph

147666 Commits

Author SHA1 Message Date
ldestailleur
958bca6223 Fix bad var 2025-09-18 16:30:30 +02:00
ldestailleur
4a363478ae Clean code with rector 2025-09-18 16:26:38 +02:00
ldestailleur
02ec4cf421 Test 2025-09-18 15:41:47 +02:00
ldestailleur
b30aa97ba9 Clean code 2025-09-18 15:00:47 +02:00
ldestailleur
f665a0301e Clean code 2025-09-18 14:52:39 +02:00
ldestailleur
a441b412cc Clean code 2025-09-18 14:04:48 +02:00
ldestailleur
6c8e2a1320 Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-09-18 13:54:44 +02:00
ldestailleur
8bd82c0b67 Clean code 2025-09-18 13:54:23 +02:00
ldestailleur
65f865b843 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-09-18 13:33:54 +02:00
ldestailleur
09240c30c7 FIX CI 2025-09-18 13:33:32 +02:00
VIAL-GOUTEYRON Quentin
1874deef49 FIX delivery triggers and mail templates: correct inconsistencies in email triggers and templates` (#35264)
* `fix(delivery): correct inconsistencies in email triggers and templates`

**Body:**
- Adjusted email trigger names from `RECEPTION_*` to `SHIPPING_*`.
- Updated parameters and placeholders for shipment email tracking.
- Removed redundant `reception_send` entry in mail templates for shipping.

* `fix(delivery): update email triggers and templates for deliveries`

**Body:**
- Replaced email trigger `SHIPPING_SENTBYMAIL` with `DELIVERY_SENTBYMAIL`.
- Updated template references from `shipping_*` to `delivery_*` for consistency.
- Modified tracking ID format from `shi` to `del` in `card.php`.
- Added `MailToSendDelivery` language entry for email labels.
- Adjusted mail templates to include `delivery_send` entries.
2025-09-18 13:23:57 +02:00
ldestailleur
42edd8f22d Clean code 2025-09-18 12:19:29 +02:00
Yamil Esteban Garcia
6329e03c7d add filter by invoice categories in the statistics module (#35388)
add filter by invoice categories in the statistics module
2025-09-18 12:09:39 +02:00
ldestailleur
6ed764bedf Clean code 2025-09-18 11:40:56 +02:00
HENRY Florian
9af7b44714 fix: display seleted log level if warning (#35377) 2025-09-18 11:23:45 +02:00
Frédéric FRANCE
d6dce86061 clean code (#35379)
* clean code

* clean code

* clean code

* clean code
2025-09-18 11:08:06 +02:00
Frédéric FRANCE
af47262f4f fix missing translation (#35378) 2025-09-18 10:52:47 +02:00
ldestailleur
333e977bf9 Allowed commit 2025-09-17 23:25:33 +02:00
ldestailleur
cd0fd6f466 CSS 2025-09-17 23:24:25 +02:00
ldestailleur
2572847b2a Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-09-17 18:29:07 +02:00
ldestailleur
6df2e2d236 Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-09-17 18:28:29 +02:00
ldestailleur
7e93fe7a5c Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-09-17 18:28:18 +02:00
ldestailleur
09eefb5031 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-09-17 18:26:27 +02:00
ldestailleur
c0c1ef276f Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-09-17 18:26:07 +02:00
ldestailleur
3fc6410b5f Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-09-17 18:24:24 +02:00
ldestailleur
70f6a23e6f Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-09-17 18:24:17 +02:00
ldestailleur
8c6ecd1144 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2025-09-17 18:23:37 +02:00
Francis Appels
7920cf8596 Fix option SERVICE_ARE_ECOMMERCE_200238EC (#35372) 2025-09-17 18:19:52 +02:00
Frédéric FRANCE
2505c3755b clean code (#35367)
* 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-17 18:18:16 +02:00
HENRY Florian
bf5a0c9ce7 fix: php 8 warning (#35363)
* fix: php 8 warning

* fix: php 8 warning

* fix: php 8 warning

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-09-17 18:16:48 +02:00
ldestailleur
ea00719449 Fix default sort order in bom list 2025-09-17 15:55:33 +02:00
Bahfir Abbes
ce46611031 Fix:prevent handling update action by generic include of actions_addupdatedelete.inc.php (#35369)
* Fix:prevent handling update action by  generic include of actions_addupdatedelete.inc.php

Fix:
To prevent handling update action by generic post update action in inventories at /core/actions_addupdatedelete.inc.php, we need to unset $action variable, otherwise $object fileds are filled with with empty values.

* Update inventory.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-09-17 15:11:34 +02:00
Bahfir Abbes
93973e13c5 Fix:prevent handling update action by generic include of actions_addupdatedelete.inc.php (#35369)
* Fix:prevent handling update action by  generic include of actions_addupdatedelete.inc.php

Fix:
To prevent handling update action by generic post update action in inventories at /core/actions_addupdatedelete.inc.php, we need to unset $action variable, otherwise $object fileds are filled with with empty values.

* Update inventory.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-09-17 15:11:09 +02:00
ldestailleur
073f7f3620 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2025-09-17 15:04:35 +02:00
ldestailleur
4e83087e28 Fix complete #35368 2025-09-17 15:04:01 +02:00
Yamil Esteban Garcia
161b73bf7b FIX The write_file function should return -1 if an error exists (#35368)
* Error: When creating an invoice for a supplier order with a negative value #30516

Error: When creating an invoice for a supplier order with a negative value #30516

* Update html.form.class.php

Modifications made related to the issue
Search for variants by EAN #34567

* Update html.form.class.php

I change :

if(getDolGlobalString('SEARCH_VARIANTS_OF_EAN13')){
with
if (getDolGlobalString('SEARCH_VARIANTS_OF_EAN13')) {

and 

SEARCH_VARIANTS_OF_EAN13
into
PRODUIT_ATTRIBUTES_HIDECHILD_BUT_ALLOW_SEARCH_IN_EAN13

* Update html.form.class.php

* Update html.form.class.php

* Update html.form.class.php

* Update html.form.class.php

* Update html.form.class.php

* added tag mass action

added tag mass action

* Update list.php

* Update pdf_crabe.modules.php

The write_file function as its own documentation describes returns 1 0 a value minus 0 if an error exists. Therefore, if there is an error in the hook more than saving the error, it must return 0 since an error occurred

* Update pdf_crabe.modules.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-09-17 14:59:51 +02:00
Frédéric FRANCE
69c65c5f4d fix CI v22 (#35370)
* fix CI v22

* Update cron_run_jobs.php

* Update files.lib.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-09-17 14:47:51 +02:00
Charlène Benke
c5451242e7 Add default values for database configuration (#35366)
warning error yet correct on old version
2025-09-17 14:46:32 +02:00
ldestailleur
41dd77959a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2025-09-17 14:45:48 +02:00
ldestailleur
86ceb63f91 Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-09-17 14:45:11 +02:00
ldestailleur
0b7acfae9b Fix CI 2025-09-17 14:45:02 +02:00
ldestailleur
1cea5220da Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-09-17 14:25:15 +02:00
Frédéric FRANCE
c8458c22e8 clean code (#35358)
* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-09-17 14:22:58 +02:00
ldestailleur
f2f5f23f8f Fix syntax error 2025-09-17 14:22:53 +02:00
John BOTELLA
776b9422e4 Fix WAF alert ModSecurity: Access denied with code 403 (phase 4). (#35360) 2025-09-17 14:20:33 +02:00
atm-GregM
c84d4c53e5 New develop import export product customer price (#35349)
* NEW import/export product customer price

* back travis and more

* back travis 2
2025-09-17 14:19:36 +02:00
ldestailleur
f5d7d165b0 Debug script 2025-09-17 14:17:29 +02:00
Frédéric FRANCE
be6c3df029 fix CI (#35361)
* fix CI

* Update msg-commit

* Update ruleset.xml
2025-09-17 14:12:39 +02:00
Frédéric FRANCE
078da229c8 clean code (#35352)
* 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

* Clean code

* Clean code

* clean code

* clean code

* clean code

* clean code

* clean code
2025-09-17 14:11:32 +02:00
Frédéric FRANCE
612248a9e9 clean code (#35365)
* clean code

* clean code

* clean code

* clean code

* clean code
2025-09-17 14:10:48 +02:00