From 75e337e8d96a203d4b055f72e48970a67e30daf6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 4 Oct 2015 16:02:50 +0200
Subject: [PATCH] FIX select of project using ajax autocomplete option

---
 htdocs/core/class/html.formprojet.class.php | 31 +++++++++++----------
 htdocs/projet/ajax/projects.php             |  7 +++--
 2 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/htdocs/core/class/html.formprojet.class.php b/htdocs/core/class/html.formprojet.class.php
index 25d65cc591a..5486d19858b 100644
--- a/htdocs/core/class/html.formprojet.class.php
+++ b/htdocs/core/class/html.formprojet.class.php
@@ -90,29 +90,30 @@ class FormProjets
 	}
 
 	/**
-	 *	Returns an array with projects qualified for a third party
+	 * Returns an array with projects qualified for a third party
 	 *
-	 *	@param	int		$socid      	Id third party (-1=all, 0=only projects not linked to a third party, id=projects not linked or linked to third party id)
-	 *	@param  int		$selected   	Id project preselected
-	 *	@param  string	$htmlname   	Nom de la zone html
-	 *	@param	int		$maxlength		Maximum length of label
-	 *	@param	int		$option_only	Return only html options lines without the select tag
-	 *	@param	int		$show_empty		Add an empty line
-	 *  @param	int		$discard_closed Discard closed projects (0=Keep,1=hide completely,2=Disable)
-     *  @param	int		$forcefocus		Force focus on field (works with javascript only)
-     *  @param	int		$disabled		Disabled
-	 *  @param int  $mode               0 for HTML mode and 1 for JSON mode
-	 * @param string $filterkey         Key to filter
-	 *	@return int         			Nber of project if OK, <0 if KO
+	 * @param  int     $socid      	       Id third party (-1=all, 0=only projects not linked to a third party, id=projects not linked or linked to third party id)
+	 * @param  int     $selected   	       Id project preselected
+	 * @param  string  $htmlname   	       Nom de la zone html
+	 * @param  int     $maxlength          Maximum length of label
+	 * @param  int     $option_only	       Return only html options lines without the select tag
+	 * @param  int     $show_empty		   Add an empty line
+	 * @param  int     $discard_closed     Discard closed projects (0=Keep,1=hide completely,2=Disable)
+     * @param  int     $forcefocus		   Force focus on field (works with javascript only)
+     * @param  int     $disabled           Disabled
+	 * @param  int     $mode               0 for HTML mode and 1 for array return (to be used by json_encode for example)
+	 * @param  string  $filterkey          Key to filter
+	 * @return int         			       Nb of project if OK, <0 if KO
 	 */
-	function select_projects_list($socid=-1, $selected='', $htmlname='projectid', $maxlength=24, $option_only=0, $show_empty=1, $discard_closed=0, $forcefocus=0, $disabled=0, $mode = 0, $filterkey = '')
+	function select_projects_list($socid=-1, $selected='', $htmlname='projectid', $maxlength=24, $option_only=0, $show_empty=1, $discard_closed=0, $forcefocus=0, $disabled=0, $mode=0, $filterkey = '')
 	{
 		global $user,$conf,$langs;
 
 		require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 
 		$out='';
-
+        $outarray=array();
+        
 		$hideunselectables = false;
 		if (! empty($conf->global->PROJECT_HIDE_UNSELECTABLES)) $hideunselectables = true;
 
diff --git a/htdocs/projet/ajax/projects.php b/htdocs/projet/ajax/projects.php
index f7fbfbaddab..55a4597dc08 100644
--- a/htdocs/projet/ajax/projects.php
+++ b/htdocs/projet/ajax/projects.php
@@ -38,6 +38,7 @@ $socid=GETPOST('socid','int');
 $action=GETPOST('action', 'alpha');
 $id=GETPOST('id', 'int');
 
+
 /*
  * View
  */
@@ -60,9 +61,11 @@ if (! GETPOST($htmlname) && ! GETPOST($idprod)) return;
 
 // When used from jQuery, the search term is added as GET param "term".
 $searchkey=(GETPOST($idprod)?GETPOST($idprod):(GETPOST($htmlname)?GETPOST($htmlname):''));
+
 $form = new FormProjets($db);
-$arrayresult=$form->select_projects_list($socid, '', $htmlname, '', 0, 0, array(), 0, 1, $searchkey);
+$arrayresult=$form->select_projects_list($socid, '', $htmlname, 0, 0, 1, 0, 0, 0, 1, $searchkey);
 
 $db->close();
 
-print json_encode($arrayresult);
\ No newline at end of file
+print json_encode($arrayresult);
+