From 4ac61b7459b9d9085d44566cb7c017f2d7cf0da8 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Tue, 2 Feb 2010 11:09:13 +0000
Subject: [PATCH] Works on enhancement of project tasks

---
 .../multicompany/templates/admin-entity.tpl   |  4 ++-
 htdocs/projet/tasks/fiche.php                 | 28 +++++++++++++------
 2 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/htdocs/multicompany/templates/admin-entity.tpl b/htdocs/multicompany/templates/admin-entity.tpl
index b549d525e71..ce231150d76 100644
--- a/htdocs/multicompany/templates/admin-entity.tpl
+++ b/htdocs/multicompany/templates/admin-entity.tpl
@@ -22,8 +22,9 @@
 <table class="noborder" width="100%">
  <tr class="liste_titre">
 
-   <td>{$langs->trans('Name')}</td>
+   <td>{$langs->trans('Label')}</td>
    <td align="left">{$langs->trans('Description')}</td>
+   <td align="left">{$langs->trans('Name')}</td>
    <td align="left">{$langs->trans('Town')}</td>
    <td align="left">{$langs->trans('Country')}</td>
    <td align="left">{$langs->trans('Currency')}</td>
@@ -36,6 +37,7 @@
    <tr class="{cycle values="impair,pair"}">
       <td>{$entities[mc].label}</td>
       <td align="left">{$entities[mc].description}</td>
+      <td align="left">{$entities[mc].details.MAIN_INFO_SOCIETE_NOM}</td>
       <td align="left">{$entities[mc].details.MAIN_INFO_SOCIETE_VILLE}</td>
       <td align="left">{$entities[mc].details.MAIN_INFO_SOCIETE_PAYS}</td>
       <td align="left">{$entities[mc].details.MAIN_MONNAIE}</td>
diff --git a/htdocs/projet/tasks/fiche.php b/htdocs/projet/tasks/fiche.php
index 648d7c4b00b..ec9d2c14547 100644
--- a/htdocs/projet/tasks/fiche.php
+++ b/htdocs/projet/tasks/fiche.php
@@ -196,9 +196,24 @@ else
 	dol_fiche_head($head, $tab, $langs->trans("Project"),0,'project');
 
 	$param=($_REQUEST["mode"]=='mine'?'&mode=mine':'');
-
-	print '<form name="addtime" method="POST" action="'.$_SERVER['PHP_SELF'].'?id='.$project->id.'">';
-	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+	
+	// To verify role of users
+	$userAccess = 0;
+	foreach(array('internal','external') as $source)
+	{
+		$userRole = $project->liste_contact(4,$source);
+		$num=sizeof($userRole);
+		
+		$i = 0;
+		while ($i < $num)
+		{
+			if ($userRole[$i]['code'] == 'PROJECTLEADER' && $user->id == $userRole[$i]['id'])
+			{
+				$userAccess++;
+			}
+			$i++;
+		}
+	}
 
 	print '<table class="border" width="100%">';
 
@@ -246,10 +261,7 @@ else
 	print '<tr><td>'.$langs->trans("Status").'</td><td>'.$project->getLibStatut(4).'</td></tr>';
 
 	print '</table>';
-
-	print '<input type="hidden" name="action" value="addtime">';
-
-	print '</form>';
+	
 	print '</div>';
 
 	/*
@@ -259,7 +271,7 @@ else
 
 	if ($user->rights->projet->creer)
 	{
-		if (empty($project->user_resp_id) || $project->user_resp_id == -1 || $project->user_resp_id == $user->id)
+		if ($userAccess)
 		{
 			print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$project->id.'&action=create'.$param.'">'.$langs->trans('AddTask').'</a>';
 		}