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

Fix: Can remove trip note

Browse Source
This commit is contained in:
Laurent Destailleur 2009-10-15 13:39:40 +00:00
parent 32746494e3
commit 755ed47c2f
2 changed files with 39 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
htdocs/compta/deplacement/fiche.php
View File

@ -50,9 +50,16 @@ $mesg = '';
if ($_POST["action"] == 'confirm_delete' && $_POST["confirm"] == "yes" && $user->rights->deplacement->supprimer) if ($_POST["action"] == 'confirm_delete' && $_POST["confirm"] == "yes" && $user->rights->deplacement->supprimer)
{ {
$deplacement = new Deplacement($db); $deplacement = new Deplacement($db);
$deplacement->delete($_GET["id"]); $result=$deplacement->delete($_GET["id"]);
Header("Location: index.php"); if ($result >= 0)
exit; {
Header("Location: index.php");
exit;
}
else
{
$mesg=$deplacement->error;
}
} }
if ($_POST["action"] == 'add' && $user->rights->deplacement->creer) if ($_POST["action"] == 'add' && $user->rights->deplacement->creer)
@ -307,8 +314,22 @@ print '<div class="tabsAction">';
if ($_GET["action"] != 'create' && $_GET["action"] != 'edit') if ($_GET["action"] != 'create' && $_GET["action"] != 'edit')
{ {
print '<a class="butAction" href="fiche.php?action=edit&id='.$id.'">'.$langs->trans('Modify').'</a>'; if ($user->rights->deplacement->creer)
print '<a class="butActionDelete" href="fiche.php?action=delete&id='.$id.'">'.$langs->trans('Delete').'</a>'; {
print '<a class="butAction" href="fiche.php?action=edit&id='.$id.'">'.$langs->trans('Modify').'</a>';
}
else
{
print '<a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'.$langs->trans('Modify').'</a>';
}
if ($user->rights->deplacement->supprimer)
{
print '<a class="butActionDelete" href="fiche.php?action=delete&id='.$id.'">'.$langs->trans('Delete').'</a>';
}
else
{
print '<a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'.$langs->trans('Delete').'</a>';
}
} }
print '</div>'; print '</div>';

28
htdocs/includes/modules/modDeplacement.class.php
View File

@ -18,25 +18,23 @@
*/ */
/** /**
\defgroup deplacement Module trips * \defgroup deplacement Module trips
\brief Module pour gerer les deplacements et notes de frais * \brief Module pour gerer les deplacements et notes de frais
\version $Id$ * \version $Id$
*/ */
/** /**
\file htdocs/includes/modules/modDeplacement.class.php * \file htdocs/includes/modules/modDeplacement.class.php
\ingroup deplacement * \ingroup deplacement
\brief Fichier de description et activation du module Deplacement et notes de frais * \brief Fichier de description et activation du module Deplacement et notes de frais
*/ */
include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php");
/** /**
\class modDeplacement * \class modDeplacement
\brief Classe de description et activation du module Deplacement * \brief Classe de description et activation du module Deplacement
*/ */
class modDeplacement extends DolibarrModules class modDeplacement extends DolibarrModules
{ {
@ -102,11 +100,11 @@ class modDeplacement extends DolibarrModules
$this->rights[3][3] = 0; $this->rights[3][3] = 0;
$this->rights[3][4] = 'supprimer'; $this->rights[3][4] = 'supprimer';
$this->rights[3][0] = 178; $this->rights[4][0] = 178;
$this->rights[3][1] = 'Exporter les deplacements'; $this->rights[4][1] = 'Exporter les deplacements';
$this->rights[3][2] = 'd'; $this->rights[4][2] = 'd';
$this->rights[3][3] = 0; $this->rights[4][3] = 0;
$this->rights[3][4] = 'export'; $this->rights[4][4] = 'export';
// Exports // Exports
$r=0; $r=0;