Commit Graph

122 Commits

Author SHA1 Message Date
Frédéric FRANCE
a7cebb70a9 fix usage of recipient translation (#35437)
* fix usage of recipient translation

* fix usage of recipient translation

* fix usage of recipient translation
2025-09-22 20:30:23 +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
92ffba11ca Remove old lang files that are too small (moved into other lang files) 2025-09-11 13:31:34 +02:00
Charlène Benke
dbd5912658 NEW Add Sign feature on shipments (#34640)
* Add Sign feature on shipping

* Update card.php

* Update sendings.lang

* Update card.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-07-18 02:29:54 +02:00
Clément
f5a48dca21 Fix missing translations (#34145)
* Fix missing translations

* Update sendings.lang
2025-05-14 12:47:46 +02:00
lvessiller-opendsi
c85cc3061b NEW shipment kits with dispatcher v2 (#33750)
* NEW shipment kits with dispatcher v2

* Show stock of virtual product on select warehouse when dispatching a shipment

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-04-16 21:11:58 +02:00
ThomasNgr-OpenDSI
c9a27ae21d NEW : allow stock management by product (#32326)
* Code part

* Code part 2

* Fix : invert a const

* Fix : invert disable/enable stock values

* Fix

* Fix missing column from select inside sql request

* Fix input hidden missing name

* ajout d'un commentaire

* small fixes

* remove unrelated lines

* phpcs

* stickler fix

* pre-commit fixes

* pre-commit fixes

* pre-commit fix

* fix missing translation

* Fix phpstan

* fix winCI

* fix travis

* fix phpstan

* fix travis (hopefully)

* remove useless lines

* relaunch tests

* change stockable_product type from bool to int

* change test in Expeditin::addline() to allow adding a line for product with disabled stock management

* make stock management mandatory for products with batch number

* try to remove PHAN errors

* fix phpstan

* fix phpstan

---------

Co-authored-by: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Co-authored-by: mrozniecki <mrozniecki@easya.solutions>
Co-authored-by: Ulysse Valdenaire <uvaldenaire@easya.solutions>
2025-03-10 10:49:53 +01:00
Frédéric FRANCE
e1c9dd32a7 fix missing translations 2025-02-06 13:48:23 +01:00
VESSILLER
7a9ad13adf FIX wrong message on update shipment 2025-02-04 11:15:48 +01:00
Frédéric FRANCE
262a07f5fa dict type contact 2025-01-29 09:25:23 +01:00
Laurent Destailleur
c4b34dd8f7 Clean code 2024-11-22 09:00:28 +01:00
Laurent Destailleur
e12fdfb550 Add language file for tunisia 2024-11-22 02:56:17 +01:00
Noé Cendrier
ed6bf372cd NEW: use Expedition::$date_shipping property in card and list (#31701)
* NEW: use Expedition::$date_shipping property in card and list

* FIX: translation

* FIX: PHPStan rebutal

* FIX: not a great idea to copy and not edit comment

* FIX: on create, expected delivery date should precede sending date

* Update card.php

* Update list.php

* Update list.php

* Update list.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-11-14 13:23:22 +01:00
HENRY Florian
575917a3c9 fix: create invoice from shipping list (20.0) (#30851)
* fix: When create invoice from shipping list translation of mass action is wrong and invoice line desc is wrong

* fix: translation

* fix: translation

* fix: translation
2024-09-04 20:20:52 +02:00
Yannis Hoareau
cd7651e460 NEW mass facturation from expedition (#29744)
* Add facturation mass action to expedition: button created

* Add facturation mass action to expedition: form mass action settings

* Add facturation mass action to expedition: bills creation

* Add facturation mass action to expedition: Import class

* Add facturation mass action to expedition: Dont reset massaction when creating bills

* Add facturation mass action to expedition: Using right name for linked elements

* Add facturation mass action to expedition: Add linked command to expedition

* Add facturation mass action to expedition: Changed wrong variables names

* Add facturation mass action to expedition: Commentary adjustment

* Add facturation mass action to expedition: Added langs and french translations fur understandability

* Add facturation mass action to expedition: fixing warnings

* Add facturation mass action to expedition: add command to retrieve data

* Add facturation mass action to expedition: added fields when fetching expedition lines

* Add facturation mass action to expedition: fix wrong variable name

* Add facturation mass action to expedition: Avoid adding link between objects twice

* Add facturation mass action to expedition: Clean code + function call

* Add facturation mass action to expedition: added missing brace

* Add facturation mass action to expedition: changed duplicate lang key

* Add facturation mass action to expedition: resolve phan warnings

* Add facturation mass action to expedition: fix variable probably undefined

* Add facturation mass action to expedition: fix php codesniffer

* Add facturation mass action to expedition: fix using new methods

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-05-24 18:44:02 +02:00
Laurent Destailleur
1e58997570 Clean code 2024-05-22 00:31:37 +02:00
Laurent Destailleur
bd7e5abc5a Trans 2023-12-08 11:16:57 +01:00
Laurent Destailleur
cd738b1964 Debug v19 2023-10-18 13:50:21 +02:00
VIAL-GOUTEYRON Quentin
61afa1c84b NEW : conf to display date entry stock exped and sort in date order (#22625)
* NEW : Date d'entree en stock sur les exped au moment de la création

* add en trad

* Ajout conf pour la date d'entree en stock

* add trad

* trad

* Fixing style errors.

* modif for only full group by

---------

Co-authored-by: stickler-ci <support@stickler-ci.com>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2023-10-16 18:38:37 +02:00
Laurent Destailleur
0c3e516e57 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-13 03:08:46 +02:00
Laurent Destailleur
ec8c2a7d62 Debug dispatch tab 2023-09-13 03:01:18 +02:00
sonikf
ec71da27be Update sendings.lang 2023-09-08 14:39:20 +03:00
Christophe Battarel
d53772f21d add constant to check if qty shipped not greater than qty ordered 2023-08-17 11:11:49 +02:00
Laurent Destailleur
9972277679 Debug v18 2023-05-22 15:59:48 +02:00
hystepik
2b2b722ead add verification on batchcode 2023-05-09 15:37:49 +02:00
hystepik
1b75dc54b4 can update and create 2023-05-09 11:04:53 +02:00
Laurent Destailleur
30e1ac2aa0 Debug v18 2023-04-06 11:49:28 +02:00
Laurent Destailleur
6c71c6f5e5 Fix trans 2021-08-25 14:18:52 +02:00
Laurent Destailleur
fdef17ef0c Fix translation 2021-04-30 16:59:58 +02:00
Laurent Destailleur
075cacb8cf Show setup of option SHOW_SUBPRODUCT_REF_IN_PDF 2020-12-09 17:40:28 +01:00
John Botella
d3c9a035e9 Add new PDF model storm for delivery 2020-09-23 15:18:53 +02:00
Rüdiger Hahn
d41675b028 Fix translations 2019-12-08 18:15:13 +01:00
Laurent Destailleur
04adbd8c80 Fix conflict between new module reception and old process
Fix inventory record does not need status at creation
2019-09-06 01:52:51 +02:00
Laurent Destailleur
653acf556b Fix translation Customer order into Sales order 2019-01-10 12:15:42 +01:00
Laurent Destailleur
699dc239d4 Fix US trans 2018-12-15 12:24:14 +01:00
torvista
805c184163 more supplier->vendor found!
use of e-mail, EMail, Email rationalised
grammar changes for module titles and descriptions
added constants for Stripe to admin to override class constants
2018-12-14 20:17:22 +01:00
torvista
1c7189ed40 supplier->vendor
suppliers->vendors
2018-12-13 22:24:45 +01:00
torvista
351274d85d 1) Standardization of use of "third party"
as a noun : third party
as an modifier: third-party contact
2) use of colons: no space before
3) Use of supplier/vendor was mixed.
Vendor is B2B or B2C, supplier is B2B. Changed all references to supplier.
4) Many minor grammar changes.
2018-12-11 10:08:19 +01:00
Laurent Destailleur
8a928a72fa Sync transifex 2018-10-13 14:03:32 +02:00
Laurent Destailleur
055d818069 FIX dashboard with IE10 not supporting flex 2018-06-28 12:09:13 +02:00
Laurent Destailleur
99afa3a3e0 Use a shorter key for column title 2017-10-11 12:19:44 +02:00
Laurent Destailleur
768df56c07 Uniformize name of standard PDF template 2017-05-04 20:16:55 +02:00
Laurent Destailleur
853c8a8e07 Fix typo 2017-04-27 18:05:53 +02:00
Laurent Destailleur
c4b6378751 Fix english translation 2017-03-23 16:46:00 +01:00
Laurent Destailleur
62e0d4ec3f FIX Several problems into shipment management with lot enabled 2016-11-14 14:34:15 +01:00
Laurent Destailleur
d1446bb7ef NEW Show subtotal into list of linked elements 2016-11-08 19:19:30 +01:00
Laurent Destailleur
32b6660f63 Uniformize code 2016-10-29 16:18:39 +02:00
Laurent Destailleur
92423be43d Fix english 2016-10-11 15:03:56 +02:00
Laurent Destailleur
d0a15d32b2 Clean language files 2016-06-18 19:48:58 +02:00
Laurent Destailleur
4382f2a437 Clean language files 2016-06-18 11:06:11 +02:00