Merge pull request #3427 from fappels/3.8-fix-delivery-validate

Fix missing delivery validation button
This commit is contained in:
Laurent Destailleur 2015-08-31 00:51:17 +02:00
commit 04d8bf7a1a

View File

@ -744,9 +744,13 @@ else
{ {
print '<div class="tabsAction">'; print '<div class="tabsAction">';
if ($object->statut == 0 && $user->rights->expedition->livraison->valider && $num_prod > 0) if ($object->statut == 0 && $num_prod > 0)
{ {
print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=valid">'.$langs->trans("Validate").'</a>'; if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->expedition->livraison->creer))
|| (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->expedition->livraison_advance->validate)))
{
print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=valid">'.$langs->trans("Validate").'</a>';
}
} }
if ($user->rights->expedition->livraison->supprimer) if ($user->rights->expedition->livraison->supprimer)