From 0916d2cf3b1307db8d8e7612ae96f2e5ce71f67b Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Fri, 13 Jun 2014 15:54:37 +0200
Subject: [PATCH] Fix link element from project "associates object" pages
 http://www.dolibarr.fr/forum/527-bugs-sur-la-version-stable-courante/50687-objet-associes-au-projet

---
 ChangeLog                                   | 1 +
 htdocs/core/class/html.formprojet.class.php | 7 ++++++-
 htdocs/projet/element.php                   | 7 ++++++-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b1f69e0e9fe..fe25f447e6e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,7 @@ Fix: Filter on status was not visible when selected from url.
 Fix: Filtering on status was last when asking to sort.
 Fix: [ bug #1454 ] Mention de bas de page erroné
 Fix: Do not display dictionnay for non activated module 
+Fix: Link element from element project pages
 
 ***** ChangeLog for 3.5.3 compared to 3.5.2 *****
 Fix: Error on field accountancy code for export profile of invoices.
diff --git a/htdocs/core/class/html.formprojet.class.php b/htdocs/core/class/html.formprojet.class.php
index e090f2f6824..d668912faca 100644
--- a/htdocs/core/class/html.formprojet.class.php
+++ b/htdocs/core/class/html.formprojet.class.php
@@ -168,6 +168,7 @@ class FormProjets
 	 */
 	function select_element($table_element)
 	{
+		global $conf;
 
 		$projectkey="fk_projet";
 		switch ($table_element)
@@ -195,7 +196,7 @@ class FormProjets
 		if (!empty($this->societe->id)) {
 			$sql.= " AND fk_soc=".$this->societe->id;
 		}
-		$sql.= ' AND entity='.$conf->entity;
+		$sql.= ' AND entity='.getEntity('project');
 		$sql.= " ORDER BY ref DESC";
 
 		dol_syslog(get_class($this).'::select_element sql='.$sql,LOG_DEBUG);
@@ -219,6 +220,10 @@ class FormProjets
 			return $sellist ;
 
 			$this->db->free($resql);
+		}else {
+			$this->error=$this->db->lasterror();
+			dol_syslog(get_class($this) . "::select_element " . $errmsg, LOG_ERR);
+			return -1;
 		}
 	}
 
diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php
index 4947af8ba30..88330819349 100644
--- a/htdocs/projet/element.php
+++ b/htdocs/projet/element.php
@@ -209,13 +209,18 @@ foreach ($listofreferent as $key => $value)
 	$classname=$value['class'];
 	$tablename=$value['table'];
 	$qualified=$value['test'];
+	
 	if ($qualified)
 	{
 		print '<br>';
 
 		print_titre($langs->trans($title));
-
+		
 		$selectList=$formproject->select_element($tablename);
+		if ($selectList<0) {
+			setEventMessage($formproject->error,'errors');
+		}
+		
 		if ($selectList)
 		{
 			print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$projectid.'" method="post">';