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

ajout de droits sur les commandes clients

Browse Source
This commit is contained in:
Regis Houssin 2006-04-29 14:21:20 +00:00
parent 7bbd16724e
commit 9a1702065a
4 changed files with 35 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/commande/fiche.php
View File

@ -1099,7 +1099,7 @@ else
if ($commande->statut == 1 || $commande->statut == 2) if ($commande->statut == 1 || $commande->statut == 2)
{ {
if ($user->rights->commande->creer) if ($user->rights->commande->cloturer)
{ {
print '<a class="butAction" href="fiche.php?id='.$id.'&amp;action=cloture">'.$langs->trans('Close').'</a>'; print '<a class="butAction" href="fiche.php?id='.$id.'&amp;action=cloture">'.$langs->trans('Close').'</a>';
} }
@ -1108,7 +1108,7 @@ else
if ($commande->statut == 1) if ($commande->statut == 1)
{ {
$nb_expedition = $commande->nb_expedition(); $nb_expedition = $commande->nb_expedition();
if ($user->rights->commande->valider && $nb_expedition == 0) if ($user->rights->commande->annuler && $nb_expedition == 0)
{ {
print '<a class="butActionDelete" href="fiche.php?id='.$id.'&amp;action=annuler">'.$langs->trans('CancelOrder').'</a>'; print '<a class="butActionDelete" href="fiche.php?id='.$id.'&amp;action=annuler">'.$langs->trans('CancelOrder').'</a>';
} }

32
htdocs/includes/modules/modCommande.class.php
View File

@ -101,28 +101,46 @@ class modCommande extends DolibarrModules
$this->rights_class = 'commande'; $this->rights_class = 'commande';
$this->rights[1][0] = 81; $this->rights[1][0] = 81;
$this->rights[1][1] = 'Lire les commandes'; $this->rights[1][1] = 'Lire les commandes clients';
$this->rights[1][2] = 'r'; $this->rights[1][2] = 'r';
$this->rights[1][3] = 1; $this->rights[1][3] = 1;
$this->rights[1][4] = 'lire'; $this->rights[1][4] = 'lire';
$this->rights[2][0] = 82; $this->rights[2][0] = 82;
$this->rights[2][1] = 'Créer modifier les commandes'; $this->rights[2][1] = 'Créer modifier les commandes clients';
$this->rights[2][2] = 'w'; $this->rights[2][2] = 'w';
$this->rights[2][3] = 0; $this->rights[2][3] = 0;
$this->rights[2][4] = 'creer'; $this->rights[2][4] = 'creer';
$this->rights[3][0] = 84; $this->rights[3][0] = 84;
$this->rights[3][1] = 'Valider les commandes'; $this->rights[3][1] = 'Valider les commandes clients';
$this->rights[3][2] = 'd'; $this->rights[3][2] = 'd';
$this->rights[3][3] = 0; $this->rights[3][3] = 0;
$this->rights[3][4] = 'valider'; $this->rights[3][4] = 'valider';
$this->rights[4][0] = 89; $this->rights[4][0] = 86;
$this->rights[4][1] = 'Supprimer les commandes'; $this->rights[4][1] = 'Envoyer les commandes clients';
$this->rights[4][2] = 'd'; $this->rights[4][2] = 'd';
$this->rights[4][3] = 0; $this->rights[4][3] = 0;
$this->rights[4][4] = 'supprimer'; $this->rights[4][4] = 'envoyer';
$this->rights[5][0] = 87;
$this->rights[5][1] = 'Clôturer les commandes clients';
$this->rights[5][2] = 'd';
$this->rights[5][3] = 0;
$this->rights[5][4] = 'cloturer';
$this->rights[6][0] = 88;
$this->rights[6][1] = 'Annuler les commandes clients';
$this->rights[6][2] = 'd';
$this->rights[6][3] = 0;
$this->rights[6][4] = 'annuler';
$this->rights[7][0] = 89;
$this->rights[7][1] = 'Supprimer les commandes clients';
$this->rights[7][2] = 'd';
$this->rights[7][3] = 0;
$this->rights[7][4] = 'supprimer';
} }

5
htdocs/langs/en_US/admin.lang
View File

@ -168,7 +168,10 @@ Permission79=Create/modify subscriptions
Permission81=Read customers orders Permission81=Read customers orders
Permission82=Create/modify customers orders Permission82=Create/modify customers orders
Permission84=Validate customers orders Permission84=Validate customers orders
Permission89=Cancel customers orders Permission86=Send customers orders
Permission87=Close customers orders
Permission88=Cancel customers orders
Permission89=Delete customers orders
Permission91=Read charges and vat Permission91=Read charges and vat
Permission92=Create/modify charges and vat Permission92=Create/modify charges and vat
Permission93=Delete charges and vat Permission93=Delete charges and vat

5
htdocs/langs/fr_FR/admin.lang
View File

@ -168,7 +168,10 @@ Permission79=Cr
Permission81=Consulter les commandes clients Permission81=Consulter les commandes clients
Permission82=Créer/modifier les commandes clients Permission82=Créer/modifier les commandes clients
Permission84=Valider les commandes clients Permission84=Valider les commandes clients
Permission89=Annuler les commandes clients Permission86=Envoyer les commandes clients
Permission87=Clôturer les commandes clients
Permission88=Annuler les commandes clients
Permission89=Supprimer les commandes clients
Permission91=Consulter les charges et la TVA Permission91=Consulter les charges et la TVA
Permission92=Créer/modifier les charges et la TVA Permission92=Créer/modifier les charges et la TVA
Permission93=Supprimer les charges et la TVA Permission93=Supprimer les charges et la TVA