Skip to content

Commit

Permalink
FIX Email text supplier order bis (Dolibarr#26884)
Browse files Browse the repository at this point in the history
  • Loading branch information
FlorentPoinsaut authored Nov 28, 2023
1 parent f1e384c commit f9a09bf
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
10 changes: 5 additions & 5 deletions htdocs/core/class/notify.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -558,7 +558,7 @@ public function send($notifcode, $object, $filename_list = array(), $mimetype_li
$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("EMailTexSuppliertOrderValidatedBy", $link, $user->getFullName($outputlangs));
$mesg .= $outputlangs->transnoentitiesnoconv("EMailTextSupplierOrderValidatedBy", $link, $user->getFullName($outputlangs));
$mesg .= "\n\n".$outputlangs->transnoentitiesnoconv("Sincerely").".\n\n";
break;
case 'ORDER_SUPPLIER_APPROVE':
Expand All @@ -582,7 +582,7 @@ public function send($notifcode, $object, $filename_list = array(), $mimetype_li
$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("EMailTextOrderRefusedBy", $link, $user->getFullName($outputlangs));
$mesg .= $outputlangs->transnoentitiesnoconv("EMailTextSupplierOrderRefusedBy", $link, $user->getFullName($outputlangs));
$mesg .= "\n\n".$outputlangs->transnoentitiesnoconv("Sincerely").".\n\n";
break;
case 'SHIPPING_VALIDATE':
Expand Down Expand Up @@ -841,15 +841,15 @@ public function send($notifcode, $object, $filename_list = array(), $mimetype_li
$dir_output = $conf->fournisseur->commande->multidir_output[$object->entity]."/".get_exdir(0, 0, 0, 1, $object);
$object_type = 'order_supplier';
$mesg = $langs->transnoentitiesnoconv("Hello").",\n\n";
$mesg .= $langs->transnoentitiesnoconv("EMailTextOrderValidatedBy", $link, $user->getFullName($langs));
$mesg .= $langs->transnoentitiesnoconv("EMailTextSupplierOrderValidatedBy", $link, $user->getFullName($langs));
$mesg .= "\n\n".$langs->transnoentitiesnoconv("Sincerely").".\n\n";
break;
case 'ORDER_SUPPLIER_APPROVE':
$link = '<a href="'.$urlwithroot.'/fourn/commande/card.php?id='.$object->id.'&entity='.$object->entity.'">'.$newref.'</a>';
$dir_output = $conf->fournisseur->commande->multidir_output[$object->entity]."/".get_exdir(0, 0, 0, 1, $object);
$object_type = 'order_supplier';
$mesg = $langs->transnoentitiesnoconv("Hello").",\n\n";
$mesg .= $langs->transnoentitiesnoconv("EMailTextOrderApprovedBy", $link, $user->getFullName($langs));
$mesg .= $langs->transnoentitiesnoconv("EMailTextSupplierOrderApprovedBy", $link, $user->getFullName($langs));
$mesg .= "\n\n".$langs->transnoentitiesnoconv("Sincerely").".\n\n";
break;
case 'ORDER_SUPPLIER_SUBMIT':
Expand All @@ -865,7 +865,7 @@ public function send($notifcode, $object, $filename_list = array(), $mimetype_li
$dir_output = $conf->fournisseur->dir_output.'/commande/';
$object_type = 'order_supplier';
$mesg = $langs->transnoentitiesnoconv("Hello").",\n\n";
$mesg .= $langs->transnoentitiesnoconv("EMailTextOrderRefusedBy", $link, $user->getFullName($langs));
$mesg .= $langs->transnoentitiesnoconv("EMailTextSupplierOrderRefusedBy", $link, $user->getFullName($langs));
$mesg .= "\n\n".$langs->transnoentitiesnoconv("Sincerely").".\n\n";
break;
case 'SHIPPING_VALIDATE':
Expand Down
2 changes: 1 addition & 1 deletion htdocs/langs/en_US/other.lang
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ EMailTextProposalClosedRefusedWeb=Proposal %s has been closed refuse on portal p
EMailTextOrderValidated=Order %s has been validated.
EMailTextOrderClose=Order %s has been delivered.
EMailTextSupplierOrderApprovedBy=Purchase order %s has been approved by %s.
EMailTextSuppliertOrderValidatedBy=Purchase order %s has been recorded by %s.
EMailTextSupplierOrderValidatedBy=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.
Expand Down

0 comments on commit f9a09bf

Please sign in to comment.