diff --git a/htdocs/compta/deplacement/fiche.php b/htdocs/compta/deplacement/fiche.php index 14439e428eb..97bffd24d1f 100644 --- a/htdocs/compta/deplacement/fiche.php +++ b/htdocs/compta/deplacement/fiche.php @@ -50,9 +50,16 @@ $mesg = ''; if ($_POST["action"] == 'confirm_delete' && $_POST["confirm"] == "yes" && $user->rights->deplacement->supprimer) { $deplacement = new Deplacement($db); - $deplacement->delete($_GET["id"]); - Header("Location: index.php"); - exit; + $result=$deplacement->delete($_GET["id"]); + if ($result >= 0) + { + Header("Location: index.php"); + exit; + } + else + { + $mesg=$deplacement->error; + } } if ($_POST["action"] == 'add' && $user->rights->deplacement->creer) @@ -307,8 +314,22 @@ print '
'; if ($_GET["action"] != 'create' && $_GET["action"] != 'edit') { - print ''.$langs->trans('Modify').''; - print ''.$langs->trans('Delete').''; + if ($user->rights->deplacement->creer) + { + print ''.$langs->trans('Modify').''; + } + else + { + print ''.$langs->trans('Modify').''; + } + if ($user->rights->deplacement->supprimer) + { + print ''.$langs->trans('Delete').''; + } + else + { + print ''.$langs->trans('Delete').''; + } } print '
'; diff --git a/htdocs/includes/modules/modDeplacement.class.php b/htdocs/includes/modules/modDeplacement.class.php index 8071e0ff030..cac248119a5 100644 --- a/htdocs/includes/modules/modDeplacement.class.php +++ b/htdocs/includes/modules/modDeplacement.class.php @@ -18,25 +18,23 @@ */ /** - \defgroup deplacement Module trips - \brief Module pour gerer les deplacements et notes de frais - \version $Id$ + * \defgroup deplacement Module trips + * \brief Module pour gerer les deplacements et notes de frais + * \version $Id$ */ /** - \file htdocs/includes/modules/modDeplacement.class.php - \ingroup deplacement - \brief Fichier de description et activation du module Deplacement et notes de frais + * \file htdocs/includes/modules/modDeplacement.class.php + * \ingroup deplacement + * \brief Fichier de description et activation du module Deplacement et notes de frais */ - include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); /** - \class modDeplacement - \brief Classe de description et activation du module Deplacement + * \class modDeplacement + * \brief Classe de description et activation du module Deplacement */ - class modDeplacement extends DolibarrModules { @@ -102,11 +100,11 @@ class modDeplacement extends DolibarrModules $this->rights[3][3] = 0; $this->rights[3][4] = 'supprimer'; - $this->rights[3][0] = 178; - $this->rights[3][1] = 'Exporter les deplacements'; - $this->rights[3][2] = 'd'; - $this->rights[3][3] = 0; - $this->rights[3][4] = 'export'; + $this->rights[4][0] = 178; + $this->rights[4][1] = 'Exporter les deplacements'; + $this->rights[4][2] = 'd'; + $this->rights[4][3] = 0; + $this->rights[4][4] = 'export'; // Exports $r=0;