rename action from makeorder to createorder
This commit is contained in:
parent
28c625dc6b
commit
a52e7b1a57
@ -8,9 +8,10 @@
|
||||
* Copyright (C) 2012-2016 Marcos García <marcosgdf@gmail.com>
|
||||
* Copyright (C) 2013 Florian Henry <florian.henry@open-concept.pro>
|
||||
* Copyright (C) 2014 Ion Agorria <ion@agorria.com>
|
||||
* Copyright (C) 2018-2019 Frédéric France <frederic.france@netlogic.fr>
|
||||
* Copyright (C) 2022 Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
|
||||
* Copyright (C) 2022 Charlene Benke <charlene@patas-monkey.com>
|
||||
* Copyright (C) 2018-2019 Frédéric France <frederic.france@netlogic.fr>
|
||||
* Copyright (C) 2022 Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
|
||||
* Copyright (C) 2022 Charlene Benke <charlene@patas-monkey.com>
|
||||
* Copyright (C) 2023 Joachim Kueter <git-jk@bloxera.com>
|
||||
*
|
||||
* 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
|
||||
@ -1047,7 +1048,7 @@ if (empty($reshook)) {
|
||||
$action = '';
|
||||
} elseif ($methodecommande <= 0) {
|
||||
setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("OrderMode")), null, 'errors');
|
||||
$action = 'makeorder';
|
||||
$action = 'createorder';
|
||||
}
|
||||
}
|
||||
|
||||
@ -2437,7 +2438,7 @@ if ($action == 'create') {
|
||||
*/
|
||||
|
||||
if ($user->socid == 0 && $action != 'delete') {
|
||||
if ($action != 'makeorder' && $action != 'presend' && $action != 'editline') {
|
||||
if ($action != 'createorder' && $action != 'presend' && $action != 'editline') {
|
||||
print '<div class="tabsAction">';
|
||||
|
||||
$parameters = array();
|
||||
@ -2568,7 +2569,7 @@ if ($action == 'create') {
|
||||
|
||||
if ($object->statut == CommandeFournisseur::STATUS_ACCEPTED) {
|
||||
if ($usercanorder) {
|
||||
print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=makeorder#makeorder">'.$langs->trans("MakeOrder").'</a></div>';
|
||||
print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=createorder#makeorder">'.$langs->trans("MakeOrder").'</a></div>';
|
||||
} else {
|
||||
print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">'.$langs->trans("MakeOrder").'</a></div>';
|
||||
}
|
||||
@ -2636,7 +2637,7 @@ if ($action == 'create') {
|
||||
print "</div>";
|
||||
}
|
||||
|
||||
if ($usercanorder && $object->statut == CommandeFournisseur::STATUS_ACCEPTED && $action == 'makeorder') {
|
||||
if ($usercanorder && $object->statut == CommandeFournisseur::STATUS_ACCEPTED && $action == 'createorder') {
|
||||
// Set status to ordered (action=commande)
|
||||
print '<!-- form to record supplier order -->'."\n";
|
||||
print '<form name="commande" id="makeorder" action="card.php?id='.$object->id.'&action=commande" method="POST">';
|
||||
@ -2677,7 +2678,7 @@ if ($action == 'create') {
|
||||
$action = 'presend';
|
||||
}
|
||||
|
||||
if ($action != 'makeorder' && $action != 'presend' ) {
|
||||
if ($action != 'createorder' && $action != 'presend' ) {
|
||||
print '<div class="fichecenter"><div class="fichehalfleft">';
|
||||
|
||||
// Generated documents
|
||||
|
||||
Loading…
Reference in New Issue
Block a user