| load("cashdesk");
$id = $obj_facturation->id();
// Si trop d'articles ont ete trouves, on n'affiche que les X premiers (defini dans le fichier de configuration) ...
- if ( $nbr_enreg > $conf_taille_listes ) {
- for ($i = 0; $i < $conf_taille_listes; $i++) {
+ $nbtoshow = $nbr_enreg;
+ if (! empty($conf_taille_listes) && $nbtoshow > $conf_taille_listes) $nbtoshow = $conf_taille_listes;
- if ( $id == $tab_designations[$i]['rowid'] )
- $selected = 'selected="selected"';
- else
- $selected = '';
+ for ($i = 0; $i < $nbtoshow; $i++)
+ {
+ if ( $id == $tab_designations[$i]['rowid'] )
+ $selected = 'selected="selected"';
+ else
+ $selected = '';
- $label = $tab_designations[$i]['label'];
+ $label = $tab_designations[$i]['label'];
- print ''."\n ";
-
- }
-
- // ... sinon on affiche tout
- } else {
-
- for ($i = 0; $i < $nbr_enreg; $i++) {
-
- if ( $id == $tab_designations[$i]['rowid'] )
- $selected = 'selected="selected"';
- else
- $selected = '';
-
- $label = $tab_designations[$i]['label'];
-
- print ''."\n ";
-
- }
+ print ''."\n";
}
-
?>
|
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 87bc7dff59f..0ed4a1ad80a 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -656,71 +656,71 @@ class Form
}
- /**
- * Return list of company for customer in Ajax if Ajax activated or go to select_thirparty_list
- *
- * @param int $selected Preselected products
- * @param string $htmlname Name of HTML seletc field (must be unique in page)
- * @param int $filter Filter on thirdparty
- * @param int $limit Limit on number of returned lines
- * @param array $ajaxoptions Options for ajax_autocompleter
+ /**
+ * Return list of company for customer in Ajax if Ajax activated or go to select_thirparty_list
+ *
+ * @param int $selected Preselected products
+ * @param string $htmlname Name of HTML seletc field (must be unique in page)
+ * @param int $filter Filter on thirdparty
+ * @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
- */
- function select_thirdparty($selected='', $htmlname='productid', $filter='', $limit=20, $ajaxoptions=array(), $forcecombo=0)
- {
- global $langs,$conf;
+ * @return void
+ */
+ function select_thirdparty($selected='', $htmlname='productid', $filter='', $limit=20, $ajaxoptions=array(), $forcecombo=0)
+ {
+ global $langs,$conf;
- /* TODO Use ajax autocompletion (not finished)
- if (! empty($conf->use_javascript_ajax) && ! empty($conf->global->COMPANY_USE_SEARCH_TO_SELECT) && ! $forcecombo)
- {
- $placeholder='';
-
- if ($selected && empty($selected_input_value))
- {
- require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
- $societe = new Societe($this->db);
- $societe->fetch($selected);
- $selected_input_value=$societe->ref;
- }
- // mode=1 means customers products
- $urloption='htmlname='.$htmlname.'&outjson=1&price_level='.$price_level.'&type='.$filtertype.'&mode=1&status='.$status.'&finished='.$finished;
- print ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT.'/societe/ajax/company.php', $urloption, $conf->global->COMPANY_USE_SEARCH_TO_SELECT, 0, $ajaxoptions);
- if (empty($hidelabel)) print $langs->trans("RefOrLabel").' : ';
- else if ($hidelabel > 1) {
- if (! empty($conf->global->MAIN_HTML5_PLACEHOLDER)) $placeholder=' placeholder="'.$langs->trans("RefOrLabel").'"';
- else $placeholder=' title="'.$langs->trans("RefOrLabel").'"';
- if ($hidelabel == 2) {
- print img_picto($langs->trans("Search"), 'search');
- }
- }
- print '';
- if ($hidelabel == 3) {
- print img_picto($langs->trans("Search"), 'search');
- }
- }
- else
- {*/
- print $this->select_thirdparty_list($selected,$htmlname,$filter,1,0,$forcecombo,array(),'',0,$limit);
- //}
+ /* TODO Use ajax autocompletion (not finished)
+ if (! empty($conf->use_javascript_ajax) && ! empty($conf->global->COMPANY_USE_SEARCH_TO_SELECT) && ! $forcecombo)
+ {
+ $placeholder='';
+
+ if ($selected && empty($selected_input_value))
+ {
+ require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+ $societe = new Societe($this->db);
+ $societe->fetch($selected);
+ $selected_input_value=$societe->ref;
+ }
+ // mode=1 means customers products
+ $urloption='htmlname='.$htmlname.'&outjson=1&price_level='.$price_level.'&type='.$filtertype.'&mode=1&status='.$status.'&finished='.$finished;
+ print ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT.'/societe/ajax/company.php', $urloption, $conf->global->COMPANY_USE_SEARCH_TO_SELECT, 0, $ajaxoptions);
+ if (empty($hidelabel)) print $langs->trans("RefOrLabel").' : ';
+ else if ($hidelabel > 1) {
+ if (! empty($conf->global->MAIN_HTML5_PLACEHOLDER)) $placeholder=' placeholder="'.$langs->trans("RefOrLabel").'"';
+ else $placeholder=' title="'.$langs->trans("RefOrLabel").'"';
+ if ($hidelabel == 2) {
+ print img_picto($langs->trans("Search"), 'search');
+ }
+ }
+ print '';
+ if ($hidelabel == 3) {
+ print img_picto($langs->trans("Search"), 'search');
+ }
+ }
+ else
+ {*/
+ print $this->select_thirdparty_list($selected,$htmlname,$filter,1,0,$forcecombo,array(),'',0,$limit);
+ //}
}
- /**
- * Output html form to select a third party
- *
- * @param string $selected Preselected type
- * @param string $htmlname Name of field in form
- * @param string $filter Optionnal filters criteras (example: 's.rowid <> x')
- * @param int $showempty Add an empty field
- * @param int $showtype Show third party type in combolist (customer, prospect or supplier)
- * @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')))
+ /**
+ * Output html form to select a third party
+ *
+ * @param string $selected Preselected type
+ * @param string $htmlname Name of field in form
+ * @param string $filter Optionnal filters criteras (example: 's.rowid <> x')
+ * @param int $showempty Add an empty field
+ * @param int $showtype Show third party type in combolist (customer, prospect or supplier)
+ * @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')))
* @return string HTML string with
- * @deprecated Use select_thirdparty instead
- */
- function select_company($selected='',$htmlname='socid',$filter='',$showempty=0, $showtype=0, $forcecombo=0, $event=array())
+ * @deprecated Use select_thirdparty instead
+ */
+ function select_company($selected='', $htmlname='socid', $filter='', $showempty=0, $showtype=0, $forcecombo=0, $event=array())
{
- return $this->select_thirdparty_list($selected='',$htmlname='socid',$filter='',$showempty=0, $showtype=0, $forcecombo=0, $event=array());
+ return $this->select_thirdparty_list($selected,$htmlname, $filter, $showempty, $showtype, $forcecombo, $event);
}
/**
@@ -754,29 +754,29 @@ class Form
if ($filter) $sql.= " AND (".$filter.")";
if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
if (! empty($conf->global->COMPANY_HIDE_INACTIVE_IN_COMBOBOX)) $sql.= " AND s.status<>0 ";
- // Add criteria
- if ($filterkey && $filterkey != '')
+ // Add criteria
+ if ($filterkey && $filterkey != '')
{
$sql.=" AND (";
- if (! empty($conf->global->COMPANY_DONOTSEARCH_ANYWHERE)) // Can use index
- {
- $sql.="(s.name LIKE '".$filterkey."%'";
- $sql.=")";
- }
- else
- {
- // For natural search
- $scrit = explode(' ', $filterkey);
- foreach ($scrit as $crit) {
- $sql.=" AND (s.name LIKE '%".$crit."%'";
- $sql.=")";
- }
- }
- if (! empty($conf->barcode->enabled))
- {
- $sql .= " OR s.barcode LIKE '".$filterkey."'";
+ if (! empty($conf->global->COMPANY_DONOTSEARCH_ANYWHERE)) // Can use index
+ {
+ $sql.="(s.name LIKE '".$filterkey."%'";
+ $sql.=")";
}
- $sql.=")";
+ else
+ {
+ // For natural search
+ $scrit = explode(' ', $filterkey);
+ foreach ($scrit as $crit) {
+ $sql.=" AND (s.name LIKE '%".$crit."%'";
+ $sql.=")";
+ }
+ }
+ if (! empty($conf->barcode->enabled))
+ {
+ $sql .= " OR s.barcode LIKE '".$filterkey."'";
+ }
+ $sql.=")";
}
$sql.= " ORDER BY nom ASC";
@@ -791,8 +791,8 @@ class Form
}
// Construct $out and $outarray
- $out.= ''."\n";
}
else
{
@@ -1262,8 +1263,8 @@ class Form
{
global $langs,$conf,$user,$db;
- $out='';
- $outarray=array();
+ $out='';
+ $outarray=array();
$sql = "SELECT ";
$sql.= " p.rowid, p.label, p.ref, p.description, p.fk_product_type, p.price, p.price_ttc, p.price_base_type, p.tva_tx, p.duration, p.stock";
@@ -1308,7 +1309,7 @@ class Form
// Add criteria on ref/label
if ($filterkey && $filterkey != '')
{
- $sql.=" AND (";
+ $sql.=" AND (";
if (! empty($conf->global->PRODUCT_DONOTSEARCH_ANYWHERE)) // Can use index
{
$sql.=" AND (p.ref LIKE '".$filterkey."%' OR p.label LIKE '".$filterkey."%'";
diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php
index 98c1ee909fc..3eb92fb26a3 100644
--- a/htdocs/core/lib/admin.lib.php
+++ b/htdocs/core/lib/admin.lib.php
@@ -1083,9 +1083,9 @@ function form_constantes($tableau,$strictw3c=0)
print 'mymailmanlist
';
print 'mymailmanlist1,mymailmanlist2
';
print 'TYPE:Type1:mymailmanlist1,TYPE:Type2:mymailmanlist2
';
- if ($conf->categorie->enabled) print 'CATEG:Categ1:mymailmanlist1,CATEG:Categ2:mymailmanlist2
';
- print '';
- //print 'http://lists.domain.com/cgi-bin/mailman/admin/%LISTE%/members/remove?adminpw=%MAILMAN_ADMINPW%&unsubscribees=%EMAIL%';
+ if ($conf->categorie->enabled) print 'CATEG:Categ1:mymailmanlist1,CATEG:Categ2:mymailmanlist2
';
+ print '';
+ //print 'http://lists.domain.com/cgi-bin/mailman/admin/%LISTE%/members/remove?adminpw=%MAILMAN_ADMINPW%&unsubscribees=%EMAIL%';
}
print "\n";
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index b54a370817f..bac044a5376 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -4322,7 +4322,7 @@ function printCommonFooter($zone='private')
}
// End of tuning
- if (! empty($_SERVER['DOL_TUNING']))
+ if (! empty($_SERVER['DOL_TUNING']) || ! empty($conf->global->MAIN_SHOW_TUNING_INFO))
{
$micro_end_time=dol_microtime_float(true);
print "\n".'