vignesh/dolibarr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

FIX delivery triggers and mail templates: correct inconsistencies in email triggers and templates` (#35264)

Browse source 
* `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.
This commit is contained in:
VIAL-GOUTEYRON Quentin 2025-09-18 13:23:57 +02:00 committed by GitHub
parent 42edd8f22d
commit 1874deef49
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
htdocs/admin/mails_templates.php
View file

@ -219,7 +219,7 @@ if (isModEnabled('invoice') && $user->hasRight('facture', 'lire')) {
}
if (isModEnabled("shipping")) {
$elementList['shipping_send'] = img_picto('', 'dolly', 'class="pictofixedwidth"').dol_escape_htmltag($langs->trans('MailToSendShipment'));
$elementList['reception_send'] = img_picto('', 'dolly', 'class="pictofixedwidth"').dol_escape_htmltag($langs->trans('MailToSendReception'));
$elementList['delivery_send'] = img_picto('', 'dolly', 'class="pictofixedwidth"').dol_escape_htmltag($langs->trans('MailToSendDelivery'));
}
if (isModEnabled("reception")) {
$elementList['reception_send'] = img_picto('', 'dollyrevert', 'class="pictofixedwidth"').dol_escape_htmltag($langs->trans('MailToSendReception'));

16
htdocs/delivery/card.php
View file

@ -284,11 +284,11 @@ include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
// Actions to send emails
$triggersendname = 'RECEPTION_SENTBYMAIL';
$triggersendname = 'DELIVERY_SENTBYMAIL';
$paramname = 'id';
$autocopy = 'MAIN_MAIL_AUTOCOPY_RECEPTION_TO';
$mode = 'emailfromreception';
$trackid = 'bl' . $object->id;
$autocopy = 'MAIN_MAIL_AUTOCOPY_DELIVERY_TO';
$mode = 'emailfromdelivery';
$trackid = 'del' . $object->id;
include DOL_DOCUMENT_ROOT . '/core/actions_sendmails.inc.php';
@ -759,10 +759,10 @@ if ($action == 'create') {
}
// Presend form
$modelmail = 'reception_send';
$defaulttopic = 'SendReceptionRef';
$diroutput = $conf->expedition->dir_output.'/receipt';
$trackid = 'bl'.$object->id;
$modelmail = 'delivery_send';
$defaulttopic = 'SendDeliveryRef';
$diroutput = $conf->expedition->dir_output . '/receipt';
$trackid = 'del' . $object->id;
include DOL_DOCUMENT_ROOT.'/core/tpl/card_presend.tpl.php';
}

1
htdocs/langs/en_US/admin.lang
View file

@ -2102,6 +2102,7 @@ MailToSendProposal=Customer proposals
MailToSendOrder=Sales orders
MailToSendInvoice=Customer invoices
MailToSendShipment=Shipments
MailToSendDelivery=Deliveries
MailToSendIntervention=Interventions
MailToSendSupplierRequestForQuotation=Quotation request
MailToSendSupplierOrder=Purchase orders

1
htdocs/langs/en_US/sendings.lang
View file

@ -51,6 +51,7 @@ DateReceived=Date delivery received
ClassifyReception=Classify Received
SendShippingByEMail=Send shipment by email
SendShippingRef=Submission of shipment %s
SendDeliveryRef=Submission of delivery %s
ActionsOnShipping=Events on shipment
LinkToTrackYourPackage=Link to track your package
ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the Sales Order record.