From a70e73a963be33d0100b01bce011e44b17f5e7be Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 23 Sep 2015 01:08:23 +0200 Subject: [PATCH] FIX Missing validate button if permission are not valid. --- htdocs/comm/propal.php | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index 504e5adb0b2..31603acc5a1 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -2164,18 +2164,20 @@ if ($action == 'create') if ($action != 'statut' && $action != 'editline') { // Validate - if ($object->statut == Propal::STATUS_DRAFT && $object->total_ttc >= 0 && count($object->lines) > 0 && - ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->propal->creer)) + if ($object->statut == Propal::STATUS_DRAFT && $object->total_ttc >= 0 && count($object->lines) > 0) + { + if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->propal->creer)) || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->propal->propal_advance->validate))) - ) { - if (count($object->lines) > 0) + { print '
' . $langs->trans('Validate') . '
'; - // else print ''.$langs->trans('Validate').''; + } + else + print '
' . $langs->trans('Validate') . '
'; } // Create event if ($conf->agenda->enabled && ! empty($conf->global->MAIN_ADD_EVENT_ON_ELEMENT_CARD)) // Add hidden condition because this is not a "workflow" action so should appears somewhere else on page. { - print '' . $langs->trans("AddAction") . ''; + print '
' . $langs->trans("AddAction") . '
'; } // Edit if ($object->statut == Propal::STATUS_VALIDATED && $user->rights->propal->creer) {