diff --git a/htdocs/core/modules/modFicheinter.class.php b/htdocs/core/modules/modFicheinter.class.php index 4578a3e60a9..c8929a67a8d 100644 --- a/htdocs/core/modules/modFicheinter.class.php +++ b/htdocs/core/modules/modFicheinter.class.php @@ -131,6 +131,22 @@ class modFicheinter extends DolibarrModules $this->rights[$r][4] = 'ficheinter_advance'; // Visible if option MAIN_USE_ADVANCED_PERMS is on $this->rights[$r][5] = 'send'; + $r++; + $this->rights[$r][0] = 69; + $this->rights[$r][1] = 'Valider les fiches d\'intervention '; + $this->rights[$r][2] = 'a'; + $this->rights[$r][3] = 0; + $this->rights[$r][4] = 'ficheinter_advance'; // Visible if option MAIN_USE_ADVANCED_PERMS is on + $this->rights[$r][5] = 'validate'; + + $r++; + $this->rights[$r][0] = 70; + $this->rights[$r][1] = 'Dévalider les fiches d\'intervention'; + $this->rights[$r][2] = 'a'; + $this->rights[$r][3] = 0; + $this->rights[$r][4] = 'ficheinter_advance'; // Visible if option MAIN_USE_ADVANCED_PERMS is on + $this->rights[$r][5] = 'unvalidate'; + //Exports //-------- $r=1; diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php index 4ba91ba7e96..8d164adaa41 100644 --- a/htdocs/fichinter/card.php +++ b/htdocs/fichinter/card.php @@ -1660,17 +1660,17 @@ else if ($id > 0 || ! empty($ref)) { if ($user->societe_id == 0) { - if ($action != 'editdescription' && ($action != 'presend')) - { - // Validate - if ($object->statut == 0 && $user->rights->ficheinter->creer && (count($object->lines) > 0 || ! empty($conf->global->FICHINTER_DISABLE_DETAILS))) - { - print '
'; - } + if ($action != 'editdescription' && ($action != 'presend')) { + // Validate + if ($object->statut == 0 && (count($object->lines) > 0 || !empty($conf->global->FICHINTER_DISABLE_DETAILS))) { + if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->ficheinter->creer) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->ficheinter->ficheinter_advance->validate)) { + print ''; + } + } - // Modify - if ($object->statut == 1 && $user->rights->ficheinter->creer) + // Modify + if ($object->statut == 1 && ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->ficheinter->creer) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->ficheinter->ficheinter_advance->unvalidate))) { print '