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

Fix: correction droit sur onglet expedition

Browse Source 
Add: dbut ajout possibilit de crer un bon de livraison  partir d'une propale
This commit is contained in:
Regis Houssin 2008-01-10 20:46:38 +00:00
parent 710096cb45
commit 73efdaca9a
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/lib/order.lib.php
View File

@ -47,7 +47,8 @@ function commande_prepare_head($commande)
$h++; $h++;
} }
if (($conf->expedition->enabled || $conf->livraison->enabled) && $user->rights->expedition->lire) if (($conf->expedition->enabled && $user->rights->expedition->lire)
|| ($conf->livraison->enabled && $user->rights->expedition->livraison->lire))
{ {
$head[$h][0] = DOL_URL_ROOT.'/expedition/commande.php?id='.$commande->id; $head[$h][0] = DOL_URL_ROOT.'/expedition/commande.php?id='.$commande->id;
if ($conf->expedition->enabled) $text=$langs->trans("Sendings"); if ($conf->expedition->enabled) $text=$langs->trans("Sendings");

12
htdocs/lib/propal.lib.php
View File

@ -43,6 +43,18 @@ function propal_prepare_head($propal)
$head[$h][2] = 'comm'; $head[$h][2] = 'comm';
$h++; $h++;
if (!$conf->commande->enabled && (($conf->expedition->enabled && $user->rights->expedition->lire)
|| ($conf->livraison->enabled && $user->rights->expedition->livraison->lire)))
{
$langs->load("sendings");
$head[$h][0] = DOL_URL_ROOT.'/expedition/propal.php?id='.$propal->id;
if ($conf->expedition->enabled) $text=$langs->trans("Sendings");
if ($conf->livraison->enabled) $text.='/'.$langs->trans("Receivings");
$head[$h][1] = $text;
$head[$h][2] = 'shipping';
$h++;
}
$head[$h][0] = DOL_URL_ROOT.'/compta/propal.php?propalid='.$propal->id; $head[$h][0] = DOL_URL_ROOT.'/compta/propal.php?propalid='.$propal->id;
$head[$h][1] = $langs->trans('AccountancyCard'); $head[$h][1] = $langs->trans('AccountancyCard');
$head[$h][2] = 'compta'; $head[$h][2] = 'compta';