lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2021-06-04 10:30:02 +02:00
commit 2069eeceda
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
View File

@ -544,13 +544,18 @@ class InterfaceActionsAuto extends DolibarrTriggers
$object->sendtoid = 0;
} elseif ($action == 'ORDER_SUPPLIER_REFUSE') {
// Load translation files required by the page
$langs->loadLangs(array("agenda", "other", "orders"));
$langs->loadLangs(array("agenda", "other", "orders", "main"));
if (empty($object->actionmsg2)) {
$object->actionmsg2 = $langs->transnoentities("OrderRefusedInDolibarr", $object->ref);
}
$object->actionmsg = $langs->transnoentities("OrderRefusedInDolibarr", $object->ref);
if (!empty($object->refuse_note)) {
$object->actionmsg .= '<br>';
$object->actionmsg .= $langs->trans("Reason") . ': '.$object->refuse_note;
}
$object->sendtoid = 0;
} elseif ($action == 'ORDER_SUPPLIER_SUBMIT') {
// Load translation files required by the page

14
htdocs/fourn/commande/card.php
View File

@ -960,6 +960,9 @@ if (empty($reshook)) {
}
if ($action == 'confirm_refuse' && $confirm == 'yes' && $usercanapprove) {
if (GETPOST('refuse_note')) {
$object->refuse_note = GETPOST('refuse_note');
}
$result = $object->refuse($user);
if ($result > 0) {
header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id);
@ -1875,7 +1878,16 @@ if ($action == 'create') {
// Confirmation de la desapprobation
if ($action == 'refuse') {
$formconfirm = $form->formconfirm($_SERVER['PHP_SELF']."?id=$object->id", $langs->trans("DenyingThisOrder"), $langs->trans("ConfirmDenyingThisOrder", $object->ref), "confirm_refuse", '', 0, 1);
$formquestion = array(
array(
'type' => 'text',
'name' => 'refuse_note',
'label' => $langs->trans("MotifCP"),
'value' => '',
'morecss' => 'minwidth300'
)
);
$formconfirm = $form->formconfirm($_SERVER['PHP_SELF']."?id=$object->id", $langs->trans("DenyingThisOrder"), $langs->trans("ConfirmDenyingThisOrder", $object->ref), "confirm_refuse", $formquestion, 0, 1);
}
// Confirmation de l'annulation