Merge pull request #684 from jfefe/develop

Fix bug #732 : Missing argument when calling selectcontacts method
Dolibarr · Feb 23, 2013 · 845e4ff · 845e4ff
2 parents 1224e79 + 7e79e1a
commit 845e4ff
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
@@ -825,11 +825,12 @@ function select_remises($selected, $htmlname, $filter, $socid, $maxvalue=0)
      *	@param	string	$showsoc	    Add company into label
      * 	@param	int		$forcecombo		Force to use combo box
      *  @param	array	$event			Event options. Example: array(array('method'=>'getContacts', 'url'=>dol_buildpath('/core/ajax/contacts.php',1), 'htmlname'=>'contactid', 'params'=>array('add-customer-contact'=>'disabled')))
+     *  @param	bool	$options_only	Return options only (for ajax treatment)
      *	@return	int						<0 if KO, Nb of contact in list if OK
      */
-    function select_contacts($socid,$selected='',$htmlname='contactid',$showempty=0,$exclude='',$limitto='',$showfunction=0, $moreclass='', $showsoc=0, $forcecombo=0, $event=array())
+    function select_contacts($socid,$selected='',$htmlname='contactid',$showempty=0,$exclude='',$limitto='',$showfunction=0, $moreclass='', $showsoc=0, $forcecombo=0, $event=array(), $options_only=false)
     {
-    	print $this->selectcontacts($socid,$selected,$htmlname,$showempty,$exclude,$limitto,$showfunction, $moreclass, $showsoc, $forcecombo, $event);
+    	print $this->selectcontacts($socid,$selected,$htmlname,$showempty,$exclude,$limitto,$showfunction, $moreclass, $options_only, $showsoc, $forcecombo, $event);
     	return $this->num;
     }
 
@@ -877,7 +878,7 @@ function selectcontacts($socid,$selected='',$htmlname='contactid',$showempty=0,$
         {
             $num=$this->db->num_rows($resql);
 
-            if ($conf->use_javascript_ajax && $conf->global->CONTACT_USE_SEARCH_TO_SELECT && ! $forcecombo)
+            if ($conf->use_javascript_ajax && $conf->global->CONTACT_USE_SEARCH_TO_SELECT && ! $forcecombo && ! $options_only)
             {
             	$out.= ajax_combobox($htmlname, $event);
             }

diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
@@ -402,6 +402,11 @@ function fetch($id, $ref='', $ref_ext='', $ref_int='')
 				// Tracking url
 				$this->GetUrlTrackingStatus($obj->tracking_number);
 
+				/*
+				 * Thirparty
+				 */
+				$result=$this->fetch_thirdparty();
+
 				/*
 				 * Lines
 				 */