From 73efdaca9a777c31e77dfea64f32d8445cd4b4d2 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Thu, 10 Jan 2008 20:46:38 +0000
Subject: [PATCH] =?UTF-8?q?Fix:=20correction=20droit=20sur=20onglet=20expe?=
=?UTF-8?q?dition=20Add:=20d=E9but=20ajout=20possibilit=E9=20de=20cr=E9er?=
=?UTF-8?q?=20un=20bon=20de=20livraison=20=E0=20partir=20d'une=20propale?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
htdocs/lib/order.lib.php | 3 ++-
htdocs/lib/propal.lib.php | 12 ++++++++++++
2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/htdocs/lib/order.lib.php b/htdocs/lib/order.lib.php
index fab6abfbf06..44aa83f3f61 100644
--- a/htdocs/lib/order.lib.php
+++ b/htdocs/lib/order.lib.php
@@ -47,7 +47,8 @@ function commande_prepare_head($commande)
$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;
if ($conf->expedition->enabled) $text=$langs->trans("Sendings");
diff --git a/htdocs/lib/propal.lib.php b/htdocs/lib/propal.lib.php
index 9503bb3cb26..86e343a6204 100644
--- a/htdocs/lib/propal.lib.php
+++ b/htdocs/lib/propal.lib.php
@@ -42,6 +42,18 @@ function propal_prepare_head($propal)
$head[$h][1] = $langs->trans('CommercialCard');
$head[$h][2] = 'comm';
$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][1] = $langs->trans('AccountancyCard');
--
GitLab