From 0da1a64335e995738f0336e72b52a08951eb56b2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 4 Feb 2014 20:41:23 +0100
Subject: [PATCH] Fix: Missing vars and bar id.

---
 htdocs/core/tpl/contacts.tpl.php | 3 +++
 htdocs/projet/tasks/contact.php  | 5 +++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/tpl/contacts.tpl.php b/htdocs/core/tpl/contacts.tpl.php
index c2c2ef9a452..875b81cd05e 100644
--- a/htdocs/core/tpl/contacts.tpl.php
+++ b/htdocs/core/tpl/contacts.tpl.php
@@ -34,6 +34,9 @@ elseif ($module == 'fichinter')			{ $permission=$user->rights->ficheinter->creer
 elseif ($module == 'invoice_supplier')	{ $permission=$user->rights->fournisseur->facture->creer; }
 elseif ($module == 'order_supplier')	{ $permission=$user->rights->fournisseur->commande->creer; }
 elseif ($module == 'project')			{ $permission=$user->rights->projet->creer; }
+elseif ($module == 'action')			{ $permission=$user->rights->agenda->myactions->create; }
+elseif ($module == 'shipping')			{ $permission=$user->rights->expedition->creer; }
+elseif ($module == 'project_task')		{ $permission=$user->rights->projet->creer; }
 elseif (! isset($permission))			{ $permission=$user->rights->$module->creer; } // If already defined by caller page
 
 $formcompany= new FormCompany($db);
diff --git a/htdocs/projet/tasks/contact.php b/htdocs/projet/tasks/contact.php
index 80ddc0cd178..27559938626 100644
--- a/htdocs/projet/tasks/contact.php
+++ b/htdocs/projet/tasks/contact.php
@@ -283,7 +283,7 @@ if ($id > 0 || ! empty($ref))
 			print '<input type="hidden" name="action" value="addcontact">';
 			print '<input type="hidden" name="source" value="internal">';
 			print '<input type="hidden" name="id" value="'.$id.'">';
-			print '<input type="hidden" name="withproject" value="'.$withproject.'">';
+			if ($withproject) print '<input type="hidden" name="withproject" value="'.$withproject.'">';
 
 			// Ligne ajout pour contact interne
 			print "<tr ".$bc[$var].">";
@@ -299,7 +299,7 @@ if ($id > 0 || ! empty($ref))
 			print '<td colspan="1">';
 			// On recupere les id des users deja selectionnes
 			$contactsofproject=$projectstatic->getListContactId('internal');
-			$form->select_users($user->id,'contactid',0,'',0,'',$contactsofproject);
+			$form->select_users($user->id,'userid',0,'',0,'',$contactsofproject);
 			print '</td>';
 			print '<td>';
 			$formcompany->selectTypeContact($object, '', 'type','internal','rowid');
@@ -317,6 +317,7 @@ if ($id > 0 || ! empty($ref))
 				print '<input type="hidden" name="action" value="addcontact">';
 				print '<input type="hidden" name="source" value="external">';
 				print '<input type="hidden" name="id" value="'.$object->id.'">';
+				if ($withproject) print '<input type="hidden" name="withproject" value="'.$withproject.'">';
 
 				$var=!$var;
 				print "<tr ".$bc[$var].">";
-- 
GitLab