From 8f3e9b1832e8a9307fcd03163bac128a40bb8caf Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 3 Feb 2014 20:05:56 +0100
Subject: [PATCH] Fix: function must return a string
---
htdocs/cashdesk/admin/cashdesk.php | 1 -
htdocs/core/class/html.form.class.php | 10 +++++++---
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/htdocs/cashdesk/admin/cashdesk.php b/htdocs/cashdesk/admin/cashdesk.php
index 217b184f1d9..901b43a0d48 100644
--- a/htdocs/cashdesk/admin/cashdesk.php
+++ b/htdocs/cashdesk/admin/cashdesk.php
@@ -103,7 +103,6 @@ print "</tr>\n";
$var=!$var;
print '<tr '.$bc[$var].'><td width=\"50%\">'.$langs->trans("CashDeskThirdPartyForSell").'</td>';
print '<td colspan="2">';
-//print $form->select_company($conf->global->CASHDESK_ID_THIRDPARTY,'socid','s.client in (1,3)',1,1);
print $form->select_thirdparty($conf->global->CASHDESK_ID_THIRDPARTY,'socid','s.client in (1,3)',0,array(),1);
print '</td></tr>';
if (! empty($conf->banque->enabled))
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 0caa16a6271..49aff9b83c0 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -667,7 +667,7 @@ class Form
/**
- * Return list of company for customer in Ajax if Ajax activated or go to select_thirparty_list
+ * Return HTML code to select a company.
*
* @param int $selected Preselected products
* @param string $htmlname Name of HTML seletc field (must be unique in page)
@@ -675,12 +675,14 @@ class Form
* @param int $limit Limit on number of returned lines
* @param array $ajaxoptions Options for ajax_autocompleter
* @param int $forcecombo Force to use combo box
- * @return void
+ * @return string Return select box for thirdparty.
*/
function select_thirdparty($selected='', $htmlname='productid', $filter='', $limit=20, $ajaxoptions=array(), $forcecombo=0)
{
global $langs,$conf;
+ $out='';
+
/* TODO Use ajax autocompletion (not finished)
if (! empty($conf->use_javascript_ajax) && ! empty($conf->global->COMPANY_USE_SEARCH_TO_SELECT) && ! $forcecombo)
{
@@ -711,8 +713,10 @@ class Form
}
else
{*/
- print $this->select_thirdparty_list($selected,$htmlname,$filter,1,0,$forcecombo,array(),'',0,$limit);
+ $out.=$this->select_thirdparty_list($selected,$htmlname,$filter,1,0,$forcecombo,array(),'',0,$limit);
//}
+
+ return $out;
}
/**
--
GitLab