diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 7ad467eb329..a6147a78791 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -40,1742 +40,1754 @@
*/
class Form
{
- var $db;
- var $error;
-
- // Cache arrays
- var $cache_types_paiements=array();
- var $cache_conditions_paiements=array();
-
- var $tva_taux_value;
- var $tva_taux_libelle;
-
-
- /**
- * Constructor
- * @param $DB Database handler
- */
- function Form($DB)
- {
- $this->db = $DB;
- }
-
- /**
- * Output key field for an editable field
- * @param text Text of label
- * @param htmlname Name of select field
- * @param preselected Preselected value for parameter
- * @param paramkey Key of parameter (unique if there is several parameter to show)
- * @param paramvalue Value of parameter
- * @param perm Permission to allow button to edit parameter
- * @param typeofdata Type of data (string by default, email, ...)
- * @return string HTML edit field
- */
- function editfieldkey($text,$htmlname,$preselected,$paramkey,$paramvalue,$perm,$typeofdata='string')
- {
- global $langs;
- $ret='';
- $ret.='
';
- $ret.=$langs->trans($text);
- $ret.='
';
- if ($_GET['action'] != 'edit'.$htmlname && $perm) $ret.='
';
- return $ret;
- }
-
- /**
- * \brief Output val field for an editable field
- * \param text Text of label (not used in this function)
- * \param htmlname Name of select field
- * \param preselected Preselected value for parameter
- * \param paramkey Key of parameter (unique if there is several parameter to show)
- * \param perm Permission to allow button to edit parameter
- * \param typeofdata Type of data (string by default, email, ...)
- * \return string HTML edit field
- */
- function editfieldval($text,$htmlname,$preselected,$paramkey,$paramvalue,$perm,$typeofdata='string')
- {
- global $langs;
- $ret='';
- if ($_GET['action'] == 'edit'.$htmlname)
- {
- $ret.="\n";
- $ret.=''."\n";
- }
- else
- {
- if ($typeofdata == 'email') $ret.=dol_print_email($preselected,0,0,0,0,1);
- else $ret.=$preselected;
- }
- return $ret;
- }
-
- /**
- * \brief Old version of textwithtooltip. Kept for backward compatibility with modules for 2.6.
- * \deprecated
- */
- function textwithhelp($text,$htmltext,$tooltipon=1)
- {
- return $this->textwithtooltip($text,$htmltext,$tooltipon);
- }
-
- /**
- * \brief Show a text and picto with tooltip on text or picto
- * \param text Texte to show
- * \param htmltext Contenu html du tooltip, code en Html / UTF8
- * \param tooltipon 1=tooltip sur texte, 2=tooltip sur picto, 3=tooltip sur les 2, 4=tooltip sur les 2 et force en Ajax
- * \param direction -1=Le picto est avant, 0=pas de picto, 1=le picto est apres
- * \param img Code img du picto
- * \param i Numero of tooltip
- * \param width Width of tooltip
- * \param shiftX Shift of tooltip
- * \return string Code html du tooltip (texte+picto)
- * \remarks Use function textwithpicto if you can.
- */
- function textwithtooltip($text,$htmltext,$tooltipon=1,$direction=0,$img='',$i=1,$width='200',$shiftX='10')
- {
- global $conf;
-
- if (! $htmltext) return $text;
-
- $paramfortooltiptext ='';
- $paramfortooltippicto ='';
-
- // Sanitize tooltip
- $htmltext=str_replace("\\","\\\\",$htmltext);
- $htmltext=str_replace("'","\'",$htmltext);
- $htmltext=str_replace("'","\'",$htmltext);
- $htmltext=str_replace("\r","",$htmltext);
- $htmltext=str_replace(" \n"," ",$htmltext);
- $htmltext=str_replace("\n","",$htmltext);
-
- if ($conf->use_javascript_ajax && $tooltipon == 4)
- {
- $s = '
';
- if ($direction > 0)
- {
- if ($text)
- {
- $s.=''.$text;
- if ($direction) $s.=' ';
- $s.='';
- }
- if ($direction) $s.=''.$img.'';
- }
- else
- {
- if ($direction) $s.=''.$img.'';
- if ($text)
- {
- $s.='';
- if ($direction) $s.=' ';
- $s.=$text.'';
- }
- }
- $s.='
';
- }
- return $s;
- }
-
- /**
- * \brief Show a text with a picto and a tooltip on picto
- * \param text Text to show
- * \param htmltooltip Content of tooltip
- * \param direction 1=Icon is after text, -1=Icon is before text
- * \param type Type of picto (info, help, warning, superadmin...)
- * \return string HTML code of text, picto, tooltip
- */
- function textwithpicto($text,$htmltext,$direction=1,$type='help')
- {
- global $conf;
-
- if ("$type" == "0") $type='info'; // For backward compatibility
-
- $alt='';
- // If info or help with no javascript, show only text
- if (empty($conf->use_javascript_ajax))
- {
- if ($type == 'info' || $type == 'help') return $text;
- else { $alt=$htmltext; $htmltext=''; }
- }
- // If info or help with smartphone, show only text
- if (! empty($conf->browser->phone))
- {
- if ($type == 'info' || $type == 'help') return $text;
- }
- // Info or help
- if ($type == 'info') $img=img_help(0,$alt);
- if ($type == 'help' || $type ==1) $img=img_help(1,$alt);
- if ($type == 'superadmin') $img=img_redstar($alt);
- // Warnings
- if ($type == 'warning') $img=img_warning($alt);
-
- return $this->textwithtooltip($text,$htmltext,2,$direction,$img);
- }
-
-
- /**
- * \brief Return combo list of activated countries, into language of user
- * \param selected Id or Code or Label of preselected country
- * \param htmlname Name of html select object
- * \param htmloption Options html on select object
- * \TODO trier liste sur noms apres traduction plutot que avant
- */
- function select_pays($selected='',$htmlname='pays_id',$htmloption='')
- {
- global $conf,$langs;
- $langs->load("dict");
-
- $sql = "SELECT rowid, code, libelle, active";
- $sql.= " FROM ".MAIN_DB_PREFIX."c_pays";
- $sql.= " WHERE active = 1";
- $sql.= " ORDER BY code ASC";
-
- dol_syslog("Form::select_pays sql=".$sql);
- $resql=$this->db->query($sql);
- if ($resql)
- {
- print '';
- return 0;
- }
- else
- {
- dol_print_error($this->db);
- return 1;
- }
- }
-
-
- /**
- * \brief Retourne la liste des types de comptes financiers
- * \param selected Type pre-selectionne
- * \param htmlname Nom champ formulaire
- */
- function select_type_comptes_financiers($selected=1,$htmlname='type')
- {
- global $langs;
- $langs->load("banks");
-
- $type_available=array(0,1,2);
-
- print '';
- }
-
-
- /**
- * \brief Return list of social contributions.
- * \remarks Use mysoc->pays_id or mysoc->pays_code so they must be defined.
- * \param selected Preselected type
- * \param htmlname Name of field in form
- * \param useempty Set to 1 if we want an empty value
- * \param maxlen Max length of text in combo box
- * \param help Add or not the admin help picto
- */
- function select_type_socialcontrib($selected='',$htmlname='actioncode', $useempty=0, $maxlen=40, $help=1)
- {
- global $db,$langs,$user,$mysoc;
-
- if (empty($mysoc->pays_id) && empty($mysoc->pays_code))
- {
- dol_print_error('','Call to select_type_socialcontrib with mysoc country not yet defined');
- exit;
- }
-
- if (! empty($mysoc->pays_id))
- {
- $sql = "SELECT c.id, c.libelle as type";
- $sql.= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c";
- $sql.= " WHERE c.active = 1";
- $sql.= " AND c.fk_pays = ".$mysoc->pays_id;
- $sql.= " ORDER BY c.libelle ASC";
- }
- else
- {
- $sql = "SELECT c.id, c.libelle as type";
- $sql.= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c, ".MAIN_DB_PREFIX."c_pays as p";
- $sql.= " WHERE c.active = 1 AND c.fk_pays = p.rowid";
- $sql.= " AND p.code = '".$mysoc->pays_code."'";
- $sql.= " ORDER BY c.libelle ASC";
- }
-
- dol_syslog("Form::select_type_socialcontrib sql=".$sql, LOG_DEBUG);
- $resql=$db->query($sql);
- if ($resql)
- {
- $num = $db->num_rows($resql);
- if ($num)
- {
- print '';
- if ($user->admin && $help) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionnarySetup"),1);
- }
- else
- {
- print $langs->trans("ErrorNoSocialContributionForSellerCountry",$mysoc->pays_code);
- }
- }
- else
- {
- dol_print_error($db,$db->lasterror());
- }
- }
-
- /**
- * \brief Return list of types of lines (product or service)
- * \param selected Preselected type
- * \param htmlname Name of field in html form
- * \param showempty Add an empty field
- * \param hidetext Do not show label before combo box
- * \param forceall Force to show products and services in combo list, whatever are activated modules
- */
- function select_type_of_lines($selected='',$htmlname='type',$showempty=0,$hidetext=0,$forceall=0)
- {
- global $db,$langs,$user,$conf;
-
- // If product & services are enabled or both disabled.
- if ($forceall || ($conf->product->enabled && $conf->service->enabled)
- || (empty($conf->product->enabled) && empty($conf->service->enabled)))
- {
- if (empty($hidetext)) print $langs->trans("Type").': ';
- print '';
- //if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionnarySetup"),1);
- }
- if (! $forceall && empty($conf->product->enabled) && $conf->service->enabled)
- {
- print '';
- }
- if (! $forceall && $conf->product->enabled && empty($conf->service->enabled))
- {
- print '';
- }
-
- }
-
- /**
- * \brief Return list of types of notes
- * \param selected Preselected type
- * \param htmlname Name of field in form
- * \param showempty Add an empty field
- */
- function select_type_fees($selected='',$htmlname='type',$showempty=0)
- {
- global $db,$langs,$user;
- $langs->load("trips");
-
- print '';
- if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionnarySetup"),1);
- }
-
- /**
- * \brief Output html form to select a third party
- * \param selected Preselected type
- * \param htmlname Name of field in form
- * \param filter Optionnal filters criteras
- * \param showempty Add an empty field
- * \param showtype Show third party type in combolist (customer, prospect or supplier)
- * \param forcecombo Force to use combo box
- */
- function select_societes($selected='',$htmlname='socid',$filter='',$showempty=0, $showtype=0, $forcecombo=0)
- {
- global $conf,$user,$langs;
-
- // On recherche les societes
- $sql = "SELECT s.rowid, s.nom, s.client, s.fournisseur, s.code_client, s.code_fournisseur";
- $sql.= " FROM ".MAIN_DB_PREFIX ."societe as s";
- if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
- $sql.= " WHERE s.entity = ".$conf->entity;
- if ($filter) $sql.= " AND ".$filter;
- if (is_numeric($selected) && $conf->use_javascript_ajax && $conf->global->COMPANY_USE_SEARCH_TO_SELECT) $sql.= " AND s.rowid = ".$selected;
- if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
- $sql.= " ORDER BY nom ASC";
-
- dol_syslog("Form::select_societes sql=".$sql);
- $resql=$this->db->query($sql);
- if ($resql)
- {
- if ($conf->use_javascript_ajax && $conf->global->COMPANY_USE_SEARCH_TO_SELECT && ! $forcecombo)
- {
- $socid = 0;
- if ($selected)
- {
- $obj = $this->db->fetch_object($resql);
- $socid = $obj->rowid?$obj->rowid:'';
- }
-
- // We call a page after a small delay when a new input has been selected
- //$javaScript = "window.location=\'...\'";
- //$htmloption = 'onChange="ac_delay(\''.$javaScript.'\',\'500\')"';
- $htmloption='';
-
- print "\n".''."\n";
- print '
';
- }
- else
- {
- print '';
- }
- }
- else
- {
- dol_print_error($this->db);
- }
- }
-
-
- /**
- * \brief Return HTML combo list of absolute discounts
- * \param selected Id remise fixe pre-selectionnee
- * \param htmlname Nom champ formulaire
- * \param filter Criteres optionnels de filtre
- * \param maxvalue Max value for lines that can be selected
- * \return int Return number of qualifed lines in list
- */
- function select_remises($selected='',$htmlname='remise_id',$filter='',$socid, $maxvalue=0)
- {
- global $langs,$conf;
-
- // On recherche les remises
- $sql = "SELECT re.rowid, re.amount_ht, re.amount_tva, re.amount_ttc,";
- $sql.= " re.description, re.fk_facture_source";
- $sql.= " FROM ".MAIN_DB_PREFIX ."societe_remise_except as re";
- $sql.= " WHERE fk_soc = ".$socid;
- if ($filter) $sql.= " AND ".$filter;
- $sql.= " ORDER BY re.description ASC";
-
- dol_syslog("Form::select_remises sql=".$sql);
- $resql=$this->db->query($sql);
- if ($resql)
- {
- print '';
- return $qualifiedlines;
- }
- else
- {
- dol_print_error($this->db);
- return -1;
- }
- }
-
-
- /**
- * \brief Retourne la liste deroulante des contacts d'une societe donnee
- * \param socid Id de la societe
- * \param selected Id contact pre-selectionne
- * \param htmlname Nom champ formulaire ('none' pour champ non editable)
- * \param show_empty 0=liste sans valeur nulle, 1=ajoute valeur inconnue
- * \param exclude Liste des id contacts a exclure
- * \param limitto Disable answers that are not id in this array list
- * \return int <0 if KO, Nb of contact in list if OK
- */
- function select_contacts($socid,$selected='',$htmlname='contactid',$showempty=0,$exclude='',$limitto='')
- {
- // Permettre l'exclusion de contacts
- if (is_array($exclude))
- {
- $excludeContacts = implode("','",$exclude);
- }
-
- // On recherche les societes
- $sql = "SELECT s.rowid, s.name, s.firstname FROM";
- $sql.= " ".MAIN_DB_PREFIX ."socpeople as s";
- $sql.= " WHERE fk_soc=".$socid;
- if (is_array($exclude) && $excludeContacts) $sql.= " AND s.rowid NOT IN ('".$excludeContacts."')";
- $sql.= " ORDER BY s.name ASC";
-
- dol_syslog("Form::select_contacts sql=".$sql);
- $resql=$this->db->query($sql);
- if ($resql)
- {
- $num=$this->db->num_rows($resql);
- if ($num == 0) return 0;
-
- if ($htmlname != 'none') print '';
- }
- return $num;
- }
- else
- {
- dol_print_error($this->db);
- return -1;
- }
- }
-
-
- /**
- * \brief Return select list of users
- * \param selected Id user preselected
- * \param htmlname Field name in form
- * \param show_empty 0=liste sans valeur nulle, 1=ajoute valeur inconnue
- * \param exclude Array list of users id to exclude
- * \param disabled If select list must be disabled
- * \param include Array list of users id to include
- * \param enableonly Array list of users id to be enabled. All other must be disabled
- */
- function select_users($selected='',$htmlname='userid',$show_empty=0,$exclude='',$disabled=0,$include='',$enableonly='')
- {
- global $conf;
-
- // Permettre l'exclusion d'utilisateurs
- if (is_array($exclude)) $excludeUsers = implode("','",$exclude);
- // Permettre l'inclusion d'utilisateurs
- if (is_array($include)) $includeUsers = implode("','",$include);
-
- // On recherche les utilisateurs
- $sql = "SELECT u.rowid, u.name, u.firstname, u.login, u.admin";
- $sql.= " FROM ".MAIN_DB_PREFIX ."user as u";
- $sql.= " WHERE u.entity IN (0,".$conf->entity.")";
- if (is_array($exclude) && $excludeUsers) $sql.= " AND u.rowid NOT IN ('".$excludeUsers."')";
- if (is_array($include) && $includeUsers) $sql.= " AND u.rowid IN ('".$includeUsers."')";
- $sql.= " ORDER BY u.name ASC";
-
- dol_syslog("Form::select_users sql=".$sql);
- $resql=$this->db->query($sql);
- if ($resql)
- {
- print '';
- }
- else
- {
- dol_print_error($this->db);
- }
- }
-
-
- /**
- * \brief Return list of products for customer in Ajax if Ajax activated or go to select_produits_do
- * \param selected Preselected products
- * \param htmlname Name of HTML select
- * \param filtertype Filter on product type (''=nofilter, 0=product, 1=service)
- * \param limit Limit sur le nombre de lignes retournees
- * \param price_level Level of price to show
- * \param status -1=Return all products, 0=Products not on sell, 1=Products on sell
- * \param finished 2=all, 1=finished, 0=raw material
- */
- function select_produits($selected='',$htmlname='productid',$filtertype='',$limit=20,$price_level=0,$status=1,$finished=2)
- {
- global $langs,$conf;
-
- if ($conf->global->PRODUIT_USE_SEARCH_TO_SELECT)
- {
- if ($conf->global->MAIN_USE_JQUERY)
- {
- print ajax_autocompleter2('','keysearch',DOL_URL_ROOT.'/product/ajaxproducts.php','&price_level='.$price_level.'&type='.$filtertype.'&mode=1&status='.$status.'&finished='.$finished,'');
-
- print '
';
- print '';
- print '';
- print '
';
- }
- else
- {
- print '
';
- print '
';
- print $langs->trans("RefOrLabel").':
';
- print '
';
- print ajax_indicator($htmlname,'working'); // Indicator is et here
- print '
';
- print '
';
- print '
';
- print '
';
- print '
';
- print ajax_updater($htmlname,'keysearch',DOL_URL_ROOT.'/product/ajaxproducts.php','&price_level='.$price_level.'&type='.$filtertype.'&mode=1&status='.$status.'&finished='.$finished,''); // Indicator is '' to disable it as it is alreay output
- print '
';
- print '
';
- }
- }
- else
- {
- $this->select_produits_do($selected,$htmlname,$filtertype,$limit,$price_level,'',$status,$finished);
- }
- }
-
- /**
- * \brief Return list of products for a customer
- * \param selected Preselected product
- * \param htmlname Name of select html
- * \param filtertype Filter on product type (''=nofilter, 0=product, 1=service)
- * \param limit Limite sur le nombre de lignes retournees
- * \param price_level Level of price to show
- * \param filterkey Filter on product
- * \param status -1=Return all products, 0=Products not on sell, 1=Products on sell
- */
- function select_produits_do($selected='',$htmlname='productid',$filtertype='',$limit=20,$price_level=0,$filterkey='',$status=1,$finished=2)
- {
- global $langs,$conf,$user,$db;
-
- $sql = "SELECT ";
- $sql.= " p.rowid, p.label, p.ref, p.fk_product_type, p.price, p.price_ttc, p.price_base_type, p.duration, p.stock";
- // Multilang : we add translation
- if ($conf->global->MAIN_MULTILANGS)
- {
- $sql.= ", pl.label as label_translated";
- }
- $sql.= " FROM ".MAIN_DB_PREFIX."product as p";
- // Multilang : we add translation
- if ($conf->global->MAIN_MULTILANGS)
- {
- $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_lang as pl ON pl.fk_product = p.rowid AND pl.lang='". $langs->getDefaultLang() ."'";
- }
- $sql.= " WHERE p.entity = ".$conf->entity;
- if (empty($user->rights->produit->hidden) && empty($user->rights->service->hidden)) $sql.=' AND p.hidden=0';
- else
- {
- if (empty($user->rights->produit->hidden)) $sql.=' AND (p.hidden=0 OR p.fk_product_type != 0)';
- if (empty($user->rights->service->hidden)) $sql.=' AND (p.hidden=0 OR p.fk_product_type != 1)';
- }
- if($finished == 0)
- {
- $sql.= " AND p.finished = ".$finished;
- }
- elseif($finished == 1)
- {
- $sql.= " AND p.finished = ".$finished;
- if ($status >= 0) $sql.= " AND p.tosell = ".$status;
- }
- elseif($status >= 0)
- {
- $sql.= " AND p.tosell = ".$status;
- }
- if (strval($filtertype) != '') $sql.=" AND p.fk_product_type=".$filtertype;
- // Add criteria on ref/label
- if (! empty($conf->global->PRODUCT_DONOTSEARCH_ANYWHERE))
- {
- if ($filterkey && $filterkey != '')
- {
- $sql.=" AND (p.ref like '".$filterkey."%' OR p.label like '".$filterkey."%'";
- if ($conf->global->MAIN_MULTILANGS) $sql.=" OR pl.label like '".$filterkey."%'";
- $sql.=")";
- }
- }
- else
- {
- if ($filterkey && $filterkey != '')
- {
- $sql.=" AND (p.ref like '%".$filterkey."%' OR p.label like '%".$filterkey."%'";
- if ($conf->global->MAIN_MULTILANGS) $sql.=" OR pl.label like '%".$filterkey."%'";
- $sql.=")";
- }
- }
- $sql.= $db->order("p.ref");
- $sql.= $db->plimit($limit);
-
- dol_syslog("Form::select_produits_do search product sql=".$sql, LOG_DEBUG);
- $result=$this->db->query($sql);
- if (! $result) dol_print_error($this->db);
-
- if ($result)
- {
- $num = $this->db->num_rows($result);
-
- if ($conf->use_javascript_ajax)
- {
- if (! $num)
- {
- print '