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

Merge pull request #14286 from RomainDeschamps/patch-1

Browse Source 
second approval back in stable feature as is the setting for minimum …
This commit is contained in:
Laurent Destailleur 2020-07-29 13:38:58 +02:00 committed by GitHub
commit 9e85abc8c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2315,7 +2315,7 @@ if ($action == 'create')
{ {
if ($usercanapprove) if ($usercanapprove)
{ {
if (!empty($conf->global->SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED) && $conf->global->MAIN_FEATURES_LEVEL > 0 && $object->total_ht >= $conf->global->SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED && !empty($object->user_approve_id)) if (!empty($conf->global->SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED) && $object->total_ht >= $conf->global->SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED && !empty($object->user_approve_id))
{ {
print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("FirstApprovalAlreadyDone")).'">'.$langs->trans("ApproveOrder").'</a>'; print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("FirstApprovalAlreadyDone")).'">'.$langs->trans("ApproveOrder").'</a>';
} else { } else {
@ -2327,7 +2327,7 @@ if ($action == 'create')
} }
// Second approval (if option SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED is set) // Second approval (if option SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED is set)
if (!empty($conf->global->SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED) && $conf->global->MAIN_FEATURES_LEVEL > 0 && $object->total_ht >= $conf->global->SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED) if (!empty($conf->global->SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED) && $object->total_ht >= $conf->global->SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED)
{ {
if ($object->statut == CommandeFournisseur::STATUS_VALIDATED) if ($object->statut == CommandeFournisseur::STATUS_VALIDATED)
{ {