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

Rename FORBID_EDIT_PROJECT_ON_SUPPLIER_ORDER into SUPPLIER_ORDER_FORBID_EDIT_PROJECT

Browse Source
This commit is contained in:
Vincent Dieltiens 2021-10-12 23:33:07 +02:00
parent 8370973a9d
commit 7f07d82d3f
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/admin/supplier_order.php
View File

@ -149,7 +149,7 @@ if ($action == 'updateMask') {
$res1 = dolibarr_set_const($db, "SUPPLIER_ORDER_FREE_TEXT", $freetext, 'chaine', 0, '', $conf->entity); $res1 = dolibarr_set_const($db, "SUPPLIER_ORDER_FREE_TEXT", $freetext, 'chaine', 0, '', $conf->entity);
$res2 = dolibarr_set_const($db, "SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED", $doubleapproval, 'chaine', 0, '', $conf->entity); $res2 = dolibarr_set_const($db, "SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED", $doubleapproval, 'chaine', 0, '', $conf->entity);
$res3 = dolibarr_set_const($db, "FORBID_EDIT_PROJECT_ON_SUPPLIER_ORDER", GETPOST('FORBID_EDIT_PROJECT_ON_SUPPLIER_ORDER', 'int'), 'chaine', 0, '', $conf->entity); $res3 = dolibarr_set_const($db, "SUPPLIER_ORDER_FORBID_EDIT_PROJECT", GETPOST('SUPPLIER_ORDER_FORBID_EDIT_PROJECT', 'int'), 'chaine', 0, '', $conf->entity);
// TODO We add/delete permission here until permission can have a condition on a global var // TODO We add/delete permission here until permission can have a condition on a global var
include_once DOL_DOCUMENT_ROOT.'/core/modules/modFournisseur.class.php'; include_once DOL_DOCUMENT_ROOT.'/core/modules/modFournisseur.class.php';
@ -536,7 +536,7 @@ print "</tr>\n";
// Option // Option
print '<tr class="oddeven">'; print '<tr class="oddeven">';
print '<td>'.$langs->trans("SupplierOrderForbidProjectChange").'</td>'; print '<td>'.$langs->trans("SupplierOrderForbidProjectChange").'</td>';
print '<td class="center">'.$form->selectyesno('FORBID_EDIT_PROJECT_ON_SUPPLIER_ORDER', $conf->global->FORBID_EDIT_PROJECT_ON_SUPPLIER_ORDER, 1).'</td>'; print '<td class="center">'.$form->selectyesno('SUPPLIER_ORDER_FORBID_EDIT_PROJECT', $conf->global->SUPPLIER_ORDER_FORBID_EDIT_PROJECT, 1).'</td>';
print '<td class="center">'; print '<td class="center">';
print '<input type="submit" class="button button-edit" value="'.$langs->trans("Modify").'">'; print '<input type="submit" class="button button-edit" value="'.$langs->trans("Modify").'">';
print '</td>'; print '</td>';

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

@ -146,7 +146,7 @@ $permissiontoadd = $usercancreate; // Used by the include of actions_addupdatede
// Project permission // Project permission
if (!empty($conf->projet->enabled)) { if (!empty($conf->projet->enabled)) {
$caneditproject = empty($conf->global->FORBID_EDIT_PROJECT_ON_SUPPLIER_ORDER) || ($object->statut == CommandeFournisseur::STATUS_DRAFT && preg_match('/^[\(]?PROV/i', $object->ref)); $caneditproject = empty($conf->global->SUPPLIER_ORDER_FORBID_EDIT_PROJECT) || ($object->statut == CommandeFournisseur::STATUS_DRAFT && preg_match('/^[\(]?PROV/i', $object->ref));
} }