From a485c8660eac44d1ad24e27c1f335e929c918bf7 Mon Sep 17 00:00:00 2001 From: William Mead Date: Mon, 29 Jan 2024 09:56:38 +0100 Subject: [PATCH 1/4] Added supplier order submit method to message. Added contributor details. --- .../core/triggers/interface_50_modAgenda_ActionsAuto.class.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php index c129095017f07..fee7005e90689 100644 --- a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php +++ b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php @@ -8,6 +8,7 @@ * Copyright (C) 2022 Ferran Marcet * Copyright (C) 2023 William Mead * Copyright (C) 2023 Christian Foellmann + * Copyright (C) 2024 William Mead * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -853,7 +854,7 @@ public function runTrigger($action, $object, User $user, Translate $langs, Conf if (empty($object->actionmsg2)) { if (empty($object->context['actionmsg2'])) { - $object->actionmsg2 = $langs->transnoentities("SupplierOrderSubmitedInDolibarr", ($object->newref ? $object->newref : $object->ref)); + $object->actionmsg2 = $langs->transnoentities("SupplierOrderSubmitedInDolibarr", ($object->newref ?: $object->ref), ($object->getInputMethod())); } else { $object->actionmsg2 = $object->context['actionmsg2']; } From 8047174b2e03c491837da549b1fcf4a669c3c83d Mon Sep 17 00:00:00 2001 From: William Mead Date: Mon, 29 Jan 2024 09:57:15 +0100 Subject: [PATCH 2/4] Updated localization with supplier order submit method --- htdocs/langs/en_US/orders.lang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/langs/en_US/orders.lang b/htdocs/langs/en_US/orders.lang index 662348b697774..8d8690ba29b0f 100644 --- a/htdocs/langs/en_US/orders.lang +++ b/htdocs/langs/en_US/orders.lang @@ -130,7 +130,7 @@ DispatchSupplierOrder=Receiving purchase order %s FirstApprovalAlreadyDone=First approval already done SecondApprovalAlreadyDone=Second approval already done SupplierOrderReceivedInDolibarr=Purchase Order %s received %s -SupplierOrderSubmitedInDolibarr=Purchase Order %s submitted +SupplierOrderSubmitedInDolibarr=Purchase Order %s submitted by %s SupplierOrderClassifiedBilled=Purchase Order %s set billed OtherOrders=Other orders SupplierOrderValidatedAndApproved=Supplier order is validated and approved : %s From a832e3bc9302df820e5f537753e6bf4139449d50 Mon Sep 17 00:00:00 2001 From: William Mead Date: Wed, 31 Jan 2024 14:08:01 +0100 Subject: [PATCH 3/4] Adjusted order method presentation --- htdocs/langs/en_US/orders.lang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/langs/en_US/orders.lang b/htdocs/langs/en_US/orders.lang index 8d8690ba29b0f..acee379edad55 100644 --- a/htdocs/langs/en_US/orders.lang +++ b/htdocs/langs/en_US/orders.lang @@ -130,7 +130,7 @@ DispatchSupplierOrder=Receiving purchase order %s FirstApprovalAlreadyDone=First approval already done SecondApprovalAlreadyDone=Second approval already done SupplierOrderReceivedInDolibarr=Purchase Order %s received %s -SupplierOrderSubmitedInDolibarr=Purchase Order %s submitted by %s +SupplierOrderSubmitedInDolibarr=Purchase Order %s submitted (%s) SupplierOrderClassifiedBilled=Purchase Order %s set billed OtherOrders=Other orders SupplierOrderValidatedAndApproved=Supplier order is validated and approved : %s From 7d74352c32c52d0bb941a24b7fd73e3ca4d597e4 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 3 Feb 2024 14:50:30 +0100 Subject: [PATCH 4/4] Update interface_50_modAgenda_ActionsAuto.class.php --- .../core/triggers/interface_50_modAgenda_ActionsAuto.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php index fee7005e90689..40c192a92d6a6 100644 --- a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php +++ b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php @@ -854,7 +854,7 @@ public function runTrigger($action, $object, User $user, Translate $langs, Conf if (empty($object->actionmsg2)) { if (empty($object->context['actionmsg2'])) { - $object->actionmsg2 = $langs->transnoentities("SupplierOrderSubmitedInDolibarr", ($object->newref ?: $object->ref), ($object->getInputMethod())); + $object->actionmsg2 = $langs->transnoentities("SupplierOrderSubmitedInDolibarr", ($object->newref ?: $object->ref), $object->getInputMethod()); } else { $object->actionmsg2 = $object->context['actionmsg2']; }