From dec9f95d7db5ec1c86eb8f740816d1df0b9d95e5 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Fri, 10 Mar 2006 16:08:22 +0000
Subject: [PATCH] =?UTF-8?q?Ajout=20de=20la=20permission=20"consulter=20tou?=
 =?UTF-8?q?s=20les=20clients"=20dans=20le=20module=20commercial,=20afin=20?=
 =?UTF-8?q?=20qu'un=20commercial=20puisse=20voir=20que=20les=20clients=20q?=
 =?UTF-8?q?ui=20lui=20sont=20affect=E9s.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/projet/activity/myactivity.php | 8 ++++++--
 htdocs/projet/commandes.php           | 4 ++++
 htdocs/projet/facture.php             | 4 ++++
 htdocs/projet/propal.php              | 4 ++++
 4 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/htdocs/projet/activity/myactivity.php b/htdocs/projet/activity/myactivity.php
index 2d76f39e197..75861b4d74f 100644
--- a/htdocs/projet/activity/myactivity.php
+++ b/htdocs/projet/activity/myactivity.php
@@ -63,9 +63,12 @@ print '<td align="center">'.$langs->trans("NbOpenTasks").'</td>';
 print "</tr>\n";
 
 $sql = "SELECT p.title, p.rowid, count(t.rowid)";
+if (!$user->rights->commercial->client->voir && !$socidp) $sql .= ", sc.fk_soc, sc.fk_user";
 $sql .= " FROM ".MAIN_DB_PREFIX."projet as p";
 $sql .= " , ".MAIN_DB_PREFIX."projet_task as t";
+if (!$user->rights->commercial->client->voir && !$socidp) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 $sql .= " WHERE t.fk_projet = p.rowid";
+if (!$user->rights->commercial->client->voir && !$socidp) $sql .= " AND p.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
 
 $sql .= " GROUP BY p.rowid";
 
@@ -96,7 +99,7 @@ else
 }
 print "</table>";
 
-/* Affichage de la liste des projets de la semaine */
+/* Affichage de la liste des projets d'aujourd'hui */
 print '<br /><table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
 print '<td width="50%">'.$langs->trans('Today').'</td>';
@@ -140,6 +143,7 @@ print '<td align="center">'.$total.'</td>';
 print "</tr>\n";    
 print "</table>";
 
+/* Affichage de la liste des projets d'hier */
 print '<br /><table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
 print '<td width="50%">'.$langs->trans('Yesterday').'</td>';
@@ -265,7 +269,7 @@ else
 }
 print "</table>";
 
-/* Affichage de la liste des projets du mois */
+/* Affichage de la liste des projets de l'année */
 print '<br /><table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
 print '<td width="50%">'.$langs->trans("Project").' cette année : '.strftime("%Y", $now).'</td>';
diff --git a/htdocs/projet/commandes.php b/htdocs/projet/commandes.php
index e716aaebcdc..f21597ce7bb 100644
--- a/htdocs/projet/commandes.php
+++ b/htdocs/projet/commandes.php
@@ -47,6 +47,10 @@ $head[$h][0] = DOL_URL_ROOT.'/projet/fiche.php?id='.$projet->id;
 $head[$h][1] = $langs->trans("Project");
 $h++;
 
+$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/fiche.php?id='.$projet->id;
+$head[$h][1] = $langs->trans("Tasks");
+$h++;
+
 if ($conf->propal->enabled) {
   $langs->load("propal");
   $head[$h][0] = DOL_URL_ROOT.'/projet/propal.php?id='.$projet->id;
diff --git a/htdocs/projet/facture.php b/htdocs/projet/facture.php
index 998caf93d4c..d23a17f95f2 100644
--- a/htdocs/projet/facture.php
+++ b/htdocs/projet/facture.php
@@ -52,6 +52,10 @@ $head[$h][0] = DOL_URL_ROOT.'/projet/fiche.php?id='.$projet->id;
 $head[$h][1] = $langs->trans("Project");
 $h++;
 
+$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/fiche.php?id='.$projet->id;
+$head[$h][1] = $langs->trans("Tasks");
+$h++;
+
 if ($conf->propal->enabled) {
   $langs->load("propal");
   $head[$h][0] = DOL_URL_ROOT.'/projet/propal.php?id='.$projet->id;
diff --git a/htdocs/projet/propal.php b/htdocs/projet/propal.php
index d493140f448..f4d03b3013a 100644
--- a/htdocs/projet/propal.php
+++ b/htdocs/projet/propal.php
@@ -48,6 +48,10 @@ $head[$h][0] = DOL_URL_ROOT.'/projet/fiche.php?id='.$projet->id;
 $head[$h][1] = $langs->trans("Project");
 $h++;
 
+$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/fiche.php?id='.$projet->id;
+$head[$h][1] = $langs->trans("Tasks");
+$h++;
+
 if ($conf->propal->enabled) {
   $langs->load("propal");
   $head[$h][0] = DOL_URL_ROOT.'/projet/propal.php?id='.$projet->id;