Commit Graph

147683 Commits

Author SHA1 Message Date
Bradley Jarvis
7e712cd368 Fix sub BOM quantities (#35371)
* FIX: reqursive bom quantities

Correctly handle quantities on BOM recursion. Current behavior is that
sub BOM total quantity is multiplied by parent quantity for that line,
the expected behaviour is that the parent BOM would be including sub BOM
on a per unit base.

* Simplified code

* Update objectline_view.tpl.php

* Update bom.class.php

* Update bom.class.php

* Update bom.class.php

* Update bom.class.php

---------

Co-authored-by: brad <brad@endurotags.com.au>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-09-20 01:00:39 +02:00
Vincent de Grandpré
2d76f12dae Repair recalculateinvoicetotal (#35381)
* PHPStan > Update baseline

* FIX#33963 - Enabling foreign key field to allow mandatory parameter saving

* Added author to copyright

* Correction calcul du total des taxes

* Travis

* code format

* espaces superflus

* bis

* Update repair.php

* Update repair.php

* PHPStan > Update baseline

* set paid = 1 when total_ttc equals sum of payments

* current upstream file

---------

Co-authored-by: Dolibot <dolibarr-bot@users.noreply.github.com>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-09-20 00:49:52 +02:00
Yamil Esteban Garcia
8037974241 NEW add supplier invoice, order and supplier order tag filter and bulk insert and statistics order and supplier order (#35399)
* add own supplier invoice tag filter and bulk insert

add own supplier invoice tag filter and bulk insert

* Update list.php

change format

* Bulk edit commande tags

Bulk edit commande tags

* Label filter orders and supplier order statistics

Label filter orders and supplier order statistics

* Supplier Order Label Filter and Mass Action for Supplier Order Labels

Supplier Order Label Filter and Mass Action for Supplier Order Labels

* Update index.php

change format

* Update list.php

change format

* Update index.php

change format

* Update index.php

change format

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-09-20 00:46:32 +02:00
MDW
decd14c735 Qual: Update phan baseline (#35405) 2025-09-20 00:45:43 +02:00
Carlos Herrera
b732fd2ed7 feat: add contact list parameter to ticket API endpoints to control contact data retrieval (#35404) 2025-09-20 00:45:30 +02:00
Frédéric FRANCE
318e0362c4 fix Objectlink api (#35402)
* fix objectlink api

* fix objectlink api

* fix objectlink api

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-09-20 00:26:38 +02:00
Charlène Benke
ad4f4fb619 Refactor VAT array handling in PDF generation (#35395)
$this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['amount'] is present on 2 part of the if
2025-09-20 00:01:19 +02:00
Frédéric FRANCE
3adedc23d9 fix CI 🐛 (#35392)
* add picto

* fix padding

* fix CI

* Update user.class.php

* fix

* fix

* fix

* fix

* fix

* fix

* fix
2025-09-19 23:38:52 +02:00
ldestailleur
daa98872eb Fix trans 2025-09-19 16:09:43 +02:00
ldestailleur
25a59cb869 Doc 2025-09-19 13:33:37 +02:00
ldestailleur
43cf29d2e1 Clean corrupted data 2025-09-19 12:20:22 +02:00
ldestailleur
b292c3d631 Add constant MAIN_USE_TITLE_FOR_USER to show a property that is not used 2025-09-18 22:28:14 +02:00
ldestailleur
2a6064b755 Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-09-18 21:49:58 +02:00
ldestailleur
134243550b Try to restore options for stock inc/dev like in v21 2025-09-18 21:49:09 +02:00
ldestailleur
e9bd32e66c FIX can't save setup of odt template for stock 2025-09-18 20:35:09 +02:00
ldestailleur
f87fc4d9e3 Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-09-18 19:49:45 +02:00
ldestailleur
8f4d36c1e8 Fix bad text for tooltip on stock increase/decrease option 2025-09-18 19:49:22 +02:00
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