Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

FIX email text for supplier order (#26880)

Browse Source 
* Fix email text for supplier order

* Update other.lang

* Update other.lang

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
This commit is contained in:
Florent Poinsaut 2023-11-28 11:29:57 +01:00 committed by GitHub
parent c23e726ce0
commit 3cd3f0da3f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/core/class/notify.class.php
View File

@ -558,7 +558,7 @@ class Notify
$dir_output = $conf->fournisseur->commande->multidir_output[$object->entity]."/".get_exdir(0, 0, 0, 1, $object);
$object_type = 'order_supplier';
$mesg = $outputlangs->transnoentitiesnoconv("Hello").",\n\n";
$mesg .= $outputlangs->transnoentitiesnoconv("EMailTextOrderValidatedBy", $link, $user->getFullName($outputlangs));
$mesg .= $outputlangs->transnoentitiesnoconv("EMailTexSuppliertOrderValidatedBy", $link, $user->getFullName($outputlangs));
$mesg .= "\n\n".$outputlangs->transnoentitiesnoconv("Sincerely").".\n\n";
break;
case 'ORDER_SUPPLIER_APPROVE':
@ -566,7 +566,7 @@ class Notify
$dir_output = $conf->fournisseur->commande->multidir_output[$object->entity]."/".get_exdir(0, 0, 0, 1, $object);
$object_type = 'order_supplier';
$mesg = $outputlangs->transnoentitiesnoconv("Hello").",\n\n";
$mesg .= $outputlangs->transnoentitiesnoconv("EMailTextOrderApprovedBy", $link, $user->getFullName($outputlangs));
$mesg .= $outputlangs->transnoentitiesnoconv("EMailTextSupplierOrderApprovedBy", $link, $user->getFullName($outputlangs));
$mesg .= "\n\n".$outputlangs->transnoentitiesnoconv("Sincerely").".\n\n";
break;
case 'ORDER_SUPPLIER_SUBMIT':

11
htdocs/langs/en_US/other.lang
View File

@ -214,13 +214,10 @@ EMailTextProposalClosedRefused=Proposal %s has been closed refused.
EMailTextProposalClosedRefusedWeb=Proposal %s has been closed refuse on portal page.
EMailTextOrderValidated=Order %s has been validated.
EMailTextOrderClose=Order %s has been delivered.
EMailTextOrderApproved=Order %s has been approved.
EMailTextOrderValidatedBy=Order %s has been recorded by %s.
EMailTextOrderApprovedBy=Order %s has been approved by %s.
EMailTextSupplierOrderSubmit=Order %s has been submitted.
EMailTextSupplierOrderSubmitBy=Order %s has been submitted by %s.
EMailTextOrderRefused=Order %s has been refused.
EMailTextOrderRefusedBy=Order %s has been refused by %s.
EMailTextSupplierOrderApprovedBy=Purchase order %s has been approved by %s.
EMailTextSuppliertOrderValidatedBy=Purchase order %s has been recorded by %s.
EMailTextSupplierOrderSubmittedBy=Purchase order %s has been submitted by %s.
EMailTextSupplierOrderRefusedBy=Purchase order %s has been refused by %s.
EMailTextExpeditionValidated=Shipping %s has been validated.
EMailTextExpenseReportValidated=Expense report %s has been validated.
EMailTextExpenseReportApproved=Expense report %s has been approved.