From 3cd3f0da3f918c464183bfabf64fcae57ccfe03f Mon Sep 17 00:00:00 2001 From: Florent Poinsaut <1256948+FlorentPoinsaut@users.noreply.github.com> Date: Tue, 28 Nov 2023 11:29:57 +0100 Subject: [PATCH] FIX email text for supplier order (#26880) * Fix email text for supplier order * Update other.lang * Update other.lang --------- Co-authored-by: Laurent Destailleur --- htdocs/core/class/notify.class.php | 4 ++-- htdocs/langs/en_US/other.lang | 11 ++++------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/htdocs/core/class/notify.class.php b/htdocs/core/class/notify.class.php index c53c2852d6f..8968053b98e 100644 --- a/htdocs/core/class/notify.class.php +++ b/htdocs/core/class/notify.class.php @@ -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': diff --git a/htdocs/langs/en_US/other.lang b/htdocs/langs/en_US/other.lang index a771fc5c02c..08719459464 100644 --- a/htdocs/langs/en_US/other.lang +++ b/htdocs/langs/en_US/other.lang @@ -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.