Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

NEW supplier order submit method message #27855

Merged
merged 6 commits into from
Feb 3, 2024
Merged

NEW supplier order submit method message #27855

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a485c86
Added supplier order submit method to message. Added contributor deta…
W1W1-M Jan 29, 2024
8047174
Updated localization with supplier order submit method
W1W1-M Jan 29, 2024
d772888
Merge branch 'develop' into new-supplier-order-submit-method-message
W1W1-M Jan 29, 2024
fd44cb7
Merge branch 'develop' into new-supplier-order-submit-method-message
W1W1-M Jan 31, 2024
a832e3b
Adjusted order method presentation
W1W1-M Jan 31, 2024
7d74352
Update interface_50_modAgenda_ActionsAuto.class.php
eldy Feb 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
* Copyright (C) 2022 Ferran Marcet <fmarcet@2byte.es>
* Copyright (C) 2023 William Mead <william.mead@manchenumerique.fr>
* Copyright (C) 2023 Christian Foellmann <christian@foellmann.de>
* Copyright (C) 2024 William Mead <william.mead@manchenumerique.fr>
*
* 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
Expand Down Expand Up @@ -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()));
W1W1-M marked this conversation as resolved.
Show resolved Hide resolved
} else {
$object->actionmsg2 = $object->context['actionmsg2'];
}
Expand Down
2 changes: 1 addition & 1 deletion htdocs/langs/en_US/orders.lang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (%s)
SupplierOrderClassifiedBilled=Purchase Order %s set billed
OtherOrders=Other orders
SupplierOrderValidatedAndApproved=Supplier order is validated and approved : %s
Expand Down
Loading