alxarafe / alixar

dolibarr/htdocs/core/class/commonobject.class.php

Indentation +7091 added lines, -7091 removed lines

@@ -41,7387 +41,7387 @@
  */
 abstract class CommonObject
 {
-	/**
-	 * @var DoliDb		Database handler (result of a new DoliDB)
-	 */
-	public $db;
-
-	/**
-	 * @var int The object identifier
-	 */
-	public $id;
-
-	/**
-	 * @var string 		Error string
-	 * @see             errors
-	 */
-	public $error;
-
-	/**
-	 * @var string[]	Array of error strings
-	 */
-	public $errors=array();
-
-	/**
-	 * @var string ID to identify managed object
-	 */
-	public $element;
-
-	/**
-	 * @var string Name of table without prefix where object is stored
-	 */
-	public $table_element;
-
-	/**
-	 * @var int    Name of subtable line
-	 */
-	public $table_element_line='';
-
-	/**
-	 * @var string		Key value used to track if data is coming from import wizard
-	 */
-	public $import_key;
-
-	/**
-	 * @var mixed		Contains data to manage extrafields
-	 */
-	public $array_options=array();
-
-	/**
-	 * @var int[][]		Array of linked objects ids. Loaded by ->fetchObjectLinked
-	 */
-	public $linkedObjectsIds;
-
-	/**
-	 * @var mixed		Array of linked objects. Loaded by ->fetchObjectLinked
-	 */
-	public $linkedObjects;
-
-	/**
-	 * @var Object      To store a cloned copy of object before to edit it and keep track of old properties
-	 */
-	public $oldcopy;
-
-	/**
-	 * @var string		Column name of the ref field.
-	 */
-	protected $table_ref_field = '';
-
-
-
-	// Following vars are used by some objects only. We keep this property here in CommonObject to be able to provide common method using them.
-
-	/**
-	 * @var array<string,mixed>		Can be used to pass information when only object is provided to method
-	 */
-	public $context=array();
-
-	/**
-	 * @var string		Contains canvas name if record is an alternative canvas record
-	 */
-	public $canvas;
-
-	/**
-	 * @var Project The related project
-	 * @see fetch_projet()
-	 */
-	public $project;
-
-	/**
-	 * @var int The related project ID
-	 * @see setProject(), project
-	 */
-	public $fk_project;
-
-	/**
-	 * @deprecated
-	 * @see project
-	 */
-	public $projet;
-
-	/**
-	 * @var Contact a related contact
-	 * @see fetch_contact()
-	 */
-	public $contact;
-
-	/**
-	 * @var int The related contact ID
-	 * @see fetch_contact()
-	 */
-	public $contact_id;
-
-	/**
-	 * @var Societe A related thirdparty
-	 * @see fetch_thirdparty()
-	 */
-	public $thirdparty;
-
-	/**
-	 * @var User A related user
-	 * @see fetch_user()
-	 */
-	public $user;
-
-	/**
-	 * @var string 	The type of originating object ('commande', 'facture', ...)
-	 * @see fetch_origin()
-	 */
-	public $origin;
-
-	/**
-	 * @var int 	The id of originating object
-	 * @see fetch_origin()
-	 */
-	public $origin_id;
-
-	/**
-	 * @var string The object's reference
-	 */
-	public $ref;
-
-	/**
-	 * @var string The object's previous reference
-	 */
-	public $ref_previous;
-
-	/**
-	 * @var string The object's next reference
-	 */
-	public $ref_next;
-
-	/**
-	 * @var string An external reference for the object
-	 */
-	public $ref_ext;
-
-	/**
-	 * @var int The object's status
-	 * @see setStatut()
-	 */
-	public $statut;
-
-	/**
-	 * @var string
-	 * @see getFullAddress()
-	 */
-	public $country;
-
-	/**
-	 * @var int
-	 * @see getFullAddress(), country
-	 */
-	public $country_id;
-
-	/**
-	 * @var string
-	 * @see getFullAddress(), isInEEC(), country
-	 */
-    public $country_code;
-
     /**
-	 * @var string
-	 * @see getFullAddress()
-	 */
-	public $state;
-
-	/**
-	 * @var int
-	 * @see getFullAddress(), state
-	 */
-	public $state_id;
+     * @var DoliDb		Database handler (result of a new DoliDB)
+     */
+    public $db;
 
-	/**
-	 * @var string
-	 * @see getFullAddress(), state
-	 */
-    public $state_code;
+    /**
+     * @var int The object identifier
+     */
+    public $id;
 
     /**
-	 * @var string
-	 * @see getFullAddress(), region
-	 */
-	public $region;
+     * @var string 		Error string
+     * @see             errors
+     */
+    public $error;
 
-	/**
-	 * @var string
-	 * @see getFullAddress(), region
-	 */
-    public $region_code;
+    /**
+     * @var string[]	Array of error strings
+     */
+    public $errors=array();
 
-	/**
-	 * @var int
-	 * @see fetch_barcode()
-	 */
-	public $barcode_type;
-
-	/**
-	 * @var string
-	 * @see fetch_barcode(), barcode_type
-	 */
-	public $barcode_type_code;
-
-	/**
-	 * @var string
-	 * @see fetch_barcode(), barcode_type
-	 */
-	public $barcode_type_label;
-
-	/**
-	 * @var string
-	 * @see fetch_barcode(), barcode_type
-	 */
-	public $barcode_type_coder;
-
-	/**
-	 * @var int Payment method ID (cheque, cash, ...)
-	 * @see setPaymentMethods()
-	 */
-	public $mode_reglement_id;
-
-	/**
-	 * @var int Payment terms ID
-	 * @see setPaymentTerms()
-	 */
-	public $cond_reglement_id;
-
-	/**
-	 * @var int Payment terms ID
-	 * @deprecated Kept for compatibility
-	 * @see cond_reglement_id;
-	 */
-	public $cond_reglement;
-
-	/**
-	 * @var int Delivery address ID
-	 * @deprecated
-	 * @see setDeliveryAddress()
-	 */
-	public $fk_delivery_address;
-
-	/**
-	 * @var int Shipping method ID
-	 * @see setShippingMethod()
-	 */
-	public $shipping_method_id;
-
-	/**
-	 * @var string
-	 * @see SetDocModel()
-	 */
-	public $modelpdf;
-
-	/**
-	 * @var int Bank account ID
-	 * @see SetBankAccount()
-	 */
-	public $fk_account;
-
-	/**
-	 * @var string Public note
-	 * @see update_note()
-	 */
-	public $note_public;
-
-	/**
-	 * @var string Private note
-	 * @see update_note()
-	 */
-	public $note_private;
-
-	/**
-	 * @deprecated
-	 * @see note_public
-	 */
-	public $note;
-
-	/**
-	 * @var float Total amount before taxes
-	 * @see update_price()
-	 */
-	public $total_ht;
-
-	/**
-	 * @var float Total VAT amount
-	 * @see update_price()
-	 */
-	public $total_tva;
-
-	/**
-	 * @var float Total local tax 1 amount
-	 * @see update_price()
-	 */
-	public $total_localtax1;
-
-	/**
-	 * @var float Total local tax 2 amount
-	 * @see update_price()
-	 */
-	public $total_localtax2;
-
-	/**
-	 * @var float Total amount with taxes
-	 * @see update_price()
-	 */
-	public $total_ttc;
-
-	/**
-	 * @var CommonObjectLine[]
-	 */
-	public $lines;
-
-	/**
-	 * @var mixed		Contains comments
-	 * @see fetchComments()
-	 */
-	public $comments=array();
-
-	/**
-	 * @var int
-	 * @see setIncoterms()
-	 */
-	public $fk_incoterms;
-
-	/**
-	 * @var string
-	 * @see SetIncoterms()
-	 */
-	public $libelle_incoterms;
-
-	/**
-	 * @var string
-	 * @see display_incoterms()
-	 */
-	public $location_incoterms;
-
-	public $name;
-	public $lastname;
-	public $firstname;
-	public $civility_id;
-
-	// Dates
-	public $date_creation;			// Date creation
-	public $date_validation;		// Date validation
-	public $date_modification;		// Date last change (tms field)
-
-
-
-	// No constructor as it is an abstract class
-
-	/**
-	 * Check an object id/ref exists
-	 * If you don't need/want to instantiate object and just need to know if object exists, use this method instead of fetch
-	 *
-	 *  @param	string	$element   	String of element ('product', 'facture', ...)
-	 *  @param	int		$id      	Id of object
-	 *  @param  string	$ref     	Ref of object to check
-	 *  @param	string	$ref_ext	Ref ext of object to check
-	 *  @return int     			<0 if KO, 0 if OK but not found, >0 if OK and exists
-	 */
-	static function isExistingObject($element, $id, $ref='', $ref_ext='')
-	{
-		global $db,$conf;
-
-		$sql = "SELECT rowid, ref, ref_ext";
-		$sql.= " FROM ".MAIN_DB_PREFIX.$element;
-		$sql.= " WHERE entity IN (".getEntity($element).")" ;
-
-		if ($id > 0) $sql.= " AND rowid = ".$db->escape($id);
-		else if ($ref) $sql.= " AND ref = '".$db->escape($ref)."'";
-		else if ($ref_ext) $sql.= " AND ref_ext = '".$db->escape($ref_ext)."'";
-		else {
-			$error='ErrorWrongParameters';
-			dol_print_error(get_class()."::isExistingObject ".$error, LOG_ERR);
-			return -1;
-		}
-		if ($ref || $ref_ext) $sql.= " AND entity = ".$conf->entity;
-
-		dol_syslog(get_class()."::isExistingObject", LOG_DEBUG);
-		$resql = $db->query($sql);
-		if ($resql)
-		{
-			$num=$db->num_rows($resql);
-			if ($num > 0) return 1;
-			else return 0;
-		}
-		return -1;
-	}
-
-	/**
-	 * Method to output saved errors
-	 *
-	 * @return	string		String with errors
-	 */
-	function errorsToString()
-	{
-		return $this->error.(is_array($this->errors)?(($this->error!=''?', ':'').join(', ',$this->errors)):'');
-	}
-
-	/**
-	 *	Return full name (civility+' '+name+' '+lastname)
-	 *
-	 *	@param	Translate	$langs			Language object for translation of civility (used only if option is 1)
-	 *	@param	int			$option			0=No option, 1=Add civility
-	 * 	@param	int			$nameorder		-1=Auto, 0=Lastname+Firstname, 1=Firstname+Lastname, 2=Firstname
-	 * 	@param	int			$maxlen			Maximum length
-	 * 	@return	string						String with full name
-	 */
-	function getFullName($langs,$option=0,$nameorder=-1,$maxlen=0)
-	{
-		//print "lastname=".$this->lastname." name=".$this->name." nom=".$this->nom."<br>\n";
-		$lastname=$this->lastname;
-		$firstname=$this->firstname;
-		if (empty($lastname))  $lastname=(isset($this->lastname)?$this->lastname:(isset($this->name)?$this->name:(isset($this->nom)?$this->nom:(isset($this->societe)?$this->societe:(isset($this->company)?$this->company:'')))));
-
-		$ret='';
-		if ($option && $this->civility_id)
-		{
-			if ($langs->transnoentitiesnoconv("Civility".$this->civility_id)!="Civility".$this->civility_id) $ret.=$langs->transnoentitiesnoconv("Civility".$this->civility_id).' ';
-			else $ret.=$this->civility_id.' ';
-		}
-
-		$ret.=dolGetFirstLastname($firstname, $lastname, $nameorder);
-
-		return dol_trunc($ret,$maxlen);
-	}
-
-	/**
-	 * 	Return full address of contact
-	 *
-	 * 	@param		int			$withcountry		1=Add country into address string
-	 *  @param		string		$sep				Separator to use to build string
-	 *  @param		int		    $withregion			1=Add region into address string
-	 *	@return		string							Full address string
-	 */
-	function getFullAddress($withcountry=0, $sep="\n", $withregion=0)
-	{
-		if ($withcountry && $this->country_id && (empty($this->country_code) || empty($this->country)))
-		{
-			require_once DOL_DOCUMENT_ROOT .'/core/lib/company.lib.php';
-			$tmparray=getCountry($this->country_id,'all');
-			$this->country_code=$tmparray['code'];
-			$this->country     =$tmparray['label'];
-		}
+    /**
+     * @var string ID to identify managed object
+     */
+    public $element;
 
-        if ($withregion && $this->state_id && (empty($this->state_code) || empty($this->state) || empty($this->region) || empty($this->region_cpde)))
-    	{
-    		require_once DOL_DOCUMENT_ROOT .'/core/lib/company.lib.php';
-    		$tmparray=getState($this->state_id,'all',0,1);
-			$this->state_code   =$tmparray['code'];
-			$this->state        =$tmparray['label'];
-			$this->region_code  =$tmparray['region_code'];
-			$this->region       =$tmparray['region'];
-        }
-
-		return dol_format_address($this, $withcountry, $sep);
-	}
-
-
-	/**
-	 * 	Return full address for banner
-	 *
-	 * 	@param		string		$htmlkey            HTML id to make banner content unique
-	 *  @param      Object      $object				Object (thirdparty, thirdparty of contact for contact, null for a member)
-	 *	@return		string							Full address string
-	 */
-	function getBannerAddress($htmlkey, $object)
-	{
-		global $conf, $langs;
-
-		$countriesusingstate=array('AU','US','IN','GB','ES','UK','TR');    // See also option MAIN_FORCE_STATE_INTO_ADDRESS
-
-		$contactid=0;
-		$thirdpartyid=0;
-		if ($this->element == 'societe')
-		{
-			$thirdpartyid=$this->id;
-		}
-		if ($this->element == 'contact')
-		{
-			$contactid=$this->id;
-			$thirdpartyid=$object->fk_soc;
-		}
-		if ($this->element == 'user')
-		{
-			$contactid=$this->contact_id;
-			$thirdpartyid=$object->fk_soc;
-		}
-
-		$out='<!-- BEGIN part to show address block -->';
-
-		$outdone=0;
-		$coords = $this->getFullAddress(1,', ',$conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT);
-		if ($coords)
-		{
-			if (! empty($conf->use_javascript_ajax))
-			{
-				$namecoords = $this->getFullName($langs,1).'<br>'.$coords;
-				// hideonsmatphone because copyToClipboard call jquery dialog that does not work with jmobile
-				$out.='<a href="#" class="hideonsmartphone" onclick="return copyToClipboard(\''.dol_escape_js($namecoords).'\',\''.dol_escape_js($langs->trans("HelpCopyToClipboard")).'\');">';
-				$out.=img_picto($langs->trans("Address"), 'object_address.png');
-				$out.='</a> ';
-			}
-			$out.=dol_print_address($coords, 'address_'.$htmlkey.'_'.$this->id, $this->element, $this->id, 1, ', '); $outdone++;
-			$outdone++;
-		}
-
-		if (! in_array($this->country_code,$countriesusingstate) && empty($conf->global->MAIN_FORCE_STATE_INTO_ADDRESS)   // If MAIN_FORCE_STATE_INTO_ADDRESS is on, state is already returned previously with getFullAddress
-				&& empty($conf->global->SOCIETE_DISABLE_STATE) && $this->state)
-		{
-            if (!empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) && $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 1 && $this->region) {
-                $out.=($outdone?' - ':'').$this->region.' - '.$this->state;
-            }
-            else {
-                $out.=($outdone?' - ':'').$this->state;
-            }
-			$outdone++;
-		}
-
-		if (! empty($this->phone) || ! empty($this->phone_pro) || ! empty($this->phone_mobile) || ! empty($this->phone_perso) || ! empty($this->fax) || ! empty($this->office_phone) || ! empty($this->user_mobile) || ! empty($this->office_fax)) $out.=($outdone?'<br>':'');
-		if (! empty($this->phone) && empty($this->phone_pro)) {		// For objects that store pro phone into ->phone
-			$out.=dol_print_phone($this->phone,$this->country_code,$contactid,$thirdpartyid,'AC_TEL','&nbsp;','phone',$langs->trans("PhonePro")); $outdone++;
-		}
-		if (! empty($this->phone_pro)) {
-			$out.=dol_print_phone($this->phone_pro,$this->country_code,$contactid,$thirdpartyid,'AC_TEL','&nbsp;','phone',$langs->trans("PhonePro")); $outdone++;
-		}
-		if (! empty($this->phone_mobile)) {
-			$out.=dol_print_phone($this->phone_mobile,$this->country_code,$contactid,$thirdpartyid,'AC_TEL','&nbsp;','mobile',$langs->trans("PhoneMobile")); $outdone++;
-		}
-		if (! empty($this->phone_perso)) {
-			$out.=dol_print_phone($this->phone_perso,$this->country_code,$contactid,$thirdpartyid,'AC_TEL','&nbsp;','phone',$langs->trans("PhonePerso")); $outdone++;
-		}
-		if (! empty($this->office_phone)) {
-			$out.=dol_print_phone($this->office_phone,$this->country_code,$contactid,$thirdpartyid,'AC_TEL','&nbsp;','phone',$langs->trans("PhonePro")); $outdone++;
-		}
-		if (! empty($this->user_mobile)) {
-			$out.=dol_print_phone($this->user_mobile,$this->country_code,$contactid,$thirdpartyid,'AC_TEL','&nbsp;','mobile',$langs->trans("PhoneMobile")); $outdone++;
-		}
-		if (! empty($this->fax)) {
-			$out.=dol_print_phone($this->fax,$this->country_code,$contactid,$thirdpartyid,'AC_FAX','&nbsp;','fax',$langs->trans("Fax")); $outdone++;
-		}
-		if (! empty($this->office_fax)) {
-			$out.=dol_print_phone($this->office_fax,$this->country_code,$contactid,$thirdpartyid,'AC_FAX','&nbsp;','fax',$langs->trans("Fax")); $outdone++;
-		}
-
-		$out.='<div style="clear: both;"></div>';
-		$outdone=0;
-		if (! empty($this->email))
-		{
-			$out.=dol_print_email($this->email,$this->id,$object->id,'AC_EMAIL',0,0,1);
-			$outdone++;
-		}
-		if (! empty($this->url))
-		{
-			$out.=dol_print_url($this->url,'_goout',0,1);
-			$outdone++;
-		}
-		$out.='<div style="clear: both;">';
-		if (! empty($conf->socialnetworks->enabled))
-		{
-			if ($this->skype) $out.=dol_print_socialnetworks($this->skype,$this->id,$object->id,'skype');
-			$outdone++;
-			if ($this->jabberid) $out.=dol_print_socialnetworks($this->jabberid,$this->id,$object->id,'jabber');
-			$outdone++;
-			if ($this->twitter) $out.=dol_print_socialnetworks($this->twitter,$this->id,$object->id,'twitter');
-			$outdone++;
-			if ($this->facebook) $out.=dol_print_socialnetworks($this->facebook,$this->id,$object->id,'facebook');
-			$outdone++;
-		}
-		$out.='</div>';
-
-		$out.='<!-- END Part to show address block -->';
-
-		return $out;
-	}
-
-	/**
-	 * Return the link of last main doc file for direct public download.
-	 *
-	 * @param	string	$modulepart			Module related to document
-	 * @param	int		$initsharekey		Init the share key if it was not yet defined
-	 * @param	int		$relativelink		0=Return full external link, 1=Return link relative to root of file
-	 * @return	string						Link or empty string if there is no download link
-	 */
-	function getLastMainDocLink($modulepart, $initsharekey=0, $relativelink=0)
-	{
-		global $user, $dolibarr_main_url_root;
-
-		if (empty($this->last_main_doc))
-		{
-			return '';		// No way to known which document name to use
-		}
-
-		include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
-		$ecmfile=new EcmFiles($this->db);
-		$result = $ecmfile->fetch(0, '', $this->last_main_doc);
-		if ($result < 0)
-		{
-			$this->error = $ecmfile->error;
-			$this->errors = $ecmfile->errors;
-			return -1;
-		}
-
-		if (empty($ecmfile->id))
-		{
-			// Add entry into index
-			if ($initsharekey)
-			{
-				require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
-				// TODO We can't, we dont' have full path of file, only last_main_doc adn ->element, so we must rebuild full path first
-				/*
-				$ecmfile->filepath = $rel_dir;
-				$ecmfile->filename = $filename;
-				$ecmfile->label = md5_file(dol_osencode($destfull));	// hash of file content
-				$ecmfile->fullpath_orig = '';
-				$ecmfile->gen_or_uploaded = 'generated';
-				$ecmfile->description = '';    // indexed content
-				$ecmfile->keyword = '';        // keyword content
-				$ecmfile->share = getRandomPassword(true);
-				$result = $ecmfile->create($user);
-				if ($result < 0)
-				{
-					$this->error = $ecmfile->error;
-					$this->errors = $ecmfile->errors;
-				}
-				*/
-			}
-			else return '';
-		}
-		elseif (empty($ecmfile->share))
-		{
-			// Add entry into index
-			if ($initsharekey)
-			{
-				require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
-				$ecmfile->share = getRandomPassword(true);
-				$ecmfile->update($user);
-			}
-			else return '';
-		}
-
-		// Define $urlwithroot
-		$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
-		$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
-		//$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
-
-		$forcedownload=0;
-
-		$paramlink='';
-		//if (! empty($modulepart)) $paramlink.=($paramlink?'&':'').'modulepart='.$modulepart;		// For sharing with hash (so public files), modulepart is not required.
-		//if (! empty($ecmfile->entity)) $paramlink.='&entity='.$ecmfile->entity; 					// For sharing with hash (so public files), entity is not required.
-		//$paramlink.=($paramlink?'&':'').'file='.urlencode($filepath);								// No need of name of file for public link, we will use the hash
-		if (! empty($ecmfile->share)) $paramlink.=($paramlink?'&':'').'hashp='.$ecmfile->share;			// Hash for public share
-		if ($forcedownload) $paramlink.=($paramlink?'&':'').'attachment=1';
-
-		if ($relativelink)
-		{
-			$linktoreturn='document.php'.($paramlink?'?'.$paramlink:'');
-		}
-		else
-		{
-			$linktoreturn=$urlwithroot.'/document.php'.($paramlink?'?'.$paramlink:'');
-		}
-
-		// Here $ecmfile->share is defined
-		return $linktoreturn;
-	}
+    /**
+     * @var string Name of table without prefix where object is stored
+     */
+    public $table_element;
 
+    /**
+     * @var int    Name of subtable line
+     */
+    public $table_element_line='';
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Add a link between element $this->element and a contact
-	 *
-	 *  @param	int		$fk_socpeople       Id of thirdparty contact (if source = 'external') or id of user (if souce = 'internal') to link
-	 *  @param 	int		$type_contact 		Type of contact (code or id). Must be id or code found into table llx_c_type_contact. For example: SALESREPFOLL
-	 *  @param  string	$source             external=Contact extern (llx_socpeople), internal=Contact intern (llx_user)
-	 *  @param  int		$notrigger			Disable all triggers
-	 *  @return int                 		<0 if KO, >0 if OK
-	 */
-	function add_contact($fk_socpeople, $type_contact, $source='external',$notrigger=0)
-	{
-        // phpcs:enable
-		global $user,$langs;
-
-
-		dol_syslog(get_class($this)."::add_contact $fk_socpeople, $type_contact, $source, $notrigger");
-
-		// Check parameters
-		if ($fk_socpeople <= 0)
-		{
-			$langs->load("errors");
-			$this->error=$langs->trans("ErrorWrongValueForParameterX","1");
-			dol_syslog(get_class($this)."::add_contact ".$this->error,LOG_ERR);
-			return -1;
-		}
-		if (! $type_contact)
-		{
-			$langs->load("errors");
-			$this->error=$langs->trans("ErrorWrongValueForParameterX","2");
-			dol_syslog(get_class($this)."::add_contact ".$this->error,LOG_ERR);
-			return -2;
-		}
-
-		$id_type_contact=0;
-		if (is_numeric($type_contact))
-		{
-			$id_type_contact=$type_contact;
-		}
-		else
-		{
-			// We look for id type_contact
-			$sql = "SELECT tc.rowid";
-			$sql.= " FROM ".MAIN_DB_PREFIX."c_type_contact as tc";
-			$sql.= " WHERE tc.element='".$this->db->escape($this->element)."'";
-			$sql.= " AND tc.source='".$this->db->escape($source)."'";
-			$sql.= " AND tc.code='".$this->db->escape($type_contact)."' AND tc.active=1";
-			//print $sql;
-			$resql=$this->db->query($sql);
-			if ($resql)
-			{
-				$obj = $this->db->fetch_object($resql);
-				if ($obj) $id_type_contact=$obj->rowid;
-			}
-		}
-
-		if ($id_type_contact == 0)
-		{
-			$this->error='CODE_NOT_VALID_FOR_THIS_ELEMENT';
-			dol_syslog("CODE_NOT_VALID_FOR_THIS_ELEMENT: Code type of contact '".$type_contact."' does not exists or is not active for element ".$this->element.", we can ignore it");
-			return -3;
-		}
-
-		$datecreate = dol_now();
-
-		// Socpeople must have already been added by some trigger, then we have to check it to avoid DB_ERROR_RECORD_ALREADY_EXISTS error
-		$TListeContacts=$this->liste_contact(-1, $source);
-		$already_added=false;
-		if(!empty($TListeContacts)) {
-			foreach($TListeContacts as $array_contact) {
-				if($array_contact['status'] == 4 && $array_contact['id'] == $fk_socpeople && $array_contact['fk_c_type_contact'] == $id_type_contact) {
-					$already_added=true;
-					break;
-				}
-			}
-		}
+    /**
+     * @var string		Key value used to track if data is coming from import wizard
+     */
+    public $import_key;
 
-		if(!$already_added) {
+    /**
+     * @var mixed		Contains data to manage extrafields
+     */
+    public $array_options=array();
 
-			$this->db->begin();
+    /**
+     * @var int[][]		Array of linked objects ids. Loaded by ->fetchObjectLinked
+     */
+    public $linkedObjectsIds;
 
-			// Insert into database
-			$sql = "INSERT INTO ".MAIN_DB_PREFIX."element_contact";
-			$sql.= " (element_id, fk_socpeople, datecreate, statut, fk_c_type_contact) ";
-			$sql.= " VALUES (".$this->id.", ".$fk_socpeople." , " ;
-			$sql.= "'".$this->db->idate($datecreate)."'";
-			$sql.= ", 4, ". $id_type_contact;
-			$sql.= ")";
+    /**
+     * @var mixed		Array of linked objects. Loaded by ->fetchObjectLinked
+     */
+    public $linkedObjects;
 
-			$resql=$this->db->query($sql);
-			if ($resql)
-			{
-				if (! $notrigger)
-				{
-					$result=$this->call_trigger(strtoupper($this->element).'_ADD_CONTACT', $user);
-					if ($result < 0)
-					{
-						$this->db->rollback();
-						return -1;
-					}
-				}
+    /**
+     * @var Object      To store a cloned copy of object before to edit it and keep track of old properties
+     */
+    public $oldcopy;
 
-				$this->db->commit();
-				return 1;
-			}
-			else
-			{
-				if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
-				{
-					$this->error=$this->db->errno();
-					$this->db->rollback();
-					echo 'err rollback';
-					return -2;
-				}
-				else
-				{
-					$this->error=$this->db->error();
-					$this->db->rollback();
-					return -1;
-				}
-			}
-		} else return 0;
-	}
+    /**
+     * @var string		Column name of the ref field.
+     */
+    protected $table_ref_field = '';
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *    Copy contact from one element to current
-	 *
-	 *    @param    CommonObject    $objFrom    Source element
-	 *    @param    string          $source     Nature of contact ('internal' or 'external')
-	 *    @return   int                         >0 if OK, <0 if KO
-	 */
-	function copy_linked_contact($objFrom, $source='internal')
-	{
-        // phpcs:enable
-		$contacts = $objFrom->liste_contact(-1, $source);
-		foreach($contacts as $contact)
-		{
-			if ($this->add_contact($contact['id'], $contact['fk_c_type_contact'], $contact['source']) < 0)
-			{
-				$this->error=$this->db->lasterror();
-				return -1;
-			}
-		}
-		return 1;
-	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *      Update a link to contact line
-	 *
-	 *      @param	int		$rowid              Id of line contact-element
-	 * 		@param	int		$statut	            New status of link
-	 *      @param  int		$type_contact_id    Id of contact type (not modified if 0)
-	 *      @param  int		$fk_socpeople	    Id of soc_people to update (not modified if 0)
-	 *      @return int                 		<0 if KO, >= 0 if OK
-	 */
-	function update_contact($rowid, $statut, $type_contact_id=0, $fk_socpeople=0)
-	{
-        // phpcs:enable
-		// Insert into database
-		$sql = "UPDATE ".MAIN_DB_PREFIX."element_contact set";
-		$sql.= " statut = ".$statut;
-		if ($type_contact_id) $sql.= ", fk_c_type_contact = '".$type_contact_id ."'";
-		if ($fk_socpeople) $sql.= ", fk_socpeople = '".$fk_socpeople ."'";
-		$sql.= " where rowid = ".$rowid;
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			return 0;
-		}
-		else
-		{
-			$this->error=$this->db->lasterror();
-			return -1;
-		}
-	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *    Delete a link to contact line
-	 *
-	 *    @param	int		$rowid			Id of contact link line to delete
-	 *    @param	int		$notrigger		Disable all triggers
-	 *    @return   int						>0 if OK, <0 if KO
-	 */
-	function delete_contact($rowid, $notrigger=0)
-	{
-        // phpcs:enable
-		global $user;
+    // Following vars are used by some objects only. We keep this property here in CommonObject to be able to provide common method using them.
 
+    /**
+     * @var array<string,mixed>		Can be used to pass information when only object is provided to method
+     */
+    public $context=array();
 
-		$this->db->begin();
+    /**
+     * @var string		Contains canvas name if record is an alternative canvas record
+     */
+    public $canvas;
 
-		$sql = "DELETE FROM ".MAIN_DB_PREFIX."element_contact";
-		$sql.= " WHERE rowid =".$rowid;
+    /**
+     * @var Project The related project
+     * @see fetch_projet()
+     */
+    public $project;
 
-		dol_syslog(get_class($this)."::delete_contact", LOG_DEBUG);
-		if ($this->db->query($sql))
-		{
-			if (! $notrigger)
-			{
-				$result=$this->call_trigger(strtoupper($this->element).'_DELETE_CONTACT', $user);
-				if ($result < 0) { $this->db->rollback(); return -1; }
-			}
-
-			$this->db->commit();
-			return 1;
-		}
-		else
-		{
-			$this->error=$this->db->lasterror();
-			$this->db->rollback();
-			return -1;
-		}
-	}
+    /**
+     * @var int The related project ID
+     * @see setProject(), project
+     */
+    public $fk_project;
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *    Delete all links between an object $this and all its contacts
-	 *
-	 *	  @param	string	$source		'' or 'internal' or 'external'
-	 *	  @param	string	$code		Type of contact (code or id)
-	 *    @return   int					>0 if OK, <0 if KO
-	 */
-	function delete_linked_contact($source='',$code='')
-	{
-        // phpcs:enable
-		$temp = array();
-		$typeContact = $this->liste_type_contact($source,'',0,0,$code);
-
-		foreach($typeContact as $key => $value)
-		{
-			array_push($temp,$key);
-		}
-		$listId = implode(",", $temp);
-
-		$sql = "DELETE FROM ".MAIN_DB_PREFIX."element_contact";
-		$sql.= " WHERE element_id = ".$this->id;
-		if ($listId)
-			$sql.= " AND fk_c_type_contact IN (".$listId.")";
-
-		dol_syslog(get_class($this)."::delete_linked_contact", LOG_DEBUG);
-		if ($this->db->query($sql))
-		{
-			return 1;
-		}
-		else
-		{
-			$this->error=$this->db->lasterror();
-			return -1;
-		}
-	}
+    /**
+     * @deprecated
+     * @see project
+     */
+    public $projet;
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *    Get array of all contacts for an object
-	 *
-	 *    @param	int			$statut		Status of links to get (-1=all)
-	 *    @param	string		$source		Source of contact: external or thirdparty (llx_socpeople) or internal (llx_user)
-	 *    @param	int         $list       0:Return array contains all properties, 1:Return array contains just id
-	 *    @param    string      $code       Filter on this code of contact type ('SHIPPING', 'BILLING', ...)
-	 *    @return	array|int		        Array of contacts, -1 if error
-	 */
-	function liste_contact($statut=-1,$source='external',$list=0,$code='')
-	{
-        // phpcs:enable
-		global $langs;
-
-		$tab=array();
-
-		$sql = "SELECT ec.rowid, ec.statut as statuslink, ec.fk_socpeople as id, ec.fk_c_type_contact";    // This field contains id of llx_socpeople or id of llx_user
-		if ($source == 'internal') $sql.=", '-1' as socid, t.statut as statuscontact, t.login, t.photo";
-		if ($source == 'external' || $source == 'thirdparty') $sql.=", t.fk_soc as socid, t.statut as statuscontact";
-		$sql.= ", t.civility as civility, t.lastname as lastname, t.firstname, t.email";
-		$sql.= ", tc.source, tc.element, tc.code, tc.libelle";
-		$sql.= " FROM ".MAIN_DB_PREFIX."c_type_contact tc";
-		$sql.= ", ".MAIN_DB_PREFIX."element_contact ec";
-		if ($source == 'internal') $sql.=" LEFT JOIN ".MAIN_DB_PREFIX."user t on ec.fk_socpeople = t.rowid";
-		if ($source == 'external'|| $source == 'thirdparty') $sql.=" LEFT JOIN ".MAIN_DB_PREFIX."socpeople t on ec.fk_socpeople = t.rowid";
-		$sql.= " WHERE ec.element_id =".$this->id;
-		$sql.= " AND ec.fk_c_type_contact=tc.rowid";
-		$sql.= " AND tc.element='".$this->db->escape($this->element)."'";
-		if ($code) $sql.= " AND tc.code = '".$this->db->escape($code)."'";
-		if ($source == 'internal') $sql.= " AND tc.source = 'internal'";
-		if ($source == 'external' || $source == 'thirdparty') $sql.= " AND tc.source = 'external'";
-		$sql.= " AND tc.active=1";
-		if ($statut >= 0) $sql.= " AND ec.statut = '".$statut."'";
-		$sql.=" ORDER BY t.lastname ASC";
-
-		dol_syslog(get_class($this)."::liste_contact", LOG_DEBUG);
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			$num=$this->db->num_rows($resql);
-			$i=0;
-			while ($i < $num)
-			{
-				$obj = $this->db->fetch_object($resql);
+    /**
+     * @var Contact a related contact
+     * @see fetch_contact()
+     */
+    public $contact;
 
-				if (! $list)
-				{
-					$transkey="TypeContact_".$obj->element."_".$obj->source."_".$obj->code;
-					$libelle_type=($langs->trans($transkey)!=$transkey ? $langs->trans($transkey) : $obj->libelle);
-					$tab[$i]=array('source'=>$obj->source,'socid'=>$obj->socid,'id'=>$obj->id,
-								   'nom'=>$obj->lastname,      // For backward compatibility
-								   'civility'=>$obj->civility, 'lastname'=>$obj->lastname, 'firstname'=>$obj->firstname, 'email'=>$obj->email, 'login'=>$obj->login, 'photo'=>$obj->photo, 'statuscontact'=>$obj->statuscontact,
-								   'rowid'=>$obj->rowid, 'code'=>$obj->code, 'libelle'=>$libelle_type, 'status'=>$obj->statuslink, 'fk_c_type_contact'=>$obj->fk_c_type_contact);
-				}
-				else
-				{
-					$tab[$i]=$obj->id;
-				}
+    /**
+     * @var int The related contact ID
+     * @see fetch_contact()
+     */
+    public $contact_id;
 
-				$i++;
-			}
-
-			return $tab;
-		}
-		else
-		{
-			$this->error=$this->db->lasterror();
-			dol_print_error($this->db);
-			return -1;
-		}
-	}
-
-
-	/**
-	 * 		Update status of a contact linked to object
-	 *
-	 * 		@param	int		$rowid		Id of link between object and contact
-	 * 		@return	int					<0 if KO, >=0 if OK
-	 */
-	function swapContactStatus($rowid)
-	{
-		$sql = "SELECT ec.datecreate, ec.statut, ec.fk_socpeople, ec.fk_c_type_contact,";
-		$sql.= " tc.code, tc.libelle";
-		//$sql.= ", s.fk_soc";
-		$sql.= " FROM (".MAIN_DB_PREFIX."element_contact as ec, ".MAIN_DB_PREFIX."c_type_contact as tc)";
-		//$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople as s ON ec.fk_socpeople=s.rowid";	// Si contact de type external, alors il est lie a une societe
-		$sql.= " WHERE ec.rowid =".$rowid;
-		$sql.= " AND ec.fk_c_type_contact=tc.rowid";
-		$sql.= " AND tc.element = '".$this->db->escape($this->element)."'";
-
-		dol_syslog(get_class($this)."::swapContactStatus", LOG_DEBUG);
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			$obj = $this->db->fetch_object($resql);
-			$newstatut = ($obj->statut == 4) ? 5 : 4;
-			$result = $this->update_contact($rowid, $newstatut);
-			$this->db->free($resql);
-			return $result;
-		}
-		else
-		{
-			$this->error=$this->db->error();
-			dol_print_error($this->db);
-			return -1;
-		}
-	}
+    /**
+     * @var Societe A related thirdparty
+     * @see fetch_thirdparty()
+     */
+    public $thirdparty;
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *      Return array with list of possible values for type of contacts
-	 *
-	 *      @param	string	$source     'internal', 'external' or 'all'
-	 *      @param	string	$order		Sort order by : 'position', 'code', 'rowid'...
-	 *      @param  int		$option     0=Return array id->label, 1=Return array code->label
-	 *      @param  int		$activeonly 0=all status of contact, 1=only the active
-	 *		@param	string	$code		Type of contact (Example: 'CUSTOMER', 'SERVICE')
-	 *      @return array       		Array list of type of contacts (id->label if option=0, code->label if option=1)
-	 */
-	function liste_type_contact($source='internal', $order='position', $option=0, $activeonly=0, $code='')
-	{
-        // phpcs:enable
-		global $langs;
-
-		if (empty($order)) $order='position';
-		if ($order == 'position') $order.=',code';
-
-		$tab = array();
-		$sql = "SELECT DISTINCT tc.rowid, tc.code, tc.libelle, tc.position";
-		$sql.= " FROM ".MAIN_DB_PREFIX."c_type_contact as tc";
-		$sql.= " WHERE tc.element='".$this->db->escape($this->element)."'";
-		if ($activeonly == 1) $sql.= " AND tc.active=1"; // only the active types
-		if (! empty($source) && $source != 'all') $sql.= " AND tc.source='".$this->db->escape($source)."'";
-		if (! empty($code)) $sql.= " AND tc.code='".$this->db->escape($code)."'";
-		$sql.= $this->db->order($order,'ASC');
-
-		//print "sql=".$sql;
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			$num=$this->db->num_rows($resql);
-			$i=0;
-			while ($i < $num)
-			{
-				$obj = $this->db->fetch_object($resql);
-
-				$transkey="TypeContact_".$this->element."_".$source."_".$obj->code;
-				$libelle_type=($langs->trans($transkey)!=$transkey ? $langs->trans($transkey) : $obj->libelle);
-				if (empty($option)) $tab[$obj->rowid]=$libelle_type;
-				else $tab[$obj->code]=$libelle_type;
-				$i++;
-			}
-			return $tab;
-		}
-		else
-		{
-			$this->error=$this->db->lasterror();
-			//dol_print_error($this->db);
-			return null;
-		}
-	}
-
-	/**
-	 *      Return id of contacts for a source and a contact code.
-	 *      Example: contact client de facturation ('external', 'BILLING')
-	 *      Example: contact client de livraison ('external', 'SHIPPING')
-	 *      Example: contact interne suivi paiement ('internal', 'SALESREPFOLL')
-	 *
-	 *		@param	string	$source		'external' or 'internal'
-	 *		@param	string	$code		'BILLING', 'SHIPPING', 'SALESREPFOLL', ...
-	 *		@param	int		$status		limited to a certain status
-	 *      @return array       		List of id for such contacts
-	 */
-	function getIdContact($source,$code,$status=0)
-	{
-		global $conf;
-
-		$result=array();
-		$i=0;
-		//cas particulier pour les expeditions
-		if($this->element=='shipping' && $this->origin_id != 0) {
-			$id=$this->origin_id;
-			$element='commande';
-        } else if($this->element=='reception' && $this->origin_id != 0) {
-            $id=$this->origin_id;
-            $element='order_supplier';
-		} else {
-			$id=$this->id;
-			$element=$this->element;
-		}
-
-		$sql = "SELECT ec.fk_socpeople";
-		$sql.= " FROM ".MAIN_DB_PREFIX."element_contact as ec,";
-		if ($source == 'internal') $sql.= " ".MAIN_DB_PREFIX."user as c,";
-		if ($source == 'external') $sql.= " ".MAIN_DB_PREFIX."socpeople as c,";
-		$sql.= " ".MAIN_DB_PREFIX."c_type_contact as tc";
-		$sql.= " WHERE ec.element_id = ".$id;
-		$sql.= " AND ec.fk_socpeople = c.rowid";
-		if ($source == 'internal') $sql.= " AND c.entity IN (".getEntity('user').")";
-		if ($source == 'external') $sql.= " AND c.entity IN (".getEntity('societe').")";
-		$sql.= " AND ec.fk_c_type_contact = tc.rowid";
-		$sql.= " AND tc.element = '".$element."'";
-		$sql.= " AND tc.source = '".$source."'";
-		$sql.= " AND tc.code = '".$code."'";
-		$sql.= " AND tc.active = 1";
-		if ($status) $sql.= " AND ec.statut = ".$status;
-
-		dol_syslog(get_class($this)."::getIdContact", LOG_DEBUG);
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			while ($obj = $this->db->fetch_object($resql))
-			{
-				$result[$i]=$obj->fk_socpeople;
-				$i++;
-			}
-		}
-		else
-		{
-			$this->error=$this->db->error();
-			return null;
-		}
-
-		return $result;
-	}
+    /**
+     * @var User A related user
+     * @see fetch_user()
+     */
+    public $user;
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *		Load object contact with id=$this->contactid into $this->contact
-	 *
-	 *		@param	int		$contactid      Id du contact. Use this->contactid if empty.
-	 *		@return	int						<0 if KO, >0 if OK
-	 */
-	function fetch_contact($contactid=null)
-	{
-        // phpcs:enable
-		if (empty($contactid)) $contactid=$this->contactid;
+    /**
+     * @var string 	The type of originating object ('commande', 'facture', ...)
+     * @see fetch_origin()
+     */
+    public $origin;
 
-		if (empty($contactid)) return 0;
+    /**
+     * @var int 	The id of originating object
+     * @see fetch_origin()
+     */
+    public $origin_id;
 
-		require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
-		$contact = new Contact($this->db);
-		$result=$contact->fetch($contactid);
-		$this->contact = $contact;
-		return $result;
-	}
+    /**
+     * @var string The object's reference
+     */
+    public $ref;
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *    	Load the third party of object, from id $this->socid or $this->fk_soc, into this->thirdparty
-	 *
-	 *		@param		int		$force_thirdparty_id	Force thirdparty id
-	 *		@return		int								<0 if KO, >0 if OK
-	 */
-	function fetch_thirdparty($force_thirdparty_id=0)
-	{
-        // phpcs:enable
-		global $conf;
+    /**
+     * @var string The object's previous reference
+     */
+    public $ref_previous;
 
-		if (empty($this->socid) && empty($this->fk_soc) && empty($this->fk_thirdparty) && empty($force_thirdparty_id))
-			return 0;
+    /**
+     * @var string The object's next reference
+     */
+    public $ref_next;
 
-		require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
+    /**
+     * @var string An external reference for the object
+     */
+    public $ref_ext;
 
-		$idtofetch = isset($this->socid) ? $this->socid : (isset($this->fk_soc) ? $this->fk_soc : $this->fk_thirdparty);
-		if ($force_thirdparty_id)
-			$idtofetch = $force_thirdparty_id;
+    /**
+     * @var int The object's status
+     * @see setStatut()
+     */
+    public $statut;
 
-		if ($idtofetch) {
-			$thirdparty = new Societe($this->db);
-			$result = $thirdparty->fetch($idtofetch);
-			$this->thirdparty = $thirdparty;
+    /**
+     * @var string
+     * @see getFullAddress()
+     */
+    public $country;
 
-			// Use first price level if level not defined for third party
-			if (!empty($conf->global->PRODUIT_MULTIPRICES) && empty($this->thirdparty->price_level)) {
-				$this->thirdparty->price_level = 1;
-			}
+    /**
+     * @var int
+     * @see getFullAddress(), country
+     */
+    public $country_id;
 
-			return $result;
-		} else
-			return -1;
-	}
+    /**
+     * @var string
+     * @see getFullAddress(), isInEEC(), country
+     */
+    public $country_code;
 
+    /**
+     * @var string
+     * @see getFullAddress()
+     */
+    public $state;
 
-	/**
-	 * Looks for an object with ref matching the wildcard provided
-	 * It does only work when $this->table_ref_field is set
-	 *
-	 * @param string $ref Wildcard
-	 * @return int >1 = OK, 0 = Not found or table_ref_field not defined, <0 = KO
-	 */
-	public function fetchOneLike($ref)
-	{
-		if (!$this->table_ref_field) {
-			return 0;
-		}
+    /**
+     * @var int
+     * @see getFullAddress(), state
+     */
+    public $state_id;
 
-		$sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.$this->table_element.' WHERE '.$this->table_ref_field.' LIKE "'.$this->db->escape($ref).'" LIMIT 1';
+    /**
+     * @var string
+     * @see getFullAddress(), state
+     */
+    public $state_code;
 
-		$query = $this->db->query($sql);
+    /**
+     * @var string
+     * @see getFullAddress(), region
+     */
+    public $region;
 
-		if (!$this->db->num_rows($query)) {
-			return 0;
-		}
+    /**
+     * @var string
+     * @see getFullAddress(), region
+     */
+    public $region_code;
 
-		$result = $this->db->fetch_object($query);
+    /**
+     * @var int
+     * @see fetch_barcode()
+     */
+    public $barcode_type;
 
-		return $this->fetch($result->rowid);
-	}
+    /**
+     * @var string
+     * @see fetch_barcode(), barcode_type
+     */
+    public $barcode_type_code;
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Load data for barcode into properties ->barcode_type*
-	 *	Properties ->barcode_type that is id of barcode. Type is used to find other properties, but
-	 *  if it is not defined, ->element must be defined to know default barcode type.
-	 *
-	 *	@return		int			<0 if KO, 0 if can't guess type of barcode (ISBN, EAN13...), >0 if OK (all barcode properties loaded)
-	 */
-	function fetch_barcode()
-	{
-        // phpcs:enable
-		global $conf;
+    /**
+     * @var string
+     * @see fetch_barcode(), barcode_type
+     */
+    public $barcode_type_label;
 
-		dol_syslog(get_class($this).'::fetch_barcode this->element='.$this->element.' this->barcode_type='.$this->barcode_type);
+    /**
+     * @var string
+     * @see fetch_barcode(), barcode_type
+     */
+    public $barcode_type_coder;
 
-		$idtype=$this->barcode_type;
-		if (empty($idtype) && $idtype != '0')	// If type of barcode no set, we try to guess. If set to '0' it means we forced to have type remain not defined
-		{
-			if ($this->element == 'product')      $idtype = $conf->global->PRODUIT_DEFAULT_BARCODE_TYPE;
-			else if ($this->element == 'societe') $idtype = $conf->global->GENBARCODE_BARCODETYPE_THIRDPARTY;
-			else dol_syslog('Call fetch_barcode with barcode_type not defined and cant be guessed', LOG_WARNING);
-		}
+    /**
+     * @var int Payment method ID (cheque, cash, ...)
+     * @see setPaymentMethods()
+     */
+    public $mode_reglement_id;
 
-		if ($idtype > 0)
-		{
-			if (empty($this->barcode_type) || empty($this->barcode_type_code) || empty($this->barcode_type_label) || empty($this->barcode_type_coder))    // If data not already loaded
-			{
-				$sql = "SELECT rowid, code, libelle as label, coder";
-				$sql.= " FROM ".MAIN_DB_PREFIX."c_barcode_type";
-				$sql.= " WHERE rowid = ".$idtype;
-				dol_syslog(get_class($this).'::fetch_barcode', LOG_DEBUG);
-				$resql = $this->db->query($sql);
-				if ($resql)
-				{
-					$obj = $this->db->fetch_object($resql);
-					$this->barcode_type       = $obj->rowid;
-					$this->barcode_type_code  = $obj->code;
-					$this->barcode_type_label = $obj->label;
-					$this->barcode_type_coder = $obj->coder;
-					return 1;
-				}
-				else
-				{
-					dol_print_error($this->db);
-					return -1;
-				}
-			}
-		}
-		return 0;
-	}
+    /**
+     * @var int Payment terms ID
+     * @see setPaymentTerms()
+     */
+    public $cond_reglement_id;
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *		Load the project with id $this->fk_project into this->project
-	 *
-	 *		@return		int			<0 if KO, >=0 if OK
-	 */
-	function fetch_projet()
-	{
-        // phpcs:enable
-		include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+    /**
+     * @var int Payment terms ID
+     * @deprecated Kept for compatibility
+     * @see cond_reglement_id;
+     */
+    public $cond_reglement;
 
-		if (empty($this->fk_project) && ! empty($this->fk_projet)) $this->fk_project = $this->fk_projet;	// For backward compatibility
-		if (empty($this->fk_project)) return 0;
+    /**
+     * @var int Delivery address ID
+     * @deprecated
+     * @see setDeliveryAddress()
+     */
+    public $fk_delivery_address;
 
-		$project = new Project($this->db);
-		$result = $project->fetch($this->fk_project);
+    /**
+     * @var int Shipping method ID
+     * @see setShippingMethod()
+     */
+    public $shipping_method_id;
 
-		$this->projet = $project;	// deprecated
-		$this->project = $project;
-		return $result;
-	}
+    /**
+     * @var string
+     * @see SetDocModel()
+     */
+    public $modelpdf;
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *		Load the product with id $this->fk_product into this->product
-	 *
-	 *		@return		int			<0 if KO, >=0 if OK
-	 */
-	function fetch_product()
-	{
-        // phpcs:enable
-		include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+    /**
+     * @var int Bank account ID
+     * @see SetBankAccount()
+     */
+    public $fk_account;
 
-		if (empty($this->fk_product)) return 0;
+    /**
+     * @var string Public note
+     * @see update_note()
+     */
+    public $note_public;
 
-		$product = new Product($this->db);
-		$result = $product->fetch($this->fk_product);
+    /**
+     * @var string Private note
+     * @see update_note()
+     */
+    public $note_private;
 
-		$this->product = $product;
-		return $result;
-	}
+    /**
+     * @deprecated
+     * @see note_public
+     */
+    public $note;
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *		Load the user with id $userid into this->user
-	 *
-	 *		@param	int		$userid 		Id du contact
-	 *		@return	int						<0 if KO, >0 if OK
-	 */
-	function fetch_user($userid)
-	{
-        // phpcs:enable
-		$user = new User($this->db);
-		$result=$user->fetch($userid);
-		$this->user = $user;
-		return $result;
-	}
+    /**
+     * @var float Total amount before taxes
+     * @see update_price()
+     */
+    public $total_ht;
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Read linked origin object
-	 *
-	 *	@return		void
-	 */
-	function fetch_origin()
-	{
-        // phpcs:enable
-		if ($this->origin == 'shipping') $this->origin = 'expedition';
-		if ($this->origin == 'delivery') $this->origin = 'livraison';
-        if ($this->origin == 'order_supplier') $this->origin = 'commandeFournisseur';
+    /**
+     * @var float Total VAT amount
+     * @see update_price()
+     */
+    public $total_tva;
 
-		$origin = $this->origin;
+    /**
+     * @var float Total local tax 1 amount
+     * @see update_price()
+     */
+    public $total_localtax1;
 
-		$classname = ucfirst($origin);
-		$this->$origin = new $classname($this->db);
-		$this->$origin->fetch($this->origin_id);
-	}
+    /**
+     * @var float Total local tax 2 amount
+     * @see update_price()
+     */
+    public $total_localtax2;
 
-	/**
-     *  Load object from specific field
-     *
-     *  @param	string	$table		Table element or element line
-     *  @param	string	$field		Field selected
-     *  @param	string	$key		Import key
-     *  @param	string	$element	Element name
-     *	@return	int					<0 if KO, >0 if OK
+    /**
+     * @var float Total amount with taxes
+     * @see update_price()
      */
-	function fetchObjectFrom($table, $field, $key, $element = null)
-	{
-		global $conf;
-
-		$result=false;
-
-		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX.$table;
-		$sql.= " WHERE ".$field." = '".$key."'";
-		if (! empty($element)) {
-			$sql.= " AND entity IN (".getEntity($element).")";
-		} else {
-			$sql.= " AND entity = ".$conf->entity;
-		}
-
-		dol_syslog(get_class($this).'::fetchObjectFrom', LOG_DEBUG);
-		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			$row = $this->db->fetch_row($resql);
-			// Test for avoid error -1
-			if ($row[0] > 0) {
-				$result = $this->fetch($row[0]);
-			}
-		}
-
-		return $result;
-	}
-
-	/**
-	 *	Getter generic. Load value from a specific field
-	 *
-	 *	@param	string	$table		Table of element or element line
-	 *	@param	int		$id			Element id
-	 *	@param	string	$field		Field selected
-	 *	@return	int					<0 if KO, >0 if OK
-	 */
-	function getValueFrom($table, $id, $field)
-	{
-		$result=false;
-		if (!empty($id) && !empty($field) && !empty($table)) {
-			$sql = "SELECT ".$field." FROM ".MAIN_DB_PREFIX.$table;
-			$sql.= " WHERE rowid = ".$id;
-
-			dol_syslog(get_class($this).'::getValueFrom', LOG_DEBUG);
-			$resql = $this->db->query($sql);
-			if ($resql)
-			{
-				$row = $this->db->fetch_row($resql);
-				$result = $row[0];
-			}
-		}
-		return $result;
-	}
-
-	/**
-	 *	Setter generic. Update a specific field into database.
-	 *  Warning: Trigger is run only if param trigkey is provided.
-	 *
-	 *	@param	string		$field			Field to update
-	 *	@param	mixed		$value			New value
-	 *	@param	string		$table			To force other table element or element line (should not be used)
-	 *	@param	int			$id				To force other object id (should not be used)
-	 *	@param	string		$format			Data format ('text', 'date'). 'text' is used if not defined
-	 *	@param	string		$id_field		To force rowid field name. 'rowid' is used if not defined
-	 *	@param	User|string	$fuser			Update the user of last update field with this user. If not provided, current user is used except if value is 'none'
-	 *  @param  string      $trigkey    	Trigger key to run (in most cases something like 'XXX_MODIFY')
-	 *  @param	string		$fk_user_field	Name of field to save user id making change
-	 *	@return	int							<0 if KO, >0 if OK
-	 *  @see updateExtraField
-	 */
-	function setValueFrom($field, $value, $table='', $id=null, $format='', $id_field='', $fuser=null, $trigkey='', $fk_user_field='fk_user_modif')
-	{
-		global $user,$langs,$conf;
-
-		if (empty($table)) 	  $table=$this->table_element;
-		if (empty($id))    	  $id=$this->id;
-		if (empty($format))   $format='text';
-		if (empty($id_field)) $id_field='rowid';
-
-		$error=0;
-
-		$this->db->begin();
-
-		// Special case
-		if ($table == 'product' && $field == 'note_private') $field='note';
-		if (in_array($table, array('actioncomm', 'adherent', 'advtargetemailing', 'cronjob', 'establishment'))) $fk_user_field = 'fk_user_mod';
-
-		$sql = "UPDATE ".MAIN_DB_PREFIX.$table." SET ";
-
-		if ($format == 'text') $sql.= $field." = '".$this->db->escape($value)."'";
-		else if ($format == 'int') $sql.= $field." = ".$this->db->escape($value);
-		else if ($format == 'date') $sql.= $field." = ".($value ? "'".$this->db->idate($value)."'" : "null");
-
-		if ($fk_user_field)
-		{
-			if (! empty($fuser) && is_object($fuser)) $sql.=", ".$fk_user_field." = ".$fuser->id;
-			elseif (empty($fuser) || $fuser != 'none') $sql.=", ".$fk_user_field." = ".$user->id;
-		}
-
-		$sql.= " WHERE ".$id_field." = ".$id;
-
-		dol_syslog(get_class($this)."::".__FUNCTION__."", LOG_DEBUG);
-		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			if ($trigkey)
-			{
-				// call trigger with updated object values
-				if (empty($this->fields) && method_exists($this, 'fetch'))
-				{
-					$result = $this->fetch($id);
-				}
-				else
-				{
-					$result = $this->fetchCommon($id);
-				}
-				if ($result >= 0) $result=$this->call_trigger($trigkey, (! empty($fuser) && is_object($fuser)) ? $fuser : $user);   // This may set this->errors
-				if ($result < 0) $error++;
-			}
+    public $total_ttc;
 
-			if (! $error)
-			{
-				if (property_exists($this, $field)) $this->$field = $value;
-				$this->db->commit();
-				return 1;
-			}
-			else
-			{
-				$this->db->rollback();
-				return -2;
-			}
-		}
-		else
-		{
-			$this->error=$this->db->lasterror();
-			$this->db->rollback();
-			return -1;
-		}
-	}
+    /**
+     * @var CommonObjectLine[]
+     */
+    public $lines;
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *      Load properties id_previous and id_next by comparing $fieldid with $this->ref
-	 *
-	 *      @param	string	$filter		Optional filter. Example: " AND (t.field1 = 'aa' OR t.field2 = 'bb')"
-	 *	 	@param  string	$fieldid   	Name of field to use for the select MAX and MIN
-	 *		@param	int		$nodbprefix	Do not include DB prefix to forge table name
-	 *      @return int         		<0 if KO, >0 if OK
-	 */
-	function load_previous_next_ref($filter, $fieldid, $nodbprefix=0)
-	{
-        // phpcs:enable
-		global $conf, $user;
-
-		if (! $this->table_element)
-		{
-			dol_print_error('',get_class($this)."::load_previous_next_ref was called on objet with property table_element not defined");
-			return -1;
-		}
-		if ($fieldid == 'none') return 1;
-
-		// Security on socid
-		$socid = 0;
-		if ($user->societe_id > 0) $socid = $user->societe_id;
-
-		// this->ismultientitymanaged contains
-		// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
-		$alias = 's';
-		if ($this->element == 'societe') $alias = 'te';
-
-		$sql = "SELECT MAX(te.".$fieldid.")";
-		$sql.= " FROM ".(empty($nodbprefix)?MAIN_DB_PREFIX:'').$this->table_element." as te";
-		if ($this->element == 'user' && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
-			$sql.= ",".MAIN_DB_PREFIX."usergroup_user as ug";
-		}
-		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) $sql.= ", ".MAIN_DB_PREFIX."societe as s";	// If we need to link to societe to limit select to entity
-		else if ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe as s";	// If we need to link to societe to limit select to socid
-		else if ($this->restrictiononfksoc == 2 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON te.fk_soc = s.rowid";	// If we need to link to societe to limit select to socid
-		if ($this->restrictiononfksoc && !$user->rights->societe->client->voir && !$socid)  $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON ".$alias.".rowid = sc.fk_soc";
-		$sql.= " WHERE te.".$fieldid." < '".$this->db->escape($this->ref)."'";  // ->ref must always be defined (set to id if field does not exists)
-		if ($this->restrictiononfksoc == 1 && !$user->rights->societe->client->voir && !$socid) $sql.= " AND sc.fk_user = " .$user->id;
-		if ($this->restrictiononfksoc == 2 && !$user->rights->societe->client->voir && !$socid) $sql.= " AND (sc.fk_user = " .$user->id.' OR te.fk_soc IS NULL)';
-		if (! empty($filter))
-		{
-			if (! preg_match('/^\s*AND/i', $filter)) $sql.=" AND ";   // For backward compatibility
-			$sql.=$filter;
-		}
-		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) $sql.= ' AND te.fk_soc = s.rowid';			// If we need to link to societe to limit select to entity
-		else if ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql.= ' AND te.fk_soc = s.rowid';			// If we need to link to societe to limit select to socid
-		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) {
-			if ($this->element == 'user' && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
-				if (! empty($user->admin) && empty($user->entity) && $conf->entity == 1) {
-					$sql.= " AND te.entity IS NOT NULL"; // Show all users
-				} else {
-					$sql.= " AND ug.fk_user = te.rowid";
-					$sql.= " AND ug.entity IN (".getEntity($this->element).")";
-				}
-			} else {
-				$sql.= ' AND te.entity IN ('.getEntity($this->element).')';
-			}
-		}
-		if ($this->restrictiononfksoc == 1 && $socid && $this->element != 'societe') $sql.= ' AND te.fk_soc = ' . $socid;
-		if ($this->restrictiononfksoc == 2 && $socid && $this->element != 'societe') $sql.= ' AND (te.fk_soc = ' . $socid.' OR te.fk_soc IS NULL)';
-		if ($this->restrictiononfksoc && $socid && $this->element == 'societe') $sql.= ' AND te.rowid = ' . $socid;
-		//print 'socid='.$socid.' restrictiononfksoc='.$this->restrictiononfksoc.' ismultientitymanaged = '.$this->ismultientitymanaged.' filter = '.$filter.' -> '.$sql."<br>";
-
-		$result = $this->db->query($sql);
-		if (! $result)
-		{
-			$this->error=$this->db->lasterror();
-			return -1;
-		}
-		$row = $this->db->fetch_row($result);
-		$this->ref_previous = $row[0];
-
-
-		$sql = "SELECT MIN(te.".$fieldid.")";
-		$sql.= " FROM ".(empty($nodbprefix)?MAIN_DB_PREFIX:'').$this->table_element." as te";
-		if ($this->element == 'user' && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
-			$sql.= ",".MAIN_DB_PREFIX."usergroup_user as ug";
-		}
-		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) $sql.= ", ".MAIN_DB_PREFIX."societe as s";	// If we need to link to societe to limit select to entity
-		else if ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe as s";	// If we need to link to societe to limit select to socid
-		else if ($this->restrictiononfksoc == 2 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON te.fk_soc = s.rowid";	// If we need to link to societe to limit select to socid
-		if ($this->restrictiononfksoc && !$user->rights->societe->client->voir && !$socid) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON ".$alias.".rowid = sc.fk_soc";
-		$sql.= " WHERE te.".$fieldid." > '".$this->db->escape($this->ref)."'";  // ->ref must always be defined (set to id if field does not exists)
-		if ($this->restrictiononfksoc == 1 && !$user->rights->societe->client->voir && !$socid) $sql.= " AND sc.fk_user = " .$user->id;
-		if ($this->restrictiononfksoc == 2 && !$user->rights->societe->client->voir && !$socid) $sql.= " AND (sc.fk_user = " .$user->id.' OR te.fk_soc IS NULL)';
-		if (! empty($filter))
-		{
-			if (! preg_match('/^\s*AND/i', $filter)) $sql.=" AND ";   // For backward compatibility
-			$sql.=$filter;
-		}
-		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) $sql.= ' AND te.fk_soc = s.rowid';			// If we need to link to societe to limit select to entity
-		else if ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql.= ' AND te.fk_soc = s.rowid';			// If we need to link to societe to limit select to socid
-		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) {
-			if ($this->element == 'user' && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
-				if (! empty($user->admin) && empty($user->entity) && $conf->entity == 1) {
-					$sql.= " AND te.entity IS NOT NULL"; // Show all users
-				} else {
-					$sql.= " AND ug.fk_user = te.rowid";
-					$sql.= " AND ug.entity IN (".getEntity($this->element).")";
-				}
-			} else {
-				$sql.= ' AND te.entity IN ('.getEntity($this->element).')';
-			}
-		}
-		if ($this->restrictiononfksoc == 1 && $socid && $this->element != 'societe') $sql.= ' AND te.fk_soc = ' . $socid;
-		if ($this->restrictiononfksoc == 2 && $socid && $this->element != 'societe') $sql.= ' AND (te.fk_soc = ' . $socid.' OR te.fk_soc IS NULL)';
-		if ($this->restrictiononfksoc && $socid && $this->element == 'societe') $sql.= ' AND te.rowid = ' . $socid;
-		//print 'socid='.$socid.' restrictiononfksoc='.$this->restrictiononfksoc.' ismultientitymanaged = '.$this->ismultientitymanaged.' filter = '.$filter.' -> '.$sql."<br>";
-		// Rem: Bug in some mysql version: SELECT MIN(rowid) FROM llx_socpeople WHERE rowid > 1 when one row in database with rowid=1, returns 1 instead of null
-
-		$result = $this->db->query($sql);
-		if (! $result)
-		{
-			$this->error=$this->db->lasterror();
-			return -2;
-		}
-		$row = $this->db->fetch_row($result);
-		$this->ref_next = $row[0];
-
-		return 1;
-	}
-
-
-	/**
-	 *      Return list of id of contacts of object
-	 *
-	 *      @param	string	$source     Source of contact: external (llx_socpeople) or internal (llx_user) or thirdparty (llx_societe)
-	 *      @return array				Array of id of contacts (if source=external or internal)
-	 * 									Array of id of third parties with at least one contact on object (if source=thirdparty)
-	 */
-	function getListContactId($source='external')
-	{
-		$contactAlreadySelected = array();
-		$tab = $this->liste_contact(-1,$source);
-		$num=count($tab);
-		$i = 0;
-		while ($i < $num)
-		{
-			if ($source == 'thirdparty') $contactAlreadySelected[$i] = $tab[$i]['socid'];
-			else  $contactAlreadySelected[$i] = $tab[$i]['id'];
-			$i++;
-		}
-		return $contactAlreadySelected;
-	}
-
-
-	/**
-	 *	Link element with a project
-	 *
-	 *	@param     	int		$projectid		Project id to link element to
-	 *	@return		int						<0 if KO, >0 if OK
-	 */
-	function setProject($projectid)
-	{
-		if (! $this->table_element)
-		{
-			dol_syslog(get_class($this)."::setProject was called on objet with property table_element not defined",LOG_ERR);
-			return -1;
-		}
-
-		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
-		if ($this->table_element == 'actioncomm')
-		{
-			if ($projectid) $sql.= ' SET fk_project = '.$projectid;
-			else $sql.= ' SET fk_project = NULL';
-			$sql.= ' WHERE id = '.$this->id;
-		}
-		else
-		{
-			if ($projectid) $sql.= ' SET fk_projet = '.$projectid;
-			else $sql.= ' SET fk_projet = NULL';
-			$sql.= ' WHERE rowid = '.$this->id;
-		}
-
-		dol_syslog(get_class($this)."::setProject", LOG_DEBUG);
-		if ($this->db->query($sql))
-		{
-			$this->fk_project = $projectid;
-			return 1;
-		}
-		else
-		{
-			dol_print_error($this->db);
-			return -1;
-		}
-	}
-
-	/**
-	 *  Change the payments methods
-	 *
-	 *  @param		int		$id		Id of new payment method
-	 *  @return		int				>0 if OK, <0 if KO
-	 */
-	function setPaymentMethods($id)
-	{
-		dol_syslog(get_class($this).'::setPaymentMethods('.$id.')');
-		if ($this->statut >= 0 || $this->element == 'societe')
-		{
-			// TODO uniformize field name
-			$fieldname = 'fk_mode_reglement';
-			if ($this->element == 'societe') $fieldname = 'mode_reglement';
-			if (get_class($this) == 'Fournisseur') $fieldname = 'mode_reglement_supplier';
-
-			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
-			$sql .= ' SET '.$fieldname.' = '.$id;
-			$sql .= ' WHERE rowid='.$this->id;
-
-			if ($this->db->query($sql))
-			{
-				$this->mode_reglement_id = $id;
-				// for supplier
-				if (get_class($this) == 'Fournisseur') $this->mode_reglement_supplier_id = $id;
-				return 1;
-			}
-			else
-			{
-				dol_syslog(get_class($this).'::setPaymentMethods Erreur '.$sql.' - '.$this->db->error());
-				$this->error=$this->db->error();
-				return -1;
-			}
-		}
-		else
-		{
-			dol_syslog(get_class($this).'::setPaymentMethods, status of the object is incompatible');
-			$this->error='Status of the object is incompatible '.$this->statut;
-			return -2;
-		}
-	}
-
-	/**
-	 *  Change the multicurrency code
-	 *
-	 *  @param		string	$code	multicurrency code
-	 *  @return		int				>0 if OK, <0 if KO
-	 */
-	function setMulticurrencyCode($code)
-	{
-		dol_syslog(get_class($this).'::setMulticurrencyCode('.$id.')');
-		if ($this->statut >= 0 || $this->element == 'societe')
-		{
-			$fieldname = 'multicurrency_code';
-
-			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
-			$sql .= ' SET '.$fieldname." = '".$this->db->escape($code)."'";
-			$sql .= ' WHERE rowid='.$this->id;
-
-			if ($this->db->query($sql))
-			{
-				$this->multicurrency_code = $code;
+    /**
+     * @var mixed		Contains comments
+     * @see fetchComments()
+     */
+    public $comments=array();
 
-				list($fk_multicurrency, $rate) = MultiCurrency::getIdAndTxFromCode($this->db, $code);
-				if ($rate) $this->setMulticurrencyRate($rate,2);
+    /**
+     * @var int
+     * @see setIncoterms()
+     */
+    public $fk_incoterms;
 
-				return 1;
-			}
-			else
-			{
-				dol_syslog(get_class($this).'::setMulticurrencyCode Erreur '.$sql.' - '.$this->db->error());
-				$this->error=$this->db->error();
-				return -1;
-			}
-		}
-		else
-		{
-			dol_syslog(get_class($this).'::setMulticurrencyCode, status of the object is incompatible');
-			$this->error='Status of the object is incompatible '.$this->statut;
-			return -2;
-		}
-	}
-
-	/**
-	 *  Change the multicurrency rate
-	 *
-	 *  @param		double	$rate	multicurrency rate
-	 *  @param		int		$mode	mode 1 : amounts in company currency will be recalculated, mode 2 : amounts in foreign currency
-	 *  @return		int				>0 if OK, <0 if KO
-	 */
-	function setMulticurrencyRate($rate, $mode=1)
-	{
-		dol_syslog(get_class($this).'::setMulticurrencyRate('.$id.')');
-		if ($this->statut >= 0 || $this->element == 'societe')
-		{
-			$fieldname = 'multicurrency_tx';
-
-			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
-			$sql .= ' SET '.$fieldname.' = '.$rate;
-			$sql .= ' WHERE rowid='.$this->id;
-
-			if ($this->db->query($sql))
-			{
-				$this->multicurrency_tx = $rate;
+    /**
+     * @var string
+     * @see SetIncoterms()
+     */
+    public $libelle_incoterms;
 
-				// Update line price
-				if (!empty($this->lines))
-				{
-					foreach ($this->lines as &$line)
-					{
-						if($mode == 1) {
-							$line->subprice = 0;
-						}
+    /**
+     * @var string
+     * @see display_incoterms()
+     */
+    public $location_incoterms;
 
-						switch ($this->element) {
-							case 'propal':
-								$this->updateline(
-									$line->id, $line->subprice, $line->qty, $line->remise_percent, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx,
-									($line->description?$line->description:$line->desc), 'HT', $line->info_bits, $line->special_code, $line->fk_parent_line,
-									$line->skip_update_total, $line->fk_fournprice, $line->pa_ht, $line->label, $line->product_type, $line->date_start,
-									$line->date_end, $line->array_options, $line->fk_unit, $line->multicurrency_subprice
-								);
-								break;
-							case 'commande':
-								$this->updateline(
-									$line->id, ($line->description?$line->description:$line->desc), $line->subprice, $line->qty, $line->remise_percent,
-									$line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'HT', $line->info_bits, $line->date_start, $line->date_end,
-									$line->product_type, $line->fk_parent_line, $line->skip_update_total, $line->fk_fournprice, $line->pa_ht, $line->label,
-									$line->special_code, $line->array_options, $line->fk_unit, $line->multicurrency_subprice
-								);
-								break;
-							case 'facture':
-								$this->updateline(
-									$line->id, ($line->description?$line->description:$line->desc), $line->subprice, $line->qty, $line->remise_percent,
-									$line->date_start, $line->date_end, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'HT', $line->info_bits,
-									$line->product_type, $line->fk_parent_line, $line->skip_update_total, $line->fk_fournprice, $line->pa_ht, $line->label,
-									$line->special_code, $line->array_options, $line->situation_percent, $line->fk_unit, $line->multicurrency_subprice
-								);
-								break;
-							case 'supplier_proposal':
-								$this->updateline(
-									$line->id, $line->subprice, $line->qty, $line->remise_percent, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx,
-									($line->description?$line->description:$line->desc), 'HT', $line->info_bits, $line->special_code, $line->fk_parent_line,
-									$line->skip_update_total, $line->fk_fournprice, $line->pa_ht, $line->label, $line->product_type, $line->array_options,
-									$line->ref_fourn, $line->multicurrency_subprice
-								);
-								break;
-							case 'order_supplier':
-								$this->updateline(
-									$line->id, ($line->description?$line->description:$line->desc), $line->subprice, $line->qty, $line->remise_percent,
-									$line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'HT', $line->info_bits, $line->product_type, false,
-									$line->date_start, $line->date_end, $line->array_options, $line->fk_unit, $line->multicurrency_subprice
-								);
-								break;
-							case 'invoice_supplier':
-								$this->updateline(
-									$line->id, ($line->description?$line->description:$line->desc), $line->subprice, $line->tva_tx, $line->localtax1_tx,
-									$line->localtax2_tx, $line->qty, 0, 'HT', $line->info_bits, $line->product_type, $line->remise_percent, false,
-									$line->date_start, $line->date_end, $line->array_options, $line->fk_unit, $line->multicurrency_subprice
-								);
-								break;
-							default:
-								dol_syslog(get_class($this).'::setMulticurrencyRate no updateline defined', LOG_DEBUG);
-								break;
-						}
-					}
-				}
+    public $name;
+    public $lastname;
+    public $firstname;
+    public $civility_id;
 
-				return 1;
-			}
-			else
-			{
-				dol_syslog(get_class($this).'::setMulticurrencyRate Erreur '.$sql.' - '.$this->db->error());
-				$this->error=$this->db->error();
-				return -1;
-			}
-		}
-		else
-		{
-			dol_syslog(get_class($this).'::setMulticurrencyRate, status of the object is incompatible');
-			$this->error='Status of the object is incompatible '.$this->statut;
-			return -2;
-		}
-	}
-
-	/**
-	 *  Change the payments terms
-	 *
-	 *  @param		int		$id		Id of new payment terms
-	 *  @return		int				>0 if OK, <0 if KO
-	 */
-	function setPaymentTerms($id)
-	{
-		dol_syslog(get_class($this).'::setPaymentTerms('.$id.')');
-		if ($this->statut >= 0 || $this->element == 'societe')
-		{
-			// TODO uniformize field name
-			$fieldname = 'fk_cond_reglement';
-			if ($this->element == 'societe') $fieldname = 'cond_reglement';
-			if (get_class($this) == 'Fournisseur') $fieldname = 'cond_reglement_supplier';
-
-			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
-			$sql .= ' SET '.$fieldname.' = '.$id;
-			$sql .= ' WHERE rowid='.$this->id;
-
-			if ($this->db->query($sql))
-			{
-				$this->cond_reglement_id = $id;
-				// for supplier
-				if (get_class($this) == 'Fournisseur') $this->cond_reglement_supplier_id = $id;
-				$this->cond_reglement = $id;	// for compatibility
-				return 1;
-			}
-			else
-			{
-				dol_syslog(get_class($this).'::setPaymentTerms Erreur '.$sql.' - '.$this->db->error());
-				$this->error=$this->db->error();
-				return -1;
-			}
-		}
-		else
-		{
-			dol_syslog(get_class($this).'::setPaymentTerms, status of the object is incompatible');
-			$this->error='Status of the object is incompatible '.$this->statut;
-			return -2;
-		}
-	}
-
-	/**
-	 *	Define delivery address
-	 *  @deprecated
-	 *
-	 *	@param      int		$id		Address id
-	 *	@return     int				<0 si ko, >0 si ok
-	 */
-	function setDeliveryAddress($id)
-	{
-		$fieldname = 'fk_delivery_address';
-		if ($this->element == 'delivery' || $this->element == 'shipping') $fieldname = 'fk_address';
-
-		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET ".$fieldname." = ".$id;
-		$sql.= " WHERE rowid = ".$this->id." AND fk_statut = 0";
-
-		if ($this->db->query($sql))
-		{
-			$this->fk_delivery_address = $id;
-			return 1;
-		}
-		else
-		{
-			$this->error=$this->db->error();
-			dol_syslog(get_class($this).'::setDeliveryAddress Erreur '.$sql.' - '.$this->error);
-			return -1;
-		}
-	}
-
-
-	/**
-	 *  Change the shipping method
-	 *
-	 *  @param      int     $shipping_method_id     Id of shipping method
-     *  @param      bool    $notrigger              false=launch triggers after, true=disable triggers
-     *  @param      User	$userused               Object user
-	 *
-	 *  @return     int              1 if OK, 0 if KO
-	 */
-	function setShippingMethod($shipping_method_id, $notrigger=false, $userused=null)
-	{
-        global $user;
+    // Dates
+    public $date_creation;			// Date creation
+    public $date_validation;		// Date validation
+    public $date_modification;		// Date last change (tms field)
 
-        if (empty($userused)) $userused=$user;
 
-        $error = 0;
 
-		if (! $this->table_element) {
-			dol_syslog(get_class($this)."::setShippingMethod was called on objet with property table_element not defined",LOG_ERR);
-			return -1;
-		}
+    // No constructor as it is an abstract class
 
-        $this->db->begin();
+    /**
+     * Check an object id/ref exists
+     * If you don't need/want to instantiate object and just need to know if object exists, use this method instead of fetch
+     *
+     *  @param	string	$element   	String of element ('product', 'facture', ...)
+     *  @param	int		$id      	Id of object
+     *  @param  string	$ref     	Ref of object to check
+     *  @param	string	$ref_ext	Ref ext of object to check
+     *  @return int     			<0 if KO, 0 if OK but not found, >0 if OK and exists
+     */
+    static function isExistingObject($element, $id, $ref='', $ref_ext='')
+    {
+        global $db,$conf;
+
+        $sql = "SELECT rowid, ref, ref_ext";
+        $sql.= " FROM ".MAIN_DB_PREFIX.$element;
+        $sql.= " WHERE entity IN (".getEntity($element).")" ;
+
+        if ($id > 0) $sql.= " AND rowid = ".$db->escape($id);
+        else if ($ref) $sql.= " AND ref = '".$db->escape($ref)."'";
+        else if ($ref_ext) $sql.= " AND ref_ext = '".$db->escape($ref_ext)."'";
+        else {
+            $error='ErrorWrongParameters';
+            dol_print_error(get_class()."::isExistingObject ".$error, LOG_ERR);
+            return -1;
+        }
+        if ($ref || $ref_ext) $sql.= " AND entity = ".$conf->entity;
 
-		if ($shipping_method_id<0) $shipping_method_id='NULL';
-		dol_syslog(get_class($this).'::setShippingMethod('.$shipping_method_id.')');
+        dol_syslog(get_class()."::isExistingObject", LOG_DEBUG);
+        $resql = $db->query($sql);
+        if ($resql)
+        {
+            $num=$db->num_rows($resql);
+            if ($num > 0) return 1;
+            else return 0;
+        }
+        return -1;
+    }
 
-		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
-		$sql.= " SET fk_shipping_method = ".$shipping_method_id;
-		$sql.= " WHERE rowid=".$this->id;
-        $resql = $this->db->query($sql);
-		if (! $resql) {
-			dol_syslog(get_class($this).'::setShippingMethod Error ', LOG_DEBUG);
-			$this->error = $this->db->lasterror();
-			$error++;
-        } else {
-            if (!$notrigger)
-            {
-                // Call trigger
-                $this->context=array('shippingmethodupdate'=>1);
-                $result = $this->call_trigger(strtoupper(get_class($this)) . '_MODIFY', $userused);
-                if ($result < 0) $error++;
-                // End call trigger
-            }
+    /**
+     * Method to output saved errors
+     *
+     * @return	string		String with errors
+     */
+    function errorsToString()
+    {
+        return $this->error.(is_array($this->errors)?(($this->error!=''?', ':'').join(', ',$this->errors)):'');
+    }
+
+    /**
+     *	Return full name (civility+' '+name+' '+lastname)
+     *
+     *	@param	Translate	$langs			Language object for translation of civility (used only if option is 1)
+     *	@param	int			$option			0=No option, 1=Add civility
+     * 	@param	int			$nameorder		-1=Auto, 0=Lastname+Firstname, 1=Firstname+Lastname, 2=Firstname
+     * 	@param	int			$maxlen			Maximum length
+     * 	@return	string						String with full name
+     */
+    function getFullName($langs,$option=0,$nameorder=-1,$maxlen=0)
+    {
+        //print "lastname=".$this->lastname." name=".$this->name." nom=".$this->nom."<br>\n";
+        $lastname=$this->lastname;
+        $firstname=$this->firstname;
+        if (empty($lastname))  $lastname=(isset($this->lastname)?$this->lastname:(isset($this->name)?$this->name:(isset($this->nom)?$this->nom:(isset($this->societe)?$this->societe:(isset($this->company)?$this->company:'')))));
+
+        $ret='';
+        if ($option && $this->civility_id)
+        {
+            if ($langs->transnoentitiesnoconv("Civility".$this->civility_id)!="Civility".$this->civility_id) $ret.=$langs->transnoentitiesnoconv("Civility".$this->civility_id).' ';
+            else $ret.=$this->civility_id.' ';
         }
-        if ($error)
+
+        $ret.=dolGetFirstLastname($firstname, $lastname, $nameorder);
+
+        return dol_trunc($ret,$maxlen);
+    }
+
+    /**
+     * 	Return full address of contact
+     *
+     * 	@param		int			$withcountry		1=Add country into address string
+     *  @param		string		$sep				Separator to use to build string
+     *  @param		int		    $withregion			1=Add region into address string
+     *	@return		string							Full address string
+     */
+    function getFullAddress($withcountry=0, $sep="\n", $withregion=0)
+    {
+        if ($withcountry && $this->country_id && (empty($this->country_code) || empty($this->country)))
         {
-            $this->db->rollback();
-            return -1;
-        } else {
-            $this->shipping_method_id = ($shipping_method_id=='NULL')?null:$shipping_method_id;
-            $this->db->commit();
-            return 1;
+            require_once DOL_DOCUMENT_ROOT .'/core/lib/company.lib.php';
+            $tmparray=getCountry($this->country_id,'all');
+            $this->country_code=$tmparray['code'];
+            $this->country     =$tmparray['label'];
         }
-	}
-
-
-	/**
-	 *  Change the warehouse
-	 *
-	 *  @param      int     $warehouse_id     Id of warehouse
-	 *  @return     int              1 if OK, 0 if KO
-	 */
-	function setWarehouse($warehouse_id)
-	{
-		if (! $this->table_element) {
-			dol_syslog(get_class($this)."::setWarehouse was called on objet with property table_element not defined",LOG_ERR);
-			return -1;
-		}
-		if ($warehouse_id<0) $warehouse_id='NULL';
-		dol_syslog(get_class($this).'::setWarehouse('.$warehouse_id.')');
-
-		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
-		$sql.= " SET fk_warehouse = ".$warehouse_id;
-		$sql.= " WHERE rowid=".$this->id;
-
-		if ($this->db->query($sql)) {
-			$this->warehouse_id = ($warehouse_id=='NULL')?null:$warehouse_id;
-			return 1;
-		} else {
-			dol_syslog(get_class($this).'::setWarehouse Error ', LOG_DEBUG);
-			$this->error=$this->db->error();
-			return 0;
-		}
-	}
-
-
-	/**
-	 *		Set last model used by doc generator
-	 *
-	 *		@param		User	$user		User object that make change
-	 *		@param		string	$modelpdf	Modele name
-	 *		@return		int					<0 if KO, >0 if OK
-	 */
-	function setDocModel($user, $modelpdf)
-	{
-		if (! $this->table_element)
-		{
-			dol_syslog(get_class($this)."::setDocModel was called on objet with property table_element not defined",LOG_ERR);
-			return -1;
-		}
-
-		$newmodelpdf=dol_trunc($modelpdf,255);
-
-		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
-		$sql.= " SET model_pdf = '".$this->db->escape($newmodelpdf)."'";
-		$sql.= " WHERE rowid = ".$this->id;
-		// if ($this->element == 'facture') $sql.= " AND fk_statut < 2";
-		// if ($this->element == 'propal')  $sql.= " AND fk_statut = 0";
-
-		dol_syslog(get_class($this)."::setDocModel", LOG_DEBUG);
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			$this->modelpdf=$modelpdf;
-			return 1;
-		}
-		else
-		{
-			dol_print_error($this->db);
-			return 0;
-		}
-	}
-
-
-	/**
-	 *  Change the bank account
-	 *
-	 *  @param		int		$fk_account		Id of bank account
-	 *  @param      bool    $notrigger      false=launch triggers after, true=disable triggers
-	 *  @param      User	$userused		Object user
-	 *  @return		int				1 if OK, 0 if KO
-	 */
-	function setBankAccount($fk_account, $notrigger=false, $userused=null)
-	{
-        global $user;
 
-        if (empty($userused)) $userused=$user;
+        if ($withregion && $this->state_id && (empty($this->state_code) || empty($this->state) || empty($this->region) || empty($this->region_cpde)))
+        {
+            require_once DOL_DOCUMENT_ROOT .'/core/lib/company.lib.php';
+            $tmparray=getState($this->state_id,'all',0,1);
+            $this->state_code   =$tmparray['code'];
+            $this->state        =$tmparray['label'];
+            $this->region_code  =$tmparray['region_code'];
+            $this->region       =$tmparray['region'];
+        }
 
-        $error = 0;
+        return dol_format_address($this, $withcountry, $sep);
+    }
 
-		if (! $this->table_element) {
-			dol_syslog(get_class($this)."::setBankAccount was called on objet with property table_element not defined",LOG_ERR);
-			return -1;
-		}
-        $this->db->begin();
 
-		if ($fk_account<0) $fk_account='NULL';
-		dol_syslog(get_class($this).'::setBankAccount('.$fk_account.')');
+    /**
+     * 	Return full address for banner
+     *
+     * 	@param		string		$htmlkey            HTML id to make banner content unique
+     *  @param      Object      $object				Object (thirdparty, thirdparty of contact for contact, null for a member)
+     *	@return		string							Full address string
+     */
+    function getBannerAddress($htmlkey, $object)
+    {
+        global $conf, $langs;
 
-		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
-		$sql.= " SET fk_account = ".$fk_account;
-		$sql.= " WHERE rowid=".$this->id;
+        $countriesusingstate=array('AU','US','IN','GB','ES','UK','TR');    // See also option MAIN_FORCE_STATE_INTO_ADDRESS
 
-        $resql = $this->db->query($sql);
-        if (! $resql)
+        $contactid=0;
+        $thirdpartyid=0;
+        if ($this->element == 'societe')
         {
-            dol_syslog(get_class($this).'::setBankAccount Error '.$sql.' - '.$this->db->error());
-            $this->error = $this->db->lasterror();
-            $error++;
+            $thirdpartyid=$this->id;
         }
-        else
+        if ($this->element == 'contact')
         {
-            if (!$notrigger)
+            $contactid=$this->id;
+            $thirdpartyid=$object->fk_soc;
+        }
+        if ($this->element == 'user')
+        {
+            $contactid=$this->contact_id;
+            $thirdpartyid=$object->fk_soc;
+        }
+
+        $out='<!-- BEGIN part to show address block -->';
+
+        $outdone=0;
+        $coords = $this->getFullAddress(1,', ',$conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT);
+        if ($coords)
+        {
+            if (! empty($conf->use_javascript_ajax))
             {
-                // Call trigger
-                $this->context=array('bankaccountupdate'=>1);
-                $result = $this->call_trigger(strtoupper(get_class($this)) . '_MODIFY', $userused);
-                if ($result < 0) $error++;
-                // End call trigger
+                $namecoords = $this->getFullName($langs,1).'<br>'.$coords;
+                // hideonsmatphone because copyToClipboard call jquery dialog that does not work with jmobile
+                $out.='<a href="#" class="hideonsmartphone" onclick="return copyToClipboard(\''.dol_escape_js($namecoords).'\',\''.dol_escape_js($langs->trans("HelpCopyToClipboard")).'\');">';
+                $out.=img_picto($langs->trans("Address"), 'object_address.png');
+                $out.='</a> ';
             }
+            $out.=dol_print_address($coords, 'address_'.$htmlkey.'_'.$this->id, $this->element, $this->id, 1, ', '); $outdone++;
+            $outdone++;
         }
-        if ($error)
+
+        if (! in_array($this->country_code,$countriesusingstate) && empty($conf->global->MAIN_FORCE_STATE_INTO_ADDRESS)   // If MAIN_FORCE_STATE_INTO_ADDRESS is on, state is already returned previously with getFullAddress
+                && empty($conf->global->SOCIETE_DISABLE_STATE) && $this->state)
         {
-            $this->db->rollback();
-            return -1;
+            if (!empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) && $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 1 && $this->region) {
+                $out.=($outdone?' - ':'').$this->region.' - '.$this->state;
+            }
+            else {
+                $out.=($outdone?' - ':'').$this->state;
+            }
+            $outdone++;
         }
-        else
+
+        if (! empty($this->phone) || ! empty($this->phone_pro) || ! empty($this->phone_mobile) || ! empty($this->phone_perso) || ! empty($this->fax) || ! empty($this->office_phone) || ! empty($this->user_mobile) || ! empty($this->office_fax)) $out.=($outdone?'<br>':'');
+        if (! empty($this->phone) && empty($this->phone_pro)) {		// For objects that store pro phone into ->phone
+            $out.=dol_print_phone($this->phone,$this->country_code,$contactid,$thirdpartyid,'AC_TEL','&nbsp;','phone',$langs->trans("PhonePro")); $outdone++;
+        }
+        if (! empty($this->phone_pro)) {
+            $out.=dol_print_phone($this->phone_pro,$this->country_code,$contactid,$thirdpartyid,'AC_TEL','&nbsp;','phone',$langs->trans("PhonePro")); $outdone++;
+        }
+        if (! empty($this->phone_mobile)) {
+            $out.=dol_print_phone($this->phone_mobile,$this->country_code,$contactid,$thirdpartyid,'AC_TEL','&nbsp;','mobile',$langs->trans("PhoneMobile")); $outdone++;
+        }
+        if (! empty($this->phone_perso)) {
+            $out.=dol_print_phone($this->phone_perso,$this->country_code,$contactid,$thirdpartyid,'AC_TEL','&nbsp;','phone',$langs->trans("PhonePerso")); $outdone++;
+        }
+        if (! empty($this->office_phone)) {
+            $out.=dol_print_phone($this->office_phone,$this->country_code,$contactid,$thirdpartyid,'AC_TEL','&nbsp;','phone',$langs->trans("PhonePro")); $outdone++;
+        }
+        if (! empty($this->user_mobile)) {
+            $out.=dol_print_phone($this->user_mobile,$this->country_code,$contactid,$thirdpartyid,'AC_TEL','&nbsp;','mobile',$langs->trans("PhoneMobile")); $outdone++;
+        }
+        if (! empty($this->fax)) {
+            $out.=dol_print_phone($this->fax,$this->country_code,$contactid,$thirdpartyid,'AC_FAX','&nbsp;','fax',$langs->trans("Fax")); $outdone++;
+        }
+        if (! empty($this->office_fax)) {
+            $out.=dol_print_phone($this->office_fax,$this->country_code,$contactid,$thirdpartyid,'AC_FAX','&nbsp;','fax',$langs->trans("Fax")); $outdone++;
+        }
+
+        $out.='<div style="clear: both;"></div>';
+        $outdone=0;
+        if (! empty($this->email))
         {
-            $this->fk_account = ($fk_account=='NULL')?null:$fk_account;
-            $this->db->commit();
-            return 1;
+            $out.=dol_print_email($this->email,$this->id,$object->id,'AC_EMAIL',0,0,1);
+            $outdone++;
+        }
+        if (! empty($this->url))
+        {
+            $out.=dol_print_url($this->url,'_goout',0,1);
+            $outdone++;
         }
+        $out.='<div style="clear: both;">';
+        if (! empty($conf->socialnetworks->enabled))
+        {
+            if ($this->skype) $out.=dol_print_socialnetworks($this->skype,$this->id,$object->id,'skype');
+            $outdone++;
+            if ($this->jabberid) $out.=dol_print_socialnetworks($this->jabberid,$this->id,$object->id,'jabber');
+            $outdone++;
+            if ($this->twitter) $out.=dol_print_socialnetworks($this->twitter,$this->id,$object->id,'twitter');
+            $outdone++;
+            if ($this->facebook) $out.=dol_print_socialnetworks($this->facebook,$this->id,$object->id,'facebook');
+            $outdone++;
+        }
+        $out.='</div>';
+
+        $out.='<!-- END Part to show address block -->';
+
+        return $out;
     }
 
+    /**
+     * Return the link of last main doc file for direct public download.
+     *
+     * @param	string	$modulepart			Module related to document
+     * @param	int		$initsharekey		Init the share key if it was not yet defined
+     * @param	int		$relativelink		0=Return full external link, 1=Return link relative to root of file
+     * @return	string						Link or empty string if there is no download link
+     */
+    function getLastMainDocLink($modulepart, $initsharekey=0, $relativelink=0)
+    {
+        global $user, $dolibarr_main_url_root;
 
-	// TODO: Move line related operations to CommonObjectLine?
+        if (empty($this->last_main_doc))
+        {
+            return '';		// No way to known which document name to use
+        }
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Save a new position (field rang) for details lines.
-	 *  You can choose to set position for lines with already a position or lines without any position defined.
-	 *
-	 * 	@param		boolean		$renum			   True to renum all already ordered lines, false to renum only not already ordered lines.
-	 * 	@param		string		$rowidorder		   ASC or DESC
-	 * 	@param		boolean		$fk_parent_line    Table with fk_parent_line field or not
-	 * 	@return		int                            <0 if KO, >0 if OK
-	 */
-	function line_order($renum=false, $rowidorder='ASC', $fk_parent_line=true)
-	{
-        // phpcs:enable
-		if (! $this->table_element_line)
-		{
-			dol_syslog(get_class($this)."::line_order was called on objet with property table_element_line not defined",LOG_ERR);
-			return -1;
-		}
-		if (! $this->fk_element)
-		{
-			dol_syslog(get_class($this)."::line_order was called on objet with property fk_element not defined",LOG_ERR);
-			return -1;
-		}
-
-		// Count number of lines to reorder (according to choice $renum)
-		$nl=0;
-		$sql = 'SELECT count(rowid) FROM '.MAIN_DB_PREFIX.$this->table_element_line;
-		$sql.= ' WHERE '.$this->fk_element.'='.$this->id;
-		if (! $renum) $sql.= ' AND rang = 0';
-		if ($renum) $sql.= ' AND rang <> 0';
-
-		dol_syslog(get_class($this)."::line_order", LOG_DEBUG);
-		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			$row = $this->db->fetch_row($resql);
-			$nl = $row[0];
-		}
-		else dol_print_error($this->db);
-		if ($nl > 0)
-		{
-			// The goal of this part is to reorder all lines, with all children lines sharing the same
-			// counter that parents.
-			$rows=array();
-
-			// We first search all lines that are parent lines (for multilevel details lines)
-			$sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.$this->table_element_line;
-			$sql.= ' WHERE '.$this->fk_element.' = '.$this->id;
-			if ($fk_parent_line) $sql.= ' AND fk_parent_line IS NULL';
-			$sql.= ' ORDER BY rang ASC, rowid '.$rowidorder;
-
-			dol_syslog(get_class($this)."::line_order search all parent lines", LOG_DEBUG);
-			$resql = $this->db->query($sql);
-			if ($resql)
-			{
-				$i=0;
-				$num = $this->db->num_rows($resql);
-				while ($i < $num)
-				{
-					$row = $this->db->fetch_row($resql);
-					$rows[] = $row[0];	// Add parent line into array rows
-					$childrens = $this->getChildrenOfLine($row[0]);
-					if (! empty($childrens))
-					{
-						foreach($childrens as $child)
-						{
-							array_push($rows, $child);
-						}
-					}
-					$i++;
-				}
+        include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
+        $ecmfile=new EcmFiles($this->db);
+        $result = $ecmfile->fetch(0, '', $this->last_main_doc);
+        if ($result < 0)
+        {
+            $this->error = $ecmfile->error;
+            $this->errors = $ecmfile->errors;
+            return -1;
+        }
 
-				// Now we set a new number for each lines (parent and children with children included into parent tree)
-				if (! empty($rows))
+        if (empty($ecmfile->id))
+        {
+            // Add entry into index
+            if ($initsharekey)
+            {
+                require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
+                // TODO We can't, we dont' have full path of file, only last_main_doc adn ->element, so we must rebuild full path first
+                /*
+				$ecmfile->filepath = $rel_dir;
+				$ecmfile->filename = $filename;
+				$ecmfile->label = md5_file(dol_osencode($destfull));	// hash of file content
+				$ecmfile->fullpath_orig = '';
+				$ecmfile->gen_or_uploaded = 'generated';
+				$ecmfile->description = '';    // indexed content
+				$ecmfile->keyword = '';        // keyword content
+				$ecmfile->share = getRandomPassword(true);
+				$result = $ecmfile->create($user);
+				if ($result < 0)
 				{
-					foreach($rows as $key => $row)
-					{
-						$this->updateRangOfLine($row, ($key+1));
-					}
+					$this->error = $ecmfile->error;
+					$this->errors = $ecmfile->errors;
 				}
-			}
-			else
-			{
-				dol_print_error($this->db);
-			}
-		}
-		return 1;
-	}
-
-	/**
-	 * 	Get children of line
-	 *
-	 * 	@param	int		$id		Id of parent line
-	 * 	@return	array			Array with list of children lines id
-	 */
-	function getChildrenOfLine($id)
-	{
-		$rows=array();
-
-		$sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.$this->table_element_line;
-		$sql.= ' WHERE '.$this->fk_element.' = '.$this->id;
-		$sql.= ' AND fk_parent_line = '.$id;
-		$sql.= ' ORDER BY rang ASC';
-
-		dol_syslog(get_class($this)."::getChildrenOfLine search children lines for line ".$id."", LOG_DEBUG);
-		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			$i=0;
-			$num = $this->db->num_rows($resql);
-			while ($i < $num)
-			{
-				$row = $this->db->fetch_row($resql);
-				$rows[$i] = $row[0];
-				$i++;
-			}
-		}
+				*/
+            }
+            else return '';
+        }
+        elseif (empty($ecmfile->share))
+        {
+            // Add entry into index
+            if ($initsharekey)
+            {
+                require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
+                $ecmfile->share = getRandomPassword(true);
+                $ecmfile->update($user);
+            }
+            else return '';
+        }
 
-		return $rows;
-	}
+        // Define $urlwithroot
+        $urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
+        $urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
+        //$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * 	Update a line to have a lower rank
-	 *
-	 * 	@param 	int			$rowid				Id of line
-	 * 	@param	boolean		$fk_parent_line		Table with fk_parent_line field or not
-	 * 	@return	void
-	 */
-	function line_up($rowid, $fk_parent_line=true)
-	{
-        // phpcs:enable
-		$this->line_order(false, 'ASC', $fk_parent_line);
+        $forcedownload=0;
 
-		// Get rang of line
-		$rang = $this->getRangOfLine($rowid);
+        $paramlink='';
+        //if (! empty($modulepart)) $paramlink.=($paramlink?'&':'').'modulepart='.$modulepart;		// For sharing with hash (so public files), modulepart is not required.
+        //if (! empty($ecmfile->entity)) $paramlink.='&entity='.$ecmfile->entity; 					// For sharing with hash (so public files), entity is not required.
+        //$paramlink.=($paramlink?'&':'').'file='.urlencode($filepath);								// No need of name of file for public link, we will use the hash
+        if (! empty($ecmfile->share)) $paramlink.=($paramlink?'&':'').'hashp='.$ecmfile->share;			// Hash for public share
+        if ($forcedownload) $paramlink.=($paramlink?'&':'').'attachment=1';
 
-		// Update position of line
-		$this->updateLineUp($rowid, $rang);
-	}
+        if ($relativelink)
+        {
+            $linktoreturn='document.php'.($paramlink?'?'.$paramlink:'');
+        }
+        else
+        {
+            $linktoreturn=$urlwithroot.'/document.php'.($paramlink?'?'.$paramlink:'');
+        }
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * 	Update a line to have a higher rank
-	 *
-	 * 	@param	int			$rowid				Id of line
-	 * 	@param	boolean		$fk_parent_line		Table with fk_parent_line field or not
-	 * 	@return	void
-	 */
-	function line_down($rowid, $fk_parent_line=true)
-	{
-        // phpcs:enable
-		$this->line_order(false, 'ASC', $fk_parent_line);
-
-		// Get rang of line
-		$rang = $this->getRangOfLine($rowid);
-
-		// Get max value for rang
-		$max = $this->line_max();
-
-		// Update position of line
-		$this->updateLineDown($rowid, $rang, $max);
-	}
-
-	/**
-	 * 	Update position of line (rang)
-	 *
-	 * 	@param	int		$rowid		Id of line
-	 * 	@param	int		$rang		Position
-	 * 	@return	void
-	 */
-	function updateRangOfLine($rowid,$rang)
-	{
-		$fieldposition = 'rang';
-		if (in_array($this->table_element_line, array('ecm_files', 'emailcollector_emailcollectoraction'))) $fieldposition = 'position';
-
-		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element_line.' SET '.$fieldposition.' = '.$rang;
-		$sql.= ' WHERE rowid = '.$rowid;
-
-		dol_syslog(get_class($this)."::updateRangOfLine", LOG_DEBUG);
-		if (! $this->db->query($sql))
-		{
-			dol_print_error($this->db);
-		}
-	}
+        // Here $ecmfile->share is defined
+        return $linktoreturn;
+    }
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * 	Update position of line with ajax (rang)
-	 *
-	 * 	@param	array	$rows	Array of rows
-	 * 	@return	void
-	 */
-	function line_ajaxorder($rows)
-	{
-        // phpcs:enable
-		$num = count($rows);
-		for ($i = 0 ; $i < $num ; $i++)
-		{
-			$this->updateRangOfLine($rows[$i], ($i+1));
-		}
-	}
-
-	/**
-	 * 	Update position of line up (rang)
-	 *
-	 * 	@param	int		$rowid		Id of line
-	 * 	@param	int		$rang		Position
-	 * 	@return	void
-	 */
-	function updateLineUp($rowid,$rang)
-	{
-		if ($rang > 1)
-		{
-			$fieldposition = 'rang';
-			if (in_array($this->table_element_line, array('ecm_files', 'emailcollector_emailcollectoraction'))) $fieldposition = 'position';
-
-			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element_line.' SET '.$fieldposition.' = '.$rang ;
-			$sql.= ' WHERE '.$this->fk_element.' = '.$this->id;
-			$sql.= ' AND rang = '.($rang - 1);
-			if ($this->db->query($sql) )
-			{
-				$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element_line.' SET '.$fieldposition.' = '.($rang - 1);
-				$sql.= ' WHERE rowid = '.$rowid;
-				if (! $this->db->query($sql) )
-				{
-					dol_print_error($this->db);
-				}
-			}
-			else
-			{
-				dol_print_error($this->db);
-			}
-		}
-	}
-
-	/**
-	 * 	Update position of line down (rang)
-	 *
-	 * 	@param	int		$rowid		Id of line
-	 * 	@param	int		$rang		Position
-	 * 	@param	int		$max		Max
-	 * 	@return	void
-	 */
-	function updateLineDown($rowid,$rang,$max)
-	{
-		if ($rang < $max)
-		{
-			$fieldposition = 'rang';
-			if (in_array($this->table_element_line, array('ecm_files', 'emailcollector_emailcollectoraction'))) $fieldposition = 'position';
-
-			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element_line.' SET '.$fieldposition.' = '.$rang;
-			$sql.= ' WHERE '.$this->fk_element.' = '.$this->id;
-			$sql.= ' AND rang = '.($rang+1);
-			if ($this->db->query($sql) )
-			{
-				$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element_line.' SET '.$fieldposition.' = '.($rang+1);
-				$sql.= ' WHERE rowid = '.$rowid;
-				if (! $this->db->query($sql) )
-				{
-					dol_print_error($this->db);
-				}
-			}
-			else
-			{
-				dol_print_error($this->db);
-			}
-		}
-	}
-
-	/**
-	 * 	Get position of line (rang)
-	 *
-	 * 	@param		int		$rowid		Id of line
-	 *  @return		int     			Value of rang in table of lines
-	 */
-	function getRangOfLine($rowid)
-	{
-		$sql = 'SELECT rang FROM '.MAIN_DB_PREFIX.$this->table_element_line;
-		$sql.= ' WHERE rowid ='.$rowid;
-
-		dol_syslog(get_class($this)."::getRangOfLine", LOG_DEBUG);
-		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			$row = $this->db->fetch_row($resql);
-			return $row[0];
-		}
-	}
-
-	/**
-	 * 	Get rowid of the line relative to its position
-	 *
-	 * 	@param		int		$rang		Rang value
-	 *  @return     int     			Rowid of the line
-	 */
-	function getIdOfLine($rang)
-	{
-		$sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.$this->table_element_line;
-		$sql.= ' WHERE '.$this->fk_element.' = '.$this->id;
-		$sql.= ' AND rang = '.$rang;
-		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			$row = $this->db->fetch_row($resql);
-			return $row[0];
-		}
-	}
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * 	Get max value used for position of line (rang)
-	 *
-	 * 	@param		int		$fk_parent_line		Parent line id
-	 *  @return     int  			   			Max value of rang in table of lines
-	 */
-	function line_max($fk_parent_line=0)
-	{
+    /**
+     *  Add a link between element $this->element and a contact
+     *
+     *  @param	int		$fk_socpeople       Id of thirdparty contact (if source = 'external') or id of user (if souce = 'internal') to link
+     *  @param 	int		$type_contact 		Type of contact (code or id). Must be id or code found into table llx_c_type_contact. For example: SALESREPFOLL
+     *  @param  string	$source             external=Contact extern (llx_socpeople), internal=Contact intern (llx_user)
+     *  @param  int		$notrigger			Disable all triggers
+     *  @return int                 		<0 if KO, >0 if OK
+     */
+    function add_contact($fk_socpeople, $type_contact, $source='external',$notrigger=0)
+    {
         // phpcs:enable
-		// Search the last rang with fk_parent_line
-		if ($fk_parent_line)
-		{
-			$sql = 'SELECT max(rang) FROM '.MAIN_DB_PREFIX.$this->table_element_line;
-			$sql.= ' WHERE '.$this->fk_element.' = '.$this->id;
-			$sql.= ' AND fk_parent_line = '.$fk_parent_line;
-
-			dol_syslog(get_class($this)."::line_max", LOG_DEBUG);
-			$resql = $this->db->query($sql);
-			if ($resql)
-			{
-				$row = $this->db->fetch_row($resql);
-				if (! empty($row[0]))
-				{
-					return $row[0];
-				}
-				else
-				{
-					return $this->getRangOfLine($fk_parent_line);
-				}
-			}
-		}
-		// If not, search the last rang of element
-		else
-		{
-			$sql = 'SELECT max(rang) FROM '.MAIN_DB_PREFIX.$this->table_element_line;
-			$sql.= ' WHERE '.$this->fk_element.' = '.$this->id;
-
-			dol_syslog(get_class($this)."::line_max", LOG_DEBUG);
-			$resql = $this->db->query($sql);
-			if ($resql)
-			{
-				$row = $this->db->fetch_row($resql);
-				return $row[0];
-			}
-		}
-	}
+        global $user,$langs;
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Update external ref of element
-	 *
-	 *  @param      string		$ref_ext	Update field ref_ext
-	 *  @return     int      		   		<0 if KO, >0 if OK
-	 */
-	function update_ref_ext($ref_ext)
-	{
-        // phpcs:enable
-		if (! $this->table_element)
-		{
-			dol_syslog(get_class($this)."::update_ref_ext was called on objet with property table_element not defined", LOG_ERR);
-			return -1;
-		}
-
-		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
-		$sql.= " SET ref_ext = '".$this->db->escape($ref_ext)."'";
-		$sql.= " WHERE ".(isset($this->table_rowid)?$this->table_rowid:'rowid')." = ". $this->id;
-
-		dol_syslog(get_class($this)."::update_ref_ext", LOG_DEBUG);
-		if ($this->db->query($sql))
-		{
-			$this->ref_ext = $ref_ext;
-			return 1;
-		}
-		else
-		{
-			$this->error=$this->db->error();
-			return -1;
-		}
-	}
+
+        dol_syslog(get_class($this)."::add_contact $fk_socpeople, $type_contact, $source, $notrigger");
+
+        // Check parameters
+        if ($fk_socpeople <= 0)
+        {
+            $langs->load("errors");
+            $this->error=$langs->trans("ErrorWrongValueForParameterX","1");
+            dol_syslog(get_class($this)."::add_contact ".$this->error,LOG_ERR);
+            return -1;
+        }
+        if (! $type_contact)
+        {
+            $langs->load("errors");
+            $this->error=$langs->trans("ErrorWrongValueForParameterX","2");
+            dol_syslog(get_class($this)."::add_contact ".$this->error,LOG_ERR);
+            return -2;
+        }
+
+        $id_type_contact=0;
+        if (is_numeric($type_contact))
+        {
+            $id_type_contact=$type_contact;
+        }
+        else
+        {
+            // We look for id type_contact
+            $sql = "SELECT tc.rowid";
+            $sql.= " FROM ".MAIN_DB_PREFIX."c_type_contact as tc";
+            $sql.= " WHERE tc.element='".$this->db->escape($this->element)."'";
+            $sql.= " AND tc.source='".$this->db->escape($source)."'";
+            $sql.= " AND tc.code='".$this->db->escape($type_contact)."' AND tc.active=1";
+            //print $sql;
+            $resql=$this->db->query($sql);
+            if ($resql)
+            {
+                $obj = $this->db->fetch_object($resql);
+                if ($obj) $id_type_contact=$obj->rowid;
+            }
+        }
+
+        if ($id_type_contact == 0)
+        {
+            $this->error='CODE_NOT_VALID_FOR_THIS_ELEMENT';
+            dol_syslog("CODE_NOT_VALID_FOR_THIS_ELEMENT: Code type of contact '".$type_contact."' does not exists or is not active for element ".$this->element.", we can ignore it");
+            return -3;
+        }
+
+        $datecreate = dol_now();
+
+        // Socpeople must have already been added by some trigger, then we have to check it to avoid DB_ERROR_RECORD_ALREADY_EXISTS error
+        $TListeContacts=$this->liste_contact(-1, $source);
+        $already_added=false;
+        if(!empty($TListeContacts)) {
+            foreach($TListeContacts as $array_contact) {
+                if($array_contact['status'] == 4 && $array_contact['id'] == $fk_socpeople && $array_contact['fk_c_type_contact'] == $id_type_contact) {
+                    $already_added=true;
+                    break;
+                }
+            }
+        }
+
+        if(!$already_added) {
+
+            $this->db->begin();
+
+            // Insert into database
+            $sql = "INSERT INTO ".MAIN_DB_PREFIX."element_contact";
+            $sql.= " (element_id, fk_socpeople, datecreate, statut, fk_c_type_contact) ";
+            $sql.= " VALUES (".$this->id.", ".$fk_socpeople." , " ;
+            $sql.= "'".$this->db->idate($datecreate)."'";
+            $sql.= ", 4, ". $id_type_contact;
+            $sql.= ")";
+
+            $resql=$this->db->query($sql);
+            if ($resql)
+            {
+                if (! $notrigger)
+                {
+                    $result=$this->call_trigger(strtoupper($this->element).'_ADD_CONTACT', $user);
+                    if ($result < 0)
+                    {
+                        $this->db->rollback();
+                        return -1;
+                    }
+                }
+
+                $this->db->commit();
+                return 1;
+            }
+            else
+            {
+                if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
+                {
+                    $this->error=$this->db->errno();
+                    $this->db->rollback();
+                    echo 'err rollback';
+                    return -2;
+                }
+                else
+                {
+                    $this->error=$this->db->error();
+                    $this->db->rollback();
+                    return -1;
+                }
+            }
+        } else return 0;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Update note of element
-	 *
-	 *  @param      string		$note		New value for note
-	 *  @param		string		$suffix		'', '_public' or '_private'
-	 *  @return     int      		   		<0 if KO, >0 if OK
-	 */
-	function update_note($note, $suffix='')
-	{
+    /**
+     *    Copy contact from one element to current
+     *
+     *    @param    CommonObject    $objFrom    Source element
+     *    @param    string          $source     Nature of contact ('internal' or 'external')
+     *    @return   int                         >0 if OK, <0 if KO
+     */
+    function copy_linked_contact($objFrom, $source='internal')
+    {
         // phpcs:enable
-		global $user;
-
-		if (! $this->table_element)
-		{
-			$this->error='update_note was called on objet with property table_element not defined';
-			dol_syslog(get_class($this)."::update_note was called on objet with property table_element not defined", LOG_ERR);
-			return -1;
-		}
-		if (! in_array($suffix,array('','_public','_private')))
-		{
-			$this->error='update_note Parameter suffix must be empty, \'_private\' or \'_public\'';
-			dol_syslog(get_class($this)."::update_note Parameter suffix must be empty, '_private' or '_public'", LOG_ERR);
-			return -2;
-		}
-		// Special cas
-		//var_dump($this->table_element);exit;
-		if ($this->table_element == 'product') $suffix='';
-
-		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
-		$sql.= " SET note".$suffix." = ".(!empty($note)?("'".$this->db->escape($note)."'"):"NULL");
-		$sql.= " ,".(in_array($this->table_element, array('actioncomm', 'adherent', 'advtargetemailing', 'cronjob', 'establishment'))?"fk_user_mod":"fk_user_modif")." = ".$user->id;
-		$sql.= " WHERE rowid =". $this->id;
-
-		dol_syslog(get_class($this)."::update_note", LOG_DEBUG);
-		if ($this->db->query($sql))
-		{
-			if ($suffix == '_public') $this->note_public = $note;
-			else if ($suffix == '_private') $this->note_private = $note;
-			else
-			{
-				$this->note = $note;      // deprecated
-				$this->note_private = $note;
-			}
-			return 1;
-		}
-		else
-		{
-			$this->error=$this->db->lasterror();
-			return -1;
-		}
-	}
+        $contacts = $objFrom->liste_contact(-1, $source);
+        foreach($contacts as $contact)
+        {
+            if ($this->add_contact($contact['id'], $contact['fk_c_type_contact'], $contact['source']) < 0)
+            {
+                $this->error=$this->db->lasterror();
+                return -1;
+            }
+        }
+        return 1;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * 	Update public note (kept for backward compatibility)
-	 *
-	 * @param      string		$note		New value for note
-	 * @return     int      		   		<0 if KO, >0 if OK
-	 * @deprecated
-	 * @see update_note()
-	 */
-	function update_note_public($note)
-	{
+    /**
+     *      Update a link to contact line
+     *
+     *      @param	int		$rowid              Id of line contact-element
+     * 		@param	int		$statut	            New status of link
+     *      @param  int		$type_contact_id    Id of contact type (not modified if 0)
+     *      @param  int		$fk_socpeople	    Id of soc_people to update (not modified if 0)
+     *      @return int                 		<0 if KO, >= 0 if OK
+     */
+    function update_contact($rowid, $statut, $type_contact_id=0, $fk_socpeople=0)
+    {
         // phpcs:enable
-		return $this->update_note($note,'_public');
-	}
+        // Insert into database
+        $sql = "UPDATE ".MAIN_DB_PREFIX."element_contact set";
+        $sql.= " statut = ".$statut;
+        if ($type_contact_id) $sql.= ", fk_c_type_contact = '".$type_contact_id ."'";
+        if ($fk_socpeople) $sql.= ", fk_socpeople = '".$fk_socpeople ."'";
+        $sql.= " where rowid = ".$rowid;
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            return 0;
+        }
+        else
+        {
+            $this->error=$this->db->lasterror();
+            return -1;
+        }
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Update total_ht, total_ttc, total_vat, total_localtax1, total_localtax2 for an object (sum of lines).
-	 *  Must be called at end of methods addline or updateline.
-	 *
-	 *	@param	int		$exclspec          	>0 = Exclude special product (product_type=9)
-	 *  @param  string	$roundingadjust    	'none'=Do nothing, 'auto'=Use default method (MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND if defined, or '0'), '0'=Force mode total of rounding, '1'=Force mode rounding of total
-	 *  @param	int		$nodatabaseupdate	1=Do not update database. Update only properties of object.
-	 *  @param	Societe	$seller				If roundingadjust is '0' or '1' or maybe 'auto', it means we recalculate total for lines before calculating total for object and for this, we need seller object.
-	 *	@return	int    			           	<0 if KO, >0 if OK
-	 */
-	function update_price($exclspec=0,$roundingadjust='none',$nodatabaseupdate=0,$seller=null)
-	{
+    /**
+     *    Delete a link to contact line
+     *
+     *    @param	int		$rowid			Id of contact link line to delete
+     *    @param	int		$notrigger		Disable all triggers
+     *    @return   int						>0 if OK, <0 if KO
+     */
+    function delete_contact($rowid, $notrigger=0)
+    {
         // phpcs:enable
-		global $conf, $hookmanager, $action;
-
-		// Some external module want no update price after a trigger because they have another method to calculate the total (ex: with an extrafield)
-		$MODULE = "";
-		if ($this->element == 'propal')
-			$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_PROPOSAL";
-		elseif ($this->element == 'order')
-			$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_ORDER";
-		elseif ($this->element == 'facture')
-			$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_INVOICE";
-		elseif ($this->element == 'facture_fourn')
-			$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_SUPPLIER_INVOICE";
-		elseif ($this->element == 'order_supplier')
-			$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_SUPPLIER_ORDER";
-		elseif ($this->element == 'supplier_proposal')
-			$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_SUPPLIER_PROPOSAL";
-
-		if (! empty($MODULE)) {
-			if (! empty($conf->global->$MODULE)) {
-				$modsactivated = explode(',', $conf->global->$MODULE);
-				foreach ($modsactivated as $mod) {
-					if ($conf->$mod->enabled)
-						return 1; // update was disabled by specific setup
-				}
-			}
-		}
-
-		include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
-
-		if ($roundingadjust == '-1') $roundingadjust='auto';	// For backward compatibility
-
-		$forcedroundingmode=$roundingadjust;
-		if ($forcedroundingmode == 'auto' && isset($conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND)) $forcedroundingmode=$conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND;
-		elseif ($forcedroundingmode == 'auto') $forcedroundingmode='0';
-
-		$error=0;
-
-		$multicurrency_tx = !empty($this->multicurrency_tx) ? $this->multicurrency_tx : 1;
-
-		// Define constants to find lines to sum
-		$fieldtva='total_tva';
-		$fieldlocaltax1='total_localtax1';
-		$fieldlocaltax2='total_localtax2';
-		$fieldup='subprice';
-		if ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier')
-		{
-			$fieldtva='tva';
-			$fieldup='pu_ht';
-		}
-		if ($this->element == 'expensereport')
-		{
-			$fieldup='value_unit';
-		}
-
-		$sql = 'SELECT rowid, qty, '.$fieldup.' as up, remise_percent, total_ht, '.$fieldtva.' as total_tva, total_ttc, '.$fieldlocaltax1.' as total_localtax1, '.$fieldlocaltax2.' as total_localtax2,';
-		$sql.= ' tva_tx as vatrate, localtax1_tx, localtax2_tx, localtax1_type, localtax2_type, info_bits, product_type';
-			if ($this->table_element_line == 'facturedet') $sql.= ', situation_percent';
-			$sql.= ', multicurrency_total_ht, multicurrency_total_tva, multicurrency_total_ttc';
-		$sql.= ' FROM '.MAIN_DB_PREFIX.$this->table_element_line;
-		$sql.= ' WHERE '.$this->fk_element.' = '.$this->id;
-		if ($exclspec)
-		{
-			$product_field='product_type';
-			if ($this->table_element_line == 'contratdet') $product_field='';    // contratdet table has no product_type field
-			if ($product_field) $sql.= ' AND '.$product_field.' <> 9';
-		}
-		$sql.= ' ORDER by rowid';	// We want to be sure to always use same order of line to not change lines differently when option MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND is used
-
-		dol_syslog(get_class($this)."::update_price", LOG_DEBUG);
-		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			$this->total_ht  = 0;
-			$this->total_tva = 0;
-			$this->total_localtax1 = 0;
-			$this->total_localtax2 = 0;
-			$this->total_ttc = 0;
-			$total_ht_by_vats  = array();
-			$total_tva_by_vats = array();
-			$total_ttc_by_vats = array();
-			$this->multicurrency_total_ht	= 0;
-			$this->multicurrency_total_tva	= 0;
-			$this->multicurrency_total_ttc	= 0;
-
-			$num = $this->db->num_rows($resql);
-			$i = 0;
-			while ($i < $num)
-			{
-				$obj = $this->db->fetch_object($resql);
-
-				// Note: There is no check on detail line and no check on total, if $forcedroundingmode = 'none'
-				$parameters=array('fk_element' => $obj->rowid);
-				$reshook = $hookmanager->executeHooks('changeRoundingMode', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-
-				if (empty($reshook) && $forcedroundingmode == '0')	// Check if data on line are consistent. This may solve lines that were not consistent because set with $forcedroundingmode='auto'
-				{
-					$localtax_array=array($obj->localtax1_type,$obj->localtax1_tx,$obj->localtax2_type,$obj->localtax2_tx);
-					$tmpcal=calcul_price_total($obj->qty, $obj->up, $obj->remise_percent, $obj->vatrate, $obj->localtax1_tx, $obj->localtax2_tx, 0, 'HT', $obj->info_bits, $obj->product_type, $seller, $localtax_array, (isset($obj->situation_percent) ? $obj->situation_percent : 100), $multicurrency_tx);
-					$diff=price2num($tmpcal[1] - $obj->total_tva, 'MT', 1);
-					if ($diff)
-					{
-						$sqlfix="UPDATE ".MAIN_DB_PREFIX.$this->table_element_line." SET ".$fieldtva." = ".$tmpcal[1].", total_ttc = ".$tmpcal[2]." WHERE rowid = ".$obj->rowid;
-						dol_syslog('We found unconsistent data into detailed line (difference of '.$diff.') for line rowid = '.$obj->rowid." (total vat of line calculated=".$tmpcal[1].", database=".$obj->total_tva."). We fix the total_vat and total_ttc of line by running sqlfix = ".$sqlfix);
-								$resqlfix=$this->db->query($sqlfix);
-								if (! $resqlfix) dol_print_error($this->db,'Failed to update line');
-								$obj->total_tva = $tmpcal[1];
-								$obj->total_ttc = $tmpcal[2];
-						//
-					}
-				}
+        global $user;
 
-				$this->total_ht        += $obj->total_ht;		// The field visible at end of line detail
-				$this->total_tva       += $obj->total_tva;
-				$this->total_localtax1 += $obj->total_localtax1;
-				$this->total_localtax2 += $obj->total_localtax2;
-				$this->total_ttc       += $obj->total_ttc;
-				$this->multicurrency_total_ht        += $obj->multicurrency_total_ht;		// The field visible at end of line detail
-				$this->multicurrency_total_tva       += $obj->multicurrency_total_tva;
-				$this->multicurrency_total_ttc       += $obj->multicurrency_total_ttc;
-
-				if (! isset($total_ht_by_vats[$obj->vatrate]))  $total_ht_by_vats[$obj->vatrate]=0;
-				if (! isset($total_tva_by_vats[$obj->vatrate])) $total_tva_by_vats[$obj->vatrate]=0;
-				if (! isset($total_ttc_by_vats[$obj->vatrate])) $total_ttc_by_vats[$obj->vatrate]=0;
-				$total_ht_by_vats[$obj->vatrate]  += $obj->total_ht;
-				$total_tva_by_vats[$obj->vatrate] += $obj->total_tva;
-				$total_ttc_by_vats[$obj->vatrate] += $obj->total_ttc;
-
-				if ($forcedroundingmode == '1')	// Check if we need adjustement onto line for vat. TODO This works on the company currency but not on multicurrency
-				{
-					$tmpvat=price2num($total_ht_by_vats[$obj->vatrate] * $obj->vatrate / 100, 'MT', 1);
-					$diff=price2num($total_tva_by_vats[$obj->vatrate]-$tmpvat, 'MT', 1);
-					//print 'Line '.$i.' rowid='.$obj->rowid.' vat_rate='.$obj->vatrate.' total_ht='.$obj->total_ht.' total_tva='.$obj->total_tva.' total_ttc='.$obj->total_ttc.' total_ht_by_vats='.$total_ht_by_vats[$obj->vatrate].' total_tva_by_vats='.$total_tva_by_vats[$obj->vatrate].' (new calculation = '.$tmpvat.') total_ttc_by_vats='.$total_ttc_by_vats[$obj->vatrate].($diff?" => DIFF":"")."<br>\n";
-					if ($diff)
-					{
-						if (abs($diff) > 0.1) { dol_syslog('A rounding difference was detected into TOTAL but is too high to be corrected', LOG_WARNING); exit; }
-						$sqlfix="UPDATE ".MAIN_DB_PREFIX.$this->table_element_line." SET ".$fieldtva." = ".($obj->total_tva - $diff).", total_ttc = ".($obj->total_ttc - $diff)." WHERE rowid = ".$obj->rowid;
-						dol_syslog('We found a difference of '.$diff.' for line rowid = '.$obj->rowid.". We fix the total_vat and total_ttc of line by running sqlfix = ".$sqlfix);
-								$resqlfix=$this->db->query($sqlfix);
-								if (! $resqlfix) dol_print_error($this->db,'Failed to update line');
-								$this->total_tva -= $diff;
-								$this->total_ttc -= $diff;
-								$total_tva_by_vats[$obj->vatrate] -= $diff;
-								$total_ttc_by_vats[$obj->vatrate] -= $diff;
-					}
-				}
 
-				$i++;
-			}
+        $this->db->begin();
 
-			// Add revenue stamp to total
-			$this->total_ttc       			+= isset($this->revenuestamp)?$this->revenuestamp:0;
-			$this->multicurrency_total_ttc  += isset($this->revenuestamp)?($this->revenuestamp * $multicurrency_tx):0;
+        $sql = "DELETE FROM ".MAIN_DB_PREFIX."element_contact";
+        $sql.= " WHERE rowid =".$rowid;
 
-			// Situations totals
-			if ($this->situation_cycle_ref && $this->situation_counter > 1 && method_exists($this, 'get_prev_sits') && $this->type != $this::TYPE_CREDIT_NOTE )
-			{
-				$prev_sits = $this->get_prev_sits();
-
-				foreach ($prev_sits as $sit) {				// $sit is an object Facture loaded with a fetch.
-					$this->total_ht -= $sit->total_ht;
-					$this->total_tva -= $sit->total_tva;
-					$this->total_localtax1 -= $sit->total_localtax1;
-					$this->total_localtax2 -= $sit->total_localtax2;
-					$this->total_ttc -= $sit->total_ttc;
-					$this->multicurrency_total_ht -= $sit->multicurrency_total_ht;
-					$this->multicurrency_total_tva -= $sit->multicurrency_total_tva;
-					$this->multicurrency_total_ttc -= $sit->multicurrency_total_ttc;
-				}
-			}
-
-			$this->db->free($resql);
-
-			// Now update global field total_ht, total_ttc and tva
-			$fieldht='total_ht';
-			$fieldtva='tva';
-			$fieldlocaltax1='localtax1';
-			$fieldlocaltax2='localtax2';
-			$fieldttc='total_ttc';
-			// Specific code for backward compatibility with old field names
-			if ($this->element == 'facture' || $this->element == 'facturerec')             $fieldht='total';
-			if ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier') $fieldtva='total_tva';
-			if ($this->element == 'propal')                                                $fieldttc='total';
-			if ($this->element == 'expensereport')                                         $fieldtva='total_tva';
-			if ($this->element == 'supplier_proposal')                                     $fieldttc='total';
-
-			if (empty($nodatabaseupdate))
-			{
-				$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element.' SET';
-				$sql .= " ".$fieldht."='".price2num($this->total_ht)."',";
-				$sql .= " ".$fieldtva."='".price2num($this->total_tva)."',";
-				$sql .= " ".$fieldlocaltax1."='".price2num($this->total_localtax1)."',";
-				$sql .= " ".$fieldlocaltax2."='".price2num($this->total_localtax2)."',";
-				$sql .= " ".$fieldttc."='".price2num($this->total_ttc)."'";
-						$sql .= ", multicurrency_total_ht='".price2num($this->multicurrency_total_ht, 'MT', 1)."'";
-						$sql .= ", multicurrency_total_tva='".price2num($this->multicurrency_total_tva, 'MT', 1)."'";
-						$sql .= ", multicurrency_total_ttc='".price2num($this->multicurrency_total_ttc, 'MT', 1)."'";
-				$sql .= ' WHERE rowid = '.$this->id;
-
-
-				dol_syslog(get_class($this)."::update_price", LOG_DEBUG);
-				$resql=$this->db->query($sql);
-				if (! $resql)
-				{
-					$error++;
-					$this->error=$this->db->lasterror();
-					$this->errors[]=$this->db->lasterror();
-				}
-			}
+        dol_syslog(get_class($this)."::delete_contact", LOG_DEBUG);
+        if ($this->db->query($sql))
+        {
+            if (! $notrigger)
+            {
+                $result=$this->call_trigger(strtoupper($this->element).'_DELETE_CONTACT', $user);
+                if ($result < 0) { $this->db->rollback(); return -1; }
+            }
 
-			if (! $error)
-			{
-				return 1;
-			}
-			else
-			{
-				return -1;
-			}
-		}
-		else
-		{
-			dol_print_error($this->db,'Bad request in update_price');
-			return -1;
-		}
-	}
+            $this->db->commit();
+            return 1;
+        }
+        else
+        {
+            $this->error=$this->db->lasterror();
+            $this->db->rollback();
+            return -1;
+        }
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Add objects linked in llx_element_element.
-	 *
-	 *	@param		string	$origin		Linked element type
-	 *	@param		int		$origin_id	Linked element id
-	 *	@return		int					<=0 if KO, >0 if OK
-	 *	@see		fetchObjectLinked, updateObjectLinked, deleteObjectLinked
-	 */
-	function add_object_linked($origin=null, $origin_id=null)
-	{
+    /**
+     *    Delete all links between an object $this and all its contacts
+     *
+     *	  @param	string	$source		'' or 'internal' or 'external'
+     *	  @param	string	$code		Type of contact (code or id)
+     *    @return   int					>0 if OK, <0 if KO
+     */
+    function delete_linked_contact($source='',$code='')
+    {
         // phpcs:enable
-		$origin = (! empty($origin) ? $origin : $this->origin);
-		$origin_id = (! empty($origin_id) ? $origin_id : $this->origin_id);
-
-		// Special case
-		if ($origin == 'order') $origin='commande';
-		if ($origin == 'invoice') $origin='facture';
-		if ($origin == 'invoice_template') $origin='facturerec';
-    	if ($origin == 'supplierorder') $origin='order_supplier';
-		$this->db->begin();
-
-		$sql = "INSERT INTO ".MAIN_DB_PREFIX."element_element (";
-		$sql.= "fk_source";
-		$sql.= ", sourcetype";
-		$sql.= ", fk_target";
-		$sql.= ", targettype";
-		$sql.= ") VALUES (";
-		$sql.= $origin_id;
-		$sql.= ", '".$this->db->escape($origin)."'";
-		$sql.= ", ".$this->id;
-		$sql.= ", '".$this->db->escape($this->element)."'";
-		$sql.= ")";
-
-		dol_syslog(get_class($this)."::add_object_linked", LOG_DEBUG);
-		if ($this->db->query($sql))
-	  	{
-	  		$this->db->commit();
-	  		return 1;
-	  	}
-	  	else
-	  	{
-	  		$this->error=$this->db->lasterror();
-	  		$this->db->rollback();
-	  		return 0;
-	  	}
-	}
-
-	/**
-	 *	Fetch array of objects linked to current object (object of enabled modules only). Links are loaded into
-	 *		this->linkedObjectsIds array and
-	 *		this->linkedObjects array if $loadalsoobjects = 1
-	 *  Possible usage for parameters:
-	 *  - all parameters empty -> we look all link to current object (current object can be source or target)
-	 *  - source id+type -> will get target list linked to source
-	 *  - target id+type -> will get source list linked to target
-	 *  - source id+type + target type -> will get target list of the type
-	 *  - target id+type + target source -> will get source list of the type
-	 *
-	 *	@param	int		$sourceid			Object source id (if not defined, id of object)
-	 *	@param  string	$sourcetype			Object source type (if not defined, element name of object)
-	 *	@param  int		$targetid			Object target id (if not defined, id of object)
-	 *	@param  string	$targettype			Object target type (if not defined, elemennt name of object)
-	 *	@param  string	$clause				'OR' or 'AND' clause used when both source id and target id are provided
-	 *  @param  int		$alsosametype		0=Return only links to object that differs from source type. 1=Include also link to objects of same type.
-	 *  @param  string	$orderby			SQL 'ORDER BY' clause
-	 *  @param	int		$loadalsoobjects	Load also array this->linkedObjects (Use 0 to increase performances)
-	 *	@return int							<0 if KO, >0 if OK
-	 *  @see	add_object_linked, updateObjectLinked, deleteObjectLinked
-	 */
-	function fetchObjectLinked($sourceid=null,$sourcetype='',$targetid=null,$targettype='',$clause='OR',$alsosametype=1,$orderby='sourcetype',$loadalsoobjects=1)
-	{
-		global $conf;
-
-		$this->linkedObjectsIds=array();
-		$this->linkedObjects=array();
-
-		$justsource=false;
-		$justtarget=false;
-		$withtargettype=false;
-		$withsourcetype=false;
-
-		if (! empty($sourceid) && ! empty($sourcetype) && empty($targetid))
-		{
-			$justsource=true;  // the source (id and type) is a search criteria
-			if (! empty($targettype)) $withtargettype=true;
-		}
-		if (! empty($targetid) && ! empty($targettype) && empty($sourceid))
-		{
-			$justtarget=true;  // the target (id and type) is a search criteria
-			if (! empty($sourcetype)) $withsourcetype=true;
-		}
-
-		$sourceid = (! empty($sourceid) ? $sourceid : $this->id);
-		$targetid = (! empty($targetid) ? $targetid : $this->id);
-		$sourcetype = (! empty($sourcetype) ? $sourcetype : $this->element);
-		$targettype = (! empty($targettype) ? $targettype : $this->element);
-
-		/*if (empty($sourceid) && empty($targetid))
-		 {
-		 dol_syslog('Bad usage of function. No source nor target id defined (nor as parameter nor as object id)', LOG_ERR);
-		 return -1;
-		 }*/
+        $temp = array();
+        $typeContact = $this->liste_type_contact($source,'',0,0,$code);
 
-		// Links between objects are stored in table element_element
-		$sql = 'SELECT rowid, fk_source, sourcetype, fk_target, targettype';
-		$sql.= ' FROM '.MAIN_DB_PREFIX.'element_element';
-		$sql.= " WHERE ";
-		if ($justsource || $justtarget)
-		{
-			if ($justsource)
-			{
-				$sql.= "fk_source = ".$sourceid." AND sourcetype = '".$sourcetype."'";
-				if ($withtargettype) $sql.= " AND targettype = '".$targettype."'";
-			}
-			else if ($justtarget)
-			{
-				$sql.= "fk_target = ".$targetid." AND targettype = '".$targettype."'";
-				if ($withsourcetype) $sql.= " AND sourcetype = '".$sourcetype."'";
-			}
-		}
-		else
-		{
-			$sql.= "(fk_source = ".$sourceid." AND sourcetype = '".$sourcetype."')";
-			$sql.= " ".$clause." (fk_target = ".$targetid." AND targettype = '".$targettype."')";
-		}
-		$sql .= ' ORDER BY '.$orderby;
-
-		dol_syslog(get_class($this)."::fetchObjectLink", LOG_DEBUG);
-		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			$num = $this->db->num_rows($resql);
-			$i = 0;
-			while ($i < $num)
-			{
-				$obj = $this->db->fetch_object($resql);
-				if ($justsource || $justtarget)
-				{
-					if ($justsource)
-					{
-						$this->linkedObjectsIds[$obj->targettype][$obj->rowid]=$obj->fk_target;
-					}
-					else if ($justtarget)
-					{
-						$this->linkedObjectsIds[$obj->sourcetype][$obj->rowid]=$obj->fk_source;
-					}
-				}
-				else
-				{
-					if ($obj->fk_source == $sourceid && $obj->sourcetype == $sourcetype)
-					{
-						$this->linkedObjectsIds[$obj->targettype][$obj->rowid]=$obj->fk_target;
-					}
-					if ($obj->fk_target == $targetid && $obj->targettype == $targettype)
-					{
-						$this->linkedObjectsIds[$obj->sourcetype][$obj->rowid]=$obj->fk_source;
-					}
-				}
-				$i++;
-			}
+        foreach($typeContact as $key => $value)
+        {
+            array_push($temp,$key);
+        }
+        $listId = implode(",", $temp);
 
-			if (! empty($this->linkedObjectsIds))
-			{
-				$tmparray = $this->linkedObjectsIds;
-				foreach($tmparray as $objecttype => $objectids)       // $objecttype is a module name ('facture', 'mymodule', ...) or a module name with a suffix ('project_task', 'mymodule_myobj', ...)
-				{
-					// Parse element/subelement (ex: project_task, cabinetmed_consultation, ...)
-					$module = $element = $subelement = $objecttype;
-					if ($objecttype != 'supplier_proposal' && $objecttype != 'order_supplier' && $objecttype != 'invoice_supplier'
-						&& preg_match('/^([^_]+)_([^_]+)/i',$objecttype,$regs))
-					{
-						$module = $element = $regs[1];
-						$subelement = $regs[2];
-					}
-
-					$classpath = $element.'/class';
-					// To work with non standard classpath or module name
-					if ($objecttype == 'facture')			{
-						$classpath = 'compta/facture/class';
-					}
-					else if ($objecttype == 'facturerec')			{
-						$classpath = 'compta/facture/class'; $module = 'facture';
-					}
-					else if ($objecttype == 'propal')			{
-						$classpath = 'comm/propal/class';
-					}
-					else if ($objecttype == 'supplier_proposal')			{
-						$classpath = 'supplier_proposal/class';
-					}
-					else if ($objecttype == 'shipping')			{
-						$classpath = 'expedition/class'; $subelement = 'expedition'; $module = 'expedition_bon';
-					}
-					else if ($objecttype == 'delivery')			{
-						$classpath = 'livraison/class'; $subelement = 'livraison'; $module = 'livraison_bon';
-					}
-					else if ($objecttype == 'invoice_supplier' || $objecttype == 'order_supplier')	{
-						$classpath = 'fourn/class'; $module = 'fournisseur';
-					}
-					else if ($objecttype == 'fichinter')			{
-						$classpath = 'fichinter/class'; $subelement = 'fichinter'; $module = 'ficheinter';
-					}
-					else if ($objecttype == 'subscription')			{
-						$classpath = 'adherents/class'; $module = 'adherent';
-					}
-
-					// Set classfile
-					$classfile = strtolower($subelement); $classname = ucfirst($subelement);
-
-					if ($objecttype == 'order') {
-						$classfile = 'commande'; $classname = 'Commande';
-					}
-					else if ($objecttype == 'invoice_supplier') {
-						$classfile = 'fournisseur.facture'; $classname = 'FactureFournisseur';
-					}
-					else if ($objecttype == 'order_supplier')   {
-						$classfile = 'fournisseur.commande'; $classname = 'CommandeFournisseur';
-					}
-					else if ($objecttype == 'supplier_proposal')   {
-						$classfile = 'supplier_proposal'; $classname = 'SupplierProposal';
-					}
-					else if ($objecttype == 'facturerec')   {
-						$classfile = 'facture-rec'; $classname = 'FactureRec';
-					}
-					else if ($objecttype == 'subscription')   {
-						$classfile = 'subscription'; $classname = 'Subscription';
-					}
-
-					// Here $module, $classfile and $classname are set
-					if ($conf->$module->enabled && (($element != $this->element) || $alsosametype))
-					{
-						if ($loadalsoobjects)
-						{
-							dol_include_once('/'.$classpath.'/'.$classfile.'.class.php');
-							//print '/'.$classpath.'/'.$classfile.'.class.php '.class_exists($classname);
-							if (class_exists($classname))
-							{
-								foreach($objectids as $i => $objectid)	// $i is rowid into llx_element_element
-								{
-									$object = new $classname($this->db);
-									$ret = $object->fetch($objectid);
-									if ($ret >= 0)
-									{
-										$this->linkedObjects[$objecttype][$i] = $object;
-									}
-								}
-							}
-						}
-					}
-					else
-					{
-						unset($this->linkedObjectsIds[$objecttype]);
-					}
-				}
-			}
-			return 1;
-		}
-		else
-		{
-			dol_print_error($this->db);
-			return -1;
-		}
-	}
-
-	/**
-	 *	Update object linked of a current object
-	 *
-	 *	@param	int		$sourceid		Object source id
-	 *	@param  string	$sourcetype		Object source type
-	 *	@param  int		$targetid		Object target id
-	 *	@param  string	$targettype		Object target type
-	 *	@return							int	>0 if OK, <0 if KO
-	 *	@see	add_object_linked, fetObjectLinked, deleteObjectLinked
-	 */
-	function updateObjectLinked($sourceid=null, $sourcetype='', $targetid=null, $targettype='')
-	{
-		$updatesource=false;
-		$updatetarget=false;
-
-		if (! empty($sourceid) && ! empty($sourcetype) && empty($targetid) && empty($targettype)) $updatesource=true;
-		else if (empty($sourceid) && empty($sourcetype) && ! empty($targetid) && ! empty($targettype)) $updatetarget=true;
-
-		$sql = "UPDATE ".MAIN_DB_PREFIX."element_element SET ";
-		if ($updatesource)
-		{
-			$sql.= "fk_source = ".$sourceid;
-			$sql.= ", sourcetype = '".$this->db->escape($sourcetype)."'";
-			$sql.= " WHERE fk_target = ".$this->id;
-			$sql.= " AND targettype = '".$this->db->escape($this->element)."'";
-		}
-		else if ($updatetarget)
-		{
-			$sql.= "fk_target = ".$targetid;
-			$sql.= ", targettype = '".$this->db->escape($targettype)."'";
-			$sql.= " WHERE fk_source = ".$this->id;
-			$sql.= " AND sourcetype = '".$this->db->escape($this->element)."'";
-		}
-
-		dol_syslog(get_class($this)."::updateObjectLinked", LOG_DEBUG);
-		if ($this->db->query($sql))
-		{
-			return 1;
-		}
-		else
-		{
-			$this->error=$this->db->lasterror();
-			return -1;
-		}
-	}
-
-	/**
-	 *	Delete all links between an object $this
-	 *
-	 *	@param	int		$sourceid		Object source id
-	 *	@param  string	$sourcetype		Object source type
-	 *	@param  int		$targetid		Object target id
-	 *	@param  string	$targettype		Object target type
-	 *  @param	int		$rowid			Row id of line to delete. If defined, other parameters are not used.
-	 *	@return     					int	>0 if OK, <0 if KO
-	 *	@see	add_object_linked, updateObjectLinked, fetchObjectLinked
-	 */
-	function deleteObjectLinked($sourceid=null, $sourcetype='', $targetid=null, $targettype='', $rowid='')
-	{
-		$deletesource=false;
-		$deletetarget=false;
-
-		if (! empty($sourceid) && ! empty($sourcetype) && empty($targetid) && empty($targettype)) $deletesource=true;
-		else if (empty($sourceid) && empty($sourcetype) && ! empty($targetid) && ! empty($targettype)) $deletetarget=true;
-
-		$sourceid = (! empty($sourceid) ? $sourceid : $this->id);
-		$sourcetype = (! empty($sourcetype) ? $sourcetype : $this->element);
-		$targetid = (! empty($targetid) ? $targetid : $this->id);
-		$targettype = (! empty($targettype) ? $targettype : $this->element);
-
-		$sql = "DELETE FROM ".MAIN_DB_PREFIX."element_element";
-		$sql.= " WHERE";
-		if ($rowid > 0)
-		{
-			$sql.=" rowid = ".$rowid;
-		}
-		else
-		{
-			if ($deletesource)
-			{
-				$sql.= " fk_source = ".$sourceid." AND sourcetype = '".$this->db->escape($sourcetype)."'";
-				$sql.= " AND fk_target = ".$this->id." AND targettype = '".$this->db->escape($this->element)."'";
-			}
-			else if ($deletetarget)
-			{
-				$sql.= " fk_target = ".$targetid." AND targettype = '".$this->db->escape($targettype)."'";
-				$sql.= " AND fk_source = ".$this->id." AND sourcetype = '".$this->db->escape($this->element)."'";
-			}
-			else
-			{
-				$sql.= " (fk_source = ".$this->id." AND sourcetype = '".$this->db->escape($this->element)."')";
-				$sql.= " OR";
-				$sql.= " (fk_target = ".$this->id." AND targettype = '".$this->db->escape($this->element)."')";
-			}
-		}
-
-		dol_syslog(get_class($this)."::deleteObjectLinked", LOG_DEBUG);
-		if ($this->db->query($sql))
-		{
-			return 1;
-		}
-		else
-		{
-			$this->error=$this->db->lasterror();
-			$this->errors[]=$this->error;
-			return -1;
-		}
-	}
-
-	/**
-	 *      Set status of an object
-	 *
-	 *      @param	int		$status			Status to set
-	 *      @param	int		$elementId		Id of element to force (use this->id by default)
-	 *      @param	string	$elementType	Type of element to force (use this->table_element by default)
-	 *      @param	string	$trigkey		Trigger key to use for trigger
-	 *      @return int						<0 if KO, >0 if OK
-	 */
-	function setStatut($status, $elementId=null, $elementType='', $trigkey='')
-	{
-		global $user,$langs,$conf;
-
-		$savElementId=$elementId;  // To be used later to know if we were using the method using the id of this or not.
-
-		$elementId = (!empty($elementId)?$elementId:$this->id);
-		$elementTable = (!empty($elementType)?$elementType:$this->table_element);
-
-		$this->db->begin();
-
-		$fieldstatus="fk_statut";
-		if ($elementTable == 'facture_rec') $fieldstatus="suspended";
-		if ($elementTable == 'mailing') $fieldstatus="statut";
-		if ($elementTable == 'cronjob') $fieldstatus="status";
-		if ($elementTable == 'user') $fieldstatus="statut";
-		if ($elementTable == 'expensereport') $fieldstatus="fk_statut";
-		if ($elementTable == 'commande_fournisseur_dispatch') $fieldstatus="status";
-
-		$sql = "UPDATE ".MAIN_DB_PREFIX.$elementTable;
-		$sql.= " SET ".$fieldstatus." = ".$status;
-		// If status = 1 = validated, update also fk_user_valid
-		if ($status == 1 && $elementTable == 'expensereport') $sql.=", fk_user_valid = ".$user->id;
-		$sql.= " WHERE rowid=".$elementId;
-
-		dol_syslog(get_class($this)."::setStatut", LOG_DEBUG);
-		if ($this->db->query($sql))
-		{
-			$error = 0;
-
-			// Try autoset of trigkey
-			if (empty($trigkey))
-			{
-				if ($this->element == 'supplier_proposal' && $status == 2) $trigkey='SUPPLIER_PROPOSAL_SIGN';   // 2 = SupplierProposal::STATUS_SIGNED. Can't use constant into this generic class
-				if ($this->element == 'supplier_proposal' && $status == 3) $trigkey='SUPPLIER_PROPOSAL_REFUSE'; // 3 = SupplierProposal::STATUS_REFUSED. Can't use constant into this generic class
-				if ($this->element == 'supplier_proposal' && $status == 4) $trigkey='SUPPLIER_PROPOSAL_CLOSE';  // 4 = SupplierProposal::STATUS_CLOSED. Can't use constant into this generic class
-				if ($this->element == 'fichinter' && $status == 3) $trigkey='FICHINTER_CLASSIFY_DONE';
-				if ($this->element == 'fichinter' && $status == 2) $trigkey='FICHINTER_CLASSIFY_BILLED';
-				if ($this->element == 'fichinter' && $status == 1) $trigkey='FICHINTER_CLASSIFY_UNBILLED';
-			}
-
-			if ($trigkey)
-			{
-				// Appel des triggers
-				include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-				$interface=new Interfaces($this->db);
-				$result=$interface->run_triggers($trigkey,$this,$user,$langs,$conf);
-				if ($result < 0) {
-					$error++; $this->errors=$interface->errors;
-				}
-				// Fin appel triggers
-			}
+        $sql = "DELETE FROM ".MAIN_DB_PREFIX."element_contact";
+        $sql.= " WHERE element_id = ".$this->id;
+        if ($listId)
+            $sql.= " AND fk_c_type_contact IN (".$listId.")";
 
-			if (! $error)
-			{
-				$this->db->commit();
+        dol_syslog(get_class($this)."::delete_linked_contact", LOG_DEBUG);
+        if ($this->db->query($sql))
+        {
+            return 1;
+        }
+        else
+        {
+            $this->error=$this->db->lasterror();
+            return -1;
+        }
+    }
 
-				if (empty($savElementId))    // If the element we update was $this (so $elementId is null)
-				{
-					$this->statut = $status;
-					$this->status = $status;
-				}
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
+    /**
+     *    Get array of all contacts for an object
+     *
+     *    @param	int			$statut		Status of links to get (-1=all)
+     *    @param	string		$source		Source of contact: external or thirdparty (llx_socpeople) or internal (llx_user)
+     *    @param	int         $list       0:Return array contains all properties, 1:Return array contains just id
+     *    @param    string      $code       Filter on this code of contact type ('SHIPPING', 'BILLING', ...)
+     *    @return	array|int		        Array of contacts, -1 if error
+     */
+    function liste_contact($statut=-1,$source='external',$list=0,$code='')
+    {
+        // phpcs:enable
+        global $langs;
+
+        $tab=array();
+
+        $sql = "SELECT ec.rowid, ec.statut as statuslink, ec.fk_socpeople as id, ec.fk_c_type_contact";    // This field contains id of llx_socpeople or id of llx_user
+        if ($source == 'internal') $sql.=", '-1' as socid, t.statut as statuscontact, t.login, t.photo";
+        if ($source == 'external' || $source == 'thirdparty') $sql.=", t.fk_soc as socid, t.statut as statuscontact";
+        $sql.= ", t.civility as civility, t.lastname as lastname, t.firstname, t.email";
+        $sql.= ", tc.source, tc.element, tc.code, tc.libelle";
+        $sql.= " FROM ".MAIN_DB_PREFIX."c_type_contact tc";
+        $sql.= ", ".MAIN_DB_PREFIX."element_contact ec";
+        if ($source == 'internal') $sql.=" LEFT JOIN ".MAIN_DB_PREFIX."user t on ec.fk_socpeople = t.rowid";
+        if ($source == 'external'|| $source == 'thirdparty') $sql.=" LEFT JOIN ".MAIN_DB_PREFIX."socpeople t on ec.fk_socpeople = t.rowid";
+        $sql.= " WHERE ec.element_id =".$this->id;
+        $sql.= " AND ec.fk_c_type_contact=tc.rowid";
+        $sql.= " AND tc.element='".$this->db->escape($this->element)."'";
+        if ($code) $sql.= " AND tc.code = '".$this->db->escape($code)."'";
+        if ($source == 'internal') $sql.= " AND tc.source = 'internal'";
+        if ($source == 'external' || $source == 'thirdparty') $sql.= " AND tc.source = 'external'";
+        $sql.= " AND tc.active=1";
+        if ($statut >= 0) $sql.= " AND ec.statut = '".$statut."'";
+        $sql.=" ORDER BY t.lastname ASC";
+
+        dol_syslog(get_class($this)."::liste_contact", LOG_DEBUG);
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            $num=$this->db->num_rows($resql);
+            $i=0;
+            while ($i < $num)
+            {
+                $obj = $this->db->fetch_object($resql);
+
+                if (! $list)
+                {
+                    $transkey="TypeContact_".$obj->element."_".$obj->source."_".$obj->code;
+                    $libelle_type=($langs->trans($transkey)!=$transkey ? $langs->trans($transkey) : $obj->libelle);
+                    $tab[$i]=array('source'=>$obj->source,'socid'=>$obj->socid,'id'=>$obj->id,
+                                    'nom'=>$obj->lastname,      // For backward compatibility
+                                    'civility'=>$obj->civility, 'lastname'=>$obj->lastname, 'firstname'=>$obj->firstname, 'email'=>$obj->email, 'login'=>$obj->login, 'photo'=>$obj->photo, 'statuscontact'=>$obj->statuscontact,
+                                    'rowid'=>$obj->rowid, 'code'=>$obj->code, 'libelle'=>$libelle_type, 'status'=>$obj->statuslink, 'fk_c_type_contact'=>$obj->fk_c_type_contact);
+                }
+                else
+                {
+                    $tab[$i]=$obj->id;
+                }
+
+                $i++;
+            }
 
-				return 1;
-			}
-			else
-			{
-				$this->db->rollback();
-				dol_syslog(get_class($this)."::setStatus ".$this->error,LOG_ERR);
-				return -1;
-			}
-		}
-		else
-		{
-			$this->error=$this->db->lasterror();
-			$this->db->rollback();
-			return -1;
-		}
-	}
-
-
-	/**
-	 *  Load type of canvas of an object if it exists
-	 *
-	 *  @param      int		$id     Record id
-	 *  @param      string	$ref    Record ref
-	 *  @return		int				<0 if KO, 0 if nothing done, >0 if OK
-	 */
-	function getCanvas($id=0,$ref='')
-	{
-		global $conf;
-
-		if (empty($id) && empty($ref)) return 0;
-		if (! empty($conf->global->MAIN_DISABLE_CANVAS)) return 0;    // To increase speed. Not enabled by default.
-
-		// Clean parameters
-		$ref = trim($ref);
-
-		$sql = "SELECT rowid, canvas";
-		$sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element;
-		$sql.= " WHERE entity IN (".getEntity($this->element).")";
-		if (! empty($id))  $sql.= " AND rowid = ".$id;
-		if (! empty($ref)) $sql.= " AND ref = '".$this->db->escape($ref)."'";
-
-		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			$obj = $this->db->fetch_object($resql);
-			if ($obj)
-			{
-				$this->canvas   = $obj->canvas;
-				return 1;
-			}
-			else return 0;
-		}
-		else
-		{
-			dol_print_error($this->db);
-			return -1;
-		}
-	}
-
-
-	/**
-	 * 	Get special code of a line
-	 *
-	 * 	@param	int		$lineid		Id of line
-	 * 	@return	int					Special code
-	 */
-	function getSpecialCode($lineid)
-	{
-		$sql = 'SELECT special_code FROM '.MAIN_DB_PREFIX.$this->table_element_line;
-		$sql.= ' WHERE rowid = '.$lineid;
-		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			$row = $this->db->fetch_row($resql);
-			return $row[0];
-		}
-	}
-
-	/**
-	 *  Function to check if an object is used by others.
-	 *  Check is done into this->childtables. There is no check into llx_element_element.
-	 *
-	 *  @param	int		$id			Force id of object
-	 *  @return	int					<0 if KO, 0 if not used, >0 if already used
-	 */
-	function isObjectUsed($id=0)
-	{
-		global $langs;
-
-		if (empty($id)) $id=$this->id;
-
-		// Check parameters
-		if (! isset($this->childtables) || ! is_array($this->childtables) || count($this->childtables) == 0)
-		{
-			dol_print_error('Called isObjectUsed on a class with property this->childtables not defined');
-			return -1;
-		}
-
-		$arraytoscan = $this->childtables;
-		// For backward compatibility, we check if array is old format array('table1', 'table2', ...)
-		$tmparray=array_keys($this->childtables);
-		if (is_numeric($tmparray[0]))
-		{
-			$arraytoscan = array_flip($this->childtables);
-		}
-
-		// Test if child exists
-		$haschild=0;
-		foreach($arraytoscan as $table => $elementname)
-		{
-			//print $id.'-'.$table.'-'.$elementname.'<br>';
-			// Check if third party can be deleted
-			$sql = "SELECT COUNT(*) as nb from ".MAIN_DB_PREFIX.$table;
-			$sql.= " WHERE ".$this->fk_element." = ".$id;
-			$resql=$this->db->query($sql);
-			if ($resql)
-			{
-				$obj=$this->db->fetch_object($resql);
-				if ($obj->nb > 0)
-				{
-					$langs->load("errors");
-					//print 'Found into table '.$table.', type '.$langs->transnoentitiesnoconv($elementname).', haschild='.$haschild;
-					$haschild += $obj->nb;
-					if (is_numeric($elementname))	// old usage
-					{
-						$this->errors[]=$langs->trans("ErrorRecordHasAtLeastOneChildOfType", $table);
-					}
-					else	// new usage: $elementname=Translation key
-					{
-						$this->errors[]=$langs->trans("ErrorRecordHasAtLeastOneChildOfType", $langs->transnoentitiesnoconv($elementname));
-					}
-					break;    // We found at least one, we stop here
-				}
-			}
-			else
-			{
-				$this->errors[]=$this->db->lasterror();
-				return -1;
-			}
-		}
-		if ($haschild > 0)
-		{
-			$this->errors[]="ErrorRecordHasChildren";
-			return $haschild;
-		}
-		else return 0;
-	}
-
-	/**
-	 *  Function to say how many lines object contains
-	 *
-	 *	@param	int		$predefined		-1=All, 0=Count free product/service only, 1=Count predefined product/service only, 2=Count predefined product, 3=Count predefined service
-	 *  @return	int						<0 if KO, 0 if no predefined products, nb of lines with predefined products if found
-	 */
-	function hasProductsOrServices($predefined=-1)
-	{
-		$nb=0;
-
-		foreach($this->lines as $key => $val)
-		{
-			$qualified=0;
-			if ($predefined == -1) $qualified=1;
-			if ($predefined == 1 && $val->fk_product > 0) $qualified=1;
-			if ($predefined == 0 && $val->fk_product <= 0) $qualified=1;
-			if ($predefined == 2 && $val->fk_product > 0 && $val->product_type==0) $qualified=1;
-			if ($predefined == 3 && $val->fk_product > 0 && $val->product_type==1) $qualified=1;
-			if ($qualified) $nb++;
-		}
-		dol_syslog(get_class($this).'::hasProductsOrServices we found '.$nb.' qualified lines of products/servcies');
-		return $nb;
-	}
-
-	/**
-	 * Function that returns the total amount HT of discounts applied for all lines.
-	 *
-	 * @return 	float
-	 */
-	function getTotalDiscount()
-	{
-		$total_discount=0.00;
-
-		$sql = "SELECT subprice as pu_ht, qty, remise_percent, total_ht";
-		$sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element."det";
-		$sql.= " WHERE ".$this->fk_element." = ".$this->id;
-
-		dol_syslog(get_class($this).'::getTotalDiscount', LOG_DEBUG);
-		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			$num=$this->db->num_rows($resql);
-			$i=0;
-			while ($i < $num)
-			{
-				$obj = $this->db->fetch_object($resql);
-
-				$pu_ht = $obj->pu_ht;
-				$qty= $obj->qty;
-				$total_ht = $obj->total_ht;
-
-				$total_discount_line = floatval(price2num(($pu_ht * $qty) - $total_ht, 'MT'));
-				$total_discount += $total_discount_line;
-
-				$i++;
-			}
-		}
-
-		//print $total_discount; exit;
-		return price2num($total_discount);
-	}
-
-
-	/**
-	 * Return into unit=0, the calculated total of weight and volume of all lines * qty
-	 * Calculate by adding weight and volume of each product line, so properties ->volume/volume_units/weight/weight_units must be loaded on line.
-	 *
-	 * @return  array                           array('weight'=>...,'volume'=>...)
-	 */
-	function getTotalWeightVolume()
-	{
-		$totalWeight = 0;
-		$totalVolume = 0;
-		// defined for shipment only
-		$totalOrdered = '';
-		// defined for shipment only
-		$totalToShip = '';
-
-		foreach ($this->lines as $line)
-		{
-			if (isset($line->qty_asked))
-			{
-				if (empty($totalOrdered)) $totalOrdered=0;  // Avoid warning because $totalOrdered is ''
-				$totalOrdered+=$line->qty_asked;    // defined for shipment only
-			}
-			if (isset($line->qty_shipped))
-			{
-				if (empty($totalToShip)) $totalToShip=0;    // Avoid warning because $totalToShip is ''
-				$totalToShip+=$line->qty_shipped;   // defined for shipment only
-            }else if ($line->element == 'commandefournisseurdispatch' && isset($line->qty))
+            return $tab;
+        }
+        else
+        {
+            $this->error=$this->db->lasterror();
+            dol_print_error($this->db);
+            return -1;
+        }
+    }
+
+
+    /**
+     * 		Update status of a contact linked to object
+     *
+     * 		@param	int		$rowid		Id of link between object and contact
+     * 		@return	int					<0 if KO, >=0 if OK
+     */
+    function swapContactStatus($rowid)
+    {
+        $sql = "SELECT ec.datecreate, ec.statut, ec.fk_socpeople, ec.fk_c_type_contact,";
+        $sql.= " tc.code, tc.libelle";
+        //$sql.= ", s.fk_soc";
+        $sql.= " FROM (".MAIN_DB_PREFIX."element_contact as ec, ".MAIN_DB_PREFIX."c_type_contact as tc)";
+        //$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople as s ON ec.fk_socpeople=s.rowid";	// Si contact de type external, alors il est lie a une societe
+        $sql.= " WHERE ec.rowid =".$rowid;
+        $sql.= " AND ec.fk_c_type_contact=tc.rowid";
+        $sql.= " AND tc.element = '".$this->db->escape($this->element)."'";
+
+        dol_syslog(get_class($this)."::swapContactStatus", LOG_DEBUG);
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            $obj = $this->db->fetch_object($resql);
+            $newstatut = ($obj->statut == 4) ? 5 : 4;
+            $result = $this->update_contact($rowid, $newstatut);
+            $this->db->free($resql);
+            return $result;
+        }
+        else
+        {
+            $this->error=$this->db->error();
+            dol_print_error($this->db);
+            return -1;
+        }
+    }
+
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
+    /**
+     *      Return array with list of possible values for type of contacts
+     *
+     *      @param	string	$source     'internal', 'external' or 'all'
+     *      @param	string	$order		Sort order by : 'position', 'code', 'rowid'...
+     *      @param  int		$option     0=Return array id->label, 1=Return array code->label
+     *      @param  int		$activeonly 0=all status of contact, 1=only the active
+     *		@param	string	$code		Type of contact (Example: 'CUSTOMER', 'SERVICE')
+     *      @return array       		Array list of type of contacts (id->label if option=0, code->label if option=1)
+     */
+    function liste_type_contact($source='internal', $order='position', $option=0, $activeonly=0, $code='')
+    {
+        // phpcs:enable
+        global $langs;
+
+        if (empty($order)) $order='position';
+        if ($order == 'position') $order.=',code';
+
+        $tab = array();
+        $sql = "SELECT DISTINCT tc.rowid, tc.code, tc.libelle, tc.position";
+        $sql.= " FROM ".MAIN_DB_PREFIX."c_type_contact as tc";
+        $sql.= " WHERE tc.element='".$this->db->escape($this->element)."'";
+        if ($activeonly == 1) $sql.= " AND tc.active=1"; // only the active types
+        if (! empty($source) && $source != 'all') $sql.= " AND tc.source='".$this->db->escape($source)."'";
+        if (! empty($code)) $sql.= " AND tc.code='".$this->db->escape($code)."'";
+        $sql.= $this->db->order($order,'ASC');
+
+        //print "sql=".$sql;
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            $num=$this->db->num_rows($resql);
+            $i=0;
+            while ($i < $num)
             {
-                if (empty($totalToShip)) $totalToShip=0;
-                $totalToShip+=$line->qty;   // defined for reception only
-			}
-
-			// Define qty, weight, volume, weight_units, volume_units
-			if ($this->element == 'shipping') {
-				// for shipments
-				$qty = $line->qty_shipped ? $line->qty_shipped : 0;
-			}
-			else {
-				$qty = $line->qty ? $line->qty : 0;
-			}
-
-			$weight = $line->weight ? $line->weight : 0;
-            ($weight==0 && !empty($line->product->weight))? $weight=$line->product->weight: 0;
-			$volume = $line->volume ? $line->volume : 0;
-			($volume==0 && !empty($line->product->volume))? $volume=$line->product->volume: 0;
+                $obj = $this->db->fetch_object($resql);
 
-			$weight_units=$line->weight_units;
-			($weight_units==0 && !empty($line->product->weight_units))? $weight_units=$line->product->weight_units: 0;
-			$volume_units=$line->volume_units;
-			($volume_units==0 && !empty($line->product->volume_units))? $volume_units=$line->product->volume_units: 0;
+                $transkey="TypeContact_".$this->element."_".$source."_".$obj->code;
+                $libelle_type=($langs->trans($transkey)!=$transkey ? $langs->trans($transkey) : $obj->libelle);
+                if (empty($option)) $tab[$obj->rowid]=$libelle_type;
+                else $tab[$obj->code]=$libelle_type;
+                $i++;
+            }
+            return $tab;
+        }
+        else
+        {
+            $this->error=$this->db->lasterror();
+            //dol_print_error($this->db);
+            return null;
+        }
+    }
 
-			$weightUnit=0;
-			$volumeUnit=0;
-			if (! empty($weight_units)) $weightUnit = $weight_units;
-			if (! empty($volume_units)) $volumeUnit = $volume_units;
+    /**
+     *      Return id of contacts for a source and a contact code.
+     *      Example: contact client de facturation ('external', 'BILLING')
+     *      Example: contact client de livraison ('external', 'SHIPPING')
+     *      Example: contact interne suivi paiement ('internal', 'SALESREPFOLL')
+     *
+     *		@param	string	$source		'external' or 'internal'
+     *		@param	string	$code		'BILLING', 'SHIPPING', 'SALESREPFOLL', ...
+     *		@param	int		$status		limited to a certain status
+     *      @return array       		List of id for such contacts
+     */
+    function getIdContact($source,$code,$status=0)
+    {
+        global $conf;
 
-			if (empty($totalWeight)) $totalWeight=0;  // Avoid warning because $totalWeight is ''
-			if (empty($totalVolume)) $totalVolume=0;  // Avoid warning because $totalVolume is ''
+        $result=array();
+        $i=0;
+        //cas particulier pour les expeditions
+        if($this->element=='shipping' && $this->origin_id != 0) {
+            $id=$this->origin_id;
+            $element='commande';
+        } else if($this->element=='reception' && $this->origin_id != 0) {
+            $id=$this->origin_id;
+            $element='order_supplier';
+        } else {
+            $id=$this->id;
+            $element=$this->element;
+        }
 
-			//var_dump($line->volume_units);
-			if ($weight_units < 50)   // >50 means a standard unit (power of 10 of official unit), > 50 means an exotic unit (like inch)
-			{
-				$trueWeightUnit=pow(10, $weightUnit);
-				$totalWeight += $weight * $qty * $trueWeightUnit;
-			}
-			else {
-		if ($weight_units == 99) {
-			// conversion 1 Pound = 0.45359237 KG
-			$trueWeightUnit = 0.45359237;
-			$totalWeight += $weight * $qty * $trueWeightUnit;
-		} elseif ($weight_units == 98) {
-			// conversion 1 Ounce = 0.0283495 KG
-			$trueWeightUnit = 0.0283495;
-			$totalWeight += $weight * $qty * $trueWeightUnit;
-		}
-		else
-					$totalWeight += $weight * $qty;   // This may be wrong if we mix different units
-			}
-			if ($volume_units < 50)   // >50 means a standard unit (power of 10 of official unit), > 50 means an exotic unit (like inch)
-			{
-				//print $line->volume."x".$line->volume_units."x".($line->volume_units < 50)."x".$volumeUnit;
-				$trueVolumeUnit=pow(10, $volumeUnit);
-				//print $line->volume;
-				$totalVolume += $volume * $qty * $trueVolumeUnit;
-			}
-			else
-			{
-				$totalVolume += $volume * $qty;   // This may be wrong if we mix different units
-			}
-		}
-
-		return array('weight'=>$totalWeight, 'volume'=>$totalVolume, 'ordered'=>$totalOrdered, 'toship'=>$totalToShip);
-	}
-
-
-	/**
-	 *	Set extra parameters
-	 *
-	 *	@return	int      <0 if KO, >0 if OK
-	 */
-	function setExtraParameters()
-	{
-		$this->db->begin();
-
-		$extraparams = (! empty($this->extraparams) ? json_encode($this->extraparams) : null);
-
-		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
-		$sql.= " SET extraparams = ".(! empty($extraparams) ? "'".$this->db->escape($extraparams)."'" : "null");
-		$sql.= " WHERE rowid = ".$this->id;
-
-		dol_syslog(get_class($this)."::setExtraParameters", LOG_DEBUG);
-		$resql = $this->db->query($sql);
-		if (! $resql)
-		{
-			$this->error=$this->db->lasterror();
-			$this->db->rollback();
-			return -1;
-		}
-		else
-		{
-			$this->db->commit();
-			return 1;
-		}
-	}
+        $sql = "SELECT ec.fk_socpeople";
+        $sql.= " FROM ".MAIN_DB_PREFIX."element_contact as ec,";
+        if ($source == 'internal') $sql.= " ".MAIN_DB_PREFIX."user as c,";
+        if ($source == 'external') $sql.= " ".MAIN_DB_PREFIX."socpeople as c,";
+        $sql.= " ".MAIN_DB_PREFIX."c_type_contact as tc";
+        $sql.= " WHERE ec.element_id = ".$id;
+        $sql.= " AND ec.fk_socpeople = c.rowid";
+        if ($source == 'internal') $sql.= " AND c.entity IN (".getEntity('user').")";
+        if ($source == 'external') $sql.= " AND c.entity IN (".getEntity('societe').")";
+        $sql.= " AND ec.fk_c_type_contact = tc.rowid";
+        $sql.= " AND tc.element = '".$element."'";
+        $sql.= " AND tc.source = '".$source."'";
+        $sql.= " AND tc.code = '".$code."'";
+        $sql.= " AND tc.active = 1";
+        if ($status) $sql.= " AND ec.statut = ".$status;
+
+        dol_syslog(get_class($this)."::getIdContact", LOG_DEBUG);
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            while ($obj = $this->db->fetch_object($resql))
+            {
+                $result[$i]=$obj->fk_socpeople;
+                $i++;
+            }
+        }
+        else
+        {
+            $this->error=$this->db->error();
+            return null;
+        }
 
+        return $result;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *    Return incoterms informations
-	 *    TODO Use a cache for label get
-	 *
-	 *    @return	string	incoterms info
-	 */
-	function display_incoterms()
-	{
+    /**
+     *		Load object contact with id=$this->contactid into $this->contact
+     *
+     *		@param	int		$contactid      Id du contact. Use this->contactid if empty.
+     *		@return	int						<0 if KO, >0 if OK
+     */
+    function fetch_contact($contactid=null)
+    {
         // phpcs:enable
-		$out = '';
-		$this->libelle_incoterms = '';
-		if (!empty($this->fk_incoterms))
-		{
-			$sql = 'SELECT code FROM '.MAIN_DB_PREFIX.'c_incoterms WHERE rowid = '.(int) $this->fk_incoterms;
-			$result = $this->db->query($sql);
-			if ($result)
-			{
-				$res = $this->db->fetch_object($result);
-				$out .= $res->code;
-			}
-		}
-
-		$out .= (($res->code && $this->location_incoterms)?' - ':'').$this->location_incoterms;
-
-		return $out;
-	}
-
-	/**
-	 *    Return incoterms informations for pdf display
-	 *
-	 *    @return	string		incoterms info
-	 */
-	function getIncotermsForPDF()
-	{
-		$sql = 'SELECT code FROM '.MAIN_DB_PREFIX.'c_incoterms WHERE rowid = '.(int) $this->fk_incoterms;
-		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			$num = $this->db->num_rows($resql);
-			if ($num > 0)
-			{
-				$res = $this->db->fetch_object($resql);
-				return 'Incoterm : '.$res->code.' - '.$this->location_incoterms;
-			}
-			else
-			{
-				return '';
-			}
-		}
-		else
-		{
-			$this->errors[] = $this->db->lasterror();
-			return false;
-		}
-	}
-
-	/**
-	 *    Define incoterms values of current object
-	 *
-	 *    @param	int		$id_incoterm     Id of incoterm to set or '' to remove
-	 * 	  @param 	string  $location		 location of incoterm
-	 *    @return	int     		<0 if KO, >0 if OK
-	 */
-	function setIncoterms($id_incoterm, $location)
-	{
-		if ($this->id && $this->table_element)
-		{
-			$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
-			$sql.= " SET fk_incoterms = ".($id_incoterm > 0 ? $id_incoterm : "null");
-			$sql.= ", location_incoterms = ".($id_incoterm > 0 ? "'".$this->db->escape($location)."'" : "null");
-			$sql.= " WHERE rowid = " . $this->id;
-			dol_syslog(get_class($this).'::setIncoterms', LOG_DEBUG);
-			$resql=$this->db->query($sql);
-			if ($resql)
-			{
-				$this->fk_incoterms = $id_incoterm;
-				$this->location_incoterms = $location;
+        if (empty($contactid)) $contactid=$this->contactid;
 
-				$sql = 'SELECT libelle FROM '.MAIN_DB_PREFIX.'c_incoterms WHERE rowid = '.(int) $this->fk_incoterms;
-				$res = $this->db->query($sql);
-				if ($res)
-				{
-					$obj = $this->db->fetch_object($res);
-					$this->libelle_incoterms = $obj->libelle;
-				}
-				return 1;
-			}
-			else
-			{
-				$this->errors[] = $this->db->lasterror();
-				return -1;
-			}
-		}
-		else return -1;
-	}
-
-
-	// --------------------
-	// TODO: All functions here must be redesigned and moved as they are not business functions but output functions
-	// --------------------
-
-	/* This is to show add lines */
-
-	/**
-	 *	Show add free and predefined products/services form
-	 *
-	 *  @param	int		        $dateSelector       1=Show also date range input fields
-	 *  @param	Societe			$seller				Object thirdparty who sell
-	 *  @param	Societe			$buyer				Object thirdparty who buy
-	 *	@return	void
-	 */
-	function formAddObjectLine($dateSelector, $seller, $buyer)
-	{
-		global $conf,$user,$langs,$object,$hookmanager;
-		global $form,$bcnd,$var;
-
-		// Line extrafield
-		require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-		$extrafieldsline = new ExtraFields($this->db);
-		$extralabelslines=$extrafieldsline->fetch_name_optionals_label($this->table_element_line);
-
-		// Output template part (modules that overwrite templates must declare this into descriptor)
-		// Use global variables + $dateSelector + $seller and $buyer
-		$dirtpls=array_merge($conf->modules_parts['tpl'],array('/core/tpl'));
-		foreach($dirtpls as $reldir)
-		{
-			$tpl = dol_buildpath($reldir.'/objectline_create.tpl.php');
-			if (empty($conf->file->strict_mode)) {
-				$res=@include $tpl;
-			} else {
-				$res=include $tpl; // for debug
-			}
-			if ($res) break;
-		}
-	}
-
-
-
-	/* This is to show array of line of details */
-
-
-	/**
-	 *	Return HTML table for object lines
-	 *	TODO Move this into an output class file (htmlline.class.php)
-	 *	If lines are into a template, title must also be into a template
-	 *	But for the moment we don't know if it's possible as we keep a method available on overloaded objects.
-	 *
-	 *	@param	string		$action				Action code
-	 *	@param  string		$seller            	Object of seller third party
-	 *	@param  string  	$buyer             	Object of buyer third party
-	 *	@param	int			$selected		   	Object line selected
-	 *	@param  int	    	$dateSelector      	1=Show also date range input fields
-	 *	@return	void
-	 */
-	function printObjectLines($action, $seller, $buyer, $selected=0, $dateSelector=0)
-	{
-		global $conf, $hookmanager, $langs, $user;
-		// TODO We should not use global var for this !
-		global $inputalsopricewithtax, $usemargins, $disableedit, $disablemove, $disableremove, $outputalsopricetotalwithtax;
-
-		// Define usemargins
-		$usemargins=0;
-		if (! empty($conf->margin->enabled) && ! empty($this->element) && in_array($this->element,array('facture','propal','commande'))) $usemargins=1;
-
-		$num = count($this->lines);
-
-		// Line extrafield
-		require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-		$extrafieldsline = new ExtraFields($this->db);
-		$extralabelslines=$extrafieldsline->fetch_name_optionals_label($this->table_element_line);
-
-		$parameters = array('num'=>$num,'i'=>$i,'dateSelector'=>$dateSelector,'seller'=>$seller,'buyer'=>$buyer,'selected'=>$selected, 'extrafieldsline'=>$extrafieldsline);
-		$reshook = $hookmanager->executeHooks('printObjectLineTitle', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-		if (empty($reshook))
-		{
-			// Title line
-		    print "<thead>\n";
-
-			print '<tr class="liste_titre nodrag nodrop">';
-
-			// Adds a line numbering column
-			if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER)) print '<td class="linecolnum" align="center" width="5">&nbsp;</td>';
-
-			// Description
-			print '<td class="linecoldescription">'.$langs->trans('Description').'</td>';
-
-			if ($this->element == 'supplier_proposal' || $this->element == 'order_supplier' || $this->element == 'invoice_supplier')
-			{
-				print '<td class="linerefsupplier"><span id="title_fourn_ref">'.$langs->trans("SupplierRef").'</span></td>';
-			}
+        if (empty($contactid)) return 0;
 
-			// VAT
-			print '<td class="linecolvat" align="right" width="80">'.$langs->trans('VAT').'</td>';
+        require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
+        $contact = new Contact($this->db);
+        $result=$contact->fetch($contactid);
+        $this->contact = $contact;
+        return $result;
+    }
 
-			// Price HT
-			print '<td class="linecoluht" align="right" width="80">'.$langs->trans('PriceUHT').'</td>';
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
+    /**
+     *    	Load the third party of object, from id $this->socid or $this->fk_soc, into this->thirdparty
+     *
+     *		@param		int		$force_thirdparty_id	Force thirdparty id
+     *		@return		int								<0 if KO, >0 if OK
+     */
+    function fetch_thirdparty($force_thirdparty_id=0)
+    {
+        // phpcs:enable
+        global $conf;
 
-			// Multicurrency
-			if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) print '<td class="linecoluht_currency" align="right" width="80">'.$langs->trans('PriceUHTCurrency', $this->multicurrency_code).'</td>';
+        if (empty($this->socid) && empty($this->fk_soc) && empty($this->fk_thirdparty) && empty($force_thirdparty_id))
+            return 0;
 
-			if ($inputalsopricewithtax) print '<td align="right" width="80">'.$langs->trans('PriceUTTC').'</td>';
+        require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
 
-			// Qty
-			print '<td class="linecolqty" align="right">'.$langs->trans('Qty').'</td>';
+        $idtofetch = isset($this->socid) ? $this->socid : (isset($this->fk_soc) ? $this->fk_soc : $this->fk_thirdparty);
+        if ($force_thirdparty_id)
+            $idtofetch = $force_thirdparty_id;
 
-			if($conf->global->PRODUCT_USE_UNITS)
-			{
-				print '<td class="linecoluseunit" align="left">'.$langs->trans('Unit').'</td>';
-			}
+        if ($idtofetch) {
+            $thirdparty = new Societe($this->db);
+            $result = $thirdparty->fetch($idtofetch);
+            $this->thirdparty = $thirdparty;
 
-			// Reduction short
-			print '<td class="linecoldiscount" align="right">'.$langs->trans('ReductionShort').'</td>';
+            // Use first price level if level not defined for third party
+            if (!empty($conf->global->PRODUIT_MULTIPRICES) && empty($this->thirdparty->price_level)) {
+                $this->thirdparty->price_level = 1;
+            }
 
-			if ($this->situation_cycle_ref) {
-				print '<td class="linecolcycleref" align="right">' . $langs->trans('Progress') . '</td>';
-			}
+            return $result;
+        } else
+            return -1;
+    }
 
-			if ($usemargins && ! empty($conf->margin->enabled) && empty($user->societe_id))
-			{
-				if (!empty($user->rights->margins->creer))
-				{
-					if ($conf->global->MARGIN_TYPE == "1")
-						print '<td class="linecolmargin1 margininfos" align="right" width="80">'.$langs->trans('BuyingPrice').'</td>';
-					else
-						print '<td class="linecolmargin1 margininfos" align="right" width="80">'.$langs->trans('CostPrice').'</td>';
-				}
 
-				if (! empty($conf->global->DISPLAY_MARGIN_RATES) && $user->rights->margins->liretous)
-					print '<td class="linecolmargin2 margininfos" align="right" width="50">'.$langs->trans('MarginRate').'</td>';
-				if (! empty($conf->global->DISPLAY_MARK_RATES) && $user->rights->margins->liretous)
-					print '<td class="linecolmargin2 margininfos" align="right" width="50">'.$langs->trans('MarkRate').'</td>';
-			}
+    /**
+     * Looks for an object with ref matching the wildcard provided
+     * It does only work when $this->table_ref_field is set
+     *
+     * @param string $ref Wildcard
+     * @return int >1 = OK, 0 = Not found or table_ref_field not defined, <0 = KO
+     */
+    public function fetchOneLike($ref)
+    {
+        if (!$this->table_ref_field) {
+            return 0;
+        }
 
-			// Total HT
-			print '<td class="linecolht" align="right">'.$langs->trans('TotalHTShort').'</td>';
+        $sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.$this->table_element.' WHERE '.$this->table_ref_field.' LIKE "'.$this->db->escape($ref).'" LIMIT 1';
 
-			// Multicurrency
-			if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) print '<td class="linecoltotalht_currency" align="right">'.$langs->trans('TotalHTShortCurrency', $this->multicurrency_code).'</td>';
+        $query = $this->db->query($sql);
 
-			if ($outputalsopricetotalwithtax) print '<td align="right" width="80">'.$langs->trans('TotalTTCShort').'</td>';
+        if (!$this->db->num_rows($query)) {
+            return 0;
+        }
 
-			print '<td class="linecoledit"></td>';  // No width to allow autodim
+        $result = $this->db->fetch_object($query);
 
-			print '<td class="linecoldelete" width="10"></td>';
+        return $this->fetch($result->rowid);
+    }
 
-			print '<td class="linecolmove" width="10"></td>';
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
+    /**
+     *	Load data for barcode into properties ->barcode_type*
+     *	Properties ->barcode_type that is id of barcode. Type is used to find other properties, but
+     *  if it is not defined, ->element must be defined to know default barcode type.
+     *
+     *	@return		int			<0 if KO, 0 if can't guess type of barcode (ISBN, EAN13...), >0 if OK (all barcode properties loaded)
+     */
+    function fetch_barcode()
+    {
+        // phpcs:enable
+        global $conf;
 
-			if($action == 'selectlines')
-			{
-			    print '<td class="linecolcheckall" align="center">';
-			    print '<input type="checkbox" class="linecheckboxtoggle" />';
-			    print '<script type="text/javascript">$(document).ready(function() {$(".linecheckboxtoggle").click(function() {var checkBoxes = $(".linecheckbox");checkBoxes.prop("checked", this.checked);})});</script>';
-			    print '</td>';
-			}
-
-			print "</tr>\n";
-			print "</thead>\n";
-		}
-
-		$var = true;
-		$i	 = 0;
-
-		print "<tbody>\n";
-		foreach ($this->lines as $line)
-		{
-			//Line extrafield
-			$line->fetch_optionals();
-
-			//if (is_object($hookmanager) && (($line->product_type == 9 && ! empty($line->special_code)) || ! empty($line->fk_parent_line)))
-			if (is_object($hookmanager))   // Old code is commented on preceding line.
-			{
-				if (empty($line->fk_parent_line))
-				{
-					$parameters = array('line'=>$line,'var'=>$var,'num'=>$num,'i'=>$i,'dateSelector'=>$dateSelector,'seller'=>$seller,'buyer'=>$buyer,'selected'=>$selected, 'extrafieldsline'=>$extrafieldsline);
-					$reshook = $hookmanager->executeHooks('printObjectLine', $parameters, $this, $action);    // Note that $action and $object may have been modified by some hooks
-				}
-				else
-				{
-					$parameters = array('line'=>$line,'var'=>$var,'num'=>$num,'i'=>$i,'dateSelector'=>$dateSelector,'seller'=>$seller,'buyer'=>$buyer,'selected'=>$selected, 'extrafieldsline'=>$extrafieldsline, 'fk_parent_line'=>$line->fk_parent_line);
-					$reshook = $hookmanager->executeHooks('printObjectSubLine', $parameters, $this, $action);    // Note that $action and $object may have been modified by some hooks
-				}
-			}
-			if (empty($reshook))
-			{
-				$this->printObjectLine($action,$line,$var,$num,$i,$dateSelector,$seller,$buyer,$selected,$extrafieldsline);
-			}
-
-			$i++;
-		}
-		print "</tbody>\n";
-	}
-
-	/**
-	 *	Return HTML content of a detail line
-	 *	TODO Move this into an output class file (htmlline.class.php)
-	 *
-	 *	@param	string		$action				GET/POST action
-	 *	@param CommonObjectLine $line		       	Selected object line to output
-	 *	@param  string	    $var               	Is it a an odd line (true)
-	 *	@param  int		    $num               	Number of line (0)
-	 *	@param  int		    $i					I
-	 *	@param  int		    $dateSelector      	1=Show also date range input fields
-	 *	@param  string	    $seller            	Object of seller third party
-	 *	@param  string	    $buyer             	Object of buyer third party
-	 *	@param	int			$selected		   	Object line selected
-	 *  @param  int			$extrafieldsline	Object of extrafield line attribute
-	 *	@return	void
-	 */
-	function printObjectLine($action,$line,$var,$num,$i,$dateSelector,$seller,$buyer,$selected=0,$extrafieldsline=0)
-	{
-		global $conf,$langs,$user,$object,$hookmanager;
-		global $form,$bc,$bcdd;
-		global $object_rights, $disableedit, $disablemove, $disableremove;   // TODO We should not use global var for this !
-
-		$object_rights = $this->getRights();
-
-		$element=$this->element;
-
-		$text=''; $description=''; $type=0;
-
-		// Show product and description
-		$type=(! empty($line->product_type)?$line->product_type:$line->fk_product_type);
-		// Try to enhance type detection using date_start and date_end for free lines where type was not saved.
-		if (! empty($line->date_start)) $type=1; // deprecated
-		if (! empty($line->date_end)) $type=1; // deprecated
-
-		// Ligne en mode visu
-		if ($action != 'editline' || $selected != $line->id)
-		{
-			// Product
-			if ($line->fk_product > 0)
-			{
-				$product_static = new Product($this->db);
-				$product_static->fetch($line->fk_product);
+        dol_syslog(get_class($this).'::fetch_barcode this->element='.$this->element.' this->barcode_type='.$this->barcode_type);
 
-				$product_static->ref = $line->ref; //can change ref in hook
-				$product_static->label = $line->label; //can change label in hook
-				$text=$product_static->getNomUrl(1);
+        $idtype=$this->barcode_type;
+        if (empty($idtype) && $idtype != '0')	// If type of barcode no set, we try to guess. If set to '0' it means we forced to have type remain not defined
+        {
+            if ($this->element == 'product')      $idtype = $conf->global->PRODUIT_DEFAULT_BARCODE_TYPE;
+            else if ($this->element == 'societe') $idtype = $conf->global->GENBARCODE_BARCODETYPE_THIRDPARTY;
+            else dol_syslog('Call fetch_barcode with barcode_type not defined and cant be guessed', LOG_WARNING);
+        }
 
-				// Define output language and label
-				if (! empty($conf->global->MAIN_MULTILANGS))
-				{
-					if (! is_object($this->thirdparty))
-					{
-						dol_print_error('','Error: Method printObjectLine was called on an object and object->fetch_thirdparty was not done before');
-						return;
-					}
-
-					$prod = new Product($this->db);
-					$prod->fetch($line->fk_product);
-
-					$outputlangs = $langs;
-					$newlang='';
-					if (empty($newlang) && GETPOST('lang_id','aZ09')) $newlang=GETPOST('lang_id','aZ09');
-					if (! empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE) && empty($newlang)) $newlang=$this->thirdparty->default_lang;		// For language to language of customer
-					if (! empty($newlang))
-					{
-						$outputlangs = new Translate("",$conf);
-						$outputlangs->setDefaultLang($newlang);
-					}
-
-					$label = (! empty($prod->multilangs[$outputlangs->defaultlang]["label"])) ? $prod->multilangs[$outputlangs->defaultlang]["label"] : $line->product_label;
-				}
-				else
-				{
-					$label = $line->product_label;
-				}
+        if ($idtype > 0)
+        {
+            if (empty($this->barcode_type) || empty($this->barcode_type_code) || empty($this->barcode_type_label) || empty($this->barcode_type_coder))    // If data not already loaded
+            {
+                $sql = "SELECT rowid, code, libelle as label, coder";
+                $sql.= " FROM ".MAIN_DB_PREFIX."c_barcode_type";
+                $sql.= " WHERE rowid = ".$idtype;
+                dol_syslog(get_class($this).'::fetch_barcode', LOG_DEBUG);
+                $resql = $this->db->query($sql);
+                if ($resql)
+                {
+                    $obj = $this->db->fetch_object($resql);
+                    $this->barcode_type       = $obj->rowid;
+                    $this->barcode_type_code  = $obj->code;
+                    $this->barcode_type_label = $obj->label;
+                    $this->barcode_type_coder = $obj->coder;
+                    return 1;
+                }
+                else
+                {
+                    dol_print_error($this->db);
+                    return -1;
+                }
+            }
+        }
+        return 0;
+    }
 
-				$text.= ' - '.(! empty($line->label)?$line->label:$label);
-				$description.=(! empty($conf->global->PRODUIT_DESC_IN_FORM)?'':dol_htmlentitiesbr($line->description));	// Description is what to show on popup. We shown nothing if already into desc.
-			}
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
+    /**
+     *		Load the project with id $this->fk_project into this->project
+     *
+     *		@return		int			<0 if KO, >=0 if OK
+     */
+    function fetch_projet()
+    {
+        // phpcs:enable
+        include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 
-			$line->pu_ttc = price2num($line->subprice * (1 + ($line->tva_tx/100)), 'MU');
+        if (empty($this->fk_project) && ! empty($this->fk_projet)) $this->fk_project = $this->fk_projet;	// For backward compatibility
+        if (empty($this->fk_project)) return 0;
 
-			// Output template part (modules that overwrite templates must declare this into descriptor)
-			// Use global variables + $dateSelector + $seller and $buyer
-			$dirtpls=array_merge($conf->modules_parts['tpl'],array('/core/tpl'));
-			foreach($dirtpls as $reldir)
-			{
-				$tpl = dol_buildpath($reldir.'/objectline_view.tpl.php');
-				if (empty($conf->file->strict_mode)) {
-					$res=@include $tpl;
-				} else {
-					$res=include $tpl; // for debug
-				}
-				if ($res) break;
-			}
-		}
-
-		// Ligne en mode update
-		if ($this->statut == 0 && $action == 'editline' && $selected == $line->id)
-		{
-			$label = (! empty($line->label) ? $line->label : (($line->fk_product > 0) ? $line->product_label : ''));
-			$placeholder=' placeholder="'.$langs->trans("Label").'"';
-
-			$line->pu_ttc = price2num($line->subprice * (1 + ($line->tva_tx/100)), 'MU');
-
-			// Output template part (modules that overwrite templates must declare this into descriptor)
-			// Use global variables + $dateSelector + $seller and $buyer
-			$dirtpls=array_merge($conf->modules_parts['tpl'],array('/core/tpl'));
-			foreach($dirtpls as $reldir)
-			{
-				$tpl = dol_buildpath($reldir.'/objectline_edit.tpl.php');
-				if (empty($conf->file->strict_mode)) {
-					$res=@include $tpl;
-				} else {
-					$res=include $tpl; // for debug
-				}
-				if ($res) break;
-			}
-		}
-	}
-
-
-	/* This is to show array of line of details of source object */
-
-
-	/**
-	 * 	Return HTML table table of source object lines
-	 *  TODO Move this and previous function into output html class file (htmlline.class.php).
-	 *  If lines are into a template, title must also be into a template
-	 *  But for the moment we don't know if it's possible, so we keep the method available on overloaded objects.
-	 *
-	 *	@param	string		$restrictlist		''=All lines, 'services'=Restrict to services only
-	 *  @return	void
-	 */
-	function printOriginLinesList($restrictlist='')
-	{
-		global $langs, $hookmanager, $conf;
-
-		print '<tr class="liste_titre">';
-		print '<td>'.$langs->trans('Ref').'</td>';
-		print '<td>'.$langs->trans('Description').'</td>';
-		print '<td align="right">'.$langs->trans('VATRate').'</td>';
-		print '<td align="right">'.$langs->trans('PriceUHT').'</td>';
-		if (!empty($conf->multicurrency->enabled)) print '<td align="right">'.$langs->trans('PriceUHTCurrency').'</td>';
-		print '<td align="right">'.$langs->trans('Qty').'</td>';
-		if($conf->global->PRODUCT_USE_UNITS)
-		{
-			print '<td align="left">'.$langs->trans('Unit').'</td>';
-		}
-		print '<td align="right">'.$langs->trans('ReductionShort').'</td></tr>';
-
-		$var = true;
-		$i	 = 0;
-
-		if (! empty($this->lines))
-		{
-			foreach ($this->lines as $line)
-			{
-				if (is_object($hookmanager) && (($line->product_type == 9 && ! empty($line->special_code)) || ! empty($line->fk_parent_line)))
-				{
-					if (empty($line->fk_parent_line))
-					{
-						$parameters=array('line'=>$line,'var'=>$var,'i'=>$i);
-						$action='';
-						$hookmanager->executeHooks('printOriginObjectLine',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
-					}
-				}
-				else
-				{
-					$this->printOriginLine($line, $var, $restrictlist);
-				}
+        $project = new Project($this->db);
+        $result = $project->fetch($this->fk_project);
 
-				$i++;
-			}
-		}
-	}
-
-	/**
-	 * 	Return HTML with a line of table array of source object lines
-	 *  TODO Move this and previous function into output html class file (htmlline.class.php).
-	 *  If lines are into a template, title must also be into a template
-	 *  But for the moment we don't know if it's possible as we keep a method available on overloaded objects.
-	 *
-	 * 	@param	CommonObjectLine	$line				Line
-	 * 	@param	string				$var				Var
-	 *	@param	string				$restrictlist		''=All lines, 'services'=Restrict to services only (strike line if not)
-	 * 	@return	void
-	 */
-	function printOriginLine($line, $var, $restrictlist='')
-	{
-		global $langs, $conf;
-
-		//var_dump($line);
-		if (!empty($line->date_start))
-		{
-			$date_start=$line->date_start;
-		}
-		else
-		{
-			$date_start=$line->date_debut_prevue;
-			if ($line->date_debut_reel) $date_start=$line->date_debut_reel;
-		}
-		if (!empty($line->date_end))
-		{
-			$date_end=$line->date_end;
-		}
-		else
-		{
-			$date_end=$line->date_fin_prevue;
-			if ($line->date_fin_reel) $date_end=$line->date_fin_reel;
-		}
-
-		$this->tpl['label'] = '';
-		if (! empty($line->fk_parent_line)) $this->tpl['label'].= img_picto('', 'rightarrow');
-
-		if (($line->info_bits & 2) == 2)  // TODO Not sure this is used for source object
-		{
-			$discount=new DiscountAbsolute($this->db);
-			$discount->fk_soc = $this->socid;
-			$this->tpl['label'].= $discount->getNomUrl(0,'discount');
-		}
-		else if (! empty($line->fk_product))
-		{
-			$productstatic = new Product($this->db);
-			$productstatic->id = $line->fk_product;
-			$productstatic->ref = $line->ref;
-			$productstatic->type = $line->fk_product_type;
-            if(empty($productstatic->ref)){
-				$line->fetch_product();
-				$productstatic = $line->product;
-			}
-			
-			$this->tpl['label'].= $productstatic->getNomUrl(1);
-			$this->tpl['label'].= ' - '.(! empty($line->label)?$line->label:$line->product_label);
-			// Dates
-			if ($line->product_type == 1 && ($date_start || $date_end))
-			{
-				$this->tpl['label'].= get_date_range($date_start,$date_end);
-			}
-		}
-		else
-		{
-			$this->tpl['label'].= ($line->product_type == -1 ? '&nbsp;' : ($line->product_type == 1 ? img_object($langs->trans(''),'service') : img_object($langs->trans(''),'product')));
-			if (!empty($line->desc)) {
-				$this->tpl['label'].=$line->desc;
-			}else {
-				$this->tpl['label'].= ($line->label ? '&nbsp;'.$line->label : '');
-			}
-			
-			// Dates
-			if ($line->product_type == 1 && ($date_start || $date_end))
-			{
-				$this->tpl['label'].= get_date_range($date_start,$date_end);
-			}
-		}
+        $this->projet = $project;	// deprecated
+        $this->project = $project;
+        return $result;
+    }
 
-		if (! empty($line->desc))
-		{
-			if ($line->desc == '(CREDIT_NOTE)')  // TODO Not sure this is used for source object
-			{
-				$discount=new DiscountAbsolute($this->db);
-				$discount->fetch($line->fk_remise_except);
-				$this->tpl['description'] = $langs->transnoentities("DiscountFromCreditNote",$discount->getNomUrl(0));
-			}
-			elseif ($line->desc == '(DEPOSIT)')  // TODO Not sure this is used for source object
-			{
-				$discount=new DiscountAbsolute($this->db);
-				$discount->fetch($line->fk_remise_except);
-				$this->tpl['description'] = $langs->transnoentities("DiscountFromDeposit",$discount->getNomUrl(0));
-			}
-			elseif ($line->desc == '(EXCESS RECEIVED)')
-			{
-				$discount=new DiscountAbsolute($this->db);
-				$discount->fetch($line->fk_remise_except);
-				$this->tpl['description'] = $langs->transnoentities("DiscountFromExcessReceived",$discount->getNomUrl(0));
-			}
-			elseif ($line->desc == '(EXCESS PAID)')
-			{
-				$discount=new DiscountAbsolute($this->db);
-				$discount->fetch($line->fk_remise_except);
-				$this->tpl['description'] = $langs->transnoentities("DiscountFromExcessPaid",$discount->getNomUrl(0));
-			}
-			else
-			{
-				$this->tpl['description'] = dol_trunc($line->desc,60);
-			}
-		}
-		else
-		{
-			$this->tpl['description'] = '&nbsp;';
-		}
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
+    /**
+     *		Load the product with id $this->fk_product into this->product
+     *
+     *		@return		int			<0 if KO, >=0 if OK
+     */
+    function fetch_product()
+    {
+        // phpcs:enable
+        include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 
-        // VAT Rate
-        $this->tpl['vat_rate'] = vatrate($line->tva_tx, true);
-        $this->tpl['vat_rate'] .= (($line->info_bits & 1) == 1) ? '*' : '';
-        if (! empty($line->vat_src_code) && ! preg_match('/\(/', $this->tpl['vat_rate'])) $this->tpl['vat_rate'].=' ('.$line->vat_src_code.')';
+        if (empty($this->fk_product)) return 0;
 
-		$this->tpl['price'] = price($line->subprice);
-		$this->tpl['multicurrency_price'] = price($line->multicurrency_subprice);
-		$this->tpl['qty'] = (($line->info_bits & 2) != 2) ? $line->qty : '&nbsp;';
-		if ($conf->global->PRODUCT_USE_UNITS) $this->tpl['unit'] = $langs->transnoentities($line->getLabelOfUnit('long'));
-		$this->tpl['remise_percent'] = (($line->info_bits & 2) != 2) ? vatrate($line->remise_percent, true) : '&nbsp;';
-
-		// Is the line strike or not
-		$this->tpl['strike']=0;
-		if ($restrictlist == 'services' && $line->product_type != Product::TYPE_SERVICE) $this->tpl['strike']=1;
-
-		// Output template part (modules that overwrite templates must declare this into descriptor)
-		// Use global variables + $dateSelector + $seller and $buyer
-		$dirtpls=array_merge($conf->modules_parts['tpl'],array('/core/tpl'));
-		foreach($dirtpls as $reldir)
-		{
-			$tpl = dol_buildpath($reldir.'/originproductline.tpl.php');
-			if (empty($conf->file->strict_mode)) {
-				$res=@include $tpl;
-			} else {
-				$res=include $tpl; // for debug
-			}
-			if ($res) break;
-		}
-	}
+        $product = new Product($this->db);
+        $result = $product->fetch($this->fk_product);
 
+        $this->product = $product;
+        return $result;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Add resources to the current object : add entry into llx_element_resources
-	 *	Need $this->element & $this->id
-	 *
-	 *	@param		int		$resource_id		Resource id
-	 *	@param		string	$resource_type		'resource'
-	 *	@param		int		$busy				Busy or not
-	 *	@param		int		$mandatory			Mandatory or not
-	 *	@return		int							<=0 if KO, >0 if OK
-	 */
-	function add_element_resource($resource_id, $resource_type, $busy=0, $mandatory=0)
-	{
+    /**
+     *		Load the user with id $userid into this->user
+     *
+     *		@param	int		$userid 		Id du contact
+     *		@return	int						<0 if KO, >0 if OK
+     */
+    function fetch_user($userid)
+    {
         // phpcs:enable
-		$this->db->begin();
-
-		$sql = "INSERT INTO ".MAIN_DB_PREFIX."element_resources (";
-		$sql.= "resource_id";
-		$sql.= ", resource_type";
-		$sql.= ", element_id";
-		$sql.= ", element_type";
-		$sql.= ", busy";
-		$sql.= ", mandatory";
-		$sql.= ") VALUES (";
-		$sql.= $resource_id;
-		$sql.= ", '".$this->db->escape($resource_type)."'";
-		$sql.= ", '".$this->db->escape($this->id)."'";
-		$sql.= ", '".$this->db->escape($this->element)."'";
-		$sql.= ", '".$this->db->escape($busy)."'";
-		$sql.= ", '".$this->db->escape($mandatory)."'";
-		$sql.= ")";
-
-		dol_syslog(get_class($this)."::add_element_resource", LOG_DEBUG);
-		if ($this->db->query($sql))
-		{
-			$this->db->commit();
-			return 1;
-		}
-		else
-		{
-			$this->error=$this->db->lasterror();
-			$this->db->rollback();
-			return  0;
-		}
-	}
+        $user = new User($this->db);
+        $result=$user->fetch($userid);
+        $this->user = $user;
+        return $result;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *    Delete a link to resource line
-	 *
-	 *    @param	int		$rowid			Id of resource line to delete
-	 *    @param	int		$element		element name (for trigger) TODO: use $this->element into commonobject class
-	 *    @param	int		$notrigger		Disable all triggers
-	 *    @return   int						>0 if OK, <0 if KO
-	 */
-	function delete_resource($rowid, $element, $notrigger=0)
-	{
+    /**
+     *	Read linked origin object
+     *
+     *	@return		void
+     */
+    function fetch_origin()
+    {
         // phpcs:enable
-		global $user;
+        if ($this->origin == 'shipping') $this->origin = 'expedition';
+        if ($this->origin == 'delivery') $this->origin = 'livraison';
+        if ($this->origin == 'order_supplier') $this->origin = 'commandeFournisseur';
 
-		$this->db->begin();
+        $origin = $this->origin;
 
-		$sql = "DELETE FROM ".MAIN_DB_PREFIX."element_resources";
-		$sql.= " WHERE rowid=".$rowid;
+        $classname = ucfirst($origin);
+        $this->$origin = new $classname($this->db);
+        $this->$origin->fetch($this->origin_id);
+    }
 
-		dol_syslog(get_class($this)."::delete_resource", LOG_DEBUG);
+    /**
+     *  Load object from specific field
+     *
+     *  @param	string	$table		Table element or element line
+     *  @param	string	$field		Field selected
+     *  @param	string	$key		Import key
+     *  @param	string	$element	Element name
+     *	@return	int					<0 if KO, >0 if OK
+     */
+    function fetchObjectFrom($table, $field, $key, $element = null)
+    {
+        global $conf;
 
-		$resql=$this->db->query($sql);
-		if (! $resql)
-		{
-			$this->error=$this->db->lasterror();
-			$this->db->rollback();
-			return -1;
-		}
-		else
-		{
-			if (! $notrigger)
-			{
-				$result=$this->call_trigger(strtoupper($element).'_DELETE_RESOURCE', $user);
-				if ($result < 0) { $this->db->rollback(); return -1; }
-			}
-			$this->db->commit();
-			return 1;
-		}
-	}
-
-
-	/**
-	 * Overwrite magic function to solve problem of cloning object that are kept as references
-	 *
-	 * @return void
-	 */
-	function __clone()
-	{
-		// Force a copy of this->lines, otherwise it will point to same object.
-		if (isset($this->lines) && is_array($this->lines))
-		{
-			$nboflines=count($this->lines);
-			for($i=0; $i < $nboflines; $i++)
-			{
-				$this->lines[$i] = clone $this->lines[$i];
-			}
-		}
-	}
-
-	/**
-	 * Common function for all objects extending CommonObject for generating documents
-	 *
-	 * @param 	string 		$modelspath 	Relative folder where generators are placed
-	 * @param 	string 		$modele 		Generator to use. Caller must set it to obj->modelpdf or GETPOST('modelpdf') for example.
-	 * @param 	Translate 	$outputlangs 	Output language to use
-	 * @param 	int 		$hidedetails 	1 to hide details. 0 by default
-	 * @param 	int 		$hidedesc 		1 to hide product description. 0 by default
-	 * @param 	int 		$hideref 		1 to hide product reference. 0 by default
-	 * @param   null|array  $moreparams     Array to provide more information
-	 * @return 	int 						>0 if OK, <0 if KO
-	 * @see	addFileIntoDatabaseIndex
-	 */
-	protected function commonGenerateDocument($modelspath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams=null)
-	{
-		global $conf, $langs, $user;
-
-		$srctemplatepath='';
-
-		// Increase limit for PDF build
-		$err=error_reporting();
-		error_reporting(0);
-		@set_time_limit(120);
-		error_reporting($err);
-
-		// If selected model is a filename template (then $modele="modelname" or "modelname:filename")
-		$tmp=explode(':',$modele,2);
-		if (! empty($tmp[1]))
-		{
-			$modele=$tmp[0];
-			$srctemplatepath=$tmp[1];
-		}
-
-		// Search template files
-		$file=''; $classname=''; $filefound=0;
-		$dirmodels=array('/');
-		if (is_array($conf->modules_parts['models'])) $dirmodels=array_merge($dirmodels,$conf->modules_parts['models']);
-		foreach($dirmodels as $reldir)
-		{
-			foreach(array('doc','pdf') as $prefix)
-			{
-				if (in_array(get_class($this), array('Adherent'))) $file = $prefix."_".$modele.".class.php";     // Member module use prefix_module.class.php
-				else $file = $prefix."_".$modele.".modules.php";
+        $result=false;
 
-				// On verifie l'emplacement du modele
-				$file=dol_buildpath($reldir.$modelspath.$file,0);
-				if (file_exists($file))
-				{
-					$filefound=1;
-					$classname=$prefix.'_'.$modele;
-					break;
-				}
-			}
-			if ($filefound) break;
-		}
+        $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX.$table;
+        $sql.= " WHERE ".$field." = '".$key."'";
+        if (! empty($element)) {
+            $sql.= " AND entity IN (".getEntity($element).")";
+        } else {
+            $sql.= " AND entity = ".$conf->entity;
+        }
 
-		// If generator was found
-		if ($filefound)
-		{
-			global $db;  // Required to solve a conception default in commonstickergenerator.class.php making an include of code using $db
+        dol_syslog(get_class($this).'::fetchObjectFrom', LOG_DEBUG);
+        $resql = $this->db->query($sql);
+        if ($resql)
+        {
+            $row = $this->db->fetch_row($resql);
+            // Test for avoid error -1
+            if ($row[0] > 0) {
+                $result = $this->fetch($row[0]);
+            }
+        }
 
-			require_once $file;
+        return $result;
+    }
 
-			$obj = new $classname($this->db);
+    /**
+     *	Getter generic. Load value from a specific field
+     *
+     *	@param	string	$table		Table of element or element line
+     *	@param	int		$id			Element id
+     *	@param	string	$field		Field selected
+     *	@return	int					<0 if KO, >0 if OK
+     */
+    function getValueFrom($table, $id, $field)
+    {
+        $result=false;
+        if (!empty($id) && !empty($field) && !empty($table)) {
+            $sql = "SELECT ".$field." FROM ".MAIN_DB_PREFIX.$table;
+            $sql.= " WHERE rowid = ".$id;
+
+            dol_syslog(get_class($this).'::getValueFrom', LOG_DEBUG);
+            $resql = $this->db->query($sql);
+            if ($resql)
+            {
+                $row = $this->db->fetch_row($resql);
+                $result = $row[0];
+            }
+        }
+        return $result;
+    }
 
-			// If generator is ODT, we must have srctemplatepath defined, if not we set it.
-			if ($obj->type == 'odt' && empty($srctemplatepath))
-			{
-				$varfortemplatedir=$obj->scandir;
-				if ($varfortemplatedir && ! empty($conf->global->$varfortemplatedir))
-				{
-					$dirtoscan=$conf->global->$varfortemplatedir;
-
-					$listoffiles=array();
-
-					// Now we add first model found in directories scanned
-					$listofdir=explode(',',$dirtoscan);
-					foreach($listofdir as $key => $tmpdir)
-					{
-						$tmpdir=trim($tmpdir);
-						$tmpdir=preg_replace('/DOL_DATA_ROOT/',DOL_DATA_ROOT,$tmpdir);
-						if (! $tmpdir) { unset($listofdir[$key]); continue; }
-						if (is_dir($tmpdir))
-						{
-							$tmpfiles=dol_dir_list($tmpdir,'files',0,'\.od(s|t)$','','name',SORT_ASC,0);
-							if (count($tmpfiles)) $listoffiles=array_merge($listoffiles,$tmpfiles);
-						}
-					}
-
-					if (count($listoffiles))
-					{
-						foreach($listoffiles as $record)
-						{
-							$srctemplatepath=$record['fullname'];
-							break;
-						}
-					}
-				}
+    /**
+     *	Setter generic. Update a specific field into database.
+     *  Warning: Trigger is run only if param trigkey is provided.
+     *
+     *	@param	string		$field			Field to update
+     *	@param	mixed		$value			New value
+     *	@param	string		$table			To force other table element or element line (should not be used)
+     *	@param	int			$id				To force other object id (should not be used)
+     *	@param	string		$format			Data format ('text', 'date'). 'text' is used if not defined
+     *	@param	string		$id_field		To force rowid field name. 'rowid' is used if not defined
+     *	@param	User|string	$fuser			Update the user of last update field with this user. If not provided, current user is used except if value is 'none'
+     *  @param  string      $trigkey    	Trigger key to run (in most cases something like 'XXX_MODIFY')
+     *  @param	string		$fk_user_field	Name of field to save user id making change
+     *	@return	int							<0 if KO, >0 if OK
+     *  @see updateExtraField
+     */
+    function setValueFrom($field, $value, $table='', $id=null, $format='', $id_field='', $fuser=null, $trigkey='', $fk_user_field='fk_user_modif')
+    {
+        global $user,$langs,$conf;
 
-				if (empty($srctemplatepath))
-				{
-					$this->error='ErrorGenerationAskedForOdtTemplateWithSrcFileNotDefined';
-					return -1;
-				}
-			}
-
-			if ($obj->type == 'odt' && ! empty($srctemplatepath))
-			{
-				if (! dol_is_file($srctemplatepath))
-				{
-					$this->error='ErrorGenerationAskedForOdtTemplateWithSrcFileNotFound';
-					return -1;
-				}
-			}
-
-			// We save charset_output to restore it because write_file can change it if needed for
-			// output format that does not support UTF8.
-			$sav_charset_output=$outputlangs->charset_output;
+        if (empty($table)) 	  $table=$this->table_element;
+        if (empty($id))    	  $id=$this->id;
+        if (empty($format))   $format='text';
+        if (empty($id_field)) $id_field='rowid';
 
-			if (in_array(get_class($this), array('Adherent')))
-			{
-				$arrayofrecords = array();   // The write_file of templates of adherent class need this var
-				$resultwritefile = $obj->write_file($this, $outputlangs, $srctemplatepath, 'member', 1, $moreparams);
-			}
-			else
-			{
-				$resultwritefile = $obj->write_file($this, $outputlangs, $srctemplatepath, $hidedetails, $hidedesc, $hideref, $moreparams);
-			}
-			// After call of write_file $obj->result['fullpath'] is set with generated file. It will be used to update the ECM database index.
+        $error=0;
 
-			if ($resultwritefile > 0)
-			{
-				$outputlangs->charset_output=$sav_charset_output;
+        $this->db->begin();
 
-				// We delete old preview
-				require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-				dol_delete_preview($this);
+        // Special case
+        if ($table == 'product' && $field == 'note_private') $field='note';
+        if (in_array($table, array('actioncomm', 'adherent', 'advtargetemailing', 'cronjob', 'establishment'))) $fk_user_field = 'fk_user_mod';
 
-				// Index file in database
-				if (! empty($obj->result['fullpath']))
-				{
-					$destfull = $obj->result['fullpath'];
-					$upload_dir = dirname($destfull);
-					$destfile = basename($destfull);
-					$rel_dir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $upload_dir);
-
-					if (! preg_match('/[\\/]temp[\\/]|[\\/]thumbs|\.meta$/', $rel_dir))     // If not a tmp dir
-					{
-						$filename = basename($destfile);
-						$rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
-						$rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
-
-						include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
-						$ecmfile=new EcmFiles($this->db);
-						$result = $ecmfile->fetch(0, '', ($rel_dir?$rel_dir.'/':'').$filename);
-
-						// Set the public "share" key
-						$setsharekey = false;
-						if ($this->element == 'propal')
-						{
-							$useonlinesignature = $conf->global->MAIN_FEATURES_LEVEL;	// Replace this with 1 when feature to make online signature is ok
-							if ($useonlinesignature) $setsharekey=true;
-							if (! empty($conf->global->PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD)) $setsharekey=true;
-						}
-						if ($this->element == 'commande'     && ! empty($conf->global->ORDER_ALLOW_EXTERNAL_DOWNLOAD))        $setsharekey=true;
-						if ($this->element == 'facture'      && ! empty($conf->global->INVOICE_ALLOW_EXTERNAL_DOWNLOAD))      $setsharekey=true;
-						if ($this->element == 'bank_account' && ! empty($conf->global->BANK_ACCOUNT_ALLOW_EXTERNAL_DOWNLOAD)) $setsharekey=true;
-
-						if ($setsharekey)
-						{
-							if (empty($ecmfile->share))	// Because object not found or share not set yet
-							{
-								require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
-								$ecmfile->share = getRandomPassword(true);
-							}
-						}
+        $sql = "UPDATE ".MAIN_DB_PREFIX.$table." SET ";
 
-						if ($result > 0)
-						{
-							$ecmfile->label = md5_file(dol_osencode($destfull));	// hash of file content
-							$ecmfile->fullpath_orig = '';
-							$ecmfile->gen_or_uploaded = 'generated';
-							$ecmfile->description = '';    // indexed content
-							$ecmfile->keyword = '';        // keyword content
-							$result = $ecmfile->update($user);
-							if ($result < 0)
-							{
-								setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
-							}
-						}
-						else
-						{
-							$ecmfile->entity = $conf->entity;
-							$ecmfile->filepath = $rel_dir;
-							$ecmfile->filename = $filename;
-							$ecmfile->label = md5_file(dol_osencode($destfull));	// hash of file content
-							$ecmfile->fullpath_orig = '';
-							$ecmfile->gen_or_uploaded = 'generated';
-							$ecmfile->description = '';    // indexed content
-							$ecmfile->keyword = '';        // keyword content
-							$ecmfile->src_object_type = $this->table_element;
-							$ecmfile->src_object_id   = $this->id;
-
-							$result = $ecmfile->create($user);
-							if ($result < 0)
-							{
-								setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
-							}
-						}
+        if ($format == 'text') $sql.= $field." = '".$this->db->escape($value)."'";
+        else if ($format == 'int') $sql.= $field." = ".$this->db->escape($value);
+        else if ($format == 'date') $sql.= $field." = ".($value ? "'".$this->db->idate($value)."'" : "null");
 
-						/*$this->result['fullname']=$destfull;
-						$this->result['filepath']=$ecmfile->filepath;
-						$this->result['filename']=$ecmfile->filename;*/
-						//var_dump($obj->update_main_doc_field);exit;
-
-						// Update the last_main_doc field into main object (if documenent generator has property ->update_main_doc_field set)
-						$update_main_doc_field=0;
-						if (! empty($obj->update_main_doc_field)) $update_main_doc_field=1;
-						if ($update_main_doc_field && ! empty($this->table_element))
-						{
-							$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element." SET last_main_doc = '".($ecmfile->filepath.'/'.$ecmfile->filename)."'";
-							$sql.= ' WHERE rowid = '.$this->id;
-							$resql = $this->db->query($sql);
-							if (! $resql) dol_print_error($this->db);
-						}
-					}
-				}
-				else
-				{
-					dol_syslog('Method ->write_file was called on object '.get_class($obj).' and return a success but the return array ->result["fullpath"] was not set.', LOG_WARNING);
-				}
+        if ($fk_user_field)
+        {
+            if (! empty($fuser) && is_object($fuser)) $sql.=", ".$fk_user_field." = ".$fuser->id;
+            elseif (empty($fuser) || $fuser != 'none') $sql.=", ".$fk_user_field." = ".$user->id;
+        }
 
-				// Success in building document. We build meta file.
-				dol_meta_create($this);
+        $sql.= " WHERE ".$id_field." = ".$id;
 
-				return 1;
-			}
-			else
-			{
-				$outputlangs->charset_output=$sav_charset_output;
-				dol_print_error($this->db, "Error generating document for ".__CLASS__.". Error: ".$obj->error, $obj->errors);
-				return -1;
-			}
-		}
-		else
-		{
-			$this->error=$langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists",$file);
-			dol_print_error('',$this->error);
-			return -1;
-		}
-	}
-
-	/**
-	 *  Build thumb
-	 *  @TODO Move this into files.lib.php
-	 *
-	 *  @param      string	$file           Path file in UTF8 to original file to create thumbs from.
-	 *	@return		void
-	 */
-	function addThumbs($file)
-	{
-		global $maxwidthsmall, $maxheightsmall, $maxwidthmini, $maxheightmini, $quality;
-
-		require_once DOL_DOCUMENT_ROOT .'/core/lib/images.lib.php';		// This define also $maxwidthsmall, $quality, ...
-
-		$file_osencoded=dol_osencode($file);
-		if (file_exists($file_osencoded))
-		{
-			// Create small thumbs for company (Ratio is near 16/9)
-			// Used on logon for example
-			vignette($file_osencoded, $maxwidthsmall, $maxheightsmall, '_small', $quality);
-
-			// Create mini thumbs for company (Ratio is near 16/9)
-			// Used on menu or for setup page for example
-			vignette($file_osencoded, $maxwidthmini, $maxheightmini, '_mini', $quality);
-		}
-	}
-
-
-	/* Functions common to commonobject and commonobjectline */
-
-	/* For default values */
-
-	/**
-	 * Return the default value to use for a field when showing the create form of object.
-	 * Return values in this order:
-	 * 1) If parameter is available into POST, we return it first.
-	 * 2) If not but an alternate value was provided as parameter of function, we return it.
-	 * 3) If not but a constant $conf->global->OBJECTELEMENT_FIELDNAME is set, we return it (It is better to use the dedicated table).
-	 * 4) Return value found into database (TODO No yet implemented)
-	 *
-	 * @param   string              $fieldname          Name of field
-	 * @param   string              $alternatevalue     Alternate value to use
-	 * @return  string|string[]                         Default value (can be an array if the GETPOST return an array)
-	 **/
-	function getDefaultCreateValueFor($fieldname, $alternatevalue=null)
-	{
-		global $conf, $_POST;
-
-		// If param here has been posted, we use this value first.
-		if (isset($_POST[$fieldname])) return GETPOST($fieldname, 2);
-
-		if (isset($alternatevalue)) return $alternatevalue;
-
-		$newelement=$this->element;
-		if ($newelement == 'facture') $newelement='invoice';
-		if ($newelement == 'commande') $newelement='order';
-		if (empty($newelement))
-		{
-			dol_syslog("Ask a default value using common method getDefaultCreateValueForField on an object with no property ->element defined. Return empty string.", LOG_WARNING);
-			return '';
-		}
-
-		$keyforfieldname=strtoupper($newelement.'_DEFAULT_'.$fieldname);
-		//var_dump($keyforfieldname);
-		if (isset($conf->global->$keyforfieldname)) return $conf->global->$keyforfieldname;
-
-		// TODO Ad here a scan into table llx_overwrite_default with a filter on $this->element and $fieldname
-	}
-
-
-	/* For triggers */
+        dol_syslog(get_class($this)."::".__FUNCTION__."", LOG_DEBUG);
+        $resql = $this->db->query($sql);
+        if ($resql)
+        {
+            if ($trigkey)
+            {
+                // call trigger with updated object values
+                if (empty($this->fields) && method_exists($this, 'fetch'))
+                {
+                    $result = $this->fetch($id);
+                }
+                else
+                {
+                    $result = $this->fetchCommon($id);
+                }
+                if ($result >= 0) $result=$this->call_trigger($trigkey, (! empty($fuser) && is_object($fuser)) ? $fuser : $user);   // This may set this->errors
+                if ($result < 0) $error++;
+            }
 
+            if (! $error)
+            {
+                if (property_exists($this, $field)) $this->$field = $value;
+                $this->db->commit();
+                return 1;
+            }
+            else
+            {
+                $this->db->rollback();
+                return -2;
+            }
+        }
+        else
+        {
+            $this->error=$this->db->lasterror();
+            $this->db->rollback();
+            return -1;
+        }
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Call trigger based on this instance.
-	 * Some context information may also be provided into array property this->context.
-	 * NB:  Error from trigger are stacked in interface->errors
-	 * NB2: If return code of triggers are < 0, action calling trigger should cancel all transaction.
-	 *
-	 * @param   string    $trigger_name   trigger's name to execute
-	 * @param   User      $user           Object user
-	 * @return  int                       Result of run_triggers
-	 */
-	function call_trigger($trigger_name, $user)
-	{
+    /**
+     *      Load properties id_previous and id_next by comparing $fieldid with $this->ref
+     *
+     *      @param	string	$filter		Optional filter. Example: " AND (t.field1 = 'aa' OR t.field2 = 'bb')"
+     *	 	@param  string	$fieldid   	Name of field to use for the select MAX and MIN
+     *		@param	int		$nodbprefix	Do not include DB prefix to forge table name
+     *      @return int         		<0 if KO, >0 if OK
+     */
+    function load_previous_next_ref($filter, $fieldid, $nodbprefix=0)
+    {
         // phpcs:enable
-		global $langs,$conf;
+        global $conf, $user;
 
-		include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-		$interface=new Interfaces($this->db);
-		$result=$interface->run_triggers($trigger_name,$this,$user,$langs,$conf);
+        if (! $this->table_element)
+        {
+            dol_print_error('',get_class($this)."::load_previous_next_ref was called on objet with property table_element not defined");
+            return -1;
+        }
+        if ($fieldid == 'none') return 1;
 
-		if ($result < 0)
-		{
-			if (!empty($this->errors))
-			{
-				$this->errors=array_unique(array_merge($this->errors,$interface->errors));   // We use array_unique because when a trigger call another trigger on same object, this->errors is added twice.
-			}
-			else
-			{
-				$this->errors=$interface->errors;
-			}
-		}
-		return $result;
-	}
+        // Security on socid
+        $socid = 0;
+        if ($user->societe_id > 0) $socid = $user->societe_id;
 
+        // this->ismultientitymanaged contains
+        // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
+        $alias = 's';
+        if ($this->element == 'societe') $alias = 'te';
 
-	/* Functions for extrafields */
+        $sql = "SELECT MAX(te.".$fieldid.")";
+        $sql.= " FROM ".(empty($nodbprefix)?MAIN_DB_PREFIX:'').$this->table_element." as te";
+        if ($this->element == 'user' && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
+            $sql.= ",".MAIN_DB_PREFIX."usergroup_user as ug";
+        }
+        if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) $sql.= ", ".MAIN_DB_PREFIX."societe as s";	// If we need to link to societe to limit select to entity
+        else if ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe as s";	// If we need to link to societe to limit select to socid
+        else if ($this->restrictiononfksoc == 2 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON te.fk_soc = s.rowid";	// If we need to link to societe to limit select to socid
+        if ($this->restrictiononfksoc && !$user->rights->societe->client->voir && !$socid)  $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON ".$alias.".rowid = sc.fk_soc";
+        $sql.= " WHERE te.".$fieldid." < '".$this->db->escape($this->ref)."'";  // ->ref must always be defined (set to id if field does not exists)
+        if ($this->restrictiononfksoc == 1 && !$user->rights->societe->client->voir && !$socid) $sql.= " AND sc.fk_user = " .$user->id;
+        if ($this->restrictiononfksoc == 2 && !$user->rights->societe->client->voir && !$socid) $sql.= " AND (sc.fk_user = " .$user->id.' OR te.fk_soc IS NULL)';
+        if (! empty($filter))
+        {
+            if (! preg_match('/^\s*AND/i', $filter)) $sql.=" AND ";   // For backward compatibility
+            $sql.=$filter;
+        }
+        if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) $sql.= ' AND te.fk_soc = s.rowid';			// If we need to link to societe to limit select to entity
+        else if ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql.= ' AND te.fk_soc = s.rowid';			// If we need to link to societe to limit select to socid
+        if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) {
+            if ($this->element == 'user' && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
+                if (! empty($user->admin) && empty($user->entity) && $conf->entity == 1) {
+                    $sql.= " AND te.entity IS NOT NULL"; // Show all users
+                } else {
+                    $sql.= " AND ug.fk_user = te.rowid";
+                    $sql.= " AND ug.entity IN (".getEntity($this->element).")";
+                }
+            } else {
+                $sql.= ' AND te.entity IN ('.getEntity($this->element).')';
+            }
+        }
+        if ($this->restrictiononfksoc == 1 && $socid && $this->element != 'societe') $sql.= ' AND te.fk_soc = ' . $socid;
+        if ($this->restrictiononfksoc == 2 && $socid && $this->element != 'societe') $sql.= ' AND (te.fk_soc = ' . $socid.' OR te.fk_soc IS NULL)';
+        if ($this->restrictiononfksoc && $socid && $this->element == 'societe') $sql.= ' AND te.rowid = ' . $socid;
+        //print 'socid='.$socid.' restrictiononfksoc='.$this->restrictiononfksoc.' ismultientitymanaged = '.$this->ismultientitymanaged.' filter = '.$filter.' -> '.$sql."<br>";
 
+        $result = $this->db->query($sql);
+        if (! $result)
+        {
+            $this->error=$this->db->lasterror();
+            return -1;
+        }
+        $row = $this->db->fetch_row($result);
+        $this->ref_previous = $row[0];
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Function to get extra fields of an object into $this->array_options
-	 *  This method is in most cases called by method fetch of objects but you can call it separately.
-	 *
-	 *  @param	int		$rowid			Id of line. Use the id of object if not defined. Deprecated. Function must be called without parameters.
-	 *  @param  array	$optionsArray   Array resulting of call of extrafields->fetch_name_optionals_label(). Deprecated. Function must be called without parameters.
-	 *  @return	int						<0 if error, 0 if no values of extrafield to find nor found, 1 if an attribute is found and value loaded
-	 */
-	function fetch_optionals($rowid=null, $optionsArray=null)
-	{
-        // phpcs:enable
-		if (empty($rowid)) $rowid=$this->id;
-
-		// To avoid SQL errors. Probably not the better solution though
-		if (!$this->table_element) {
-			return 0;
-		}
-
-		$this->array_options=array();
-
-		if (! is_array($optionsArray))
-		{
-			// If $extrafields is not a known object, we initialize it. Best practice is to have $extrafields defined into card.php or list.php page.
-			// TODO Use of existing $extrafield is not yet ready (must mutualize code that use extrafields in form first)
-			// global $extrafields;
-			//if (! is_object($extrafields))
-			//{
-				require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-				$extrafields = new ExtraFields($this->db);
-			//}
-
-			// Load array of extrafields for elementype = $this->table_element
-			if (empty($extrafields->attributes[$this->table_element]['loaded']))
-			{
-				$extrafields->fetch_name_optionals_label($this->table_element);
-			}
-			$optionsArray = (! empty($extrafields->attributes[$this->table_element]['label'])?$extrafields->attributes[$this->table_element]['label']:null);
-		}
-		else
-		{
-			global $extrafields;
-			dol_syslog("Warning: fetch_optionals was called with param optionsArray defined when you should pass null now", LOG_WARNING);
-		}
-
-		$table_element = $this->table_element;
-		if ($table_element == 'categorie') $table_element = 'categories'; // For compatibility
-
-		// Request to get complementary values
-		if (is_array($optionsArray) && count($optionsArray) > 0)
-		{
-			$sql = "SELECT rowid";
-			foreach ($optionsArray as $name => $label)
-			{
-				if (empty($extrafields->attributes[$this->table_element]['type'][$name]) || $extrafields->attributes[$this->table_element]['type'][$name] != 'separate')
-				{
-					$sql.= ", ".$name;
-				}
-			}
-			$sql.= " FROM ".MAIN_DB_PREFIX.$table_element."_extrafields";
-			$sql.= " WHERE fk_object = ".$rowid;
 
-			//dol_syslog(get_class($this)."::fetch_optionals get extrafields data for ".$this->table_element, LOG_DEBUG);		// Too verbose
-			$resql=$this->db->query($sql);
-			if ($resql)
-			{
-				$this->array_options = array();
-				$numrows=$this->db->num_rows($resql);
-				if ($numrows)
-				{
-					$tab = $this->db->fetch_array($resql);
-
-					foreach ($tab as $key => $value)
-					{
-						// Test fetch_array ! is_int($key) because fetch_array result is a mix table with Key as alpha and Key as int (depend db engine)
-						if ($key != 'rowid' && $key != 'tms' && $key != 'fk_member' && ! is_int($key))
-						{
-							// we can add this attribute to object
-							if (! empty($extrafields) && in_array($extrafields->attributes[$this->table_element]['type'][$key], array('date','datetime')))
-							{
-								//var_dump($extrafields->attributes[$this->table_element]['type'][$key]);
-								$this->array_options["options_".$key]=$this->db->jdate($value);
-							}
-							else
-							{
-								$this->array_options["options_".$key]=$value;
-							}
+        $sql = "SELECT MIN(te.".$fieldid.")";
+        $sql.= " FROM ".(empty($nodbprefix)?MAIN_DB_PREFIX:'').$this->table_element." as te";
+        if ($this->element == 'user' && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
+            $sql.= ",".MAIN_DB_PREFIX."usergroup_user as ug";
+        }
+        if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) $sql.= ", ".MAIN_DB_PREFIX."societe as s";	// If we need to link to societe to limit select to entity
+        else if ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe as s";	// If we need to link to societe to limit select to socid
+        else if ($this->restrictiononfksoc == 2 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON te.fk_soc = s.rowid";	// If we need to link to societe to limit select to socid
+        if ($this->restrictiononfksoc && !$user->rights->societe->client->voir && !$socid) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON ".$alias.".rowid = sc.fk_soc";
+        $sql.= " WHERE te.".$fieldid." > '".$this->db->escape($this->ref)."'";  // ->ref must always be defined (set to id if field does not exists)
+        if ($this->restrictiononfksoc == 1 && !$user->rights->societe->client->voir && !$socid) $sql.= " AND sc.fk_user = " .$user->id;
+        if ($this->restrictiononfksoc == 2 && !$user->rights->societe->client->voir && !$socid) $sql.= " AND (sc.fk_user = " .$user->id.' OR te.fk_soc IS NULL)';
+        if (! empty($filter))
+        {
+            if (! preg_match('/^\s*AND/i', $filter)) $sql.=" AND ";   // For backward compatibility
+            $sql.=$filter;
+        }
+        if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) $sql.= ' AND te.fk_soc = s.rowid';			// If we need to link to societe to limit select to entity
+        else if ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql.= ' AND te.fk_soc = s.rowid';			// If we need to link to societe to limit select to socid
+        if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) {
+            if ($this->element == 'user' && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
+                if (! empty($user->admin) && empty($user->entity) && $conf->entity == 1) {
+                    $sql.= " AND te.entity IS NOT NULL"; // Show all users
+                } else {
+                    $sql.= " AND ug.fk_user = te.rowid";
+                    $sql.= " AND ug.entity IN (".getEntity($this->element).")";
+                }
+            } else {
+                $sql.= ' AND te.entity IN ('.getEntity($this->element).')';
+            }
+        }
+        if ($this->restrictiononfksoc == 1 && $socid && $this->element != 'societe') $sql.= ' AND te.fk_soc = ' . $socid;
+        if ($this->restrictiononfksoc == 2 && $socid && $this->element != 'societe') $sql.= ' AND (te.fk_soc = ' . $socid.' OR te.fk_soc IS NULL)';
+        if ($this->restrictiononfksoc && $socid && $this->element == 'societe') $sql.= ' AND te.rowid = ' . $socid;
+        //print 'socid='.$socid.' restrictiononfksoc='.$this->restrictiononfksoc.' ismultientitymanaged = '.$this->ismultientitymanaged.' filter = '.$filter.' -> '.$sql."<br>";
+        // Rem: Bug in some mysql version: SELECT MIN(rowid) FROM llx_socpeople WHERE rowid > 1 when one row in database with rowid=1, returns 1 instead of null
+
+        $result = $this->db->query($sql);
+        if (! $result)
+        {
+            $this->error=$this->db->lasterror();
+            return -2;
+        }
+        $row = $this->db->fetch_row($result);
+        $this->ref_next = $row[0];
 
-							//var_dump('key '.$key.' '.$value.' type='.$extrafields->attributes[$this->table_element]['type'][$key].' '.$this->array_options["options_".$key]);
-						}
-					}
-				}
+        return 1;
+    }
 
-				$this->db->free($resql);
 
-				if ($numrows) return $numrows;
-				else return 0;
-			}
-			else
-			{
-				dol_print_error($this->db);
-				return -1;
-			}
-		}
-		return 0;
-	}
-
-	/**
-	 *	Delete all extra fields values for the current object.
-	 *
-	 *  @return	int		<0 if KO, >0 if OK
-	 */
-	function deleteExtraFields()
-	{
-		$this->db->begin();
-
-		$table_element = $this->table_element;
-		if ($table_element == 'categorie') $table_element = 'categories'; // For compatibility
-
-		$sql_del = "DELETE FROM ".MAIN_DB_PREFIX.$table_element."_extrafields WHERE fk_object = ".$this->id;
-		dol_syslog(get_class($this)."::deleteExtraFields delete", LOG_DEBUG);
-		$resql=$this->db->query($sql_del);
-		if (! $resql)
-		{
-			$this->error=$this->db->lasterror();
-			$this->db->rollback();
-			return -1;
-		}
-		else
-		{
-			$this->db->commit();
-			return 1;
-		}
-	}
-
-	/**
-	 *	Add/Update all extra fields values for the current object.
-	 *  Data to describe values to insert/update are stored into $this->array_options=array('options_codeforfield1'=>'valueforfield1', 'options_codeforfield2'=>'valueforfield2', ...)
-	 *  This function delete record with all extrafields and insert them again from the array $this->array_options.
-	 *
-	 *  @param	string		$trigger		If defined, call also the trigger (for example COMPANY_MODIFY)
-	 *  @param	User		$userused		Object user
-	 *  @return int 						-1=error, O=did nothing, 1=OK
-	 *  @see updateExtraField, setValueFrom
-	 */
-	function insertExtraFields($trigger='', $userused=null)
-	{
-		global $conf,$langs,$user;
-
-		if (empty($userused)) $userused=$user;
-
-		$error=0;
-
-		if (! empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) return 0;	// For avoid conflicts if trigger used
-
-		if (! empty($this->array_options))
-		{
-			// Check parameters
-			$langs->load('admin');
-			require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-			$extrafields = new ExtraFields($this->db);
-			$target_extrafields=$extrafields->fetch_name_optionals_label($this->table_element);
-
-			//Eliminate copied source object extra_fields that do not exist in target object
-			$new_array_options=array();
-			foreach ($this->array_options as $key => $value) {
-				if (in_array(substr($key,8), array_keys($target_extrafields)))	// We remove the 'options_' from $key for test
-					$new_array_options[$key] = $value;
-				elseif (in_array($key, array_keys($target_extrafields)))		// We test on $key that does not contains the 'options_' prefix
-					$new_array_options['options_'.$key] = $value;
-			}
-
-			foreach($new_array_options as $key => $value)
-			{
-			   	$attributeKey      = substr($key,8);   // Remove 'options_' prefix
-			   	$attributeType     = $extrafields->attributes[$this->table_element]['type'][$attributeKey];
-			   	$attributeLabel    = $extrafields->attributes[$this->table_element]['label'][$attributeKey];
-			   	$attributeParam    = $extrafields->attributes[$this->table_element]['param'][$attributeKey];
-			   	$attributeRequired = $extrafields->attributes[$this->table_element]['required'][$attributeKey];
-
-			   	if ($attributeRequired)
-			   	{
-			   		$mandatorypb=false;
-			   		if ($attributeType == 'link' && $this->array_options[$key] == '-1') $mandatorypb=true;
-			   		if ($this->array_options[$key] === '') $mandatorypb=true;
-			   		if ($mandatorypb)
-			   		{
-			   			dol_syslog($this->error);
-			   			$this->errors[]=$langs->trans('ErrorFieldRequired', $attributeLabel);
-			   			return -1;
-			   		}
-			   	}
-
-				//dol_syslog("attributeLabel=".$attributeLabel, LOG_DEBUG);
-				//dol_syslog("attributeType=".$attributeType, LOG_DEBUG);
-
-			   	switch ($attributeType)
-			   	{
-			   		case 'int':
-			  			if (!is_numeric($value) && $value!='')
-			   			{
-			   				$this->errors[]=$langs->trans("ExtraFieldHasWrongValue", $attributeLabel);
-			   				return -1;
-			  			}
-			   			elseif ($value=='')
-			   			{
-			   				$new_array_options[$key] = null;
-			   			}
-			 			break;
-					case 'double':
-						$value = price2num($value);
-						if (!is_numeric($value) && $value!='')
-						{
-							dol_syslog($langs->trans("ExtraFieldHasWrongValue")." sur ".$attributeLabel."(".$value."is not '".$attributeType."')", LOG_DEBUG);
-							$this->errors[]=$langs->trans("ExtraFieldHasWrongValue", $attributeLabel);
-							return -1;
-						}
-						elseif ($value=='')
-						{
-							$new_array_options[$key] = null;
-						}
-						//dol_syslog("double value"." sur ".$attributeLabel."(".$value." is '".$attributeType."')", LOG_DEBUG);
-						$new_array_options[$key] = $value;
-						break;
-			 		/*case 'select':	// Not required, we chosed value='0' for undefined values
-             			if ($value=='-1')
-             			{
-             				$this->array_options[$key] = null;
-             			}
-             			break;*/
-			   		case 'password':
-			   			$algo='';
-			   			if ($this->array_options[$key] != '' && is_array($extrafields->attributes[$this->table_element]['param'][$attributeKey]['options']))
-			   			{
-			   				// If there is an encryption choice, we use it to crypt data before insert
-			   				$tmparrays = array_keys($extrafields->attributes[$this->table_element]['param'][$attributeKey]['options']);
-			   				$algo=reset($tmparrays);
-			   				if ($algo != '')
-			   				{
-			   					//global $action;		// $action may be 'create', 'update', 'update_extras'...
-			   					//var_dump($action);
-			   					//var_dump($this->oldcopy);exit;
-			   					if (is_object($this->oldcopy))		// If this->oldcopy is not defined, we can't know if we change attribute or not, so we must keep value
-			   					{
-			   						//var_dump($this->oldcopy->array_options[$key]); var_dump($this->array_options[$key]);
-				   					if ($this->array_options[$key] == $this->oldcopy->array_options[$key])	// If old value crypted in database is same than submited new value, it means we don't change it, so we don't update.
-				   					{
-				   						$new_array_options[$key] = $this->array_options[$key];	// Value is kept
-				   					}
-									else
-									{
-										// var_dump($algo);
-										$newvalue = dol_hash($this->array_options[$key], $algo);
-										$new_array_options[$key] = $newvalue;
-									}
-			   					}
-			   					else
-			   					{
-			   						$new_array_options[$key] = $this->array_options[$key];	// Value is kept
-			   					}
-			   				}
-			   			}
-			   			else	// Common usage
-			   			{
-			   				$new_array_options[$key] = $this->array_options[$key];
-			   			}
-			   			break;
-			   		case 'price':
-						$new_array_options[$key] = price2num($this->array_options[$key]);
-						break;
-					case 'date':
-						$new_array_options[$key] = $this->db->idate($this->array_options[$key]);
-						break;
-					case 'datetime':
-						// If data is a string instead of a timestamp, we convert it
-						if (! is_int($this->array_options[$key])) {
-							$this->array_options[$key] = strtotime($this->array_options[$key]);
-						}
-						$new_array_options[$key] = $this->db->idate($this->array_options[$key]);
-						break;
-		   			case 'link':
-						$param_list=array_keys($attributeParam['options']);
-						// 0 : ObjectName
-						// 1 : classPath
-						$InfoFieldList = explode(":", $param_list[0]);
-						dol_include_once($InfoFieldList[1]);
-						if ($InfoFieldList[0] && class_exists($InfoFieldList[0]))
-						{
-							if ($value == '-1')	// -1 is key for no defined in combo list of objects
-							{
-								$new_array_options[$key]='';
-							}
-							elseif ($value)
-							{
-								$object = new $InfoFieldList[0]($this->db);
-								if (is_numeric($value)) $res=$object->fetch($value);
-								else $res=$object->fetch('',$value);
-
-								if ($res > 0) $new_array_options[$key]=$object->id;
-								else
-								{
-									$this->error="Id/Ref '".$value."' for object '".$object->element."' not found";
-									$this->db->rollback();
-									return -1;
-								}
-							}
-						}
-						else
-						{
-							dol_syslog('Error bad setup of extrafield', LOG_WARNING);
-						}
-						break;
-			   	}
-			}
+    /**
+     *      Return list of id of contacts of object
+     *
+     *      @param	string	$source     Source of contact: external (llx_socpeople) or internal (llx_user) or thirdparty (llx_societe)
+     *      @return array				Array of id of contacts (if source=external or internal)
+     * 									Array of id of third parties with at least one contact on object (if source=thirdparty)
+     */
+    function getListContactId($source='external')
+    {
+        $contactAlreadySelected = array();
+        $tab = $this->liste_contact(-1,$source);
+        $num=count($tab);
+        $i = 0;
+        while ($i < $num)
+        {
+            if ($source == 'thirdparty') $contactAlreadySelected[$i] = $tab[$i]['socid'];
+            else  $contactAlreadySelected[$i] = $tab[$i]['id'];
+            $i++;
+        }
+        return $contactAlreadySelected;
+    }
 
-			$this->db->begin();
 
-			$table_element = $this->table_element;
-			if ($table_element == 'categorie') $table_element = 'categories'; // For compatibility
+    /**
+     *	Link element with a project
+     *
+     *	@param     	int		$projectid		Project id to link element to
+     *	@return		int						<0 if KO, >0 if OK
+     */
+    function setProject($projectid)
+    {
+        if (! $this->table_element)
+        {
+            dol_syslog(get_class($this)."::setProject was called on objet with property table_element not defined",LOG_ERR);
+            return -1;
+        }
 
-			$sql_del = "DELETE FROM ".MAIN_DB_PREFIX.$table_element."_extrafields WHERE fk_object = ".$this->id;
-			dol_syslog(get_class($this)."::insertExtraFields delete", LOG_DEBUG);
-			$this->db->query($sql_del);
+        $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
+        if ($this->table_element == 'actioncomm')
+        {
+            if ($projectid) $sql.= ' SET fk_project = '.$projectid;
+            else $sql.= ' SET fk_project = NULL';
+            $sql.= ' WHERE id = '.$this->id;
+        }
+        else
+        {
+            if ($projectid) $sql.= ' SET fk_projet = '.$projectid;
+            else $sql.= ' SET fk_projet = NULL';
+            $sql.= ' WHERE rowid = '.$this->id;
+        }
 
-			$sql = "INSERT INTO ".MAIN_DB_PREFIX.$table_element."_extrafields (fk_object";
-			foreach($new_array_options as $key => $value)
-			{
-				$attributeKey = substr($key,8);   // Remove 'options_' prefix
-				// Add field of attribut
-				if ($extrafields->attributes[$this->table_element]['type'][$attributeKey] != 'separate') // Only for other type than separator
-					$sql.=",".$attributeKey;
-			}
-			$sql .= ") VALUES (".$this->id;
-
-			foreach($new_array_options as $key => $value)
-			{
-				$attributeKey = substr($key,8);   // Remove 'options_' prefix
-				// Add field of attribute
-				if ($extrafields->attributes[$this->table_element]['type'][$attributeKey] != 'separate') // Only for other type than separator)
-				{
-					if ($new_array_options[$key] != '')
-					{
-						$sql.=",'".$this->db->escape($new_array_options[$key])."'";
-					}
-					else
-					{
-						$sql.=",null";
-					}
-				}
-			}
-			$sql.=")";
+        dol_syslog(get_class($this)."::setProject", LOG_DEBUG);
+        if ($this->db->query($sql))
+        {
+            $this->fk_project = $projectid;
+            return 1;
+        }
+        else
+        {
+            dol_print_error($this->db);
+            return -1;
+        }
+    }
 
-			dol_syslog(get_class($this)."::insertExtraFields insert", LOG_DEBUG);
-			$resql = $this->db->query($sql);
-			if (! $resql)
-			{
-				$this->error=$this->db->lasterror();
-				$error++;
-			}
+    /**
+     *  Change the payments methods
+     *
+     *  @param		int		$id		Id of new payment method
+     *  @return		int				>0 if OK, <0 if KO
+     */
+    function setPaymentMethods($id)
+    {
+        dol_syslog(get_class($this).'::setPaymentMethods('.$id.')');
+        if ($this->statut >= 0 || $this->element == 'societe')
+        {
+            // TODO uniformize field name
+            $fieldname = 'fk_mode_reglement';
+            if ($this->element == 'societe') $fieldname = 'mode_reglement';
+            if (get_class($this) == 'Fournisseur') $fieldname = 'mode_reglement_supplier';
 
-			if (! $error && $trigger)
-			{
-				// Call trigger
-				$this->context=array('extrafieldaddupdate'=>1);
-				$result=$this->call_trigger($trigger, $userused);
-				if ($result < 0) $error++;
-				// End call trigger
-			}
-
-			if ($error)
-			{
-				$this->db->rollback();
-				return -1;
-			}
-			else
-			{
-				$this->db->commit();
-				return 1;
-			}
-		}
-		else return 0;
-	}
-
-	/**
-	 *	Update an extra field value for the current object.
-	 *  Data to describe values to update are stored into $this->array_options=array('options_codeforfield1'=>'valueforfield1', 'options_codeforfield2'=>'valueforfield2', ...)
-	 *
-	 *  @param  string      $key    		Key of the extrafield (without starting 'options_')
-	 *  @param	string		$trigger		If defined, call also the trigger (for example COMPANY_MODIFY)
-	 *  @param	User		$userused		Object user
-	 *  @return int                 		-1=error, O=did nothing, 1=OK
-	 *  @see setValueFrom, insertExtraFields
-	 */
-	function updateExtraField($key, $trigger=null, $userused=null)
-	{
-		global $conf,$langs,$user;
-
-		if (empty($userused)) $userused=$user;
-
-		$error=0;
-
-		if (! empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) return 0;	// For avoid conflicts if trigger used
-
-		if (! empty($this->array_options) && isset($this->array_options["options_".$key]))
-		{
-			// Check parameters
-			$langs->load('admin');
-			require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-			$extrafields = new ExtraFields($this->db);
-			$target_extrafields=$extrafields->fetch_name_optionals_label($this->table_element);
-
-			$value=$this->array_options["options_".$key];
-
-			$attributeType     = $extrafields->attributes[$this->table_element]['type'][$key];
-			$attributeLabel    = $extrafields->attributes[$this->table_element]['label'][$key];
-			$attributeParam    = $extrafields->attributes[$this->table_element]['param'][$key];
-			$attributeRequired = $extrafields->attributes[$this->table_element]['required'][$key];
-
-			//dol_syslog("attributeLabel=".$attributeLabel, LOG_DEBUG);
-			//dol_syslog("attributeType=".$attributeType, LOG_DEBUG);
-
-			switch ($attributeType)
-			{
-				case 'int':
-					if (!is_numeric($value) && $value!='')
-					{
-						$this->errors[]=$langs->trans("ExtraFieldHasWrongValue",$attributeLabel);
-						return -1;
-					}
-					elseif ($value=='')
-					{
-						$this->array_options["options_".$key] = null;
-					}
-					break;
-				case 'double':
-					$value = price2num($value);
-					if (!is_numeric($value) && $value!='')
-					{
-						dol_syslog($langs->trans("ExtraFieldHasWrongValue")." sur ".$attributeLabel."(".$value."is not '".$attributeType."')", LOG_DEBUG);
-						$this->errors[]=$langs->trans("ExtraFieldHasWrongValue", $attributeLabel);
-						return -1;
-					}
-					elseif ($value=='')
-					{
-						$this->array_options["options_".$key] = null;
-					}
-					//dol_syslog("double value"." sur ".$attributeLabel."(".$value." is '".$attributeType."')", LOG_DEBUG);
-					$this->array_options["options_".$key] = $value;
-					break;
-			 	/*case 'select':	// Not required, we chosed value='0' for undefined values
-             		if ($value=='-1')
-             		{
-             			$this->array_options[$key] = null;
-             		}
-             		break;*/
-				case 'price':
-					$this->array_options["options_".$key] = price2num($this->array_options["options_".$key]);
-					break;
-				case 'date':
-					$this->array_options["options_".$key]=$this->db->idate($this->array_options["options_".$key]);
-					break;
-				case 'datetime':
-					$this->array_options["options_".$key]=$this->db->idate($this->array_options["options_".$key]);
-					break;
-				case 'link':
-					$param_list=array_keys($attributeParam['options']);
-					// 0 : ObjectName
-					// 1 : classPath
-					$InfoFieldList = explode(":", $param_list[0]);
-					dol_include_once($InfoFieldList[1]);
-					if ($value)
-					{
-						$object = new $InfoFieldList[0]($this->db);
-						$object->fetch(0,$value);
-						$this->array_options["options_".$key]=$object->id;
-					}
-					break;
-			}
-
-			$this->db->begin();
-			$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element."_extrafields SET ".$key."='".$this->db->escape($this->array_options["options_".$key])."'";
-			$sql .= " WHERE fk_object = ".$this->id;
-			$resql = $this->db->query($sql);
-			if (! $resql)
-			{
-				$error++;
-				$this->error=$this->db->lasterror();
-			}
+            $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
+            $sql .= ' SET '.$fieldname.' = '.$id;
+            $sql .= ' WHERE rowid='.$this->id;
 
-			if (! $error && $trigger)
-			{
-				// Call trigger
-				$this->context=array('extrafieldupdate'=>1);
-				$result=$this->call_trigger($trigger, $userused);
-				if ($result < 0) $error++;
-				// End call trigger
-			}
-
-			if ($error)
-			{
-				dol_syslog(get_class($this) . "::".__METHOD__ . $this->error, LOG_ERR);
-				$this->db->rollback();
-				return -1;
-			}
-			else
-			{
-				$this->db->commit();
-				return 1;
-			}
-		}
-		else return 0;
-	}
-
-
-	/**
-	 * Return HTML string to put an input field into a page
-	 * Code very similar with showInputField of extra fields
-	 *
-	 * @param  array   		$val	       Array of properties for field to show
-	 * @param  string  		$key           Key of attribute
-	 * @param  string  		$value         Preselected value to show (for date type it must be in timestamp format, for amount or price it must be a php numeric value)
-	 * @param  string  		$moreparam     To add more parameters on html input tag
-	 * @param  string  		$keysuffix     Prefix string to add into name and id of field (can be used to avoid duplicate names)
-	 * @param  string  		$keyprefix     Suffix string to add into name and id of field (can be used to avoid duplicate names)
-	 * @param  string|int		$morecss       Value for css to define style/length of field. May also be a numeric.
-	 * @return string
-	 */
-	function showInputField($val, $key, $value, $moreparam='', $keysuffix='', $keyprefix='', $morecss=0)
-	{
-		global $conf,$langs,$form;
-
-		if (! is_object($form))
-		{
-			require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
-			$form=new Form($this->db);
-		}
-
-		$val=$this->fields[$key];
-
-		$out='';
-        $type='';
-        $param = array();
-        $param['options']=array();
-        $size =$this->fields[$key]['size'];
-        // Because we work on extrafields
-        if(preg_match('/^integer:(.*):(.*)/i', $val['type'], $reg)){
-            $param['options']=array($reg[1].':'.$reg[2]=>'N');
-            $type ='link';
-        } elseif(preg_match('/^link:(.*):(.*)/i', $val['type'], $reg)) {
-            $param['options']=array($reg[1].':'.$reg[2]=>'N');
-            $type ='link';
-        } elseif(preg_match('/^sellist:(.*):(.*):(.*):(.*)/i', $val['type'], $reg)) {
-            $param['options']=array($reg[1].':'.$reg[2].':'.$reg[3].':'.$reg[4]=>'N');
-            $type ='sellist';
-        } elseif(preg_match('/varchar\((\d+)\)/', $val['type'],$reg)) {
-            $param['options']=array();
-            $type ='varchar';
-            $size=$reg[1];
-        } elseif(preg_match('/varchar/', $val['type'])) {
-            $param['options']=array();
-            $type ='varchar';
-        } elseif(is_array($this->fields[$key]['arrayofkeyval'])) {
-            $param['options']=$this->fields[$key]['arrayofkeyval'];
-            $type ='select';
-        } else {
-            $param['options']=array();
-            $type =$this->fields[$key]['type'];
+            if ($this->db->query($sql))
+            {
+                $this->mode_reglement_id = $id;
+                // for supplier
+                if (get_class($this) == 'Fournisseur') $this->mode_reglement_supplier_id = $id;
+                return 1;
+            }
+            else
+            {
+                dol_syslog(get_class($this).'::setPaymentMethods Erreur '.$sql.' - '.$this->db->error());
+                $this->error=$this->db->error();
+                return -1;
+            }
         }
+        else
+        {
+            dol_syslog(get_class($this).'::setPaymentMethods, status of the object is incompatible');
+            $this->error='Status of the object is incompatible '.$this->statut;
+            return -2;
+        }
+    }
 
-		$label=$this->fields[$key]['label'];
-		//$elementtype=$this->fields[$key]['elementtype'];	// Seems not used
-		$default=$this->fields[$key]['default'];
-		$computed=$this->fields[$key]['computed'];
-		$unique=$this->fields[$key]['unique'];
-		$required=$this->fields[$key]['required'];
-
-		$langfile=$this->fields[$key]['langfile'];
-		$list=$this->fields[$key]['list'];
-		$hidden=abs($this->fields[$key]['visible'])!=1?1:0;
-
-		$objectid = $this->id;
+    /**
+     *  Change the multicurrency code
+     *
+     *  @param		string	$code	multicurrency code
+     *  @return		int				>0 if OK, <0 if KO
+     */
+    function setMulticurrencyCode($code)
+    {
+        dol_syslog(get_class($this).'::setMulticurrencyCode('.$id.')');
+        if ($this->statut >= 0 || $this->element == 'societe')
+        {
+            $fieldname = 'multicurrency_code';
 
+            $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
+            $sql .= ' SET '.$fieldname." = '".$this->db->escape($code)."'";
+            $sql .= ' WHERE rowid='.$this->id;
 
-		if ($computed)
-		{
-			if (! preg_match('/^search_/', $keyprefix)) return '<span class="opacitymedium">'.$langs->trans("AutomaticallyCalculated").'</span>';
-			else return '';
-		}
+            if ($this->db->query($sql))
+            {
+                $this->multicurrency_code = $code;
 
+                list($fk_multicurrency, $rate) = MultiCurrency::getIdAndTxFromCode($this->db, $code);
+                if ($rate) $this->setMulticurrencyRate($rate,2);
 
-		// Use in priority showsize from parameters, then $val['css'] then autodefine
-		if (empty($morecss) && ! empty($val['css']))
-		{
-			$showsize = $val['css'];
-		}
-		if (empty($morecss))
-		{
-			if ($type == 'date')
-			{
-				$morecss = 'minwidth100imp';
-			}
-			elseif ($type == 'datetime')
-			{
-				$morecss = 'minwidth200imp';
-			}
-			elseif (in_array($type,array('int','integer','price')) || preg_match('/^double(\([0-9],[0-9]\)){0,1}/',$type))
-			{
-				$morecss = 'maxwidth75';
-                        }elseif ($type == 'url')
-			{
-				$morecss='minwidth400';
-			}
-			elseif ($type == 'boolean')
-			{
-				$morecss='';
-			}
-			else
-			{
-				if (round($size) < 12)
-				{
-					$morecss = 'minwidth100';
-				}
-				else if (round($size) <= 48)
-				{
-					$morecss = 'minwidth200';
-				}
-				else
-				{
-					$morecss = 'minwidth400';
-				}
-			}
-		}
-
-		if (in_array($type,array('date','datetime')))
-		{
-			$tmp=explode(',',$size);
-			$newsize=$tmp[0];
-
-			$showtime = in_array($type,array('datetime')) ? 1 : 0;
-
-			// Do not show current date when field not required (see selectDate() method)
-			if (!$required && $value == '') $value = '-1';
-
-			// TODO Must also support $moreparam
-			$out = $form->selectDate($value, $keyprefix.$key.$keysuffix, $showtime, $showtime, $required, '', 1, (($keyprefix != 'search_' && $keyprefix != 'search_options_') ? 1 : 0), 0, 1);
-		}
-		elseif (in_array($type,array('int','integer')))
-		{
-			$tmp=explode(',',$size);
-			$newsize=$tmp[0];
-			$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$newsize.'" value="'.dol_escape_htmltag($value).'"'.($moreparam?$moreparam:'').'>';
-		}
-		elseif (preg_match('/varchar/', $type))
-		{
-			$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$size.'" value="'.dol_escape_htmltag($value).'"'.($moreparam?$moreparam:'').'>';
-		}
-		elseif (in_array($type, array('mail', 'phone', 'url')))
-		{
-			$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam?$moreparam:'').'>';
-		}
-		elseif ($type == 'text')
-		{
-			if (! preg_match('/search_/', $keyprefix))		// If keyprefix is search_ or search_options_, we must just use a simple text field
-			{
-				require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-				$doleditor=new DolEditor($keyprefix.$key.$keysuffix,$value,'',200,'dolibarr_notes','In',false,false,false,ROWS_5,'90%');
-				$out=$doleditor->Create(1);
-			}
-			else
-			{
-				$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam?$moreparam:'').'>';
-			}
-		}
-		elseif ($type == 'html')
-		{
-			if (! preg_match('/search_/', $keyprefix))		// If keyprefix is search_ or search_options_, we must just use a simple text field
-			{
-				require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-				$doleditor=new DolEditor($keyprefix.$key.$keysuffix,$value,'',200,'dolibarr_notes','In',false,false,! empty($conf->fckeditor->enabled) && $conf->global->FCKEDITOR_ENABLE_SOCIETE,ROWS_5,'90%');
-				$out=$doleditor->Create(1);
-			}
-			else
-			{
-				$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam?$moreparam:'').'>';
-			}
-		}
-		elseif ($type == 'boolean')
-		{
-			$checked='';
-			if (!empty($value)) {
-				$checked=' checked value="1" ';
-			} else {
-				$checked=' value="1" ';
-			}
-			$out='<input type="checkbox" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.$checked.' '.($moreparam?$moreparam:'').'>';
-		}
-		elseif ($type == 'price')
-		{
-			if (!empty($value)) {		// $value in memory is a php numeric, we format it into user number format.
-				$value=price($value);
-			}
-			$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam?$moreparam:'').'> '.$langs->getCurrencySymbol($conf->currency);
-		}
-		elseif (preg_match('/^double(\([0-9],[0-9]\)){0,1}/',$type))
-		{
-			if (!empty($value)) {		// $value in memory is a php numeric, we format it into user number format.
-				$value=price($value);
-			}
-			$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam?$moreparam:'').'> ';
-		}
-		elseif ($type == 'select')
-		{
-			$out = '';
-			if (! empty($conf->use_javascript_ajax) && ! empty($conf->global->MAIN_EXTRAFIELDS_USE_SELECT2))
-			{
-				include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
-				$out.= ajax_combobox($keyprefix.$key.$keysuffix, array(), 0);
-			}
+                return 1;
+            }
+            else
+            {
+                dol_syslog(get_class($this).'::setMulticurrencyCode Erreur '.$sql.' - '.$this->db->error());
+                $this->error=$this->db->error();
+                return -1;
+            }
+        }
+        else
+        {
+            dol_syslog(get_class($this).'::setMulticurrencyCode, status of the object is incompatible');
+            $this->error='Status of the object is incompatible '.$this->statut;
+            return -2;
+        }
+    }
 
-			$out.='<select class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam?$moreparam:'').'>';
-                if((! isset($this->fields[$key]['default'])) ||($this->fields[$key]['notnull']!=1))$out.='<option value="0">&nbsp;</option>';
-			foreach ($param['options'] as $key => $val)
-			{
-				if ((string) $key == '') continue;
-				list($val, $parent) = explode('|', $val);
-				$out.='<option value="'.$key.'"';
-				$out.= (((string) $value == (string) $key)?' selected':'');
-				$out.= (!empty($parent)?' parent="'.$parent.'"':'');
-				$out.='>'.$val.'</option>';
-			}
-			$out.='</select>';
-		}
-		elseif ($type == 'sellist')
-		{
-			$out = '';
-			if (! empty($conf->use_javascript_ajax) && ! empty($conf->global->MAIN_EXTRAFIELDS_USE_SELECT2))
-			{
-				include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
-				$out.= ajax_combobox($keyprefix.$key.$keysuffix, array(), 0);
-			}
+    /**
+     *  Change the multicurrency rate
+     *
+     *  @param		double	$rate	multicurrency rate
+     *  @param		int		$mode	mode 1 : amounts in company currency will be recalculated, mode 2 : amounts in foreign currency
+     *  @return		int				>0 if OK, <0 if KO
+     */
+    function setMulticurrencyRate($rate, $mode=1)
+    {
+        dol_syslog(get_class($this).'::setMulticurrencyRate('.$id.')');
+        if ($this->statut >= 0 || $this->element == 'societe')
+        {
+            $fieldname = 'multicurrency_tx';
 
-			$out.='<select class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam?$moreparam:'').'>';
-			if (is_array($param['options']))
-			{
-				$param_list=array_keys($param['options']);
-				$InfoFieldList = explode(":", $param_list[0]);
-				$parentName='';
-				$parentField='';
-				// 0 : tableName
-				// 1 : label field name
-				// 2 : key fields name (if differ of rowid)
-				// 3 : key field parent (for dependent lists)
-				// 4 : where clause filter on column or table extrafield, syntax field='value' or extra.field=value
-				$keyList=(empty($InfoFieldList[2])?'rowid':$InfoFieldList[2].' as rowid');
-
-
-				if (count($InfoFieldList) > 4 && ! empty($InfoFieldList[4]))
-				{
-					if (strpos($InfoFieldList[4], 'extra.') !== false)
-					{
-						$keyList='main.'.$InfoFieldList[2].' as rowid';
-					} else {
-						$keyList=$InfoFieldList[2].' as rowid';
-					}
-				}
-				if (count($InfoFieldList) > 3 && ! empty($InfoFieldList[3]))
-				{
-					list($parentName, $parentField) = explode('|', $InfoFieldList[3]);
-					$keyList.= ', '.$parentField;
-				}
+            $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
+            $sql .= ' SET '.$fieldname.' = '.$rate;
+            $sql .= ' WHERE rowid='.$this->id;
 
-				$fields_label = explode('|',$InfoFieldList[1]);
-				if (is_array($fields_label))
-				{
-					$keyList .=', ';
-					$keyList .= implode(', ', $fields_label);
-				}
+            if ($this->db->query($sql))
+            {
+                $this->multicurrency_tx = $rate;
+
+                // Update line price
+                if (!empty($this->lines))
+                {
+                    foreach ($this->lines as &$line)
+                    {
+                        if($mode == 1) {
+                            $line->subprice = 0;
+                        }
+
+                        switch ($this->element) {
+                            case 'propal':
+                                $this->updateline(
+                                    $line->id, $line->subprice, $line->qty, $line->remise_percent, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx,
+                                    ($line->description?$line->description:$line->desc), 'HT', $line->info_bits, $line->special_code, $line->fk_parent_line,
+                                    $line->skip_update_total, $line->fk_fournprice, $line->pa_ht, $line->label, $line->product_type, $line->date_start,
+                                    $line->date_end, $line->array_options, $line->fk_unit, $line->multicurrency_subprice
+                                );
+                                break;
+                            case 'commande':
+                                $this->updateline(
+                                    $line->id, ($line->description?$line->description:$line->desc), $line->subprice, $line->qty, $line->remise_percent,
+                                    $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'HT', $line->info_bits, $line->date_start, $line->date_end,
+                                    $line->product_type, $line->fk_parent_line, $line->skip_update_total, $line->fk_fournprice, $line->pa_ht, $line->label,
+                                    $line->special_code, $line->array_options, $line->fk_unit, $line->multicurrency_subprice
+                                );
+                                break;
+                            case 'facture':
+                                $this->updateline(
+                                    $line->id, ($line->description?$line->description:$line->desc), $line->subprice, $line->qty, $line->remise_percent,
+                                    $line->date_start, $line->date_end, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'HT', $line->info_bits,
+                                    $line->product_type, $line->fk_parent_line, $line->skip_update_total, $line->fk_fournprice, $line->pa_ht, $line->label,
+                                    $line->special_code, $line->array_options, $line->situation_percent, $line->fk_unit, $line->multicurrency_subprice
+                                );
+                                break;
+                            case 'supplier_proposal':
+                                $this->updateline(
+                                    $line->id, $line->subprice, $line->qty, $line->remise_percent, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx,
+                                    ($line->description?$line->description:$line->desc), 'HT', $line->info_bits, $line->special_code, $line->fk_parent_line,
+                                    $line->skip_update_total, $line->fk_fournprice, $line->pa_ht, $line->label, $line->product_type, $line->array_options,
+                                    $line->ref_fourn, $line->multicurrency_subprice
+                                );
+                                break;
+                            case 'order_supplier':
+                                $this->updateline(
+                                    $line->id, ($line->description?$line->description:$line->desc), $line->subprice, $line->qty, $line->remise_percent,
+                                    $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'HT', $line->info_bits, $line->product_type, false,
+                                    $line->date_start, $line->date_end, $line->array_options, $line->fk_unit, $line->multicurrency_subprice
+                                );
+                                break;
+                            case 'invoice_supplier':
+                                $this->updateline(
+                                    $line->id, ($line->description?$line->description:$line->desc), $line->subprice, $line->tva_tx, $line->localtax1_tx,
+                                    $line->localtax2_tx, $line->qty, 0, 'HT', $line->info_bits, $line->product_type, $line->remise_percent, false,
+                                    $line->date_start, $line->date_end, $line->array_options, $line->fk_unit, $line->multicurrency_subprice
+                                );
+                                break;
+                            default:
+                                dol_syslog(get_class($this).'::setMulticurrencyRate no updateline defined', LOG_DEBUG);
+                                break;
+                        }
+                    }
+                }
+
+                return 1;
+            }
+            else
+            {
+                dol_syslog(get_class($this).'::setMulticurrencyRate Erreur '.$sql.' - '.$this->db->error());
+                $this->error=$this->db->error();
+                return -1;
+            }
+        }
+        else
+        {
+            dol_syslog(get_class($this).'::setMulticurrencyRate, status of the object is incompatible');
+            $this->error='Status of the object is incompatible '.$this->statut;
+            return -2;
+        }
+    }
 
-				$sqlwhere='';
-				$sql = 'SELECT '.$keyList;
-				$sql.= ' FROM '.MAIN_DB_PREFIX .$InfoFieldList[0];
-				if (!empty($InfoFieldList[4]))
-				{
-					// can use SELECT request
-					if (strpos($InfoFieldList[4], '$SEL$')!==false) {
-						$InfoFieldList[4]=str_replace('$SEL$','SELECT',$InfoFieldList[4]);
-					}
-
-					// current object id can be use into filter
-					if (strpos($InfoFieldList[4], '$ID$')!==false && !empty($objectid)) {
-						$InfoFieldList[4]=str_replace('$ID$',$objectid,$InfoFieldList[4]);
-					} else {
-						$InfoFieldList[4]=str_replace('$ID$','0',$InfoFieldList[4]);
-					}
-					//We have to join on extrafield table
-					if (strpos($InfoFieldList[4], 'extra')!==false)
-					{
-						$sql.= ' as main, '.MAIN_DB_PREFIX .$InfoFieldList[0].'_extrafields as extra';
-						$sqlwhere.= ' WHERE extra.fk_object=main.'.$InfoFieldList[2]. ' AND '.$InfoFieldList[4];
-					}
-					else
-					{
-						$sqlwhere.= ' WHERE '.$InfoFieldList[4];
-					}
-				}
-				else
-				{
-					$sqlwhere.= ' WHERE 1=1';
-				}
-				// Some tables may have field, some other not. For the moment we disable it.
-				if (in_array($InfoFieldList[0],array('tablewithentity')))
-				{
-					$sqlwhere.= ' AND entity = '.$conf->entity;
-				}
-				$sql.=$sqlwhere;
-				//print $sql;
+    /**
+     *  Change the payments terms
+     *
+     *  @param		int		$id		Id of new payment terms
+     *  @return		int				>0 if OK, <0 if KO
+     */
+    function setPaymentTerms($id)
+    {
+        dol_syslog(get_class($this).'::setPaymentTerms('.$id.')');
+        if ($this->statut >= 0 || $this->element == 'societe')
+        {
+            // TODO uniformize field name
+            $fieldname = 'fk_cond_reglement';
+            if ($this->element == 'societe') $fieldname = 'cond_reglement';
+            if (get_class($this) == 'Fournisseur') $fieldname = 'cond_reglement_supplier';
 
-				$sql .= ' ORDER BY ' . implode(', ', $fields_label);
+            $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
+            $sql .= ' SET '.$fieldname.' = '.$id;
+            $sql .= ' WHERE rowid='.$this->id;
 
-				dol_syslog(get_class($this).'::showInputField type=sellist', LOG_DEBUG);
-				$resql = $this->db->query($sql);
-				if ($resql)
-				{
-					$out.='<option value="0">&nbsp;</option>';
-					$num = $this->db->num_rows($resql);
-					$i = 0;
-					while ($i < $num)
-					{
-						$labeltoshow='';
-						$obj = $this->db->fetch_object($resql);
-
-						// Several field into label (eq table:code|libelle:rowid)
-						$notrans = false;
-						$fields_label = explode('|',$InfoFieldList[1]);
-						if (is_array($fields_label))
-						{
-							$notrans = true;
-							foreach ($fields_label as $field_toshow)
-							{
-								$labeltoshow.= $obj->$field_toshow.' ';
-							}
-						}
-						else
-						{
-							$labeltoshow=$obj->{$InfoFieldList[1]};
-						}
-						$labeltoshow=dol_trunc($labeltoshow,45);
-
-						if ($value == $obj->rowid)
-						{
-							foreach ($fields_label as $field_toshow)
-							{
-								$translabel=$langs->trans($obj->$field_toshow);
-								if ($translabel!=$obj->$field_toshow) {
-									$labeltoshow=dol_trunc($translabel,18).' ';
-								}else {
-									$labeltoshow=dol_trunc($obj->$field_toshow,18).' ';
-								}
-							}
-							$out.='<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
-						}
-						else
-						{
-							if (! $notrans)
-							{
-								$translabel=$langs->trans($obj->{$InfoFieldList[1]});
-								if ($translabel!=$obj->{$InfoFieldList[1]}) {
-									$labeltoshow=dol_trunc($translabel,18);
-								}
-								else {
-									$labeltoshow=dol_trunc($obj->{$InfoFieldList[1]},18);
-								}
-							}
-							if (empty($labeltoshow)) $labeltoshow='(not defined)';
-							if ($value==$obj->rowid)
-							{
-								$out.='<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
+            if ($this->db->query($sql))
+            {
+                $this->cond_reglement_id = $id;
+                // for supplier
+                if (get_class($this) == 'Fournisseur') $this->cond_reglement_supplier_id = $id;
+                $this->cond_reglement = $id;	// for compatibility
+                return 1;
+            }
+            else
+            {
+                dol_syslog(get_class($this).'::setPaymentTerms Erreur '.$sql.' - '.$this->db->error());
+                $this->error=$this->db->error();
+                return -1;
+            }
+        }
+        else
+        {
+            dol_syslog(get_class($this).'::setPaymentTerms, status of the object is incompatible');
+            $this->error='Status of the object is incompatible '.$this->statut;
+            return -2;
+        }
+    }
+
+    /**
+     *	Define delivery address
+     *  @deprecated
+     *
+     *	@param      int		$id		Address id
+     *	@return     int				<0 si ko, >0 si ok
+     */
+    function setDeliveryAddress($id)
+    {
+        $fieldname = 'fk_delivery_address';
+        if ($this->element == 'delivery' || $this->element == 'shipping') $fieldname = 'fk_address';
+
+        $sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET ".$fieldname." = ".$id;
+        $sql.= " WHERE rowid = ".$this->id." AND fk_statut = 0";
+
+        if ($this->db->query($sql))
+        {
+            $this->fk_delivery_address = $id;
+            return 1;
+        }
+        else
+        {
+            $this->error=$this->db->error();
+            dol_syslog(get_class($this).'::setDeliveryAddress Erreur '.$sql.' - '.$this->error);
+            return -1;
+        }
+    }
+
+
+    /**
+     *  Change the shipping method
+     *
+     *  @param      int     $shipping_method_id     Id of shipping method
+     *  @param      bool    $notrigger              false=launch triggers after, true=disable triggers
+     *  @param      User	$userused               Object user
+     *
+     *  @return     int              1 if OK, 0 if KO
+     */
+    function setShippingMethod($shipping_method_id, $notrigger=false, $userused=null)
+    {
+        global $user;
+
+        if (empty($userused)) $userused=$user;
+
+        $error = 0;
+
+        if (! $this->table_element) {
+            dol_syslog(get_class($this)."::setShippingMethod was called on objet with property table_element not defined",LOG_ERR);
+            return -1;
+        }
+
+        $this->db->begin();
+
+        if ($shipping_method_id<0) $shipping_method_id='NULL';
+        dol_syslog(get_class($this).'::setShippingMethod('.$shipping_method_id.')');
+
+        $sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
+        $sql.= " SET fk_shipping_method = ".$shipping_method_id;
+        $sql.= " WHERE rowid=".$this->id;
+        $resql = $this->db->query($sql);
+        if (! $resql) {
+            dol_syslog(get_class($this).'::setShippingMethod Error ', LOG_DEBUG);
+            $this->error = $this->db->lasterror();
+            $error++;
+        } else {
+            if (!$notrigger)
+            {
+                // Call trigger
+                $this->context=array('shippingmethodupdate'=>1);
+                $result = $this->call_trigger(strtoupper(get_class($this)) . '_MODIFY', $userused);
+                if ($result < 0) $error++;
+                // End call trigger
+            }
+        }
+        if ($error)
+        {
+            $this->db->rollback();
+            return -1;
+        } else {
+            $this->shipping_method_id = ($shipping_method_id=='NULL')?null:$shipping_method_id;
+            $this->db->commit();
+            return 1;
+        }
+    }
+
+
+    /**
+     *  Change the warehouse
+     *
+     *  @param      int     $warehouse_id     Id of warehouse
+     *  @return     int              1 if OK, 0 if KO
+     */
+    function setWarehouse($warehouse_id)
+    {
+        if (! $this->table_element) {
+            dol_syslog(get_class($this)."::setWarehouse was called on objet with property table_element not defined",LOG_ERR);
+            return -1;
+        }
+        if ($warehouse_id<0) $warehouse_id='NULL';
+        dol_syslog(get_class($this).'::setWarehouse('.$warehouse_id.')');
+
+        $sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
+        $sql.= " SET fk_warehouse = ".$warehouse_id;
+        $sql.= " WHERE rowid=".$this->id;
+
+        if ($this->db->query($sql)) {
+            $this->warehouse_id = ($warehouse_id=='NULL')?null:$warehouse_id;
+            return 1;
+        } else {
+            dol_syslog(get_class($this).'::setWarehouse Error ', LOG_DEBUG);
+            $this->error=$this->db->error();
+            return 0;
+        }
+    }
+
+
+    /**
+     *		Set last model used by doc generator
+     *
+     *		@param		User	$user		User object that make change
+     *		@param		string	$modelpdf	Modele name
+     *		@return		int					<0 if KO, >0 if OK
+     */
+    function setDocModel($user, $modelpdf)
+    {
+        if (! $this->table_element)
+        {
+            dol_syslog(get_class($this)."::setDocModel was called on objet with property table_element not defined",LOG_ERR);
+            return -1;
+        }
+
+        $newmodelpdf=dol_trunc($modelpdf,255);
+
+        $sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
+        $sql.= " SET model_pdf = '".$this->db->escape($newmodelpdf)."'";
+        $sql.= " WHERE rowid = ".$this->id;
+        // if ($this->element == 'facture') $sql.= " AND fk_statut < 2";
+        // if ($this->element == 'propal')  $sql.= " AND fk_statut = 0";
+
+        dol_syslog(get_class($this)."::setDocModel", LOG_DEBUG);
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            $this->modelpdf=$modelpdf;
+            return 1;
+        }
+        else
+        {
+            dol_print_error($this->db);
+            return 0;
+        }
+    }
+
+
+    /**
+     *  Change the bank account
+     *
+     *  @param		int		$fk_account		Id of bank account
+     *  @param      bool    $notrigger      false=launch triggers after, true=disable triggers
+     *  @param      User	$userused		Object user
+     *  @return		int				1 if OK, 0 if KO
+     */
+    function setBankAccount($fk_account, $notrigger=false, $userused=null)
+    {
+        global $user;
+
+        if (empty($userused)) $userused=$user;
+
+        $error = 0;
+
+        if (! $this->table_element) {
+            dol_syslog(get_class($this)."::setBankAccount was called on objet with property table_element not defined",LOG_ERR);
+            return -1;
+        }
+        $this->db->begin();
+
+        if ($fk_account<0) $fk_account='NULL';
+        dol_syslog(get_class($this).'::setBankAccount('.$fk_account.')');
+
+        $sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
+        $sql.= " SET fk_account = ".$fk_account;
+        $sql.= " WHERE rowid=".$this->id;
+
+        $resql = $this->db->query($sql);
+        if (! $resql)
+        {
+            dol_syslog(get_class($this).'::setBankAccount Error '.$sql.' - '.$this->db->error());
+            $this->error = $this->db->lasterror();
+            $error++;
+        }
+        else
+        {
+            if (!$notrigger)
+            {
+                // Call trigger
+                $this->context=array('bankaccountupdate'=>1);
+                $result = $this->call_trigger(strtoupper(get_class($this)) . '_MODIFY', $userused);
+                if ($result < 0) $error++;
+                // End call trigger
+            }
+        }
+        if ($error)
+        {
+            $this->db->rollback();
+            return -1;
+        }
+        else
+        {
+            $this->fk_account = ($fk_account=='NULL')?null:$fk_account;
+            $this->db->commit();
+            return 1;
+        }
+    }
+
+
+    // TODO: Move line related operations to CommonObjectLine?
+
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
+    /**
+     *  Save a new position (field rang) for details lines.
+     *  You can choose to set position for lines with already a position or lines without any position defined.
+     *
+     * 	@param		boolean		$renum			   True to renum all already ordered lines, false to renum only not already ordered lines.
+     * 	@param		string		$rowidorder		   ASC or DESC
+     * 	@param		boolean		$fk_parent_line    Table with fk_parent_line field or not
+     * 	@return		int                            <0 if KO, >0 if OK
+     */
+    function line_order($renum=false, $rowidorder='ASC', $fk_parent_line=true)
+    {
+        // phpcs:enable
+        if (! $this->table_element_line)
+        {
+            dol_syslog(get_class($this)."::line_order was called on objet with property table_element_line not defined",LOG_ERR);
+            return -1;
+        }
+        if (! $this->fk_element)
+        {
+            dol_syslog(get_class($this)."::line_order was called on objet with property fk_element not defined",LOG_ERR);
+            return -1;
+        }
+
+        // Count number of lines to reorder (according to choice $renum)
+        $nl=0;
+        $sql = 'SELECT count(rowid) FROM '.MAIN_DB_PREFIX.$this->table_element_line;
+        $sql.= ' WHERE '.$this->fk_element.'='.$this->id;
+        if (! $renum) $sql.= ' AND rang = 0';
+        if ($renum) $sql.= ' AND rang <> 0';
+
+        dol_syslog(get_class($this)."::line_order", LOG_DEBUG);
+        $resql = $this->db->query($sql);
+        if ($resql)
+        {
+            $row = $this->db->fetch_row($resql);
+            $nl = $row[0];
+        }
+        else dol_print_error($this->db);
+        if ($nl > 0)
+        {
+            // The goal of this part is to reorder all lines, with all children lines sharing the same
+            // counter that parents.
+            $rows=array();
+
+            // We first search all lines that are parent lines (for multilevel details lines)
+            $sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.$this->table_element_line;
+            $sql.= ' WHERE '.$this->fk_element.' = '.$this->id;
+            if ($fk_parent_line) $sql.= ' AND fk_parent_line IS NULL';
+            $sql.= ' ORDER BY rang ASC, rowid '.$rowidorder;
+
+            dol_syslog(get_class($this)."::line_order search all parent lines", LOG_DEBUG);
+            $resql = $this->db->query($sql);
+            if ($resql)
+            {
+                $i=0;
+                $num = $this->db->num_rows($resql);
+                while ($i < $num)
+                {
+                    $row = $this->db->fetch_row($resql);
+                    $rows[] = $row[0];	// Add parent line into array rows
+                    $childrens = $this->getChildrenOfLine($row[0]);
+                    if (! empty($childrens))
+                    {
+                        foreach($childrens as $child)
+                        {
+                            array_push($rows, $child);
+                        }
+                    }
+                    $i++;
+                }
+
+                // Now we set a new number for each lines (parent and children with children included into parent tree)
+                if (! empty($rows))
+                {
+                    foreach($rows as $key => $row)
+                    {
+                        $this->updateRangOfLine($row, ($key+1));
+                    }
+                }
+            }
+            else
+            {
+                dol_print_error($this->db);
+            }
+        }
+        return 1;
+    }
+
+    /**
+     * 	Get children of line
+     *
+     * 	@param	int		$id		Id of parent line
+     * 	@return	array			Array with list of children lines id
+     */
+    function getChildrenOfLine($id)
+    {
+        $rows=array();
+
+        $sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.$this->table_element_line;
+        $sql.= ' WHERE '.$this->fk_element.' = '.$this->id;
+        $sql.= ' AND fk_parent_line = '.$id;
+        $sql.= ' ORDER BY rang ASC';
+
+        dol_syslog(get_class($this)."::getChildrenOfLine search children lines for line ".$id."", LOG_DEBUG);
+        $resql = $this->db->query($sql);
+        if ($resql)
+        {
+            $i=0;
+            $num = $this->db->num_rows($resql);
+            while ($i < $num)
+            {
+                $row = $this->db->fetch_row($resql);
+                $rows[$i] = $row[0];
+                $i++;
+            }
+        }
+
+        return $rows;
+    }
+
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
+    /**
+     * 	Update a line to have a lower rank
+     *
+     * 	@param 	int			$rowid				Id of line
+     * 	@param	boolean		$fk_parent_line		Table with fk_parent_line field or not
+     * 	@return	void
+     */
+    function line_up($rowid, $fk_parent_line=true)
+    {
+        // phpcs:enable
+        $this->line_order(false, 'ASC', $fk_parent_line);
+
+        // Get rang of line
+        $rang = $this->getRangOfLine($rowid);
+
+        // Update position of line
+        $this->updateLineUp($rowid, $rang);
+    }
+
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
+    /**
+     * 	Update a line to have a higher rank
+     *
+     * 	@param	int			$rowid				Id of line
+     * 	@param	boolean		$fk_parent_line		Table with fk_parent_line field or not
+     * 	@return	void
+     */
+    function line_down($rowid, $fk_parent_line=true)
+    {
+        // phpcs:enable
+        $this->line_order(false, 'ASC', $fk_parent_line);
+
+        // Get rang of line
+        $rang = $this->getRangOfLine($rowid);
+
+        // Get max value for rang
+        $max = $this->line_max();
+
+        // Update position of line
+        $this->updateLineDown($rowid, $rang, $max);
+    }
+
+    /**
+     * 	Update position of line (rang)
+     *
+     * 	@param	int		$rowid		Id of line
+     * 	@param	int		$rang		Position
+     * 	@return	void
+     */
+    function updateRangOfLine($rowid,$rang)
+    {
+        $fieldposition = 'rang';
+        if (in_array($this->table_element_line, array('ecm_files', 'emailcollector_emailcollectoraction'))) $fieldposition = 'position';
+
+        $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element_line.' SET '.$fieldposition.' = '.$rang;
+        $sql.= ' WHERE rowid = '.$rowid;
+
+        dol_syslog(get_class($this)."::updateRangOfLine", LOG_DEBUG);
+        if (! $this->db->query($sql))
+        {
+            dol_print_error($this->db);
+        }
+    }
+
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
+    /**
+     * 	Update position of line with ajax (rang)
+     *
+     * 	@param	array	$rows	Array of rows
+     * 	@return	void
+     */
+    function line_ajaxorder($rows)
+    {
+        // phpcs:enable
+        $num = count($rows);
+        for ($i = 0 ; $i < $num ; $i++)
+        {
+            $this->updateRangOfLine($rows[$i], ($i+1));
+        }
+    }
+
+    /**
+     * 	Update position of line up (rang)
+     *
+     * 	@param	int		$rowid		Id of line
+     * 	@param	int		$rang		Position
+     * 	@return	void
+     */
+    function updateLineUp($rowid,$rang)
+    {
+        if ($rang > 1)
+        {
+            $fieldposition = 'rang';
+            if (in_array($this->table_element_line, array('ecm_files', 'emailcollector_emailcollectoraction'))) $fieldposition = 'position';
+
+            $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element_line.' SET '.$fieldposition.' = '.$rang ;
+            $sql.= ' WHERE '.$this->fk_element.' = '.$this->id;
+            $sql.= ' AND rang = '.($rang - 1);
+            if ($this->db->query($sql) )
+            {
+                $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element_line.' SET '.$fieldposition.' = '.($rang - 1);
+                $sql.= ' WHERE rowid = '.$rowid;
+                if (! $this->db->query($sql) )
+                {
+                    dol_print_error($this->db);
+                }
+            }
+            else
+            {
+                dol_print_error($this->db);
+            }
+        }
+    }
+
+    /**
+     * 	Update position of line down (rang)
+     *
+     * 	@param	int		$rowid		Id of line
+     * 	@param	int		$rang		Position
+     * 	@param	int		$max		Max
+     * 	@return	void
+     */
+    function updateLineDown($rowid,$rang,$max)
+    {
+        if ($rang < $max)
+        {
+            $fieldposition = 'rang';
+            if (in_array($this->table_element_line, array('ecm_files', 'emailcollector_emailcollectoraction'))) $fieldposition = 'position';
+
+            $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element_line.' SET '.$fieldposition.' = '.$rang;
+            $sql.= ' WHERE '.$this->fk_element.' = '.$this->id;
+            $sql.= ' AND rang = '.($rang+1);
+            if ($this->db->query($sql) )
+            {
+                $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element_line.' SET '.$fieldposition.' = '.($rang+1);
+                $sql.= ' WHERE rowid = '.$rowid;
+                if (! $this->db->query($sql) )
+                {
+                    dol_print_error($this->db);
+                }
+            }
+            else
+            {
+                dol_print_error($this->db);
+            }
+        }
+    }
+
+    /**
+     * 	Get position of line (rang)
+     *
+     * 	@param		int		$rowid		Id of line
+     *  @return		int     			Value of rang in table of lines
+     */
+    function getRangOfLine($rowid)
+    {
+        $sql = 'SELECT rang FROM '.MAIN_DB_PREFIX.$this->table_element_line;
+        $sql.= ' WHERE rowid ='.$rowid;
+
+        dol_syslog(get_class($this)."::getRangOfLine", LOG_DEBUG);
+        $resql = $this->db->query($sql);
+        if ($resql)
+        {
+            $row = $this->db->fetch_row($resql);
+            return $row[0];
+        }
+    }
+
+    /**
+     * 	Get rowid of the line relative to its position
+     *
+     * 	@param		int		$rang		Rang value
+     *  @return     int     			Rowid of the line
+     */
+    function getIdOfLine($rang)
+    {
+        $sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.$this->table_element_line;
+        $sql.= ' WHERE '.$this->fk_element.' = '.$this->id;
+        $sql.= ' AND rang = '.$rang;
+        $resql = $this->db->query($sql);
+        if ($resql)
+        {
+            $row = $this->db->fetch_row($resql);
+            return $row[0];
+        }
+    }
+
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
+    /**
+     * 	Get max value used for position of line (rang)
+     *
+     * 	@param		int		$fk_parent_line		Parent line id
+     *  @return     int  			   			Max value of rang in table of lines
+     */
+    function line_max($fk_parent_line=0)
+    {
+        // phpcs:enable
+        // Search the last rang with fk_parent_line
+        if ($fk_parent_line)
+        {
+            $sql = 'SELECT max(rang) FROM '.MAIN_DB_PREFIX.$this->table_element_line;
+            $sql.= ' WHERE '.$this->fk_element.' = '.$this->id;
+            $sql.= ' AND fk_parent_line = '.$fk_parent_line;
+
+            dol_syslog(get_class($this)."::line_max", LOG_DEBUG);
+            $resql = $this->db->query($sql);
+            if ($resql)
+            {
+                $row = $this->db->fetch_row($resql);
+                if (! empty($row[0]))
+                {
+                    return $row[0];
+                }
+                else
+                {
+                    return $this->getRangOfLine($fk_parent_line);
+                }
+            }
+        }
+        // If not, search the last rang of element
+        else
+        {
+            $sql = 'SELECT max(rang) FROM '.MAIN_DB_PREFIX.$this->table_element_line;
+            $sql.= ' WHERE '.$this->fk_element.' = '.$this->id;
+
+            dol_syslog(get_class($this)."::line_max", LOG_DEBUG);
+            $resql = $this->db->query($sql);
+            if ($resql)
+            {
+                $row = $this->db->fetch_row($resql);
+                return $row[0];
+            }
+        }
+    }
+
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
+    /**
+     *  Update external ref of element
+     *
+     *  @param      string		$ref_ext	Update field ref_ext
+     *  @return     int      		   		<0 if KO, >0 if OK
+     */
+    function update_ref_ext($ref_ext)
+    {
+        // phpcs:enable
+        if (! $this->table_element)
+        {
+            dol_syslog(get_class($this)."::update_ref_ext was called on objet with property table_element not defined", LOG_ERR);
+            return -1;
+        }
+
+        $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
+        $sql.= " SET ref_ext = '".$this->db->escape($ref_ext)."'";
+        $sql.= " WHERE ".(isset($this->table_rowid)?$this->table_rowid:'rowid')." = ". $this->id;
+
+        dol_syslog(get_class($this)."::update_ref_ext", LOG_DEBUG);
+        if ($this->db->query($sql))
+        {
+            $this->ref_ext = $ref_ext;
+            return 1;
+        }
+        else
+        {
+            $this->error=$this->db->error();
+            return -1;
+        }
+    }
+
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
+    /**
+     *  Update note of element
+     *
+     *  @param      string		$note		New value for note
+     *  @param		string		$suffix		'', '_public' or '_private'
+     *  @return     int      		   		<0 if KO, >0 if OK
+     */
+    function update_note($note, $suffix='')
+    {
+        // phpcs:enable
+        global $user;
+
+        if (! $this->table_element)
+        {
+            $this->error='update_note was called on objet with property table_element not defined';
+            dol_syslog(get_class($this)."::update_note was called on objet with property table_element not defined", LOG_ERR);
+            return -1;
+        }
+        if (! in_array($suffix,array('','_public','_private')))
+        {
+            $this->error='update_note Parameter suffix must be empty, \'_private\' or \'_public\'';
+            dol_syslog(get_class($this)."::update_note Parameter suffix must be empty, '_private' or '_public'", LOG_ERR);
+            return -2;
+        }
+        // Special cas
+        //var_dump($this->table_element);exit;
+        if ($this->table_element == 'product') $suffix='';
+
+        $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
+        $sql.= " SET note".$suffix." = ".(!empty($note)?("'".$this->db->escape($note)."'"):"NULL");
+        $sql.= " ,".(in_array($this->table_element, array('actioncomm', 'adherent', 'advtargetemailing', 'cronjob', 'establishment'))?"fk_user_mod":"fk_user_modif")." = ".$user->id;
+        $sql.= " WHERE rowid =". $this->id;
+
+        dol_syslog(get_class($this)."::update_note", LOG_DEBUG);
+        if ($this->db->query($sql))
+        {
+            if ($suffix == '_public') $this->note_public = $note;
+            else if ($suffix == '_private') $this->note_private = $note;
+            else
+            {
+                $this->note = $note;      // deprecated
+                $this->note_private = $note;
+            }
+            return 1;
+        }
+        else
+        {
+            $this->error=$this->db->lasterror();
+            return -1;
+        }
+    }
+
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
+    /**
+     * 	Update public note (kept for backward compatibility)
+     *
+     * @param      string		$note		New value for note
+     * @return     int      		   		<0 if KO, >0 if OK
+     * @deprecated
+     * @see update_note()
+     */
+    function update_note_public($note)
+    {
+        // phpcs:enable
+        return $this->update_note($note,'_public');
+    }
+
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
+    /**
+     *	Update total_ht, total_ttc, total_vat, total_localtax1, total_localtax2 for an object (sum of lines).
+     *  Must be called at end of methods addline or updateline.
+     *
+     *	@param	int		$exclspec          	>0 = Exclude special product (product_type=9)
+     *  @param  string	$roundingadjust    	'none'=Do nothing, 'auto'=Use default method (MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND if defined, or '0'), '0'=Force mode total of rounding, '1'=Force mode rounding of total
+     *  @param	int		$nodatabaseupdate	1=Do not update database. Update only properties of object.
+     *  @param	Societe	$seller				If roundingadjust is '0' or '1' or maybe 'auto', it means we recalculate total for lines before calculating total for object and for this, we need seller object.
+     *	@return	int    			           	<0 if KO, >0 if OK
+     */
+    function update_price($exclspec=0,$roundingadjust='none',$nodatabaseupdate=0,$seller=null)
+    {
+        // phpcs:enable
+        global $conf, $hookmanager, $action;
+
+        // Some external module want no update price after a trigger because they have another method to calculate the total (ex: with an extrafield)
+        $MODULE = "";
+        if ($this->element == 'propal')
+            $MODULE = "MODULE_DISALLOW_UPDATE_PRICE_PROPOSAL";
+        elseif ($this->element == 'order')
+            $MODULE = "MODULE_DISALLOW_UPDATE_PRICE_ORDER";
+        elseif ($this->element == 'facture')
+            $MODULE = "MODULE_DISALLOW_UPDATE_PRICE_INVOICE";
+        elseif ($this->element == 'facture_fourn')
+            $MODULE = "MODULE_DISALLOW_UPDATE_PRICE_SUPPLIER_INVOICE";
+        elseif ($this->element == 'order_supplier')
+            $MODULE = "MODULE_DISALLOW_UPDATE_PRICE_SUPPLIER_ORDER";
+        elseif ($this->element == 'supplier_proposal')
+            $MODULE = "MODULE_DISALLOW_UPDATE_PRICE_SUPPLIER_PROPOSAL";
+
+        if (! empty($MODULE)) {
+            if (! empty($conf->global->$MODULE)) {
+                $modsactivated = explode(',', $conf->global->$MODULE);
+                foreach ($modsactivated as $mod) {
+                    if ($conf->$mod->enabled)
+                        return 1; // update was disabled by specific setup
+                }
+            }
+        }
+
+        include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
+
+        if ($roundingadjust == '-1') $roundingadjust='auto';	// For backward compatibility
+
+        $forcedroundingmode=$roundingadjust;
+        if ($forcedroundingmode == 'auto' && isset($conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND)) $forcedroundingmode=$conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND;
+        elseif ($forcedroundingmode == 'auto') $forcedroundingmode='0';
+
+        $error=0;
+
+        $multicurrency_tx = !empty($this->multicurrency_tx) ? $this->multicurrency_tx : 1;
+
+        // Define constants to find lines to sum
+        $fieldtva='total_tva';
+        $fieldlocaltax1='total_localtax1';
+        $fieldlocaltax2='total_localtax2';
+        $fieldup='subprice';
+        if ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier')
+        {
+            $fieldtva='tva';
+            $fieldup='pu_ht';
+        }
+        if ($this->element == 'expensereport')
+        {
+            $fieldup='value_unit';
+        }
+
+        $sql = 'SELECT rowid, qty, '.$fieldup.' as up, remise_percent, total_ht, '.$fieldtva.' as total_tva, total_ttc, '.$fieldlocaltax1.' as total_localtax1, '.$fieldlocaltax2.' as total_localtax2,';
+        $sql.= ' tva_tx as vatrate, localtax1_tx, localtax2_tx, localtax1_type, localtax2_type, info_bits, product_type';
+            if ($this->table_element_line == 'facturedet') $sql.= ', situation_percent';
+            $sql.= ', multicurrency_total_ht, multicurrency_total_tva, multicurrency_total_ttc';
+        $sql.= ' FROM '.MAIN_DB_PREFIX.$this->table_element_line;
+        $sql.= ' WHERE '.$this->fk_element.' = '.$this->id;
+        if ($exclspec)
+        {
+            $product_field='product_type';
+            if ($this->table_element_line == 'contratdet') $product_field='';    // contratdet table has no product_type field
+            if ($product_field) $sql.= ' AND '.$product_field.' <> 9';
+        }
+        $sql.= ' ORDER by rowid';	// We want to be sure to always use same order of line to not change lines differently when option MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND is used
+
+        dol_syslog(get_class($this)."::update_price", LOG_DEBUG);
+        $resql = $this->db->query($sql);
+        if ($resql)
+        {
+            $this->total_ht  = 0;
+            $this->total_tva = 0;
+            $this->total_localtax1 = 0;
+            $this->total_localtax2 = 0;
+            $this->total_ttc = 0;
+            $total_ht_by_vats  = array();
+            $total_tva_by_vats = array();
+            $total_ttc_by_vats = array();
+            $this->multicurrency_total_ht	= 0;
+            $this->multicurrency_total_tva	= 0;
+            $this->multicurrency_total_ttc	= 0;
+
+            $num = $this->db->num_rows($resql);
+            $i = 0;
+            while ($i < $num)
+            {
+                $obj = $this->db->fetch_object($resql);
+
+                // Note: There is no check on detail line and no check on total, if $forcedroundingmode = 'none'
+                $parameters=array('fk_element' => $obj->rowid);
+                $reshook = $hookmanager->executeHooks('changeRoundingMode', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+
+                if (empty($reshook) && $forcedroundingmode == '0')	// Check if data on line are consistent. This may solve lines that were not consistent because set with $forcedroundingmode='auto'
+                {
+                    $localtax_array=array($obj->localtax1_type,$obj->localtax1_tx,$obj->localtax2_type,$obj->localtax2_tx);
+                    $tmpcal=calcul_price_total($obj->qty, $obj->up, $obj->remise_percent, $obj->vatrate, $obj->localtax1_tx, $obj->localtax2_tx, 0, 'HT', $obj->info_bits, $obj->product_type, $seller, $localtax_array, (isset($obj->situation_percent) ? $obj->situation_percent : 100), $multicurrency_tx);
+                    $diff=price2num($tmpcal[1] - $obj->total_tva, 'MT', 1);
+                    if ($diff)
+                    {
+                        $sqlfix="UPDATE ".MAIN_DB_PREFIX.$this->table_element_line." SET ".$fieldtva." = ".$tmpcal[1].", total_ttc = ".$tmpcal[2]." WHERE rowid = ".$obj->rowid;
+                        dol_syslog('We found unconsistent data into detailed line (difference of '.$diff.') for line rowid = '.$obj->rowid." (total vat of line calculated=".$tmpcal[1].", database=".$obj->total_tva."). We fix the total_vat and total_ttc of line by running sqlfix = ".$sqlfix);
+                                $resqlfix=$this->db->query($sqlfix);
+                                if (! $resqlfix) dol_print_error($this->db,'Failed to update line');
+                                $obj->total_tva = $tmpcal[1];
+                                $obj->total_ttc = $tmpcal[2];
+                        //
+                    }
+                }
+
+                $this->total_ht        += $obj->total_ht;		// The field visible at end of line detail
+                $this->total_tva       += $obj->total_tva;
+                $this->total_localtax1 += $obj->total_localtax1;
+                $this->total_localtax2 += $obj->total_localtax2;
+                $this->total_ttc       += $obj->total_ttc;
+                $this->multicurrency_total_ht        += $obj->multicurrency_total_ht;		// The field visible at end of line detail
+                $this->multicurrency_total_tva       += $obj->multicurrency_total_tva;
+                $this->multicurrency_total_ttc       += $obj->multicurrency_total_ttc;
+
+                if (! isset($total_ht_by_vats[$obj->vatrate]))  $total_ht_by_vats[$obj->vatrate]=0;
+                if (! isset($total_tva_by_vats[$obj->vatrate])) $total_tva_by_vats[$obj->vatrate]=0;
+                if (! isset($total_ttc_by_vats[$obj->vatrate])) $total_ttc_by_vats[$obj->vatrate]=0;
+                $total_ht_by_vats[$obj->vatrate]  += $obj->total_ht;
+                $total_tva_by_vats[$obj->vatrate] += $obj->total_tva;
+                $total_ttc_by_vats[$obj->vatrate] += $obj->total_ttc;
+
+                if ($forcedroundingmode == '1')	// Check if we need adjustement onto line for vat. TODO This works on the company currency but not on multicurrency
+                {
+                    $tmpvat=price2num($total_ht_by_vats[$obj->vatrate] * $obj->vatrate / 100, 'MT', 1);
+                    $diff=price2num($total_tva_by_vats[$obj->vatrate]-$tmpvat, 'MT', 1);
+                    //print 'Line '.$i.' rowid='.$obj->rowid.' vat_rate='.$obj->vatrate.' total_ht='.$obj->total_ht.' total_tva='.$obj->total_tva.' total_ttc='.$obj->total_ttc.' total_ht_by_vats='.$total_ht_by_vats[$obj->vatrate].' total_tva_by_vats='.$total_tva_by_vats[$obj->vatrate].' (new calculation = '.$tmpvat.') total_ttc_by_vats='.$total_ttc_by_vats[$obj->vatrate].($diff?" => DIFF":"")."<br>\n";
+                    if ($diff)
+                    {
+                        if (abs($diff) > 0.1) { dol_syslog('A rounding difference was detected into TOTAL but is too high to be corrected', LOG_WARNING); exit; }
+                        $sqlfix="UPDATE ".MAIN_DB_PREFIX.$this->table_element_line." SET ".$fieldtva." = ".($obj->total_tva - $diff).", total_ttc = ".($obj->total_ttc - $diff)." WHERE rowid = ".$obj->rowid;
+                        dol_syslog('We found a difference of '.$diff.' for line rowid = '.$obj->rowid.". We fix the total_vat and total_ttc of line by running sqlfix = ".$sqlfix);
+                                $resqlfix=$this->db->query($sqlfix);
+                                if (! $resqlfix) dol_print_error($this->db,'Failed to update line');
+                                $this->total_tva -= $diff;
+                                $this->total_ttc -= $diff;
+                                $total_tva_by_vats[$obj->vatrate] -= $diff;
+                                $total_ttc_by_vats[$obj->vatrate] -= $diff;
+                    }
+                }
+
+                $i++;
+            }
+
+            // Add revenue stamp to total
+            $this->total_ttc       			+= isset($this->revenuestamp)?$this->revenuestamp:0;
+            $this->multicurrency_total_ttc  += isset($this->revenuestamp)?($this->revenuestamp * $multicurrency_tx):0;
+
+            // Situations totals
+            if ($this->situation_cycle_ref && $this->situation_counter > 1 && method_exists($this, 'get_prev_sits') && $this->type != $this::TYPE_CREDIT_NOTE )
+            {
+                $prev_sits = $this->get_prev_sits();
+
+                foreach ($prev_sits as $sit) {				// $sit is an object Facture loaded with a fetch.
+                    $this->total_ht -= $sit->total_ht;
+                    $this->total_tva -= $sit->total_tva;
+                    $this->total_localtax1 -= $sit->total_localtax1;
+                    $this->total_localtax2 -= $sit->total_localtax2;
+                    $this->total_ttc -= $sit->total_ttc;
+                    $this->multicurrency_total_ht -= $sit->multicurrency_total_ht;
+                    $this->multicurrency_total_tva -= $sit->multicurrency_total_tva;
+                    $this->multicurrency_total_ttc -= $sit->multicurrency_total_ttc;
+                }
+            }
+
+            $this->db->free($resql);
+
+            // Now update global field total_ht, total_ttc and tva
+            $fieldht='total_ht';
+            $fieldtva='tva';
+            $fieldlocaltax1='localtax1';
+            $fieldlocaltax2='localtax2';
+            $fieldttc='total_ttc';
+            // Specific code for backward compatibility with old field names
+            if ($this->element == 'facture' || $this->element == 'facturerec')             $fieldht='total';
+            if ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier') $fieldtva='total_tva';
+            if ($this->element == 'propal')                                                $fieldttc='total';
+            if ($this->element == 'expensereport')                                         $fieldtva='total_tva';
+            if ($this->element == 'supplier_proposal')                                     $fieldttc='total';
+
+            if (empty($nodatabaseupdate))
+            {
+                $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element.' SET';
+                $sql .= " ".$fieldht."='".price2num($this->total_ht)."',";
+                $sql .= " ".$fieldtva."='".price2num($this->total_tva)."',";
+                $sql .= " ".$fieldlocaltax1."='".price2num($this->total_localtax1)."',";
+                $sql .= " ".$fieldlocaltax2."='".price2num($this->total_localtax2)."',";
+                $sql .= " ".$fieldttc."='".price2num($this->total_ttc)."'";
+                        $sql .= ", multicurrency_total_ht='".price2num($this->multicurrency_total_ht, 'MT', 1)."'";
+                        $sql .= ", multicurrency_total_tva='".price2num($this->multicurrency_total_tva, 'MT', 1)."'";
+                        $sql .= ", multicurrency_total_ttc='".price2num($this->multicurrency_total_ttc, 'MT', 1)."'";
+                $sql .= ' WHERE rowid = '.$this->id;
+
+
+                dol_syslog(get_class($this)."::update_price", LOG_DEBUG);
+                $resql=$this->db->query($sql);
+                if (! $resql)
+                {
+                    $error++;
+                    $this->error=$this->db->lasterror();
+                    $this->errors[]=$this->db->lasterror();
+                }
+            }
+
+            if (! $error)
+            {
+                return 1;
+            }
+            else
+            {
+                return -1;
+            }
+        }
+        else
+        {
+            dol_print_error($this->db,'Bad request in update_price');
+            return -1;
+        }
+    }
+
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
+    /**
+     *	Add objects linked in llx_element_element.
+     *
+     *	@param		string	$origin		Linked element type
+     *	@param		int		$origin_id	Linked element id
+     *	@return		int					<=0 if KO, >0 if OK
+     *	@see		fetchObjectLinked, updateObjectLinked, deleteObjectLinked
+     */
+    function add_object_linked($origin=null, $origin_id=null)
+    {
+        // phpcs:enable
+        $origin = (! empty($origin) ? $origin : $this->origin);
+        $origin_id = (! empty($origin_id) ? $origin_id : $this->origin_id);
+
+        // Special case
+        if ($origin == 'order') $origin='commande';
+        if ($origin == 'invoice') $origin='facture';
+        if ($origin == 'invoice_template') $origin='facturerec';
+        if ($origin == 'supplierorder') $origin='order_supplier';
+        $this->db->begin();
+
+        $sql = "INSERT INTO ".MAIN_DB_PREFIX."element_element (";
+        $sql.= "fk_source";
+        $sql.= ", sourcetype";
+        $sql.= ", fk_target";
+        $sql.= ", targettype";
+        $sql.= ") VALUES (";
+        $sql.= $origin_id;
+        $sql.= ", '".$this->db->escape($origin)."'";
+        $sql.= ", ".$this->id;
+        $sql.= ", '".$this->db->escape($this->element)."'";
+        $sql.= ")";
+
+        dol_syslog(get_class($this)."::add_object_linked", LOG_DEBUG);
+        if ($this->db->query($sql))
+            {
+                $this->db->commit();
+                return 1;
+            }
+            else
+            {
+                $this->error=$this->db->lasterror();
+                $this->db->rollback();
+                return 0;
+            }
+    }
+
+    /**
+     *	Fetch array of objects linked to current object (object of enabled modules only). Links are loaded into
+     *		this->linkedObjectsIds array and
+     *		this->linkedObjects array if $loadalsoobjects = 1
+     *  Possible usage for parameters:
+     *  - all parameters empty -> we look all link to current object (current object can be source or target)
+     *  - source id+type -> will get target list linked to source
+     *  - target id+type -> will get source list linked to target
+     *  - source id+type + target type -> will get target list of the type
+     *  - target id+type + target source -> will get source list of the type
+     *
+     *	@param	int		$sourceid			Object source id (if not defined, id of object)
+     *	@param  string	$sourcetype			Object source type (if not defined, element name of object)
+     *	@param  int		$targetid			Object target id (if not defined, id of object)
+     *	@param  string	$targettype			Object target type (if not defined, elemennt name of object)
+     *	@param  string	$clause				'OR' or 'AND' clause used when both source id and target id are provided
+     *  @param  int		$alsosametype		0=Return only links to object that differs from source type. 1=Include also link to objects of same type.
+     *  @param  string	$orderby			SQL 'ORDER BY' clause
+     *  @param	int		$loadalsoobjects	Load also array this->linkedObjects (Use 0 to increase performances)
+     *	@return int							<0 if KO, >0 if OK
+     *  @see	add_object_linked, updateObjectLinked, deleteObjectLinked
+     */
+    function fetchObjectLinked($sourceid=null,$sourcetype='',$targetid=null,$targettype='',$clause='OR',$alsosametype=1,$orderby='sourcetype',$loadalsoobjects=1)
+    {
+        global $conf;
+
+        $this->linkedObjectsIds=array();
+        $this->linkedObjects=array();
+
+        $justsource=false;
+        $justtarget=false;
+        $withtargettype=false;
+        $withsourcetype=false;
+
+        if (! empty($sourceid) && ! empty($sourcetype) && empty($targetid))
+        {
+            $justsource=true;  // the source (id and type) is a search criteria
+            if (! empty($targettype)) $withtargettype=true;
+        }
+        if (! empty($targetid) && ! empty($targettype) && empty($sourceid))
+        {
+            $justtarget=true;  // the target (id and type) is a search criteria
+            if (! empty($sourcetype)) $withsourcetype=true;
+        }
+
+        $sourceid = (! empty($sourceid) ? $sourceid : $this->id);
+        $targetid = (! empty($targetid) ? $targetid : $this->id);
+        $sourcetype = (! empty($sourcetype) ? $sourcetype : $this->element);
+        $targettype = (! empty($targettype) ? $targettype : $this->element);
+
+        /*if (empty($sourceid) && empty($targetid))
+		 {
+		 dol_syslog('Bad usage of function. No source nor target id defined (nor as parameter nor as object id)', LOG_ERR);
+		 return -1;
+		 }*/
+
+        // Links between objects are stored in table element_element
+        $sql = 'SELECT rowid, fk_source, sourcetype, fk_target, targettype';
+        $sql.= ' FROM '.MAIN_DB_PREFIX.'element_element';
+        $sql.= " WHERE ";
+        if ($justsource || $justtarget)
+        {
+            if ($justsource)
+            {
+                $sql.= "fk_source = ".$sourceid." AND sourcetype = '".$sourcetype."'";
+                if ($withtargettype) $sql.= " AND targettype = '".$targettype."'";
+            }
+            else if ($justtarget)
+            {
+                $sql.= "fk_target = ".$targetid." AND targettype = '".$targettype."'";
+                if ($withsourcetype) $sql.= " AND sourcetype = '".$sourcetype."'";
+            }
+        }
+        else
+        {
+            $sql.= "(fk_source = ".$sourceid." AND sourcetype = '".$sourcetype."')";
+            $sql.= " ".$clause." (fk_target = ".$targetid." AND targettype = '".$targettype."')";
+        }
+        $sql .= ' ORDER BY '.$orderby;
+
+        dol_syslog(get_class($this)."::fetchObjectLink", LOG_DEBUG);
+        $resql = $this->db->query($sql);
+        if ($resql)
+        {
+            $num = $this->db->num_rows($resql);
+            $i = 0;
+            while ($i < $num)
+            {
+                $obj = $this->db->fetch_object($resql);
+                if ($justsource || $justtarget)
+                {
+                    if ($justsource)
+                    {
+                        $this->linkedObjectsIds[$obj->targettype][$obj->rowid]=$obj->fk_target;
+                    }
+                    else if ($justtarget)
+                    {
+                        $this->linkedObjectsIds[$obj->sourcetype][$obj->rowid]=$obj->fk_source;
+                    }
+                }
+                else
+                {
+                    if ($obj->fk_source == $sourceid && $obj->sourcetype == $sourcetype)
+                    {
+                        $this->linkedObjectsIds[$obj->targettype][$obj->rowid]=$obj->fk_target;
+                    }
+                    if ($obj->fk_target == $targetid && $obj->targettype == $targettype)
+                    {
+                        $this->linkedObjectsIds[$obj->sourcetype][$obj->rowid]=$obj->fk_source;
+                    }
+                }
+                $i++;
+            }
+
+            if (! empty($this->linkedObjectsIds))
+            {
+                $tmparray = $this->linkedObjectsIds;
+                foreach($tmparray as $objecttype => $objectids)       // $objecttype is a module name ('facture', 'mymodule', ...) or a module name with a suffix ('project_task', 'mymodule_myobj', ...)
+                {
+                    // Parse element/subelement (ex: project_task, cabinetmed_consultation, ...)
+                    $module = $element = $subelement = $objecttype;
+                    if ($objecttype != 'supplier_proposal' && $objecttype != 'order_supplier' && $objecttype != 'invoice_supplier'
+                        && preg_match('/^([^_]+)_([^_]+)/i',$objecttype,$regs))
+                    {
+                        $module = $element = $regs[1];
+                        $subelement = $regs[2];
+                    }
+
+                    $classpath = $element.'/class';
+                    // To work with non standard classpath or module name
+                    if ($objecttype == 'facture')			{
+                        $classpath = 'compta/facture/class';
+                    }
+                    else if ($objecttype == 'facturerec')			{
+                        $classpath = 'compta/facture/class'; $module = 'facture';
+                    }
+                    else if ($objecttype == 'propal')			{
+                        $classpath = 'comm/propal/class';
+                    }
+                    else if ($objecttype == 'supplier_proposal')			{
+                        $classpath = 'supplier_proposal/class';
+                    }
+                    else if ($objecttype == 'shipping')			{
+                        $classpath = 'expedition/class'; $subelement = 'expedition'; $module = 'expedition_bon';
+                    }
+                    else if ($objecttype == 'delivery')			{
+                        $classpath = 'livraison/class'; $subelement = 'livraison'; $module = 'livraison_bon';
+                    }
+                    else if ($objecttype == 'invoice_supplier' || $objecttype == 'order_supplier')	{
+                        $classpath = 'fourn/class'; $module = 'fournisseur';
+                    }
+                    else if ($objecttype == 'fichinter')			{
+                        $classpath = 'fichinter/class'; $subelement = 'fichinter'; $module = 'ficheinter';
+                    }
+                    else if ($objecttype == 'subscription')			{
+                        $classpath = 'adherents/class'; $module = 'adherent';
+                    }
+
+                    // Set classfile
+                    $classfile = strtolower($subelement); $classname = ucfirst($subelement);
+
+                    if ($objecttype == 'order') {
+                        $classfile = 'commande'; $classname = 'Commande';
+                    }
+                    else if ($objecttype == 'invoice_supplier') {
+                        $classfile = 'fournisseur.facture'; $classname = 'FactureFournisseur';
+                    }
+                    else if ($objecttype == 'order_supplier')   {
+                        $classfile = 'fournisseur.commande'; $classname = 'CommandeFournisseur';
+                    }
+                    else if ($objecttype == 'supplier_proposal')   {
+                        $classfile = 'supplier_proposal'; $classname = 'SupplierProposal';
+                    }
+                    else if ($objecttype == 'facturerec')   {
+                        $classfile = 'facture-rec'; $classname = 'FactureRec';
+                    }
+                    else if ($objecttype == 'subscription')   {
+                        $classfile = 'subscription'; $classname = 'Subscription';
+                    }
+
+                    // Here $module, $classfile and $classname are set
+                    if ($conf->$module->enabled && (($element != $this->element) || $alsosametype))
+                    {
+                        if ($loadalsoobjects)
+                        {
+                            dol_include_once('/'.$classpath.'/'.$classfile.'.class.php');
+                            //print '/'.$classpath.'/'.$classfile.'.class.php '.class_exists($classname);
+                            if (class_exists($classname))
+                            {
+                                foreach($objectids as $i => $objectid)	// $i is rowid into llx_element_element
+                                {
+                                    $object = new $classname($this->db);
+                                    $ret = $object->fetch($objectid);
+                                    if ($ret >= 0)
+                                    {
+                                        $this->linkedObjects[$objecttype][$i] = $object;
+                                    }
+                                }
+                            }
+                        }
+                    }
+                    else
+                    {
+                        unset($this->linkedObjectsIds[$objecttype]);
+                    }
+                }
+            }
+            return 1;
+        }
+        else
+        {
+            dol_print_error($this->db);
+            return -1;
+        }
+    }
+
+    /**
+     *	Update object linked of a current object
+     *
+     *	@param	int		$sourceid		Object source id
+     *	@param  string	$sourcetype		Object source type
+     *	@param  int		$targetid		Object target id
+     *	@param  string	$targettype		Object target type
+     *	@return							int	>0 if OK, <0 if KO
+     *	@see	add_object_linked, fetObjectLinked, deleteObjectLinked
+     */
+    function updateObjectLinked($sourceid=null, $sourcetype='', $targetid=null, $targettype='')
+    {
+        $updatesource=false;
+        $updatetarget=false;
+
+        if (! empty($sourceid) && ! empty($sourcetype) && empty($targetid) && empty($targettype)) $updatesource=true;
+        else if (empty($sourceid) && empty($sourcetype) && ! empty($targetid) && ! empty($targettype)) $updatetarget=true;
+
+        $sql = "UPDATE ".MAIN_DB_PREFIX."element_element SET ";
+        if ($updatesource)
+        {
+            $sql.= "fk_source = ".$sourceid;
+            $sql.= ", sourcetype = '".$this->db->escape($sourcetype)."'";
+            $sql.= " WHERE fk_target = ".$this->id;
+            $sql.= " AND targettype = '".$this->db->escape($this->element)."'";
+        }
+        else if ($updatetarget)
+        {
+            $sql.= "fk_target = ".$targetid;
+            $sql.= ", targettype = '".$this->db->escape($targettype)."'";
+            $sql.= " WHERE fk_source = ".$this->id;
+            $sql.= " AND sourcetype = '".$this->db->escape($this->element)."'";
+        }
+
+        dol_syslog(get_class($this)."::updateObjectLinked", LOG_DEBUG);
+        if ($this->db->query($sql))
+        {
+            return 1;
+        }
+        else
+        {
+            $this->error=$this->db->lasterror();
+            return -1;
+        }
+    }
+
+    /**
+     *	Delete all links between an object $this
+     *
+     *	@param	int		$sourceid		Object source id
+     *	@param  string	$sourcetype		Object source type
+     *	@param  int		$targetid		Object target id
+     *	@param  string	$targettype		Object target type
+     *  @param	int		$rowid			Row id of line to delete. If defined, other parameters are not used.
+     *	@return     					int	>0 if OK, <0 if KO
+     *	@see	add_object_linked, updateObjectLinked, fetchObjectLinked
+     */
+    function deleteObjectLinked($sourceid=null, $sourcetype='', $targetid=null, $targettype='', $rowid='')
+    {
+        $deletesource=false;
+        $deletetarget=false;
+
+        if (! empty($sourceid) && ! empty($sourcetype) && empty($targetid) && empty($targettype)) $deletesource=true;
+        else if (empty($sourceid) && empty($sourcetype) && ! empty($targetid) && ! empty($targettype)) $deletetarget=true;
+
+        $sourceid = (! empty($sourceid) ? $sourceid : $this->id);
+        $sourcetype = (! empty($sourcetype) ? $sourcetype : $this->element);
+        $targetid = (! empty($targetid) ? $targetid : $this->id);
+        $targettype = (! empty($targettype) ? $targettype : $this->element);
+
+        $sql = "DELETE FROM ".MAIN_DB_PREFIX."element_element";
+        $sql.= " WHERE";
+        if ($rowid > 0)
+        {
+            $sql.=" rowid = ".$rowid;
+        }
+        else
+        {
+            if ($deletesource)
+            {
+                $sql.= " fk_source = ".$sourceid." AND sourcetype = '".$this->db->escape($sourcetype)."'";
+                $sql.= " AND fk_target = ".$this->id." AND targettype = '".$this->db->escape($this->element)."'";
+            }
+            else if ($deletetarget)
+            {
+                $sql.= " fk_target = ".$targetid." AND targettype = '".$this->db->escape($targettype)."'";
+                $sql.= " AND fk_source = ".$this->id." AND sourcetype = '".$this->db->escape($this->element)."'";
+            }
+            else
+            {
+                $sql.= " (fk_source = ".$this->id." AND sourcetype = '".$this->db->escape($this->element)."')";
+                $sql.= " OR";
+                $sql.= " (fk_target = ".$this->id." AND targettype = '".$this->db->escape($this->element)."')";
+            }
+        }
+
+        dol_syslog(get_class($this)."::deleteObjectLinked", LOG_DEBUG);
+        if ($this->db->query($sql))
+        {
+            return 1;
+        }
+        else
+        {
+            $this->error=$this->db->lasterror();
+            $this->errors[]=$this->error;
+            return -1;
+        }
+    }
+
+    /**
+     *      Set status of an object
+     *
+     *      @param	int		$status			Status to set
+     *      @param	int		$elementId		Id of element to force (use this->id by default)
+     *      @param	string	$elementType	Type of element to force (use this->table_element by default)
+     *      @param	string	$trigkey		Trigger key to use for trigger
+     *      @return int						<0 if KO, >0 if OK
+     */
+    function setStatut($status, $elementId=null, $elementType='', $trigkey='')
+    {
+        global $user,$langs,$conf;
+
+        $savElementId=$elementId;  // To be used later to know if we were using the method using the id of this or not.
+
+        $elementId = (!empty($elementId)?$elementId:$this->id);
+        $elementTable = (!empty($elementType)?$elementType:$this->table_element);
+
+        $this->db->begin();
+
+        $fieldstatus="fk_statut";
+        if ($elementTable == 'facture_rec') $fieldstatus="suspended";
+        if ($elementTable == 'mailing') $fieldstatus="statut";
+        if ($elementTable == 'cronjob') $fieldstatus="status";
+        if ($elementTable == 'user') $fieldstatus="statut";
+        if ($elementTable == 'expensereport') $fieldstatus="fk_statut";
+        if ($elementTable == 'commande_fournisseur_dispatch') $fieldstatus="status";
+
+        $sql = "UPDATE ".MAIN_DB_PREFIX.$elementTable;
+        $sql.= " SET ".$fieldstatus." = ".$status;
+        // If status = 1 = validated, update also fk_user_valid
+        if ($status == 1 && $elementTable == 'expensereport') $sql.=", fk_user_valid = ".$user->id;
+        $sql.= " WHERE rowid=".$elementId;
+
+        dol_syslog(get_class($this)."::setStatut", LOG_DEBUG);
+        if ($this->db->query($sql))
+        {
+            $error = 0;
+
+            // Try autoset of trigkey
+            if (empty($trigkey))
+            {
+                if ($this->element == 'supplier_proposal' && $status == 2) $trigkey='SUPPLIER_PROPOSAL_SIGN';   // 2 = SupplierProposal::STATUS_SIGNED. Can't use constant into this generic class
+                if ($this->element == 'supplier_proposal' && $status == 3) $trigkey='SUPPLIER_PROPOSAL_REFUSE'; // 3 = SupplierProposal::STATUS_REFUSED. Can't use constant into this generic class
+                if ($this->element == 'supplier_proposal' && $status == 4) $trigkey='SUPPLIER_PROPOSAL_CLOSE';  // 4 = SupplierProposal::STATUS_CLOSED. Can't use constant into this generic class
+                if ($this->element == 'fichinter' && $status == 3) $trigkey='FICHINTER_CLASSIFY_DONE';
+                if ($this->element == 'fichinter' && $status == 2) $trigkey='FICHINTER_CLASSIFY_BILLED';
+                if ($this->element == 'fichinter' && $status == 1) $trigkey='FICHINTER_CLASSIFY_UNBILLED';
+            }
+
+            if ($trigkey)
+            {
+                // Appel des triggers
+                include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+                $interface=new Interfaces($this->db);
+                $result=$interface->run_triggers($trigkey,$this,$user,$langs,$conf);
+                if ($result < 0) {
+                    $error++; $this->errors=$interface->errors;
+                }
+                // Fin appel triggers
+            }
+
+            if (! $error)
+            {
+                $this->db->commit();
+
+                if (empty($savElementId))    // If the element we update was $this (so $elementId is null)
+                {
+                    $this->statut = $status;
+                    $this->status = $status;
+                }
+
+                return 1;
+            }
+            else
+            {
+                $this->db->rollback();
+                dol_syslog(get_class($this)."::setStatus ".$this->error,LOG_ERR);
+                return -1;
+            }
+        }
+        else
+        {
+            $this->error=$this->db->lasterror();
+            $this->db->rollback();
+            return -1;
+        }
+    }
+
+
+    /**
+     *  Load type of canvas of an object if it exists
+     *
+     *  @param      int		$id     Record id
+     *  @param      string	$ref    Record ref
+     *  @return		int				<0 if KO, 0 if nothing done, >0 if OK
+     */
+    function getCanvas($id=0,$ref='')
+    {
+        global $conf;
+
+        if (empty($id) && empty($ref)) return 0;
+        if (! empty($conf->global->MAIN_DISABLE_CANVAS)) return 0;    // To increase speed. Not enabled by default.
+
+        // Clean parameters
+        $ref = trim($ref);
+
+        $sql = "SELECT rowid, canvas";
+        $sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element;
+        $sql.= " WHERE entity IN (".getEntity($this->element).")";
+        if (! empty($id))  $sql.= " AND rowid = ".$id;
+        if (! empty($ref)) $sql.= " AND ref = '".$this->db->escape($ref)."'";
+
+        $resql = $this->db->query($sql);
+        if ($resql)
+        {
+            $obj = $this->db->fetch_object($resql);
+            if ($obj)
+            {
+                $this->canvas   = $obj->canvas;
+                return 1;
+            }
+            else return 0;
+        }
+        else
+        {
+            dol_print_error($this->db);
+            return -1;
+        }
+    }
+
+
+    /**
+     * 	Get special code of a line
+     *
+     * 	@param	int		$lineid		Id of line
+     * 	@return	int					Special code
+     */
+    function getSpecialCode($lineid)
+    {
+        $sql = 'SELECT special_code FROM '.MAIN_DB_PREFIX.$this->table_element_line;
+        $sql.= ' WHERE rowid = '.$lineid;
+        $resql = $this->db->query($sql);
+        if ($resql)
+        {
+            $row = $this->db->fetch_row($resql);
+            return $row[0];
+        }
+    }
+
+    /**
+     *  Function to check if an object is used by others.
+     *  Check is done into this->childtables. There is no check into llx_element_element.
+     *
+     *  @param	int		$id			Force id of object
+     *  @return	int					<0 if KO, 0 if not used, >0 if already used
+     */
+    function isObjectUsed($id=0)
+    {
+        global $langs;
+
+        if (empty($id)) $id=$this->id;
+
+        // Check parameters
+        if (! isset($this->childtables) || ! is_array($this->childtables) || count($this->childtables) == 0)
+        {
+            dol_print_error('Called isObjectUsed on a class with property this->childtables not defined');
+            return -1;
+        }
+
+        $arraytoscan = $this->childtables;
+        // For backward compatibility, we check if array is old format array('table1', 'table2', ...)
+        $tmparray=array_keys($this->childtables);
+        if (is_numeric($tmparray[0]))
+        {
+            $arraytoscan = array_flip($this->childtables);
+        }
+
+        // Test if child exists
+        $haschild=0;
+        foreach($arraytoscan as $table => $elementname)
+        {
+            //print $id.'-'.$table.'-'.$elementname.'<br>';
+            // Check if third party can be deleted
+            $sql = "SELECT COUNT(*) as nb from ".MAIN_DB_PREFIX.$table;
+            $sql.= " WHERE ".$this->fk_element." = ".$id;
+            $resql=$this->db->query($sql);
+            if ($resql)
+            {
+                $obj=$this->db->fetch_object($resql);
+                if ($obj->nb > 0)
+                {
+                    $langs->load("errors");
+                    //print 'Found into table '.$table.', type '.$langs->transnoentitiesnoconv($elementname).', haschild='.$haschild;
+                    $haschild += $obj->nb;
+                    if (is_numeric($elementname))	// old usage
+                    {
+                        $this->errors[]=$langs->trans("ErrorRecordHasAtLeastOneChildOfType", $table);
+                    }
+                    else	// new usage: $elementname=Translation key
+                    {
+                        $this->errors[]=$langs->trans("ErrorRecordHasAtLeastOneChildOfType", $langs->transnoentitiesnoconv($elementname));
+                    }
+                    break;    // We found at least one, we stop here
+                }
+            }
+            else
+            {
+                $this->errors[]=$this->db->lasterror();
+                return -1;
+            }
+        }
+        if ($haschild > 0)
+        {
+            $this->errors[]="ErrorRecordHasChildren";
+            return $haschild;
+        }
+        else return 0;
+    }
+
+    /**
+     *  Function to say how many lines object contains
+     *
+     *	@param	int		$predefined		-1=All, 0=Count free product/service only, 1=Count predefined product/service only, 2=Count predefined product, 3=Count predefined service
+     *  @return	int						<0 if KO, 0 if no predefined products, nb of lines with predefined products if found
+     */
+    function hasProductsOrServices($predefined=-1)
+    {
+        $nb=0;
+
+        foreach($this->lines as $key => $val)
+        {
+            $qualified=0;
+            if ($predefined == -1) $qualified=1;
+            if ($predefined == 1 && $val->fk_product > 0) $qualified=1;
+            if ($predefined == 0 && $val->fk_product <= 0) $qualified=1;
+            if ($predefined == 2 && $val->fk_product > 0 && $val->product_type==0) $qualified=1;
+            if ($predefined == 3 && $val->fk_product > 0 && $val->product_type==1) $qualified=1;
+            if ($qualified) $nb++;
+        }
+        dol_syslog(get_class($this).'::hasProductsOrServices we found '.$nb.' qualified lines of products/servcies');
+        return $nb;
+    }
+
+    /**
+     * Function that returns the total amount HT of discounts applied for all lines.
+     *
+     * @return 	float
+     */
+    function getTotalDiscount()
+    {
+        $total_discount=0.00;
+
+        $sql = "SELECT subprice as pu_ht, qty, remise_percent, total_ht";
+        $sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element."det";
+        $sql.= " WHERE ".$this->fk_element." = ".$this->id;
+
+        dol_syslog(get_class($this).'::getTotalDiscount', LOG_DEBUG);
+        $resql = $this->db->query($sql);
+        if ($resql)
+        {
+            $num=$this->db->num_rows($resql);
+            $i=0;
+            while ($i < $num)
+            {
+                $obj = $this->db->fetch_object($resql);
+
+                $pu_ht = $obj->pu_ht;
+                $qty= $obj->qty;
+                $total_ht = $obj->total_ht;
+
+                $total_discount_line = floatval(price2num(($pu_ht * $qty) - $total_ht, 'MT'));
+                $total_discount += $total_discount_line;
+
+                $i++;
+            }
+        }
+
+        //print $total_discount; exit;
+        return price2num($total_discount);
+    }
+
+
+    /**
+     * Return into unit=0, the calculated total of weight and volume of all lines * qty
+     * Calculate by adding weight and volume of each product line, so properties ->volume/volume_units/weight/weight_units must be loaded on line.
+     *
+     * @return  array                           array('weight'=>...,'volume'=>...)
+     */
+    function getTotalWeightVolume()
+    {
+        $totalWeight = 0;
+        $totalVolume = 0;
+        // defined for shipment only
+        $totalOrdered = '';
+        // defined for shipment only
+        $totalToShip = '';
+
+        foreach ($this->lines as $line)
+        {
+            if (isset($line->qty_asked))
+            {
+                if (empty($totalOrdered)) $totalOrdered=0;  // Avoid warning because $totalOrdered is ''
+                $totalOrdered+=$line->qty_asked;    // defined for shipment only
+            }
+            if (isset($line->qty_shipped))
+            {
+                if (empty($totalToShip)) $totalToShip=0;    // Avoid warning because $totalToShip is ''
+                $totalToShip+=$line->qty_shipped;   // defined for shipment only
+            }else if ($line->element == 'commandefournisseurdispatch' && isset($line->qty))
+            {
+                if (empty($totalToShip)) $totalToShip=0;
+                $totalToShip+=$line->qty;   // defined for reception only
+            }
+
+            // Define qty, weight, volume, weight_units, volume_units
+            if ($this->element == 'shipping') {
+                // for shipments
+                $qty = $line->qty_shipped ? $line->qty_shipped : 0;
+            }
+            else {
+                $qty = $line->qty ? $line->qty : 0;
+            }
+
+            $weight = $line->weight ? $line->weight : 0;
+            ($weight==0 && !empty($line->product->weight))? $weight=$line->product->weight: 0;
+            $volume = $line->volume ? $line->volume : 0;
+            ($volume==0 && !empty($line->product->volume))? $volume=$line->product->volume: 0;
+
+            $weight_units=$line->weight_units;
+            ($weight_units==0 && !empty($line->product->weight_units))? $weight_units=$line->product->weight_units: 0;
+            $volume_units=$line->volume_units;
+            ($volume_units==0 && !empty($line->product->volume_units))? $volume_units=$line->product->volume_units: 0;
+
+            $weightUnit=0;
+            $volumeUnit=0;
+            if (! empty($weight_units)) $weightUnit = $weight_units;
+            if (! empty($volume_units)) $volumeUnit = $volume_units;
+
+            if (empty($totalWeight)) $totalWeight=0;  // Avoid warning because $totalWeight is ''
+            if (empty($totalVolume)) $totalVolume=0;  // Avoid warning because $totalVolume is ''
+
+            //var_dump($line->volume_units);
+            if ($weight_units < 50)   // >50 means a standard unit (power of 10 of official unit), > 50 means an exotic unit (like inch)
+            {
+                $trueWeightUnit=pow(10, $weightUnit);
+                $totalWeight += $weight * $qty * $trueWeightUnit;
+            }
+            else {
+        if ($weight_units == 99) {
+            // conversion 1 Pound = 0.45359237 KG
+            $trueWeightUnit = 0.45359237;
+            $totalWeight += $weight * $qty * $trueWeightUnit;
+        } elseif ($weight_units == 98) {
+            // conversion 1 Ounce = 0.0283495 KG
+            $trueWeightUnit = 0.0283495;
+            $totalWeight += $weight * $qty * $trueWeightUnit;
+        }
+        else
+                    $totalWeight += $weight * $qty;   // This may be wrong if we mix different units
+            }
+            if ($volume_units < 50)   // >50 means a standard unit (power of 10 of official unit), > 50 means an exotic unit (like inch)
+            {
+                //print $line->volume."x".$line->volume_units."x".($line->volume_units < 50)."x".$volumeUnit;
+                $trueVolumeUnit=pow(10, $volumeUnit);
+                //print $line->volume;
+                $totalVolume += $volume * $qty * $trueVolumeUnit;
+            }
+            else
+            {
+                $totalVolume += $volume * $qty;   // This may be wrong if we mix different units
+            }
+        }
+
+        return array('weight'=>$totalWeight, 'volume'=>$totalVolume, 'ordered'=>$totalOrdered, 'toship'=>$totalToShip);
+    }
+
+
+    /**
+     *	Set extra parameters
+     *
+     *	@return	int      <0 if KO, >0 if OK
+     */
+    function setExtraParameters()
+    {
+        $this->db->begin();
+
+        $extraparams = (! empty($this->extraparams) ? json_encode($this->extraparams) : null);
+
+        $sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
+        $sql.= " SET extraparams = ".(! empty($extraparams) ? "'".$this->db->escape($extraparams)."'" : "null");
+        $sql.= " WHERE rowid = ".$this->id;
+
+        dol_syslog(get_class($this)."::setExtraParameters", LOG_DEBUG);
+        $resql = $this->db->query($sql);
+        if (! $resql)
+        {
+            $this->error=$this->db->lasterror();
+            $this->db->rollback();
+            return -1;
+        }
+        else
+        {
+            $this->db->commit();
+            return 1;
+        }
+    }
+
+
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
+    /**
+     *    Return incoterms informations
+     *    TODO Use a cache for label get
+     *
+     *    @return	string	incoterms info
+     */
+    function display_incoterms()
+    {
+        // phpcs:enable
+        $out = '';
+        $this->libelle_incoterms = '';
+        if (!empty($this->fk_incoterms))
+        {
+            $sql = 'SELECT code FROM '.MAIN_DB_PREFIX.'c_incoterms WHERE rowid = '.(int) $this->fk_incoterms;
+            $result = $this->db->query($sql);
+            if ($result)
+            {
+                $res = $this->db->fetch_object($result);
+                $out .= $res->code;
+            }
+        }
+
+        $out .= (($res->code && $this->location_incoterms)?' - ':'').$this->location_incoterms;
+
+        return $out;
+    }
+
+    /**
+     *    Return incoterms informations for pdf display
+     *
+     *    @return	string		incoterms info
+     */
+    function getIncotermsForPDF()
+    {
+        $sql = 'SELECT code FROM '.MAIN_DB_PREFIX.'c_incoterms WHERE rowid = '.(int) $this->fk_incoterms;
+        $resql = $this->db->query($sql);
+        if ($resql)
+        {
+            $num = $this->db->num_rows($resql);
+            if ($num > 0)
+            {
+                $res = $this->db->fetch_object($resql);
+                return 'Incoterm : '.$res->code.' - '.$this->location_incoterms;
+            }
+            else
+            {
+                return '';
+            }
+        }
+        else
+        {
+            $this->errors[] = $this->db->lasterror();
+            return false;
+        }
+    }
+
+    /**
+     *    Define incoterms values of current object
+     *
+     *    @param	int		$id_incoterm     Id of incoterm to set or '' to remove
+     * 	  @param 	string  $location		 location of incoterm
+     *    @return	int     		<0 if KO, >0 if OK
+     */
+    function setIncoterms($id_incoterm, $location)
+    {
+        if ($this->id && $this->table_element)
+        {
+            $sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
+            $sql.= " SET fk_incoterms = ".($id_incoterm > 0 ? $id_incoterm : "null");
+            $sql.= ", location_incoterms = ".($id_incoterm > 0 ? "'".$this->db->escape($location)."'" : "null");
+            $sql.= " WHERE rowid = " . $this->id;
+            dol_syslog(get_class($this).'::setIncoterms', LOG_DEBUG);
+            $resql=$this->db->query($sql);
+            if ($resql)
+            {
+                $this->fk_incoterms = $id_incoterm;
+                $this->location_incoterms = $location;
+
+                $sql = 'SELECT libelle FROM '.MAIN_DB_PREFIX.'c_incoterms WHERE rowid = '.(int) $this->fk_incoterms;
+                $res = $this->db->query($sql);
+                if ($res)
+                {
+                    $obj = $this->db->fetch_object($res);
+                    $this->libelle_incoterms = $obj->libelle;
+                }
+                return 1;
+            }
+            else
+            {
+                $this->errors[] = $this->db->lasterror();
+                return -1;
+            }
+        }
+        else return -1;
+    }
+
+
+    // --------------------
+    // TODO: All functions here must be redesigned and moved as they are not business functions but output functions
+    // --------------------
+
+    /* This is to show add lines */
+
+    /**
+     *	Show add free and predefined products/services form
+     *
+     *  @param	int		        $dateSelector       1=Show also date range input fields
+     *  @param	Societe			$seller				Object thirdparty who sell
+     *  @param	Societe			$buyer				Object thirdparty who buy
+     *	@return	void
+     */
+    function formAddObjectLine($dateSelector, $seller, $buyer)
+    {
+        global $conf,$user,$langs,$object,$hookmanager;
+        global $form,$bcnd,$var;
+
+        // Line extrafield
+        require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+        $extrafieldsline = new ExtraFields($this->db);
+        $extralabelslines=$extrafieldsline->fetch_name_optionals_label($this->table_element_line);
+
+        // Output template part (modules that overwrite templates must declare this into descriptor)
+        // Use global variables + $dateSelector + $seller and $buyer
+        $dirtpls=array_merge($conf->modules_parts['tpl'],array('/core/tpl'));
+        foreach($dirtpls as $reldir)
+        {
+            $tpl = dol_buildpath($reldir.'/objectline_create.tpl.php');
+            if (empty($conf->file->strict_mode)) {
+                $res=@include $tpl;
+            } else {
+                $res=include $tpl; // for debug
+            }
+            if ($res) break;
+        }
+    }
+
+
+
+    /* This is to show array of line of details */
+
+
+    /**
+     *	Return HTML table for object lines
+     *	TODO Move this into an output class file (htmlline.class.php)
+     *	If lines are into a template, title must also be into a template
+     *	But for the moment we don't know if it's possible as we keep a method available on overloaded objects.
+     *
+     *	@param	string		$action				Action code
+     *	@param  string		$seller            	Object of seller third party
+     *	@param  string  	$buyer             	Object of buyer third party
+     *	@param	int			$selected		   	Object line selected
+     *	@param  int	    	$dateSelector      	1=Show also date range input fields
+     *	@return	void
+     */
+    function printObjectLines($action, $seller, $buyer, $selected=0, $dateSelector=0)
+    {
+        global $conf, $hookmanager, $langs, $user;
+        // TODO We should not use global var for this !
+        global $inputalsopricewithtax, $usemargins, $disableedit, $disablemove, $disableremove, $outputalsopricetotalwithtax;
+
+        // Define usemargins
+        $usemargins=0;
+        if (! empty($conf->margin->enabled) && ! empty($this->element) && in_array($this->element,array('facture','propal','commande'))) $usemargins=1;
+
+        $num = count($this->lines);
+
+        // Line extrafield
+        require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+        $extrafieldsline = new ExtraFields($this->db);
+        $extralabelslines=$extrafieldsline->fetch_name_optionals_label($this->table_element_line);
+
+        $parameters = array('num'=>$num,'i'=>$i,'dateSelector'=>$dateSelector,'seller'=>$seller,'buyer'=>$buyer,'selected'=>$selected, 'extrafieldsline'=>$extrafieldsline);
+        $reshook = $hookmanager->executeHooks('printObjectLineTitle', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+        if (empty($reshook))
+        {
+            // Title line
+            print "<thead>\n";
+
+            print '<tr class="liste_titre nodrag nodrop">';
+
+            // Adds a line numbering column
+            if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER)) print '<td class="linecolnum" align="center" width="5">&nbsp;</td>';
+
+            // Description
+            print '<td class="linecoldescription">'.$langs->trans('Description').'</td>';
+
+            if ($this->element == 'supplier_proposal' || $this->element == 'order_supplier' || $this->element == 'invoice_supplier')
+            {
+                print '<td class="linerefsupplier"><span id="title_fourn_ref">'.$langs->trans("SupplierRef").'</span></td>';
+            }
+
+            // VAT
+            print '<td class="linecolvat" align="right" width="80">'.$langs->trans('VAT').'</td>';
+
+            // Price HT
+            print '<td class="linecoluht" align="right" width="80">'.$langs->trans('PriceUHT').'</td>';
+
+            // Multicurrency
+            if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) print '<td class="linecoluht_currency" align="right" width="80">'.$langs->trans('PriceUHTCurrency', $this->multicurrency_code).'</td>';
+
+            if ($inputalsopricewithtax) print '<td align="right" width="80">'.$langs->trans('PriceUTTC').'</td>';
+
+            // Qty
+            print '<td class="linecolqty" align="right">'.$langs->trans('Qty').'</td>';
+
+            if($conf->global->PRODUCT_USE_UNITS)
+            {
+                print '<td class="linecoluseunit" align="left">'.$langs->trans('Unit').'</td>';
+            }
+
+            // Reduction short
+            print '<td class="linecoldiscount" align="right">'.$langs->trans('ReductionShort').'</td>';
+
+            if ($this->situation_cycle_ref) {
+                print '<td class="linecolcycleref" align="right">' . $langs->trans('Progress') . '</td>';
+            }
+
+            if ($usemargins && ! empty($conf->margin->enabled) && empty($user->societe_id))
+            {
+                if (!empty($user->rights->margins->creer))
+                {
+                    if ($conf->global->MARGIN_TYPE == "1")
+                        print '<td class="linecolmargin1 margininfos" align="right" width="80">'.$langs->trans('BuyingPrice').'</td>';
+                    else
+                        print '<td class="linecolmargin1 margininfos" align="right" width="80">'.$langs->trans('CostPrice').'</td>';
+                }
+
+                if (! empty($conf->global->DISPLAY_MARGIN_RATES) && $user->rights->margins->liretous)
+                    print '<td class="linecolmargin2 margininfos" align="right" width="50">'.$langs->trans('MarginRate').'</td>';
+                if (! empty($conf->global->DISPLAY_MARK_RATES) && $user->rights->margins->liretous)
+                    print '<td class="linecolmargin2 margininfos" align="right" width="50">'.$langs->trans('MarkRate').'</td>';
+            }
+
+            // Total HT
+            print '<td class="linecolht" align="right">'.$langs->trans('TotalHTShort').'</td>';
+
+            // Multicurrency
+            if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) print '<td class="linecoltotalht_currency" align="right">'.$langs->trans('TotalHTShortCurrency', $this->multicurrency_code).'</td>';
+
+            if ($outputalsopricetotalwithtax) print '<td align="right" width="80">'.$langs->trans('TotalTTCShort').'</td>';
+
+            print '<td class="linecoledit"></td>';  // No width to allow autodim
+
+            print '<td class="linecoldelete" width="10"></td>';
+
+            print '<td class="linecolmove" width="10"></td>';
+
+            if($action == 'selectlines')
+            {
+                print '<td class="linecolcheckall" align="center">';
+                print '<input type="checkbox" class="linecheckboxtoggle" />';
+                print '<script type="text/javascript">$(document).ready(function() {$(".linecheckboxtoggle").click(function() {var checkBoxes = $(".linecheckbox");checkBoxes.prop("checked", this.checked);})});</script>';
+                print '</td>';
+            }
+
+            print "</tr>\n";
+            print "</thead>\n";
+        }
+
+        $var = true;
+        $i	 = 0;
+
+        print "<tbody>\n";
+        foreach ($this->lines as $line)
+        {
+            //Line extrafield
+            $line->fetch_optionals();
+
+            //if (is_object($hookmanager) && (($line->product_type == 9 && ! empty($line->special_code)) || ! empty($line->fk_parent_line)))
+            if (is_object($hookmanager))   // Old code is commented on preceding line.
+            {
+                if (empty($line->fk_parent_line))
+                {
+                    $parameters = array('line'=>$line,'var'=>$var,'num'=>$num,'i'=>$i,'dateSelector'=>$dateSelector,'seller'=>$seller,'buyer'=>$buyer,'selected'=>$selected, 'extrafieldsline'=>$extrafieldsline);
+                    $reshook = $hookmanager->executeHooks('printObjectLine', $parameters, $this, $action);    // Note that $action and $object may have been modified by some hooks
+                }
+                else
+                {
+                    $parameters = array('line'=>$line,'var'=>$var,'num'=>$num,'i'=>$i,'dateSelector'=>$dateSelector,'seller'=>$seller,'buyer'=>$buyer,'selected'=>$selected, 'extrafieldsline'=>$extrafieldsline, 'fk_parent_line'=>$line->fk_parent_line);
+                    $reshook = $hookmanager->executeHooks('printObjectSubLine', $parameters, $this, $action);    // Note that $action and $object may have been modified by some hooks
+                }
+            }
+            if (empty($reshook))
+            {
+                $this->printObjectLine($action,$line,$var,$num,$i,$dateSelector,$seller,$buyer,$selected,$extrafieldsline);
+            }
+
+            $i++;
+        }
+        print "</tbody>\n";
+    }
+
+    /**
+     *	Return HTML content of a detail line
+     *	TODO Move this into an output class file (htmlline.class.php)
+     *
+     *	@param	string		$action				GET/POST action
+     *	@param CommonObjectLine $line		       	Selected object line to output
+     *	@param  string	    $var               	Is it a an odd line (true)
+     *	@param  int		    $num               	Number of line (0)
+     *	@param  int		    $i					I
+     *	@param  int		    $dateSelector      	1=Show also date range input fields
+     *	@param  string	    $seller            	Object of seller third party
+     *	@param  string	    $buyer             	Object of buyer third party
+     *	@param	int			$selected		   	Object line selected
+     *  @param  int			$extrafieldsline	Object of extrafield line attribute
+     *	@return	void
+     */
+    function printObjectLine($action,$line,$var,$num,$i,$dateSelector,$seller,$buyer,$selected=0,$extrafieldsline=0)
+    {
+        global $conf,$langs,$user,$object,$hookmanager;
+        global $form,$bc,$bcdd;
+        global $object_rights, $disableedit, $disablemove, $disableremove;   // TODO We should not use global var for this !
+
+        $object_rights = $this->getRights();
+
+        $element=$this->element;
+
+        $text=''; $description=''; $type=0;
+
+        // Show product and description
+        $type=(! empty($line->product_type)?$line->product_type:$line->fk_product_type);
+        // Try to enhance type detection using date_start and date_end for free lines where type was not saved.
+        if (! empty($line->date_start)) $type=1; // deprecated
+        if (! empty($line->date_end)) $type=1; // deprecated
+
+        // Ligne en mode visu
+        if ($action != 'editline' || $selected != $line->id)
+        {
+            // Product
+            if ($line->fk_product > 0)
+            {
+                $product_static = new Product($this->db);
+                $product_static->fetch($line->fk_product);
+
+                $product_static->ref = $line->ref; //can change ref in hook
+                $product_static->label = $line->label; //can change label in hook
+                $text=$product_static->getNomUrl(1);
+
+                // Define output language and label
+                if (! empty($conf->global->MAIN_MULTILANGS))
+                {
+                    if (! is_object($this->thirdparty))
+                    {
+                        dol_print_error('','Error: Method printObjectLine was called on an object and object->fetch_thirdparty was not done before');
+                        return;
+                    }
+
+                    $prod = new Product($this->db);
+                    $prod->fetch($line->fk_product);
+
+                    $outputlangs = $langs;
+                    $newlang='';
+                    if (empty($newlang) && GETPOST('lang_id','aZ09')) $newlang=GETPOST('lang_id','aZ09');
+                    if (! empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE) && empty($newlang)) $newlang=$this->thirdparty->default_lang;		// For language to language of customer
+                    if (! empty($newlang))
+                    {
+                        $outputlangs = new Translate("",$conf);
+                        $outputlangs->setDefaultLang($newlang);
+                    }
+
+                    $label = (! empty($prod->multilangs[$outputlangs->defaultlang]["label"])) ? $prod->multilangs[$outputlangs->defaultlang]["label"] : $line->product_label;
+                }
+                else
+                {
+                    $label = $line->product_label;
+                }
+
+                $text.= ' - '.(! empty($line->label)?$line->label:$label);
+                $description.=(! empty($conf->global->PRODUIT_DESC_IN_FORM)?'':dol_htmlentitiesbr($line->description));	// Description is what to show on popup. We shown nothing if already into desc.
+            }
+
+            $line->pu_ttc = price2num($line->subprice * (1 + ($line->tva_tx/100)), 'MU');
+
+            // Output template part (modules that overwrite templates must declare this into descriptor)
+            // Use global variables + $dateSelector + $seller and $buyer
+            $dirtpls=array_merge($conf->modules_parts['tpl'],array('/core/tpl'));
+            foreach($dirtpls as $reldir)
+            {
+                $tpl = dol_buildpath($reldir.'/objectline_view.tpl.php');
+                if (empty($conf->file->strict_mode)) {
+                    $res=@include $tpl;
+                } else {
+                    $res=include $tpl; // for debug
+                }
+                if ($res) break;
+            }
+        }
+
+        // Ligne en mode update
+        if ($this->statut == 0 && $action == 'editline' && $selected == $line->id)
+        {
+            $label = (! empty($line->label) ? $line->label : (($line->fk_product > 0) ? $line->product_label : ''));
+            $placeholder=' placeholder="'.$langs->trans("Label").'"';
+
+            $line->pu_ttc = price2num($line->subprice * (1 + ($line->tva_tx/100)), 'MU');
+
+            // Output template part (modules that overwrite templates must declare this into descriptor)
+            // Use global variables + $dateSelector + $seller and $buyer
+            $dirtpls=array_merge($conf->modules_parts['tpl'],array('/core/tpl'));
+            foreach($dirtpls as $reldir)
+            {
+                $tpl = dol_buildpath($reldir.'/objectline_edit.tpl.php');
+                if (empty($conf->file->strict_mode)) {
+                    $res=@include $tpl;
+                } else {
+                    $res=include $tpl; // for debug
+                }
+                if ($res) break;
+            }
+        }
+    }
+
+
+    /* This is to show array of line of details of source object */
+
+
+    /**
+     * 	Return HTML table table of source object lines
+     *  TODO Move this and previous function into output html class file (htmlline.class.php).
+     *  If lines are into a template, title must also be into a template
+     *  But for the moment we don't know if it's possible, so we keep the method available on overloaded objects.
+     *
+     *	@param	string		$restrictlist		''=All lines, 'services'=Restrict to services only
+     *  @return	void
+     */
+    function printOriginLinesList($restrictlist='')
+    {
+        global $langs, $hookmanager, $conf;
+
+        print '<tr class="liste_titre">';
+        print '<td>'.$langs->trans('Ref').'</td>';
+        print '<td>'.$langs->trans('Description').'</td>';
+        print '<td align="right">'.$langs->trans('VATRate').'</td>';
+        print '<td align="right">'.$langs->trans('PriceUHT').'</td>';
+        if (!empty($conf->multicurrency->enabled)) print '<td align="right">'.$langs->trans('PriceUHTCurrency').'</td>';
+        print '<td align="right">'.$langs->trans('Qty').'</td>';
+        if($conf->global->PRODUCT_USE_UNITS)
+        {
+            print '<td align="left">'.$langs->trans('Unit').'</td>';
+        }
+        print '<td align="right">'.$langs->trans('ReductionShort').'</td></tr>';
+
+        $var = true;
+        $i	 = 0;
+
+        if (! empty($this->lines))
+        {
+            foreach ($this->lines as $line)
+            {
+                if (is_object($hookmanager) && (($line->product_type == 9 && ! empty($line->special_code)) || ! empty($line->fk_parent_line)))
+                {
+                    if (empty($line->fk_parent_line))
+                    {
+                        $parameters=array('line'=>$line,'var'=>$var,'i'=>$i);
+                        $action='';
+                        $hookmanager->executeHooks('printOriginObjectLine',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+                    }
+                }
+                else
+                {
+                    $this->printOriginLine($line, $var, $restrictlist);
+                }
+
+                $i++;
+            }
+        }
+    }
+
+    /**
+     * 	Return HTML with a line of table array of source object lines
+     *  TODO Move this and previous function into output html class file (htmlline.class.php).
+     *  If lines are into a template, title must also be into a template
+     *  But for the moment we don't know if it's possible as we keep a method available on overloaded objects.
+     *
+     * 	@param	CommonObjectLine	$line				Line
+     * 	@param	string				$var				Var
+     *	@param	string				$restrictlist		''=All lines, 'services'=Restrict to services only (strike line if not)
+     * 	@return	void
+     */
+    function printOriginLine($line, $var, $restrictlist='')
+    {
+        global $langs, $conf;
+
+        //var_dump($line);
+        if (!empty($line->date_start))
+        {
+            $date_start=$line->date_start;
+        }
+        else
+        {
+            $date_start=$line->date_debut_prevue;
+            if ($line->date_debut_reel) $date_start=$line->date_debut_reel;
+        }
+        if (!empty($line->date_end))
+        {
+            $date_end=$line->date_end;
+        }
+        else
+        {
+            $date_end=$line->date_fin_prevue;
+            if ($line->date_fin_reel) $date_end=$line->date_fin_reel;
+        }
+
+        $this->tpl['label'] = '';
+        if (! empty($line->fk_parent_line)) $this->tpl['label'].= img_picto('', 'rightarrow');
+
+        if (($line->info_bits & 2) == 2)  // TODO Not sure this is used for source object
+        {
+            $discount=new DiscountAbsolute($this->db);
+            $discount->fk_soc = $this->socid;
+            $this->tpl['label'].= $discount->getNomUrl(0,'discount');
+        }
+        else if (! empty($line->fk_product))
+        {
+            $productstatic = new Product($this->db);
+            $productstatic->id = $line->fk_product;
+            $productstatic->ref = $line->ref;
+            $productstatic->type = $line->fk_product_type;
+            if(empty($productstatic->ref)){
+                $line->fetch_product();
+                $productstatic = $line->product;
+            }
+			
+            $this->tpl['label'].= $productstatic->getNomUrl(1);
+            $this->tpl['label'].= ' - '.(! empty($line->label)?$line->label:$line->product_label);
+            // Dates
+            if ($line->product_type == 1 && ($date_start || $date_end))
+            {
+                $this->tpl['label'].= get_date_range($date_start,$date_end);
+            }
+        }
+        else
+        {
+            $this->tpl['label'].= ($line->product_type == -1 ? '&nbsp;' : ($line->product_type == 1 ? img_object($langs->trans(''),'service') : img_object($langs->trans(''),'product')));
+            if (!empty($line->desc)) {
+                $this->tpl['label'].=$line->desc;
+            }else {
+                $this->tpl['label'].= ($line->label ? '&nbsp;'.$line->label : '');
+            }
+			
+            // Dates
+            if ($line->product_type == 1 && ($date_start || $date_end))
+            {
+                $this->tpl['label'].= get_date_range($date_start,$date_end);
+            }
+        }
+
+        if (! empty($line->desc))
+        {
+            if ($line->desc == '(CREDIT_NOTE)')  // TODO Not sure this is used for source object
+            {
+                $discount=new DiscountAbsolute($this->db);
+                $discount->fetch($line->fk_remise_except);
+                $this->tpl['description'] = $langs->transnoentities("DiscountFromCreditNote",$discount->getNomUrl(0));
+            }
+            elseif ($line->desc == '(DEPOSIT)')  // TODO Not sure this is used for source object
+            {
+                $discount=new DiscountAbsolute($this->db);
+                $discount->fetch($line->fk_remise_except);
+                $this->tpl['description'] = $langs->transnoentities("DiscountFromDeposit",$discount->getNomUrl(0));
+            }
+            elseif ($line->desc == '(EXCESS RECEIVED)')
+            {
+                $discount=new DiscountAbsolute($this->db);
+                $discount->fetch($line->fk_remise_except);
+                $this->tpl['description'] = $langs->transnoentities("DiscountFromExcessReceived",$discount->getNomUrl(0));
+            }
+            elseif ($line->desc == '(EXCESS PAID)')
+            {
+                $discount=new DiscountAbsolute($this->db);
+                $discount->fetch($line->fk_remise_except);
+                $this->tpl['description'] = $langs->transnoentities("DiscountFromExcessPaid",$discount->getNomUrl(0));
+            }
+            else
+            {
+                $this->tpl['description'] = dol_trunc($line->desc,60);
+            }
+        }
+        else
+        {
+            $this->tpl['description'] = '&nbsp;';
+        }
+
+        // VAT Rate
+        $this->tpl['vat_rate'] = vatrate($line->tva_tx, true);
+        $this->tpl['vat_rate'] .= (($line->info_bits & 1) == 1) ? '*' : '';
+        if (! empty($line->vat_src_code) && ! preg_match('/\(/', $this->tpl['vat_rate'])) $this->tpl['vat_rate'].=' ('.$line->vat_src_code.')';
+
+        $this->tpl['price'] = price($line->subprice);
+        $this->tpl['multicurrency_price'] = price($line->multicurrency_subprice);
+        $this->tpl['qty'] = (($line->info_bits & 2) != 2) ? $line->qty : '&nbsp;';
+        if ($conf->global->PRODUCT_USE_UNITS) $this->tpl['unit'] = $langs->transnoentities($line->getLabelOfUnit('long'));
+        $this->tpl['remise_percent'] = (($line->info_bits & 2) != 2) ? vatrate($line->remise_percent, true) : '&nbsp;';
+
+        // Is the line strike or not
+        $this->tpl['strike']=0;
+        if ($restrictlist == 'services' && $line->product_type != Product::TYPE_SERVICE) $this->tpl['strike']=1;
+
+        // Output template part (modules that overwrite templates must declare this into descriptor)
+        // Use global variables + $dateSelector + $seller and $buyer
+        $dirtpls=array_merge($conf->modules_parts['tpl'],array('/core/tpl'));
+        foreach($dirtpls as $reldir)
+        {
+            $tpl = dol_buildpath($reldir.'/originproductline.tpl.php');
+            if (empty($conf->file->strict_mode)) {
+                $res=@include $tpl;
+            } else {
+                $res=include $tpl; // for debug
+            }
+            if ($res) break;
+        }
+    }
+
+
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
+    /**
+     *	Add resources to the current object : add entry into llx_element_resources
+     *	Need $this->element & $this->id
+     *
+     *	@param		int		$resource_id		Resource id
+     *	@param		string	$resource_type		'resource'
+     *	@param		int		$busy				Busy or not
+     *	@param		int		$mandatory			Mandatory or not
+     *	@return		int							<=0 if KO, >0 if OK
+     */
+    function add_element_resource($resource_id, $resource_type, $busy=0, $mandatory=0)
+    {
+        // phpcs:enable
+        $this->db->begin();
+
+        $sql = "INSERT INTO ".MAIN_DB_PREFIX."element_resources (";
+        $sql.= "resource_id";
+        $sql.= ", resource_type";
+        $sql.= ", element_id";
+        $sql.= ", element_type";
+        $sql.= ", busy";
+        $sql.= ", mandatory";
+        $sql.= ") VALUES (";
+        $sql.= $resource_id;
+        $sql.= ", '".$this->db->escape($resource_type)."'";
+        $sql.= ", '".$this->db->escape($this->id)."'";
+        $sql.= ", '".$this->db->escape($this->element)."'";
+        $sql.= ", '".$this->db->escape($busy)."'";
+        $sql.= ", '".$this->db->escape($mandatory)."'";
+        $sql.= ")";
+
+        dol_syslog(get_class($this)."::add_element_resource", LOG_DEBUG);
+        if ($this->db->query($sql))
+        {
+            $this->db->commit();
+            return 1;
+        }
+        else
+        {
+            $this->error=$this->db->lasterror();
+            $this->db->rollback();
+            return  0;
+        }
+    }
+
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
+    /**
+     *    Delete a link to resource line
+     *
+     *    @param	int		$rowid			Id of resource line to delete
+     *    @param	int		$element		element name (for trigger) TODO: use $this->element into commonobject class
+     *    @param	int		$notrigger		Disable all triggers
+     *    @return   int						>0 if OK, <0 if KO
+     */
+    function delete_resource($rowid, $element, $notrigger=0)
+    {
+        // phpcs:enable
+        global $user;
+
+        $this->db->begin();
+
+        $sql = "DELETE FROM ".MAIN_DB_PREFIX."element_resources";
+        $sql.= " WHERE rowid=".$rowid;
+
+        dol_syslog(get_class($this)."::delete_resource", LOG_DEBUG);
+
+        $resql=$this->db->query($sql);
+        if (! $resql)
+        {
+            $this->error=$this->db->lasterror();
+            $this->db->rollback();
+            return -1;
+        }
+        else
+        {
+            if (! $notrigger)
+            {
+                $result=$this->call_trigger(strtoupper($element).'_DELETE_RESOURCE', $user);
+                if ($result < 0) { $this->db->rollback(); return -1; }
+            }
+            $this->db->commit();
+            return 1;
+        }
+    }
+
+
+    /**
+     * Overwrite magic function to solve problem of cloning object that are kept as references
+     *
+     * @return void
+     */
+    function __clone()
+    {
+        // Force a copy of this->lines, otherwise it will point to same object.
+        if (isset($this->lines) && is_array($this->lines))
+        {
+            $nboflines=count($this->lines);
+            for($i=0; $i < $nboflines; $i++)
+            {
+                $this->lines[$i] = clone $this->lines[$i];
+            }
+        }
+    }
+
+    /**
+     * Common function for all objects extending CommonObject for generating documents
+     *
+     * @param 	string 		$modelspath 	Relative folder where generators are placed
+     * @param 	string 		$modele 		Generator to use. Caller must set it to obj->modelpdf or GETPOST('modelpdf') for example.
+     * @param 	Translate 	$outputlangs 	Output language to use
+     * @param 	int 		$hidedetails 	1 to hide details. 0 by default
+     * @param 	int 		$hidedesc 		1 to hide product description. 0 by default
+     * @param 	int 		$hideref 		1 to hide product reference. 0 by default
+     * @param   null|array  $moreparams     Array to provide more information
+     * @return 	int 						>0 if OK, <0 if KO
+     * @see	addFileIntoDatabaseIndex
+     */
+    protected function commonGenerateDocument($modelspath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams=null)
+    {
+        global $conf, $langs, $user;
+
+        $srctemplatepath='';
+
+        // Increase limit for PDF build
+        $err=error_reporting();
+        error_reporting(0);
+        @set_time_limit(120);
+        error_reporting($err);
+
+        // If selected model is a filename template (then $modele="modelname" or "modelname:filename")
+        $tmp=explode(':',$modele,2);
+        if (! empty($tmp[1]))
+        {
+            $modele=$tmp[0];
+            $srctemplatepath=$tmp[1];
+        }
+
+        // Search template files
+        $file=''; $classname=''; $filefound=0;
+        $dirmodels=array('/');
+        if (is_array($conf->modules_parts['models'])) $dirmodels=array_merge($dirmodels,$conf->modules_parts['models']);
+        foreach($dirmodels as $reldir)
+        {
+            foreach(array('doc','pdf') as $prefix)
+            {
+                if (in_array(get_class($this), array('Adherent'))) $file = $prefix."_".$modele.".class.php";     // Member module use prefix_module.class.php
+                else $file = $prefix."_".$modele.".modules.php";
+
+                // On verifie l'emplacement du modele
+                $file=dol_buildpath($reldir.$modelspath.$file,0);
+                if (file_exists($file))
+                {
+                    $filefound=1;
+                    $classname=$prefix.'_'.$modele;
+                    break;
+                }
+            }
+            if ($filefound) break;
+        }
+
+        // If generator was found
+        if ($filefound)
+        {
+            global $db;  // Required to solve a conception default in commonstickergenerator.class.php making an include of code using $db
+
+            require_once $file;
+
+            $obj = new $classname($this->db);
+
+            // If generator is ODT, we must have srctemplatepath defined, if not we set it.
+            if ($obj->type == 'odt' && empty($srctemplatepath))
+            {
+                $varfortemplatedir=$obj->scandir;
+                if ($varfortemplatedir && ! empty($conf->global->$varfortemplatedir))
+                {
+                    $dirtoscan=$conf->global->$varfortemplatedir;
+
+                    $listoffiles=array();
+
+                    // Now we add first model found in directories scanned
+                    $listofdir=explode(',',$dirtoscan);
+                    foreach($listofdir as $key => $tmpdir)
+                    {
+                        $tmpdir=trim($tmpdir);
+                        $tmpdir=preg_replace('/DOL_DATA_ROOT/',DOL_DATA_ROOT,$tmpdir);
+                        if (! $tmpdir) { unset($listofdir[$key]); continue; }
+                        if (is_dir($tmpdir))
+                        {
+                            $tmpfiles=dol_dir_list($tmpdir,'files',0,'\.od(s|t)$','','name',SORT_ASC,0);
+                            if (count($tmpfiles)) $listoffiles=array_merge($listoffiles,$tmpfiles);
+                        }
+                    }
+
+                    if (count($listoffiles))
+                    {
+                        foreach($listoffiles as $record)
+                        {
+                            $srctemplatepath=$record['fullname'];
+                            break;
+                        }
+                    }
+                }
+
+                if (empty($srctemplatepath))
+                {
+                    $this->error='ErrorGenerationAskedForOdtTemplateWithSrcFileNotDefined';
+                    return -1;
+                }
+            }
+
+            if ($obj->type == 'odt' && ! empty($srctemplatepath))
+            {
+                if (! dol_is_file($srctemplatepath))
+                {
+                    $this->error='ErrorGenerationAskedForOdtTemplateWithSrcFileNotFound';
+                    return -1;
+                }
+            }
+
+            // We save charset_output to restore it because write_file can change it if needed for
+            // output format that does not support UTF8.
+            $sav_charset_output=$outputlangs->charset_output;
+
+            if (in_array(get_class($this), array('Adherent')))
+            {
+                $arrayofrecords = array();   // The write_file of templates of adherent class need this var
+                $resultwritefile = $obj->write_file($this, $outputlangs, $srctemplatepath, 'member', 1, $moreparams);
+            }
+            else
+            {
+                $resultwritefile = $obj->write_file($this, $outputlangs, $srctemplatepath, $hidedetails, $hidedesc, $hideref, $moreparams);
+            }
+            // After call of write_file $obj->result['fullpath'] is set with generated file. It will be used to update the ECM database index.
+
+            if ($resultwritefile > 0)
+            {
+                $outputlangs->charset_output=$sav_charset_output;
+
+                // We delete old preview
+                require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+                dol_delete_preview($this);
+
+                // Index file in database
+                if (! empty($obj->result['fullpath']))
+                {
+                    $destfull = $obj->result['fullpath'];
+                    $upload_dir = dirname($destfull);
+                    $destfile = basename($destfull);
+                    $rel_dir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $upload_dir);
+
+                    if (! preg_match('/[\\/]temp[\\/]|[\\/]thumbs|\.meta$/', $rel_dir))     // If not a tmp dir
+                    {
+                        $filename = basename($destfile);
+                        $rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
+                        $rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
+
+                        include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
+                        $ecmfile=new EcmFiles($this->db);
+                        $result = $ecmfile->fetch(0, '', ($rel_dir?$rel_dir.'/':'').$filename);
+
+                        // Set the public "share" key
+                        $setsharekey = false;
+                        if ($this->element == 'propal')
+                        {
+                            $useonlinesignature = $conf->global->MAIN_FEATURES_LEVEL;	// Replace this with 1 when feature to make online signature is ok
+                            if ($useonlinesignature) $setsharekey=true;
+                            if (! empty($conf->global->PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD)) $setsharekey=true;
+                        }
+                        if ($this->element == 'commande'     && ! empty($conf->global->ORDER_ALLOW_EXTERNAL_DOWNLOAD))        $setsharekey=true;
+                        if ($this->element == 'facture'      && ! empty($conf->global->INVOICE_ALLOW_EXTERNAL_DOWNLOAD))      $setsharekey=true;
+                        if ($this->element == 'bank_account' && ! empty($conf->global->BANK_ACCOUNT_ALLOW_EXTERNAL_DOWNLOAD)) $setsharekey=true;
+
+                        if ($setsharekey)
+                        {
+                            if (empty($ecmfile->share))	// Because object not found or share not set yet
+                            {
+                                require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
+                                $ecmfile->share = getRandomPassword(true);
+                            }
+                        }
+
+                        if ($result > 0)
+                        {
+                            $ecmfile->label = md5_file(dol_osencode($destfull));	// hash of file content
+                            $ecmfile->fullpath_orig = '';
+                            $ecmfile->gen_or_uploaded = 'generated';
+                            $ecmfile->description = '';    // indexed content
+                            $ecmfile->keyword = '';        // keyword content
+                            $result = $ecmfile->update($user);
+                            if ($result < 0)
+                            {
+                                setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
+                            }
+                        }
+                        else
+                        {
+                            $ecmfile->entity = $conf->entity;
+                            $ecmfile->filepath = $rel_dir;
+                            $ecmfile->filename = $filename;
+                            $ecmfile->label = md5_file(dol_osencode($destfull));	// hash of file content
+                            $ecmfile->fullpath_orig = '';
+                            $ecmfile->gen_or_uploaded = 'generated';
+                            $ecmfile->description = '';    // indexed content
+                            $ecmfile->keyword = '';        // keyword content
+                            $ecmfile->src_object_type = $this->table_element;
+                            $ecmfile->src_object_id   = $this->id;
+
+                            $result = $ecmfile->create($user);
+                            if ($result < 0)
+                            {
+                                setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
+                            }
+                        }
+
+                        /*$this->result['fullname']=$destfull;
+						$this->result['filepath']=$ecmfile->filepath;
+						$this->result['filename']=$ecmfile->filename;*/
+                        //var_dump($obj->update_main_doc_field);exit;
+
+                        // Update the last_main_doc field into main object (if documenent generator has property ->update_main_doc_field set)
+                        $update_main_doc_field=0;
+                        if (! empty($obj->update_main_doc_field)) $update_main_doc_field=1;
+                        if ($update_main_doc_field && ! empty($this->table_element))
+                        {
+                            $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element." SET last_main_doc = '".($ecmfile->filepath.'/'.$ecmfile->filename)."'";
+                            $sql.= ' WHERE rowid = '.$this->id;
+                            $resql = $this->db->query($sql);
+                            if (! $resql) dol_print_error($this->db);
+                        }
+                    }
+                }
+                else
+                {
+                    dol_syslog('Method ->write_file was called on object '.get_class($obj).' and return a success but the return array ->result["fullpath"] was not set.', LOG_WARNING);
+                }
+
+                // Success in building document. We build meta file.
+                dol_meta_create($this);
+
+                return 1;
+            }
+            else
+            {
+                $outputlangs->charset_output=$sav_charset_output;
+                dol_print_error($this->db, "Error generating document for ".__CLASS__.". Error: ".$obj->error, $obj->errors);
+                return -1;
+            }
+        }
+        else
+        {
+            $this->error=$langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists",$file);
+            dol_print_error('',$this->error);
+            return -1;
+        }
+    }
+
+    /**
+     *  Build thumb
+     *  @TODO Move this into files.lib.php
+     *
+     *  @param      string	$file           Path file in UTF8 to original file to create thumbs from.
+     *	@return		void
+     */
+    function addThumbs($file)
+    {
+        global $maxwidthsmall, $maxheightsmall, $maxwidthmini, $maxheightmini, $quality;
+
+        require_once DOL_DOCUMENT_ROOT .'/core/lib/images.lib.php';		// This define also $maxwidthsmall, $quality, ...
+
+        $file_osencoded=dol_osencode($file);
+        if (file_exists($file_osencoded))
+        {
+            // Create small thumbs for company (Ratio is near 16/9)
+            // Used on logon for example
+            vignette($file_osencoded, $maxwidthsmall, $maxheightsmall, '_small', $quality);
+
+            // Create mini thumbs for company (Ratio is near 16/9)
+            // Used on menu or for setup page for example
+            vignette($file_osencoded, $maxwidthmini, $maxheightmini, '_mini', $quality);
+        }
+    }
+
+
+    /* Functions common to commonobject and commonobjectline */
+
+    /* For default values */
+
+    /**
+     * Return the default value to use for a field when showing the create form of object.
+     * Return values in this order:
+     * 1) If parameter is available into POST, we return it first.
+     * 2) If not but an alternate value was provided as parameter of function, we return it.
+     * 3) If not but a constant $conf->global->OBJECTELEMENT_FIELDNAME is set, we return it (It is better to use the dedicated table).
+     * 4) Return value found into database (TODO No yet implemented)
+     *
+     * @param   string              $fieldname          Name of field
+     * @param   string              $alternatevalue     Alternate value to use
+     * @return  string|string[]                         Default value (can be an array if the GETPOST return an array)
+     **/
+    function getDefaultCreateValueFor($fieldname, $alternatevalue=null)
+    {
+        global $conf, $_POST;
+
+        // If param here has been posted, we use this value first.
+        if (isset($_POST[$fieldname])) return GETPOST($fieldname, 2);
+
+        if (isset($alternatevalue)) return $alternatevalue;
+
+        $newelement=$this->element;
+        if ($newelement == 'facture') $newelement='invoice';
+        if ($newelement == 'commande') $newelement='order';
+        if (empty($newelement))
+        {
+            dol_syslog("Ask a default value using common method getDefaultCreateValueForField on an object with no property ->element defined. Return empty string.", LOG_WARNING);
+            return '';
+        }
+
+        $keyforfieldname=strtoupper($newelement.'_DEFAULT_'.$fieldname);
+        //var_dump($keyforfieldname);
+        if (isset($conf->global->$keyforfieldname)) return $conf->global->$keyforfieldname;
+
+        // TODO Ad here a scan into table llx_overwrite_default with a filter on $this->element and $fieldname
+    }
+
+
+    /* For triggers */
+
+
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
+    /**
+     * Call trigger based on this instance.
+     * Some context information may also be provided into array property this->context.
+     * NB:  Error from trigger are stacked in interface->errors
+     * NB2: If return code of triggers are < 0, action calling trigger should cancel all transaction.
+     *
+     * @param   string    $trigger_name   trigger's name to execute
+     * @param   User      $user           Object user
+     * @return  int                       Result of run_triggers
+     */
+    function call_trigger($trigger_name, $user)
+    {
+        // phpcs:enable
+        global $langs,$conf;
+
+        include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+        $interface=new Interfaces($this->db);
+        $result=$interface->run_triggers($trigger_name,$this,$user,$langs,$conf);
+
+        if ($result < 0)
+        {
+            if (!empty($this->errors))
+            {
+                $this->errors=array_unique(array_merge($this->errors,$interface->errors));   // We use array_unique because when a trigger call another trigger on same object, this->errors is added twice.
+            }
+            else
+            {
+                $this->errors=$interface->errors;
+            }
+        }
+        return $result;
+    }
+
+
+    /* Functions for extrafields */
+
+
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
+    /**
+     *  Function to get extra fields of an object into $this->array_options
+     *  This method is in most cases called by method fetch of objects but you can call it separately.
+     *
+     *  @param	int		$rowid			Id of line. Use the id of object if not defined. Deprecated. Function must be called without parameters.
+     *  @param  array	$optionsArray   Array resulting of call of extrafields->fetch_name_optionals_label(). Deprecated. Function must be called without parameters.
+     *  @return	int						<0 if error, 0 if no values of extrafield to find nor found, 1 if an attribute is found and value loaded
+     */
+    function fetch_optionals($rowid=null, $optionsArray=null)
+    {
+        // phpcs:enable
+        if (empty($rowid)) $rowid=$this->id;
+
+        // To avoid SQL errors. Probably not the better solution though
+        if (!$this->table_element) {
+            return 0;
+        }
+
+        $this->array_options=array();
+
+        if (! is_array($optionsArray))
+        {
+            // If $extrafields is not a known object, we initialize it. Best practice is to have $extrafields defined into card.php or list.php page.
+            // TODO Use of existing $extrafield is not yet ready (must mutualize code that use extrafields in form first)
+            // global $extrafields;
+            //if (! is_object($extrafields))
+            //{
+                require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+                $extrafields = new ExtraFields($this->db);
+            //}
+
+            // Load array of extrafields for elementype = $this->table_element
+            if (empty($extrafields->attributes[$this->table_element]['loaded']))
+            {
+                $extrafields->fetch_name_optionals_label($this->table_element);
+            }
+            $optionsArray = (! empty($extrafields->attributes[$this->table_element]['label'])?$extrafields->attributes[$this->table_element]['label']:null);
+        }
+        else
+        {
+            global $extrafields;
+            dol_syslog("Warning: fetch_optionals was called with param optionsArray defined when you should pass null now", LOG_WARNING);
+        }
+
+        $table_element = $this->table_element;
+        if ($table_element == 'categorie') $table_element = 'categories'; // For compatibility
+
+        // Request to get complementary values
+        if (is_array($optionsArray) && count($optionsArray) > 0)
+        {
+            $sql = "SELECT rowid";
+            foreach ($optionsArray as $name => $label)
+            {
+                if (empty($extrafields->attributes[$this->table_element]['type'][$name]) || $extrafields->attributes[$this->table_element]['type'][$name] != 'separate')
+                {
+                    $sql.= ", ".$name;
+                }
+            }
+            $sql.= " FROM ".MAIN_DB_PREFIX.$table_element."_extrafields";
+            $sql.= " WHERE fk_object = ".$rowid;
+
+            //dol_syslog(get_class($this)."::fetch_optionals get extrafields data for ".$this->table_element, LOG_DEBUG);		// Too verbose
+            $resql=$this->db->query($sql);
+            if ($resql)
+            {
+                $this->array_options = array();
+                $numrows=$this->db->num_rows($resql);
+                if ($numrows)
+                {
+                    $tab = $this->db->fetch_array($resql);
+
+                    foreach ($tab as $key => $value)
+                    {
+                        // Test fetch_array ! is_int($key) because fetch_array result is a mix table with Key as alpha and Key as int (depend db engine)
+                        if ($key != 'rowid' && $key != 'tms' && $key != 'fk_member' && ! is_int($key))
+                        {
+                            // we can add this attribute to object
+                            if (! empty($extrafields) && in_array($extrafields->attributes[$this->table_element]['type'][$key], array('date','datetime')))
+                            {
+                                //var_dump($extrafields->attributes[$this->table_element]['type'][$key]);
+                                $this->array_options["options_".$key]=$this->db->jdate($value);
+                            }
+                            else
+                            {
+                                $this->array_options["options_".$key]=$value;
+                            }
+
+                            //var_dump('key '.$key.' '.$value.' type='.$extrafields->attributes[$this->table_element]['type'][$key].' '.$this->array_options["options_".$key]);
+                        }
+                    }
+                }
+
+                $this->db->free($resql);
+
+                if ($numrows) return $numrows;
+                else return 0;
+            }
+            else
+            {
+                dol_print_error($this->db);
+                return -1;
+            }
+        }
+        return 0;
+    }
+
+    /**
+     *	Delete all extra fields values for the current object.
+     *
+     *  @return	int		<0 if KO, >0 if OK
+     */
+    function deleteExtraFields()
+    {
+        $this->db->begin();
+
+        $table_element = $this->table_element;
+        if ($table_element == 'categorie') $table_element = 'categories'; // For compatibility
+
+        $sql_del = "DELETE FROM ".MAIN_DB_PREFIX.$table_element."_extrafields WHERE fk_object = ".$this->id;
+        dol_syslog(get_class($this)."::deleteExtraFields delete", LOG_DEBUG);
+        $resql=$this->db->query($sql_del);
+        if (! $resql)
+        {
+            $this->error=$this->db->lasterror();
+            $this->db->rollback();
+            return -1;
+        }
+        else
+        {
+            $this->db->commit();
+            return 1;
+        }
+    }
+
+    /**
+     *	Add/Update all extra fields values for the current object.
+     *  Data to describe values to insert/update are stored into $this->array_options=array('options_codeforfield1'=>'valueforfield1', 'options_codeforfield2'=>'valueforfield2', ...)
+     *  This function delete record with all extrafields and insert them again from the array $this->array_options.
+     *
+     *  @param	string		$trigger		If defined, call also the trigger (for example COMPANY_MODIFY)
+     *  @param	User		$userused		Object user
+     *  @return int 						-1=error, O=did nothing, 1=OK
+     *  @see updateExtraField, setValueFrom
+     */
+    function insertExtraFields($trigger='', $userused=null)
+    {
+        global $conf,$langs,$user;
+
+        if (empty($userused)) $userused=$user;
+
+        $error=0;
+
+        if (! empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) return 0;	// For avoid conflicts if trigger used
+
+        if (! empty($this->array_options))
+        {
+            // Check parameters
+            $langs->load('admin');
+            require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+            $extrafields = new ExtraFields($this->db);
+            $target_extrafields=$extrafields->fetch_name_optionals_label($this->table_element);
+
+            //Eliminate copied source object extra_fields that do not exist in target object
+            $new_array_options=array();
+            foreach ($this->array_options as $key => $value) {
+                if (in_array(substr($key,8), array_keys($target_extrafields)))	// We remove the 'options_' from $key for test
+                    $new_array_options[$key] = $value;
+                elseif (in_array($key, array_keys($target_extrafields)))		// We test on $key that does not contains the 'options_' prefix
+                    $new_array_options['options_'.$key] = $value;
+            }
+
+            foreach($new_array_options as $key => $value)
+            {
+                    $attributeKey      = substr($key,8);   // Remove 'options_' prefix
+                    $attributeType     = $extrafields->attributes[$this->table_element]['type'][$attributeKey];
+                    $attributeLabel    = $extrafields->attributes[$this->table_element]['label'][$attributeKey];
+                    $attributeParam    = $extrafields->attributes[$this->table_element]['param'][$attributeKey];
+                    $attributeRequired = $extrafields->attributes[$this->table_element]['required'][$attributeKey];
+
+                    if ($attributeRequired)
+                    {
+                        $mandatorypb=false;
+                        if ($attributeType == 'link' && $this->array_options[$key] == '-1') $mandatorypb=true;
+                        if ($this->array_options[$key] === '') $mandatorypb=true;
+                        if ($mandatorypb)
+                        {
+                            dol_syslog($this->error);
+                            $this->errors[]=$langs->trans('ErrorFieldRequired', $attributeLabel);
+                            return -1;
+                        }
+                    }
+
+                //dol_syslog("attributeLabel=".$attributeLabel, LOG_DEBUG);
+                //dol_syslog("attributeType=".$attributeType, LOG_DEBUG);
+
+                    switch ($attributeType)
+                    {
+                        case 'int':
+                          if (!is_numeric($value) && $value!='')
+                            {
+                                $this->errors[]=$langs->trans("ExtraFieldHasWrongValue", $attributeLabel);
+                                return -1;
+                            }
+                            elseif ($value=='')
+                            {
+                                $new_array_options[$key] = null;
+                            }
+                            break;
+                    case 'double':
+                        $value = price2num($value);
+                        if (!is_numeric($value) && $value!='')
+                        {
+                            dol_syslog($langs->trans("ExtraFieldHasWrongValue")." sur ".$attributeLabel."(".$value."is not '".$attributeType."')", LOG_DEBUG);
+                            $this->errors[]=$langs->trans("ExtraFieldHasWrongValue", $attributeLabel);
+                            return -1;
+                        }
+                        elseif ($value=='')
+                        {
+                            $new_array_options[$key] = null;
+                        }
+                        //dol_syslog("double value"." sur ".$attributeLabel."(".$value." is '".$attributeType."')", LOG_DEBUG);
+                        $new_array_options[$key] = $value;
+                        break;
+                        /*case 'select':	// Not required, we chosed value='0' for undefined values
+             			if ($value=='-1')
+             			{
+             				$this->array_options[$key] = null;
+             			}
+             			break;*/
+                        case 'password':
+                           $algo='';
+                            if ($this->array_options[$key] != '' && is_array($extrafields->attributes[$this->table_element]['param'][$attributeKey]['options']))
+                            {
+                                // If there is an encryption choice, we use it to crypt data before insert
+                                $tmparrays = array_keys($extrafields->attributes[$this->table_element]['param'][$attributeKey]['options']);
+                                $algo=reset($tmparrays);
+                                if ($algo != '')
+                                {
+                                    //global $action;		// $action may be 'create', 'update', 'update_extras'...
+                                    //var_dump($action);
+                                    //var_dump($this->oldcopy);exit;
+                                    if (is_object($this->oldcopy))		// If this->oldcopy is not defined, we can't know if we change attribute or not, so we must keep value
+                                    {
+                                        //var_dump($this->oldcopy->array_options[$key]); var_dump($this->array_options[$key]);
+                                        if ($this->array_options[$key] == $this->oldcopy->array_options[$key])	// If old value crypted in database is same than submited new value, it means we don't change it, so we don't update.
+                                        {
+                                            $new_array_options[$key] = $this->array_options[$key];	// Value is kept
+                                        }
+                                    else
+                                    {
+                                        // var_dump($algo);
+                                        $newvalue = dol_hash($this->array_options[$key], $algo);
+                                        $new_array_options[$key] = $newvalue;
+                                    }
+                                    }
+                                    else
+                                    {
+                                        $new_array_options[$key] = $this->array_options[$key];	// Value is kept
+                                    }
+                                }
+                            }
+                            else	// Common usage
+                            {
+                                $new_array_options[$key] = $this->array_options[$key];
+                            }
+                            break;
+                        case 'price':
+                        $new_array_options[$key] = price2num($this->array_options[$key]);
+                        break;
+                    case 'date':
+                        $new_array_options[$key] = $this->db->idate($this->array_options[$key]);
+                        break;
+                    case 'datetime':
+                        // If data is a string instead of a timestamp, we convert it
+                        if (! is_int($this->array_options[$key])) {
+                            $this->array_options[$key] = strtotime($this->array_options[$key]);
+                        }
+                        $new_array_options[$key] = $this->db->idate($this->array_options[$key]);
+                        break;
+                        case 'link':
+                        $param_list=array_keys($attributeParam['options']);
+                        // 0 : ObjectName
+                        // 1 : classPath
+                        $InfoFieldList = explode(":", $param_list[0]);
+                        dol_include_once($InfoFieldList[1]);
+                        if ($InfoFieldList[0] && class_exists($InfoFieldList[0]))
+                        {
+                            if ($value == '-1')	// -1 is key for no defined in combo list of objects
+                            {
+                                $new_array_options[$key]='';
+                            }
+                            elseif ($value)
+                            {
+                                $object = new $InfoFieldList[0]($this->db);
+                                if (is_numeric($value)) $res=$object->fetch($value);
+                                else $res=$object->fetch('',$value);
+
+                                if ($res > 0) $new_array_options[$key]=$object->id;
+                                else
+                                {
+                                    $this->error="Id/Ref '".$value."' for object '".$object->element."' not found";
+                                    $this->db->rollback();
+                                    return -1;
+                                }
+                            }
+                        }
+                        else
+                        {
+                            dol_syslog('Error bad setup of extrafield', LOG_WARNING);
+                        }
+                        break;
+                    }
+            }
+
+            $this->db->begin();
+
+            $table_element = $this->table_element;
+            if ($table_element == 'categorie') $table_element = 'categories'; // For compatibility
+
+            $sql_del = "DELETE FROM ".MAIN_DB_PREFIX.$table_element."_extrafields WHERE fk_object = ".$this->id;
+            dol_syslog(get_class($this)."::insertExtraFields delete", LOG_DEBUG);
+            $this->db->query($sql_del);
+
+            $sql = "INSERT INTO ".MAIN_DB_PREFIX.$table_element."_extrafields (fk_object";
+            foreach($new_array_options as $key => $value)
+            {
+                $attributeKey = substr($key,8);   // Remove 'options_' prefix
+                // Add field of attribut
+                if ($extrafields->attributes[$this->table_element]['type'][$attributeKey] != 'separate') // Only for other type than separator
+                    $sql.=",".$attributeKey;
+            }
+            $sql .= ") VALUES (".$this->id;
+
+            foreach($new_array_options as $key => $value)
+            {
+                $attributeKey = substr($key,8);   // Remove 'options_' prefix
+                // Add field of attribute
+                if ($extrafields->attributes[$this->table_element]['type'][$attributeKey] != 'separate') // Only for other type than separator)
+                {
+                    if ($new_array_options[$key] != '')
+                    {
+                        $sql.=",'".$this->db->escape($new_array_options[$key])."'";
+                    }
+                    else
+                    {
+                        $sql.=",null";
+                    }
+                }
+            }
+            $sql.=")";
+
+            dol_syslog(get_class($this)."::insertExtraFields insert", LOG_DEBUG);
+            $resql = $this->db->query($sql);
+            if (! $resql)
+            {
+                $this->error=$this->db->lasterror();
+                $error++;
+            }
+
+            if (! $error && $trigger)
+            {
+                // Call trigger
+                $this->context=array('extrafieldaddupdate'=>1);
+                $result=$this->call_trigger($trigger, $userused);
+                if ($result < 0) $error++;
+                // End call trigger
+            }
+
+            if ($error)
+            {
+                $this->db->rollback();
+                return -1;
+            }
+            else
+            {
+                $this->db->commit();
+                return 1;
+            }
+        }
+        else return 0;
+    }
+
+    /**
+     *	Update an extra field value for the current object.
+     *  Data to describe values to update are stored into $this->array_options=array('options_codeforfield1'=>'valueforfield1', 'options_codeforfield2'=>'valueforfield2', ...)
+     *
+     *  @param  string      $key    		Key of the extrafield (without starting 'options_')
+     *  @param	string		$trigger		If defined, call also the trigger (for example COMPANY_MODIFY)
+     *  @param	User		$userused		Object user
+     *  @return int                 		-1=error, O=did nothing, 1=OK
+     *  @see setValueFrom, insertExtraFields
+     */
+    function updateExtraField($key, $trigger=null, $userused=null)
+    {
+        global $conf,$langs,$user;
+
+        if (empty($userused)) $userused=$user;
+
+        $error=0;
+
+        if (! empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) return 0;	// For avoid conflicts if trigger used
+
+        if (! empty($this->array_options) && isset($this->array_options["options_".$key]))
+        {
+            // Check parameters
+            $langs->load('admin');
+            require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+            $extrafields = new ExtraFields($this->db);
+            $target_extrafields=$extrafields->fetch_name_optionals_label($this->table_element);
+
+            $value=$this->array_options["options_".$key];
+
+            $attributeType     = $extrafields->attributes[$this->table_element]['type'][$key];
+            $attributeLabel    = $extrafields->attributes[$this->table_element]['label'][$key];
+            $attributeParam    = $extrafields->attributes[$this->table_element]['param'][$key];
+            $attributeRequired = $extrafields->attributes[$this->table_element]['required'][$key];
+
+            //dol_syslog("attributeLabel=".$attributeLabel, LOG_DEBUG);
+            //dol_syslog("attributeType=".$attributeType, LOG_DEBUG);
+
+            switch ($attributeType)
+            {
+                case 'int':
+                    if (!is_numeric($value) && $value!='')
+                    {
+                        $this->errors[]=$langs->trans("ExtraFieldHasWrongValue",$attributeLabel);
+                        return -1;
+                    }
+                    elseif ($value=='')
+                    {
+                        $this->array_options["options_".$key] = null;
+                    }
+                    break;
+                case 'double':
+                    $value = price2num($value);
+                    if (!is_numeric($value) && $value!='')
+                    {
+                        dol_syslog($langs->trans("ExtraFieldHasWrongValue")." sur ".$attributeLabel."(".$value."is not '".$attributeType."')", LOG_DEBUG);
+                        $this->errors[]=$langs->trans("ExtraFieldHasWrongValue", $attributeLabel);
+                        return -1;
+                    }
+                    elseif ($value=='')
+                    {
+                        $this->array_options["options_".$key] = null;
+                    }
+                    //dol_syslog("double value"." sur ".$attributeLabel."(".$value." is '".$attributeType."')", LOG_DEBUG);
+                    $this->array_options["options_".$key] = $value;
+                    break;
+                    /*case 'select':	// Not required, we chosed value='0' for undefined values
+             		if ($value=='-1')
+             		{
+             			$this->array_options[$key] = null;
+             		}
+             		break;*/
+                case 'price':
+                    $this->array_options["options_".$key] = price2num($this->array_options["options_".$key]);
+                    break;
+                case 'date':
+                    $this->array_options["options_".$key]=$this->db->idate($this->array_options["options_".$key]);
+                    break;
+                case 'datetime':
+                    $this->array_options["options_".$key]=$this->db->idate($this->array_options["options_".$key]);
+                    break;
+                case 'link':
+                    $param_list=array_keys($attributeParam['options']);
+                    // 0 : ObjectName
+                    // 1 : classPath
+                    $InfoFieldList = explode(":", $param_list[0]);
+                    dol_include_once($InfoFieldList[1]);
+                    if ($value)
+                    {
+                        $object = new $InfoFieldList[0]($this->db);
+                        $object->fetch(0,$value);
+                        $this->array_options["options_".$key]=$object->id;
+                    }
+                    break;
+            }
+
+            $this->db->begin();
+            $sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element."_extrafields SET ".$key."='".$this->db->escape($this->array_options["options_".$key])."'";
+            $sql .= " WHERE fk_object = ".$this->id;
+            $resql = $this->db->query($sql);
+            if (! $resql)
+            {
+                $error++;
+                $this->error=$this->db->lasterror();
+            }
+
+            if (! $error && $trigger)
+            {
+                // Call trigger
+                $this->context=array('extrafieldupdate'=>1);
+                $result=$this->call_trigger($trigger, $userused);
+                if ($result < 0) $error++;
+                // End call trigger
+            }
+
+            if ($error)
+            {
+                dol_syslog(get_class($this) . "::".__METHOD__ . $this->error, LOG_ERR);
+                $this->db->rollback();
+                return -1;
+            }
+            else
+            {
+                $this->db->commit();
+                return 1;
+            }
+        }
+        else return 0;
+    }
+
+
+    /**
+     * Return HTML string to put an input field into a page
+     * Code very similar with showInputField of extra fields
+     *
+     * @param  array   		$val	       Array of properties for field to show
+     * @param  string  		$key           Key of attribute
+     * @param  string  		$value         Preselected value to show (for date type it must be in timestamp format, for amount or price it must be a php numeric value)
+     * @param  string  		$moreparam     To add more parameters on html input tag
+     * @param  string  		$keysuffix     Prefix string to add into name and id of field (can be used to avoid duplicate names)
+     * @param  string  		$keyprefix     Suffix string to add into name and id of field (can be used to avoid duplicate names)
+     * @param  string|int		$morecss       Value for css to define style/length of field. May also be a numeric.
+     * @return string
+     */
+    function showInputField($val, $key, $value, $moreparam='', $keysuffix='', $keyprefix='', $morecss=0)
+    {
+        global $conf,$langs,$form;
+
+        if (! is_object($form))
+        {
+            require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
+            $form=new Form($this->db);
+        }
+
+        $val=$this->fields[$key];
+
+        $out='';
+        $type='';
+        $param = array();
+        $param['options']=array();
+        $size =$this->fields[$key]['size'];
+        // Because we work on extrafields
+        if(preg_match('/^integer:(.*):(.*)/i', $val['type'], $reg)){
+            $param['options']=array($reg[1].':'.$reg[2]=>'N');
+            $type ='link';
+        } elseif(preg_match('/^link:(.*):(.*)/i', $val['type'], $reg)) {
+            $param['options']=array($reg[1].':'.$reg[2]=>'N');
+            $type ='link';
+        } elseif(preg_match('/^sellist:(.*):(.*):(.*):(.*)/i', $val['type'], $reg)) {
+            $param['options']=array($reg[1].':'.$reg[2].':'.$reg[3].':'.$reg[4]=>'N');
+            $type ='sellist';
+        } elseif(preg_match('/varchar\((\d+)\)/', $val['type'],$reg)) {
+            $param['options']=array();
+            $type ='varchar';
+            $size=$reg[1];
+        } elseif(preg_match('/varchar/', $val['type'])) {
+            $param['options']=array();
+            $type ='varchar';
+        } elseif(is_array($this->fields[$key]['arrayofkeyval'])) {
+            $param['options']=$this->fields[$key]['arrayofkeyval'];
+            $type ='select';
+        } else {
+            $param['options']=array();
+            $type =$this->fields[$key]['type'];
+        }
+
+        $label=$this->fields[$key]['label'];
+        //$elementtype=$this->fields[$key]['elementtype'];	// Seems not used
+        $default=$this->fields[$key]['default'];
+        $computed=$this->fields[$key]['computed'];
+        $unique=$this->fields[$key]['unique'];
+        $required=$this->fields[$key]['required'];
+
+        $langfile=$this->fields[$key]['langfile'];
+        $list=$this->fields[$key]['list'];
+        $hidden=abs($this->fields[$key]['visible'])!=1?1:0;
+
+        $objectid = $this->id;
+
+
+        if ($computed)
+        {
+            if (! preg_match('/^search_/', $keyprefix)) return '<span class="opacitymedium">'.$langs->trans("AutomaticallyCalculated").'</span>';
+            else return '';
+        }
+
+
+        // Use in priority showsize from parameters, then $val['css'] then autodefine
+        if (empty($morecss) && ! empty($val['css']))
+        {
+            $showsize = $val['css'];
+        }
+        if (empty($morecss))
+        {
+            if ($type == 'date')
+            {
+                $morecss = 'minwidth100imp';
+            }
+            elseif ($type == 'datetime')
+            {
+                $morecss = 'minwidth200imp';
+            }
+            elseif (in_array($type,array('int','integer','price')) || preg_match('/^double(\([0-9],[0-9]\)){0,1}/',$type))
+            {
+                $morecss = 'maxwidth75';
+                        }elseif ($type == 'url')
+            {
+                $morecss='minwidth400';
+            }
+            elseif ($type == 'boolean')
+            {
+                $morecss='';
+            }
+            else
+            {
+                if (round($size) < 12)
+                {
+                    $morecss = 'minwidth100';
+                }
+                else if (round($size) <= 48)
+                {
+                    $morecss = 'minwidth200';
+                }
+                else
+                {
+                    $morecss = 'minwidth400';
+                }
+            }
+        }
+
+        if (in_array($type,array('date','datetime')))
+        {
+            $tmp=explode(',',$size);
+            $newsize=$tmp[0];
+
+            $showtime = in_array($type,array('datetime')) ? 1 : 0;
+
+            // Do not show current date when field not required (see selectDate() method)
+            if (!$required && $value == '') $value = '-1';
+
+            // TODO Must also support $moreparam
+            $out = $form->selectDate($value, $keyprefix.$key.$keysuffix, $showtime, $showtime, $required, '', 1, (($keyprefix != 'search_' && $keyprefix != 'search_options_') ? 1 : 0), 0, 1);
+        }
+        elseif (in_array($type,array('int','integer')))
+        {
+            $tmp=explode(',',$size);
+            $newsize=$tmp[0];
+            $out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$newsize.'" value="'.dol_escape_htmltag($value).'"'.($moreparam?$moreparam:'').'>';
+        }
+        elseif (preg_match('/varchar/', $type))
+        {
+            $out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$size.'" value="'.dol_escape_htmltag($value).'"'.($moreparam?$moreparam:'').'>';
+        }
+        elseif (in_array($type, array('mail', 'phone', 'url')))
+        {
+            $out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam?$moreparam:'').'>';
+        }
+        elseif ($type == 'text')
+        {
+            if (! preg_match('/search_/', $keyprefix))		// If keyprefix is search_ or search_options_, we must just use a simple text field
+            {
+                require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+                $doleditor=new DolEditor($keyprefix.$key.$keysuffix,$value,'',200,'dolibarr_notes','In',false,false,false,ROWS_5,'90%');
+                $out=$doleditor->Create(1);
+            }
+            else
+            {
+                $out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam?$moreparam:'').'>';
+            }
+        }
+        elseif ($type == 'html')
+        {
+            if (! preg_match('/search_/', $keyprefix))		// If keyprefix is search_ or search_options_, we must just use a simple text field
+            {
+                require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+                $doleditor=new DolEditor($keyprefix.$key.$keysuffix,$value,'',200,'dolibarr_notes','In',false,false,! empty($conf->fckeditor->enabled) && $conf->global->FCKEDITOR_ENABLE_SOCIETE,ROWS_5,'90%');
+                $out=$doleditor->Create(1);
+            }
+            else
+            {
+                $out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam?$moreparam:'').'>';
+            }
+        }
+        elseif ($type == 'boolean')
+        {
+            $checked='';
+            if (!empty($value)) {
+                $checked=' checked value="1" ';
+            } else {
+                $checked=' value="1" ';
+            }
+            $out='<input type="checkbox" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.$checked.' '.($moreparam?$moreparam:'').'>';
+        }
+        elseif ($type == 'price')
+        {
+            if (!empty($value)) {		// $value in memory is a php numeric, we format it into user number format.
+                $value=price($value);
+            }
+            $out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam?$moreparam:'').'> '.$langs->getCurrencySymbol($conf->currency);
+        }
+        elseif (preg_match('/^double(\([0-9],[0-9]\)){0,1}/',$type))
+        {
+            if (!empty($value)) {		// $value in memory is a php numeric, we format it into user number format.
+                $value=price($value);
+            }
+            $out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam?$moreparam:'').'> ';
+        }
+        elseif ($type == 'select')
+        {
+            $out = '';
+            if (! empty($conf->use_javascript_ajax) && ! empty($conf->global->MAIN_EXTRAFIELDS_USE_SELECT2))
+            {
+                include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
+                $out.= ajax_combobox($keyprefix.$key.$keysuffix, array(), 0);
+            }
+
+            $out.='<select class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam?$moreparam:'').'>';
+                if((! isset($this->fields[$key]['default'])) ||($this->fields[$key]['notnull']!=1))$out.='<option value="0">&nbsp;</option>';
+            foreach ($param['options'] as $key => $val)
+            {
+                if ((string) $key == '') continue;
+                list($val, $parent) = explode('|', $val);
+                $out.='<option value="'.$key.'"';
+                $out.= (((string) $value == (string) $key)?' selected':'');
+                $out.= (!empty($parent)?' parent="'.$parent.'"':'');
+                $out.='>'.$val.'</option>';
+            }
+            $out.='</select>';
+        }
+        elseif ($type == 'sellist')
+        {
+            $out = '';
+            if (! empty($conf->use_javascript_ajax) && ! empty($conf->global->MAIN_EXTRAFIELDS_USE_SELECT2))
+            {
+                include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
+                $out.= ajax_combobox($keyprefix.$key.$keysuffix, array(), 0);
+            }
+
+            $out.='<select class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam?$moreparam:'').'>';
+            if (is_array($param['options']))
+            {
+                $param_list=array_keys($param['options']);
+                $InfoFieldList = explode(":", $param_list[0]);
+                $parentName='';
+                $parentField='';
+                // 0 : tableName
+                // 1 : label field name
+                // 2 : key fields name (if differ of rowid)
+                // 3 : key field parent (for dependent lists)
+                // 4 : where clause filter on column or table extrafield, syntax field='value' or extra.field=value
+                $keyList=(empty($InfoFieldList[2])?'rowid':$InfoFieldList[2].' as rowid');
+
+
+                if (count($InfoFieldList) > 4 && ! empty($InfoFieldList[4]))
+                {
+                    if (strpos($InfoFieldList[4], 'extra.') !== false)
+                    {
+                        $keyList='main.'.$InfoFieldList[2].' as rowid';
+                    } else {
+                        $keyList=$InfoFieldList[2].' as rowid';
+                    }
+                }
+                if (count($InfoFieldList) > 3 && ! empty($InfoFieldList[3]))
+                {
+                    list($parentName, $parentField) = explode('|', $InfoFieldList[3]);
+                    $keyList.= ', '.$parentField;
+                }
+
+                $fields_label = explode('|',$InfoFieldList[1]);
+                if (is_array($fields_label))
+                {
+                    $keyList .=', ';
+                    $keyList .= implode(', ', $fields_label);
+                }
+
+                $sqlwhere='';
+                $sql = 'SELECT '.$keyList;
+                $sql.= ' FROM '.MAIN_DB_PREFIX .$InfoFieldList[0];
+                if (!empty($InfoFieldList[4]))
+                {
+                    // can use SELECT request
+                    if (strpos($InfoFieldList[4], '$SEL$')!==false) {
+                        $InfoFieldList[4]=str_replace('$SEL$','SELECT',$InfoFieldList[4]);
+                    }
+
+                    // current object id can be use into filter
+                    if (strpos($InfoFieldList[4], '$ID$')!==false && !empty($objectid)) {
+                        $InfoFieldList[4]=str_replace('$ID$',$objectid,$InfoFieldList[4]);
+                    } else {
+                        $InfoFieldList[4]=str_replace('$ID$','0',$InfoFieldList[4]);
+                    }
+                    //We have to join on extrafield table
+                    if (strpos($InfoFieldList[4], 'extra')!==false)
+                    {
+                        $sql.= ' as main, '.MAIN_DB_PREFIX .$InfoFieldList[0].'_extrafields as extra';
+                        $sqlwhere.= ' WHERE extra.fk_object=main.'.$InfoFieldList[2]. ' AND '.$InfoFieldList[4];
+                    }
+                    else
+                    {
+                        $sqlwhere.= ' WHERE '.$InfoFieldList[4];
+                    }
+                }
+                else
+                {
+                    $sqlwhere.= ' WHERE 1=1';
+                }
+                // Some tables may have field, some other not. For the moment we disable it.
+                if (in_array($InfoFieldList[0],array('tablewithentity')))
+                {
+                    $sqlwhere.= ' AND entity = '.$conf->entity;
+                }
+                $sql.=$sqlwhere;
+                //print $sql;
+
+                $sql .= ' ORDER BY ' . implode(', ', $fields_label);
+
+                dol_syslog(get_class($this).'::showInputField type=sellist', LOG_DEBUG);
+                $resql = $this->db->query($sql);
+                if ($resql)
+                {
+                    $out.='<option value="0">&nbsp;</option>';
+                    $num = $this->db->num_rows($resql);
+                    $i = 0;
+                    while ($i < $num)
+                    {
+                        $labeltoshow='';
+                        $obj = $this->db->fetch_object($resql);
+
+                        // Several field into label (eq table:code|libelle:rowid)
+                        $notrans = false;
+                        $fields_label = explode('|',$InfoFieldList[1]);
+                        if (is_array($fields_label))
+                        {
+                            $notrans = true;
+                            foreach ($fields_label as $field_toshow)
+                            {
+                                $labeltoshow.= $obj->$field_toshow.' ';
+                            }
+                        }
+                        else
+                        {
+                            $labeltoshow=$obj->{$InfoFieldList[1]};
+                        }
+                        $labeltoshow=dol_trunc($labeltoshow,45);
+
+                        if ($value == $obj->rowid)
+                        {
+                            foreach ($fields_label as $field_toshow)
+                            {
+                                $translabel=$langs->trans($obj->$field_toshow);
+                                if ($translabel!=$obj->$field_toshow) {
+                                    $labeltoshow=dol_trunc($translabel,18).' ';
+                                }else {
+                                    $labeltoshow=dol_trunc($obj->$field_toshow,18).' ';
+                                }
+                            }
+                            $out.='<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
+                        }
+                        else
+                        {
+                            if (! $notrans)
+                            {
+                                $translabel=$langs->trans($obj->{$InfoFieldList[1]});
+                                if ($translabel!=$obj->{$InfoFieldList[1]}) {
+                                    $labeltoshow=dol_trunc($translabel,18);
+                                }
+                                else {
+                                    $labeltoshow=dol_trunc($obj->{$InfoFieldList[1]},18);
+                                }
+                            }
+                            if (empty($labeltoshow)) $labeltoshow='(not defined)';
+                            if ($value==$obj->rowid)
+                            {
+                                $out.='<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
+                            }
+
+                            if (!empty($InfoFieldList[3]) && $parentField)
+                            {
+                                $parent = $parentName.':'.$obj->{$parentField};
+                            }
+
+                            $out.='<option value="'.$obj->rowid.'"';
+                            $out.= ($value==$obj->rowid?' selected':'');
+                            $out.= (!empty($parent)?' parent="'.$parent.'"':'');
+                            $out.='>'.$labeltoshow.'</option>';
+                        }
+
+                        $i++;
+                    }
+                    $this->db->free($resql);
+                }
+                else {
+                    print 'Error in request '.$sql.' '.$this->db->lasterror().'. Check setup of extra parameters.<br>';
+                }
+            }
+            $out.='</select>';
+        }
+        elseif ($type == 'checkbox')
+        {
+            $value_arr=explode(',',$value);
+            $out=$form->multiselectarray($keyprefix.$key.$keysuffix, (empty($param['options'])?null:$param['options']), $value_arr, '', 0, '', 0, '100%');
+        }
+        elseif ($type == 'radio')
+        {
+            $out='';
+            foreach ($param['options'] as $keyopt => $val)
+            {
+                $out.='<input class="flat '.$morecss.'" type="radio" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam?$moreparam:'');
+                $out.=' value="'.$keyopt.'"';
+                $out.=' id="'.$keyprefix.$key.$keysuffix.'_'.$keyopt.'"';
+                $out.= ($value==$keyopt?'checked':'');
+                $out.='/><label for="'.$keyprefix.$key.$keysuffix.'_'.$keyopt.'">'.$val.'</label><br>';
+            }
+        }
+        elseif ($type == 'chkbxlst')
+        {
+            if (is_array($value)) {
+                $value_arr = $value;
+            }
+            else {
+                $value_arr = explode(',', $value);
+            }
+
+            if (is_array($param['options'])) {
+                $param_list = array_keys($param['options']);
+                $InfoFieldList = explode(":", $param_list[0]);
+                $parentName='';
+                $parentField='';
+                // 0 : tableName
+                // 1 : label field name
+                // 2 : key fields name (if differ of rowid)
+                // 3 : key field parent (for dependent lists)
+                // 4 : where clause filter on column or table extrafield, syntax field='value' or extra.field=value
+                $keyList = (empty($InfoFieldList[2]) ? 'rowid' : $InfoFieldList[2] . ' as rowid');
+
+                if (count($InfoFieldList) > 3 && ! empty($InfoFieldList[3])) {
+                    list ( $parentName, $parentField ) = explode('|', $InfoFieldList[3]);
+                    $keyList .= ', ' . $parentField;
+                }
+                if (count($InfoFieldList) > 4 && ! empty($InfoFieldList[4])) {
+                    if (strpos($InfoFieldList[4], 'extra.') !== false) {
+                        $keyList = 'main.' . $InfoFieldList[2] . ' as rowid';
+                    } else {
+                        $keyList = $InfoFieldList[2] . ' as rowid';
+                    }
+                }
+
+                $fields_label = explode('|', $InfoFieldList[1]);
+                if (is_array($fields_label)) {
+                    $keyList .= ', ';
+                    $keyList .= implode(', ', $fields_label);
+                }
+
+                $sqlwhere = '';
+                $sql = 'SELECT ' . $keyList;
+                $sql .= ' FROM ' . MAIN_DB_PREFIX . $InfoFieldList[0];
+                if (! empty($InfoFieldList[4])) {
+
+                    // can use SELECT request
+                    if (strpos($InfoFieldList[4], '$SEL$')!==false) {
+                        $InfoFieldList[4]=str_replace('$SEL$','SELECT',$InfoFieldList[4]);
+                    }
+
+                    // current object id can be use into filter
+                    if (strpos($InfoFieldList[4], '$ID$')!==false && !empty($objectid)) {
+                        $InfoFieldList[4]=str_replace('$ID$',$objectid,$InfoFieldList[4]);
+                    } else {
+                        $InfoFieldList[4]=str_replace('$ID$','0',$InfoFieldList[4]);
+                    }
+
+                    // We have to join on extrafield table
+                    if (strpos($InfoFieldList[4], 'extra') !== false) {
+                        $sql .= ' as main, ' . MAIN_DB_PREFIX . $InfoFieldList[0] . '_extrafields as extra';
+                        $sqlwhere .= ' WHERE extra.fk_object=main.' . $InfoFieldList[2] . ' AND ' . $InfoFieldList[4];
+                    } else {
+                        $sqlwhere .= ' WHERE ' . $InfoFieldList[4];
+                    }
+                } else {
+                    $sqlwhere .= ' WHERE 1=1';
+                }
+                // Some tables may have field, some other not. For the moment we disable it.
+                if (in_array($InfoFieldList[0], array ('tablewithentity')))
+                {
+                    $sqlwhere .= ' AND entity = ' . $conf->entity;
+                }
+                // $sql.=preg_replace('/^ AND /','',$sqlwhere);
+                // print $sql;
+
+                $sql .= $sqlwhere;
+                dol_syslog(get_class($this) . '::showInputField type=chkbxlst',LOG_DEBUG);
+                $resql = $this->db->query($sql);
+                if ($resql) {
+                    $num = $this->db->num_rows($resql);
+                    $i = 0;
+
+                    $data=array();
+
+                    while ( $i < $num ) {
+                        $labeltoshow = '';
+                        $obj = $this->db->fetch_object($resql);
+
+                        $notrans = false;
+                        // Several field into label (eq table:code|libelle:rowid)
+                        $fields_label = explode('|', $InfoFieldList[1]);
+                        if (is_array($fields_label)) {
+                            $notrans = true;
+                            foreach ( $fields_label as $field_toshow ) {
+                                $labeltoshow .= $obj->$field_toshow . ' ';
+                            }
+                        } else {
+                            $labeltoshow = $obj->{$InfoFieldList[1]};
+                        }
+                        $labeltoshow = dol_trunc($labeltoshow, 45);
+
+                        if (is_array($value_arr) && in_array($obj->rowid, $value_arr)) {
+                            foreach ( $fields_label as $field_toshow ) {
+                                $translabel = $langs->trans($obj->$field_toshow);
+                                if ($translabel != $obj->$field_toshow) {
+                                    $labeltoshow = dol_trunc($translabel, 18) . ' ';
+                                } else {
+                                    $labeltoshow = dol_trunc($obj->$field_toshow, 18) . ' ';
+                                }
+                            }
+
+                            $data[$obj->rowid]=$labeltoshow;
+                        } else {
+                            if (! $notrans) {
+                                $translabel = $langs->trans($obj->{$InfoFieldList[1]});
+                                if ($translabel != $obj->{$InfoFieldList[1]}) {
+                                    $labeltoshow = dol_trunc($translabel, 18);
+                                } else {
+                                    $labeltoshow = dol_trunc($obj->{$InfoFieldList[1]}, 18);
+                                }
+                            }
+                            if (empty($labeltoshow))
+                                $labeltoshow = '(not defined)';
+
+                                if (is_array($value_arr) && in_array($obj->rowid, $value_arr)) {
+                                    $data[$obj->rowid]=$labeltoshow;
+                                }
+
+                                if (! empty($InfoFieldList[3]) && $parentField) {
+                                    $parent = $parentName . ':' . $obj->{$parentField};
+                                }
+
+                                $data[$obj->rowid]=$labeltoshow;
+                        }
+
+                        $i ++;
+                    }
+                    $this->db->free($resql);
+
+                    $out=$form->multiselectarray($keyprefix.$key.$keysuffix, $data, $value_arr, '', 0, '', 0, '100%');
+                } else {
+                    print 'Error in request ' . $sql . ' ' . $this->db->lasterror() . '. Check setup of extra parameters.<br>';
+                }
+            }
+        }
+        elseif ($type == 'link')
+        {
+            $param_list=array_keys($param['options']);				// $param_list='ObjectName:classPath'
+            $showempty=(($required && $default != '')?0:1);
+            $out=$form->selectForForms($param_list[0], $keyprefix.$key.$keysuffix, $value, $showempty);
+            if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
+            {
+                        list($class,$classfile)=explode(':',$param_list[0]);
+                        if (file_exists(dol_buildpath(dirname(dirname($classfile)).'/card.php'))) $url_path=dol_buildpath(dirname(dirname($classfile)).'/card.php',1);
+                        else $url_path=dol_buildpath(dirname(dirname($classfile)).'/'.$class.'_card.php',1);
+                        $out.='<a class="butActionNew" href="'.$url_path.'?action=create&backtopage='.$_SERVER['PHP_SELF'].'"><span class="fa fa-plus-circle valignmiddle"></span></a>';
+                        // TODO Add Javascript code to add input fields contents to new elements urls
+            }
+        }
+        elseif ($type == 'password')
+        {
+            // If prefix is 'search_', field is used as a filter, we use a common text field.
+            $out='<input type="'.($keyprefix=='search_'?'text':'password').'" class="flat '.$morecss.'" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam?$moreparam:'').'>';
+        }
+        elseif ($type == 'array')
+        {
+            $newval = $val;
+            $newval['type'] = 'varchar(256)';
+
+            $out='';
+
+            $inputs = array();
+            if(! empty($value)) {
+                foreach($value as $option) {
+                    $out.= '<span><a class="'.dol_escape_htmltag($keyprefix.$key.$keysuffix).'_del" href="javascript:;"><span class="fa fa-minus-circle valignmiddle"></span></a> ';
+                    $out.= $this->showInputField($newval, $keyprefix.$key.$keysuffix.'[]', $option, $moreparam, '', '', $showsize).'<br></span>';
+                }
+            }
+
+            $out.= '<a id="'.dol_escape_htmltag($keyprefix.$key.$keysuffix).'_add" href="javascript:;"><span class="fa fa-plus-circle valignmiddle"></span></a>';
+
+            $newInput = '<span><a class="'.dol_escape_htmltag($keyprefix.$key.$keysuffix).'_del" href="javascript:;"><span class="fa fa-minus-circle valignmiddle"></span></a> ';
+            $newInput.= $this->showInputField($newval, $keyprefix.$key.$keysuffix.'[]', '', $moreparam, '', '', $showsize).'<br></span>';
+
+            if(! empty($conf->use_javascript_ajax)) {
+                $out.= '
+					<script type="text/javascript">
+					$(document).ready(function() {
+						$("a#'.dol_escape_js($keyprefix.$key.$keysuffix).'_add").click(function() {
+							$("'.dol_escape_js($newInput).'").insertBefore(this);
+						});
+
+						$(document).on("click", "a.'.dol_escape_js($keyprefix.$key.$keysuffix).'_del", function() {
+							$(this).parent().remove();
+						});
+					});
+					</script>';
+            }
+        }
+        if (!empty($hidden)) {
+            $out='<input type="hidden" value="'.$value.'" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'"/>';
+        }
+        /* Add comments
+		 if ($type == 'date') $out.=' (YYYY-MM-DD)';
+		 elseif ($type == 'datetime') $out.=' (YYYY-MM-DD HH:MM:SS)';
+		 */
+        return $out;
+    }
+
+    /**
+     * Return HTML string to show a field into a page
+     * Code very similar with showOutputField of extra fields
+     *
+     * @param  array   $val		       Array of properties of field to show
+     * @param  string  $key            Key of attribute
+     * @param  string  $value          Preselected value to show (for date type it must be in timestamp format, for amount or price it must be a php numeric value)
+     * @param  string  $moreparam      To add more parametes on html input tag
+     * @param  string  $keysuffix      Prefix string to add into name and id of field (can be used to avoid duplicate names)
+     * @param  string  $keyprefix      Suffix string to add into name and id of field (can be used to avoid duplicate names)
+     * @param  mixed   $showsize       Value for css to define size. May also be a numeric.
+     * @return string
+     */
+    function showOutputField($val, $key, $value, $moreparam='', $keysuffix='', $keyprefix='', $showsize=0)
+    {
+        global $conf,$langs,$form;
+
+        if (! is_object($form))
+        {
+            require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
+            $form=new Form($this->db);
+        }
+
+        $objectid = $this->id;
+        $label = $val['label'];
+        $type  = $val['type'];
+        $size  = $val['css'];
+
+        // Convert var to be able to share same code than showOutputField of extrafields
+        if (preg_match('/varchar\((\d+)\)/', $type, $reg))
+        {
+            $type = 'varchar';		// convert varchar(xx) int varchar
+            $size = $reg[1];
+        }
+        elseif (preg_match('/varchar/', $type)) $type = 'varchar';		// convert varchar(xx) int varchar
+        if (is_array($val['arrayofkeyval'])) $type='select';
+        if (preg_match('/^integer:(.*):(.*)/i', $val['type'], $reg)) $type='link';
+
+        $default=$val['default'];
+        $computed=$val['computed'];
+        $unique=$val['unique'];
+        $required=$val['required'];
+        $param=$val['param'];
+        if (is_array($val['arrayofkeyval'])) $param['options'] = $val['arrayofkeyval'];
+        if (preg_match('/^integer:(.*):(.*)/i', $val['type'], $reg))
+        {
+            $type='link';
+            $param['options']=array($reg[1].':'.$reg[2]=>$reg[1].':'.$reg[2]);
+        }
+        $langfile=$val['langfile'];
+        $list=$val['list'];
+        $help=$val['help'];
+        $hidden=(($val['visible'] == 0) ? 1 : 0);			// If zero, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
+
+        if ($hidden) return '';
+
+        // If field is a computed field, value must become result of compute
+        if ($computed)
+        {
+            // Make the eval of compute string
+            //var_dump($computed);
+            $value = dol_eval($computed, 1, 0);
+        }
+
+        if (empty($showsize))
+        {
+            if ($type == 'date')
+            {
+                //$showsize=10;
+                $showsize = 'minwidth100imp';
+            }
+            elseif ($type == 'datetime')
+            {
+                //$showsize=19;
+                $showsize = 'minwidth200imp';
+            }
+            elseif (in_array($type,array('int','double','price')))
+            {
+                //$showsize=10;
+                $showsize = 'maxwidth75';
+            }
+            elseif ($type == 'url')
+            {
+                $showsize='minwidth400';
+            }
+            elseif ($type == 'boolean')
+            {
+                $showsize='';
+            }
+            else
+            {
+                if (round($size) < 12)
+                {
+                    $showsize = 'minwidth100';
+                }
+                else if (round($size) <= 48)
+                {
+                    $showsize = 'minwidth200';
+                }
+                else
+                {
+                    //$showsize=48;
+                    $showsize = 'minwidth400';
+                }
+            }
+        }
+
+        // Format output value differently according to properties of field
+        if ($key == 'ref' && method_exists($this, 'getNomUrl')) $value=$this->getNomUrl(1, '', 0, '', 1);
+        elseif ($key == 'status' && method_exists($this, 'getLibStatut')) $value=$this->getLibStatut(3);
+        elseif ($type == 'date')
+        {
+            if(! empty($value)) {
+                $value=dol_print_date($value,'day');
+            } else {
+                $value='';
+            }
+        }
+        elseif ($type == 'datetime')
+        {
+            if(! empty($value)) {
+                $value=dol_print_date($value,'dayhour');
+            } else {
+                $value='';
+            }
+        }
+        elseif ($type == 'double')
+        {
+            if (!empty($value)) {
+                $value=price($value);
+            }
+        }
+        elseif ($type == 'boolean')
+        {
+            $checked='';
+            if (!empty($value)) {
+                $checked=' checked ';
+            }
+            $value='<input type="checkbox" '.$checked.' '.($moreparam?$moreparam:'').' readonly disabled>';
+        }
+        elseif ($type == 'mail')
+        {
+            $value=dol_print_email($value,0,0,0,64,1,1);
+        }
+        elseif ($type == 'url')
+        {
+            $value=dol_print_url($value,'_blank',32,1);
+        }
+        elseif ($type == 'phone')
+        {
+            $value=dol_print_phone($value, '', 0, 0, '', '&nbsp;', 1);
+        }
+        elseif ($type == 'price')
+        {
+            $value=price($value,0,$langs,0,0,-1,$conf->currency);
+        }
+        elseif ($type == 'select')
+        {
+            $value=$param['options'][$value];
+        }
+        elseif ($type == 'sellist')
+        {
+            $param_list=array_keys($param['options']);
+            $InfoFieldList = explode(":", $param_list[0]);
+
+            $selectkey="rowid";
+            $keyList='rowid';
+
+            if (count($InfoFieldList)>=3)
+            {
+                $selectkey = $InfoFieldList[2];
+                $keyList=$InfoFieldList[2].' as rowid';
+            }
+
+            $fields_label = explode('|',$InfoFieldList[1]);
+            if(is_array($fields_label)) {
+                $keyList .=', ';
+                $keyList .= implode(', ', $fields_label);
+            }
+
+            $sql = 'SELECT '.$keyList;
+            $sql.= ' FROM '.MAIN_DB_PREFIX .$InfoFieldList[0];
+            if (strpos($InfoFieldList[4], 'extra')!==false)
+            {
+                $sql.= ' as main';
+            }
+            if ($selectkey=='rowid' && empty($value)) {
+                $sql.= " WHERE ".$selectkey."=0";
+            } elseif ($selectkey=='rowid') {
+                $sql.= " WHERE ".$selectkey."=".$this->db->escape($value);
+            }else {
+                $sql.= " WHERE ".$selectkey."='".$this->db->escape($value)."'";
+            }
+
+            //$sql.= ' AND entity = '.$conf->entity;
+
+            dol_syslog(get_class($this).':showOutputField:$type=sellist', LOG_DEBUG);
+            $resql = $this->db->query($sql);
+            if ($resql)
+            {
+                $value='';	// value was used, so now we reste it to use it to build final output
+
+                $obj = $this->db->fetch_object($resql);
+
+                // Several field into label (eq table:code|libelle:rowid)
+                $fields_label = explode('|',$InfoFieldList[1]);
+
+                if(is_array($fields_label) && count($fields_label)>1)
+                {
+                    foreach ($fields_label as $field_toshow)
+                    {
+                        $translabel='';
+                        if (!empty($obj->$field_toshow)) {
+                            $translabel=$langs->trans($obj->$field_toshow);
+                        }
+                        if ($translabel!=$field_toshow) {
+                            $value.=dol_trunc($translabel,18).' ';
+                        }else {
+                            $value.=$obj->$field_toshow.' ';
+                        }
+                    }
+                }
+                else
+                {
+                    $translabel='';
+                    if (!empty($obj->{$InfoFieldList[1]})) {
+                        $translabel=$langs->trans($obj->{$InfoFieldList[1]});
+                    }
+                    if ($translabel!=$obj->{$InfoFieldList[1]}) {
+                        $value=dol_trunc($translabel,18);
+                    }else {
+                        $value=$obj->{$InfoFieldList[1]};
+                    }
+                }
+            }
+            else dol_syslog(get_class($this).'::showOutputField error '.$this->db->lasterror(), LOG_WARNING);
+        }
+        elseif ($type == 'radio')
+        {
+            $value=$param['options'][$value];
+        }
+        elseif ($type == 'checkbox')
+        {
+            $value_arr=explode(',',$value);
+            $value='';
+            if (is_array($value_arr) && count($value_arr)>0)
+            {
+                foreach ($value_arr as $keyval=>$valueval) {
+                    $toprint[]='<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$param['options'][$valueval].'</li>';
+                }
+                $value='<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';
+            }
+        }
+        elseif ($type == 'chkbxlst')
+        {
+            $value_arr = explode(',', $value);
+
+            $param_list = array_keys($param['options']);
+            $InfoFieldList = explode(":", $param_list[0]);
+
+            $selectkey = "rowid";
+            $keyList = 'rowid';
+
+            if (count($InfoFieldList) >= 3) {
+                $selectkey = $InfoFieldList[2];
+                $keyList = $InfoFieldList[2] . ' as rowid';
+            }
+
+            $fields_label = explode('|', $InfoFieldList[1]);
+            if (is_array($fields_label)) {
+                $keyList .= ', ';
+                $keyList .= implode(', ', $fields_label);
+            }
+
+            $sql = 'SELECT ' . $keyList;
+            $sql .= ' FROM ' . MAIN_DB_PREFIX . $InfoFieldList[0];
+            if (strpos($InfoFieldList[4], 'extra') !== false) {
+                $sql .= ' as main';
+            }
+            // $sql.= " WHERE ".$selectkey."='".$this->db->escape($value)."'";
+            // $sql.= ' AND entity = '.$conf->entity;
+
+            dol_syslog(get_class($this) . ':showOutputField:$type=chkbxlst',LOG_DEBUG);
+            $resql = $this->db->query($sql);
+            if ($resql) {
+                $value = ''; // value was used, so now we reste it to use it to build final output
+                $toprint=array();
+                while ( $obj = $this->db->fetch_object($resql) ) {
+
+                    // Several field into label (eq table:code|libelle:rowid)
+                    $fields_label = explode('|', $InfoFieldList[1]);
+                    if (is_array($value_arr) && in_array($obj->rowid, $value_arr)) {
+                        if (is_array($fields_label) && count($fields_label) > 1) {
+                            foreach ( $fields_label as $field_toshow ) {
+                                $translabel = '';
+                                if (! empty($obj->$field_toshow)) {
+                                    $translabel = $langs->trans($obj->$field_toshow);
+                                }
+                                if ($translabel != $field_toshow) {
+                                    $toprint[]='<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.dol_trunc($translabel, 18).'</li>';
+                                } else {
+                                    $toprint[]='<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$obj->$field_toshow.'</li>';
+                                }
+                            }
+                        } else {
+                            $translabel = '';
+                            if (! empty($obj->{$InfoFieldList[1]})) {
+                                $translabel = $langs->trans($obj->{$InfoFieldList[1]});
+                            }
+                            if ($translabel != $obj->{$InfoFieldList[1]}) {
+                                $toprint[]='<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.dol_trunc($translabel, 18).'</li>';
+                            } else {
+                                $toprint[]='<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$obj->{$InfoFieldList[1]}.'</li>';
+                            }
+                        }
+                    }
+                }
+                $value='<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';
+            } else {
+                dol_syslog(get_class($this) . '::showOutputField error ' . $this->db->lasterror(), LOG_WARNING);
+            }
+        }
+        elseif ($type == 'link')
+        {
+            $out='';
+
+            // only if something to display (perf)
+            if ($value)
+            {
+                $param_list=array_keys($param['options']);				// $param_list='ObjectName:classPath'
+
+                $InfoFieldList = explode(":", $param_list[0]);
+                $classname=$InfoFieldList[0];
+                $classpath=$InfoFieldList[1];
+                $getnomurlparam=(empty($InfoFieldList[2]) ? 3 : $InfoFieldList[2]);
+                if (! empty($classpath))
+                {
+                    dol_include_once($InfoFieldList[1]);
+                    if ($classname && class_exists($classname))
+                    {
+                        $object = new $classname($this->db);
+                        $object->fetch($value);
+                        $value=$object->getNomUrl($getnomurlparam);
+                    }
+                }
+                else
+                {
+                    dol_syslog('Error bad setup of extrafield', LOG_WARNING);
+                    return 'Error bad setup of extrafield';
+                }
+            }
+            else $value='';
+        }
+        elseif ($type == 'text' || $type == 'html')
+        {
+            $value=dol_htmlentitiesbr($value);
+        }
+        elseif ($type == 'password')
+        {
+            $value=preg_replace('/./i','*',$value);
+        }
+        elseif ($type == 'array')
+        {
+            $value = implode('<br>', $value);
+        }
+
+        //print $type.'-'.$size;
+        $out=$value;
+
+        return $out;
+    }
+
+
+    /**
+     * Function to show lines of extrafields with output datas
+     *
+     * @param 	Extrafields $extrafields    Extrafield Object
+     * @param 	string      $mode           Show output (view) or input (edit) for extrafield
+     * @param 	array       $params         Optional parameters. Example: array('style'=>'class="oddeven"', 'colspan'=>$colspan)
+     * @param 	string      $keysuffix      Suffix string to add after name and id of field (can be used to avoid duplicate names)
+     * @param 	string      $keyprefix      Prefix string to add before name and id of field (can be used to avoid duplicate names)
+     * @param	string		$onetrtd		All fields in same tr td
+     * @return 	string
+     */
+    function showOptionals($extrafields, $mode='view', $params=null, $keysuffix='', $keyprefix='', $onetrtd=0)
+    {
+        global $db, $conf, $langs, $action, $form;
+
+        if (! is_object($form)) $form=new Form($db);
+
+        $out = '';
+
+        if (is_array($extrafields->attributes[$this->table_element]['label']) && count($extrafields->attributes[$this->table_element]['label']) > 0)
+        {
+            $out .= "\n";
+            $out .= '<!-- showOptionalsInput --> ';
+            $out .= "\n";
+
+            $e = 0;
+            foreach($extrafields->attributes[$this->table_element]['label'] as $key=>$label)
+            {
+                // Show only the key field in params
+                if (is_array($params) && array_key_exists('onlykey',$params) && $key != $params['onlykey']) continue;
+
+                $enabled = 1;
+                if ($enabled && isset($extrafields->attributes[$this->table_element]['list'][$key]))
+                {
+                    $enabled = dol_eval($extrafields->attributes[$this->table_element]['list'][$key], 1);
+                }
+
+                $perms = 1;
+                if ($perms && isset($extrafields->attributes[$this->table_element]['perms'][$key]))
+                {
+                    $perms = dol_eval($extrafields->attributes[$this->table_element]['perms'][$key], 1);
+                }
+
+                if (($mode == 'create' || $mode == 'edit') && abs($enabled) != 1 && abs($enabled) != 3) continue;	// <> -1 and <> 1 and <> 3 = not visible on forms, only on list
+                if (empty($perms)) continue;
+
+                // Load language if required
+                if (! empty($extrafields->attributes[$this->table_element]['langfile'][$key])) $langs->load($extrafields->attributes[$this->table_element]['langfile'][$key]);
+
+                $colspan='3';
+                if (is_array($params) && count($params)>0) {
+                    if (array_key_exists('colspan',$params)) {
+                        $colspan=$params['colspan'];
+                    }
+                }
+
+                switch($mode) {
+                    case "view":
+                        $value=$this->array_options["options_".$key.$keysuffix];
+                        break;
+                    case "edit":
+                        $getposttemp = GETPOST($keyprefix.'options_'.$key.$keysuffix, 'none');				// GETPOST can get value from GET, POST or setup of default values.
+                        // GETPOST("options_" . $key) can be 'abc' or array(0=>'abc')
+                        if (is_array($getposttemp) || $getposttemp != '' || GETPOSTISSET($keyprefix.'options_'.$key.$keysuffix))
+                        {
+                            if (is_array($getposttemp)) {
+                                // $getposttemp is an array but following code expects a comma separated string
+                                $value = implode(",", $getposttemp);
+                            } else {
+                                $value = $getposttemp;
+                            }
+                        } else {
+                            $value = $this->array_options["options_" . $key];			// No GET, no POST, no default value, so we take value of object.
+                        }
+                        //var_dump($keyprefix.' - '.$key.' - '.$keysuffix.' - '.$keyprefix.'options_'.$key.$keysuffix.' - '.$this->array_options["options_".$key.$keysuffix].' - '.$getposttemp.' - '.$value);
+                        break;
+                }
+
+                if ($extrafields->attributes[$this->table_element]['type'][$key] == 'separate')
+                {
+                    $out .= $extrafields->showSeparator($key, $this);
+                }
+                else
+                {
+                    $csstyle='';
+                    $class=(!empty($extrafields->attributes[$this->table_element]['hidden'][$key]) ? 'hideobject ' : '');
+                    if (is_array($params) && count($params)>0) {
+                        if (array_key_exists('style',$params)) {
+                            $csstyle=$params['style'];
+                        }
+                    }
+
+                    // add html5 elements
+                    $domData  = ' data-element="extrafield"';
+                    $domData .= ' data-targetelement="'.$this->element.'"';
+                    $domData .= ' data-targetid="'.$this->id.'"';
+
+                    $html_id = !empty($this->id) ? 'extrarow-'.$this->element.'_'.$key.'_'.$this->id : '';
+
+                    $out .= '<tr id="'.$html_id.'" '.$csstyle.' class="'.$class.$this->element.'_extras_'.$key.'" '.$domData.' >';
+
+                    if (! empty($conf->global->MAIN_EXTRAFIELDS_USE_TWO_COLUMS) && ($e % 2) == 0)
+                    {
+                        if (! empty($conf->global->MAIN_EXTRAFIELDS_USE_TWO_COLUMS) && ($e % 2) == 0) { $colspan='0'; }
+                    }
+
+                    if ($action == 'selectlines') { $colspan++; }
+
+                    // Convert date into timestamp format (value in memory must be a timestamp)
+                    if (in_array($extrafields->attributes[$this->table_element]['type'][$key],array('date','datetime')))
+                    {
+                        $datenotinstring = $this->array_options['options_' . $key];
+                        if (! is_numeric($this->array_options['options_' . $key]))	// For backward compatibility
+                        {
+                            $datenotinstring = $this->db->jdate($datenotinstring);
+                        }
+                        $value = GETPOSTISSET($keyprefix.'options_'.$key.$keysuffix)?dol_mktime(GETPOST($keyprefix.'options_'.$key.$keysuffix."hour", 'int', 3), GETPOST($keyprefix.'options_'.$key.$keysuffix."min",'int',3), 0, GETPOST($keyprefix.'options_'.$key.$keysuffix."month",'int',3), GETPOST($keyprefix.'options_'.$key.$keysuffix."day",'int',3), GETPOST($keyprefix.'options_'.$key.$keysuffix."year",'int',3)):$datenotinstring;
+                    }
+                    // Convert float submited string into real php numeric (value in memory must be a php numeric)
+                    if (in_array($extrafields->attributes[$this->table_element]['type'][$key],array('price','double')))
+                    {
+                        $value = GETPOSTISSET($keyprefix.'options_'.$key.$keysuffix)?price2num(GETPOST($keyprefix.'options_'.$key.$keysuffix, 'alpha', 3)):$this->array_options['options_'.$key];
+                    }
+
+                    $labeltoshow = $langs->trans($label);
+
+                    $out .= '<td class="titlefield';
+                    if (GETPOST('action','none') == 'create') $out.='create';
+                    if ($mode != 'view' && ! empty($extrafields->attributes[$this->table_element]['required'][$key])) $out .= ' fieldrequired';
+                    $out .= '">';
+                    if (! empty($extrafields->attributes[$object->table_element]['help'][$key])) $out .= $form->textwithpicto($labeltoshow, $extrafields->attributes[$object->table_element]['help'][$key]);
+                    else $out .= $labeltoshow;
+                    $out .= '</td>';
+
+                    $html_id = !empty($this->id) ? $this->element.'_extras_'.$key.'_'.$this->id : '';
+                    $out .='<td id="'.$html_id.'" class="'.$this->element.'_extras_'.$key.'" '.($colspan?' colspan="'.$colspan.'"':'').'>';
+
+                    switch($mode) {
+                        case "view":
+                            $out .= $extrafields->showOutputField($key, $value);
+                            break;
+                        case "edit":
+                            $out .= $extrafields->showInputField($key, $value, '', $keysuffix, '', 0, $this->id);
+                            break;
+                    }
+
+                    $out .= '</td>';
+
+                    if (! empty($conf->global->MAIN_EXTRAFIELDS_USE_TWO_COLUMS) && (($e % 2) == 1)) $out .= '</tr>';
+                    else $out .= '</tr>';
+                    $e++;
+                }
+            }
+            $out .= "\n";
+            // Add code to manage list depending on others
+            if (! empty($conf->use_javascript_ajax)) {
+                $out .= '
+				<script type="text/javascript">
+				    jQuery(document).ready(function() {
+				    	function showOptions(child_list, parent_list)
+				    	{
+				    		var val = $("select[name=\"options_"+parent_list+"\"]").val();
+				    		var parentVal = parent_list + ":" + val;
+							if(val > 0) {
+					    		$("select[name=\""+child_list+"\"] option[parent]").hide();
+					    		$("select[name=\""+child_list+"\"] option[parent=\""+parentVal+"\"]").show();
+							} else {
+								$("select[name=\""+child_list+"\"] option").show();
 							}
+				    	}
+						function setListDependencies() {
+					    	jQuery("select option[parent]").parent().each(function() {
+					    		var child_list = $(this).attr("name");
+								var parent = $(this).find("option[parent]:first").attr("parent");
+								var infos = parent.split(":");
+								var parent_list = infos[0];
+								$("select[name=\""+parent_list+"\"]").change(function() {
+									showOptions(child_list, parent_list);
+								});
+					    	});
+						}
 
-							if (!empty($InfoFieldList[3]) && $parentField)
-							{
-								$parent = $parentName.':'.$obj->{$parentField};
-							}
+						setListDependencies();
+				    });
+				</script>'."\n";
+                $out .= '<!-- /showOptionalsInput --> '."\n";
+            }
+        }
+        return $out;
+    }
 
-							$out.='<option value="'.$obj->rowid.'"';
-							$out.= ($value==$obj->rowid?' selected':'');
-							$out.= (!empty($parent)?' parent="'.$parent.'"':'');
-							$out.='>'.$labeltoshow.'</option>';
-						}
 
-						$i++;
-					}
-					$this->db->free($resql);
-				}
-				else {
-					print 'Error in request '.$sql.' '.$this->db->lasterror().'. Check setup of extra parameters.<br>';
-				}
-			}
-			$out.='</select>';
-		}
-		elseif ($type == 'checkbox')
-		{
-			$value_arr=explode(',',$value);
-			$out=$form->multiselectarray($keyprefix.$key.$keysuffix, (empty($param['options'])?null:$param['options']), $value_arr, '', 0, '', 0, '100%');
-		}
-		elseif ($type == 'radio')
-		{
-			$out='';
-			foreach ($param['options'] as $keyopt => $val)
-			{
-				$out.='<input class="flat '.$morecss.'" type="radio" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam?$moreparam:'');
-				$out.=' value="'.$keyopt.'"';
-				$out.=' id="'.$keyprefix.$key.$keysuffix.'_'.$keyopt.'"';
-				$out.= ($value==$keyopt?'checked':'');
-				$out.='/><label for="'.$keyprefix.$key.$keysuffix.'_'.$keyopt.'">'.$val.'</label><br>';
-			}
-		}
-		elseif ($type == 'chkbxlst')
-		{
-			if (is_array($value)) {
-				$value_arr = $value;
-			}
-			else {
-				$value_arr = explode(',', $value);
-			}
-
-			if (is_array($param['options'])) {
-				$param_list = array_keys($param['options']);
-				$InfoFieldList = explode(":", $param_list[0]);
-				$parentName='';
-				$parentField='';
-				// 0 : tableName
-				// 1 : label field name
-				// 2 : key fields name (if differ of rowid)
-				// 3 : key field parent (for dependent lists)
-				// 4 : where clause filter on column or table extrafield, syntax field='value' or extra.field=value
-				$keyList = (empty($InfoFieldList[2]) ? 'rowid' : $InfoFieldList[2] . ' as rowid');
-
-				if (count($InfoFieldList) > 3 && ! empty($InfoFieldList[3])) {
-					list ( $parentName, $parentField ) = explode('|', $InfoFieldList[3]);
-					$keyList .= ', ' . $parentField;
-				}
-				if (count($InfoFieldList) > 4 && ! empty($InfoFieldList[4])) {
-					if (strpos($InfoFieldList[4], 'extra.') !== false) {
-						$keyList = 'main.' . $InfoFieldList[2] . ' as rowid';
-					} else {
-						$keyList = $InfoFieldList[2] . ' as rowid';
-					}
-				}
+    /**
+     * Returns the rights used for this class
+     * @return stdClass
+     */
+    public function getRights()
+    {
+        global $user;
 
-				$fields_label = explode('|', $InfoFieldList[1]);
-				if (is_array($fields_label)) {
-					$keyList .= ', ';
-					$keyList .= implode(', ', $fields_label);
-				}
+        $element = $this->element;
+        if ($element == 'facturerec') $element='facture';
 
-				$sqlwhere = '';
-				$sql = 'SELECT ' . $keyList;
-				$sql .= ' FROM ' . MAIN_DB_PREFIX . $InfoFieldList[0];
-				if (! empty($InfoFieldList[4])) {
-
-					// can use SELECT request
-					if (strpos($InfoFieldList[4], '$SEL$')!==false) {
-						$InfoFieldList[4]=str_replace('$SEL$','SELECT',$InfoFieldList[4]);
-					}
-
-					// current object id can be use into filter
-					if (strpos($InfoFieldList[4], '$ID$')!==false && !empty($objectid)) {
-						$InfoFieldList[4]=str_replace('$ID$',$objectid,$InfoFieldList[4]);
-					} else {
-						$InfoFieldList[4]=str_replace('$ID$','0',$InfoFieldList[4]);
-					}
-
-					// We have to join on extrafield table
-					if (strpos($InfoFieldList[4], 'extra') !== false) {
-						$sql .= ' as main, ' . MAIN_DB_PREFIX . $InfoFieldList[0] . '_extrafields as extra';
-						$sqlwhere .= ' WHERE extra.fk_object=main.' . $InfoFieldList[2] . ' AND ' . $InfoFieldList[4];
-					} else {
-						$sqlwhere .= ' WHERE ' . $InfoFieldList[4];
-					}
-				} else {
-					$sqlwhere .= ' WHERE 1=1';
-				}
-				// Some tables may have field, some other not. For the moment we disable it.
-				if (in_array($InfoFieldList[0], array ('tablewithentity')))
-				{
-					$sqlwhere .= ' AND entity = ' . $conf->entity;
-				}
-				// $sql.=preg_replace('/^ AND /','',$sqlwhere);
-				// print $sql;
-
-				$sql .= $sqlwhere;
-				dol_syslog(get_class($this) . '::showInputField type=chkbxlst',LOG_DEBUG);
-				$resql = $this->db->query($sql);
-				if ($resql) {
-					$num = $this->db->num_rows($resql);
-					$i = 0;
-
-					$data=array();
-
-					while ( $i < $num ) {
-						$labeltoshow = '';
-						$obj = $this->db->fetch_object($resql);
-
-						$notrans = false;
-						// Several field into label (eq table:code|libelle:rowid)
-						$fields_label = explode('|', $InfoFieldList[1]);
-						if (is_array($fields_label)) {
-							$notrans = true;
-							foreach ( $fields_label as $field_toshow ) {
-								$labeltoshow .= $obj->$field_toshow . ' ';
-							}
-						} else {
-							$labeltoshow = $obj->{$InfoFieldList[1]};
-						}
-						$labeltoshow = dol_trunc($labeltoshow, 45);
-
-						if (is_array($value_arr) && in_array($obj->rowid, $value_arr)) {
-							foreach ( $fields_label as $field_toshow ) {
-								$translabel = $langs->trans($obj->$field_toshow);
-								if ($translabel != $obj->$field_toshow) {
-									$labeltoshow = dol_trunc($translabel, 18) . ' ';
-								} else {
-									$labeltoshow = dol_trunc($obj->$field_toshow, 18) . ' ';
-								}
-							}
+        return $user->rights->{$element};
+    }
 
-							$data[$obj->rowid]=$labeltoshow;
-						} else {
-							if (! $notrans) {
-								$translabel = $langs->trans($obj->{$InfoFieldList[1]});
-								if ($translabel != $obj->{$InfoFieldList[1]}) {
-									$labeltoshow = dol_trunc($translabel, 18);
-								} else {
-									$labeltoshow = dol_trunc($obj->{$InfoFieldList[1]}, 18);
-								}
-							}
-							if (empty($labeltoshow))
-								$labeltoshow = '(not defined)';
+    /**
+     * Function used to replace a thirdparty id with another one.
+     * This function is meant to be called from replaceThirdparty with the appropiate tables
+     * Column name fk_soc MUST be used to identify thirdparties
+     *
+     * @param  DoliDB 	   $db 			  Database handler
+     * @param  int 		   $origin_id     Old thirdparty id (the thirdparty to delete)
+     * @param  int 		   $dest_id       New thirdparty id (the thirdparty that will received element of the other)
+     * @param  string[]    $tables        Tables that need to be changed
+     * @param  int         $ignoreerrors  Ignore errors. Return true even if errors. We need this when replacement can fails like for categories (categorie of old thirdparty may already exists on new one)
+     * @return bool						  True if success, False if error
+     */
+    public static function commonReplaceThirdparty(DoliDB $db, $origin_id, $dest_id, array $tables, $ignoreerrors=0)
+    {
+        foreach ($tables as $table)
+        {
+            $sql = 'UPDATE '.MAIN_DB_PREFIX.$table.' SET fk_soc = '.$dest_id.' WHERE fk_soc = '.$origin_id;
 
-								if (is_array($value_arr) && in_array($obj->rowid, $value_arr)) {
-									$data[$obj->rowid]=$labeltoshow;
-								}
+            if (! $db->query($sql))
+            {
+                if ($ignoreerrors) return true;		// TODO Not enough. If there is A-B on kept thirdarty and B-C on old one, we must get A-B-C after merge. Not A-B.
+                //$this->errors = $db->lasterror();
+                return false;
+            }
+        }
 
-								if (! empty($InfoFieldList[3]) && $parentField) {
-									$parent = $parentName . ':' . $obj->{$parentField};
-								}
+        return true;
+    }
 
-								$data[$obj->rowid]=$labeltoshow;
-						}
+    /**
+     * Get buy price to use for margin calculation. This function is called when buy price is unknown.
+     *	 Set buy price = sell price if ForceBuyingPriceIfNull configured,
+     *   else if calculation MARGIN_TYPE = 'costprice' and costprice is defined, use costprice as buyprice
+     *	 else if calculation MARGIN_TYPE = 'pmp' and pmp is calculated, use pmp as buyprice
+     *	 else set min buy price as buy price
+     *
+     * @param float		$unitPrice		 Product unit price
+     * @param float		$discountPercent Line discount percent
+     * @param int		$fk_product		 Product id
+     * @return	float                    <0 if KO, buyprice if OK
+     */
+    public function defineBuyPrice($unitPrice = 0.0, $discountPercent = 0.0, $fk_product = 0)
+    {
+        global $conf;
 
-						$i ++;
-					}
-					$this->db->free($resql);
+        $buyPrice = 0;
 
-					$out=$form->multiselectarray($keyprefix.$key.$keysuffix, $data, $value_arr, '', 0, '', 0, '100%');
-				} else {
-					print 'Error in request ' . $sql . ' ' . $this->db->lasterror() . '. Check setup of extra parameters.<br>';
-				}
-			}
-		}
-		elseif ($type == 'link')
-		{
-			$param_list=array_keys($param['options']);				// $param_list='ObjectName:classPath'
-			$showempty=(($required && $default != '')?0:1);
-			$out=$form->selectForForms($param_list[0], $keyprefix.$key.$keysuffix, $value, $showempty);
-			if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
-			{
-            			list($class,$classfile)=explode(':',$param_list[0]);
-            			if (file_exists(dol_buildpath(dirname(dirname($classfile)).'/card.php'))) $url_path=dol_buildpath(dirname(dirname($classfile)).'/card.php',1);
-            			else $url_path=dol_buildpath(dirname(dirname($classfile)).'/'.$class.'_card.php',1);
-            			$out.='<a class="butActionNew" href="'.$url_path.'?action=create&backtopage='.$_SERVER['PHP_SELF'].'"><span class="fa fa-plus-circle valignmiddle"></span></a>';
-            			// TODO Add Javascript code to add input fields contents to new elements urls
-			}
-		}
-		elseif ($type == 'password')
-		{
-			// If prefix is 'search_', field is used as a filter, we use a common text field.
-			$out='<input type="'.($keyprefix=='search_'?'text':'password').'" class="flat '.$morecss.'" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam?$moreparam:'').'>';
-		}
-		elseif ($type == 'array')
-		{
-			$newval = $val;
-			$newval['type'] = 'varchar(256)';
-
-			$out='';
-
-			$inputs = array();
-			if(! empty($value)) {
-				foreach($value as $option) {
-					$out.= '<span><a class="'.dol_escape_htmltag($keyprefix.$key.$keysuffix).'_del" href="javascript:;"><span class="fa fa-minus-circle valignmiddle"></span></a> ';
-					$out.= $this->showInputField($newval, $keyprefix.$key.$keysuffix.'[]', $option, $moreparam, '', '', $showsize).'<br></span>';
-				}
-			}
+        if (($unitPrice > 0) && (isset($conf->global->ForceBuyingPriceIfNull) && $conf->global->ForceBuyingPriceIfNull == 1)) // In most cases, test here is false
+        {
+            $buyPrice = $unitPrice * (1 - $discountPercent / 100);
+        }
+        else
+        {
+            // Get cost price for margin calculation
+            if (! empty($fk_product))
+            {
+                if (isset($conf->global->MARGIN_TYPE) && $conf->global->MARGIN_TYPE == 'costprice')
+                {
+                    require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+                    $product = new Product($this->db);
+                    $result = $product->fetch($fk_product);
+                    if ($result <= 0)
+                    {
+                        $this->errors[] = 'ErrorProductIdDoesNotExists';
+                        return -1;
+                    }
+                    if ($product->cost_price > 0)
+                    {
+                        $buyPrice = $product->cost_price;
+                    }
+                    else if ($product->pmp > 0)
+                    {
+                        $buyPrice = $product->pmp;
+                    }
+                }
+                else if (isset($conf->global->MARGIN_TYPE) && $conf->global->MARGIN_TYPE == 'pmp')
+                {
+                    require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+                    $product = new Product($this->db);
+                    $result = $product->fetch($fk_product);
+                    if ($result <= 0)
+                    {
+                        $this->errors[] = 'ErrorProductIdDoesNotExists';
+                        return -1;
+                    }
+                    if ($product->pmp > 0)
+                    {
+                        $buyPrice = $product->pmp;
+                    }
+                }
+
+                if (empty($buyPrice) && isset($conf->global->MARGIN_TYPE) && in_array($conf->global->MARGIN_TYPE, array('1','pmp','costprice')))
+                {
+                    require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
+                    $productFournisseur = new ProductFournisseur($this->db);
+                    if (($result = $productFournisseur->find_min_price_product_fournisseur($fk_product)) > 0)
+                    {
+                        $buyPrice = $productFournisseur->fourn_unitprice;
+                    }
+                    else if ($result < 0)
+                    {
+                        $this->errors[] = $productFournisseur->error;
+                        return -2;
+                    }
+                }
+            }
+        }
+        return $buyPrice;
+    }
 
-			$out.= '<a id="'.dol_escape_htmltag($keyprefix.$key.$keysuffix).'_add" href="javascript:;"><span class="fa fa-plus-circle valignmiddle"></span></a>';
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
+    /**
+     *  Show photos of an object (nbmax maximum), into several columns
+     *
+     *  @param		string	$modulepart		'product', 'ticket', ...
+     *  @param      string	$sdir        	Directory to scan (full absolute path)
+     *  @param      int		$size        	0=original size, 1='small' use thumbnail if possible
+     *  @param      int		$nbmax       	Nombre maximum de photos (0=pas de max)
+     *  @param      int		$nbbyrow     	Number of image per line or -1 to use div. Used only if size=1.
+     * 	@param		int		$showfilename	1=Show filename
+     * 	@param		int		$showaction		1=Show icon with action links (resize, delete)
+     * 	@param		int		$maxHeight		Max height of original image when size='small' (so we can use original even if small requested). If 0, always use 'small' thumb image.
+     * 	@param		int		$maxWidth		Max width of original image when size='small'
+     *  @param      int     $nolink         Do not add a href link to view enlarged imaged into a new tab
+     *  @param      int     $notitle        Do not add title tag on image
+     *  @param		int		$usesharelink	Use the public shared link of image (if not available, the 'nophoto' image will be shown instead)
+     *  @return     string					Html code to show photo. Number of photos shown is saved in this->nbphoto
+     */
+    function show_photos($modulepart, $sdir, $size=0, $nbmax=0, $nbbyrow=5, $showfilename=0, $showaction=0, $maxHeight=120, $maxWidth=160, $nolink=0, $notitle=0, $usesharelink=0)
+    {
+        // phpcs:enable
+        global $conf,$user,$langs;
 
-			$newInput = '<span><a class="'.dol_escape_htmltag($keyprefix.$key.$keysuffix).'_del" href="javascript:;"><span class="fa fa-minus-circle valignmiddle"></span></a> ';
-			$newInput.= $this->showInputField($newval, $keyprefix.$key.$keysuffix.'[]', '', $moreparam, '', '', $showsize).'<br></span>';
+        include_once DOL_DOCUMENT_ROOT .'/core/lib/files.lib.php';
+        include_once DOL_DOCUMENT_ROOT .'/core/lib/images.lib.php';
 
-			if(! empty($conf->use_javascript_ajax)) {
-				$out.= '
-					<script type="text/javascript">
-					$(document).ready(function() {
-						$("a#'.dol_escape_js($keyprefix.$key.$keysuffix).'_add").click(function() {
-							$("'.dol_escape_js($newInput).'").insertBefore(this);
-						});
+        $sortfield='position_name';
+        $sortorder='asc';
 
-						$(document).on("click", "a.'.dol_escape_js($keyprefix.$key.$keysuffix).'_del", function() {
-							$(this).parent().remove();
-						});
-					});
-					</script>';
-			}
-		}
-		if (!empty($hidden)) {
-			$out='<input type="hidden" value="'.$value.'" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'"/>';
-		}
-		/* Add comments
-		 if ($type == 'date') $out.=' (YYYY-MM-DD)';
-		 elseif ($type == 'datetime') $out.=' (YYYY-MM-DD HH:MM:SS)';
-		 */
-		return $out;
-	}
-
-	/**
-	 * Return HTML string to show a field into a page
-	 * Code very similar with showOutputField of extra fields
-	 *
-	 * @param  array   $val		       Array of properties of field to show
-	 * @param  string  $key            Key of attribute
-	 * @param  string  $value          Preselected value to show (for date type it must be in timestamp format, for amount or price it must be a php numeric value)
-	 * @param  string  $moreparam      To add more parametes on html input tag
-	 * @param  string  $keysuffix      Prefix string to add into name and id of field (can be used to avoid duplicate names)
-	 * @param  string  $keyprefix      Suffix string to add into name and id of field (can be used to avoid duplicate names)
-	 * @param  mixed   $showsize       Value for css to define size. May also be a numeric.
-	 * @return string
-	 */
-	function showOutputField($val, $key, $value, $moreparam='', $keysuffix='', $keyprefix='', $showsize=0)
-	{
-		global $conf,$langs,$form;
-
-		if (! is_object($form))
-		{
-			require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
-			$form=new Form($this->db);
-		}
-
-		$objectid = $this->id;
-		$label = $val['label'];
-		$type  = $val['type'];
-		$size  = $val['css'];
-
-		// Convert var to be able to share same code than showOutputField of extrafields
-		if (preg_match('/varchar\((\d+)\)/', $type, $reg))
-		{
-			$type = 'varchar';		// convert varchar(xx) int varchar
-			$size = $reg[1];
-		}
-		elseif (preg_match('/varchar/', $type)) $type = 'varchar';		// convert varchar(xx) int varchar
-		if (is_array($val['arrayofkeyval'])) $type='select';
-		if (preg_match('/^integer:(.*):(.*)/i', $val['type'], $reg)) $type='link';
-
-		$default=$val['default'];
-		$computed=$val['computed'];
-		$unique=$val['unique'];
-		$required=$val['required'];
-		$param=$val['param'];
-		if (is_array($val['arrayofkeyval'])) $param['options'] = $val['arrayofkeyval'];
-		if (preg_match('/^integer:(.*):(.*)/i', $val['type'], $reg))
-		{
-			$type='link';
-			$param['options']=array($reg[1].':'.$reg[2]=>$reg[1].':'.$reg[2]);
-		}
-		$langfile=$val['langfile'];
-		$list=$val['list'];
-		$help=$val['help'];
-		$hidden=(($val['visible'] == 0) ? 1 : 0);			// If zero, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
-
-		if ($hidden) return '';
-
-		// If field is a computed field, value must become result of compute
-		if ($computed)
-		{
-			// Make the eval of compute string
-			//var_dump($computed);
-			$value = dol_eval($computed, 1, 0);
-		}
-
-		if (empty($showsize))
-		{
-			if ($type == 'date')
-			{
-				//$showsize=10;
-				$showsize = 'minwidth100imp';
-			}
-			elseif ($type == 'datetime')
-			{
-				//$showsize=19;
-				$showsize = 'minwidth200imp';
-			}
-			elseif (in_array($type,array('int','double','price')))
-			{
-				//$showsize=10;
-				$showsize = 'maxwidth75';
-			}
-			elseif ($type == 'url')
-			{
-				$showsize='minwidth400';
-			}
-			elseif ($type == 'boolean')
-			{
-				$showsize='';
-			}
-			else
-			{
-				if (round($size) < 12)
-				{
-					$showsize = 'minwidth100';
-				}
-				else if (round($size) <= 48)
-				{
-					$showsize = 'minwidth200';
-				}
-				else
-				{
-					//$showsize=48;
-					$showsize = 'minwidth400';
-				}
-			}
-		}
-
-		// Format output value differently according to properties of field
-		if ($key == 'ref' && method_exists($this, 'getNomUrl')) $value=$this->getNomUrl(1, '', 0, '', 1);
-		elseif ($key == 'status' && method_exists($this, 'getLibStatut')) $value=$this->getLibStatut(3);
-		elseif ($type == 'date')
-		{
-			if(! empty($value)) {
-				$value=dol_print_date($value,'day');
-			} else {
-				$value='';
-			}
-		}
-		elseif ($type == 'datetime')
-		{
-			if(! empty($value)) {
-				$value=dol_print_date($value,'dayhour');
-			} else {
-				$value='';
-			}
-		}
-		elseif ($type == 'double')
-		{
-			if (!empty($value)) {
-				$value=price($value);
-			}
-		}
-		elseif ($type == 'boolean')
-		{
-			$checked='';
-			if (!empty($value)) {
-				$checked=' checked ';
-			}
-			$value='<input type="checkbox" '.$checked.' '.($moreparam?$moreparam:'').' readonly disabled>';
-		}
-		elseif ($type == 'mail')
-		{
-			$value=dol_print_email($value,0,0,0,64,1,1);
-		}
-		elseif ($type == 'url')
-		{
-			$value=dol_print_url($value,'_blank',32,1);
-		}
-		elseif ($type == 'phone')
-		{
-			$value=dol_print_phone($value, '', 0, 0, '', '&nbsp;', 1);
-		}
-		elseif ($type == 'price')
-		{
-			$value=price($value,0,$langs,0,0,-1,$conf->currency);
-		}
-		elseif ($type == 'select')
-		{
-			$value=$param['options'][$value];
-		}
-		elseif ($type == 'sellist')
-		{
-			$param_list=array_keys($param['options']);
-			$InfoFieldList = explode(":", $param_list[0]);
-
-			$selectkey="rowid";
-			$keyList='rowid';
-
-			if (count($InfoFieldList)>=3)
-			{
-				$selectkey = $InfoFieldList[2];
-				$keyList=$InfoFieldList[2].' as rowid';
-			}
-
-			$fields_label = explode('|',$InfoFieldList[1]);
-			if(is_array($fields_label)) {
-				$keyList .=', ';
-				$keyList .= implode(', ', $fields_label);
-			}
-
-			$sql = 'SELECT '.$keyList;
-			$sql.= ' FROM '.MAIN_DB_PREFIX .$InfoFieldList[0];
-			if (strpos($InfoFieldList[4], 'extra')!==false)
-			{
-				$sql.= ' as main';
-			}
-			if ($selectkey=='rowid' && empty($value)) {
-				$sql.= " WHERE ".$selectkey."=0";
-			} elseif ($selectkey=='rowid') {
-				$sql.= " WHERE ".$selectkey."=".$this->db->escape($value);
-			}else {
-				$sql.= " WHERE ".$selectkey."='".$this->db->escape($value)."'";
-			}
-
-			//$sql.= ' AND entity = '.$conf->entity;
-
-			dol_syslog(get_class($this).':showOutputField:$type=sellist', LOG_DEBUG);
-			$resql = $this->db->query($sql);
-			if ($resql)
-			{
-				$value='';	// value was used, so now we reste it to use it to build final output
+        $dir = $sdir . '/';
+        $pdir = '/';
+        if ($modulepart == 'ticket')
+        {
+            $dir .= get_exdir(0, 0, 0, 0, $this, $modulepart).$this->track_id.'/';
+            $pdir .= get_exdir(0, 0, 0, 0, $this, $modulepart).$this->track_id.'/';
+        }
+        else
+        {
+            $dir .= get_exdir(0, 0, 0, 0, $this, $modulepart).$this->ref.'/';
+            $pdir .= get_exdir(0, 0, 0, 0, $this, $modulepart).$this->ref.'/';
+        }
+
+        // For backward compatibility
+        if ($modulepart == 'product' && ! empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))
+        {
+            $dir = $sdir . '/'. get_exdir($this->id,2,0,0,$this,$modulepart) . $this->id ."/photos/";
+            $pdir = '/' . get_exdir($this->id,2,0,0,$this,$modulepart) . $this->id ."/photos/";
+        }
+
+        // Defined relative dir to DOL_DATA_ROOT
+        $relativedir = '';
+        if ($dir)
+        {
+            $relativedir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $dir);
+            $relativedir = preg_replace('/^[\\/]/','',$relativedir);
+            $relativedir = preg_replace('/[\\/]$/','',$relativedir);
+        }
+
+        $dirthumb = $dir.'thumbs/';
+        $pdirthumb = $pdir.'thumbs/';
+
+        $return ='<!-- Photo -->'."\n";
+        $nbphoto=0;
+
+        $filearray=dol_dir_list($dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
+
+        /*if (! empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))    // For backward compatiblity, we scan also old dirs
+		 {
+		 $filearrayold=dol_dir_list($dirold,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
+		 $filearray=array_merge($filearray, $filearrayold);
+		 }*/
+
+        completeFileArrayWithDatabaseInfo($filearray, $relativedir);
+
+        if (count($filearray))
+        {
+            if ($sortfield && $sortorder)
+            {
+                $filearray=dol_sort_array($filearray, $sortfield, $sortorder);
+            }
+
+            foreach($filearray as $key => $val)
+            {
+                $photo='';
+                $file = $val['name'];
+
+                //if (! utf8_check($file)) $file=utf8_encode($file);	// To be sure file is stored in UTF8 in memory
+
+                //if (dol_is_file($dir.$file) && image_format_supported($file) >= 0)
+                if (image_format_supported($file) >= 0)
+                {
+                    $nbphoto++;
+                    $photo = $file;
+                    $viewfilename = $file;
+
+                    if ($size == 1 || $size == 'small') {   // Format vignette
+
+                        // Find name of thumb file
+                        $photo_vignette=basename(getImageFileNameForSize($dir.$file, '_small'));
+                        if (! dol_is_file($dirthumb.$photo_vignette)) $photo_vignette='';
+
+                        // Get filesize of original file
+                        $imgarray=dol_getImageSize($dir.$photo);
+
+                        if ($nbbyrow > 0)
+                        {
+                            if ($nbphoto == 1) $return.= '<table width="100%" valign="top" align="center" border="0" cellpadding="2" cellspacing="2">';
+
+                            if ($nbphoto % $nbbyrow == 1) $return.= '<tr align=center valign=middle border=1>';
+                            $return.= '<td width="'.ceil(100/$nbbyrow).'%" class="photo">';
+                        }
+                        else if ($nbbyrow < 0) $return .= '<div class="inline-block">';
+
+                        $return.= "\n";
+
+                        $relativefile=preg_replace('/^\//', '', $pdir.$photo);
+                        if (empty($nolink))
+                        {
+                            $urladvanced=getAdvancedPreviewUrl($modulepart, $relativefile, 0, 'entity='.$this->entity);
+                            if ($urladvanced) $return.='<a href="'.$urladvanced.'">';
+                            else $return.= '<a href="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdir.$photo).'" class="aphoto" target="_blank">';
+                        }
+
+                        // Show image (width height=$maxHeight)
+                        // Si fichier vignette disponible et image source trop grande, on utilise la vignette, sinon on utilise photo origine
+                        $alt=$langs->transnoentitiesnoconv('File').': '.$relativefile;
+                        $alt.=' - '.$langs->transnoentitiesnoconv('Size').': '.$imgarray['width'].'x'.$imgarray['height'];
+                        if ($notitle) $alt='';
+
+                        if ($usesharelink)
+                        {
+                            if ($val['share'])
+                            {
+                                if (empty($maxHeight) || $photo_vignette && $imgarray['height'] > $maxHeight)
+                                {
+                                    $return.= '<!-- Show original file (thumb not yet available with shared links) -->';
+                                    $return.= '<img class="photo photowithmargin" border="0" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?hashp='.urlencode($val['share']).'" title="'.dol_escape_htmltag($alt).'">';
+                                }
+                                else {
+                                    $return.= '<!-- Show original file -->';
+                                    $return.= '<img class="photo photowithmargin" border="0" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?hashp='.urlencode($val['share']).'" title="'.dol_escape_htmltag($alt).'">';
+                                }
+                            }
+                            else
+                            {
+                                $return.= '<!-- Show nophoto file (because file is not shared) -->';
+                                $return.= '<img class="photo photowithmargin" border="0" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/public/theme/common/nophoto.png" title="'.dol_escape_htmltag($alt).'">';
+                            }
+                        }
+                        else
+                        {
+                            if (empty($maxHeight) || $photo_vignette && $imgarray['height'] > $maxHeight)
+                            {
+                                $return.= '<!-- Show thumb -->';
+                                $return.= '<img class="photo photowithmargin" border="0" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdirthumb.$photo_vignette).'" title="'.dol_escape_htmltag($alt).'">';
+                            }
+                            else {
+                                $return.= '<!-- Show original file -->';
+                                $return.= '<img class="photo photowithmargin" border="0" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdir.$photo).'" title="'.dol_escape_htmltag($alt).'">';
+                            }
+                        }
+
+                        if (empty($nolink)) $return.= '</a>';
+                        $return.="\n";
+
+                        if ($showfilename) $return.= '<br>'.$viewfilename;
+                        if ($showaction)
+                        {
+                            $return.= '<br>';
+                            // On propose la generation de la vignette si elle n'existe pas et si la taille est superieure aux limites
+                            if ($photo_vignette && (image_format_supported($photo) > 0) && ($this->imgWidth > $maxWidth || $this->imgHeight > $maxHeight))
+                            {
+                                $return.= '<a href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=addthumb&amp;file='.urlencode($pdir.$viewfilename).'">'.img_picto($langs->trans('GenerateThumb'),'refresh').'&nbsp;&nbsp;</a>';
+                            }
+                            // Special cas for product
+                            if ($modulepart == 'product' && ($user->rights->produit->creer || $user->rights->service->creer))
+                            {
+                                // Link to resize
+                                $return.= '<a href="'.DOL_URL_ROOT.'/core/photos_resize.php?modulepart='.urlencode('produit|service').'&id='.$this->id.'&amp;file='.urlencode($pdir.$viewfilename).'" title="'.dol_escape_htmltag($langs->trans("Resize")).'">'.img_picto($langs->trans("Resize"), 'resize', '').'</a> &nbsp; ';
+
+                                // Link to delete
+                                $return.= '<a href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=delete&amp;file='.urlencode($pdir.$viewfilename).'">';
+                                $return.= img_delete().'</a>';
+                            }
+                        }
+                        $return.= "\n";
+
+                        if ($nbbyrow > 0)
+                        {
+                            $return.= '</td>';
+                            if (($nbphoto % $nbbyrow) == 0) $return.= '</tr>';
+                        }
+                        else if ($nbbyrow < 0) $return.='</div>';
+                    }
+
+                    if (empty($size)) {     // Format origine
+                        $return.= '<img class="photo photowithmargin" border="0" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdir.$photo).'">';
+
+                        if ($showfilename) $return.= '<br>'.$viewfilename;
+                        if ($showaction)
+                        {
+                            // Special case for product
+                            if ($modulepart == 'product' && ($user->rights->produit->creer || $user->rights->service->creer))
+                            {
+                                // Link to resize
+                                $return.= '<a href="'.DOL_URL_ROOT.'/core/photos_resize.php?modulepart='.urlencode('produit|service').'&id='.$this->id.'&amp;file='.urlencode($pdir.$viewfilename).'" title="'.dol_escape_htmltag($langs->trans("Resize")).'">'.img_picto($langs->trans("Resize"), 'resize', '').'</a> &nbsp; ';
+
+                                // Link to delete
+                                $return.= '<a href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=delete&amp;file='.urlencode($pdir.$viewfilename).'">';
+                                $return.= img_delete().'</a>';
+                            }
+                        }
+                    }
+
+                    // On continue ou on arrete de boucler ?
+                    if ($nbmax && $nbphoto >= $nbmax) break;
+                }
+            }
+
+            if ($size==1 || $size=='small')
+            {
+                if ($nbbyrow > 0)
+                {
+                    // Ferme tableau
+                    while ($nbphoto % $nbbyrow)
+                    {
+                        $return.= '<td width="'.ceil(100/$nbbyrow).'%">&nbsp;</td>';
+                        $nbphoto++;
+                    }
+
+                    if ($nbphoto) $return.= '</table>';
+                }
+            }
+        }
+
+        $this->nbphoto = $nbphoto;
+
+        return $return;
+    }
+
+
+    /**
+     * Function test if type is array
+     *
+     * @param   array   $info   content informations of field
+     * @return                  bool
+     */
+    protected function isArray($info)
+    {
+        if(is_array($info))
+        {
+            if(isset($info['type']) && $info['type']=='array') return true;
+            else return false;
+        }
+        else return false;
+    }
+
+    /**
+     * Function test if type is null
+     *
+     * @param   array   $info   content informations of field
+     * @return                  bool
+     */
+    protected function isNull($info)
+    {
+        if(is_array($info))
+        {
+            if(isset($info['type']) && $info['type']=='null') return true;
+            else return false;
+        }
+        else return false;
+    }
+
+    /**
+     * Function test if type is date
+     *
+     * @param   array   $info   content informations of field
+     * @return                  bool
+     */
+    public function isDate($info)
+    {
+        if(isset($info['type']) && ($info['type']=='date' || $info['type']=='datetime' || $info['type']=='timestamp')) return true;
+        else return false;
+    }
+
+    /**
+     * Function test if type is integer
+     *
+     * @param   array   $info   content informations of field
+     * @return                  bool
+     */
+    public function isInt($info)
+    {
+        if(is_array($info))
+        {
+            if(isset($info['type']) && ($info['type']=='int' || preg_match('/^integer/i',$info['type']) ) ) return true;
+            else return false;
+        }
+        else return false;
+    }
+
+    /**
+     * Function test if type is float
+     *
+     * @param   array   $info   content informations of field
+     * @return                  bool
+     */
+    public function isFloat($info)
+    {
+        if(is_array($info))
+        {
+            if (isset($info['type']) && (preg_match('/^(double|real)/i', $info['type']))) return true;
+            else return false;
+        }
+        else return false;
+    }
+
+    /**
+     * Function test if type is text
+     *
+     * @param   array   $info   content informations of field
+     * @return                  bool
+     */
+    public function isText($info)
+    {
+        if(is_array($info))
+        {
+            if(isset($info['type']) && $info['type']=='text') return true;
+            else return false;
+        }
+        else return false;
+    }
+
+    /**
+     * Function test if is indexed
+     *
+     * @param   array   $info   content informations of field
+     * @return                  bool
+     */
+    protected function isIndex($info)
+    {
+        if(is_array($info))
+        {
+            if(isset($info['index']) && $info['index']==true) return true;
+            else return false;
+        }
+        else return false;
+    }
+
+    /**
+     * Function to prepare the values to insert.
+     * Note $this->${field} are set by the page that make the createCommon or the updateCommon.
+     *
+     * @return array
+     */
+    protected function setSaveQuery()
+    {
+        global $conf;
+
+        $queryarray=array();
+        foreach ($this->fields as $field=>$info)	// Loop on definition of fields
+        {
+            // Depending on field type ('datetime', ...)
+            if($this->isDate($info))
+            {
+                if(empty($this->{$field}))
+                {
+                    $queryarray[$field] = null;
+                }
+                else
+                {
+                    $queryarray[$field] = $this->db->idate($this->{$field});
+                }
+            }
+            else if($this->isArray($info))
+            {
+                if(! empty($this->{$field})) {
+                    if(! is_array($this->{$field})) {
+                        $this->{$field} = array($this->{$field});
+                    }
+                    $queryarray[$field] = serialize($this->{$field});
+                } else {
+                    $queryarray[$field] = null;
+                }
+            }
+            else if($this->isInt($info))
+            {
+                if ($field == 'entity' && is_null($this->{$field})) $queryarray[$field]=$conf->entity;
+                else
+                {
+                    $queryarray[$field] = (int) price2num($this->{$field});
+                    if (empty($queryarray[$field])) $queryarray[$field]=0;		// May be reset to null later if property 'notnull' is -1 for this field.
+                }
+            }
+            else if($this->isFloat($info))
+            {
+                $queryarray[$field] = (double) price2num($this->{$field});
+                if (empty($queryarray[$field])) $queryarray[$field]=0;
+            }
+            else
+            {
+                $queryarray[$field] = $this->{$field};
+            }
+
+            if ($info['type'] == 'timestamp' && empty($queryarray[$field])) unset($queryarray[$field]);
+            if (! empty($info['notnull']) && $info['notnull'] == -1 && empty($queryarray[$field])) $queryarray[$field] = null;
+        }
+
+        return $queryarray;
+    }
+
+    /**
+     * Function to load data from a SQL pointer into properties of current object $this
+     *
+     * @param   stdClass    $obj    Contain data of object from database
+     * @return void
+     */
+    protected function setVarsFromFetchObj(&$obj)
+    {
+        foreach ($this->fields as $field => $info)
+        {
+            if($this->isDate($info))
+            {
+                if(empty($obj->{$field}) || $obj->{$field} === '0000-00-00 00:00:00' || $obj->{$field} === '1000-01-01 00:00:00') $this->{$field} = 0;
+                else $this->{$field} = strtotime($obj->{$field});
+            }
+            elseif($this->isArray($info))
+            {
+                if(! empty($obj->{$field})) {
+                    $this->{$field} = @unserialize($obj->{$field});
+                    // Hack for data not in UTF8
+                    if($this->{$field } === false) @unserialize(utf8_decode($obj->{$field}));
+                } else {
+                    $this->{$field} = array();
+                }
+            }
+            elseif($this->isInt($info))
+            {
+                if ($field == 'rowid') $this->id = (int) $obj->{$field};
+                else $this->{$field} = (int) $obj->{$field};
+            }
+            elseif($this->isFloat($info))
+            {
+                $this->{$field} = (double) $obj->{$field};
+            }
+            elseif($this->isNull($info))
+            {
+                $val = $obj->{$field};
+                // zero is not null
+                $this->{$field} = (is_null($val) || (empty($val) && $val!==0 && $val!=='0') ? null : $val);
+            }
+            else
+            {
+                $this->{$field} = $obj->{$field};
+            }
+        }
+
+        // If there is no 'ref' field, we force property ->ref to ->id for a better compatibility with common functions.
+        if (! isset($this->fields['ref']) && isset($this->id)) $this->ref = $this->id;
+    }
+
+    /**
+     * Function to concat keys of fields
+     *
+     * @return string
+     */
+    protected function getFieldList()
+    {
+        $keys = array_keys($this->fields);
+        return implode(',', $keys);
+    }
+
+    /**
+     * Add quote to field value if necessary
+     *
+     * @param 	string|int	$value			Value to protect
+     * @param	array		$fieldsentry	Properties of field
+     * @return 	string
+     */
+    protected function quote($value, $fieldsentry)
+    {
+        if (is_null($value)) return 'NULL';
+        else if (preg_match('/^(int|double|real)/i', $fieldsentry['type'])) return $this->db->escape("$value");
+        else return "'".$this->db->escape($value)."'";
+    }
+
+
+    /**
+     * Create object into database
+     *
+     * @param  User $user      User that creates
+     * @param  bool $notrigger false=launch triggers after, true=disable triggers
+     * @return int             <0 if KO, Id of created object if OK
+     */
+    public function createCommon(User $user, $notrigger = false)
+    {
+        global $langs;
 
-				$obj = $this->db->fetch_object($resql);
+        $error = 0;
 
-				// Several field into label (eq table:code|libelle:rowid)
-				$fields_label = explode('|',$InfoFieldList[1]);
+        $now=dol_now();
 
-				if(is_array($fields_label) && count($fields_label)>1)
-				{
-					foreach ($fields_label as $field_toshow)
-					{
-						$translabel='';
-						if (!empty($obj->$field_toshow)) {
-							$translabel=$langs->trans($obj->$field_toshow);
-						}
-						if ($translabel!=$field_toshow) {
-							$value.=dol_trunc($translabel,18).' ';
-						}else {
-							$value.=$obj->$field_toshow.' ';
-						}
-					}
-				}
-				else
-				{
-					$translabel='';
-					if (!empty($obj->{$InfoFieldList[1]})) {
-						$translabel=$langs->trans($obj->{$InfoFieldList[1]});
-					}
-					if ($translabel!=$obj->{$InfoFieldList[1]}) {
-						$value=dol_trunc($translabel,18);
-					}else {
-						$value=$obj->{$InfoFieldList[1]};
-					}
-				}
-			}
-			else dol_syslog(get_class($this).'::showOutputField error '.$this->db->lasterror(), LOG_WARNING);
-		}
-		elseif ($type == 'radio')
-		{
-			$value=$param['options'][$value];
-		}
-		elseif ($type == 'checkbox')
-		{
-			$value_arr=explode(',',$value);
-			$value='';
-			if (is_array($value_arr) && count($value_arr)>0)
-			{
-				foreach ($value_arr as $keyval=>$valueval) {
-					$toprint[]='<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$param['options'][$valueval].'</li>';
-				}
-				$value='<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';
-			}
-		}
-		elseif ($type == 'chkbxlst')
-		{
-			$value_arr = explode(',', $value);
-
-			$param_list = array_keys($param['options']);
-			$InfoFieldList = explode(":", $param_list[0]);
-
-			$selectkey = "rowid";
-			$keyList = 'rowid';
-
-			if (count($InfoFieldList) >= 3) {
-				$selectkey = $InfoFieldList[2];
-				$keyList = $InfoFieldList[2] . ' as rowid';
-			}
-
-			$fields_label = explode('|', $InfoFieldList[1]);
-			if (is_array($fields_label)) {
-				$keyList .= ', ';
-				$keyList .= implode(', ', $fields_label);
-			}
-
-			$sql = 'SELECT ' . $keyList;
-			$sql .= ' FROM ' . MAIN_DB_PREFIX . $InfoFieldList[0];
-			if (strpos($InfoFieldList[4], 'extra') !== false) {
-				$sql .= ' as main';
-			}
-			// $sql.= " WHERE ".$selectkey."='".$this->db->escape($value)."'";
-			// $sql.= ' AND entity = '.$conf->entity;
-
-			dol_syslog(get_class($this) . ':showOutputField:$type=chkbxlst',LOG_DEBUG);
-			$resql = $this->db->query($sql);
-			if ($resql) {
-				$value = ''; // value was used, so now we reste it to use it to build final output
-				$toprint=array();
-				while ( $obj = $this->db->fetch_object($resql) ) {
-
-					// Several field into label (eq table:code|libelle:rowid)
-					$fields_label = explode('|', $InfoFieldList[1]);
-					if (is_array($value_arr) && in_array($obj->rowid, $value_arr)) {
-						if (is_array($fields_label) && count($fields_label) > 1) {
-							foreach ( $fields_label as $field_toshow ) {
-								$translabel = '';
-								if (! empty($obj->$field_toshow)) {
-									$translabel = $langs->trans($obj->$field_toshow);
-								}
-								if ($translabel != $field_toshow) {
-									$toprint[]='<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.dol_trunc($translabel, 18).'</li>';
-								} else {
-									$toprint[]='<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$obj->$field_toshow.'</li>';
-								}
-							}
-						} else {
-							$translabel = '';
-							if (! empty($obj->{$InfoFieldList[1]})) {
-								$translabel = $langs->trans($obj->{$InfoFieldList[1]});
-							}
-							if ($translabel != $obj->{$InfoFieldList[1]}) {
-								$toprint[]='<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.dol_trunc($translabel, 18).'</li>';
-							} else {
-								$toprint[]='<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$obj->{$InfoFieldList[1]}.'</li>';
-							}
-						}
-					}
-				}
-				$value='<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';
-			} else {
-				dol_syslog(get_class($this) . '::showOutputField error ' . $this->db->lasterror(), LOG_WARNING);
-			}
-		}
-		elseif ($type == 'link')
-		{
-			$out='';
-
-			// only if something to display (perf)
-			if ($value)
-			{
-				$param_list=array_keys($param['options']);				// $param_list='ObjectName:classPath'
+        $fieldvalues = $this->setSaveQuery();
+        if (array_key_exists('date_creation', $fieldvalues) && empty($fieldvalues['date_creation'])) $fieldvalues['date_creation']=$this->db->idate($now);
+        if (array_key_exists('fk_user_creat', $fieldvalues) && ! ($fieldvalues['fk_user_creat'] > 0)) $fieldvalues['fk_user_creat']=$user->id;
+        unset($fieldvalues['rowid']);	// The field 'rowid' is reserved field name for autoincrement field so we don't need it into insert.
 
-				$InfoFieldList = explode(":", $param_list[0]);
-				$classname=$InfoFieldList[0];
-				$classpath=$InfoFieldList[1];
-				$getnomurlparam=(empty($InfoFieldList[2]) ? 3 : $InfoFieldList[2]);
-				if (! empty($classpath))
-				{
-					dol_include_once($InfoFieldList[1]);
-					if ($classname && class_exists($classname))
-					{
-						$object = new $classname($this->db);
-						$object->fetch($value);
-						$value=$object->getNomUrl($getnomurlparam);
-					}
-				}
-				else
-				{
-					dol_syslog('Error bad setup of extrafield', LOG_WARNING);
-					return 'Error bad setup of extrafield';
-				}
-			}
-			else $value='';
-		}
-		elseif ($type == 'text' || $type == 'html')
-		{
-			$value=dol_htmlentitiesbr($value);
-		}
-		elseif ($type == 'password')
-		{
-			$value=preg_replace('/./i','*',$value);
-		}
-		elseif ($type == 'array')
-		{
-			$value = implode('<br>', $value);
-		}
-
-		//print $type.'-'.$size;
-		$out=$value;
-
-		return $out;
-	}
-
-
-	/**
-	 * Function to show lines of extrafields with output datas
-	 *
-	 * @param 	Extrafields $extrafields    Extrafield Object
-	 * @param 	string      $mode           Show output (view) or input (edit) for extrafield
-	 * @param 	array       $params         Optional parameters. Example: array('style'=>'class="oddeven"', 'colspan'=>$colspan)
-	 * @param 	string      $keysuffix      Suffix string to add after name and id of field (can be used to avoid duplicate names)
-	 * @param 	string      $keyprefix      Prefix string to add before name and id of field (can be used to avoid duplicate names)
-	 * @param	string		$onetrtd		All fields in same tr td
-	 * @return 	string
-	 */
-	function showOptionals($extrafields, $mode='view', $params=null, $keysuffix='', $keyprefix='', $onetrtd=0)
-	{
-		global $db, $conf, $langs, $action, $form;
-
-		if (! is_object($form)) $form=new Form($db);
-
-		$out = '';
-
-		if (is_array($extrafields->attributes[$this->table_element]['label']) && count($extrafields->attributes[$this->table_element]['label']) > 0)
-		{
-			$out .= "\n";
-			$out .= '<!-- showOptionalsInput --> ';
-			$out .= "\n";
-
-			$e = 0;
-			foreach($extrafields->attributes[$this->table_element]['label'] as $key=>$label)
-			{
-				// Show only the key field in params
-				if (is_array($params) && array_key_exists('onlykey',$params) && $key != $params['onlykey']) continue;
+        $keys=array();
+        $values = array();
+        foreach ($fieldvalues as $k => $v) {
+            $keys[$k] = $k;
+            $value = $this->fields[$k];
+            $values[$k] = $this->quote($v, $value);
+        }
 
-				$enabled = 1;
-				if ($enabled && isset($extrafields->attributes[$this->table_element]['list'][$key]))
-				{
-					$enabled = dol_eval($extrafields->attributes[$this->table_element]['list'][$key], 1);
-				}
+        // Clean and check mandatory
+        foreach($keys as $key)
+        {
+            // If field is an implicit foreign key field
+            if (preg_match('/^integer:/i', $this->fields[$key]['type']) && $values[$key] == '-1') $values[$key]='';
+            if (! empty($this->fields[$key]['foreignkey']) && $values[$key] == '-1') $values[$key]='';
 
-				$perms = 1;
-				if ($perms && isset($extrafields->attributes[$this->table_element]['perms'][$key]))
-				{
-					$perms = dol_eval($extrafields->attributes[$this->table_element]['perms'][$key], 1);
-				}
+            //var_dump($key.'-'.$values[$key].'-'.($this->fields[$key]['notnull'] == 1));
+            if (isset($this->fields[$key]['notnull']) && $this->fields[$key]['notnull'] == 1 && ! isset($values[$key]) && is_null($val['default']))
+            {
+                $error++;
+                $this->errors[]=$langs->trans("ErrorFieldRequired", $this->fields[$key]['label']);
+            }
 
-				if (($mode == 'create' || $mode == 'edit') && abs($enabled) != 1 && abs($enabled) != 3) continue;	// <> -1 and <> 1 and <> 3 = not visible on forms, only on list
-				if (empty($perms)) continue;
+            // If field is an implicit foreign key field
+            if (preg_match('/^integer:/i', $this->fields[$key]['type']) && empty($values[$key])) $values[$key]='null';
+            if (! empty($this->fields[$key]['foreignkey']) && empty($values[$key])) $values[$key]='null';
+        }
 
-				// Load language if required
-				if (! empty($extrafields->attributes[$this->table_element]['langfile'][$key])) $langs->load($extrafields->attributes[$this->table_element]['langfile'][$key]);
+        if ($error) return -1;
 
-				$colspan='3';
-				if (is_array($params) && count($params)>0) {
-					if (array_key_exists('colspan',$params)) {
-						$colspan=$params['colspan'];
-					}
-				}
+        $this->db->begin();
 
-				switch($mode) {
-					case "view":
-						$value=$this->array_options["options_".$key.$keysuffix];
-						break;
-					case "edit":
-						$getposttemp = GETPOST($keyprefix.'options_'.$key.$keysuffix, 'none');				// GETPOST can get value from GET, POST or setup of default values.
-						// GETPOST("options_" . $key) can be 'abc' or array(0=>'abc')
-						if (is_array($getposttemp) || $getposttemp != '' || GETPOSTISSET($keyprefix.'options_'.$key.$keysuffix))
-						{
-							if (is_array($getposttemp)) {
-								// $getposttemp is an array but following code expects a comma separated string
-								$value = implode(",", $getposttemp);
-							} else {
-								$value = $getposttemp;
-							}
-						} else {
-							$value = $this->array_options["options_" . $key];			// No GET, no POST, no default value, so we take value of object.
-						}
-						//var_dump($keyprefix.' - '.$key.' - '.$keysuffix.' - '.$keyprefix.'options_'.$key.$keysuffix.' - '.$this->array_options["options_".$key.$keysuffix].' - '.$getposttemp.' - '.$value);
-						break;
-				}
+        if (! $error)
+        {
+            $sql = 'INSERT INTO '.MAIN_DB_PREFIX.$this->table_element;
+            $sql.= ' ('.implode( ", ", $keys ).')';
+            $sql.= ' VALUES ('.implode( ", ", $values ).')';
+
+            $res = $this->db->query($sql);
+            if ($res===false) {
+                $error++;
+                $this->errors[] = $this->db->lasterror();
+            }
+        }
 
-				if ($extrafields->attributes[$this->table_element]['type'][$key] == 'separate')
-				{
-					$out .= $extrafields->showSeparator($key, $this);
-				}
-				else
-				{
-					$csstyle='';
-					$class=(!empty($extrafields->attributes[$this->table_element]['hidden'][$key]) ? 'hideobject ' : '');
-					if (is_array($params) && count($params)>0) {
-						if (array_key_exists('style',$params)) {
-							$csstyle=$params['style'];
-						}
-					}
+        if (! $error)
+        {
+            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . $this->table_element);
+        }
 
-					// add html5 elements
-					$domData  = ' data-element="extrafield"';
-					$domData .= ' data-targetelement="'.$this->element.'"';
-					$domData .= ' data-targetid="'.$this->id.'"';
+        // Create extrafields
+        if (! $error)
+        {
+            $result=$this->insertExtraFields();
+            if ($result < 0) $error++;
+        }
 
-					$html_id = !empty($this->id) ? 'extrarow-'.$this->element.'_'.$key.'_'.$this->id : '';
+        // Triggers
+        if (! $error && ! $notrigger)
+        {
+            // Call triggers
+            $result=$this->call_trigger(strtoupper(get_class($this)).'_CREATE',$user);
+            if ($result < 0) { $error++; }
+            // End call triggers
+        }
 
-					$out .= '<tr id="'.$html_id.'" '.$csstyle.' class="'.$class.$this->element.'_extras_'.$key.'" '.$domData.' >';
+        // Commit or rollback
+        if ($error) {
+            $this->db->rollback();
+            return -1;
+        } else {
+            $this->db->commit();
+            return $this->id;
+        }
+    }
 
-					if (! empty($conf->global->MAIN_EXTRAFIELDS_USE_TWO_COLUMS) && ($e % 2) == 0)
-					{
-						if (! empty($conf->global->MAIN_EXTRAFIELDS_USE_TWO_COLUMS) && ($e % 2) == 0) { $colspan='0'; }
-					}
 
-					if ($action == 'selectlines') { $colspan++; }
+    /**
+     * Load object in memory from the database
+     *
+     * @param	int    $id				Id object
+     * @param	string $ref				Ref
+     * @param	string	$morewhere		More SQL filters (' AND ...')
+     * @return 	int         			<0 if KO, 0 if not found, >0 if OK
+     */
+    public function fetchCommon($id, $ref = null, $morewhere = '')
+    {
+        if (empty($id) && empty($ref) && empty($morewhere)) return -1;
 
-					// Convert date into timestamp format (value in memory must be a timestamp)
-					if (in_array($extrafields->attributes[$this->table_element]['type'][$key],array('date','datetime')))
-					{
-						$datenotinstring = $this->array_options['options_' . $key];
-						if (! is_numeric($this->array_options['options_' . $key]))	// For backward compatibility
-						{
-							$datenotinstring = $this->db->jdate($datenotinstring);
-						}
-						$value = GETPOSTISSET($keyprefix.'options_'.$key.$keysuffix)?dol_mktime(GETPOST($keyprefix.'options_'.$key.$keysuffix."hour", 'int', 3), GETPOST($keyprefix.'options_'.$key.$keysuffix."min",'int',3), 0, GETPOST($keyprefix.'options_'.$key.$keysuffix."month",'int',3), GETPOST($keyprefix.'options_'.$key.$keysuffix."day",'int',3), GETPOST($keyprefix.'options_'.$key.$keysuffix."year",'int',3)):$datenotinstring;
-					}
-					// Convert float submited string into real php numeric (value in memory must be a php numeric)
-					if (in_array($extrafields->attributes[$this->table_element]['type'][$key],array('price','double')))
-					{
-						$value = GETPOSTISSET($keyprefix.'options_'.$key.$keysuffix)?price2num(GETPOST($keyprefix.'options_'.$key.$keysuffix, 'alpha', 3)):$this->array_options['options_'.$key];
-					}
-
-					$labeltoshow = $langs->trans($label);
-
-					$out .= '<td class="titlefield';
-					if (GETPOST('action','none') == 'create') $out.='create';
-					if ($mode != 'view' && ! empty($extrafields->attributes[$this->table_element]['required'][$key])) $out .= ' fieldrequired';
-					$out .= '">';
-					if (! empty($extrafields->attributes[$object->table_element]['help'][$key])) $out .= $form->textwithpicto($labeltoshow, $extrafields->attributes[$object->table_element]['help'][$key]);
-					else $out .= $labeltoshow;
-					$out .= '</td>';
-
-					$html_id = !empty($this->id) ? $this->element.'_extras_'.$key.'_'.$this->id : '';
-					$out .='<td id="'.$html_id.'" class="'.$this->element.'_extras_'.$key.'" '.($colspan?' colspan="'.$colspan.'"':'').'>';
-
-					switch($mode) {
-						case "view":
-							$out .= $extrafields->showOutputField($key, $value);
-							break;
-						case "edit":
-							$out .= $extrafields->showInputField($key, $value, '', $keysuffix, '', 0, $this->id);
-							break;
-					}
-
-					$out .= '</td>';
-
-					if (! empty($conf->global->MAIN_EXTRAFIELDS_USE_TWO_COLUMS) && (($e % 2) == 1)) $out .= '</tr>';
-					else $out .= '</tr>';
-					$e++;
-				}
-			}
-			$out .= "\n";
-			// Add code to manage list depending on others
-			if (! empty($conf->use_javascript_ajax)) {
-				$out .= '
-				<script type="text/javascript">
-				    jQuery(document).ready(function() {
-				    	function showOptions(child_list, parent_list)
-				    	{
-				    		var val = $("select[name=\"options_"+parent_list+"\"]").val();
-				    		var parentVal = parent_list + ":" + val;
-							if(val > 0) {
-					    		$("select[name=\""+child_list+"\"] option[parent]").hide();
-					    		$("select[name=\""+child_list+"\"] option[parent=\""+parentVal+"\"]").show();
-							} else {
-								$("select[name=\""+child_list+"\"] option").show();
-							}
-				    	}
-						function setListDependencies() {
-					    	jQuery("select option[parent]").parent().each(function() {
-					    		var child_list = $(this).attr("name");
-								var parent = $(this).find("option[parent]:first").attr("parent");
-								var infos = parent.split(":");
-								var parent_list = infos[0];
-								$("select[name=\""+parent_list+"\"]").change(function() {
-									showOptions(child_list, parent_list);
-								});
-					    	});
-						}
+        $sql = 'SELECT '.$this->getFieldList();
+        $sql.= ' FROM '.MAIN_DB_PREFIX.$this->table_element;
 
-						setListDependencies();
-				    });
-				</script>'."\n";
-				$out .= '<!-- /showOptionalsInput --> '."\n";
-			}
-		}
-		return $out;
-	}
-
-
-	/**
-	 * Returns the rights used for this class
-	 * @return stdClass
-	 */
-	public function getRights()
-	{
-		global $user;
-
-		$element = $this->element;
-		if ($element == 'facturerec') $element='facture';
-
-		return $user->rights->{$element};
-	}
-
-	/**
-	 * Function used to replace a thirdparty id with another one.
-	 * This function is meant to be called from replaceThirdparty with the appropiate tables
-	 * Column name fk_soc MUST be used to identify thirdparties
-	 *
-	 * @param  DoliDB 	   $db 			  Database handler
-	 * @param  int 		   $origin_id     Old thirdparty id (the thirdparty to delete)
-	 * @param  int 		   $dest_id       New thirdparty id (the thirdparty that will received element of the other)
-	 * @param  string[]    $tables        Tables that need to be changed
-	 * @param  int         $ignoreerrors  Ignore errors. Return true even if errors. We need this when replacement can fails like for categories (categorie of old thirdparty may already exists on new one)
-	 * @return bool						  True if success, False if error
-	 */
-	public static function commonReplaceThirdparty(DoliDB $db, $origin_id, $dest_id, array $tables, $ignoreerrors=0)
-	{
-		foreach ($tables as $table)
-		{
-			$sql = 'UPDATE '.MAIN_DB_PREFIX.$table.' SET fk_soc = '.$dest_id.' WHERE fk_soc = '.$origin_id;
-
-			if (! $db->query($sql))
-			{
-				if ($ignoreerrors) return true;		// TODO Not enough. If there is A-B on kept thirdarty and B-C on old one, we must get A-B-C after merge. Not A-B.
-				//$this->errors = $db->lasterror();
-				return false;
-			}
-		}
-
-		return true;
-	}
-
-	/**
-	 * Get buy price to use for margin calculation. This function is called when buy price is unknown.
-	 *	 Set buy price = sell price if ForceBuyingPriceIfNull configured,
-	 *   else if calculation MARGIN_TYPE = 'costprice' and costprice is defined, use costprice as buyprice
-	 *	 else if calculation MARGIN_TYPE = 'pmp' and pmp is calculated, use pmp as buyprice
-	 *	 else set min buy price as buy price
-	 *
-	 * @param float		$unitPrice		 Product unit price
-	 * @param float		$discountPercent Line discount percent
-	 * @param int		$fk_product		 Product id
-	 * @return	float                    <0 if KO, buyprice if OK
-	 */
-	public function defineBuyPrice($unitPrice = 0.0, $discountPercent = 0.0, $fk_product = 0)
-	{
-		global $conf;
-
-		$buyPrice = 0;
-
-		if (($unitPrice > 0) && (isset($conf->global->ForceBuyingPriceIfNull) && $conf->global->ForceBuyingPriceIfNull == 1)) // In most cases, test here is false
-		{
-			$buyPrice = $unitPrice * (1 - $discountPercent / 100);
-		}
-		else
-		{
-			// Get cost price for margin calculation
-			if (! empty($fk_product))
-			{
-				if (isset($conf->global->MARGIN_TYPE) && $conf->global->MARGIN_TYPE == 'costprice')
-				{
-					require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
-					$product = new Product($this->db);
-					$result = $product->fetch($fk_product);
-					if ($result <= 0)
-					{
-						$this->errors[] = 'ErrorProductIdDoesNotExists';
-						return -1;
-					}
-					if ($product->cost_price > 0)
-					{
-						$buyPrice = $product->cost_price;
-					}
-					else if ($product->pmp > 0)
-					{
-						$buyPrice = $product->pmp;
-					}
-				}
-				else if (isset($conf->global->MARGIN_TYPE) && $conf->global->MARGIN_TYPE == 'pmp')
-				{
-					require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
-					$product = new Product($this->db);
-					$result = $product->fetch($fk_product);
-					if ($result <= 0)
-					{
-						$this->errors[] = 'ErrorProductIdDoesNotExists';
-						return -1;
-					}
-					if ($product->pmp > 0)
-					{
-						$buyPrice = $product->pmp;
-					}
-				}
+        if (!empty($id))  $sql.= ' WHERE rowid = '.$id;
+        elseif (!empty($ref)) $sql.= " WHERE ref = ".$this->quote($ref, $this->fields['ref']);
+        else $sql.=' WHERE 1 = 1';	// usage with empty id and empty ref is very rare
+        if ($morewhere)   $sql.= $morewhere;
+        $sql.=' LIMIT 1';	// This is a fetch, to be sure to get only one record
 
-				if (empty($buyPrice) && isset($conf->global->MARGIN_TYPE) && in_array($conf->global->MARGIN_TYPE, array('1','pmp','costprice')))
-				{
-					require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
-					$productFournisseur = new ProductFournisseur($this->db);
-					if (($result = $productFournisseur->find_min_price_product_fournisseur($fk_product)) > 0)
-					{
-						$buyPrice = $productFournisseur->fourn_unitprice;
-					}
-					else if ($result < 0)
-					{
-						$this->errors[] = $productFournisseur->error;
-						return -2;
-					}
-				}
-			}
-		}
-		return $buyPrice;
-	}
+        $res = $this->db->query($sql);
+        if ($res)
+        {
+            $obj = $this->db->fetch_object($res);
+            if ($obj)
+            {
+                $this->setVarsFromFetchObj($obj);
+                return $this->id;
+            }
+            else
+            {
+                return 0;
+            }
+        }
+        else
+        {
+            $this->error = $this->db->lasterror();
+            $this->errors[] = $this->error;
+            return -1;
+        }
+    }
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Show photos of an object (nbmax maximum), into several columns
-	 *
-	 *  @param		string	$modulepart		'product', 'ticket', ...
-	 *  @param      string	$sdir        	Directory to scan (full absolute path)
-	 *  @param      int		$size        	0=original size, 1='small' use thumbnail if possible
-	 *  @param      int		$nbmax       	Nombre maximum de photos (0=pas de max)
-	 *  @param      int		$nbbyrow     	Number of image per line or -1 to use div. Used only if size=1.
-	 * 	@param		int		$showfilename	1=Show filename
-	 * 	@param		int		$showaction		1=Show icon with action links (resize, delete)
-	 * 	@param		int		$maxHeight		Max height of original image when size='small' (so we can use original even if small requested). If 0, always use 'small' thumb image.
-	 * 	@param		int		$maxWidth		Max width of original image when size='small'
-	 *  @param      int     $nolink         Do not add a href link to view enlarged imaged into a new tab
-	 *  @param      int     $notitle        Do not add title tag on image
-	 *  @param		int		$usesharelink	Use the public shared link of image (if not available, the 'nophoto' image will be shown instead)
-	 *  @return     string					Html code to show photo. Number of photos shown is saved in this->nbphoto
-	 */
-	function show_photos($modulepart, $sdir, $size=0, $nbmax=0, $nbbyrow=5, $showfilename=0, $showaction=0, $maxHeight=120, $maxWidth=160, $nolink=0, $notitle=0, $usesharelink=0)
-	{
-        // phpcs:enable
-		global $conf,$user,$langs;
-
-		include_once DOL_DOCUMENT_ROOT .'/core/lib/files.lib.php';
-		include_once DOL_DOCUMENT_ROOT .'/core/lib/images.lib.php';
-
-		$sortfield='position_name';
-		$sortorder='asc';
-
-		$dir = $sdir . '/';
-		$pdir = '/';
-		if ($modulepart == 'ticket')
-		{
-			$dir .= get_exdir(0, 0, 0, 0, $this, $modulepart).$this->track_id.'/';
-			$pdir .= get_exdir(0, 0, 0, 0, $this, $modulepart).$this->track_id.'/';
-		}
-		else
-		{
-			$dir .= get_exdir(0, 0, 0, 0, $this, $modulepart).$this->ref.'/';
-			$pdir .= get_exdir(0, 0, 0, 0, $this, $modulepart).$this->ref.'/';
-		}
-
-		// For backward compatibility
-		if ($modulepart == 'product' && ! empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))
-		{
-			$dir = $sdir . '/'. get_exdir($this->id,2,0,0,$this,$modulepart) . $this->id ."/photos/";
-			$pdir = '/' . get_exdir($this->id,2,0,0,$this,$modulepart) . $this->id ."/photos/";
-		}
-
-		// Defined relative dir to DOL_DATA_ROOT
-		$relativedir = '';
-		if ($dir)
-		{
-			$relativedir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $dir);
-			$relativedir = preg_replace('/^[\\/]/','',$relativedir);
-			$relativedir = preg_replace('/[\\/]$/','',$relativedir);
-		}
-
-		$dirthumb = $dir.'thumbs/';
-		$pdirthumb = $pdir.'thumbs/';
-
-		$return ='<!-- Photo -->'."\n";
-		$nbphoto=0;
-
-		$filearray=dol_dir_list($dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
-
-		/*if (! empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))    // For backward compatiblity, we scan also old dirs
-		 {
-		 $filearrayold=dol_dir_list($dirold,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
-		 $filearray=array_merge($filearray, $filearrayold);
-		 }*/
+    /**
+     * Update object into database
+     *
+     * @param  User $user      	User that modifies
+     * @param  bool $notrigger 	false=launch triggers after, true=disable triggers
+     * @return int             	<0 if KO, >0 if OK
+     */
+    public function updateCommon(User $user, $notrigger = false)
+    {
+        global $conf, $langs;
 
-		completeFileArrayWithDatabaseInfo($filearray, $relativedir);
+        $error = 0;
 
-		if (count($filearray))
-		{
-			if ($sortfield && $sortorder)
-			{
-				$filearray=dol_sort_array($filearray, $sortfield, $sortorder);
-			}
+        $now=dol_now();
 
-			foreach($filearray as $key => $val)
-			{
-				$photo='';
-				$file = $val['name'];
+        $fieldvalues = $this->setSaveQuery();
+        if (array_key_exists('date_modification', $fieldvalues) && empty($fieldvalues['date_modification'])) $fieldvalues['date_modification']=$this->db->idate($now);
+        if (array_key_exists('fk_user_modif', $fieldvalues) && ! ($fieldvalues['fk_user_modif'] > 0)) $fieldvalues['fk_user_modif']=$user->id;
+        unset($fieldvalues['rowid']);	// The field 'rowid' is reserved field name for autoincrement field so we don't need it into update.
 
-				//if (! utf8_check($file)) $file=utf8_encode($file);	// To be sure file is stored in UTF8 in memory
+        $keys=array();
+        $values = array();
+        foreach ($fieldvalues as $k => $v) {
+            $keys[$k] = $k;
+            $value = $this->fields[$k];
+            $values[$k] = $this->quote($v, $value);
+            $tmp[] = $k.'='.$this->quote($v, $this->fields[$k]);
+        }
 
-				//if (dol_is_file($dir.$file) && image_format_supported($file) >= 0)
-				if (image_format_supported($file) >= 0)
-				{
-					$nbphoto++;
-					$photo = $file;
-					$viewfilename = $file;
+        // Clean and check mandatory
+        foreach($keys as $key)
+        {
+            if (preg_match('/^integer:/i', $this->fields[$key]['type']) && $values[$key] == '-1') $values[$key]='';		// This is an implicit foreign key field
+            if (! empty($this->fields[$key]['foreignkey']) && $values[$key] == '-1') $values[$key]='';					// This is an explicit foreign key field
+
+            //var_dump($key.'-'.$values[$key].'-'.($this->fields[$key]['notnull'] == 1));
+            /*
+			if ($this->fields[$key]['notnull'] == 1 && empty($values[$key]))
+			{
+				$error++;
+				$this->errors[]=$langs->trans("ErrorFieldRequired", $this->fields[$key]['label']);
+			}*/
+        }
 
-					if ($size == 1 || $size == 'small') {   // Format vignette
+        $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element.' SET '.implode( ',', $tmp ).' WHERE rowid='.$this->id ;
 
-						// Find name of thumb file
-						$photo_vignette=basename(getImageFileNameForSize($dir.$file, '_small'));
-						if (! dol_is_file($dirthumb.$photo_vignette)) $photo_vignette='';
+        $this->db->begin();
+        if (! $error)
+        {
+            $res = $this->db->query($sql);
+            if ($res===false)
+            {
+                $error++;
+                $this->errors[] = $this->db->lasterror();
+            }
+        }
 
-						// Get filesize of original file
-						$imgarray=dol_getImageSize($dir.$photo);
+        // Update extrafield
+        if (! $error && empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($this->array_options) && count($this->array_options)>0)
+        {
+            $result=$this->insertExtraFields();
+            if ($result < 0)
+            {
+                $error++;
+            }
+        }
 
-						if ($nbbyrow > 0)
-						{
-							if ($nbphoto == 1) $return.= '<table width="100%" valign="top" align="center" border="0" cellpadding="2" cellspacing="2">';
+        // Triggers
+        if (! $error && ! $notrigger)
+        {
+            // Call triggers
+            $result=$this->call_trigger(strtoupper(get_class($this)).'_MODIFY',$user);
+            if ($result < 0) { $error++; } //Do also here what you must do to rollback action if trigger fail
+            // End call triggers
+        }
 
-							if ($nbphoto % $nbbyrow == 1) $return.= '<tr align=center valign=middle border=1>';
-							$return.= '<td width="'.ceil(100/$nbbyrow).'%" class="photo">';
-						}
-						else if ($nbbyrow < 0) $return .= '<div class="inline-block">';
+        // Commit or rollback
+        if ($error) {
+            $this->db->rollback();
+            return -1;
+        } else {
+            $this->db->commit();
+            return $this->id;
+        }
+    }
 
-						$return.= "\n";
+    /**
+     * Delete object in database
+     *
+     * @param 	User 	$user       			User that deletes
+     * @param 	bool 	$notrigger  			false=launch triggers after, true=disable triggers
+     * @param	int		$forcechilddeletion		0=no, 1=Force deletion of children
+     * @return 	int             				<=0 if KO, >0 if OK
+     */
+    public function deleteCommon(User $user, $notrigger=false, $forcechilddeletion=0)
+    {
+        $error=0;
 
-						$relativefile=preg_replace('/^\//', '', $pdir.$photo);
-						if (empty($nolink))
-						{
-							$urladvanced=getAdvancedPreviewUrl($modulepart, $relativefile, 0, 'entity='.$this->entity);
-							if ($urladvanced) $return.='<a href="'.$urladvanced.'">';
-							else $return.= '<a href="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdir.$photo).'" class="aphoto" target="_blank">';
-						}
+        $this->db->begin();
 
-						// Show image (width height=$maxHeight)
-						// Si fichier vignette disponible et image source trop grande, on utilise la vignette, sinon on utilise photo origine
-						$alt=$langs->transnoentitiesnoconv('File').': '.$relativefile;
-						$alt.=' - '.$langs->transnoentitiesnoconv('Size').': '.$imgarray['width'].'x'.$imgarray['height'];
-						if ($notitle) $alt='';
-
-						if ($usesharelink)
-						{
-							if ($val['share'])
-							{
-								if (empty($maxHeight) || $photo_vignette && $imgarray['height'] > $maxHeight)
-								{
-									$return.= '<!-- Show original file (thumb not yet available with shared links) -->';
-									$return.= '<img class="photo photowithmargin" border="0" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?hashp='.urlencode($val['share']).'" title="'.dol_escape_htmltag($alt).'">';
-								}
-								else {
-									$return.= '<!-- Show original file -->';
-									$return.= '<img class="photo photowithmargin" border="0" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?hashp='.urlencode($val['share']).'" title="'.dol_escape_htmltag($alt).'">';
-								}
-							}
-							else
-							{
-								$return.= '<!-- Show nophoto file (because file is not shared) -->';
-								$return.= '<img class="photo photowithmargin" border="0" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/public/theme/common/nophoto.png" title="'.dol_escape_htmltag($alt).'">';
-							}
-						}
-						else
-						{
-							if (empty($maxHeight) || $photo_vignette && $imgarray['height'] > $maxHeight)
-							{
-								$return.= '<!-- Show thumb -->';
-								$return.= '<img class="photo photowithmargin" border="0" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdirthumb.$photo_vignette).'" title="'.dol_escape_htmltag($alt).'">';
-							}
-							else {
-								$return.= '<!-- Show original file -->';
-								$return.= '<img class="photo photowithmargin" border="0" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdir.$photo).'" title="'.dol_escape_htmltag($alt).'">';
-							}
-						}
+        if ($forcechilddeletion)
+        {
+            foreach($this->childtables as $table)
+            {
+                $sql = 'DELETE FROM '.MAIN_DB_PREFIX.$table.' WHERE '.$this->fk_element.' = '.$this->id;
+                $resql = $this->db->query($sql);
+                if (! $resql)
+                {
+                    $this->error=$this->db->lasterror();
+                    $this->errors[]=$this->error;
+                    $this->db->rollback();
+                    return -1;
+                }
+            }
+        }
+        elseif (! empty($this->fk_element) && ! empty($this->childtables))	// If object has childs linked with a foreign key field, we check all child tables.
+        {
+            $objectisused = $this->isObjectUsed($this->id);
+            if (! empty($objectisused))
+            {
+                dol_syslog(get_class($this)."::deleteCommon Can't delete record as it has some child", LOG_WARNING);
+                $this->error='ErrorRecordHasChildren';
+                $this->errors[]=$this->error;
+                $this->db->rollback();
+                return 0;
+            }
+        }
 
-						if (empty($nolink)) $return.= '</a>';
-						$return.="\n";
-
-						if ($showfilename) $return.= '<br>'.$viewfilename;
-						if ($showaction)
-						{
-							$return.= '<br>';
-							// On propose la generation de la vignette si elle n'existe pas et si la taille est superieure aux limites
-							if ($photo_vignette && (image_format_supported($photo) > 0) && ($this->imgWidth > $maxWidth || $this->imgHeight > $maxHeight))
-							{
-								$return.= '<a href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=addthumb&amp;file='.urlencode($pdir.$viewfilename).'">'.img_picto($langs->trans('GenerateThumb'),'refresh').'&nbsp;&nbsp;</a>';
-							}
-							// Special cas for product
-							if ($modulepart == 'product' && ($user->rights->produit->creer || $user->rights->service->creer))
-							{
-								// Link to resize
-								$return.= '<a href="'.DOL_URL_ROOT.'/core/photos_resize.php?modulepart='.urlencode('produit|service').'&id='.$this->id.'&amp;file='.urlencode($pdir.$viewfilename).'" title="'.dol_escape_htmltag($langs->trans("Resize")).'">'.img_picto($langs->trans("Resize"), 'resize', '').'</a> &nbsp; ';
-
-								// Link to delete
-								$return.= '<a href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=delete&amp;file='.urlencode($pdir.$viewfilename).'">';
-								$return.= img_delete().'</a>';
-							}
-						}
-						$return.= "\n";
+        if (! $error) {
+            if (! $notrigger) {
+                // Call triggers
+                $result=$this->call_trigger(strtoupper(get_class($this)).'_DELETE', $user);
+                if ($result < 0) { $error++; } // Do also here what you must do to rollback action if trigger fail
+                // End call triggers
+            }
+        }
 
-						if ($nbbyrow > 0)
-						{
-							$return.= '</td>';
-							if (($nbphoto % $nbbyrow) == 0) $return.= '</tr>';
-						}
-						else if ($nbbyrow < 0) $return.='</div>';
-					}
-
-					if (empty($size)) {     // Format origine
-						$return.= '<img class="photo photowithmargin" border="0" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdir.$photo).'">';
-
-						if ($showfilename) $return.= '<br>'.$viewfilename;
-						if ($showaction)
-						{
-							// Special case for product
-							if ($modulepart == 'product' && ($user->rights->produit->creer || $user->rights->service->creer))
-							{
-								// Link to resize
-								$return.= '<a href="'.DOL_URL_ROOT.'/core/photos_resize.php?modulepart='.urlencode('produit|service').'&id='.$this->id.'&amp;file='.urlencode($pdir.$viewfilename).'" title="'.dol_escape_htmltag($langs->trans("Resize")).'">'.img_picto($langs->trans("Resize"), 'resize', '').'</a> &nbsp; ';
-
-								// Link to delete
-								$return.= '<a href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=delete&amp;file='.urlencode($pdir.$viewfilename).'">';
-								$return.= img_delete().'</a>';
-							}
-						}
-					}
+        if (! $error && ! empty($this->isextrafieldmanaged))
+        {
+            $sql = "DELETE FROM " . MAIN_DB_PREFIX . $this->table_element."_extrafields";
+            $sql.= " WHERE fk_object=" . $this->id;
 
-					// On continue ou on arrete de boucler ?
-					if ($nbmax && $nbphoto >= $nbmax) break;
-				}
-			}
+            $resql = $this->db->query($sql);
+            if (! $resql)
+            {
+                $this->errors[] = $this->db->lasterror();
+                $error++;
+            }
+        }
 
-			if ($size==1 || $size=='small')
-			{
-				if ($nbbyrow > 0)
-				{
-					// Ferme tableau
-					while ($nbphoto % $nbbyrow)
-					{
-						$return.= '<td width="'.ceil(100/$nbbyrow).'%">&nbsp;</td>';
-						$nbphoto++;
-					}
-
-					if ($nbphoto) $return.= '</table>';
-				}
-			}
-		}
-
-		$this->nbphoto = $nbphoto;
-
-		return $return;
-	}
-
-
-	/**
-	 * Function test if type is array
-	 *
-	 * @param   array   $info   content informations of field
-	 * @return                  bool
-	 */
-	protected function isArray($info)
-	{
-		if(is_array($info))
-		{
-			if(isset($info['type']) && $info['type']=='array') return true;
-			else return false;
-		}
-		else return false;
-	}
-
-	/**
-	 * Function test if type is null
-	 *
-	 * @param   array   $info   content informations of field
-	 * @return                  bool
-	 */
-	protected function isNull($info)
-	{
-		if(is_array($info))
-		{
-			if(isset($info['type']) && $info['type']=='null') return true;
-			else return false;
-		}
-		else return false;
-	}
-
-	/**
-	 * Function test if type is date
-	 *
-	 * @param   array   $info   content informations of field
-	 * @return                  bool
-	 */
-	public function isDate($info)
-	{
-		if(isset($info['type']) && ($info['type']=='date' || $info['type']=='datetime' || $info['type']=='timestamp')) return true;
-		else return false;
-	}
-
-	/**
-	 * Function test if type is integer
-	 *
-	 * @param   array   $info   content informations of field
-	 * @return                  bool
-	 */
-	public function isInt($info)
-	{
-		if(is_array($info))
-		{
-			if(isset($info['type']) && ($info['type']=='int' || preg_match('/^integer/i',$info['type']) ) ) return true;
-			else return false;
-		}
-		else return false;
-	}
-
-	/**
-	 * Function test if type is float
-	 *
-	 * @param   array   $info   content informations of field
-	 * @return                  bool
-	 */
-	public function isFloat($info)
-	{
-		if(is_array($info))
-		{
-			if (isset($info['type']) && (preg_match('/^(double|real)/i', $info['type']))) return true;
-			else return false;
-		}
-		else return false;
-	}
-
-	/**
-	 * Function test if type is text
-	 *
-	 * @param   array   $info   content informations of field
-	 * @return                  bool
-	 */
-	public function isText($info)
-	{
-		if(is_array($info))
-		{
-			if(isset($info['type']) && $info['type']=='text') return true;
-			else return false;
-		}
-		else return false;
-	}
-
-	/**
-	 * Function test if is indexed
-	 *
-	 * @param   array   $info   content informations of field
-	 * @return                  bool
-	 */
-	protected function isIndex($info)
-	{
-		if(is_array($info))
-		{
-			if(isset($info['index']) && $info['index']==true) return true;
-			else return false;
-		}
-		else return false;
-	}
-
-	/**
-	 * Function to prepare the values to insert.
-	 * Note $this->${field} are set by the page that make the createCommon or the updateCommon.
-	 *
-	 * @return array
-	 */
-	protected function setSaveQuery()
-	{
-		global $conf;
-
-		$queryarray=array();
-		foreach ($this->fields as $field=>$info)	// Loop on definition of fields
-		{
-			// Depending on field type ('datetime', ...)
-			if($this->isDate($info))
-			{
-				if(empty($this->{$field}))
-				{
-					$queryarray[$field] = null;
-				}
-				else
-				{
-					$queryarray[$field] = $this->db->idate($this->{$field});
-				}
-			}
-			else if($this->isArray($info))
-			{
-				if(! empty($this->{$field})) {
-					if(! is_array($this->{$field})) {
-						$this->{$field} = array($this->{$field});
-					}
-					$queryarray[$field] = serialize($this->{$field});
-				} else {
-					$queryarray[$field] = null;
-				}
-			}
-			else if($this->isInt($info))
-			{
-				if ($field == 'entity' && is_null($this->{$field})) $queryarray[$field]=$conf->entity;
-				else
-				{
-					$queryarray[$field] = (int) price2num($this->{$field});
-					if (empty($queryarray[$field])) $queryarray[$field]=0;		// May be reset to null later if property 'notnull' is -1 for this field.
-				}
-			}
-			else if($this->isFloat($info))
-			{
-				$queryarray[$field] = (double) price2num($this->{$field});
-				if (empty($queryarray[$field])) $queryarray[$field]=0;
-			}
-			else
-			{
-				$queryarray[$field] = $this->{$field};
-			}
+        if (! $error)
+        {
+            $sql = 'DELETE FROM '.MAIN_DB_PREFIX.$this->table_element.' WHERE rowid='.$this->id;
 
-			if ($info['type'] == 'timestamp' && empty($queryarray[$field])) unset($queryarray[$field]);
-			if (! empty($info['notnull']) && $info['notnull'] == -1 && empty($queryarray[$field])) $queryarray[$field] = null;
-		}
+            $res = $this->db->query($sql);
+            if($res===false) {
+                $error++;
+                $this->errors[] = $this->db->lasterror();
+            }
+        }
 
-		return $queryarray;
-	}
+        // Commit or rollback
+        if ($error) {
+            $this->db->rollback();
+            return -1;
+        } else {
+            $this->db->commit();
+            return 1;
+        }
+    }
 
-	/**
-	 * Function to load data from a SQL pointer into properties of current object $this
-	 *
-	 * @param   stdClass    $obj    Contain data of object from database
+    /**
+     * Initialise object with example values
+     * Id must be 0 if object instance is a specimen
+     *
      * @return void
-	 */
-	protected function setVarsFromFetchObj(&$obj)
-	{
-		foreach ($this->fields as $field => $info)
-		{
-			if($this->isDate($info))
-			{
-				if(empty($obj->{$field}) || $obj->{$field} === '0000-00-00 00:00:00' || $obj->{$field} === '1000-01-01 00:00:00') $this->{$field} = 0;
-				else $this->{$field} = strtotime($obj->{$field});
-			}
-			elseif($this->isArray($info))
-			{
-				if(! empty($obj->{$field})) {
-					$this->{$field} = @unserialize($obj->{$field});
-					// Hack for data not in UTF8
-					if($this->{$field } === false) @unserialize(utf8_decode($obj->{$field}));
-				} else {
-					$this->{$field} = array();
-				}
-			}
-			elseif($this->isInt($info))
-			{
-				if ($field == 'rowid') $this->id = (int) $obj->{$field};
-				else $this->{$field} = (int) $obj->{$field};
-			}
-			elseif($this->isFloat($info))
-			{
-				$this->{$field} = (double) $obj->{$field};
-			}
-			elseif($this->isNull($info))
-			{
-				$val = $obj->{$field};
-				// zero is not null
-				$this->{$field} = (is_null($val) || (empty($val) && $val!==0 && $val!=='0') ? null : $val);
-			}
-			else
-			{
-				$this->{$field} = $obj->{$field};
-			}
-		}
-
-		// If there is no 'ref' field, we force property ->ref to ->id for a better compatibility with common functions.
-		if (! isset($this->fields['ref']) && isset($this->id)) $this->ref = $this->id;
-	}
-
-	/**
-	 * Function to concat keys of fields
-	 *
-	 * @return string
-	 */
-	protected function getFieldList()
-	{
-		$keys = array_keys($this->fields);
-		return implode(',', $keys);
-	}
-
-	/**
-	 * Add quote to field value if necessary
-	 *
-	 * @param 	string|int	$value			Value to protect
-	 * @param	array		$fieldsentry	Properties of field
-	 * @return 	string
-	 */
-    protected function quote($value, $fieldsentry)
+     */
+    public function initAsSpecimenCommon()
     {
-		if (is_null($value)) return 'NULL';
-		else if (preg_match('/^(int|double|real)/i', $fieldsentry['type'])) return $this->db->escape("$value");
-		else return "'".$this->db->escape($value)."'";
-	}
-
-
-	/**
-	 * Create object into database
-	 *
-	 * @param  User $user      User that creates
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, Id of created object if OK
-	 */
-	public function createCommon(User $user, $notrigger = false)
-	{
-		global $langs;
-
-		$error = 0;
-
-		$now=dol_now();
-
-		$fieldvalues = $this->setSaveQuery();
-		if (array_key_exists('date_creation', $fieldvalues) && empty($fieldvalues['date_creation'])) $fieldvalues['date_creation']=$this->db->idate($now);
-		if (array_key_exists('fk_user_creat', $fieldvalues) && ! ($fieldvalues['fk_user_creat'] > 0)) $fieldvalues['fk_user_creat']=$user->id;
-		unset($fieldvalues['rowid']);	// The field 'rowid' is reserved field name for autoincrement field so we don't need it into insert.
-
-		$keys=array();
-		$values = array();
-		foreach ($fieldvalues as $k => $v) {
-			$keys[$k] = $k;
-			$value = $this->fields[$k];
-			$values[$k] = $this->quote($v, $value);
-		}
-
-		// Clean and check mandatory
-		foreach($keys as $key)
-		{
-			// If field is an implicit foreign key field
-			if (preg_match('/^integer:/i', $this->fields[$key]['type']) && $values[$key] == '-1') $values[$key]='';
-			if (! empty($this->fields[$key]['foreignkey']) && $values[$key] == '-1') $values[$key]='';
-
-			//var_dump($key.'-'.$values[$key].'-'.($this->fields[$key]['notnull'] == 1));
-			if (isset($this->fields[$key]['notnull']) && $this->fields[$key]['notnull'] == 1 && ! isset($values[$key]) && is_null($val['default']))
-			{
-				$error++;
-				$this->errors[]=$langs->trans("ErrorFieldRequired", $this->fields[$key]['label']);
-			}
-
-			// If field is an implicit foreign key field
-			if (preg_match('/^integer:/i', $this->fields[$key]['type']) && empty($values[$key])) $values[$key]='null';
-			if (! empty($this->fields[$key]['foreignkey']) && empty($values[$key])) $values[$key]='null';
-		}
-
-		if ($error) return -1;
-
-		$this->db->begin();
+        $this->id = 0;
 
-		if (! $error)
-		{
-			$sql = 'INSERT INTO '.MAIN_DB_PREFIX.$this->table_element;
-			$sql.= ' ('.implode( ", ", $keys ).')';
-			$sql.= ' VALUES ('.implode( ", ", $values ).')';
+        // TODO...
+    }
 
-			$res = $this->db->query($sql);
-			if ($res===false) {
-				$error++;
-				$this->errors[] = $this->db->lasterror();
-			}
-		}
-
-		if (! $error)
-		{
-			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . $this->table_element);
-		}
-
-		// Create extrafields
-		if (! $error)
-		{
-			$result=$this->insertExtraFields();
-			if ($result < 0) $error++;
-		}
-
-		// Triggers
-		if (! $error && ! $notrigger)
-		{
-			// Call triggers
-			$result=$this->call_trigger(strtoupper(get_class($this)).'_CREATE',$user);
-			if ($result < 0) { $error++; }
-			// End call triggers
-		}
-
-		// Commit or rollback
-		if ($error) {
-			$this->db->rollback();
-			return -1;
-		} else {
-			$this->db->commit();
-			return $this->id;
-		}
-	}
-
-
-	/**
-	 * Load object in memory from the database
-	 *
-	 * @param	int    $id				Id object
-	 * @param	string $ref				Ref
-	 * @param	string	$morewhere		More SQL filters (' AND ...')
-	 * @return 	int         			<0 if KO, 0 if not found, >0 if OK
-	 */
-	public function fetchCommon($id, $ref = null, $morewhere = '')
-	{
-		if (empty($id) && empty($ref) && empty($morewhere)) return -1;
-
-		$sql = 'SELECT '.$this->getFieldList();
-		$sql.= ' FROM '.MAIN_DB_PREFIX.$this->table_element;
-
-		if (!empty($id))  $sql.= ' WHERE rowid = '.$id;
-		elseif (!empty($ref)) $sql.= " WHERE ref = ".$this->quote($ref, $this->fields['ref']);
-		else $sql.=' WHERE 1 = 1';	// usage with empty id and empty ref is very rare
-		if ($morewhere)   $sql.= $morewhere;
-		$sql.=' LIMIT 1';	// This is a fetch, to be sure to get only one record
-
-		$res = $this->db->query($sql);
-		if ($res)
-		{
-			$obj = $this->db->fetch_object($res);
-			if ($obj)
-			{
-				$this->setVarsFromFetchObj($obj);
-				return $this->id;
-			}
-			else
-			{
-				return 0;
-			}
-		}
-		else
-		{
-			$this->error = $this->db->lasterror();
-			$this->errors[] = $this->error;
-			return -1;
-		}
-	}
-
-	/**
-	 * Update object into database
-	 *
-	 * @param  User $user      	User that modifies
-	 * @param  bool $notrigger 	false=launch triggers after, true=disable triggers
-	 * @return int             	<0 if KO, >0 if OK
-	 */
-	public function updateCommon(User $user, $notrigger = false)
-	{
-		global $conf, $langs;
-
-		$error = 0;
-
-		$now=dol_now();
-
-		$fieldvalues = $this->setSaveQuery();
-		if (array_key_exists('date_modification', $fieldvalues) && empty($fieldvalues['date_modification'])) $fieldvalues['date_modification']=$this->db->idate($now);
-		if (array_key_exists('fk_user_modif', $fieldvalues) && ! ($fieldvalues['fk_user_modif'] > 0)) $fieldvalues['fk_user_modif']=$user->id;
-		unset($fieldvalues['rowid']);	// The field 'rowid' is reserved field name for autoincrement field so we don't need it into update.
-
-		$keys=array();
-		$values = array();
-		foreach ($fieldvalues as $k => $v) {
-			$keys[$k] = $k;
-			$value = $this->fields[$k];
-			$values[$k] = $this->quote($v, $value);
-			$tmp[] = $k.'='.$this->quote($v, $this->fields[$k]);
-		}
-
-		// Clean and check mandatory
-		foreach($keys as $key)
-		{
-			if (preg_match('/^integer:/i', $this->fields[$key]['type']) && $values[$key] == '-1') $values[$key]='';		// This is an implicit foreign key field
-			if (! empty($this->fields[$key]['foreignkey']) && $values[$key] == '-1') $values[$key]='';					// This is an explicit foreign key field
-
-			//var_dump($key.'-'.$values[$key].'-'.($this->fields[$key]['notnull'] == 1));
-			/*
-			if ($this->fields[$key]['notnull'] == 1 && empty($values[$key]))
-			{
-				$error++;
-				$this->errors[]=$langs->trans("ErrorFieldRequired", $this->fields[$key]['label']);
-			}*/
-		}
 
-		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element.' SET '.implode( ',', $tmp ).' WHERE rowid='.$this->id ;
+    /* Part for comments */
 
-		$this->db->begin();
-		if (! $error)
-		{
-			$res = $this->db->query($sql);
-			if ($res===false)
-			{
-				$error++;
-				$this->errors[] = $this->db->lasterror();
-			}
-		}
-
-		// Update extrafield
-		if (! $error && empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($this->array_options) && count($this->array_options)>0)
-		{
-			$result=$this->insertExtraFields();
-			if ($result < 0)
-			{
-				$error++;
-			}
-		}
-
-		// Triggers
-		if (! $error && ! $notrigger)
-		{
-			// Call triggers
-			$result=$this->call_trigger(strtoupper(get_class($this)).'_MODIFY',$user);
-			if ($result < 0) { $error++; } //Do also here what you must do to rollback action if trigger fail
-			// End call triggers
-		}
-
-		// Commit or rollback
-		if ($error) {
-			$this->db->rollback();
-			return -1;
-		} else {
-			$this->db->commit();
-			return $this->id;
-		}
-	}
-
-	/**
-	 * Delete object in database
-	 *
-	 * @param 	User 	$user       			User that deletes
-	 * @param 	bool 	$notrigger  			false=launch triggers after, true=disable triggers
-	 * @param	int		$forcechilddeletion		0=no, 1=Force deletion of children
-	 * @return 	int             				<=0 if KO, >0 if OK
-	 */
-	public function deleteCommon(User $user, $notrigger=false, $forcechilddeletion=0)
-	{
-		$error=0;
-
-		$this->db->begin();
-
-		if ($forcechilddeletion)
-		{
-			foreach($this->childtables as $table)
-			{
-				$sql = 'DELETE FROM '.MAIN_DB_PREFIX.$table.' WHERE '.$this->fk_element.' = '.$this->id;
-				$resql = $this->db->query($sql);
-				if (! $resql)
-				{
-					$this->error=$this->db->lasterror();
-					$this->errors[]=$this->error;
-					$this->db->rollback();
-					return -1;
-				}
-			}
-		}
-		elseif (! empty($this->fk_element) && ! empty($this->childtables))	// If object has childs linked with a foreign key field, we check all child tables.
-		{
-			$objectisused = $this->isObjectUsed($this->id);
-			if (! empty($objectisused))
-			{
-				dol_syslog(get_class($this)."::deleteCommon Can't delete record as it has some child", LOG_WARNING);
-				$this->error='ErrorRecordHasChildren';
-				$this->errors[]=$this->error;
-				$this->db->rollback();
-				return 0;
-			}
-		}
-
-		if (! $error) {
-			if (! $notrigger) {
-				// Call triggers
-				$result=$this->call_trigger(strtoupper(get_class($this)).'_DELETE', $user);
-				if ($result < 0) { $error++; } // Do also here what you must do to rollback action if trigger fail
-				// End call triggers
-			}
-		}
-
-		if (! $error && ! empty($this->isextrafieldmanaged))
-		{
-			$sql = "DELETE FROM " . MAIN_DB_PREFIX . $this->table_element."_extrafields";
-			$sql.= " WHERE fk_object=" . $this->id;
-
-			$resql = $this->db->query($sql);
-			if (! $resql)
-			{
-				$this->errors[] = $this->db->lasterror();
-				$error++;
-			}
-		}
+    /**
+     * Load comments linked with current task
+     *	@return boolean	1 if ok
+     */
+    public function fetchComments()
+    {
+        require_once DOL_DOCUMENT_ROOT.'/core/class/comment.class.php';
 
-		if (! $error)
-		{
-			$sql = 'DELETE FROM '.MAIN_DB_PREFIX.$this->table_element.' WHERE rowid='.$this->id;
+        $comment = new Comment($this->db);
+        $result=$comment->fetchAllFor($this->element, $this->id);
+        if ($result<0) {
+            $this->errors=array_merge($this->errors, $comment->errors);
+            return -1;
+        } else {
+            $this->comments = $comment->comments;
+        }
+        return count($this->comments);
+    }
 
-			$res = $this->db->query($sql);
-			if($res===false) {
-				$error++;
-				$this->errors[] = $this->db->lasterror();
-			}
-		}
-
-		// Commit or rollback
-		if ($error) {
-			$this->db->rollback();
-			return -1;
-		} else {
-			$this->db->commit();
-			return 1;
-		}
-	}
-
-	/**
-	 * Initialise object with example values
-	 * Id must be 0 if object instance is a specimen
-	 *
-	 * @return void
-	 */
-	public function initAsSpecimenCommon()
-	{
-		$this->id = 0;
-
-		// TODO...
-	}
-
-
-	/* Part for comments */
-
-	/**
-	 * Load comments linked with current task
-	 *	@return boolean	1 if ok
-	 */
-	public function fetchComments()
-	{
-		require_once DOL_DOCUMENT_ROOT.'/core/class/comment.class.php';
-
-		$comment = new Comment($this->db);
-		$result=$comment->fetchAllFor($this->element, $this->id);
-		if ($result<0) {
-			$this->errors=array_merge($this->errors, $comment->errors);
-			return -1;
-		} else {
-			$this->comments = $comment->comments;
-		}
-		return count($this->comments);
-	}
-
-	/**
-	 * Return nb comments already posted
-	 *
-	 * @return int
-	 */
-	public function getNbComments()
-	{
-		return count($this->comments);
-	}
+    /**
+     * Return nb comments already posted
+     *
+     * @return int
+     */
+    public function getNbComments()
+    {
+        return count($this->comments);
+    }
 
     /**
      * Trim object parameters

Spacing +1526 added lines, -1526 removed lines

@@ -60,7 +60,7 @@ 
 	/**
 	 * @var string[]	Array of error strings
 	 */
-	public $errors=array();
+	public $errors = array();
 
 	/**
 	 * @var string ID to identify managed object
@@ -75,7 +75,7 @@ 
 	/**
 	 * @var int    Name of subtable line
 	 */
-	public $table_element_line='';
+	public $table_element_line = '';
 
 	/**
 	 * @var string		Key value used to track if data is coming from import wizard
@@ -85,7 +85,7 @@ 
 	/**
 	 * @var mixed		Contains data to manage extrafields
 	 */
-	public $array_options=array();
+	public $array_options = array();
 
 	/**
 	 * @var int[][]		Array of linked objects ids. Loaded by ->fetchObjectLinked
@@ -114,7 +114,7 @@ 
 	/**
 	 * @var array<string,mixed>		Can be used to pass information when only object is provided to method
 	 */
-	public $context=array();
+	public $context = array();
 
 	/**
 	 * @var string		Contains canvas name if record is an alternative canvas record
@@ -374,7 +374,7 @@ 
 	 * @var mixed		Contains comments
 	 * @see fetchComments()
 	 */
-	public $comments=array();
+	public $comments = array();
 
 	/**
 	 * @var int
@@ -400,9 +400,9 @@ 
 	public $civility_id;
 
 	// Dates
-	public $date_creation;			// Date creation
-	public $date_validation;		// Date validation
-	public $date_modification;		// Date last change (tms field)
+	public $date_creation; // Date creation
+	public $date_validation; // Date validation
+	public $date_modification; // Date last change (tms field)
 
 
 
@@ -418,29 +418,29 @@ 
 	 *  @param	string	$ref_ext	Ref ext of object to check
 	 *  @return int     			<0 if KO, 0 if OK but not found, >0 if OK and exists
 	 */
-	static function isExistingObject($element, $id, $ref='', $ref_ext='')
+	static function isExistingObject($element, $id, $ref = '', $ref_ext = '')
 	{
-		global $db,$conf;
+		global $db, $conf;
 
 		$sql = "SELECT rowid, ref, ref_ext";
-		$sql.= " FROM ".MAIN_DB_PREFIX.$element;
-		$sql.= " WHERE entity IN (".getEntity($element).")" ;
+		$sql .= " FROM ".MAIN_DB_PREFIX.$element;
+		$sql .= " WHERE entity IN (".getEntity($element).")";
 
-		if ($id > 0) $sql.= " AND rowid = ".$db->escape($id);
-		else if ($ref) $sql.= " AND ref = '".$db->escape($ref)."'";
-		else if ($ref_ext) $sql.= " AND ref_ext = '".$db->escape($ref_ext)."'";
+		if ($id > 0) $sql .= " AND rowid = ".$db->escape($id);
+		else if ($ref) $sql .= " AND ref = '".$db->escape($ref)."'";
+		else if ($ref_ext) $sql .= " AND ref_ext = '".$db->escape($ref_ext)."'";
 		else {
-			$error='ErrorWrongParameters';
+			$error = 'ErrorWrongParameters';
 			dol_print_error(get_class()."::isExistingObject ".$error, LOG_ERR);
 			return -1;
 		}
-		if ($ref || $ref_ext) $sql.= " AND entity = ".$conf->entity;
+		if ($ref || $ref_ext) $sql .= " AND entity = ".$conf->entity;
 
 		dol_syslog(get_class()."::isExistingObject", LOG_DEBUG);
 		$resql = $db->query($sql);
 		if ($resql)
 		{
-			$num=$db->num_rows($resql);
+			$num = $db->num_rows($resql);
 			if ($num > 0) return 1;
 			else return 0;
 		}
@@ -454,7 +454,7 @@ 
 	 */
 	function errorsToString()
 	{
-		return $this->error.(is_array($this->errors)?(($this->error!=''?', ':'').join(', ',$this->errors)):'');
+		return $this->error.(is_array($this->errors) ? (($this->error != '' ? ', ' : '').join(', ', $this->errors)) : '');
 	}
 
 	/**
@@ -466,23 +466,23 @@ 
 	 * 	@param	int			$maxlen			Maximum length
 	 * 	@return	string						String with full name
 	 */
-	function getFullName($langs,$option=0,$nameorder=-1,$maxlen=0)
+	function getFullName($langs, $option = 0, $nameorder = -1, $maxlen = 0)
 	{
 		//print "lastname=".$this->lastname." name=".$this->name." nom=".$this->nom."<br>\n";
-		$lastname=$this->lastname;
-		$firstname=$this->firstname;
-		if (empty($lastname))  $lastname=(isset($this->lastname)?$this->lastname:(isset($this->name)?$this->name:(isset($this->nom)?$this->nom:(isset($this->societe)?$this->societe:(isset($this->company)?$this->company:'')))));
+		$lastname = $this->lastname;
+		$firstname = $this->firstname;
+		if (empty($lastname))  $lastname = (isset($this->lastname) ? $this->lastname : (isset($this->name) ? $this->name : (isset($this->nom) ? $this->nom : (isset($this->societe) ? $this->societe : (isset($this->company) ? $this->company : '')))));
 
-		$ret='';
+		$ret = '';
 		if ($option && $this->civility_id)
 		{
-			if ($langs->transnoentitiesnoconv("Civility".$this->civility_id)!="Civility".$this->civility_id) $ret.=$langs->transnoentitiesnoconv("Civility".$this->civility_id).' ';
-			else $ret.=$this->civility_id.' ';
+			if ($langs->transnoentitiesnoconv("Civility".$this->civility_id) != "Civility".$this->civility_id) $ret .= $langs->transnoentitiesnoconv("Civility".$this->civility_id).' ';
+			else $ret .= $this->civility_id.' ';
 		}
 
-		$ret.=dolGetFirstLastname($firstname, $lastname, $nameorder);
+		$ret .= dolGetFirstLastname($firstname, $lastname, $nameorder);
 
-		return dol_trunc($ret,$maxlen);
+		return dol_trunc($ret, $maxlen);
 	}
 
 	/**
@@ -493,24 +493,24 @@ 
 	 *  @param		int		    $withregion			1=Add region into address string
 	 *	@return		string							Full address string
 	 */
-	function getFullAddress($withcountry=0, $sep="\n", $withregion=0)
+	function getFullAddress($withcountry = 0, $sep = "\n", $withregion = 0)
 	{
 		if ($withcountry && $this->country_id && (empty($this->country_code) || empty($this->country)))
 		{
-			require_once DOL_DOCUMENT_ROOT .'/core/lib/company.lib.php';
-			$tmparray=getCountry($this->country_id,'all');
-			$this->country_code=$tmparray['code'];
-			$this->country     =$tmparray['label'];
+			require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+			$tmparray = getCountry($this->country_id, 'all');
+			$this->country_code = $tmparray['code'];
+			$this->country     = $tmparray['label'];
 		}
 
         if ($withregion && $this->state_id && (empty($this->state_code) || empty($this->state) || empty($this->region) || empty($this->region_cpde)))
     	{
-    		require_once DOL_DOCUMENT_ROOT .'/core/lib/company.lib.php';
-    		$tmparray=getState($this->state_id,'all',0,1);
-			$this->state_code   =$tmparray['code'];
-			$this->state        =$tmparray['label'];
-			$this->region_code  =$tmparray['region_code'];
-			$this->region       =$tmparray['region'];
+    		require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+    		$tmparray = getState($this->state_id, 'all', 0, 1);
+			$this->state_code   = $tmparray['code'];
+			$this->state        = $tmparray['label'];
+			$this->region_code  = $tmparray['region_code'];
+			$this->region       = $tmparray['region'];
         }
 
 		return dol_format_address($this, $withcountry, $sep);
@@ -528,108 +528,108 @@ 
 	{
 		global $conf, $langs;
 
-		$countriesusingstate=array('AU','US','IN','GB','ES','UK','TR');    // See also option MAIN_FORCE_STATE_INTO_ADDRESS
+		$countriesusingstate = array('AU', 'US', 'IN', 'GB', 'ES', 'UK', 'TR'); // See also option MAIN_FORCE_STATE_INTO_ADDRESS
 
-		$contactid=0;
-		$thirdpartyid=0;
+		$contactid = 0;
+		$thirdpartyid = 0;
 		if ($this->element == 'societe')
 		{
-			$thirdpartyid=$this->id;
+			$thirdpartyid = $this->id;
 		}
 		if ($this->element == 'contact')
 		{
-			$contactid=$this->id;
-			$thirdpartyid=$object->fk_soc;
+			$contactid = $this->id;
+			$thirdpartyid = $object->fk_soc;
 		}
 		if ($this->element == 'user')
 		{
-			$contactid=$this->contact_id;
-			$thirdpartyid=$object->fk_soc;
+			$contactid = $this->contact_id;
+			$thirdpartyid = $object->fk_soc;
 		}
 
-		$out='<!-- BEGIN part to show address block -->';
+		$out = '<!-- BEGIN part to show address block -->';
 
-		$outdone=0;
-		$coords = $this->getFullAddress(1,', ',$conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT);
+		$outdone = 0;
+		$coords = $this->getFullAddress(1, ', ', $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT);
 		if ($coords)
 		{
-			if (! empty($conf->use_javascript_ajax))
+			if (!empty($conf->use_javascript_ajax))
 			{
-				$namecoords = $this->getFullName($langs,1).'<br>'.$coords;
+				$namecoords = $this->getFullName($langs, 1).'<br>'.$coords;
 				// hideonsmatphone because copyToClipboard call jquery dialog that does not work with jmobile
-				$out.='<a href="#" class="hideonsmartphone" onclick="return copyToClipboard(\''.dol_escape_js($namecoords).'\',\''.dol_escape_js($langs->trans("HelpCopyToClipboard")).'\');">';
-				$out.=img_picto($langs->trans("Address"), 'object_address.png');
-				$out.='</a> ';
+				$out .= '<a href="#" class="hideonsmartphone" onclick="return copyToClipboard(\''.dol_escape_js($namecoords).'\',\''.dol_escape_js($langs->trans("HelpCopyToClipboard")).'\');">';
+				$out .= img_picto($langs->trans("Address"), 'object_address.png');
+				$out .= '</a> ';
 			}
-			$out.=dol_print_address($coords, 'address_'.$htmlkey.'_'.$this->id, $this->element, $this->id, 1, ', '); $outdone++;
+			$out .= dol_print_address($coords, 'address_'.$htmlkey.'_'.$this->id, $this->element, $this->id, 1, ', '); $outdone++;
 			$outdone++;
 		}
 
-		if (! in_array($this->country_code,$countriesusingstate) && empty($conf->global->MAIN_FORCE_STATE_INTO_ADDRESS)   // If MAIN_FORCE_STATE_INTO_ADDRESS is on, state is already returned previously with getFullAddress
+		if (!in_array($this->country_code, $countriesusingstate) && empty($conf->global->MAIN_FORCE_STATE_INTO_ADDRESS)   // If MAIN_FORCE_STATE_INTO_ADDRESS is on, state is already returned previously with getFullAddress
 				&& empty($conf->global->SOCIETE_DISABLE_STATE) && $this->state)
 		{
             if (!empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) && $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 1 && $this->region) {
-                $out.=($outdone?' - ':'').$this->region.' - '.$this->state;
+                $out .= ($outdone ? ' - ' : '').$this->region.' - '.$this->state;
             }
             else {
-                $out.=($outdone?' - ':'').$this->state;
+                $out .= ($outdone ? ' - ' : '').$this->state;
             }
 			$outdone++;
 		}
 
-		if (! empty($this->phone) || ! empty($this->phone_pro) || ! empty($this->phone_mobile) || ! empty($this->phone_perso) || ! empty($this->fax) || ! empty($this->office_phone) || ! empty($this->user_mobile) || ! empty($this->office_fax)) $out.=($outdone?'<br>':'');
-		if (! empty($this->phone) && empty($this->phone_pro)) {		// For objects that store pro phone into ->phone
-			$out.=dol_print_phone($this->phone,$this->country_code,$contactid,$thirdpartyid,'AC_TEL','&nbsp;','phone',$langs->trans("PhonePro")); $outdone++;
+		if (!empty($this->phone) || !empty($this->phone_pro) || !empty($this->phone_mobile) || !empty($this->phone_perso) || !empty($this->fax) || !empty($this->office_phone) || !empty($this->user_mobile) || !empty($this->office_fax)) $out .= ($outdone ? '<br>' : '');
+		if (!empty($this->phone) && empty($this->phone_pro)) {		// For objects that store pro phone into ->phone
+			$out .= dol_print_phone($this->phone, $this->country_code, $contactid, $thirdpartyid, 'AC_TEL', '&nbsp;', 'phone', $langs->trans("PhonePro")); $outdone++;
 		}
-		if (! empty($this->phone_pro)) {
-			$out.=dol_print_phone($this->phone_pro,$this->country_code,$contactid,$thirdpartyid,'AC_TEL','&nbsp;','phone',$langs->trans("PhonePro")); $outdone++;
+		if (!empty($this->phone_pro)) {
+			$out .= dol_print_phone($this->phone_pro, $this->country_code, $contactid, $thirdpartyid, 'AC_TEL', '&nbsp;', 'phone', $langs->trans("PhonePro")); $outdone++;
 		}
-		if (! empty($this->phone_mobile)) {
-			$out.=dol_print_phone($this->phone_mobile,$this->country_code,$contactid,$thirdpartyid,'AC_TEL','&nbsp;','mobile',$langs->trans("PhoneMobile")); $outdone++;
+		if (!empty($this->phone_mobile)) {
+			$out .= dol_print_phone($this->phone_mobile, $this->country_code, $contactid, $thirdpartyid, 'AC_TEL', '&nbsp;', 'mobile', $langs->trans("PhoneMobile")); $outdone++;
 		}
-		if (! empty($this->phone_perso)) {
-			$out.=dol_print_phone($this->phone_perso,$this->country_code,$contactid,$thirdpartyid,'AC_TEL','&nbsp;','phone',$langs->trans("PhonePerso")); $outdone++;
+		if (!empty($this->phone_perso)) {
+			$out .= dol_print_phone($this->phone_perso, $this->country_code, $contactid, $thirdpartyid, 'AC_TEL', '&nbsp;', 'phone', $langs->trans("PhonePerso")); $outdone++;
 		}
-		if (! empty($this->office_phone)) {
-			$out.=dol_print_phone($this->office_phone,$this->country_code,$contactid,$thirdpartyid,'AC_TEL','&nbsp;','phone',$langs->trans("PhonePro")); $outdone++;
+		if (!empty($this->office_phone)) {
+			$out .= dol_print_phone($this->office_phone, $this->country_code, $contactid, $thirdpartyid, 'AC_TEL', '&nbsp;', 'phone', $langs->trans("PhonePro")); $outdone++;
 		}
-		if (! empty($this->user_mobile)) {
-			$out.=dol_print_phone($this->user_mobile,$this->country_code,$contactid,$thirdpartyid,'AC_TEL','&nbsp;','mobile',$langs->trans("PhoneMobile")); $outdone++;
+		if (!empty($this->user_mobile)) {
+			$out .= dol_print_phone($this->user_mobile, $this->country_code, $contactid, $thirdpartyid, 'AC_TEL', '&nbsp;', 'mobile', $langs->trans("PhoneMobile")); $outdone++;
 		}
-		if (! empty($this->fax)) {
-			$out.=dol_print_phone($this->fax,$this->country_code,$contactid,$thirdpartyid,'AC_FAX','&nbsp;','fax',$langs->trans("Fax")); $outdone++;
+		if (!empty($this->fax)) {
+			$out .= dol_print_phone($this->fax, $this->country_code, $contactid, $thirdpartyid, 'AC_FAX', '&nbsp;', 'fax', $langs->trans("Fax")); $outdone++;
 		}
-		if (! empty($this->office_fax)) {
-			$out.=dol_print_phone($this->office_fax,$this->country_code,$contactid,$thirdpartyid,'AC_FAX','&nbsp;','fax',$langs->trans("Fax")); $outdone++;
+		if (!empty($this->office_fax)) {
+			$out .= dol_print_phone($this->office_fax, $this->country_code, $contactid, $thirdpartyid, 'AC_FAX', '&nbsp;', 'fax', $langs->trans("Fax")); $outdone++;
 		}
 
-		$out.='<div style="clear: both;"></div>';
-		$outdone=0;
-		if (! empty($this->email))
+		$out .= '<div style="clear: both;"></div>';
+		$outdone = 0;
+		if (!empty($this->email))
 		{
-			$out.=dol_print_email($this->email,$this->id,$object->id,'AC_EMAIL',0,0,1);
+			$out .= dol_print_email($this->email, $this->id, $object->id, 'AC_EMAIL', 0, 0, 1);
 			$outdone++;
 		}
-		if (! empty($this->url))
+		if (!empty($this->url))
 		{
-			$out.=dol_print_url($this->url,'_goout',0,1);
+			$out .= dol_print_url($this->url, '_goout', 0, 1);
 			$outdone++;
 		}
-		$out.='<div style="clear: both;">';
-		if (! empty($conf->socialnetworks->enabled))
+		$out .= '<div style="clear: both;">';
+		if (!empty($conf->socialnetworks->enabled))
 		{
-			if ($this->skype) $out.=dol_print_socialnetworks($this->skype,$this->id,$object->id,'skype');
+			if ($this->skype) $out .= dol_print_socialnetworks($this->skype, $this->id, $object->id, 'skype');
 			$outdone++;
-			if ($this->jabberid) $out.=dol_print_socialnetworks($this->jabberid,$this->id,$object->id,'jabber');
+			if ($this->jabberid) $out .= dol_print_socialnetworks($this->jabberid, $this->id, $object->id, 'jabber');
 			$outdone++;
-			if ($this->twitter) $out.=dol_print_socialnetworks($this->twitter,$this->id,$object->id,'twitter');
+			if ($this->twitter) $out .= dol_print_socialnetworks($this->twitter, $this->id, $object->id, 'twitter');
 			$outdone++;
-			if ($this->facebook) $out.=dol_print_socialnetworks($this->facebook,$this->id,$object->id,'facebook');
+			if ($this->facebook) $out .= dol_print_socialnetworks($this->facebook, $this->id, $object->id, 'facebook');
 			$outdone++;
 		}
-		$out.='</div>';
+		$out .= '</div>';
 
-		$out.='<!-- END Part to show address block -->';
+		$out .= '<!-- END Part to show address block -->';
 
 		return $out;
 	}
@@ -642,17 +642,17 @@ 
 	 * @param	int		$relativelink		0=Return full external link, 1=Return link relative to root of file
 	 * @return	string						Link or empty string if there is no download link
 	 */
-	function getLastMainDocLink($modulepart, $initsharekey=0, $relativelink=0)
+	function getLastMainDocLink($modulepart, $initsharekey = 0, $relativelink = 0)
 	{
 		global $user, $dolibarr_main_url_root;
 
 		if (empty($this->last_main_doc))
 		{
-			return '';		// No way to known which document name to use
+			return ''; // No way to known which document name to use
 		}
 
 		include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
-		$ecmfile=new EcmFiles($this->db);
+		$ecmfile = new EcmFiles($this->db);
 		$result = $ecmfile->fetch(0, '', $this->last_main_doc);
 		if ($result < 0)
 		{
@@ -700,26 +700,26 @@ 
 		}
 
 		// Define $urlwithroot
-		$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
-		$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
+		$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
+		$urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file
 		//$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
 
-		$forcedownload=0;
+		$forcedownload = 0;
 
-		$paramlink='';
+		$paramlink = '';
 		//if (! empty($modulepart)) $paramlink.=($paramlink?'&':'').'modulepart='.$modulepart;		// For sharing with hash (so public files), modulepart is not required.
 		//if (! empty($ecmfile->entity)) $paramlink.='&entity='.$ecmfile->entity; 					// For sharing with hash (so public files), entity is not required.
 		//$paramlink.=($paramlink?'&':'').'file='.urlencode($filepath);								// No need of name of file for public link, we will use the hash
-		if (! empty($ecmfile->share)) $paramlink.=($paramlink?'&':'').'hashp='.$ecmfile->share;			// Hash for public share
-		if ($forcedownload) $paramlink.=($paramlink?'&':'').'attachment=1';
+		if (!empty($ecmfile->share)) $paramlink .= ($paramlink ? '&' : '').'hashp='.$ecmfile->share; // Hash for public share
+		if ($forcedownload) $paramlink .= ($paramlink ? '&' : '').'attachment=1';
 
 		if ($relativelink)
 		{
-			$linktoreturn='document.php'.($paramlink?'?'.$paramlink:'');
+			$linktoreturn = 'document.php'.($paramlink ? '?'.$paramlink : '');
 		}
 		else
 		{
-			$linktoreturn=$urlwithroot.'/document.php'.($paramlink?'?'.$paramlink:'');
+			$linktoreturn = $urlwithroot.'/document.php'.($paramlink ? '?'.$paramlink : '');
 		}
 
 		// Here $ecmfile->share is defined
@@ -737,10 +737,10 @@ 
 	 *  @param  int		$notrigger			Disable all triggers
 	 *  @return int                 		<0 if KO, >0 if OK
 	 */
-	function add_contact($fk_socpeople, $type_contact, $source='external',$notrigger=0)
+	function add_contact($fk_socpeople, $type_contact, $source = 'external', $notrigger = 0)
 	{
         // phpcs:enable
-		global $user,$langs;
+		global $user, $langs;
 
 
 		dol_syslog(get_class($this)."::add_contact $fk_socpeople, $type_contact, $source, $notrigger");
@@ -749,43 +749,43 @@ 
 		if ($fk_socpeople <= 0)
 		{
 			$langs->load("errors");
-			$this->error=$langs->trans("ErrorWrongValueForParameterX","1");
-			dol_syslog(get_class($this)."::add_contact ".$this->error,LOG_ERR);
+			$this->error = $langs->trans("ErrorWrongValueForParameterX", "1");
+			dol_syslog(get_class($this)."::add_contact ".$this->error, LOG_ERR);
 			return -1;
 		}
-		if (! $type_contact)
+		if (!$type_contact)
 		{
 			$langs->load("errors");
-			$this->error=$langs->trans("ErrorWrongValueForParameterX","2");
-			dol_syslog(get_class($this)."::add_contact ".$this->error,LOG_ERR);
+			$this->error = $langs->trans("ErrorWrongValueForParameterX", "2");
+			dol_syslog(get_class($this)."::add_contact ".$this->error, LOG_ERR);
 			return -2;
 		}
 
-		$id_type_contact=0;
+		$id_type_contact = 0;
 		if (is_numeric($type_contact))
 		{
-			$id_type_contact=$type_contact;
+			$id_type_contact = $type_contact;
 		}
 		else
 		{
 			// We look for id type_contact
 			$sql = "SELECT tc.rowid";
-			$sql.= " FROM ".MAIN_DB_PREFIX."c_type_contact as tc";
-			$sql.= " WHERE tc.element='".$this->db->escape($this->element)."'";
-			$sql.= " AND tc.source='".$this->db->escape($source)."'";
-			$sql.= " AND tc.code='".$this->db->escape($type_contact)."' AND tc.active=1";
+			$sql .= " FROM ".MAIN_DB_PREFIX."c_type_contact as tc";
+			$sql .= " WHERE tc.element='".$this->db->escape($this->element)."'";
+			$sql .= " AND tc.source='".$this->db->escape($source)."'";
+			$sql .= " AND tc.code='".$this->db->escape($type_contact)."' AND tc.active=1";
 			//print $sql;
-			$resql=$this->db->query($sql);
+			$resql = $this->db->query($sql);
 			if ($resql)
 			{
 				$obj = $this->db->fetch_object($resql);
-				if ($obj) $id_type_contact=$obj->rowid;
+				if ($obj) $id_type_contact = $obj->rowid;
 			}
 		}
 
 		if ($id_type_contact == 0)
 		{
-			$this->error='CODE_NOT_VALID_FOR_THIS_ELEMENT';
+			$this->error = 'CODE_NOT_VALID_FOR_THIS_ELEMENT';
 			dol_syslog("CODE_NOT_VALID_FOR_THIS_ELEMENT: Code type of contact '".$type_contact."' does not exists or is not active for element ".$this->element.", we can ignore it");
 			return -3;
 		}
@@ -793,35 +793,35 @@ 
 		$datecreate = dol_now();
 
 		// Socpeople must have already been added by some trigger, then we have to check it to avoid DB_ERROR_RECORD_ALREADY_EXISTS error
-		$TListeContacts=$this->liste_contact(-1, $source);
-		$already_added=false;
-		if(!empty($TListeContacts)) {
-			foreach($TListeContacts as $array_contact) {
-				if($array_contact['status'] == 4 && $array_contact['id'] == $fk_socpeople && $array_contact['fk_c_type_contact'] == $id_type_contact) {
-					$already_added=true;
+		$TListeContacts = $this->liste_contact(-1, $source);
+		$already_added = false;
+		if (!empty($TListeContacts)) {
+			foreach ($TListeContacts as $array_contact) {
+				if ($array_contact['status'] == 4 && $array_contact['id'] == $fk_socpeople && $array_contact['fk_c_type_contact'] == $id_type_contact) {
+					$already_added = true;
 					break;
 				}
 			}
 		}
 
-		if(!$already_added) {
+		if (!$already_added) {
 
 			$this->db->begin();
 
 			// Insert into database
 			$sql = "INSERT INTO ".MAIN_DB_PREFIX."element_contact";
-			$sql.= " (element_id, fk_socpeople, datecreate, statut, fk_c_type_contact) ";
-			$sql.= " VALUES (".$this->id.", ".$fk_socpeople." , " ;
-			$sql.= "'".$this->db->idate($datecreate)."'";
-			$sql.= ", 4, ". $id_type_contact;
-			$sql.= ")";
+			$sql .= " (element_id, fk_socpeople, datecreate, statut, fk_c_type_contact) ";
+			$sql .= " VALUES (".$this->id.", ".$fk_socpeople." , ";
+			$sql .= "'".$this->db->idate($datecreate)."'";
+			$sql .= ", 4, ".$id_type_contact;
+			$sql .= ")";
 
-			$resql=$this->db->query($sql);
+			$resql = $this->db->query($sql);
 			if ($resql)
 			{
-				if (! $notrigger)
+				if (!$notrigger)
 				{
-					$result=$this->call_trigger(strtoupper($this->element).'_ADD_CONTACT', $user);
+					$result = $this->call_trigger(strtoupper($this->element).'_ADD_CONTACT', $user);
 					if ($result < 0)
 					{
 						$this->db->rollback();
@@ -836,14 +836,14 @@ 
 			{
 				if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 				{
-					$this->error=$this->db->errno();
+					$this->error = $this->db->errno();
 					$this->db->rollback();
 					echo 'err rollback';
 					return -2;
 				}
 				else
 				{
-					$this->error=$this->db->error();
+					$this->error = $this->db->error();
 					$this->db->rollback();
 					return -1;
 				}
@@ -859,15 +859,15 @@ 
 	 *    @param    string          $source     Nature of contact ('internal' or 'external')
 	 *    @return   int                         >0 if OK, <0 if KO
 	 */
-	function copy_linked_contact($objFrom, $source='internal')
+	function copy_linked_contact($objFrom, $source = 'internal')
 	{
         // phpcs:enable
 		$contacts = $objFrom->liste_contact(-1, $source);
-		foreach($contacts as $contact)
+		foreach ($contacts as $contact)
 		{
 			if ($this->add_contact($contact['id'], $contact['fk_c_type_contact'], $contact['source']) < 0)
 			{
-				$this->error=$this->db->lasterror();
+				$this->error = $this->db->lasterror();
 				return -1;
 			}
 		}
@@ -884,23 +884,23 @@ 
 	 *      @param  int		$fk_socpeople	    Id of soc_people to update (not modified if 0)
 	 *      @return int                 		<0 if KO, >= 0 if OK
 	 */
-	function update_contact($rowid, $statut, $type_contact_id=0, $fk_socpeople=0)
+	function update_contact($rowid, $statut, $type_contact_id = 0, $fk_socpeople = 0)
 	{
         // phpcs:enable
 		// Insert into database
 		$sql = "UPDATE ".MAIN_DB_PREFIX."element_contact set";
-		$sql.= " statut = ".$statut;
-		if ($type_contact_id) $sql.= ", fk_c_type_contact = '".$type_contact_id ."'";
-		if ($fk_socpeople) $sql.= ", fk_socpeople = '".$fk_socpeople ."'";
-		$sql.= " where rowid = ".$rowid;
-		$resql=$this->db->query($sql);
+		$sql .= " statut = ".$statut;
+		if ($type_contact_id) $sql .= ", fk_c_type_contact = '".$type_contact_id."'";
+		if ($fk_socpeople) $sql .= ", fk_socpeople = '".$fk_socpeople."'";
+		$sql .= " where rowid = ".$rowid;
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			return 0;
 		}
 		else
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			return -1;
 		}
 	}
@@ -913,7 +913,7 @@ 
 	 *    @param	int		$notrigger		Disable all triggers
 	 *    @return   int						>0 if OK, <0 if KO
 	 */
-	function delete_contact($rowid, $notrigger=0)
+	function delete_contact($rowid, $notrigger = 0)
 	{
         // phpcs:enable
 		global $user;
@@ -922,14 +922,14 @@ 
 		$this->db->begin();
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."element_contact";
-		$sql.= " WHERE rowid =".$rowid;
+		$sql .= " WHERE rowid =".$rowid;
 
 		dol_syslog(get_class($this)."::delete_contact", LOG_DEBUG);
 		if ($this->db->query($sql))
 		{
-			if (! $notrigger)
+			if (!$notrigger)
 			{
-				$result=$this->call_trigger(strtoupper($this->element).'_DELETE_CONTACT', $user);
+				$result = $this->call_trigger(strtoupper($this->element).'_DELETE_CONTACT', $user);
 				if ($result < 0) { $this->db->rollback(); return -1; }
 			}
 
@@ -938,7 +938,7 @@ 
 		}
 		else
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
 		}
@@ -952,22 +952,22 @@ 
 	 *	  @param	string	$code		Type of contact (code or id)
 	 *    @return   int					>0 if OK, <0 if KO
 	 */
-	function delete_linked_contact($source='',$code='')
+	function delete_linked_contact($source = '', $code = '')
 	{
         // phpcs:enable
 		$temp = array();
-		$typeContact = $this->liste_type_contact($source,'',0,0,$code);
+		$typeContact = $this->liste_type_contact($source, '', 0, 0, $code);
 
-		foreach($typeContact as $key => $value)
+		foreach ($typeContact as $key => $value)
 		{
-			array_push($temp,$key);
+			array_push($temp, $key);
 		}
 		$listId = implode(",", $temp);
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."element_contact";
-		$sql.= " WHERE element_id = ".$this->id;
+		$sql .= " WHERE element_id = ".$this->id;
 		if ($listId)
-			$sql.= " AND fk_c_type_contact IN (".$listId.")";
+			$sql .= " AND fk_c_type_contact IN (".$listId.")";
 
 		dol_syslog(get_class($this)."::delete_linked_contact", LOG_DEBUG);
 		if ($this->db->query($sql))
@@ -976,7 +976,7 @@ 
 		}
 		else
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			return -1;
 		}
 	}
@@ -991,54 +991,54 @@ 
 	 *    @param    string      $code       Filter on this code of contact type ('SHIPPING', 'BILLING', ...)
 	 *    @return	array|int		        Array of contacts, -1 if error
 	 */
-	function liste_contact($statut=-1,$source='external',$list=0,$code='')
+	function liste_contact($statut = -1, $source = 'external', $list = 0, $code = '')
 	{
         // phpcs:enable
 		global $langs;
 
-		$tab=array();
-
-		$sql = "SELECT ec.rowid, ec.statut as statuslink, ec.fk_socpeople as id, ec.fk_c_type_contact";    // This field contains id of llx_socpeople or id of llx_user
-		if ($source == 'internal') $sql.=", '-1' as socid, t.statut as statuscontact, t.login, t.photo";
-		if ($source == 'external' || $source == 'thirdparty') $sql.=", t.fk_soc as socid, t.statut as statuscontact";
-		$sql.= ", t.civility as civility, t.lastname as lastname, t.firstname, t.email";
-		$sql.= ", tc.source, tc.element, tc.code, tc.libelle";
-		$sql.= " FROM ".MAIN_DB_PREFIX."c_type_contact tc";
-		$sql.= ", ".MAIN_DB_PREFIX."element_contact ec";
-		if ($source == 'internal') $sql.=" LEFT JOIN ".MAIN_DB_PREFIX."user t on ec.fk_socpeople = t.rowid";
-		if ($source == 'external'|| $source == 'thirdparty') $sql.=" LEFT JOIN ".MAIN_DB_PREFIX."socpeople t on ec.fk_socpeople = t.rowid";
-		$sql.= " WHERE ec.element_id =".$this->id;
-		$sql.= " AND ec.fk_c_type_contact=tc.rowid";
-		$sql.= " AND tc.element='".$this->db->escape($this->element)."'";
-		if ($code) $sql.= " AND tc.code = '".$this->db->escape($code)."'";
-		if ($source == 'internal') $sql.= " AND tc.source = 'internal'";
-		if ($source == 'external' || $source == 'thirdparty') $sql.= " AND tc.source = 'external'";
-		$sql.= " AND tc.active=1";
-		if ($statut >= 0) $sql.= " AND ec.statut = '".$statut."'";
-		$sql.=" ORDER BY t.lastname ASC";
+		$tab = array();
+
+		$sql = "SELECT ec.rowid, ec.statut as statuslink, ec.fk_socpeople as id, ec.fk_c_type_contact"; // This field contains id of llx_socpeople or id of llx_user
+		if ($source == 'internal') $sql .= ", '-1' as socid, t.statut as statuscontact, t.login, t.photo";
+		if ($source == 'external' || $source == 'thirdparty') $sql .= ", t.fk_soc as socid, t.statut as statuscontact";
+		$sql .= ", t.civility as civility, t.lastname as lastname, t.firstname, t.email";
+		$sql .= ", tc.source, tc.element, tc.code, tc.libelle";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_type_contact tc";
+		$sql .= ", ".MAIN_DB_PREFIX."element_contact ec";
+		if ($source == 'internal') $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user t on ec.fk_socpeople = t.rowid";
+		if ($source == 'external' || $source == 'thirdparty') $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople t on ec.fk_socpeople = t.rowid";
+		$sql .= " WHERE ec.element_id =".$this->id;
+		$sql .= " AND ec.fk_c_type_contact=tc.rowid";
+		$sql .= " AND tc.element='".$this->db->escape($this->element)."'";
+		if ($code) $sql .= " AND tc.code = '".$this->db->escape($code)."'";
+		if ($source == 'internal') $sql .= " AND tc.source = 'internal'";
+		if ($source == 'external' || $source == 'thirdparty') $sql .= " AND tc.source = 'external'";
+		$sql .= " AND tc.active=1";
+		if ($statut >= 0) $sql .= " AND ec.statut = '".$statut."'";
+		$sql .= " ORDER BY t.lastname ASC";
 
 		dol_syslog(get_class($this)."::liste_contact", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
-			$num=$this->db->num_rows($resql);
-			$i=0;
+			$num = $this->db->num_rows($resql);
+			$i = 0;
 			while ($i < $num)
 			{
 				$obj = $this->db->fetch_object($resql);
 
-				if (! $list)
+				if (!$list)
 				{
-					$transkey="TypeContact_".$obj->element."_".$obj->source."_".$obj->code;
-					$libelle_type=($langs->trans($transkey)!=$transkey ? $langs->trans($transkey) : $obj->libelle);
-					$tab[$i]=array('source'=>$obj->source,'socid'=>$obj->socid,'id'=>$obj->id,
-								   'nom'=>$obj->lastname,      // For backward compatibility
+					$transkey = "TypeContact_".$obj->element."_".$obj->source."_".$obj->code;
+					$libelle_type = ($langs->trans($transkey) != $transkey ? $langs->trans($transkey) : $obj->libelle);
+					$tab[$i] = array('source'=>$obj->source, 'socid'=>$obj->socid, 'id'=>$obj->id,
+								   'nom'=>$obj->lastname, // For backward compatibility
 								   'civility'=>$obj->civility, 'lastname'=>$obj->lastname, 'firstname'=>$obj->firstname, 'email'=>$obj->email, 'login'=>$obj->login, 'photo'=>$obj->photo, 'statuscontact'=>$obj->statuscontact,
 								   'rowid'=>$obj->rowid, 'code'=>$obj->code, 'libelle'=>$libelle_type, 'status'=>$obj->statuslink, 'fk_c_type_contact'=>$obj->fk_c_type_contact);
 				}
 				else
 				{
-					$tab[$i]=$obj->id;
+					$tab[$i] = $obj->id;
 				}
 
 				$i++;
@@ -1048,7 +1048,7 @@ 
 		}
 		else
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -1064,16 +1064,16 @@ 
 	function swapContactStatus($rowid)
 	{
 		$sql = "SELECT ec.datecreate, ec.statut, ec.fk_socpeople, ec.fk_c_type_contact,";
-		$sql.= " tc.code, tc.libelle";
+		$sql .= " tc.code, tc.libelle";
 		//$sql.= ", s.fk_soc";
-		$sql.= " FROM (".MAIN_DB_PREFIX."element_contact as ec, ".MAIN_DB_PREFIX."c_type_contact as tc)";
+		$sql .= " FROM (".MAIN_DB_PREFIX."element_contact as ec, ".MAIN_DB_PREFIX."c_type_contact as tc)";
 		//$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople as s ON ec.fk_socpeople=s.rowid";	// Si contact de type external, alors il est lie a une societe
-		$sql.= " WHERE ec.rowid =".$rowid;
-		$sql.= " AND ec.fk_c_type_contact=tc.rowid";
-		$sql.= " AND tc.element = '".$this->db->escape($this->element)."'";
+		$sql .= " WHERE ec.rowid =".$rowid;
+		$sql .= " AND ec.fk_c_type_contact=tc.rowid";
+		$sql .= " AND tc.element = '".$this->db->escape($this->element)."'";
 
 		dol_syslog(get_class($this)."::swapContactStatus", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$obj = $this->db->fetch_object($resql);
@@ -1084,7 +1084,7 @@ 
 		}
 		else
 		{
-			$this->error=$this->db->error();
+			$this->error = $this->db->error();
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -1101,44 +1101,44 @@ 
 	 *		@param	string	$code		Type of contact (Example: 'CUSTOMER', 'SERVICE')
 	 *      @return array       		Array list of type of contacts (id->label if option=0, code->label if option=1)
 	 */
-	function liste_type_contact($source='internal', $order='position', $option=0, $activeonly=0, $code='')
+	function liste_type_contact($source = 'internal', $order = 'position', $option = 0, $activeonly = 0, $code = '')
 	{
         // phpcs:enable
 		global $langs;
 
-		if (empty($order)) $order='position';
-		if ($order == 'position') $order.=',code';
+		if (empty($order)) $order = 'position';
+		if ($order == 'position') $order .= ',code';
 
 		$tab = array();
 		$sql = "SELECT DISTINCT tc.rowid, tc.code, tc.libelle, tc.position";
-		$sql.= " FROM ".MAIN_DB_PREFIX."c_type_contact as tc";
-		$sql.= " WHERE tc.element='".$this->db->escape($this->element)."'";
-		if ($activeonly == 1) $sql.= " AND tc.active=1"; // only the active types
-		if (! empty($source) && $source != 'all') $sql.= " AND tc.source='".$this->db->escape($source)."'";
-		if (! empty($code)) $sql.= " AND tc.code='".$this->db->escape($code)."'";
-		$sql.= $this->db->order($order,'ASC');
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_type_contact as tc";
+		$sql .= " WHERE tc.element='".$this->db->escape($this->element)."'";
+		if ($activeonly == 1) $sql .= " AND tc.active=1"; // only the active types
+		if (!empty($source) && $source != 'all') $sql .= " AND tc.source='".$this->db->escape($source)."'";
+		if (!empty($code)) $sql .= " AND tc.code='".$this->db->escape($code)."'";
+		$sql .= $this->db->order($order, 'ASC');
 
 		//print "sql=".$sql;
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
-			$num=$this->db->num_rows($resql);
-			$i=0;
+			$num = $this->db->num_rows($resql);
+			$i = 0;
 			while ($i < $num)
 			{
 				$obj = $this->db->fetch_object($resql);
 
-				$transkey="TypeContact_".$this->element."_".$source."_".$obj->code;
-				$libelle_type=($langs->trans($transkey)!=$transkey ? $langs->trans($transkey) : $obj->libelle);
-				if (empty($option)) $tab[$obj->rowid]=$libelle_type;
-				else $tab[$obj->code]=$libelle_type;
+				$transkey = "TypeContact_".$this->element."_".$source."_".$obj->code;
+				$libelle_type = ($langs->trans($transkey) != $transkey ? $langs->trans($transkey) : $obj->libelle);
+				if (empty($option)) $tab[$obj->rowid] = $libelle_type;
+				else $tab[$obj->code] = $libelle_type;
 				$i++;
 			}
 			return $tab;
 		}
 		else
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			//dol_print_error($this->db);
 			return null;
 		}
@@ -1155,53 +1155,53 @@ 
 	 *		@param	int		$status		limited to a certain status
 	 *      @return array       		List of id for such contacts
 	 */
-	function getIdContact($source,$code,$status=0)
+	function getIdContact($source, $code, $status = 0)
 	{
 		global $conf;
 
-		$result=array();
-		$i=0;
+		$result = array();
+		$i = 0;
 		//cas particulier pour les expeditions
-		if($this->element=='shipping' && $this->origin_id != 0) {
-			$id=$this->origin_id;
-			$element='commande';
-        } else if($this->element=='reception' && $this->origin_id != 0) {
-            $id=$this->origin_id;
-            $element='order_supplier';
+		if ($this->element == 'shipping' && $this->origin_id != 0) {
+			$id = $this->origin_id;
+			$element = 'commande';
+        } else if ($this->element == 'reception' && $this->origin_id != 0) {
+            $id = $this->origin_id;
+            $element = 'order_supplier';
 		} else {
-			$id=$this->id;
-			$element=$this->element;
+			$id = $this->id;
+			$element = $this->element;
 		}
 
 		$sql = "SELECT ec.fk_socpeople";
-		$sql.= " FROM ".MAIN_DB_PREFIX."element_contact as ec,";
-		if ($source == 'internal') $sql.= " ".MAIN_DB_PREFIX."user as c,";
-		if ($source == 'external') $sql.= " ".MAIN_DB_PREFIX."socpeople as c,";
-		$sql.= " ".MAIN_DB_PREFIX."c_type_contact as tc";
-		$sql.= " WHERE ec.element_id = ".$id;
-		$sql.= " AND ec.fk_socpeople = c.rowid";
-		if ($source == 'internal') $sql.= " AND c.entity IN (".getEntity('user').")";
-		if ($source == 'external') $sql.= " AND c.entity IN (".getEntity('societe').")";
-		$sql.= " AND ec.fk_c_type_contact = tc.rowid";
-		$sql.= " AND tc.element = '".$element."'";
-		$sql.= " AND tc.source = '".$source."'";
-		$sql.= " AND tc.code = '".$code."'";
-		$sql.= " AND tc.active = 1";
-		if ($status) $sql.= " AND ec.statut = ".$status;
+		$sql .= " FROM ".MAIN_DB_PREFIX."element_contact as ec,";
+		if ($source == 'internal') $sql .= " ".MAIN_DB_PREFIX."user as c,";
+		if ($source == 'external') $sql .= " ".MAIN_DB_PREFIX."socpeople as c,";
+		$sql .= " ".MAIN_DB_PREFIX."c_type_contact as tc";
+		$sql .= " WHERE ec.element_id = ".$id;
+		$sql .= " AND ec.fk_socpeople = c.rowid";
+		if ($source == 'internal') $sql .= " AND c.entity IN (".getEntity('user').")";
+		if ($source == 'external') $sql .= " AND c.entity IN (".getEntity('societe').")";
+		$sql .= " AND ec.fk_c_type_contact = tc.rowid";
+		$sql .= " AND tc.element = '".$element."'";
+		$sql .= " AND tc.source = '".$source."'";
+		$sql .= " AND tc.code = '".$code."'";
+		$sql .= " AND tc.active = 1";
+		if ($status) $sql .= " AND ec.statut = ".$status;
 
 		dol_syslog(get_class($this)."::getIdContact", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			while ($obj = $this->db->fetch_object($resql))
 			{
-				$result[$i]=$obj->fk_socpeople;
+				$result[$i] = $obj->fk_socpeople;
 				$i++;
 			}
 		}
 		else
 		{
-			$this->error=$this->db->error();
+			$this->error = $this->db->error();
 			return null;
 		}
 
@@ -1215,16 +1215,16 @@ 
 	 *		@param	int		$contactid      Id du contact. Use this->contactid if empty.
 	 *		@return	int						<0 if KO, >0 if OK
 	 */
-	function fetch_contact($contactid=null)
+	function fetch_contact($contactid = null)
 	{
         // phpcs:enable
-		if (empty($contactid)) $contactid=$this->contactid;
+		if (empty($contactid)) $contactid = $this->contactid;
 
 		if (empty($contactid)) return 0;
 
 		require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 		$contact = new Contact($this->db);
-		$result=$contact->fetch($contactid);
+		$result = $contact->fetch($contactid);
 		$this->contact = $contact;
 		return $result;
 	}
@@ -1236,7 +1236,7 @@ 
 	 *		@param		int		$force_thirdparty_id	Force thirdparty id
 	 *		@return		int								<0 if KO, >0 if OK
 	 */
-	function fetch_thirdparty($force_thirdparty_id=0)
+	function fetch_thirdparty($force_thirdparty_id = 0)
 	{
         // phpcs:enable
 		global $conf;
@@ -1244,7 +1244,7 @@ 
 		if (empty($this->socid) && empty($this->fk_soc) && empty($this->fk_thirdparty) && empty($force_thirdparty_id))
 			return 0;
 
-		require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 
 		$idtofetch = isset($this->socid) ? $this->socid : (isset($this->fk_soc) ? $this->fk_soc : $this->fk_thirdparty);
 		if ($force_thirdparty_id)
@@ -1307,7 +1307,7 @@ 
 
 		dol_syslog(get_class($this).'::fetch_barcode this->element='.$this->element.' this->barcode_type='.$this->barcode_type);
 
-		$idtype=$this->barcode_type;
+		$idtype = $this->barcode_type;
 		if (empty($idtype) && $idtype != '0')	// If type of barcode no set, we try to guess. If set to '0' it means we forced to have type remain not defined
 		{
 			if ($this->element == 'product')      $idtype = $conf->global->PRODUIT_DEFAULT_BARCODE_TYPE;
@@ -1320,8 +1320,8 @@ 
 			if (empty($this->barcode_type) || empty($this->barcode_type_code) || empty($this->barcode_type_label) || empty($this->barcode_type_coder))    // If data not already loaded
 			{
 				$sql = "SELECT rowid, code, libelle as label, coder";
-				$sql.= " FROM ".MAIN_DB_PREFIX."c_barcode_type";
-				$sql.= " WHERE rowid = ".$idtype;
+				$sql .= " FROM ".MAIN_DB_PREFIX."c_barcode_type";
+				$sql .= " WHERE rowid = ".$idtype;
 				dol_syslog(get_class($this).'::fetch_barcode', LOG_DEBUG);
 				$resql = $this->db->query($sql);
 				if ($resql)
@@ -1354,13 +1354,13 @@ 
         // phpcs:enable
 		include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 
-		if (empty($this->fk_project) && ! empty($this->fk_projet)) $this->fk_project = $this->fk_projet;	// For backward compatibility
+		if (empty($this->fk_project) && !empty($this->fk_projet)) $this->fk_project = $this->fk_projet; // For backward compatibility
 		if (empty($this->fk_project)) return 0;
 
 		$project = new Project($this->db);
 		$result = $project->fetch($this->fk_project);
 
-		$this->projet = $project;	// deprecated
+		$this->projet = $project; // deprecated
 		$this->project = $project;
 		return $result;
 	}
@@ -1396,7 +1396,7 @@ 
 	{
         // phpcs:enable
 		$user = new User($this->db);
-		$result=$user->fetch($userid);
+		$result = $user->fetch($userid);
 		$this->user = $user;
 		return $result;
 	}
@@ -1434,14 +1434,14 @@ 
 	{
 		global $conf;
 
-		$result=false;
+		$result = false;
 
 		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX.$table;
-		$sql.= " WHERE ".$field." = '".$key."'";
-		if (! empty($element)) {
-			$sql.= " AND entity IN (".getEntity($element).")";
+		$sql .= " WHERE ".$field." = '".$key."'";
+		if (!empty($element)) {
+			$sql .= " AND entity IN (".getEntity($element).")";
 		} else {
-			$sql.= " AND entity = ".$conf->entity;
+			$sql .= " AND entity = ".$conf->entity;
 		}
 
 		dol_syslog(get_class($this).'::fetchObjectFrom', LOG_DEBUG);
@@ -1468,10 +1468,10 @@ 
 	 */
 	function getValueFrom($table, $id, $field)
 	{
-		$result=false;
+		$result = false;
 		if (!empty($id) && !empty($field) && !empty($table)) {
 			$sql = "SELECT ".$field." FROM ".MAIN_DB_PREFIX.$table;
-			$sql.= " WHERE rowid = ".$id;
+			$sql .= " WHERE rowid = ".$id;
 
 			dol_syslog(get_class($this).'::getValueFrom', LOG_DEBUG);
 			$resql = $this->db->query($sql);
@@ -1500,36 +1500,36 @@ 
 	 *	@return	int							<0 if KO, >0 if OK
 	 *  @see updateExtraField
 	 */
-	function setValueFrom($field, $value, $table='', $id=null, $format='', $id_field='', $fuser=null, $trigkey='', $fk_user_field='fk_user_modif')
+	function setValueFrom($field, $value, $table = '', $id = null, $format = '', $id_field = '', $fuser = null, $trigkey = '', $fk_user_field = 'fk_user_modif')
 	{
-		global $user,$langs,$conf;
+		global $user, $langs, $conf;
 
-		if (empty($table)) 	  $table=$this->table_element;
-		if (empty($id))    	  $id=$this->id;
-		if (empty($format))   $format='text';
-		if (empty($id_field)) $id_field='rowid';
+		if (empty($table)) 	  $table = $this->table_element;
+		if (empty($id))    	  $id = $this->id;
+		if (empty($format))   $format = 'text';
+		if (empty($id_field)) $id_field = 'rowid';
 
-		$error=0;
+		$error = 0;
 
 		$this->db->begin();
 
 		// Special case
-		if ($table == 'product' && $field == 'note_private') $field='note';
+		if ($table == 'product' && $field == 'note_private') $field = 'note';
 		if (in_array($table, array('actioncomm', 'adherent', 'advtargetemailing', 'cronjob', 'establishment'))) $fk_user_field = 'fk_user_mod';
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$table." SET ";
 
-		if ($format == 'text') $sql.= $field." = '".$this->db->escape($value)."'";
-		else if ($format == 'int') $sql.= $field." = ".$this->db->escape($value);
-		else if ($format == 'date') $sql.= $field." = ".($value ? "'".$this->db->idate($value)."'" : "null");
+		if ($format == 'text') $sql .= $field." = '".$this->db->escape($value)."'";
+		else if ($format == 'int') $sql .= $field." = ".$this->db->escape($value);
+		else if ($format == 'date') $sql .= $field." = ".($value ? "'".$this->db->idate($value)."'" : "null");
 
 		if ($fk_user_field)
 		{
-			if (! empty($fuser) && is_object($fuser)) $sql.=", ".$fk_user_field." = ".$fuser->id;
-			elseif (empty($fuser) || $fuser != 'none') $sql.=", ".$fk_user_field." = ".$user->id;
+			if (!empty($fuser) && is_object($fuser)) $sql .= ", ".$fk_user_field." = ".$fuser->id;
+			elseif (empty($fuser) || $fuser != 'none') $sql .= ", ".$fk_user_field." = ".$user->id;
 		}
 
-		$sql.= " WHERE ".$id_field." = ".$id;
+		$sql .= " WHERE ".$id_field." = ".$id;
 
 		dol_syslog(get_class($this)."::".__FUNCTION__."", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -1546,11 +1546,11 @@ 
 				{
 					$result = $this->fetchCommon($id);
 				}
-				if ($result >= 0) $result=$this->call_trigger($trigkey, (! empty($fuser) && is_object($fuser)) ? $fuser : $user);   // This may set this->errors
+				if ($result >= 0) $result = $this->call_trigger($trigkey, (!empty($fuser) && is_object($fuser)) ? $fuser : $user); // This may set this->errors
 				if ($result < 0) $error++;
 			}
 
-			if (! $error)
+			if (!$error)
 			{
 				if (property_exists($this, $field)) $this->$field = $value;
 				$this->db->commit();
@@ -1564,7 +1564,7 @@ 
 		}
 		else
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
 		}
@@ -1579,14 +1579,14 @@ 
 	 *		@param	int		$nodbprefix	Do not include DB prefix to forge table name
 	 *      @return int         		<0 if KO, >0 if OK
 	 */
-	function load_previous_next_ref($filter, $fieldid, $nodbprefix=0)
+	function load_previous_next_ref($filter, $fieldid, $nodbprefix = 0)
 	{
         // phpcs:enable
 		global $conf, $user;
 
-		if (! $this->table_element)
+		if (!$this->table_element)
 		{
-			dol_print_error('',get_class($this)."::load_previous_next_ref was called on objet with property table_element not defined");
+			dol_print_error('', get_class($this)."::load_previous_next_ref was called on objet with property table_element not defined");
 			return -1;
 		}
 		if ($fieldid == 'none') return 1;
@@ -1601,45 +1601,45 @@ 
 		if ($this->element == 'societe') $alias = 'te';
 
 		$sql = "SELECT MAX(te.".$fieldid.")";
-		$sql.= " FROM ".(empty($nodbprefix)?MAIN_DB_PREFIX:'').$this->table_element." as te";
-		if ($this->element == 'user' && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
-			$sql.= ",".MAIN_DB_PREFIX."usergroup_user as ug";
-		}
-		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) $sql.= ", ".MAIN_DB_PREFIX."societe as s";	// If we need to link to societe to limit select to entity
-		else if ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe as s";	// If we need to link to societe to limit select to socid
-		else if ($this->restrictiononfksoc == 2 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON te.fk_soc = s.rowid";	// If we need to link to societe to limit select to socid
-		if ($this->restrictiononfksoc && !$user->rights->societe->client->voir && !$socid)  $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON ".$alias.".rowid = sc.fk_soc";
-		$sql.= " WHERE te.".$fieldid." < '".$this->db->escape($this->ref)."'";  // ->ref must always be defined (set to id if field does not exists)
-		if ($this->restrictiononfksoc == 1 && !$user->rights->societe->client->voir && !$socid) $sql.= " AND sc.fk_user = " .$user->id;
-		if ($this->restrictiononfksoc == 2 && !$user->rights->societe->client->voir && !$socid) $sql.= " AND (sc.fk_user = " .$user->id.' OR te.fk_soc IS NULL)';
-		if (! empty($filter))
-		{
-			if (! preg_match('/^\s*AND/i', $filter)) $sql.=" AND ";   // For backward compatibility
-			$sql.=$filter;
-		}
-		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) $sql.= ' AND te.fk_soc = s.rowid';			// If we need to link to societe to limit select to entity
-		else if ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql.= ' AND te.fk_soc = s.rowid';			// If we need to link to societe to limit select to socid
+		$sql .= " FROM ".(empty($nodbprefix) ?MAIN_DB_PREFIX:'').$this->table_element." as te";
+		if ($this->element == 'user' && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
+			$sql .= ",".MAIN_DB_PREFIX."usergroup_user as ug";
+		}
+		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) $sql .= ", ".MAIN_DB_PREFIX."societe as s"; // If we need to link to societe to limit select to entity
+		else if ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe as s"; // If we need to link to societe to limit select to socid
+		else if ($this->restrictiononfksoc == 2 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON te.fk_soc = s.rowid"; // If we need to link to societe to limit select to socid
+		if ($this->restrictiononfksoc && !$user->rights->societe->client->voir && !$socid)  $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON ".$alias.".rowid = sc.fk_soc";
+		$sql .= " WHERE te.".$fieldid." < '".$this->db->escape($this->ref)."'"; // ->ref must always be defined (set to id if field does not exists)
+		if ($this->restrictiononfksoc == 1 && !$user->rights->societe->client->voir && !$socid) $sql .= " AND sc.fk_user = ".$user->id;
+		if ($this->restrictiononfksoc == 2 && !$user->rights->societe->client->voir && !$socid) $sql .= " AND (sc.fk_user = ".$user->id.' OR te.fk_soc IS NULL)';
+		if (!empty($filter))
+		{
+			if (!preg_match('/^\s*AND/i', $filter)) $sql .= " AND "; // For backward compatibility
+			$sql .= $filter;
+		}
+		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) $sql .= ' AND te.fk_soc = s.rowid'; // If we need to link to societe to limit select to entity
+		else if ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql .= ' AND te.fk_soc = s.rowid'; // If we need to link to societe to limit select to socid
 		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) {
-			if ($this->element == 'user' && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
-				if (! empty($user->admin) && empty($user->entity) && $conf->entity == 1) {
-					$sql.= " AND te.entity IS NOT NULL"; // Show all users
+			if ($this->element == 'user' && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
+				if (!empty($user->admin) && empty($user->entity) && $conf->entity == 1) {
+					$sql .= " AND te.entity IS NOT NULL"; // Show all users
 				} else {
-					$sql.= " AND ug.fk_user = te.rowid";
-					$sql.= " AND ug.entity IN (".getEntity($this->element).")";
+					$sql .= " AND ug.fk_user = te.rowid";
+					$sql .= " AND ug.entity IN (".getEntity($this->element).")";
 				}
 			} else {
-				$sql.= ' AND te.entity IN ('.getEntity($this->element).')';
+				$sql .= ' AND te.entity IN ('.getEntity($this->element).')';
 			}
 		}
-		if ($this->restrictiononfksoc == 1 && $socid && $this->element != 'societe') $sql.= ' AND te.fk_soc = ' . $socid;
-		if ($this->restrictiononfksoc == 2 && $socid && $this->element != 'societe') $sql.= ' AND (te.fk_soc = ' . $socid.' OR te.fk_soc IS NULL)';
-		if ($this->restrictiononfksoc && $socid && $this->element == 'societe') $sql.= ' AND te.rowid = ' . $socid;
+		if ($this->restrictiononfksoc == 1 && $socid && $this->element != 'societe') $sql .= ' AND te.fk_soc = '.$socid;
+		if ($this->restrictiononfksoc == 2 && $socid && $this->element != 'societe') $sql .= ' AND (te.fk_soc = '.$socid.' OR te.fk_soc IS NULL)';
+		if ($this->restrictiononfksoc && $socid && $this->element == 'societe') $sql .= ' AND te.rowid = '.$socid;
 		//print 'socid='.$socid.' restrictiononfksoc='.$this->restrictiononfksoc.' ismultientitymanaged = '.$this->ismultientitymanaged.' filter = '.$filter.' -> '.$sql."<br>";
 
 		$result = $this->db->query($sql);
-		if (! $result)
+		if (!$result)
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			return -1;
 		}
 		$row = $this->db->fetch_row($result);
@@ -1647,46 +1647,46 @@ 
 
 
 		$sql = "SELECT MIN(te.".$fieldid.")";
-		$sql.= " FROM ".(empty($nodbprefix)?MAIN_DB_PREFIX:'').$this->table_element." as te";
-		if ($this->element == 'user' && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
-			$sql.= ",".MAIN_DB_PREFIX."usergroup_user as ug";
-		}
-		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) $sql.= ", ".MAIN_DB_PREFIX."societe as s";	// If we need to link to societe to limit select to entity
-		else if ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe as s";	// If we need to link to societe to limit select to socid
-		else if ($this->restrictiononfksoc == 2 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON te.fk_soc = s.rowid";	// If we need to link to societe to limit select to socid
-		if ($this->restrictiononfksoc && !$user->rights->societe->client->voir && !$socid) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON ".$alias.".rowid = sc.fk_soc";
-		$sql.= " WHERE te.".$fieldid." > '".$this->db->escape($this->ref)."'";  // ->ref must always be defined (set to id if field does not exists)
-		if ($this->restrictiononfksoc == 1 && !$user->rights->societe->client->voir && !$socid) $sql.= " AND sc.fk_user = " .$user->id;
-		if ($this->restrictiononfksoc == 2 && !$user->rights->societe->client->voir && !$socid) $sql.= " AND (sc.fk_user = " .$user->id.' OR te.fk_soc IS NULL)';
-		if (! empty($filter))
-		{
-			if (! preg_match('/^\s*AND/i', $filter)) $sql.=" AND ";   // For backward compatibility
-			$sql.=$filter;
-		}
-		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) $sql.= ' AND te.fk_soc = s.rowid';			// If we need to link to societe to limit select to entity
-		else if ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql.= ' AND te.fk_soc = s.rowid';			// If we need to link to societe to limit select to socid
+		$sql .= " FROM ".(empty($nodbprefix) ?MAIN_DB_PREFIX:'').$this->table_element." as te";
+		if ($this->element == 'user' && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
+			$sql .= ",".MAIN_DB_PREFIX."usergroup_user as ug";
+		}
+		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) $sql .= ", ".MAIN_DB_PREFIX."societe as s"; // If we need to link to societe to limit select to entity
+		else if ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe as s"; // If we need to link to societe to limit select to socid
+		else if ($this->restrictiononfksoc == 2 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON te.fk_soc = s.rowid"; // If we need to link to societe to limit select to socid
+		if ($this->restrictiononfksoc && !$user->rights->societe->client->voir && !$socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON ".$alias.".rowid = sc.fk_soc";
+		$sql .= " WHERE te.".$fieldid." > '".$this->db->escape($this->ref)."'"; // ->ref must always be defined (set to id if field does not exists)
+		if ($this->restrictiononfksoc == 1 && !$user->rights->societe->client->voir && !$socid) $sql .= " AND sc.fk_user = ".$user->id;
+		if ($this->restrictiononfksoc == 2 && !$user->rights->societe->client->voir && !$socid) $sql .= " AND (sc.fk_user = ".$user->id.' OR te.fk_soc IS NULL)';
+		if (!empty($filter))
+		{
+			if (!preg_match('/^\s*AND/i', $filter)) $sql .= " AND "; // For backward compatibility
+			$sql .= $filter;
+		}
+		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) $sql .= ' AND te.fk_soc = s.rowid'; // If we need to link to societe to limit select to entity
+		else if ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql .= ' AND te.fk_soc = s.rowid'; // If we need to link to societe to limit select to socid
 		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) {
-			if ($this->element == 'user' && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
-				if (! empty($user->admin) && empty($user->entity) && $conf->entity == 1) {
-					$sql.= " AND te.entity IS NOT NULL"; // Show all users
+			if ($this->element == 'user' && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
+				if (!empty($user->admin) && empty($user->entity) && $conf->entity == 1) {
+					$sql .= " AND te.entity IS NOT NULL"; // Show all users
 				} else {
-					$sql.= " AND ug.fk_user = te.rowid";
-					$sql.= " AND ug.entity IN (".getEntity($this->element).")";
+					$sql .= " AND ug.fk_user = te.rowid";
+					$sql .= " AND ug.entity IN (".getEntity($this->element).")";
 				}
 			} else {
-				$sql.= ' AND te.entity IN ('.getEntity($this->element).')';
+				$sql .= ' AND te.entity IN ('.getEntity($this->element).')';
 			}
 		}
-		if ($this->restrictiononfksoc == 1 && $socid && $this->element != 'societe') $sql.= ' AND te.fk_soc = ' . $socid;
-		if ($this->restrictiononfksoc == 2 && $socid && $this->element != 'societe') $sql.= ' AND (te.fk_soc = ' . $socid.' OR te.fk_soc IS NULL)';
-		if ($this->restrictiononfksoc && $socid && $this->element == 'societe') $sql.= ' AND te.rowid = ' . $socid;
+		if ($this->restrictiononfksoc == 1 && $socid && $this->element != 'societe') $sql .= ' AND te.fk_soc = '.$socid;
+		if ($this->restrictiononfksoc == 2 && $socid && $this->element != 'societe') $sql .= ' AND (te.fk_soc = '.$socid.' OR te.fk_soc IS NULL)';
+		if ($this->restrictiononfksoc && $socid && $this->element == 'societe') $sql .= ' AND te.rowid = '.$socid;
 		//print 'socid='.$socid.' restrictiononfksoc='.$this->restrictiononfksoc.' ismultientitymanaged = '.$this->ismultientitymanaged.' filter = '.$filter.' -> '.$sql."<br>";
 		// Rem: Bug in some mysql version: SELECT MIN(rowid) FROM llx_socpeople WHERE rowid > 1 when one row in database with rowid=1, returns 1 instead of null
 
 		$result = $this->db->query($sql);
-		if (! $result)
+		if (!$result)
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			return -2;
 		}
 		$row = $this->db->fetch_row($result);
@@ -1703,11 +1703,11 @@ 
 	 *      @return array				Array of id of contacts (if source=external or internal)
 	 * 									Array of id of third parties with at least one contact on object (if source=thirdparty)
 	 */
-	function getListContactId($source='external')
+	function getListContactId($source = 'external')
 	{
 		$contactAlreadySelected = array();
-		$tab = $this->liste_contact(-1,$source);
-		$num=count($tab);
+		$tab = $this->liste_contact(-1, $source);
+		$num = count($tab);
 		$i = 0;
 		while ($i < $num)
 		{
@@ -1727,24 +1727,24 @@ 
 	 */
 	function setProject($projectid)
 	{
-		if (! $this->table_element)
+		if (!$this->table_element)
 		{
-			dol_syslog(get_class($this)."::setProject was called on objet with property table_element not defined",LOG_ERR);
+			dol_syslog(get_class($this)."::setProject was called on objet with property table_element not defined", LOG_ERR);
 			return -1;
 		}
 
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
 		if ($this->table_element == 'actioncomm')
 		{
-			if ($projectid) $sql.= ' SET fk_project = '.$projectid;
-			else $sql.= ' SET fk_project = NULL';
-			$sql.= ' WHERE id = '.$this->id;
+			if ($projectid) $sql .= ' SET fk_project = '.$projectid;
+			else $sql .= ' SET fk_project = NULL';
+			$sql .= ' WHERE id = '.$this->id;
 		}
 		else
 		{
-			if ($projectid) $sql.= ' SET fk_projet = '.$projectid;
-			else $sql.= ' SET fk_projet = NULL';
-			$sql.= ' WHERE rowid = '.$this->id;
+			if ($projectid) $sql .= ' SET fk_projet = '.$projectid;
+			else $sql .= ' SET fk_projet = NULL';
+			$sql .= ' WHERE rowid = '.$this->id;
 		}
 
 		dol_syslog(get_class($this)."::setProject", LOG_DEBUG);
@@ -1790,14 +1790,14 @@ 
 			else
 			{
 				dol_syslog(get_class($this).'::setPaymentMethods Erreur '.$sql.' - '.$this->db->error());
-				$this->error=$this->db->error();
+				$this->error = $this->db->error();
 				return -1;
 			}
 		}
 		else
 		{
 			dol_syslog(get_class($this).'::setPaymentMethods, status of the object is incompatible');
-			$this->error='Status of the object is incompatible '.$this->statut;
+			$this->error = 'Status of the object is incompatible '.$this->statut;
 			return -2;
 		}
 	}
@@ -1824,21 +1824,21 @@ 
 				$this->multicurrency_code = $code;
 
 				list($fk_multicurrency, $rate) = MultiCurrency::getIdAndTxFromCode($this->db, $code);
-				if ($rate) $this->setMulticurrencyRate($rate,2);
+				if ($rate) $this->setMulticurrencyRate($rate, 2);
 
 				return 1;
 			}
 			else
 			{
 				dol_syslog(get_class($this).'::setMulticurrencyCode Erreur '.$sql.' - '.$this->db->error());
-				$this->error=$this->db->error();
+				$this->error = $this->db->error();
 				return -1;
 			}
 		}
 		else
 		{
 			dol_syslog(get_class($this).'::setMulticurrencyCode, status of the object is incompatible');
-			$this->error='Status of the object is incompatible '.$this->statut;
+			$this->error = 'Status of the object is incompatible '.$this->statut;
 			return -2;
 		}
 	}
@@ -1850,7 +1850,7 @@ 
 	 *  @param		int		$mode	mode 1 : amounts in company currency will be recalculated, mode 2 : amounts in foreign currency
 	 *  @return		int				>0 if OK, <0 if KO
 	 */
-	function setMulticurrencyRate($rate, $mode=1)
+	function setMulticurrencyRate($rate, $mode = 1)
 	{
 		dol_syslog(get_class($this).'::setMulticurrencyRate('.$id.')');
 		if ($this->statut >= 0 || $this->element == 'societe')
@@ -1870,7 +1870,7 @@ 
 				{
 					foreach ($this->lines as &$line)
 					{
-						if($mode == 1) {
+						if ($mode == 1) {
 							$line->subprice = 0;
 						}
 
@@ -1878,14 +1878,14 @@ 
 							case 'propal':
 								$this->updateline(
 									$line->id, $line->subprice, $line->qty, $line->remise_percent, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx,
-									($line->description?$line->description:$line->desc), 'HT', $line->info_bits, $line->special_code, $line->fk_parent_line,
+									($line->description ? $line->description : $line->desc), 'HT', $line->info_bits, $line->special_code, $line->fk_parent_line,
 									$line->skip_update_total, $line->fk_fournprice, $line->pa_ht, $line->label, $line->product_type, $line->date_start,
 									$line->date_end, $line->array_options, $line->fk_unit, $line->multicurrency_subprice
 								);
 								break;
 							case 'commande':
 								$this->updateline(
-									$line->id, ($line->description?$line->description:$line->desc), $line->subprice, $line->qty, $line->remise_percent,
+									$line->id, ($line->description ? $line->description : $line->desc), $line->subprice, $line->qty, $line->remise_percent,
 									$line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'HT', $line->info_bits, $line->date_start, $line->date_end,
 									$line->product_type, $line->fk_parent_line, $line->skip_update_total, $line->fk_fournprice, $line->pa_ht, $line->label,
 									$line->special_code, $line->array_options, $line->fk_unit, $line->multicurrency_subprice
@@ -1893,7 +1893,7 @@ 
 								break;
 							case 'facture':
 								$this->updateline(
-									$line->id, ($line->description?$line->description:$line->desc), $line->subprice, $line->qty, $line->remise_percent,
+									$line->id, ($line->description ? $line->description : $line->desc), $line->subprice, $line->qty, $line->remise_percent,
 									$line->date_start, $line->date_end, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'HT', $line->info_bits,
 									$line->product_type, $line->fk_parent_line, $line->skip_update_total, $line->fk_fournprice, $line->pa_ht, $line->label,
 									$line->special_code, $line->array_options, $line->situation_percent, $line->fk_unit, $line->multicurrency_subprice
@@ -1902,21 +1902,21 @@ 
 							case 'supplier_proposal':
 								$this->updateline(
 									$line->id, $line->subprice, $line->qty, $line->remise_percent, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx,
-									($line->description?$line->description:$line->desc), 'HT', $line->info_bits, $line->special_code, $line->fk_parent_line,
+									($line->description ? $line->description : $line->desc), 'HT', $line->info_bits, $line->special_code, $line->fk_parent_line,
 									$line->skip_update_total, $line->fk_fournprice, $line->pa_ht, $line->label, $line->product_type, $line->array_options,
 									$line->ref_fourn, $line->multicurrency_subprice
 								);
 								break;
 							case 'order_supplier':
 								$this->updateline(
-									$line->id, ($line->description?$line->description:$line->desc), $line->subprice, $line->qty, $line->remise_percent,
+									$line->id, ($line->description ? $line->description : $line->desc), $line->subprice, $line->qty, $line->remise_percent,
 									$line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'HT', $line->info_bits, $line->product_type, false,
 									$line->date_start, $line->date_end, $line->array_options, $line->fk_unit, $line->multicurrency_subprice
 								);
 								break;
 							case 'invoice_supplier':
 								$this->updateline(
-									$line->id, ($line->description?$line->description:$line->desc), $line->subprice, $line->tva_tx, $line->localtax1_tx,
+									$line->id, ($line->description ? $line->description : $line->desc), $line->subprice, $line->tva_tx, $line->localtax1_tx,
 									$line->localtax2_tx, $line->qty, 0, 'HT', $line->info_bits, $line->product_type, $line->remise_percent, false,
 									$line->date_start, $line->date_end, $line->array_options, $line->fk_unit, $line->multicurrency_subprice
 								);
@@ -1933,14 +1933,14 @@ 
 			else
 			{
 				dol_syslog(get_class($this).'::setMulticurrencyRate Erreur '.$sql.' - '.$this->db->error());
-				$this->error=$this->db->error();
+				$this->error = $this->db->error();
 				return -1;
 			}
 		}
 		else
 		{
 			dol_syslog(get_class($this).'::setMulticurrencyRate, status of the object is incompatible');
-			$this->error='Status of the object is incompatible '.$this->statut;
+			$this->error = 'Status of the object is incompatible '.$this->statut;
 			return -2;
 		}
 	}
@@ -1970,20 +1970,20 @@ 
 				$this->cond_reglement_id = $id;
 				// for supplier
 				if (get_class($this) == 'Fournisseur') $this->cond_reglement_supplier_id = $id;
-				$this->cond_reglement = $id;	// for compatibility
+				$this->cond_reglement = $id; // for compatibility
 				return 1;
 			}
 			else
 			{
 				dol_syslog(get_class($this).'::setPaymentTerms Erreur '.$sql.' - '.$this->db->error());
-				$this->error=$this->db->error();
+				$this->error = $this->db->error();
 				return -1;
 			}
 		}
 		else
 		{
 			dol_syslog(get_class($this).'::setPaymentTerms, status of the object is incompatible');
-			$this->error='Status of the object is incompatible '.$this->statut;
+			$this->error = 'Status of the object is incompatible '.$this->statut;
 			return -2;
 		}
 	}
@@ -2001,7 +2001,7 @@ 
 		if ($this->element == 'delivery' || $this->element == 'shipping') $fieldname = 'fk_address';
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET ".$fieldname." = ".$id;
-		$sql.= " WHERE rowid = ".$this->id." AND fk_statut = 0";
+		$sql .= " WHERE rowid = ".$this->id." AND fk_statut = 0";
 
 		if ($this->db->query($sql))
 		{
@@ -2010,7 +2010,7 @@ 
 		}
 		else
 		{
-			$this->error=$this->db->error();
+			$this->error = $this->db->error();
 			dol_syslog(get_class($this).'::setDeliveryAddress Erreur '.$sql.' - '.$this->error);
 			return -1;
 		}
@@ -2026,29 +2026,29 @@ 
 	 *
 	 *  @return     int              1 if OK, 0 if KO
 	 */
-	function setShippingMethod($shipping_method_id, $notrigger=false, $userused=null)
+	function setShippingMethod($shipping_method_id, $notrigger = false, $userused = null)
 	{
         global $user;
 
-        if (empty($userused)) $userused=$user;
+        if (empty($userused)) $userused = $user;
 
         $error = 0;
 
-		if (! $this->table_element) {
-			dol_syslog(get_class($this)."::setShippingMethod was called on objet with property table_element not defined",LOG_ERR);
+		if (!$this->table_element) {
+			dol_syslog(get_class($this)."::setShippingMethod was called on objet with property table_element not defined", LOG_ERR);
 			return -1;
 		}
 
         $this->db->begin();
 
-		if ($shipping_method_id<0) $shipping_method_id='NULL';
+		if ($shipping_method_id < 0) $shipping_method_id = 'NULL';
 		dol_syslog(get_class($this).'::setShippingMethod('.$shipping_method_id.')');
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
-		$sql.= " SET fk_shipping_method = ".$shipping_method_id;
-		$sql.= " WHERE rowid=".$this->id;
+		$sql .= " SET fk_shipping_method = ".$shipping_method_id;
+		$sql .= " WHERE rowid=".$this->id;
         $resql = $this->db->query($sql);
-		if (! $resql) {
+		if (!$resql) {
 			dol_syslog(get_class($this).'::setShippingMethod Error ', LOG_DEBUG);
 			$this->error = $this->db->lasterror();
 			$error++;
@@ -2056,8 +2056,8 @@ 
             if (!$notrigger)
             {
                 // Call trigger
-                $this->context=array('shippingmethodupdate'=>1);
-                $result = $this->call_trigger(strtoupper(get_class($this)) . '_MODIFY', $userused);
+                $this->context = array('shippingmethodupdate'=>1);
+                $result = $this->call_trigger(strtoupper(get_class($this)).'_MODIFY', $userused);
                 if ($result < 0) $error++;
                 // End call trigger
             }
@@ -2067,7 +2067,7 @@ 
             $this->db->rollback();
             return -1;
         } else {
-            $this->shipping_method_id = ($shipping_method_id=='NULL')?null:$shipping_method_id;
+            $this->shipping_method_id = ($shipping_method_id == 'NULL') ?null:$shipping_method_id;
             $this->db->commit();
             return 1;
         }
@@ -2082,23 +2082,23 @@ 
 	 */
 	function setWarehouse($warehouse_id)
 	{
-		if (! $this->table_element) {
-			dol_syslog(get_class($this)."::setWarehouse was called on objet with property table_element not defined",LOG_ERR);
+		if (!$this->table_element) {
+			dol_syslog(get_class($this)."::setWarehouse was called on objet with property table_element not defined", LOG_ERR);
 			return -1;
 		}
-		if ($warehouse_id<0) $warehouse_id='NULL';
+		if ($warehouse_id < 0) $warehouse_id = 'NULL';
 		dol_syslog(get_class($this).'::setWarehouse('.$warehouse_id.')');
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
-		$sql.= " SET fk_warehouse = ".$warehouse_id;
-		$sql.= " WHERE rowid=".$this->id;
+		$sql .= " SET fk_warehouse = ".$warehouse_id;
+		$sql .= " WHERE rowid=".$this->id;
 
 		if ($this->db->query($sql)) {
-			$this->warehouse_id = ($warehouse_id=='NULL')?null:$warehouse_id;
+			$this->warehouse_id = ($warehouse_id == 'NULL') ?null:$warehouse_id;
 			return 1;
 		} else {
 			dol_syslog(get_class($this).'::setWarehouse Error ', LOG_DEBUG);
-			$this->error=$this->db->error();
+			$this->error = $this->db->error();
 			return 0;
 		}
 	}
@@ -2113,25 +2113,25 @@ 
 	 */
 	function setDocModel($user, $modelpdf)
 	{
-		if (! $this->table_element)
+		if (!$this->table_element)
 		{
-			dol_syslog(get_class($this)."::setDocModel was called on objet with property table_element not defined",LOG_ERR);
+			dol_syslog(get_class($this)."::setDocModel was called on objet with property table_element not defined", LOG_ERR);
 			return -1;
 		}
 
-		$newmodelpdf=dol_trunc($modelpdf,255);
+		$newmodelpdf = dol_trunc($modelpdf, 255);
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
-		$sql.= " SET model_pdf = '".$this->db->escape($newmodelpdf)."'";
-		$sql.= " WHERE rowid = ".$this->id;
+		$sql .= " SET model_pdf = '".$this->db->escape($newmodelpdf)."'";
+		$sql .= " WHERE rowid = ".$this->id;
 		// if ($this->element == 'facture') $sql.= " AND fk_statut < 2";
 		// if ($this->element == 'propal')  $sql.= " AND fk_statut = 0";
 
 		dol_syslog(get_class($this)."::setDocModel", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
-			$this->modelpdf=$modelpdf;
+			$this->modelpdf = $modelpdf;
 			return 1;
 		}
 		else
@@ -2150,29 +2150,29 @@ 
 	 *  @param      User	$userused		Object user
 	 *  @return		int				1 if OK, 0 if KO
 	 */
-	function setBankAccount($fk_account, $notrigger=false, $userused=null)
+	function setBankAccount($fk_account, $notrigger = false, $userused = null)
 	{
         global $user;
 
-        if (empty($userused)) $userused=$user;
+        if (empty($userused)) $userused = $user;
 
         $error = 0;
 
-		if (! $this->table_element) {
-			dol_syslog(get_class($this)."::setBankAccount was called on objet with property table_element not defined",LOG_ERR);
+		if (!$this->table_element) {
+			dol_syslog(get_class($this)."::setBankAccount was called on objet with property table_element not defined", LOG_ERR);
 			return -1;
 		}
         $this->db->begin();
 
-		if ($fk_account<0) $fk_account='NULL';
+		if ($fk_account < 0) $fk_account = 'NULL';
 		dol_syslog(get_class($this).'::setBankAccount('.$fk_account.')');
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
-		$sql.= " SET fk_account = ".$fk_account;
-		$sql.= " WHERE rowid=".$this->id;
+		$sql .= " SET fk_account = ".$fk_account;
+		$sql .= " WHERE rowid=".$this->id;
 
         $resql = $this->db->query($sql);
-        if (! $resql)
+        if (!$resql)
         {
             dol_syslog(get_class($this).'::setBankAccount Error '.$sql.' - '.$this->db->error());
             $this->error = $this->db->lasterror();
@@ -2183,8 +2183,8 @@ 
             if (!$notrigger)
             {
                 // Call trigger
-                $this->context=array('bankaccountupdate'=>1);
-                $result = $this->call_trigger(strtoupper(get_class($this)) . '_MODIFY', $userused);
+                $this->context = array('bankaccountupdate'=>1);
+                $result = $this->call_trigger(strtoupper(get_class($this)).'_MODIFY', $userused);
                 if ($result < 0) $error++;
                 // End call trigger
             }
@@ -2196,7 +2196,7 @@ 
         }
         else
         {
-            $this->fk_account = ($fk_account=='NULL')?null:$fk_account;
+            $this->fk_account = ($fk_account == 'NULL') ?null:$fk_account;
             $this->db->commit();
             return 1;
         }
@@ -2215,26 +2215,26 @@ 
 	 * 	@param		boolean		$fk_parent_line    Table with fk_parent_line field or not
 	 * 	@return		int                            <0 if KO, >0 if OK
 	 */
-	function line_order($renum=false, $rowidorder='ASC', $fk_parent_line=true)
+	function line_order($renum = false, $rowidorder = 'ASC', $fk_parent_line = true)
 	{
         // phpcs:enable
-		if (! $this->table_element_line)
+		if (!$this->table_element_line)
 		{
-			dol_syslog(get_class($this)."::line_order was called on objet with property table_element_line not defined",LOG_ERR);
+			dol_syslog(get_class($this)."::line_order was called on objet with property table_element_line not defined", LOG_ERR);
 			return -1;
 		}
-		if (! $this->fk_element)
+		if (!$this->fk_element)
 		{
-			dol_syslog(get_class($this)."::line_order was called on objet with property fk_element not defined",LOG_ERR);
+			dol_syslog(get_class($this)."::line_order was called on objet with property fk_element not defined", LOG_ERR);
 			return -1;
 		}
 
 		// Count number of lines to reorder (according to choice $renum)
-		$nl=0;
+		$nl = 0;
 		$sql = 'SELECT count(rowid) FROM '.MAIN_DB_PREFIX.$this->table_element_line;
-		$sql.= ' WHERE '.$this->fk_element.'='.$this->id;
-		if (! $renum) $sql.= ' AND rang = 0';
-		if ($renum) $sql.= ' AND rang <> 0';
+		$sql .= ' WHERE '.$this->fk_element.'='.$this->id;
+		if (!$renum) $sql .= ' AND rang = 0';
+		if ($renum) $sql .= ' AND rang <> 0';
 
 		dol_syslog(get_class($this)."::line_order", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -2248,28 +2248,28 @@ 
 		{
 			// The goal of this part is to reorder all lines, with all children lines sharing the same
 			// counter that parents.
-			$rows=array();
+			$rows = array();
 
 			// We first search all lines that are parent lines (for multilevel details lines)
 			$sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.$this->table_element_line;
-			$sql.= ' WHERE '.$this->fk_element.' = '.$this->id;
-			if ($fk_parent_line) $sql.= ' AND fk_parent_line IS NULL';
-			$sql.= ' ORDER BY rang ASC, rowid '.$rowidorder;
+			$sql .= ' WHERE '.$this->fk_element.' = '.$this->id;
+			if ($fk_parent_line) $sql .= ' AND fk_parent_line IS NULL';
+			$sql .= ' ORDER BY rang ASC, rowid '.$rowidorder;
 
 			dol_syslog(get_class($this)."::line_order search all parent lines", LOG_DEBUG);
 			$resql = $this->db->query($sql);
 			if ($resql)
 			{
-				$i=0;
+				$i = 0;
 				$num = $this->db->num_rows($resql);
 				while ($i < $num)
 				{
 					$row = $this->db->fetch_row($resql);
-					$rows[] = $row[0];	// Add parent line into array rows
+					$rows[] = $row[0]; // Add parent line into array rows
 					$childrens = $this->getChildrenOfLine($row[0]);
-					if (! empty($childrens))
+					if (!empty($childrens))
 					{
-						foreach($childrens as $child)
+						foreach ($childrens as $child)
 						{
 							array_push($rows, $child);
 						}
@@ -2278,11 +2278,11 @@ 
 				}
 
 				// Now we set a new number for each lines (parent and children with children included into parent tree)
-				if (! empty($rows))
+				if (!empty($rows))
 				{
-					foreach($rows as $key => $row)
+					foreach ($rows as $key => $row)
 					{
-						$this->updateRangOfLine($row, ($key+1));
+						$this->updateRangOfLine($row, ($key + 1));
 					}
 				}
 			}
@@ -2302,18 +2302,18 @@ 
 	 */
 	function getChildrenOfLine($id)
 	{
-		$rows=array();
+		$rows = array();
 
 		$sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.$this->table_element_line;
-		$sql.= ' WHERE '.$this->fk_element.' = '.$this->id;
-		$sql.= ' AND fk_parent_line = '.$id;
-		$sql.= ' ORDER BY rang ASC';
+		$sql .= ' WHERE '.$this->fk_element.' = '.$this->id;
+		$sql .= ' AND fk_parent_line = '.$id;
+		$sql .= ' ORDER BY rang ASC';
 
 		dol_syslog(get_class($this)."::getChildrenOfLine search children lines for line ".$id."", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
-			$i=0;
+			$i = 0;
 			$num = $this->db->num_rows($resql);
 			while ($i < $num)
 			{
@@ -2334,7 +2334,7 @@ 
 	 * 	@param	boolean		$fk_parent_line		Table with fk_parent_line field or not
 	 * 	@return	void
 	 */
-	function line_up($rowid, $fk_parent_line=true)
+	function line_up($rowid, $fk_parent_line = true)
 	{
         // phpcs:enable
 		$this->line_order(false, 'ASC', $fk_parent_line);
@@ -2354,7 +2354,7 @@ 
 	 * 	@param	boolean		$fk_parent_line		Table with fk_parent_line field or not
 	 * 	@return	void
 	 */
-	function line_down($rowid, $fk_parent_line=true)
+	function line_down($rowid, $fk_parent_line = true)
 	{
         // phpcs:enable
 		$this->line_order(false, 'ASC', $fk_parent_line);
@@ -2376,16 +2376,16 @@ 
 	 * 	@param	int		$rang		Position
 	 * 	@return	void
 	 */
-	function updateRangOfLine($rowid,$rang)
+	function updateRangOfLine($rowid, $rang)
 	{
 		$fieldposition = 'rang';
 		if (in_array($this->table_element_line, array('ecm_files', 'emailcollector_emailcollectoraction'))) $fieldposition = 'position';
 
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element_line.' SET '.$fieldposition.' = '.$rang;
-		$sql.= ' WHERE rowid = '.$rowid;
+		$sql .= ' WHERE rowid = '.$rowid;
 
 		dol_syslog(get_class($this)."::updateRangOfLine", LOG_DEBUG);
-		if (! $this->db->query($sql))
+		if (!$this->db->query($sql))
 		{
 			dol_print_error($this->db);
 		}
@@ -2402,9 +2402,9 @@ 
 	{
         // phpcs:enable
 		$num = count($rows);
-		for ($i = 0 ; $i < $num ; $i++)
+		for ($i = 0; $i < $num; $i++)
 		{
-			$this->updateRangOfLine($rows[$i], ($i+1));
+			$this->updateRangOfLine($rows[$i], ($i + 1));
 		}
 	}
 
@@ -2415,21 +2415,21 @@ 
 	 * 	@param	int		$rang		Position
 	 * 	@return	void
 	 */
-	function updateLineUp($rowid,$rang)
+	function updateLineUp($rowid, $rang)
 	{
 		if ($rang > 1)
 		{
 			$fieldposition = 'rang';
 			if (in_array($this->table_element_line, array('ecm_files', 'emailcollector_emailcollectoraction'))) $fieldposition = 'position';
 
-			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element_line.' SET '.$fieldposition.' = '.$rang ;
-			$sql.= ' WHERE '.$this->fk_element.' = '.$this->id;
-			$sql.= ' AND rang = '.($rang - 1);
-			if ($this->db->query($sql) )
+			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element_line.' SET '.$fieldposition.' = '.$rang;
+			$sql .= ' WHERE '.$this->fk_element.' = '.$this->id;
+			$sql .= ' AND rang = '.($rang - 1);
+			if ($this->db->query($sql))
 			{
 				$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element_line.' SET '.$fieldposition.' = '.($rang - 1);
-				$sql.= ' WHERE rowid = '.$rowid;
-				if (! $this->db->query($sql) )
+				$sql .= ' WHERE rowid = '.$rowid;
+				if (!$this->db->query($sql))
 				{
 					dol_print_error($this->db);
 				}
@@ -2449,7 +2449,7 @@ 
 	 * 	@param	int		$max		Max
 	 * 	@return	void
 	 */
-	function updateLineDown($rowid,$rang,$max)
+	function updateLineDown($rowid, $rang, $max)
 	{
 		if ($rang < $max)
 		{
@@ -2457,13 +2457,13 @@ 
 			if (in_array($this->table_element_line, array('ecm_files', 'emailcollector_emailcollectoraction'))) $fieldposition = 'position';
 
 			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element_line.' SET '.$fieldposition.' = '.$rang;
-			$sql.= ' WHERE '.$this->fk_element.' = '.$this->id;
-			$sql.= ' AND rang = '.($rang+1);
-			if ($this->db->query($sql) )
+			$sql .= ' WHERE '.$this->fk_element.' = '.$this->id;
+			$sql .= ' AND rang = '.($rang + 1);
+			if ($this->db->query($sql))
 			{
-				$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element_line.' SET '.$fieldposition.' = '.($rang+1);
-				$sql.= ' WHERE rowid = '.$rowid;
-				if (! $this->db->query($sql) )
+				$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element_line.' SET '.$fieldposition.' = '.($rang + 1);
+				$sql .= ' WHERE rowid = '.$rowid;
+				if (!$this->db->query($sql))
 				{
 					dol_print_error($this->db);
 				}
@@ -2484,7 +2484,7 @@ 
 	function getRangOfLine($rowid)
 	{
 		$sql = 'SELECT rang FROM '.MAIN_DB_PREFIX.$this->table_element_line;
-		$sql.= ' WHERE rowid ='.$rowid;
+		$sql .= ' WHERE rowid ='.$rowid;
 
 		dol_syslog(get_class($this)."::getRangOfLine", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -2504,8 +2504,8 @@ 
 	function getIdOfLine($rang)
 	{
 		$sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.$this->table_element_line;
-		$sql.= ' WHERE '.$this->fk_element.' = '.$this->id;
-		$sql.= ' AND rang = '.$rang;
+		$sql .= ' WHERE '.$this->fk_element.' = '.$this->id;
+		$sql .= ' AND rang = '.$rang;
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
@@ -2521,22 +2521,22 @@ 
 	 * 	@param		int		$fk_parent_line		Parent line id
 	 *  @return     int  			   			Max value of rang in table of lines
 	 */
-	function line_max($fk_parent_line=0)
+	function line_max($fk_parent_line = 0)
 	{
         // phpcs:enable
 		// Search the last rang with fk_parent_line
 		if ($fk_parent_line)
 		{
 			$sql = 'SELECT max(rang) FROM '.MAIN_DB_PREFIX.$this->table_element_line;
-			$sql.= ' WHERE '.$this->fk_element.' = '.$this->id;
-			$sql.= ' AND fk_parent_line = '.$fk_parent_line;
+			$sql .= ' WHERE '.$this->fk_element.' = '.$this->id;
+			$sql .= ' AND fk_parent_line = '.$fk_parent_line;
 
 			dol_syslog(get_class($this)."::line_max", LOG_DEBUG);
 			$resql = $this->db->query($sql);
 			if ($resql)
 			{
 				$row = $this->db->fetch_row($resql);
-				if (! empty($row[0]))
+				if (!empty($row[0]))
 				{
 					return $row[0];
 				}
@@ -2550,7 +2550,7 @@ 
 		else
 		{
 			$sql = 'SELECT max(rang) FROM '.MAIN_DB_PREFIX.$this->table_element_line;
-			$sql.= ' WHERE '.$this->fk_element.' = '.$this->id;
+			$sql .= ' WHERE '.$this->fk_element.' = '.$this->id;
 
 			dol_syslog(get_class($this)."::line_max", LOG_DEBUG);
 			$resql = $this->db->query($sql);
@@ -2572,15 +2572,15 @@ 
 	function update_ref_ext($ref_ext)
 	{
         // phpcs:enable
-		if (! $this->table_element)
+		if (!$this->table_element)
 		{
 			dol_syslog(get_class($this)."::update_ref_ext was called on objet with property table_element not defined", LOG_ERR);
 			return -1;
 		}
 
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
-		$sql.= " SET ref_ext = '".$this->db->escape($ref_ext)."'";
-		$sql.= " WHERE ".(isset($this->table_rowid)?$this->table_rowid:'rowid')." = ". $this->id;
+		$sql .= " SET ref_ext = '".$this->db->escape($ref_ext)."'";
+		$sql .= " WHERE ".(isset($this->table_rowid) ? $this->table_rowid : 'rowid')." = ".$this->id;
 
 		dol_syslog(get_class($this)."::update_ref_ext", LOG_DEBUG);
 		if ($this->db->query($sql))
@@ -2590,7 +2590,7 @@ 
 		}
 		else
 		{
-			$this->error=$this->db->error();
+			$this->error = $this->db->error();
 			return -1;
 		}
 	}
@@ -2603,31 +2603,31 @@ 
 	 *  @param		string		$suffix		'', '_public' or '_private'
 	 *  @return     int      		   		<0 if KO, >0 if OK
 	 */
-	function update_note($note, $suffix='')
+	function update_note($note, $suffix = '')
 	{
         // phpcs:enable
 		global $user;
 
-		if (! $this->table_element)
+		if (!$this->table_element)
 		{
-			$this->error='update_note was called on objet with property table_element not defined';
+			$this->error = 'update_note was called on objet with property table_element not defined';
 			dol_syslog(get_class($this)."::update_note was called on objet with property table_element not defined", LOG_ERR);
 			return -1;
 		}
-		if (! in_array($suffix,array('','_public','_private')))
+		if (!in_array($suffix, array('', '_public', '_private')))
 		{
-			$this->error='update_note Parameter suffix must be empty, \'_private\' or \'_public\'';
+			$this->error = 'update_note Parameter suffix must be empty, \'_private\' or \'_public\'';
 			dol_syslog(get_class($this)."::update_note Parameter suffix must be empty, '_private' or '_public'", LOG_ERR);
 			return -2;
 		}
 		// Special cas
 		//var_dump($this->table_element);exit;
-		if ($this->table_element == 'product') $suffix='';
+		if ($this->table_element == 'product') $suffix = '';
 
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
-		$sql.= " SET note".$suffix." = ".(!empty($note)?("'".$this->db->escape($note)."'"):"NULL");
-		$sql.= " ,".(in_array($this->table_element, array('actioncomm', 'adherent', 'advtargetemailing', 'cronjob', 'establishment'))?"fk_user_mod":"fk_user_modif")." = ".$user->id;
-		$sql.= " WHERE rowid =". $this->id;
+		$sql .= " SET note".$suffix." = ".(!empty($note) ? ("'".$this->db->escape($note)."'") : "NULL");
+		$sql .= " ,".(in_array($this->table_element, array('actioncomm', 'adherent', 'advtargetemailing', 'cronjob', 'establishment')) ? "fk_user_mod" : "fk_user_modif")." = ".$user->id;
+		$sql .= " WHERE rowid =".$this->id;
 
 		dol_syslog(get_class($this)."::update_note", LOG_DEBUG);
 		if ($this->db->query($sql))
@@ -2636,14 +2636,14 @@ 
 			else if ($suffix == '_private') $this->note_private = $note;
 			else
 			{
-				$this->note = $note;      // deprecated
+				$this->note = $note; // deprecated
 				$this->note_private = $note;
 			}
 			return 1;
 		}
 		else
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			return -1;
 		}
 	}
@@ -2660,7 +2660,7 @@ 
 	function update_note_public($note)
 	{
         // phpcs:enable
-		return $this->update_note($note,'_public');
+		return $this->update_note($note, '_public');
 	}
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -2674,7 +2674,7 @@ 
 	 *  @param	Societe	$seller				If roundingadjust is '0' or '1' or maybe 'auto', it means we recalculate total for lines before calculating total for object and for this, we need seller object.
 	 *	@return	int    			           	<0 if KO, >0 if OK
 	 */
-	function update_price($exclspec=0,$roundingadjust='none',$nodatabaseupdate=0,$seller=null)
+	function update_price($exclspec = 0, $roundingadjust = 'none', $nodatabaseupdate = 0, $seller = null)
 	{
         // phpcs:enable
 		global $conf, $hookmanager, $action;
@@ -2694,8 +2694,8 @@ 
 		elseif ($this->element == 'supplier_proposal')
 			$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_SUPPLIER_PROPOSAL";
 
-		if (! empty($MODULE)) {
-			if (! empty($conf->global->$MODULE)) {
+		if (!empty($MODULE)) {
+			if (!empty($conf->global->$MODULE)) {
 				$modsactivated = explode(',', $conf->global->$MODULE);
 				foreach ($modsactivated as $mod) {
 					if ($conf->$mod->enabled)
@@ -2706,44 +2706,44 @@ 
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
 
-		if ($roundingadjust == '-1') $roundingadjust='auto';	// For backward compatibility
+		if ($roundingadjust == '-1') $roundingadjust = 'auto'; // For backward compatibility
 
-		$forcedroundingmode=$roundingadjust;
-		if ($forcedroundingmode == 'auto' && isset($conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND)) $forcedroundingmode=$conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND;
-		elseif ($forcedroundingmode == 'auto') $forcedroundingmode='0';
+		$forcedroundingmode = $roundingadjust;
+		if ($forcedroundingmode == 'auto' && isset($conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND)) $forcedroundingmode = $conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND;
+		elseif ($forcedroundingmode == 'auto') $forcedroundingmode = '0';
 
-		$error=0;
+		$error = 0;
 
 		$multicurrency_tx = !empty($this->multicurrency_tx) ? $this->multicurrency_tx : 1;
 
 		// Define constants to find lines to sum
-		$fieldtva='total_tva';
-		$fieldlocaltax1='total_localtax1';
-		$fieldlocaltax2='total_localtax2';
-		$fieldup='subprice';
+		$fieldtva = 'total_tva';
+		$fieldlocaltax1 = 'total_localtax1';
+		$fieldlocaltax2 = 'total_localtax2';
+		$fieldup = 'subprice';
 		if ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier')
 		{
-			$fieldtva='tva';
-			$fieldup='pu_ht';
+			$fieldtva = 'tva';
+			$fieldup = 'pu_ht';
 		}
 		if ($this->element == 'expensereport')
 		{
-			$fieldup='value_unit';
+			$fieldup = 'value_unit';
 		}
 
 		$sql = 'SELECT rowid, qty, '.$fieldup.' as up, remise_percent, total_ht, '.$fieldtva.' as total_tva, total_ttc, '.$fieldlocaltax1.' as total_localtax1, '.$fieldlocaltax2.' as total_localtax2,';
-		$sql.= ' tva_tx as vatrate, localtax1_tx, localtax2_tx, localtax1_type, localtax2_type, info_bits, product_type';
-			if ($this->table_element_line == 'facturedet') $sql.= ', situation_percent';
-			$sql.= ', multicurrency_total_ht, multicurrency_total_tva, multicurrency_total_ttc';
-		$sql.= ' FROM '.MAIN_DB_PREFIX.$this->table_element_line;
-		$sql.= ' WHERE '.$this->fk_element.' = '.$this->id;
+		$sql .= ' tva_tx as vatrate, localtax1_tx, localtax2_tx, localtax1_type, localtax2_type, info_bits, product_type';
+			if ($this->table_element_line == 'facturedet') $sql .= ', situation_percent';
+			$sql .= ', multicurrency_total_ht, multicurrency_total_tva, multicurrency_total_ttc';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element_line;
+		$sql .= ' WHERE '.$this->fk_element.' = '.$this->id;
 		if ($exclspec)
 		{
-			$product_field='product_type';
-			if ($this->table_element_line == 'contratdet') $product_field='';    // contratdet table has no product_type field
-			if ($product_field) $sql.= ' AND '.$product_field.' <> 9';
+			$product_field = 'product_type';
+			if ($this->table_element_line == 'contratdet') $product_field = ''; // contratdet table has no product_type field
+			if ($product_field) $sql .= ' AND '.$product_field.' <> 9';
 		}
-		$sql.= ' ORDER by rowid';	// We want to be sure to always use same order of line to not change lines differently when option MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND is used
+		$sql .= ' ORDER by rowid'; // We want to be sure to always use same order of line to not change lines differently when option MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND is used
 
 		dol_syslog(get_class($this)."::update_price", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -2757,7 +2757,7 @@ 
 			$total_ht_by_vats  = array();
 			$total_tva_by_vats = array();
 			$total_ttc_by_vats = array();
-			$this->multicurrency_total_ht	= 0;
+			$this->multicurrency_total_ht = 0;
 			$this->multicurrency_total_tva	= 0;
 			$this->multicurrency_total_ttc	= 0;
 
@@ -2768,54 +2768,54 @@ 
 				$obj = $this->db->fetch_object($resql);
 
 				// Note: There is no check on detail line and no check on total, if $forcedroundingmode = 'none'
-				$parameters=array('fk_element' => $obj->rowid);
+				$parameters = array('fk_element' => $obj->rowid);
 				$reshook = $hookmanager->executeHooks('changeRoundingMode', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 
 				if (empty($reshook) && $forcedroundingmode == '0')	// Check if data on line are consistent. This may solve lines that were not consistent because set with $forcedroundingmode='auto'
 				{
-					$localtax_array=array($obj->localtax1_type,$obj->localtax1_tx,$obj->localtax2_type,$obj->localtax2_tx);
-					$tmpcal=calcul_price_total($obj->qty, $obj->up, $obj->remise_percent, $obj->vatrate, $obj->localtax1_tx, $obj->localtax2_tx, 0, 'HT', $obj->info_bits, $obj->product_type, $seller, $localtax_array, (isset($obj->situation_percent) ? $obj->situation_percent : 100), $multicurrency_tx);
-					$diff=price2num($tmpcal[1] - $obj->total_tva, 'MT', 1);
+					$localtax_array = array($obj->localtax1_type, $obj->localtax1_tx, $obj->localtax2_type, $obj->localtax2_tx);
+					$tmpcal = calcul_price_total($obj->qty, $obj->up, $obj->remise_percent, $obj->vatrate, $obj->localtax1_tx, $obj->localtax2_tx, 0, 'HT', $obj->info_bits, $obj->product_type, $seller, $localtax_array, (isset($obj->situation_percent) ? $obj->situation_percent : 100), $multicurrency_tx);
+					$diff = price2num($tmpcal[1] - $obj->total_tva, 'MT', 1);
 					if ($diff)
 					{
-						$sqlfix="UPDATE ".MAIN_DB_PREFIX.$this->table_element_line." SET ".$fieldtva." = ".$tmpcal[1].", total_ttc = ".$tmpcal[2]." WHERE rowid = ".$obj->rowid;
+						$sqlfix = "UPDATE ".MAIN_DB_PREFIX.$this->table_element_line." SET ".$fieldtva." = ".$tmpcal[1].", total_ttc = ".$tmpcal[2]." WHERE rowid = ".$obj->rowid;
 						dol_syslog('We found unconsistent data into detailed line (difference of '.$diff.') for line rowid = '.$obj->rowid." (total vat of line calculated=".$tmpcal[1].", database=".$obj->total_tva."). We fix the total_vat and total_ttc of line by running sqlfix = ".$sqlfix);
-								$resqlfix=$this->db->query($sqlfix);
-								if (! $resqlfix) dol_print_error($this->db,'Failed to update line');
+								$resqlfix = $this->db->query($sqlfix);
+								if (!$resqlfix) dol_print_error($this->db, 'Failed to update line');
 								$obj->total_tva = $tmpcal[1];
 								$obj->total_ttc = $tmpcal[2];
 						//
 					}
 				}
 
-				$this->total_ht        += $obj->total_ht;		// The field visible at end of line detail
+				$this->total_ht        += $obj->total_ht; // The field visible at end of line detail
 				$this->total_tva       += $obj->total_tva;
 				$this->total_localtax1 += $obj->total_localtax1;
 				$this->total_localtax2 += $obj->total_localtax2;
 				$this->total_ttc       += $obj->total_ttc;
-				$this->multicurrency_total_ht        += $obj->multicurrency_total_ht;		// The field visible at end of line detail
+				$this->multicurrency_total_ht        += $obj->multicurrency_total_ht; // The field visible at end of line detail
 				$this->multicurrency_total_tva       += $obj->multicurrency_total_tva;
 				$this->multicurrency_total_ttc       += $obj->multicurrency_total_ttc;
 
-				if (! isset($total_ht_by_vats[$obj->vatrate]))  $total_ht_by_vats[$obj->vatrate]=0;
-				if (! isset($total_tva_by_vats[$obj->vatrate])) $total_tva_by_vats[$obj->vatrate]=0;
-				if (! isset($total_ttc_by_vats[$obj->vatrate])) $total_ttc_by_vats[$obj->vatrate]=0;
+				if (!isset($total_ht_by_vats[$obj->vatrate]))  $total_ht_by_vats[$obj->vatrate] = 0;
+				if (!isset($total_tva_by_vats[$obj->vatrate])) $total_tva_by_vats[$obj->vatrate] = 0;
+				if (!isset($total_ttc_by_vats[$obj->vatrate])) $total_ttc_by_vats[$obj->vatrate] = 0;
 				$total_ht_by_vats[$obj->vatrate]  += $obj->total_ht;
 				$total_tva_by_vats[$obj->vatrate] += $obj->total_tva;
 				$total_ttc_by_vats[$obj->vatrate] += $obj->total_ttc;
 
 				if ($forcedroundingmode == '1')	// Check if we need adjustement onto line for vat. TODO This works on the company currency but not on multicurrency
 				{
-					$tmpvat=price2num($total_ht_by_vats[$obj->vatrate] * $obj->vatrate / 100, 'MT', 1);
-					$diff=price2num($total_tva_by_vats[$obj->vatrate]-$tmpvat, 'MT', 1);
+					$tmpvat = price2num($total_ht_by_vats[$obj->vatrate] * $obj->vatrate / 100, 'MT', 1);
+					$diff = price2num($total_tva_by_vats[$obj->vatrate] - $tmpvat, 'MT', 1);
 					//print 'Line '.$i.' rowid='.$obj->rowid.' vat_rate='.$obj->vatrate.' total_ht='.$obj->total_ht.' total_tva='.$obj->total_tva.' total_ttc='.$obj->total_ttc.' total_ht_by_vats='.$total_ht_by_vats[$obj->vatrate].' total_tva_by_vats='.$total_tva_by_vats[$obj->vatrate].' (new calculation = '.$tmpvat.') total_ttc_by_vats='.$total_ttc_by_vats[$obj->vatrate].($diff?" => DIFF":"")."<br>\n";
 					if ($diff)
 					{
 						if (abs($diff) > 0.1) { dol_syslog('A rounding difference was detected into TOTAL but is too high to be corrected', LOG_WARNING); exit; }
-						$sqlfix="UPDATE ".MAIN_DB_PREFIX.$this->table_element_line." SET ".$fieldtva." = ".($obj->total_tva - $diff).", total_ttc = ".($obj->total_ttc - $diff)." WHERE rowid = ".$obj->rowid;
+						$sqlfix = "UPDATE ".MAIN_DB_PREFIX.$this->table_element_line." SET ".$fieldtva." = ".($obj->total_tva - $diff).", total_ttc = ".($obj->total_ttc - $diff)." WHERE rowid = ".$obj->rowid;
 						dol_syslog('We found a difference of '.$diff.' for line rowid = '.$obj->rowid.". We fix the total_vat and total_ttc of line by running sqlfix = ".$sqlfix);
-								$resqlfix=$this->db->query($sqlfix);
-								if (! $resqlfix) dol_print_error($this->db,'Failed to update line');
+								$resqlfix = $this->db->query($sqlfix);
+								if (!$resqlfix) dol_print_error($this->db, 'Failed to update line');
 								$this->total_tva -= $diff;
 								$this->total_ttc -= $diff;
 								$total_tva_by_vats[$obj->vatrate] -= $diff;
@@ -2827,11 +2827,11 @@ 
 			}
 
 			// Add revenue stamp to total
-			$this->total_ttc       			+= isset($this->revenuestamp)?$this->revenuestamp:0;
-			$this->multicurrency_total_ttc  += isset($this->revenuestamp)?($this->revenuestamp * $multicurrency_tx):0;
+			$this->total_ttc += isset($this->revenuestamp) ? $this->revenuestamp : 0;
+			$this->multicurrency_total_ttc += isset($this->revenuestamp) ? ($this->revenuestamp * $multicurrency_tx) : 0;
 
 			// Situations totals
-			if ($this->situation_cycle_ref && $this->situation_counter > 1 && method_exists($this, 'get_prev_sits') && $this->type != $this::TYPE_CREDIT_NOTE )
+			if ($this->situation_cycle_ref && $this->situation_counter > 1 && method_exists($this, 'get_prev_sits') && $this->type != $this::TYPE_CREDIT_NOTE)
 			{
 				$prev_sits = $this->get_prev_sits();
 
@@ -2850,17 +2850,17 @@ 
 			$this->db->free($resql);
 
 			// Now update global field total_ht, total_ttc and tva
-			$fieldht='total_ht';
-			$fieldtva='tva';
-			$fieldlocaltax1='localtax1';
-			$fieldlocaltax2='localtax2';
-			$fieldttc='total_ttc';
+			$fieldht = 'total_ht';
+			$fieldtva = 'tva';
+			$fieldlocaltax1 = 'localtax1';
+			$fieldlocaltax2 = 'localtax2';
+			$fieldttc = 'total_ttc';
 			// Specific code for backward compatibility with old field names
-			if ($this->element == 'facture' || $this->element == 'facturerec')             $fieldht='total';
-			if ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier') $fieldtva='total_tva';
-			if ($this->element == 'propal')                                                $fieldttc='total';
-			if ($this->element == 'expensereport')                                         $fieldtva='total_tva';
-			if ($this->element == 'supplier_proposal')                                     $fieldttc='total';
+			if ($this->element == 'facture' || $this->element == 'facturerec')             $fieldht = 'total';
+			if ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier') $fieldtva = 'total_tva';
+			if ($this->element == 'propal')                                                $fieldttc = 'total';
+			if ($this->element == 'expensereport')                                         $fieldtva = 'total_tva';
+			if ($this->element == 'supplier_proposal')                                     $fieldttc = 'total';
 
 			if (empty($nodatabaseupdate))
 			{
@@ -2877,16 +2877,16 @@ 
 
 
 				dol_syslog(get_class($this)."::update_price", LOG_DEBUG);
-				$resql=$this->db->query($sql);
-				if (! $resql)
+				$resql = $this->db->query($sql);
+				if (!$resql)
 				{
 					$error++;
-					$this->error=$this->db->lasterror();
-					$this->errors[]=$this->db->lasterror();
+					$this->error = $this->db->lasterror();
+					$this->errors[] = $this->db->lasterror();
 				}
 			}
 
-			if (! $error)
+			if (!$error)
 			{
 				return 1;
 			}
@@ -2897,7 +2897,7 @@ 
 		}
 		else
 		{
-			dol_print_error($this->db,'Bad request in update_price');
+			dol_print_error($this->db, 'Bad request in update_price');
 			return -1;
 		}
 	}
@@ -2911,30 +2911,30 @@ 
 	 *	@return		int					<=0 if KO, >0 if OK
 	 *	@see		fetchObjectLinked, updateObjectLinked, deleteObjectLinked
 	 */
-	function add_object_linked($origin=null, $origin_id=null)
+	function add_object_linked($origin = null, $origin_id = null)
 	{
         // phpcs:enable
-		$origin = (! empty($origin) ? $origin : $this->origin);
-		$origin_id = (! empty($origin_id) ? $origin_id : $this->origin_id);
+		$origin = (!empty($origin) ? $origin : $this->origin);
+		$origin_id = (!empty($origin_id) ? $origin_id : $this->origin_id);
 
 		// Special case
-		if ($origin == 'order') $origin='commande';
-		if ($origin == 'invoice') $origin='facture';
-		if ($origin == 'invoice_template') $origin='facturerec';
-    	if ($origin == 'supplierorder') $origin='order_supplier';
+		if ($origin == 'order') $origin = 'commande';
+		if ($origin == 'invoice') $origin = 'facture';
+		if ($origin == 'invoice_template') $origin = 'facturerec';
+    	if ($origin == 'supplierorder') $origin = 'order_supplier';
 		$this->db->begin();
 
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."element_element (";
-		$sql.= "fk_source";
-		$sql.= ", sourcetype";
-		$sql.= ", fk_target";
-		$sql.= ", targettype";
-		$sql.= ") VALUES (";
-		$sql.= $origin_id;
-		$sql.= ", '".$this->db->escape($origin)."'";
-		$sql.= ", ".$this->id;
-		$sql.= ", '".$this->db->escape($this->element)."'";
-		$sql.= ")";
+		$sql .= "fk_source";
+		$sql .= ", sourcetype";
+		$sql .= ", fk_target";
+		$sql .= ", targettype";
+		$sql .= ") VALUES (";
+		$sql .= $origin_id;
+		$sql .= ", '".$this->db->escape($origin)."'";
+		$sql .= ", ".$this->id;
+		$sql .= ", '".$this->db->escape($this->element)."'";
+		$sql .= ")";
 
 		dol_syslog(get_class($this)."::add_object_linked", LOG_DEBUG);
 		if ($this->db->query($sql))
@@ -2944,7 +2944,7 @@ 
 	  	}
 	  	else
 	  	{
-	  		$this->error=$this->db->lasterror();
+	  		$this->error = $this->db->lasterror();
 	  		$this->db->rollback();
 	  		return 0;
 	  	}
@@ -2972,33 +2972,33 @@ 
 	 *	@return int							<0 if KO, >0 if OK
 	 *  @see	add_object_linked, updateObjectLinked, deleteObjectLinked
 	 */
-	function fetchObjectLinked($sourceid=null,$sourcetype='',$targetid=null,$targettype='',$clause='OR',$alsosametype=1,$orderby='sourcetype',$loadalsoobjects=1)
+	function fetchObjectLinked($sourceid = null, $sourcetype = '', $targetid = null, $targettype = '', $clause = 'OR', $alsosametype = 1, $orderby = 'sourcetype', $loadalsoobjects = 1)
 	{
 		global $conf;
 
-		$this->linkedObjectsIds=array();
-		$this->linkedObjects=array();
+		$this->linkedObjectsIds = array();
+		$this->linkedObjects = array();
 
-		$justsource=false;
-		$justtarget=false;
-		$withtargettype=false;
-		$withsourcetype=false;
+		$justsource = false;
+		$justtarget = false;
+		$withtargettype = false;
+		$withsourcetype = false;
 
-		if (! empty($sourceid) && ! empty($sourcetype) && empty($targetid))
+		if (!empty($sourceid) && !empty($sourcetype) && empty($targetid))
 		{
-			$justsource=true;  // the source (id and type) is a search criteria
-			if (! empty($targettype)) $withtargettype=true;
+			$justsource = true; // the source (id and type) is a search criteria
+			if (!empty($targettype)) $withtargettype = true;
 		}
-		if (! empty($targetid) && ! empty($targettype) && empty($sourceid))
+		if (!empty($targetid) && !empty($targettype) && empty($sourceid))
 		{
-			$justtarget=true;  // the target (id and type) is a search criteria
-			if (! empty($sourcetype)) $withsourcetype=true;
+			$justtarget = true; // the target (id and type) is a search criteria
+			if (!empty($sourcetype)) $withsourcetype = true;
 		}
 
-		$sourceid = (! empty($sourceid) ? $sourceid : $this->id);
-		$targetid = (! empty($targetid) ? $targetid : $this->id);
-		$sourcetype = (! empty($sourcetype) ? $sourcetype : $this->element);
-		$targettype = (! empty($targettype) ? $targettype : $this->element);
+		$sourceid = (!empty($sourceid) ? $sourceid : $this->id);
+		$targetid = (!empty($targetid) ? $targetid : $this->id);
+		$sourcetype = (!empty($sourcetype) ? $sourcetype : $this->element);
+		$targettype = (!empty($targettype) ? $targettype : $this->element);
 
 		/*if (empty($sourceid) && empty($targetid))
 		 {
@@ -3008,25 +3008,25 @@ 
 
 		// Links between objects are stored in table element_element
 		$sql = 'SELECT rowid, fk_source, sourcetype, fk_target, targettype';
-		$sql.= ' FROM '.MAIN_DB_PREFIX.'element_element';
-		$sql.= " WHERE ";
+		$sql .= ' FROM '.MAIN_DB_PREFIX.'element_element';
+		$sql .= " WHERE ";
 		if ($justsource || $justtarget)
 		{
 			if ($justsource)
 			{
-				$sql.= "fk_source = ".$sourceid." AND sourcetype = '".$sourcetype."'";
-				if ($withtargettype) $sql.= " AND targettype = '".$targettype."'";
+				$sql .= "fk_source = ".$sourceid." AND sourcetype = '".$sourcetype."'";
+				if ($withtargettype) $sql .= " AND targettype = '".$targettype."'";
 			}
 			else if ($justtarget)
 			{
-				$sql.= "fk_target = ".$targetid." AND targettype = '".$targettype."'";
-				if ($withsourcetype) $sql.= " AND sourcetype = '".$sourcetype."'";
+				$sql .= "fk_target = ".$targetid." AND targettype = '".$targettype."'";
+				if ($withsourcetype) $sql .= " AND sourcetype = '".$sourcetype."'";
 			}
 		}
 		else
 		{
-			$sql.= "(fk_source = ".$sourceid." AND sourcetype = '".$sourcetype."')";
-			$sql.= " ".$clause." (fk_target = ".$targetid." AND targettype = '".$targettype."')";
+			$sql .= "(fk_source = ".$sourceid." AND sourcetype = '".$sourcetype."')";
+			$sql .= " ".$clause." (fk_target = ".$targetid." AND targettype = '".$targettype."')";
 		}
 		$sql .= ' ORDER BY '.$orderby;
 
@@ -3043,36 +3043,36 @@ 
 				{
 					if ($justsource)
 					{
-						$this->linkedObjectsIds[$obj->targettype][$obj->rowid]=$obj->fk_target;
+						$this->linkedObjectsIds[$obj->targettype][$obj->rowid] = $obj->fk_target;
 					}
 					else if ($justtarget)
 					{
-						$this->linkedObjectsIds[$obj->sourcetype][$obj->rowid]=$obj->fk_source;
+						$this->linkedObjectsIds[$obj->sourcetype][$obj->rowid] = $obj->fk_source;
 					}
 				}
 				else
 				{
 					if ($obj->fk_source == $sourceid && $obj->sourcetype == $sourcetype)
 					{
-						$this->linkedObjectsIds[$obj->targettype][$obj->rowid]=$obj->fk_target;
+						$this->linkedObjectsIds[$obj->targettype][$obj->rowid] = $obj->fk_target;
 					}
 					if ($obj->fk_target == $targetid && $obj->targettype == $targettype)
 					{
-						$this->linkedObjectsIds[$obj->sourcetype][$obj->rowid]=$obj->fk_source;
+						$this->linkedObjectsIds[$obj->sourcetype][$obj->rowid] = $obj->fk_source;
 					}
 				}
 				$i++;
 			}
 
-			if (! empty($this->linkedObjectsIds))
+			if (!empty($this->linkedObjectsIds))
 			{
 				$tmparray = $this->linkedObjectsIds;
-				foreach($tmparray as $objecttype => $objectids)       // $objecttype is a module name ('facture', 'mymodule', ...) or a module name with a suffix ('project_task', 'mymodule_myobj', ...)
+				foreach ($tmparray as $objecttype => $objectids)       // $objecttype is a module name ('facture', 'mymodule', ...) or a module name with a suffix ('project_task', 'mymodule_myobj', ...)
 				{
 					// Parse element/subelement (ex: project_task, cabinetmed_consultation, ...)
 					$module = $element = $subelement = $objecttype;
 					if ($objecttype != 'supplier_proposal' && $objecttype != 'order_supplier' && $objecttype != 'invoice_supplier'
-						&& preg_match('/^([^_]+)_([^_]+)/i',$objecttype,$regs))
+						&& preg_match('/^([^_]+)_([^_]+)/i', $objecttype, $regs))
 					{
 						$module = $element = $regs[1];
 						$subelement = $regs[2];
@@ -3080,31 +3080,31 @@ 
 
 					$classpath = $element.'/class';
 					// To work with non standard classpath or module name
-					if ($objecttype == 'facture')			{
+					if ($objecttype == 'facture') {
 						$classpath = 'compta/facture/class';
 					}
-					else if ($objecttype == 'facturerec')			{
+					else if ($objecttype == 'facturerec') {
 						$classpath = 'compta/facture/class'; $module = 'facture';
 					}
-					else if ($objecttype == 'propal')			{
+					else if ($objecttype == 'propal') {
 						$classpath = 'comm/propal/class';
 					}
-					else if ($objecttype == 'supplier_proposal')			{
+					else if ($objecttype == 'supplier_proposal') {
 						$classpath = 'supplier_proposal/class';
 					}
-					else if ($objecttype == 'shipping')			{
+					else if ($objecttype == 'shipping') {
 						$classpath = 'expedition/class'; $subelement = 'expedition'; $module = 'expedition_bon';
 					}
-					else if ($objecttype == 'delivery')			{
+					else if ($objecttype == 'delivery') {
 						$classpath = 'livraison/class'; $subelement = 'livraison'; $module = 'livraison_bon';
 					}
-					else if ($objecttype == 'invoice_supplier' || $objecttype == 'order_supplier')	{
+					else if ($objecttype == 'invoice_supplier' || $objecttype == 'order_supplier') {
 						$classpath = 'fourn/class'; $module = 'fournisseur';
 					}
-					else if ($objecttype == 'fichinter')			{
+					else if ($objecttype == 'fichinter') {
 						$classpath = 'fichinter/class'; $subelement = 'fichinter'; $module = 'ficheinter';
 					}
-					else if ($objecttype == 'subscription')			{
+					else if ($objecttype == 'subscription') {
 						$classpath = 'adherents/class'; $module = 'adherent';
 					}
 
@@ -3117,16 +3117,16 @@ 
 					else if ($objecttype == 'invoice_supplier') {
 						$classfile = 'fournisseur.facture'; $classname = 'FactureFournisseur';
 					}
-					else if ($objecttype == 'order_supplier')   {
+					else if ($objecttype == 'order_supplier') {
 						$classfile = 'fournisseur.commande'; $classname = 'CommandeFournisseur';
 					}
-					else if ($objecttype == 'supplier_proposal')   {
+					else if ($objecttype == 'supplier_proposal') {
 						$classfile = 'supplier_proposal'; $classname = 'SupplierProposal';
 					}
-					else if ($objecttype == 'facturerec')   {
+					else if ($objecttype == 'facturerec') {
 						$classfile = 'facture-rec'; $classname = 'FactureRec';
 					}
-					else if ($objecttype == 'subscription')   {
+					else if ($objecttype == 'subscription') {
 						$classfile = 'subscription'; $classname = 'Subscription';
 					}
 
@@ -3139,7 +3139,7 @@ 
 							//print '/'.$classpath.'/'.$classfile.'.class.php '.class_exists($classname);
 							if (class_exists($classname))
 							{
-								foreach($objectids as $i => $objectid)	// $i is rowid into llx_element_element
+								foreach ($objectids as $i => $objectid)	// $i is rowid into llx_element_element
 								{
 									$object = new $classname($this->db);
 									$ret = $object->fetch($objectid);
@@ -3176,28 +3176,28 @@ 
 	 *	@return							int	>0 if OK, <0 if KO
 	 *	@see	add_object_linked, fetObjectLinked, deleteObjectLinked
 	 */
-	function updateObjectLinked($sourceid=null, $sourcetype='', $targetid=null, $targettype='')
+	function updateObjectLinked($sourceid = null, $sourcetype = '', $targetid = null, $targettype = '')
 	{
-		$updatesource=false;
-		$updatetarget=false;
+		$updatesource = false;
+		$updatetarget = false;
 
-		if (! empty($sourceid) && ! empty($sourcetype) && empty($targetid) && empty($targettype)) $updatesource=true;
-		else if (empty($sourceid) && empty($sourcetype) && ! empty($targetid) && ! empty($targettype)) $updatetarget=true;
+		if (!empty($sourceid) && !empty($sourcetype) && empty($targetid) && empty($targettype)) $updatesource = true;
+		else if (empty($sourceid) && empty($sourcetype) && !empty($targetid) && !empty($targettype)) $updatetarget = true;
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."element_element SET ";
 		if ($updatesource)
 		{
-			$sql.= "fk_source = ".$sourceid;
-			$sql.= ", sourcetype = '".$this->db->escape($sourcetype)."'";
-			$sql.= " WHERE fk_target = ".$this->id;
-			$sql.= " AND targettype = '".$this->db->escape($this->element)."'";
+			$sql .= "fk_source = ".$sourceid;
+			$sql .= ", sourcetype = '".$this->db->escape($sourcetype)."'";
+			$sql .= " WHERE fk_target = ".$this->id;
+			$sql .= " AND targettype = '".$this->db->escape($this->element)."'";
 		}
 		else if ($updatetarget)
 		{
-			$sql.= "fk_target = ".$targetid;
-			$sql.= ", targettype = '".$this->db->escape($targettype)."'";
-			$sql.= " WHERE fk_source = ".$this->id;
-			$sql.= " AND sourcetype = '".$this->db->escape($this->element)."'";
+			$sql .= "fk_target = ".$targetid;
+			$sql .= ", targettype = '".$this->db->escape($targettype)."'";
+			$sql .= " WHERE fk_source = ".$this->id;
+			$sql .= " AND sourcetype = '".$this->db->escape($this->element)."'";
 		}
 
 		dol_syslog(get_class($this)."::updateObjectLinked", LOG_DEBUG);
@@ -3207,7 +3207,7 @@ 
 		}
 		else
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			return -1;
 		}
 	}
@@ -3223,42 +3223,42 @@ 
 	 *	@return     					int	>0 if OK, <0 if KO
 	 *	@see	add_object_linked, updateObjectLinked, fetchObjectLinked
 	 */
-	function deleteObjectLinked($sourceid=null, $sourcetype='', $targetid=null, $targettype='', $rowid='')
+	function deleteObjectLinked($sourceid = null, $sourcetype = '', $targetid = null, $targettype = '', $rowid = '')
 	{
-		$deletesource=false;
-		$deletetarget=false;
+		$deletesource = false;
+		$deletetarget = false;
 
-		if (! empty($sourceid) && ! empty($sourcetype) && empty($targetid) && empty($targettype)) $deletesource=true;
-		else if (empty($sourceid) && empty($sourcetype) && ! empty($targetid) && ! empty($targettype)) $deletetarget=true;
+		if (!empty($sourceid) && !empty($sourcetype) && empty($targetid) && empty($targettype)) $deletesource = true;
+		else if (empty($sourceid) && empty($sourcetype) && !empty($targetid) && !empty($targettype)) $deletetarget = true;
 
-		$sourceid = (! empty($sourceid) ? $sourceid : $this->id);
-		$sourcetype = (! empty($sourcetype) ? $sourcetype : $this->element);
-		$targetid = (! empty($targetid) ? $targetid : $this->id);
-		$targettype = (! empty($targettype) ? $targettype : $this->element);
+		$sourceid = (!empty($sourceid) ? $sourceid : $this->id);
+		$sourcetype = (!empty($sourcetype) ? $sourcetype : $this->element);
+		$targetid = (!empty($targetid) ? $targetid : $this->id);
+		$targettype = (!empty($targettype) ? $targettype : $this->element);
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."element_element";
-		$sql.= " WHERE";
+		$sql .= " WHERE";
 		if ($rowid > 0)
 		{
-			$sql.=" rowid = ".$rowid;
+			$sql .= " rowid = ".$rowid;
 		}
 		else
 		{
 			if ($deletesource)
 			{
-				$sql.= " fk_source = ".$sourceid." AND sourcetype = '".$this->db->escape($sourcetype)."'";
-				$sql.= " AND fk_target = ".$this->id." AND targettype = '".$this->db->escape($this->element)."'";
+				$sql .= " fk_source = ".$sourceid." AND sourcetype = '".$this->db->escape($sourcetype)."'";
+				$sql .= " AND fk_target = ".$this->id." AND targettype = '".$this->db->escape($this->element)."'";
 			}
 			else if ($deletetarget)
 			{
-				$sql.= " fk_target = ".$targetid." AND targettype = '".$this->db->escape($targettype)."'";
-				$sql.= " AND fk_source = ".$this->id." AND sourcetype = '".$this->db->escape($this->element)."'";
+				$sql .= " fk_target = ".$targetid." AND targettype = '".$this->db->escape($targettype)."'";
+				$sql .= " AND fk_source = ".$this->id." AND sourcetype = '".$this->db->escape($this->element)."'";
 			}
 			else
 			{
-				$sql.= " (fk_source = ".$this->id." AND sourcetype = '".$this->db->escape($this->element)."')";
-				$sql.= " OR";
-				$sql.= " (fk_target = ".$this->id." AND targettype = '".$this->db->escape($this->element)."')";
+				$sql .= " (fk_source = ".$this->id." AND sourcetype = '".$this->db->escape($this->element)."')";
+				$sql .= " OR";
+				$sql .= " (fk_target = ".$this->id." AND targettype = '".$this->db->escape($this->element)."')";
 			}
 		}
 
@@ -3269,8 +3269,8 @@ 
 		}
 		else
 		{
-			$this->error=$this->db->lasterror();
-			$this->errors[]=$this->error;
+			$this->error = $this->db->lasterror();
+			$this->errors[] = $this->error;
 			return -1;
 		}
 	}
@@ -3284,30 +3284,30 @@ 
 	 *      @param	string	$trigkey		Trigger key to use for trigger
 	 *      @return int						<0 if KO, >0 if OK
 	 */
-	function setStatut($status, $elementId=null, $elementType='', $trigkey='')
+	function setStatut($status, $elementId = null, $elementType = '', $trigkey = '')
 	{
-		global $user,$langs,$conf;
+		global $user, $langs, $conf;
 
-		$savElementId=$elementId;  // To be used later to know if we were using the method using the id of this or not.
+		$savElementId = $elementId; // To be used later to know if we were using the method using the id of this or not.
 
-		$elementId = (!empty($elementId)?$elementId:$this->id);
-		$elementTable = (!empty($elementType)?$elementType:$this->table_element);
+		$elementId = (!empty($elementId) ? $elementId : $this->id);
+		$elementTable = (!empty($elementType) ? $elementType : $this->table_element);
 
 		$this->db->begin();
 
-		$fieldstatus="fk_statut";
-		if ($elementTable == 'facture_rec') $fieldstatus="suspended";
-		if ($elementTable == 'mailing') $fieldstatus="statut";
-		if ($elementTable == 'cronjob') $fieldstatus="status";
-		if ($elementTable == 'user') $fieldstatus="statut";
-		if ($elementTable == 'expensereport') $fieldstatus="fk_statut";
-		if ($elementTable == 'commande_fournisseur_dispatch') $fieldstatus="status";
+		$fieldstatus = "fk_statut";
+		if ($elementTable == 'facture_rec') $fieldstatus = "suspended";
+		if ($elementTable == 'mailing') $fieldstatus = "statut";
+		if ($elementTable == 'cronjob') $fieldstatus = "status";
+		if ($elementTable == 'user') $fieldstatus = "statut";
+		if ($elementTable == 'expensereport') $fieldstatus = "fk_statut";
+		if ($elementTable == 'commande_fournisseur_dispatch') $fieldstatus = "status";
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$elementTable;
-		$sql.= " SET ".$fieldstatus." = ".$status;
+		$sql .= " SET ".$fieldstatus." = ".$status;
 		// If status = 1 = validated, update also fk_user_valid
-		if ($status == 1 && $elementTable == 'expensereport') $sql.=", fk_user_valid = ".$user->id;
-		$sql.= " WHERE rowid=".$elementId;
+		if ($status == 1 && $elementTable == 'expensereport') $sql .= ", fk_user_valid = ".$user->id;
+		$sql .= " WHERE rowid=".$elementId;
 
 		dol_syslog(get_class($this)."::setStatut", LOG_DEBUG);
 		if ($this->db->query($sql))
@@ -3317,27 +3317,27 @@ 
 			// Try autoset of trigkey
 			if (empty($trigkey))
 			{
-				if ($this->element == 'supplier_proposal' && $status == 2) $trigkey='SUPPLIER_PROPOSAL_SIGN';   // 2 = SupplierProposal::STATUS_SIGNED. Can't use constant into this generic class
-				if ($this->element == 'supplier_proposal' && $status == 3) $trigkey='SUPPLIER_PROPOSAL_REFUSE'; // 3 = SupplierProposal::STATUS_REFUSED. Can't use constant into this generic class
-				if ($this->element == 'supplier_proposal' && $status == 4) $trigkey='SUPPLIER_PROPOSAL_CLOSE';  // 4 = SupplierProposal::STATUS_CLOSED. Can't use constant into this generic class
-				if ($this->element == 'fichinter' && $status == 3) $trigkey='FICHINTER_CLASSIFY_DONE';
-				if ($this->element == 'fichinter' && $status == 2) $trigkey='FICHINTER_CLASSIFY_BILLED';
-				if ($this->element == 'fichinter' && $status == 1) $trigkey='FICHINTER_CLASSIFY_UNBILLED';
+				if ($this->element == 'supplier_proposal' && $status == 2) $trigkey = 'SUPPLIER_PROPOSAL_SIGN'; // 2 = SupplierProposal::STATUS_SIGNED. Can't use constant into this generic class
+				if ($this->element == 'supplier_proposal' && $status == 3) $trigkey = 'SUPPLIER_PROPOSAL_REFUSE'; // 3 = SupplierProposal::STATUS_REFUSED. Can't use constant into this generic class
+				if ($this->element == 'supplier_proposal' && $status == 4) $trigkey = 'SUPPLIER_PROPOSAL_CLOSE'; // 4 = SupplierProposal::STATUS_CLOSED. Can't use constant into this generic class
+				if ($this->element == 'fichinter' && $status == 3) $trigkey = 'FICHINTER_CLASSIFY_DONE';
+				if ($this->element == 'fichinter' && $status == 2) $trigkey = 'FICHINTER_CLASSIFY_BILLED';
+				if ($this->element == 'fichinter' && $status == 1) $trigkey = 'FICHINTER_CLASSIFY_UNBILLED';
 			}
 
 			if ($trigkey)
 			{
 				// Appel des triggers
-				include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-				$interface=new Interfaces($this->db);
-				$result=$interface->run_triggers($trigkey,$this,$user,$langs,$conf);
+				include_once DOL_DOCUMENT_ROOT.'/core/class/interfaces.class.php';
+				$interface = new Interfaces($this->db);
+				$result = $interface->run_triggers($trigkey, $this, $user, $langs, $conf);
 				if ($result < 0) {
-					$error++; $this->errors=$interface->errors;
+					$error++; $this->errors = $interface->errors;
 				}
 				// Fin appel triggers
 			}
 
-			if (! $error)
+			if (!$error)
 			{
 				$this->db->commit();
 
@@ -3352,13 +3352,13 @@ 
 			else
 			{
 				$this->db->rollback();
-				dol_syslog(get_class($this)."::setStatus ".$this->error,LOG_ERR);
+				dol_syslog(get_class($this)."::setStatus ".$this->error, LOG_ERR);
 				return -1;
 			}
 		}
 		else
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
 		}
@@ -3372,21 +3372,21 @@ 
 	 *  @param      string	$ref    Record ref
 	 *  @return		int				<0 if KO, 0 if nothing done, >0 if OK
 	 */
-	function getCanvas($id=0,$ref='')
+	function getCanvas($id = 0, $ref = '')
 	{
 		global $conf;
 
 		if (empty($id) && empty($ref)) return 0;
-		if (! empty($conf->global->MAIN_DISABLE_CANVAS)) return 0;    // To increase speed. Not enabled by default.
+		if (!empty($conf->global->MAIN_DISABLE_CANVAS)) return 0; // To increase speed. Not enabled by default.
 
 		// Clean parameters
 		$ref = trim($ref);
 
 		$sql = "SELECT rowid, canvas";
-		$sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element;
-		$sql.= " WHERE entity IN (".getEntity($this->element).")";
-		if (! empty($id))  $sql.= " AND rowid = ".$id;
-		if (! empty($ref)) $sql.= " AND ref = '".$this->db->escape($ref)."'";
+		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element;
+		$sql .= " WHERE entity IN (".getEntity($this->element).")";
+		if (!empty($id))  $sql .= " AND rowid = ".$id;
+		if (!empty($ref)) $sql .= " AND ref = '".$this->db->escape($ref)."'";
 
 		$resql = $this->db->query($sql);
 		if ($resql)
@@ -3394,7 +3394,7 @@ 
 			$obj = $this->db->fetch_object($resql);
 			if ($obj)
 			{
-				$this->canvas   = $obj->canvas;
+				$this->canvas = $obj->canvas;
 				return 1;
 			}
 			else return 0;
@@ -3416,7 +3416,7 @@ 
 	function getSpecialCode($lineid)
 	{
 		$sql = 'SELECT special_code FROM '.MAIN_DB_PREFIX.$this->table_element_line;
-		$sql.= ' WHERE rowid = '.$lineid;
+		$sql .= ' WHERE rowid = '.$lineid;
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
@@ -3432,14 +3432,14 @@ 
 	 *  @param	int		$id			Force id of object
 	 *  @return	int					<0 if KO, 0 if not used, >0 if already used
 	 */
-	function isObjectUsed($id=0)
+	function isObjectUsed($id = 0)
 	{
 		global $langs;
 
-		if (empty($id)) $id=$this->id;
+		if (empty($id)) $id = $this->id;
 
 		// Check parameters
-		if (! isset($this->childtables) || ! is_array($this->childtables) || count($this->childtables) == 0)
+		if (!isset($this->childtables) || !is_array($this->childtables) || count($this->childtables) == 0)
 		{
 			dol_print_error('Called isObjectUsed on a class with property this->childtables not defined');
 			return -1;
@@ -3447,24 +3447,24 @@ 
 
 		$arraytoscan = $this->childtables;
 		// For backward compatibility, we check if array is old format array('table1', 'table2', ...)
-		$tmparray=array_keys($this->childtables);
+		$tmparray = array_keys($this->childtables);
 		if (is_numeric($tmparray[0]))
 		{
 			$arraytoscan = array_flip($this->childtables);
 		}
 
 		// Test if child exists
-		$haschild=0;
-		foreach($arraytoscan as $table => $elementname)
+		$haschild = 0;
+		foreach ($arraytoscan as $table => $elementname)
 		{
 			//print $id.'-'.$table.'-'.$elementname.'<br>';
 			// Check if third party can be deleted
 			$sql = "SELECT COUNT(*) as nb from ".MAIN_DB_PREFIX.$table;
-			$sql.= " WHERE ".$this->fk_element." = ".$id;
-			$resql=$this->db->query($sql);
+			$sql .= " WHERE ".$this->fk_element." = ".$id;
+			$resql = $this->db->query($sql);
 			if ($resql)
 			{
-				$obj=$this->db->fetch_object($resql);
+				$obj = $this->db->fetch_object($resql);
 				if ($obj->nb > 0)
 				{
 					$langs->load("errors");
@@ -3472,24 +3472,24 @@ 
 					$haschild += $obj->nb;
 					if (is_numeric($elementname))	// old usage
 					{
-						$this->errors[]=$langs->trans("ErrorRecordHasAtLeastOneChildOfType", $table);
+						$this->errors[] = $langs->trans("ErrorRecordHasAtLeastOneChildOfType", $table);
 					}
 					else	// new usage: $elementname=Translation key
 					{
-						$this->errors[]=$langs->trans("ErrorRecordHasAtLeastOneChildOfType", $langs->transnoentitiesnoconv($elementname));
+						$this->errors[] = $langs->trans("ErrorRecordHasAtLeastOneChildOfType", $langs->transnoentitiesnoconv($elementname));
 					}
-					break;    // We found at least one, we stop here
+					break; // We found at least one, we stop here
 				}
 			}
 			else
 			{
-				$this->errors[]=$this->db->lasterror();
+				$this->errors[] = $this->db->lasterror();
 				return -1;
 			}
 		}
 		if ($haschild > 0)
 		{
-			$this->errors[]="ErrorRecordHasChildren";
+			$this->errors[] = "ErrorRecordHasChildren";
 			return $haschild;
 		}
 		else return 0;
@@ -3501,18 +3501,18 @@ 
 	 *	@param	int		$predefined		-1=All, 0=Count free product/service only, 1=Count predefined product/service only, 2=Count predefined product, 3=Count predefined service
 	 *  @return	int						<0 if KO, 0 if no predefined products, nb of lines with predefined products if found
 	 */
-	function hasProductsOrServices($predefined=-1)
+	function hasProductsOrServices($predefined = -1)
 	{
-		$nb=0;
+		$nb = 0;
 
-		foreach($this->lines as $key => $val)
+		foreach ($this->lines as $key => $val)
 		{
-			$qualified=0;
-			if ($predefined == -1) $qualified=1;
-			if ($predefined == 1 && $val->fk_product > 0) $qualified=1;
-			if ($predefined == 0 && $val->fk_product <= 0) $qualified=1;
-			if ($predefined == 2 && $val->fk_product > 0 && $val->product_type==0) $qualified=1;
-			if ($predefined == 3 && $val->fk_product > 0 && $val->product_type==1) $qualified=1;
+			$qualified = 0;
+			if ($predefined == -1) $qualified = 1;
+			if ($predefined == 1 && $val->fk_product > 0) $qualified = 1;
+			if ($predefined == 0 && $val->fk_product <= 0) $qualified = 1;
+			if ($predefined == 2 && $val->fk_product > 0 && $val->product_type == 0) $qualified = 1;
+			if ($predefined == 3 && $val->fk_product > 0 && $val->product_type == 1) $qualified = 1;
 			if ($qualified) $nb++;
 		}
 		dol_syslog(get_class($this).'::hasProductsOrServices we found '.$nb.' qualified lines of products/servcies');
@@ -3526,24 +3526,24 @@ 
 	 */
 	function getTotalDiscount()
 	{
-		$total_discount=0.00;
+		$total_discount = 0.00;
 
 		$sql = "SELECT subprice as pu_ht, qty, remise_percent, total_ht";
-		$sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element."det";
-		$sql.= " WHERE ".$this->fk_element." = ".$this->id;
+		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element."det";
+		$sql .= " WHERE ".$this->fk_element." = ".$this->id;
 
 		dol_syslog(get_class($this).'::getTotalDiscount', LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
-			$num=$this->db->num_rows($resql);
-			$i=0;
+			$num = $this->db->num_rows($resql);
+			$i = 0;
 			while ($i < $num)
 			{
 				$obj = $this->db->fetch_object($resql);
 
 				$pu_ht = $obj->pu_ht;
-				$qty= $obj->qty;
+				$qty = $obj->qty;
 				$total_ht = $obj->total_ht;
 
 				$total_discount_line = floatval(price2num(($pu_ht * $qty) - $total_ht, 'MT'));
@@ -3577,17 +3577,17 @@ 
 		{
 			if (isset($line->qty_asked))
 			{
-				if (empty($totalOrdered)) $totalOrdered=0;  // Avoid warning because $totalOrdered is ''
-				$totalOrdered+=$line->qty_asked;    // defined for shipment only
+				if (empty($totalOrdered)) $totalOrdered = 0; // Avoid warning because $totalOrdered is ''
+				$totalOrdered += $line->qty_asked; // defined for shipment only
 			}
 			if (isset($line->qty_shipped))
 			{
-				if (empty($totalToShip)) $totalToShip=0;    // Avoid warning because $totalToShip is ''
-				$totalToShip+=$line->qty_shipped;   // defined for shipment only
-            }else if ($line->element == 'commandefournisseurdispatch' && isset($line->qty))
+				if (empty($totalToShip)) $totalToShip = 0; // Avoid warning because $totalToShip is ''
+				$totalToShip += $line->qty_shipped; // defined for shipment only
+            } else if ($line->element == 'commandefournisseurdispatch' && isset($line->qty))
             {
-                if (empty($totalToShip)) $totalToShip=0;
-                $totalToShip+=$line->qty;   // defined for reception only
+                if (empty($totalToShip)) $totalToShip = 0;
+                $totalToShip += $line->qty; // defined for reception only
 			}
 
 			// Define qty, weight, volume, weight_units, volume_units
@@ -3600,27 +3600,27 @@ 
 			}
 
 			$weight = $line->weight ? $line->weight : 0;
-            ($weight==0 && !empty($line->product->weight))? $weight=$line->product->weight: 0;
+            ($weight == 0 && !empty($line->product->weight)) ? $weight = $line->product->weight : 0;
 			$volume = $line->volume ? $line->volume : 0;
-			($volume==0 && !empty($line->product->volume))? $volume=$line->product->volume: 0;
+			($volume == 0 && !empty($line->product->volume)) ? $volume = $line->product->volume : 0;
 
-			$weight_units=$line->weight_units;
-			($weight_units==0 && !empty($line->product->weight_units))? $weight_units=$line->product->weight_units: 0;
-			$volume_units=$line->volume_units;
-			($volume_units==0 && !empty($line->product->volume_units))? $volume_units=$line->product->volume_units: 0;
+			$weight_units = $line->weight_units;
+			($weight_units == 0 && !empty($line->product->weight_units)) ? $weight_units = $line->product->weight_units : 0;
+			$volume_units = $line->volume_units;
+			($volume_units == 0 && !empty($line->product->volume_units)) ? $volume_units = $line->product->volume_units : 0;
 
-			$weightUnit=0;
-			$volumeUnit=0;
-			if (! empty($weight_units)) $weightUnit = $weight_units;
-			if (! empty($volume_units)) $volumeUnit = $volume_units;
+			$weightUnit = 0;
+			$volumeUnit = 0;
+			if (!empty($weight_units)) $weightUnit = $weight_units;
+			if (!empty($volume_units)) $volumeUnit = $volume_units;
 
-			if (empty($totalWeight)) $totalWeight=0;  // Avoid warning because $totalWeight is ''
-			if (empty($totalVolume)) $totalVolume=0;  // Avoid warning because $totalVolume is ''
+			if (empty($totalWeight)) $totalWeight = 0; // Avoid warning because $totalWeight is ''
+			if (empty($totalVolume)) $totalVolume = 0; // Avoid warning because $totalVolume is ''
 
 			//var_dump($line->volume_units);
 			if ($weight_units < 50)   // >50 means a standard unit (power of 10 of official unit), > 50 means an exotic unit (like inch)
 			{
-				$trueWeightUnit=pow(10, $weightUnit);
+				$trueWeightUnit = pow(10, $weightUnit);
 				$totalWeight += $weight * $qty * $trueWeightUnit;
 			}
 			else {
@@ -3634,18 +3634,18 @@ 
 			$totalWeight += $weight * $qty * $trueWeightUnit;
 		}
 		else
-					$totalWeight += $weight * $qty;   // This may be wrong if we mix different units
+					$totalWeight += $weight * $qty; // This may be wrong if we mix different units
 			}
 			if ($volume_units < 50)   // >50 means a standard unit (power of 10 of official unit), > 50 means an exotic unit (like inch)
 			{
 				//print $line->volume."x".$line->volume_units."x".($line->volume_units < 50)."x".$volumeUnit;
-				$trueVolumeUnit=pow(10, $volumeUnit);
+				$trueVolumeUnit = pow(10, $volumeUnit);
 				//print $line->volume;
 				$totalVolume += $volume * $qty * $trueVolumeUnit;
 			}
 			else
 			{
-				$totalVolume += $volume * $qty;   // This may be wrong if we mix different units
+				$totalVolume += $volume * $qty; // This may be wrong if we mix different units
 			}
 		}
 
@@ -3662,17 +3662,17 @@ 
 	{
 		$this->db->begin();
 
-		$extraparams = (! empty($this->extraparams) ? json_encode($this->extraparams) : null);
+		$extraparams = (!empty($this->extraparams) ? json_encode($this->extraparams) : null);
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
-		$sql.= " SET extraparams = ".(! empty($extraparams) ? "'".$this->db->escape($extraparams)."'" : "null");
-		$sql.= " WHERE rowid = ".$this->id;
+		$sql .= " SET extraparams = ".(!empty($extraparams) ? "'".$this->db->escape($extraparams)."'" : "null");
+		$sql .= " WHERE rowid = ".$this->id;
 
 		dol_syslog(get_class($this)."::setExtraParameters", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if (! $resql)
+		if (!$resql)
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
 		}
@@ -3707,7 +3707,7 @@ 
 			}
 		}
 
-		$out .= (($res->code && $this->location_incoterms)?' - ':'').$this->location_incoterms;
+		$out .= (($res->code && $this->location_incoterms) ? ' - ' : '').$this->location_incoterms;
 
 		return $out;
 	}
@@ -3753,11 +3753,11 @@ 
 		if ($this->id && $this->table_element)
 		{
 			$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
-			$sql.= " SET fk_incoterms = ".($id_incoterm > 0 ? $id_incoterm : "null");
-			$sql.= ", location_incoterms = ".($id_incoterm > 0 ? "'".$this->db->escape($location)."'" : "null");
-			$sql.= " WHERE rowid = " . $this->id;
+			$sql .= " SET fk_incoterms = ".($id_incoterm > 0 ? $id_incoterm : "null");
+			$sql .= ", location_incoterms = ".($id_incoterm > 0 ? "'".$this->db->escape($location)."'" : "null");
+			$sql .= " WHERE rowid = ".$this->id;
 			dol_syslog(get_class($this).'::setIncoterms', LOG_DEBUG);
-			$resql=$this->db->query($sql);
+			$resql = $this->db->query($sql);
 			if ($resql)
 			{
 				$this->fk_incoterms = $id_incoterm;
@@ -3798,24 +3798,24 @@ 
 	 */
 	function formAddObjectLine($dateSelector, $seller, $buyer)
 	{
-		global $conf,$user,$langs,$object,$hookmanager;
-		global $form,$bcnd,$var;
+		global $conf, $user, $langs, $object, $hookmanager;
+		global $form, $bcnd, $var;
 
 		// Line extrafield
 		require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 		$extrafieldsline = new ExtraFields($this->db);
-		$extralabelslines=$extrafieldsline->fetch_name_optionals_label($this->table_element_line);
+		$extralabelslines = $extrafieldsline->fetch_name_optionals_label($this->table_element_line);
 
 		// Output template part (modules that overwrite templates must declare this into descriptor)
 		// Use global variables + $dateSelector + $seller and $buyer
-		$dirtpls=array_merge($conf->modules_parts['tpl'],array('/core/tpl'));
-		foreach($dirtpls as $reldir)
+		$dirtpls = array_merge($conf->modules_parts['tpl'], array('/core/tpl'));
+		foreach ($dirtpls as $reldir)
 		{
 			$tpl = dol_buildpath($reldir.'/objectline_create.tpl.php');
 			if (empty($conf->file->strict_mode)) {
-				$res=@include $tpl;
+				$res = @include $tpl;
 			} else {
-				$res=include $tpl; // for debug
+				$res = include $tpl; // for debug
 			}
 			if ($res) break;
 		}
@@ -3839,24 +3839,24 @@ 
 	 *	@param  int	    	$dateSelector      	1=Show also date range input fields
 	 *	@return	void
 	 */
-	function printObjectLines($action, $seller, $buyer, $selected=0, $dateSelector=0)
+	function printObjectLines($action, $seller, $buyer, $selected = 0, $dateSelector = 0)
 	{
 		global $conf, $hookmanager, $langs, $user;
 		// TODO We should not use global var for this !
 		global $inputalsopricewithtax, $usemargins, $disableedit, $disablemove, $disableremove, $outputalsopricetotalwithtax;
 
 		// Define usemargins
-		$usemargins=0;
-		if (! empty($conf->margin->enabled) && ! empty($this->element) && in_array($this->element,array('facture','propal','commande'))) $usemargins=1;
+		$usemargins = 0;
+		if (!empty($conf->margin->enabled) && !empty($this->element) && in_array($this->element, array('facture', 'propal', 'commande'))) $usemargins = 1;
 
 		$num = count($this->lines);
 
 		// Line extrafield
 		require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 		$extrafieldsline = new ExtraFields($this->db);
-		$extralabelslines=$extrafieldsline->fetch_name_optionals_label($this->table_element_line);
+		$extralabelslines = $extrafieldsline->fetch_name_optionals_label($this->table_element_line);
 
-		$parameters = array('num'=>$num,'i'=>$i,'dateSelector'=>$dateSelector,'seller'=>$seller,'buyer'=>$buyer,'selected'=>$selected, 'extrafieldsline'=>$extrafieldsline);
+		$parameters = array('num'=>$num, 'i'=>$i, 'dateSelector'=>$dateSelector, 'seller'=>$seller, 'buyer'=>$buyer, 'selected'=>$selected, 'extrafieldsline'=>$extrafieldsline);
 		$reshook = $hookmanager->executeHooks('printObjectLineTitle', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if (empty($reshook))
 		{
@@ -3866,7 +3866,7 @@ 
 			print '<tr class="liste_titre nodrag nodrop">';
 
 			// Adds a line numbering column
-			if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER)) print '<td class="linecolnum" align="center" width="5">&nbsp;</td>';
+			if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) print '<td class="linecolnum" align="center" width="5">&nbsp;</td>';
 
 			// Description
 			print '<td class="linecoldescription">'.$langs->trans('Description').'</td>';
@@ -3890,7 +3890,7 @@ 
 			// Qty
 			print '<td class="linecolqty" align="right">'.$langs->trans('Qty').'</td>';
 
-			if($conf->global->PRODUCT_USE_UNITS)
+			if ($conf->global->PRODUCT_USE_UNITS)
 			{
 				print '<td class="linecoluseunit" align="left">'.$langs->trans('Unit').'</td>';
 			}
@@ -3899,10 +3899,10 @@ 
 			print '<td class="linecoldiscount" align="right">'.$langs->trans('ReductionShort').'</td>';
 
 			if ($this->situation_cycle_ref) {
-				print '<td class="linecolcycleref" align="right">' . $langs->trans('Progress') . '</td>';
+				print '<td class="linecolcycleref" align="right">'.$langs->trans('Progress').'</td>';
 			}
 
-			if ($usemargins && ! empty($conf->margin->enabled) && empty($user->societe_id))
+			if ($usemargins && !empty($conf->margin->enabled) && empty($user->societe_id))
 			{
 				if (!empty($user->rights->margins->creer))
 				{
@@ -3912,9 +3912,9 @@ 
 						print '<td class="linecolmargin1 margininfos" align="right" width="80">'.$langs->trans('CostPrice').'</td>';
 				}
 
-				if (! empty($conf->global->DISPLAY_MARGIN_RATES) && $user->rights->margins->liretous)
+				if (!empty($conf->global->DISPLAY_MARGIN_RATES) && $user->rights->margins->liretous)
 					print '<td class="linecolmargin2 margininfos" align="right" width="50">'.$langs->trans('MarginRate').'</td>';
-				if (! empty($conf->global->DISPLAY_MARK_RATES) && $user->rights->margins->liretous)
+				if (!empty($conf->global->DISPLAY_MARK_RATES) && $user->rights->margins->liretous)
 					print '<td class="linecolmargin2 margininfos" align="right" width="50">'.$langs->trans('MarkRate').'</td>';
 			}
 
@@ -3926,13 +3926,13 @@ 
 
 			if ($outputalsopricetotalwithtax) print '<td align="right" width="80">'.$langs->trans('TotalTTCShort').'</td>';
 
-			print '<td class="linecoledit"></td>';  // No width to allow autodim
+			print '<td class="linecoledit"></td>'; // No width to allow autodim
 
 			print '<td class="linecoldelete" width="10"></td>';
 
 			print '<td class="linecolmove" width="10"></td>';
 
-			if($action == 'selectlines')
+			if ($action == 'selectlines')
 			{
 			    print '<td class="linecolcheckall" align="center">';
 			    print '<input type="checkbox" class="linecheckboxtoggle" />';
@@ -3945,7 +3945,7 @@ 
 		}
 
 		$var = true;
-		$i	 = 0;
+		$i = 0;
 
 		print "<tbody>\n";
 		foreach ($this->lines as $line)
@@ -3958,18 +3958,18 @@ 
 			{
 				if (empty($line->fk_parent_line))
 				{
-					$parameters = array('line'=>$line,'var'=>$var,'num'=>$num,'i'=>$i,'dateSelector'=>$dateSelector,'seller'=>$seller,'buyer'=>$buyer,'selected'=>$selected, 'extrafieldsline'=>$extrafieldsline);
-					$reshook = $hookmanager->executeHooks('printObjectLine', $parameters, $this, $action);    // Note that $action and $object may have been modified by some hooks
+					$parameters = array('line'=>$line, 'var'=>$var, 'num'=>$num, 'i'=>$i, 'dateSelector'=>$dateSelector, 'seller'=>$seller, 'buyer'=>$buyer, 'selected'=>$selected, 'extrafieldsline'=>$extrafieldsline);
+					$reshook = $hookmanager->executeHooks('printObjectLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 				}
 				else
 				{
-					$parameters = array('line'=>$line,'var'=>$var,'num'=>$num,'i'=>$i,'dateSelector'=>$dateSelector,'seller'=>$seller,'buyer'=>$buyer,'selected'=>$selected, 'extrafieldsline'=>$extrafieldsline, 'fk_parent_line'=>$line->fk_parent_line);
-					$reshook = $hookmanager->executeHooks('printObjectSubLine', $parameters, $this, $action);    // Note that $action and $object may have been modified by some hooks
+					$parameters = array('line'=>$line, 'var'=>$var, 'num'=>$num, 'i'=>$i, 'dateSelector'=>$dateSelector, 'seller'=>$seller, 'buyer'=>$buyer, 'selected'=>$selected, 'extrafieldsline'=>$extrafieldsline, 'fk_parent_line'=>$line->fk_parent_line);
+					$reshook = $hookmanager->executeHooks('printObjectSubLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 				}
 			}
 			if (empty($reshook))
 			{
-				$this->printObjectLine($action,$line,$var,$num,$i,$dateSelector,$seller,$buyer,$selected,$extrafieldsline);
+				$this->printObjectLine($action, $line, $var, $num, $i, $dateSelector, $seller, $buyer, $selected, $extrafieldsline);
 			}
 
 			$i++;
@@ -3993,23 +3993,23 @@ 
 	 *  @param  int			$extrafieldsline	Object of extrafield line attribute
 	 *	@return	void
 	 */
-	function printObjectLine($action,$line,$var,$num,$i,$dateSelector,$seller,$buyer,$selected=0,$extrafieldsline=0)
+	function printObjectLine($action, $line, $var, $num, $i, $dateSelector, $seller, $buyer, $selected = 0, $extrafieldsline = 0)
 	{
-		global $conf,$langs,$user,$object,$hookmanager;
-		global $form,$bc,$bcdd;
-		global $object_rights, $disableedit, $disablemove, $disableremove;   // TODO We should not use global var for this !
+		global $conf, $langs, $user, $object, $hookmanager;
+		global $form, $bc, $bcdd;
+		global $object_rights, $disableedit, $disablemove, $disableremove; // TODO We should not use global var for this !
 
 		$object_rights = $this->getRights();
 
-		$element=$this->element;
+		$element = $this->element;
 
-		$text=''; $description=''; $type=0;
+		$text = ''; $description = ''; $type = 0;
 
 		// Show product and description
-		$type=(! empty($line->product_type)?$line->product_type:$line->fk_product_type);
+		$type = (!empty($line->product_type) ? $line->product_type : $line->fk_product_type);
 		// Try to enhance type detection using date_start and date_end for free lines where type was not saved.
-		if (! empty($line->date_start)) $type=1; // deprecated
-		if (! empty($line->date_end)) $type=1; // deprecated
+		if (!empty($line->date_start)) $type = 1; // deprecated
+		if (!empty($line->date_end)) $type = 1; // deprecated
 
 		// Ligne en mode visu
 		if ($action != 'editline' || $selected != $line->id)
@@ -4022,14 +4022,14 @@ 
 
 				$product_static->ref = $line->ref; //can change ref in hook
 				$product_static->label = $line->label; //can change label in hook
-				$text=$product_static->getNomUrl(1);
+				$text = $product_static->getNomUrl(1);
 
 				// Define output language and label
-				if (! empty($conf->global->MAIN_MULTILANGS))
+				if (!empty($conf->global->MAIN_MULTILANGS))
 				{
-					if (! is_object($this->thirdparty))
+					if (!is_object($this->thirdparty))
 					{
-						dol_print_error('','Error: Method printObjectLine was called on an object and object->fetch_thirdparty was not done before');
+						dol_print_error('', 'Error: Method printObjectLine was called on an object and object->fetch_thirdparty was not done before');
 						return;
 					}
 
@@ -4037,38 +4037,38 @@ 
 					$prod->fetch($line->fk_product);
 
 					$outputlangs = $langs;
-					$newlang='';
-					if (empty($newlang) && GETPOST('lang_id','aZ09')) $newlang=GETPOST('lang_id','aZ09');
-					if (! empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE) && empty($newlang)) $newlang=$this->thirdparty->default_lang;		// For language to language of customer
-					if (! empty($newlang))
+					$newlang = '';
+					if (empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang = GETPOST('lang_id', 'aZ09');
+					if (!empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE) && empty($newlang)) $newlang = $this->thirdparty->default_lang; // For language to language of customer
+					if (!empty($newlang))
 					{
-						$outputlangs = new Translate("",$conf);
+						$outputlangs = new Translate("", $conf);
 						$outputlangs->setDefaultLang($newlang);
 					}
 
-					$label = (! empty($prod->multilangs[$outputlangs->defaultlang]["label"])) ? $prod->multilangs[$outputlangs->defaultlang]["label"] : $line->product_label;
+					$label = (!empty($prod->multilangs[$outputlangs->defaultlang]["label"])) ? $prod->multilangs[$outputlangs->defaultlang]["label"] : $line->product_label;
 				}
 				else
 				{
 					$label = $line->product_label;
 				}
 
-				$text.= ' - '.(! empty($line->label)?$line->label:$label);
-				$description.=(! empty($conf->global->PRODUIT_DESC_IN_FORM)?'':dol_htmlentitiesbr($line->description));	// Description is what to show on popup. We shown nothing if already into desc.
+				$text .= ' - '.(!empty($line->label) ? $line->label : $label);
+				$description .= (!empty($conf->global->PRODUIT_DESC_IN_FORM) ? '' : dol_htmlentitiesbr($line->description)); // Description is what to show on popup. We shown nothing if already into desc.
 			}
 
-			$line->pu_ttc = price2num($line->subprice * (1 + ($line->tva_tx/100)), 'MU');
+			$line->pu_ttc = price2num($line->subprice * (1 + ($line->tva_tx / 100)), 'MU');
 
 			// Output template part (modules that overwrite templates must declare this into descriptor)
 			// Use global variables + $dateSelector + $seller and $buyer
-			$dirtpls=array_merge($conf->modules_parts['tpl'],array('/core/tpl'));
-			foreach($dirtpls as $reldir)
+			$dirtpls = array_merge($conf->modules_parts['tpl'], array('/core/tpl'));
+			foreach ($dirtpls as $reldir)
 			{
 				$tpl = dol_buildpath($reldir.'/objectline_view.tpl.php');
 				if (empty($conf->file->strict_mode)) {
-					$res=@include $tpl;
+					$res = @include $tpl;
 				} else {
-					$res=include $tpl; // for debug
+					$res = include $tpl; // for debug
 				}
 				if ($res) break;
 			}
@@ -4077,21 +4077,21 @@ 
 		// Ligne en mode update
 		if ($this->statut == 0 && $action == 'editline' && $selected == $line->id)
 		{
-			$label = (! empty($line->label) ? $line->label : (($line->fk_product > 0) ? $line->product_label : ''));
-			$placeholder=' placeholder="'.$langs->trans("Label").'"';
+			$label = (!empty($line->label) ? $line->label : (($line->fk_product > 0) ? $line->product_label : ''));
+			$placeholder = ' placeholder="'.$langs->trans("Label").'"';
 
-			$line->pu_ttc = price2num($line->subprice * (1 + ($line->tva_tx/100)), 'MU');
+			$line->pu_ttc = price2num($line->subprice * (1 + ($line->tva_tx / 100)), 'MU');
 
 			// Output template part (modules that overwrite templates must declare this into descriptor)
 			// Use global variables + $dateSelector + $seller and $buyer
-			$dirtpls=array_merge($conf->modules_parts['tpl'],array('/core/tpl'));
-			foreach($dirtpls as $reldir)
+			$dirtpls = array_merge($conf->modules_parts['tpl'], array('/core/tpl'));
+			foreach ($dirtpls as $reldir)
 			{
 				$tpl = dol_buildpath($reldir.'/objectline_edit.tpl.php');
 				if (empty($conf->file->strict_mode)) {
-					$res=@include $tpl;
+					$res = @include $tpl;
 				} else {
-					$res=include $tpl; // for debug
+					$res = include $tpl; // for debug
 				}
 				if ($res) break;
 			}
@@ -4111,7 +4111,7 @@ 
 	 *	@param	string		$restrictlist		''=All lines, 'services'=Restrict to services only
 	 *  @return	void
 	 */
-	function printOriginLinesList($restrictlist='')
+	function printOriginLinesList($restrictlist = '')
 	{
 		global $langs, $hookmanager, $conf;
 
@@ -4122,26 +4122,26 @@ 
 		print '<td align="right">'.$langs->trans('PriceUHT').'</td>';
 		if (!empty($conf->multicurrency->enabled)) print '<td align="right">'.$langs->trans('PriceUHTCurrency').'</td>';
 		print '<td align="right">'.$langs->trans('Qty').'</td>';
-		if($conf->global->PRODUCT_USE_UNITS)
+		if ($conf->global->PRODUCT_USE_UNITS)
 		{
 			print '<td align="left">'.$langs->trans('Unit').'</td>';
 		}
 		print '<td align="right">'.$langs->trans('ReductionShort').'</td></tr>';
 
 		$var = true;
-		$i	 = 0;
+		$i = 0;
 
-		if (! empty($this->lines))
+		if (!empty($this->lines))
 		{
 			foreach ($this->lines as $line)
 			{
-				if (is_object($hookmanager) && (($line->product_type == 9 && ! empty($line->special_code)) || ! empty($line->fk_parent_line)))
+				if (is_object($hookmanager) && (($line->product_type == 9 && !empty($line->special_code)) || !empty($line->fk_parent_line)))
 				{
 					if (empty($line->fk_parent_line))
 					{
-						$parameters=array('line'=>$line,'var'=>$var,'i'=>$i);
-						$action='';
-						$hookmanager->executeHooks('printOriginObjectLine',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+						$parameters = array('line'=>$line, 'var'=>$var, 'i'=>$i);
+						$action = '';
+						$hookmanager->executeHooks('printOriginObjectLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 					}
 				}
 				else
@@ -4165,103 +4165,103 @@ 
 	 *	@param	string				$restrictlist		''=All lines, 'services'=Restrict to services only (strike line if not)
 	 * 	@return	void
 	 */
-	function printOriginLine($line, $var, $restrictlist='')
+	function printOriginLine($line, $var, $restrictlist = '')
 	{
 		global $langs, $conf;
 
 		//var_dump($line);
 		if (!empty($line->date_start))
 		{
-			$date_start=$line->date_start;
+			$date_start = $line->date_start;
 		}
 		else
 		{
-			$date_start=$line->date_debut_prevue;
-			if ($line->date_debut_reel) $date_start=$line->date_debut_reel;
+			$date_start = $line->date_debut_prevue;
+			if ($line->date_debut_reel) $date_start = $line->date_debut_reel;
 		}
 		if (!empty($line->date_end))
 		{
-			$date_end=$line->date_end;
+			$date_end = $line->date_end;
 		}
 		else
 		{
-			$date_end=$line->date_fin_prevue;
-			if ($line->date_fin_reel) $date_end=$line->date_fin_reel;
+			$date_end = $line->date_fin_prevue;
+			if ($line->date_fin_reel) $date_end = $line->date_fin_reel;
 		}
 
 		$this->tpl['label'] = '';
-		if (! empty($line->fk_parent_line)) $this->tpl['label'].= img_picto('', 'rightarrow');
+		if (!empty($line->fk_parent_line)) $this->tpl['label'] .= img_picto('', 'rightarrow');
 
 		if (($line->info_bits & 2) == 2)  // TODO Not sure this is used for source object
 		{
-			$discount=new DiscountAbsolute($this->db);
+			$discount = new DiscountAbsolute($this->db);
 			$discount->fk_soc = $this->socid;
-			$this->tpl['label'].= $discount->getNomUrl(0,'discount');
+			$this->tpl['label'] .= $discount->getNomUrl(0, 'discount');
 		}
-		else if (! empty($line->fk_product))
+		else if (!empty($line->fk_product))
 		{
 			$productstatic = new Product($this->db);
 			$productstatic->id = $line->fk_product;
 			$productstatic->ref = $line->ref;
 			$productstatic->type = $line->fk_product_type;
-            if(empty($productstatic->ref)){
+            if (empty($productstatic->ref)) {
 				$line->fetch_product();
 				$productstatic = $line->product;
 			}
 			
-			$this->tpl['label'].= $productstatic->getNomUrl(1);
-			$this->tpl['label'].= ' - '.(! empty($line->label)?$line->label:$line->product_label);
+			$this->tpl['label'] .= $productstatic->getNomUrl(1);
+			$this->tpl['label'] .= ' - '.(!empty($line->label) ? $line->label : $line->product_label);
 			// Dates
 			if ($line->product_type == 1 && ($date_start || $date_end))
 			{
-				$this->tpl['label'].= get_date_range($date_start,$date_end);
+				$this->tpl['label'] .= get_date_range($date_start, $date_end);
 			}
 		}
 		else
 		{
-			$this->tpl['label'].= ($line->product_type == -1 ? '&nbsp;' : ($line->product_type == 1 ? img_object($langs->trans(''),'service') : img_object($langs->trans(''),'product')));
+			$this->tpl['label'] .= ($line->product_type == -1 ? '&nbsp;' : ($line->product_type == 1 ? img_object($langs->trans(''), 'service') : img_object($langs->trans(''), 'product')));
 			if (!empty($line->desc)) {
-				$this->tpl['label'].=$line->desc;
-			}else {
-				$this->tpl['label'].= ($line->label ? '&nbsp;'.$line->label : '');
+				$this->tpl['label'] .= $line->desc;
+			} else {
+				$this->tpl['label'] .= ($line->label ? '&nbsp;'.$line->label : '');
 			}
 			
 			// Dates
 			if ($line->product_type == 1 && ($date_start || $date_end))
 			{
-				$this->tpl['label'].= get_date_range($date_start,$date_end);
+				$this->tpl['label'] .= get_date_range($date_start, $date_end);
 			}
 		}
 
-		if (! empty($line->desc))
+		if (!empty($line->desc))
 		{
 			if ($line->desc == '(CREDIT_NOTE)')  // TODO Not sure this is used for source object
 			{
-				$discount=new DiscountAbsolute($this->db);
+				$discount = new DiscountAbsolute($this->db);
 				$discount->fetch($line->fk_remise_except);
-				$this->tpl['description'] = $langs->transnoentities("DiscountFromCreditNote",$discount->getNomUrl(0));
+				$this->tpl['description'] = $langs->transnoentities("DiscountFromCreditNote", $discount->getNomUrl(0));
 			}
 			elseif ($line->desc == '(DEPOSIT)')  // TODO Not sure this is used for source object
 			{
-				$discount=new DiscountAbsolute($this->db);
+				$discount = new DiscountAbsolute($this->db);
 				$discount->fetch($line->fk_remise_except);
-				$this->tpl['description'] = $langs->transnoentities("DiscountFromDeposit",$discount->getNomUrl(0));
+				$this->tpl['description'] = $langs->transnoentities("DiscountFromDeposit", $discount->getNomUrl(0));
 			}
 			elseif ($line->desc == '(EXCESS RECEIVED)')
 			{
-				$discount=new DiscountAbsolute($this->db);
+				$discount = new DiscountAbsolute($this->db);
 				$discount->fetch($line->fk_remise_except);
-				$this->tpl['description'] = $langs->transnoentities("DiscountFromExcessReceived",$discount->getNomUrl(0));
+				$this->tpl['description'] = $langs->transnoentities("DiscountFromExcessReceived", $discount->getNomUrl(0));
 			}
 			elseif ($line->desc == '(EXCESS PAID)')
 			{
-				$discount=new DiscountAbsolute($this->db);
+				$discount = new DiscountAbsolute($this->db);
 				$discount->fetch($line->fk_remise_except);
-				$this->tpl['description'] = $langs->transnoentities("DiscountFromExcessPaid",$discount->getNomUrl(0));
+				$this->tpl['description'] = $langs->transnoentities("DiscountFromExcessPaid", $discount->getNomUrl(0));
 			}
 			else
 			{
-				$this->tpl['description'] = dol_trunc($line->desc,60);
+				$this->tpl['description'] = dol_trunc($line->desc, 60);
 			}
 		}
 		else
@@ -4272,7 +4272,7 @@ 
         // VAT Rate
         $this->tpl['vat_rate'] = vatrate($line->tva_tx, true);
         $this->tpl['vat_rate'] .= (($line->info_bits & 1) == 1) ? '*' : '';
-        if (! empty($line->vat_src_code) && ! preg_match('/\(/', $this->tpl['vat_rate'])) $this->tpl['vat_rate'].=' ('.$line->vat_src_code.')';
+        if (!empty($line->vat_src_code) && !preg_match('/\(/', $this->tpl['vat_rate'])) $this->tpl['vat_rate'] .= ' ('.$line->vat_src_code.')';
 
 		$this->tpl['price'] = price($line->subprice);
 		$this->tpl['multicurrency_price'] = price($line->multicurrency_subprice);
@@ -4281,19 +4281,19 @@ 
 		$this->tpl['remise_percent'] = (($line->info_bits & 2) != 2) ? vatrate($line->remise_percent, true) : '&nbsp;';
 
 		// Is the line strike or not
-		$this->tpl['strike']=0;
-		if ($restrictlist == 'services' && $line->product_type != Product::TYPE_SERVICE) $this->tpl['strike']=1;
+		$this->tpl['strike'] = 0;
+		if ($restrictlist == 'services' && $line->product_type != Product::TYPE_SERVICE) $this->tpl['strike'] = 1;
 
 		// Output template part (modules that overwrite templates must declare this into descriptor)
 		// Use global variables + $dateSelector + $seller and $buyer
-		$dirtpls=array_merge($conf->modules_parts['tpl'],array('/core/tpl'));
-		foreach($dirtpls as $reldir)
+		$dirtpls = array_merge($conf->modules_parts['tpl'], array('/core/tpl'));
+		foreach ($dirtpls as $reldir)
 		{
 			$tpl = dol_buildpath($reldir.'/originproductline.tpl.php');
 			if (empty($conf->file->strict_mode)) {
-				$res=@include $tpl;
+				$res = @include $tpl;
 			} else {
-				$res=include $tpl; // for debug
+				$res = include $tpl; // for debug
 			}
 			if ($res) break;
 		}
@@ -4311,26 +4311,26 @@ 
 	 *	@param		int		$mandatory			Mandatory or not
 	 *	@return		int							<=0 if KO, >0 if OK
 	 */
-	function add_element_resource($resource_id, $resource_type, $busy=0, $mandatory=0)
+	function add_element_resource($resource_id, $resource_type, $busy = 0, $mandatory = 0)
 	{
         // phpcs:enable
 		$this->db->begin();
 
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."element_resources (";
-		$sql.= "resource_id";
-		$sql.= ", resource_type";
-		$sql.= ", element_id";
-		$sql.= ", element_type";
-		$sql.= ", busy";
-		$sql.= ", mandatory";
-		$sql.= ") VALUES (";
-		$sql.= $resource_id;
-		$sql.= ", '".$this->db->escape($resource_type)."'";
-		$sql.= ", '".$this->db->escape($this->id)."'";
-		$sql.= ", '".$this->db->escape($this->element)."'";
-		$sql.= ", '".$this->db->escape($busy)."'";
-		$sql.= ", '".$this->db->escape($mandatory)."'";
-		$sql.= ")";
+		$sql .= "resource_id";
+		$sql .= ", resource_type";
+		$sql .= ", element_id";
+		$sql .= ", element_type";
+		$sql .= ", busy";
+		$sql .= ", mandatory";
+		$sql .= ") VALUES (";
+		$sql .= $resource_id;
+		$sql .= ", '".$this->db->escape($resource_type)."'";
+		$sql .= ", '".$this->db->escape($this->id)."'";
+		$sql .= ", '".$this->db->escape($this->element)."'";
+		$sql .= ", '".$this->db->escape($busy)."'";
+		$sql .= ", '".$this->db->escape($mandatory)."'";
+		$sql .= ")";
 
 		dol_syslog(get_class($this)."::add_element_resource", LOG_DEBUG);
 		if ($this->db->query($sql))
@@ -4340,7 +4340,7 @@ 
 		}
 		else
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return  0;
 		}
@@ -4355,7 +4355,7 @@ 
 	 *    @param	int		$notrigger		Disable all triggers
 	 *    @return   int						>0 if OK, <0 if KO
 	 */
-	function delete_resource($rowid, $element, $notrigger=0)
+	function delete_resource($rowid, $element, $notrigger = 0)
 	{
         // phpcs:enable
 		global $user;
@@ -4363,22 +4363,22 @@ 
 		$this->db->begin();
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."element_resources";
-		$sql.= " WHERE rowid=".$rowid;
+		$sql .= " WHERE rowid=".$rowid;
 
 		dol_syslog(get_class($this)."::delete_resource", LOG_DEBUG);
 
-		$resql=$this->db->query($sql);
-		if (! $resql)
+		$resql = $this->db->query($sql);
+		if (!$resql)
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
 		}
 		else
 		{
-			if (! $notrigger)
+			if (!$notrigger)
 			{
-				$result=$this->call_trigger(strtoupper($element).'_DELETE_RESOURCE', $user);
+				$result = $this->call_trigger(strtoupper($element).'_DELETE_RESOURCE', $user);
 				if ($result < 0) { $this->db->rollback(); return -1; }
 			}
 			$this->db->commit();
@@ -4397,8 +4397,8 @@ 
 		// Force a copy of this->lines, otherwise it will point to same object.
 		if (isset($this->lines) && is_array($this->lines))
 		{
-			$nboflines=count($this->lines);
-			for($i=0; $i < $nboflines; $i++)
+			$nboflines = count($this->lines);
+			for ($i = 0; $i < $nboflines; $i++)
 			{
 				$this->lines[$i] = clone $this->lines[$i];
 			}
@@ -4418,43 +4418,43 @@ 
 	 * @return 	int 						>0 if OK, <0 if KO
 	 * @see	addFileIntoDatabaseIndex
 	 */
-	protected function commonGenerateDocument($modelspath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams=null)
+	protected function commonGenerateDocument($modelspath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams = null)
 	{
 		global $conf, $langs, $user;
 
-		$srctemplatepath='';
+		$srctemplatepath = '';
 
 		// Increase limit for PDF build
-		$err=error_reporting();
+		$err = error_reporting();
 		error_reporting(0);
 		@set_time_limit(120);
 		error_reporting($err);
 
 		// If selected model is a filename template (then $modele="modelname" or "modelname:filename")
-		$tmp=explode(':',$modele,2);
-		if (! empty($tmp[1]))
+		$tmp = explode(':', $modele, 2);
+		if (!empty($tmp[1]))
 		{
-			$modele=$tmp[0];
-			$srctemplatepath=$tmp[1];
+			$modele = $tmp[0];
+			$srctemplatepath = $tmp[1];
 		}
 
 		// Search template files
-		$file=''; $classname=''; $filefound=0;
-		$dirmodels=array('/');
-		if (is_array($conf->modules_parts['models'])) $dirmodels=array_merge($dirmodels,$conf->modules_parts['models']);
-		foreach($dirmodels as $reldir)
+		$file = ''; $classname = ''; $filefound = 0;
+		$dirmodels = array('/');
+		if (is_array($conf->modules_parts['models'])) $dirmodels = array_merge($dirmodels, $conf->modules_parts['models']);
+		foreach ($dirmodels as $reldir)
 		{
-			foreach(array('doc','pdf') as $prefix)
+			foreach (array('doc', 'pdf') as $prefix)
 			{
-				if (in_array(get_class($this), array('Adherent'))) $file = $prefix."_".$modele.".class.php";     // Member module use prefix_module.class.php
+				if (in_array(get_class($this), array('Adherent'))) $file = $prefix."_".$modele.".class.php"; // Member module use prefix_module.class.php
 				else $file = $prefix."_".$modele.".modules.php";
 
 				// On verifie l'emplacement du modele
-				$file=dol_buildpath($reldir.$modelspath.$file,0);
+				$file = dol_buildpath($reldir.$modelspath.$file, 0);
 				if (file_exists($file))
 				{
-					$filefound=1;
-					$classname=$prefix.'_'.$modele;
+					$filefound = 1;
+					$classname = $prefix.'_'.$modele;
 					break;
 				}
 			}
@@ -4464,7 +4464,7 @@ 
 		// If generator was found
 		if ($filefound)
 		{
-			global $db;  // Required to solve a conception default in commonstickergenerator.class.php making an include of code using $db
+			global $db; // Required to solve a conception default in commonstickergenerator.class.php making an include of code using $db
 
 			require_once $file;
 
@@ -4473,32 +4473,32 @@ 
 			// If generator is ODT, we must have srctemplatepath defined, if not we set it.
 			if ($obj->type == 'odt' && empty($srctemplatepath))
 			{
-				$varfortemplatedir=$obj->scandir;
-				if ($varfortemplatedir && ! empty($conf->global->$varfortemplatedir))
+				$varfortemplatedir = $obj->scandir;
+				if ($varfortemplatedir && !empty($conf->global->$varfortemplatedir))
 				{
-					$dirtoscan=$conf->global->$varfortemplatedir;
+					$dirtoscan = $conf->global->$varfortemplatedir;
 
-					$listoffiles=array();
+					$listoffiles = array();
 
 					// Now we add first model found in directories scanned
-					$listofdir=explode(',',$dirtoscan);
-					foreach($listofdir as $key => $tmpdir)
+					$listofdir = explode(',', $dirtoscan);
+					foreach ($listofdir as $key => $tmpdir)
 					{
-						$tmpdir=trim($tmpdir);
-						$tmpdir=preg_replace('/DOL_DATA_ROOT/',DOL_DATA_ROOT,$tmpdir);
-						if (! $tmpdir) { unset($listofdir[$key]); continue; }
+						$tmpdir = trim($tmpdir);
+						$tmpdir = preg_replace('/DOL_DATA_ROOT/', DOL_DATA_ROOT, $tmpdir);
+						if (!$tmpdir) { unset($listofdir[$key]); continue; }
 						if (is_dir($tmpdir))
 						{
-							$tmpfiles=dol_dir_list($tmpdir,'files',0,'\.od(s|t)$','','name',SORT_ASC,0);
-							if (count($tmpfiles)) $listoffiles=array_merge($listoffiles,$tmpfiles);
+							$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '\.od(s|t)$', '', 'name', SORT_ASC, 0);
+							if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles);
 						}
 					}
 
 					if (count($listoffiles))
 					{
-						foreach($listoffiles as $record)
+						foreach ($listoffiles as $record)
 						{
-							$srctemplatepath=$record['fullname'];
+							$srctemplatepath = $record['fullname'];
 							break;
 						}
 					}
@@ -4506,27 +4506,27 @@ 
 
 				if (empty($srctemplatepath))
 				{
-					$this->error='ErrorGenerationAskedForOdtTemplateWithSrcFileNotDefined';
+					$this->error = 'ErrorGenerationAskedForOdtTemplateWithSrcFileNotDefined';
 					return -1;
 				}
 			}
 
-			if ($obj->type == 'odt' && ! empty($srctemplatepath))
+			if ($obj->type == 'odt' && !empty($srctemplatepath))
 			{
-				if (! dol_is_file($srctemplatepath))
+				if (!dol_is_file($srctemplatepath))
 				{
-					$this->error='ErrorGenerationAskedForOdtTemplateWithSrcFileNotFound';
+					$this->error = 'ErrorGenerationAskedForOdtTemplateWithSrcFileNotFound';
 					return -1;
 				}
 			}
 
 			// We save charset_output to restore it because write_file can change it if needed for
 			// output format that does not support UTF8.
-			$sav_charset_output=$outputlangs->charset_output;
+			$sav_charset_output = $outputlangs->charset_output;
 
 			if (in_array(get_class($this), array('Adherent')))
 			{
-				$arrayofrecords = array();   // The write_file of templates of adherent class need this var
+				$arrayofrecords = array(); // The write_file of templates of adherent class need this var
 				$resultwritefile = $obj->write_file($this, $outputlangs, $srctemplatepath, 'member', 1, $moreparams);
 			}
 			else
@@ -4537,41 +4537,41 @@ 
 
 			if ($resultwritefile > 0)
 			{
-				$outputlangs->charset_output=$sav_charset_output;
+				$outputlangs->charset_output = $sav_charset_output;
 
 				// We delete old preview
 				require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 				dol_delete_preview($this);
 
 				// Index file in database
-				if (! empty($obj->result['fullpath']))
+				if (!empty($obj->result['fullpath']))
 				{
 					$destfull = $obj->result['fullpath'];
 					$upload_dir = dirname($destfull);
 					$destfile = basename($destfull);
-					$rel_dir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $upload_dir);
+					$rel_dir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT, '/').'/', '', $upload_dir);
 
-					if (! preg_match('/[\\/]temp[\\/]|[\\/]thumbs|\.meta$/', $rel_dir))     // If not a tmp dir
+					if (!preg_match('/[\\/]temp[\\/]|[\\/]thumbs|\.meta$/', $rel_dir))     // If not a tmp dir
 					{
 						$filename = basename($destfile);
 						$rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
 						$rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
 
 						include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
-						$ecmfile=new EcmFiles($this->db);
-						$result = $ecmfile->fetch(0, '', ($rel_dir?$rel_dir.'/':'').$filename);
+						$ecmfile = new EcmFiles($this->db);
+						$result = $ecmfile->fetch(0, '', ($rel_dir ? $rel_dir.'/' : '').$filename);
 
 						// Set the public "share" key
 						$setsharekey = false;
 						if ($this->element == 'propal')
 						{
-							$useonlinesignature = $conf->global->MAIN_FEATURES_LEVEL;	// Replace this with 1 when feature to make online signature is ok
-							if ($useonlinesignature) $setsharekey=true;
-							if (! empty($conf->global->PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD)) $setsharekey=true;
+							$useonlinesignature = $conf->global->MAIN_FEATURES_LEVEL; // Replace this with 1 when feature to make online signature is ok
+							if ($useonlinesignature) $setsharekey = true;
+							if (!empty($conf->global->PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD)) $setsharekey = true;
 						}
-						if ($this->element == 'commande'     && ! empty($conf->global->ORDER_ALLOW_EXTERNAL_DOWNLOAD))        $setsharekey=true;
-						if ($this->element == 'facture'      && ! empty($conf->global->INVOICE_ALLOW_EXTERNAL_DOWNLOAD))      $setsharekey=true;
-						if ($this->element == 'bank_account' && ! empty($conf->global->BANK_ACCOUNT_ALLOW_EXTERNAL_DOWNLOAD)) $setsharekey=true;
+						if ($this->element == 'commande' && !empty($conf->global->ORDER_ALLOW_EXTERNAL_DOWNLOAD))        $setsharekey = true;
+						if ($this->element == 'facture' && !empty($conf->global->INVOICE_ALLOW_EXTERNAL_DOWNLOAD))      $setsharekey = true;
+						if ($this->element == 'bank_account' && !empty($conf->global->BANK_ACCOUNT_ALLOW_EXTERNAL_DOWNLOAD)) $setsharekey = true;
 
 						if ($setsharekey)
 						{
@@ -4584,11 +4584,11 @@ 
 
 						if ($result > 0)
 						{
-							$ecmfile->label = md5_file(dol_osencode($destfull));	// hash of file content
+							$ecmfile->label = md5_file(dol_osencode($destfull)); // hash of file content
 							$ecmfile->fullpath_orig = '';
 							$ecmfile->gen_or_uploaded = 'generated';
-							$ecmfile->description = '';    // indexed content
-							$ecmfile->keyword = '';        // keyword content
+							$ecmfile->description = ''; // indexed content
+							$ecmfile->keyword = ''; // keyword content
 							$result = $ecmfile->update($user);
 							if ($result < 0)
 							{
@@ -4600,11 +4600,11 @@ 
 							$ecmfile->entity = $conf->entity;
 							$ecmfile->filepath = $rel_dir;
 							$ecmfile->filename = $filename;
-							$ecmfile->label = md5_file(dol_osencode($destfull));	// hash of file content
+							$ecmfile->label = md5_file(dol_osencode($destfull)); // hash of file content
 							$ecmfile->fullpath_orig = '';
 							$ecmfile->gen_or_uploaded = 'generated';
-							$ecmfile->description = '';    // indexed content
-							$ecmfile->keyword = '';        // keyword content
+							$ecmfile->description = ''; // indexed content
+							$ecmfile->keyword = ''; // keyword content
 							$ecmfile->src_object_type = $this->table_element;
 							$ecmfile->src_object_id   = $this->id;
 
@@ -4621,14 +4621,14 @@ 
 						//var_dump($obj->update_main_doc_field);exit;
 
 						// Update the last_main_doc field into main object (if documenent generator has property ->update_main_doc_field set)
-						$update_main_doc_field=0;
-						if (! empty($obj->update_main_doc_field)) $update_main_doc_field=1;
-						if ($update_main_doc_field && ! empty($this->table_element))
+						$update_main_doc_field = 0;
+						if (!empty($obj->update_main_doc_field)) $update_main_doc_field = 1;
+						if ($update_main_doc_field && !empty($this->table_element))
 						{
 							$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element." SET last_main_doc = '".($ecmfile->filepath.'/'.$ecmfile->filename)."'";
-							$sql.= ' WHERE rowid = '.$this->id;
+							$sql .= ' WHERE rowid = '.$this->id;
 							$resql = $this->db->query($sql);
-							if (! $resql) dol_print_error($this->db);
+							if (!$resql) dol_print_error($this->db);
 						}
 					}
 				}
@@ -4644,15 +4644,15 @@ 
 			}
 			else
 			{
-				$outputlangs->charset_output=$sav_charset_output;
+				$outputlangs->charset_output = $sav_charset_output;
 				dol_print_error($this->db, "Error generating document for ".__CLASS__.". Error: ".$obj->error, $obj->errors);
 				return -1;
 			}
 		}
 		else
 		{
-			$this->error=$langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists",$file);
-			dol_print_error('',$this->error);
+			$this->error = $langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists", $file);
+			dol_print_error('', $this->error);
 			return -1;
 		}
 	}
@@ -4668,9 +4668,9 @@ 
 	{
 		global $maxwidthsmall, $maxheightsmall, $maxwidthmini, $maxheightmini, $quality;
 
-		require_once DOL_DOCUMENT_ROOT .'/core/lib/images.lib.php';		// This define also $maxwidthsmall, $quality, ...
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php'; // This define also $maxwidthsmall, $quality, ...
 
-		$file_osencoded=dol_osencode($file);
+		$file_osencoded = dol_osencode($file);
 		if (file_exists($file_osencoded))
 		{
 			// Create small thumbs for company (Ratio is near 16/9)
@@ -4700,7 +4700,7 @@ 
 	 * @param   string              $alternatevalue     Alternate value to use
 	 * @return  string|string[]                         Default value (can be an array if the GETPOST return an array)
 	 **/
-	function getDefaultCreateValueFor($fieldname, $alternatevalue=null)
+	function getDefaultCreateValueFor($fieldname, $alternatevalue = null)
 	{
 		global $conf, $_POST;
 
@@ -4709,16 +4709,16 @@ 
 
 		if (isset($alternatevalue)) return $alternatevalue;
 
-		$newelement=$this->element;
-		if ($newelement == 'facture') $newelement='invoice';
-		if ($newelement == 'commande') $newelement='order';
+		$newelement = $this->element;
+		if ($newelement == 'facture') $newelement = 'invoice';
+		if ($newelement == 'commande') $newelement = 'order';
 		if (empty($newelement))
 		{
 			dol_syslog("Ask a default value using common method getDefaultCreateValueForField on an object with no property ->element defined. Return empty string.", LOG_WARNING);
 			return '';
 		}
 
-		$keyforfieldname=strtoupper($newelement.'_DEFAULT_'.$fieldname);
+		$keyforfieldname = strtoupper($newelement.'_DEFAULT_'.$fieldname);
 		//var_dump($keyforfieldname);
 		if (isset($conf->global->$keyforfieldname)) return $conf->global->$keyforfieldname;
 
@@ -4743,21 +4743,21 @@ 
 	function call_trigger($trigger_name, $user)
 	{
         // phpcs:enable
-		global $langs,$conf;
+		global $langs, $conf;
 
-		include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-		$interface=new Interfaces($this->db);
-		$result=$interface->run_triggers($trigger_name,$this,$user,$langs,$conf);
+		include_once DOL_DOCUMENT_ROOT.'/core/class/interfaces.class.php';
+		$interface = new Interfaces($this->db);
+		$result = $interface->run_triggers($trigger_name, $this, $user, $langs, $conf);
 
 		if ($result < 0)
 		{
 			if (!empty($this->errors))
 			{
-				$this->errors=array_unique(array_merge($this->errors,$interface->errors));   // We use array_unique because when a trigger call another trigger on same object, this->errors is added twice.
+				$this->errors = array_unique(array_merge($this->errors, $interface->errors)); // We use array_unique because when a trigger call another trigger on same object, this->errors is added twice.
 			}
 			else
 			{
-				$this->errors=$interface->errors;
+				$this->errors = $interface->errors;
 			}
 		}
 		return $result;
@@ -4776,19 +4776,19 @@ 
 	 *  @param  array	$optionsArray   Array resulting of call of extrafields->fetch_name_optionals_label(). Deprecated. Function must be called without parameters.
 	 *  @return	int						<0 if error, 0 if no values of extrafield to find nor found, 1 if an attribute is found and value loaded
 	 */
-	function fetch_optionals($rowid=null, $optionsArray=null)
+	function fetch_optionals($rowid = null, $optionsArray = null)
 	{
         // phpcs:enable
-		if (empty($rowid)) $rowid=$this->id;
+		if (empty($rowid)) $rowid = $this->id;
 
 		// To avoid SQL errors. Probably not the better solution though
 		if (!$this->table_element) {
 			return 0;
 		}
 
-		$this->array_options=array();
+		$this->array_options = array();
 
-		if (! is_array($optionsArray))
+		if (!is_array($optionsArray))
 		{
 			// If $extrafields is not a known object, we initialize it. Best practice is to have $extrafields defined into card.php or list.php page.
 			// TODO Use of existing $extrafield is not yet ready (must mutualize code that use extrafields in form first)
@@ -4804,7 +4804,7 @@ 
 			{
 				$extrafields->fetch_name_optionals_label($this->table_element);
 			}
-			$optionsArray = (! empty($extrafields->attributes[$this->table_element]['label'])?$extrafields->attributes[$this->table_element]['label']:null);
+			$optionsArray = (!empty($extrafields->attributes[$this->table_element]['label']) ? $extrafields->attributes[$this->table_element]['label'] : null);
 		}
 		else
 		{
@@ -4823,18 +4823,18 @@ 
 			{
 				if (empty($extrafields->attributes[$this->table_element]['type'][$name]) || $extrafields->attributes[$this->table_element]['type'][$name] != 'separate')
 				{
-					$sql.= ", ".$name;
+					$sql .= ", ".$name;
 				}
 			}
-			$sql.= " FROM ".MAIN_DB_PREFIX.$table_element."_extrafields";
-			$sql.= " WHERE fk_object = ".$rowid;
+			$sql .= " FROM ".MAIN_DB_PREFIX.$table_element."_extrafields";
+			$sql .= " WHERE fk_object = ".$rowid;
 
 			//dol_syslog(get_class($this)."::fetch_optionals get extrafields data for ".$this->table_element, LOG_DEBUG);		// Too verbose
-			$resql=$this->db->query($sql);
+			$resql = $this->db->query($sql);
 			if ($resql)
 			{
 				$this->array_options = array();
-				$numrows=$this->db->num_rows($resql);
+				$numrows = $this->db->num_rows($resql);
 				if ($numrows)
 				{
 					$tab = $this->db->fetch_array($resql);
@@ -4842,17 +4842,17 @@ 
 					foreach ($tab as $key => $value)
 					{
 						// Test fetch_array ! is_int($key) because fetch_array result is a mix table with Key as alpha and Key as int (depend db engine)
-						if ($key != 'rowid' && $key != 'tms' && $key != 'fk_member' && ! is_int($key))
+						if ($key != 'rowid' && $key != 'tms' && $key != 'fk_member' && !is_int($key))
 						{
 							// we can add this attribute to object
-							if (! empty($extrafields) && in_array($extrafields->attributes[$this->table_element]['type'][$key], array('date','datetime')))
+							if (!empty($extrafields) && in_array($extrafields->attributes[$this->table_element]['type'][$key], array('date', 'datetime')))
 							{
 								//var_dump($extrafields->attributes[$this->table_element]['type'][$key]);
-								$this->array_options["options_".$key]=$this->db->jdate($value);
+								$this->array_options["options_".$key] = $this->db->jdate($value);
 							}
 							else
 							{
-								$this->array_options["options_".$key]=$value;
+								$this->array_options["options_".$key] = $value;
 							}
 
 							//var_dump('key '.$key.' '.$value.' type='.$extrafields->attributes[$this->table_element]['type'][$key].' '.$this->array_options["options_".$key]);
@@ -4888,10 +4888,10 @@ 
 
 		$sql_del = "DELETE FROM ".MAIN_DB_PREFIX.$table_element."_extrafields WHERE fk_object = ".$this->id;
 		dol_syslog(get_class($this)."::deleteExtraFields delete", LOG_DEBUG);
-		$resql=$this->db->query($sql_del);
-		if (! $resql)
+		$resql = $this->db->query($sql_del);
+		if (!$resql)
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
 		}
@@ -4912,36 +4912,36 @@ 
 	 *  @return int 						-1=error, O=did nothing, 1=OK
 	 *  @see updateExtraField, setValueFrom
 	 */
-	function insertExtraFields($trigger='', $userused=null)
+	function insertExtraFields($trigger = '', $userused = null)
 	{
-		global $conf,$langs,$user;
+		global $conf, $langs, $user;
 
-		if (empty($userused)) $userused=$user;
+		if (empty($userused)) $userused = $user;
 
-		$error=0;
+		$error = 0;
 
-		if (! empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) return 0;	// For avoid conflicts if trigger used
+		if (!empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) return 0; // For avoid conflicts if trigger used
 
-		if (! empty($this->array_options))
+		if (!empty($this->array_options))
 		{
 			// Check parameters
 			$langs->load('admin');
 			require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 			$extrafields = new ExtraFields($this->db);
-			$target_extrafields=$extrafields->fetch_name_optionals_label($this->table_element);
+			$target_extrafields = $extrafields->fetch_name_optionals_label($this->table_element);
 
 			//Eliminate copied source object extra_fields that do not exist in target object
-			$new_array_options=array();
+			$new_array_options = array();
 			foreach ($this->array_options as $key => $value) {
-				if (in_array(substr($key,8), array_keys($target_extrafields)))	// We remove the 'options_' from $key for test
+				if (in_array(substr($key, 8), array_keys($target_extrafields)))	// We remove the 'options_' from $key for test
 					$new_array_options[$key] = $value;
 				elseif (in_array($key, array_keys($target_extrafields)))		// We test on $key that does not contains the 'options_' prefix
 					$new_array_options['options_'.$key] = $value;
 			}
 
-			foreach($new_array_options as $key => $value)
+			foreach ($new_array_options as $key => $value)
 			{
-			   	$attributeKey      = substr($key,8);   // Remove 'options_' prefix
+			   	$attributeKey      = substr($key, 8); // Remove 'options_' prefix
 			   	$attributeType     = $extrafields->attributes[$this->table_element]['type'][$attributeKey];
 			   	$attributeLabel    = $extrafields->attributes[$this->table_element]['label'][$attributeKey];
 			   	$attributeParam    = $extrafields->attributes[$this->table_element]['param'][$attributeKey];
@@ -4949,13 +4949,13 @@ 
 
 			   	if ($attributeRequired)
 			   	{
-			   		$mandatorypb=false;
-			   		if ($attributeType == 'link' && $this->array_options[$key] == '-1') $mandatorypb=true;
-			   		if ($this->array_options[$key] === '') $mandatorypb=true;
+			   		$mandatorypb = false;
+			   		if ($attributeType == 'link' && $this->array_options[$key] == '-1') $mandatorypb = true;
+			   		if ($this->array_options[$key] === '') $mandatorypb = true;
 			   		if ($mandatorypb)
 			   		{
 			   			dol_syslog($this->error);
-			   			$this->errors[]=$langs->trans('ErrorFieldRequired', $attributeLabel);
+			   			$this->errors[] = $langs->trans('ErrorFieldRequired', $attributeLabel);
 			   			return -1;
 			   		}
 			   	}
@@ -4966,25 +4966,25 @@ 
 			   	switch ($attributeType)
 			   	{
 			   		case 'int':
-			  			if (!is_numeric($value) && $value!='')
+			  			if (!is_numeric($value) && $value != '')
 			   			{
-			   				$this->errors[]=$langs->trans("ExtraFieldHasWrongValue", $attributeLabel);
+			   				$this->errors[] = $langs->trans("ExtraFieldHasWrongValue", $attributeLabel);
 			   				return -1;
 			  			}
-			   			elseif ($value=='')
+			   			elseif ($value == '')
 			   			{
 			   				$new_array_options[$key] = null;
 			   			}
 			 			break;
 					case 'double':
 						$value = price2num($value);
-						if (!is_numeric($value) && $value!='')
+						if (!is_numeric($value) && $value != '')
 						{
 							dol_syslog($langs->trans("ExtraFieldHasWrongValue")." sur ".$attributeLabel."(".$value."is not '".$attributeType."')", LOG_DEBUG);
-							$this->errors[]=$langs->trans("ExtraFieldHasWrongValue", $attributeLabel);
+							$this->errors[] = $langs->trans("ExtraFieldHasWrongValue", $attributeLabel);
 							return -1;
 						}
-						elseif ($value=='')
+						elseif ($value == '')
 						{
 							$new_array_options[$key] = null;
 						}
@@ -4998,12 +4998,12 @@ 
              			}
              			break;*/
 			   		case 'password':
-			   			$algo='';
+			   			$algo = '';
 			   			if ($this->array_options[$key] != '' && is_array($extrafields->attributes[$this->table_element]['param'][$attributeKey]['options']))
 			   			{
 			   				// If there is an encryption choice, we use it to crypt data before insert
 			   				$tmparrays = array_keys($extrafields->attributes[$this->table_element]['param'][$attributeKey]['options']);
-			   				$algo=reset($tmparrays);
+			   				$algo = reset($tmparrays);
 			   				if ($algo != '')
 			   				{
 			   					//global $action;		// $action may be 'create', 'update', 'update_extras'...
@@ -5014,7 +5014,7 @@ 
 			   						//var_dump($this->oldcopy->array_options[$key]); var_dump($this->array_options[$key]);
 				   					if ($this->array_options[$key] == $this->oldcopy->array_options[$key])	// If old value crypted in database is same than submited new value, it means we don't change it, so we don't update.
 				   					{
-				   						$new_array_options[$key] = $this->array_options[$key];	// Value is kept
+				   						$new_array_options[$key] = $this->array_options[$key]; // Value is kept
 				   					}
 									else
 									{
@@ -5025,7 +5025,7 @@ 
 			   					}
 			   					else
 			   					{
-			   						$new_array_options[$key] = $this->array_options[$key];	// Value is kept
+			   						$new_array_options[$key] = $this->array_options[$key]; // Value is kept
 			   					}
 			   				}
 			   			}
@@ -5042,13 +5042,13 @@ 
 						break;
 					case 'datetime':
 						// If data is a string instead of a timestamp, we convert it
-						if (! is_int($this->array_options[$key])) {
+						if (!is_int($this->array_options[$key])) {
 							$this->array_options[$key] = strtotime($this->array_options[$key]);
 						}
 						$new_array_options[$key] = $this->db->idate($this->array_options[$key]);
 						break;
 		   			case 'link':
-						$param_list=array_keys($attributeParam['options']);
+						$param_list = array_keys($attributeParam['options']);
 						// 0 : ObjectName
 						// 1 : classPath
 						$InfoFieldList = explode(":", $param_list[0]);
@@ -5057,18 +5057,18 @@ 
 						{
 							if ($value == '-1')	// -1 is key for no defined in combo list of objects
 							{
-								$new_array_options[$key]='';
+								$new_array_options[$key] = '';
 							}
 							elseif ($value)
 							{
 								$object = new $InfoFieldList[0]($this->db);
-								if (is_numeric($value)) $res=$object->fetch($value);
-								else $res=$object->fetch('',$value);
+								if (is_numeric($value)) $res = $object->fetch($value);
+								else $res = $object->fetch('', $value);
 
-								if ($res > 0) $new_array_options[$key]=$object->id;
+								if ($res > 0) $new_array_options[$key] = $object->id;
 								else
 								{
-									$this->error="Id/Ref '".$value."' for object '".$object->element."' not found";
+									$this->error = "Id/Ref '".$value."' for object '".$object->element."' not found";
 									$this->db->rollback();
 									return -1;
 								}
@@ -5092,46 +5092,46 @@ 
 			$this->db->query($sql_del);
 
 			$sql = "INSERT INTO ".MAIN_DB_PREFIX.$table_element."_extrafields (fk_object";
-			foreach($new_array_options as $key => $value)
+			foreach ($new_array_options as $key => $value)
 			{
-				$attributeKey = substr($key,8);   // Remove 'options_' prefix
+				$attributeKey = substr($key, 8); // Remove 'options_' prefix
 				// Add field of attribut
 				if ($extrafields->attributes[$this->table_element]['type'][$attributeKey] != 'separate') // Only for other type than separator
-					$sql.=",".$attributeKey;
+					$sql .= ",".$attributeKey;
 			}
 			$sql .= ") VALUES (".$this->id;
 
-			foreach($new_array_options as $key => $value)
+			foreach ($new_array_options as $key => $value)
 			{
-				$attributeKey = substr($key,8);   // Remove 'options_' prefix
+				$attributeKey = substr($key, 8); // Remove 'options_' prefix
 				// Add field of attribute
 				if ($extrafields->attributes[$this->table_element]['type'][$attributeKey] != 'separate') // Only for other type than separator)
 				{
 					if ($new_array_options[$key] != '')
 					{
-						$sql.=",'".$this->db->escape($new_array_options[$key])."'";
+						$sql .= ",'".$this->db->escape($new_array_options[$key])."'";
 					}
 					else
 					{
-						$sql.=",null";
+						$sql .= ",null";
 					}
 				}
 			}
-			$sql.=")";
+			$sql .= ")";
 
 			dol_syslog(get_class($this)."::insertExtraFields insert", LOG_DEBUG);
 			$resql = $this->db->query($sql);
-			if (! $resql)
+			if (!$resql)
 			{
-				$this->error=$this->db->lasterror();
+				$this->error = $this->db->lasterror();
 				$error++;
 			}
 
-			if (! $error && $trigger)
+			if (!$error && $trigger)
 			{
 				// Call trigger
-				$this->context=array('extrafieldaddupdate'=>1);
-				$result=$this->call_trigger($trigger, $userused);
+				$this->context = array('extrafieldaddupdate'=>1);
+				$result = $this->call_trigger($trigger, $userused);
 				if ($result < 0) $error++;
 				// End call trigger
 			}
@@ -5160,25 +5160,25 @@ 
 	 *  @return int                 		-1=error, O=did nothing, 1=OK
 	 *  @see setValueFrom, insertExtraFields
 	 */
-	function updateExtraField($key, $trigger=null, $userused=null)
+	function updateExtraField($key, $trigger = null, $userused = null)
 	{
-		global $conf,$langs,$user;
+		global $conf, $langs, $user;
 
-		if (empty($userused)) $userused=$user;
+		if (empty($userused)) $userused = $user;
 
-		$error=0;
+		$error = 0;
 
-		if (! empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) return 0;	// For avoid conflicts if trigger used
+		if (!empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) return 0; // For avoid conflicts if trigger used
 
-		if (! empty($this->array_options) && isset($this->array_options["options_".$key]))
+		if (!empty($this->array_options) && isset($this->array_options["options_".$key]))
 		{
 			// Check parameters
 			$langs->load('admin');
 			require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 			$extrafields = new ExtraFields($this->db);
-			$target_extrafields=$extrafields->fetch_name_optionals_label($this->table_element);
+			$target_extrafields = $extrafields->fetch_name_optionals_label($this->table_element);
 
-			$value=$this->array_options["options_".$key];
+			$value = $this->array_options["options_".$key];
 
 			$attributeType     = $extrafields->attributes[$this->table_element]['type'][$key];
 			$attributeLabel    = $extrafields->attributes[$this->table_element]['label'][$key];
@@ -5191,25 +5191,25 @@ 
 			switch ($attributeType)
 			{
 				case 'int':
-					if (!is_numeric($value) && $value!='')
+					if (!is_numeric($value) && $value != '')
 					{
-						$this->errors[]=$langs->trans("ExtraFieldHasWrongValue",$attributeLabel);
+						$this->errors[] = $langs->trans("ExtraFieldHasWrongValue", $attributeLabel);
 						return -1;
 					}
-					elseif ($value=='')
+					elseif ($value == '')
 					{
 						$this->array_options["options_".$key] = null;
 					}
 					break;
 				case 'double':
 					$value = price2num($value);
-					if (!is_numeric($value) && $value!='')
+					if (!is_numeric($value) && $value != '')
 					{
 						dol_syslog($langs->trans("ExtraFieldHasWrongValue")." sur ".$attributeLabel."(".$value."is not '".$attributeType."')", LOG_DEBUG);
-						$this->errors[]=$langs->trans("ExtraFieldHasWrongValue", $attributeLabel);
+						$this->errors[] = $langs->trans("ExtraFieldHasWrongValue", $attributeLabel);
 						return -1;
 					}
-					elseif ($value=='')
+					elseif ($value == '')
 					{
 						$this->array_options["options_".$key] = null;
 					}
@@ -5226,13 +5226,13 @@ 
 					$this->array_options["options_".$key] = price2num($this->array_options["options_".$key]);
 					break;
 				case 'date':
-					$this->array_options["options_".$key]=$this->db->idate($this->array_options["options_".$key]);
+					$this->array_options["options_".$key] = $this->db->idate($this->array_options["options_".$key]);
 					break;
 				case 'datetime':
-					$this->array_options["options_".$key]=$this->db->idate($this->array_options["options_".$key]);
+					$this->array_options["options_".$key] = $this->db->idate($this->array_options["options_".$key]);
 					break;
 				case 'link':
-					$param_list=array_keys($attributeParam['options']);
+					$param_list = array_keys($attributeParam['options']);
 					// 0 : ObjectName
 					// 1 : classPath
 					$InfoFieldList = explode(":", $param_list[0]);
@@ -5240,8 +5240,8 @@ 
 					if ($value)
 					{
 						$object = new $InfoFieldList[0]($this->db);
-						$object->fetch(0,$value);
-						$this->array_options["options_".$key]=$object->id;
+						$object->fetch(0, $value);
+						$this->array_options["options_".$key] = $object->id;
 					}
 					break;
 			}
@@ -5250,24 +5250,24 @@ 
 			$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element."_extrafields SET ".$key."='".$this->db->escape($this->array_options["options_".$key])."'";
 			$sql .= " WHERE fk_object = ".$this->id;
 			$resql = $this->db->query($sql);
-			if (! $resql)
+			if (!$resql)
 			{
 				$error++;
-				$this->error=$this->db->lasterror();
+				$this->error = $this->db->lasterror();
 			}
 
-			if (! $error && $trigger)
+			if (!$error && $trigger)
 			{
 				// Call trigger
-				$this->context=array('extrafieldupdate'=>1);
-				$result=$this->call_trigger($trigger, $userused);
+				$this->context = array('extrafieldupdate'=>1);
+				$result = $this->call_trigger($trigger, $userused);
 				if ($result < 0) $error++;
 				// End call trigger
 			}
 
 			if ($error)
 			{
-				dol_syslog(get_class($this) . "::".__METHOD__ . $this->error, LOG_ERR);
+				dol_syslog(get_class($this)."::".__METHOD__.$this->error, LOG_ERR);
 				$this->db->rollback();
 				return -1;
 			}
@@ -5294,71 +5294,71 @@ 
 	 * @param  string|int		$morecss       Value for css to define style/length of field. May also be a numeric.
 	 * @return string
 	 */
-	function showInputField($val, $key, $value, $moreparam='', $keysuffix='', $keyprefix='', $morecss=0)
+	function showInputField($val, $key, $value, $moreparam = '', $keysuffix = '', $keyprefix = '', $morecss = 0)
 	{
-		global $conf,$langs,$form;
+		global $conf, $langs, $form;
 
-		if (! is_object($form))
+		if (!is_object($form))
 		{
 			require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
-			$form=new Form($this->db);
+			$form = new Form($this->db);
 		}
 
-		$val=$this->fields[$key];
+		$val = $this->fields[$key];
 
-		$out='';
-        $type='';
+		$out = '';
+        $type = '';
         $param = array();
-        $param['options']=array();
-        $size =$this->fields[$key]['size'];
+        $param['options'] = array();
+        $size = $this->fields[$key]['size'];
         // Because we work on extrafields
-        if(preg_match('/^integer:(.*):(.*)/i', $val['type'], $reg)){
-            $param['options']=array($reg[1].':'.$reg[2]=>'N');
-            $type ='link';
-        } elseif(preg_match('/^link:(.*):(.*)/i', $val['type'], $reg)) {
-            $param['options']=array($reg[1].':'.$reg[2]=>'N');
-            $type ='link';
-        } elseif(preg_match('/^sellist:(.*):(.*):(.*):(.*)/i', $val['type'], $reg)) {
-            $param['options']=array($reg[1].':'.$reg[2].':'.$reg[3].':'.$reg[4]=>'N');
-            $type ='sellist';
-        } elseif(preg_match('/varchar\((\d+)\)/', $val['type'],$reg)) {
-            $param['options']=array();
-            $type ='varchar';
-            $size=$reg[1];
-        } elseif(preg_match('/varchar/', $val['type'])) {
-            $param['options']=array();
-            $type ='varchar';
-        } elseif(is_array($this->fields[$key]['arrayofkeyval'])) {
-            $param['options']=$this->fields[$key]['arrayofkeyval'];
-            $type ='select';
+        if (preg_match('/^integer:(.*):(.*)/i', $val['type'], $reg)) {
+            $param['options'] = array($reg[1].':'.$reg[2]=>'N');
+            $type = 'link';
+        } elseif (preg_match('/^link:(.*):(.*)/i', $val['type'], $reg)) {
+            $param['options'] = array($reg[1].':'.$reg[2]=>'N');
+            $type = 'link';
+        } elseif (preg_match('/^sellist:(.*):(.*):(.*):(.*)/i', $val['type'], $reg)) {
+            $param['options'] = array($reg[1].':'.$reg[2].':'.$reg[3].':'.$reg[4]=>'N');
+            $type = 'sellist';
+        } elseif (preg_match('/varchar\((\d+)\)/', $val['type'], $reg)) {
+            $param['options'] = array();
+            $type = 'varchar';
+            $size = $reg[1];
+        } elseif (preg_match('/varchar/', $val['type'])) {
+            $param['options'] = array();
+            $type = 'varchar';
+        } elseif (is_array($this->fields[$key]['arrayofkeyval'])) {
+            $param['options'] = $this->fields[$key]['arrayofkeyval'];
+            $type = 'select';
         } else {
-            $param['options']=array();
-            $type =$this->fields[$key]['type'];
+            $param['options'] = array();
+            $type = $this->fields[$key]['type'];
         }
 
-		$label=$this->fields[$key]['label'];
+		$label = $this->fields[$key]['label'];
 		//$elementtype=$this->fields[$key]['elementtype'];	// Seems not used
-		$default=$this->fields[$key]['default'];
-		$computed=$this->fields[$key]['computed'];
-		$unique=$this->fields[$key]['unique'];
-		$required=$this->fields[$key]['required'];
+		$default = $this->fields[$key]['default'];
+		$computed = $this->fields[$key]['computed'];
+		$unique = $this->fields[$key]['unique'];
+		$required = $this->fields[$key]['required'];
 
-		$langfile=$this->fields[$key]['langfile'];
-		$list=$this->fields[$key]['list'];
-		$hidden=abs($this->fields[$key]['visible'])!=1?1:0;
+		$langfile = $this->fields[$key]['langfile'];
+		$list = $this->fields[$key]['list'];
+		$hidden = abs($this->fields[$key]['visible']) != 1 ? 1 : 0;
 
 		$objectid = $this->id;
 
 
 		if ($computed)
 		{
-			if (! preg_match('/^search_/', $keyprefix)) return '<span class="opacitymedium">'.$langs->trans("AutomaticallyCalculated").'</span>';
+			if (!preg_match('/^search_/', $keyprefix)) return '<span class="opacitymedium">'.$langs->trans("AutomaticallyCalculated").'</span>';
 			else return '';
 		}
 
 
 		// Use in priority showsize from parameters, then $val['css'] then autodefine
-		if (empty($morecss) && ! empty($val['css']))
+		if (empty($morecss) && !empty($val['css']))
 		{
 			$showsize = $val['css'];
 		}
@@ -5372,16 +5372,16 @@ 
 			{
 				$morecss = 'minwidth200imp';
 			}
-			elseif (in_array($type,array('int','integer','price')) || preg_match('/^double(\([0-9],[0-9]\)){0,1}/',$type))
+			elseif (in_array($type, array('int', 'integer', 'price')) || preg_match('/^double(\([0-9],[0-9]\)){0,1}/', $type))
 			{
 				$morecss = 'maxwidth75';
                         }elseif ($type == 'url')
 			{
-				$morecss='minwidth400';
+				$morecss = 'minwidth400';
 			}
 			elseif ($type == 'boolean')
 			{
-				$morecss='';
+				$morecss = '';
 			}
 			else
 			{
@@ -5400,12 +5400,12 @@ 
 			}
 		}
 
-		if (in_array($type,array('date','datetime')))
+		if (in_array($type, array('date', 'datetime')))
 		{
-			$tmp=explode(',',$size);
-			$newsize=$tmp[0];
+			$tmp = explode(',', $size);
+			$newsize = $tmp[0];
 
-			$showtime = in_array($type,array('datetime')) ? 1 : 0;
+			$showtime = in_array($type, array('datetime')) ? 1 : 0;
 
 			// Do not show current date when field not required (see selectDate() method)
 			if (!$required && $value == '') $value = '-1';
@@ -5413,237 +5413,237 @@ 
 			// TODO Must also support $moreparam
 			$out = $form->selectDate($value, $keyprefix.$key.$keysuffix, $showtime, $showtime, $required, '', 1, (($keyprefix != 'search_' && $keyprefix != 'search_options_') ? 1 : 0), 0, 1);
 		}
-		elseif (in_array($type,array('int','integer')))
+		elseif (in_array($type, array('int', 'integer')))
 		{
-			$tmp=explode(',',$size);
-			$newsize=$tmp[0];
-			$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$newsize.'" value="'.dol_escape_htmltag($value).'"'.($moreparam?$moreparam:'').'>';
+			$tmp = explode(',', $size);
+			$newsize = $tmp[0];
+			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$newsize.'" value="'.dol_escape_htmltag($value).'"'.($moreparam ? $moreparam : '').'>';
 		}
 		elseif (preg_match('/varchar/', $type))
 		{
-			$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$size.'" value="'.dol_escape_htmltag($value).'"'.($moreparam?$moreparam:'').'>';
+			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$size.'" value="'.dol_escape_htmltag($value).'"'.($moreparam ? $moreparam : '').'>';
 		}
 		elseif (in_array($type, array('mail', 'phone', 'url')))
 		{
-			$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam?$moreparam:'').'>';
+			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam ? $moreparam : '').'>';
 		}
 		elseif ($type == 'text')
 		{
-			if (! preg_match('/search_/', $keyprefix))		// If keyprefix is search_ or search_options_, we must just use a simple text field
+			if (!preg_match('/search_/', $keyprefix))		// If keyprefix is search_ or search_options_, we must just use a simple text field
 			{
 				require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-				$doleditor=new DolEditor($keyprefix.$key.$keysuffix,$value,'',200,'dolibarr_notes','In',false,false,false,ROWS_5,'90%');
-				$out=$doleditor->Create(1);
+				$doleditor = new DolEditor($keyprefix.$key.$keysuffix, $value, '', 200, 'dolibarr_notes', 'In', false, false, false, ROWS_5, '90%');
+				$out = $doleditor->Create(1);
 			}
 			else
 			{
-				$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam?$moreparam:'').'>';
+				$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam ? $moreparam : '').'>';
 			}
 		}
 		elseif ($type == 'html')
 		{
-			if (! preg_match('/search_/', $keyprefix))		// If keyprefix is search_ or search_options_, we must just use a simple text field
+			if (!preg_match('/search_/', $keyprefix))		// If keyprefix is search_ or search_options_, we must just use a simple text field
 			{
 				require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-				$doleditor=new DolEditor($keyprefix.$key.$keysuffix,$value,'',200,'dolibarr_notes','In',false,false,! empty($conf->fckeditor->enabled) && $conf->global->FCKEDITOR_ENABLE_SOCIETE,ROWS_5,'90%');
-				$out=$doleditor->Create(1);
+				$doleditor = new DolEditor($keyprefix.$key.$keysuffix, $value, '', 200, 'dolibarr_notes', 'In', false, false, !empty($conf->fckeditor->enabled) && $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_5, '90%');
+				$out = $doleditor->Create(1);
 			}
 			else
 			{
-				$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam?$moreparam:'').'>';
+				$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam ? $moreparam : '').'>';
 			}
 		}
 		elseif ($type == 'boolean')
 		{
-			$checked='';
+			$checked = '';
 			if (!empty($value)) {
-				$checked=' checked value="1" ';
+				$checked = ' checked value="1" ';
 			} else {
-				$checked=' value="1" ';
+				$checked = ' value="1" ';
 			}
-			$out='<input type="checkbox" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.$checked.' '.($moreparam?$moreparam:'').'>';
+			$out = '<input type="checkbox" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.$checked.' '.($moreparam ? $moreparam : '').'>';
 		}
 		elseif ($type == 'price')
 		{
 			if (!empty($value)) {		// $value in memory is a php numeric, we format it into user number format.
-				$value=price($value);
+				$value = price($value);
 			}
-			$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam?$moreparam:'').'> '.$langs->getCurrencySymbol($conf->currency);
+			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam ? $moreparam : '').'> '.$langs->getCurrencySymbol($conf->currency);
 		}
-		elseif (preg_match('/^double(\([0-9],[0-9]\)){0,1}/',$type))
+		elseif (preg_match('/^double(\([0-9],[0-9]\)){0,1}/', $type))
 		{
 			if (!empty($value)) {		// $value in memory is a php numeric, we format it into user number format.
-				$value=price($value);
+				$value = price($value);
 			}
-			$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam?$moreparam:'').'> ';
+			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam ? $moreparam : '').'> ';
 		}
 		elseif ($type == 'select')
 		{
 			$out = '';
-			if (! empty($conf->use_javascript_ajax) && ! empty($conf->global->MAIN_EXTRAFIELDS_USE_SELECT2))
+			if (!empty($conf->use_javascript_ajax) && !empty($conf->global->MAIN_EXTRAFIELDS_USE_SELECT2))
 			{
-				include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
-				$out.= ajax_combobox($keyprefix.$key.$keysuffix, array(), 0);
+				include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
+				$out .= ajax_combobox($keyprefix.$key.$keysuffix, array(), 0);
 			}
 
-			$out.='<select class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam?$moreparam:'').'>';
-                if((! isset($this->fields[$key]['default'])) ||($this->fields[$key]['notnull']!=1))$out.='<option value="0">&nbsp;</option>';
+			$out .= '<select class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam ? $moreparam : '').'>';
+                if ((!isset($this->fields[$key]['default'])) || ($this->fields[$key]['notnull'] != 1))$out .= '<option value="0">&nbsp;</option>';
 			foreach ($param['options'] as $key => $val)
 			{
 				if ((string) $key == '') continue;
 				list($val, $parent) = explode('|', $val);
-				$out.='<option value="'.$key.'"';
-				$out.= (((string) $value == (string) $key)?' selected':'');
-				$out.= (!empty($parent)?' parent="'.$parent.'"':'');
-				$out.='>'.$val.'</option>';
+				$out .= '<option value="'.$key.'"';
+				$out .= (((string) $value == (string) $key) ? ' selected' : '');
+				$out .= (!empty($parent) ? ' parent="'.$parent.'"' : '');
+				$out .= '>'.$val.'</option>';
 			}
-			$out.='</select>';
+			$out .= '</select>';
 		}
 		elseif ($type == 'sellist')
 		{
 			$out = '';
-			if (! empty($conf->use_javascript_ajax) && ! empty($conf->global->MAIN_EXTRAFIELDS_USE_SELECT2))
+			if (!empty($conf->use_javascript_ajax) && !empty($conf->global->MAIN_EXTRAFIELDS_USE_SELECT2))
 			{
-				include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
-				$out.= ajax_combobox($keyprefix.$key.$keysuffix, array(), 0);
+				include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
+				$out .= ajax_combobox($keyprefix.$key.$keysuffix, array(), 0);
 			}
 
-			$out.='<select class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam?$moreparam:'').'>';
+			$out .= '<select class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam ? $moreparam : '').'>';
 			if (is_array($param['options']))
 			{
-				$param_list=array_keys($param['options']);
+				$param_list = array_keys($param['options']);
 				$InfoFieldList = explode(":", $param_list[0]);
-				$parentName='';
-				$parentField='';
+				$parentName = '';
+				$parentField = '';
 				// 0 : tableName
 				// 1 : label field name
 				// 2 : key fields name (if differ of rowid)
 				// 3 : key field parent (for dependent lists)
 				// 4 : where clause filter on column or table extrafield, syntax field='value' or extra.field=value
-				$keyList=(empty($InfoFieldList[2])?'rowid':$InfoFieldList[2].' as rowid');
+				$keyList = (empty($InfoFieldList[2]) ? 'rowid' : $InfoFieldList[2].' as rowid');
 
 
-				if (count($InfoFieldList) > 4 && ! empty($InfoFieldList[4]))
+				if (count($InfoFieldList) > 4 && !empty($InfoFieldList[4]))
 				{
 					if (strpos($InfoFieldList[4], 'extra.') !== false)
 					{
-						$keyList='main.'.$InfoFieldList[2].' as rowid';
+						$keyList = 'main.'.$InfoFieldList[2].' as rowid';
 					} else {
-						$keyList=$InfoFieldList[2].' as rowid';
+						$keyList = $InfoFieldList[2].' as rowid';
 					}
 				}
-				if (count($InfoFieldList) > 3 && ! empty($InfoFieldList[3]))
+				if (count($InfoFieldList) > 3 && !empty($InfoFieldList[3]))
 				{
 					list($parentName, $parentField) = explode('|', $InfoFieldList[3]);
-					$keyList.= ', '.$parentField;
+					$keyList .= ', '.$parentField;
 				}
 
-				$fields_label = explode('|',$InfoFieldList[1]);
+				$fields_label = explode('|', $InfoFieldList[1]);
 				if (is_array($fields_label))
 				{
-					$keyList .=', ';
+					$keyList .= ', ';
 					$keyList .= implode(', ', $fields_label);
 				}
 
-				$sqlwhere='';
+				$sqlwhere = '';
 				$sql = 'SELECT '.$keyList;
-				$sql.= ' FROM '.MAIN_DB_PREFIX .$InfoFieldList[0];
+				$sql .= ' FROM '.MAIN_DB_PREFIX.$InfoFieldList[0];
 				if (!empty($InfoFieldList[4]))
 				{
 					// can use SELECT request
-					if (strpos($InfoFieldList[4], '$SEL$')!==false) {
-						$InfoFieldList[4]=str_replace('$SEL$','SELECT',$InfoFieldList[4]);
+					if (strpos($InfoFieldList[4], '$SEL$') !== false) {
+						$InfoFieldList[4] = str_replace('$SEL$', 'SELECT', $InfoFieldList[4]);
 					}
 
 					// current object id can be use into filter
-					if (strpos($InfoFieldList[4], '$ID$')!==false && !empty($objectid)) {
-						$InfoFieldList[4]=str_replace('$ID$',$objectid,$InfoFieldList[4]);
+					if (strpos($InfoFieldList[4], '$ID$') !== false && !empty($objectid)) {
+						$InfoFieldList[4] = str_replace('$ID$', $objectid, $InfoFieldList[4]);
 					} else {
-						$InfoFieldList[4]=str_replace('$ID$','0',$InfoFieldList[4]);
+						$InfoFieldList[4] = str_replace('$ID$', '0', $InfoFieldList[4]);
 					}
 					//We have to join on extrafield table
-					if (strpos($InfoFieldList[4], 'extra')!==false)
+					if (strpos($InfoFieldList[4], 'extra') !== false)
 					{
-						$sql.= ' as main, '.MAIN_DB_PREFIX .$InfoFieldList[0].'_extrafields as extra';
-						$sqlwhere.= ' WHERE extra.fk_object=main.'.$InfoFieldList[2]. ' AND '.$InfoFieldList[4];
+						$sql .= ' as main, '.MAIN_DB_PREFIX.$InfoFieldList[0].'_extrafields as extra';
+						$sqlwhere .= ' WHERE extra.fk_object=main.'.$InfoFieldList[2].' AND '.$InfoFieldList[4];
 					}
 					else
 					{
-						$sqlwhere.= ' WHERE '.$InfoFieldList[4];
+						$sqlwhere .= ' WHERE '.$InfoFieldList[4];
 					}
 				}
 				else
 				{
-					$sqlwhere.= ' WHERE 1=1';
+					$sqlwhere .= ' WHERE 1=1';
 				}
 				// Some tables may have field, some other not. For the moment we disable it.
-				if (in_array($InfoFieldList[0],array('tablewithentity')))
+				if (in_array($InfoFieldList[0], array('tablewithentity')))
 				{
-					$sqlwhere.= ' AND entity = '.$conf->entity;
+					$sqlwhere .= ' AND entity = '.$conf->entity;
 				}
-				$sql.=$sqlwhere;
+				$sql .= $sqlwhere;
 				//print $sql;
 
-				$sql .= ' ORDER BY ' . implode(', ', $fields_label);
+				$sql .= ' ORDER BY '.implode(', ', $fields_label);
 
 				dol_syslog(get_class($this).'::showInputField type=sellist', LOG_DEBUG);
 				$resql = $this->db->query($sql);
 				if ($resql)
 				{
-					$out.='<option value="0">&nbsp;</option>';
+					$out .= '<option value="0">&nbsp;</option>';
 					$num = $this->db->num_rows($resql);
 					$i = 0;
 					while ($i < $num)
 					{
-						$labeltoshow='';
+						$labeltoshow = '';
 						$obj = $this->db->fetch_object($resql);
 
 						// Several field into label (eq table:code|libelle:rowid)
 						$notrans = false;
-						$fields_label = explode('|',$InfoFieldList[1]);
+						$fields_label = explode('|', $InfoFieldList[1]);
 						if (is_array($fields_label))
 						{
 							$notrans = true;
 							foreach ($fields_label as $field_toshow)
 							{
-								$labeltoshow.= $obj->$field_toshow.' ';
+								$labeltoshow .= $obj->$field_toshow.' ';
 							}
 						}
 						else
 						{
-							$labeltoshow=$obj->{$InfoFieldList[1]};
+							$labeltoshow = $obj->{$InfoFieldList[1]};
 						}
-						$labeltoshow=dol_trunc($labeltoshow,45);
+						$labeltoshow = dol_trunc($labeltoshow, 45);
 
 						if ($value == $obj->rowid)
 						{
 							foreach ($fields_label as $field_toshow)
 							{
-								$translabel=$langs->trans($obj->$field_toshow);
-								if ($translabel!=$obj->$field_toshow) {
-									$labeltoshow=dol_trunc($translabel,18).' ';
-								}else {
-									$labeltoshow=dol_trunc($obj->$field_toshow,18).' ';
+								$translabel = $langs->trans($obj->$field_toshow);
+								if ($translabel != $obj->$field_toshow) {
+									$labeltoshow = dol_trunc($translabel, 18).' ';
+								} else {
+									$labeltoshow = dol_trunc($obj->$field_toshow, 18).' ';
 								}
 							}
-							$out.='<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
+							$out .= '<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
 						}
 						else
 						{
-							if (! $notrans)
+							if (!$notrans)
 							{
-								$translabel=$langs->trans($obj->{$InfoFieldList[1]});
-								if ($translabel!=$obj->{$InfoFieldList[1]}) {
-									$labeltoshow=dol_trunc($translabel,18);
+								$translabel = $langs->trans($obj->{$InfoFieldList[1]});
+								if ($translabel != $obj->{$InfoFieldList[1]}) {
+									$labeltoshow = dol_trunc($translabel, 18);
 								}
 								else {
-									$labeltoshow=dol_trunc($obj->{$InfoFieldList[1]},18);
+									$labeltoshow = dol_trunc($obj->{$InfoFieldList[1]},18);
 								}
 							}
-							if (empty($labeltoshow)) $labeltoshow='(not defined)';
-							if ($value==$obj->rowid)
+							if (empty($labeltoshow)) $labeltoshow = '(not defined)';
+							if ($value == $obj->rowid)
 							{
-								$out.='<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
+								$out .= '<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
 							}
 
 							if (!empty($InfoFieldList[3]) && $parentField)
@@ -5651,10 +5651,10 @@ 
 								$parent = $parentName.':'.$obj->{$parentField};
 							}
 
-							$out.='<option value="'.$obj->rowid.'"';
-							$out.= ($value==$obj->rowid?' selected':'');
-							$out.= (!empty($parent)?' parent="'.$parent.'"':'');
-							$out.='>'.$labeltoshow.'</option>';
+							$out .= '<option value="'.$obj->rowid.'"';
+							$out .= ($value == $obj->rowid ? ' selected' : '');
+							$out .= (!empty($parent) ? ' parent="'.$parent.'"' : '');
+							$out .= '>'.$labeltoshow.'</option>';
 						}
 
 						$i++;
@@ -5665,23 +5665,23 @@ 
 					print 'Error in request '.$sql.' '.$this->db->lasterror().'. Check setup of extra parameters.<br>';
 				}
 			}
-			$out.='</select>';
+			$out .= '</select>';
 		}
 		elseif ($type == 'checkbox')
 		{
-			$value_arr=explode(',',$value);
-			$out=$form->multiselectarray($keyprefix.$key.$keysuffix, (empty($param['options'])?null:$param['options']), $value_arr, '', 0, '', 0, '100%');
+			$value_arr = explode(',', $value);
+			$out = $form->multiselectarray($keyprefix.$key.$keysuffix, (empty($param['options']) ?null:$param['options']), $value_arr, '', 0, '', 0, '100%');
 		}
 		elseif ($type == 'radio')
 		{
-			$out='';
+			$out = '';
 			foreach ($param['options'] as $keyopt => $val)
 			{
-				$out.='<input class="flat '.$morecss.'" type="radio" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam?$moreparam:'');
-				$out.=' value="'.$keyopt.'"';
-				$out.=' id="'.$keyprefix.$key.$keysuffix.'_'.$keyopt.'"';
-				$out.= ($value==$keyopt?'checked':'');
-				$out.='/><label for="'.$keyprefix.$key.$keysuffix.'_'.$keyopt.'">'.$val.'</label><br>';
+				$out .= '<input class="flat '.$morecss.'" type="radio" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam ? $moreparam : '');
+				$out .= ' value="'.$keyopt.'"';
+				$out .= ' id="'.$keyprefix.$key.$keysuffix.'_'.$keyopt.'"';
+				$out .= ($value == $keyopt ? 'checked' : '');
+				$out .= '/><label for="'.$keyprefix.$key.$keysuffix.'_'.$keyopt.'">'.$val.'</label><br>';
 			}
 		}
 		elseif ($type == 'chkbxlst')
@@ -5696,24 +5696,24 @@ 
 			if (is_array($param['options'])) {
 				$param_list = array_keys($param['options']);
 				$InfoFieldList = explode(":", $param_list[0]);
-				$parentName='';
-				$parentField='';
+				$parentName = '';
+				$parentField = '';
 				// 0 : tableName
 				// 1 : label field name
 				// 2 : key fields name (if differ of rowid)
 				// 3 : key field parent (for dependent lists)
 				// 4 : where clause filter on column or table extrafield, syntax field='value' or extra.field=value
-				$keyList = (empty($InfoFieldList[2]) ? 'rowid' : $InfoFieldList[2] . ' as rowid');
+				$keyList = (empty($InfoFieldList[2]) ? 'rowid' : $InfoFieldList[2].' as rowid');
 
-				if (count($InfoFieldList) > 3 && ! empty($InfoFieldList[3])) {
-					list ( $parentName, $parentField ) = explode('|', $InfoFieldList[3]);
-					$keyList .= ', ' . $parentField;
+				if (count($InfoFieldList) > 3 && !empty($InfoFieldList[3])) {
+					list ($parentName, $parentField) = explode('|', $InfoFieldList[3]);
+					$keyList .= ', '.$parentField;
 				}
-				if (count($InfoFieldList) > 4 && ! empty($InfoFieldList[4])) {
+				if (count($InfoFieldList) > 4 && !empty($InfoFieldList[4])) {
 					if (strpos($InfoFieldList[4], 'extra.') !== false) {
-						$keyList = 'main.' . $InfoFieldList[2] . ' as rowid';
+						$keyList = 'main.'.$InfoFieldList[2].' as rowid';
 					} else {
-						$keyList = $InfoFieldList[2] . ' as rowid';
+						$keyList = $InfoFieldList[2].' as rowid';
 					}
 				}
 
@@ -5724,50 +5724,50 @@ 
 				}
 
 				$sqlwhere = '';
-				$sql = 'SELECT ' . $keyList;
-				$sql .= ' FROM ' . MAIN_DB_PREFIX . $InfoFieldList[0];
-				if (! empty($InfoFieldList[4])) {
+				$sql = 'SELECT '.$keyList;
+				$sql .= ' FROM '.MAIN_DB_PREFIX.$InfoFieldList[0];
+				if (!empty($InfoFieldList[4])) {
 
 					// can use SELECT request
-					if (strpos($InfoFieldList[4], '$SEL$')!==false) {
-						$InfoFieldList[4]=str_replace('$SEL$','SELECT',$InfoFieldList[4]);
+					if (strpos($InfoFieldList[4], '$SEL$') !== false) {
+						$InfoFieldList[4] = str_replace('$SEL$', 'SELECT', $InfoFieldList[4]);
 					}
 
 					// current object id can be use into filter
-					if (strpos($InfoFieldList[4], '$ID$')!==false && !empty($objectid)) {
-						$InfoFieldList[4]=str_replace('$ID$',$objectid,$InfoFieldList[4]);
+					if (strpos($InfoFieldList[4], '$ID$') !== false && !empty($objectid)) {
+						$InfoFieldList[4] = str_replace('$ID$', $objectid, $InfoFieldList[4]);
 					} else {
-						$InfoFieldList[4]=str_replace('$ID$','0',$InfoFieldList[4]);
+						$InfoFieldList[4] = str_replace('$ID$', '0', $InfoFieldList[4]);
 					}
 
 					// We have to join on extrafield table
 					if (strpos($InfoFieldList[4], 'extra') !== false) {
-						$sql .= ' as main, ' . MAIN_DB_PREFIX . $InfoFieldList[0] . '_extrafields as extra';
-						$sqlwhere .= ' WHERE extra.fk_object=main.' . $InfoFieldList[2] . ' AND ' . $InfoFieldList[4];
+						$sql .= ' as main, '.MAIN_DB_PREFIX.$InfoFieldList[0].'_extrafields as extra';
+						$sqlwhere .= ' WHERE extra.fk_object=main.'.$InfoFieldList[2].' AND '.$InfoFieldList[4];
 					} else {
-						$sqlwhere .= ' WHERE ' . $InfoFieldList[4];
+						$sqlwhere .= ' WHERE '.$InfoFieldList[4];
 					}
 				} else {
 					$sqlwhere .= ' WHERE 1=1';
 				}
 				// Some tables may have field, some other not. For the moment we disable it.
-				if (in_array($InfoFieldList[0], array ('tablewithentity')))
+				if (in_array($InfoFieldList[0], array('tablewithentity')))
 				{
-					$sqlwhere .= ' AND entity = ' . $conf->entity;
+					$sqlwhere .= ' AND entity = '.$conf->entity;
 				}
 				// $sql.=preg_replace('/^ AND /','',$sqlwhere);
 				// print $sql;
 
 				$sql .= $sqlwhere;
-				dol_syslog(get_class($this) . '::showInputField type=chkbxlst',LOG_DEBUG);
+				dol_syslog(get_class($this).'::showInputField type=chkbxlst', LOG_DEBUG);
 				$resql = $this->db->query($sql);
 				if ($resql) {
 					$num = $this->db->num_rows($resql);
 					$i = 0;
 
-					$data=array();
+					$data = array();
 
-					while ( $i < $num ) {
+					while ($i < $num) {
 						$labeltoshow = '';
 						$obj = $this->db->fetch_object($resql);
 
@@ -5776,8 +5776,8 @@ 
 						$fields_label = explode('|', $InfoFieldList[1]);
 						if (is_array($fields_label)) {
 							$notrans = true;
-							foreach ( $fields_label as $field_toshow ) {
-								$labeltoshow .= $obj->$field_toshow . ' ';
+							foreach ($fields_label as $field_toshow) {
+								$labeltoshow .= $obj->$field_toshow.' ';
 							}
 						} else {
 							$labeltoshow = $obj->{$InfoFieldList[1]};
@@ -5785,18 +5785,18 @@ 
 						$labeltoshow = dol_trunc($labeltoshow, 45);
 
 						if (is_array($value_arr) && in_array($obj->rowid, $value_arr)) {
-							foreach ( $fields_label as $field_toshow ) {
+							foreach ($fields_label as $field_toshow) {
 								$translabel = $langs->trans($obj->$field_toshow);
 								if ($translabel != $obj->$field_toshow) {
-									$labeltoshow = dol_trunc($translabel, 18) . ' ';
+									$labeltoshow = dol_trunc($translabel, 18).' ';
 								} else {
-									$labeltoshow = dol_trunc($obj->$field_toshow, 18) . ' ';
+									$labeltoshow = dol_trunc($obj->$field_toshow, 18).' ';
 								}
 							}
 
-							$data[$obj->rowid]=$labeltoshow;
+							$data[$obj->rowid] = $labeltoshow;
 						} else {
-							if (! $notrans) {
+							if (!$notrans) {
 								$translabel = $langs->trans($obj->{$InfoFieldList[1]});
 								if ($translabel != $obj->{$InfoFieldList[1]}) {
 									$labeltoshow = dol_trunc($translabel, 18);
@@ -5808,67 +5808,67 @@ 
 								$labeltoshow = '(not defined)';
 
 								if (is_array($value_arr) && in_array($obj->rowid, $value_arr)) {
-									$data[$obj->rowid]=$labeltoshow;
+									$data[$obj->rowid] = $labeltoshow;
 								}
 
-								if (! empty($InfoFieldList[3]) && $parentField) {
-									$parent = $parentName . ':' . $obj->{$parentField};
+								if (!empty($InfoFieldList[3]) && $parentField) {
+									$parent = $parentName.':'.$obj->{$parentField};
 								}
 
-								$data[$obj->rowid]=$labeltoshow;
+								$data[$obj->rowid] = $labeltoshow;
 						}
 
-						$i ++;
+						$i++;
 					}
 					$this->db->free($resql);
 
-					$out=$form->multiselectarray($keyprefix.$key.$keysuffix, $data, $value_arr, '', 0, '', 0, '100%');
+					$out = $form->multiselectarray($keyprefix.$key.$keysuffix, $data, $value_arr, '', 0, '', 0, '100%');
 				} else {
-					print 'Error in request ' . $sql . ' ' . $this->db->lasterror() . '. Check setup of extra parameters.<br>';
+					print 'Error in request '.$sql.' '.$this->db->lasterror().'. Check setup of extra parameters.<br>';
 				}
 			}
 		}
 		elseif ($type == 'link')
 		{
-			$param_list=array_keys($param['options']);				// $param_list='ObjectName:classPath'
-			$showempty=(($required && $default != '')?0:1);
-			$out=$form->selectForForms($param_list[0], $keyprefix.$key.$keysuffix, $value, $showempty);
+			$param_list = array_keys($param['options']); // $param_list='ObjectName:classPath'
+			$showempty = (($required && $default != '') ? 0 : 1);
+			$out = $form->selectForForms($param_list[0], $keyprefix.$key.$keysuffix, $value, $showempty);
 			if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
 			{
-            			list($class,$classfile)=explode(':',$param_list[0]);
-            			if (file_exists(dol_buildpath(dirname(dirname($classfile)).'/card.php'))) $url_path=dol_buildpath(dirname(dirname($classfile)).'/card.php',1);
-            			else $url_path=dol_buildpath(dirname(dirname($classfile)).'/'.$class.'_card.php',1);
-            			$out.='<a class="butActionNew" href="'.$url_path.'?action=create&backtopage='.$_SERVER['PHP_SELF'].'"><span class="fa fa-plus-circle valignmiddle"></span></a>';
+            			list($class, $classfile) = explode(':', $param_list[0]);
+            			if (file_exists(dol_buildpath(dirname(dirname($classfile)).'/card.php'))) $url_path = dol_buildpath(dirname(dirname($classfile)).'/card.php', 1);
+            			else $url_path = dol_buildpath(dirname(dirname($classfile)).'/'.$class.'_card.php', 1);
+            			$out .= '<a class="butActionNew" href="'.$url_path.'?action=create&backtopage='.$_SERVER['PHP_SELF'].'"><span class="fa fa-plus-circle valignmiddle"></span></a>';
             			// TODO Add Javascript code to add input fields contents to new elements urls
 			}
 		}
 		elseif ($type == 'password')
 		{
 			// If prefix is 'search_', field is used as a filter, we use a common text field.
-			$out='<input type="'.($keyprefix=='search_'?'text':'password').'" class="flat '.$morecss.'" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam?$moreparam:'').'>';
+			$out = '<input type="'.($keyprefix == 'search_' ? 'text' : 'password').'" class="flat '.$morecss.'" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam ? $moreparam : '').'>';
 		}
 		elseif ($type == 'array')
 		{
 			$newval = $val;
 			$newval['type'] = 'varchar(256)';
 
-			$out='';
+			$out = '';
 
 			$inputs = array();
-			if(! empty($value)) {
-				foreach($value as $option) {
-					$out.= '<span><a class="'.dol_escape_htmltag($keyprefix.$key.$keysuffix).'_del" href="javascript:;"><span class="fa fa-minus-circle valignmiddle"></span></a> ';
-					$out.= $this->showInputField($newval, $keyprefix.$key.$keysuffix.'[]', $option, $moreparam, '', '', $showsize).'<br></span>';
+			if (!empty($value)) {
+				foreach ($value as $option) {
+					$out .= '<span><a class="'.dol_escape_htmltag($keyprefix.$key.$keysuffix).'_del" href="javascript:;"><span class="fa fa-minus-circle valignmiddle"></span></a> ';
+					$out .= $this->showInputField($newval, $keyprefix.$key.$keysuffix.'[]', $option, $moreparam, '', '', $showsize).'<br></span>';
 				}
 			}
 
-			$out.= '<a id="'.dol_escape_htmltag($keyprefix.$key.$keysuffix).'_add" href="javascript:;"><span class="fa fa-plus-circle valignmiddle"></span></a>';
+			$out .= '<a id="'.dol_escape_htmltag($keyprefix.$key.$keysuffix).'_add" href="javascript:;"><span class="fa fa-plus-circle valignmiddle"></span></a>';
 
 			$newInput = '<span><a class="'.dol_escape_htmltag($keyprefix.$key.$keysuffix).'_del" href="javascript:;"><span class="fa fa-minus-circle valignmiddle"></span></a> ';
-			$newInput.= $this->showInputField($newval, $keyprefix.$key.$keysuffix.'[]', '', $moreparam, '', '', $showsize).'<br></span>';
+			$newInput .= $this->showInputField($newval, $keyprefix.$key.$keysuffix.'[]', '', $moreparam, '', '', $showsize).'<br></span>';
 
-			if(! empty($conf->use_javascript_ajax)) {
-				$out.= '
+			if (!empty($conf->use_javascript_ajax)) {
+				$out .= '
 					<script type="text/javascript">
 					$(document).ready(function() {
 						$("a#'.dol_escape_js($keyprefix.$key.$keysuffix).'_add").click(function() {
@@ -5883,7 +5883,7 @@ 
 			}
 		}
 		if (!empty($hidden)) {
-			$out='<input type="hidden" value="'.$value.'" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'"/>';
+			$out = '<input type="hidden" value="'.$value.'" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'"/>';
 		}
 		/* Add comments
 		 if ($type == 'date') $out.=' (YYYY-MM-DD)';
@@ -5905,14 +5905,14 @@ 
 	 * @param  mixed   $showsize       Value for css to define size. May also be a numeric.
 	 * @return string
 	 */
-	function showOutputField($val, $key, $value, $moreparam='', $keysuffix='', $keyprefix='', $showsize=0)
+	function showOutputField($val, $key, $value, $moreparam = '', $keysuffix = '', $keyprefix = '', $showsize = 0)
 	{
-		global $conf,$langs,$form;
+		global $conf, $langs, $form;
 
-		if (! is_object($form))
+		if (!is_object($form))
 		{
 			require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
-			$form=new Form($this->db);
+			$form = new Form($this->db);
 		}
 
 		$objectid = $this->id;
@@ -5923,28 +5923,28 @@ 
 		// Convert var to be able to share same code than showOutputField of extrafields
 		if (preg_match('/varchar\((\d+)\)/', $type, $reg))
 		{
-			$type = 'varchar';		// convert varchar(xx) int varchar
+			$type = 'varchar'; // convert varchar(xx) int varchar
 			$size = $reg[1];
 		}
-		elseif (preg_match('/varchar/', $type)) $type = 'varchar';		// convert varchar(xx) int varchar
-		if (is_array($val['arrayofkeyval'])) $type='select';
-		if (preg_match('/^integer:(.*):(.*)/i', $val['type'], $reg)) $type='link';
+		elseif (preg_match('/varchar/', $type)) $type = 'varchar'; // convert varchar(xx) int varchar
+		if (is_array($val['arrayofkeyval'])) $type = 'select';
+		if (preg_match('/^integer:(.*):(.*)/i', $val['type'], $reg)) $type = 'link';
 
-		$default=$val['default'];
-		$computed=$val['computed'];
-		$unique=$val['unique'];
-		$required=$val['required'];
-		$param=$val['param'];
+		$default = $val['default'];
+		$computed = $val['computed'];
+		$unique = $val['unique'];
+		$required = $val['required'];
+		$param = $val['param'];
 		if (is_array($val['arrayofkeyval'])) $param['options'] = $val['arrayofkeyval'];
 		if (preg_match('/^integer:(.*):(.*)/i', $val['type'], $reg))
 		{
-			$type='link';
-			$param['options']=array($reg[1].':'.$reg[2]=>$reg[1].':'.$reg[2]);
+			$type = 'link';
+			$param['options'] = array($reg[1].':'.$reg[2]=>$reg[1].':'.$reg[2]);
 		}
-		$langfile=$val['langfile'];
-		$list=$val['list'];
-		$help=$val['help'];
-		$hidden=(($val['visible'] == 0) ? 1 : 0);			// If zero, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
+		$langfile = $val['langfile'];
+		$list = $val['list'];
+		$help = $val['help'];
+		$hidden = (($val['visible'] == 0) ? 1 : 0); // If zero, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
 
 		if ($hidden) return '';
 
@@ -5968,18 +5968,18 @@ 
 				//$showsize=19;
 				$showsize = 'minwidth200imp';
 			}
-			elseif (in_array($type,array('int','double','price')))
+			elseif (in_array($type, array('int', 'double', 'price')))
 			{
 				//$showsize=10;
 				$showsize = 'maxwidth75';
 			}
 			elseif ($type == 'url')
 			{
-				$showsize='minwidth400';
+				$showsize = 'minwidth400';
 			}
 			elseif ($type == 'boolean')
 			{
-				$showsize='';
+				$showsize = '';
 			}
 			else
 			{
@@ -6000,90 +6000,90 @@ 
 		}
 
 		// Format output value differently according to properties of field
-		if ($key == 'ref' && method_exists($this, 'getNomUrl')) $value=$this->getNomUrl(1, '', 0, '', 1);
-		elseif ($key == 'status' && method_exists($this, 'getLibStatut')) $value=$this->getLibStatut(3);
+		if ($key == 'ref' && method_exists($this, 'getNomUrl')) $value = $this->getNomUrl(1, '', 0, '', 1);
+		elseif ($key == 'status' && method_exists($this, 'getLibStatut')) $value = $this->getLibStatut(3);
 		elseif ($type == 'date')
 		{
-			if(! empty($value)) {
-				$value=dol_print_date($value,'day');
+			if (!empty($value)) {
+				$value = dol_print_date($value, 'day');
 			} else {
-				$value='';
+				$value = '';
 			}
 		}
 		elseif ($type == 'datetime')
 		{
-			if(! empty($value)) {
-				$value=dol_print_date($value,'dayhour');
+			if (!empty($value)) {
+				$value = dol_print_date($value, 'dayhour');
 			} else {
-				$value='';
+				$value = '';
 			}
 		}
 		elseif ($type == 'double')
 		{
 			if (!empty($value)) {
-				$value=price($value);
+				$value = price($value);
 			}
 		}
 		elseif ($type == 'boolean')
 		{
-			$checked='';
+			$checked = '';
 			if (!empty($value)) {
-				$checked=' checked ';
+				$checked = ' checked ';
 			}
-			$value='<input type="checkbox" '.$checked.' '.($moreparam?$moreparam:'').' readonly disabled>';
+			$value = '<input type="checkbox" '.$checked.' '.($moreparam ? $moreparam : '').' readonly disabled>';
 		}
 		elseif ($type == 'mail')
 		{
-			$value=dol_print_email($value,0,0,0,64,1,1);
+			$value = dol_print_email($value, 0, 0, 0, 64, 1, 1);
 		}
 		elseif ($type == 'url')
 		{
-			$value=dol_print_url($value,'_blank',32,1);
+			$value = dol_print_url($value, '_blank', 32, 1);
 		}
 		elseif ($type == 'phone')
 		{
-			$value=dol_print_phone($value, '', 0, 0, '', '&nbsp;', 1);
+			$value = dol_print_phone($value, '', 0, 0, '', '&nbsp;', 1);
 		}
 		elseif ($type == 'price')
 		{
-			$value=price($value,0,$langs,0,0,-1,$conf->currency);
+			$value = price($value, 0, $langs, 0, 0, -1, $conf->currency);
 		}
 		elseif ($type == 'select')
 		{
-			$value=$param['options'][$value];
+			$value = $param['options'][$value];
 		}
 		elseif ($type == 'sellist')
 		{
-			$param_list=array_keys($param['options']);
+			$param_list = array_keys($param['options']);
 			$InfoFieldList = explode(":", $param_list[0]);
 
-			$selectkey="rowid";
-			$keyList='rowid';
+			$selectkey = "rowid";
+			$keyList = 'rowid';
 
-			if (count($InfoFieldList)>=3)
+			if (count($InfoFieldList) >= 3)
 			{
 				$selectkey = $InfoFieldList[2];
-				$keyList=$InfoFieldList[2].' as rowid';
+				$keyList = $InfoFieldList[2].' as rowid';
 			}
 
-			$fields_label = explode('|',$InfoFieldList[1]);
-			if(is_array($fields_label)) {
-				$keyList .=', ';
+			$fields_label = explode('|', $InfoFieldList[1]);
+			if (is_array($fields_label)) {
+				$keyList .= ', ';
 				$keyList .= implode(', ', $fields_label);
 			}
 
 			$sql = 'SELECT '.$keyList;
-			$sql.= ' FROM '.MAIN_DB_PREFIX .$InfoFieldList[0];
-			if (strpos($InfoFieldList[4], 'extra')!==false)
+			$sql .= ' FROM '.MAIN_DB_PREFIX.$InfoFieldList[0];
+			if (strpos($InfoFieldList[4], 'extra') !== false)
 			{
-				$sql.= ' as main';
+				$sql .= ' as main';
 			}
-			if ($selectkey=='rowid' && empty($value)) {
-				$sql.= " WHERE ".$selectkey."=0";
-			} elseif ($selectkey=='rowid') {
-				$sql.= " WHERE ".$selectkey."=".$this->db->escape($value);
-			}else {
-				$sql.= " WHERE ".$selectkey."='".$this->db->escape($value)."'";
+			if ($selectkey == 'rowid' && empty($value)) {
+				$sql .= " WHERE ".$selectkey."=0";
+			} elseif ($selectkey == 'rowid') {
+				$sql .= " WHERE ".$selectkey."=".$this->db->escape($value);
+			} else {
+				$sql .= " WHERE ".$selectkey."='".$this->db->escape($value)."'";
 			}
 
 			//$sql.= ' AND entity = '.$conf->entity;
@@ -6092,38 +6092,38 @@ 
 			$resql = $this->db->query($sql);
 			if ($resql)
 			{
-				$value='';	// value was used, so now we reste it to use it to build final output
+				$value = ''; // value was used, so now we reste it to use it to build final output
 
 				$obj = $this->db->fetch_object($resql);
 
 				// Several field into label (eq table:code|libelle:rowid)
-				$fields_label = explode('|',$InfoFieldList[1]);
+				$fields_label = explode('|', $InfoFieldList[1]);
 
-				if(is_array($fields_label) && count($fields_label)>1)
+				if (is_array($fields_label) && count($fields_label) > 1)
 				{
 					foreach ($fields_label as $field_toshow)
 					{
-						$translabel='';
+						$translabel = '';
 						if (!empty($obj->$field_toshow)) {
-							$translabel=$langs->trans($obj->$field_toshow);
+							$translabel = $langs->trans($obj->$field_toshow);
 						}
-						if ($translabel!=$field_toshow) {
-							$value.=dol_trunc($translabel,18).' ';
-						}else {
-							$value.=$obj->$field_toshow.' ';
+						if ($translabel != $field_toshow) {
+							$value .= dol_trunc($translabel, 18).' ';
+						} else {
+							$value .= $obj->$field_toshow.' ';
 						}
 					}
 				}
 				else
 				{
-					$translabel='';
+					$translabel = '';
 					if (!empty($obj->{$InfoFieldList[1]})) {
-						$translabel=$langs->trans($obj->{$InfoFieldList[1]});
+						$translabel = $langs->trans($obj->{$InfoFieldList[1]});
 					}
-					if ($translabel!=$obj->{$InfoFieldList[1]}) {
-						$value=dol_trunc($translabel,18);
-					}else {
-						$value=$obj->{$InfoFieldList[1]};
+					if ($translabel != $obj->{$InfoFieldList[1]}) {
+						$value = dol_trunc($translabel, 18);
+					} else {
+						$value = $obj->{$InfoFieldList[1]};
 					}
 				}
 			}
@@ -6131,18 +6131,18 @@ 
 		}
 		elseif ($type == 'radio')
 		{
-			$value=$param['options'][$value];
+			$value = $param['options'][$value];
 		}
 		elseif ($type == 'checkbox')
 		{
-			$value_arr=explode(',',$value);
-			$value='';
-			if (is_array($value_arr) && count($value_arr)>0)
+			$value_arr = explode(',', $value);
+			$value = '';
+			if (is_array($value_arr) && count($value_arr) > 0)
 			{
 				foreach ($value_arr as $keyval=>$valueval) {
-					$toprint[]='<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$param['options'][$valueval].'</li>';
+					$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$param['options'][$valueval].'</li>';
 				}
-				$value='<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';
+				$value = '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';
 			}
 		}
 		elseif ($type == 'chkbxlst')
@@ -6157,7 +6157,7 @@ 
 
 			if (count($InfoFieldList) >= 3) {
 				$selectkey = $InfoFieldList[2];
-				$keyList = $InfoFieldList[2] . ' as rowid';
+				$keyList = $InfoFieldList[2].' as rowid';
 			}
 
 			$fields_label = explode('|', $InfoFieldList[1]);
@@ -6166,75 +6166,75 @@ 
 				$keyList .= implode(', ', $fields_label);
 			}
 
-			$sql = 'SELECT ' . $keyList;
-			$sql .= ' FROM ' . MAIN_DB_PREFIX . $InfoFieldList[0];
+			$sql = 'SELECT '.$keyList;
+			$sql .= ' FROM '.MAIN_DB_PREFIX.$InfoFieldList[0];
 			if (strpos($InfoFieldList[4], 'extra') !== false) {
 				$sql .= ' as main';
 			}
 			// $sql.= " WHERE ".$selectkey."='".$this->db->escape($value)."'";
 			// $sql.= ' AND entity = '.$conf->entity;
 
-			dol_syslog(get_class($this) . ':showOutputField:$type=chkbxlst',LOG_DEBUG);
+			dol_syslog(get_class($this).':showOutputField:$type=chkbxlst', LOG_DEBUG);
 			$resql = $this->db->query($sql);
 			if ($resql) {
 				$value = ''; // value was used, so now we reste it to use it to build final output
-				$toprint=array();
-				while ( $obj = $this->db->fetch_object($resql) ) {
+				$toprint = array();
+				while ($obj = $this->db->fetch_object($resql)) {
 
 					// Several field into label (eq table:code|libelle:rowid)
 					$fields_label = explode('|', $InfoFieldList[1]);
 					if (is_array($value_arr) && in_array($obj->rowid, $value_arr)) {
 						if (is_array($fields_label) && count($fields_label) > 1) {
-							foreach ( $fields_label as $field_toshow ) {
+							foreach ($fields_label as $field_toshow) {
 								$translabel = '';
-								if (! empty($obj->$field_toshow)) {
+								if (!empty($obj->$field_toshow)) {
 									$translabel = $langs->trans($obj->$field_toshow);
 								}
 								if ($translabel != $field_toshow) {
-									$toprint[]='<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.dol_trunc($translabel, 18).'</li>';
+									$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.dol_trunc($translabel, 18).'</li>';
 								} else {
-									$toprint[]='<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$obj->$field_toshow.'</li>';
+									$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$obj->$field_toshow.'</li>';
 								}
 							}
 						} else {
 							$translabel = '';
-							if (! empty($obj->{$InfoFieldList[1]})) {
+							if (!empty($obj->{$InfoFieldList[1]})) {
 								$translabel = $langs->trans($obj->{$InfoFieldList[1]});
 							}
 							if ($translabel != $obj->{$InfoFieldList[1]}) {
-								$toprint[]='<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.dol_trunc($translabel, 18).'</li>';
+								$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.dol_trunc($translabel, 18).'</li>';
 							} else {
-								$toprint[]='<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$obj->{$InfoFieldList[1]}.'</li>';
+								$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$obj->{$InfoFieldList[1]}.'</li>';
 							}
 						}
 					}
 				}
-				$value='<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';
+				$value = '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';
 			} else {
-				dol_syslog(get_class($this) . '::showOutputField error ' . $this->db->lasterror(), LOG_WARNING);
+				dol_syslog(get_class($this).'::showOutputField error '.$this->db->lasterror(), LOG_WARNING);
 			}
 		}
 		elseif ($type == 'link')
 		{
-			$out='';
+			$out = '';
 
 			// only if something to display (perf)
 			if ($value)
 			{
-				$param_list=array_keys($param['options']);				// $param_list='ObjectName:classPath'
+				$param_list = array_keys($param['options']); // $param_list='ObjectName:classPath'
 
 				$InfoFieldList = explode(":", $param_list[0]);
-				$classname=$InfoFieldList[0];
-				$classpath=$InfoFieldList[1];
-				$getnomurlparam=(empty($InfoFieldList[2]) ? 3 : $InfoFieldList[2]);
-				if (! empty($classpath))
+				$classname = $InfoFieldList[0];
+				$classpath = $InfoFieldList[1];
+				$getnomurlparam = (empty($InfoFieldList[2]) ? 3 : $InfoFieldList[2]);
+				if (!empty($classpath))
 				{
 					dol_include_once($InfoFieldList[1]);
 					if ($classname && class_exists($classname))
 					{
 						$object = new $classname($this->db);
 						$object->fetch($value);
-						$value=$object->getNomUrl($getnomurlparam);
+						$value = $object->getNomUrl($getnomurlparam);
 					}
 				}
 				else
@@ -6243,15 +6243,15 @@ 
 					return 'Error bad setup of extrafield';
 				}
 			}
-			else $value='';
+			else $value = '';
 		}
 		elseif ($type == 'text' || $type == 'html')
 		{
-			$value=dol_htmlentitiesbr($value);
+			$value = dol_htmlentitiesbr($value);
 		}
 		elseif ($type == 'password')
 		{
-			$value=preg_replace('/./i','*',$value);
+			$value = preg_replace('/./i', '*', $value);
 		}
 		elseif ($type == 'array')
 		{
@@ -6259,7 +6259,7 @@ 
 		}
 
 		//print $type.'-'.$size;
-		$out=$value;
+		$out = $value;
 
 		return $out;
 	}
@@ -6276,11 +6276,11 @@ 
 	 * @param	string		$onetrtd		All fields in same tr td
 	 * @return 	string
 	 */
-	function showOptionals($extrafields, $mode='view', $params=null, $keysuffix='', $keyprefix='', $onetrtd=0)
+	function showOptionals($extrafields, $mode = 'view', $params = null, $keysuffix = '', $keyprefix = '', $onetrtd = 0)
 	{
 		global $db, $conf, $langs, $action, $form;
 
-		if (! is_object($form)) $form=new Form($db);
+		if (!is_object($form)) $form = new Form($db);
 
 		$out = '';
 
@@ -6291,10 +6291,10 @@ 
 			$out .= "\n";
 
 			$e = 0;
-			foreach($extrafields->attributes[$this->table_element]['label'] as $key=>$label)
+			foreach ($extrafields->attributes[$this->table_element]['label'] as $key=>$label)
 			{
 				// Show only the key field in params
-				if (is_array($params) && array_key_exists('onlykey',$params) && $key != $params['onlykey']) continue;
+				if (is_array($params) && array_key_exists('onlykey', $params) && $key != $params['onlykey']) continue;
 
 				$enabled = 1;
 				if ($enabled && isset($extrafields->attributes[$this->table_element]['list'][$key]))
@@ -6308,25 +6308,25 @@ 
 					$perms = dol_eval($extrafields->attributes[$this->table_element]['perms'][$key], 1);
 				}
 
-				if (($mode == 'create' || $mode == 'edit') && abs($enabled) != 1 && abs($enabled) != 3) continue;	// <> -1 and <> 1 and <> 3 = not visible on forms, only on list
+				if (($mode == 'create' || $mode == 'edit') && abs($enabled) != 1 && abs($enabled) != 3) continue; // <> -1 and <> 1 and <> 3 = not visible on forms, only on list
 				if (empty($perms)) continue;
 
 				// Load language if required
-				if (! empty($extrafields->attributes[$this->table_element]['langfile'][$key])) $langs->load($extrafields->attributes[$this->table_element]['langfile'][$key]);
+				if (!empty($extrafields->attributes[$this->table_element]['langfile'][$key])) $langs->load($extrafields->attributes[$this->table_element]['langfile'][$key]);
 
-				$colspan='3';
-				if (is_array($params) && count($params)>0) {
-					if (array_key_exists('colspan',$params)) {
-						$colspan=$params['colspan'];
+				$colspan = '3';
+				if (is_array($params) && count($params) > 0) {
+					if (array_key_exists('colspan', $params)) {
+						$colspan = $params['colspan'];
 					}
 				}
 
-				switch($mode) {
+				switch ($mode) {
 					case "view":
-						$value=$this->array_options["options_".$key.$keysuffix];
+						$value = $this->array_options["options_".$key.$keysuffix];
 						break;
 					case "edit":
-						$getposttemp = GETPOST($keyprefix.'options_'.$key.$keysuffix, 'none');				// GETPOST can get value from GET, POST or setup of default values.
+						$getposttemp = GETPOST($keyprefix.'options_'.$key.$keysuffix, 'none'); // GETPOST can get value from GET, POST or setup of default values.
 						// GETPOST("options_" . $key) can be 'abc' or array(0=>'abc')
 						if (is_array($getposttemp) || $getposttemp != '' || GETPOSTISSET($keyprefix.'options_'.$key.$keysuffix))
 						{
@@ -6337,7 +6337,7 @@ 
 								$value = $getposttemp;
 							}
 						} else {
-							$value = $this->array_options["options_" . $key];			// No GET, no POST, no default value, so we take value of object.
+							$value = $this->array_options["options_".$key]; // No GET, no POST, no default value, so we take value of object.
 						}
 						//var_dump($keyprefix.' - '.$key.' - '.$keysuffix.' - '.$keyprefix.'options_'.$key.$keysuffix.' - '.$this->array_options["options_".$key.$keysuffix].' - '.$getposttemp.' - '.$value);
 						break;
@@ -6349,11 +6349,11 @@ 
 				}
 				else
 				{
-					$csstyle='';
-					$class=(!empty($extrafields->attributes[$this->table_element]['hidden'][$key]) ? 'hideobject ' : '');
-					if (is_array($params) && count($params)>0) {
-						if (array_key_exists('style',$params)) {
-							$csstyle=$params['style'];
+					$csstyle = '';
+					$class = (!empty($extrafields->attributes[$this->table_element]['hidden'][$key]) ? 'hideobject ' : '');
+					if (is_array($params) && count($params) > 0) {
+						if (array_key_exists('style', $params)) {
+							$csstyle = $params['style'];
 						}
 					}
 
@@ -6366,43 +6366,43 @@ 
 
 					$out .= '<tr id="'.$html_id.'" '.$csstyle.' class="'.$class.$this->element.'_extras_'.$key.'" '.$domData.' >';
 
-					if (! empty($conf->global->MAIN_EXTRAFIELDS_USE_TWO_COLUMS) && ($e % 2) == 0)
+					if (!empty($conf->global->MAIN_EXTRAFIELDS_USE_TWO_COLUMS) && ($e % 2) == 0)
 					{
-						if (! empty($conf->global->MAIN_EXTRAFIELDS_USE_TWO_COLUMS) && ($e % 2) == 0) { $colspan='0'; }
+						if (!empty($conf->global->MAIN_EXTRAFIELDS_USE_TWO_COLUMS) && ($e % 2) == 0) { $colspan = '0'; }
 					}
 
 					if ($action == 'selectlines') { $colspan++; }
 
 					// Convert date into timestamp format (value in memory must be a timestamp)
-					if (in_array($extrafields->attributes[$this->table_element]['type'][$key],array('date','datetime')))
+					if (in_array($extrafields->attributes[$this->table_element]['type'][$key], array('date', 'datetime')))
 					{
-						$datenotinstring = $this->array_options['options_' . $key];
-						if (! is_numeric($this->array_options['options_' . $key]))	// For backward compatibility
+						$datenotinstring = $this->array_options['options_'.$key];
+						if (!is_numeric($this->array_options['options_'.$key]))	// For backward compatibility
 						{
 							$datenotinstring = $this->db->jdate($datenotinstring);
 						}
-						$value = GETPOSTISSET($keyprefix.'options_'.$key.$keysuffix)?dol_mktime(GETPOST($keyprefix.'options_'.$key.$keysuffix."hour", 'int', 3), GETPOST($keyprefix.'options_'.$key.$keysuffix."min",'int',3), 0, GETPOST($keyprefix.'options_'.$key.$keysuffix."month",'int',3), GETPOST($keyprefix.'options_'.$key.$keysuffix."day",'int',3), GETPOST($keyprefix.'options_'.$key.$keysuffix."year",'int',3)):$datenotinstring;
+						$value = GETPOSTISSET($keyprefix.'options_'.$key.$keysuffix) ?dol_mktime(GETPOST($keyprefix.'options_'.$key.$keysuffix."hour", 'int', 3), GETPOST($keyprefix.'options_'.$key.$keysuffix."min", 'int', 3), 0, GETPOST($keyprefix.'options_'.$key.$keysuffix."month", 'int', 3), GETPOST($keyprefix.'options_'.$key.$keysuffix."day", 'int', 3), GETPOST($keyprefix.'options_'.$key.$keysuffix."year", 'int', 3)) : $datenotinstring;
 					}
 					// Convert float submited string into real php numeric (value in memory must be a php numeric)
-					if (in_array($extrafields->attributes[$this->table_element]['type'][$key],array('price','double')))
+					if (in_array($extrafields->attributes[$this->table_element]['type'][$key], array('price', 'double')))
 					{
-						$value = GETPOSTISSET($keyprefix.'options_'.$key.$keysuffix)?price2num(GETPOST($keyprefix.'options_'.$key.$keysuffix, 'alpha', 3)):$this->array_options['options_'.$key];
+						$value = GETPOSTISSET($keyprefix.'options_'.$key.$keysuffix) ?price2num(GETPOST($keyprefix.'options_'.$key.$keysuffix, 'alpha', 3)) : $this->array_options['options_'.$key];
 					}
 
 					$labeltoshow = $langs->trans($label);
 
 					$out .= '<td class="titlefield';
-					if (GETPOST('action','none') == 'create') $out.='create';
-					if ($mode != 'view' && ! empty($extrafields->attributes[$this->table_element]['required'][$key])) $out .= ' fieldrequired';
+					if (GETPOST('action', 'none') == 'create') $out .= 'create';
+					if ($mode != 'view' && !empty($extrafields->attributes[$this->table_element]['required'][$key])) $out .= ' fieldrequired';
 					$out .= '">';
-					if (! empty($extrafields->attributes[$object->table_element]['help'][$key])) $out .= $form->textwithpicto($labeltoshow, $extrafields->attributes[$object->table_element]['help'][$key]);
+					if (!empty($extrafields->attributes[$object->table_element]['help'][$key])) $out .= $form->textwithpicto($labeltoshow, $extrafields->attributes[$object->table_element]['help'][$key]);
 					else $out .= $labeltoshow;
 					$out .= '</td>';
 
 					$html_id = !empty($this->id) ? $this->element.'_extras_'.$key.'_'.$this->id : '';
-					$out .='<td id="'.$html_id.'" class="'.$this->element.'_extras_'.$key.'" '.($colspan?' colspan="'.$colspan.'"':'').'>';
+					$out .= '<td id="'.$html_id.'" class="'.$this->element.'_extras_'.$key.'" '.($colspan ? ' colspan="'.$colspan.'"' : '').'>';
 
-					switch($mode) {
+					switch ($mode) {
 						case "view":
 							$out .= $extrafields->showOutputField($key, $value);
 							break;
@@ -6413,14 +6413,14 @@ 
 
 					$out .= '</td>';
 
-					if (! empty($conf->global->MAIN_EXTRAFIELDS_USE_TWO_COLUMS) && (($e % 2) == 1)) $out .= '</tr>';
+					if (!empty($conf->global->MAIN_EXTRAFIELDS_USE_TWO_COLUMS) && (($e % 2) == 1)) $out .= '</tr>';
 					else $out .= '</tr>';
 					$e++;
 				}
 			}
 			$out .= "\n";
 			// Add code to manage list depending on others
-			if (! empty($conf->use_javascript_ajax)) {
+			if (!empty($conf->use_javascript_ajax)) {
 				$out .= '
 				<script type="text/javascript">
 				    jQuery(document).ready(function() {
@@ -6466,7 +6466,7 @@ 
 		global $user;
 
 		$element = $this->element;
-		if ($element == 'facturerec') $element='facture';
+		if ($element == 'facturerec') $element = 'facture';
 
 		return $user->rights->{$element};
 	}
@@ -6483,15 +6483,15 @@ 
 	 * @param  int         $ignoreerrors  Ignore errors. Return true even if errors. We need this when replacement can fails like for categories (categorie of old thirdparty may already exists on new one)
 	 * @return bool						  True if success, False if error
 	 */
-	public static function commonReplaceThirdparty(DoliDB $db, $origin_id, $dest_id, array $tables, $ignoreerrors=0)
+	public static function commonReplaceThirdparty(DoliDB $db, $origin_id, $dest_id, array $tables, $ignoreerrors = 0)
 	{
 		foreach ($tables as $table)
 		{
 			$sql = 'UPDATE '.MAIN_DB_PREFIX.$table.' SET fk_soc = '.$dest_id.' WHERE fk_soc = '.$origin_id;
 
-			if (! $db->query($sql))
+			if (!$db->query($sql))
 			{
-				if ($ignoreerrors) return true;		// TODO Not enough. If there is A-B on kept thirdarty and B-C on old one, we must get A-B-C after merge. Not A-B.
+				if ($ignoreerrors) return true; // TODO Not enough. If there is A-B on kept thirdarty and B-C on old one, we must get A-B-C after merge. Not A-B.
 				//$this->errors = $db->lasterror();
 				return false;
 			}
@@ -6525,7 +6525,7 @@ 
 		else
 		{
 			// Get cost price for margin calculation
-			if (! empty($fk_product))
+			if (!empty($fk_product))
 			{
 				if (isset($conf->global->MARGIN_TYPE) && $conf->global->MARGIN_TYPE == 'costprice')
 				{
@@ -6562,7 +6562,7 @@ 
 					}
 				}
 
-				if (empty($buyPrice) && isset($conf->global->MARGIN_TYPE) && in_array($conf->global->MARGIN_TYPE, array('1','pmp','costprice')))
+				if (empty($buyPrice) && isset($conf->global->MARGIN_TYPE) && in_array($conf->global->MARGIN_TYPE, array('1', 'pmp', 'costprice')))
 				{
 					require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
 					$productFournisseur = new ProductFournisseur($this->db);
@@ -6599,18 +6599,18 @@ 
 	 *  @param		int		$usesharelink	Use the public shared link of image (if not available, the 'nophoto' image will be shown instead)
 	 *  @return     string					Html code to show photo. Number of photos shown is saved in this->nbphoto
 	 */
-	function show_photos($modulepart, $sdir, $size=0, $nbmax=0, $nbbyrow=5, $showfilename=0, $showaction=0, $maxHeight=120, $maxWidth=160, $nolink=0, $notitle=0, $usesharelink=0)
+	function show_photos($modulepart, $sdir, $size = 0, $nbmax = 0, $nbbyrow = 5, $showfilename = 0, $showaction = 0, $maxHeight = 120, $maxWidth = 160, $nolink = 0, $notitle = 0, $usesharelink = 0)
 	{
         // phpcs:enable
-		global $conf,$user,$langs;
+		global $conf, $user, $langs;
 
-		include_once DOL_DOCUMENT_ROOT .'/core/lib/files.lib.php';
-		include_once DOL_DOCUMENT_ROOT .'/core/lib/images.lib.php';
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
 
-		$sortfield='position_name';
-		$sortorder='asc';
+		$sortfield = 'position_name';
+		$sortorder = 'asc';
 
-		$dir = $sdir . '/';
+		$dir = $sdir.'/';
 		$pdir = '/';
 		if ($modulepart == 'ticket')
 		{
@@ -6624,28 +6624,28 @@ 
 		}
 
 		// For backward compatibility
-		if ($modulepart == 'product' && ! empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))
+		if ($modulepart == 'product' && !empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))
 		{
-			$dir = $sdir . '/'. get_exdir($this->id,2,0,0,$this,$modulepart) . $this->id ."/photos/";
-			$pdir = '/' . get_exdir($this->id,2,0,0,$this,$modulepart) . $this->id ."/photos/";
+			$dir = $sdir.'/'.get_exdir($this->id, 2, 0, 0, $this, $modulepart).$this->id."/photos/";
+			$pdir = '/'.get_exdir($this->id, 2, 0, 0, $this, $modulepart).$this->id."/photos/";
 		}
 
 		// Defined relative dir to DOL_DATA_ROOT
 		$relativedir = '';
 		if ($dir)
 		{
-			$relativedir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $dir);
-			$relativedir = preg_replace('/^[\\/]/','',$relativedir);
-			$relativedir = preg_replace('/[\\/]$/','',$relativedir);
+			$relativedir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT, '/').'/', '', $dir);
+			$relativedir = preg_replace('/^[\\/]/', '', $relativedir);
+			$relativedir = preg_replace('/[\\/]$/', '', $relativedir);
 		}
 
 		$dirthumb = $dir.'thumbs/';
 		$pdirthumb = $pdir.'thumbs/';
 
-		$return ='<!-- Photo -->'."\n";
-		$nbphoto=0;
+		$return = '<!-- Photo -->'."\n";
+		$nbphoto = 0;
 
-		$filearray=dol_dir_list($dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
+		$filearray = dol_dir_list($dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
 
 		/*if (! empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))    // For backward compatiblity, we scan also old dirs
 		 {
@@ -6659,12 +6659,12 @@ 
 		{
 			if ($sortfield && $sortorder)
 			{
-				$filearray=dol_sort_array($filearray, $sortfield, $sortorder);
+				$filearray = dol_sort_array($filearray, $sortfield, $sortorder);
 			}
 
-			foreach($filearray as $key => $val)
+			foreach ($filearray as $key => $val)
 			{
-				$photo='';
+				$photo = '';
 				$file = $val['name'];
 
 				//if (! utf8_check($file)) $file=utf8_encode($file);	// To be sure file is stored in UTF8 in memory
@@ -6679,36 +6679,36 @@ 
 					if ($size == 1 || $size == 'small') {   // Format vignette
 
 						// Find name of thumb file
-						$photo_vignette=basename(getImageFileNameForSize($dir.$file, '_small'));
-						if (! dol_is_file($dirthumb.$photo_vignette)) $photo_vignette='';
+						$photo_vignette = basename(getImageFileNameForSize($dir.$file, '_small'));
+						if (!dol_is_file($dirthumb.$photo_vignette)) $photo_vignette = '';
 
 						// Get filesize of original file
-						$imgarray=dol_getImageSize($dir.$photo);
+						$imgarray = dol_getImageSize($dir.$photo);
 
 						if ($nbbyrow > 0)
 						{
-							if ($nbphoto == 1) $return.= '<table width="100%" valign="top" align="center" border="0" cellpadding="2" cellspacing="2">';
+							if ($nbphoto == 1) $return .= '<table width="100%" valign="top" align="center" border="0" cellpadding="2" cellspacing="2">';
 
-							if ($nbphoto % $nbbyrow == 1) $return.= '<tr align=center valign=middle border=1>';
-							$return.= '<td width="'.ceil(100/$nbbyrow).'%" class="photo">';
+							if ($nbphoto % $nbbyrow == 1) $return .= '<tr align=center valign=middle border=1>';
+							$return .= '<td width="'.ceil(100 / $nbbyrow).'%" class="photo">';
 						}
 						else if ($nbbyrow < 0) $return .= '<div class="inline-block">';
 
-						$return.= "\n";
+						$return .= "\n";
 
-						$relativefile=preg_replace('/^\//', '', $pdir.$photo);
+						$relativefile = preg_replace('/^\//', '', $pdir.$photo);
 						if (empty($nolink))
 						{
-							$urladvanced=getAdvancedPreviewUrl($modulepart, $relativefile, 0, 'entity='.$this->entity);
-							if ($urladvanced) $return.='<a href="'.$urladvanced.'">';
-							else $return.= '<a href="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdir.$photo).'" class="aphoto" target="_blank">';
+							$urladvanced = getAdvancedPreviewUrl($modulepart, $relativefile, 0, 'entity='.$this->entity);
+							if ($urladvanced) $return .= '<a href="'.$urladvanced.'">';
+							else $return .= '<a href="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdir.$photo).'" class="aphoto" target="_blank">';
 						}
 
 						// Show image (width height=$maxHeight)
 						// Si fichier vignette disponible et image source trop grande, on utilise la vignette, sinon on utilise photo origine
-						$alt=$langs->transnoentitiesnoconv('File').': '.$relativefile;
-						$alt.=' - '.$langs->transnoentitiesnoconv('Size').': '.$imgarray['width'].'x'.$imgarray['height'];
-						if ($notitle) $alt='';
+						$alt = $langs->transnoentitiesnoconv('File').': '.$relativefile;
+						$alt .= ' - '.$langs->transnoentitiesnoconv('Size').': '.$imgarray['width'].'x'.$imgarray['height'];
+						if ($notitle) $alt = '';
 
 						if ($usesharelink)
 						{
@@ -6716,81 +6716,81 @@ 
 							{
 								if (empty($maxHeight) || $photo_vignette && $imgarray['height'] > $maxHeight)
 								{
-									$return.= '<!-- Show original file (thumb not yet available with shared links) -->';
-									$return.= '<img class="photo photowithmargin" border="0" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?hashp='.urlencode($val['share']).'" title="'.dol_escape_htmltag($alt).'">';
+									$return .= '<!-- Show original file (thumb not yet available with shared links) -->';
+									$return .= '<img class="photo photowithmargin" border="0" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?hashp='.urlencode($val['share']).'" title="'.dol_escape_htmltag($alt).'">';
 								}
 								else {
-									$return.= '<!-- Show original file -->';
-									$return.= '<img class="photo photowithmargin" border="0" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?hashp='.urlencode($val['share']).'" title="'.dol_escape_htmltag($alt).'">';
+									$return .= '<!-- Show original file -->';
+									$return .= '<img class="photo photowithmargin" border="0" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?hashp='.urlencode($val['share']).'" title="'.dol_escape_htmltag($alt).'">';
 								}
 							}
 							else
 							{
-								$return.= '<!-- Show nophoto file (because file is not shared) -->';
-								$return.= '<img class="photo photowithmargin" border="0" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/public/theme/common/nophoto.png" title="'.dol_escape_htmltag($alt).'">';
+								$return .= '<!-- Show nophoto file (because file is not shared) -->';
+								$return .= '<img class="photo photowithmargin" border="0" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/public/theme/common/nophoto.png" title="'.dol_escape_htmltag($alt).'">';
 							}
 						}
 						else
 						{
 							if (empty($maxHeight) || $photo_vignette && $imgarray['height'] > $maxHeight)
 							{
-								$return.= '<!-- Show thumb -->';
-								$return.= '<img class="photo photowithmargin" border="0" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdirthumb.$photo_vignette).'" title="'.dol_escape_htmltag($alt).'">';
+								$return .= '<!-- Show thumb -->';
+								$return .= '<img class="photo photowithmargin" border="0" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdirthumb.$photo_vignette).'" title="'.dol_escape_htmltag($alt).'">';
 							}
 							else {
-								$return.= '<!-- Show original file -->';
-								$return.= '<img class="photo photowithmargin" border="0" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdir.$photo).'" title="'.dol_escape_htmltag($alt).'">';
+								$return .= '<!-- Show original file -->';
+								$return .= '<img class="photo photowithmargin" border="0" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdir.$photo).'" title="'.dol_escape_htmltag($alt).'">';
 							}
 						}
 
-						if (empty($nolink)) $return.= '</a>';
-						$return.="\n";
+						if (empty($nolink)) $return .= '</a>';
+						$return .= "\n";
 
-						if ($showfilename) $return.= '<br>'.$viewfilename;
+						if ($showfilename) $return .= '<br>'.$viewfilename;
 						if ($showaction)
 						{
-							$return.= '<br>';
+							$return .= '<br>';
 							// On propose la generation de la vignette si elle n'existe pas et si la taille est superieure aux limites
 							if ($photo_vignette && (image_format_supported($photo) > 0) && ($this->imgWidth > $maxWidth || $this->imgHeight > $maxHeight))
 							{
-								$return.= '<a href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=addthumb&amp;file='.urlencode($pdir.$viewfilename).'">'.img_picto($langs->trans('GenerateThumb'),'refresh').'&nbsp;&nbsp;</a>';
+								$return .= '<a href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=addthumb&amp;file='.urlencode($pdir.$viewfilename).'">'.img_picto($langs->trans('GenerateThumb'), 'refresh').'&nbsp;&nbsp;</a>';
 							}
 							// Special cas for product
 							if ($modulepart == 'product' && ($user->rights->produit->creer || $user->rights->service->creer))
 							{
 								// Link to resize
-								$return.= '<a href="'.DOL_URL_ROOT.'/core/photos_resize.php?modulepart='.urlencode('produit|service').'&id='.$this->id.'&amp;file='.urlencode($pdir.$viewfilename).'" title="'.dol_escape_htmltag($langs->trans("Resize")).'">'.img_picto($langs->trans("Resize"), 'resize', '').'</a> &nbsp; ';
+								$return .= '<a href="'.DOL_URL_ROOT.'/core/photos_resize.php?modulepart='.urlencode('produit|service').'&id='.$this->id.'&amp;file='.urlencode($pdir.$viewfilename).'" title="'.dol_escape_htmltag($langs->trans("Resize")).'">'.img_picto($langs->trans("Resize"), 'resize', '').'</a> &nbsp; ';
 
 								// Link to delete
-								$return.= '<a href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=delete&amp;file='.urlencode($pdir.$viewfilename).'">';
-								$return.= img_delete().'</a>';
+								$return .= '<a href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=delete&amp;file='.urlencode($pdir.$viewfilename).'">';
+								$return .= img_delete().'</a>';
 							}
 						}
-						$return.= "\n";
+						$return .= "\n";
 
 						if ($nbbyrow > 0)
 						{
-							$return.= '</td>';
-							if (($nbphoto % $nbbyrow) == 0) $return.= '</tr>';
+							$return .= '</td>';
+							if (($nbphoto % $nbbyrow) == 0) $return .= '</tr>';
 						}
-						else if ($nbbyrow < 0) $return.='</div>';
+						else if ($nbbyrow < 0) $return .= '</div>';
 					}
 
 					if (empty($size)) {     // Format origine
-						$return.= '<img class="photo photowithmargin" border="0" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdir.$photo).'">';
+						$return .= '<img class="photo photowithmargin" border="0" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdir.$photo).'">';
 
-						if ($showfilename) $return.= '<br>'.$viewfilename;
+						if ($showfilename) $return .= '<br>'.$viewfilename;
 						if ($showaction)
 						{
 							// Special case for product
 							if ($modulepart == 'product' && ($user->rights->produit->creer || $user->rights->service->creer))
 							{
 								// Link to resize
-								$return.= '<a href="'.DOL_URL_ROOT.'/core/photos_resize.php?modulepart='.urlencode('produit|service').'&id='.$this->id.'&amp;file='.urlencode($pdir.$viewfilename).'" title="'.dol_escape_htmltag($langs->trans("Resize")).'">'.img_picto($langs->trans("Resize"), 'resize', '').'</a> &nbsp; ';
+								$return .= '<a href="'.DOL_URL_ROOT.'/core/photos_resize.php?modulepart='.urlencode('produit|service').'&id='.$this->id.'&amp;file='.urlencode($pdir.$viewfilename).'" title="'.dol_escape_htmltag($langs->trans("Resize")).'">'.img_picto($langs->trans("Resize"), 'resize', '').'</a> &nbsp; ';
 
 								// Link to delete
-								$return.= '<a href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=delete&amp;file='.urlencode($pdir.$viewfilename).'">';
-								$return.= img_delete().'</a>';
+								$return .= '<a href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=delete&amp;file='.urlencode($pdir.$viewfilename).'">';
+								$return .= img_delete().'</a>';
 							}
 						}
 					}
@@ -6800,18 +6800,18 @@ 
 				}
 			}
 
-			if ($size==1 || $size=='small')
+			if ($size == 1 || $size == 'small')
 			{
 				if ($nbbyrow > 0)
 				{
 					// Ferme tableau
 					while ($nbphoto % $nbbyrow)
 					{
-						$return.= '<td width="'.ceil(100/$nbbyrow).'%">&nbsp;</td>';
+						$return .= '<td width="'.ceil(100 / $nbbyrow).'%">&nbsp;</td>';
 						$nbphoto++;
 					}
 
-					if ($nbphoto) $return.= '</table>';
+					if ($nbphoto) $return .= '</table>';
 				}
 			}
 		}
@@ -6830,9 +6830,9 @@ 
 	 */
 	protected function isArray($info)
 	{
-		if(is_array($info))
+		if (is_array($info))
 		{
-			if(isset($info['type']) && $info['type']=='array') return true;
+			if (isset($info['type']) && $info['type'] == 'array') return true;
 			else return false;
 		}
 		else return false;
@@ -6846,9 +6846,9 @@ 
 	 */
 	protected function isNull($info)
 	{
-		if(is_array($info))
+		if (is_array($info))
 		{
-			if(isset($info['type']) && $info['type']=='null') return true;
+			if (isset($info['type']) && $info['type'] == 'null') return true;
 			else return false;
 		}
 		else return false;
@@ -6862,7 +6862,7 @@ 
 	 */
 	public function isDate($info)
 	{
-		if(isset($info['type']) && ($info['type']=='date' || $info['type']=='datetime' || $info['type']=='timestamp')) return true;
+		if (isset($info['type']) && ($info['type'] == 'date' || $info['type'] == 'datetime' || $info['type'] == 'timestamp')) return true;
 		else return false;
 	}
 
@@ -6874,9 +6874,9 @@ 
 	 */
 	public function isInt($info)
 	{
-		if(is_array($info))
+		if (is_array($info))
 		{
-			if(isset($info['type']) && ($info['type']=='int' || preg_match('/^integer/i',$info['type']) ) ) return true;
+			if (isset($info['type']) && ($info['type'] == 'int' || preg_match('/^integer/i', $info['type']))) return true;
 			else return false;
 		}
 		else return false;
@@ -6890,7 +6890,7 @@ 
 	 */
 	public function isFloat($info)
 	{
-		if(is_array($info))
+		if (is_array($info))
 		{
 			if (isset($info['type']) && (preg_match('/^(double|real)/i', $info['type']))) return true;
 			else return false;
@@ -6906,9 +6906,9 @@ 
 	 */
 	public function isText($info)
 	{
-		if(is_array($info))
+		if (is_array($info))
 		{
-			if(isset($info['type']) && $info['type']=='text') return true;
+			if (isset($info['type']) && $info['type'] == 'text') return true;
 			else return false;
 		}
 		else return false;
@@ -6922,9 +6922,9 @@ 
 	 */
 	protected function isIndex($info)
 	{
-		if(is_array($info))
+		if (is_array($info))
 		{
-			if(isset($info['index']) && $info['index']==true) return true;
+			if (isset($info['index']) && $info['index'] == true) return true;
 			else return false;
 		}
 		else return false;
@@ -6940,13 +6940,13 @@ 
 	{
 		global $conf;
 
-		$queryarray=array();
+		$queryarray = array();
 		foreach ($this->fields as $field=>$info)	// Loop on definition of fields
 		{
 			// Depending on field type ('datetime', ...)
-			if($this->isDate($info))
+			if ($this->isDate($info))
 			{
-				if(empty($this->{$field}))
+				if (empty($this->{$field}))
 				{
 					$queryarray[$field] = null;
 				}
@@ -6955,10 +6955,10 @@ 
 					$queryarray[$field] = $this->db->idate($this->{$field});
 				}
 			}
-			else if($this->isArray($info))
+			else if ($this->isArray($info))
 			{
-				if(! empty($this->{$field})) {
-					if(! is_array($this->{$field})) {
+				if (!empty($this->{$field})) {
+					if (!is_array($this->{$field})) {
 						$this->{$field} = array($this->{$field});
 					}
 					$queryarray[$field] = serialize($this->{$field});
@@ -6966,19 +6966,19 @@ 
 					$queryarray[$field] = null;
 				}
 			}
-			else if($this->isInt($info))
+			else if ($this->isInt($info))
 			{
-				if ($field == 'entity' && is_null($this->{$field})) $queryarray[$field]=$conf->entity;
+				if ($field == 'entity' && is_null($this->{$field})) $queryarray[$field] = $conf->entity;
 				else
 				{
 					$queryarray[$field] = (int) price2num($this->{$field});
-					if (empty($queryarray[$field])) $queryarray[$field]=0;		// May be reset to null later if property 'notnull' is -1 for this field.
+					if (empty($queryarray[$field])) $queryarray[$field] = 0; // May be reset to null later if property 'notnull' is -1 for this field.
 				}
 			}
-			else if($this->isFloat($info))
+			else if ($this->isFloat($info))
 			{
 				$queryarray[$field] = (double) price2num($this->{$field});
-				if (empty($queryarray[$field])) $queryarray[$field]=0;
+				if (empty($queryarray[$field])) $queryarray[$field] = 0;
 			}
 			else
 			{
@@ -6986,7 +6986,7 @@ 
 			}
 
 			if ($info['type'] == 'timestamp' && empty($queryarray[$field])) unset($queryarray[$field]);
-			if (! empty($info['notnull']) && $info['notnull'] == -1 && empty($queryarray[$field])) $queryarray[$field] = null;
+			if (!empty($info['notnull']) && $info['notnull'] == -1 && empty($queryarray[$field])) $queryarray[$field] = null;
 		}
 
 		return $queryarray;
@@ -7002,35 +7002,35 @@ 
 	{
 		foreach ($this->fields as $field => $info)
 		{
-			if($this->isDate($info))
+			if ($this->isDate($info))
 			{
-				if(empty($obj->{$field}) || $obj->{$field} === '0000-00-00 00:00:00' || $obj->{$field} === '1000-01-01 00:00:00') $this->{$field} = 0;
+				if (empty($obj->{$field}) || $obj->{$field} === '0000-00-00 00:00:00' || $obj->{$field} === '1000-01-01 00:00:00') $this->{$field} = 0;
 				else $this->{$field} = strtotime($obj->{$field});
 			}
-			elseif($this->isArray($info))
+			elseif ($this->isArray($info))
 			{
-				if(! empty($obj->{$field})) {
+				if (!empty($obj->{$field})) {
 					$this->{$field} = @unserialize($obj->{$field});
 					// Hack for data not in UTF8
-					if($this->{$field } === false) @unserialize(utf8_decode($obj->{$field}));
+					if ($this->{$field } === false) @unserialize(utf8_decode($obj->{$field}));
 				} else {
 					$this->{$field} = array();
 				}
 			}
-			elseif($this->isInt($info))
+			elseif ($this->isInt($info))
 			{
 				if ($field == 'rowid') $this->id = (int) $obj->{$field};
 				else $this->{$field} = (int) $obj->{$field};
 			}
-			elseif($this->isFloat($info))
+			elseif ($this->isFloat($info))
 			{
 				$this->{$field} = (double) $obj->{$field};
 			}
-			elseif($this->isNull($info))
+			elseif ($this->isNull($info))
 			{
 				$val = $obj->{$field};
 				// zero is not null
-				$this->{$field} = (is_null($val) || (empty($val) && $val!==0 && $val!=='0') ? null : $val);
+				$this->{$field} = (is_null($val) || (empty($val) && $val !== 0 && $val !== '0') ? null : $val);
 			}
 			else
 			{
@@ -7039,7 +7039,7 @@ 
 		}
 
 		// If there is no 'ref' field, we force property ->ref to ->id for a better compatibility with common functions.
-		if (! isset($this->fields['ref']) && isset($this->id)) $this->ref = $this->id;
+		if (!isset($this->fields['ref']) && isset($this->id)) $this->ref = $this->id;
 	}
 
 	/**
@@ -7081,14 +7081,14 @@ 
 
 		$error = 0;
 
-		$now=dol_now();
+		$now = dol_now();
 
 		$fieldvalues = $this->setSaveQuery();
-		if (array_key_exists('date_creation', $fieldvalues) && empty($fieldvalues['date_creation'])) $fieldvalues['date_creation']=$this->db->idate($now);
-		if (array_key_exists('fk_user_creat', $fieldvalues) && ! ($fieldvalues['fk_user_creat'] > 0)) $fieldvalues['fk_user_creat']=$user->id;
-		unset($fieldvalues['rowid']);	// The field 'rowid' is reserved field name for autoincrement field so we don't need it into insert.
+		if (array_key_exists('date_creation', $fieldvalues) && empty($fieldvalues['date_creation'])) $fieldvalues['date_creation'] = $this->db->idate($now);
+		if (array_key_exists('fk_user_creat', $fieldvalues) && !($fieldvalues['fk_user_creat'] > 0)) $fieldvalues['fk_user_creat'] = $user->id;
+		unset($fieldvalues['rowid']); // The field 'rowid' is reserved field name for autoincrement field so we don't need it into insert.
 
-		$keys=array();
+		$keys = array();
 		$values = array();
 		foreach ($fieldvalues as $k => $v) {
 			$keys[$k] = $k;
@@ -7097,58 +7097,58 @@ 
 		}
 
 		// Clean and check mandatory
-		foreach($keys as $key)
+		foreach ($keys as $key)
 		{
 			// If field is an implicit foreign key field
-			if (preg_match('/^integer:/i', $this->fields[$key]['type']) && $values[$key] == '-1') $values[$key]='';
-			if (! empty($this->fields[$key]['foreignkey']) && $values[$key] == '-1') $values[$key]='';
+			if (preg_match('/^integer:/i', $this->fields[$key]['type']) && $values[$key] == '-1') $values[$key] = '';
+			if (!empty($this->fields[$key]['foreignkey']) && $values[$key] == '-1') $values[$key] = '';
 
 			//var_dump($key.'-'.$values[$key].'-'.($this->fields[$key]['notnull'] == 1));
-			if (isset($this->fields[$key]['notnull']) && $this->fields[$key]['notnull'] == 1 && ! isset($values[$key]) && is_null($val['default']))
+			if (isset($this->fields[$key]['notnull']) && $this->fields[$key]['notnull'] == 1 && !isset($values[$key]) && is_null($val['default']))
 			{
 				$error++;
-				$this->errors[]=$langs->trans("ErrorFieldRequired", $this->fields[$key]['label']);
+				$this->errors[] = $langs->trans("ErrorFieldRequired", $this->fields[$key]['label']);
 			}
 
 			// If field is an implicit foreign key field
-			if (preg_match('/^integer:/i', $this->fields[$key]['type']) && empty($values[$key])) $values[$key]='null';
-			if (! empty($this->fields[$key]['foreignkey']) && empty($values[$key])) $values[$key]='null';
+			if (preg_match('/^integer:/i', $this->fields[$key]['type']) && empty($values[$key])) $values[$key] = 'null';
+			if (!empty($this->fields[$key]['foreignkey']) && empty($values[$key])) $values[$key] = 'null';
 		}
 
 		if ($error) return -1;
 
 		$this->db->begin();
 
-		if (! $error)
+		if (!$error)
 		{
 			$sql = 'INSERT INTO '.MAIN_DB_PREFIX.$this->table_element;
-			$sql.= ' ('.implode( ", ", $keys ).')';
-			$sql.= ' VALUES ('.implode( ", ", $values ).')';
+			$sql .= ' ('.implode(", ", $keys).')';
+			$sql .= ' VALUES ('.implode(", ", $values).')';
 
 			$res = $this->db->query($sql);
-			if ($res===false) {
+			if ($res === false) {
 				$error++;
 				$this->errors[] = $this->db->lasterror();
 			}
 		}
 
-		if (! $error)
+		if (!$error)
 		{
-			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . $this->table_element);
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
 		}
 
 		// Create extrafields
-		if (! $error)
+		if (!$error)
 		{
-			$result=$this->insertExtraFields();
+			$result = $this->insertExtraFields();
 			if ($result < 0) $error++;
 		}
 
 		// Triggers
-		if (! $error && ! $notrigger)
+		if (!$error && !$notrigger)
 		{
 			// Call triggers
-			$result=$this->call_trigger(strtoupper(get_class($this)).'_CREATE',$user);
+			$result = $this->call_trigger(strtoupper(get_class($this)).'_CREATE', $user);
 			if ($result < 0) { $error++; }
 			// End call triggers
 		}
@@ -7177,13 +7177,13 @@ 
 		if (empty($id) && empty($ref) && empty($morewhere)) return -1;
 
 		$sql = 'SELECT '.$this->getFieldList();
-		$sql.= ' FROM '.MAIN_DB_PREFIX.$this->table_element;
+		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element;
 
-		if (!empty($id))  $sql.= ' WHERE rowid = '.$id;
-		elseif (!empty($ref)) $sql.= " WHERE ref = ".$this->quote($ref, $this->fields['ref']);
-		else $sql.=' WHERE 1 = 1';	// usage with empty id and empty ref is very rare
-		if ($morewhere)   $sql.= $morewhere;
-		$sql.=' LIMIT 1';	// This is a fetch, to be sure to get only one record
+		if (!empty($id))  $sql .= ' WHERE rowid = '.$id;
+		elseif (!empty($ref)) $sql .= " WHERE ref = ".$this->quote($ref, $this->fields['ref']);
+		else $sql .= ' WHERE 1 = 1'; // usage with empty id and empty ref is very rare
+		if ($morewhere)   $sql .= $morewhere;
+		$sql .= ' LIMIT 1'; // This is a fetch, to be sure to get only one record
 
 		$res = $this->db->query($sql);
 		if ($res)
@@ -7220,14 +7220,14 @@ 
 
 		$error = 0;
 
-		$now=dol_now();
+		$now = dol_now();
 
 		$fieldvalues = $this->setSaveQuery();
-		if (array_key_exists('date_modification', $fieldvalues) && empty($fieldvalues['date_modification'])) $fieldvalues['date_modification']=$this->db->idate($now);
-		if (array_key_exists('fk_user_modif', $fieldvalues) && ! ($fieldvalues['fk_user_modif'] > 0)) $fieldvalues['fk_user_modif']=$user->id;
-		unset($fieldvalues['rowid']);	// The field 'rowid' is reserved field name for autoincrement field so we don't need it into update.
+		if (array_key_exists('date_modification', $fieldvalues) && empty($fieldvalues['date_modification'])) $fieldvalues['date_modification'] = $this->db->idate($now);
+		if (array_key_exists('fk_user_modif', $fieldvalues) && !($fieldvalues['fk_user_modif'] > 0)) $fieldvalues['fk_user_modif'] = $user->id;
+		unset($fieldvalues['rowid']); // The field 'rowid' is reserved field name for autoincrement field so we don't need it into update.
 
-		$keys=array();
+		$keys = array();
 		$values = array();
 		foreach ($fieldvalues as $k => $v) {
 			$keys[$k] = $k;
@@ -7237,10 +7237,10 @@ 
 		}
 
 		// Clean and check mandatory
-		foreach($keys as $key)
+		foreach ($keys as $key)
 		{
-			if (preg_match('/^integer:/i', $this->fields[$key]['type']) && $values[$key] == '-1') $values[$key]='';		// This is an implicit foreign key field
-			if (! empty($this->fields[$key]['foreignkey']) && $values[$key] == '-1') $values[$key]='';					// This is an explicit foreign key field
+			if (preg_match('/^integer:/i', $this->fields[$key]['type']) && $values[$key] == '-1') $values[$key] = ''; // This is an implicit foreign key field
+			if (!empty($this->fields[$key]['foreignkey']) && $values[$key] == '-1') $values[$key] = ''; // This is an explicit foreign key field
 
 			//var_dump($key.'-'.$values[$key].'-'.($this->fields[$key]['notnull'] == 1));
 			/*
@@ -7251,13 +7251,13 @@ 
 			}*/
 		}
 
-		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element.' SET '.implode( ',', $tmp ).' WHERE rowid='.$this->id ;
+		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element.' SET '.implode(',', $tmp).' WHERE rowid='.$this->id;
 
 		$this->db->begin();
-		if (! $error)
+		if (!$error)
 		{
 			$res = $this->db->query($sql);
-			if ($res===false)
+			if ($res === false)
 			{
 				$error++;
 				$this->errors[] = $this->db->lasterror();
@@ -7265,9 +7265,9 @@ 
 		}
 
 		// Update extrafield
-		if (! $error && empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($this->array_options) && count($this->array_options)>0)
+		if (!$error && empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($this->array_options) && count($this->array_options) > 0)
 		{
-			$result=$this->insertExtraFields();
+			$result = $this->insertExtraFields();
 			if ($result < 0)
 			{
 				$error++;
@@ -7275,10 +7275,10 @@ 
 		}
 
 		// Triggers
-		if (! $error && ! $notrigger)
+		if (!$error && !$notrigger)
 		{
 			// Call triggers
-			$result=$this->call_trigger(strtoupper(get_class($this)).'_MODIFY',$user);
+			$result = $this->call_trigger(strtoupper(get_class($this)).'_MODIFY', $user);
 			if ($result < 0) { $error++; } //Do also here what you must do to rollback action if trigger fail
 			// End call triggers
 		}
@@ -7301,68 +7301,68 @@ 
 	 * @param	int		$forcechilddeletion		0=no, 1=Force deletion of children
 	 * @return 	int             				<=0 if KO, >0 if OK
 	 */
-	public function deleteCommon(User $user, $notrigger=false, $forcechilddeletion=0)
+	public function deleteCommon(User $user, $notrigger = false, $forcechilddeletion = 0)
 	{
-		$error=0;
+		$error = 0;
 
 		$this->db->begin();
 
 		if ($forcechilddeletion)
 		{
-			foreach($this->childtables as $table)
+			foreach ($this->childtables as $table)
 			{
 				$sql = 'DELETE FROM '.MAIN_DB_PREFIX.$table.' WHERE '.$this->fk_element.' = '.$this->id;
 				$resql = $this->db->query($sql);
-				if (! $resql)
+				if (!$resql)
 				{
-					$this->error=$this->db->lasterror();
-					$this->errors[]=$this->error;
+					$this->error = $this->db->lasterror();
+					$this->errors[] = $this->error;
 					$this->db->rollback();
 					return -1;
 				}
 			}
 		}
-		elseif (! empty($this->fk_element) && ! empty($this->childtables))	// If object has childs linked with a foreign key field, we check all child tables.
+		elseif (!empty($this->fk_element) && !empty($this->childtables))	// If object has childs linked with a foreign key field, we check all child tables.
 		{
 			$objectisused = $this->isObjectUsed($this->id);
-			if (! empty($objectisused))
+			if (!empty($objectisused))
 			{
 				dol_syslog(get_class($this)."::deleteCommon Can't delete record as it has some child", LOG_WARNING);
-				$this->error='ErrorRecordHasChildren';
-				$this->errors[]=$this->error;
+				$this->error = 'ErrorRecordHasChildren';
+				$this->errors[] = $this->error;
 				$this->db->rollback();
 				return 0;
 			}
 		}
 
-		if (! $error) {
-			if (! $notrigger) {
+		if (!$error) {
+			if (!$notrigger) {
 				// Call triggers
-				$result=$this->call_trigger(strtoupper(get_class($this)).'_DELETE', $user);
+				$result = $this->call_trigger(strtoupper(get_class($this)).'_DELETE', $user);
 				if ($result < 0) { $error++; } // Do also here what you must do to rollback action if trigger fail
 				// End call triggers
 			}
 		}
 
-		if (! $error && ! empty($this->isextrafieldmanaged))
+		if (!$error && !empty($this->isextrafieldmanaged))
 		{
-			$sql = "DELETE FROM " . MAIN_DB_PREFIX . $this->table_element."_extrafields";
-			$sql.= " WHERE fk_object=" . $this->id;
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX.$this->table_element."_extrafields";
+			$sql .= " WHERE fk_object=".$this->id;
 
 			$resql = $this->db->query($sql);
-			if (! $resql)
+			if (!$resql)
 			{
 				$this->errors[] = $this->db->lasterror();
 				$error++;
 			}
 		}
 
-		if (! $error)
+		if (!$error)
 		{
 			$sql = 'DELETE FROM '.MAIN_DB_PREFIX.$this->table_element.' WHERE rowid='.$this->id;
 
 			$res = $this->db->query($sql);
-			if($res===false) {
+			if ($res === false) {
 				$error++;
 				$this->errors[] = $this->db->lasterror();
 			}
@@ -7403,9 +7403,9 @@ 
 		require_once DOL_DOCUMENT_ROOT.'/core/class/comment.class.php';
 
 		$comment = new Comment($this->db);
-		$result=$comment->fetchAllFor($this->element, $this->id);
-		if ($result<0) {
-			$this->errors=array_merge($this->errors, $comment->errors);
+		$result = $comment->fetchAllFor($this->element, $this->id);
+		if ($result < 0) {
+			$this->errors = array_merge($this->errors, $comment->errors);
 			return -1;
 		} else {
 			$this->comments = $comment->comments;

Braces +1328 added lines, -795 removed lines

@@ -426,23 +426,31 @@ 
 		$sql.= " FROM ".MAIN_DB_PREFIX.$element;
 		$sql.= " WHERE entity IN (".getEntity($element).")" ;
 
-		if ($id > 0) $sql.= " AND rowid = ".$db->escape($id);
-		else if ($ref) $sql.= " AND ref = '".$db->escape($ref)."'";
-		else if ($ref_ext) $sql.= " AND ref_ext = '".$db->escape($ref_ext)."'";
-		else {
+		if ($id > 0) {
+		    $sql.= " AND rowid = ".$db->escape($id);
+		} else if ($ref) {
+		    $sql.= " AND ref = '".$db->escape($ref)."'";
+		} else if ($ref_ext) {
+		    $sql.= " AND ref_ext = '".$db->escape($ref_ext)."'";
+		} else {
 			$error='ErrorWrongParameters';
 			dol_print_error(get_class()."::isExistingObject ".$error, LOG_ERR);
 			return -1;
 		}
-		if ($ref || $ref_ext) $sql.= " AND entity = ".$conf->entity;
+		if ($ref || $ref_ext) {
+		    $sql.= " AND entity = ".$conf->entity;
+		}
 
 		dol_syslog(get_class()."::isExistingObject", LOG_DEBUG);
 		$resql = $db->query($sql);
 		if ($resql)
 		{
 			$num=$db->num_rows($resql);
-			if ($num > 0) return 1;
-			else return 0;
+			if ($num > 0) {
+			    return 1;
+			} else {
+			    return 0;
+			}
 		}
 		return -1;
 	}
@@ -471,13 +479,18 @@ 
 		//print "lastname=".$this->lastname." name=".$this->name." nom=".$this->nom."<br>\n";
 		$lastname=$this->lastname;
 		$firstname=$this->firstname;
-		if (empty($lastname))  $lastname=(isset($this->lastname)?$this->lastname:(isset($this->name)?$this->name:(isset($this->nom)?$this->nom:(isset($this->societe)?$this->societe:(isset($this->company)?$this->company:'')))));
+		if (empty($lastname)) {
+		    $lastname=(isset($this->lastname)?$this->lastname:(isset($this->name)?$this->name:(isset($this->nom)?$this->nom:(isset($this->societe)?$this->societe:(isset($this->company)?$this->company:'')))));
+		}
 
 		$ret='';
 		if ($option && $this->civility_id)
 		{
-			if ($langs->transnoentitiesnoconv("Civility".$this->civility_id)!="Civility".$this->civility_id) $ret.=$langs->transnoentitiesnoconv("Civility".$this->civility_id).' ';
-			else $ret.=$this->civility_id.' ';
+			if ($langs->transnoentitiesnoconv("Civility".$this->civility_id)!="Civility".$this->civility_id) {
+			    $ret.=$langs->transnoentitiesnoconv("Civility".$this->civility_id).' ';
+			} else {
+			    $ret.=$this->civility_id.' ';
+			}
 		}
 
 		$ret.=dolGetFirstLastname($firstname, $lastname, $nameorder);
@@ -570,14 +583,15 @@ 
 		{
             if (!empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) && $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 1 && $this->region) {
                 $out.=($outdone?' - ':'').$this->region.' - '.$this->state;
-            }
-            else {
+            } else {
                 $out.=($outdone?' - ':'').$this->state;
             }
 			$outdone++;
 		}
 
-		if (! empty($this->phone) || ! empty($this->phone_pro) || ! empty($this->phone_mobile) || ! empty($this->phone_perso) || ! empty($this->fax) || ! empty($this->office_phone) || ! empty($this->user_mobile) || ! empty($this->office_fax)) $out.=($outdone?'<br>':'');
+		if (! empty($this->phone) || ! empty($this->phone_pro) || ! empty($this->phone_mobile) || ! empty($this->phone_perso) || ! empty($this->fax) || ! empty($this->office_phone) || ! empty($this->user_mobile) || ! empty($this->office_fax)) {
+		    $out.=($outdone?'<br>':'');
+		}
 		if (! empty($this->phone) && empty($this->phone_pro)) {		// For objects that store pro phone into ->phone
 			$out.=dol_print_phone($this->phone,$this->country_code,$contactid,$thirdpartyid,'AC_TEL','&nbsp;','phone',$langs->trans("PhonePro")); $outdone++;
 		}
@@ -618,13 +632,21 @@ 
 		$out.='<div style="clear: both;">';
 		if (! empty($conf->socialnetworks->enabled))
 		{
-			if ($this->skype) $out.=dol_print_socialnetworks($this->skype,$this->id,$object->id,'skype');
+			if ($this->skype) {
+			    $out.=dol_print_socialnetworks($this->skype,$this->id,$object->id,'skype');
+			}
 			$outdone++;
-			if ($this->jabberid) $out.=dol_print_socialnetworks($this->jabberid,$this->id,$object->id,'jabber');
+			if ($this->jabberid) {
+			    $out.=dol_print_socialnetworks($this->jabberid,$this->id,$object->id,'jabber');
+			}
 			$outdone++;
-			if ($this->twitter) $out.=dol_print_socialnetworks($this->twitter,$this->id,$object->id,'twitter');
+			if ($this->twitter) {
+			    $out.=dol_print_socialnetworks($this->twitter,$this->id,$object->id,'twitter');
+			}
 			$outdone++;
-			if ($this->facebook) $out.=dol_print_socialnetworks($this->facebook,$this->id,$object->id,'facebook');
+			if ($this->facebook) {
+			    $out.=dol_print_socialnetworks($this->facebook,$this->id,$object->id,'facebook');
+			}
 			$outdone++;
 		}
 		$out.='</div>';
@@ -684,10 +706,10 @@ 
 					$this->errors = $ecmfile->errors;
 				}
 				*/
+			} else {
+			    return '';
 			}
-			else return '';
-		}
-		elseif (empty($ecmfile->share))
+		} elseif (empty($ecmfile->share))
 		{
 			// Add entry into index
 			if ($initsharekey)
@@ -695,8 +717,9 @@ 
 				require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
 				$ecmfile->share = getRandomPassword(true);
 				$ecmfile->update($user);
+			} else {
+			    return '';
 			}
-			else return '';
 		}
 
 		// Define $urlwithroot
@@ -710,14 +733,18 @@ 
 		//if (! empty($modulepart)) $paramlink.=($paramlink?'&':'').'modulepart='.$modulepart;		// For sharing with hash (so public files), modulepart is not required.
 		//if (! empty($ecmfile->entity)) $paramlink.='&entity='.$ecmfile->entity; 					// For sharing with hash (so public files), entity is not required.
 		//$paramlink.=($paramlink?'&':'').'file='.urlencode($filepath);								// No need of name of file for public link, we will use the hash
-		if (! empty($ecmfile->share)) $paramlink.=($paramlink?'&':'').'hashp='.$ecmfile->share;			// Hash for public share
-		if ($forcedownload) $paramlink.=($paramlink?'&':'').'attachment=1';
+		if (! empty($ecmfile->share)) {
+		    $paramlink.=($paramlink?'&':'').'hashp='.$ecmfile->share;
+		}
+		// Hash for public share
+		if ($forcedownload) {
+		    $paramlink.=($paramlink?'&':'').'attachment=1';
+		}
 
 		if ($relativelink)
 		{
 			$linktoreturn='document.php'.($paramlink?'?'.$paramlink:'');
-		}
-		else
+		} else
 		{
 			$linktoreturn=$urlwithroot.'/document.php'.($paramlink?'?'.$paramlink:'');
 		}
@@ -765,8 +792,7 @@ 
 		if (is_numeric($type_contact))
 		{
 			$id_type_contact=$type_contact;
-		}
-		else
+		} else
 		{
 			// We look for id type_contact
 			$sql = "SELECT tc.rowid";
@@ -779,7 +805,9 @@ 
 			if ($resql)
 			{
 				$obj = $this->db->fetch_object($resql);
-				if ($obj) $id_type_contact=$obj->rowid;
+				if ($obj) {
+				    $id_type_contact=$obj->rowid;
+				}
 			}
 		}
 
@@ -831,8 +859,7 @@ 
 
 				$this->db->commit();
 				return 1;
-			}
-			else
+			} else
 			{
 				if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 				{
@@ -840,15 +867,16 @@ 
 					$this->db->rollback();
 					echo 'err rollback';
 					return -2;
-				}
-				else
+				} else
 				{
 					$this->error=$this->db->error();
 					$this->db->rollback();
 					return -1;
 				}
 			}
-		} else return 0;
+		} else {
+		    return 0;
+		}
 	}
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -890,15 +918,18 @@ 
 		// Insert into database
 		$sql = "UPDATE ".MAIN_DB_PREFIX."element_contact set";
 		$sql.= " statut = ".$statut;
-		if ($type_contact_id) $sql.= ", fk_c_type_contact = '".$type_contact_id ."'";
-		if ($fk_socpeople) $sql.= ", fk_socpeople = '".$fk_socpeople ."'";
+		if ($type_contact_id) {
+		    $sql.= ", fk_c_type_contact = '".$type_contact_id ."'";
+		}
+		if ($fk_socpeople) {
+		    $sql.= ", fk_socpeople = '".$fk_socpeople ."'";
+		}
 		$sql.= " where rowid = ".$rowid;
 		$resql=$this->db->query($sql);
 		if ($resql)
 		{
 			return 0;
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->lasterror();
 			return -1;
@@ -935,8 +966,7 @@ 
 
 			$this->db->commit();
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->lasterror();
 			$this->db->rollback();
@@ -966,15 +996,15 @@ 
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."element_contact";
 		$sql.= " WHERE element_id = ".$this->id;
-		if ($listId)
-			$sql.= " AND fk_c_type_contact IN (".$listId.")";
+		if ($listId) {
+					$sql.= " AND fk_c_type_contact IN (".$listId.")";
+		}
 
 		dol_syslog(get_class($this)."::delete_linked_contact", LOG_DEBUG);
 		if ($this->db->query($sql))
 		{
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->lasterror();
 			return -1;
@@ -999,22 +1029,38 @@ 
 		$tab=array();
 
 		$sql = "SELECT ec.rowid, ec.statut as statuslink, ec.fk_socpeople as id, ec.fk_c_type_contact";    // This field contains id of llx_socpeople or id of llx_user
-		if ($source == 'internal') $sql.=", '-1' as socid, t.statut as statuscontact, t.login, t.photo";
-		if ($source == 'external' || $source == 'thirdparty') $sql.=", t.fk_soc as socid, t.statut as statuscontact";
+		if ($source == 'internal') {
+		    $sql.=", '-1' as socid, t.statut as statuscontact, t.login, t.photo";
+		}
+		if ($source == 'external' || $source == 'thirdparty') {
+		    $sql.=", t.fk_soc as socid, t.statut as statuscontact";
+		}
 		$sql.= ", t.civility as civility, t.lastname as lastname, t.firstname, t.email";
 		$sql.= ", tc.source, tc.element, tc.code, tc.libelle";
 		$sql.= " FROM ".MAIN_DB_PREFIX."c_type_contact tc";
 		$sql.= ", ".MAIN_DB_PREFIX."element_contact ec";
-		if ($source == 'internal') $sql.=" LEFT JOIN ".MAIN_DB_PREFIX."user t on ec.fk_socpeople = t.rowid";
-		if ($source == 'external'|| $source == 'thirdparty') $sql.=" LEFT JOIN ".MAIN_DB_PREFIX."socpeople t on ec.fk_socpeople = t.rowid";
+		if ($source == 'internal') {
+		    $sql.=" LEFT JOIN ".MAIN_DB_PREFIX."user t on ec.fk_socpeople = t.rowid";
+		}
+		if ($source == 'external'|| $source == 'thirdparty') {
+		    $sql.=" LEFT JOIN ".MAIN_DB_PREFIX."socpeople t on ec.fk_socpeople = t.rowid";
+		}
 		$sql.= " WHERE ec.element_id =".$this->id;
 		$sql.= " AND ec.fk_c_type_contact=tc.rowid";
 		$sql.= " AND tc.element='".$this->db->escape($this->element)."'";
-		if ($code) $sql.= " AND tc.code = '".$this->db->escape($code)."'";
-		if ($source == 'internal') $sql.= " AND tc.source = 'internal'";
-		if ($source == 'external' || $source == 'thirdparty') $sql.= " AND tc.source = 'external'";
+		if ($code) {
+		    $sql.= " AND tc.code = '".$this->db->escape($code)."'";
+		}
+		if ($source == 'internal') {
+		    $sql.= " AND tc.source = 'internal'";
+		}
+		if ($source == 'external' || $source == 'thirdparty') {
+		    $sql.= " AND tc.source = 'external'";
+		}
 		$sql.= " AND tc.active=1";
-		if ($statut >= 0) $sql.= " AND ec.statut = '".$statut."'";
+		if ($statut >= 0) {
+		    $sql.= " AND ec.statut = '".$statut."'";
+		}
 		$sql.=" ORDER BY t.lastname ASC";
 
 		dol_syslog(get_class($this)."::liste_contact", LOG_DEBUG);
@@ -1035,8 +1081,7 @@ 
 								   'nom'=>$obj->lastname,      // For backward compatibility
 								   'civility'=>$obj->civility, 'lastname'=>$obj->lastname, 'firstname'=>$obj->firstname, 'email'=>$obj->email, 'login'=>$obj->login, 'photo'=>$obj->photo, 'statuscontact'=>$obj->statuscontact,
 								   'rowid'=>$obj->rowid, 'code'=>$obj->code, 'libelle'=>$libelle_type, 'status'=>$obj->statuslink, 'fk_c_type_contact'=>$obj->fk_c_type_contact);
-				}
-				else
+				} else
 				{
 					$tab[$i]=$obj->id;
 				}
@@ -1045,8 +1090,7 @@ 
 			}
 
 			return $tab;
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->lasterror();
 			dol_print_error($this->db);
@@ -1081,8 +1125,7 @@ 
 			$result = $this->update_contact($rowid, $newstatut);
 			$this->db->free($resql);
 			return $result;
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->error();
 			dol_print_error($this->db);
@@ -1106,16 +1149,27 @@ 
         // phpcs:enable
 		global $langs;
 
-		if (empty($order)) $order='position';
-		if ($order == 'position') $order.=',code';
+		if (empty($order)) {
+		    $order='position';
+		}
+		if ($order == 'position') {
+		    $order.=',code';
+		}
 
 		$tab = array();
 		$sql = "SELECT DISTINCT tc.rowid, tc.code, tc.libelle, tc.position";
 		$sql.= " FROM ".MAIN_DB_PREFIX."c_type_contact as tc";
 		$sql.= " WHERE tc.element='".$this->db->escape($this->element)."'";
-		if ($activeonly == 1) $sql.= " AND tc.active=1"; // only the active types
-		if (! empty($source) && $source != 'all') $sql.= " AND tc.source='".$this->db->escape($source)."'";
-		if (! empty($code)) $sql.= " AND tc.code='".$this->db->escape($code)."'";
+		if ($activeonly == 1) {
+		    $sql.= " AND tc.active=1";
+		}
+		// only the active types
+		if (! empty($source) && $source != 'all') {
+		    $sql.= " AND tc.source='".$this->db->escape($source)."'";
+		}
+		if (! empty($code)) {
+		    $sql.= " AND tc.code='".$this->db->escape($code)."'";
+		}
 		$sql.= $this->db->order($order,'ASC');
 
 		//print "sql=".$sql;
@@ -1130,13 +1184,15 @@ 
 
 				$transkey="TypeContact_".$this->element."_".$source."_".$obj->code;
 				$libelle_type=($langs->trans($transkey)!=$transkey ? $langs->trans($transkey) : $obj->libelle);
-				if (empty($option)) $tab[$obj->rowid]=$libelle_type;
-				else $tab[$obj->code]=$libelle_type;
+				if (empty($option)) {
+				    $tab[$obj->rowid]=$libelle_type;
+				} else {
+				    $tab[$obj->code]=$libelle_type;
+				}
 				$i++;
 			}
 			return $tab;
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->lasterror();
 			//dol_print_error($this->db);
@@ -1175,19 +1231,29 @@ 
 
 		$sql = "SELECT ec.fk_socpeople";
 		$sql.= " FROM ".MAIN_DB_PREFIX."element_contact as ec,";
-		if ($source == 'internal') $sql.= " ".MAIN_DB_PREFIX."user as c,";
-		if ($source == 'external') $sql.= " ".MAIN_DB_PREFIX."socpeople as c,";
+		if ($source == 'internal') {
+		    $sql.= " ".MAIN_DB_PREFIX."user as c,";
+		}
+		if ($source == 'external') {
+		    $sql.= " ".MAIN_DB_PREFIX."socpeople as c,";
+		}
 		$sql.= " ".MAIN_DB_PREFIX."c_type_contact as tc";
 		$sql.= " WHERE ec.element_id = ".$id;
 		$sql.= " AND ec.fk_socpeople = c.rowid";
-		if ($source == 'internal') $sql.= " AND c.entity IN (".getEntity('user').")";
-		if ($source == 'external') $sql.= " AND c.entity IN (".getEntity('societe').")";
+		if ($source == 'internal') {
+		    $sql.= " AND c.entity IN (".getEntity('user').")";
+		}
+		if ($source == 'external') {
+		    $sql.= " AND c.entity IN (".getEntity('societe').")";
+		}
 		$sql.= " AND ec.fk_c_type_contact = tc.rowid";
 		$sql.= " AND tc.element = '".$element."'";
 		$sql.= " AND tc.source = '".$source."'";
 		$sql.= " AND tc.code = '".$code."'";
 		$sql.= " AND tc.active = 1";
-		if ($status) $sql.= " AND ec.statut = ".$status;
+		if ($status) {
+		    $sql.= " AND ec.statut = ".$status;
+		}
 
 		dol_syslog(get_class($this)."::getIdContact", LOG_DEBUG);
 		$resql=$this->db->query($sql);
@@ -1198,8 +1264,7 @@ 
 				$result[$i]=$obj->fk_socpeople;
 				$i++;
 			}
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->error();
 			return null;
@@ -1218,9 +1283,13 @@ 
 	function fetch_contact($contactid=null)
 	{
         // phpcs:enable
-		if (empty($contactid)) $contactid=$this->contactid;
+		if (empty($contactid)) {
+		    $contactid=$this->contactid;
+		}
 
-		if (empty($contactid)) return 0;
+		if (empty($contactid)) {
+		    return 0;
+		}
 
 		require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 		$contact = new Contact($this->db);
@@ -1241,14 +1310,16 @@ 
         // phpcs:enable
 		global $conf;
 
-		if (empty($this->socid) && empty($this->fk_soc) && empty($this->fk_thirdparty) && empty($force_thirdparty_id))
-			return 0;
+		if (empty($this->socid) && empty($this->fk_soc) && empty($this->fk_thirdparty) && empty($force_thirdparty_id)) {
+					return 0;
+		}
 
 		require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
 
 		$idtofetch = isset($this->socid) ? $this->socid : (isset($this->fk_soc) ? $this->fk_soc : $this->fk_thirdparty);
-		if ($force_thirdparty_id)
-			$idtofetch = $force_thirdparty_id;
+		if ($force_thirdparty_id) {
+					$idtofetch = $force_thirdparty_id;
+		}
 
 		if ($idtofetch) {
 			$thirdparty = new Societe($this->db);
@@ -1261,8 +1332,9 @@ 
 			}
 
 			return $result;
-		} else
-			return -1;
+		} else {
+					return -1;
+		}
 	}
 
 
@@ -1308,18 +1380,24 @@ 
 		dol_syslog(get_class($this).'::fetch_barcode this->element='.$this->element.' this->barcode_type='.$this->barcode_type);
 
 		$idtype=$this->barcode_type;
-		if (empty($idtype) && $idtype != '0')	// If type of barcode no set, we try to guess. If set to '0' it means we forced to have type remain not defined
+		if (empty($idtype) && $idtype != '0') {
+		    // If type of barcode no set, we try to guess. If set to '0' it means we forced to have type remain not defined
 		{
 			if ($this->element == 'product')      $idtype = $conf->global->PRODUIT_DEFAULT_BARCODE_TYPE;
-			else if ($this->element == 'societe') $idtype = $conf->global->GENBARCODE_BARCODETYPE_THIRDPARTY;
-			else dol_syslog('Call fetch_barcode with barcode_type not defined and cant be guessed', LOG_WARNING);
+		} else if ($this->element == 'societe') {
+			    $idtype = $conf->global->GENBARCODE_BARCODETYPE_THIRDPARTY;
+			} else {
+			    dol_syslog('Call fetch_barcode with barcode_type not defined and cant be guessed', LOG_WARNING);
+			}
 		}
 
 		if ($idtype > 0)
 		{
-			if (empty($this->barcode_type) || empty($this->barcode_type_code) || empty($this->barcode_type_label) || empty($this->barcode_type_coder))    // If data not already loaded
+			if (empty($this->barcode_type) || empty($this->barcode_type_code) || empty($this->barcode_type_label) || empty($this->barcode_type_coder)) {
+			    // If data not already loaded
 			{
 				$sql = "SELECT rowid, code, libelle as label, coder";
+			}
 				$sql.= " FROM ".MAIN_DB_PREFIX."c_barcode_type";
 				$sql.= " WHERE rowid = ".$idtype;
 				dol_syslog(get_class($this).'::fetch_barcode', LOG_DEBUG);
@@ -1332,8 +1410,7 @@ 
 					$this->barcode_type_label = $obj->label;
 					$this->barcode_type_coder = $obj->coder;
 					return 1;
-				}
-				else
+				} else
 				{
 					dol_print_error($this->db);
 					return -1;
@@ -1354,8 +1431,13 @@ 
         // phpcs:enable
 		include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 
-		if (empty($this->fk_project) && ! empty($this->fk_projet)) $this->fk_project = $this->fk_projet;	// For backward compatibility
-		if (empty($this->fk_project)) return 0;
+		if (empty($this->fk_project) && ! empty($this->fk_projet)) {
+		    $this->fk_project = $this->fk_projet;
+		}
+		// For backward compatibility
+		if (empty($this->fk_project)) {
+		    return 0;
+		}
 
 		$project = new Project($this->db);
 		$result = $project->fetch($this->fk_project);
@@ -1376,7 +1458,9 @@ 
         // phpcs:enable
 		include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 
-		if (empty($this->fk_product)) return 0;
+		if (empty($this->fk_product)) {
+		    return 0;
+		}
 
 		$product = new Product($this->db);
 		$result = $product->fetch($this->fk_product);
@@ -1410,9 +1494,15 @@ 
 	function fetch_origin()
 	{
         // phpcs:enable
-		if ($this->origin == 'shipping') $this->origin = 'expedition';
-		if ($this->origin == 'delivery') $this->origin = 'livraison';
-        if ($this->origin == 'order_supplier') $this->origin = 'commandeFournisseur';
+		if ($this->origin == 'shipping') {
+		    $this->origin = 'expedition';
+		}
+		if ($this->origin == 'delivery') {
+		    $this->origin = 'livraison';
+		}
+        if ($this->origin == 'order_supplier') {
+            $this->origin = 'commandeFournisseur';
+        }
 
 		$origin = $this->origin;
 
@@ -1504,29 +1594,48 @@ 
 	{
 		global $user,$langs,$conf;
 
-		if (empty($table)) 	  $table=$this->table_element;
-		if (empty($id))    	  $id=$this->id;
-		if (empty($format))   $format='text';
-		if (empty($id_field)) $id_field='rowid';
+		if (empty($table)) {
+		    $table=$this->table_element;
+		}
+		if (empty($id)) {
+		    $id=$this->id;
+		}
+		if (empty($format)) {
+		    $format='text';
+		}
+		if (empty($id_field)) {
+		    $id_field='rowid';
+		}
 
 		$error=0;
 
 		$this->db->begin();
 
 		// Special case
-		if ($table == 'product' && $field == 'note_private') $field='note';
-		if (in_array($table, array('actioncomm', 'adherent', 'advtargetemailing', 'cronjob', 'establishment'))) $fk_user_field = 'fk_user_mod';
+		if ($table == 'product' && $field == 'note_private') {
+		    $field='note';
+		}
+		if (in_array($table, array('actioncomm', 'adherent', 'advtargetemailing', 'cronjob', 'establishment'))) {
+		    $fk_user_field = 'fk_user_mod';
+		}
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$table." SET ";
 
-		if ($format == 'text') $sql.= $field." = '".$this->db->escape($value)."'";
-		else if ($format == 'int') $sql.= $field." = ".$this->db->escape($value);
-		else if ($format == 'date') $sql.= $field." = ".($value ? "'".$this->db->idate($value)."'" : "null");
+		if ($format == 'text') {
+		    $sql.= $field." = '".$this->db->escape($value)."'";
+		} else if ($format == 'int') {
+		    $sql.= $field." = ".$this->db->escape($value);
+		} else if ($format == 'date') {
+		    $sql.= $field." = ".($value ? "'".$this->db->idate($value)."'" : "null");
+		}
 
 		if ($fk_user_field)
 		{
-			if (! empty($fuser) && is_object($fuser)) $sql.=", ".$fk_user_field." = ".$fuser->id;
-			elseif (empty($fuser) || $fuser != 'none') $sql.=", ".$fk_user_field." = ".$user->id;
+			if (! empty($fuser) && is_object($fuser)) {
+			    $sql.=", ".$fk_user_field." = ".$fuser->id;
+			} elseif (empty($fuser) || $fuser != 'none') {
+			    $sql.=", ".$fk_user_field." = ".$user->id;
+			}
 		}
 
 		$sql.= " WHERE ".$id_field." = ".$id;
@@ -1541,28 +1650,32 @@ 
 				if (empty($this->fields) && method_exists($this, 'fetch'))
 				{
 					$result = $this->fetch($id);
-				}
-				else
+				} else
 				{
 					$result = $this->fetchCommon($id);
 				}
-				if ($result >= 0) $result=$this->call_trigger($trigkey, (! empty($fuser) && is_object($fuser)) ? $fuser : $user);   // This may set this->errors
-				if ($result < 0) $error++;
+				if ($result >= 0) {
+				    $result=$this->call_trigger($trigkey, (! empty($fuser) && is_object($fuser)) ? $fuser : $user);
+				}
+				// This may set this->errors
+				if ($result < 0) {
+				    $error++;
+				}
 			}
 
 			if (! $error)
 			{
-				if (property_exists($this, $field)) $this->$field = $value;
+				if (property_exists($this, $field)) {
+				    $this->$field = $value;
+				}
 				$this->db->commit();
 				return 1;
-			}
-			else
+			} else
 			{
 				$this->db->rollback();
 				return -2;
 			}
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->lasterror();
 			$this->db->rollback();
@@ -1589,36 +1702,66 @@ 
 			dol_print_error('',get_class($this)."::load_previous_next_ref was called on objet with property table_element not defined");
 			return -1;
 		}
-		if ($fieldid == 'none') return 1;
+		if ($fieldid == 'none') {
+		    return 1;
+		}
 
 		// Security on socid
 		$socid = 0;
-		if ($user->societe_id > 0) $socid = $user->societe_id;
+		if ($user->societe_id > 0) {
+		    $socid = $user->societe_id;
+		}
 
 		// this->ismultientitymanaged contains
 		// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
 		$alias = 's';
-		if ($this->element == 'societe') $alias = 'te';
+		if ($this->element == 'societe') {
+		    $alias = 'te';
+		}
 
 		$sql = "SELECT MAX(te.".$fieldid.")";
 		$sql.= " FROM ".(empty($nodbprefix)?MAIN_DB_PREFIX:'').$this->table_element." as te";
 		if ($this->element == 'user' && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
 			$sql.= ",".MAIN_DB_PREFIX."usergroup_user as ug";
 		}
-		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) $sql.= ", ".MAIN_DB_PREFIX."societe as s";	// If we need to link to societe to limit select to entity
-		else if ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe as s";	// If we need to link to societe to limit select to socid
-		else if ($this->restrictiononfksoc == 2 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON te.fk_soc = s.rowid";	// If we need to link to societe to limit select to socid
-		if ($this->restrictiononfksoc && !$user->rights->societe->client->voir && !$socid)  $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON ".$alias.".rowid = sc.fk_soc";
+		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) {
+		    $sql.= ", ".MAIN_DB_PREFIX."societe as s";
+		}
+		// If we need to link to societe to limit select to entity
+		else if ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) {
+		    $sql.= ", ".MAIN_DB_PREFIX."societe as s";
+		}
+		// If we need to link to societe to limit select to socid
+		else if ($this->restrictiononfksoc == 2 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) {
+		    $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON te.fk_soc = s.rowid";
+		}
+		// If we need to link to societe to limit select to socid
+		if ($this->restrictiononfksoc && !$user->rights->societe->client->voir && !$socid) {
+		    $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON ".$alias.".rowid = sc.fk_soc";
+		}
 		$sql.= " WHERE te.".$fieldid." < '".$this->db->escape($this->ref)."'";  // ->ref must always be defined (set to id if field does not exists)
-		if ($this->restrictiononfksoc == 1 && !$user->rights->societe->client->voir && !$socid) $sql.= " AND sc.fk_user = " .$user->id;
-		if ($this->restrictiononfksoc == 2 && !$user->rights->societe->client->voir && !$socid) $sql.= " AND (sc.fk_user = " .$user->id.' OR te.fk_soc IS NULL)';
+		if ($this->restrictiononfksoc == 1 && !$user->rights->societe->client->voir && !$socid) {
+		    $sql.= " AND sc.fk_user = " .$user->id;
+		}
+		if ($this->restrictiononfksoc == 2 && !$user->rights->societe->client->voir && !$socid) {
+		    $sql.= " AND (sc.fk_user = " .$user->id.' OR te.fk_soc IS NULL)';
+		}
 		if (! empty($filter))
 		{
-			if (! preg_match('/^\s*AND/i', $filter)) $sql.=" AND ";   // For backward compatibility
+			if (! preg_match('/^\s*AND/i', $filter)) {
+			    $sql.=" AND ";
+			}
+			// For backward compatibility
 			$sql.=$filter;
 		}
-		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) $sql.= ' AND te.fk_soc = s.rowid';			// If we need to link to societe to limit select to entity
-		else if ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql.= ' AND te.fk_soc = s.rowid';			// If we need to link to societe to limit select to socid
+		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) {
+		    $sql.= ' AND te.fk_soc = s.rowid';
+		}
+		// If we need to link to societe to limit select to entity
+		else if ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) {
+		    $sql.= ' AND te.fk_soc = s.rowid';
+		}
+		// If we need to link to societe to limit select to socid
 		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) {
 			if ($this->element == 'user' && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
 				if (! empty($user->admin) && empty($user->entity) && $conf->entity == 1) {
@@ -1631,9 +1774,15 @@ 
 				$sql.= ' AND te.entity IN ('.getEntity($this->element).')';
 			}
 		}
-		if ($this->restrictiononfksoc == 1 && $socid && $this->element != 'societe') $sql.= ' AND te.fk_soc = ' . $socid;
-		if ($this->restrictiononfksoc == 2 && $socid && $this->element != 'societe') $sql.= ' AND (te.fk_soc = ' . $socid.' OR te.fk_soc IS NULL)';
-		if ($this->restrictiononfksoc && $socid && $this->element == 'societe') $sql.= ' AND te.rowid = ' . $socid;
+		if ($this->restrictiononfksoc == 1 && $socid && $this->element != 'societe') {
+		    $sql.= ' AND te.fk_soc = ' . $socid;
+		}
+		if ($this->restrictiononfksoc == 2 && $socid && $this->element != 'societe') {
+		    $sql.= ' AND (te.fk_soc = ' . $socid.' OR te.fk_soc IS NULL)';
+		}
+		if ($this->restrictiononfksoc && $socid && $this->element == 'societe') {
+		    $sql.= ' AND te.rowid = ' . $socid;
+		}
 		//print 'socid='.$socid.' restrictiononfksoc='.$this->restrictiononfksoc.' ismultientitymanaged = '.$this->ismultientitymanaged.' filter = '.$filter.' -> '.$sql."<br>";
 
 		$result = $this->db->query($sql);
@@ -1651,20 +1800,44 @@ 
 		if ($this->element == 'user' && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
 			$sql.= ",".MAIN_DB_PREFIX."usergroup_user as ug";
 		}
-		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) $sql.= ", ".MAIN_DB_PREFIX."societe as s";	// If we need to link to societe to limit select to entity
-		else if ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe as s";	// If we need to link to societe to limit select to socid
-		else if ($this->restrictiononfksoc == 2 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON te.fk_soc = s.rowid";	// If we need to link to societe to limit select to socid
-		if ($this->restrictiononfksoc && !$user->rights->societe->client->voir && !$socid) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON ".$alias.".rowid = sc.fk_soc";
+		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) {
+		    $sql.= ", ".MAIN_DB_PREFIX."societe as s";
+		}
+		// If we need to link to societe to limit select to entity
+		else if ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) {
+		    $sql.= ", ".MAIN_DB_PREFIX."societe as s";
+		}
+		// If we need to link to societe to limit select to socid
+		else if ($this->restrictiononfksoc == 2 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) {
+		    $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON te.fk_soc = s.rowid";
+		}
+		// If we need to link to societe to limit select to socid
+		if ($this->restrictiononfksoc && !$user->rights->societe->client->voir && !$socid) {
+		    $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON ".$alias.".rowid = sc.fk_soc";
+		}
 		$sql.= " WHERE te.".$fieldid." > '".$this->db->escape($this->ref)."'";  // ->ref must always be defined (set to id if field does not exists)
-		if ($this->restrictiononfksoc == 1 && !$user->rights->societe->client->voir && !$socid) $sql.= " AND sc.fk_user = " .$user->id;
-		if ($this->restrictiononfksoc == 2 && !$user->rights->societe->client->voir && !$socid) $sql.= " AND (sc.fk_user = " .$user->id.' OR te.fk_soc IS NULL)';
+		if ($this->restrictiononfksoc == 1 && !$user->rights->societe->client->voir && !$socid) {
+		    $sql.= " AND sc.fk_user = " .$user->id;
+		}
+		if ($this->restrictiononfksoc == 2 && !$user->rights->societe->client->voir && !$socid) {
+		    $sql.= " AND (sc.fk_user = " .$user->id.' OR te.fk_soc IS NULL)';
+		}
 		if (! empty($filter))
 		{
-			if (! preg_match('/^\s*AND/i', $filter)) $sql.=" AND ";   // For backward compatibility
+			if (! preg_match('/^\s*AND/i', $filter)) {
+			    $sql.=" AND ";
+			}
+			// For backward compatibility
 			$sql.=$filter;
 		}
-		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) $sql.= ' AND te.fk_soc = s.rowid';			// If we need to link to societe to limit select to entity
-		else if ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql.= ' AND te.fk_soc = s.rowid';			// If we need to link to societe to limit select to socid
+		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) {
+		    $sql.= ' AND te.fk_soc = s.rowid';
+		}
+		// If we need to link to societe to limit select to entity
+		else if ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) {
+		    $sql.= ' AND te.fk_soc = s.rowid';
+		}
+		// If we need to link to societe to limit select to socid
 		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) {
 			if ($this->element == 'user' && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
 				if (! empty($user->admin) && empty($user->entity) && $conf->entity == 1) {
@@ -1677,9 +1850,15 @@ 
 				$sql.= ' AND te.entity IN ('.getEntity($this->element).')';
 			}
 		}
-		if ($this->restrictiononfksoc == 1 && $socid && $this->element != 'societe') $sql.= ' AND te.fk_soc = ' . $socid;
-		if ($this->restrictiononfksoc == 2 && $socid && $this->element != 'societe') $sql.= ' AND (te.fk_soc = ' . $socid.' OR te.fk_soc IS NULL)';
-		if ($this->restrictiononfksoc && $socid && $this->element == 'societe') $sql.= ' AND te.rowid = ' . $socid;
+		if ($this->restrictiononfksoc == 1 && $socid && $this->element != 'societe') {
+		    $sql.= ' AND te.fk_soc = ' . $socid;
+		}
+		if ($this->restrictiononfksoc == 2 && $socid && $this->element != 'societe') {
+		    $sql.= ' AND (te.fk_soc = ' . $socid.' OR te.fk_soc IS NULL)';
+		}
+		if ($this->restrictiononfksoc && $socid && $this->element == 'societe') {
+		    $sql.= ' AND te.rowid = ' . $socid;
+		}
 		//print 'socid='.$socid.' restrictiononfksoc='.$this->restrictiononfksoc.' ismultientitymanaged = '.$this->ismultientitymanaged.' filter = '.$filter.' -> '.$sql."<br>";
 		// Rem: Bug in some mysql version: SELECT MIN(rowid) FROM llx_socpeople WHERE rowid > 1 when one row in database with rowid=1, returns 1 instead of null
 
@@ -1711,8 +1890,11 @@ 
 		$i = 0;
 		while ($i < $num)
 		{
-			if ($source == 'thirdparty') $contactAlreadySelected[$i] = $tab[$i]['socid'];
-			else  $contactAlreadySelected[$i] = $tab[$i]['id'];
+			if ($source == 'thirdparty') {
+			    $contactAlreadySelected[$i] = $tab[$i]['socid'];
+			} else {
+			    $contactAlreadySelected[$i] = $tab[$i]['id'];
+			}
 			$i++;
 		}
 		return $contactAlreadySelected;
@@ -1736,14 +1918,19 @@ 
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
 		if ($this->table_element == 'actioncomm')
 		{
-			if ($projectid) $sql.= ' SET fk_project = '.$projectid;
-			else $sql.= ' SET fk_project = NULL';
+			if ($projectid) {
+			    $sql.= ' SET fk_project = '.$projectid;
+			} else {
+			    $sql.= ' SET fk_project = NULL';
+			}
 			$sql.= ' WHERE id = '.$this->id;
-		}
-		else
+		} else
 		{
-			if ($projectid) $sql.= ' SET fk_projet = '.$projectid;
-			else $sql.= ' SET fk_projet = NULL';
+			if ($projectid) {
+			    $sql.= ' SET fk_projet = '.$projectid;
+			} else {
+			    $sql.= ' SET fk_projet = NULL';
+			}
 			$sql.= ' WHERE rowid = '.$this->id;
 		}
 
@@ -1752,8 +1939,7 @@ 
 		{
 			$this->fk_project = $projectid;
 			return 1;
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db);
 			return -1;
@@ -1773,8 +1959,12 @@ 
 		{
 			// TODO uniformize field name
 			$fieldname = 'fk_mode_reglement';
-			if ($this->element == 'societe') $fieldname = 'mode_reglement';
-			if (get_class($this) == 'Fournisseur') $fieldname = 'mode_reglement_supplier';
+			if ($this->element == 'societe') {
+			    $fieldname = 'mode_reglement';
+			}
+			if (get_class($this) == 'Fournisseur') {
+			    $fieldname = 'mode_reglement_supplier';
+			}
 
 			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
 			$sql .= ' SET '.$fieldname.' = '.$id;
@@ -1784,17 +1974,17 @@ 
 			{
 				$this->mode_reglement_id = $id;
 				// for supplier
-				if (get_class($this) == 'Fournisseur') $this->mode_reglement_supplier_id = $id;
+				if (get_class($this) == 'Fournisseur') {
+				    $this->mode_reglement_supplier_id = $id;
+				}
 				return 1;
-			}
-			else
+			} else
 			{
 				dol_syslog(get_class($this).'::setPaymentMethods Erreur '.$sql.' - '.$this->db->error());
 				$this->error=$this->db->error();
 				return -1;
 			}
-		}
-		else
+		} else
 		{
 			dol_syslog(get_class($this).'::setPaymentMethods, status of the object is incompatible');
 			$this->error='Status of the object is incompatible '.$this->statut;
@@ -1824,18 +2014,18 @@ 
 				$this->multicurrency_code = $code;
 
 				list($fk_multicurrency, $rate) = MultiCurrency::getIdAndTxFromCode($this->db, $code);
-				if ($rate) $this->setMulticurrencyRate($rate,2);
+				if ($rate) {
+				    $this->setMulticurrencyRate($rate,2);
+				}
 
 				return 1;
-			}
-			else
+			} else
 			{
 				dol_syslog(get_class($this).'::setMulticurrencyCode Erreur '.$sql.' - '.$this->db->error());
 				$this->error=$this->db->error();
 				return -1;
 			}
-		}
-		else
+		} else
 		{
 			dol_syslog(get_class($this).'::setMulticurrencyCode, status of the object is incompatible');
 			$this->error='Status of the object is incompatible '.$this->statut;
@@ -1929,15 +2119,13 @@ 
 				}
 
 				return 1;
-			}
-			else
+			} else
 			{
 				dol_syslog(get_class($this).'::setMulticurrencyRate Erreur '.$sql.' - '.$this->db->error());
 				$this->error=$this->db->error();
 				return -1;
 			}
-		}
-		else
+		} else
 		{
 			dol_syslog(get_class($this).'::setMulticurrencyRate, status of the object is incompatible');
 			$this->error='Status of the object is incompatible '.$this->statut;
@@ -1958,8 +2146,12 @@ 
 		{
 			// TODO uniformize field name
 			$fieldname = 'fk_cond_reglement';
-			if ($this->element == 'societe') $fieldname = 'cond_reglement';
-			if (get_class($this) == 'Fournisseur') $fieldname = 'cond_reglement_supplier';
+			if ($this->element == 'societe') {
+			    $fieldname = 'cond_reglement';
+			}
+			if (get_class($this) == 'Fournisseur') {
+			    $fieldname = 'cond_reglement_supplier';
+			}
 
 			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
 			$sql .= ' SET '.$fieldname.' = '.$id;
@@ -1969,18 +2161,18 @@ 
 			{
 				$this->cond_reglement_id = $id;
 				// for supplier
-				if (get_class($this) == 'Fournisseur') $this->cond_reglement_supplier_id = $id;
+				if (get_class($this) == 'Fournisseur') {
+				    $this->cond_reglement_supplier_id = $id;
+				}
 				$this->cond_reglement = $id;	// for compatibility
 				return 1;
-			}
-			else
+			} else
 			{
 				dol_syslog(get_class($this).'::setPaymentTerms Erreur '.$sql.' - '.$this->db->error());
 				$this->error=$this->db->error();
 				return -1;
 			}
-		}
-		else
+		} else
 		{
 			dol_syslog(get_class($this).'::setPaymentTerms, status of the object is incompatible');
 			$this->error='Status of the object is incompatible '.$this->statut;
@@ -1998,7 +2190,9 @@ 
 	function setDeliveryAddress($id)
 	{
 		$fieldname = 'fk_delivery_address';
-		if ($this->element == 'delivery' || $this->element == 'shipping') $fieldname = 'fk_address';
+		if ($this->element == 'delivery' || $this->element == 'shipping') {
+		    $fieldname = 'fk_address';
+		}
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET ".$fieldname." = ".$id;
 		$sql.= " WHERE rowid = ".$this->id." AND fk_statut = 0";
@@ -2007,8 +2201,7 @@ 
 		{
 			$this->fk_delivery_address = $id;
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->error();
 			dol_syslog(get_class($this).'::setDeliveryAddress Erreur '.$sql.' - '.$this->error);
@@ -2030,7 +2223,9 @@ 
 	{
         global $user;
 
-        if (empty($userused)) $userused=$user;
+        if (empty($userused)) {
+            $userused=$user;
+        }
 
         $error = 0;
 
@@ -2041,7 +2236,9 @@ 
 
         $this->db->begin();
 
-		if ($shipping_method_id<0) $shipping_method_id='NULL';
+		if ($shipping_method_id<0) {
+		    $shipping_method_id='NULL';
+		}
 		dol_syslog(get_class($this).'::setShippingMethod('.$shipping_method_id.')');
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
@@ -2058,7 +2255,9 @@ 
                 // Call trigger
                 $this->context=array('shippingmethodupdate'=>1);
                 $result = $this->call_trigger(strtoupper(get_class($this)) . '_MODIFY', $userused);
-                if ($result < 0) $error++;
+                if ($result < 0) {
+                    $error++;
+                }
                 // End call trigger
             }
         }
@@ -2086,7 +2285,9 @@ 
 			dol_syslog(get_class($this)."::setWarehouse was called on objet with property table_element not defined",LOG_ERR);
 			return -1;
 		}
-		if ($warehouse_id<0) $warehouse_id='NULL';
+		if ($warehouse_id<0) {
+		    $warehouse_id='NULL';
+		}
 		dol_syslog(get_class($this).'::setWarehouse('.$warehouse_id.')');
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
@@ -2133,8 +2334,7 @@ 
 		{
 			$this->modelpdf=$modelpdf;
 			return 1;
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db);
 			return 0;
@@ -2154,7 +2354,9 @@ 
 	{
         global $user;
 
-        if (empty($userused)) $userused=$user;
+        if (empty($userused)) {
+            $userused=$user;
+        }
 
         $error = 0;
 
@@ -2164,7 +2366,9 @@ 
 		}
         $this->db->begin();
 
-		if ($fk_account<0) $fk_account='NULL';
+		if ($fk_account<0) {
+		    $fk_account='NULL';
+		}
 		dol_syslog(get_class($this).'::setBankAccount('.$fk_account.')');
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
@@ -2177,15 +2381,16 @@ 
             dol_syslog(get_class($this).'::setBankAccount Error '.$sql.' - '.$this->db->error());
             $this->error = $this->db->lasterror();
             $error++;
-        }
-        else
+        } else
         {
             if (!$notrigger)
             {
                 // Call trigger
                 $this->context=array('bankaccountupdate'=>1);
                 $result = $this->call_trigger(strtoupper(get_class($this)) . '_MODIFY', $userused);
-                if ($result < 0) $error++;
+                if ($result < 0) {
+                    $error++;
+                }
                 // End call trigger
             }
         }
@@ -2193,8 +2398,7 @@ 
         {
             $this->db->rollback();
             return -1;
-        }
-        else
+        } else
         {
             $this->fk_account = ($fk_account=='NULL')?null:$fk_account;
             $this->db->commit();
@@ -2233,8 +2437,12 @@ 
 		$nl=0;
 		$sql = 'SELECT count(rowid) FROM '.MAIN_DB_PREFIX.$this->table_element_line;
 		$sql.= ' WHERE '.$this->fk_element.'='.$this->id;
-		if (! $renum) $sql.= ' AND rang = 0';
-		if ($renum) $sql.= ' AND rang <> 0';
+		if (! $renum) {
+		    $sql.= ' AND rang = 0';
+		}
+		if ($renum) {
+		    $sql.= ' AND rang <> 0';
+		}
 
 		dol_syslog(get_class($this)."::line_order", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -2242,8 +2450,9 @@ 
 		{
 			$row = $this->db->fetch_row($resql);
 			$nl = $row[0];
+		} else {
+		    dol_print_error($this->db);
 		}
-		else dol_print_error($this->db);
 		if ($nl > 0)
 		{
 			// The goal of this part is to reorder all lines, with all children lines sharing the same
@@ -2253,7 +2462,9 @@ 
 			// We first search all lines that are parent lines (for multilevel details lines)
 			$sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.$this->table_element_line;
 			$sql.= ' WHERE '.$this->fk_element.' = '.$this->id;
-			if ($fk_parent_line) $sql.= ' AND fk_parent_line IS NULL';
+			if ($fk_parent_line) {
+			    $sql.= ' AND fk_parent_line IS NULL';
+			}
 			$sql.= ' ORDER BY rang ASC, rowid '.$rowidorder;
 
 			dol_syslog(get_class($this)."::line_order search all parent lines", LOG_DEBUG);
@@ -2285,8 +2496,7 @@ 
 						$this->updateRangOfLine($row, ($key+1));
 					}
 				}
-			}
-			else
+			} else
 			{
 				dol_print_error($this->db);
 			}
@@ -2379,7 +2589,9 @@ 
 	function updateRangOfLine($rowid,$rang)
 	{
 		$fieldposition = 'rang';
-		if (in_array($this->table_element_line, array('ecm_files', 'emailcollector_emailcollectoraction'))) $fieldposition = 'position';
+		if (in_array($this->table_element_line, array('ecm_files', 'emailcollector_emailcollectoraction'))) {
+		    $fieldposition = 'position';
+		}
 
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element_line.' SET '.$fieldposition.' = '.$rang;
 		$sql.= ' WHERE rowid = '.$rowid;
@@ -2420,7 +2632,9 @@ 
 		if ($rang > 1)
 		{
 			$fieldposition = 'rang';
-			if (in_array($this->table_element_line, array('ecm_files', 'emailcollector_emailcollectoraction'))) $fieldposition = 'position';
+			if (in_array($this->table_element_line, array('ecm_files', 'emailcollector_emailcollectoraction'))) {
+			    $fieldposition = 'position';
+			}
 
 			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element_line.' SET '.$fieldposition.' = '.$rang ;
 			$sql.= ' WHERE '.$this->fk_element.' = '.$this->id;
@@ -2433,8 +2647,7 @@ 
 				{
 					dol_print_error($this->db);
 				}
-			}
-			else
+			} else
 			{
 				dol_print_error($this->db);
 			}
@@ -2454,7 +2667,9 @@ 
 		if ($rang < $max)
 		{
 			$fieldposition = 'rang';
-			if (in_array($this->table_element_line, array('ecm_files', 'emailcollector_emailcollectoraction'))) $fieldposition = 'position';
+			if (in_array($this->table_element_line, array('ecm_files', 'emailcollector_emailcollectoraction'))) {
+			    $fieldposition = 'position';
+			}
 
 			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element_line.' SET '.$fieldposition.' = '.$rang;
 			$sql.= ' WHERE '.$this->fk_element.' = '.$this->id;
@@ -2467,8 +2682,7 @@ 
 				{
 					dol_print_error($this->db);
 				}
-			}
-			else
+			} else
 			{
 				dol_print_error($this->db);
 			}
@@ -2539,8 +2753,7 @@ 
 				if (! empty($row[0]))
 				{
 					return $row[0];
-				}
-				else
+				} else
 				{
 					return $this->getRangOfLine($fk_parent_line);
 				}
@@ -2587,8 +2800,7 @@ 
 		{
 			$this->ref_ext = $ref_ext;
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->error();
 			return -1;
@@ -2622,7 +2834,9 @@ 
 		}
 		// Special cas
 		//var_dump($this->table_element);exit;
-		if ($this->table_element == 'product') $suffix='';
+		if ($this->table_element == 'product') {
+		    $suffix='';
+		}
 
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
 		$sql.= " SET note".$suffix." = ".(!empty($note)?("'".$this->db->escape($note)."'"):"NULL");
@@ -2632,16 +2846,17 @@ 
 		dol_syslog(get_class($this)."::update_note", LOG_DEBUG);
 		if ($this->db->query($sql))
 		{
-			if ($suffix == '_public') $this->note_public = $note;
-			else if ($suffix == '_private') $this->note_private = $note;
-			else
+			if ($suffix == '_public') {
+			    $this->note_public = $note;
+			} else if ($suffix == '_private') {
+			    $this->note_private = $note;
+			} else
 			{
 				$this->note = $note;      // deprecated
 				$this->note_private = $note;
 			}
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->lasterror();
 			return -1;
@@ -2681,36 +2896,45 @@ 
 
 		// Some external module want no update price after a trigger because they have another method to calculate the total (ex: with an extrafield)
 		$MODULE = "";
-		if ($this->element == 'propal')
-			$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_PROPOSAL";
-		elseif ($this->element == 'order')
-			$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_ORDER";
-		elseif ($this->element == 'facture')
-			$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_INVOICE";
-		elseif ($this->element == 'facture_fourn')
-			$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_SUPPLIER_INVOICE";
-		elseif ($this->element == 'order_supplier')
-			$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_SUPPLIER_ORDER";
-		elseif ($this->element == 'supplier_proposal')
-			$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_SUPPLIER_PROPOSAL";
+		if ($this->element == 'propal') {
+					$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_PROPOSAL";
+		} elseif ($this->element == 'order') {
+					$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_ORDER";
+		} elseif ($this->element == 'facture') {
+					$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_INVOICE";
+		} elseif ($this->element == 'facture_fourn') {
+					$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_SUPPLIER_INVOICE";
+		} elseif ($this->element == 'order_supplier') {
+					$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_SUPPLIER_ORDER";
+		} elseif ($this->element == 'supplier_proposal') {
+					$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_SUPPLIER_PROPOSAL";
+		}
 
 		if (! empty($MODULE)) {
 			if (! empty($conf->global->$MODULE)) {
 				$modsactivated = explode(',', $conf->global->$MODULE);
 				foreach ($modsactivated as $mod) {
-					if ($conf->$mod->enabled)
-						return 1; // update was disabled by specific setup
+					if ($conf->$mod->enabled) {
+											return 1;
+					}
+					// update was disabled by specific setup
 				}
 			}
 		}
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
 
-		if ($roundingadjust == '-1') $roundingadjust='auto';	// For backward compatibility
+		if ($roundingadjust == '-1') {
+		    $roundingadjust='auto';
+		}
+		// For backward compatibility
 
 		$forcedroundingmode=$roundingadjust;
-		if ($forcedroundingmode == 'auto' && isset($conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND)) $forcedroundingmode=$conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND;
-		elseif ($forcedroundingmode == 'auto') $forcedroundingmode='0';
+		if ($forcedroundingmode == 'auto' && isset($conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND)) {
+		    $forcedroundingmode=$conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND;
+		} elseif ($forcedroundingmode == 'auto') {
+		    $forcedroundingmode='0';
+		}
 
 		$error=0;
 
@@ -2733,15 +2957,22 @@ 
 
 		$sql = 'SELECT rowid, qty, '.$fieldup.' as up, remise_percent, total_ht, '.$fieldtva.' as total_tva, total_ttc, '.$fieldlocaltax1.' as total_localtax1, '.$fieldlocaltax2.' as total_localtax2,';
 		$sql.= ' tva_tx as vatrate, localtax1_tx, localtax2_tx, localtax1_type, localtax2_type, info_bits, product_type';
-			if ($this->table_element_line == 'facturedet') $sql.= ', situation_percent';
+			if ($this->table_element_line == 'facturedet') {
+			    $sql.= ', situation_percent';
+			}
 			$sql.= ', multicurrency_total_ht, multicurrency_total_tva, multicurrency_total_ttc';
 		$sql.= ' FROM '.MAIN_DB_PREFIX.$this->table_element_line;
 		$sql.= ' WHERE '.$this->fk_element.' = '.$this->id;
 		if ($exclspec)
 		{
 			$product_field='product_type';
-			if ($this->table_element_line == 'contratdet') $product_field='';    // contratdet table has no product_type field
-			if ($product_field) $sql.= ' AND '.$product_field.' <> 9';
+			if ($this->table_element_line == 'contratdet') {
+			    $product_field='';
+			}
+			// contratdet table has no product_type field
+			if ($product_field) {
+			    $sql.= ' AND '.$product_field.' <> 9';
+			}
 		}
 		$sql.= ' ORDER by rowid';	// We want to be sure to always use same order of line to not change lines differently when option MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND is used
 
@@ -2771,9 +3002,11 @@ 
 				$parameters=array('fk_element' => $obj->rowid);
 				$reshook = $hookmanager->executeHooks('changeRoundingMode', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 
-				if (empty($reshook) && $forcedroundingmode == '0')	// Check if data on line are consistent. This may solve lines that were not consistent because set with $forcedroundingmode='auto'
+				if (empty($reshook) && $forcedroundingmode == '0') {
+				    // Check if data on line are consistent. This may solve lines that were not consistent because set with $forcedroundingmode='auto'
 				{
 					$localtax_array=array($obj->localtax1_type,$obj->localtax1_tx,$obj->localtax2_type,$obj->localtax2_tx);
+				}
 					$tmpcal=calcul_price_total($obj->qty, $obj->up, $obj->remise_percent, $obj->vatrate, $obj->localtax1_tx, $obj->localtax2_tx, 0, 'HT', $obj->info_bits, $obj->product_type, $seller, $localtax_array, (isset($obj->situation_percent) ? $obj->situation_percent : 100), $multicurrency_tx);
 					$diff=price2num($tmpcal[1] - $obj->total_tva, 'MT', 1);
 					if ($diff)
@@ -2781,7 +3014,9 @@ 
 						$sqlfix="UPDATE ".MAIN_DB_PREFIX.$this->table_element_line." SET ".$fieldtva." = ".$tmpcal[1].", total_ttc = ".$tmpcal[2]." WHERE rowid = ".$obj->rowid;
 						dol_syslog('We found unconsistent data into detailed line (difference of '.$diff.') for line rowid = '.$obj->rowid." (total vat of line calculated=".$tmpcal[1].", database=".$obj->total_tva."). We fix the total_vat and total_ttc of line by running sqlfix = ".$sqlfix);
 								$resqlfix=$this->db->query($sqlfix);
-								if (! $resqlfix) dol_print_error($this->db,'Failed to update line');
+								if (! $resqlfix) {
+								    dol_print_error($this->db,'Failed to update line');
+								}
 								$obj->total_tva = $tmpcal[1];
 								$obj->total_ttc = $tmpcal[2];
 						//
@@ -2797,16 +3032,24 @@ 
 				$this->multicurrency_total_tva       += $obj->multicurrency_total_tva;
 				$this->multicurrency_total_ttc       += $obj->multicurrency_total_ttc;
 
-				if (! isset($total_ht_by_vats[$obj->vatrate]))  $total_ht_by_vats[$obj->vatrate]=0;
-				if (! isset($total_tva_by_vats[$obj->vatrate])) $total_tva_by_vats[$obj->vatrate]=0;
-				if (! isset($total_ttc_by_vats[$obj->vatrate])) $total_ttc_by_vats[$obj->vatrate]=0;
+				if (! isset($total_ht_by_vats[$obj->vatrate])) {
+				    $total_ht_by_vats[$obj->vatrate]=0;
+				}
+				if (! isset($total_tva_by_vats[$obj->vatrate])) {
+				    $total_tva_by_vats[$obj->vatrate]=0;
+				}
+				if (! isset($total_ttc_by_vats[$obj->vatrate])) {
+				    $total_ttc_by_vats[$obj->vatrate]=0;
+				}
 				$total_ht_by_vats[$obj->vatrate]  += $obj->total_ht;
 				$total_tva_by_vats[$obj->vatrate] += $obj->total_tva;
 				$total_ttc_by_vats[$obj->vatrate] += $obj->total_ttc;
 
-				if ($forcedroundingmode == '1')	// Check if we need adjustement onto line for vat. TODO This works on the company currency but not on multicurrency
+				if ($forcedroundingmode == '1') {
+				    // Check if we need adjustement onto line for vat. TODO This works on the company currency but not on multicurrency
 				{
 					$tmpvat=price2num($total_ht_by_vats[$obj->vatrate] * $obj->vatrate / 100, 'MT', 1);
+				}
 					$diff=price2num($total_tva_by_vats[$obj->vatrate]-$tmpvat, 'MT', 1);
 					//print 'Line '.$i.' rowid='.$obj->rowid.' vat_rate='.$obj->vatrate.' total_ht='.$obj->total_ht.' total_tva='.$obj->total_tva.' total_ttc='.$obj->total_ttc.' total_ht_by_vats='.$total_ht_by_vats[$obj->vatrate].' total_tva_by_vats='.$total_tva_by_vats[$obj->vatrate].' (new calculation = '.$tmpvat.') total_ttc_by_vats='.$total_ttc_by_vats[$obj->vatrate].($diff?" => DIFF":"")."<br>\n";
 					if ($diff)
@@ -2815,7 +3058,9 @@ 
 						$sqlfix="UPDATE ".MAIN_DB_PREFIX.$this->table_element_line." SET ".$fieldtva." = ".($obj->total_tva - $diff).", total_ttc = ".($obj->total_ttc - $diff)." WHERE rowid = ".$obj->rowid;
 						dol_syslog('We found a difference of '.$diff.' for line rowid = '.$obj->rowid.". We fix the total_vat and total_ttc of line by running sqlfix = ".$sqlfix);
 								$resqlfix=$this->db->query($sqlfix);
-								if (! $resqlfix) dol_print_error($this->db,'Failed to update line');
+								if (! $resqlfix) {
+								    dol_print_error($this->db,'Failed to update line');
+								}
 								$this->total_tva -= $diff;
 								$this->total_ttc -= $diff;
 								$total_tva_by_vats[$obj->vatrate] -= $diff;
@@ -2856,11 +3101,21 @@ 
 			$fieldlocaltax2='localtax2';
 			$fieldttc='total_ttc';
 			// Specific code for backward compatibility with old field names
-			if ($this->element == 'facture' || $this->element == 'facturerec')             $fieldht='total';
-			if ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier') $fieldtva='total_tva';
-			if ($this->element == 'propal')                                                $fieldttc='total';
-			if ($this->element == 'expensereport')                                         $fieldtva='total_tva';
-			if ($this->element == 'supplier_proposal')                                     $fieldttc='total';
+			if ($this->element == 'facture' || $this->element == 'facturerec') {
+			    $fieldht='total';
+			}
+			if ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier') {
+			    $fieldtva='total_tva';
+			}
+			if ($this->element == 'propal') {
+			    $fieldttc='total';
+			}
+			if ($this->element == 'expensereport') {
+			    $fieldtva='total_tva';
+			}
+			if ($this->element == 'supplier_proposal') {
+			    $fieldttc='total';
+			}
 
 			if (empty($nodatabaseupdate))
 			{
@@ -2889,13 +3144,11 @@ 
 			if (! $error)
 			{
 				return 1;
-			}
-			else
+			} else
 			{
 				return -1;
 			}
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db,'Bad request in update_price');
 			return -1;
@@ -2918,10 +3171,18 @@ 
 		$origin_id = (! empty($origin_id) ? $origin_id : $this->origin_id);
 
 		// Special case
-		if ($origin == 'order') $origin='commande';
-		if ($origin == 'invoice') $origin='facture';
-		if ($origin == 'invoice_template') $origin='facturerec';
-    	if ($origin == 'supplierorder') $origin='order_supplier';
+		if ($origin == 'order') {
+		    $origin='commande';
+		}
+		if ($origin == 'invoice') {
+		    $origin='facture';
+		}
+		if ($origin == 'invoice_template') {
+		    $origin='facturerec';
+		}
+    	if ($origin == 'supplierorder') {
+    	    $origin='order_supplier';
+    	}
 		$this->db->begin();
 
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."element_element (";
@@ -2941,8 +3202,7 @@ 
 	  	{
 	  		$this->db->commit();
 	  		return 1;
-	  	}
-	  	else
+	  	} else
 	  	{
 	  		$this->error=$this->db->lasterror();
 	  		$this->db->rollback();
@@ -2987,12 +3247,16 @@ 
 		if (! empty($sourceid) && ! empty($sourcetype) && empty($targetid))
 		{
 			$justsource=true;  // the source (id and type) is a search criteria
-			if (! empty($targettype)) $withtargettype=true;
+			if (! empty($targettype)) {
+			    $withtargettype=true;
+			}
 		}
 		if (! empty($targetid) && ! empty($targettype) && empty($sourceid))
 		{
 			$justtarget=true;  // the target (id and type) is a search criteria
-			if (! empty($sourcetype)) $withsourcetype=true;
+			if (! empty($sourcetype)) {
+			    $withsourcetype=true;
+			}
 		}
 
 		$sourceid = (! empty($sourceid) ? $sourceid : $this->id);
@@ -3015,15 +3279,17 @@ 
 			if ($justsource)
 			{
 				$sql.= "fk_source = ".$sourceid." AND sourcetype = '".$sourcetype."'";
-				if ($withtargettype) $sql.= " AND targettype = '".$targettype."'";
-			}
-			else if ($justtarget)
+				if ($withtargettype) {
+				    $sql.= " AND targettype = '".$targettype."'";
+				}
+			} else if ($justtarget)
 			{
 				$sql.= "fk_target = ".$targetid." AND targettype = '".$targettype."'";
-				if ($withsourcetype) $sql.= " AND sourcetype = '".$sourcetype."'";
+				if ($withsourcetype) {
+				    $sql.= " AND sourcetype = '".$sourcetype."'";
+				}
 			}
-		}
-		else
+		} else
 		{
 			$sql.= "(fk_source = ".$sourceid." AND sourcetype = '".$sourcetype."')";
 			$sql.= " ".$clause." (fk_target = ".$targetid." AND targettype = '".$targettype."')";
@@ -3044,13 +3310,11 @@ 
 					if ($justsource)
 					{
 						$this->linkedObjectsIds[$obj->targettype][$obj->rowid]=$obj->fk_target;
-					}
-					else if ($justtarget)
+					} else if ($justtarget)
 					{
 						$this->linkedObjectsIds[$obj->sourcetype][$obj->rowid]=$obj->fk_source;
 					}
-				}
-				else
+				} else
 				{
 					if ($obj->fk_source == $sourceid && $obj->sourcetype == $sourcetype)
 					{
@@ -3067,10 +3331,12 @@ 
 			if (! empty($this->linkedObjectsIds))
 			{
 				$tmparray = $this->linkedObjectsIds;
-				foreach($tmparray as $objecttype => $objectids)       // $objecttype is a module name ('facture', 'mymodule', ...) or a module name with a suffix ('project_task', 'mymodule_myobj', ...)
+				foreach($tmparray as $objecttype => $objectids) {
+				    // $objecttype is a module name ('facture', 'mymodule', ...) or a module name with a suffix ('project_task', 'mymodule_myobj', ...)
 				{
 					// Parse element/subelement (ex: project_task, cabinetmed_consultation, ...)
 					$module = $element = $subelement = $objecttype;
+				}
 					if ($objecttype != 'supplier_proposal' && $objecttype != 'order_supplier' && $objecttype != 'invoice_supplier'
 						&& preg_match('/^([^_]+)_([^_]+)/i',$objecttype,$regs))
 					{
@@ -3082,29 +3348,21 @@ 
 					// To work with non standard classpath or module name
 					if ($objecttype == 'facture')			{
 						$classpath = 'compta/facture/class';
-					}
-					else if ($objecttype == 'facturerec')			{
+					} else if ($objecttype == 'facturerec')			{
 						$classpath = 'compta/facture/class'; $module = 'facture';
-					}
-					else if ($objecttype == 'propal')			{
+					} else if ($objecttype == 'propal')			{
 						$classpath = 'comm/propal/class';
-					}
-					else if ($objecttype == 'supplier_proposal')			{
+					} else if ($objecttype == 'supplier_proposal')			{
 						$classpath = 'supplier_proposal/class';
-					}
-					else if ($objecttype == 'shipping')			{
+					} else if ($objecttype == 'shipping')			{
 						$classpath = 'expedition/class'; $subelement = 'expedition'; $module = 'expedition_bon';
-					}
-					else if ($objecttype == 'delivery')			{
+					} else if ($objecttype == 'delivery')			{
 						$classpath = 'livraison/class'; $subelement = 'livraison'; $module = 'livraison_bon';
-					}
-					else if ($objecttype == 'invoice_supplier' || $objecttype == 'order_supplier')	{
+					} else if ($objecttype == 'invoice_supplier' || $objecttype == 'order_supplier')	{
 						$classpath = 'fourn/class'; $module = 'fournisseur';
-					}
-					else if ($objecttype == 'fichinter')			{
+					} else if ($objecttype == 'fichinter')			{
 						$classpath = 'fichinter/class'; $subelement = 'fichinter'; $module = 'ficheinter';
-					}
-					else if ($objecttype == 'subscription')			{
+					} else if ($objecttype == 'subscription')			{
 						$classpath = 'adherents/class'; $module = 'adherent';
 					}
 
@@ -3113,20 +3371,15 @@ 
 
 					if ($objecttype == 'order') {
 						$classfile = 'commande'; $classname = 'Commande';
-					}
-					else if ($objecttype == 'invoice_supplier') {
+					} else if ($objecttype == 'invoice_supplier') {
 						$classfile = 'fournisseur.facture'; $classname = 'FactureFournisseur';
-					}
-					else if ($objecttype == 'order_supplier')   {
+					} else if ($objecttype == 'order_supplier')   {
 						$classfile = 'fournisseur.commande'; $classname = 'CommandeFournisseur';
-					}
-					else if ($objecttype == 'supplier_proposal')   {
+					} else if ($objecttype == 'supplier_proposal')   {
 						$classfile = 'supplier_proposal'; $classname = 'SupplierProposal';
-					}
-					else if ($objecttype == 'facturerec')   {
+					} else if ($objecttype == 'facturerec')   {
 						$classfile = 'facture-rec'; $classname = 'FactureRec';
-					}
-					else if ($objecttype == 'subscription')   {
+					} else if ($objecttype == 'subscription')   {
 						$classfile = 'subscription'; $classname = 'Subscription';
 					}
 
@@ -3139,9 +3392,11 @@ 
 							//print '/'.$classpath.'/'.$classfile.'.class.php '.class_exists($classname);
 							if (class_exists($classname))
 							{
-								foreach($objectids as $i => $objectid)	// $i is rowid into llx_element_element
+								foreach($objectids as $i => $objectid) {
+								    // $i is rowid into llx_element_element
 								{
 									$object = new $classname($this->db);
+								}
 									$ret = $object->fetch($objectid);
 									if ($ret >= 0)
 									{
@@ -3150,16 +3405,14 @@ 
 								}
 							}
 						}
-					}
-					else
+					} else
 					{
 						unset($this->linkedObjectsIds[$objecttype]);
 					}
 				}
 			}
 			return 1;
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db);
 			return -1;
@@ -3181,8 +3434,11 @@ 
 		$updatesource=false;
 		$updatetarget=false;
 
-		if (! empty($sourceid) && ! empty($sourcetype) && empty($targetid) && empty($targettype)) $updatesource=true;
-		else if (empty($sourceid) && empty($sourcetype) && ! empty($targetid) && ! empty($targettype)) $updatetarget=true;
+		if (! empty($sourceid) && ! empty($sourcetype) && empty($targetid) && empty($targettype)) {
+		    $updatesource=true;
+		} else if (empty($sourceid) && empty($sourcetype) && ! empty($targetid) && ! empty($targettype)) {
+		    $updatetarget=true;
+		}
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."element_element SET ";
 		if ($updatesource)
@@ -3191,8 +3447,7 @@ 
 			$sql.= ", sourcetype = '".$this->db->escape($sourcetype)."'";
 			$sql.= " WHERE fk_target = ".$this->id;
 			$sql.= " AND targettype = '".$this->db->escape($this->element)."'";
-		}
-		else if ($updatetarget)
+		} else if ($updatetarget)
 		{
 			$sql.= "fk_target = ".$targetid;
 			$sql.= ", targettype = '".$this->db->escape($targettype)."'";
@@ -3204,8 +3459,7 @@ 
 		if ($this->db->query($sql))
 		{
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->lasterror();
 			return -1;
@@ -3228,8 +3482,11 @@ 
 		$deletesource=false;
 		$deletetarget=false;
 
-		if (! empty($sourceid) && ! empty($sourcetype) && empty($targetid) && empty($targettype)) $deletesource=true;
-		else if (empty($sourceid) && empty($sourcetype) && ! empty($targetid) && ! empty($targettype)) $deletetarget=true;
+		if (! empty($sourceid) && ! empty($sourcetype) && empty($targetid) && empty($targettype)) {
+		    $deletesource=true;
+		} else if (empty($sourceid) && empty($sourcetype) && ! empty($targetid) && ! empty($targettype)) {
+		    $deletetarget=true;
+		}
 
 		$sourceid = (! empty($sourceid) ? $sourceid : $this->id);
 		$sourcetype = (! empty($sourcetype) ? $sourcetype : $this->element);
@@ -3241,20 +3498,17 @@ 
 		if ($rowid > 0)
 		{
 			$sql.=" rowid = ".$rowid;
-		}
-		else
+		} else
 		{
 			if ($deletesource)
 			{
 				$sql.= " fk_source = ".$sourceid." AND sourcetype = '".$this->db->escape($sourcetype)."'";
 				$sql.= " AND fk_target = ".$this->id." AND targettype = '".$this->db->escape($this->element)."'";
-			}
-			else if ($deletetarget)
+			} else if ($deletetarget)
 			{
 				$sql.= " fk_target = ".$targetid." AND targettype = '".$this->db->escape($targettype)."'";
 				$sql.= " AND fk_source = ".$this->id." AND sourcetype = '".$this->db->escape($this->element)."'";
-			}
-			else
+			} else
 			{
 				$sql.= " (fk_source = ".$this->id." AND sourcetype = '".$this->db->escape($this->element)."')";
 				$sql.= " OR";
@@ -3266,8 +3520,7 @@ 
 		if ($this->db->query($sql))
 		{
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->lasterror();
 			$this->errors[]=$this->error;
@@ -3296,17 +3549,31 @@ 
 		$this->db->begin();
 
 		$fieldstatus="fk_statut";
-		if ($elementTable == 'facture_rec') $fieldstatus="suspended";
-		if ($elementTable == 'mailing') $fieldstatus="statut";
-		if ($elementTable == 'cronjob') $fieldstatus="status";
-		if ($elementTable == 'user') $fieldstatus="statut";
-		if ($elementTable == 'expensereport') $fieldstatus="fk_statut";
-		if ($elementTable == 'commande_fournisseur_dispatch') $fieldstatus="status";
+		if ($elementTable == 'facture_rec') {
+		    $fieldstatus="suspended";
+		}
+		if ($elementTable == 'mailing') {
+		    $fieldstatus="statut";
+		}
+		if ($elementTable == 'cronjob') {
+		    $fieldstatus="status";
+		}
+		if ($elementTable == 'user') {
+		    $fieldstatus="statut";
+		}
+		if ($elementTable == 'expensereport') {
+		    $fieldstatus="fk_statut";
+		}
+		if ($elementTable == 'commande_fournisseur_dispatch') {
+		    $fieldstatus="status";
+		}
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$elementTable;
 		$sql.= " SET ".$fieldstatus." = ".$status;
 		// If status = 1 = validated, update also fk_user_valid
-		if ($status == 1 && $elementTable == 'expensereport') $sql.=", fk_user_valid = ".$user->id;
+		if ($status == 1 && $elementTable == 'expensereport') {
+		    $sql.=", fk_user_valid = ".$user->id;
+		}
 		$sql.= " WHERE rowid=".$elementId;
 
 		dol_syslog(get_class($this)."::setStatut", LOG_DEBUG);
@@ -3317,12 +3584,27 @@ 
 			// Try autoset of trigkey
 			if (empty($trigkey))
 			{
-				if ($this->element == 'supplier_proposal' && $status == 2) $trigkey='SUPPLIER_PROPOSAL_SIGN';   // 2 = SupplierProposal::STATUS_SIGNED. Can't use constant into this generic class
-				if ($this->element == 'supplier_proposal' && $status == 3) $trigkey='SUPPLIER_PROPOSAL_REFUSE'; // 3 = SupplierProposal::STATUS_REFUSED. Can't use constant into this generic class
-				if ($this->element == 'supplier_proposal' && $status == 4) $trigkey='SUPPLIER_PROPOSAL_CLOSE';  // 4 = SupplierProposal::STATUS_CLOSED. Can't use constant into this generic class
-				if ($this->element == 'fichinter' && $status == 3) $trigkey='FICHINTER_CLASSIFY_DONE';
-				if ($this->element == 'fichinter' && $status == 2) $trigkey='FICHINTER_CLASSIFY_BILLED';
-				if ($this->element == 'fichinter' && $status == 1) $trigkey='FICHINTER_CLASSIFY_UNBILLED';
+				if ($this->element == 'supplier_proposal' && $status == 2) {
+				    $trigkey='SUPPLIER_PROPOSAL_SIGN';
+				}
+				// 2 = SupplierProposal::STATUS_SIGNED. Can't use constant into this generic class
+				if ($this->element == 'supplier_proposal' && $status == 3) {
+				    $trigkey='SUPPLIER_PROPOSAL_REFUSE';
+				}
+				// 3 = SupplierProposal::STATUS_REFUSED. Can't use constant into this generic class
+				if ($this->element == 'supplier_proposal' && $status == 4) {
+				    $trigkey='SUPPLIER_PROPOSAL_CLOSE';
+				}
+				// 4 = SupplierProposal::STATUS_CLOSED. Can't use constant into this generic class
+				if ($this->element == 'fichinter' && $status == 3) {
+				    $trigkey='FICHINTER_CLASSIFY_DONE';
+				}
+				if ($this->element == 'fichinter' && $status == 2) {
+				    $trigkey='FICHINTER_CLASSIFY_BILLED';
+				}
+				if ($this->element == 'fichinter' && $status == 1) {
+				    $trigkey='FICHINTER_CLASSIFY_UNBILLED';
+				}
 			}
 
 			if ($trigkey)
@@ -3341,22 +3623,22 @@ 
 			{
 				$this->db->commit();
 
-				if (empty($savElementId))    // If the element we update was $this (so $elementId is null)
+				if (empty($savElementId)) {
+				    // If the element we update was $this (so $elementId is null)
 				{
 					$this->statut = $status;
+				}
 					$this->status = $status;
 				}
 
 				return 1;
-			}
-			else
+			} else
 			{
 				$this->db->rollback();
 				dol_syslog(get_class($this)."::setStatus ".$this->error,LOG_ERR);
 				return -1;
 			}
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->lasterror();
 			$this->db->rollback();
@@ -3376,8 +3658,13 @@ 
 	{
 		global $conf;
 
-		if (empty($id) && empty($ref)) return 0;
-		if (! empty($conf->global->MAIN_DISABLE_CANVAS)) return 0;    // To increase speed. Not enabled by default.
+		if (empty($id) && empty($ref)) {
+		    return 0;
+		}
+		if (! empty($conf->global->MAIN_DISABLE_CANVAS)) {
+		    return 0;
+		}
+		// To increase speed. Not enabled by default.
 
 		// Clean parameters
 		$ref = trim($ref);
@@ -3385,8 +3672,12 @@ 
 		$sql = "SELECT rowid, canvas";
 		$sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element;
 		$sql.= " WHERE entity IN (".getEntity($this->element).")";
-		if (! empty($id))  $sql.= " AND rowid = ".$id;
-		if (! empty($ref)) $sql.= " AND ref = '".$this->db->escape($ref)."'";
+		if (! empty($id)) {
+		    $sql.= " AND rowid = ".$id;
+		}
+		if (! empty($ref)) {
+		    $sql.= " AND ref = '".$this->db->escape($ref)."'";
+		}
 
 		$resql = $this->db->query($sql);
 		if ($resql)
@@ -3396,10 +3687,10 @@ 
 			{
 				$this->canvas   = $obj->canvas;
 				return 1;
+			} else {
+			    return 0;
 			}
-			else return 0;
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db);
 			return -1;
@@ -3436,7 +3727,9 @@ 
 	{
 		global $langs;
 
-		if (empty($id)) $id=$this->id;
+		if (empty($id)) {
+		    $id=$this->id;
+		}
 
 		// Check parameters
 		if (! isset($this->childtables) || ! is_array($this->childtables) || count($this->childtables) == 0)
@@ -3470,18 +3763,18 @@ 
 					$langs->load("errors");
 					//print 'Found into table '.$table.', type '.$langs->transnoentitiesnoconv($elementname).', haschild='.$haschild;
 					$haschild += $obj->nb;
-					if (is_numeric($elementname))	// old usage
+					if (is_numeric($elementname)) {
+					    // old usage
 					{
 						$this->errors[]=$langs->trans("ErrorRecordHasAtLeastOneChildOfType", $table);
 					}
-					else	// new usage: $elementname=Translation key
+					} else	// new usage: $elementname=Translation key
 					{
 						$this->errors[]=$langs->trans("ErrorRecordHasAtLeastOneChildOfType", $langs->transnoentitiesnoconv($elementname));
 					}
 					break;    // We found at least one, we stop here
 				}
-			}
-			else
+			} else
 			{
 				$this->errors[]=$this->db->lasterror();
 				return -1;
@@ -3491,8 +3784,9 @@ 
 		{
 			$this->errors[]="ErrorRecordHasChildren";
 			return $haschild;
+		} else {
+		    return 0;
 		}
-		else return 0;
 	}
 
 	/**
@@ -3508,12 +3802,24 @@ 
 		foreach($this->lines as $key => $val)
 		{
 			$qualified=0;
-			if ($predefined == -1) $qualified=1;
-			if ($predefined == 1 && $val->fk_product > 0) $qualified=1;
-			if ($predefined == 0 && $val->fk_product <= 0) $qualified=1;
-			if ($predefined == 2 && $val->fk_product > 0 && $val->product_type==0) $qualified=1;
-			if ($predefined == 3 && $val->fk_product > 0 && $val->product_type==1) $qualified=1;
-			if ($qualified) $nb++;
+			if ($predefined == -1) {
+			    $qualified=1;
+			}
+			if ($predefined == 1 && $val->fk_product > 0) {
+			    $qualified=1;
+			}
+			if ($predefined == 0 && $val->fk_product <= 0) {
+			    $qualified=1;
+			}
+			if ($predefined == 2 && $val->fk_product > 0 && $val->product_type==0) {
+			    $qualified=1;
+			}
+			if ($predefined == 3 && $val->fk_product > 0 && $val->product_type==1) {
+			    $qualified=1;
+			}
+			if ($qualified) {
+			    $nb++;
+			}
 		}
 		dol_syslog(get_class($this).'::hasProductsOrServices we found '.$nb.' qualified lines of products/servcies');
 		return $nb;
@@ -3577,16 +3883,24 @@ 
 		{
 			if (isset($line->qty_asked))
 			{
-				if (empty($totalOrdered)) $totalOrdered=0;  // Avoid warning because $totalOrdered is ''
+				if (empty($totalOrdered)) {
+				    $totalOrdered=0;
+				}
+				// Avoid warning because $totalOrdered is ''
 				$totalOrdered+=$line->qty_asked;    // defined for shipment only
 			}
 			if (isset($line->qty_shipped))
 			{
-				if (empty($totalToShip)) $totalToShip=0;    // Avoid warning because $totalToShip is ''
+				if (empty($totalToShip)) {
+				    $totalToShip=0;
+				}
+				// Avoid warning because $totalToShip is ''
 				$totalToShip+=$line->qty_shipped;   // defined for shipment only
-            }else if ($line->element == 'commandefournisseurdispatch' && isset($line->qty))
+            } else if ($line->element == 'commandefournisseurdispatch' && isset($line->qty))
             {
-                if (empty($totalToShip)) $totalToShip=0;
+                if (empty($totalToShip)) {
+                    $totalToShip=0;
+                }
                 $totalToShip+=$line->qty;   // defined for reception only
 			}
 
@@ -3594,8 +3908,7 @@ 
 			if ($this->element == 'shipping') {
 				// for shipments
 				$qty = $line->qty_shipped ? $line->qty_shipped : 0;
-			}
-			else {
+			} else {
 				$qty = $line->qty ? $line->qty : 0;
 			}
 
@@ -3611,19 +3924,30 @@ 
 
 			$weightUnit=0;
 			$volumeUnit=0;
-			if (! empty($weight_units)) $weightUnit = $weight_units;
-			if (! empty($volume_units)) $volumeUnit = $volume_units;
+			if (! empty($weight_units)) {
+			    $weightUnit = $weight_units;
+			}
+			if (! empty($volume_units)) {
+			    $volumeUnit = $volume_units;
+			}
 
-			if (empty($totalWeight)) $totalWeight=0;  // Avoid warning because $totalWeight is ''
-			if (empty($totalVolume)) $totalVolume=0;  // Avoid warning because $totalVolume is ''
+			if (empty($totalWeight)) {
+			    $totalWeight=0;
+			}
+			// Avoid warning because $totalWeight is ''
+			if (empty($totalVolume)) {
+			    $totalVolume=0;
+			}
+			// Avoid warning because $totalVolume is ''
 
 			//var_dump($line->volume_units);
-			if ($weight_units < 50)   // >50 means a standard unit (power of 10 of official unit), > 50 means an exotic unit (like inch)
+			if ($weight_units < 50) {
+			    // >50 means a standard unit (power of 10 of official unit), > 50 means an exotic unit (like inch)
 			{
 				$trueWeightUnit=pow(10, $weightUnit);
-				$totalWeight += $weight * $qty * $trueWeightUnit;
 			}
-			else {
+				$totalWeight += $weight * $qty * $trueWeightUnit;
+			} else {
 		if ($weight_units == 99) {
 			// conversion 1 Pound = 0.45359237 KG
 			$trueWeightUnit = 0.45359237;
@@ -3632,18 +3956,20 @@ 
 			// conversion 1 Ounce = 0.0283495 KG
 			$trueWeightUnit = 0.0283495;
 			$totalWeight += $weight * $qty * $trueWeightUnit;
+		} else {
+							$totalWeight += $weight * $qty;
 		}
-		else
-					$totalWeight += $weight * $qty;   // This may be wrong if we mix different units
+		// This may be wrong if we mix different units
 			}
-			if ($volume_units < 50)   // >50 means a standard unit (power of 10 of official unit), > 50 means an exotic unit (like inch)
+			if ($volume_units < 50) {
+			    // >50 means a standard unit (power of 10 of official unit), > 50 means an exotic unit (like inch)
 			{
 				//print $line->volume."x".$line->volume_units."x".($line->volume_units < 50)."x".$volumeUnit;
 				$trueVolumeUnit=pow(10, $volumeUnit);
+			}
 				//print $line->volume;
 				$totalVolume += $volume * $qty * $trueVolumeUnit;
-			}
-			else
+			} else
 			{
 				$totalVolume += $volume * $qty;   // This may be wrong if we mix different units
 			}
@@ -3675,8 +4001,7 @@ 
 			$this->error=$this->db->lasterror();
 			$this->db->rollback();
 			return -1;
-		}
-		else
+		} else
 		{
 			$this->db->commit();
 			return 1;
@@ -3728,13 +4053,11 @@ 
 			{
 				$res = $this->db->fetch_object($resql);
 				return 'Incoterm : '.$res->code.' - '.$this->location_incoterms;
-			}
-			else
+			} else
 			{
 				return '';
 			}
-		}
-		else
+		} else
 		{
 			$this->errors[] = $this->db->lasterror();
 			return false;
@@ -3771,14 +4094,14 @@ 
 					$this->libelle_incoterms = $obj->libelle;
 				}
 				return 1;
-			}
-			else
+			} else
 			{
 				$this->errors[] = $this->db->lasterror();
 				return -1;
 			}
+		} else {
+		    return -1;
 		}
-		else return -1;
 	}
 
 
@@ -3817,7 +4140,9 @@ 
 			} else {
 				$res=include $tpl; // for debug
 			}
-			if ($res) break;
+			if ($res) {
+			    break;
+			}
 		}
 	}
 
@@ -3847,7 +4172,9 @@ 
 
 		// Define usemargins
 		$usemargins=0;
-		if (! empty($conf->margin->enabled) && ! empty($this->element) && in_array($this->element,array('facture','propal','commande'))) $usemargins=1;
+		if (! empty($conf->margin->enabled) && ! empty($this->element) && in_array($this->element,array('facture','propal','commande'))) {
+		    $usemargins=1;
+		}
 
 		$num = count($this->lines);
 
@@ -3866,7 +4193,9 @@ 
 			print '<tr class="liste_titre nodrag nodrop">';
 
 			// Adds a line numbering column
-			if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER)) print '<td class="linecolnum" align="center" width="5">&nbsp;</td>';
+			if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER)) {
+			    print '<td class="linecolnum" align="center" width="5">&nbsp;</td>';
+			}
 
 			// Description
 			print '<td class="linecoldescription">'.$langs->trans('Description').'</td>';
@@ -3883,9 +4212,13 @@ 
 			print '<td class="linecoluht" align="right" width="80">'.$langs->trans('PriceUHT').'</td>';
 
 			// Multicurrency
-			if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) print '<td class="linecoluht_currency" align="right" width="80">'.$langs->trans('PriceUHTCurrency', $this->multicurrency_code).'</td>';
+			if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) {
+			    print '<td class="linecoluht_currency" align="right" width="80">'.$langs->trans('PriceUHTCurrency', $this->multicurrency_code).'</td>';
+			}
 
-			if ($inputalsopricewithtax) print '<td align="right" width="80">'.$langs->trans('PriceUTTC').'</td>';
+			if ($inputalsopricewithtax) {
+			    print '<td align="right" width="80">'.$langs->trans('PriceUTTC').'</td>';
+			}
 
 			// Qty
 			print '<td class="linecolqty" align="right">'.$langs->trans('Qty').'</td>';
@@ -3906,25 +4239,32 @@ 
 			{
 				if (!empty($user->rights->margins->creer))
 				{
-					if ($conf->global->MARGIN_TYPE == "1")
-						print '<td class="linecolmargin1 margininfos" align="right" width="80">'.$langs->trans('BuyingPrice').'</td>';
-					else
-						print '<td class="linecolmargin1 margininfos" align="right" width="80">'.$langs->trans('CostPrice').'</td>';
+					if ($conf->global->MARGIN_TYPE == "1") {
+											print '<td class="linecolmargin1 margininfos" align="right" width="80">'.$langs->trans('BuyingPrice').'</td>';
+					} else {
+											print '<td class="linecolmargin1 margininfos" align="right" width="80">'.$langs->trans('CostPrice').'</td>';
+					}
 				}
 
-				if (! empty($conf->global->DISPLAY_MARGIN_RATES) && $user->rights->margins->liretous)
-					print '<td class="linecolmargin2 margininfos" align="right" width="50">'.$langs->trans('MarginRate').'</td>';
-				if (! empty($conf->global->DISPLAY_MARK_RATES) && $user->rights->margins->liretous)
-					print '<td class="linecolmargin2 margininfos" align="right" width="50">'.$langs->trans('MarkRate').'</td>';
+				if (! empty($conf->global->DISPLAY_MARGIN_RATES) && $user->rights->margins->liretous) {
+									print '<td class="linecolmargin2 margininfos" align="right" width="50">'.$langs->trans('MarginRate').'</td>';
+				}
+				if (! empty($conf->global->DISPLAY_MARK_RATES) && $user->rights->margins->liretous) {
+									print '<td class="linecolmargin2 margininfos" align="right" width="50">'.$langs->trans('MarkRate').'</td>';
+				}
 			}
 
 			// Total HT
 			print '<td class="linecolht" align="right">'.$langs->trans('TotalHTShort').'</td>';
 
 			// Multicurrency
-			if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) print '<td class="linecoltotalht_currency" align="right">'.$langs->trans('TotalHTShortCurrency', $this->multicurrency_code).'</td>';
+			if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) {
+			    print '<td class="linecoltotalht_currency" align="right">'.$langs->trans('TotalHTShortCurrency', $this->multicurrency_code).'</td>';
+			}
 
-			if ($outputalsopricetotalwithtax) print '<td align="right" width="80">'.$langs->trans('TotalTTCShort').'</td>';
+			if ($outputalsopricetotalwithtax) {
+			    print '<td align="right" width="80">'.$langs->trans('TotalTTCShort').'</td>';
+			}
 
 			print '<td class="linecoledit"></td>';  // No width to allow autodim
 
@@ -3954,14 +4294,15 @@ 
 			$line->fetch_optionals();
 
 			//if (is_object($hookmanager) && (($line->product_type == 9 && ! empty($line->special_code)) || ! empty($line->fk_parent_line)))
-			if (is_object($hookmanager))   // Old code is commented on preceding line.
+			if (is_object($hookmanager)) {
+			    // Old code is commented on preceding line.
 			{
 				if (empty($line->fk_parent_line))
 				{
 					$parameters = array('line'=>$line,'var'=>$var,'num'=>$num,'i'=>$i,'dateSelector'=>$dateSelector,'seller'=>$seller,'buyer'=>$buyer,'selected'=>$selected, 'extrafieldsline'=>$extrafieldsline);
+			}
 					$reshook = $hookmanager->executeHooks('printObjectLine', $parameters, $this, $action);    // Note that $action and $object may have been modified by some hooks
-				}
-				else
+				} else
 				{
 					$parameters = array('line'=>$line,'var'=>$var,'num'=>$num,'i'=>$i,'dateSelector'=>$dateSelector,'seller'=>$seller,'buyer'=>$buyer,'selected'=>$selected, 'extrafieldsline'=>$extrafieldsline, 'fk_parent_line'=>$line->fk_parent_line);
 					$reshook = $hookmanager->executeHooks('printObjectSubLine', $parameters, $this, $action);    // Note that $action and $object may have been modified by some hooks
@@ -4008,8 +4349,14 @@ 
 		// Show product and description
 		$type=(! empty($line->product_type)?$line->product_type:$line->fk_product_type);
 		// Try to enhance type detection using date_start and date_end for free lines where type was not saved.
-		if (! empty($line->date_start)) $type=1; // deprecated
-		if (! empty($line->date_end)) $type=1; // deprecated
+		if (! empty($line->date_start)) {
+		    $type=1;
+		}
+		// deprecated
+		if (! empty($line->date_end)) {
+		    $type=1;
+		}
+		// deprecated
 
 		// Ligne en mode visu
 		if ($action != 'editline' || $selected != $line->id)
@@ -4038,8 +4385,13 @@ 
 
 					$outputlangs = $langs;
 					$newlang='';
-					if (empty($newlang) && GETPOST('lang_id','aZ09')) $newlang=GETPOST('lang_id','aZ09');
-					if (! empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE) && empty($newlang)) $newlang=$this->thirdparty->default_lang;		// For language to language of customer
+					if (empty($newlang) && GETPOST('lang_id','aZ09')) {
+					    $newlang=GETPOST('lang_id','aZ09');
+					}
+					if (! empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE) && empty($newlang)) {
+					    $newlang=$this->thirdparty->default_lang;
+					}
+					// For language to language of customer
 					if (! empty($newlang))
 					{
 						$outputlangs = new Translate("",$conf);
@@ -4047,8 +4399,7 @@ 
 					}
 
 					$label = (! empty($prod->multilangs[$outputlangs->defaultlang]["label"])) ? $prod->multilangs[$outputlangs->defaultlang]["label"] : $line->product_label;
-				}
-				else
+				} else
 				{
 					$label = $line->product_label;
 				}
@@ -4070,7 +4421,9 @@ 
 				} else {
 					$res=include $tpl; // for debug
 				}
-				if ($res) break;
+				if ($res) {
+				    break;
+				}
 			}
 		}
 
@@ -4093,7 +4446,9 @@ 
 				} else {
 					$res=include $tpl; // for debug
 				}
-				if ($res) break;
+				if ($res) {
+				    break;
+				}
 			}
 		}
 	}
@@ -4120,7 +4475,9 @@ 
 		print '<td>'.$langs->trans('Description').'</td>';
 		print '<td align="right">'.$langs->trans('VATRate').'</td>';
 		print '<td align="right">'.$langs->trans('PriceUHT').'</td>';
-		if (!empty($conf->multicurrency->enabled)) print '<td align="right">'.$langs->trans('PriceUHTCurrency').'</td>';
+		if (!empty($conf->multicurrency->enabled)) {
+		    print '<td align="right">'.$langs->trans('PriceUHTCurrency').'</td>';
+		}
 		print '<td align="right">'.$langs->trans('Qty').'</td>';
 		if($conf->global->PRODUCT_USE_UNITS)
 		{
@@ -4143,8 +4500,7 @@ 
 						$action='';
 						$hookmanager->executeHooks('printOriginObjectLine',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
 					}
-				}
-				else
+				} else
 				{
 					$this->printOriginLine($line, $var, $restrictlist);
 				}
@@ -4173,32 +4529,37 @@ 
 		if (!empty($line->date_start))
 		{
 			$date_start=$line->date_start;
-		}
-		else
+		} else
 		{
 			$date_start=$line->date_debut_prevue;
-			if ($line->date_debut_reel) $date_start=$line->date_debut_reel;
+			if ($line->date_debut_reel) {
+			    $date_start=$line->date_debut_reel;
+			}
 		}
 		if (!empty($line->date_end))
 		{
 			$date_end=$line->date_end;
-		}
-		else
+		} else
 		{
 			$date_end=$line->date_fin_prevue;
-			if ($line->date_fin_reel) $date_end=$line->date_fin_reel;
+			if ($line->date_fin_reel) {
+			    $date_end=$line->date_fin_reel;
+			}
 		}
 
 		$this->tpl['label'] = '';
-		if (! empty($line->fk_parent_line)) $this->tpl['label'].= img_picto('', 'rightarrow');
+		if (! empty($line->fk_parent_line)) {
+		    $this->tpl['label'].= img_picto('', 'rightarrow');
+		}
 
-		if (($line->info_bits & 2) == 2)  // TODO Not sure this is used for source object
+		if (($line->info_bits & 2) == 2) {
+		    // TODO Not sure this is used for source object
 		{
 			$discount=new DiscountAbsolute($this->db);
+		}
 			$discount->fk_soc = $this->socid;
 			$this->tpl['label'].= $discount->getNomUrl(0,'discount');
-		}
-		else if (! empty($line->fk_product))
+		} else if (! empty($line->fk_product))
 		{
 			$productstatic = new Product($this->db);
 			$productstatic->id = $line->fk_product;
@@ -4216,13 +4577,12 @@ 
 			{
 				$this->tpl['label'].= get_date_range($date_start,$date_end);
 			}
-		}
-		else
+		} else
 		{
 			$this->tpl['label'].= ($line->product_type == -1 ? '&nbsp;' : ($line->product_type == 1 ? img_object($langs->trans(''),'service') : img_object($langs->trans(''),'product')));
 			if (!empty($line->desc)) {
 				$this->tpl['label'].=$line->desc;
-			}else {
+			} else {
 				$this->tpl['label'].= ($line->label ? '&nbsp;'.$line->label : '');
 			}
 			
@@ -4235,36 +4595,35 @@ 
 
 		if (! empty($line->desc))
 		{
-			if ($line->desc == '(CREDIT_NOTE)')  // TODO Not sure this is used for source object
+			if ($line->desc == '(CREDIT_NOTE)') {
+			    // TODO Not sure this is used for source object
 			{
 				$discount=new DiscountAbsolute($this->db);
+			}
 				$discount->fetch($line->fk_remise_except);
 				$this->tpl['description'] = $langs->transnoentities("DiscountFromCreditNote",$discount->getNomUrl(0));
-			}
-			elseif ($line->desc == '(DEPOSIT)')  // TODO Not sure this is used for source object
+			} elseif ($line->desc == '(DEPOSIT)') {
+			    // TODO Not sure this is used for source object
 			{
 				$discount=new DiscountAbsolute($this->db);
+			}
 				$discount->fetch($line->fk_remise_except);
 				$this->tpl['description'] = $langs->transnoentities("DiscountFromDeposit",$discount->getNomUrl(0));
-			}
-			elseif ($line->desc == '(EXCESS RECEIVED)')
+			} elseif ($line->desc == '(EXCESS RECEIVED)')
 			{
 				$discount=new DiscountAbsolute($this->db);
 				$discount->fetch($line->fk_remise_except);
 				$this->tpl['description'] = $langs->transnoentities("DiscountFromExcessReceived",$discount->getNomUrl(0));
-			}
-			elseif ($line->desc == '(EXCESS PAID)')
+			} elseif ($line->desc == '(EXCESS PAID)')
 			{
 				$discount=new DiscountAbsolute($this->db);
 				$discount->fetch($line->fk_remise_except);
 				$this->tpl['description'] = $langs->transnoentities("DiscountFromExcessPaid",$discount->getNomUrl(0));
-			}
-			else
+			} else
 			{
 				$this->tpl['description'] = dol_trunc($line->desc,60);
 			}
-		}
-		else
+		} else
 		{
 			$this->tpl['description'] = '&nbsp;';
 		}
@@ -4272,17 +4631,23 @@ 
         // VAT Rate
         $this->tpl['vat_rate'] = vatrate($line->tva_tx, true);
         $this->tpl['vat_rate'] .= (($line->info_bits & 1) == 1) ? '*' : '';
-        if (! empty($line->vat_src_code) && ! preg_match('/\(/', $this->tpl['vat_rate'])) $this->tpl['vat_rate'].=' ('.$line->vat_src_code.')';
+        if (! empty($line->vat_src_code) && ! preg_match('/\(/', $this->tpl['vat_rate'])) {
+            $this->tpl['vat_rate'].=' ('.$line->vat_src_code.')';
+        }
 
 		$this->tpl['price'] = price($line->subprice);
 		$this->tpl['multicurrency_price'] = price($line->multicurrency_subprice);
 		$this->tpl['qty'] = (($line->info_bits & 2) != 2) ? $line->qty : '&nbsp;';
-		if ($conf->global->PRODUCT_USE_UNITS) $this->tpl['unit'] = $langs->transnoentities($line->getLabelOfUnit('long'));
+		if ($conf->global->PRODUCT_USE_UNITS) {
+		    $this->tpl['unit'] = $langs->transnoentities($line->getLabelOfUnit('long'));
+		}
 		$this->tpl['remise_percent'] = (($line->info_bits & 2) != 2) ? vatrate($line->remise_percent, true) : '&nbsp;';
 
 		// Is the line strike or not
 		$this->tpl['strike']=0;
-		if ($restrictlist == 'services' && $line->product_type != Product::TYPE_SERVICE) $this->tpl['strike']=1;
+		if ($restrictlist == 'services' && $line->product_type != Product::TYPE_SERVICE) {
+		    $this->tpl['strike']=1;
+		}
 
 		// Output template part (modules that overwrite templates must declare this into descriptor)
 		// Use global variables + $dateSelector + $seller and $buyer
@@ -4295,7 +4660,9 @@ 
 			} else {
 				$res=include $tpl; // for debug
 			}
-			if ($res) break;
+			if ($res) {
+			    break;
+			}
 		}
 	}
 
@@ -4337,8 +4704,7 @@ 
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->lasterror();
 			$this->db->rollback();
@@ -4373,8 +4739,7 @@ 
 			$this->error=$this->db->lasterror();
 			$this->db->rollback();
 			return -1;
-		}
-		else
+		} else
 		{
 			if (! $notrigger)
 			{
@@ -4441,13 +4806,20 @@ 
 		// Search template files
 		$file=''; $classname=''; $filefound=0;
 		$dirmodels=array('/');
-		if (is_array($conf->modules_parts['models'])) $dirmodels=array_merge($dirmodels,$conf->modules_parts['models']);
+		if (is_array($conf->modules_parts['models'])) {
+		    $dirmodels=array_merge($dirmodels,$conf->modules_parts['models']);
+		}
 		foreach($dirmodels as $reldir)
 		{
 			foreach(array('doc','pdf') as $prefix)
 			{
-				if (in_array(get_class($this), array('Adherent'))) $file = $prefix."_".$modele.".class.php";     // Member module use prefix_module.class.php
-				else $file = $prefix."_".$modele.".modules.php";
+				if (in_array(get_class($this), array('Adherent'))) {
+				    $file = $prefix."_".$modele.".class.php";
+				}
+				// Member module use prefix_module.class.php
+				else {
+				    $file = $prefix."_".$modele.".modules.php";
+				}
 
 				// On verifie l'emplacement du modele
 				$file=dol_buildpath($reldir.$modelspath.$file,0);
@@ -4458,7 +4830,9 @@ 
 					break;
 				}
 			}
-			if ($filefound) break;
+			if ($filefound) {
+			    break;
+			}
 		}
 
 		// If generator was found
@@ -4490,7 +4864,9 @@ 
 						if (is_dir($tmpdir))
 						{
 							$tmpfiles=dol_dir_list($tmpdir,'files',0,'\.od(s|t)$','','name',SORT_ASC,0);
-							if (count($tmpfiles)) $listoffiles=array_merge($listoffiles,$tmpfiles);
+							if (count($tmpfiles)) {
+							    $listoffiles=array_merge($listoffiles,$tmpfiles);
+							}
 						}
 					}
 
@@ -4528,8 +4904,7 @@ 
 			{
 				$arrayofrecords = array();   // The write_file of templates of adherent class need this var
 				$resultwritefile = $obj->write_file($this, $outputlangs, $srctemplatepath, 'member', 1, $moreparams);
-			}
-			else
+			} else
 			{
 				$resultwritefile = $obj->write_file($this, $outputlangs, $srctemplatepath, $hidedetails, $hidedesc, $hideref, $moreparams);
 			}
@@ -4551,9 +4926,11 @@ 
 					$destfile = basename($destfull);
 					$rel_dir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $upload_dir);
 
-					if (! preg_match('/[\\/]temp[\\/]|[\\/]thumbs|\.meta$/', $rel_dir))     // If not a tmp dir
+					if (! preg_match('/[\\/]temp[\\/]|[\\/]thumbs|\.meta$/', $rel_dir)) {
+					    // If not a tmp dir
 					{
 						$filename = basename($destfile);
+					}
 						$rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
 						$rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
 
@@ -4566,18 +4943,30 @@ 
 						if ($this->element == 'propal')
 						{
 							$useonlinesignature = $conf->global->MAIN_FEATURES_LEVEL;	// Replace this with 1 when feature to make online signature is ok
-							if ($useonlinesignature) $setsharekey=true;
-							if (! empty($conf->global->PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD)) $setsharekey=true;
+							if ($useonlinesignature) {
+							    $setsharekey=true;
+							}
+							if (! empty($conf->global->PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD)) {
+							    $setsharekey=true;
+							}
+						}
+						if ($this->element == 'commande'     && ! empty($conf->global->ORDER_ALLOW_EXTERNAL_DOWNLOAD)) {
+						    $setsharekey=true;
+						}
+						if ($this->element == 'facture'      && ! empty($conf->global->INVOICE_ALLOW_EXTERNAL_DOWNLOAD)) {
+						    $setsharekey=true;
+						}
+						if ($this->element == 'bank_account' && ! empty($conf->global->BANK_ACCOUNT_ALLOW_EXTERNAL_DOWNLOAD)) {
+						    $setsharekey=true;
 						}
-						if ($this->element == 'commande'     && ! empty($conf->global->ORDER_ALLOW_EXTERNAL_DOWNLOAD))        $setsharekey=true;
-						if ($this->element == 'facture'      && ! empty($conf->global->INVOICE_ALLOW_EXTERNAL_DOWNLOAD))      $setsharekey=true;
-						if ($this->element == 'bank_account' && ! empty($conf->global->BANK_ACCOUNT_ALLOW_EXTERNAL_DOWNLOAD)) $setsharekey=true;
 
 						if ($setsharekey)
 						{
-							if (empty($ecmfile->share))	// Because object not found or share not set yet
+							if (empty($ecmfile->share)) {
+							    // Because object not found or share not set yet
 							{
 								require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
+							}
 								$ecmfile->share = getRandomPassword(true);
 							}
 						}
@@ -4594,8 +4983,7 @@ 
 							{
 								setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
 							}
-						}
-						else
+						} else
 						{
 							$ecmfile->entity = $conf->entity;
 							$ecmfile->filepath = $rel_dir;
@@ -4622,17 +5010,20 @@ 
 
 						// Update the last_main_doc field into main object (if documenent generator has property ->update_main_doc_field set)
 						$update_main_doc_field=0;
-						if (! empty($obj->update_main_doc_field)) $update_main_doc_field=1;
+						if (! empty($obj->update_main_doc_field)) {
+						    $update_main_doc_field=1;
+						}
 						if ($update_main_doc_field && ! empty($this->table_element))
 						{
 							$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element." SET last_main_doc = '".($ecmfile->filepath.'/'.$ecmfile->filename)."'";
 							$sql.= ' WHERE rowid = '.$this->id;
 							$resql = $this->db->query($sql);
-							if (! $resql) dol_print_error($this->db);
+							if (! $resql) {
+							    dol_print_error($this->db);
+							}
 						}
 					}
-				}
-				else
+				} else
 				{
 					dol_syslog('Method ->write_file was called on object '.get_class($obj).' and return a success but the return array ->result["fullpath"] was not set.', LOG_WARNING);
 				}
@@ -4641,15 +5032,13 @@ 
 				dol_meta_create($this);
 
 				return 1;
-			}
-			else
+			} else
 			{
 				$outputlangs->charset_output=$sav_charset_output;
 				dol_print_error($this->db, "Error generating document for ".__CLASS__.". Error: ".$obj->error, $obj->errors);
 				return -1;
 			}
-		}
-		else
+		} else
 		{
 			$this->error=$langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists",$file);
 			dol_print_error('',$this->error);
@@ -4705,13 +5094,21 @@ 
 		global $conf, $_POST;
 
 		// If param here has been posted, we use this value first.
-		if (isset($_POST[$fieldname])) return GETPOST($fieldname, 2);
+		if (isset($_POST[$fieldname])) {
+		    return GETPOST($fieldname, 2);
+		}
 
-		if (isset($alternatevalue)) return $alternatevalue;
+		if (isset($alternatevalue)) {
+		    return $alternatevalue;
+		}
 
 		$newelement=$this->element;
-		if ($newelement == 'facture') $newelement='invoice';
-		if ($newelement == 'commande') $newelement='order';
+		if ($newelement == 'facture') {
+		    $newelement='invoice';
+		}
+		if ($newelement == 'commande') {
+		    $newelement='order';
+		}
 		if (empty($newelement))
 		{
 			dol_syslog("Ask a default value using common method getDefaultCreateValueForField on an object with no property ->element defined. Return empty string.", LOG_WARNING);
@@ -4720,7 +5117,9 @@ 
 
 		$keyforfieldname=strtoupper($newelement.'_DEFAULT_'.$fieldname);
 		//var_dump($keyforfieldname);
-		if (isset($conf->global->$keyforfieldname)) return $conf->global->$keyforfieldname;
+		if (isset($conf->global->$keyforfieldname)) {
+		    return $conf->global->$keyforfieldname;
+		}
 
 		// TODO Ad here a scan into table llx_overwrite_default with a filter on $this->element and $fieldname
 	}
@@ -4754,8 +5153,7 @@ 
 			if (!empty($this->errors))
 			{
 				$this->errors=array_unique(array_merge($this->errors,$interface->errors));   // We use array_unique because when a trigger call another trigger on same object, this->errors is added twice.
-			}
-			else
+			} else
 			{
 				$this->errors=$interface->errors;
 			}
@@ -4779,7 +5177,9 @@ 
 	function fetch_optionals($rowid=null, $optionsArray=null)
 	{
         // phpcs:enable
-		if (empty($rowid)) $rowid=$this->id;
+		if (empty($rowid)) {
+		    $rowid=$this->id;
+		}
 
 		// To avoid SQL errors. Probably not the better solution though
 		if (!$this->table_element) {
@@ -4805,15 +5205,17 @@ 
 				$extrafields->fetch_name_optionals_label($this->table_element);
 			}
 			$optionsArray = (! empty($extrafields->attributes[$this->table_element]['label'])?$extrafields->attributes[$this->table_element]['label']:null);
-		}
-		else
+		} else
 		{
 			global $extrafields;
 			dol_syslog("Warning: fetch_optionals was called with param optionsArray defined when you should pass null now", LOG_WARNING);
 		}
 
 		$table_element = $this->table_element;
-		if ($table_element == 'categorie') $table_element = 'categories'; // For compatibility
+		if ($table_element == 'categorie') {
+		    $table_element = 'categories';
+		}
+		// For compatibility
 
 		// Request to get complementary values
 		if (is_array($optionsArray) && count($optionsArray) > 0)
@@ -4849,8 +5251,7 @@ 
 							{
 								//var_dump($extrafields->attributes[$this->table_element]['type'][$key]);
 								$this->array_options["options_".$key]=$this->db->jdate($value);
-							}
-							else
+							} else
 							{
 								$this->array_options["options_".$key]=$value;
 							}
@@ -4862,10 +5263,12 @@ 
 
 				$this->db->free($resql);
 
-				if ($numrows) return $numrows;
-				else return 0;
-			}
-			else
+				if ($numrows) {
+				    return $numrows;
+				} else {
+				    return 0;
+				}
+			} else
 			{
 				dol_print_error($this->db);
 				return -1;
@@ -4884,7 +5287,10 @@ 
 		$this->db->begin();
 
 		$table_element = $this->table_element;
-		if ($table_element == 'categorie') $table_element = 'categories'; // For compatibility
+		if ($table_element == 'categorie') {
+		    $table_element = 'categories';
+		}
+		// For compatibility
 
 		$sql_del = "DELETE FROM ".MAIN_DB_PREFIX.$table_element."_extrafields WHERE fk_object = ".$this->id;
 		dol_syslog(get_class($this)."::deleteExtraFields delete", LOG_DEBUG);
@@ -4894,8 +5300,7 @@ 
 			$this->error=$this->db->lasterror();
 			$this->db->rollback();
 			return -1;
-		}
-		else
+		} else
 		{
 			$this->db->commit();
 			return 1;
@@ -4916,11 +5321,16 @@ 
 	{
 		global $conf,$langs,$user;
 
-		if (empty($userused)) $userused=$user;
+		if (empty($userused)) {
+		    $userused=$user;
+		}
 
 		$error=0;
 
-		if (! empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) return 0;	// For avoid conflicts if trigger used
+		if (! empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) {
+		    return 0;
+		}
+		// For avoid conflicts if trigger used
 
 		if (! empty($this->array_options))
 		{
@@ -4933,10 +5343,13 @@ 
 			//Eliminate copied source object extra_fields that do not exist in target object
 			$new_array_options=array();
 			foreach ($this->array_options as $key => $value) {
-				if (in_array(substr($key,8), array_keys($target_extrafields)))	// We remove the 'options_' from $key for test
+				if (in_array(substr($key,8), array_keys($target_extrafields))) {
+				    // We remove the 'options_' from $key for test
 					$new_array_options[$key] = $value;
-				elseif (in_array($key, array_keys($target_extrafields)))		// We test on $key that does not contains the 'options_' prefix
+				} elseif (in_array($key, array_keys($target_extrafields))) {
+				    // We test on $key that does not contains the 'options_' prefix
 					$new_array_options['options_'.$key] = $value;
+				}
 			}
 
 			foreach($new_array_options as $key => $value)
@@ -4950,8 +5363,12 @@ 
 			   	if ($attributeRequired)
 			   	{
 			   		$mandatorypb=false;
-			   		if ($attributeType == 'link' && $this->array_options[$key] == '-1') $mandatorypb=true;
-			   		if ($this->array_options[$key] === '') $mandatorypb=true;
+			   		if ($attributeType == 'link' && $this->array_options[$key] == '-1') {
+			   		    $mandatorypb=true;
+			   		}
+			   		if ($this->array_options[$key] === '') {
+			   		    $mandatorypb=true;
+			   		}
 			   		if ($mandatorypb)
 			   		{
 			   			dol_syslog($this->error);
@@ -4970,8 +5387,7 @@ 
 			   			{
 			   				$this->errors[]=$langs->trans("ExtraFieldHasWrongValue", $attributeLabel);
 			   				return -1;
-			  			}
-			   			elseif ($value=='')
+			  			} elseif ($value=='')
 			   			{
 			   				$new_array_options[$key] = null;
 			   			}
@@ -4983,8 +5399,7 @@ 
 							dol_syslog($langs->trans("ExtraFieldHasWrongValue")." sur ".$attributeLabel."(".$value."is not '".$attributeType."')", LOG_DEBUG);
 							$this->errors[]=$langs->trans("ExtraFieldHasWrongValue", $attributeLabel);
 							return -1;
-						}
-						elseif ($value=='')
+						} elseif ($value=='')
 						{
 							$new_array_options[$key] = null;
 						}
@@ -5009,27 +5424,27 @@ 
 			   					//global $action;		// $action may be 'create', 'update', 'update_extras'...
 			   					//var_dump($action);
 			   					//var_dump($this->oldcopy);exit;
-			   					if (is_object($this->oldcopy))		// If this->oldcopy is not defined, we can't know if we change attribute or not, so we must keep value
+			   					if (is_object($this->oldcopy)) {
+			   					    // If this->oldcopy is not defined, we can't know if we change attribute or not, so we must keep value
 			   					{
 			   						//var_dump($this->oldcopy->array_options[$key]); var_dump($this->array_options[$key]);
 				   					if ($this->array_options[$key] == $this->oldcopy->array_options[$key])	// If old value crypted in database is same than submited new value, it means we don't change it, so we don't update.
 				   					{
-				   						$new_array_options[$key] = $this->array_options[$key];	// Value is kept
-				   					}
-									else
+				   						$new_array_options[$key] = $this->array_options[$key];
+			   					}
+			   					// Value is kept
+				   					} else
 									{
 										// var_dump($algo);
 										$newvalue = dol_hash($this->array_options[$key], $algo);
 										$new_array_options[$key] = $newvalue;
 									}
-			   					}
-			   					else
+			   					} else
 			   					{
 			   						$new_array_options[$key] = $this->array_options[$key];	// Value is kept
 			   					}
 			   				}
-			   			}
-			   			else	// Common usage
+			   			} else	// Common usage
 			   			{
 			   				$new_array_options[$key] = $this->array_options[$key];
 			   			}
@@ -5055,26 +5470,30 @@ 
 						dol_include_once($InfoFieldList[1]);
 						if ($InfoFieldList[0] && class_exists($InfoFieldList[0]))
 						{
-							if ($value == '-1')	// -1 is key for no defined in combo list of objects
+							if ($value == '-1') {
+							    // -1 is key for no defined in combo list of objects
 							{
 								$new_array_options[$key]='';
 							}
-							elseif ($value)
+							} elseif ($value)
 							{
 								$object = new $InfoFieldList[0]($this->db);
-								if (is_numeric($value)) $res=$object->fetch($value);
-								else $res=$object->fetch('',$value);
+								if (is_numeric($value)) {
+								    $res=$object->fetch($value);
+								} else {
+								    $res=$object->fetch('',$value);
+								}
 
-								if ($res > 0) $new_array_options[$key]=$object->id;
-								else
+								if ($res > 0) {
+								    $new_array_options[$key]=$object->id;
+								} else
 								{
 									$this->error="Id/Ref '".$value."' for object '".$object->element."' not found";
 									$this->db->rollback();
 									return -1;
 								}
 							}
-						}
-						else
+						} else
 						{
 							dol_syslog('Error bad setup of extrafield', LOG_WARNING);
 						}
@@ -5085,7 +5504,10 @@ 
 			$this->db->begin();
 
 			$table_element = $this->table_element;
-			if ($table_element == 'categorie') $table_element = 'categories'; // For compatibility
+			if ($table_element == 'categorie') {
+			    $table_element = 'categories';
+			}
+			// For compatibility
 
 			$sql_del = "DELETE FROM ".MAIN_DB_PREFIX.$table_element."_extrafields WHERE fk_object = ".$this->id;
 			dol_syslog(get_class($this)."::insertExtraFields delete", LOG_DEBUG);
@@ -5096,8 +5518,10 @@ 
 			{
 				$attributeKey = substr($key,8);   // Remove 'options_' prefix
 				// Add field of attribut
-				if ($extrafields->attributes[$this->table_element]['type'][$attributeKey] != 'separate') // Only for other type than separator
+				if ($extrafields->attributes[$this->table_element]['type'][$attributeKey] != 'separate') {
+				    // Only for other type than separator
 					$sql.=",".$attributeKey;
+				}
 			}
 			$sql .= ") VALUES (".$this->id;
 
@@ -5105,13 +5529,14 @@ 
 			{
 				$attributeKey = substr($key,8);   // Remove 'options_' prefix
 				// Add field of attribute
-				if ($extrafields->attributes[$this->table_element]['type'][$attributeKey] != 'separate') // Only for other type than separator)
+				if ($extrafields->attributes[$this->table_element]['type'][$attributeKey] != 'separate') {
+				    // Only for other type than separator)
 				{
 					if ($new_array_options[$key] != '')
 					{
 						$sql.=",'".$this->db->escape($new_array_options[$key])."'";
-					}
-					else
+				}
+					} else
 					{
 						$sql.=",null";
 					}
@@ -5132,7 +5557,9 @@ 
 				// Call trigger
 				$this->context=array('extrafieldaddupdate'=>1);
 				$result=$this->call_trigger($trigger, $userused);
-				if ($result < 0) $error++;
+				if ($result < 0) {
+				    $error++;
+				}
 				// End call trigger
 			}
 
@@ -5140,14 +5567,14 @@ 
 			{
 				$this->db->rollback();
 				return -1;
-			}
-			else
+			} else
 			{
 				$this->db->commit();
 				return 1;
 			}
+		} else {
+		    return 0;
 		}
-		else return 0;
 	}
 
 	/**
@@ -5164,11 +5591,16 @@ 
 	{
 		global $conf,$langs,$user;
 
-		if (empty($userused)) $userused=$user;
+		if (empty($userused)) {
+		    $userused=$user;
+		}
 
 		$error=0;
 
-		if (! empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) return 0;	// For avoid conflicts if trigger used
+		if (! empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) {
+		    return 0;
+		}
+		// For avoid conflicts if trigger used
 
 		if (! empty($this->array_options) && isset($this->array_options["options_".$key]))
 		{
@@ -5195,8 +5627,7 @@ 
 					{
 						$this->errors[]=$langs->trans("ExtraFieldHasWrongValue",$attributeLabel);
 						return -1;
-					}
-					elseif ($value=='')
+					} elseif ($value=='')
 					{
 						$this->array_options["options_".$key] = null;
 					}
@@ -5208,8 +5639,7 @@ 
 						dol_syslog($langs->trans("ExtraFieldHasWrongValue")." sur ".$attributeLabel."(".$value."is not '".$attributeType."')", LOG_DEBUG);
 						$this->errors[]=$langs->trans("ExtraFieldHasWrongValue", $attributeLabel);
 						return -1;
-					}
-					elseif ($value=='')
+					} elseif ($value=='')
 					{
 						$this->array_options["options_".$key] = null;
 					}
@@ -5261,7 +5691,9 @@ 
 				// Call trigger
 				$this->context=array('extrafieldupdate'=>1);
 				$result=$this->call_trigger($trigger, $userused);
-				if ($result < 0) $error++;
+				if ($result < 0) {
+				    $error++;
+				}
 				// End call trigger
 			}
 
@@ -5270,14 +5702,14 @@ 
 				dol_syslog(get_class($this) . "::".__METHOD__ . $this->error, LOG_ERR);
 				$this->db->rollback();
 				return -1;
-			}
-			else
+			} else
 			{
 				$this->db->commit();
 				return 1;
 			}
+		} else {
+		    return 0;
 		}
-		else return 0;
 	}
 
 
@@ -5352,8 +5784,11 @@ 
 
 		if ($computed)
 		{
-			if (! preg_match('/^search_/', $keyprefix)) return '<span class="opacitymedium">'.$langs->trans("AutomaticallyCalculated").'</span>';
-			else return '';
+			if (! preg_match('/^search_/', $keyprefix)) {
+			    return '<span class="opacitymedium">'.$langs->trans("AutomaticallyCalculated").'</span>';
+			} else {
+			    return '';
+			}
 		}
 
 
@@ -5367,33 +5802,27 @@ 
 			if ($type == 'date')
 			{
 				$morecss = 'minwidth100imp';
-			}
-			elseif ($type == 'datetime')
+			} elseif ($type == 'datetime')
 			{
 				$morecss = 'minwidth200imp';
-			}
-			elseif (in_array($type,array('int','integer','price')) || preg_match('/^double(\([0-9],[0-9]\)){0,1}/',$type))
+			} elseif (in_array($type,array('int','integer','price')) || preg_match('/^double(\([0-9],[0-9]\)){0,1}/',$type))
 			{
 				$morecss = 'maxwidth75';
-                        }elseif ($type == 'url')
+                        } elseif ($type == 'url')
 			{
 				$morecss='minwidth400';
-			}
-			elseif ($type == 'boolean')
+			} elseif ($type == 'boolean')
 			{
 				$morecss='';
-			}
-			else
+			} else
 			{
 				if (round($size) < 12)
 				{
 					$morecss = 'minwidth100';
-				}
-				else if (round($size) <= 48)
+				} else if (round($size) <= 48)
 				{
 					$morecss = 'minwidth200';
-				}
-				else
+				} else
 				{
 					$morecss = 'minwidth400';
 				}
@@ -5408,52 +5837,50 @@ 
 			$showtime = in_array($type,array('datetime')) ? 1 : 0;
 
 			// Do not show current date when field not required (see selectDate() method)
-			if (!$required && $value == '') $value = '-1';
+			if (!$required && $value == '') {
+			    $value = '-1';
+			}
 
 			// TODO Must also support $moreparam
 			$out = $form->selectDate($value, $keyprefix.$key.$keysuffix, $showtime, $showtime, $required, '', 1, (($keyprefix != 'search_' && $keyprefix != 'search_options_') ? 1 : 0), 0, 1);
-		}
-		elseif (in_array($type,array('int','integer')))
+		} elseif (in_array($type,array('int','integer')))
 		{
 			$tmp=explode(',',$size);
 			$newsize=$tmp[0];
 			$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$newsize.'" value="'.dol_escape_htmltag($value).'"'.($moreparam?$moreparam:'').'>';
-		}
-		elseif (preg_match('/varchar/', $type))
+		} elseif (preg_match('/varchar/', $type))
 		{
 			$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$size.'" value="'.dol_escape_htmltag($value).'"'.($moreparam?$moreparam:'').'>';
-		}
-		elseif (in_array($type, array('mail', 'phone', 'url')))
+		} elseif (in_array($type, array('mail', 'phone', 'url')))
 		{
 			$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam?$moreparam:'').'>';
-		}
-		elseif ($type == 'text')
+		} elseif ($type == 'text')
 		{
-			if (! preg_match('/search_/', $keyprefix))		// If keyprefix is search_ or search_options_, we must just use a simple text field
+			if (! preg_match('/search_/', $keyprefix)) {
+			    // If keyprefix is search_ or search_options_, we must just use a simple text field
 			{
 				require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+			}
 				$doleditor=new DolEditor($keyprefix.$key.$keysuffix,$value,'',200,'dolibarr_notes','In',false,false,false,ROWS_5,'90%');
 				$out=$doleditor->Create(1);
-			}
-			else
+			} else
 			{
 				$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam?$moreparam:'').'>';
 			}
-		}
-		elseif ($type == 'html')
+		} elseif ($type == 'html')
 		{
-			if (! preg_match('/search_/', $keyprefix))		// If keyprefix is search_ or search_options_, we must just use a simple text field
+			if (! preg_match('/search_/', $keyprefix)) {
+			    // If keyprefix is search_ or search_options_, we must just use a simple text field
 			{
 				require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+			}
 				$doleditor=new DolEditor($keyprefix.$key.$keysuffix,$value,'',200,'dolibarr_notes','In',false,false,! empty($conf->fckeditor->enabled) && $conf->global->FCKEDITOR_ENABLE_SOCIETE,ROWS_5,'90%');
 				$out=$doleditor->Create(1);
-			}
-			else
+			} else
 			{
 				$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam?$moreparam:'').'>';
 			}
-		}
-		elseif ($type == 'boolean')
+		} elseif ($type == 'boolean')
 		{
 			$checked='';
 			if (!empty($value)) {
@@ -5462,22 +5889,19 @@ 
 				$checked=' value="1" ';
 			}
 			$out='<input type="checkbox" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.$checked.' '.($moreparam?$moreparam:'').'>';
-		}
-		elseif ($type == 'price')
+		} elseif ($type == 'price')
 		{
 			if (!empty($value)) {		// $value in memory is a php numeric, we format it into user number format.
 				$value=price($value);
 			}
 			$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam?$moreparam:'').'> '.$langs->getCurrencySymbol($conf->currency);
-		}
-		elseif (preg_match('/^double(\([0-9],[0-9]\)){0,1}/',$type))
+		} elseif (preg_match('/^double(\([0-9],[0-9]\)){0,1}/',$type))
 		{
 			if (!empty($value)) {		// $value in memory is a php numeric, we format it into user number format.
 				$value=price($value);
 			}
 			$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam?$moreparam:'').'> ';
-		}
-		elseif ($type == 'select')
+		} elseif ($type == 'select')
 		{
 			$out = '';
 			if (! empty($conf->use_javascript_ajax) && ! empty($conf->global->MAIN_EXTRAFIELDS_USE_SELECT2))
@@ -5487,10 +5911,14 @@ 
 			}
 
 			$out.='<select class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam?$moreparam:'').'>';
-                if((! isset($this->fields[$key]['default'])) ||($this->fields[$key]['notnull']!=1))$out.='<option value="0">&nbsp;</option>';
+                if((! isset($this->fields[$key]['default'])) ||($this->fields[$key]['notnull']!=1)) {
+                    $out.='<option value="0">&nbsp;</option>';
+                }
 			foreach ($param['options'] as $key => $val)
 			{
-				if ((string) $key == '') continue;
+				if ((string) $key == '') {
+				    continue;
+				}
 				list($val, $parent) = explode('|', $val);
 				$out.='<option value="'.$key.'"';
 				$out.= (((string) $value == (string) $key)?' selected':'');
@@ -5498,8 +5926,7 @@ 
 				$out.='>'.$val.'</option>';
 			}
 			$out.='</select>';
-		}
-		elseif ($type == 'sellist')
+		} elseif ($type == 'sellist')
 		{
 			$out = '';
 			if (! empty($conf->use_javascript_ajax) && ! empty($conf->global->MAIN_EXTRAFIELDS_USE_SELECT2))
@@ -5566,13 +5993,11 @@ 
 					{
 						$sql.= ' as main, '.MAIN_DB_PREFIX .$InfoFieldList[0].'_extrafields as extra';
 						$sqlwhere.= ' WHERE extra.fk_object=main.'.$InfoFieldList[2]. ' AND '.$InfoFieldList[4];
-					}
-					else
+					} else
 					{
 						$sqlwhere.= ' WHERE '.$InfoFieldList[4];
 					}
-				}
-				else
+				} else
 				{
 					$sqlwhere.= ' WHERE 1=1';
 				}
@@ -5608,8 +6033,7 @@ 
 							{
 								$labeltoshow.= $obj->$field_toshow.' ';
 							}
-						}
-						else
+						} else
 						{
 							$labeltoshow=$obj->{$InfoFieldList[1]};
 						}
@@ -5622,25 +6046,25 @@ 
 								$translabel=$langs->trans($obj->$field_toshow);
 								if ($translabel!=$obj->$field_toshow) {
 									$labeltoshow=dol_trunc($translabel,18).' ';
-								}else {
+								} else {
 									$labeltoshow=dol_trunc($obj->$field_toshow,18).' ';
 								}
 							}
 							$out.='<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
-						}
-						else
+						} else
 						{
 							if (! $notrans)
 							{
 								$translabel=$langs->trans($obj->{$InfoFieldList[1]});
 								if ($translabel!=$obj->{$InfoFieldList[1]}) {
 									$labeltoshow=dol_trunc($translabel,18);
-								}
-								else {
+								} else {
 									$labeltoshow=dol_trunc($obj->{$InfoFieldList[1]},18);
 								}
 							}
-							if (empty($labeltoshow)) $labeltoshow='(not defined)';
+							if (empty($labeltoshow)) {
+							    $labeltoshow='(not defined)';
+							}
 							if ($value==$obj->rowid)
 							{
 								$out.='<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
@@ -5660,19 +6084,16 @@ 
 						$i++;
 					}
 					$this->db->free($resql);
-				}
-				else {
+				} else {
 					print 'Error in request '.$sql.' '.$this->db->lasterror().'. Check setup of extra parameters.<br>';
 				}
 			}
 			$out.='</select>';
-		}
-		elseif ($type == 'checkbox')
+		} elseif ($type == 'checkbox')
 		{
 			$value_arr=explode(',',$value);
 			$out=$form->multiselectarray($keyprefix.$key.$keysuffix, (empty($param['options'])?null:$param['options']), $value_arr, '', 0, '', 0, '100%');
-		}
-		elseif ($type == 'radio')
+		} elseif ($type == 'radio')
 		{
 			$out='';
 			foreach ($param['options'] as $keyopt => $val)
@@ -5683,13 +6104,11 @@ 
 				$out.= ($value==$keyopt?'checked':'');
 				$out.='/><label for="'.$keyprefix.$key.$keysuffix.'_'.$keyopt.'">'.$val.'</label><br>';
 			}
-		}
-		elseif ($type == 'chkbxlst')
+		} elseif ($type == 'chkbxlst')
 		{
 			if (is_array($value)) {
 				$value_arr = $value;
-			}
-			else {
+			} else {
 				$value_arr = explode(',', $value);
 			}
 
@@ -5804,8 +6223,9 @@ 
 									$labeltoshow = dol_trunc($obj->{$InfoFieldList[1]}, 18);
 								}
 							}
-							if (empty($labeltoshow))
-								$labeltoshow = '(not defined)';
+							if (empty($labeltoshow)) {
+															$labeltoshow = '(not defined)';
+							}
 
 								if (is_array($value_arr) && in_array($obj->rowid, $value_arr)) {
 									$data[$obj->rowid]=$labeltoshow;
@@ -5827,8 +6247,7 @@ 
 					print 'Error in request ' . $sql . ' ' . $this->db->lasterror() . '. Check setup of extra parameters.<br>';
 				}
 			}
-		}
-		elseif ($type == 'link')
+		} elseif ($type == 'link')
 		{
 			$param_list=array_keys($param['options']);				// $param_list='ObjectName:classPath'
 			$showempty=(($required && $default != '')?0:1);
@@ -5836,18 +6255,19 @@ 
 			if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
 			{
             			list($class,$classfile)=explode(':',$param_list[0]);
-            			if (file_exists(dol_buildpath(dirname(dirname($classfile)).'/card.php'))) $url_path=dol_buildpath(dirname(dirname($classfile)).'/card.php',1);
-            			else $url_path=dol_buildpath(dirname(dirname($classfile)).'/'.$class.'_card.php',1);
+            			if (file_exists(dol_buildpath(dirname(dirname($classfile)).'/card.php'))) {
+            			    $url_path=dol_buildpath(dirname(dirname($classfile)).'/card.php',1);
+            			} else {
+            			    $url_path=dol_buildpath(dirname(dirname($classfile)).'/'.$class.'_card.php',1);
+            			}
             			$out.='<a class="butActionNew" href="'.$url_path.'?action=create&backtopage='.$_SERVER['PHP_SELF'].'"><span class="fa fa-plus-circle valignmiddle"></span></a>';
             			// TODO Add Javascript code to add input fields contents to new elements urls
 			}
-		}
-		elseif ($type == 'password')
+		} elseif ($type == 'password')
 		{
 			// If prefix is 'search_', field is used as a filter, we use a common text field.
 			$out='<input type="'.($keyprefix=='search_'?'text':'password').'" class="flat '.$morecss.'" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam?$moreparam:'').'>';
-		}
-		elseif ($type == 'array')
+		} elseif ($type == 'array')
 		{
 			$newval = $val;
 			$newval['type'] = 'varchar(256)';
@@ -5925,17 +6345,25 @@ 
 		{
 			$type = 'varchar';		// convert varchar(xx) int varchar
 			$size = $reg[1];
+		} elseif (preg_match('/varchar/', $type)) {
+		    $type = 'varchar';
+		}
+		// convert varchar(xx) int varchar
+		if (is_array($val['arrayofkeyval'])) {
+		    $type='select';
+		}
+		if (preg_match('/^integer:(.*):(.*)/i', $val['type'], $reg)) {
+		    $type='link';
 		}
-		elseif (preg_match('/varchar/', $type)) $type = 'varchar';		// convert varchar(xx) int varchar
-		if (is_array($val['arrayofkeyval'])) $type='select';
-		if (preg_match('/^integer:(.*):(.*)/i', $val['type'], $reg)) $type='link';
 
 		$default=$val['default'];
 		$computed=$val['computed'];
 		$unique=$val['unique'];
 		$required=$val['required'];
 		$param=$val['param'];
-		if (is_array($val['arrayofkeyval'])) $param['options'] = $val['arrayofkeyval'];
+		if (is_array($val['arrayofkeyval'])) {
+		    $param['options'] = $val['arrayofkeyval'];
+		}
 		if (preg_match('/^integer:(.*):(.*)/i', $val['type'], $reg))
 		{
 			$type='link';
@@ -5946,7 +6374,9 @@ 
 		$help=$val['help'];
 		$hidden=(($val['visible'] == 0) ? 1 : 0);			// If zero, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
 
-		if ($hidden) return '';
+		if ($hidden) {
+		    return '';
+		}
 
 		// If field is a computed field, value must become result of compute
 		if ($computed)
@@ -5962,36 +6392,29 @@ 
 			{
 				//$showsize=10;
 				$showsize = 'minwidth100imp';
-			}
-			elseif ($type == 'datetime')
+			} elseif ($type == 'datetime')
 			{
 				//$showsize=19;
 				$showsize = 'minwidth200imp';
-			}
-			elseif (in_array($type,array('int','double','price')))
+			} elseif (in_array($type,array('int','double','price')))
 			{
 				//$showsize=10;
 				$showsize = 'maxwidth75';
-			}
-			elseif ($type == 'url')
+			} elseif ($type == 'url')
 			{
 				$showsize='minwidth400';
-			}
-			elseif ($type == 'boolean')
+			} elseif ($type == 'boolean')
 			{
 				$showsize='';
-			}
-			else
+			} else
 			{
 				if (round($size) < 12)
 				{
 					$showsize = 'minwidth100';
-				}
-				else if (round($size) <= 48)
+				} else if (round($size) <= 48)
 				{
 					$showsize = 'minwidth200';
-				}
-				else
+				} else
 				{
 					//$showsize=48;
 					$showsize = 'minwidth400';
@@ -6000,59 +6423,52 @@ 
 		}
 
 		// Format output value differently according to properties of field
-		if ($key == 'ref' && method_exists($this, 'getNomUrl')) $value=$this->getNomUrl(1, '', 0, '', 1);
-		elseif ($key == 'status' && method_exists($this, 'getLibStatut')) $value=$this->getLibStatut(3);
-		elseif ($type == 'date')
+		if ($key == 'ref' && method_exists($this, 'getNomUrl')) {
+		    $value=$this->getNomUrl(1, '', 0, '', 1);
+		} elseif ($key == 'status' && method_exists($this, 'getLibStatut')) {
+		    $value=$this->getLibStatut(3);
+		} elseif ($type == 'date')
 		{
 			if(! empty($value)) {
 				$value=dol_print_date($value,'day');
 			} else {
 				$value='';
 			}
-		}
-		elseif ($type == 'datetime')
+		} elseif ($type == 'datetime')
 		{
 			if(! empty($value)) {
 				$value=dol_print_date($value,'dayhour');
 			} else {
 				$value='';
 			}
-		}
-		elseif ($type == 'double')
+		} elseif ($type == 'double')
 		{
 			if (!empty($value)) {
 				$value=price($value);
 			}
-		}
-		elseif ($type == 'boolean')
+		} elseif ($type == 'boolean')
 		{
 			$checked='';
 			if (!empty($value)) {
 				$checked=' checked ';
 			}
 			$value='<input type="checkbox" '.$checked.' '.($moreparam?$moreparam:'').' readonly disabled>';
-		}
-		elseif ($type == 'mail')
+		} elseif ($type == 'mail')
 		{
 			$value=dol_print_email($value,0,0,0,64,1,1);
-		}
-		elseif ($type == 'url')
+		} elseif ($type == 'url')
 		{
 			$value=dol_print_url($value,'_blank',32,1);
-		}
-		elseif ($type == 'phone')
+		} elseif ($type == 'phone')
 		{
 			$value=dol_print_phone($value, '', 0, 0, '', '&nbsp;', 1);
-		}
-		elseif ($type == 'price')
+		} elseif ($type == 'price')
 		{
 			$value=price($value,0,$langs,0,0,-1,$conf->currency);
-		}
-		elseif ($type == 'select')
+		} elseif ($type == 'select')
 		{
 			$value=$param['options'][$value];
-		}
-		elseif ($type == 'sellist')
+		} elseif ($type == 'sellist')
 		{
 			$param_list=array_keys($param['options']);
 			$InfoFieldList = explode(":", $param_list[0]);
@@ -6082,7 +6498,7 @@ 
 				$sql.= " WHERE ".$selectkey."=0";
 			} elseif ($selectkey=='rowid') {
 				$sql.= " WHERE ".$selectkey."=".$this->db->escape($value);
-			}else {
+			} else {
 				$sql.= " WHERE ".$selectkey."='".$this->db->escape($value)."'";
 			}
 
@@ -6109,12 +6525,11 @@ 
 						}
 						if ($translabel!=$field_toshow) {
 							$value.=dol_trunc($translabel,18).' ';
-						}else {
+						} else {
 							$value.=$obj->$field_toshow.' ';
 						}
 					}
-				}
-				else
+				} else
 				{
 					$translabel='';
 					if (!empty($obj->{$InfoFieldList[1]})) {
@@ -6122,18 +6537,17 @@ 
 					}
 					if ($translabel!=$obj->{$InfoFieldList[1]}) {
 						$value=dol_trunc($translabel,18);
-					}else {
+					} else {
 						$value=$obj->{$InfoFieldList[1]};
 					}
 				}
+			} else {
+			    dol_syslog(get_class($this).'::showOutputField error '.$this->db->lasterror(), LOG_WARNING);
 			}
-			else dol_syslog(get_class($this).'::showOutputField error '.$this->db->lasterror(), LOG_WARNING);
-		}
-		elseif ($type == 'radio')
+		} elseif ($type == 'radio')
 		{
 			$value=$param['options'][$value];
-		}
-		elseif ($type == 'checkbox')
+		} elseif ($type == 'checkbox')
 		{
 			$value_arr=explode(',',$value);
 			$value='';
@@ -6144,8 +6558,7 @@ 
 				}
 				$value='<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';
 			}
-		}
-		elseif ($type == 'chkbxlst')
+		} elseif ($type == 'chkbxlst')
 		{
 			$value_arr = explode(',', $value);
 
@@ -6213,8 +6626,7 @@ 
 			} else {
 				dol_syslog(get_class($this) . '::showOutputField error ' . $this->db->lasterror(), LOG_WARNING);
 			}
-		}
-		elseif ($type == 'link')
+		} elseif ($type == 'link')
 		{
 			$out='';
 
@@ -6236,24 +6648,21 @@ 
 						$object->fetch($value);
 						$value=$object->getNomUrl($getnomurlparam);
 					}
-				}
-				else
+				} else
 				{
 					dol_syslog('Error bad setup of extrafield', LOG_WARNING);
 					return 'Error bad setup of extrafield';
 				}
+			} else {
+			    $value='';
 			}
-			else $value='';
-		}
-		elseif ($type == 'text' || $type == 'html')
+		} elseif ($type == 'text' || $type == 'html')
 		{
 			$value=dol_htmlentitiesbr($value);
-		}
-		elseif ($type == 'password')
+		} elseif ($type == 'password')
 		{
 			$value=preg_replace('/./i','*',$value);
-		}
-		elseif ($type == 'array')
+		} elseif ($type == 'array')
 		{
 			$value = implode('<br>', $value);
 		}
@@ -6280,7 +6689,9 @@ 
 	{
 		global $db, $conf, $langs, $action, $form;
 
-		if (! is_object($form)) $form=new Form($db);
+		if (! is_object($form)) {
+		    $form=new Form($db);
+		}
 
 		$out = '';
 
@@ -6294,7 +6705,9 @@ 
 			foreach($extrafields->attributes[$this->table_element]['label'] as $key=>$label)
 			{
 				// Show only the key field in params
-				if (is_array($params) && array_key_exists('onlykey',$params) && $key != $params['onlykey']) continue;
+				if (is_array($params) && array_key_exists('onlykey',$params) && $key != $params['onlykey']) {
+				    continue;
+				}
 
 				$enabled = 1;
 				if ($enabled && isset($extrafields->attributes[$this->table_element]['list'][$key]))
@@ -6308,11 +6721,18 @@ 
 					$perms = dol_eval($extrafields->attributes[$this->table_element]['perms'][$key], 1);
 				}
 
-				if (($mode == 'create' || $mode == 'edit') && abs($enabled) != 1 && abs($enabled) != 3) continue;	// <> -1 and <> 1 and <> 3 = not visible on forms, only on list
-				if (empty($perms)) continue;
+				if (($mode == 'create' || $mode == 'edit') && abs($enabled) != 1 && abs($enabled) != 3) {
+				    continue;
+				}
+				// <> -1 and <> 1 and <> 3 = not visible on forms, only on list
+				if (empty($perms)) {
+				    continue;
+				}
 
 				// Load language if required
-				if (! empty($extrafields->attributes[$this->table_element]['langfile'][$key])) $langs->load($extrafields->attributes[$this->table_element]['langfile'][$key]);
+				if (! empty($extrafields->attributes[$this->table_element]['langfile'][$key])) {
+				    $langs->load($extrafields->attributes[$this->table_element]['langfile'][$key]);
+				}
 
 				$colspan='3';
 				if (is_array($params) && count($params)>0) {
@@ -6346,8 +6766,7 @@ 
 				if ($extrafields->attributes[$this->table_element]['type'][$key] == 'separate')
 				{
 					$out .= $extrafields->showSeparator($key, $this);
-				}
-				else
+				} else
 				{
 					$csstyle='';
 					$class=(!empty($extrafields->attributes[$this->table_element]['hidden'][$key]) ? 'hideobject ' : '');
@@ -6377,10 +6796,12 @@ 
 					if (in_array($extrafields->attributes[$this->table_element]['type'][$key],array('date','datetime')))
 					{
 						$datenotinstring = $this->array_options['options_' . $key];
-						if (! is_numeric($this->array_options['options_' . $key]))	// For backward compatibility
+						if (! is_numeric($this->array_options['options_' . $key])) {
+						    // For backward compatibility
 						{
 							$datenotinstring = $this->db->jdate($datenotinstring);
 						}
+						}
 						$value = GETPOSTISSET($keyprefix.'options_'.$key.$keysuffix)?dol_mktime(GETPOST($keyprefix.'options_'.$key.$keysuffix."hour", 'int', 3), GETPOST($keyprefix.'options_'.$key.$keysuffix."min",'int',3), 0, GETPOST($keyprefix.'options_'.$key.$keysuffix."month",'int',3), GETPOST($keyprefix.'options_'.$key.$keysuffix."day",'int',3), GETPOST($keyprefix.'options_'.$key.$keysuffix."year",'int',3)):$datenotinstring;
 					}
 					// Convert float submited string into real php numeric (value in memory must be a php numeric)
@@ -6392,11 +6813,18 @@ 
 					$labeltoshow = $langs->trans($label);
 
 					$out .= '<td class="titlefield';
-					if (GETPOST('action','none') == 'create') $out.='create';
-					if ($mode != 'view' && ! empty($extrafields->attributes[$this->table_element]['required'][$key])) $out .= ' fieldrequired';
+					if (GETPOST('action','none') == 'create') {
+					    $out.='create';
+					}
+					if ($mode != 'view' && ! empty($extrafields->attributes[$this->table_element]['required'][$key])) {
+					    $out .= ' fieldrequired';
+					}
 					$out .= '">';
-					if (! empty($extrafields->attributes[$object->table_element]['help'][$key])) $out .= $form->textwithpicto($labeltoshow, $extrafields->attributes[$object->table_element]['help'][$key]);
-					else $out .= $labeltoshow;
+					if (! empty($extrafields->attributes[$object->table_element]['help'][$key])) {
+					    $out .= $form->textwithpicto($labeltoshow, $extrafields->attributes[$object->table_element]['help'][$key]);
+					} else {
+					    $out .= $labeltoshow;
+					}
 					$out .= '</td>';
 
 					$html_id = !empty($this->id) ? $this->element.'_extras_'.$key.'_'.$this->id : '';
@@ -6413,8 +6841,11 @@ 
 
 					$out .= '</td>';
 
-					if (! empty($conf->global->MAIN_EXTRAFIELDS_USE_TWO_COLUMS) && (($e % 2) == 1)) $out .= '</tr>';
-					else $out .= '</tr>';
+					if (! empty($conf->global->MAIN_EXTRAFIELDS_USE_TWO_COLUMS) && (($e % 2) == 1)) {
+					    $out .= '</tr>';
+					} else {
+					    $out .= '</tr>';
+					}
 					$e++;
 				}
 			}
@@ -6466,7 +6897,9 @@ 
 		global $user;
 
 		$element = $this->element;
-		if ($element == 'facturerec') $element='facture';
+		if ($element == 'facturerec') {
+		    $element='facture';
+		}
 
 		return $user->rights->{$element};
 	}
@@ -6491,7 +6924,10 @@ 
 
 			if (! $db->query($sql))
 			{
-				if ($ignoreerrors) return true;		// TODO Not enough. If there is A-B on kept thirdarty and B-C on old one, we must get A-B-C after merge. Not A-B.
+				if ($ignoreerrors) {
+				    return true;
+				}
+				// TODO Not enough. If there is A-B on kept thirdarty and B-C on old one, we must get A-B-C after merge. Not A-B.
 				//$this->errors = $db->lasterror();
 				return false;
 			}
@@ -6518,11 +6954,12 @@ 
 
 		$buyPrice = 0;
 
-		if (($unitPrice > 0) && (isset($conf->global->ForceBuyingPriceIfNull) && $conf->global->ForceBuyingPriceIfNull == 1)) // In most cases, test here is false
+		if (($unitPrice > 0) && (isset($conf->global->ForceBuyingPriceIfNull) && $conf->global->ForceBuyingPriceIfNull == 1)) {
+		    // In most cases, test here is false
 		{
 			$buyPrice = $unitPrice * (1 - $discountPercent / 100);
 		}
-		else
+		} else
 		{
 			// Get cost price for margin calculation
 			if (! empty($fk_product))
@@ -6540,13 +6977,11 @@ 
 					if ($product->cost_price > 0)
 					{
 						$buyPrice = $product->cost_price;
-					}
-					else if ($product->pmp > 0)
+					} else if ($product->pmp > 0)
 					{
 						$buyPrice = $product->pmp;
 					}
-				}
-				else if (isset($conf->global->MARGIN_TYPE) && $conf->global->MARGIN_TYPE == 'pmp')
+				} else if (isset($conf->global->MARGIN_TYPE) && $conf->global->MARGIN_TYPE == 'pmp')
 				{
 					require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 					$product = new Product($this->db);
@@ -6569,8 +7004,7 @@ 
 					if (($result = $productFournisseur->find_min_price_product_fournisseur($fk_product)) > 0)
 					{
 						$buyPrice = $productFournisseur->fourn_unitprice;
-					}
-					else if ($result < 0)
+					} else if ($result < 0)
 					{
 						$this->errors[] = $productFournisseur->error;
 						return -2;
@@ -6616,8 +7050,7 @@ 
 		{
 			$dir .= get_exdir(0, 0, 0, 0, $this, $modulepart).$this->track_id.'/';
 			$pdir .= get_exdir(0, 0, 0, 0, $this, $modulepart).$this->track_id.'/';
-		}
-		else
+		} else
 		{
 			$dir .= get_exdir(0, 0, 0, 0, $this, $modulepart).$this->ref.'/';
 			$pdir .= get_exdir(0, 0, 0, 0, $this, $modulepart).$this->ref.'/';
@@ -6680,19 +7113,26 @@ 
 
 						// Find name of thumb file
 						$photo_vignette=basename(getImageFileNameForSize($dir.$file, '_small'));
-						if (! dol_is_file($dirthumb.$photo_vignette)) $photo_vignette='';
+						if (! dol_is_file($dirthumb.$photo_vignette)) {
+						    $photo_vignette='';
+						}
 
 						// Get filesize of original file
 						$imgarray=dol_getImageSize($dir.$photo);
 
 						if ($nbbyrow > 0)
 						{
-							if ($nbphoto == 1) $return.= '<table width="100%" valign="top" align="center" border="0" cellpadding="2" cellspacing="2">';
+							if ($nbphoto == 1) {
+							    $return.= '<table width="100%" valign="top" align="center" border="0" cellpadding="2" cellspacing="2">';
+							}
 
-							if ($nbphoto % $nbbyrow == 1) $return.= '<tr align=center valign=middle border=1>';
+							if ($nbphoto % $nbbyrow == 1) {
+							    $return.= '<tr align=center valign=middle border=1>';
+							}
 							$return.= '<td width="'.ceil(100/$nbbyrow).'%" class="photo">';
+						} else if ($nbbyrow < 0) {
+						    $return .= '<div class="inline-block">';
 						}
-						else if ($nbbyrow < 0) $return .= '<div class="inline-block">';
 
 						$return.= "\n";
 
@@ -6700,15 +7140,20 @@ 
 						if (empty($nolink))
 						{
 							$urladvanced=getAdvancedPreviewUrl($modulepart, $relativefile, 0, 'entity='.$this->entity);
-							if ($urladvanced) $return.='<a href="'.$urladvanced.'">';
-							else $return.= '<a href="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdir.$photo).'" class="aphoto" target="_blank">';
+							if ($urladvanced) {
+							    $return.='<a href="'.$urladvanced.'">';
+							} else {
+							    $return.= '<a href="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdir.$photo).'" class="aphoto" target="_blank">';
+							}
 						}
 
 						// Show image (width height=$maxHeight)
 						// Si fichier vignette disponible et image source trop grande, on utilise la vignette, sinon on utilise photo origine
 						$alt=$langs->transnoentitiesnoconv('File').': '.$relativefile;
 						$alt.=' - '.$langs->transnoentitiesnoconv('Size').': '.$imgarray['width'].'x'.$imgarray['height'];
-						if ($notitle) $alt='';
+						if ($notitle) {
+						    $alt='';
+						}
 
 						if ($usesharelink)
 						{
@@ -6718,35 +7163,35 @@ 
 								{
 									$return.= '<!-- Show original file (thumb not yet available with shared links) -->';
 									$return.= '<img class="photo photowithmargin" border="0" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?hashp='.urlencode($val['share']).'" title="'.dol_escape_htmltag($alt).'">';
-								}
-								else {
+								} else {
 									$return.= '<!-- Show original file -->';
 									$return.= '<img class="photo photowithmargin" border="0" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?hashp='.urlencode($val['share']).'" title="'.dol_escape_htmltag($alt).'">';
 								}
-							}
-							else
+							} else
 							{
 								$return.= '<!-- Show nophoto file (because file is not shared) -->';
 								$return.= '<img class="photo photowithmargin" border="0" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/public/theme/common/nophoto.png" title="'.dol_escape_htmltag($alt).'">';
 							}
-						}
-						else
+						} else
 						{
 							if (empty($maxHeight) || $photo_vignette && $imgarray['height'] > $maxHeight)
 							{
 								$return.= '<!-- Show thumb -->';
 								$return.= '<img class="photo photowithmargin" border="0" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdirthumb.$photo_vignette).'" title="'.dol_escape_htmltag($alt).'">';
-							}
-							else {
+							} else {
 								$return.= '<!-- Show original file -->';
 								$return.= '<img class="photo photowithmargin" border="0" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdir.$photo).'" title="'.dol_escape_htmltag($alt).'">';
 							}
 						}
 
-						if (empty($nolink)) $return.= '</a>';
+						if (empty($nolink)) {
+						    $return.= '</a>';
+						}
 						$return.="\n";
 
-						if ($showfilename) $return.= '<br>'.$viewfilename;
+						if ($showfilename) {
+						    $return.= '<br>'.$viewfilename;
+						}
 						if ($showaction)
 						{
 							$return.= '<br>';
@@ -6771,15 +7216,20 @@ 
 						if ($nbbyrow > 0)
 						{
 							$return.= '</td>';
-							if (($nbphoto % $nbbyrow) == 0) $return.= '</tr>';
+							if (($nbphoto % $nbbyrow) == 0) {
+							    $return.= '</tr>';
+							}
+						} else if ($nbbyrow < 0) {
+						    $return.='</div>';
 						}
-						else if ($nbbyrow < 0) $return.='</div>';
 					}
 
 					if (empty($size)) {     // Format origine
 						$return.= '<img class="photo photowithmargin" border="0" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdir.$photo).'">';
 
-						if ($showfilename) $return.= '<br>'.$viewfilename;
+						if ($showfilename) {
+						    $return.= '<br>'.$viewfilename;
+						}
 						if ($showaction)
 						{
 							// Special case for product
@@ -6796,7 +7246,9 @@ 
 					}
 
 					// On continue ou on arrete de boucler ?
-					if ($nbmax && $nbphoto >= $nbmax) break;
+					if ($nbmax && $nbphoto >= $nbmax) {
+					    break;
+					}
 				}
 			}
 
@@ -6811,7 +7263,9 @@ 
 						$nbphoto++;
 					}
 
-					if ($nbphoto) $return.= '</table>';
+					if ($nbphoto) {
+					    $return.= '</table>';
+					}
 				}
 			}
 		}
@@ -6832,10 +7286,14 @@ 
 	{
 		if(is_array($info))
 		{
-			if(isset($info['type']) && $info['type']=='array') return true;
-			else return false;
+			if(isset($info['type']) && $info['type']=='array') {
+			    return true;
+			} else {
+			    return false;
+			}
+		} else {
+		    return false;
 		}
-		else return false;
 	}
 
 	/**
@@ -6848,10 +7306,14 @@ 
 	{
 		if(is_array($info))
 		{
-			if(isset($info['type']) && $info['type']=='null') return true;
-			else return false;
+			if(isset($info['type']) && $info['type']=='null') {
+			    return true;
+			} else {
+			    return false;
+			}
+		} else {
+		    return false;
 		}
-		else return false;
 	}
 
 	/**
@@ -6862,8 +7324,11 @@ 
 	 */
 	public function isDate($info)
 	{
-		if(isset($info['type']) && ($info['type']=='date' || $info['type']=='datetime' || $info['type']=='timestamp')) return true;
-		else return false;
+		if(isset($info['type']) && ($info['type']=='date' || $info['type']=='datetime' || $info['type']=='timestamp')) {
+		    return true;
+		} else {
+		    return false;
+		}
 	}
 
 	/**
@@ -6876,10 +7341,14 @@ 
 	{
 		if(is_array($info))
 		{
-			if(isset($info['type']) && ($info['type']=='int' || preg_match('/^integer/i',$info['type']) ) ) return true;
-			else return false;
+			if(isset($info['type']) && ($info['type']=='int' || preg_match('/^integer/i',$info['type']) ) ) {
+			    return true;
+			} else {
+			    return false;
+			}
+		} else {
+		    return false;
 		}
-		else return false;
 	}
 
 	/**
@@ -6892,10 +7361,14 @@ 
 	{
 		if(is_array($info))
 		{
-			if (isset($info['type']) && (preg_match('/^(double|real)/i', $info['type']))) return true;
-			else return false;
+			if (isset($info['type']) && (preg_match('/^(double|real)/i', $info['type']))) {
+			    return true;
+			} else {
+			    return false;
+			}
+		} else {
+		    return false;
 		}
-		else return false;
 	}
 
 	/**
@@ -6908,10 +7381,14 @@ 
 	{
 		if(is_array($info))
 		{
-			if(isset($info['type']) && $info['type']=='text') return true;
-			else return false;
+			if(isset($info['type']) && $info['type']=='text') {
+			    return true;
+			} else {
+			    return false;
+			}
+		} else {
+		    return false;
 		}
-		else return false;
 	}
 
 	/**
@@ -6924,10 +7401,14 @@ 
 	{
 		if(is_array($info))
 		{
-			if(isset($info['index']) && $info['index']==true) return true;
-			else return false;
+			if(isset($info['index']) && $info['index']==true) {
+			    return true;
+			} else {
+			    return false;
+			}
+		} else {
+		    return false;
 		}
-		else return false;
 	}
 
 	/**
@@ -6941,7 +7422,8 @@ 
 		global $conf;
 
 		$queryarray=array();
-		foreach ($this->fields as $field=>$info)	// Loop on definition of fields
+		foreach ($this->fields as $field=>$info) {
+		    // Loop on definition of fields
 		{
 			// Depending on field type ('datetime', ...)
 			if($this->isDate($info))
@@ -6949,13 +7431,12 @@ 
 				if(empty($this->{$field}))
 				{
 					$queryarray[$field] = null;
-				}
-				else
+		}
+				} else
 				{
 					$queryarray[$field] = $this->db->idate($this->{$field});
 				}
-			}
-			else if($this->isArray($info))
+			} else if($this->isArray($info))
 			{
 				if(! empty($this->{$field})) {
 					if(! is_array($this->{$field})) {
@@ -6965,28 +7446,35 @@ 
 				} else {
 					$queryarray[$field] = null;
 				}
-			}
-			else if($this->isInt($info))
+			} else if($this->isInt($info))
 			{
-				if ($field == 'entity' && is_null($this->{$field})) $queryarray[$field]=$conf->entity;
-				else
+				if ($field == 'entity' && is_null($this->{$field})) {
+				    $queryarray[$field]=$conf->entity;
+				} else
 				{
 					$queryarray[$field] = (int) price2num($this->{$field});
-					if (empty($queryarray[$field])) $queryarray[$field]=0;		// May be reset to null later if property 'notnull' is -1 for this field.
+					if (empty($queryarray[$field])) {
+					    $queryarray[$field]=0;
+					}
+					// May be reset to null later if property 'notnull' is -1 for this field.
 				}
-			}
-			else if($this->isFloat($info))
+			} else if($this->isFloat($info))
 			{
 				$queryarray[$field] = (double) price2num($this->{$field});
-				if (empty($queryarray[$field])) $queryarray[$field]=0;
-			}
-			else
+				if (empty($queryarray[$field])) {
+				    $queryarray[$field]=0;
+				}
+			} else
 			{
 				$queryarray[$field] = $this->{$field};
 			}
 
-			if ($info['type'] == 'timestamp' && empty($queryarray[$field])) unset($queryarray[$field]);
-			if (! empty($info['notnull']) && $info['notnull'] == -1 && empty($queryarray[$field])) $queryarray[$field] = null;
+			if ($info['type'] == 'timestamp' && empty($queryarray[$field])) {
+			    unset($queryarray[$field]);
+			}
+			if (! empty($info['notnull']) && $info['notnull'] == -1 && empty($queryarray[$field])) {
+			    $queryarray[$field] = null;
+			}
 		}
 
 		return $queryarray;
@@ -7004,42 +7492,47 @@ 
 		{
 			if($this->isDate($info))
 			{
-				if(empty($obj->{$field}) || $obj->{$field} === '0000-00-00 00:00:00' || $obj->{$field} === '1000-01-01 00:00:00') $this->{$field} = 0;
-				else $this->{$field} = strtotime($obj->{$field});
-			}
-			elseif($this->isArray($info))
+				if(empty($obj->{$field}) || $obj->{$field} === '0000-00-00 00:00:00' || $obj->{$field} === '1000-01-01 00:00:00') {
+				    $this->{$field} = 0;
+				} else {
+				    $this->{$field} = strtotime($obj->{$field});
+				}
+			} elseif($this->isArray($info))
 			{
 				if(! empty($obj->{$field})) {
 					$this->{$field} = @unserialize($obj->{$field});
 					// Hack for data not in UTF8
-					if($this->{$field } === false) @unserialize(utf8_decode($obj->{$field}));
+					if($this->{$field } === false) {
+					    @unserialize(utf8_decode($obj->{$field}));
+					}
 				} else {
 					$this->{$field} = array();
 				}
-			}
-			elseif($this->isInt($info))
+			} elseif($this->isInt($info))
 			{
-				if ($field == 'rowid') $this->id = (int) $obj->{$field};
-				else $this->{$field} = (int) $obj->{$field};
-			}
-			elseif($this->isFloat($info))
+				if ($field == 'rowid') {
+				    $this->id = (int) $obj->{$field};
+				} else {
+				    $this->{$field} = (int) $obj->{$field};
+				}
+			} elseif($this->isFloat($info))
 			{
 				$this->{$field} = (double) $obj->{$field};
-			}
-			elseif($this->isNull($info))
+			} elseif($this->isNull($info))
 			{
 				$val = $obj->{$field};
 				// zero is not null
 				$this->{$field} = (is_null($val) || (empty($val) && $val!==0 && $val!=='0') ? null : $val);
-			}
-			else
+			} else
 			{
 				$this->{$field} = $obj->{$field};
 			}
 		}
 
 		// If there is no 'ref' field, we force property ->ref to ->id for a better compatibility with common functions.
-		if (! isset($this->fields['ref']) && isset($this->id)) $this->ref = $this->id;
+		if (! isset($this->fields['ref']) && isset($this->id)) {
+		    $this->ref = $this->id;
+		}
 	}
 
 	/**
@@ -7062,9 +7555,13 @@ 
 	 */
     protected function quote($value, $fieldsentry)
     {
-		if (is_null($value)) return 'NULL';
-		else if (preg_match('/^(int|double|real)/i', $fieldsentry['type'])) return $this->db->escape("$value");
-		else return "'".$this->db->escape($value)."'";
+		if (is_null($value)) {
+		    return 'NULL';
+		} else if (preg_match('/^(int|double|real)/i', $fieldsentry['type'])) {
+		    return $this->db->escape("$value");
+		} else {
+		    return "'".$this->db->escape($value)."'";
+		}
 	}
 
 
@@ -7084,8 +7581,12 @@ 
 		$now=dol_now();
 
 		$fieldvalues = $this->setSaveQuery();
-		if (array_key_exists('date_creation', $fieldvalues) && empty($fieldvalues['date_creation'])) $fieldvalues['date_creation']=$this->db->idate($now);
-		if (array_key_exists('fk_user_creat', $fieldvalues) && ! ($fieldvalues['fk_user_creat'] > 0)) $fieldvalues['fk_user_creat']=$user->id;
+		if (array_key_exists('date_creation', $fieldvalues) && empty($fieldvalues['date_creation'])) {
+		    $fieldvalues['date_creation']=$this->db->idate($now);
+		}
+		if (array_key_exists('fk_user_creat', $fieldvalues) && ! ($fieldvalues['fk_user_creat'] > 0)) {
+		    $fieldvalues['fk_user_creat']=$user->id;
+		}
 		unset($fieldvalues['rowid']);	// The field 'rowid' is reserved field name for autoincrement field so we don't need it into insert.
 
 		$keys=array();
@@ -7100,8 +7601,12 @@ 
 		foreach($keys as $key)
 		{
 			// If field is an implicit foreign key field
-			if (preg_match('/^integer:/i', $this->fields[$key]['type']) && $values[$key] == '-1') $values[$key]='';
-			if (! empty($this->fields[$key]['foreignkey']) && $values[$key] == '-1') $values[$key]='';
+			if (preg_match('/^integer:/i', $this->fields[$key]['type']) && $values[$key] == '-1') {
+			    $values[$key]='';
+			}
+			if (! empty($this->fields[$key]['foreignkey']) && $values[$key] == '-1') {
+			    $values[$key]='';
+			}
 
 			//var_dump($key.'-'.$values[$key].'-'.($this->fields[$key]['notnull'] == 1));
 			if (isset($this->fields[$key]['notnull']) && $this->fields[$key]['notnull'] == 1 && ! isset($values[$key]) && is_null($val['default']))
@@ -7111,11 +7616,17 @@ 
 			}
 
 			// If field is an implicit foreign key field
-			if (preg_match('/^integer:/i', $this->fields[$key]['type']) && empty($values[$key])) $values[$key]='null';
-			if (! empty($this->fields[$key]['foreignkey']) && empty($values[$key])) $values[$key]='null';
+			if (preg_match('/^integer:/i', $this->fields[$key]['type']) && empty($values[$key])) {
+			    $values[$key]='null';
+			}
+			if (! empty($this->fields[$key]['foreignkey']) && empty($values[$key])) {
+			    $values[$key]='null';
+			}
 		}
 
-		if ($error) return -1;
+		if ($error) {
+		    return -1;
+		}
 
 		$this->db->begin();
 
@@ -7141,7 +7652,9 @@ 
 		if (! $error)
 		{
 			$result=$this->insertExtraFields();
-			if ($result < 0) $error++;
+			if ($result < 0) {
+			    $error++;
+			}
 		}
 
 		// Triggers
@@ -7174,15 +7687,24 @@ 
 	 */
 	public function fetchCommon($id, $ref = null, $morewhere = '')
 	{
-		if (empty($id) && empty($ref) && empty($morewhere)) return -1;
+		if (empty($id) && empty($ref) && empty($morewhere)) {
+		    return -1;
+		}
 
 		$sql = 'SELECT '.$this->getFieldList();
 		$sql.= ' FROM '.MAIN_DB_PREFIX.$this->table_element;
 
-		if (!empty($id))  $sql.= ' WHERE rowid = '.$id;
-		elseif (!empty($ref)) $sql.= " WHERE ref = ".$this->quote($ref, $this->fields['ref']);
-		else $sql.=' WHERE 1 = 1';	// usage with empty id and empty ref is very rare
-		if ($morewhere)   $sql.= $morewhere;
+		if (!empty($id)) {
+		    $sql.= ' WHERE rowid = '.$id;
+		} elseif (!empty($ref)) {
+		    $sql.= " WHERE ref = ".$this->quote($ref, $this->fields['ref']);
+		} else {
+		    $sql.=' WHERE 1 = 1';
+		}
+		// usage with empty id and empty ref is very rare
+		if ($morewhere) {
+		    $sql.= $morewhere;
+		}
 		$sql.=' LIMIT 1';	// This is a fetch, to be sure to get only one record
 
 		$res = $this->db->query($sql);
@@ -7193,13 +7715,11 @@ 
 			{
 				$this->setVarsFromFetchObj($obj);
 				return $this->id;
-			}
-			else
+			} else
 			{
 				return 0;
 			}
-		}
-		else
+		} else
 		{
 			$this->error = $this->db->lasterror();
 			$this->errors[] = $this->error;
@@ -7223,8 +7743,12 @@ 
 		$now=dol_now();
 
 		$fieldvalues = $this->setSaveQuery();
-		if (array_key_exists('date_modification', $fieldvalues) && empty($fieldvalues['date_modification'])) $fieldvalues['date_modification']=$this->db->idate($now);
-		if (array_key_exists('fk_user_modif', $fieldvalues) && ! ($fieldvalues['fk_user_modif'] > 0)) $fieldvalues['fk_user_modif']=$user->id;
+		if (array_key_exists('date_modification', $fieldvalues) && empty($fieldvalues['date_modification'])) {
+		    $fieldvalues['date_modification']=$this->db->idate($now);
+		}
+		if (array_key_exists('fk_user_modif', $fieldvalues) && ! ($fieldvalues['fk_user_modif'] > 0)) {
+		    $fieldvalues['fk_user_modif']=$user->id;
+		}
 		unset($fieldvalues['rowid']);	// The field 'rowid' is reserved field name for autoincrement field so we don't need it into update.
 
 		$keys=array();
@@ -7239,8 +7763,14 @@ 
 		// Clean and check mandatory
 		foreach($keys as $key)
 		{
-			if (preg_match('/^integer:/i', $this->fields[$key]['type']) && $values[$key] == '-1') $values[$key]='';		// This is an implicit foreign key field
-			if (! empty($this->fields[$key]['foreignkey']) && $values[$key] == '-1') $values[$key]='';					// This is an explicit foreign key field
+			if (preg_match('/^integer:/i', $this->fields[$key]['type']) && $values[$key] == '-1') {
+			    $values[$key]='';
+			}
+			// This is an implicit foreign key field
+			if (! empty($this->fields[$key]['foreignkey']) && $values[$key] == '-1') {
+			    $values[$key]='';
+			}
+			// This is an explicit foreign key field
 
 			//var_dump($key.'-'.$values[$key].'-'.($this->fields[$key]['notnull'] == 1));
 			/*
@@ -7321,10 +7851,11 @@ 
 					return -1;
 				}
 			}
-		}
-		elseif (! empty($this->fk_element) && ! empty($this->childtables))	// If object has childs linked with a foreign key field, we check all child tables.
+		} elseif (! empty($this->fk_element) && ! empty($this->childtables)) {
+		    // If object has childs linked with a foreign key field, we check all child tables.
 		{
 			$objectisused = $this->isObjectUsed($this->id);
+		}
 			if (! empty($objectisused))
 			{
 				dol_syslog(get_class($this)."::deleteCommon Can't delete record as it has some child", LOG_WARNING);
@@ -7431,7 +7962,9 @@ 
      */
     public function trimParameters($parameters)
     {
-        if (!is_array($parameters)) return;
+        if (!is_array($parameters)) {
+            return;
+        }
         foreach ($parameters as $parameter) {
             if (isset($this->$parameter)) {
                 $this->$parameter = trim($this->$parameter);

dolibarr/htdocs/core/class/dolgraph.class.php

Indentation +945 added lines, -945 removed lines

@@ -39,941 +39,941 @@ 
  */
 class DolGraph
 {
-	public $type=array();			// Array with type of each series. Example: array('bars', 'lines', ...)
-	public $mode='side';		    // Mode bars graph: side, depth
-	private $_library='jflot';	// Graphic library to use (jflot, artichow)
-
-	//! Array of data
-	public $data;				// Data of graph: array(array('abs1',valA1,valB1), array('abs2',valA2,valB2), ...)
-	public $title;				// Title of graph
-	public $cssprefix='';		// To add into css styles
-	public $width=380;
-	public $height=200;
-	public $MaxValue=0;
-	public $MinValue=0;
-	public $SetShading=0;
-
-	public $PrecisionY=-1;
-
-	public $horizTickIncrement=-1;
-	public $SetNumXTicks=-1;
-	public $labelInterval=-1;
-
-	public $hideXGrid=false;
-	public $hideYGrid=false;
-
-	public $Legend=array();
-	public $LegendWidthMin=0;
-	public $showlegend=1;
-	public $showpointvalue=1;
-	public $showpercent=0;
-	public $combine=0;				// 0.05 if you want to combine records < 5% into "other"
-	public $graph;     			// Objet Graph (Artichow, Phplot...)
-
-	/**
-	 * @var string Error code (or message)
-	 */
-	public $error='';
-
-	public $bordercolor;			// array(R,G,B)
-	public $bgcolor;				// array(R,G,B)
-	public $bgcolorgrid=array(255,255,255);			// array(R,G,B)
-	public $datacolor;				// array(array(R,G,B),...)
-
-	private $stringtoshow;      // To store string to output graph into HTML page
-
-
-	/**
-	 * Constructor
-	 *
-	 * @param	string	$library		'jflot' (default) or 'artichow' (no more supported)
-	 */
-	function __construct($library='jflot')
-	{
-		global $conf;
-		global $theme_bordercolor, $theme_datacolor, $theme_bgcolor, $theme_bgcoloronglet;
-
-		// To use old feature
-		if ($library == 'artichow')
-		{
-			$this->_library='artichow';
-
-			// Test if module GD present
-			$modules_list = get_loaded_extensions();
-			$isgdinstalled=0;
-			foreach ($modules_list as $module)
-			{
-				if ($module == 'gd') $isgdinstalled=1;
-			}
-			if (! $isgdinstalled)
-			{
-				$this->error="Error: PHP GD module is not available. It is required to build graphics.";
-				return -1;
-			}
-		}
-
-		$this->bordercolor = array(235,235,224);
-		$this->datacolor = array(array(120,130,150), array(160,160,180), array(190,190,220));
-		$this->bgcolor = array(235,235,224);
-
-		$color_file = DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/graph-color.php';
-		if (is_readable($color_file))
-		{
-			include_once $color_file;
-			if (isset($theme_bordercolor)) $this->bordercolor = $theme_bordercolor;
-			if (isset($theme_datacolor))   $this->datacolor   = $theme_datacolor;
-			if (isset($theme_bgcolor))     $this->bgcolor     = $theme_bgcolor;
-		}
-		//print 'bgcolor: '.join(',',$this->bgcolor).'<br>';
-	}
+    public $type=array();			// Array with type of each series. Example: array('bars', 'lines', ...)
+    public $mode='side';		    // Mode bars graph: side, depth
+    private $_library='jflot';	// Graphic library to use (jflot, artichow)
+
+    //! Array of data
+    public $data;				// Data of graph: array(array('abs1',valA1,valB1), array('abs2',valA2,valB2), ...)
+    public $title;				// Title of graph
+    public $cssprefix='';		// To add into css styles
+    public $width=380;
+    public $height=200;
+    public $MaxValue=0;
+    public $MinValue=0;
+    public $SetShading=0;
+
+    public $PrecisionY=-1;
+
+    public $horizTickIncrement=-1;
+    public $SetNumXTicks=-1;
+    public $labelInterval=-1;
+
+    public $hideXGrid=false;
+    public $hideYGrid=false;
+
+    public $Legend=array();
+    public $LegendWidthMin=0;
+    public $showlegend=1;
+    public $showpointvalue=1;
+    public $showpercent=0;
+    public $combine=0;				// 0.05 if you want to combine records < 5% into "other"
+    public $graph;     			// Objet Graph (Artichow, Phplot...)
+
+    /**
+     * @var string Error code (or message)
+     */
+    public $error='';
+
+    public $bordercolor;			// array(R,G,B)
+    public $bgcolor;				// array(R,G,B)
+    public $bgcolorgrid=array(255,255,255);			// array(R,G,B)
+    public $datacolor;				// array(array(R,G,B),...)
+
+    private $stringtoshow;      // To store string to output graph into HTML page
+
+
+    /**
+     * Constructor
+     *
+     * @param	string	$library		'jflot' (default) or 'artichow' (no more supported)
+     */
+    function __construct($library='jflot')
+    {
+        global $conf;
+        global $theme_bordercolor, $theme_datacolor, $theme_bgcolor, $theme_bgcoloronglet;
+
+        // To use old feature
+        if ($library == 'artichow')
+        {
+            $this->_library='artichow';
+
+            // Test if module GD present
+            $modules_list = get_loaded_extensions();
+            $isgdinstalled=0;
+            foreach ($modules_list as $module)
+            {
+                if ($module == 'gd') $isgdinstalled=1;
+            }
+            if (! $isgdinstalled)
+            {
+                $this->error="Error: PHP GD module is not available. It is required to build graphics.";
+                return -1;
+            }
+        }
+
+        $this->bordercolor = array(235,235,224);
+        $this->datacolor = array(array(120,130,150), array(160,160,180), array(190,190,220));
+        $this->bgcolor = array(235,235,224);
+
+        $color_file = DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/graph-color.php';
+        if (is_readable($color_file))
+        {
+            include_once $color_file;
+            if (isset($theme_bordercolor)) $this->bordercolor = $theme_bordercolor;
+            if (isset($theme_datacolor))   $this->datacolor   = $theme_datacolor;
+            if (isset($theme_bgcolor))     $this->bgcolor     = $theme_bgcolor;
+        }
+        //print 'bgcolor: '.join(',',$this->bgcolor).'<br>';
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Set Y precision
-	 *
-	 * @param 	float	$which_prec		Precision
-	 * @return 	boolean
-	 */
-	function SetPrecisionY($which_prec)
-	{
+    /**
+     * Set Y precision
+     *
+     * @param 	float	$which_prec		Precision
+     * @return 	boolean
+     */
+    function SetPrecisionY($which_prec)
+    {
         // phpcs:enable
-		$this->PrecisionY = $which_prec;
-		return true;
-	}
+        $this->PrecisionY = $which_prec;
+        return true;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Utiliser SetNumTicks ou SetHorizTickIncrement mais pas les 2
-	 *
-	 * @param 	float 		$xi		Xi
-	 * @return	boolean				True
-	 */
-	function SetHorizTickIncrement($xi)
-	{
+    /**
+     * Utiliser SetNumTicks ou SetHorizTickIncrement mais pas les 2
+     *
+     * @param 	float 		$xi		Xi
+     * @return	boolean				True
+     */
+    function SetHorizTickIncrement($xi)
+    {
         // phpcs:enable
-		$this->horizTickIncrement = $xi;
-		return true;
-	}
+        $this->horizTickIncrement = $xi;
+        return true;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Utiliser SetNumTicks ou SetHorizTickIncrement mais pas les 2
-	 *
-	 * @param 	float 		$xt		Xt
-	 * @return	boolean				True
-	 */
-	function SetNumXTicks($xt)
-	{
+    /**
+     * Utiliser SetNumTicks ou SetHorizTickIncrement mais pas les 2
+     *
+     * @param 	float 		$xt		Xt
+     * @return	boolean				True
+     */
+    function SetNumXTicks($xt)
+    {
         // phpcs:enable
-		$this->SetNumXTicks = $xt;
-		return true;
-	}
+        $this->SetNumXTicks = $xt;
+        return true;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Set label interval to reduce number of labels
-	 *
-	 * @param 	float 		$x		Label interval
-	 * @return	boolean				True
-	 */
-	function SetLabelInterval($x)
-	{
+    /**
+     * Set label interval to reduce number of labels
+     *
+     * @param 	float 		$x		Label interval
+     * @return	boolean				True
+     */
+    function SetLabelInterval($x)
+    {
         // phpcs:enable
-		$this->labelInterval = $x;
-		return true;
-	}
+        $this->labelInterval = $x;
+        return true;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Hide X grid
-	 *
-	 * @param	boolean		$bool	XGrid or not
-	 * @return	boolean				true
-	 */
-	function SetHideXGrid($bool)
-	{
+    /**
+     * Hide X grid
+     *
+     * @param	boolean		$bool	XGrid or not
+     * @return	boolean				true
+     */
+    function SetHideXGrid($bool)
+    {
         // phpcs:enable
-		$this->hideXGrid = $bool;
-		return true;
-	}
+        $this->hideXGrid = $bool;
+        return true;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Hide Y grid
-	 *
-	 * @param	boolean		$bool	YGrid or not
-	 * @return	boolean				true
-	 */
-	function SetHideYGrid($bool)
-	{
+    /**
+     * Hide Y grid
+     *
+     * @param	boolean		$bool	YGrid or not
+     * @return	boolean				true
+     */
+    function SetHideYGrid($bool)
+    {
         // phpcs:enable
-		$this->hideYGrid = $bool;
-		return true;
-	}
+        $this->hideYGrid = $bool;
+        return true;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Set y label
-	 *
-	 * @param 	string	$label		Y label
-	 * @return	boolean|null				True
-	 */
-	function SetYLabel($label)
-	{
+    /**
+     * Set y label
+     *
+     * @param 	string	$label		Y label
+     * @return	boolean|null				True
+     */
+    function SetYLabel($label)
+    {
         // phpcs:enable
-		$this->YLabel = $label;
-	}
+        $this->YLabel = $label;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Set width
-	 *
-	 * @param 	int		$w			Width
-	 * @return	boolean|null				True
-	 */
-	function SetWidth($w)
-	{
+    /**
+     * Set width
+     *
+     * @param 	int		$w			Width
+     * @return	boolean|null				True
+     */
+    function SetWidth($w)
+    {
         // phpcs:enable
-		$this->width = $w;
-	}
+        $this->width = $w;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Set title
-	 *
-	 * @param 	string	$title		Title
-	 * @return	void
-	 */
-	function SetTitle($title)
-	{
+    /**
+     * Set title
+     *
+     * @param 	string	$title		Title
+     * @return	void
+     */
+    function SetTitle($title)
+    {
         // phpcs:enable
-		$this->title = $title;
-	}
+        $this->title = $title;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Set data
-	 *
-	 * @param 	array	$data		Data
-	 * @return	void
-	 * @see draw_jflot for syntax of data array
-	 */
-	function SetData($data)
-	{
+    /**
+     * Set data
+     *
+     * @param 	array	$data		Data
+     * @return	void
+     * @see draw_jflot for syntax of data array
+     */
+    function SetData($data)
+    {
         // phpcs:enable
-		$this->data = $data;
-	}
+        $this->data = $data;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Set data
-	 *
-	 * @param 	array	$datacolor		Data color array(array(R,G,B),array(R,G,B)...)
-	 * @return	void
-	 */
-	function SetDataColor($datacolor)
-	{
+    /**
+     * Set data
+     *
+     * @param 	array	$datacolor		Data color array(array(R,G,B),array(R,G,B)...)
+     * @return	void
+     */
+    function SetDataColor($datacolor)
+    {
         // phpcs:enable
-		$this->datacolor = $datacolor;
-	}
+        $this->datacolor = $datacolor;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Set type
-	 *
-	 * @param 	array	$type		Array with type for each serie. Example: array('pie'), array('lines',...,'bars')
-	 * @return	void
-	 */
-	function SetType($type)
-	{
+    /**
+     * Set type
+     *
+     * @param 	array	$type		Array with type for each serie. Example: array('pie'), array('lines',...,'bars')
+     * @return	void
+     */
+    function SetType($type)
+    {
         // phpcs:enable
-		$this->type = $type;
-	}
+        $this->type = $type;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Set legend
-	 *
-	 * @param 	array	$legend		Legend. Example: array('seriename1','seriname2',...)
-	 * @return	void
-	 */
-	function SetLegend($legend)
-	{
+    /**
+     * Set legend
+     *
+     * @param 	array	$legend		Legend. Example: array('seriename1','seriname2',...)
+     * @return	void
+     */
+    function SetLegend($legend)
+    {
         // phpcs:enable
-		$this->Legend = $legend;
-	}
+        $this->Legend = $legend;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Set min width
-	 *
-	 * @param 	int		$legendwidthmin		Min width
-	 * @return	void
-	 */
-	function SetLegendWidthMin($legendwidthmin)
-	{
+    /**
+     * Set min width
+     *
+     * @param 	int		$legendwidthmin		Min width
+     * @return	void
+     */
+    function SetLegendWidthMin($legendwidthmin)
+    {
         // phpcs:enable
-		$this->LegendWidthMin = $legendwidthmin;
-	}
+        $this->LegendWidthMin = $legendwidthmin;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Set max value
-	 *
-	 * @param 	int		$max			Max value
-	 * @return	void
-	 */
-	function SetMaxValue($max)
-	{
+    /**
+     * Set max value
+     *
+     * @param 	int		$max			Max value
+     * @return	void
+     */
+    function SetMaxValue($max)
+    {
         // phpcs:enable
-		$this->MaxValue = $max;
-	}
+        $this->MaxValue = $max;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Get max value
-	 *
-	 * @return	int		Max value
-	 */
-	function GetMaxValue()
-	{
+    /**
+     * Get max value
+     *
+     * @return	int		Max value
+     */
+    function GetMaxValue()
+    {
         // phpcs:enable
-		return $this->MaxValue;
-	}
+        return $this->MaxValue;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Set min value
-	 *
-	 * @param 	int		$min			Min value
-	 * @return	void
-	 */
-	function SetMinValue($min)
-	{
+    /**
+     * Set min value
+     *
+     * @param 	int		$min			Min value
+     * @return	void
+     */
+    function SetMinValue($min)
+    {
         // phpcs:enable
-		$this->MinValue = $min;
-	}
+        $this->MinValue = $min;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Get min value
-	 *
-	 * @return	int		Max value
-	 */
-	function GetMinValue()
-	{
+    /**
+     * Get min value
+     *
+     * @return	int		Max value
+     */
+    function GetMinValue()
+    {
         // phpcs:enable
-		return $this->MinValue;
-	}
+        return $this->MinValue;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Set height
-	 *
-	 * @param 	int		$h				Height
-	 * @return	void
-	 */
-	function SetHeight($h)
-	{
+    /**
+     * Set height
+     *
+     * @param 	int		$h				Height
+     * @return	void
+     */
+    function SetHeight($h)
+    {
         // phpcs:enable
-		$this->height = $h;
-	}
+        $this->height = $h;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Set shading
-	 *
-	 * @param 	string	$s				Shading
-	 * @return	void
-	 */
-	function SetShading($s)
-	{
+    /**
+     * Set shading
+     *
+     * @param 	string	$s				Shading
+     * @return	void
+     */
+    function SetShading($s)
+    {
         // phpcs:enable
-		$this->SetShading = $s;
-	}
+        $this->SetShading = $s;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Set shading
-	 *
-	 * @param 	string	$s				Shading
-	 * @return	void
-	 */
-	function SetCssPrefix($s)
-	{
+    /**
+     * Set shading
+     *
+     * @param 	string	$s				Shading
+     * @return	void
+     */
+    function SetCssPrefix($s)
+    {
         // phpcs:enable
-		$this->cssprefix = $s;
-	}
+        $this->cssprefix = $s;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Reset bg color
-	 *
-	 * @return	void
-	 */
-	function ResetBgColor()
-	{
+    /**
+     * Reset bg color
+     *
+     * @return	void
+     */
+    function ResetBgColor()
+    {
         // phpcs:enable
-		unset($this->bgcolor);
-	}
+        unset($this->bgcolor);
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Reset bgcolorgrid
-	 *
-	 * @return	void
-	 */
-	function ResetBgColorGrid()
-	{
+    /**
+     * Reset bgcolorgrid
+     *
+     * @return	void
+     */
+    function ResetBgColorGrid()
+    {
         // phpcs:enable
-		unset($this->bgcolorgrid);
-	}
-
-	/**
-	 * Is graph ko
-	 *
-	 * @return	string		Error
-	 */
-	function isGraphKo()
-	{
-		return $this->error;
-	}
-
-	/**
-	 * Show legend or not
-	 *
-	 * @param	int		$showlegend		1=Show legend (default), 0=Hide legend
-	 * @return	void
-	 */
-	function setShowLegend($showlegend)
-	{
-		$this->showlegend=$showlegend;
-	}
-
-	/**
-	 * Show pointvalue or not
-	 *
-	 * @param	int		$showpointvalue		1=Show value for each point, as tooltip or inline (default), 0=Hide value
-	 * @return	void
-	 */
-	function setShowPointValue($showpointvalue)
-	{
-		$this->showpointvalue=$showpointvalue;
-	}
-
-	/**
-	 * Show percent or not
-	 *
-	 * @param	int		$showpercent		1=Show percent for each point, as tooltip or inline, 0=Hide percent (default)
-	 * @return	void
-	 */
-	function setShowPercent($showpercent)
-	{
-		$this->showpercent=$showpercent;
-	}
+        unset($this->bgcolorgrid);
+    }
+
+    /**
+     * Is graph ko
+     *
+     * @return	string		Error
+     */
+    function isGraphKo()
+    {
+        return $this->error;
+    }
+
+    /**
+     * Show legend or not
+     *
+     * @param	int		$showlegend		1=Show legend (default), 0=Hide legend
+     * @return	void
+     */
+    function setShowLegend($showlegend)
+    {
+        $this->showlegend=$showlegend;
+    }
+
+    /**
+     * Show pointvalue or not
+     *
+     * @param	int		$showpointvalue		1=Show value for each point, as tooltip or inline (default), 0=Hide value
+     * @return	void
+     */
+    function setShowPointValue($showpointvalue)
+    {
+        $this->showpointvalue=$showpointvalue;
+    }
+
+    /**
+     * Show percent or not
+     *
+     * @param	int		$showpercent		1=Show percent for each point, as tooltip or inline, 0=Hide percent (default)
+     * @return	void
+     */
+    function setShowPercent($showpercent)
+    {
+        $this->showpercent=$showpercent;
+    }
 
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Define background color of complete image
-	 *
-	 * @param	array	$bg_color		array(R,G,B) ou 'onglet' ou 'default'
-	 * @return	void
-	 */
-	function SetBgColor($bg_color = array(255,255,255))
-	{
+    /**
+     * Define background color of complete image
+     *
+     * @param	array	$bg_color		array(R,G,B) ou 'onglet' ou 'default'
+     * @return	void
+     */
+    function SetBgColor($bg_color = array(255,255,255))
+    {
         // phpcs:enable
-		global $theme_bgcolor,$theme_bgcoloronglet;
-
-		if (! is_array($bg_color))
-		{
-			if ($bg_color == 'onglet')
-			{
-				//print 'ee'.join(',',$theme_bgcoloronglet);
-				$this->bgcolor = $theme_bgcoloronglet;
-			}
-			else
-			{
-				$this->bgcolor = $theme_bgcolor;
-			}
-		}
-		else
-		{
-			$this->bgcolor = $bg_color;
-		}
-	}
+        global $theme_bgcolor,$theme_bgcoloronglet;
+
+        if (! is_array($bg_color))
+        {
+            if ($bg_color == 'onglet')
+            {
+                //print 'ee'.join(',',$theme_bgcoloronglet);
+                $this->bgcolor = $theme_bgcoloronglet;
+            }
+            else
+            {
+                $this->bgcolor = $theme_bgcolor;
+            }
+        }
+        else
+        {
+            $this->bgcolor = $bg_color;
+        }
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Define background color of grid
-	 *
-	 * @param	array	$bg_colorgrid		array(R,G,B) ou 'onglet' ou 'default'
-	 * @return	void
-	 */
-	function SetBgColorGrid($bg_colorgrid = array(255,255,255))
-	{
+    /**
+     * Define background color of grid
+     *
+     * @param	array	$bg_colorgrid		array(R,G,B) ou 'onglet' ou 'default'
+     * @return	void
+     */
+    function SetBgColorGrid($bg_colorgrid = array(255,255,255))
+    {
         // phpcs:enable
-		global $theme_bgcolor,$theme_bgcoloronglet;
-
-		if (! is_array($bg_colorgrid))
-		{
-			if ($bg_colorgrid == 'onglet')
-			{
-				//print 'ee'.join(',',$theme_bgcoloronglet);
-				$this->bgcolorgrid = $theme_bgcoloronglet;
-			}
-			else
-			{
-				$this->bgcolorgrid = $theme_bgcolor;
-			}
-		}
-		else
-		{
-			$this->bgcolorgrid = $bg_colorgrid;
-		}
-	}
+        global $theme_bgcolor,$theme_bgcoloronglet;
+
+        if (! is_array($bg_colorgrid))
+        {
+            if ($bg_colorgrid == 'onglet')
+            {
+                //print 'ee'.join(',',$theme_bgcoloronglet);
+                $this->bgcolorgrid = $theme_bgcoloronglet;
+            }
+            else
+            {
+                $this->bgcolorgrid = $theme_bgcolor;
+            }
+        }
+        else
+        {
+            $this->bgcolorgrid = $bg_colorgrid;
+        }
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Reset data color
-	 *
-	 * @return	void
-	 */
-	function ResetDataColor()
-	{
+    /**
+     * Reset data color
+     *
+     * @return	void
+     */
+    function ResetDataColor()
+    {
         // phpcs:enable
-		unset($this->datacolor);
-	}
+        unset($this->datacolor);
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Get max value
-	 *
-	 * @return	int		Max value
-	 */
-	function GetMaxValueInData()
-	{
+    /**
+     * Get max value
+     *
+     * @return	int		Max value
+     */
+    function GetMaxValueInData()
+    {
         // phpcs:enable
-		$k = 0;
-		$vals = array();
-
-		$nblines = count($this->data);
-		$nbvalues = count($this->data[0]) - 1;
-
-		for ($j = 0 ; $j < $nblines ; $j++)
-		{
-			for ($i = 0 ; $i < $nbvalues ; $i++)
-			{
-				$vals[$k] = $this->data[$j][$i+1];
-				$k++;
-			}
-		}
-		rsort($vals);
-		return $vals[0];
-	}
+        $k = 0;
+        $vals = array();
+
+        $nblines = count($this->data);
+        $nbvalues = count($this->data[0]) - 1;
+
+        for ($j = 0 ; $j < $nblines ; $j++)
+        {
+            for ($i = 0 ; $i < $nbvalues ; $i++)
+            {
+                $vals[$k] = $this->data[$j][$i+1];
+                $k++;
+            }
+        }
+        rsort($vals);
+        return $vals[0];
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Return min value of all data
-	 *
-	 * @return	int		Min value of all data
-	 */
-	function GetMinValueInData()
-	{
+    /**
+     * Return min value of all data
+     *
+     * @return	int		Min value of all data
+     */
+    function GetMinValueInData()
+    {
         // phpcs:enable
-		$k = 0;
-		$vals = array();
-
-		$nblines = count($this->data);
-		$nbvalues = count($this->data[0]) - 1;
-
-		for ($j = 0 ; $j < $nblines ; $j++)
-		{
-			for ($i = 0 ; $i < $nbvalues ; $i++)
-			{
-				$vals[$k] = $this->data[$j][$i+1];
-				$k++;
-			}
-		}
-		sort($vals);
-		return $vals[0];
-	}
+        $k = 0;
+        $vals = array();
+
+        $nblines = count($this->data);
+        $nbvalues = count($this->data[0]) - 1;
+
+        for ($j = 0 ; $j < $nblines ; $j++)
+        {
+            for ($i = 0 ; $i < $nbvalues ; $i++)
+            {
+                $vals[$k] = $this->data[$j][$i+1];
+                $k++;
+            }
+        }
+        sort($vals);
+        return $vals[0];
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Return max value of all data
-	 *
-	 * @return 	int		Max value of all data
-	 */
-	function GetCeilMaxValue()
-	{
+    /**
+     * Return max value of all data
+     *
+     * @return 	int		Max value of all data
+     */
+    function GetCeilMaxValue()
+    {
         // phpcs:enable
-		$max = $this->GetMaxValueInData();
-		if ($max != 0) $max++;
-		$size=dol_strlen(abs(ceil($max)));
-		$factor=1;
-		for ($i=0; $i < ($size-1); $i++)
-		{
-			$factor*=10;
-		}
-
-		$res=0;
-		if (is_numeric($max)) $res=ceil($max/$factor)*$factor;
-
-		//print "max=".$max." res=".$res;
-		return $res;
-	}
+        $max = $this->GetMaxValueInData();
+        if ($max != 0) $max++;
+        $size=dol_strlen(abs(ceil($max)));
+        $factor=1;
+        for ($i=0; $i < ($size-1); $i++)
+        {
+            $factor*=10;
+        }
+
+        $res=0;
+        if (is_numeric($max)) $res=ceil($max/$factor)*$factor;
+
+        //print "max=".$max." res=".$res;
+        return $res;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Return min value of all data
-	 *
-	 * @return 	double		Max value of all data
-	 */
-	function GetFloorMinValue()
-	{
+    /**
+     * Return min value of all data
+     *
+     * @return 	double		Max value of all data
+     */
+    function GetFloorMinValue()
+    {
         // phpcs:enable
-		$min = $this->GetMinValueInData();
-		if ($min == '') $min=0;
-		if ($min != 0) $min--;
-		$size=dol_strlen(abs(floor($min)));
-		$factor=1;
-		for ($i=0; $i < ($size-1); $i++)
-		{
-			$factor*=10;
-		}
-
-		$res=floor($min/$factor)*$factor;
-
-		//print "min=".$min." res=".$res;
-		return $res;
-	}
-
-	/**
-	 * Build a graph into memory using correct library  (may also be wrote on disk, depending on library used)
-	 *
-	 * @param	string	$file    	Image file name to use to save onto disk (also used as javascript unique id)
-	 * @param	string	$fileurl	Url path to show image if saved onto disk
-	 * @return	integer|null
-	 */
-	function draw($file, $fileurl='')
-	{
-		if (empty($file))
-		{
-			$this->error="Call to draw method was made with empty value for parameter file.";
-			dol_syslog(get_class($this)."::draw ".$this->error, LOG_ERR);
-			return -2;
-		}
-		if (! is_array($this->data))
-		{
-			$this->error="Call to draw method was made but SetData was not called or called with an empty dataset for parameters";
-			dol_syslog(get_class($this)."::draw ".$this->error, LOG_ERR);
-			return -1;
-		}
-		if (count($this->data) < 1)
-		{
-			$this->error="Call to draw method was made but SetData was is an empty dataset";
-			dol_syslog(get_class($this)."::draw ".$this->error, LOG_WARNING);
-		}
-		$call = "draw_".$this->_library;
-		call_user_func_array(array($this,$call), array($file,$fileurl));
-	}
+        $min = $this->GetMinValueInData();
+        if ($min == '') $min=0;
+        if ($min != 0) $min--;
+        $size=dol_strlen(abs(floor($min)));
+        $factor=1;
+        for ($i=0; $i < ($size-1); $i++)
+        {
+            $factor*=10;
+        }
+
+        $res=floor($min/$factor)*$factor;
+
+        //print "min=".$min." res=".$res;
+        return $res;
+    }
+
+    /**
+     * Build a graph into memory using correct library  (may also be wrote on disk, depending on library used)
+     *
+     * @param	string	$file    	Image file name to use to save onto disk (also used as javascript unique id)
+     * @param	string	$fileurl	Url path to show image if saved onto disk
+     * @return	integer|null
+     */
+    function draw($file, $fileurl='')
+    {
+        if (empty($file))
+        {
+            $this->error="Call to draw method was made with empty value for parameter file.";
+            dol_syslog(get_class($this)."::draw ".$this->error, LOG_ERR);
+            return -2;
+        }
+        if (! is_array($this->data))
+        {
+            $this->error="Call to draw method was made but SetData was not called or called with an empty dataset for parameters";
+            dol_syslog(get_class($this)."::draw ".$this->error, LOG_ERR);
+            return -1;
+        }
+        if (count($this->data) < 1)
+        {
+            $this->error="Call to draw method was made but SetData was is an empty dataset";
+            dol_syslog(get_class($this)."::draw ".$this->error, LOG_WARNING);
+        }
+        $call = "draw_".$this->_library;
+        call_user_func_array(array($this,$call), array($file,$fileurl));
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-	/**
-	 * Build a graph onto disk using Artichow library and return img string to it
-	 *
-	 * @param	string	$file    	Image file name to use if we save onto disk
-	 * @param	string	$fileurl	Url path to show image if saved onto disk
-	 * @return	void
-	 */
-	private function draw_artichow($file,$fileurl)
-	{
+    /**
+     * Build a graph onto disk using Artichow library and return img string to it
+     *
+     * @param	string	$file    	Image file name to use if we save onto disk
+     * @param	string	$fileurl	Url path to show image if saved onto disk
+     * @return	void
+     */
+    private function draw_artichow($file,$fileurl)
+    {
         // phpcs:enable
-		global $artichow_defaultfont;
-
-		dol_syslog(get_class($this)."::draw_artichow this->type=".join(',',$this->type));
-
-		if (! defined('SHADOW_RIGHT_TOP'))  define('SHADOW_RIGHT_TOP',3);
-		if (! defined('LEGEND_BACKGROUND')) define('LEGEND_BACKGROUND',2);
-		if (! defined('LEGEND_LINE'))       define('LEGEND_LINE',1);
-
-		// Create graph
-		$classname='';
-		if (! isset($this->type[0]) || $this->type[0] == 'bars')  $classname='BarPlot';    // Only one type (first one) is supported by artichow
-		else if ($this->type[0] == 'lines' || $this->type[0] == 'linesnopoint') $classname='LinePlot';
-		else $classname='TypeUnknown';
-		include_once ARTICHOW_PATH.$classname.'.class.php';
-
-		// Definition de couleurs
-		$bgcolor=new Color($this->bgcolor[0],$this->bgcolor[1],$this->bgcolor[2]);
-		$bgcolorgrid=new Color($this->bgcolorgrid[0],$this->bgcolorgrid[1],$this->bgcolorgrid[2]);
-		$colortrans=new Color(0,0,0,100);
-		$colorsemitrans=new Color(255,255,255,60);
-		$colorgradient= new LinearGradient(new Color(235, 235, 235),new Color(255, 255, 255),0);
-		$colorwhite=new Color(255,255,255);
-
-		// Graph
-		$graph = new Graph($this->width, $this->height);
-		$graph->border->hide();
-		$graph->setAntiAliasing(true);
-		if (isset($this->title))
-		{
-			$graph->title->set($this->title);
-			//print $artichow_defaultfont;exit;
-			$graph->title->setFont(new $artichow_defaultfont(10));
-		}
-
-		if (is_array($this->bgcolor)) $graph->setBackgroundColor($bgcolor);
-		else $graph->setBackgroundGradient($colorgradient);
-
-		$group = new PlotGroup;
-		//$group->setSpace(5, 5, 0, 0);
-
-		$paddleft=50;
-		$paddright=10;
-		$strl=dol_strlen(max(abs($this->MaxValue),abs($this->MinValue)));
-		if ($strl > 6) $paddleft += ($strl * 4);
-		$group->setPadding($paddleft, $paddright);		// Width on left and right for Y axis values
-		$group->legend->setSpace(0);
-		$group->legend->setPadding(2,2,2,2);
-		$group->legend->setPosition(null, 0.1);
-		$group->legend->setBackgroundColor($colorsemitrans);
-
-		if (is_array($this->bgcolorgrid)) $group->grid->setBackgroundColor($bgcolorgrid);
-		else $group->grid->setBackgroundColor($colortrans);
-
-		if ($this->hideXGrid)	$group->grid->hideVertical(true);
-		if ($this->hideYGrid)	$group->grid->hideHorizontal(true);
-
-		// On boucle sur chaque lot de donnees
-		$legends=array();
-		$i=0;
-		$nblot=count($this->data[0])-1;
-
-		while ($i < $nblot)
-		{
-			$x=0;
-			$values=array();
-			foreach($this->data as $key => $valarray)
-			{
-				$legends[$x] = $valarray[0];
-				$values[$x]  = $valarray[$i+1];
-				$x++;
-			}
-
-			// We fix unknown values to null
-			$newvalues=array();
-			foreach($values as $val)
-			{
-				$newvalues[]=(is_numeric($val) ? $val : null);
-			}
+        global $artichow_defaultfont;
+
+        dol_syslog(get_class($this)."::draw_artichow this->type=".join(',',$this->type));
+
+        if (! defined('SHADOW_RIGHT_TOP'))  define('SHADOW_RIGHT_TOP',3);
+        if (! defined('LEGEND_BACKGROUND')) define('LEGEND_BACKGROUND',2);
+        if (! defined('LEGEND_LINE'))       define('LEGEND_LINE',1);
+
+        // Create graph
+        $classname='';
+        if (! isset($this->type[0]) || $this->type[0] == 'bars')  $classname='BarPlot';    // Only one type (first one) is supported by artichow
+        else if ($this->type[0] == 'lines' || $this->type[0] == 'linesnopoint') $classname='LinePlot';
+        else $classname='TypeUnknown';
+        include_once ARTICHOW_PATH.$classname.'.class.php';
+
+        // Definition de couleurs
+        $bgcolor=new Color($this->bgcolor[0],$this->bgcolor[1],$this->bgcolor[2]);
+        $bgcolorgrid=new Color($this->bgcolorgrid[0],$this->bgcolorgrid[1],$this->bgcolorgrid[2]);
+        $colortrans=new Color(0,0,0,100);
+        $colorsemitrans=new Color(255,255,255,60);
+        $colorgradient= new LinearGradient(new Color(235, 235, 235),new Color(255, 255, 255),0);
+        $colorwhite=new Color(255,255,255);
+
+        // Graph
+        $graph = new Graph($this->width, $this->height);
+        $graph->border->hide();
+        $graph->setAntiAliasing(true);
+        if (isset($this->title))
+        {
+            $graph->title->set($this->title);
+            //print $artichow_defaultfont;exit;
+            $graph->title->setFont(new $artichow_defaultfont(10));
+        }
+
+        if (is_array($this->bgcolor)) $graph->setBackgroundColor($bgcolor);
+        else $graph->setBackgroundGradient($colorgradient);
+
+        $group = new PlotGroup;
+        //$group->setSpace(5, 5, 0, 0);
+
+        $paddleft=50;
+        $paddright=10;
+        $strl=dol_strlen(max(abs($this->MaxValue),abs($this->MinValue)));
+        if ($strl > 6) $paddleft += ($strl * 4);
+        $group->setPadding($paddleft, $paddright);		// Width on left and right for Y axis values
+        $group->legend->setSpace(0);
+        $group->legend->setPadding(2,2,2,2);
+        $group->legend->setPosition(null, 0.1);
+        $group->legend->setBackgroundColor($colorsemitrans);
+
+        if (is_array($this->bgcolorgrid)) $group->grid->setBackgroundColor($bgcolorgrid);
+        else $group->grid->setBackgroundColor($colortrans);
+
+        if ($this->hideXGrid)	$group->grid->hideVertical(true);
+        if ($this->hideYGrid)	$group->grid->hideHorizontal(true);
+
+        // On boucle sur chaque lot de donnees
+        $legends=array();
+        $i=0;
+        $nblot=count($this->data[0])-1;
+
+        while ($i < $nblot)
+        {
+            $x=0;
+            $values=array();
+            foreach($this->data as $key => $valarray)
+            {
+                $legends[$x] = $valarray[0];
+                $values[$x]  = $valarray[$i+1];
+                $x++;
+            }
+
+            // We fix unknown values to null
+            $newvalues=array();
+            foreach($values as $val)
+            {
+                $newvalues[]=(is_numeric($val) ? $val : null);
+            }
+
+
+            if ($this->type[0] == 'bars')
+            {
+                //print "Lot de donnees $i<br>";
+                //print_r($values);
+                //print '<br>';
+
+                $color=new Color($this->datacolor[$i][0],$this->datacolor[$i][1],$this->datacolor[$i][2],20);
+                $colorbis=new Color(min($this->datacolor[$i][0]+50,255),min($this->datacolor[$i][1]+50,255),min($this->datacolor[$i][2]+50,255),50);
+
+                $colorgrey=new Color(100,100,100);
+                $colorborder=new Color($this->datacolor[$i][0],$this->datacolor[$i][1],$this->datacolor[$i][2]);
+
+                if ($this->mode == 'side')  $plot = new BarPlot($newvalues, $i+1, $nblot);
+                if ($this->mode == 'depth') $plot = new BarPlot($newvalues, 1, 1, ($nblot-$i-1)*5);
+
+                $plot->barBorder->setColor($colorgrey);
+                //$plot->setBarColor($color);
+                $plot->setBarGradient(new LinearGradient($colorbis, $color, 90));
+
+                if ($this->mode == 'side')  $plot->setBarPadding(0.1, 0.1);
+                if ($this->mode == 'depth') $plot->setBarPadding(0.1, 0.4);
+                if ($this->mode == 'side')  $plot->setBarSpace(5);
+                if ($this->mode == 'depth') $plot->setBarSpace(2);
+
+                $plot->barShadow->setSize($this->SetShading);
+                $plot->barShadow->setPosition(SHADOW_RIGHT_TOP);
+                $plot->barShadow->setColor(new Color(160, 160, 160, 50));
+                $plot->barShadow->smooth(true);
+                //$plot->setSize(1, 0.96);
+                //$plot->setCenter(0.5, 0.52);
+
+                // Le mode automatique est plus efficace
+                $plot->SetYMax($this->MaxValue);
+                $plot->SetYMin($this->MinValue);
+            }
+
+            if ($this->type[0] == 'lines' || $this->type[0] == 'linesnopoint')
+            {
+                $color=new Color($this->datacolor[$i][0],$this->datacolor[$i][1],$this->datacolor[$i][2],20);
+                $colorbis=new Color(min($this->datacolor[$i][0]+20,255),min($this->datacolor[$i][1]+20,255),min($this->datacolor[$i][2]+20,255),60);
+                $colorter=new Color(min($this->datacolor[$i][0]+50,255),min($this->datacolor[$i][1]+50,255),min($this->datacolor[$i][2]+50,255),90);
+
+                $plot = new LinePlot($newvalues);
+                //$plot->setSize(1, 0.96);
+                //$plot->setCenter(0.5, 0.52);
+
+                $plot->setColor($color);
+                $plot->setThickness(1);
+
+                // Set line background gradient
+                $plot->setFillGradient(new LinearGradient($colorter, $colorbis, 90));
+
+                $plot->xAxis->setLabelText($legends);
+
+                // Le mode automatique est plus efficace
+                $plot->SetYMax($this->MaxValue);
+                $plot->SetYMin($this->MinValue);
+                //$plot->setYAxis(0);
+                //$plot->hideLine(true);
+            }
+
+            //$plot->reduce(80);		// Evite temps d'affichage trop long et nombre de ticks absisce satures
+
+            $group->legend->setTextFont(new $artichow_defaultfont(10)); // This is to force Artichow to use awFileFontDriver to
+            // solve a bug in Artichow with UTF8
+            if (count($this->Legend))
+            {
+                if ($this->type[0] == 'bars')  										$group->legend->add($plot, $this->Legend[$i], LEGEND_BACKGROUND);
+                if ($this->type[0] == 'lines' || $this->type[0] == 'linesnopoint')	$group->legend->add($plot, $this->Legend[$i], LEGEND_LINE);
+            }
+            $group->add($plot);
 
+            $i++;
+        }
+
+        $group->axis->bottom->setLabelText($legends);
+        $group->axis->bottom->label->setFont(new $artichow_defaultfont(7));
+
+        //print $group->axis->bottom->getLabelNumber();
+        if ($this->labelInterval > 0) $group->axis->bottom->setLabelInterval($this->labelInterval);
 
-			if ($this->type[0] == 'bars')
-			{
-				//print "Lot de donnees $i<br>";
-				//print_r($values);
-				//print '<br>';
-
-				$color=new Color($this->datacolor[$i][0],$this->datacolor[$i][1],$this->datacolor[$i][2],20);
-				$colorbis=new Color(min($this->datacolor[$i][0]+50,255),min($this->datacolor[$i][1]+50,255),min($this->datacolor[$i][2]+50,255),50);
-
-				$colorgrey=new Color(100,100,100);
-				$colorborder=new Color($this->datacolor[$i][0],$this->datacolor[$i][1],$this->datacolor[$i][2]);
-
-				if ($this->mode == 'side')  $plot = new BarPlot($newvalues, $i+1, $nblot);
-				if ($this->mode == 'depth') $plot = new BarPlot($newvalues, 1, 1, ($nblot-$i-1)*5);
-
-				$plot->barBorder->setColor($colorgrey);
-				//$plot->setBarColor($color);
-				$plot->setBarGradient(new LinearGradient($colorbis, $color, 90));
-
-				if ($this->mode == 'side')  $plot->setBarPadding(0.1, 0.1);
-				if ($this->mode == 'depth') $plot->setBarPadding(0.1, 0.4);
-				if ($this->mode == 'side')  $plot->setBarSpace(5);
-				if ($this->mode == 'depth') $plot->setBarSpace(2);
-
-				$plot->barShadow->setSize($this->SetShading);
-				$plot->barShadow->setPosition(SHADOW_RIGHT_TOP);
-				$plot->barShadow->setColor(new Color(160, 160, 160, 50));
-				$plot->barShadow->smooth(true);
-				//$plot->setSize(1, 0.96);
-				//$plot->setCenter(0.5, 0.52);
-
-				// Le mode automatique est plus efficace
-				$plot->SetYMax($this->MaxValue);
-				$plot->SetYMin($this->MinValue);
-			}
+        $graph->add($group);
+
+        // Generate file
+        $graph->draw($file);
 
-			if ($this->type[0] == 'lines' || $this->type[0] == 'linesnopoint')
-			{
-				$color=new Color($this->datacolor[$i][0],$this->datacolor[$i][1],$this->datacolor[$i][2],20);
-				$colorbis=new Color(min($this->datacolor[$i][0]+20,255),min($this->datacolor[$i][1]+20,255),min($this->datacolor[$i][2]+20,255),60);
-				$colorter=new Color(min($this->datacolor[$i][0]+50,255),min($this->datacolor[$i][1]+50,255),min($this->datacolor[$i][2]+50,255),90);
-
-				$plot = new LinePlot($newvalues);
-				//$plot->setSize(1, 0.96);
-				//$plot->setCenter(0.5, 0.52);
-
-				$plot->setColor($color);
-				$plot->setThickness(1);
-
-				// Set line background gradient
-				$plot->setFillGradient(new LinearGradient($colorter, $colorbis, 90));
-
-				$plot->xAxis->setLabelText($legends);
-
-				// Le mode automatique est plus efficace
-				$plot->SetYMax($this->MaxValue);
-				$plot->SetYMin($this->MinValue);
-				//$plot->setYAxis(0);
-				//$plot->hideLine(true);
-			}
-
-			//$plot->reduce(80);		// Evite temps d'affichage trop long et nombre de ticks absisce satures
-
-			$group->legend->setTextFont(new $artichow_defaultfont(10)); // This is to force Artichow to use awFileFontDriver to
-			// solve a bug in Artichow with UTF8
-			if (count($this->Legend))
-			{
-				if ($this->type[0] == 'bars')  										$group->legend->add($plot, $this->Legend[$i], LEGEND_BACKGROUND);
-				if ($this->type[0] == 'lines' || $this->type[0] == 'linesnopoint')	$group->legend->add($plot, $this->Legend[$i], LEGEND_LINE);
-			}
-			$group->add($plot);
-
-			$i++;
-		}
-
-		$group->axis->bottom->setLabelText($legends);
-		$group->axis->bottom->label->setFont(new $artichow_defaultfont(7));
-
-		//print $group->axis->bottom->getLabelNumber();
-		if ($this->labelInterval > 0) $group->axis->bottom->setLabelInterval($this->labelInterval);
-
-		$graph->add($group);
-
-		// Generate file
-		$graph->draw($file);
-
-		$this->stringtoshow='<!-- Build using '.$this->_library.' --><img src="'.$fileurl.'" title="'.dol_escape_htmltag($this->title?$this->title:$this->YLabel).'" alt="'.dol_escape_htmltag($this->title?$this->title:$this->YLabel).'">';
-	}
+        $this->stringtoshow='<!-- Build using '.$this->_library.' --><img src="'.$fileurl.'" title="'.dol_escape_htmltag($this->title?$this->title:$this->YLabel).'" alt="'.dol_escape_htmltag($this->title?$this->title:$this->YLabel).'">';
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-	/**
-	 * Build a graph using JFlot library. Input when calling this method should be:
-	 *	$this->data  = array(array(0=>'labelxA',1=>yA),  array('labelxB',yB));
-	 *	$this->data  = array(array(0=>'labelxA',1=>yA1,...,n=>yAn), array('labelxB',yB1,...yBn));   // or when there is n series to show for each x
-	 *  $this->data  = array(array('label'=>'labelxA','data'=>yA),  array('labelxB',yB));			// Syntax deprecated
-	 *  $this->legend= array("Val1",...,"Valn");													// list of n series name
-	 *  $this->type  = array('bars',...'lines'); or array('pie')
-	 *  $this->mode = 'depth' ???
-	 *  $this->bgcolorgrid
-	 *  $this->datacolor
-	 *  $this->shownodatagraph
-	 *
-	 * @param	string	$file    	Image file name to use to save onto disk (also used as javascript unique id)
-	 * @param	string	$fileurl	Url path to show image if saved onto disk. Never used here.
-	 * @return	void
-	 */
-	private function draw_jflot($file, $fileurl)
-	{
+    /**
+     * Build a graph using JFlot library. Input when calling this method should be:
+     *	$this->data  = array(array(0=>'labelxA',1=>yA),  array('labelxB',yB));
+     *	$this->data  = array(array(0=>'labelxA',1=>yA1,...,n=>yAn), array('labelxB',yB1,...yBn));   // or when there is n series to show for each x
+     *  $this->data  = array(array('label'=>'labelxA','data'=>yA),  array('labelxB',yB));			// Syntax deprecated
+     *  $this->legend= array("Val1",...,"Valn");													// list of n series name
+     *  $this->type  = array('bars',...'lines'); or array('pie')
+     *  $this->mode = 'depth' ???
+     *  $this->bgcolorgrid
+     *  $this->datacolor
+     *  $this->shownodatagraph
+     *
+     * @param	string	$file    	Image file name to use to save onto disk (also used as javascript unique id)
+     * @param	string	$fileurl	Url path to show image if saved onto disk. Never used here.
+     * @return	void
+     */
+    private function draw_jflot($file, $fileurl)
+    {
         // phpcs:enable
-		global $artichow_defaultfont;
-
-		dol_syslog(get_class($this)."::draw_jflot this->type=".join(',',$this->type)." this->MaxValue=".$this->MaxValue);
-
-		if (empty($this->width) && empty($this->height))
-		{
-			print 'Error width or height not set';
-			return;
-		}
-
-		$legends=array();
-		$nblot=count($this->data[0])-1;    // -1 to remove legend
-		if ($nblot < 0) dol_syslog('Bad value for property ->data. Must be set by mydolgraph->SetData before calling mydolgrapgh->draw', LOG_WARNING);
-		$firstlot=0;
-		// Works with line but not with bars
-		//if ($nblot > 2) $firstlot = ($nblot - 2);        // We limit nblot to 2 because jflot can't manage more than 2 bars on same x
-
-		$i=$firstlot;
-		$serie=array();
-		while ($i < $nblot)	// Loop on each serie
-		{
-			$values=array();	// Array with horizontal y values (specific values of a serie) for each abscisse x
-			$serie[$i]="var d".$i." = [];\n";
-
-			// Fill array $values
-			$x=0;
-			foreach($this->data as $valarray)	// Loop on each x
-			{
-				$legends[$x] = $valarray[0];
-				$values[$x]  = (is_numeric($valarray[$i+1]) ? $valarray[$i+1] : null);
-				$x++;
-			}
-
-			// TODO Avoid push by adding generated long array...
-			if (isset($this->type[$firstlot]) && $this->type[$firstlot] == 'pie')
-			{
-				foreach($values as $x => $y) {
-					if (isset($y)) $serie[$i].='d'.$i.'.push({"label":"'.dol_escape_js($legends[$x]).'", "data":'.$y.'});'."\n";
-				}
-			}
-			else
-			{
-				foreach($values as $x => $y) {
-					if (isset($y)) $serie[$i].='d'.$i.'.push(['.$x.', '.$y.']);'."\n";
-				}
-			}
-
-			unset($values);
-			$i++;
-		}
-		$tag=dol_escape_htmltag(dol_string_unaccent(dol_string_nospecial(basename($file),'_',array('-','.'))));
-
-		$this->stringtoshow ='<!-- Build using '.$this->_library.' -->'."\n";
-		if (! empty($this->title)) $this->stringtoshow.='<div align="center" class="dolgraphtitle'.(empty($this->cssprefix)?'':' dolgraphtitle'.$this->cssprefix).'">'.$this->title.'</div>';
-		if (! empty($this->shownographyet))
-		{
-		  $this->stringtoshow.='<div style="width:'.$this->width.'px;height:'.$this->height.'px;" class="nographyet"></div>';
-		  $this->stringtoshow.='<div class="nographyettext">'.$langs->trans("NotEnoughDataYet").'</div>';
-		  return;
-		}
-		$this->stringtoshow.='<div id="placeholder_'.$tag.'" style="width:'.$this->width.'px;height:'.$this->height.'px;" class="dolgraph'.(empty($this->cssprefix)?'':' dolgraph'.$this->cssprefix).'"></div>'."\n";
-
-		$this->stringtoshow.='<script id="'.$tag.'">'."\n";
-		$this->stringtoshow.='$(function () {'."\n";
-		$i=$firstlot;
-		if ($nblot < 0)
-		{
-			$this->stringtoshow.='<!-- No series of data -->';
-		}
-		else
-		{
-			while ($i < $nblot)
-			{
-				$this->stringtoshow.=$serie[$i];
-				$i++;
-			}
-		}
-		$this->stringtoshow.="\n";
-
-		// Special case for Graph of type 'pie'
-		if (isset($this->type[$firstlot]) && $this->type[$firstlot] == 'pie')
-		{
-			$datacolor=array();
-			foreach($this->datacolor as $val) $datacolor[]="#".sprintf("%02x%02x%02x",$val[0],$val[1],$val[2]);
-
-			$urltemp='';	// TODO Add support for url link into labels
-			$showlegend=$this->showlegend;
-			$showpointvalue=$this->showpointvalue;
-			$showpercent=$this->showpercent;
-
-			$this->stringtoshow.= '
+        global $artichow_defaultfont;
+
+        dol_syslog(get_class($this)."::draw_jflot this->type=".join(',',$this->type)." this->MaxValue=".$this->MaxValue);
+
+        if (empty($this->width) && empty($this->height))
+        {
+            print 'Error width or height not set';
+            return;
+        }
+
+        $legends=array();
+        $nblot=count($this->data[0])-1;    // -1 to remove legend
+        if ($nblot < 0) dol_syslog('Bad value for property ->data. Must be set by mydolgraph->SetData before calling mydolgrapgh->draw', LOG_WARNING);
+        $firstlot=0;
+        // Works with line but not with bars
+        //if ($nblot > 2) $firstlot = ($nblot - 2);        // We limit nblot to 2 because jflot can't manage more than 2 bars on same x
+
+        $i=$firstlot;
+        $serie=array();
+        while ($i < $nblot)	// Loop on each serie
+        {
+            $values=array();	// Array with horizontal y values (specific values of a serie) for each abscisse x
+            $serie[$i]="var d".$i." = [];\n";
+
+            // Fill array $values
+            $x=0;
+            foreach($this->data as $valarray)	// Loop on each x
+            {
+                $legends[$x] = $valarray[0];
+                $values[$x]  = (is_numeric($valarray[$i+1]) ? $valarray[$i+1] : null);
+                $x++;
+            }
+
+            // TODO Avoid push by adding generated long array...
+            if (isset($this->type[$firstlot]) && $this->type[$firstlot] == 'pie')
+            {
+                foreach($values as $x => $y) {
+                    if (isset($y)) $serie[$i].='d'.$i.'.push({"label":"'.dol_escape_js($legends[$x]).'", "data":'.$y.'});'."\n";
+                }
+            }
+            else
+            {
+                foreach($values as $x => $y) {
+                    if (isset($y)) $serie[$i].='d'.$i.'.push(['.$x.', '.$y.']);'."\n";
+                }
+            }
+
+            unset($values);
+            $i++;
+        }
+        $tag=dol_escape_htmltag(dol_string_unaccent(dol_string_nospecial(basename($file),'_',array('-','.'))));
+
+        $this->stringtoshow ='<!-- Build using '.$this->_library.' -->'."\n";
+        if (! empty($this->title)) $this->stringtoshow.='<div align="center" class="dolgraphtitle'.(empty($this->cssprefix)?'':' dolgraphtitle'.$this->cssprefix).'">'.$this->title.'</div>';
+        if (! empty($this->shownographyet))
+        {
+            $this->stringtoshow.='<div style="width:'.$this->width.'px;height:'.$this->height.'px;" class="nographyet"></div>';
+            $this->stringtoshow.='<div class="nographyettext">'.$langs->trans("NotEnoughDataYet").'</div>';
+            return;
+        }
+        $this->stringtoshow.='<div id="placeholder_'.$tag.'" style="width:'.$this->width.'px;height:'.$this->height.'px;" class="dolgraph'.(empty($this->cssprefix)?'':' dolgraph'.$this->cssprefix).'"></div>'."\n";
+
+        $this->stringtoshow.='<script id="'.$tag.'">'."\n";
+        $this->stringtoshow.='$(function () {'."\n";
+        $i=$firstlot;
+        if ($nblot < 0)
+        {
+            $this->stringtoshow.='<!-- No series of data -->';
+        }
+        else
+        {
+            while ($i < $nblot)
+            {
+                $this->stringtoshow.=$serie[$i];
+                $i++;
+            }
+        }
+        $this->stringtoshow.="\n";
+
+        // Special case for Graph of type 'pie'
+        if (isset($this->type[$firstlot]) && $this->type[$firstlot] == 'pie')
+        {
+            $datacolor=array();
+            foreach($this->datacolor as $val) $datacolor[]="#".sprintf("%02x%02x%02x",$val[0],$val[1],$val[2]);
+
+            $urltemp='';	// TODO Add support for url link into labels
+            $showlegend=$this->showlegend;
+            $showpointvalue=$this->showpointvalue;
+            $showpercent=$this->showpercent;
+
+            $this->stringtoshow.= '
 			function plotWithOptions_'.$tag.'() {
 			$.plot($("#placeholder_'.$tag.'"), d0,
 			{
@@ -992,15 +992,15 @@ 
 								var percent=Math.round(series.percent);
 								var number=series.data[0][1];
 								return \'';
-								$this->stringtoshow.='<span style="font-size:8pt;text-align:center;padding:2px;color:black;">';
-								if ($urltemp) $this->stringtoshow.='<a style="color: #FFFFFF;" border="0" href="'.$urltemp.'">';
-								$this->stringtoshow.='\'+';
-								$this->stringtoshow.=($showlegend?'':'label+\' \'+');	// Hide label if already shown in legend
-								$this->stringtoshow.=($showpointvalue?'number+':'');
-								$this->stringtoshow.=($showpercent?'\'<br/>\'+percent+\'%\'+':'');
-								$this->stringtoshow.='\'';
-								if ($urltemp) $this->stringtoshow.='</a>';
-								$this->stringtoshow.='</span>\';
+                                $this->stringtoshow.='<span style="font-size:8pt;text-align:center;padding:2px;color:black;">';
+                                if ($urltemp) $this->stringtoshow.='<a style="color: #FFFFFF;" border="0" href="'.$urltemp.'">';
+                                $this->stringtoshow.='\'+';
+                                $this->stringtoshow.=($showlegend?'':'label+\' \'+');	// Hide label if already shown in legend
+                                $this->stringtoshow.=($showpointvalue?'number+':'');
+                                $this->stringtoshow.=($showpercent?'\'<br/>\'+percent+\'%\'+':'');
+                                $this->stringtoshow.='\'';
+                                if ($urltemp) $this->stringtoshow.='</a>';
+                                $this->stringtoshow.='</span>\';
 							},
 							background: {
 							opacity: 0.0,
@@ -1015,20 +1015,20 @@ 
 			pan: {
 				interactive: true
 			},';
-			if (count($datacolor))
-			{
-				$this->stringtoshow.='colors: '.(! empty($data['seriescolor']) ? json_encode($data['seriescolor']) : json_encode($datacolor)).',';
-			}
-			$this->stringtoshow.='legend: {show: '.($showlegend?'true':'false').', position: \'ne\' }
+            if (count($datacolor))
+            {
+                $this->stringtoshow.='colors: '.(! empty($data['seriescolor']) ? json_encode($data['seriescolor']) : json_encode($datacolor)).',';
+            }
+            $this->stringtoshow.='legend: {show: '.($showlegend?'true':'false').', position: \'ne\' }
 		});
 		}'."\n";
-		}
-		// Other cases, graph of type 'bars', 'lines'
-		else
-		{
-			// Add code to support tooltips
-		    // TODO: remove js css and use graph-tooltip-inner class instead by adding css in each themes
-			$this->stringtoshow.='
+        }
+        // Other cases, graph of type 'bars', 'lines'
+        else
+        {
+            // Add code to support tooltips
+            // TODO: remove js css and use graph-tooltip-inner class instead by adding css in each themes
+            $this->stringtoshow.='
 			function showTooltip_'.$tag.'(x, y, contents) {
 				$(\'<div class="graph-tooltip-inner" id="tooltip_'.$tag.'">\' + contents + \'</div>\').css({
 					position: \'absolute\',
@@ -1060,10 +1060,10 @@ 
 						var y = item.datapoint[1].toFixed(2);
 						var z = item.series.xaxis.ticks[item.dataIndex].label;
 						';
-						if ($this->showpointvalue > 0) $this->stringtoshow.='
+                        if ($this->showpointvalue > 0) $this->stringtoshow.='
 							showTooltip_'.$tag.'(item.pageX, item.pageY, item.series.label + "<br>" + z + " => " + y);
 						';
-						$this->stringtoshow.='
+                        $this->stringtoshow.='
 					}
 				}
 				else {
@@ -1073,95 +1073,95 @@ 
 			});
 			';
 
-			$this->stringtoshow.='var stack = null, steps = false;'."\n";
-
-			$this->stringtoshow.='function plotWithOptions_'.$tag.'() {'."\n";
-			$this->stringtoshow.='$.plot($("#placeholder_'.$tag.'"), [ '."\n";
-			$i=$firstlot;
-			while ($i < $nblot)
-			{
-				if ($i > $firstlot) $this->stringtoshow.=', '."\n";
-				$color=sprintf("%02x%02x%02x",$this->datacolor[$i][0],$this->datacolor[$i][1],$this->datacolor[$i][2]);
-				$this->stringtoshow.='{ ';
-				if (! isset($this->type[$i]) || $this->type[$i] == 'bars') $this->stringtoshow.='bars: { lineWidth: 1, show: true, align: "'.($i==$firstlot?'center':'left').'", barWidth: 0.5 }, ';
-				if (isset($this->type[$i]) && ($this->type[$i] == 'lines' || $this->type[$i] == 'linesnopoint')) $this->stringtoshow.='lines: { show: true, fill: false }, points: { show: '.($this->type[$i] == 'linesnopoint' ? 'false' : 'true').' }, ';
-				$this->stringtoshow.='color: "#'.$color.'", label: "'.(isset($this->Legend[$i]) ? dol_escape_js($this->Legend[$i]) : '').'", data: d'.$i.' }';
-				$i++;
-			}
-			// shadowSize: 0 -> Drawing is faster without shadows
-			$this->stringtoshow.="\n".' ], { series: { shadowSize: 0, stack: stack, lines: { fill: false, steps: steps }, bars: { barWidth: 0.6 } }'."\n";
-
-			// Xaxis
-			$this->stringtoshow.=', xaxis: { ticks: ['."\n";
-			$x=0;
-			foreach($this->data as $key => $valarray)
-			{
-				if ($x > 0) $this->stringtoshow.=', '."\n";
-				$this->stringtoshow.= ' ['.$x.', "'.$valarray[0].'"]';
-				$x++;
-			}
-			$this->stringtoshow.='] }'."\n";
-
-			// Yaxis
-			$this->stringtoshow.=', yaxis: { min: '.$this->MinValue.', max: '.($this->MaxValue).' }'."\n";
-
-			// Background color
-			$color1=sprintf("%02x%02x%02x",$this->bgcolorgrid[0],$this->bgcolorgrid[0],$this->bgcolorgrid[2]);
-			$color2=sprintf("%02x%02x%02x",$this->bgcolorgrid[0],$this->bgcolorgrid[1],$this->bgcolorgrid[2]);
-			$this->stringtoshow.=', grid: { hoverable: true, backgroundColor: { colors: ["#'.$color1.'", "#'.$color2.'"] }, borderWidth: 1, borderColor: \'#e6e6e6\', tickColor  : \'#e6e6e6\' }'."\n";
-			//$this->stringtoshow.=', shadowSize: 20'."\n";    TODO Uncommet this
-			$this->stringtoshow.='});'."\n";
-			$this->stringtoshow.='}'."\n";
-		}
-
-		$this->stringtoshow.='plotWithOptions_'.$tag.'();'."\n";
-		$this->stringtoshow.='});'."\n";
-		$this->stringtoshow.='</script>'."\n";
-	}
-
-
-
-	/**
-	 * Output HTML string to show graph
-	 *
-	 * @param	int			$shownographyet 	Show graph to say there is not enough data
-	 * @return	string							HTML string to show graph
-	 */
-	function show($shownographyet=0)
-	{
-		global $langs;
-
-		if ($shownographyet)
-		{
-			$s= '<div class="nographyet" style="width:'.(preg_match('/%/',$this->width)?$this->width:$this->width.'px').'; height:'.(preg_match('/%/',$this->height)?$this->height:$this->height.'px').';"></div>';
-			$s.='<div class="nographyettext">'.$langs->trans("NotEnoughDataYet").'</div>';
-			return $s;
-		}
-
-		return $this->stringtoshow;
-	}
-
-
-	/**
-	 * getDefaultGraphSizeForStats
-	 *
-	 * @param	string	$direction		'width' or 'height'
-	 * @param	string	$defaultsize	Value we want as default size
-	 * @return	int						Value of width or height to use by default
-	 */
-	static function getDefaultGraphSizeForStats($direction,$defaultsize='')
-	{
-		global $conf;
-
-		if ($direction == 'width')
-		{
-			if (empty($conf->dol_optimize_smallscreen)) return ($defaultsize ? $defaultsize : '500');
-			else return (empty($_SESSION['dol_screen_width']) ? '280' : ($_SESSION['dol_screen_width']-40));
-		}
-		if ($direction == 'height')
-		{
-			return (empty($conf->dol_optimize_smallscreen)?($defaultsize?$defaultsize:'200'):'160');
-		}
-		return 0;
-	}
+            $this->stringtoshow.='var stack = null, steps = false;'."\n";
+
+            $this->stringtoshow.='function plotWithOptions_'.$tag.'() {'."\n";
+            $this->stringtoshow.='$.plot($("#placeholder_'.$tag.'"), [ '."\n";
+            $i=$firstlot;
+            while ($i < $nblot)
+            {
+                if ($i > $firstlot) $this->stringtoshow.=', '."\n";
+                $color=sprintf("%02x%02x%02x",$this->datacolor[$i][0],$this->datacolor[$i][1],$this->datacolor[$i][2]);
+                $this->stringtoshow.='{ ';
+                if (! isset($this->type[$i]) || $this->type[$i] == 'bars') $this->stringtoshow.='bars: { lineWidth: 1, show: true, align: "'.($i==$firstlot?'center':'left').'", barWidth: 0.5 }, ';
+                if (isset($this->type[$i]) && ($this->type[$i] == 'lines' || $this->type[$i] == 'linesnopoint')) $this->stringtoshow.='lines: { show: true, fill: false }, points: { show: '.($this->type[$i] == 'linesnopoint' ? 'false' : 'true').' }, ';
+                $this->stringtoshow.='color: "#'.$color.'", label: "'.(isset($this->Legend[$i]) ? dol_escape_js($this->Legend[$i]) : '').'", data: d'.$i.' }';
+                $i++;
+            }
+            // shadowSize: 0 -> Drawing is faster without shadows
+            $this->stringtoshow.="\n".' ], { series: { shadowSize: 0, stack: stack, lines: { fill: false, steps: steps }, bars: { barWidth: 0.6 } }'."\n";
+
+            // Xaxis
+            $this->stringtoshow.=', xaxis: { ticks: ['."\n";
+            $x=0;
+            foreach($this->data as $key => $valarray)
+            {
+                if ($x > 0) $this->stringtoshow.=', '."\n";
+                $this->stringtoshow.= ' ['.$x.', "'.$valarray[0].'"]';
+                $x++;
+            }
+            $this->stringtoshow.='] }'."\n";
+
+            // Yaxis
+            $this->stringtoshow.=', yaxis: { min: '.$this->MinValue.', max: '.($this->MaxValue).' }'."\n";
+
+            // Background color
+            $color1=sprintf("%02x%02x%02x",$this->bgcolorgrid[0],$this->bgcolorgrid[0],$this->bgcolorgrid[2]);
+            $color2=sprintf("%02x%02x%02x",$this->bgcolorgrid[0],$this->bgcolorgrid[1],$this->bgcolorgrid[2]);
+            $this->stringtoshow.=', grid: { hoverable: true, backgroundColor: { colors: ["#'.$color1.'", "#'.$color2.'"] }, borderWidth: 1, borderColor: \'#e6e6e6\', tickColor  : \'#e6e6e6\' }'."\n";
+            //$this->stringtoshow.=', shadowSize: 20'."\n";    TODO Uncommet this
+            $this->stringtoshow.='});'."\n";
+            $this->stringtoshow.='}'."\n";
+        }
+
+        $this->stringtoshow.='plotWithOptions_'.$tag.'();'."\n";
+        $this->stringtoshow.='});'."\n";
+        $this->stringtoshow.='</script>'."\n";
+    }
+
+
+
+    /**
+     * Output HTML string to show graph
+     *
+     * @param	int			$shownographyet 	Show graph to say there is not enough data
+     * @return	string							HTML string to show graph
+     */
+    function show($shownographyet=0)
+    {
+        global $langs;
+
+        if ($shownographyet)
+        {
+            $s= '<div class="nographyet" style="width:'.(preg_match('/%/',$this->width)?$this->width:$this->width.'px').'; height:'.(preg_match('/%/',$this->height)?$this->height:$this->height.'px').';"></div>';
+            $s.='<div class="nographyettext">'.$langs->trans("NotEnoughDataYet").'</div>';
+            return $s;
+        }
+
+        return $this->stringtoshow;
+    }
+
+
+    /**
+     * getDefaultGraphSizeForStats
+     *
+     * @param	string	$direction		'width' or 'height'
+     * @param	string	$defaultsize	Value we want as default size
+     * @return	int						Value of width or height to use by default
+     */
+    static function getDefaultGraphSizeForStats($direction,$defaultsize='')
+    {
+        global $conf;
+
+        if ($direction == 'width')
+        {
+            if (empty($conf->dol_optimize_smallscreen)) return ($defaultsize ? $defaultsize : '500');
+            else return (empty($_SESSION['dol_screen_width']) ? '280' : ($_SESSION['dol_screen_width']-40));
+        }
+        if ($direction == 'height')
+        {
+            return (empty($conf->dol_optimize_smallscreen)?($defaultsize?$defaultsize:'200'):'160');
+        }
+        return 0;
+    }
 }

Spacing +198 added lines, -198 removed lines

@@ -39,48 +39,48 @@ 
  */
 class DolGraph
 {
-	public $type=array();			// Array with type of each series. Example: array('bars', 'lines', ...)
-	public $mode='side';		    // Mode bars graph: side, depth
-	private $_library='jflot';	// Graphic library to use (jflot, artichow)
+	public $type = array(); // Array with type of each series. Example: array('bars', 'lines', ...)
+	public $mode = 'side'; // Mode bars graph: side, depth
+	private $_library = 'jflot'; // Graphic library to use (jflot, artichow)
 
 	//! Array of data
-	public $data;				// Data of graph: array(array('abs1',valA1,valB1), array('abs2',valA2,valB2), ...)
-	public $title;				// Title of graph
-	public $cssprefix='';		// To add into css styles
-	public $width=380;
-	public $height=200;
-	public $MaxValue=0;
-	public $MinValue=0;
-	public $SetShading=0;
-
-	public $PrecisionY=-1;
-
-	public $horizTickIncrement=-1;
-	public $SetNumXTicks=-1;
-	public $labelInterval=-1;
-
-	public $hideXGrid=false;
-	public $hideYGrid=false;
-
-	public $Legend=array();
-	public $LegendWidthMin=0;
-	public $showlegend=1;
-	public $showpointvalue=1;
-	public $showpercent=0;
-	public $combine=0;				// 0.05 if you want to combine records < 5% into "other"
-	public $graph;     			// Objet Graph (Artichow, Phplot...)
+	public $data; // Data of graph: array(array('abs1',valA1,valB1), array('abs2',valA2,valB2), ...)
+	public $title; // Title of graph
+	public $cssprefix = ''; // To add into css styles
+	public $width = 380;
+	public $height = 200;
+	public $MaxValue = 0;
+	public $MinValue = 0;
+	public $SetShading = 0;
+
+	public $PrecisionY = -1;
+
+	public $horizTickIncrement = -1;
+	public $SetNumXTicks = -1;
+	public $labelInterval = -1;
+
+	public $hideXGrid = false;
+	public $hideYGrid = false;
+
+	public $Legend = array();
+	public $LegendWidthMin = 0;
+	public $showlegend = 1;
+	public $showpointvalue = 1;
+	public $showpercent = 0;
+	public $combine = 0; // 0.05 if you want to combine records < 5% into "other"
+	public $graph; // Objet Graph (Artichow, Phplot...)
 
 	/**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
-	public $bordercolor;			// array(R,G,B)
-	public $bgcolor;				// array(R,G,B)
-	public $bgcolorgrid=array(255,255,255);			// array(R,G,B)
-	public $datacolor;				// array(array(R,G,B),...)
+	public $bordercolor; // array(R,G,B)
+	public $bgcolor; // array(R,G,B)
+	public $bgcolorgrid = array(255, 255, 255); // array(R,G,B)
+	public $datacolor; // array(array(R,G,B),...)
 
-	private $stringtoshow;      // To store string to output graph into HTML page
+	private $stringtoshow; // To store string to output graph into HTML page
 
 
 	/**
@@ -88,7 +88,7 @@ 
 	 *
 	 * @param	string	$library		'jflot' (default) or 'artichow' (no more supported)
 	 */
-	function __construct($library='jflot')
+	function __construct($library = 'jflot')
 	{
 		global $conf;
 		global $theme_bordercolor, $theme_datacolor, $theme_bgcolor, $theme_bgcoloronglet;
@@ -96,25 +96,25 @@ 
 		// To use old feature
 		if ($library == 'artichow')
 		{
-			$this->_library='artichow';
+			$this->_library = 'artichow';
 
 			// Test if module GD present
 			$modules_list = get_loaded_extensions();
-			$isgdinstalled=0;
+			$isgdinstalled = 0;
 			foreach ($modules_list as $module)
 			{
-				if ($module == 'gd') $isgdinstalled=1;
+				if ($module == 'gd') $isgdinstalled = 1;
 			}
-			if (! $isgdinstalled)
+			if (!$isgdinstalled)
 			{
-				$this->error="Error: PHP GD module is not available. It is required to build graphics.";
+				$this->error = "Error: PHP GD module is not available. It is required to build graphics.";
 				return -1;
 			}
 		}
 
-		$this->bordercolor = array(235,235,224);
-		$this->datacolor = array(array(120,130,150), array(160,160,180), array(190,190,220));
-		$this->bgcolor = array(235,235,224);
+		$this->bordercolor = array(235, 235, 224);
+		$this->datacolor = array(array(120, 130, 150), array(160, 160, 180), array(190, 190, 220));
+		$this->bgcolor = array(235, 235, 224);
 
 		$color_file = DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/graph-color.php';
 		if (is_readable($color_file))
@@ -448,7 +448,7 @@ 
 	 */
 	function setShowLegend($showlegend)
 	{
-		$this->showlegend=$showlegend;
+		$this->showlegend = $showlegend;
 	}
 
 	/**
@@ -459,7 +459,7 @@ 
 	 */
 	function setShowPointValue($showpointvalue)
 	{
-		$this->showpointvalue=$showpointvalue;
+		$this->showpointvalue = $showpointvalue;
 	}
 
 	/**
@@ -470,7 +470,7 @@ 
 	 */
 	function setShowPercent($showpercent)
 	{
-		$this->showpercent=$showpercent;
+		$this->showpercent = $showpercent;
 	}
 
 
@@ -482,12 +482,12 @@ 
 	 * @param	array	$bg_color		array(R,G,B) ou 'onglet' ou 'default'
 	 * @return	void
 	 */
-	function SetBgColor($bg_color = array(255,255,255))
+	function SetBgColor($bg_color = array(255, 255, 255))
 	{
         // phpcs:enable
-		global $theme_bgcolor,$theme_bgcoloronglet;
+		global $theme_bgcolor, $theme_bgcoloronglet;
 
-		if (! is_array($bg_color))
+		if (!is_array($bg_color))
 		{
 			if ($bg_color == 'onglet')
 			{
@@ -512,12 +512,12 @@ 
 	 * @param	array	$bg_colorgrid		array(R,G,B) ou 'onglet' ou 'default'
 	 * @return	void
 	 */
-	function SetBgColorGrid($bg_colorgrid = array(255,255,255))
+	function SetBgColorGrid($bg_colorgrid = array(255, 255, 255))
 	{
         // phpcs:enable
-		global $theme_bgcolor,$theme_bgcoloronglet;
+		global $theme_bgcolor, $theme_bgcoloronglet;
 
-		if (! is_array($bg_colorgrid))
+		if (!is_array($bg_colorgrid))
 		{
 			if ($bg_colorgrid == 'onglet')
 			{
@@ -562,11 +562,11 @@ 
 		$nblines = count($this->data);
 		$nbvalues = count($this->data[0]) - 1;
 
-		for ($j = 0 ; $j < $nblines ; $j++)
+		for ($j = 0; $j < $nblines; $j++)
 		{
-			for ($i = 0 ; $i < $nbvalues ; $i++)
+			for ($i = 0; $i < $nbvalues; $i++)
 			{
-				$vals[$k] = $this->data[$j][$i+1];
+				$vals[$k] = $this->data[$j][$i + 1];
 				$k++;
 			}
 		}
@@ -589,11 +589,11 @@ 
 		$nblines = count($this->data);
 		$nbvalues = count($this->data[0]) - 1;
 
-		for ($j = 0 ; $j < $nblines ; $j++)
+		for ($j = 0; $j < $nblines; $j++)
 		{
-			for ($i = 0 ; $i < $nbvalues ; $i++)
+			for ($i = 0; $i < $nbvalues; $i++)
 			{
-				$vals[$k] = $this->data[$j][$i+1];
+				$vals[$k] = $this->data[$j][$i + 1];
 				$k++;
 			}
 		}
@@ -612,15 +612,15 @@ 
         // phpcs:enable
 		$max = $this->GetMaxValueInData();
 		if ($max != 0) $max++;
-		$size=dol_strlen(abs(ceil($max)));
-		$factor=1;
-		for ($i=0; $i < ($size-1); $i++)
+		$size = dol_strlen(abs(ceil($max)));
+		$factor = 1;
+		for ($i = 0; $i < ($size - 1); $i++)
 		{
-			$factor*=10;
+			$factor *= 10;
 		}
 
-		$res=0;
-		if (is_numeric($max)) $res=ceil($max/$factor)*$factor;
+		$res = 0;
+		if (is_numeric($max)) $res = ceil($max / $factor) * $factor;
 
 		//print "max=".$max." res=".$res;
 		return $res;
@@ -636,16 +636,16 @@ 
 	{
         // phpcs:enable
 		$min = $this->GetMinValueInData();
-		if ($min == '') $min=0;
+		if ($min == '') $min = 0;
 		if ($min != 0) $min--;
-		$size=dol_strlen(abs(floor($min)));
-		$factor=1;
-		for ($i=0; $i < ($size-1); $i++)
+		$size = dol_strlen(abs(floor($min)));
+		$factor = 1;
+		for ($i = 0; $i < ($size - 1); $i++)
 		{
-			$factor*=10;
+			$factor *= 10;
 		}
 
-		$res=floor($min/$factor)*$factor;
+		$res = floor($min / $factor) * $factor;
 
 		//print "min=".$min." res=".$res;
 		return $res;
@@ -658,27 +658,27 @@ 
 	 * @param	string	$fileurl	Url path to show image if saved onto disk
 	 * @return	integer|null
 	 */
-	function draw($file, $fileurl='')
+	function draw($file, $fileurl = '')
 	{
 		if (empty($file))
 		{
-			$this->error="Call to draw method was made with empty value for parameter file.";
+			$this->error = "Call to draw method was made with empty value for parameter file.";
 			dol_syslog(get_class($this)."::draw ".$this->error, LOG_ERR);
 			return -2;
 		}
-		if (! is_array($this->data))
+		if (!is_array($this->data))
 		{
-			$this->error="Call to draw method was made but SetData was not called or called with an empty dataset for parameters";
+			$this->error = "Call to draw method was made but SetData was not called or called with an empty dataset for parameters";
 			dol_syslog(get_class($this)."::draw ".$this->error, LOG_ERR);
 			return -1;
 		}
 		if (count($this->data) < 1)
 		{
-			$this->error="Call to draw method was made but SetData was is an empty dataset";
+			$this->error = "Call to draw method was made but SetData was is an empty dataset";
 			dol_syslog(get_class($this)."::draw ".$this->error, LOG_WARNING);
 		}
 		$call = "draw_".$this->_library;
-		call_user_func_array(array($this,$call), array($file,$fileurl));
+		call_user_func_array(array($this, $call), array($file, $fileurl));
 	}
 
 
@@ -690,31 +690,31 @@ 
 	 * @param	string	$fileurl	Url path to show image if saved onto disk
 	 * @return	void
 	 */
-	private function draw_artichow($file,$fileurl)
+	private function draw_artichow($file, $fileurl)
 	{
         // phpcs:enable
 		global $artichow_defaultfont;
 
-		dol_syslog(get_class($this)."::draw_artichow this->type=".join(',',$this->type));
+		dol_syslog(get_class($this)."::draw_artichow this->type=".join(',', $this->type));
 
-		if (! defined('SHADOW_RIGHT_TOP'))  define('SHADOW_RIGHT_TOP',3);
-		if (! defined('LEGEND_BACKGROUND')) define('LEGEND_BACKGROUND',2);
-		if (! defined('LEGEND_LINE'))       define('LEGEND_LINE',1);
+		if (!defined('SHADOW_RIGHT_TOP'))  define('SHADOW_RIGHT_TOP', 3);
+		if (!defined('LEGEND_BACKGROUND')) define('LEGEND_BACKGROUND', 2);
+		if (!defined('LEGEND_LINE'))       define('LEGEND_LINE', 1);
 
 		// Create graph
-		$classname='';
-		if (! isset($this->type[0]) || $this->type[0] == 'bars')  $classname='BarPlot';    // Only one type (first one) is supported by artichow
-		else if ($this->type[0] == 'lines' || $this->type[0] == 'linesnopoint') $classname='LinePlot';
-		else $classname='TypeUnknown';
+		$classname = '';
+		if (!isset($this->type[0]) || $this->type[0] == 'bars')  $classname = 'BarPlot'; // Only one type (first one) is supported by artichow
+		else if ($this->type[0] == 'lines' || $this->type[0] == 'linesnopoint') $classname = 'LinePlot';
+		else $classname = 'TypeUnknown';
 		include_once ARTICHOW_PATH.$classname.'.class.php';
 
 		// Definition de couleurs
-		$bgcolor=new Color($this->bgcolor[0],$this->bgcolor[1],$this->bgcolor[2]);
-		$bgcolorgrid=new Color($this->bgcolorgrid[0],$this->bgcolorgrid[1],$this->bgcolorgrid[2]);
-		$colortrans=new Color(0,0,0,100);
-		$colorsemitrans=new Color(255,255,255,60);
-		$colorgradient= new LinearGradient(new Color(235, 235, 235),new Color(255, 255, 255),0);
-		$colorwhite=new Color(255,255,255);
+		$bgcolor = new Color($this->bgcolor[0], $this->bgcolor[1], $this->bgcolor[2]);
+		$bgcolorgrid = new Color($this->bgcolorgrid[0], $this->bgcolorgrid[1], $this->bgcolorgrid[2]);
+		$colortrans = new Color(0, 0, 0, 100);
+		$colorsemitrans = new Color(255, 255, 255, 60);
+		$colorgradient = new LinearGradient(new Color(235, 235, 235), new Color(255, 255, 255), 0);
+		$colorwhite = new Color(255, 255, 255);
 
 		// Graph
 		$graph = new Graph($this->width, $this->height);
@@ -733,13 +733,13 @@ 
 		$group = new PlotGroup;
 		//$group->setSpace(5, 5, 0, 0);
 
-		$paddleft=50;
-		$paddright=10;
-		$strl=dol_strlen(max(abs($this->MaxValue),abs($this->MinValue)));
+		$paddleft = 50;
+		$paddright = 10;
+		$strl = dol_strlen(max(abs($this->MaxValue), abs($this->MinValue)));
 		if ($strl > 6) $paddleft += ($strl * 4);
-		$group->setPadding($paddleft, $paddright);		// Width on left and right for Y axis values
+		$group->setPadding($paddleft, $paddright); // Width on left and right for Y axis values
 		$group->legend->setSpace(0);
-		$group->legend->setPadding(2,2,2,2);
+		$group->legend->setPadding(2, 2, 2, 2);
 		$group->legend->setPosition(null, 0.1);
 		$group->legend->setBackgroundColor($colorsemitrans);
 
@@ -750,26 +750,26 @@ 
 		if ($this->hideYGrid)	$group->grid->hideHorizontal(true);
 
 		// On boucle sur chaque lot de donnees
-		$legends=array();
-		$i=0;
-		$nblot=count($this->data[0])-1;
+		$legends = array();
+		$i = 0;
+		$nblot = count($this->data[0]) - 1;
 
 		while ($i < $nblot)
 		{
-			$x=0;
-			$values=array();
-			foreach($this->data as $key => $valarray)
+			$x = 0;
+			$values = array();
+			foreach ($this->data as $key => $valarray)
 			{
 				$legends[$x] = $valarray[0];
-				$values[$x]  = $valarray[$i+1];
+				$values[$x]  = $valarray[$i + 1];
 				$x++;
 			}
 
 			// We fix unknown values to null
-			$newvalues=array();
-			foreach($values as $val)
+			$newvalues = array();
+			foreach ($values as $val)
 			{
-				$newvalues[]=(is_numeric($val) ? $val : null);
+				$newvalues[] = (is_numeric($val) ? $val : null);
 			}
 
 
@@ -779,14 +779,14 @@ 
 				//print_r($values);
 				//print '<br>';
 
-				$color=new Color($this->datacolor[$i][0],$this->datacolor[$i][1],$this->datacolor[$i][2],20);
-				$colorbis=new Color(min($this->datacolor[$i][0]+50,255),min($this->datacolor[$i][1]+50,255),min($this->datacolor[$i][2]+50,255),50);
+				$color = new Color($this->datacolor[$i][0], $this->datacolor[$i][1], $this->datacolor[$i][2], 20);
+				$colorbis = new Color(min($this->datacolor[$i][0] + 50, 255), min($this->datacolor[$i][1] + 50, 255), min($this->datacolor[$i][2] + 50, 255), 50);
 
-				$colorgrey=new Color(100,100,100);
-				$colorborder=new Color($this->datacolor[$i][0],$this->datacolor[$i][1],$this->datacolor[$i][2]);
+				$colorgrey = new Color(100, 100, 100);
+				$colorborder = new Color($this->datacolor[$i][0], $this->datacolor[$i][1], $this->datacolor[$i][2]);
 
-				if ($this->mode == 'side')  $plot = new BarPlot($newvalues, $i+1, $nblot);
-				if ($this->mode == 'depth') $plot = new BarPlot($newvalues, 1, 1, ($nblot-$i-1)*5);
+				if ($this->mode == 'side')  $plot = new BarPlot($newvalues, $i + 1, $nblot);
+				if ($this->mode == 'depth') $plot = new BarPlot($newvalues, 1, 1, ($nblot - $i - 1) * 5);
 
 				$plot->barBorder->setColor($colorgrey);
 				//$plot->setBarColor($color);
@@ -811,9 +811,9 @@ 
 
 			if ($this->type[0] == 'lines' || $this->type[0] == 'linesnopoint')
 			{
-				$color=new Color($this->datacolor[$i][0],$this->datacolor[$i][1],$this->datacolor[$i][2],20);
-				$colorbis=new Color(min($this->datacolor[$i][0]+20,255),min($this->datacolor[$i][1]+20,255),min($this->datacolor[$i][2]+20,255),60);
-				$colorter=new Color(min($this->datacolor[$i][0]+50,255),min($this->datacolor[$i][1]+50,255),min($this->datacolor[$i][2]+50,255),90);
+				$color = new Color($this->datacolor[$i][0], $this->datacolor[$i][1], $this->datacolor[$i][2], 20);
+				$colorbis = new Color(min($this->datacolor[$i][0] + 20, 255), min($this->datacolor[$i][1] + 20, 255), min($this->datacolor[$i][2] + 20, 255), 60);
+				$colorter = new Color(min($this->datacolor[$i][0] + 50, 255), min($this->datacolor[$i][1] + 50, 255), min($this->datacolor[$i][2] + 50, 255), 90);
 
 				$plot = new LinePlot($newvalues);
 				//$plot->setSize(1, 0.96);
@@ -859,7 +859,7 @@ 
 		// Generate file
 		$graph->draw($file);
 
-		$this->stringtoshow='<!-- Build using '.$this->_library.' --><img src="'.$fileurl.'" title="'.dol_escape_htmltag($this->title?$this->title:$this->YLabel).'" alt="'.dol_escape_htmltag($this->title?$this->title:$this->YLabel).'">';
+		$this->stringtoshow = '<!-- Build using '.$this->_library.' --><img src="'.$fileurl.'" title="'.dol_escape_htmltag($this->title ? $this->title : $this->YLabel).'" alt="'.dol_escape_htmltag($this->title ? $this->title : $this->YLabel).'">';
 	}
 
 
@@ -885,7 +885,7 @@ 
         // phpcs:enable
 		global $artichow_defaultfont;
 
-		dol_syslog(get_class($this)."::draw_jflot this->type=".join(',',$this->type)." this->MaxValue=".$this->MaxValue);
+		dol_syslog(get_class($this)."::draw_jflot this->type=".join(',', $this->type)." this->MaxValue=".$this->MaxValue);
 
 		if (empty($this->width) && empty($this->height))
 		{
@@ -893,87 +893,87 @@ 
 			return;
 		}
 
-		$legends=array();
-		$nblot=count($this->data[0])-1;    // -1 to remove legend
+		$legends = array();
+		$nblot = count($this->data[0]) - 1; // -1 to remove legend
 		if ($nblot < 0) dol_syslog('Bad value for property ->data. Must be set by mydolgraph->SetData before calling mydolgrapgh->draw', LOG_WARNING);
-		$firstlot=0;
+		$firstlot = 0;
 		// Works with line but not with bars
 		//if ($nblot > 2) $firstlot = ($nblot - 2);        // We limit nblot to 2 because jflot can't manage more than 2 bars on same x
 
-		$i=$firstlot;
-		$serie=array();
+		$i = $firstlot;
+		$serie = array();
 		while ($i < $nblot)	// Loop on each serie
 		{
-			$values=array();	// Array with horizontal y values (specific values of a serie) for each abscisse x
-			$serie[$i]="var d".$i." = [];\n";
+			$values = array(); // Array with horizontal y values (specific values of a serie) for each abscisse x
+			$serie[$i] = "var d".$i." = [];\n";
 
 			// Fill array $values
-			$x=0;
-			foreach($this->data as $valarray)	// Loop on each x
+			$x = 0;
+			foreach ($this->data as $valarray)	// Loop on each x
 			{
 				$legends[$x] = $valarray[0];
-				$values[$x]  = (is_numeric($valarray[$i+1]) ? $valarray[$i+1] : null);
+				$values[$x]  = (is_numeric($valarray[$i + 1]) ? $valarray[$i + 1] : null);
 				$x++;
 			}
 
 			// TODO Avoid push by adding generated long array...
 			if (isset($this->type[$firstlot]) && $this->type[$firstlot] == 'pie')
 			{
-				foreach($values as $x => $y) {
-					if (isset($y)) $serie[$i].='d'.$i.'.push({"label":"'.dol_escape_js($legends[$x]).'", "data":'.$y.'});'."\n";
+				foreach ($values as $x => $y) {
+					if (isset($y)) $serie[$i] .= 'd'.$i.'.push({"label":"'.dol_escape_js($legends[$x]).'", "data":'.$y.'});'."\n";
 				}
 			}
 			else
 			{
-				foreach($values as $x => $y) {
-					if (isset($y)) $serie[$i].='d'.$i.'.push(['.$x.', '.$y.']);'."\n";
+				foreach ($values as $x => $y) {
+					if (isset($y)) $serie[$i] .= 'd'.$i.'.push(['.$x.', '.$y.']);'."\n";
 				}
 			}
 
 			unset($values);
 			$i++;
 		}
-		$tag=dol_escape_htmltag(dol_string_unaccent(dol_string_nospecial(basename($file),'_',array('-','.'))));
+		$tag = dol_escape_htmltag(dol_string_unaccent(dol_string_nospecial(basename($file), '_', array('-', '.'))));
 
-		$this->stringtoshow ='<!-- Build using '.$this->_library.' -->'."\n";
-		if (! empty($this->title)) $this->stringtoshow.='<div align="center" class="dolgraphtitle'.(empty($this->cssprefix)?'':' dolgraphtitle'.$this->cssprefix).'">'.$this->title.'</div>';
-		if (! empty($this->shownographyet))
+		$this->stringtoshow = '<!-- Build using '.$this->_library.' -->'."\n";
+		if (!empty($this->title)) $this->stringtoshow .= '<div align="center" class="dolgraphtitle'.(empty($this->cssprefix) ? '' : ' dolgraphtitle'.$this->cssprefix).'">'.$this->title.'</div>';
+		if (!empty($this->shownographyet))
 		{
-		  $this->stringtoshow.='<div style="width:'.$this->width.'px;height:'.$this->height.'px;" class="nographyet"></div>';
-		  $this->stringtoshow.='<div class="nographyettext">'.$langs->trans("NotEnoughDataYet").'</div>';
+		  $this->stringtoshow .= '<div style="width:'.$this->width.'px;height:'.$this->height.'px;" class="nographyet"></div>';
+		  $this->stringtoshow .= '<div class="nographyettext">'.$langs->trans("NotEnoughDataYet").'</div>';
 		  return;
 		}
-		$this->stringtoshow.='<div id="placeholder_'.$tag.'" style="width:'.$this->width.'px;height:'.$this->height.'px;" class="dolgraph'.(empty($this->cssprefix)?'':' dolgraph'.$this->cssprefix).'"></div>'."\n";
+		$this->stringtoshow .= '<div id="placeholder_'.$tag.'" style="width:'.$this->width.'px;height:'.$this->height.'px;" class="dolgraph'.(empty($this->cssprefix) ? '' : ' dolgraph'.$this->cssprefix).'"></div>'."\n";
 
-		$this->stringtoshow.='<script id="'.$tag.'">'."\n";
-		$this->stringtoshow.='$(function () {'."\n";
-		$i=$firstlot;
+		$this->stringtoshow .= '<script id="'.$tag.'">'."\n";
+		$this->stringtoshow .= '$(function () {'."\n";
+		$i = $firstlot;
 		if ($nblot < 0)
 		{
-			$this->stringtoshow.='<!-- No series of data -->';
+			$this->stringtoshow .= '<!-- No series of data -->';
 		}
 		else
 		{
 			while ($i < $nblot)
 			{
-				$this->stringtoshow.=$serie[$i];
+				$this->stringtoshow .= $serie[$i];
 				$i++;
 			}
 		}
-		$this->stringtoshow.="\n";
+		$this->stringtoshow .= "\n";
 
 		// Special case for Graph of type 'pie'
 		if (isset($this->type[$firstlot]) && $this->type[$firstlot] == 'pie')
 		{
-			$datacolor=array();
-			foreach($this->datacolor as $val) $datacolor[]="#".sprintf("%02x%02x%02x",$val[0],$val[1],$val[2]);
+			$datacolor = array();
+			foreach ($this->datacolor as $val) $datacolor[] = "#".sprintf("%02x%02x%02x", $val[0], $val[1], $val[2]);
 
-			$urltemp='';	// TODO Add support for url link into labels
-			$showlegend=$this->showlegend;
-			$showpointvalue=$this->showpointvalue;
-			$showpercent=$this->showpercent;
+			$urltemp = ''; // TODO Add support for url link into labels
+			$showlegend = $this->showlegend;
+			$showpointvalue = $this->showpointvalue;
+			$showpercent = $this->showpercent;
 
-			$this->stringtoshow.= '
+			$this->stringtoshow .= '
 			function plotWithOptions_'.$tag.'() {
 			$.plot($("#placeholder_'.$tag.'"), d0,
 			{
@@ -984,7 +984,7 @@ 
 						'.($this->combine ? '
 						combine: {
 						 	threshold: '.$this->combine.'
-						},' : '') . '
+						},' : '').'
 						label: {
 							show: true,
 							radius: 0.9,
@@ -992,15 +992,15 @@ 
 								var percent=Math.round(series.percent);
 								var number=series.data[0][1];
 								return \'';
-								$this->stringtoshow.='<span style="font-size:8pt;text-align:center;padding:2px;color:black;">';
-								if ($urltemp) $this->stringtoshow.='<a style="color: #FFFFFF;" border="0" href="'.$urltemp.'">';
-								$this->stringtoshow.='\'+';
-								$this->stringtoshow.=($showlegend?'':'label+\' \'+');	// Hide label if already shown in legend
-								$this->stringtoshow.=($showpointvalue?'number+':'');
-								$this->stringtoshow.=($showpercent?'\'<br/>\'+percent+\'%\'+':'');
-								$this->stringtoshow.='\'';
-								if ($urltemp) $this->stringtoshow.='</a>';
-								$this->stringtoshow.='</span>\';
+								$this->stringtoshow .= '<span style="font-size:8pt;text-align:center;padding:2px;color:black;">';
+								if ($urltemp) $this->stringtoshow .= '<a style="color: #FFFFFF;" border="0" href="'.$urltemp.'">';
+								$this->stringtoshow .= '\'+';
+								$this->stringtoshow .= ($showlegend ? '' : 'label+\' \'+'); // Hide label if already shown in legend
+								$this->stringtoshow .= ($showpointvalue ? 'number+' : '');
+								$this->stringtoshow .= ($showpercent ? '\'<br/>\'+percent+\'%\'+' : '');
+								$this->stringtoshow .= '\'';
+								if ($urltemp) $this->stringtoshow .= '</a>';
+								$this->stringtoshow .= '</span>\';
 							},
 							background: {
 							opacity: 0.0,
@@ -1017,9 +1017,9 @@ 
 			},';
 			if (count($datacolor))
 			{
-				$this->stringtoshow.='colors: '.(! empty($data['seriescolor']) ? json_encode($data['seriescolor']) : json_encode($datacolor)).',';
+				$this->stringtoshow .= 'colors: '.(!empty($data['seriescolor']) ? json_encode($data['seriescolor']) : json_encode($datacolor)).',';
 			}
-			$this->stringtoshow.='legend: {show: '.($showlegend?'true':'false').', position: \'ne\' }
+			$this->stringtoshow .= 'legend: {show: '.($showlegend ? 'true' : 'false').', position: \'ne\' }
 		});
 		}'."\n";
 		}
@@ -1028,7 +1028,7 @@ 
 		{
 			// Add code to support tooltips
 		    // TODO: remove js css and use graph-tooltip-inner class instead by adding css in each themes
-			$this->stringtoshow.='
+			$this->stringtoshow .= '
 			function showTooltip_'.$tag.'(x, y, contents) {
 				$(\'<div class="graph-tooltip-inner" id="tooltip_'.$tag.'">\' + contents + \'</div>\').css({
 					position: \'absolute\',
@@ -1060,10 +1060,10 @@ 
 						var y = item.datapoint[1].toFixed(2);
 						var z = item.series.xaxis.ticks[item.dataIndex].label;
 						';
-						if ($this->showpointvalue > 0) $this->stringtoshow.='
+						if ($this->showpointvalue > 0) $this->stringtoshow .= '
 							showTooltip_'.$tag.'(item.pageX, item.pageY, item.series.label + "<br>" + z + " => " + y);
 						';
-						$this->stringtoshow.='
+						$this->stringtoshow .= '
 					}
 				}
 				else {
@@ -1073,50 +1073,50 @@ 
 			});
 			';
 
-			$this->stringtoshow.='var stack = null, steps = false;'."\n";
+			$this->stringtoshow .= 'var stack = null, steps = false;'."\n";
 
-			$this->stringtoshow.='function plotWithOptions_'.$tag.'() {'."\n";
-			$this->stringtoshow.='$.plot($("#placeholder_'.$tag.'"), [ '."\n";
-			$i=$firstlot;
+			$this->stringtoshow .= 'function plotWithOptions_'.$tag.'() {'."\n";
+			$this->stringtoshow .= '$.plot($("#placeholder_'.$tag.'"), [ '."\n";
+			$i = $firstlot;
 			while ($i < $nblot)
 			{
-				if ($i > $firstlot) $this->stringtoshow.=', '."\n";
-				$color=sprintf("%02x%02x%02x",$this->datacolor[$i][0],$this->datacolor[$i][1],$this->datacolor[$i][2]);
-				$this->stringtoshow.='{ ';
-				if (! isset($this->type[$i]) || $this->type[$i] == 'bars') $this->stringtoshow.='bars: { lineWidth: 1, show: true, align: "'.($i==$firstlot?'center':'left').'", barWidth: 0.5 }, ';
-				if (isset($this->type[$i]) && ($this->type[$i] == 'lines' || $this->type[$i] == 'linesnopoint')) $this->stringtoshow.='lines: { show: true, fill: false }, points: { show: '.($this->type[$i] == 'linesnopoint' ? 'false' : 'true').' }, ';
-				$this->stringtoshow.='color: "#'.$color.'", label: "'.(isset($this->Legend[$i]) ? dol_escape_js($this->Legend[$i]) : '').'", data: d'.$i.' }';
+				if ($i > $firstlot) $this->stringtoshow .= ', '."\n";
+				$color = sprintf("%02x%02x%02x", $this->datacolor[$i][0], $this->datacolor[$i][1], $this->datacolor[$i][2]);
+				$this->stringtoshow .= '{ ';
+				if (!isset($this->type[$i]) || $this->type[$i] == 'bars') $this->stringtoshow .= 'bars: { lineWidth: 1, show: true, align: "'.($i == $firstlot ? 'center' : 'left').'", barWidth: 0.5 }, ';
+				if (isset($this->type[$i]) && ($this->type[$i] == 'lines' || $this->type[$i] == 'linesnopoint')) $this->stringtoshow .= 'lines: { show: true, fill: false }, points: { show: '.($this->type[$i] == 'linesnopoint' ? 'false' : 'true').' }, ';
+				$this->stringtoshow .= 'color: "#'.$color.'", label: "'.(isset($this->Legend[$i]) ? dol_escape_js($this->Legend[$i]) : '').'", data: d'.$i.' }';
 				$i++;
 			}
 			// shadowSize: 0 -> Drawing is faster without shadows
-			$this->stringtoshow.="\n".' ], { series: { shadowSize: 0, stack: stack, lines: { fill: false, steps: steps }, bars: { barWidth: 0.6 } }'."\n";
+			$this->stringtoshow .= "\n".' ], { series: { shadowSize: 0, stack: stack, lines: { fill: false, steps: steps }, bars: { barWidth: 0.6 } }'."\n";
 
 			// Xaxis
-			$this->stringtoshow.=', xaxis: { ticks: ['."\n";
-			$x=0;
-			foreach($this->data as $key => $valarray)
+			$this->stringtoshow .= ', xaxis: { ticks: ['."\n";
+			$x = 0;
+			foreach ($this->data as $key => $valarray)
 			{
-				if ($x > 0) $this->stringtoshow.=', '."\n";
-				$this->stringtoshow.= ' ['.$x.', "'.$valarray[0].'"]';
+				if ($x > 0) $this->stringtoshow .= ', '."\n";
+				$this->stringtoshow .= ' ['.$x.', "'.$valarray[0].'"]';
 				$x++;
 			}
-			$this->stringtoshow.='] }'."\n";
+			$this->stringtoshow .= '] }'."\n";
 
 			// Yaxis
-			$this->stringtoshow.=', yaxis: { min: '.$this->MinValue.', max: '.($this->MaxValue).' }'."\n";
+			$this->stringtoshow .= ', yaxis: { min: '.$this->MinValue.', max: '.($this->MaxValue).' }'."\n";
 
 			// Background color
-			$color1=sprintf("%02x%02x%02x",$this->bgcolorgrid[0],$this->bgcolorgrid[0],$this->bgcolorgrid[2]);
-			$color2=sprintf("%02x%02x%02x",$this->bgcolorgrid[0],$this->bgcolorgrid[1],$this->bgcolorgrid[2]);
-			$this->stringtoshow.=', grid: { hoverable: true, backgroundColor: { colors: ["#'.$color1.'", "#'.$color2.'"] }, borderWidth: 1, borderColor: \'#e6e6e6\', tickColor  : \'#e6e6e6\' }'."\n";
+			$color1 = sprintf("%02x%02x%02x", $this->bgcolorgrid[0], $this->bgcolorgrid[0], $this->bgcolorgrid[2]);
+			$color2 = sprintf("%02x%02x%02x", $this->bgcolorgrid[0], $this->bgcolorgrid[1], $this->bgcolorgrid[2]);
+			$this->stringtoshow .= ', grid: { hoverable: true, backgroundColor: { colors: ["#'.$color1.'", "#'.$color2.'"] }, borderWidth: 1, borderColor: \'#e6e6e6\', tickColor  : \'#e6e6e6\' }'."\n";
 			//$this->stringtoshow.=', shadowSize: 20'."\n";    TODO Uncommet this
-			$this->stringtoshow.='});'."\n";
-			$this->stringtoshow.='}'."\n";
+			$this->stringtoshow .= '});'."\n";
+			$this->stringtoshow .= '}'."\n";
 		}
 
-		$this->stringtoshow.='plotWithOptions_'.$tag.'();'."\n";
-		$this->stringtoshow.='});'."\n";
-		$this->stringtoshow.='</script>'."\n";
+		$this->stringtoshow .= 'plotWithOptions_'.$tag.'();'."\n";
+		$this->stringtoshow .= '});'."\n";
+		$this->stringtoshow .= '</script>'."\n";
 	}
 
 
@@ -1127,14 +1127,14 @@ 
 	 * @param	int			$shownographyet 	Show graph to say there is not enough data
 	 * @return	string							HTML string to show graph
 	 */
-	function show($shownographyet=0)
+	function show($shownographyet = 0)
 	{
 		global $langs;
 
 		if ($shownographyet)
 		{
-			$s= '<div class="nographyet" style="width:'.(preg_match('/%/',$this->width)?$this->width:$this->width.'px').'; height:'.(preg_match('/%/',$this->height)?$this->height:$this->height.'px').';"></div>';
-			$s.='<div class="nographyettext">'.$langs->trans("NotEnoughDataYet").'</div>';
+			$s = '<div class="nographyet" style="width:'.(preg_match('/%/', $this->width) ? $this->width : $this->width.'px').'; height:'.(preg_match('/%/', $this->height) ? $this->height : $this->height.'px').';"></div>';
+			$s .= '<div class="nographyettext">'.$langs->trans("NotEnoughDataYet").'</div>';
 			return $s;
 		}
 
@@ -1149,18 +1149,18 @@ 
 	 * @param	string	$defaultsize	Value we want as default size
 	 * @return	int						Value of width or height to use by default
 	 */
-	static function getDefaultGraphSizeForStats($direction,$defaultsize='')
+	static function getDefaultGraphSizeForStats($direction, $defaultsize = '')
 	{
 		global $conf;
 
 		if ($direction == 'width')
 		{
 			if (empty($conf->dol_optimize_smallscreen)) return ($defaultsize ? $defaultsize : '500');
-			else return (empty($_SESSION['dol_screen_width']) ? '280' : ($_SESSION['dol_screen_width']-40));
+			else return (empty($_SESSION['dol_screen_width']) ? '280' : ($_SESSION['dol_screen_width'] - 40));
 		}
 		if ($direction == 'height')
 		{
-			return (empty($conf->dol_optimize_smallscreen)?($defaultsize?$defaultsize:'200'):'160');
+			return (empty($conf->dol_optimize_smallscreen) ? ($defaultsize ? $defaultsize : '200') : '160');
 		}
 		return 0;
 	}

Braces +143 added lines, -59 removed lines

@@ -103,7 +103,9 @@ 
 			$isgdinstalled=0;
 			foreach ($modules_list as $module)
 			{
-				if ($module == 'gd') $isgdinstalled=1;
+				if ($module == 'gd') {
+				    $isgdinstalled=1;
+				}
 			}
 			if (! $isgdinstalled)
 			{
@@ -120,9 +122,15 @@ 
 		if (is_readable($color_file))
 		{
 			include_once $color_file;
-			if (isset($theme_bordercolor)) $this->bordercolor = $theme_bordercolor;
-			if (isset($theme_datacolor))   $this->datacolor   = $theme_datacolor;
-			if (isset($theme_bgcolor))     $this->bgcolor     = $theme_bgcolor;
+			if (isset($theme_bordercolor)) {
+			    $this->bordercolor = $theme_bordercolor;
+			}
+			if (isset($theme_datacolor)) {
+			    $this->datacolor   = $theme_datacolor;
+			}
+			if (isset($theme_bgcolor)) {
+			    $this->bgcolor     = $theme_bgcolor;
+			}
 		}
 		//print 'bgcolor: '.join(',',$this->bgcolor).'<br>';
 	}
@@ -493,13 +501,11 @@ 
 			{
 				//print 'ee'.join(',',$theme_bgcoloronglet);
 				$this->bgcolor = $theme_bgcoloronglet;
-			}
-			else
+			} else
 			{
 				$this->bgcolor = $theme_bgcolor;
 			}
-		}
-		else
+		} else
 		{
 			$this->bgcolor = $bg_color;
 		}
@@ -523,13 +529,11 @@ 
 			{
 				//print 'ee'.join(',',$theme_bgcoloronglet);
 				$this->bgcolorgrid = $theme_bgcoloronglet;
-			}
-			else
+			} else
 			{
 				$this->bgcolorgrid = $theme_bgcolor;
 			}
-		}
-		else
+		} else
 		{
 			$this->bgcolorgrid = $bg_colorgrid;
 		}
@@ -611,7 +615,9 @@ 
 	{
         // phpcs:enable
 		$max = $this->GetMaxValueInData();
-		if ($max != 0) $max++;
+		if ($max != 0) {
+		    $max++;
+		}
 		$size=dol_strlen(abs(ceil($max)));
 		$factor=1;
 		for ($i=0; $i < ($size-1); $i++)
@@ -620,7 +626,9 @@ 
 		}
 
 		$res=0;
-		if (is_numeric($max)) $res=ceil($max/$factor)*$factor;
+		if (is_numeric($max)) {
+		    $res=ceil($max/$factor)*$factor;
+		}
 
 		//print "max=".$max." res=".$res;
 		return $res;
@@ -636,8 +644,12 @@ 
 	{
         // phpcs:enable
 		$min = $this->GetMinValueInData();
-		if ($min == '') $min=0;
-		if ($min != 0) $min--;
+		if ($min == '') {
+		    $min=0;
+		}
+		if ($min != 0) {
+		    $min--;
+		}
 		$size=dol_strlen(abs(floor($min)));
 		$factor=1;
 		for ($i=0; $i < ($size-1); $i++)
@@ -697,15 +709,27 @@ 
 
 		dol_syslog(get_class($this)."::draw_artichow this->type=".join(',',$this->type));
 
-		if (! defined('SHADOW_RIGHT_TOP'))  define('SHADOW_RIGHT_TOP',3);
-		if (! defined('LEGEND_BACKGROUND')) define('LEGEND_BACKGROUND',2);
-		if (! defined('LEGEND_LINE'))       define('LEGEND_LINE',1);
+		if (! defined('SHADOW_RIGHT_TOP')) {
+		    define('SHADOW_RIGHT_TOP',3);
+		}
+		if (! defined('LEGEND_BACKGROUND')) {
+		    define('LEGEND_BACKGROUND',2);
+		}
+		if (! defined('LEGEND_LINE')) {
+		    define('LEGEND_LINE',1);
+		}
 
 		// Create graph
 		$classname='';
-		if (! isset($this->type[0]) || $this->type[0] == 'bars')  $classname='BarPlot';    // Only one type (first one) is supported by artichow
-		else if ($this->type[0] == 'lines' || $this->type[0] == 'linesnopoint') $classname='LinePlot';
-		else $classname='TypeUnknown';
+		if (! isset($this->type[0]) || $this->type[0] == 'bars') {
+		    $classname='BarPlot';
+		}
+		// Only one type (first one) is supported by artichow
+		else if ($this->type[0] == 'lines' || $this->type[0] == 'linesnopoint') {
+		    $classname='LinePlot';
+		} else {
+		    $classname='TypeUnknown';
+		}
 		include_once ARTICHOW_PATH.$classname.'.class.php';
 
 		// Definition de couleurs
@@ -727,8 +751,11 @@ 
 			$graph->title->setFont(new $artichow_defaultfont(10));
 		}
 
-		if (is_array($this->bgcolor)) $graph->setBackgroundColor($bgcolor);
-		else $graph->setBackgroundGradient($colorgradient);
+		if (is_array($this->bgcolor)) {
+		    $graph->setBackgroundColor($bgcolor);
+		} else {
+		    $graph->setBackgroundGradient($colorgradient);
+		}
 
 		$group = new PlotGroup;
 		//$group->setSpace(5, 5, 0, 0);
@@ -736,18 +763,27 @@ 
 		$paddleft=50;
 		$paddright=10;
 		$strl=dol_strlen(max(abs($this->MaxValue),abs($this->MinValue)));
-		if ($strl > 6) $paddleft += ($strl * 4);
+		if ($strl > 6) {
+		    $paddleft += ($strl * 4);
+		}
 		$group->setPadding($paddleft, $paddright);		// Width on left and right for Y axis values
 		$group->legend->setSpace(0);
 		$group->legend->setPadding(2,2,2,2);
 		$group->legend->setPosition(null, 0.1);
 		$group->legend->setBackgroundColor($colorsemitrans);
 
-		if (is_array($this->bgcolorgrid)) $group->grid->setBackgroundColor($bgcolorgrid);
-		else $group->grid->setBackgroundColor($colortrans);
+		if (is_array($this->bgcolorgrid)) {
+		    $group->grid->setBackgroundColor($bgcolorgrid);
+		} else {
+		    $group->grid->setBackgroundColor($colortrans);
+		}
 
-		if ($this->hideXGrid)	$group->grid->hideVertical(true);
-		if ($this->hideYGrid)	$group->grid->hideHorizontal(true);
+		if ($this->hideXGrid) {
+		    $group->grid->hideVertical(true);
+		}
+		if ($this->hideYGrid) {
+		    $group->grid->hideHorizontal(true);
+		}
 
 		// On boucle sur chaque lot de donnees
 		$legends=array();
@@ -785,17 +821,29 @@ 
 				$colorgrey=new Color(100,100,100);
 				$colorborder=new Color($this->datacolor[$i][0],$this->datacolor[$i][1],$this->datacolor[$i][2]);
 
-				if ($this->mode == 'side')  $plot = new BarPlot($newvalues, $i+1, $nblot);
-				if ($this->mode == 'depth') $plot = new BarPlot($newvalues, 1, 1, ($nblot-$i-1)*5);
+				if ($this->mode == 'side') {
+				    $plot = new BarPlot($newvalues, $i+1, $nblot);
+				}
+				if ($this->mode == 'depth') {
+				    $plot = new BarPlot($newvalues, 1, 1, ($nblot-$i-1)*5);
+				}
 
 				$plot->barBorder->setColor($colorgrey);
 				//$plot->setBarColor($color);
 				$plot->setBarGradient(new LinearGradient($colorbis, $color, 90));
 
-				if ($this->mode == 'side')  $plot->setBarPadding(0.1, 0.1);
-				if ($this->mode == 'depth') $plot->setBarPadding(0.1, 0.4);
-				if ($this->mode == 'side')  $plot->setBarSpace(5);
-				if ($this->mode == 'depth') $plot->setBarSpace(2);
+				if ($this->mode == 'side') {
+				    $plot->setBarPadding(0.1, 0.1);
+				}
+				if ($this->mode == 'depth') {
+				    $plot->setBarPadding(0.1, 0.4);
+				}
+				if ($this->mode == 'side') {
+				    $plot->setBarSpace(5);
+				}
+				if ($this->mode == 'depth') {
+				    $plot->setBarSpace(2);
+				}
 
 				$plot->barShadow->setSize($this->SetShading);
 				$plot->barShadow->setPosition(SHADOW_RIGHT_TOP);
@@ -840,8 +888,12 @@ 
 			// solve a bug in Artichow with UTF8
 			if (count($this->Legend))
 			{
-				if ($this->type[0] == 'bars')  										$group->legend->add($plot, $this->Legend[$i], LEGEND_BACKGROUND);
-				if ($this->type[0] == 'lines' || $this->type[0] == 'linesnopoint')	$group->legend->add($plot, $this->Legend[$i], LEGEND_LINE);
+				if ($this->type[0] == 'bars') {
+				    $group->legend->add($plot, $this->Legend[$i], LEGEND_BACKGROUND);
+				}
+				if ($this->type[0] == 'lines' || $this->type[0] == 'linesnopoint') {
+				    $group->legend->add($plot, $this->Legend[$i], LEGEND_LINE);
+				}
 			}
 			$group->add($plot);
 
@@ -852,7 +904,9 @@ 
 		$group->axis->bottom->label->setFont(new $artichow_defaultfont(7));
 
 		//print $group->axis->bottom->getLabelNumber();
-		if ($this->labelInterval > 0) $group->axis->bottom->setLabelInterval($this->labelInterval);
+		if ($this->labelInterval > 0) {
+		    $group->axis->bottom->setLabelInterval($this->labelInterval);
+		}
 
 		$graph->add($group);
 
@@ -895,23 +949,30 @@ 
 
 		$legends=array();
 		$nblot=count($this->data[0])-1;    // -1 to remove legend
-		if ($nblot < 0) dol_syslog('Bad value for property ->data. Must be set by mydolgraph->SetData before calling mydolgrapgh->draw', LOG_WARNING);
+		if ($nblot < 0) {
+		    dol_syslog('Bad value for property ->data. Must be set by mydolgraph->SetData before calling mydolgrapgh->draw', LOG_WARNING);
+		}
 		$firstlot=0;
 		// Works with line but not with bars
 		//if ($nblot > 2) $firstlot = ($nblot - 2);        // We limit nblot to 2 because jflot can't manage more than 2 bars on same x
 
 		$i=$firstlot;
 		$serie=array();
-		while ($i < $nblot)	// Loop on each serie
+		while ($i < $nblot) {
+		    // Loop on each serie
 		{
-			$values=array();	// Array with horizontal y values (specific values of a serie) for each abscisse x
+			$values=array();
+		}
+		// Array with horizontal y values (specific values of a serie) for each abscisse x
 			$serie[$i]="var d".$i." = [];\n";
 
 			// Fill array $values
 			$x=0;
-			foreach($this->data as $valarray)	// Loop on each x
+			foreach($this->data as $valarray) {
+			    // Loop on each x
 			{
 				$legends[$x] = $valarray[0];
+			}
 				$values[$x]  = (is_numeric($valarray[$i+1]) ? $valarray[$i+1] : null);
 				$x++;
 			}
@@ -920,13 +981,16 @@ 
 			if (isset($this->type[$firstlot]) && $this->type[$firstlot] == 'pie')
 			{
 				foreach($values as $x => $y) {
-					if (isset($y)) $serie[$i].='d'.$i.'.push({"label":"'.dol_escape_js($legends[$x]).'", "data":'.$y.'});'."\n";
+					if (isset($y)) {
+					    $serie[$i].='d'.$i.'.push({"label":"'.dol_escape_js($legends[$x]).'", "data":'.$y.'});'."\n";
+					}
 				}
-			}
-			else
+			} else
 			{
 				foreach($values as $x => $y) {
-					if (isset($y)) $serie[$i].='d'.$i.'.push(['.$x.', '.$y.']);'."\n";
+					if (isset($y)) {
+					    $serie[$i].='d'.$i.'.push(['.$x.', '.$y.']);'."\n";
+					}
 				}
 			}
 
@@ -936,7 +1000,9 @@ 
 		$tag=dol_escape_htmltag(dol_string_unaccent(dol_string_nospecial(basename($file),'_',array('-','.'))));
 
 		$this->stringtoshow ='<!-- Build using '.$this->_library.' -->'."\n";
-		if (! empty($this->title)) $this->stringtoshow.='<div align="center" class="dolgraphtitle'.(empty($this->cssprefix)?'':' dolgraphtitle'.$this->cssprefix).'">'.$this->title.'</div>';
+		if (! empty($this->title)) {
+		    $this->stringtoshow.='<div align="center" class="dolgraphtitle'.(empty($this->cssprefix)?'':' dolgraphtitle'.$this->cssprefix).'">'.$this->title.'</div>';
+		}
 		if (! empty($this->shownographyet))
 		{
 		  $this->stringtoshow.='<div style="width:'.$this->width.'px;height:'.$this->height.'px;" class="nographyet"></div>';
@@ -951,8 +1017,7 @@ 
 		if ($nblot < 0)
 		{
 			$this->stringtoshow.='<!-- No series of data -->';
-		}
-		else
+		} else
 		{
 			while ($i < $nblot)
 			{
@@ -966,7 +1031,9 @@ 
 		if (isset($this->type[$firstlot]) && $this->type[$firstlot] == 'pie')
 		{
 			$datacolor=array();
-			foreach($this->datacolor as $val) $datacolor[]="#".sprintf("%02x%02x%02x",$val[0],$val[1],$val[2]);
+			foreach($this->datacolor as $val) {
+			    $datacolor[]="#".sprintf("%02x%02x%02x",$val[0],$val[1],$val[2]);
+			}
 
 			$urltemp='';	// TODO Add support for url link into labels
 			$showlegend=$this->showlegend;
@@ -993,13 +1060,17 @@ 
 								var number=series.data[0][1];
 								return \'';
 								$this->stringtoshow.='<span style="font-size:8pt;text-align:center;padding:2px;color:black;">';
-								if ($urltemp) $this->stringtoshow.='<a style="color: #FFFFFF;" border="0" href="'.$urltemp.'">';
+								if ($urltemp) {
+								    $this->stringtoshow.='<a style="color: #FFFFFF;" border="0" href="'.$urltemp.'">';
+								}
 								$this->stringtoshow.='\'+';
 								$this->stringtoshow.=($showlegend?'':'label+\' \'+');	// Hide label if already shown in legend
 								$this->stringtoshow.=($showpointvalue?'number+':'');
 								$this->stringtoshow.=($showpercent?'\'<br/>\'+percent+\'%\'+':'');
 								$this->stringtoshow.='\'';
-								if ($urltemp) $this->stringtoshow.='</a>';
+								if ($urltemp) {
+								    $this->stringtoshow.='</a>';
+								}
 								$this->stringtoshow.='</span>\';
 							},
 							background: {
@@ -1060,9 +1131,11 @@ 
 						var y = item.datapoint[1].toFixed(2);
 						var z = item.series.xaxis.ticks[item.dataIndex].label;
 						';
-						if ($this->showpointvalue > 0) $this->stringtoshow.='
+						if ($this->showpointvalue > 0) {
+						    $this->stringtoshow.='
 							showTooltip_'.$tag.'(item.pageX, item.pageY, item.series.label + "<br>" + z + " => " + y);
 						';
+						}
 						$this->stringtoshow.='
 					}
 				}
@@ -1080,11 +1153,17 @@ 
 			$i=$firstlot;
 			while ($i < $nblot)
 			{
-				if ($i > $firstlot) $this->stringtoshow.=', '."\n";
+				if ($i > $firstlot) {
+				    $this->stringtoshow.=', '."\n";
+				}
 				$color=sprintf("%02x%02x%02x",$this->datacolor[$i][0],$this->datacolor[$i][1],$this->datacolor[$i][2]);
 				$this->stringtoshow.='{ ';
-				if (! isset($this->type[$i]) || $this->type[$i] == 'bars') $this->stringtoshow.='bars: { lineWidth: 1, show: true, align: "'.($i==$firstlot?'center':'left').'", barWidth: 0.5 }, ';
-				if (isset($this->type[$i]) && ($this->type[$i] == 'lines' || $this->type[$i] == 'linesnopoint')) $this->stringtoshow.='lines: { show: true, fill: false }, points: { show: '.($this->type[$i] == 'linesnopoint' ? 'false' : 'true').' }, ';
+				if (! isset($this->type[$i]) || $this->type[$i] == 'bars') {
+				    $this->stringtoshow.='bars: { lineWidth: 1, show: true, align: "'.($i==$firstlot?'center':'left').'", barWidth: 0.5 }, ';
+				}
+				if (isset($this->type[$i]) && ($this->type[$i] == 'lines' || $this->type[$i] == 'linesnopoint')) {
+				    $this->stringtoshow.='lines: { show: true, fill: false }, points: { show: '.($this->type[$i] == 'linesnopoint' ? 'false' : 'true').' }, ';
+				}
 				$this->stringtoshow.='color: "#'.$color.'", label: "'.(isset($this->Legend[$i]) ? dol_escape_js($this->Legend[$i]) : '').'", data: d'.$i.' }';
 				$i++;
 			}
@@ -1096,7 +1175,9 @@ 
 			$x=0;
 			foreach($this->data as $key => $valarray)
 			{
-				if ($x > 0) $this->stringtoshow.=', '."\n";
+				if ($x > 0) {
+				    $this->stringtoshow.=', '."\n";
+				}
 				$this->stringtoshow.= ' ['.$x.', "'.$valarray[0].'"]';
 				$x++;
 			}
@@ -1155,8 +1236,11 @@ 
 
 		if ($direction == 'width')
 		{
-			if (empty($conf->dol_optimize_smallscreen)) return ($defaultsize ? $defaultsize : '500');
-			else return (empty($_SESSION['dol_screen_width']) ? '280' : ($_SESSION['dol_screen_width']-40));
+			if (empty($conf->dol_optimize_smallscreen)) {
+			    return ($defaultsize ? $defaultsize : '500');
+			} else {
+			    return (empty($_SESSION['dol_screen_width']) ? '280' : ($_SESSION['dol_screen_width']-40));
+			}
 		}
 		if ($direction == 'height')
 		{

dolibarr/htdocs/core/class/extrafields.class.php

Indentation +1967 added lines, -1967 removed lines

@@ -37,2020 +37,2020 @@
  */
 class ExtraFields
 {
-	/**
+    /**
      * @var DoliDB Database handler.
      */
     public $db;
 
-	// type of element (for what object is the extrafield)
-	// @deprecated
-	var $attribute_elementtype;
-	// Array with type of the extra field
-	// @deprecated
-	var $attribute_type;
-	// Array with label of extra field
-	// @deprecated
-	var $attribute_label;
-	// Array with size of extra field
-	// @deprecated
-	var $attribute_size;
-	// array with list of possible values for some types of extra fields
-	// @deprecated
-	var $attribute_choice;
-	// Array to store compute formula for computed fields
-	// @deprecated
-	var $attribute_computed;
-	// Array to store default value
-	// @deprecated
-	var $attribute_default;
-	// Array to store if attribute is unique or not
-	// @deprecated
-	var $attribute_unique;
-	// Array to store if attribute is required or not
-	// @deprecated
-	var $attribute_required;
-	// Array to store parameters of attribute (used in select type)
-	// @deprecated
-	var $attribute_param;
-	// Array to store position of attribute
-	// @deprecated
-	var $attribute_pos;
-	// Array to store if attribute is editable regardless of the document status
-	// @deprecated
-	var $attribute_alwayseditable;
-	// Array to store permission to check
-	// @deprecated
-	var $attribute_perms;
-	// Array to store language file to translate label of values
-	// @deprecated
-	var $attribute_langfile;
-	// Array to store if field is visible by default on list
-	// @deprecated
-	var $attribute_list;
-
-	// New array to store extrafields definition
-	var $attributes;
-
-	/**
-	 * @var string Error code (or message)
-	 */
-	public $error='';
-
-	var $errno;
-
-
-	public static $type2label=array(
-	'varchar'=>'String',
-	'text'=>'TextLong',
-	'html'=>'HtmlText',
-	'int'=>'Int',
-	'double'=>'Float',
-	'date'=>'Date',
-	'datetime'=>'DateAndTime',
-	'boolean'=>'Boolean',
-	'price'=>'ExtrafieldPrice',
-	'phone'=>'ExtrafieldPhone',
-	'mail'=>'ExtrafieldMail',
-	'url'=>'ExtrafieldUrl',
-	'password' => 'ExtrafieldPassword',
-	'select' => 'ExtrafieldSelect',
-	'sellist' => 'ExtrafieldSelectList',
-	'radio' => 'ExtrafieldRadio',
-	'checkbox' => 'ExtrafieldCheckBox',
-	'chkbxlst' => 'ExtrafieldCheckBoxFromList',
-	'link' => 'ExtrafieldLink',
-	'separate' => 'ExtrafieldSeparator',
-	);
-
-
-	/**
-	 *	Constructor
-	 *
-	 *  @param		DoliDB		$db      Database handler
-	*/
-	function __construct($db)
-	{
-		$this->db = $db;
-		$this->error = array();
-		$this->attributes = array();
-
-		// For old usage
-		$this->attribute_elementtype = array();
-		$this->attribute_type = array();
-		$this->attribute_label = array();
-		$this->attribute_size = array();
-		$this->attribute_computed = array();
-		$this->attribute_default = array();
-		$this->attribute_unique = array();
-		$this->attribute_required = array();
-		$this->attribute_perms = array();
-		$this->attribute_langfile = array();
-		$this->attribute_list = array();
-	}
-
-	/**
-	 *  Add a new extra field parameter
-	 *
-	 *  @param	string			$attrname           Code of attribute
-	 *  @param  string			$label              label of attribute
-	 *  @param  int				$type               Type of attribute ('boolean','int','varchar','text','html','date','datehour','price','phone','mail','password','url','select','checkbox','separate',...)
-	 *  @param  int				$pos                Position of attribute
-	 *  @param  string			$size               Size/length of attribute
-	 *  @param  string			$elementtype        Element type. Same value than object->table_element (Example 'member', 'product', 'thirdparty', ...)
-	 *  @param	int				$unique				Is field unique or not
-	 *  @param	int				$required			Is field required or not
-	 *  @param	string			$default_value		Defaulted value (In database. use the default_value feature for default value on screen. Example: '', '0', 'null', 'avalue')
-	 *  @param  array|string	$param				Params for field (ex for select list : array('options' => array(value'=>'label of option')) )
-	 *  @param  int				$alwayseditable		Is attribute always editable regardless of the document status
-	 *  @param	string			$perms				Permission to check
-	 *  @param	string			$list				Visibilty ('0'=never visible, '1'=visible on list+forms, '2'=list only, '3'=form only or 'eval string')
-	 *  @param	string			$help				Text with help tooltip
-	 *  @param  string  		$computed           Computed value
-	 *  @param  string  		$entity    		 	Entity of extrafields (for multicompany modules)
-	 *  @param  string  		$langfile  		 	Language file
-	 *  @param  string  		$enabled  		 	Condition to have the field enabled or not
-	 *  @return int      							<=0 if KO, >0 if OK
-	 */
-	function addExtraField($attrname, $label, $type, $pos, $size, $elementtype, $unique=0, $required=0, $default_value='', $param='', $alwayseditable=0, $perms='', $list='-1', $help='', $computed='', $entity='', $langfile='', $enabled='1')
-	{
-		if (empty($attrname)) return -1;
-		if (empty($label)) return -1;
-
-		if ($elementtype == 'thirdparty') $elementtype='societe';
-		if ($elementtype == 'contact') $elementtype='socpeople';
-
-		// Create field into database except for separator type which is not stored in database
-		if ($type != 'separate')
-		{
-			$result=$this->create($attrname, $type, $size, $elementtype, $unique, $required, $default_value, $param, $perms, $list, $computed, $help);
-		}
-		$err1=$this->errno;
-		if ($result > 0 || $err1 == 'DB_ERROR_COLUMN_ALREADY_EXISTS' || $type == 'separate')
-		{
-			// Add declaration of field into table
-			$result2=$this->create_label($attrname, $label, $type, $pos, $size, $elementtype, $unique, $required, $param, $alwayseditable, $perms, $list, $help, $default_value, $computed, $entity, $langfile, $enabled);
-			$err2=$this->errno;
-			if ($result2 > 0 || ($err1 == 'DB_ERROR_COLUMN_ALREADY_EXISTS' && $err2 == 'DB_ERROR_RECORD_ALREADY_EXISTS'))
-			{
-				$this->error='';
-				$this->errno=0;
-				return 1;
-			}
-			else return -2;
-		}
-		else
-		{
-			return -1;
-		}
-	}
-
-	/**
-	 *	Add a new optional attribute.
-	 *  This is a private method. For public method, use addExtraField.
-	 *
-	 *	@param	string	$attrname			code of attribute
-	 *  @param	int		$type				Type of attribute ('boolean', 'int', 'varchar', 'text', 'html', 'date', 'datehour','price','phone','mail','password','url','select','checkbox', ...)
-	 *  @param	string	$length				Size/length of attribute ('5', '24,8', ...)
-	 *  @param  string	$elementtype        Element type ('member', 'product', 'thirdparty', 'contact', ...)
-	 *  @param	int		$unique				Is field unique or not
-	 *  @param	int		$required			Is field required or not
-	 *  @param  string  $default_value		Default value for field (in database)
-	 *  @param  array	$param				Params for field  (ex for select list : array('options'=>array('value'=>'label of option'))
-	 *  @param	string	$perms				Permission
-	 *	@param	string	$list				Into list view by default
-	 *  @param  string  $computed           Computed value
-	 *  @return int      	           		<=0 if KO, >0 if OK
-	 */
-	private function create($attrname, $type='varchar', $length=255, $elementtype='member', $unique=0, $required=0, $default_value='',$param='', $perms='', $list='0', $computed='')
-	{
-		if ($elementtype == 'thirdparty') $elementtype='societe';
-		if ($elementtype == 'contact') $elementtype='socpeople';
-
-		$table=$elementtype.'_extrafields';
-		if ($elementtype == 'categorie') $table='categories_extrafields';
-
-		if (! empty($attrname) && preg_match("/^\w[a-zA-Z0-9_]*$/",$attrname) && ! is_numeric($attrname))
-		{
-			if ($type=='boolean') {
-				$typedb='int';
-				$lengthdb='1';
-			} elseif($type=='price') {
-				$typedb='double';
-				$lengthdb='24,8';
-			} elseif($type=='phone') {
-				$typedb='varchar';
-				$lengthdb='20';
-			} elseif($type=='mail') {
-				$typedb='varchar';
-				$lengthdb='128';
-			} elseif($type=='url') {
-				$typedb='varchar';
-				$lengthdb='255';
-			} elseif (($type=='select') || ($type=='sellist') || ($type=='radio') ||($type=='checkbox') ||($type=='chkbxlst')){
-				$typedb='varchar';
-				$lengthdb='255';
-			} elseif ($type=='link') {
-				$typedb='int';
-				$lengthdb='11';
-			} elseif ($type=='html') {
-				$typedb='text';
-				$lengthdb=$length;
-			} elseif($type=='password') {
-				$typedb='varchar';
-				$lengthdb='128';
-			} else {
-				$typedb=$type;
-				$lengthdb=$length;
-				if ($type == 'varchar' && empty($lengthdb)) $lengthdb='255';
-			}
-			$field_desc = array(
-				'type'=>$typedb,
-				'value'=>$lengthdb,
-				'null'=>($required?'NOT NULL':'NULL'),
-				'default' => $default_value
-			);
-
-			$result=$this->db->DDLAddField(MAIN_DB_PREFIX.$table, $attrname, $field_desc);
-			if ($result > 0)
-			{
-				if ($unique)
-				{
-					$sql="ALTER TABLE ".MAIN_DB_PREFIX.$table." ADD UNIQUE INDEX uk_".$table."_".$attrname." (".$attrname.")";
-					$resql=$this->db->query($sql,1,'dml');
-				}
-				return 1;
-			}
-			else
-			{
-				$this->error=$this->db->lasterror();
-				$this->errno=$this->db->lasterrno();
-				return -1;
-			}
-		}
-		else
-		{
-			return 0;
-		}
-	}
+    // type of element (for what object is the extrafield)
+    // @deprecated
+    var $attribute_elementtype;
+    // Array with type of the extra field
+    // @deprecated
+    var $attribute_type;
+    // Array with label of extra field
+    // @deprecated
+    var $attribute_label;
+    // Array with size of extra field
+    // @deprecated
+    var $attribute_size;
+    // array with list of possible values for some types of extra fields
+    // @deprecated
+    var $attribute_choice;
+    // Array to store compute formula for computed fields
+    // @deprecated
+    var $attribute_computed;
+    // Array to store default value
+    // @deprecated
+    var $attribute_default;
+    // Array to store if attribute is unique or not
+    // @deprecated
+    var $attribute_unique;
+    // Array to store if attribute is required or not
+    // @deprecated
+    var $attribute_required;
+    // Array to store parameters of attribute (used in select type)
+    // @deprecated
+    var $attribute_param;
+    // Array to store position of attribute
+    // @deprecated
+    var $attribute_pos;
+    // Array to store if attribute is editable regardless of the document status
+    // @deprecated
+    var $attribute_alwayseditable;
+    // Array to store permission to check
+    // @deprecated
+    var $attribute_perms;
+    // Array to store language file to translate label of values
+    // @deprecated
+    var $attribute_langfile;
+    // Array to store if field is visible by default on list
+    // @deprecated
+    var $attribute_list;
+
+    // New array to store extrafields definition
+    var $attributes;
+
+    /**
+     * @var string Error code (or message)
+     */
+    public $error='';
+
+    var $errno;
+
+
+    public static $type2label=array(
+    'varchar'=>'String',
+    'text'=>'TextLong',
+    'html'=>'HtmlText',
+    'int'=>'Int',
+    'double'=>'Float',
+    'date'=>'Date',
+    'datetime'=>'DateAndTime',
+    'boolean'=>'Boolean',
+    'price'=>'ExtrafieldPrice',
+    'phone'=>'ExtrafieldPhone',
+    'mail'=>'ExtrafieldMail',
+    'url'=>'ExtrafieldUrl',
+    'password' => 'ExtrafieldPassword',
+    'select' => 'ExtrafieldSelect',
+    'sellist' => 'ExtrafieldSelectList',
+    'radio' => 'ExtrafieldRadio',
+    'checkbox' => 'ExtrafieldCheckBox',
+    'chkbxlst' => 'ExtrafieldCheckBoxFromList',
+    'link' => 'ExtrafieldLink',
+    'separate' => 'ExtrafieldSeparator',
+    );
+
+
+    /**
+     *	Constructor
+     *
+     *  @param		DoliDB		$db      Database handler
+     */
+    function __construct($db)
+    {
+        $this->db = $db;
+        $this->error = array();
+        $this->attributes = array();
+
+        // For old usage
+        $this->attribute_elementtype = array();
+        $this->attribute_type = array();
+        $this->attribute_label = array();
+        $this->attribute_size = array();
+        $this->attribute_computed = array();
+        $this->attribute_default = array();
+        $this->attribute_unique = array();
+        $this->attribute_required = array();
+        $this->attribute_perms = array();
+        $this->attribute_langfile = array();
+        $this->attribute_list = array();
+    }
+
+    /**
+     *  Add a new extra field parameter
+     *
+     *  @param	string			$attrname           Code of attribute
+     *  @param  string			$label              label of attribute
+     *  @param  int				$type               Type of attribute ('boolean','int','varchar','text','html','date','datehour','price','phone','mail','password','url','select','checkbox','separate',...)
+     *  @param  int				$pos                Position of attribute
+     *  @param  string			$size               Size/length of attribute
+     *  @param  string			$elementtype        Element type. Same value than object->table_element (Example 'member', 'product', 'thirdparty', ...)
+     *  @param	int				$unique				Is field unique or not
+     *  @param	int				$required			Is field required or not
+     *  @param	string			$default_value		Defaulted value (In database. use the default_value feature for default value on screen. Example: '', '0', 'null', 'avalue')
+     *  @param  array|string	$param				Params for field (ex for select list : array('options' => array(value'=>'label of option')) )
+     *  @param  int				$alwayseditable		Is attribute always editable regardless of the document status
+     *  @param	string			$perms				Permission to check
+     *  @param	string			$list				Visibilty ('0'=never visible, '1'=visible on list+forms, '2'=list only, '3'=form only or 'eval string')
+     *  @param	string			$help				Text with help tooltip
+     *  @param  string  		$computed           Computed value
+     *  @param  string  		$entity    		 	Entity of extrafields (for multicompany modules)
+     *  @param  string  		$langfile  		 	Language file
+     *  @param  string  		$enabled  		 	Condition to have the field enabled or not
+     *  @return int      							<=0 if KO, >0 if OK
+     */
+    function addExtraField($attrname, $label, $type, $pos, $size, $elementtype, $unique=0, $required=0, $default_value='', $param='', $alwayseditable=0, $perms='', $list='-1', $help='', $computed='', $entity='', $langfile='', $enabled='1')
+    {
+        if (empty($attrname)) return -1;
+        if (empty($label)) return -1;
+
+        if ($elementtype == 'thirdparty') $elementtype='societe';
+        if ($elementtype == 'contact') $elementtype='socpeople';
+
+        // Create field into database except for separator type which is not stored in database
+        if ($type != 'separate')
+        {
+            $result=$this->create($attrname, $type, $size, $elementtype, $unique, $required, $default_value, $param, $perms, $list, $computed, $help);
+        }
+        $err1=$this->errno;
+        if ($result > 0 || $err1 == 'DB_ERROR_COLUMN_ALREADY_EXISTS' || $type == 'separate')
+        {
+            // Add declaration of field into table
+            $result2=$this->create_label($attrname, $label, $type, $pos, $size, $elementtype, $unique, $required, $param, $alwayseditable, $perms, $list, $help, $default_value, $computed, $entity, $langfile, $enabled);
+            $err2=$this->errno;
+            if ($result2 > 0 || ($err1 == 'DB_ERROR_COLUMN_ALREADY_EXISTS' && $err2 == 'DB_ERROR_RECORD_ALREADY_EXISTS'))
+            {
+                $this->error='';
+                $this->errno=0;
+                return 1;
+            }
+            else return -2;
+        }
+        else
+        {
+            return -1;
+        }
+    }
+
+    /**
+     *	Add a new optional attribute.
+     *  This is a private method. For public method, use addExtraField.
+     *
+     *	@param	string	$attrname			code of attribute
+     *  @param	int		$type				Type of attribute ('boolean', 'int', 'varchar', 'text', 'html', 'date', 'datehour','price','phone','mail','password','url','select','checkbox', ...)
+     *  @param	string	$length				Size/length of attribute ('5', '24,8', ...)
+     *  @param  string	$elementtype        Element type ('member', 'product', 'thirdparty', 'contact', ...)
+     *  @param	int		$unique				Is field unique or not
+     *  @param	int		$required			Is field required or not
+     *  @param  string  $default_value		Default value for field (in database)
+     *  @param  array	$param				Params for field  (ex for select list : array('options'=>array('value'=>'label of option'))
+     *  @param	string	$perms				Permission
+     *	@param	string	$list				Into list view by default
+     *  @param  string  $computed           Computed value
+     *  @return int      	           		<=0 if KO, >0 if OK
+     */
+    private function create($attrname, $type='varchar', $length=255, $elementtype='member', $unique=0, $required=0, $default_value='',$param='', $perms='', $list='0', $computed='')
+    {
+        if ($elementtype == 'thirdparty') $elementtype='societe';
+        if ($elementtype == 'contact') $elementtype='socpeople';
+
+        $table=$elementtype.'_extrafields';
+        if ($elementtype == 'categorie') $table='categories_extrafields';
+
+        if (! empty($attrname) && preg_match("/^\w[a-zA-Z0-9_]*$/",$attrname) && ! is_numeric($attrname))
+        {
+            if ($type=='boolean') {
+                $typedb='int';
+                $lengthdb='1';
+            } elseif($type=='price') {
+                $typedb='double';
+                $lengthdb='24,8';
+            } elseif($type=='phone') {
+                $typedb='varchar';
+                $lengthdb='20';
+            } elseif($type=='mail') {
+                $typedb='varchar';
+                $lengthdb='128';
+            } elseif($type=='url') {
+                $typedb='varchar';
+                $lengthdb='255';
+            } elseif (($type=='select') || ($type=='sellist') || ($type=='radio') ||($type=='checkbox') ||($type=='chkbxlst')){
+                $typedb='varchar';
+                $lengthdb='255';
+            } elseif ($type=='link') {
+                $typedb='int';
+                $lengthdb='11';
+            } elseif ($type=='html') {
+                $typedb='text';
+                $lengthdb=$length;
+            } elseif($type=='password') {
+                $typedb='varchar';
+                $lengthdb='128';
+            } else {
+                $typedb=$type;
+                $lengthdb=$length;
+                if ($type == 'varchar' && empty($lengthdb)) $lengthdb='255';
+            }
+            $field_desc = array(
+                'type'=>$typedb,
+                'value'=>$lengthdb,
+                'null'=>($required?'NOT NULL':'NULL'),
+                'default' => $default_value
+            );
+
+            $result=$this->db->DDLAddField(MAIN_DB_PREFIX.$table, $attrname, $field_desc);
+            if ($result > 0)
+            {
+                if ($unique)
+                {
+                    $sql="ALTER TABLE ".MAIN_DB_PREFIX.$table." ADD UNIQUE INDEX uk_".$table."_".$attrname." (".$attrname.")";
+                    $resql=$this->db->query($sql,1,'dml');
+                }
+                return 1;
+            }
+            else
+            {
+                $this->error=$this->db->lasterror();
+                $this->errno=$this->db->lasterrno();
+                return -1;
+            }
+        }
+        else
+        {
+            return 0;
+        }
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-	/**
-	 *	Add description of a new optional attribute
-	 *
-	 *	@param	string			$attrname		code of attribute
-	 *	@param	string			$label			label of attribute
-	 *  @param	int				$type			Type of attribute ('int', 'varchar', 'text', 'html', 'date', 'datehour', 'float')
-	 *  @param	int				$pos			Position of attribute
-	 *  @param	string			$size			Size/length of attribute ('5', '24,8', ...)
-	 *  @param  string			$elementtype	Element type ('member', 'product', 'thirdparty', ...)
-	 *  @param	int				$unique			Is field unique or not
-	 *  @param	int				$required		Is field required or not
-	 *  @param  array|string	$param			Params for field  (ex for select list : array('options' => array(value'=>'label of option')) )
-	 *  @param  int				$alwayseditable	Is attribute always editable regardless of the document status
-	 *  @param	string			$perms			Permission to check
-	 *  @param	string			$list			Visibily
-	 *  @param	string			$help			Help on tooltip
-	 *  @param  string          $default        Default value (in database. use the default_value feature for default value on screen).
-	 *  @param  string          $computed       Computed value
-	 *  @param  string          $entity     	Entity of extrafields
-	 *  @param	string			$langfile		Language file
-	 *  @param  string  		$enabled  		Condition to have the field enabled or not
-	 *  @return	int								<=0 if KO, >0 if OK
-	 */
-	private function create_label($attrname, $label='', $type='', $pos=0, $size=0, $elementtype='member', $unique=0, $required=0, $param='', $alwayseditable=0, $perms='', $list='-1', $help='', $default='', $computed='',$entity='', $langfile='', $enabled='1')
-	{
+    /**
+     *	Add description of a new optional attribute
+     *
+     *	@param	string			$attrname		code of attribute
+     *	@param	string			$label			label of attribute
+     *  @param	int				$type			Type of attribute ('int', 'varchar', 'text', 'html', 'date', 'datehour', 'float')
+     *  @param	int				$pos			Position of attribute
+     *  @param	string			$size			Size/length of attribute ('5', '24,8', ...)
+     *  @param  string			$elementtype	Element type ('member', 'product', 'thirdparty', ...)
+     *  @param	int				$unique			Is field unique or not
+     *  @param	int				$required		Is field required or not
+     *  @param  array|string	$param			Params for field  (ex for select list : array('options' => array(value'=>'label of option')) )
+     *  @param  int				$alwayseditable	Is attribute always editable regardless of the document status
+     *  @param	string			$perms			Permission to check
+     *  @param	string			$list			Visibily
+     *  @param	string			$help			Help on tooltip
+     *  @param  string          $default        Default value (in database. use the default_value feature for default value on screen).
+     *  @param  string          $computed       Computed value
+     *  @param  string          $entity     	Entity of extrafields
+     *  @param	string			$langfile		Language file
+     *  @param  string  		$enabled  		Condition to have the field enabled or not
+     *  @return	int								<=0 if KO, >0 if OK
+     */
+    private function create_label($attrname, $label='', $type='', $pos=0, $size=0, $elementtype='member', $unique=0, $required=0, $param='', $alwayseditable=0, $perms='', $list='-1', $help='', $default='', $computed='',$entity='', $langfile='', $enabled='1')
+    {
         // phpcs:enable
-		global $conf,$user;
-
-		if ($elementtype == 'thirdparty') $elementtype='societe';
-		if ($elementtype == 'contact') $elementtype='socpeople';
-
-		// Clean parameters
-		if (empty($pos)) $pos=0;
-		if (empty($list)) $list='0';
-		if (empty($required)) $required=0;
-		if (empty($unique)) $unique=0;
-		if (empty($alwayseditable)) $alwayseditable=0;
-
-		if (! empty($attrname) && preg_match("/^\w[a-zA-Z0-9-_]*$/",$attrname) && ! is_numeric($attrname))
-		{
-			if (is_array($param) && count($param) > 0)
-			{
-				$params = serialize($param);
-			}
-			elseif (strlen($param) > 0)
-			{
-				$params = trim($param);
-			}
-			else
-			{
-				$params='';
-			}
-
-			$sql = "INSERT INTO ".MAIN_DB_PREFIX."extrafields(";
-			$sql.= " name,";
-			$sql.= " label,";
-			$sql.= " type,";
-			$sql.= " pos,";
-			$sql.= " size,";
-			$sql.= " entity,";
-			$sql.= " elementtype,";
-			$sql.= " fieldunique,";
-			$sql.= " fieldrequired,";
-			$sql.= " param,";
-			$sql.= " alwayseditable,";
-			$sql.= " perms,";
-			$sql.= " langs,";
-			$sql.= " list,";
-			$sql.= " fielddefault,";
-			$sql.= " fieldcomputed,";
-			$sql.= " fk_user_author,";
-			$sql.= " fk_user_modif,";
-			$sql.= " datec,";
-			$sql.= " enabled,";
-			$sql.= " help";
-			$sql.= " )";
-			$sql.= " VALUES('".$attrname."',";
-			$sql.= " '".$this->db->escape($label)."',";
-			$sql.= " '".$this->db->escape($type)."',";
-			$sql.= " ".$pos.",";
-			$sql.= " '".$this->db->escape($size)."',";
-			$sql.= " ".($entity===''?$conf->entity:$entity).",";
-			$sql.= " '".$this->db->escape($elementtype)."',";
-			$sql.= " ".$unique.",";
-			$sql.= " ".$required.",";
-			$sql.= " '".$this->db->escape($params)."',";
-			$sql.= " ".$alwayseditable.",";
-			$sql.= " ".($perms?"'".$this->db->escape($perms)."'":"null").",";
-			$sql.= " ".($langfile?"'".$this->db->escape($langfile)."'":"null").",";
-			$sql.= " '".$this->db->escape($list)."',";
-			$sql.= " ".($default?"'".$this->db->escape($default)."'":"null").",";
-			$sql.= " ".($computed?"'".$this->db->escape($computed)."'":"null").",";
-			$sql .= " " . (is_object($user) ? $user->id : 0). ",";
-			$sql .= " " . (is_object($user) ? $user->id : 0). ",";
-			$sql .= "'" . $this->db->idate(dol_now()) . "',";
-			$sql.= " ".($enabled?"'".$this->db->escape($enabled)."'":"1").",";
-			$sql.= " ".($help?"'".$this->db->escape($help)."'":"null");
-			$sql.=')';
-
-			dol_syslog(get_class($this)."::create_label", LOG_DEBUG);
-			if ($this->db->query($sql))
-			{
-				return 1;
-			}
-			else
-			{
-				$this->error=$this->db->lasterror();
-				$this->errno=$this->db->lasterrno();
-				return -1;
-			}
-		}
-	}
-
-	/**
-	 *	Delete an optional attribute
-	 *
-	 *	@param	string	$attrname		Code of attribute to delete
-	 *  @param  string	$elementtype    Element type ('member', 'product', 'thirdparty', 'contact', ...)
-	 *  @return int              		< 0 if KO, 0 if nothing is done, 1 if OK
-	 */
-	function delete($attrname, $elementtype='member')
-	{
-		if ($elementtype == 'thirdparty') $elementtype='societe';
-		if ($elementtype == 'contact') $elementtype='socpeople';
-
-		$table=$elementtype.'_extrafields';
-		if ($elementtype == 'categorie') $table='categories_extrafields';
-
-		$error=0;
-
-		if (! empty($attrname) && preg_match("/^\w[a-zA-Z0-9-_]*$/",$attrname))
-		{
-			$result=$this->delete_label($attrname,$elementtype);
-			if ($result < 0)
-			{
-			    $this->error=$this->db->lasterror();
-			    $error++;
-			}
-
-			if (! $error)
-			{
-        		$sql = "SELECT COUNT(rowid) as nb";
-        		$sql.= " FROM ".MAIN_DB_PREFIX."extrafields";
-        		$sql.= " WHERE elementtype = '".$elementtype."'";
-        		$sql.= " AND name = '".$attrname."'";
-        		//$sql.= " AND entity IN (0,".$conf->entity.")";      Do not test on entity here. We want to see if there is still on field remaning in other entities before deleting field in table
+        global $conf,$user;
+
+        if ($elementtype == 'thirdparty') $elementtype='societe';
+        if ($elementtype == 'contact') $elementtype='socpeople';
+
+        // Clean parameters
+        if (empty($pos)) $pos=0;
+        if (empty($list)) $list='0';
+        if (empty($required)) $required=0;
+        if (empty($unique)) $unique=0;
+        if (empty($alwayseditable)) $alwayseditable=0;
+
+        if (! empty($attrname) && preg_match("/^\w[a-zA-Z0-9-_]*$/",$attrname) && ! is_numeric($attrname))
+        {
+            if (is_array($param) && count($param) > 0)
+            {
+                $params = serialize($param);
+            }
+            elseif (strlen($param) > 0)
+            {
+                $params = trim($param);
+            }
+            else
+            {
+                $params='';
+            }
+
+            $sql = "INSERT INTO ".MAIN_DB_PREFIX."extrafields(";
+            $sql.= " name,";
+            $sql.= " label,";
+            $sql.= " type,";
+            $sql.= " pos,";
+            $sql.= " size,";
+            $sql.= " entity,";
+            $sql.= " elementtype,";
+            $sql.= " fieldunique,";
+            $sql.= " fieldrequired,";
+            $sql.= " param,";
+            $sql.= " alwayseditable,";
+            $sql.= " perms,";
+            $sql.= " langs,";
+            $sql.= " list,";
+            $sql.= " fielddefault,";
+            $sql.= " fieldcomputed,";
+            $sql.= " fk_user_author,";
+            $sql.= " fk_user_modif,";
+            $sql.= " datec,";
+            $sql.= " enabled,";
+            $sql.= " help";
+            $sql.= " )";
+            $sql.= " VALUES('".$attrname."',";
+            $sql.= " '".$this->db->escape($label)."',";
+            $sql.= " '".$this->db->escape($type)."',";
+            $sql.= " ".$pos.",";
+            $sql.= " '".$this->db->escape($size)."',";
+            $sql.= " ".($entity===''?$conf->entity:$entity).",";
+            $sql.= " '".$this->db->escape($elementtype)."',";
+            $sql.= " ".$unique.",";
+            $sql.= " ".$required.",";
+            $sql.= " '".$this->db->escape($params)."',";
+            $sql.= " ".$alwayseditable.",";
+            $sql.= " ".($perms?"'".$this->db->escape($perms)."'":"null").",";
+            $sql.= " ".($langfile?"'".$this->db->escape($langfile)."'":"null").",";
+            $sql.= " '".$this->db->escape($list)."',";
+            $sql.= " ".($default?"'".$this->db->escape($default)."'":"null").",";
+            $sql.= " ".($computed?"'".$this->db->escape($computed)."'":"null").",";
+            $sql .= " " . (is_object($user) ? $user->id : 0). ",";
+            $sql .= " " . (is_object($user) ? $user->id : 0). ",";
+            $sql .= "'" . $this->db->idate(dol_now()) . "',";
+            $sql.= " ".($enabled?"'".$this->db->escape($enabled)."'":"1").",";
+            $sql.= " ".($help?"'".$this->db->escape($help)."'":"null");
+            $sql.=')';
+
+            dol_syslog(get_class($this)."::create_label", LOG_DEBUG);
+            if ($this->db->query($sql))
+            {
+                return 1;
+            }
+            else
+            {
+                $this->error=$this->db->lasterror();
+                $this->errno=$this->db->lasterrno();
+                return -1;
+            }
+        }
+    }
+
+    /**
+     *	Delete an optional attribute
+     *
+     *	@param	string	$attrname		Code of attribute to delete
+     *  @param  string	$elementtype    Element type ('member', 'product', 'thirdparty', 'contact', ...)
+     *  @return int              		< 0 if KO, 0 if nothing is done, 1 if OK
+     */
+    function delete($attrname, $elementtype='member')
+    {
+        if ($elementtype == 'thirdparty') $elementtype='societe';
+        if ($elementtype == 'contact') $elementtype='socpeople';
+
+        $table=$elementtype.'_extrafields';
+        if ($elementtype == 'categorie') $table='categories_extrafields';
+
+        $error=0;
+
+        if (! empty($attrname) && preg_match("/^\w[a-zA-Z0-9-_]*$/",$attrname))
+        {
+            $result=$this->delete_label($attrname,$elementtype);
+            if ($result < 0)
+            {
+                $this->error=$this->db->lasterror();
+                $error++;
+            }
+
+            if (! $error)
+            {
+                $sql = "SELECT COUNT(rowid) as nb";
+                $sql.= " FROM ".MAIN_DB_PREFIX."extrafields";
+                $sql.= " WHERE elementtype = '".$elementtype."'";
+                $sql.= " AND name = '".$attrname."'";
+                //$sql.= " AND entity IN (0,".$conf->entity.")";      Do not test on entity here. We want to see if there is still on field remaning in other entities before deleting field in table
                 $resql = $this->db->query($sql);
                 if ($resql)
                 {
                     $obj = $this->db->fetch_object($resql);
                     if ($obj->nb <= 0)
                     {
-            			$result=$this->db->DDLDropField(MAIN_DB_PREFIX.$table,$attrname);	// This also drop the unique key
-            			if ($result < 0)
-            			{
-            				$this->error=$this->db->lasterror();
-            				$error++;
-            			}
+                        $result=$this->db->DDLDropField(MAIN_DB_PREFIX.$table,$attrname);	// This also drop the unique key
+                        if ($result < 0)
+                        {
+                            $this->error=$this->db->lasterror();
+                            $error++;
+                        }
                     }
                 }
-			}
+            }
 
-			return $result;
-		}
-		else
-		{
-			return 0;
-		}
-	}
+            return $result;
+        }
+        else
+        {
+            return 0;
+        }
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-	/**
-	 *	Delete description of an optional attribute
-	 *
-	 *	@param	string	$attrname			Code of attribute to delete
-	 *  @param  string	$elementtype        Element type ('member', 'product', 'thirdparty', ...)
-	 *  @return int              			< 0 if KO, 0 if nothing is done, 1 if OK
-	 */
-	private function delete_label($attrname, $elementtype='member')
-	{
+    /**
+     *	Delete description of an optional attribute
+     *
+     *	@param	string	$attrname			Code of attribute to delete
+     *  @param  string	$elementtype        Element type ('member', 'product', 'thirdparty', ...)
+     *  @return int              			< 0 if KO, 0 if nothing is done, 1 if OK
+     */
+    private function delete_label($attrname, $elementtype='member')
+    {
         // phpcs:enable
-		global $conf;
-
-		if ($elementtype == 'thirdparty') $elementtype='societe';
-		if ($elementtype == 'contact') $elementtype='socpeople';
-
-		if (isset($attrname) && $attrname != '' && preg_match("/^\w[a-zA-Z0-9-_]*$/",$attrname))
-		{
-			$sql = "DELETE FROM ".MAIN_DB_PREFIX."extrafields";
-			$sql.= " WHERE name = '".$attrname."'";
-			$sql.= " AND entity IN  (0,".$conf->entity.')';
-			$sql.= " AND elementtype = '".$elementtype."'";
-
-			dol_syslog(get_class($this)."::delete_label", LOG_DEBUG);
-			$resql=$this->db->query($sql);
-			if ($resql)
-			{
-				return 1;
-			}
-			else
-			{
-				print dol_print_error($this->db);
-				return -1;
-			}
-		}
-		else
-		{
-			return 0;
-		}
-	}
-
-	/**
-	 * 	Modify type of a personalized attribute
-	 *
-	 *  @param	string	$attrname			Name of attribute
-	 *  @param	string	$label				Label of attribute
-	 *  @param	string	$type				Type of attribute ('boolean', 'int', 'varchar', 'text', 'html', 'date', 'datehour','price','phone','mail','password','url','select','checkbox', ...)
-	 *  @param	int		$length				Length of attribute
-	 *  @param  string	$elementtype        Element type ('member', 'product', 'thirdparty', 'contact', ...)
-	 *  @param	int		$unique				Is field unique or not
-	 *  @param	int		$required			Is field required or not
-	 *  @param	int		$pos				Position of attribute
-	 *  @param  array	$param				Params for field (ex for select list : array('options' => array(value'=>'label of option')) )
-	 *  @param  int		$alwayseditable		Is attribute always editable regardless of the document status
-	 *  @param	string	$perms				Permission to check
-	 *  @param	string	$list				Visibility
-	 *  @param	string	$help				Help on tooltip
-	 *  @param  string  $default            Default value (in database. use the default_value feature for default value on screen).
-	 *  @param  string  $computed           Computed value
-	 *  @param  string  $entity	            Entity of extrafields
-	 *  @param	string	$langfile			Language file
-	 *  @param  string  $enabled  			Condition to have the field enabled or not
+        global $conf;
+
+        if ($elementtype == 'thirdparty') $elementtype='societe';
+        if ($elementtype == 'contact') $elementtype='socpeople';
+
+        if (isset($attrname) && $attrname != '' && preg_match("/^\w[a-zA-Z0-9-_]*$/",$attrname))
+        {
+            $sql = "DELETE FROM ".MAIN_DB_PREFIX."extrafields";
+            $sql.= " WHERE name = '".$attrname."'";
+            $sql.= " AND entity IN  (0,".$conf->entity.')';
+            $sql.= " AND elementtype = '".$elementtype."'";
+
+            dol_syslog(get_class($this)."::delete_label", LOG_DEBUG);
+            $resql=$this->db->query($sql);
+            if ($resql)
+            {
+                return 1;
+            }
+            else
+            {
+                print dol_print_error($this->db);
+                return -1;
+            }
+        }
+        else
+        {
+            return 0;
+        }
+    }
+
+    /**
+     * 	Modify type of a personalized attribute
+     *
+     *  @param	string	$attrname			Name of attribute
+     *  @param	string	$label				Label of attribute
+     *  @param	string	$type				Type of attribute ('boolean', 'int', 'varchar', 'text', 'html', 'date', 'datehour','price','phone','mail','password','url','select','checkbox', ...)
+     *  @param	int		$length				Length of attribute
+     *  @param  string	$elementtype        Element type ('member', 'product', 'thirdparty', 'contact', ...)
+     *  @param	int		$unique				Is field unique or not
+     *  @param	int		$required			Is field required or not
+     *  @param	int		$pos				Position of attribute
+     *  @param  array	$param				Params for field (ex for select list : array('options' => array(value'=>'label of option')) )
+     *  @param  int		$alwayseditable		Is attribute always editable regardless of the document status
+     *  @param	string	$perms				Permission to check
+     *  @param	string	$list				Visibility
+     *  @param	string	$help				Help on tooltip
+     *  @param  string  $default            Default value (in database. use the default_value feature for default value on screen).
+     *  @param  string  $computed           Computed value
+     *  @param  string  $entity	            Entity of extrafields
+     *  @param	string	$langfile			Language file
+     *  @param  string  $enabled  			Condition to have the field enabled or not
      *  @param  int     $totalizable        Is extrafield totalizable on list
-	 * 	@return	int							>0 if OK, <=0 if KO
-	 */
-	function update($attrname, $label, $type, $length, $elementtype, $unique=0, $required=0, $pos=0, $param='', $alwayseditable=0, $perms='', $list='', $help='', $default='', $computed='', $entity='', $langfile='', $enabled='1', $totalizable=0)
-	{
-		if ($elementtype == 'thirdparty') $elementtype='societe';
-		if ($elementtype == 'contact') $elementtype='socpeople';
+     * 	@return	int							>0 if OK, <=0 if KO
+     */
+    function update($attrname, $label, $type, $length, $elementtype, $unique=0, $required=0, $pos=0, $param='', $alwayseditable=0, $perms='', $list='', $help='', $default='', $computed='', $entity='', $langfile='', $enabled='1', $totalizable=0)
+    {
+        if ($elementtype == 'thirdparty') $elementtype='societe';
+        if ($elementtype == 'contact') $elementtype='socpeople';
 
         $table=$elementtype.'_extrafields';
-		if ($elementtype == 'categorie') $table='categories_extrafields';
-
-		if (isset($attrname) && $attrname != '' && preg_match("/^\w[a-zA-Z0-9-_]*$/",$attrname))
-		{
-			if ($type=='boolean') {
-				$typedb='int';
-				$lengthdb='1';
-			} elseif($type=='price') {
-				$typedb='double';
-				$lengthdb='24,8';
-			} elseif($type=='phone') {
-				$typedb='varchar';
-				$lengthdb='20';
-			} elseif($type=='mail') {
-				$typedb='varchar';
-				$lengthdb='128';
-			} elseif($type=='url') {
-				$typedb='varchar';
-				$lengthdb='255';
-			} elseif (($type=='select') || ($type=='sellist') || ($type=='radio') || ($type=='checkbox') || ($type=='chkbxlst')) {
-				$typedb='varchar';
-				$lengthdb='255';
-			} elseif ($type == 'html') {
-				$typedb='text';
-			} elseif ($type=='link') {
-				$typedb='int';
-				$lengthdb='11';
-			} elseif($type=='password') {
-				$typedb='varchar';
-				$lengthdb='50';
-			} else {
-				$typedb=$type;
-				$lengthdb=$length;
-			}
-			$field_desc = array('type'=>$typedb, 'value'=>$lengthdb, 'null'=>($required?'NOT NULL':'NULL'), 'default'=>$default);
-
-			if ($type != 'separate') // No table update when separate type
-			{
-				$result=$this->db->DDLUpdateField(MAIN_DB_PREFIX.$table, $attrname, $field_desc);
-			}
-			if ($result > 0 || $type == 'separate')
-			{
-				if ($label)
-				{
-					$result=$this->update_label($attrname,$label,$type,$length,$elementtype,$unique,$required,$pos,$param,$alwayseditable,$perms,$list,$help,$default,$computed,$entity,$langfile,$enabled, $totalizable);
-				}
-				if ($result > 0)
-				{
-					$sql='';
-					if ($unique)
-					{
-						$sql="ALTER TABLE ".MAIN_DB_PREFIX.$table." ADD UNIQUE INDEX uk_".$table."_".$attrname." (".$attrname.")";
-					}
-					else
-					{
-						$sql="ALTER TABLE ".MAIN_DB_PREFIX.$table." DROP INDEX uk_".$table."_".$attrname;
-					}
-					dol_syslog(get_class($this).'::update', LOG_DEBUG);
-					$resql=$this->db->query($sql,1,'dml');
-					return 1;
-				}
-				else
-				{
-					$this->error=$this->db->lasterror();
-					return -1;
-				}
-			}
-			else
-			{
-				$this->error=$this->db->lasterror();
-				return -1;
-			}
-		}
-		else
-		{
-			return 0;
-		}
-	}
+        if ($elementtype == 'categorie') $table='categories_extrafields';
+
+        if (isset($attrname) && $attrname != '' && preg_match("/^\w[a-zA-Z0-9-_]*$/",$attrname))
+        {
+            if ($type=='boolean') {
+                $typedb='int';
+                $lengthdb='1';
+            } elseif($type=='price') {
+                $typedb='double';
+                $lengthdb='24,8';
+            } elseif($type=='phone') {
+                $typedb='varchar';
+                $lengthdb='20';
+            } elseif($type=='mail') {
+                $typedb='varchar';
+                $lengthdb='128';
+            } elseif($type=='url') {
+                $typedb='varchar';
+                $lengthdb='255';
+            } elseif (($type=='select') || ($type=='sellist') || ($type=='radio') || ($type=='checkbox') || ($type=='chkbxlst')) {
+                $typedb='varchar';
+                $lengthdb='255';
+            } elseif ($type == 'html') {
+                $typedb='text';
+            } elseif ($type=='link') {
+                $typedb='int';
+                $lengthdb='11';
+            } elseif($type=='password') {
+                $typedb='varchar';
+                $lengthdb='50';
+            } else {
+                $typedb=$type;
+                $lengthdb=$length;
+            }
+            $field_desc = array('type'=>$typedb, 'value'=>$lengthdb, 'null'=>($required?'NOT NULL':'NULL'), 'default'=>$default);
+
+            if ($type != 'separate') // No table update when separate type
+            {
+                $result=$this->db->DDLUpdateField(MAIN_DB_PREFIX.$table, $attrname, $field_desc);
+            }
+            if ($result > 0 || $type == 'separate')
+            {
+                if ($label)
+                {
+                    $result=$this->update_label($attrname,$label,$type,$length,$elementtype,$unique,$required,$pos,$param,$alwayseditable,$perms,$list,$help,$default,$computed,$entity,$langfile,$enabled, $totalizable);
+                }
+                if ($result > 0)
+                {
+                    $sql='';
+                    if ($unique)
+                    {
+                        $sql="ALTER TABLE ".MAIN_DB_PREFIX.$table." ADD UNIQUE INDEX uk_".$table."_".$attrname." (".$attrname.")";
+                    }
+                    else
+                    {
+                        $sql="ALTER TABLE ".MAIN_DB_PREFIX.$table." DROP INDEX uk_".$table."_".$attrname;
+                    }
+                    dol_syslog(get_class($this).'::update', LOG_DEBUG);
+                    $resql=$this->db->query($sql,1,'dml');
+                    return 1;
+                }
+                else
+                {
+                    $this->error=$this->db->lasterror();
+                    return -1;
+                }
+            }
+            else
+            {
+                $this->error=$this->db->lasterror();
+                return -1;
+            }
+        }
+        else
+        {
+            return 0;
+        }
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-	/**
-	 *  Modify description of personalized attribute
-	 *
-	 *  @param	string	$attrname			Name of attribute
-	 *  @param	string	$label				Label of attribute
-	 *  @param  string	$type               Type of attribute
-	 *  @param  int		$size		        Length of attribute
-	 *  @param  string	$elementtype		Element type ('member', 'product', 'thirdparty', ...)
-	 *  @param	int		$unique				Is field unique or not
-	 *  @param	int		$required			Is field required or not
-	 *  @param	int		$pos				Position of attribute
-	 *  @param  array	$param				Params for field  (ex for select list : array('options' => array(value'=>'label of option')) )
-	 *  @param  int		$alwayseditable		Is attribute always editable regardless of the document status
-	 *  @param	string	$perms				Permission to check
-	 *  @param	string	$list				Visiblity
-	 *  @param	string	$help				Help on tooltip.
-	 *  @param  string  $default            Default value (in database. use the default_value feature for default value on screen).
-	 *  @param  string  $computed           Computed value
-	 *  @param  string  $entity     		Entity of extrafields
-	 *  @param	string	$langfile			Language file
-	 *  @param  string  $enabled  			Condition to have the field enabled or not
+    /**
+     *  Modify description of personalized attribute
+     *
+     *  @param	string	$attrname			Name of attribute
+     *  @param	string	$label				Label of attribute
+     *  @param  string	$type               Type of attribute
+     *  @param  int		$size		        Length of attribute
+     *  @param  string	$elementtype		Element type ('member', 'product', 'thirdparty', ...)
+     *  @param	int		$unique				Is field unique or not
+     *  @param	int		$required			Is field required or not
+     *  @param	int		$pos				Position of attribute
+     *  @param  array	$param				Params for field  (ex for select list : array('options' => array(value'=>'label of option')) )
+     *  @param  int		$alwayseditable		Is attribute always editable regardless of the document status
+     *  @param	string	$perms				Permission to check
+     *  @param	string	$list				Visiblity
+     *  @param	string	$help				Help on tooltip.
+     *  @param  string  $default            Default value (in database. use the default_value feature for default value on screen).
+     *  @param  string  $computed           Computed value
+     *  @param  string  $entity     		Entity of extrafields
+     *  @param	string	$langfile			Language file
+     *  @param  string  $enabled  			Condition to have the field enabled or not
      *  @param  int     $totalizable        Is extrafield totalizable on list
      *  @return	int							<=0 if KO, >0 if OK
-	 */
-	private function update_label($attrname,$label,$type,$size,$elementtype,$unique=0,$required=0,$pos=0,$param='',$alwayseditable=0,$perms='',$list='0',$help='',$default='',$computed='',$entity='',$langfile='',$enabled='1', $totalizable=0)
-	{
+     */
+    private function update_label($attrname,$label,$type,$size,$elementtype,$unique=0,$required=0,$pos=0,$param='',$alwayseditable=0,$perms='',$list='0',$help='',$default='',$computed='',$entity='',$langfile='',$enabled='1', $totalizable=0)
+    {
         // phpcs:enable
-		global $conf, $user;
-		dol_syslog(get_class($this)."::update_label ".$attrname.", ".$label.", ".$type.", ".$size.", ".$elementtype.", ".$unique.", ".$required.", ".$pos.", ".$alwayseditable.", ".$perms.", ".$list.", ".$default.", ".$computed.", ".$entity.", ".$langfile.", ".$enabled.", ".$totalizable);
+        global $conf, $user;
+        dol_syslog(get_class($this)."::update_label ".$attrname.", ".$label.", ".$type.", ".$size.", ".$elementtype.", ".$unique.", ".$required.", ".$pos.", ".$alwayseditable.", ".$perms.", ".$list.", ".$default.", ".$computed.", ".$entity.", ".$langfile.", ".$enabled.", ".$totalizable);
 
-		// Clean parameters
-		if ($elementtype == 'thirdparty') $elementtype='societe';
-		if ($elementtype == 'contact') $elementtype='socpeople';
+        // Clean parameters
+        if ($elementtype == 'thirdparty') $elementtype='societe';
+        if ($elementtype == 'contact') $elementtype='socpeople';
 
-		if (empty($pos)) $pos=0;
-		if (empty($list)) $list='0';
+        if (empty($pos)) $pos=0;
+        if (empty($list)) $list='0';
         if (empty($totalizable)) {
             $totalizable = 0;
         }
-		if (empty($required)) $required=0;
-		if (empty($unique)) $unique=0;
-		if (empty($alwayseditable)) $alwayseditable=0;
-
-		if (isset($attrname) && $attrname != '' && preg_match("/^\w[a-zA-Z0-9-_]*$/",$attrname))
-		{
-			$this->db->begin();
-
-			if (is_array($param) && count($param) > 0)
-			{
-				$params = serialize($param);
-			}
-			elseif (strlen($param) > 0)
-			{
-				$params = trim($param);
-			}
-			else
-			{
-				$params='';
-			}
-
-			if ($entity === '' || $entity != '0')
-			{
-				// We dont want on all entities, we delete all and current
-				$sql_del = "DELETE FROM ".MAIN_DB_PREFIX."extrafields";
-				$sql_del.= " WHERE name = '".$attrname."'";
-				$sql_del.= " AND entity IN (0, ".($entity===''?$conf->entity:$entity).")";
-				$sql_del.= " AND elementtype = '".$elementtype."'";
-			}
-			else
-			{
-				// We want on all entities ($entities = '0'), we delete on all only (we keep setup specific to each entity)
-				$sql_del = "DELETE FROM ".MAIN_DB_PREFIX."extrafields";
-				$sql_del.= " WHERE name = '".$attrname."'";
-				$sql_del.= " AND entity = 0";
-				$sql_del.= " AND elementtype = '".$elementtype."'";
-			}
-			$resql1=$this->db->query($sql_del);
-
-			$sql = "INSERT INTO ".MAIN_DB_PREFIX."extrafields(";
-			$sql.= " name,";		// This is code
-			$sql.= " entity,";
-			$sql.= " label,";
-			$sql.= " type,";
-			$sql.= " size,";
-			$sql.= " elementtype,";
-			$sql.= " fieldunique,";
-			$sql.= " fieldrequired,";
-			$sql.= " perms,";
-			$sql.= " langs,";
-			$sql.= " pos,";
-			$sql.= " alwayseditable,";
-			$sql.= " param,";
-			$sql.= " list,";
+        if (empty($required)) $required=0;
+        if (empty($unique)) $unique=0;
+        if (empty($alwayseditable)) $alwayseditable=0;
+
+        if (isset($attrname) && $attrname != '' && preg_match("/^\w[a-zA-Z0-9-_]*$/",$attrname))
+        {
+            $this->db->begin();
+
+            if (is_array($param) && count($param) > 0)
+            {
+                $params = serialize($param);
+            }
+            elseif (strlen($param) > 0)
+            {
+                $params = trim($param);
+            }
+            else
+            {
+                $params='';
+            }
+
+            if ($entity === '' || $entity != '0')
+            {
+                // We dont want on all entities, we delete all and current
+                $sql_del = "DELETE FROM ".MAIN_DB_PREFIX."extrafields";
+                $sql_del.= " WHERE name = '".$attrname."'";
+                $sql_del.= " AND entity IN (0, ".($entity===''?$conf->entity:$entity).")";
+                $sql_del.= " AND elementtype = '".$elementtype."'";
+            }
+            else
+            {
+                // We want on all entities ($entities = '0'), we delete on all only (we keep setup specific to each entity)
+                $sql_del = "DELETE FROM ".MAIN_DB_PREFIX."extrafields";
+                $sql_del.= " WHERE name = '".$attrname."'";
+                $sql_del.= " AND entity = 0";
+                $sql_del.= " AND elementtype = '".$elementtype."'";
+            }
+            $resql1=$this->db->query($sql_del);
+
+            $sql = "INSERT INTO ".MAIN_DB_PREFIX."extrafields(";
+            $sql.= " name,";		// This is code
+            $sql.= " entity,";
+            $sql.= " label,";
+            $sql.= " type,";
+            $sql.= " size,";
+            $sql.= " elementtype,";
+            $sql.= " fieldunique,";
+            $sql.= " fieldrequired,";
+            $sql.= " perms,";
+            $sql.= " langs,";
+            $sql.= " pos,";
+            $sql.= " alwayseditable,";
+            $sql.= " param,";
+            $sql.= " list,";
             $sql.= " totalizable,";
-			$sql.= " fielddefault,";
-			$sql.= " fieldcomputed,";
-			$sql.= " fk_user_author,";
-			$sql.= " fk_user_modif,";
-			$sql.= " datec,";
-			$sql.= " enabled,";
-			$sql.= " help";
-			$sql.= ") VALUES (";
-			$sql.= "'".$attrname."',";
-			$sql.= " ".($entity===''?$conf->entity:$entity).",";
-			$sql.= " '".$this->db->escape($label)."',";
-			$sql.= " '".$this->db->escape($type)."',";
-			$sql.= " '".$this->db->escape($size)."',";
-			$sql.= " '".$this->db->escape($elementtype)."',";
-			$sql.= " ".$unique.",";
-			$sql.= " ".$required.",";
-			$sql.= " ".($perms?"'".$this->db->escape($perms)."'":"null").",";
-			$sql.= " ".($langfile?"'".$this->db->escape($langfile)."'":"null").",";
-			$sql.= " ".$pos.",";
-			$sql.= " '".$this->db->escape($alwayseditable)."',";
-			$sql.= " '".$this->db->escape($params)."',";
-			$sql.= " '".$this->db->escape($list)."', ";
+            $sql.= " fielddefault,";
+            $sql.= " fieldcomputed,";
+            $sql.= " fk_user_author,";
+            $sql.= " fk_user_modif,";
+            $sql.= " datec,";
+            $sql.= " enabled,";
+            $sql.= " help";
+            $sql.= ") VALUES (";
+            $sql.= "'".$attrname."',";
+            $sql.= " ".($entity===''?$conf->entity:$entity).",";
+            $sql.= " '".$this->db->escape($label)."',";
+            $sql.= " '".$this->db->escape($type)."',";
+            $sql.= " '".$this->db->escape($size)."',";
+            $sql.= " '".$this->db->escape($elementtype)."',";
+            $sql.= " ".$unique.",";
+            $sql.= " ".$required.",";
+            $sql.= " ".($perms?"'".$this->db->escape($perms)."'":"null").",";
+            $sql.= " ".($langfile?"'".$this->db->escape($langfile)."'":"null").",";
+            $sql.= " ".$pos.",";
+            $sql.= " '".$this->db->escape($alwayseditable)."',";
+            $sql.= " '".$this->db->escape($params)."',";
+            $sql.= " '".$this->db->escape($list)."', ";
             $sql.= " ".$totalizable.",";
-			$sql.= " ".(($default!='')?"'".$this->db->escape($default)."'":"null").",";
-			$sql.= " ".($computed?"'".$this->db->escape($computed)."'":"null").",";
-			$sql .= " " . $user->id . ",";
-			$sql .= " " . $user->id . ",";
-			$sql .= "'" . $this->db->idate(dol_now()) . "',";
-			$sql .= "'" . $this->db->escape($enabled). "',";
-			$sql.= " ".($help?"'".$this->db->escape($help)."'":"null");
-			$sql.= ")";
-
-			$resql2=$this->db->query($sql);
-
-			if ($resql1 && $resql2)
-			{
-				$this->db->commit();
-				return 1;
-			}
-			else
-			{
-				$this->db->rollback();
-				print dol_print_error($this->db);
-				return -1;
-			}
-		}
-		else
-		{
-			return 0;
-		}
-	}
+            $sql.= " ".(($default!='')?"'".$this->db->escape($default)."'":"null").",";
+            $sql.= " ".($computed?"'".$this->db->escape($computed)."'":"null").",";
+            $sql .= " " . $user->id . ",";
+            $sql .= " " . $user->id . ",";
+            $sql .= "'" . $this->db->idate(dol_now()) . "',";
+            $sql .= "'" . $this->db->escape($enabled). "',";
+            $sql.= " ".($help?"'".$this->db->escape($help)."'":"null");
+            $sql.= ")";
+
+            $resql2=$this->db->query($sql);
+
+            if ($resql1 && $resql2)
+            {
+                $this->db->commit();
+                return 1;
+            }
+            else
+            {
+                $this->db->rollback();
+                print dol_print_error($this->db);
+                return -1;
+            }
+        }
+        else
+        {
+            return 0;
+        }
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * 	Load array this->attributes, or old this->attribute_xxx like attribute_label, attribute_type, ...
-	 *
-	 * 	@param	string		$elementtype		Type of element ('adherent', 'commande', 'thirdparty', 'facture', 'propal', 'product', ...).
-	 * 	@param	boolean		$forceload			Force load of extra fields whatever is option MAIN_EXTRAFIELDS_DISABLED. Deprecated. Should not be required.
-	 * 	@return	array							Array of attributes keys+label for all extra fields.
-	 */
-	function fetch_name_optionals_label($elementtype,$forceload=false)
-	{
+    /**
+     * 	Load array this->attributes, or old this->attribute_xxx like attribute_label, attribute_type, ...
+     *
+     * 	@param	string		$elementtype		Type of element ('adherent', 'commande', 'thirdparty', 'facture', 'propal', 'product', ...).
+     * 	@param	boolean		$forceload			Force load of extra fields whatever is option MAIN_EXTRAFIELDS_DISABLED. Deprecated. Should not be required.
+     * 	@return	array							Array of attributes keys+label for all extra fields.
+     */
+    function fetch_name_optionals_label($elementtype,$forceload=false)
+    {
         // phpcs:enable
-		global $conf;
-
-		if (empty($elementtype)) return array();
-
-		if ($elementtype == 'thirdparty') $elementtype='societe';
-		if ($elementtype == 'contact') $elementtype='socpeople';
-		if ($elementtype == 'order_supplier') $elementtype='commande_fournisseur';
-
-		$array_name_label=array();
-
-		// To avoid conflicts with external modules. TODO Remove this.
-		if (!$forceload && !empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) return $array_name_label;
-
-		// Set array of label of entity
-		// TODO Remove completely loading of label. This should be done by presentation.
-		$labelmulticompany=array();
-		if (!empty($conf->multicompany->enabled))
-		{
-			$sql_entity_name='SELECT rowid, label FROM '.MAIN_DB_PREFIX.'entity WHERE rowid in (0,'.$conf->entity.')';
-			$resql_entity_name=$this->db->query($sql_entity_name);
-			if ($resql_entity_name)
-			{
-				while ($obj = $this->db->fetch_object($resql_entity_name))
-				{
-					$labelmulticompany[$obj->rowid]=$obj->label;
-				}
-			}
-		}
-
-		// We should not have several time this log. If we have, there is some optimization to do by calling a simple $object->fetch_optionals() that include cache management.
-		dol_syslog("fetch_name_optionals_label elementtype=".$elementtype);
-
-		$sql = "SELECT rowid,name,label,type,size,elementtype,fieldunique,fieldrequired,param,pos,alwayseditable,perms,langs,list,totalizable,fielddefault,fieldcomputed,entity,enabled,help";
-		$sql.= " FROM ".MAIN_DB_PREFIX."extrafields";
-		$sql.= " WHERE entity IN (0,".$conf->entity.")";
-		if ($elementtype) $sql.= " AND elementtype = '".$elementtype."'";	// Filed with object->table_element
-		$sql.= " ORDER BY pos";
-
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			if ($this->db->num_rows($resql))
-			{
-				while ($tab = $this->db->fetch_object($resql))
-				{
-					// We can add this attribute to object. TODO Remove this and return $this->attributes[$elementtype]['label']
-					if ($tab->type != 'separate')
-					{
-						$array_name_label[$tab->name]=$tab->label;
-					}
-
-					// Old usage
-					$this->attribute_type[$tab->name]=$tab->type;
-					$this->attribute_label[$tab->name]=$tab->label;
-					$this->attribute_size[$tab->name]=$tab->size;
-					$this->attribute_elementtype[$tab->name]=$tab->elementtype;
-					$this->attribute_default[$tab->name]=$tab->fielddefault;
-					$this->attribute_computed[$tab->name]=$tab->fieldcomputed;
-					$this->attribute_unique[$tab->name]=$tab->fieldunique;
-					$this->attribute_required[$tab->name]=$tab->fieldrequired;
-					$this->attribute_param[$tab->name]=($tab->param ? unserialize($tab->param) : '');
-					$this->attribute_pos[$tab->name]=$tab->pos;
-					$this->attribute_alwayseditable[$tab->name]=$tab->alwayseditable;
-					$this->attribute_perms[$tab->name]=(strlen($tab->perms) == 0 ? 1 : $tab->perms);
-					$this->attribute_langfile[$tab->name]=$tab->langs;
-					$this->attribute_list[$tab->name]=$tab->list;
-					$this->attribute_totalizable[$tab->name]=$tab->totalizable;
-					$this->attribute_entityid[$tab->name]=$tab->entity;
-					$this->attribute_entitylabel[$tab->name]=(empty($labelmulticompany[$tab->entity])?'Entity'.$tab->entity:$labelmulticompany[$tab->entity]);
-
-					// New usage
-					$this->attributes[$tab->elementtype]['type'][$tab->name]=$tab->type;
-					$this->attributes[$tab->elementtype]['label'][$tab->name]=$tab->label;
-					$this->attributes[$tab->elementtype]['size'][$tab->name]=$tab->size;
-					$this->attributes[$tab->elementtype]['elementtype'][$tab->name]=$tab->elementtype;
-					$this->attributes[$tab->elementtype]['default'][$tab->name]=$tab->fielddefault;
-					$this->attributes[$tab->elementtype]['computed'][$tab->name]=$tab->fieldcomputed;
-					$this->attributes[$tab->elementtype]['unique'][$tab->name]=$tab->fieldunique;
-					$this->attributes[$tab->elementtype]['required'][$tab->name]=$tab->fieldrequired;
-					$this->attributes[$tab->elementtype]['param'][$tab->name]=($tab->param ? unserialize($tab->param) : '');
-					$this->attributes[$tab->elementtype]['pos'][$tab->name]=$tab->pos;
-					$this->attributes[$tab->elementtype]['alwayseditable'][$tab->name]=$tab->alwayseditable;
-					$this->attributes[$tab->elementtype]['perms'][$tab->name]=(strlen($tab->perms) == 0 ? 1 : $tab->perms);
-					$this->attributes[$tab->elementtype]['langfile'][$tab->name]=$tab->langs;
-					$this->attributes[$tab->elementtype]['list'][$tab->name]=$tab->list;
+        global $conf;
+
+        if (empty($elementtype)) return array();
+
+        if ($elementtype == 'thirdparty') $elementtype='societe';
+        if ($elementtype == 'contact') $elementtype='socpeople';
+        if ($elementtype == 'order_supplier') $elementtype='commande_fournisseur';
+
+        $array_name_label=array();
+
+        // To avoid conflicts with external modules. TODO Remove this.
+        if (!$forceload && !empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) return $array_name_label;
+
+        // Set array of label of entity
+        // TODO Remove completely loading of label. This should be done by presentation.
+        $labelmulticompany=array();
+        if (!empty($conf->multicompany->enabled))
+        {
+            $sql_entity_name='SELECT rowid, label FROM '.MAIN_DB_PREFIX.'entity WHERE rowid in (0,'.$conf->entity.')';
+            $resql_entity_name=$this->db->query($sql_entity_name);
+            if ($resql_entity_name)
+            {
+                while ($obj = $this->db->fetch_object($resql_entity_name))
+                {
+                    $labelmulticompany[$obj->rowid]=$obj->label;
+                }
+            }
+        }
+
+        // We should not have several time this log. If we have, there is some optimization to do by calling a simple $object->fetch_optionals() that include cache management.
+        dol_syslog("fetch_name_optionals_label elementtype=".$elementtype);
+
+        $sql = "SELECT rowid,name,label,type,size,elementtype,fieldunique,fieldrequired,param,pos,alwayseditable,perms,langs,list,totalizable,fielddefault,fieldcomputed,entity,enabled,help";
+        $sql.= " FROM ".MAIN_DB_PREFIX."extrafields";
+        $sql.= " WHERE entity IN (0,".$conf->entity.")";
+        if ($elementtype) $sql.= " AND elementtype = '".$elementtype."'";	// Filed with object->table_element
+        $sql.= " ORDER BY pos";
+
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            if ($this->db->num_rows($resql))
+            {
+                while ($tab = $this->db->fetch_object($resql))
+                {
+                    // We can add this attribute to object. TODO Remove this and return $this->attributes[$elementtype]['label']
+                    if ($tab->type != 'separate')
+                    {
+                        $array_name_label[$tab->name]=$tab->label;
+                    }
+
+                    // Old usage
+                    $this->attribute_type[$tab->name]=$tab->type;
+                    $this->attribute_label[$tab->name]=$tab->label;
+                    $this->attribute_size[$tab->name]=$tab->size;
+                    $this->attribute_elementtype[$tab->name]=$tab->elementtype;
+                    $this->attribute_default[$tab->name]=$tab->fielddefault;
+                    $this->attribute_computed[$tab->name]=$tab->fieldcomputed;
+                    $this->attribute_unique[$tab->name]=$tab->fieldunique;
+                    $this->attribute_required[$tab->name]=$tab->fieldrequired;
+                    $this->attribute_param[$tab->name]=($tab->param ? unserialize($tab->param) : '');
+                    $this->attribute_pos[$tab->name]=$tab->pos;
+                    $this->attribute_alwayseditable[$tab->name]=$tab->alwayseditable;
+                    $this->attribute_perms[$tab->name]=(strlen($tab->perms) == 0 ? 1 : $tab->perms);
+                    $this->attribute_langfile[$tab->name]=$tab->langs;
+                    $this->attribute_list[$tab->name]=$tab->list;
+                    $this->attribute_totalizable[$tab->name]=$tab->totalizable;
+                    $this->attribute_entityid[$tab->name]=$tab->entity;
+                    $this->attribute_entitylabel[$tab->name]=(empty($labelmulticompany[$tab->entity])?'Entity'.$tab->entity:$labelmulticompany[$tab->entity]);
+
+                    // New usage
+                    $this->attributes[$tab->elementtype]['type'][$tab->name]=$tab->type;
+                    $this->attributes[$tab->elementtype]['label'][$tab->name]=$tab->label;
+                    $this->attributes[$tab->elementtype]['size'][$tab->name]=$tab->size;
+                    $this->attributes[$tab->elementtype]['elementtype'][$tab->name]=$tab->elementtype;
+                    $this->attributes[$tab->elementtype]['default'][$tab->name]=$tab->fielddefault;
+                    $this->attributes[$tab->elementtype]['computed'][$tab->name]=$tab->fieldcomputed;
+                    $this->attributes[$tab->elementtype]['unique'][$tab->name]=$tab->fieldunique;
+                    $this->attributes[$tab->elementtype]['required'][$tab->name]=$tab->fieldrequired;
+                    $this->attributes[$tab->elementtype]['param'][$tab->name]=($tab->param ? unserialize($tab->param) : '');
+                    $this->attributes[$tab->elementtype]['pos'][$tab->name]=$tab->pos;
+                    $this->attributes[$tab->elementtype]['alwayseditable'][$tab->name]=$tab->alwayseditable;
+                    $this->attributes[$tab->elementtype]['perms'][$tab->name]=(strlen($tab->perms) == 0 ? 1 : $tab->perms);
+                    $this->attributes[$tab->elementtype]['langfile'][$tab->name]=$tab->langs;
+                    $this->attributes[$tab->elementtype]['list'][$tab->name]=$tab->list;
                     $this->attributes[$tab->elementtype]['totalizable'][$tab->name]=$tab->totalizable;
-					$this->attributes[$tab->elementtype]['entityid'][$tab->name]=$tab->entity;
-					$this->attributes[$tab->elementtype]['entitylabel'][$tab->name]=(empty($labelmulticompany[$tab->entity])?'Entity'.$tab->entity:$labelmulticompany[$tab->entity]);
-					$this->attributes[$tab->elementtype]['enabled'][$tab->name]=$tab->enabled;
-					$this->attributes[$tab->elementtype]['help'][$tab->name]=$tab->help;
-
-					$this->attributes[$tab->elementtype]['loaded']=1;
-				}
-			}
-			if ($elementtype) $this->attributes[$elementtype]['loaded']=1;	// If nothing found, we also save tag 'loaded'
-		}
-		else
-		{
-			$this->error=$this->db->lasterror();
-			dol_syslog(get_class($this)."::fetch_name_optionals_label ".$this->error, LOG_ERR);
-		}
-
-		return $array_name_label;
-	}
-
-
-	/**
-	 * Return HTML string to put an input field into a page
-	 * Code very similar with showInputField of common object
-	 *
-	 * @param  string  $key            			Key of attribute
-	 * @param  string  $value          			Preselected value to show (for date type it must be in timestamp format, for amount or price it must be a php numeric value)
-	 * @param  string  $moreparam      			To add more parametes on html input tag
-	 * @param  string  $keysuffix      			Prefix string to add after name and id of field (can be used to avoid duplicate names)
-	 * @param  string  $keyprefix      			Suffix string to add before name and id of field (can be used to avoid duplicate names)
-	 * @param  string  $morecss        			More css (to defined size of field. Old behaviour: may also be a numeric)
-	 * @param  int     $objectid       			Current object id
-	 * @param  string  $extrafieldsobjectkey	If defined (for example $object->table_element), use the new method to get extrafields data
-	 * @return string
-	 */
-	function showInputField($key, $value, $moreparam='', $keysuffix='', $keyprefix='', $morecss='', $objectid=0, $extrafieldsobjectkey='')
-	{
-		global $conf,$langs,$form;
-
-		if (! is_object($form))
-		{
-			require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
-			$form=new Form($this->db);
-		}
-
-		$out='';
-
-		$keyprefix = $keyprefix.'options_';		// Because we work on extrafields
-
-		if (! empty($extrafieldsobjectkey))
-		{
-			$label=$this->attributes[$extrafieldsobjectkey]['label'][$key];
-			$type=$this->attributes[$extrafieldsobjectkey]['type'][$key];
-			$size=$this->attributes[$extrafieldsobjectkey]['size'][$key];
-			$default=$this->attributes[$extrafieldsobjectkey]['default'][$key];
-			$computed=$this->attributes[$extrafieldsobjectkey]['computed'][$key];
-			$unique=$this->attributes[$extrafieldsobjectkey]['unique'][$key];
-			$required=$this->attributes[$extrafieldsobjectkey]['required'][$key];
-			$param=$this->attributes[$extrafieldsobjectkey]['param'][$key];
-			$perms=dol_eval($this->attributes[$extrafieldsobjectkey]['perms'][$key], 1);
-			$langfile=$this->attributes[$extrafieldsobjectkey]['langfile'][$key];
-			$list=dol_eval($this->attributes[$extrafieldsobjectkey]['list'][$key], 1);
-			$totalizable=$this->attributes[$extrafieldsobjectkey]['totalizable'][$key];
-			$help=$this->attributes[$extrafieldsobjectkey]['help'][$key];
-			$hidden=(empty($list) ? 1 : 0);		// If empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
-		}
-		else	// Old usage
-		{
-			$label=$this->attribute_label[$key];
-			$type =$this->attribute_type[$key];
-			$size =$this->attribute_size[$key];
-			$elementtype=$this->attribute_elementtype[$key];	// Seems not used
-			$default=$this->attribute_default[$key];
-			$computed=$this->attribute_computed[$key];
-			$unique=$this->attribute_unique[$key];
-			$required=$this->attribute_required[$key];
-			$param=$this->attribute_param[$key];
-			$langfile=$this->attribute_langfile[$key];
-			$list=$this->attribute_list[$key];
-			$totalizable=$this->attribute_totalizable[$key];
-			$hidden=(empty($list) ? 1 : 0);		// If empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
-		}
-
-		if ($computed)
-		{
-			if (! preg_match('/^search_/', $keyprefix)) return '<span class="opacitymedium">'.$langs->trans("AutomaticallyCalculated").'</span>';
-			else return '';
-		}
-
-		if (empty($morecss))
-		{
-			if ($type == 'date')
-			{
-				$morecss = 'minwidth100imp';
-			}
-			elseif ($type == 'datetime')
-			{
-				$morecss = 'minwidth200imp';
-			}
-			elseif (in_array($type,array('int','integer','double','price')))
-			{
-				$morecss = 'maxwidth75';
-			}
-			elseif ($type == 'password')
-			{
-				$morecss='maxwidth100';
-			}
-			elseif ($type == 'url')
-			{
-				$morecss='minwidth400';
-			}
-			elseif ($type == 'boolean')
-			{
-				$morecss='';
-			}
-			else
-			{
-				if (round($size) < 12)
-				{
-					$morecss = 'minwidth100';
-				}
-				else if (round($size) <= 48)
-				{
-					$morecss = 'minwidth200';
-				}
-				else
-				{
-					$morecss = 'minwidth400';
-				}
-			}
-		}
-
-		if (in_array($type,array('date','datetime')))
-		{
-			$tmp=explode(',',$size);
-			$newsize=$tmp[0];
-
-			$showtime = in_array($type,array('datetime')) ? 1 : 0;
-
-			// Do not show current date when field not required (see selectDate() method)
-			if (!$required && $value == '') $value = '-1';
-
-			// TODO Must also support $moreparam
-			$out = $form->selectDate($value, $keyprefix.$key.$keysuffix, $showtime, $showtime, $required, '', 1, (($keyprefix != 'search_' && $keyprefix != 'search_options_') ? 1 : 0), 0, 1);
-		}
-		elseif (in_array($type,array('int','integer')))
-		{
-			$tmp=explode(',',$size);
-			$newsize=$tmp[0];
-			$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$newsize.'" value="'.dol_escape_htmltag($value).'"'.($moreparam?$moreparam:'').'>';
-		}
-		elseif (preg_match('/varchar/', $type))
-		{
-			$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$size.'" value="'.dol_escape_htmltag($value).'"'.($moreparam?$moreparam:'').'>';
-		}
-		elseif (in_array($type, array('mail', 'phone', 'url')))
-		{
-			$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam?$moreparam:'').'>';
-		}
-		elseif ($type == 'text')
-		{
-			if (! preg_match('/search_/', $keyprefix))		// If keyprefix is search_ or search_options_, we must just use a simple text field
-			{
-				require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-				$doleditor=new DolEditor($keyprefix.$key.$keysuffix,$value,'',200,'dolibarr_notes','In',false,false,false,ROWS_5,'90%');
-				$out=$doleditor->Create(1);
-			}
-			else
-			{
-				$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam?$moreparam:'').'>';
-			}
-		}
-		elseif ($type == 'html')
-		{
-			if (! preg_match('/search_/', $keyprefix))		// If keyprefix is search_ or search_options_, we must just use a simple text field
-			{
-				require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-				$doleditor=new DolEditor($keyprefix.$key.$keysuffix,$value,'',200,'dolibarr_notes','In',false,false,! empty($conf->fckeditor->enabled) && $conf->global->FCKEDITOR_ENABLE_SOCIETE,ROWS_5,'90%');
-				$out=$doleditor->Create(1);
-			}
-			else
-			{
-				$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam?$moreparam:'').'>';
-			}
-		}
-		elseif ($type == 'boolean')
-		{
-			$checked='';
-			if (!empty($value)) {
-				$checked=' checked value="1" ';
-			} else {
-				$checked=' value="1" ';
-			}
-			$out='<input type="checkbox" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.$checked.' '.($moreparam?$moreparam:'').'>';
-		}
-		elseif ($type == 'price')
-		{
-			if (!empty($value)) {		// $value in memory is a php numeric, we format it into user number format.
-				$value=price($value);
-			}
-			$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam?$moreparam:'').'> '.$langs->getCurrencySymbol($conf->currency);
-		}
-		elseif ($type == 'double')
-		{
-			if (!empty($value)) {		// $value in memory is a php numeric, we format it into user number format.
-				$value=price($value);
-			}
-			$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam?$moreparam:'').'> ';
-		}
-		elseif ($type == 'select')
-		{
-			$out = '';
-			if (! empty($conf->use_javascript_ajax) && ! empty($conf->global->MAIN_EXTRAFIELDS_USE_SELECT2))
-			{
-				include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
-				$out.= ajax_combobox($keyprefix.$key.$keysuffix, array(), 0);
-			}
-
-			$out.='<select class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam?$moreparam:'').'>';
-			$out.='<option value="0">&nbsp;</option>';
-			foreach ($param['options'] as $key => $val)
-			{
-				if ((string) $key == '') continue;
-				list($val, $parent) = explode('|', $val);
-				$out.='<option value="'.$key.'"';
-				$out.= (((string) $value == (string) $key)?' selected':'');
-				$out.= (!empty($parent)?' parent="'.$parent.'"':'');
-				$out.='>';
-				if ($langfile && $val) $out.=$langs->trans($val);
-				else $out.=$val;
-				$out.='</option>';
-			}
-			$out.='</select>';
-		}
-		elseif ($type == 'sellist')
-		{
-			$out = '';
-			if (! empty($conf->use_javascript_ajax) && ! empty($conf->global->MAIN_EXTRAFIELDS_USE_SELECT2))
-			{
-				include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
-				$out.= ajax_combobox($keyprefix.$key.$keysuffix, array(), 0);
-			}
-
-			$out.='<select class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam?$moreparam:'').'>';
-			if (is_array($param['options']))
-			{
-				$param_list=array_keys($param['options']);
-				$InfoFieldList = explode(":", $param_list[0]);
-				$parentName='';
-				$parentField='';
-				// 0 : tableName
-				// 1 : label field name
-				// 2 : key fields name (if differ of rowid)
-				// 3 : key field parent (for dependent lists)
-				// 4 : where clause filter on column or table extrafield, syntax field='value' or extra.field=value
-				$keyList=(empty($InfoFieldList[2])?'rowid':$InfoFieldList[2].' as rowid');
-
-
-				if (count($InfoFieldList) > 4 && ! empty($InfoFieldList[4]))
-				{
-					if (strpos($InfoFieldList[4], 'extra.') !== false)
-					{
-						$keyList='main.'.$InfoFieldList[2].' as rowid';
-					} else {
-						$keyList=$InfoFieldList[2].' as rowid';
-					}
-				}
-				if (count($InfoFieldList) > 3 && ! empty($InfoFieldList[3]))
-				{
-					list($parentName, $parentField) = explode('|', $InfoFieldList[3]);
-					$keyList.= ', '.$parentField;
-				}
-
-				$fields_label = explode('|',$InfoFieldList[1]);
-				if (is_array($fields_label))
-				{
-					$keyList .=', ';
-					$keyList .= implode(', ', $fields_label);
-				}
-
-				$sqlwhere='';
-				$sql = 'SELECT '.$keyList;
-				$sql.= ' FROM '.MAIN_DB_PREFIX .$InfoFieldList[0];
-				if (!empty($InfoFieldList[4]))
-				{
-				    // can use curent entity filter
-				    if (strpos($InfoFieldList[4], '$ENTITY$')!==false) {
-				        $InfoFieldList[4]=str_replace('$ENTITY$',$conf->entity,$InfoFieldList[4]);
-				    }
-					// can use SELECT request
-					if (strpos($InfoFieldList[4], '$SEL$')!==false) {
-						$InfoFieldList[4]=str_replace('$SEL$','SELECT',$InfoFieldList[4]);
-					}
-
-					// current object id can be use into filter
-					if (strpos($InfoFieldList[4], '$ID$')!==false && !empty($objectid)) {
-						$InfoFieldList[4]=str_replace('$ID$',$objectid,$InfoFieldList[4]);
-					} else {
-						$InfoFieldList[4]=str_replace('$ID$','0',$InfoFieldList[4]);
-					}
-					//We have to join on extrafield table
-					if (strpos($InfoFieldList[4], 'extra')!==false)
-					{
-						$sql.= ' as main, '.MAIN_DB_PREFIX .$InfoFieldList[0].'_extrafields as extra';
-						$sqlwhere.= ' WHERE extra.fk_object=main.'.$InfoFieldList[2]. ' AND '.$InfoFieldList[4];
-					}
-					else
-					{
-						$sqlwhere.= ' WHERE '.$InfoFieldList[4];
-					}
-				}
-				else
-				{
-					$sqlwhere.= ' WHERE 1=1';
-				}
-				// Some tables may have field, some other not. For the moment we disable it.
-				if (in_array($InfoFieldList[0],array('tablewithentity')))
-				{
-					$sqlwhere.= ' AND entity = '.$conf->entity;
-				}
-				$sql.=$sqlwhere;
-				//print $sql;
-
-				$sql .= ' ORDER BY ' . implode(', ', $fields_label);
-
-				dol_syslog(get_class($this).'::showInputField type=sellist', LOG_DEBUG);
-				$resql = $this->db->query($sql);
-				if ($resql)
-				{
-					$out.='<option value="0">&nbsp;</option>';
-					$num = $this->db->num_rows($resql);
-					$i = 0;
-					while ($i < $num)
-					{
-						$labeltoshow='';
-						$obj = $this->db->fetch_object($resql);
-
-						// Several field into label (eq table:code|libelle:rowid)
-						$notrans = false;
-						$fields_label = explode('|',$InfoFieldList[1]);
-						if (is_array($fields_label))
-						{
-							$notrans = true;
-							foreach ($fields_label as $field_toshow)
-							{
-								$labeltoshow.= $obj->$field_toshow.' ';
-							}
-						}
-						else
-						{
-							$labeltoshow=$obj->{$InfoFieldList[1]};
-						}
-						$labeltoshow=dol_trunc($labeltoshow,45);
-
-						if ($value == $obj->rowid)
-						{
-							foreach ($fields_label as $field_toshow)
-							{
-								$translabel=$langs->trans($obj->$field_toshow);
-								if ($translabel!=$obj->$field_toshow) {
-									$labeltoshow=dol_trunc($translabel,18).' ';
-								}else {
-									$labeltoshow=dol_trunc($obj->$field_toshow,18).' ';
-								}
-							}
-							$out.='<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
-						}
-						else
-						{
-							if (! $notrans)
-							{
-								$translabel=$langs->trans($obj->{$InfoFieldList[1]});
-								if ($translabel!=$obj->{$InfoFieldList[1]}) {
-									$labeltoshow=dol_trunc($translabel,18);
-								}
-								else {
-									$labeltoshow=dol_trunc($obj->{$InfoFieldList[1]},18);
-								}
-							}
-							if (empty($labeltoshow)) $labeltoshow='(not defined)';
-							if ($value==$obj->rowid)
-							{
-								$out.='<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
-							}
-
-							if (!empty($InfoFieldList[3]) && $parentField)
-							{
-								$parent = $parentName.':'.$obj->{$parentField};
-							}
-
-							$out.='<option value="'.$obj->rowid.'"';
-							$out.= ($value==$obj->rowid?' selected':'');
-							$out.= (!empty($parent)?' parent="'.$parent.'"':'');
-							$out.='>'.$labeltoshow.'</option>';
-						}
-
-						$i++;
-					}
-					$this->db->free($resql);
-				}
-				else {
-					print 'Error in request '.$sql.' '.$this->db->lasterror().'. Check setup of extra parameters.<br>';
-				}
-			}
-			$out.='</select>';
-		}
-		elseif ($type == 'checkbox')
-		{
-			$value_arr=explode(',',$value);
-			$out=$form->multiselectarray($keyprefix.$key.$keysuffix, (empty($param['options'])?null:$param['options']), $value_arr, '', 0, '', 0, '100%');
-		}
-		elseif ($type == 'radio')
-		{
-			$out='';
-			foreach ($param['options'] as $keyopt => $val)
-			{
-				$out.='<input class="flat '.$morecss.'" type="radio" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam?$moreparam:'');
-				$out.=' value="'.$keyopt.'"';
-				$out.=' id="'.$keyprefix.$key.$keysuffix.'_'.$keyopt.'"';
-				$out.= ($value==$keyopt?'checked':'');
-				$out.='/><label for="'.$keyprefix.$key.$keysuffix.'_'.$keyopt.'">'.$val.'</label><br>';
-			}
-		}
-		elseif ($type == 'chkbxlst')
-		{
-			if (is_array($value)) {
-				$value_arr = $value;
-			}
-			else {
-				$value_arr = explode(',', $value);
-			}
-
-			if (is_array($param['options'])) {
-				$param_list = array_keys($param['options']);
-				$InfoFieldList = explode(":", $param_list[0]);
-				$parentName='';
-				$parentField='';
-				// 0 : tableName
-				// 1 : label field name
-				// 2 : key fields name (if differ of rowid)
-				// 3 : key field parent (for dependent lists)
-				// 4 : where clause filter on column or table extrafield, syntax field='value' or extra.field=value
-				$keyList = (empty($InfoFieldList[2]) ? 'rowid' : $InfoFieldList[2] . ' as rowid');
-
-				if (count($InfoFieldList) > 3 && ! empty($InfoFieldList[3])) {
-					list ( $parentName, $parentField ) = explode('|', $InfoFieldList[3]);
-					$keyList .= ', ' . $parentField;
-				}
-				if (count($InfoFieldList) > 4 && ! empty($InfoFieldList[4])) {
-					if (strpos($InfoFieldList[4], 'extra.') !== false) {
-						$keyList = 'main.' . $InfoFieldList[2] . ' as rowid';
-					} else {
-						$keyList = $InfoFieldList[2] . ' as rowid';
-					}
-				}
-
-				$fields_label = explode('|', $InfoFieldList[1]);
-				if (is_array($fields_label)) {
-					$keyList .= ', ';
-					$keyList .= implode(', ', $fields_label);
-				}
-
-				$sqlwhere = '';
-				$sql = 'SELECT ' . $keyList;
-				$sql .= ' FROM ' . MAIN_DB_PREFIX . $InfoFieldList[0];
-				if (! empty($InfoFieldList[4])) {
-
-					// can use SELECT request
-					if (strpos($InfoFieldList[4], '$SEL$')!==false) {
-						$InfoFieldList[4]=str_replace('$SEL$','SELECT',$InfoFieldList[4]);
-					}
-
-					// current object id can be use into filter
-					if (strpos($InfoFieldList[4], '$ID$')!==false && !empty($objectid)) {
-						$InfoFieldList[4]=str_replace('$ID$',$objectid,$InfoFieldList[4]);
-					} else if (preg_match("#^.*list.php$#",$_SERVER["DOCUMENT_URI"])) {
-						// Pattern for word=$ID$
-						$word = '\b[a-zA-Z0-9-\.-_]+\b=\$ID\$';
+                    $this->attributes[$tab->elementtype]['entityid'][$tab->name]=$tab->entity;
+                    $this->attributes[$tab->elementtype]['entitylabel'][$tab->name]=(empty($labelmulticompany[$tab->entity])?'Entity'.$tab->entity:$labelmulticompany[$tab->entity]);
+                    $this->attributes[$tab->elementtype]['enabled'][$tab->name]=$tab->enabled;
+                    $this->attributes[$tab->elementtype]['help'][$tab->name]=$tab->help;
+
+                    $this->attributes[$tab->elementtype]['loaded']=1;
+                }
+            }
+            if ($elementtype) $this->attributes[$elementtype]['loaded']=1;	// If nothing found, we also save tag 'loaded'
+        }
+        else
+        {
+            $this->error=$this->db->lasterror();
+            dol_syslog(get_class($this)."::fetch_name_optionals_label ".$this->error, LOG_ERR);
+        }
+
+        return $array_name_label;
+    }
+
+
+    /**
+     * Return HTML string to put an input field into a page
+     * Code very similar with showInputField of common object
+     *
+     * @param  string  $key            			Key of attribute
+     * @param  string  $value          			Preselected value to show (for date type it must be in timestamp format, for amount or price it must be a php numeric value)
+     * @param  string  $moreparam      			To add more parametes on html input tag
+     * @param  string  $keysuffix      			Prefix string to add after name and id of field (can be used to avoid duplicate names)
+     * @param  string  $keyprefix      			Suffix string to add before name and id of field (can be used to avoid duplicate names)
+     * @param  string  $morecss        			More css (to defined size of field. Old behaviour: may also be a numeric)
+     * @param  int     $objectid       			Current object id
+     * @param  string  $extrafieldsobjectkey	If defined (for example $object->table_element), use the new method to get extrafields data
+     * @return string
+     */
+    function showInputField($key, $value, $moreparam='', $keysuffix='', $keyprefix='', $morecss='', $objectid=0, $extrafieldsobjectkey='')
+    {
+        global $conf,$langs,$form;
+
+        if (! is_object($form))
+        {
+            require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
+            $form=new Form($this->db);
+        }
+
+        $out='';
+
+        $keyprefix = $keyprefix.'options_';		// Because we work on extrafields
+
+        if (! empty($extrafieldsobjectkey))
+        {
+            $label=$this->attributes[$extrafieldsobjectkey]['label'][$key];
+            $type=$this->attributes[$extrafieldsobjectkey]['type'][$key];
+            $size=$this->attributes[$extrafieldsobjectkey]['size'][$key];
+            $default=$this->attributes[$extrafieldsobjectkey]['default'][$key];
+            $computed=$this->attributes[$extrafieldsobjectkey]['computed'][$key];
+            $unique=$this->attributes[$extrafieldsobjectkey]['unique'][$key];
+            $required=$this->attributes[$extrafieldsobjectkey]['required'][$key];
+            $param=$this->attributes[$extrafieldsobjectkey]['param'][$key];
+            $perms=dol_eval($this->attributes[$extrafieldsobjectkey]['perms'][$key], 1);
+            $langfile=$this->attributes[$extrafieldsobjectkey]['langfile'][$key];
+            $list=dol_eval($this->attributes[$extrafieldsobjectkey]['list'][$key], 1);
+            $totalizable=$this->attributes[$extrafieldsobjectkey]['totalizable'][$key];
+            $help=$this->attributes[$extrafieldsobjectkey]['help'][$key];
+            $hidden=(empty($list) ? 1 : 0);		// If empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
+        }
+        else	// Old usage
+        {
+            $label=$this->attribute_label[$key];
+            $type =$this->attribute_type[$key];
+            $size =$this->attribute_size[$key];
+            $elementtype=$this->attribute_elementtype[$key];	// Seems not used
+            $default=$this->attribute_default[$key];
+            $computed=$this->attribute_computed[$key];
+            $unique=$this->attribute_unique[$key];
+            $required=$this->attribute_required[$key];
+            $param=$this->attribute_param[$key];
+            $langfile=$this->attribute_langfile[$key];
+            $list=$this->attribute_list[$key];
+            $totalizable=$this->attribute_totalizable[$key];
+            $hidden=(empty($list) ? 1 : 0);		// If empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
+        }
+
+        if ($computed)
+        {
+            if (! preg_match('/^search_/', $keyprefix)) return '<span class="opacitymedium">'.$langs->trans("AutomaticallyCalculated").'</span>';
+            else return '';
+        }
+
+        if (empty($morecss))
+        {
+            if ($type == 'date')
+            {
+                $morecss = 'minwidth100imp';
+            }
+            elseif ($type == 'datetime')
+            {
+                $morecss = 'minwidth200imp';
+            }
+            elseif (in_array($type,array('int','integer','double','price')))
+            {
+                $morecss = 'maxwidth75';
+            }
+            elseif ($type == 'password')
+            {
+                $morecss='maxwidth100';
+            }
+            elseif ($type == 'url')
+            {
+                $morecss='minwidth400';
+            }
+            elseif ($type == 'boolean')
+            {
+                $morecss='';
+            }
+            else
+            {
+                if (round($size) < 12)
+                {
+                    $morecss = 'minwidth100';
+                }
+                else if (round($size) <= 48)
+                {
+                    $morecss = 'minwidth200';
+                }
+                else
+                {
+                    $morecss = 'minwidth400';
+                }
+            }
+        }
+
+        if (in_array($type,array('date','datetime')))
+        {
+            $tmp=explode(',',$size);
+            $newsize=$tmp[0];
+
+            $showtime = in_array($type,array('datetime')) ? 1 : 0;
+
+            // Do not show current date when field not required (see selectDate() method)
+            if (!$required && $value == '') $value = '-1';
+
+            // TODO Must also support $moreparam
+            $out = $form->selectDate($value, $keyprefix.$key.$keysuffix, $showtime, $showtime, $required, '', 1, (($keyprefix != 'search_' && $keyprefix != 'search_options_') ? 1 : 0), 0, 1);
+        }
+        elseif (in_array($type,array('int','integer')))
+        {
+            $tmp=explode(',',$size);
+            $newsize=$tmp[0];
+            $out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$newsize.'" value="'.dol_escape_htmltag($value).'"'.($moreparam?$moreparam:'').'>';
+        }
+        elseif (preg_match('/varchar/', $type))
+        {
+            $out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$size.'" value="'.dol_escape_htmltag($value).'"'.($moreparam?$moreparam:'').'>';
+        }
+        elseif (in_array($type, array('mail', 'phone', 'url')))
+        {
+            $out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam?$moreparam:'').'>';
+        }
+        elseif ($type == 'text')
+        {
+            if (! preg_match('/search_/', $keyprefix))		// If keyprefix is search_ or search_options_, we must just use a simple text field
+            {
+                require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+                $doleditor=new DolEditor($keyprefix.$key.$keysuffix,$value,'',200,'dolibarr_notes','In',false,false,false,ROWS_5,'90%');
+                $out=$doleditor->Create(1);
+            }
+            else
+            {
+                $out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam?$moreparam:'').'>';
+            }
+        }
+        elseif ($type == 'html')
+        {
+            if (! preg_match('/search_/', $keyprefix))		// If keyprefix is search_ or search_options_, we must just use a simple text field
+            {
+                require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+                $doleditor=new DolEditor($keyprefix.$key.$keysuffix,$value,'',200,'dolibarr_notes','In',false,false,! empty($conf->fckeditor->enabled) && $conf->global->FCKEDITOR_ENABLE_SOCIETE,ROWS_5,'90%');
+                $out=$doleditor->Create(1);
+            }
+            else
+            {
+                $out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam?$moreparam:'').'>';
+            }
+        }
+        elseif ($type == 'boolean')
+        {
+            $checked='';
+            if (!empty($value)) {
+                $checked=' checked value="1" ';
+            } else {
+                $checked=' value="1" ';
+            }
+            $out='<input type="checkbox" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.$checked.' '.($moreparam?$moreparam:'').'>';
+        }
+        elseif ($type == 'price')
+        {
+            if (!empty($value)) {		// $value in memory is a php numeric, we format it into user number format.
+                $value=price($value);
+            }
+            $out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam?$moreparam:'').'> '.$langs->getCurrencySymbol($conf->currency);
+        }
+        elseif ($type == 'double')
+        {
+            if (!empty($value)) {		// $value in memory is a php numeric, we format it into user number format.
+                $value=price($value);
+            }
+            $out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam?$moreparam:'').'> ';
+        }
+        elseif ($type == 'select')
+        {
+            $out = '';
+            if (! empty($conf->use_javascript_ajax) && ! empty($conf->global->MAIN_EXTRAFIELDS_USE_SELECT2))
+            {
+                include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
+                $out.= ajax_combobox($keyprefix.$key.$keysuffix, array(), 0);
+            }
+
+            $out.='<select class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam?$moreparam:'').'>';
+            $out.='<option value="0">&nbsp;</option>';
+            foreach ($param['options'] as $key => $val)
+            {
+                if ((string) $key == '') continue;
+                list($val, $parent) = explode('|', $val);
+                $out.='<option value="'.$key.'"';
+                $out.= (((string) $value == (string) $key)?' selected':'');
+                $out.= (!empty($parent)?' parent="'.$parent.'"':'');
+                $out.='>';
+                if ($langfile && $val) $out.=$langs->trans($val);
+                else $out.=$val;
+                $out.='</option>';
+            }
+            $out.='</select>';
+        }
+        elseif ($type == 'sellist')
+        {
+            $out = '';
+            if (! empty($conf->use_javascript_ajax) && ! empty($conf->global->MAIN_EXTRAFIELDS_USE_SELECT2))
+            {
+                include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
+                $out.= ajax_combobox($keyprefix.$key.$keysuffix, array(), 0);
+            }
+
+            $out.='<select class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam?$moreparam:'').'>';
+            if (is_array($param['options']))
+            {
+                $param_list=array_keys($param['options']);
+                $InfoFieldList = explode(":", $param_list[0]);
+                $parentName='';
+                $parentField='';
+                // 0 : tableName
+                // 1 : label field name
+                // 2 : key fields name (if differ of rowid)
+                // 3 : key field parent (for dependent lists)
+                // 4 : where clause filter on column or table extrafield, syntax field='value' or extra.field=value
+                $keyList=(empty($InfoFieldList[2])?'rowid':$InfoFieldList[2].' as rowid');
+
+
+                if (count($InfoFieldList) > 4 && ! empty($InfoFieldList[4]))
+                {
+                    if (strpos($InfoFieldList[4], 'extra.') !== false)
+                    {
+                        $keyList='main.'.$InfoFieldList[2].' as rowid';
+                    } else {
+                        $keyList=$InfoFieldList[2].' as rowid';
+                    }
+                }
+                if (count($InfoFieldList) > 3 && ! empty($InfoFieldList[3]))
+                {
+                    list($parentName, $parentField) = explode('|', $InfoFieldList[3]);
+                    $keyList.= ', '.$parentField;
+                }
+
+                $fields_label = explode('|',$InfoFieldList[1]);
+                if (is_array($fields_label))
+                {
+                    $keyList .=', ';
+                    $keyList .= implode(', ', $fields_label);
+                }
+
+                $sqlwhere='';
+                $sql = 'SELECT '.$keyList;
+                $sql.= ' FROM '.MAIN_DB_PREFIX .$InfoFieldList[0];
+                if (!empty($InfoFieldList[4]))
+                {
+                    // can use curent entity filter
+                    if (strpos($InfoFieldList[4], '$ENTITY$')!==false) {
+                        $InfoFieldList[4]=str_replace('$ENTITY$',$conf->entity,$InfoFieldList[4]);
+                    }
+                    // can use SELECT request
+                    if (strpos($InfoFieldList[4], '$SEL$')!==false) {
+                        $InfoFieldList[4]=str_replace('$SEL$','SELECT',$InfoFieldList[4]);
+                    }
+
+                    // current object id can be use into filter
+                    if (strpos($InfoFieldList[4], '$ID$')!==false && !empty($objectid)) {
+                        $InfoFieldList[4]=str_replace('$ID$',$objectid,$InfoFieldList[4]);
+                    } else {
+                        $InfoFieldList[4]=str_replace('$ID$','0',$InfoFieldList[4]);
+                    }
+                    //We have to join on extrafield table
+                    if (strpos($InfoFieldList[4], 'extra')!==false)
+                    {
+                        $sql.= ' as main, '.MAIN_DB_PREFIX .$InfoFieldList[0].'_extrafields as extra';
+                        $sqlwhere.= ' WHERE extra.fk_object=main.'.$InfoFieldList[2]. ' AND '.$InfoFieldList[4];
+                    }
+                    else
+                    {
+                        $sqlwhere.= ' WHERE '.$InfoFieldList[4];
+                    }
+                }
+                else
+                {
+                    $sqlwhere.= ' WHERE 1=1';
+                }
+                // Some tables may have field, some other not. For the moment we disable it.
+                if (in_array($InfoFieldList[0],array('tablewithentity')))
+                {
+                    $sqlwhere.= ' AND entity = '.$conf->entity;
+                }
+                $sql.=$sqlwhere;
+                //print $sql;
+
+                $sql .= ' ORDER BY ' . implode(', ', $fields_label);
+
+                dol_syslog(get_class($this).'::showInputField type=sellist', LOG_DEBUG);
+                $resql = $this->db->query($sql);
+                if ($resql)
+                {
+                    $out.='<option value="0">&nbsp;</option>';
+                    $num = $this->db->num_rows($resql);
+                    $i = 0;
+                    while ($i < $num)
+                    {
+                        $labeltoshow='';
+                        $obj = $this->db->fetch_object($resql);
+
+                        // Several field into label (eq table:code|libelle:rowid)
+                        $notrans = false;
+                        $fields_label = explode('|',$InfoFieldList[1]);
+                        if (is_array($fields_label))
+                        {
+                            $notrans = true;
+                            foreach ($fields_label as $field_toshow)
+                            {
+                                $labeltoshow.= $obj->$field_toshow.' ';
+                            }
+                        }
+                        else
+                        {
+                            $labeltoshow=$obj->{$InfoFieldList[1]};
+                        }
+                        $labeltoshow=dol_trunc($labeltoshow,45);
+
+                        if ($value == $obj->rowid)
+                        {
+                            foreach ($fields_label as $field_toshow)
+                            {
+                                $translabel=$langs->trans($obj->$field_toshow);
+                                if ($translabel!=$obj->$field_toshow) {
+                                    $labeltoshow=dol_trunc($translabel,18).' ';
+                                }else {
+                                    $labeltoshow=dol_trunc($obj->$field_toshow,18).' ';
+                                }
+                            }
+                            $out.='<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
+                        }
+                        else
+                        {
+                            if (! $notrans)
+                            {
+                                $translabel=$langs->trans($obj->{$InfoFieldList[1]});
+                                if ($translabel!=$obj->{$InfoFieldList[1]}) {
+                                    $labeltoshow=dol_trunc($translabel,18);
+                                }
+                                else {
+                                    $labeltoshow=dol_trunc($obj->{$InfoFieldList[1]},18);
+                                }
+                            }
+                            if (empty($labeltoshow)) $labeltoshow='(not defined)';
+                            if ($value==$obj->rowid)
+                            {
+                                $out.='<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
+                            }
+
+                            if (!empty($InfoFieldList[3]) && $parentField)
+                            {
+                                $parent = $parentName.':'.$obj->{$parentField};
+                            }
+
+                            $out.='<option value="'.$obj->rowid.'"';
+                            $out.= ($value==$obj->rowid?' selected':'');
+                            $out.= (!empty($parent)?' parent="'.$parent.'"':'');
+                            $out.='>'.$labeltoshow.'</option>';
+                        }
+
+                        $i++;
+                    }
+                    $this->db->free($resql);
+                }
+                else {
+                    print 'Error in request '.$sql.' '.$this->db->lasterror().'. Check setup of extra parameters.<br>';
+                }
+            }
+            $out.='</select>';
+        }
+        elseif ($type == 'checkbox')
+        {
+            $value_arr=explode(',',$value);
+            $out=$form->multiselectarray($keyprefix.$key.$keysuffix, (empty($param['options'])?null:$param['options']), $value_arr, '', 0, '', 0, '100%');
+        }
+        elseif ($type == 'radio')
+        {
+            $out='';
+            foreach ($param['options'] as $keyopt => $val)
+            {
+                $out.='<input class="flat '.$morecss.'" type="radio" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam?$moreparam:'');
+                $out.=' value="'.$keyopt.'"';
+                $out.=' id="'.$keyprefix.$key.$keysuffix.'_'.$keyopt.'"';
+                $out.= ($value==$keyopt?'checked':'');
+                $out.='/><label for="'.$keyprefix.$key.$keysuffix.'_'.$keyopt.'">'.$val.'</label><br>';
+            }
+        }
+        elseif ($type == 'chkbxlst')
+        {
+            if (is_array($value)) {
+                $value_arr = $value;
+            }
+            else {
+                $value_arr = explode(',', $value);
+            }
+
+            if (is_array($param['options'])) {
+                $param_list = array_keys($param['options']);
+                $InfoFieldList = explode(":", $param_list[0]);
+                $parentName='';
+                $parentField='';
+                // 0 : tableName
+                // 1 : label field name
+                // 2 : key fields name (if differ of rowid)
+                // 3 : key field parent (for dependent lists)
+                // 4 : where clause filter on column or table extrafield, syntax field='value' or extra.field=value
+                $keyList = (empty($InfoFieldList[2]) ? 'rowid' : $InfoFieldList[2] . ' as rowid');
+
+                if (count($InfoFieldList) > 3 && ! empty($InfoFieldList[3])) {
+                    list ( $parentName, $parentField ) = explode('|', $InfoFieldList[3]);
+                    $keyList .= ', ' . $parentField;
+                }
+                if (count($InfoFieldList) > 4 && ! empty($InfoFieldList[4])) {
+                    if (strpos($InfoFieldList[4], 'extra.') !== false) {
+                        $keyList = 'main.' . $InfoFieldList[2] . ' as rowid';
+                    } else {
+                        $keyList = $InfoFieldList[2] . ' as rowid';
+                    }
+                }
+
+                $fields_label = explode('|', $InfoFieldList[1]);
+                if (is_array($fields_label)) {
+                    $keyList .= ', ';
+                    $keyList .= implode(', ', $fields_label);
+                }
+
+                $sqlwhere = '';
+                $sql = 'SELECT ' . $keyList;
+                $sql .= ' FROM ' . MAIN_DB_PREFIX . $InfoFieldList[0];
+                if (! empty($InfoFieldList[4])) {
+
+                    // can use SELECT request
+                    if (strpos($InfoFieldList[4], '$SEL$')!==false) {
+                        $InfoFieldList[4]=str_replace('$SEL$','SELECT',$InfoFieldList[4]);
+                    }
+
+                    // current object id can be use into filter
+                    if (strpos($InfoFieldList[4], '$ID$')!==false && !empty($objectid)) {
+                        $InfoFieldList[4]=str_replace('$ID$',$objectid,$InfoFieldList[4]);
+                    } else if (preg_match("#^.*list.php$#",$_SERVER["DOCUMENT_URI"])) {
+                        // Pattern for word=$ID$
+                        $word = '\b[a-zA-Z0-9-\.-_]+\b=\$ID\$';
 						
-						// Removing space arount =, ( and )
-						$InfoFieldList[4]=preg_replace('# *(=|\(|\)) *#','$1', $InfoFieldList[4]);
+                        // Removing space arount =, ( and )
+                        $InfoFieldList[4]=preg_replace('# *(=|\(|\)) *#','$1', $InfoFieldList[4]);
 						
-						$nbPreg = 1;
-						// While we have parenthesis
-						while ($nbPreg!=0) {
-							// Init des compteurs
-							$nbPregRepl = $nbPregSel = 0;
-							// On retire toutes les parenthèses sans = avant
-							$InfoFieldList[4]=preg_replace( '#([^=])(\([^)^(]*(' . $word .   ')[^)^(]*\))#','$1 $3 ',$InfoFieldList[4],-1,$nbPregRepl);
-							// On retire les espaces autour des = et parenthèses
-							$InfoFieldList[4]=preg_replace('# *(=|\(|\)) *#','$1', $InfoFieldList[4]);
-							// On retire toutes les parenthèses avec = avant
-							$InfoFieldList[4]=preg_replace(  '#\b[a-zA-Z0-9-\.-_]+\b=\([^)^(]*(' . $word .   ')[^)^(]*\)#','$1 ',$InfoFieldList[4], -1, $nbPregSel);
-							// On retire les espaces autour des = et parenthèses
-							$InfoFieldList[4]=preg_replace('# *(=|\(|\)) *#','$1', $InfoFieldList[4]);
+                        $nbPreg = 1;
+                        // While we have parenthesis
+                        while ($nbPreg!=0) {
+                            // Init des compteurs
+                            $nbPregRepl = $nbPregSel = 0;
+                            // On retire toutes les parenthèses sans = avant
+                            $InfoFieldList[4]=preg_replace( '#([^=])(\([^)^(]*(' . $word .   ')[^)^(]*\))#','$1 $3 ',$InfoFieldList[4],-1,$nbPregRepl);
+                            // On retire les espaces autour des = et parenthèses
+                            $InfoFieldList[4]=preg_replace('# *(=|\(|\)) *#','$1', $InfoFieldList[4]);
+                            // On retire toutes les parenthèses avec = avant
+                            $InfoFieldList[4]=preg_replace(  '#\b[a-zA-Z0-9-\.-_]+\b=\([^)^(]*(' . $word .   ')[^)^(]*\)#','$1 ',$InfoFieldList[4], -1, $nbPregSel);
+                            // On retire les espaces autour des = et parenthèses
+                            $InfoFieldList[4]=preg_replace('# *(=|\(|\)) *#','$1', $InfoFieldList[4]);
 							
-							// Calcul du compteur général pour la boucle
-							$nbPreg = $nbPregRepl + $nbPregSel;
-						}
+                            // Calcul du compteur général pour la boucle
+                            $nbPreg = $nbPregRepl + $nbPregSel;
+                        }
 						
-						// Si l'on a un AND ou un OR, avant ou après
-						preg_match('#(AND|OR|) *('.$word.') *(AND|OR|)#',$InfoFieldList[4],$matchCondition);
-						while(!empty($matchCondition[0])) {
-							// If the two sides differ but are not empty
-							if (! empty($matchCondition[1]) && ! empty($matchCondition[3]) && $matchCondition[1] != $matchCondition[3] ) {
-								// Nobody sain would do that without parentheses
-								$InfoFieldList[4]=str_replace('$ID$','0',$InfoFieldList[4]);
-							}
-							else {
-								if (! empty($matchCondition[1])) {
-									$boolCond =(( $matchCondition[1] == "AND" )?' AND 1 ':' OR 0 ');
-									$InfoFieldList[4]=str_replace($matchCondition[0],$boolCond.$matchCondition[3],$InfoFieldList[4]);
-								}
-								else if (! empty($matchCondition[3])) {
-									$boolCond =(( $matchCondition[3] == "AND" )?' 1 AND ':' 0 OR');
-									$InfoFieldList[4]=str_replace($matchCondition[0],$boolCond,$InfoFieldList[4]);
-								}
-								else {
-									$InfoFieldList[4] = 1;
-								}
-							}
+                        // Si l'on a un AND ou un OR, avant ou après
+                        preg_match('#(AND|OR|) *('.$word.') *(AND|OR|)#',$InfoFieldList[4],$matchCondition);
+                        while(!empty($matchCondition[0])) {
+                            // If the two sides differ but are not empty
+                            if (! empty($matchCondition[1]) && ! empty($matchCondition[3]) && $matchCondition[1] != $matchCondition[3] ) {
+                                // Nobody sain would do that without parentheses
+                                $InfoFieldList[4]=str_replace('$ID$','0',$InfoFieldList[4]);
+                            }
+                            else {
+                                if (! empty($matchCondition[1])) {
+                                    $boolCond =(( $matchCondition[1] == "AND" )?' AND 1 ':' OR 0 ');
+                                    $InfoFieldList[4]=str_replace($matchCondition[0],$boolCond.$matchCondition[3],$InfoFieldList[4]);
+                                }
+                                else if (! empty($matchCondition[3])) {
+                                    $boolCond =(( $matchCondition[3] == "AND" )?' 1 AND ':' 0 OR');
+                                    $InfoFieldList[4]=str_replace($matchCondition[0],$boolCond,$InfoFieldList[4]);
+                                }
+                                else {
+                                    $InfoFieldList[4] = 1;
+                                }
+                            }
 							
-							// Si l'on a un AND ou un OR, avant ou après
-							preg_match('#(AND|OR|) *('.$word.') *(AND|OR|)#',$InfoFieldList[4],$matchCondition);
-						}
-					}
-					else {
-						$InfoFieldList[4]=str_replace('$ID$','0',$InfoFieldList[4]);
-					}
-
-					// We have to join on extrafield table
-					if (strpos($InfoFieldList[4], 'extra') !== false) {
-						$sql .= ' as main, ' . MAIN_DB_PREFIX . $InfoFieldList[0] . '_extrafields as extra';
-						$sqlwhere .= ' WHERE extra.fk_object=main.' . $InfoFieldList[2] . ' AND ' . $InfoFieldList[4];
-					} else {
-						$sqlwhere .= ' WHERE ' . $InfoFieldList[4];
-					}
-				} else {
-					$sqlwhere .= ' WHERE 1=1';
-				}
-				// Some tables may have field, some other not. For the moment we disable it.
-				if (in_array($InfoFieldList[0], array ('tablewithentity')))
-				{
-					$sqlwhere .= ' AND entity = ' . $conf->entity;
-				}
-				// $sql.=preg_replace('/^ AND /','',$sqlwhere);
-				// print $sql;
-
-				$sql .= $sqlwhere;
-				dol_syslog(get_class($this) . '::showInputField type=chkbxlst',LOG_DEBUG);
-				$resql = $this->db->query($sql);
-				if ($resql) {
-					$num = $this->db->num_rows($resql);
-					$i = 0;
-
-					$data=array();
-
-					while ( $i < $num ) {
-						$labeltoshow = '';
-						$obj = $this->db->fetch_object($resql);
-
-						$notrans = false;
-						// Several field into label (eq table:code|libelle:rowid)
-						$fields_label = explode('|', $InfoFieldList[1]);
-						if (is_array($fields_label)) {
-							$notrans = true;
-							foreach ( $fields_label as $field_toshow ) {
-								$labeltoshow .= $obj->$field_toshow . ' ';
-							}
-						} else {
-							$labeltoshow = $obj->{$InfoFieldList[1]};
-						}
-						$labeltoshow = dol_trunc($labeltoshow, 45);
-
-						if (is_array($value_arr) && in_array($obj->rowid, $value_arr)) {
-							foreach ( $fields_label as $field_toshow ) {
-								$translabel = $langs->trans($obj->$field_toshow);
-								if ($translabel != $obj->$field_toshow) {
-									$labeltoshow = dol_trunc($translabel, 18) . ' ';
-								} else {
-									$labeltoshow = dol_trunc($obj->$field_toshow, 18) . ' ';
-								}
-							}
-
-							$data[$obj->rowid]=$labeltoshow;
-						} else {
-							if (! $notrans) {
-								$translabel = $langs->trans($obj->{$InfoFieldList[1]});
-								if ($translabel != $obj->{$InfoFieldList[1]}) {
-									$labeltoshow = dol_trunc($translabel, 18);
-								} else {
-									$labeltoshow = dol_trunc($obj->{$InfoFieldList[1]}, 18);
-								}
-							}
-							if (empty($labeltoshow))
-								$labeltoshow = '(not defined)';
-
-								if (is_array($value_arr) && in_array($obj->rowid, $value_arr)) {
-									$data[$obj->rowid]=$labeltoshow;
-								}
-
-								if (! empty($InfoFieldList[3]) && $parentField) {
-									$parent = $parentName . ':' . $obj->{$parentField};
-								}
-
-								$data[$obj->rowid]=$labeltoshow;
-						}
-
-						$i ++;
-					}
-					$this->db->free($resql);
-
-					$out=$form->multiselectarray($keyprefix.$key.$keysuffix, $data, $value_arr, '', 0, '', 0, '100%');
-				} else {
-					print 'Error in request ' . $sql . ' ' . $this->db->lasterror() . '. Check setup of extra parameters.<br>';
-				}
-			}
-		}
-		elseif ($type == 'link')
-		{
-			$param_list=array_keys($param['options']);				// $param_list='ObjectName:classPath'
-			$showempty=(($required && $default != '')?0:1);
-			$out=$form->selectForForms($param_list[0], $keyprefix.$key.$keysuffix, $value, $showempty);
-		}
-		elseif ($type == 'password')
-		{
-			// If prefix is 'search_', field is used as a filter, we use a common text field.
-			$out='<input style="display:none" type="text" name="fakeusernameremembered">';	// Hidden field to reduce impact of evil Google Chrome autopopulate bug.
-			$out.='<input autocomplete="new-password" type="'.($keyprefix=='search_'?'text':'password').'" class="flat '.$morecss.'" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam?$moreparam:'').'>';
-		}
-		if (!empty($hidden)) {
-			$out='<input type="hidden" value="'.$value.'" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'"/>';
-		}
-		/* Add comments
+                            // Si l'on a un AND ou un OR, avant ou après
+                            preg_match('#(AND|OR|) *('.$word.') *(AND|OR|)#',$InfoFieldList[4],$matchCondition);
+                        }
+                    }
+                    else {
+                        $InfoFieldList[4]=str_replace('$ID$','0',$InfoFieldList[4]);
+                    }
+
+                    // We have to join on extrafield table
+                    if (strpos($InfoFieldList[4], 'extra') !== false) {
+                        $sql .= ' as main, ' . MAIN_DB_PREFIX . $InfoFieldList[0] . '_extrafields as extra';
+                        $sqlwhere .= ' WHERE extra.fk_object=main.' . $InfoFieldList[2] . ' AND ' . $InfoFieldList[4];
+                    } else {
+                        $sqlwhere .= ' WHERE ' . $InfoFieldList[4];
+                    }
+                } else {
+                    $sqlwhere .= ' WHERE 1=1';
+                }
+                // Some tables may have field, some other not. For the moment we disable it.
+                if (in_array($InfoFieldList[0], array ('tablewithentity')))
+                {
+                    $sqlwhere .= ' AND entity = ' . $conf->entity;
+                }
+                // $sql.=preg_replace('/^ AND /','',$sqlwhere);
+                // print $sql;
+
+                $sql .= $sqlwhere;
+                dol_syslog(get_class($this) . '::showInputField type=chkbxlst',LOG_DEBUG);
+                $resql = $this->db->query($sql);
+                if ($resql) {
+                    $num = $this->db->num_rows($resql);
+                    $i = 0;
+
+                    $data=array();
+
+                    while ( $i < $num ) {
+                        $labeltoshow = '';
+                        $obj = $this->db->fetch_object($resql);
+
+                        $notrans = false;
+                        // Several field into label (eq table:code|libelle:rowid)
+                        $fields_label = explode('|', $InfoFieldList[1]);
+                        if (is_array($fields_label)) {
+                            $notrans = true;
+                            foreach ( $fields_label as $field_toshow ) {
+                                $labeltoshow .= $obj->$field_toshow . ' ';
+                            }
+                        } else {
+                            $labeltoshow = $obj->{$InfoFieldList[1]};
+                        }
+                        $labeltoshow = dol_trunc($labeltoshow, 45);
+
+                        if (is_array($value_arr) && in_array($obj->rowid, $value_arr)) {
+                            foreach ( $fields_label as $field_toshow ) {
+                                $translabel = $langs->trans($obj->$field_toshow);
+                                if ($translabel != $obj->$field_toshow) {
+                                    $labeltoshow = dol_trunc($translabel, 18) . ' ';
+                                } else {
+                                    $labeltoshow = dol_trunc($obj->$field_toshow, 18) . ' ';
+                                }
+                            }
+
+                            $data[$obj->rowid]=$labeltoshow;
+                        } else {
+                            if (! $notrans) {
+                                $translabel = $langs->trans($obj->{$InfoFieldList[1]});
+                                if ($translabel != $obj->{$InfoFieldList[1]}) {
+                                    $labeltoshow = dol_trunc($translabel, 18);
+                                } else {
+                                    $labeltoshow = dol_trunc($obj->{$InfoFieldList[1]}, 18);
+                                }
+                            }
+                            if (empty($labeltoshow))
+                                $labeltoshow = '(not defined)';
+
+                                if (is_array($value_arr) && in_array($obj->rowid, $value_arr)) {
+                                    $data[$obj->rowid]=$labeltoshow;
+                                }
+
+                                if (! empty($InfoFieldList[3]) && $parentField) {
+                                    $parent = $parentName . ':' . $obj->{$parentField};
+                                }
+
+                                $data[$obj->rowid]=$labeltoshow;
+                        }
+
+                        $i ++;
+                    }
+                    $this->db->free($resql);
+
+                    $out=$form->multiselectarray($keyprefix.$key.$keysuffix, $data, $value_arr, '', 0, '', 0, '100%');
+                } else {
+                    print 'Error in request ' . $sql . ' ' . $this->db->lasterror() . '. Check setup of extra parameters.<br>';
+                }
+            }
+        }
+        elseif ($type == 'link')
+        {
+            $param_list=array_keys($param['options']);				// $param_list='ObjectName:classPath'
+            $showempty=(($required && $default != '')?0:1);
+            $out=$form->selectForForms($param_list[0], $keyprefix.$key.$keysuffix, $value, $showempty);
+        }
+        elseif ($type == 'password')
+        {
+            // If prefix is 'search_', field is used as a filter, we use a common text field.
+            $out='<input style="display:none" type="text" name="fakeusernameremembered">';	// Hidden field to reduce impact of evil Google Chrome autopopulate bug.
+            $out.='<input autocomplete="new-password" type="'.($keyprefix=='search_'?'text':'password').'" class="flat '.$morecss.'" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam?$moreparam:'').'>';
+        }
+        if (!empty($hidden)) {
+            $out='<input type="hidden" value="'.$value.'" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'"/>';
+        }
+        /* Add comments
 		 if ($type == 'date') $out.=' (YYYY-MM-DD)';
 		 elseif ($type == 'datetime') $out.=' (YYYY-MM-DD HH:MM:SS)';
 		 */
-		return $out;
-	}
-
-
-	/**
-	 * Return HTML string to put an output field into a page
-	 *
-	 * @param   string	$key            		Key of attribute
-	 * @param   string	$value          		Value to show
-	 * @param	string	$moreparam				To add more parameters on html input tag (only checkbox use html input for output rendering)
-	 * @param	string	$extrafieldsobjectkey	If defined (for example $object->table_element), use the new method to get extrafields data
-	 * @return	string							Formated value
-	 */
-	function showOutputField($key, $value, $moreparam='', $extrafieldsobjectkey='')
-	{
-		global $conf,$langs;
-
-		if (! empty($extrafieldsobjectkey))
-		{
-			$label=$this->attributes[$extrafieldsobjectkey]['label'][$key];
-			$type=$this->attributes[$extrafieldsobjectkey]['type'][$key];
-			$size=$this->attributes[$extrafieldsobjectkey]['size'][$key];
-			$default=$this->attributes[$extrafieldsobjectkey]['default'][$key];
-			$computed=$this->attributes[$extrafieldsobjectkey]['computed'][$key];
-			$unique=$this->attributes[$extrafieldsobjectkey]['unique'][$key];
-			$required=$this->attributes[$extrafieldsobjectkey]['required'][$key];
-			$param=$this->attributes[$extrafieldsobjectkey]['param'][$key];
-			$perms=dol_eval($this->attributes[$extrafieldsobjectkey]['perms'][$key], 1);
-			$langfile=$this->attributes[$extrafieldsobjectkey]['langfile'][$key];
-			$list=dol_eval($this->attributes[$extrafieldsobjectkey]['list'][$key], 1);
-			$help=$this->attributes[$extrafieldsobjectkey]['help'][$key];
-			$hidden=(empty($list) ? 1 : 0);		// If $list empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
-		}
-		else	// Old usage
-		{
-			$label=$this->attribute_label[$key];
-			$type=$this->attribute_type[$key];
-			$size=$this->attribute_size[$key];
-			$default=$this->attribute_default[$key];
-			$computed=$this->attribute_computed[$key];
-			$unique=$this->attribute_unique[$key];
-			$required=$this->attribute_required[$key];
-			$param=$this->attribute_param[$key];
-			$perms=dol_eval($this->attribute_perms[$key], 1);
-			$langfile=$this->attribute_langfile[$key];
-			$list=dol_eval($this->attribute_list[$key], 1);
-			$help='';	// Not supported with old syntax
-			$hidden=(empty($list) ? 1 : 0);		// If $list empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
-		}
-
-		if ($hidden) return '';		// This is a protection. If field is hidden, we should just not call this method.
-
-		// If field is a computed field, value must become result of compute
-		if ($computed)
-		{
-		    // Make the eval of compute string
-		    //var_dump($computed);
-		    $value = dol_eval($computed, 1, 0);
-		}
-
-		$showsize=0;
-		if ($type == 'date')
-		{
-			$showsize=10;
-			$value=dol_print_date($value, 'day');
-		}
-		elseif ($type == 'datetime')
-		{
-			$showsize=19;
-			$value=dol_print_date($value, 'dayhour');
-		}
-		elseif ($type == 'int')
-		{
-			$showsize=10;
-		}
-		elseif ($type == 'double')
-		{
-			if (!empty($value)) {
-				$value=price($value);
-			}
-		}
-		elseif ($type == 'boolean')
-		{
-			$checked='';
-			if (!empty($value)) {
-				$checked=' checked ';
-			}
-			$value='<input type="checkbox" '.$checked.' '.($moreparam?$moreparam:'').' readonly disabled>';
-		}
-		elseif ($type == 'mail')
-		{
-			$value=dol_print_email($value, 0, 0, 0, 64, 1, 1);
-		}
-		elseif ($type == 'url')
-		{
-			$value=dol_print_url($value,'_blank',32,1);
-		}
-		elseif ($type == 'phone')
-		{
-			$value=dol_print_phone($value, '', 0, 0, '', '&nbsp;', 1);
-		}
-		elseif ($type == 'price')
-		{
-			$value=price($value, 0, $langs, 0, 0, -1, $conf->currency);
-		}
-		elseif ($type == 'select')
-		{
-			if ($langfile && $param['options'][$value]) $value=$langs->trans($param['options'][$value]);
-			else $value=$param['options'][$value];
-		}
-		elseif ($type == 'sellist')
-		{
-			$param_list=array_keys($param['options']);
-			$InfoFieldList = explode(":", $param_list[0]);
-
-			$selectkey="rowid";
-			$keyList='rowid';
-
-			if (count($InfoFieldList)>=3)
-			{
-				$selectkey = $InfoFieldList[2];
-				$keyList=$InfoFieldList[2].' as rowid';
-			}
-
-			$fields_label = explode('|',$InfoFieldList[1]);
-			if(is_array($fields_label)) {
-				$keyList .=', ';
-				$keyList .= implode(', ', $fields_label);
-			}
-
-			$sql = 'SELECT '.$keyList;
-			$sql.= ' FROM '.MAIN_DB_PREFIX .$InfoFieldList[0];
-			if (strpos($InfoFieldList[4], 'extra')!==false)
-			{
-				$sql.= ' as main';
-			}
-			if ($selectkey=='rowid' && empty($value)) {
-				$sql.= " WHERE ".$selectkey."=0";
-			} elseif ($selectkey=='rowid') {
-				$sql.= " WHERE ".$selectkey."=".$this->db->escape($value);
-			}else {
-				$sql.= " WHERE ".$selectkey."='".$this->db->escape($value)."'";
-			}
-
-			//$sql.= ' AND entity = '.$conf->entity;
-
-			dol_syslog(get_class($this).':showOutputField:$type=sellist', LOG_DEBUG);
-			$resql = $this->db->query($sql);
-			if ($resql)
-			{
-				$value='';	// value was used, so now we reste it to use it to build final output
-
-				$obj = $this->db->fetch_object($resql);
-
-				// Several field into label (eq table:code|libelle:rowid)
-				$fields_label = explode('|',$InfoFieldList[1]);
-
-				if(is_array($fields_label) && count($fields_label)>1)
-				{
-					foreach ($fields_label as $field_toshow)
-					{
-						$translabel='';
-						if (!empty($obj->$field_toshow)) {
-							$translabel=$langs->trans($obj->$field_toshow);
-						}
-						if ($translabel!=$field_toshow) {
-							$value.=dol_trunc($translabel,18).' ';
-						}else {
-							$value.=$obj->$field_toshow.' ';
-						}
-					}
-				}
-				else
-				{
-					$translabel='';
-					if (!empty($obj->{$InfoFieldList[1]})) {
-						$translabel=$langs->trans($obj->{$InfoFieldList[1]});
-					}
-					if ($translabel!=$obj->{$InfoFieldList[1]}) {
-						$value=dol_trunc($translabel,18);
-					}else {
-						$value=$obj->{$InfoFieldList[1]};
-					}
-				}
-			}
-			else dol_syslog(get_class($this).'::showOutputField error '.$this->db->lasterror(), LOG_WARNING);
-		}
-		elseif ($type == 'radio')
-		{
-			$value=$param['options'][$value];
-		}
-		elseif ($type == 'checkbox')
-		{
-			$value_arr=explode(',',$value);
-			$value='';
-			$toprint=array();
-			if (is_array($value_arr))
-			{
-				foreach ($value_arr as $keyval=>$valueval) {
-					$toprint[]='<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$param['options'][$valueval].'</li>';
-				}
-			}
-			$value='<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';
-		}
-		elseif ($type == 'chkbxlst')
-		{
-			$value_arr = explode(',', $value);
-
-			$param_list = array_keys($param['options']);
-			$InfoFieldList = explode(":", $param_list[0]);
-
-			$selectkey = "rowid";
-			$keyList = 'rowid';
-
-			if (count($InfoFieldList) >= 3) {
-				$selectkey = $InfoFieldList[2];
-				$keyList = $InfoFieldList[2] . ' as rowid';
-			}
-
-			$fields_label = explode('|', $InfoFieldList[1]);
-			if (is_array($fields_label)) {
-				$keyList .= ', ';
-				$keyList .= implode(', ', $fields_label);
-			}
-
-			$sql = 'SELECT ' . $keyList;
-			$sql .= ' FROM ' . MAIN_DB_PREFIX . $InfoFieldList[0];
-			if (strpos($InfoFieldList[4], 'extra') !== false) {
-				$sql .= ' as main';
-			}
-			// $sql.= " WHERE ".$selectkey."='".$this->db->escape($value)."'";
-			// $sql.= ' AND entity = '.$conf->entity;
-
-			dol_syslog(get_class($this) . ':showOutputField:$type=chkbxlst',LOG_DEBUG);
-			$resql = $this->db->query($sql);
-			if ($resql) {
-				$value = ''; // value was used, so now we reste it to use it to build final output
-				$toprint=array();
-				while ( $obj = $this->db->fetch_object($resql) ) {
-
-					// Several field into label (eq table:code|libelle:rowid)
-					$fields_label = explode('|', $InfoFieldList[1]);
-					if (is_array($value_arr) && in_array($obj->rowid, $value_arr)) {
-						if (is_array($fields_label) && count($fields_label) > 1) {
-							foreach ( $fields_label as $field_toshow ) {
-								$translabel = '';
-								if (! empty($obj->$field_toshow)) {
-									$translabel = $langs->trans($obj->$field_toshow);
-								}
-								if ($translabel != $field_toshow) {
-									$toprint[]='<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.dol_trunc($translabel, 18).'</li>';
-								} else {
-									$toprint[]='<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$obj->$field_toshow.'</li>';
-								}
-							}
-						} else {
-							$translabel = '';
-							if (! empty($obj->{$InfoFieldList[1]})) {
-								$translabel = $langs->trans($obj->{$InfoFieldList[1]});
-							}
-							if ($translabel != $obj->{$InfoFieldList[1]}) {
-								$toprint[]='<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.dol_trunc($translabel, 18).'</li>';
-							} else {
-								$toprint[]='<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$obj->{$InfoFieldList[1]}.'</li>';
-							}
-						}
-					}
-				}
-				$value='<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';
-			} else {
-				dol_syslog(get_class($this) . '::showOutputField error ' . $this->db->lasterror(), LOG_WARNING);
-			}
-		}
-		elseif ($type == 'link')
-		{
-			$out='';
-
-			// Only if something to display (perf)
-			if ($value)		// If we have -1 here, pb is into sert, not into ouptu
-			{
-				$param_list=array_keys($param['options']);				// $param_list='ObjectName:classPath'
-
-				$InfoFieldList = explode(":", $param_list[0]);
-				$classname=$InfoFieldList[0];
-				$classpath=$InfoFieldList[1];
-				if (! empty($classpath))
-				{
-					dol_include_once($InfoFieldList[1]);
-					if ($classname && class_exists($classname))
-					{
-						$object = new $classname($this->db);
-						$object->fetch($value);
-						$value=$object->getNomUrl(3);
-					}
-				}
-				else
-				{
-					dol_syslog('Error bad setup of extrafield', LOG_WARNING);
-					return 'Error bad setup of extrafield';
-				}
-			}
-		}
-		elseif ($type == 'text')
-		{
-			$value=dol_htmlentitiesbr($value);
-		}
-		elseif ($type == 'html')
-		{
-			$value=dol_htmlentitiesbr($value);
-		}
-		elseif ($type == 'password')
-		{
-			$value=dol_trunc(preg_replace('/./i','*',$value), 8, 'right', 'UTF-8', 1);
-		}
-		else
-		{
-			$showsize=round($size);
-			if ($showsize > 48) $showsize=48;
-		}
-
-		//print $type.'-'.$size;
-		$out=$value;
-
-		return $out;
-	}
-
-	/**
-	 * Return tag to describe alignement to use for this extrafield
-	 *
-	 * @param   string	$key            		Key of attribute
-	 * @param	string	$extrafieldsobjectkey	If defined, use the new method to get extrafields data
-	 * @return	string							Formated value
-	 */
-	function getAlignFlag($key, $extrafieldsobjectkey='')
-	{
-		global $conf,$langs;
-
-		if (! empty($extrafieldsobjectkey)) $type=$this->attributes[$extrafieldsobjectkey]['type'][$key];
-		else $type=$this->attribute_type[$key];
-
-		$align='';
+        return $out;
+    }
+
+
+    /**
+     * Return HTML string to put an output field into a page
+     *
+     * @param   string	$key            		Key of attribute
+     * @param   string	$value          		Value to show
+     * @param	string	$moreparam				To add more parameters on html input tag (only checkbox use html input for output rendering)
+     * @param	string	$extrafieldsobjectkey	If defined (for example $object->table_element), use the new method to get extrafields data
+     * @return	string							Formated value
+     */
+    function showOutputField($key, $value, $moreparam='', $extrafieldsobjectkey='')
+    {
+        global $conf,$langs;
+
+        if (! empty($extrafieldsobjectkey))
+        {
+            $label=$this->attributes[$extrafieldsobjectkey]['label'][$key];
+            $type=$this->attributes[$extrafieldsobjectkey]['type'][$key];
+            $size=$this->attributes[$extrafieldsobjectkey]['size'][$key];
+            $default=$this->attributes[$extrafieldsobjectkey]['default'][$key];
+            $computed=$this->attributes[$extrafieldsobjectkey]['computed'][$key];
+            $unique=$this->attributes[$extrafieldsobjectkey]['unique'][$key];
+            $required=$this->attributes[$extrafieldsobjectkey]['required'][$key];
+            $param=$this->attributes[$extrafieldsobjectkey]['param'][$key];
+            $perms=dol_eval($this->attributes[$extrafieldsobjectkey]['perms'][$key], 1);
+            $langfile=$this->attributes[$extrafieldsobjectkey]['langfile'][$key];
+            $list=dol_eval($this->attributes[$extrafieldsobjectkey]['list'][$key], 1);
+            $help=$this->attributes[$extrafieldsobjectkey]['help'][$key];
+            $hidden=(empty($list) ? 1 : 0);		// If $list empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
+        }
+        else	// Old usage
+        {
+            $label=$this->attribute_label[$key];
+            $type=$this->attribute_type[$key];
+            $size=$this->attribute_size[$key];
+            $default=$this->attribute_default[$key];
+            $computed=$this->attribute_computed[$key];
+            $unique=$this->attribute_unique[$key];
+            $required=$this->attribute_required[$key];
+            $param=$this->attribute_param[$key];
+            $perms=dol_eval($this->attribute_perms[$key], 1);
+            $langfile=$this->attribute_langfile[$key];
+            $list=dol_eval($this->attribute_list[$key], 1);
+            $help='';	// Not supported with old syntax
+            $hidden=(empty($list) ? 1 : 0);		// If $list empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
+        }
+
+        if ($hidden) return '';		// This is a protection. If field is hidden, we should just not call this method.
 
+        // If field is a computed field, value must become result of compute
+        if ($computed)
+        {
+            // Make the eval of compute string
+            //var_dump($computed);
+            $value = dol_eval($computed, 1, 0);
+        }
+
+        $showsize=0;
         if ($type == 'date')
-		{
-			$align="center";
-		}
-		elseif ($type == 'datetime')
-		{
-			$align="center";
-		}
-		elseif ($type == 'int')
-		{
-			$align="right";
-		}
-		elseif ($type == 'double')
-		{
-			$align="right";
-		}
-		elseif ($type == 'boolean')
-		{
-			$align="center";
-		}
-		elseif ($type == 'radio')
-		{
-			$align="center";
-		}
-		elseif ($type == 'checkbox')
-		{
-			$align="center";
-		}
-		elseif ($type == 'price')
-		{
-			$align="right";
-		}
-
-		return $align;
-	}
-
-	/**
-	 * Return HTML string to print separator extrafield
-	 *
-	 * @param   string	$key            Key of attribute
-	 * @param	string	$object			Object
-	 * @return 	string					HTML code with line for separator
-	 */
-	function showSeparator($key, $object)
-	{
-		global $langs;
-
-		$out = '<tr class="trextrafieldseparator trextrafieldseparator'.$key.'"><td colspan="2"><strong>';
-		$out.= $langs->trans($this->attributes[$object->table_element]['label'][$key]);
-		$out.= '</strong></td></tr>';
-		return $out;
-	}
-
-	/**
-	 * Fill array_options property of object by extrafields value (using for data sent by forms)
-	 *
-	 * @param   array	$extralabels    $array of extrafields (@deprecated)
-	 * @param   object	$object         Object
-	 * @param	string	$onlykey		Only following key is filled. When we make update of only one extrafield ($action = 'update_extras'), calling page must must set this to avoid to have other extrafields being reset.
-	 * @return	int						1 if array_options set, 0 if no value, -1 if error (field required missing for example)
-	 */
-	function setOptionalsFromPost($extralabels, &$object, $onlykey='')
-	{
-		global $_POST, $langs;
-		$nofillrequired='';// For error when required field left blank
-		$error_field_required = array();
-
-		if (is_array($this->attributes[$object->table_element]['label'])) $extralabels=$this->attributes[$object->table_element]['label'];
-
-		if (is_array($extralabels))
-		{
-			// Get extra fields
-			foreach ($extralabels as $key => $value)
-			{
-				if (! empty($onlykey) && $key != $onlykey) continue;
-
-				$key_type = $this->attributes[$object->table_element]['type'][$key];
-				if ($key_type == 'separate') continue;
-
-				$enabled = 1;
-				if (isset($this->attributes[$object->table_element]['list'][$key]))
-				{
-					$enabled = dol_eval($this->attributes[$object->table_element]['list'][$key], 1);
-				}
-				$perms = 1;
-				if (isset($this->attributes[$object->table_element]['perms'][$key]))
-				{
-					$perms = dol_eval($this->attributes[$object->table_element]['perms'][$key], 1);
-				}
-				if (empty($enabled)) continue;
-				if (empty($perms)) continue;
-
-				if ($this->attributes[$object->table_element]['required'][$key])	// Value is required
-				{
-					// Check if empty without using GETPOST, value can be alpha, int, array, etc...
-					if ((! is_array($_POST["options_".$key]) && empty($_POST["options_".$key]) && $_POST["options_".$key] != '0')
-						|| (is_array($_POST["options_".$key]) && empty($_POST["options_".$key])))
-					{
-						//print 'ccc'.$value.'-'.$this->attributes[$object->table_element]['required'][$key];
-						$nofillrequired++;
-						$error_field_required[] = $langs->transnoentitiesnoconv($value);
-					}
-				}
-
-				if (in_array($key_type,array('date')))
-				{
-					// Clean parameters
-					// TODO GMT date in memory must be GMT so we should add gm=true in parameters
-					$value_key=dol_mktime(0, 0, 0, $_POST["options_".$key."month"], $_POST["options_".$key."day"], $_POST["options_".$key."year"]);
-				}
-				elseif (in_array($key_type,array('datetime')))
-				{
-					// Clean parameters
-					// TODO GMT date in memory must be GMT so we should add gm=true in parameters
-					$value_key=dol_mktime($_POST["options_".$key."hour"], $_POST["options_".$key."min"], 0, $_POST["options_".$key."month"], $_POST["options_".$key."day"], $_POST["options_".$key."year"]);
-				}
-				else if (in_array($key_type,array('checkbox','chkbxlst')))
-				{
-					$value_arr=GETPOST("options_".$key, 'array'); // check if an array
-					if (!empty($value_arr)) {
-						$value_key=implode($value_arr,',');
-					}else {
-						$value_key='';
-					}
-				}
-				else if (in_array($key_type,array('price','double')))
-				{
-					$value_arr=GETPOST("options_".$key, 'alpha');
-					$value_key=price2num($value_arr);
-				}
-				else
-				{
-					$value_key=GETPOST("options_".$key);
-				}
-
-				$object->array_options["options_".$key]=$value_key;
-			}
-
-			if ($nofillrequired) {
-				$langs->load('errors');
-				setEventMessages($langs->trans('ErrorFieldsRequired').' : '.implode(', ',$error_field_required), null, 'errors');
-				return -1;
-			}
-			else {
-				return 1;
-			}
-		}
-		else {
-			return 0;
-		}
-	}
-
-	/**
-	 * return array_options array of data of extrafields value of object sent by a search form
-	 *
-	 * @param  array|string		$extrafieldsobjectkey  	array of extrafields (old usage) or value of object->table_element (new usage)
-	 * @param  string			$keyprefix      		Prefix string to add into name and id of field (can be used to avoid duplicate names)
-	 * @param  string			$keysuffix      		Suffix string to add into name and id of field (can be used to avoid duplicate names)
-	 * @return array|int								array_options set or 0 if no value
-	 */
-	function getOptionalsFromPost($extrafieldsobjectkey, $keyprefix='', $keysuffix='')
-	{
-		global $_POST;
-
-		if (is_string($extrafieldsobjectkey) && is_array($this->attributes[$extrafieldsobjectkey]['label']))
-		{
-			$extralabels = $this->attributes[$extrafieldsobjectkey]['label'];
-		}
-		else
-		{
-			$extralabels = $extrafieldsobjectkey;
-		}
-
-		if (is_array($extralabels))
-		{
-			$array_options = array();
-
-			// Get extra fields
-			foreach ($extralabels as $key => $value)
-			{
-				$key_type = '';
-				if (is_string($extrafieldsobjectkey))
-				{
-					$key_type = $this->attributes[$extrafieldsobjectkey]['type'][$key];
-				}
-
-				if (in_array($key_type,array('date','datetime')))
-				{
-					// Clean parameters
-					$value_key=dol_mktime($_POST[$keysuffix."options_".$key.$keyprefix."hour"], $_POST[$keysuffix."options_".$key.$keyprefix."min"], 0, $_POST[$keysuffix."options_".$key.$keyprefix."month"], $_POST[$keysuffix."options_".$key.$keyprefix."day"], $_POST[$keysuffix."options_".$key.$keyprefix."year"]);
-				}
-				else if (in_array($key_type,array('checkbox', 'chkbxlst')))
-				{
-					$value_arr=GETPOST($keysuffix."options_".$key.$keyprefix);
-					// Make sure we get an array even if there's only one checkbox
-					$value_arr=(array) $value_arr;
-					$value_key=implode(',', $value_arr);
-				}
-				else if (in_array($key_type,array('price','double')))
-				{
-					$value_arr=GETPOST($keysuffix."options_".$key.$keyprefix);
-					$value_key=price2num($value_arr);
-				}
-				else
-				{
-					$value_key=GETPOST($keysuffix."options_".$key.$keyprefix);
-				}
-
-				$array_options[$keysuffix."options_".$key]=$value_key;	// No keyprefix here. keyprefix is used only for read.
-			}
-
-			return $array_options;
-		}
-
-		return 0;
-	}
+        {
+            $showsize=10;
+            $value=dol_print_date($value, 'day');
+        }
+        elseif ($type == 'datetime')
+        {
+            $showsize=19;
+            $value=dol_print_date($value, 'dayhour');
+        }
+        elseif ($type == 'int')
+        {
+            $showsize=10;
+        }
+        elseif ($type == 'double')
+        {
+            if (!empty($value)) {
+                $value=price($value);
+            }
+        }
+        elseif ($type == 'boolean')
+        {
+            $checked='';
+            if (!empty($value)) {
+                $checked=' checked ';
+            }
+            $value='<input type="checkbox" '.$checked.' '.($moreparam?$moreparam:'').' readonly disabled>';
+        }
+        elseif ($type == 'mail')
+        {
+            $value=dol_print_email($value, 0, 0, 0, 64, 1, 1);
+        }
+        elseif ($type == 'url')
+        {
+            $value=dol_print_url($value,'_blank',32,1);
+        }
+        elseif ($type == 'phone')
+        {
+            $value=dol_print_phone($value, '', 0, 0, '', '&nbsp;', 1);
+        }
+        elseif ($type == 'price')
+        {
+            $value=price($value, 0, $langs, 0, 0, -1, $conf->currency);
+        }
+        elseif ($type == 'select')
+        {
+            if ($langfile && $param['options'][$value]) $value=$langs->trans($param['options'][$value]);
+            else $value=$param['options'][$value];
+        }
+        elseif ($type == 'sellist')
+        {
+            $param_list=array_keys($param['options']);
+            $InfoFieldList = explode(":", $param_list[0]);
+
+            $selectkey="rowid";
+            $keyList='rowid';
+
+            if (count($InfoFieldList)>=3)
+            {
+                $selectkey = $InfoFieldList[2];
+                $keyList=$InfoFieldList[2].' as rowid';
+            }
+
+            $fields_label = explode('|',$InfoFieldList[1]);
+            if(is_array($fields_label)) {
+                $keyList .=', ';
+                $keyList .= implode(', ', $fields_label);
+            }
+
+            $sql = 'SELECT '.$keyList;
+            $sql.= ' FROM '.MAIN_DB_PREFIX .$InfoFieldList[0];
+            if (strpos($InfoFieldList[4], 'extra')!==false)
+            {
+                $sql.= ' as main';
+            }
+            if ($selectkey=='rowid' && empty($value)) {
+                $sql.= " WHERE ".$selectkey."=0";
+            } elseif ($selectkey=='rowid') {
+                $sql.= " WHERE ".$selectkey."=".$this->db->escape($value);
+            }else {
+                $sql.= " WHERE ".$selectkey."='".$this->db->escape($value)."'";
+            }
+
+            //$sql.= ' AND entity = '.$conf->entity;
+
+            dol_syslog(get_class($this).':showOutputField:$type=sellist', LOG_DEBUG);
+            $resql = $this->db->query($sql);
+            if ($resql)
+            {
+                $value='';	// value was used, so now we reste it to use it to build final output
+
+                $obj = $this->db->fetch_object($resql);
+
+                // Several field into label (eq table:code|libelle:rowid)
+                $fields_label = explode('|',$InfoFieldList[1]);
+
+                if(is_array($fields_label) && count($fields_label)>1)
+                {
+                    foreach ($fields_label as $field_toshow)
+                    {
+                        $translabel='';
+                        if (!empty($obj->$field_toshow)) {
+                            $translabel=$langs->trans($obj->$field_toshow);
+                        }
+                        if ($translabel!=$field_toshow) {
+                            $value.=dol_trunc($translabel,18).' ';
+                        }else {
+                            $value.=$obj->$field_toshow.' ';
+                        }
+                    }
+                }
+                else
+                {
+                    $translabel='';
+                    if (!empty($obj->{$InfoFieldList[1]})) {
+                        $translabel=$langs->trans($obj->{$InfoFieldList[1]});
+                    }
+                    if ($translabel!=$obj->{$InfoFieldList[1]}) {
+                        $value=dol_trunc($translabel,18);
+                    }else {
+                        $value=$obj->{$InfoFieldList[1]};
+                    }
+                }
+            }
+            else dol_syslog(get_class($this).'::showOutputField error '.$this->db->lasterror(), LOG_WARNING);
+        }
+        elseif ($type == 'radio')
+        {
+            $value=$param['options'][$value];
+        }
+        elseif ($type == 'checkbox')
+        {
+            $value_arr=explode(',',$value);
+            $value='';
+            $toprint=array();
+            if (is_array($value_arr))
+            {
+                foreach ($value_arr as $keyval=>$valueval) {
+                    $toprint[]='<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$param['options'][$valueval].'</li>';
+                }
+            }
+            $value='<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';
+        }
+        elseif ($type == 'chkbxlst')
+        {
+            $value_arr = explode(',', $value);
+
+            $param_list = array_keys($param['options']);
+            $InfoFieldList = explode(":", $param_list[0]);
+
+            $selectkey = "rowid";
+            $keyList = 'rowid';
+
+            if (count($InfoFieldList) >= 3) {
+                $selectkey = $InfoFieldList[2];
+                $keyList = $InfoFieldList[2] . ' as rowid';
+            }
+
+            $fields_label = explode('|', $InfoFieldList[1]);
+            if (is_array($fields_label)) {
+                $keyList .= ', ';
+                $keyList .= implode(', ', $fields_label);
+            }
+
+            $sql = 'SELECT ' . $keyList;
+            $sql .= ' FROM ' . MAIN_DB_PREFIX . $InfoFieldList[0];
+            if (strpos($InfoFieldList[4], 'extra') !== false) {
+                $sql .= ' as main';
+            }
+            // $sql.= " WHERE ".$selectkey."='".$this->db->escape($value)."'";
+            // $sql.= ' AND entity = '.$conf->entity;
+
+            dol_syslog(get_class($this) . ':showOutputField:$type=chkbxlst',LOG_DEBUG);
+            $resql = $this->db->query($sql);
+            if ($resql) {
+                $value = ''; // value was used, so now we reste it to use it to build final output
+                $toprint=array();
+                while ( $obj = $this->db->fetch_object($resql) ) {
+
+                    // Several field into label (eq table:code|libelle:rowid)
+                    $fields_label = explode('|', $InfoFieldList[1]);
+                    if (is_array($value_arr) && in_array($obj->rowid, $value_arr)) {
+                        if (is_array($fields_label) && count($fields_label) > 1) {
+                            foreach ( $fields_label as $field_toshow ) {
+                                $translabel = '';
+                                if (! empty($obj->$field_toshow)) {
+                                    $translabel = $langs->trans($obj->$field_toshow);
+                                }
+                                if ($translabel != $field_toshow) {
+                                    $toprint[]='<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.dol_trunc($translabel, 18).'</li>';
+                                } else {
+                                    $toprint[]='<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$obj->$field_toshow.'</li>';
+                                }
+                            }
+                        } else {
+                            $translabel = '';
+                            if (! empty($obj->{$InfoFieldList[1]})) {
+                                $translabel = $langs->trans($obj->{$InfoFieldList[1]});
+                            }
+                            if ($translabel != $obj->{$InfoFieldList[1]}) {
+                                $toprint[]='<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.dol_trunc($translabel, 18).'</li>';
+                            } else {
+                                $toprint[]='<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$obj->{$InfoFieldList[1]}.'</li>';
+                            }
+                        }
+                    }
+                }
+                $value='<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';
+            } else {
+                dol_syslog(get_class($this) . '::showOutputField error ' . $this->db->lasterror(), LOG_WARNING);
+            }
+        }
+        elseif ($type == 'link')
+        {
+            $out='';
+
+            // Only if something to display (perf)
+            if ($value)		// If we have -1 here, pb is into sert, not into ouptu
+            {
+                $param_list=array_keys($param['options']);				// $param_list='ObjectName:classPath'
+
+                $InfoFieldList = explode(":", $param_list[0]);
+                $classname=$InfoFieldList[0];
+                $classpath=$InfoFieldList[1];
+                if (! empty($classpath))
+                {
+                    dol_include_once($InfoFieldList[1]);
+                    if ($classname && class_exists($classname))
+                    {
+                        $object = new $classname($this->db);
+                        $object->fetch($value);
+                        $value=$object->getNomUrl(3);
+                    }
+                }
+                else
+                {
+                    dol_syslog('Error bad setup of extrafield', LOG_WARNING);
+                    return 'Error bad setup of extrafield';
+                }
+            }
+        }
+        elseif ($type == 'text')
+        {
+            $value=dol_htmlentitiesbr($value);
+        }
+        elseif ($type == 'html')
+        {
+            $value=dol_htmlentitiesbr($value);
+        }
+        elseif ($type == 'password')
+        {
+            $value=dol_trunc(preg_replace('/./i','*',$value), 8, 'right', 'UTF-8', 1);
+        }
+        else
+        {
+            $showsize=round($size);
+            if ($showsize > 48) $showsize=48;
+        }
+
+        //print $type.'-'.$size;
+        $out=$value;
+
+        return $out;
+    }
+
+    /**
+     * Return tag to describe alignement to use for this extrafield
+     *
+     * @param   string	$key            		Key of attribute
+     * @param	string	$extrafieldsobjectkey	If defined, use the new method to get extrafields data
+     * @return	string							Formated value
+     */
+    function getAlignFlag($key, $extrafieldsobjectkey='')
+    {
+        global $conf,$langs;
+
+        if (! empty($extrafieldsobjectkey)) $type=$this->attributes[$extrafieldsobjectkey]['type'][$key];
+        else $type=$this->attribute_type[$key];
+
+        $align='';
+
+        if ($type == 'date')
+        {
+            $align="center";
+        }
+        elseif ($type == 'datetime')
+        {
+            $align="center";
+        }
+        elseif ($type == 'int')
+        {
+            $align="right";
+        }
+        elseif ($type == 'double')
+        {
+            $align="right";
+        }
+        elseif ($type == 'boolean')
+        {
+            $align="center";
+        }
+        elseif ($type == 'radio')
+        {
+            $align="center";
+        }
+        elseif ($type == 'checkbox')
+        {
+            $align="center";
+        }
+        elseif ($type == 'price')
+        {
+            $align="right";
+        }
+
+        return $align;
+    }
+
+    /**
+     * Return HTML string to print separator extrafield
+     *
+     * @param   string	$key            Key of attribute
+     * @param	string	$object			Object
+     * @return 	string					HTML code with line for separator
+     */
+    function showSeparator($key, $object)
+    {
+        global $langs;
+
+        $out = '<tr class="trextrafieldseparator trextrafieldseparator'.$key.'"><td colspan="2"><strong>';
+        $out.= $langs->trans($this->attributes[$object->table_element]['label'][$key]);
+        $out.= '</strong></td></tr>';
+        return $out;
+    }
+
+    /**
+     * Fill array_options property of object by extrafields value (using for data sent by forms)
+     *
+     * @param   array	$extralabels    $array of extrafields (@deprecated)
+     * @param   object	$object         Object
+     * @param	string	$onlykey		Only following key is filled. When we make update of only one extrafield ($action = 'update_extras'), calling page must must set this to avoid to have other extrafields being reset.
+     * @return	int						1 if array_options set, 0 if no value, -1 if error (field required missing for example)
+     */
+    function setOptionalsFromPost($extralabels, &$object, $onlykey='')
+    {
+        global $_POST, $langs;
+        $nofillrequired='';// For error when required field left blank
+        $error_field_required = array();
+
+        if (is_array($this->attributes[$object->table_element]['label'])) $extralabels=$this->attributes[$object->table_element]['label'];
+
+        if (is_array($extralabels))
+        {
+            // Get extra fields
+            foreach ($extralabels as $key => $value)
+            {
+                if (! empty($onlykey) && $key != $onlykey) continue;
+
+                $key_type = $this->attributes[$object->table_element]['type'][$key];
+                if ($key_type == 'separate') continue;
+
+                $enabled = 1;
+                if (isset($this->attributes[$object->table_element]['list'][$key]))
+                {
+                    $enabled = dol_eval($this->attributes[$object->table_element]['list'][$key], 1);
+                }
+                $perms = 1;
+                if (isset($this->attributes[$object->table_element]['perms'][$key]))
+                {
+                    $perms = dol_eval($this->attributes[$object->table_element]['perms'][$key], 1);
+                }
+                if (empty($enabled)) continue;
+                if (empty($perms)) continue;
+
+                if ($this->attributes[$object->table_element]['required'][$key])	// Value is required
+                {
+                    // Check if empty without using GETPOST, value can be alpha, int, array, etc...
+                    if ((! is_array($_POST["options_".$key]) && empty($_POST["options_".$key]) && $_POST["options_".$key] != '0')
+                        || (is_array($_POST["options_".$key]) && empty($_POST["options_".$key])))
+                    {
+                        //print 'ccc'.$value.'-'.$this->attributes[$object->table_element]['required'][$key];
+                        $nofillrequired++;
+                        $error_field_required[] = $langs->transnoentitiesnoconv($value);
+                    }
+                }
+
+                if (in_array($key_type,array('date')))
+                {
+                    // Clean parameters
+                    // TODO GMT date in memory must be GMT so we should add gm=true in parameters
+                    $value_key=dol_mktime(0, 0, 0, $_POST["options_".$key."month"], $_POST["options_".$key."day"], $_POST["options_".$key."year"]);
+                }
+                elseif (in_array($key_type,array('datetime')))
+                {
+                    // Clean parameters
+                    // TODO GMT date in memory must be GMT so we should add gm=true in parameters
+                    $value_key=dol_mktime($_POST["options_".$key."hour"], $_POST["options_".$key."min"], 0, $_POST["options_".$key."month"], $_POST["options_".$key."day"], $_POST["options_".$key."year"]);
+                }
+                else if (in_array($key_type,array('checkbox','chkbxlst')))
+                {
+                    $value_arr=GETPOST("options_".$key, 'array'); // check if an array
+                    if (!empty($value_arr)) {
+                        $value_key=implode($value_arr,',');
+                    }else {
+                        $value_key='';
+                    }
+                }
+                else if (in_array($key_type,array('price','double')))
+                {
+                    $value_arr=GETPOST("options_".$key, 'alpha');
+                    $value_key=price2num($value_arr);
+                }
+                else
+                {
+                    $value_key=GETPOST("options_".$key);
+                }
+
+                $object->array_options["options_".$key]=$value_key;
+            }
+
+            if ($nofillrequired) {
+                $langs->load('errors');
+                setEventMessages($langs->trans('ErrorFieldsRequired').' : '.implode(', ',$error_field_required), null, 'errors');
+                return -1;
+            }
+            else {
+                return 1;
+            }
+        }
+        else {
+            return 0;
+        }
+    }
+
+    /**
+     * return array_options array of data of extrafields value of object sent by a search form
+     *
+     * @param  array|string		$extrafieldsobjectkey  	array of extrafields (old usage) or value of object->table_element (new usage)
+     * @param  string			$keyprefix      		Prefix string to add into name and id of field (can be used to avoid duplicate names)
+     * @param  string			$keysuffix      		Suffix string to add into name and id of field (can be used to avoid duplicate names)
+     * @return array|int								array_options set or 0 if no value
+     */
+    function getOptionalsFromPost($extrafieldsobjectkey, $keyprefix='', $keysuffix='')
+    {
+        global $_POST;
+
+        if (is_string($extrafieldsobjectkey) && is_array($this->attributes[$extrafieldsobjectkey]['label']))
+        {
+            $extralabels = $this->attributes[$extrafieldsobjectkey]['label'];
+        }
+        else
+        {
+            $extralabels = $extrafieldsobjectkey;
+        }
+
+        if (is_array($extralabels))
+        {
+            $array_options = array();
+
+            // Get extra fields
+            foreach ($extralabels as $key => $value)
+            {
+                $key_type = '';
+                if (is_string($extrafieldsobjectkey))
+                {
+                    $key_type = $this->attributes[$extrafieldsobjectkey]['type'][$key];
+                }
+
+                if (in_array($key_type,array('date','datetime')))
+                {
+                    // Clean parameters
+                    $value_key=dol_mktime($_POST[$keysuffix."options_".$key.$keyprefix."hour"], $_POST[$keysuffix."options_".$key.$keyprefix."min"], 0, $_POST[$keysuffix."options_".$key.$keyprefix."month"], $_POST[$keysuffix."options_".$key.$keyprefix."day"], $_POST[$keysuffix."options_".$key.$keyprefix."year"]);
+                }
+                else if (in_array($key_type,array('checkbox', 'chkbxlst')))
+                {
+                    $value_arr=GETPOST($keysuffix."options_".$key.$keyprefix);
+                    // Make sure we get an array even if there's only one checkbox
+                    $value_arr=(array) $value_arr;
+                    $value_key=implode(',', $value_arr);
+                }
+                else if (in_array($key_type,array('price','double')))
+                {
+                    $value_arr=GETPOST($keysuffix."options_".$key.$keyprefix);
+                    $value_key=price2num($value_arr);
+                }
+                else
+                {
+                    $value_key=GETPOST($keysuffix."options_".$key.$keyprefix);
+                }
+
+                $array_options[$keysuffix."options_".$key]=$value_key;	// No keyprefix here. keyprefix is used only for read.
+            }
+
+            return $array_options;
+        }
+
+        return 0;
+    }
 }

Spacing +668 added lines, -668 removed lines

@@ -94,12 +94,12 @@ 
 	/**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
 	var $errno;
 
 
-	public static $type2label=array(
+	public static $type2label = array(
 	'varchar'=>'String',
 	'text'=>'TextLong',
 	'html'=>'HtmlText',
@@ -171,29 +171,29 @@ 
 	 *  @param  string  		$enabled  		 	Condition to have the field enabled or not
 	 *  @return int      							<=0 if KO, >0 if OK
 	 */
-	function addExtraField($attrname, $label, $type, $pos, $size, $elementtype, $unique=0, $required=0, $default_value='', $param='', $alwayseditable=0, $perms='', $list='-1', $help='', $computed='', $entity='', $langfile='', $enabled='1')
+	function addExtraField($attrname, $label, $type, $pos, $size, $elementtype, $unique = 0, $required = 0, $default_value = '', $param = '', $alwayseditable = 0, $perms = '', $list = '-1', $help = '', $computed = '', $entity = '', $langfile = '', $enabled = '1')
 	{
 		if (empty($attrname)) return -1;
 		if (empty($label)) return -1;
 
-		if ($elementtype == 'thirdparty') $elementtype='societe';
-		if ($elementtype == 'contact') $elementtype='socpeople';
+		if ($elementtype == 'thirdparty') $elementtype = 'societe';
+		if ($elementtype == 'contact') $elementtype = 'socpeople';
 
 		// Create field into database except for separator type which is not stored in database
 		if ($type != 'separate')
 		{
-			$result=$this->create($attrname, $type, $size, $elementtype, $unique, $required, $default_value, $param, $perms, $list, $computed, $help);
+			$result = $this->create($attrname, $type, $size, $elementtype, $unique, $required, $default_value, $param, $perms, $list, $computed, $help);
 		}
-		$err1=$this->errno;
+		$err1 = $this->errno;
 		if ($result > 0 || $err1 == 'DB_ERROR_COLUMN_ALREADY_EXISTS' || $type == 'separate')
 		{
 			// Add declaration of field into table
-			$result2=$this->create_label($attrname, $label, $type, $pos, $size, $elementtype, $unique, $required, $param, $alwayseditable, $perms, $list, $help, $default_value, $computed, $entity, $langfile, $enabled);
-			$err2=$this->errno;
+			$result2 = $this->create_label($attrname, $label, $type, $pos, $size, $elementtype, $unique, $required, $param, $alwayseditable, $perms, $list, $help, $default_value, $computed, $entity, $langfile, $enabled);
+			$err2 = $this->errno;
 			if ($result2 > 0 || ($err1 == 'DB_ERROR_COLUMN_ALREADY_EXISTS' && $err2 == 'DB_ERROR_RECORD_ALREADY_EXISTS'))
 			{
-				$this->error='';
-				$this->errno=0;
+				$this->error = '';
+				$this->errno = 0;
 				return 1;
 			}
 			else return -2;
@@ -221,69 +221,69 @@ 
 	 *  @param  string  $computed           Computed value
 	 *  @return int      	           		<=0 if KO, >0 if OK
 	 */
-	private function create($attrname, $type='varchar', $length=255, $elementtype='member', $unique=0, $required=0, $default_value='',$param='', $perms='', $list='0', $computed='')
+	private function create($attrname, $type = 'varchar', $length = 255, $elementtype = 'member', $unique = 0, $required = 0, $default_value = '', $param = '', $perms = '', $list = '0', $computed = '')
 	{
-		if ($elementtype == 'thirdparty') $elementtype='societe';
-		if ($elementtype == 'contact') $elementtype='socpeople';
-
-		$table=$elementtype.'_extrafields';
-		if ($elementtype == 'categorie') $table='categories_extrafields';
-
-		if (! empty($attrname) && preg_match("/^\w[a-zA-Z0-9_]*$/",$attrname) && ! is_numeric($attrname))
-		{
-			if ($type=='boolean') {
-				$typedb='int';
-				$lengthdb='1';
-			} elseif($type=='price') {
-				$typedb='double';
-				$lengthdb='24,8';
-			} elseif($type=='phone') {
-				$typedb='varchar';
-				$lengthdb='20';
-			} elseif($type=='mail') {
-				$typedb='varchar';
-				$lengthdb='128';
-			} elseif($type=='url') {
-				$typedb='varchar';
-				$lengthdb='255';
-			} elseif (($type=='select') || ($type=='sellist') || ($type=='radio') ||($type=='checkbox') ||($type=='chkbxlst')){
-				$typedb='varchar';
-				$lengthdb='255';
-			} elseif ($type=='link') {
-				$typedb='int';
-				$lengthdb='11';
-			} elseif ($type=='html') {
-				$typedb='text';
-				$lengthdb=$length;
-			} elseif($type=='password') {
-				$typedb='varchar';
-				$lengthdb='128';
+		if ($elementtype == 'thirdparty') $elementtype = 'societe';
+		if ($elementtype == 'contact') $elementtype = 'socpeople';
+
+		$table = $elementtype.'_extrafields';
+		if ($elementtype == 'categorie') $table = 'categories_extrafields';
+
+		if (!empty($attrname) && preg_match("/^\w[a-zA-Z0-9_]*$/", $attrname) && !is_numeric($attrname))
+		{
+			if ($type == 'boolean') {
+				$typedb = 'int';
+				$lengthdb = '1';
+			} elseif ($type == 'price') {
+				$typedb = 'double';
+				$lengthdb = '24,8';
+			} elseif ($type == 'phone') {
+				$typedb = 'varchar';
+				$lengthdb = '20';
+			} elseif ($type == 'mail') {
+				$typedb = 'varchar';
+				$lengthdb = '128';
+			} elseif ($type == 'url') {
+				$typedb = 'varchar';
+				$lengthdb = '255';
+			} elseif (($type == 'select') || ($type == 'sellist') || ($type == 'radio') || ($type == 'checkbox') || ($type == 'chkbxlst')) {
+				$typedb = 'varchar';
+				$lengthdb = '255';
+			} elseif ($type == 'link') {
+				$typedb = 'int';
+				$lengthdb = '11';
+			} elseif ($type == 'html') {
+				$typedb = 'text';
+				$lengthdb = $length;
+			} elseif ($type == 'password') {
+				$typedb = 'varchar';
+				$lengthdb = '128';
 			} else {
-				$typedb=$type;
-				$lengthdb=$length;
-				if ($type == 'varchar' && empty($lengthdb)) $lengthdb='255';
+				$typedb = $type;
+				$lengthdb = $length;
+				if ($type == 'varchar' && empty($lengthdb)) $lengthdb = '255';
 			}
 			$field_desc = array(
 				'type'=>$typedb,
 				'value'=>$lengthdb,
-				'null'=>($required?'NOT NULL':'NULL'),
+				'null'=>($required ? 'NOT NULL' : 'NULL'),
 				'default' => $default_value
 			);
 
-			$result=$this->db->DDLAddField(MAIN_DB_PREFIX.$table, $attrname, $field_desc);
+			$result = $this->db->DDLAddField(MAIN_DB_PREFIX.$table, $attrname, $field_desc);
 			if ($result > 0)
 			{
 				if ($unique)
 				{
-					$sql="ALTER TABLE ".MAIN_DB_PREFIX.$table." ADD UNIQUE INDEX uk_".$table."_".$attrname." (".$attrname.")";
-					$resql=$this->db->query($sql,1,'dml');
+					$sql = "ALTER TABLE ".MAIN_DB_PREFIX.$table." ADD UNIQUE INDEX uk_".$table."_".$attrname." (".$attrname.")";
+					$resql = $this->db->query($sql, 1, 'dml');
 				}
 				return 1;
 			}
 			else
 			{
-				$this->error=$this->db->lasterror();
-				$this->errno=$this->db->lasterrno();
+				$this->error = $this->db->lasterror();
+				$this->errno = $this->db->lasterrno();
 				return -1;
 			}
 		}
@@ -317,22 +317,22 @@ 
 	 *  @param  string  		$enabled  		Condition to have the field enabled or not
 	 *  @return	int								<=0 if KO, >0 if OK
 	 */
-	private function create_label($attrname, $label='', $type='', $pos=0, $size=0, $elementtype='member', $unique=0, $required=0, $param='', $alwayseditable=0, $perms='', $list='-1', $help='', $default='', $computed='',$entity='', $langfile='', $enabled='1')
+	private function create_label($attrname, $label = '', $type = '', $pos = 0, $size = 0, $elementtype = 'member', $unique = 0, $required = 0, $param = '', $alwayseditable = 0, $perms = '', $list = '-1', $help = '', $default = '', $computed = '', $entity = '', $langfile = '', $enabled = '1')
 	{
         // phpcs:enable
-		global $conf,$user;
+		global $conf, $user;
 
-		if ($elementtype == 'thirdparty') $elementtype='societe';
-		if ($elementtype == 'contact') $elementtype='socpeople';
+		if ($elementtype == 'thirdparty') $elementtype = 'societe';
+		if ($elementtype == 'contact') $elementtype = 'socpeople';
 
 		// Clean parameters
-		if (empty($pos)) $pos=0;
-		if (empty($list)) $list='0';
-		if (empty($required)) $required=0;
-		if (empty($unique)) $unique=0;
-		if (empty($alwayseditable)) $alwayseditable=0;
+		if (empty($pos)) $pos = 0;
+		if (empty($list)) $list = '0';
+		if (empty($required)) $required = 0;
+		if (empty($unique)) $unique = 0;
+		if (empty($alwayseditable)) $alwayseditable = 0;
 
-		if (! empty($attrname) && preg_match("/^\w[a-zA-Z0-9-_]*$/",$attrname) && ! is_numeric($attrname))
+		if (!empty($attrname) && preg_match("/^\w[a-zA-Z0-9-_]*$/", $attrname) && !is_numeric($attrname))
 		{
 			if (is_array($param) && count($param) > 0)
 			{
@@ -344,54 +344,54 @@ 
 			}
 			else
 			{
-				$params='';
+				$params = '';
 			}
 
 			$sql = "INSERT INTO ".MAIN_DB_PREFIX."extrafields(";
-			$sql.= " name,";
-			$sql.= " label,";
-			$sql.= " type,";
-			$sql.= " pos,";
-			$sql.= " size,";
-			$sql.= " entity,";
-			$sql.= " elementtype,";
-			$sql.= " fieldunique,";
-			$sql.= " fieldrequired,";
-			$sql.= " param,";
-			$sql.= " alwayseditable,";
-			$sql.= " perms,";
-			$sql.= " langs,";
-			$sql.= " list,";
-			$sql.= " fielddefault,";
-			$sql.= " fieldcomputed,";
-			$sql.= " fk_user_author,";
-			$sql.= " fk_user_modif,";
-			$sql.= " datec,";
-			$sql.= " enabled,";
-			$sql.= " help";
-			$sql.= " )";
-			$sql.= " VALUES('".$attrname."',";
-			$sql.= " '".$this->db->escape($label)."',";
-			$sql.= " '".$this->db->escape($type)."',";
-			$sql.= " ".$pos.",";
-			$sql.= " '".$this->db->escape($size)."',";
-			$sql.= " ".($entity===''?$conf->entity:$entity).",";
-			$sql.= " '".$this->db->escape($elementtype)."',";
-			$sql.= " ".$unique.",";
-			$sql.= " ".$required.",";
-			$sql.= " '".$this->db->escape($params)."',";
-			$sql.= " ".$alwayseditable.",";
-			$sql.= " ".($perms?"'".$this->db->escape($perms)."'":"null").",";
-			$sql.= " ".($langfile?"'".$this->db->escape($langfile)."'":"null").",";
-			$sql.= " '".$this->db->escape($list)."',";
-			$sql.= " ".($default?"'".$this->db->escape($default)."'":"null").",";
-			$sql.= " ".($computed?"'".$this->db->escape($computed)."'":"null").",";
-			$sql .= " " . (is_object($user) ? $user->id : 0). ",";
-			$sql .= " " . (is_object($user) ? $user->id : 0). ",";
-			$sql .= "'" . $this->db->idate(dol_now()) . "',";
-			$sql.= " ".($enabled?"'".$this->db->escape($enabled)."'":"1").",";
-			$sql.= " ".($help?"'".$this->db->escape($help)."'":"null");
-			$sql.=')';
+			$sql .= " name,";
+			$sql .= " label,";
+			$sql .= " type,";
+			$sql .= " pos,";
+			$sql .= " size,";
+			$sql .= " entity,";
+			$sql .= " elementtype,";
+			$sql .= " fieldunique,";
+			$sql .= " fieldrequired,";
+			$sql .= " param,";
+			$sql .= " alwayseditable,";
+			$sql .= " perms,";
+			$sql .= " langs,";
+			$sql .= " list,";
+			$sql .= " fielddefault,";
+			$sql .= " fieldcomputed,";
+			$sql .= " fk_user_author,";
+			$sql .= " fk_user_modif,";
+			$sql .= " datec,";
+			$sql .= " enabled,";
+			$sql .= " help";
+			$sql .= " )";
+			$sql .= " VALUES('".$attrname."',";
+			$sql .= " '".$this->db->escape($label)."',";
+			$sql .= " '".$this->db->escape($type)."',";
+			$sql .= " ".$pos.",";
+			$sql .= " '".$this->db->escape($size)."',";
+			$sql .= " ".($entity === '' ? $conf->entity : $entity).",";
+			$sql .= " '".$this->db->escape($elementtype)."',";
+			$sql .= " ".$unique.",";
+			$sql .= " ".$required.",";
+			$sql .= " '".$this->db->escape($params)."',";
+			$sql .= " ".$alwayseditable.",";
+			$sql .= " ".($perms ? "'".$this->db->escape($perms)."'" : "null").",";
+			$sql .= " ".($langfile ? "'".$this->db->escape($langfile)."'" : "null").",";
+			$sql .= " '".$this->db->escape($list)."',";
+			$sql .= " ".($default ? "'".$this->db->escape($default)."'" : "null").",";
+			$sql .= " ".($computed ? "'".$this->db->escape($computed)."'" : "null").",";
+			$sql .= " ".(is_object($user) ? $user->id : 0).",";
+			$sql .= " ".(is_object($user) ? $user->id : 0).",";
+			$sql .= "'".$this->db->idate(dol_now())."',";
+			$sql .= " ".($enabled ? "'".$this->db->escape($enabled)."'" : "1").",";
+			$sql .= " ".($help ? "'".$this->db->escape($help)."'" : "null");
+			$sql .= ')';
 
 			dol_syslog(get_class($this)."::create_label", LOG_DEBUG);
 			if ($this->db->query($sql))
@@ -400,8 +400,8 @@ 
 			}
 			else
 			{
-				$this->error=$this->db->lasterror();
-				$this->errno=$this->db->lasterrno();
+				$this->error = $this->db->lasterror();
+				$this->errno = $this->db->lasterrno();
 				return -1;
 			}
 		}
@@ -414,31 +414,31 @@ 
 	 *  @param  string	$elementtype    Element type ('member', 'product', 'thirdparty', 'contact', ...)
 	 *  @return int              		< 0 if KO, 0 if nothing is done, 1 if OK
 	 */
-	function delete($attrname, $elementtype='member')
+	function delete($attrname, $elementtype = 'member')
 	{
-		if ($elementtype == 'thirdparty') $elementtype='societe';
-		if ($elementtype == 'contact') $elementtype='socpeople';
+		if ($elementtype == 'thirdparty') $elementtype = 'societe';
+		if ($elementtype == 'contact') $elementtype = 'socpeople';
 
-		$table=$elementtype.'_extrafields';
-		if ($elementtype == 'categorie') $table='categories_extrafields';
+		$table = $elementtype.'_extrafields';
+		if ($elementtype == 'categorie') $table = 'categories_extrafields';
 
-		$error=0;
+		$error = 0;
 
-		if (! empty($attrname) && preg_match("/^\w[a-zA-Z0-9-_]*$/",$attrname))
+		if (!empty($attrname) && preg_match("/^\w[a-zA-Z0-9-_]*$/", $attrname))
 		{
-			$result=$this->delete_label($attrname,$elementtype);
+			$result = $this->delete_label($attrname, $elementtype);
 			if ($result < 0)
 			{
-			    $this->error=$this->db->lasterror();
+			    $this->error = $this->db->lasterror();
 			    $error++;
 			}
 
-			if (! $error)
+			if (!$error)
 			{
         		$sql = "SELECT COUNT(rowid) as nb";
-        		$sql.= " FROM ".MAIN_DB_PREFIX."extrafields";
-        		$sql.= " WHERE elementtype = '".$elementtype."'";
-        		$sql.= " AND name = '".$attrname."'";
+        		$sql .= " FROM ".MAIN_DB_PREFIX."extrafields";
+        		$sql .= " WHERE elementtype = '".$elementtype."'";
+        		$sql .= " AND name = '".$attrname."'";
         		//$sql.= " AND entity IN (0,".$conf->entity.")";      Do not test on entity here. We want to see if there is still on field remaning in other entities before deleting field in table
                 $resql = $this->db->query($sql);
                 if ($resql)
@@ -446,10 +446,10 @@ 
                     $obj = $this->db->fetch_object($resql);
                     if ($obj->nb <= 0)
                     {
-            			$result=$this->db->DDLDropField(MAIN_DB_PREFIX.$table,$attrname);	// This also drop the unique key
+            			$result = $this->db->DDLDropField(MAIN_DB_PREFIX.$table, $attrname); // This also drop the unique key
             			if ($result < 0)
             			{
-            				$this->error=$this->db->lasterror();
+            				$this->error = $this->db->lasterror();
             				$error++;
             			}
                     }
@@ -472,23 +472,23 @@ 
 	 *  @param  string	$elementtype        Element type ('member', 'product', 'thirdparty', ...)
 	 *  @return int              			< 0 if KO, 0 if nothing is done, 1 if OK
 	 */
-	private function delete_label($attrname, $elementtype='member')
+	private function delete_label($attrname, $elementtype = 'member')
 	{
         // phpcs:enable
 		global $conf;
 
-		if ($elementtype == 'thirdparty') $elementtype='societe';
-		if ($elementtype == 'contact') $elementtype='socpeople';
+		if ($elementtype == 'thirdparty') $elementtype = 'societe';
+		if ($elementtype == 'contact') $elementtype = 'socpeople';
 
-		if (isset($attrname) && $attrname != '' && preg_match("/^\w[a-zA-Z0-9-_]*$/",$attrname))
+		if (isset($attrname) && $attrname != '' && preg_match("/^\w[a-zA-Z0-9-_]*$/", $attrname))
 		{
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."extrafields";
-			$sql.= " WHERE name = '".$attrname."'";
-			$sql.= " AND entity IN  (0,".$conf->entity.')';
-			$sql.= " AND elementtype = '".$elementtype."'";
+			$sql .= " WHERE name = '".$attrname."'";
+			$sql .= " AND entity IN  (0,".$conf->entity.')';
+			$sql .= " AND elementtype = '".$elementtype."'";
 
 			dol_syslog(get_class($this)."::delete_label", LOG_DEBUG);
-			$resql=$this->db->query($sql);
+			$resql = $this->db->query($sql);
 			if ($resql)
 			{
 				return 1;
@@ -529,82 +529,82 @@ 
      *  @param  int     $totalizable        Is extrafield totalizable on list
 	 * 	@return	int							>0 if OK, <=0 if KO
 	 */
-	function update($attrname, $label, $type, $length, $elementtype, $unique=0, $required=0, $pos=0, $param='', $alwayseditable=0, $perms='', $list='', $help='', $default='', $computed='', $entity='', $langfile='', $enabled='1', $totalizable=0)
+	function update($attrname, $label, $type, $length, $elementtype, $unique = 0, $required = 0, $pos = 0, $param = '', $alwayseditable = 0, $perms = '', $list = '', $help = '', $default = '', $computed = '', $entity = '', $langfile = '', $enabled = '1', $totalizable = 0)
 	{
-		if ($elementtype == 'thirdparty') $elementtype='societe';
-		if ($elementtype == 'contact') $elementtype='socpeople';
-
-        $table=$elementtype.'_extrafields';
-		if ($elementtype == 'categorie') $table='categories_extrafields';
-
-		if (isset($attrname) && $attrname != '' && preg_match("/^\w[a-zA-Z0-9-_]*$/",$attrname))
-		{
-			if ($type=='boolean') {
-				$typedb='int';
-				$lengthdb='1';
-			} elseif($type=='price') {
-				$typedb='double';
-				$lengthdb='24,8';
-			} elseif($type=='phone') {
-				$typedb='varchar';
-				$lengthdb='20';
-			} elseif($type=='mail') {
-				$typedb='varchar';
-				$lengthdb='128';
-			} elseif($type=='url') {
-				$typedb='varchar';
-				$lengthdb='255';
-			} elseif (($type=='select') || ($type=='sellist') || ($type=='radio') || ($type=='checkbox') || ($type=='chkbxlst')) {
-				$typedb='varchar';
-				$lengthdb='255';
+		if ($elementtype == 'thirdparty') $elementtype = 'societe';
+		if ($elementtype == 'contact') $elementtype = 'socpeople';
+
+        $table = $elementtype.'_extrafields';
+		if ($elementtype == 'categorie') $table = 'categories_extrafields';
+
+		if (isset($attrname) && $attrname != '' && preg_match("/^\w[a-zA-Z0-9-_]*$/", $attrname))
+		{
+			if ($type == 'boolean') {
+				$typedb = 'int';
+				$lengthdb = '1';
+			} elseif ($type == 'price') {
+				$typedb = 'double';
+				$lengthdb = '24,8';
+			} elseif ($type == 'phone') {
+				$typedb = 'varchar';
+				$lengthdb = '20';
+			} elseif ($type == 'mail') {
+				$typedb = 'varchar';
+				$lengthdb = '128';
+			} elseif ($type == 'url') {
+				$typedb = 'varchar';
+				$lengthdb = '255';
+			} elseif (($type == 'select') || ($type == 'sellist') || ($type == 'radio') || ($type == 'checkbox') || ($type == 'chkbxlst')) {
+				$typedb = 'varchar';
+				$lengthdb = '255';
 			} elseif ($type == 'html') {
-				$typedb='text';
-			} elseif ($type=='link') {
-				$typedb='int';
-				$lengthdb='11';
-			} elseif($type=='password') {
-				$typedb='varchar';
-				$lengthdb='50';
+				$typedb = 'text';
+			} elseif ($type == 'link') {
+				$typedb = 'int';
+				$lengthdb = '11';
+			} elseif ($type == 'password') {
+				$typedb = 'varchar';
+				$lengthdb = '50';
 			} else {
-				$typedb=$type;
-				$lengthdb=$length;
+				$typedb = $type;
+				$lengthdb = $length;
 			}
-			$field_desc = array('type'=>$typedb, 'value'=>$lengthdb, 'null'=>($required?'NOT NULL':'NULL'), 'default'=>$default);
+			$field_desc = array('type'=>$typedb, 'value'=>$lengthdb, 'null'=>($required ? 'NOT NULL' : 'NULL'), 'default'=>$default);
 
 			if ($type != 'separate') // No table update when separate type
 			{
-				$result=$this->db->DDLUpdateField(MAIN_DB_PREFIX.$table, $attrname, $field_desc);
+				$result = $this->db->DDLUpdateField(MAIN_DB_PREFIX.$table, $attrname, $field_desc);
 			}
 			if ($result > 0 || $type == 'separate')
 			{
 				if ($label)
 				{
-					$result=$this->update_label($attrname,$label,$type,$length,$elementtype,$unique,$required,$pos,$param,$alwayseditable,$perms,$list,$help,$default,$computed,$entity,$langfile,$enabled, $totalizable);
+					$result = $this->update_label($attrname, $label, $type, $length, $elementtype, $unique, $required, $pos, $param, $alwayseditable, $perms, $list, $help, $default, $computed, $entity, $langfile, $enabled, $totalizable);
 				}
 				if ($result > 0)
 				{
-					$sql='';
+					$sql = '';
 					if ($unique)
 					{
-						$sql="ALTER TABLE ".MAIN_DB_PREFIX.$table." ADD UNIQUE INDEX uk_".$table."_".$attrname." (".$attrname.")";
+						$sql = "ALTER TABLE ".MAIN_DB_PREFIX.$table." ADD UNIQUE INDEX uk_".$table."_".$attrname." (".$attrname.")";
 					}
 					else
 					{
-						$sql="ALTER TABLE ".MAIN_DB_PREFIX.$table." DROP INDEX uk_".$table."_".$attrname;
+						$sql = "ALTER TABLE ".MAIN_DB_PREFIX.$table." DROP INDEX uk_".$table."_".$attrname;
 					}
 					dol_syslog(get_class($this).'::update', LOG_DEBUG);
-					$resql=$this->db->query($sql,1,'dml');
+					$resql = $this->db->query($sql, 1, 'dml');
 					return 1;
 				}
 				else
 				{
-					$this->error=$this->db->lasterror();
+					$this->error = $this->db->lasterror();
 					return -1;
 				}
 			}
 			else
 			{
-				$this->error=$this->db->lasterror();
+				$this->error = $this->db->lasterror();
 				return -1;
 			}
 		}
@@ -639,26 +639,26 @@ 
      *  @param  int     $totalizable        Is extrafield totalizable on list
      *  @return	int							<=0 if KO, >0 if OK
 	 */
-	private function update_label($attrname,$label,$type,$size,$elementtype,$unique=0,$required=0,$pos=0,$param='',$alwayseditable=0,$perms='',$list='0',$help='',$default='',$computed='',$entity='',$langfile='',$enabled='1', $totalizable=0)
+	private function update_label($attrname, $label, $type, $size, $elementtype, $unique = 0, $required = 0, $pos = 0, $param = '', $alwayseditable = 0, $perms = '', $list = '0', $help = '', $default = '', $computed = '', $entity = '', $langfile = '', $enabled = '1', $totalizable = 0)
 	{
         // phpcs:enable
 		global $conf, $user;
 		dol_syslog(get_class($this)."::update_label ".$attrname.", ".$label.", ".$type.", ".$size.", ".$elementtype.", ".$unique.", ".$required.", ".$pos.", ".$alwayseditable.", ".$perms.", ".$list.", ".$default.", ".$computed.", ".$entity.", ".$langfile.", ".$enabled.", ".$totalizable);
 
 		// Clean parameters
-		if ($elementtype == 'thirdparty') $elementtype='societe';
-		if ($elementtype == 'contact') $elementtype='socpeople';
+		if ($elementtype == 'thirdparty') $elementtype = 'societe';
+		if ($elementtype == 'contact') $elementtype = 'socpeople';
 
-		if (empty($pos)) $pos=0;
-		if (empty($list)) $list='0';
+		if (empty($pos)) $pos = 0;
+		if (empty($list)) $list = '0';
         if (empty($totalizable)) {
             $totalizable = 0;
         }
-		if (empty($required)) $required=0;
-		if (empty($unique)) $unique=0;
-		if (empty($alwayseditable)) $alwayseditable=0;
+		if (empty($required)) $required = 0;
+		if (empty($unique)) $unique = 0;
+		if (empty($alwayseditable)) $alwayseditable = 0;
 
-		if (isset($attrname) && $attrname != '' && preg_match("/^\w[a-zA-Z0-9-_]*$/",$attrname))
+		if (isset($attrname) && $attrname != '' && preg_match("/^\w[a-zA-Z0-9-_]*$/", $attrname))
 		{
 			$this->db->begin();
 
@@ -672,76 +672,76 @@ 
 			}
 			else
 			{
-				$params='';
+				$params = '';
 			}
 
 			if ($entity === '' || $entity != '0')
 			{
 				// We dont want on all entities, we delete all and current
 				$sql_del = "DELETE FROM ".MAIN_DB_PREFIX."extrafields";
-				$sql_del.= " WHERE name = '".$attrname."'";
-				$sql_del.= " AND entity IN (0, ".($entity===''?$conf->entity:$entity).")";
-				$sql_del.= " AND elementtype = '".$elementtype."'";
+				$sql_del .= " WHERE name = '".$attrname."'";
+				$sql_del .= " AND entity IN (0, ".($entity === '' ? $conf->entity : $entity).")";
+				$sql_del .= " AND elementtype = '".$elementtype."'";
 			}
 			else
 			{
 				// We want on all entities ($entities = '0'), we delete on all only (we keep setup specific to each entity)
 				$sql_del = "DELETE FROM ".MAIN_DB_PREFIX."extrafields";
-				$sql_del.= " WHERE name = '".$attrname."'";
-				$sql_del.= " AND entity = 0";
-				$sql_del.= " AND elementtype = '".$elementtype."'";
+				$sql_del .= " WHERE name = '".$attrname."'";
+				$sql_del .= " AND entity = 0";
+				$sql_del .= " AND elementtype = '".$elementtype."'";
 			}
-			$resql1=$this->db->query($sql_del);
+			$resql1 = $this->db->query($sql_del);
 
 			$sql = "INSERT INTO ".MAIN_DB_PREFIX."extrafields(";
-			$sql.= " name,";		// This is code
-			$sql.= " entity,";
-			$sql.= " label,";
-			$sql.= " type,";
-			$sql.= " size,";
-			$sql.= " elementtype,";
-			$sql.= " fieldunique,";
-			$sql.= " fieldrequired,";
-			$sql.= " perms,";
-			$sql.= " langs,";
-			$sql.= " pos,";
-			$sql.= " alwayseditable,";
-			$sql.= " param,";
-			$sql.= " list,";
-            $sql.= " totalizable,";
-			$sql.= " fielddefault,";
-			$sql.= " fieldcomputed,";
-			$sql.= " fk_user_author,";
-			$sql.= " fk_user_modif,";
-			$sql.= " datec,";
-			$sql.= " enabled,";
-			$sql.= " help";
-			$sql.= ") VALUES (";
-			$sql.= "'".$attrname."',";
-			$sql.= " ".($entity===''?$conf->entity:$entity).",";
-			$sql.= " '".$this->db->escape($label)."',";
-			$sql.= " '".$this->db->escape($type)."',";
-			$sql.= " '".$this->db->escape($size)."',";
-			$sql.= " '".$this->db->escape($elementtype)."',";
-			$sql.= " ".$unique.",";
-			$sql.= " ".$required.",";
-			$sql.= " ".($perms?"'".$this->db->escape($perms)."'":"null").",";
-			$sql.= " ".($langfile?"'".$this->db->escape($langfile)."'":"null").",";
-			$sql.= " ".$pos.",";
-			$sql.= " '".$this->db->escape($alwayseditable)."',";
-			$sql.= " '".$this->db->escape($params)."',";
-			$sql.= " '".$this->db->escape($list)."', ";
-            $sql.= " ".$totalizable.",";
-			$sql.= " ".(($default!='')?"'".$this->db->escape($default)."'":"null").",";
-			$sql.= " ".($computed?"'".$this->db->escape($computed)."'":"null").",";
-			$sql .= " " . $user->id . ",";
-			$sql .= " " . $user->id . ",";
-			$sql .= "'" . $this->db->idate(dol_now()) . "',";
-			$sql .= "'" . $this->db->escape($enabled). "',";
-			$sql.= " ".($help?"'".$this->db->escape($help)."'":"null");
-			$sql.= ")";
-
-			$resql2=$this->db->query($sql);
+			$sql .= " name,"; // This is code
+			$sql .= " entity,";
+			$sql .= " label,";
+			$sql .= " type,";
+			$sql .= " size,";
+			$sql .= " elementtype,";
+			$sql .= " fieldunique,";
+			$sql .= " fieldrequired,";
+			$sql .= " perms,";
+			$sql .= " langs,";
+			$sql .= " pos,";
+			$sql .= " alwayseditable,";
+			$sql .= " param,";
+			$sql .= " list,";
+            $sql .= " totalizable,";
+			$sql .= " fielddefault,";
+			$sql .= " fieldcomputed,";
+			$sql .= " fk_user_author,";
+			$sql .= " fk_user_modif,";
+			$sql .= " datec,";
+			$sql .= " enabled,";
+			$sql .= " help";
+			$sql .= ") VALUES (";
+			$sql .= "'".$attrname."',";
+			$sql .= " ".($entity === '' ? $conf->entity : $entity).",";
+			$sql .= " '".$this->db->escape($label)."',";
+			$sql .= " '".$this->db->escape($type)."',";
+			$sql .= " '".$this->db->escape($size)."',";
+			$sql .= " '".$this->db->escape($elementtype)."',";
+			$sql .= " ".$unique.",";
+			$sql .= " ".$required.",";
+			$sql .= " ".($perms ? "'".$this->db->escape($perms)."'" : "null").",";
+			$sql .= " ".($langfile ? "'".$this->db->escape($langfile)."'" : "null").",";
+			$sql .= " ".$pos.",";
+			$sql .= " '".$this->db->escape($alwayseditable)."',";
+			$sql .= " '".$this->db->escape($params)."',";
+			$sql .= " '".$this->db->escape($list)."', ";
+            $sql .= " ".$totalizable.",";
+			$sql .= " ".(($default != '') ? "'".$this->db->escape($default)."'" : "null").",";
+			$sql .= " ".($computed ? "'".$this->db->escape($computed)."'" : "null").",";
+			$sql .= " ".$user->id.",";
+			$sql .= " ".$user->id.",";
+			$sql .= "'".$this->db->idate(dol_now())."',";
+			$sql .= "'".$this->db->escape($enabled)."',";
+			$sql .= " ".($help ? "'".$this->db->escape($help)."'" : "null");
+			$sql .= ")";
+
+			$resql2 = $this->db->query($sql);
 
 			if ($resql1 && $resql2)
 			{
@@ -770,34 +770,34 @@ 
 	 * 	@param	boolean		$forceload			Force load of extra fields whatever is option MAIN_EXTRAFIELDS_DISABLED. Deprecated. Should not be required.
 	 * 	@return	array							Array of attributes keys+label for all extra fields.
 	 */
-	function fetch_name_optionals_label($elementtype,$forceload=false)
+	function fetch_name_optionals_label($elementtype, $forceload = false)
 	{
         // phpcs:enable
 		global $conf;
 
 		if (empty($elementtype)) return array();
 
-		if ($elementtype == 'thirdparty') $elementtype='societe';
-		if ($elementtype == 'contact') $elementtype='socpeople';
-		if ($elementtype == 'order_supplier') $elementtype='commande_fournisseur';
+		if ($elementtype == 'thirdparty') $elementtype = 'societe';
+		if ($elementtype == 'contact') $elementtype = 'socpeople';
+		if ($elementtype == 'order_supplier') $elementtype = 'commande_fournisseur';
 
-		$array_name_label=array();
+		$array_name_label = array();
 
 		// To avoid conflicts with external modules. TODO Remove this.
 		if (!$forceload && !empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) return $array_name_label;
 
 		// Set array of label of entity
 		// TODO Remove completely loading of label. This should be done by presentation.
-		$labelmulticompany=array();
+		$labelmulticompany = array();
 		if (!empty($conf->multicompany->enabled))
 		{
-			$sql_entity_name='SELECT rowid, label FROM '.MAIN_DB_PREFIX.'entity WHERE rowid in (0,'.$conf->entity.')';
-			$resql_entity_name=$this->db->query($sql_entity_name);
+			$sql_entity_name = 'SELECT rowid, label FROM '.MAIN_DB_PREFIX.'entity WHERE rowid in (0,'.$conf->entity.')';
+			$resql_entity_name = $this->db->query($sql_entity_name);
 			if ($resql_entity_name)
 			{
 				while ($obj = $this->db->fetch_object($resql_entity_name))
 				{
-					$labelmulticompany[$obj->rowid]=$obj->label;
+					$labelmulticompany[$obj->rowid] = $obj->label;
 				}
 			}
 		}
@@ -806,12 +806,12 @@ 
 		dol_syslog("fetch_name_optionals_label elementtype=".$elementtype);
 
 		$sql = "SELECT rowid,name,label,type,size,elementtype,fieldunique,fieldrequired,param,pos,alwayseditable,perms,langs,list,totalizable,fielddefault,fieldcomputed,entity,enabled,help";
-		$sql.= " FROM ".MAIN_DB_PREFIX."extrafields";
-		$sql.= " WHERE entity IN (0,".$conf->entity.")";
-		if ($elementtype) $sql.= " AND elementtype = '".$elementtype."'";	// Filed with object->table_element
-		$sql.= " ORDER BY pos";
+		$sql .= " FROM ".MAIN_DB_PREFIX."extrafields";
+		$sql .= " WHERE entity IN (0,".$conf->entity.")";
+		if ($elementtype) $sql .= " AND elementtype = '".$elementtype."'"; // Filed with object->table_element
+		$sql .= " ORDER BY pos";
 
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			if ($this->db->num_rows($resql))
@@ -821,57 +821,57 @@ 
 					// We can add this attribute to object. TODO Remove this and return $this->attributes[$elementtype]['label']
 					if ($tab->type != 'separate')
 					{
-						$array_name_label[$tab->name]=$tab->label;
+						$array_name_label[$tab->name] = $tab->label;
 					}
 
 					// Old usage
-					$this->attribute_type[$tab->name]=$tab->type;
-					$this->attribute_label[$tab->name]=$tab->label;
-					$this->attribute_size[$tab->name]=$tab->size;
-					$this->attribute_elementtype[$tab->name]=$tab->elementtype;
-					$this->attribute_default[$tab->name]=$tab->fielddefault;
-					$this->attribute_computed[$tab->name]=$tab->fieldcomputed;
-					$this->attribute_unique[$tab->name]=$tab->fieldunique;
-					$this->attribute_required[$tab->name]=$tab->fieldrequired;
-					$this->attribute_param[$tab->name]=($tab->param ? unserialize($tab->param) : '');
-					$this->attribute_pos[$tab->name]=$tab->pos;
-					$this->attribute_alwayseditable[$tab->name]=$tab->alwayseditable;
-					$this->attribute_perms[$tab->name]=(strlen($tab->perms) == 0 ? 1 : $tab->perms);
-					$this->attribute_langfile[$tab->name]=$tab->langs;
-					$this->attribute_list[$tab->name]=$tab->list;
-					$this->attribute_totalizable[$tab->name]=$tab->totalizable;
-					$this->attribute_entityid[$tab->name]=$tab->entity;
-					$this->attribute_entitylabel[$tab->name]=(empty($labelmulticompany[$tab->entity])?'Entity'.$tab->entity:$labelmulticompany[$tab->entity]);
+					$this->attribute_type[$tab->name] = $tab->type;
+					$this->attribute_label[$tab->name] = $tab->label;
+					$this->attribute_size[$tab->name] = $tab->size;
+					$this->attribute_elementtype[$tab->name] = $tab->elementtype;
+					$this->attribute_default[$tab->name] = $tab->fielddefault;
+					$this->attribute_computed[$tab->name] = $tab->fieldcomputed;
+					$this->attribute_unique[$tab->name] = $tab->fieldunique;
+					$this->attribute_required[$tab->name] = $tab->fieldrequired;
+					$this->attribute_param[$tab->name] = ($tab->param ? unserialize($tab->param) : '');
+					$this->attribute_pos[$tab->name] = $tab->pos;
+					$this->attribute_alwayseditable[$tab->name] = $tab->alwayseditable;
+					$this->attribute_perms[$tab->name] = (strlen($tab->perms) == 0 ? 1 : $tab->perms);
+					$this->attribute_langfile[$tab->name] = $tab->langs;
+					$this->attribute_list[$tab->name] = $tab->list;
+					$this->attribute_totalizable[$tab->name] = $tab->totalizable;
+					$this->attribute_entityid[$tab->name] = $tab->entity;
+					$this->attribute_entitylabel[$tab->name] = (empty($labelmulticompany[$tab->entity]) ? 'Entity'.$tab->entity : $labelmulticompany[$tab->entity]);
 
 					// New usage
-					$this->attributes[$tab->elementtype]['type'][$tab->name]=$tab->type;
-					$this->attributes[$tab->elementtype]['label'][$tab->name]=$tab->label;
-					$this->attributes[$tab->elementtype]['size'][$tab->name]=$tab->size;
-					$this->attributes[$tab->elementtype]['elementtype'][$tab->name]=$tab->elementtype;
-					$this->attributes[$tab->elementtype]['default'][$tab->name]=$tab->fielddefault;
-					$this->attributes[$tab->elementtype]['computed'][$tab->name]=$tab->fieldcomputed;
-					$this->attributes[$tab->elementtype]['unique'][$tab->name]=$tab->fieldunique;
-					$this->attributes[$tab->elementtype]['required'][$tab->name]=$tab->fieldrequired;
-					$this->attributes[$tab->elementtype]['param'][$tab->name]=($tab->param ? unserialize($tab->param) : '');
-					$this->attributes[$tab->elementtype]['pos'][$tab->name]=$tab->pos;
-					$this->attributes[$tab->elementtype]['alwayseditable'][$tab->name]=$tab->alwayseditable;
-					$this->attributes[$tab->elementtype]['perms'][$tab->name]=(strlen($tab->perms) == 0 ? 1 : $tab->perms);
-					$this->attributes[$tab->elementtype]['langfile'][$tab->name]=$tab->langs;
-					$this->attributes[$tab->elementtype]['list'][$tab->name]=$tab->list;
-                    $this->attributes[$tab->elementtype]['totalizable'][$tab->name]=$tab->totalizable;
-					$this->attributes[$tab->elementtype]['entityid'][$tab->name]=$tab->entity;
-					$this->attributes[$tab->elementtype]['entitylabel'][$tab->name]=(empty($labelmulticompany[$tab->entity])?'Entity'.$tab->entity:$labelmulticompany[$tab->entity]);
-					$this->attributes[$tab->elementtype]['enabled'][$tab->name]=$tab->enabled;
-					$this->attributes[$tab->elementtype]['help'][$tab->name]=$tab->help;
-
-					$this->attributes[$tab->elementtype]['loaded']=1;
+					$this->attributes[$tab->elementtype]['type'][$tab->name] = $tab->type;
+					$this->attributes[$tab->elementtype]['label'][$tab->name] = $tab->label;
+					$this->attributes[$tab->elementtype]['size'][$tab->name] = $tab->size;
+					$this->attributes[$tab->elementtype]['elementtype'][$tab->name] = $tab->elementtype;
+					$this->attributes[$tab->elementtype]['default'][$tab->name] = $tab->fielddefault;
+					$this->attributes[$tab->elementtype]['computed'][$tab->name] = $tab->fieldcomputed;
+					$this->attributes[$tab->elementtype]['unique'][$tab->name] = $tab->fieldunique;
+					$this->attributes[$tab->elementtype]['required'][$tab->name] = $tab->fieldrequired;
+					$this->attributes[$tab->elementtype]['param'][$tab->name] = ($tab->param ? unserialize($tab->param) : '');
+					$this->attributes[$tab->elementtype]['pos'][$tab->name] = $tab->pos;
+					$this->attributes[$tab->elementtype]['alwayseditable'][$tab->name] = $tab->alwayseditable;
+					$this->attributes[$tab->elementtype]['perms'][$tab->name] = (strlen($tab->perms) == 0 ? 1 : $tab->perms);
+					$this->attributes[$tab->elementtype]['langfile'][$tab->name] = $tab->langs;
+					$this->attributes[$tab->elementtype]['list'][$tab->name] = $tab->list;
+                    $this->attributes[$tab->elementtype]['totalizable'][$tab->name] = $tab->totalizable;
+					$this->attributes[$tab->elementtype]['entityid'][$tab->name] = $tab->entity;
+					$this->attributes[$tab->elementtype]['entitylabel'][$tab->name] = (empty($labelmulticompany[$tab->entity]) ? 'Entity'.$tab->entity : $labelmulticompany[$tab->entity]);
+					$this->attributes[$tab->elementtype]['enabled'][$tab->name] = $tab->enabled;
+					$this->attributes[$tab->elementtype]['help'][$tab->name] = $tab->help;
+
+					$this->attributes[$tab->elementtype]['loaded'] = 1;
 				}
 			}
-			if ($elementtype) $this->attributes[$elementtype]['loaded']=1;	// If nothing found, we also save tag 'loaded'
+			if ($elementtype) $this->attributes[$elementtype]['loaded'] = 1; // If nothing found, we also save tag 'loaded'
 		}
 		else
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			dol_syslog(get_class($this)."::fetch_name_optionals_label ".$this->error, LOG_ERR);
 		}
 
@@ -893,57 +893,57 @@ 
 	 * @param  string  $extrafieldsobjectkey	If defined (for example $object->table_element), use the new method to get extrafields data
 	 * @return string
 	 */
-	function showInputField($key, $value, $moreparam='', $keysuffix='', $keyprefix='', $morecss='', $objectid=0, $extrafieldsobjectkey='')
+	function showInputField($key, $value, $moreparam = '', $keysuffix = '', $keyprefix = '', $morecss = '', $objectid = 0, $extrafieldsobjectkey = '')
 	{
-		global $conf,$langs,$form;
+		global $conf, $langs, $form;
 
-		if (! is_object($form))
+		if (!is_object($form))
 		{
 			require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
-			$form=new Form($this->db);
+			$form = new Form($this->db);
 		}
 
-		$out='';
+		$out = '';
 
-		$keyprefix = $keyprefix.'options_';		// Because we work on extrafields
+		$keyprefix = $keyprefix.'options_'; // Because we work on extrafields
 
-		if (! empty($extrafieldsobjectkey))
+		if (!empty($extrafieldsobjectkey))
 		{
-			$label=$this->attributes[$extrafieldsobjectkey]['label'][$key];
-			$type=$this->attributes[$extrafieldsobjectkey]['type'][$key];
-			$size=$this->attributes[$extrafieldsobjectkey]['size'][$key];
-			$default=$this->attributes[$extrafieldsobjectkey]['default'][$key];
-			$computed=$this->attributes[$extrafieldsobjectkey]['computed'][$key];
-			$unique=$this->attributes[$extrafieldsobjectkey]['unique'][$key];
-			$required=$this->attributes[$extrafieldsobjectkey]['required'][$key];
-			$param=$this->attributes[$extrafieldsobjectkey]['param'][$key];
-			$perms=dol_eval($this->attributes[$extrafieldsobjectkey]['perms'][$key], 1);
-			$langfile=$this->attributes[$extrafieldsobjectkey]['langfile'][$key];
-			$list=dol_eval($this->attributes[$extrafieldsobjectkey]['list'][$key], 1);
-			$totalizable=$this->attributes[$extrafieldsobjectkey]['totalizable'][$key];
-			$help=$this->attributes[$extrafieldsobjectkey]['help'][$key];
-			$hidden=(empty($list) ? 1 : 0);		// If empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
+			$label = $this->attributes[$extrafieldsobjectkey]['label'][$key];
+			$type = $this->attributes[$extrafieldsobjectkey]['type'][$key];
+			$size = $this->attributes[$extrafieldsobjectkey]['size'][$key];
+			$default = $this->attributes[$extrafieldsobjectkey]['default'][$key];
+			$computed = $this->attributes[$extrafieldsobjectkey]['computed'][$key];
+			$unique = $this->attributes[$extrafieldsobjectkey]['unique'][$key];
+			$required = $this->attributes[$extrafieldsobjectkey]['required'][$key];
+			$param = $this->attributes[$extrafieldsobjectkey]['param'][$key];
+			$perms = dol_eval($this->attributes[$extrafieldsobjectkey]['perms'][$key], 1);
+			$langfile = $this->attributes[$extrafieldsobjectkey]['langfile'][$key];
+			$list = dol_eval($this->attributes[$extrafieldsobjectkey]['list'][$key], 1);
+			$totalizable = $this->attributes[$extrafieldsobjectkey]['totalizable'][$key];
+			$help = $this->attributes[$extrafieldsobjectkey]['help'][$key];
+			$hidden = (empty($list) ? 1 : 0); // If empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
 		}
 		else	// Old usage
 		{
-			$label=$this->attribute_label[$key];
-			$type =$this->attribute_type[$key];
-			$size =$this->attribute_size[$key];
-			$elementtype=$this->attribute_elementtype[$key];	// Seems not used
-			$default=$this->attribute_default[$key];
-			$computed=$this->attribute_computed[$key];
-			$unique=$this->attribute_unique[$key];
-			$required=$this->attribute_required[$key];
-			$param=$this->attribute_param[$key];
-			$langfile=$this->attribute_langfile[$key];
-			$list=$this->attribute_list[$key];
-			$totalizable=$this->attribute_totalizable[$key];
-			$hidden=(empty($list) ? 1 : 0);		// If empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
+			$label = $this->attribute_label[$key];
+			$type = $this->attribute_type[$key];
+			$size = $this->attribute_size[$key];
+			$elementtype = $this->attribute_elementtype[$key]; // Seems not used
+			$default = $this->attribute_default[$key];
+			$computed = $this->attribute_computed[$key];
+			$unique = $this->attribute_unique[$key];
+			$required = $this->attribute_required[$key];
+			$param = $this->attribute_param[$key];
+			$langfile = $this->attribute_langfile[$key];
+			$list = $this->attribute_list[$key];
+			$totalizable = $this->attribute_totalizable[$key];
+			$hidden = (empty($list) ? 1 : 0); // If empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
 		}
 
 		if ($computed)
 		{
-			if (! preg_match('/^search_/', $keyprefix)) return '<span class="opacitymedium">'.$langs->trans("AutomaticallyCalculated").'</span>';
+			if (!preg_match('/^search_/', $keyprefix)) return '<span class="opacitymedium">'.$langs->trans("AutomaticallyCalculated").'</span>';
 			else return '';
 		}
 
@@ -957,21 +957,21 @@ 
 			{
 				$morecss = 'minwidth200imp';
 			}
-			elseif (in_array($type,array('int','integer','double','price')))
+			elseif (in_array($type, array('int', 'integer', 'double', 'price')))
 			{
 				$morecss = 'maxwidth75';
 			}
 			elseif ($type == 'password')
 			{
-				$morecss='maxwidth100';
+				$morecss = 'maxwidth100';
 			}
 			elseif ($type == 'url')
 			{
-				$morecss='minwidth400';
+				$morecss = 'minwidth400';
 			}
 			elseif ($type == 'boolean')
 			{
-				$morecss='';
+				$morecss = '';
 			}
 			else
 			{
@@ -990,12 +990,12 @@ 
 			}
 		}
 
-		if (in_array($type,array('date','datetime')))
+		if (in_array($type, array('date', 'datetime')))
 		{
-			$tmp=explode(',',$size);
-			$newsize=$tmp[0];
+			$tmp = explode(',', $size);
+			$newsize = $tmp[0];
 
-			$showtime = in_array($type,array('datetime')) ? 1 : 0;
+			$showtime = in_array($type, array('datetime')) ? 1 : 0;
 
 			// Do not show current date when field not required (see selectDate() method)
 			if (!$required && $value == '') $value = '-1';
@@ -1003,244 +1003,244 @@ 
 			// TODO Must also support $moreparam
 			$out = $form->selectDate($value, $keyprefix.$key.$keysuffix, $showtime, $showtime, $required, '', 1, (($keyprefix != 'search_' && $keyprefix != 'search_options_') ? 1 : 0), 0, 1);
 		}
-		elseif (in_array($type,array('int','integer')))
+		elseif (in_array($type, array('int', 'integer')))
 		{
-			$tmp=explode(',',$size);
-			$newsize=$tmp[0];
-			$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$newsize.'" value="'.dol_escape_htmltag($value).'"'.($moreparam?$moreparam:'').'>';
+			$tmp = explode(',', $size);
+			$newsize = $tmp[0];
+			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$newsize.'" value="'.dol_escape_htmltag($value).'"'.($moreparam ? $moreparam : '').'>';
 		}
 		elseif (preg_match('/varchar/', $type))
 		{
-			$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$size.'" value="'.dol_escape_htmltag($value).'"'.($moreparam?$moreparam:'').'>';
+			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$size.'" value="'.dol_escape_htmltag($value).'"'.($moreparam ? $moreparam : '').'>';
 		}
 		elseif (in_array($type, array('mail', 'phone', 'url')))
 		{
-			$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam?$moreparam:'').'>';
+			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam ? $moreparam : '').'>';
 		}
 		elseif ($type == 'text')
 		{
-			if (! preg_match('/search_/', $keyprefix))		// If keyprefix is search_ or search_options_, we must just use a simple text field
+			if (!preg_match('/search_/', $keyprefix))		// If keyprefix is search_ or search_options_, we must just use a simple text field
 			{
 				require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-				$doleditor=new DolEditor($keyprefix.$key.$keysuffix,$value,'',200,'dolibarr_notes','In',false,false,false,ROWS_5,'90%');
-				$out=$doleditor->Create(1);
+				$doleditor = new DolEditor($keyprefix.$key.$keysuffix, $value, '', 200, 'dolibarr_notes', 'In', false, false, false, ROWS_5, '90%');
+				$out = $doleditor->Create(1);
 			}
 			else
 			{
-				$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam?$moreparam:'').'>';
+				$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam ? $moreparam : '').'>';
 			}
 		}
 		elseif ($type == 'html')
 		{
-			if (! preg_match('/search_/', $keyprefix))		// If keyprefix is search_ or search_options_, we must just use a simple text field
+			if (!preg_match('/search_/', $keyprefix))		// If keyprefix is search_ or search_options_, we must just use a simple text field
 			{
 				require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-				$doleditor=new DolEditor($keyprefix.$key.$keysuffix,$value,'',200,'dolibarr_notes','In',false,false,! empty($conf->fckeditor->enabled) && $conf->global->FCKEDITOR_ENABLE_SOCIETE,ROWS_5,'90%');
-				$out=$doleditor->Create(1);
+				$doleditor = new DolEditor($keyprefix.$key.$keysuffix, $value, '', 200, 'dolibarr_notes', 'In', false, false, !empty($conf->fckeditor->enabled) && $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_5, '90%');
+				$out = $doleditor->Create(1);
 			}
 			else
 			{
-				$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam?$moreparam:'').'>';
+				$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam ? $moreparam : '').'>';
 			}
 		}
 		elseif ($type == 'boolean')
 		{
-			$checked='';
+			$checked = '';
 			if (!empty($value)) {
-				$checked=' checked value="1" ';
+				$checked = ' checked value="1" ';
 			} else {
-				$checked=' value="1" ';
+				$checked = ' value="1" ';
 			}
-			$out='<input type="checkbox" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.$checked.' '.($moreparam?$moreparam:'').'>';
+			$out = '<input type="checkbox" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.$checked.' '.($moreparam ? $moreparam : '').'>';
 		}
 		elseif ($type == 'price')
 		{
 			if (!empty($value)) {		// $value in memory is a php numeric, we format it into user number format.
-				$value=price($value);
+				$value = price($value);
 			}
-			$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam?$moreparam:'').'> '.$langs->getCurrencySymbol($conf->currency);
+			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam ? $moreparam : '').'> '.$langs->getCurrencySymbol($conf->currency);
 		}
 		elseif ($type == 'double')
 		{
 			if (!empty($value)) {		// $value in memory is a php numeric, we format it into user number format.
-				$value=price($value);
+				$value = price($value);
 			}
-			$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam?$moreparam:'').'> ';
+			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam ? $moreparam : '').'> ';
 		}
 		elseif ($type == 'select')
 		{
 			$out = '';
-			if (! empty($conf->use_javascript_ajax) && ! empty($conf->global->MAIN_EXTRAFIELDS_USE_SELECT2))
+			if (!empty($conf->use_javascript_ajax) && !empty($conf->global->MAIN_EXTRAFIELDS_USE_SELECT2))
 			{
-				include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
-				$out.= ajax_combobox($keyprefix.$key.$keysuffix, array(), 0);
+				include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
+				$out .= ajax_combobox($keyprefix.$key.$keysuffix, array(), 0);
 			}
 
-			$out.='<select class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam?$moreparam:'').'>';
-			$out.='<option value="0">&nbsp;</option>';
+			$out .= '<select class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam ? $moreparam : '').'>';
+			$out .= '<option value="0">&nbsp;</option>';
 			foreach ($param['options'] as $key => $val)
 			{
 				if ((string) $key == '') continue;
 				list($val, $parent) = explode('|', $val);
-				$out.='<option value="'.$key.'"';
-				$out.= (((string) $value == (string) $key)?' selected':'');
-				$out.= (!empty($parent)?' parent="'.$parent.'"':'');
-				$out.='>';
-				if ($langfile && $val) $out.=$langs->trans($val);
-				else $out.=$val;
-				$out.='</option>';
+				$out .= '<option value="'.$key.'"';
+				$out .= (((string) $value == (string) $key) ? ' selected' : '');
+				$out .= (!empty($parent) ? ' parent="'.$parent.'"' : '');
+				$out .= '>';
+				if ($langfile && $val) $out .= $langs->trans($val);
+				else $out .= $val;
+				$out .= '</option>';
 			}
-			$out.='</select>';
+			$out .= '</select>';
 		}
 		elseif ($type == 'sellist')
 		{
 			$out = '';
-			if (! empty($conf->use_javascript_ajax) && ! empty($conf->global->MAIN_EXTRAFIELDS_USE_SELECT2))
+			if (!empty($conf->use_javascript_ajax) && !empty($conf->global->MAIN_EXTRAFIELDS_USE_SELECT2))
 			{
-				include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
-				$out.= ajax_combobox($keyprefix.$key.$keysuffix, array(), 0);
+				include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
+				$out .= ajax_combobox($keyprefix.$key.$keysuffix, array(), 0);
 			}
 
-			$out.='<select class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam?$moreparam:'').'>';
+			$out .= '<select class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam ? $moreparam : '').'>';
 			if (is_array($param['options']))
 			{
-				$param_list=array_keys($param['options']);
+				$param_list = array_keys($param['options']);
 				$InfoFieldList = explode(":", $param_list[0]);
-				$parentName='';
-				$parentField='';
+				$parentName = '';
+				$parentField = '';
 				// 0 : tableName
 				// 1 : label field name
 				// 2 : key fields name (if differ of rowid)
 				// 3 : key field parent (for dependent lists)
 				// 4 : where clause filter on column or table extrafield, syntax field='value' or extra.field=value
-				$keyList=(empty($InfoFieldList[2])?'rowid':$InfoFieldList[2].' as rowid');
+				$keyList = (empty($InfoFieldList[2]) ? 'rowid' : $InfoFieldList[2].' as rowid');
 
 
-				if (count($InfoFieldList) > 4 && ! empty($InfoFieldList[4]))
+				if (count($InfoFieldList) > 4 && !empty($InfoFieldList[4]))
 				{
 					if (strpos($InfoFieldList[4], 'extra.') !== false)
 					{
-						$keyList='main.'.$InfoFieldList[2].' as rowid';
+						$keyList = 'main.'.$InfoFieldList[2].' as rowid';
 					} else {
-						$keyList=$InfoFieldList[2].' as rowid';
+						$keyList = $InfoFieldList[2].' as rowid';
 					}
 				}
-				if (count($InfoFieldList) > 3 && ! empty($InfoFieldList[3]))
+				if (count($InfoFieldList) > 3 && !empty($InfoFieldList[3]))
 				{
 					list($parentName, $parentField) = explode('|', $InfoFieldList[3]);
-					$keyList.= ', '.$parentField;
+					$keyList .= ', '.$parentField;
 				}
 
-				$fields_label = explode('|',$InfoFieldList[1]);
+				$fields_label = explode('|', $InfoFieldList[1]);
 				if (is_array($fields_label))
 				{
-					$keyList .=', ';
+					$keyList .= ', ';
 					$keyList .= implode(', ', $fields_label);
 				}
 
-				$sqlwhere='';
+				$sqlwhere = '';
 				$sql = 'SELECT '.$keyList;
-				$sql.= ' FROM '.MAIN_DB_PREFIX .$InfoFieldList[0];
+				$sql .= ' FROM '.MAIN_DB_PREFIX.$InfoFieldList[0];
 				if (!empty($InfoFieldList[4]))
 				{
 				    // can use curent entity filter
-				    if (strpos($InfoFieldList[4], '$ENTITY$')!==false) {
-				        $InfoFieldList[4]=str_replace('$ENTITY$',$conf->entity,$InfoFieldList[4]);
+				    if (strpos($InfoFieldList[4], '$ENTITY$') !== false) {
+				        $InfoFieldList[4] = str_replace('$ENTITY$', $conf->entity, $InfoFieldList[4]);
 				    }
 					// can use SELECT request
-					if (strpos($InfoFieldList[4], '$SEL$')!==false) {
-						$InfoFieldList[4]=str_replace('$SEL$','SELECT',$InfoFieldList[4]);
+					if (strpos($InfoFieldList[4], '$SEL$') !== false) {
+						$InfoFieldList[4] = str_replace('$SEL$', 'SELECT', $InfoFieldList[4]);
 					}
 
 					// current object id can be use into filter
-					if (strpos($InfoFieldList[4], '$ID$')!==false && !empty($objectid)) {
-						$InfoFieldList[4]=str_replace('$ID$',$objectid,$InfoFieldList[4]);
+					if (strpos($InfoFieldList[4], '$ID$') !== false && !empty($objectid)) {
+						$InfoFieldList[4] = str_replace('$ID$', $objectid, $InfoFieldList[4]);
 					} else {
-						$InfoFieldList[4]=str_replace('$ID$','0',$InfoFieldList[4]);
+						$InfoFieldList[4] = str_replace('$ID$', '0', $InfoFieldList[4]);
 					}
 					//We have to join on extrafield table
-					if (strpos($InfoFieldList[4], 'extra')!==false)
+					if (strpos($InfoFieldList[4], 'extra') !== false)
 					{
-						$sql.= ' as main, '.MAIN_DB_PREFIX .$InfoFieldList[0].'_extrafields as extra';
-						$sqlwhere.= ' WHERE extra.fk_object=main.'.$InfoFieldList[2]. ' AND '.$InfoFieldList[4];
+						$sql .= ' as main, '.MAIN_DB_PREFIX.$InfoFieldList[0].'_extrafields as extra';
+						$sqlwhere .= ' WHERE extra.fk_object=main.'.$InfoFieldList[2].' AND '.$InfoFieldList[4];
 					}
 					else
 					{
-						$sqlwhere.= ' WHERE '.$InfoFieldList[4];
+						$sqlwhere .= ' WHERE '.$InfoFieldList[4];
 					}
 				}
 				else
 				{
-					$sqlwhere.= ' WHERE 1=1';
+					$sqlwhere .= ' WHERE 1=1';
 				}
 				// Some tables may have field, some other not. For the moment we disable it.
-				if (in_array($InfoFieldList[0],array('tablewithentity')))
+				if (in_array($InfoFieldList[0], array('tablewithentity')))
 				{
-					$sqlwhere.= ' AND entity = '.$conf->entity;
+					$sqlwhere .= ' AND entity = '.$conf->entity;
 				}
-				$sql.=$sqlwhere;
+				$sql .= $sqlwhere;
 				//print $sql;
 
-				$sql .= ' ORDER BY ' . implode(', ', $fields_label);
+				$sql .= ' ORDER BY '.implode(', ', $fields_label);
 
 				dol_syslog(get_class($this).'::showInputField type=sellist', LOG_DEBUG);
 				$resql = $this->db->query($sql);
 				if ($resql)
 				{
-					$out.='<option value="0">&nbsp;</option>';
+					$out .= '<option value="0">&nbsp;</option>';
 					$num = $this->db->num_rows($resql);
 					$i = 0;
 					while ($i < $num)
 					{
-						$labeltoshow='';
+						$labeltoshow = '';
 						$obj = $this->db->fetch_object($resql);
 
 						// Several field into label (eq table:code|libelle:rowid)
 						$notrans = false;
-						$fields_label = explode('|',$InfoFieldList[1]);
+						$fields_label = explode('|', $InfoFieldList[1]);
 						if (is_array($fields_label))
 						{
 							$notrans = true;
 							foreach ($fields_label as $field_toshow)
 							{
-								$labeltoshow.= $obj->$field_toshow.' ';
+								$labeltoshow .= $obj->$field_toshow.' ';
 							}
 						}
 						else
 						{
-							$labeltoshow=$obj->{$InfoFieldList[1]};
+							$labeltoshow = $obj->{$InfoFieldList[1]};
 						}
-						$labeltoshow=dol_trunc($labeltoshow,45);
+						$labeltoshow = dol_trunc($labeltoshow, 45);
 
 						if ($value == $obj->rowid)
 						{
 							foreach ($fields_label as $field_toshow)
 							{
-								$translabel=$langs->trans($obj->$field_toshow);
-								if ($translabel!=$obj->$field_toshow) {
-									$labeltoshow=dol_trunc($translabel,18).' ';
-								}else {
-									$labeltoshow=dol_trunc($obj->$field_toshow,18).' ';
+								$translabel = $langs->trans($obj->$field_toshow);
+								if ($translabel != $obj->$field_toshow) {
+									$labeltoshow = dol_trunc($translabel, 18).' ';
+								} else {
+									$labeltoshow = dol_trunc($obj->$field_toshow, 18).' ';
 								}
 							}
-							$out.='<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
+							$out .= '<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
 						}
 						else
 						{
-							if (! $notrans)
+							if (!$notrans)
 							{
-								$translabel=$langs->trans($obj->{$InfoFieldList[1]});
-								if ($translabel!=$obj->{$InfoFieldList[1]}) {
-									$labeltoshow=dol_trunc($translabel,18);
+								$translabel = $langs->trans($obj->{$InfoFieldList[1]});
+								if ($translabel != $obj->{$InfoFieldList[1]}) {
+									$labeltoshow = dol_trunc($translabel, 18);
 								}
 								else {
-									$labeltoshow=dol_trunc($obj->{$InfoFieldList[1]},18);
+									$labeltoshow = dol_trunc($obj->{$InfoFieldList[1]},18);
 								}
 							}
-							if (empty($labeltoshow)) $labeltoshow='(not defined)';
-							if ($value==$obj->rowid)
+							if (empty($labeltoshow)) $labeltoshow = '(not defined)';
+							if ($value == $obj->rowid)
 							{
-								$out.='<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
+								$out .= '<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
 							}
 
 							if (!empty($InfoFieldList[3]) && $parentField)
@@ -1248,10 +1248,10 @@ 
 								$parent = $parentName.':'.$obj->{$parentField};
 							}
 
-							$out.='<option value="'.$obj->rowid.'"';
-							$out.= ($value==$obj->rowid?' selected':'');
-							$out.= (!empty($parent)?' parent="'.$parent.'"':'');
-							$out.='>'.$labeltoshow.'</option>';
+							$out .= '<option value="'.$obj->rowid.'"';
+							$out .= ($value == $obj->rowid ? ' selected' : '');
+							$out .= (!empty($parent) ? ' parent="'.$parent.'"' : '');
+							$out .= '>'.$labeltoshow.'</option>';
 						}
 
 						$i++;
@@ -1262,23 +1262,23 @@ 
 					print 'Error in request '.$sql.' '.$this->db->lasterror().'. Check setup of extra parameters.<br>';
 				}
 			}
-			$out.='</select>';
+			$out .= '</select>';
 		}
 		elseif ($type == 'checkbox')
 		{
-			$value_arr=explode(',',$value);
-			$out=$form->multiselectarray($keyprefix.$key.$keysuffix, (empty($param['options'])?null:$param['options']), $value_arr, '', 0, '', 0, '100%');
+			$value_arr = explode(',', $value);
+			$out = $form->multiselectarray($keyprefix.$key.$keysuffix, (empty($param['options']) ?null:$param['options']), $value_arr, '', 0, '', 0, '100%');
 		}
 		elseif ($type == 'radio')
 		{
-			$out='';
+			$out = '';
 			foreach ($param['options'] as $keyopt => $val)
 			{
-				$out.='<input class="flat '.$morecss.'" type="radio" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam?$moreparam:'');
-				$out.=' value="'.$keyopt.'"';
-				$out.=' id="'.$keyprefix.$key.$keysuffix.'_'.$keyopt.'"';
-				$out.= ($value==$keyopt?'checked':'');
-				$out.='/><label for="'.$keyprefix.$key.$keysuffix.'_'.$keyopt.'">'.$val.'</label><br>';
+				$out .= '<input class="flat '.$morecss.'" type="radio" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam ? $moreparam : '');
+				$out .= ' value="'.$keyopt.'"';
+				$out .= ' id="'.$keyprefix.$key.$keysuffix.'_'.$keyopt.'"';
+				$out .= ($value == $keyopt ? 'checked' : '');
+				$out .= '/><label for="'.$keyprefix.$key.$keysuffix.'_'.$keyopt.'">'.$val.'</label><br>';
 			}
 		}
 		elseif ($type == 'chkbxlst')
@@ -1293,24 +1293,24 @@ 
 			if (is_array($param['options'])) {
 				$param_list = array_keys($param['options']);
 				$InfoFieldList = explode(":", $param_list[0]);
-				$parentName='';
-				$parentField='';
+				$parentName = '';
+				$parentField = '';
 				// 0 : tableName
 				// 1 : label field name
 				// 2 : key fields name (if differ of rowid)
 				// 3 : key field parent (for dependent lists)
 				// 4 : where clause filter on column or table extrafield, syntax field='value' or extra.field=value
-				$keyList = (empty($InfoFieldList[2]) ? 'rowid' : $InfoFieldList[2] . ' as rowid');
+				$keyList = (empty($InfoFieldList[2]) ? 'rowid' : $InfoFieldList[2].' as rowid');
 
-				if (count($InfoFieldList) > 3 && ! empty($InfoFieldList[3])) {
-					list ( $parentName, $parentField ) = explode('|', $InfoFieldList[3]);
-					$keyList .= ', ' . $parentField;
+				if (count($InfoFieldList) > 3 && !empty($InfoFieldList[3])) {
+					list ($parentName, $parentField) = explode('|', $InfoFieldList[3]);
+					$keyList .= ', '.$parentField;
 				}
-				if (count($InfoFieldList) > 4 && ! empty($InfoFieldList[4])) {
+				if (count($InfoFieldList) > 4 && !empty($InfoFieldList[4])) {
 					if (strpos($InfoFieldList[4], 'extra.') !== false) {
-						$keyList = 'main.' . $InfoFieldList[2] . ' as rowid';
+						$keyList = 'main.'.$InfoFieldList[2].' as rowid';
 					} else {
-						$keyList = $InfoFieldList[2] . ' as rowid';
+						$keyList = $InfoFieldList[2].' as rowid';
 					}
 				}
 
@@ -1321,59 +1321,59 @@ 
 				}
 
 				$sqlwhere = '';
-				$sql = 'SELECT ' . $keyList;
-				$sql .= ' FROM ' . MAIN_DB_PREFIX . $InfoFieldList[0];
-				if (! empty($InfoFieldList[4])) {
+				$sql = 'SELECT '.$keyList;
+				$sql .= ' FROM '.MAIN_DB_PREFIX.$InfoFieldList[0];
+				if (!empty($InfoFieldList[4])) {
 
 					// can use SELECT request
-					if (strpos($InfoFieldList[4], '$SEL$')!==false) {
-						$InfoFieldList[4]=str_replace('$SEL$','SELECT',$InfoFieldList[4]);
+					if (strpos($InfoFieldList[4], '$SEL$') !== false) {
+						$InfoFieldList[4] = str_replace('$SEL$', 'SELECT', $InfoFieldList[4]);
 					}
 
 					// current object id can be use into filter
-					if (strpos($InfoFieldList[4], '$ID$')!==false && !empty($objectid)) {
-						$InfoFieldList[4]=str_replace('$ID$',$objectid,$InfoFieldList[4]);
-					} else if (preg_match("#^.*list.php$#",$_SERVER["DOCUMENT_URI"])) {
+					if (strpos($InfoFieldList[4], '$ID$') !== false && !empty($objectid)) {
+						$InfoFieldList[4] = str_replace('$ID$', $objectid, $InfoFieldList[4]);
+					} else if (preg_match("#^.*list.php$#", $_SERVER["DOCUMENT_URI"])) {
 						// Pattern for word=$ID$
 						$word = '\b[a-zA-Z0-9-\.-_]+\b=\$ID\$';
 						
 						// Removing space arount =, ( and )
-						$InfoFieldList[4]=preg_replace('# *(=|\(|\)) *#','$1', $InfoFieldList[4]);
+						$InfoFieldList[4] = preg_replace('# *(=|\(|\)) *#', '$1', $InfoFieldList[4]);
 						
 						$nbPreg = 1;
 						// While we have parenthesis
-						while ($nbPreg!=0) {
+						while ($nbPreg != 0) {
 							// Init des compteurs
 							$nbPregRepl = $nbPregSel = 0;
 							// On retire toutes les parenthèses sans = avant
-							$InfoFieldList[4]=preg_replace( '#([^=])(\([^)^(]*(' . $word .   ')[^)^(]*\))#','$1 $3 ',$InfoFieldList[4],-1,$nbPregRepl);
+							$InfoFieldList[4] = preg_replace('#([^=])(\([^)^(]*('.$word.')[^)^(]*\))#', '$1 $3 ', $InfoFieldList[4], -1, $nbPregRepl);
 							// On retire les espaces autour des = et parenthèses
-							$InfoFieldList[4]=preg_replace('# *(=|\(|\)) *#','$1', $InfoFieldList[4]);
+							$InfoFieldList[4] = preg_replace('# *(=|\(|\)) *#', '$1', $InfoFieldList[4]);
 							// On retire toutes les parenthèses avec = avant
-							$InfoFieldList[4]=preg_replace(  '#\b[a-zA-Z0-9-\.-_]+\b=\([^)^(]*(' . $word .   ')[^)^(]*\)#','$1 ',$InfoFieldList[4], -1, $nbPregSel);
+							$InfoFieldList[4] = preg_replace('#\b[a-zA-Z0-9-\.-_]+\b=\([^)^(]*('.$word.')[^)^(]*\)#', '$1 ', $InfoFieldList[4], -1, $nbPregSel);
 							// On retire les espaces autour des = et parenthèses
-							$InfoFieldList[4]=preg_replace('# *(=|\(|\)) *#','$1', $InfoFieldList[4]);
+							$InfoFieldList[4] = preg_replace('# *(=|\(|\)) *#', '$1', $InfoFieldList[4]);
 							
 							// Calcul du compteur général pour la boucle
 							$nbPreg = $nbPregRepl + $nbPregSel;
 						}
 						
 						// Si l'on a un AND ou un OR, avant ou après
-						preg_match('#(AND|OR|) *('.$word.') *(AND|OR|)#',$InfoFieldList[4],$matchCondition);
-						while(!empty($matchCondition[0])) {
+						preg_match('#(AND|OR|) *('.$word.') *(AND|OR|)#', $InfoFieldList[4], $matchCondition);
+						while (!empty($matchCondition[0])) {
 							// If the two sides differ but are not empty
-							if (! empty($matchCondition[1]) && ! empty($matchCondition[3]) && $matchCondition[1] != $matchCondition[3] ) {
+							if (!empty($matchCondition[1]) && !empty($matchCondition[3]) && $matchCondition[1] != $matchCondition[3]) {
 								// Nobody sain would do that without parentheses
-								$InfoFieldList[4]=str_replace('$ID$','0',$InfoFieldList[4]);
+								$InfoFieldList[4] = str_replace('$ID$', '0', $InfoFieldList[4]);
 							}
 							else {
-								if (! empty($matchCondition[1])) {
-									$boolCond =(( $matchCondition[1] == "AND" )?' AND 1 ':' OR 0 ');
-									$InfoFieldList[4]=str_replace($matchCondition[0],$boolCond.$matchCondition[3],$InfoFieldList[4]);
+								if (!empty($matchCondition[1])) {
+									$boolCond = (($matchCondition[1] == "AND") ? ' AND 1 ' : ' OR 0 ');
+									$InfoFieldList[4] = str_replace($matchCondition[0], $boolCond.$matchCondition[3], $InfoFieldList[4]);
 								}
-								else if (! empty($matchCondition[3])) {
-									$boolCond =(( $matchCondition[3] == "AND" )?' 1 AND ':' 0 OR');
-									$InfoFieldList[4]=str_replace($matchCondition[0],$boolCond,$InfoFieldList[4]);
+								else if (!empty($matchCondition[3])) {
+									$boolCond = (($matchCondition[3] == "AND") ? ' 1 AND ' : ' 0 OR');
+									$InfoFieldList[4] = str_replace($matchCondition[0], $boolCond, $InfoFieldList[4]);
 								}
 								else {
 									$InfoFieldList[4] = 1;
@@ -1381,41 +1381,41 @@ 
 							}
 							
 							// Si l'on a un AND ou un OR, avant ou après
-							preg_match('#(AND|OR|) *('.$word.') *(AND|OR|)#',$InfoFieldList[4],$matchCondition);
+							preg_match('#(AND|OR|) *('.$word.') *(AND|OR|)#', $InfoFieldList[4], $matchCondition);
 						}
 					}
 					else {
-						$InfoFieldList[4]=str_replace('$ID$','0',$InfoFieldList[4]);
+						$InfoFieldList[4] = str_replace('$ID$', '0', $InfoFieldList[4]);
 					}
 
 					// We have to join on extrafield table
 					if (strpos($InfoFieldList[4], 'extra') !== false) {
-						$sql .= ' as main, ' . MAIN_DB_PREFIX . $InfoFieldList[0] . '_extrafields as extra';
-						$sqlwhere .= ' WHERE extra.fk_object=main.' . $InfoFieldList[2] . ' AND ' . $InfoFieldList[4];
+						$sql .= ' as main, '.MAIN_DB_PREFIX.$InfoFieldList[0].'_extrafields as extra';
+						$sqlwhere .= ' WHERE extra.fk_object=main.'.$InfoFieldList[2].' AND '.$InfoFieldList[4];
 					} else {
-						$sqlwhere .= ' WHERE ' . $InfoFieldList[4];
+						$sqlwhere .= ' WHERE '.$InfoFieldList[4];
 					}
 				} else {
 					$sqlwhere .= ' WHERE 1=1';
 				}
 				// Some tables may have field, some other not. For the moment we disable it.
-				if (in_array($InfoFieldList[0], array ('tablewithentity')))
+				if (in_array($InfoFieldList[0], array('tablewithentity')))
 				{
-					$sqlwhere .= ' AND entity = ' . $conf->entity;
+					$sqlwhere .= ' AND entity = '.$conf->entity;
 				}
 				// $sql.=preg_replace('/^ AND /','',$sqlwhere);
 				// print $sql;
 
 				$sql .= $sqlwhere;
-				dol_syslog(get_class($this) . '::showInputField type=chkbxlst',LOG_DEBUG);
+				dol_syslog(get_class($this).'::showInputField type=chkbxlst', LOG_DEBUG);
 				$resql = $this->db->query($sql);
 				if ($resql) {
 					$num = $this->db->num_rows($resql);
 					$i = 0;
 
-					$data=array();
+					$data = array();
 
-					while ( $i < $num ) {
+					while ($i < $num) {
 						$labeltoshow = '';
 						$obj = $this->db->fetch_object($resql);
 
@@ -1424,8 +1424,8 @@ 
 						$fields_label = explode('|', $InfoFieldList[1]);
 						if (is_array($fields_label)) {
 							$notrans = true;
-							foreach ( $fields_label as $field_toshow ) {
-								$labeltoshow .= $obj->$field_toshow . ' ';
+							foreach ($fields_label as $field_toshow) {
+								$labeltoshow .= $obj->$field_toshow.' ';
 							}
 						} else {
 							$labeltoshow = $obj->{$InfoFieldList[1]};
@@ -1433,18 +1433,18 @@ 
 						$labeltoshow = dol_trunc($labeltoshow, 45);
 
 						if (is_array($value_arr) && in_array($obj->rowid, $value_arr)) {
-							foreach ( $fields_label as $field_toshow ) {
+							foreach ($fields_label as $field_toshow) {
 								$translabel = $langs->trans($obj->$field_toshow);
 								if ($translabel != $obj->$field_toshow) {
-									$labeltoshow = dol_trunc($translabel, 18) . ' ';
+									$labeltoshow = dol_trunc($translabel, 18).' ';
 								} else {
-									$labeltoshow = dol_trunc($obj->$field_toshow, 18) . ' ';
+									$labeltoshow = dol_trunc($obj->$field_toshow, 18).' ';
 								}
 							}
 
-							$data[$obj->rowid]=$labeltoshow;
+							$data[$obj->rowid] = $labeltoshow;
 						} else {
-							if (! $notrans) {
+							if (!$notrans) {
 								$translabel = $langs->trans($obj->{$InfoFieldList[1]});
 								if ($translabel != $obj->{$InfoFieldList[1]}) {
 									$labeltoshow = dol_trunc($translabel, 18);
@@ -1456,40 +1456,40 @@ 
 								$labeltoshow = '(not defined)';
 
 								if (is_array($value_arr) && in_array($obj->rowid, $value_arr)) {
-									$data[$obj->rowid]=$labeltoshow;
+									$data[$obj->rowid] = $labeltoshow;
 								}
 
-								if (! empty($InfoFieldList[3]) && $parentField) {
-									$parent = $parentName . ':' . $obj->{$parentField};
+								if (!empty($InfoFieldList[3]) && $parentField) {
+									$parent = $parentName.':'.$obj->{$parentField};
 								}
 
-								$data[$obj->rowid]=$labeltoshow;
+								$data[$obj->rowid] = $labeltoshow;
 						}
 
-						$i ++;
+						$i++;
 					}
 					$this->db->free($resql);
 
-					$out=$form->multiselectarray($keyprefix.$key.$keysuffix, $data, $value_arr, '', 0, '', 0, '100%');
+					$out = $form->multiselectarray($keyprefix.$key.$keysuffix, $data, $value_arr, '', 0, '', 0, '100%');
 				} else {
-					print 'Error in request ' . $sql . ' ' . $this->db->lasterror() . '. Check setup of extra parameters.<br>';
+					print 'Error in request '.$sql.' '.$this->db->lasterror().'. Check setup of extra parameters.<br>';
 				}
 			}
 		}
 		elseif ($type == 'link')
 		{
-			$param_list=array_keys($param['options']);				// $param_list='ObjectName:classPath'
-			$showempty=(($required && $default != '')?0:1);
-			$out=$form->selectForForms($param_list[0], $keyprefix.$key.$keysuffix, $value, $showempty);
+			$param_list = array_keys($param['options']); // $param_list='ObjectName:classPath'
+			$showempty = (($required && $default != '') ? 0 : 1);
+			$out = $form->selectForForms($param_list[0], $keyprefix.$key.$keysuffix, $value, $showempty);
 		}
 		elseif ($type == 'password')
 		{
 			// If prefix is 'search_', field is used as a filter, we use a common text field.
-			$out='<input style="display:none" type="text" name="fakeusernameremembered">';	// Hidden field to reduce impact of evil Google Chrome autopopulate bug.
-			$out.='<input autocomplete="new-password" type="'.($keyprefix=='search_'?'text':'password').'" class="flat '.$morecss.'" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam?$moreparam:'').'>';
+			$out = '<input style="display:none" type="text" name="fakeusernameremembered">'; // Hidden field to reduce impact of evil Google Chrome autopopulate bug.
+			$out .= '<input autocomplete="new-password" type="'.($keyprefix == 'search_' ? 'text' : 'password').'" class="flat '.$morecss.'" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam ? $moreparam : '').'>';
 		}
 		if (!empty($hidden)) {
-			$out='<input type="hidden" value="'.$value.'" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'"/>';
+			$out = '<input type="hidden" value="'.$value.'" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'"/>';
 		}
 		/* Add comments
 		 if ($type == 'date') $out.=' (YYYY-MM-DD)';
@@ -1508,44 +1508,44 @@ 
 	 * @param	string	$extrafieldsobjectkey	If defined (for example $object->table_element), use the new method to get extrafields data
 	 * @return	string							Formated value
 	 */
-	function showOutputField($key, $value, $moreparam='', $extrafieldsobjectkey='')
+	function showOutputField($key, $value, $moreparam = '', $extrafieldsobjectkey = '')
 	{
-		global $conf,$langs;
-
-		if (! empty($extrafieldsobjectkey))
-		{
-			$label=$this->attributes[$extrafieldsobjectkey]['label'][$key];
-			$type=$this->attributes[$extrafieldsobjectkey]['type'][$key];
-			$size=$this->attributes[$extrafieldsobjectkey]['size'][$key];
-			$default=$this->attributes[$extrafieldsobjectkey]['default'][$key];
-			$computed=$this->attributes[$extrafieldsobjectkey]['computed'][$key];
-			$unique=$this->attributes[$extrafieldsobjectkey]['unique'][$key];
-			$required=$this->attributes[$extrafieldsobjectkey]['required'][$key];
-			$param=$this->attributes[$extrafieldsobjectkey]['param'][$key];
-			$perms=dol_eval($this->attributes[$extrafieldsobjectkey]['perms'][$key], 1);
-			$langfile=$this->attributes[$extrafieldsobjectkey]['langfile'][$key];
-			$list=dol_eval($this->attributes[$extrafieldsobjectkey]['list'][$key], 1);
-			$help=$this->attributes[$extrafieldsobjectkey]['help'][$key];
-			$hidden=(empty($list) ? 1 : 0);		// If $list empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
+		global $conf, $langs;
+
+		if (!empty($extrafieldsobjectkey))
+		{
+			$label = $this->attributes[$extrafieldsobjectkey]['label'][$key];
+			$type = $this->attributes[$extrafieldsobjectkey]['type'][$key];
+			$size = $this->attributes[$extrafieldsobjectkey]['size'][$key];
+			$default = $this->attributes[$extrafieldsobjectkey]['default'][$key];
+			$computed = $this->attributes[$extrafieldsobjectkey]['computed'][$key];
+			$unique = $this->attributes[$extrafieldsobjectkey]['unique'][$key];
+			$required = $this->attributes[$extrafieldsobjectkey]['required'][$key];
+			$param = $this->attributes[$extrafieldsobjectkey]['param'][$key];
+			$perms = dol_eval($this->attributes[$extrafieldsobjectkey]['perms'][$key], 1);
+			$langfile = $this->attributes[$extrafieldsobjectkey]['langfile'][$key];
+			$list = dol_eval($this->attributes[$extrafieldsobjectkey]['list'][$key], 1);
+			$help = $this->attributes[$extrafieldsobjectkey]['help'][$key];
+			$hidden = (empty($list) ? 1 : 0); // If $list empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
 		}
 		else	// Old usage
 		{
-			$label=$this->attribute_label[$key];
-			$type=$this->attribute_type[$key];
-			$size=$this->attribute_size[$key];
-			$default=$this->attribute_default[$key];
-			$computed=$this->attribute_computed[$key];
-			$unique=$this->attribute_unique[$key];
-			$required=$this->attribute_required[$key];
-			$param=$this->attribute_param[$key];
-			$perms=dol_eval($this->attribute_perms[$key], 1);
-			$langfile=$this->attribute_langfile[$key];
-			$list=dol_eval($this->attribute_list[$key], 1);
-			$help='';	// Not supported with old syntax
-			$hidden=(empty($list) ? 1 : 0);		// If $list empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
+			$label = $this->attribute_label[$key];
+			$type = $this->attribute_type[$key];
+			$size = $this->attribute_size[$key];
+			$default = $this->attribute_default[$key];
+			$computed = $this->attribute_computed[$key];
+			$unique = $this->attribute_unique[$key];
+			$required = $this->attribute_required[$key];
+			$param = $this->attribute_param[$key];
+			$perms = dol_eval($this->attribute_perms[$key], 1);
+			$langfile = $this->attribute_langfile[$key];
+			$list = dol_eval($this->attribute_list[$key], 1);
+			$help = ''; // Not supported with old syntax
+			$hidden = (empty($list) ? 1 : 0); // If $list empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
 		}
 
-		if ($hidden) return '';		// This is a protection. If field is hidden, we should just not call this method.
+		if ($hidden) return ''; // This is a protection. If field is hidden, we should just not call this method.
 
 		// If field is a computed field, value must become result of compute
 		if ($computed)
@@ -1555,88 +1555,88 @@ 
 		    $value = dol_eval($computed, 1, 0);
 		}
 
-		$showsize=0;
+		$showsize = 0;
 		if ($type == 'date')
 		{
-			$showsize=10;
-			$value=dol_print_date($value, 'day');
+			$showsize = 10;
+			$value = dol_print_date($value, 'day');
 		}
 		elseif ($type == 'datetime')
 		{
-			$showsize=19;
-			$value=dol_print_date($value, 'dayhour');
+			$showsize = 19;
+			$value = dol_print_date($value, 'dayhour');
 		}
 		elseif ($type == 'int')
 		{
-			$showsize=10;
+			$showsize = 10;
 		}
 		elseif ($type == 'double')
 		{
 			if (!empty($value)) {
-				$value=price($value);
+				$value = price($value);
 			}
 		}
 		elseif ($type == 'boolean')
 		{
-			$checked='';
+			$checked = '';
 			if (!empty($value)) {
-				$checked=' checked ';
+				$checked = ' checked ';
 			}
-			$value='<input type="checkbox" '.$checked.' '.($moreparam?$moreparam:'').' readonly disabled>';
+			$value = '<input type="checkbox" '.$checked.' '.($moreparam ? $moreparam : '').' readonly disabled>';
 		}
 		elseif ($type == 'mail')
 		{
-			$value=dol_print_email($value, 0, 0, 0, 64, 1, 1);
+			$value = dol_print_email($value, 0, 0, 0, 64, 1, 1);
 		}
 		elseif ($type == 'url')
 		{
-			$value=dol_print_url($value,'_blank',32,1);
+			$value = dol_print_url($value, '_blank', 32, 1);
 		}
 		elseif ($type == 'phone')
 		{
-			$value=dol_print_phone($value, '', 0, 0, '', '&nbsp;', 1);
+			$value = dol_print_phone($value, '', 0, 0, '', '&nbsp;', 1);
 		}
 		elseif ($type == 'price')
 		{
-			$value=price($value, 0, $langs, 0, 0, -1, $conf->currency);
+			$value = price($value, 0, $langs, 0, 0, -1, $conf->currency);
 		}
 		elseif ($type == 'select')
 		{
-			if ($langfile && $param['options'][$value]) $value=$langs->trans($param['options'][$value]);
-			else $value=$param['options'][$value];
+			if ($langfile && $param['options'][$value]) $value = $langs->trans($param['options'][$value]);
+			else $value = $param['options'][$value];
 		}
 		elseif ($type == 'sellist')
 		{
-			$param_list=array_keys($param['options']);
+			$param_list = array_keys($param['options']);
 			$InfoFieldList = explode(":", $param_list[0]);
 
-			$selectkey="rowid";
-			$keyList='rowid';
+			$selectkey = "rowid";
+			$keyList = 'rowid';
 
-			if (count($InfoFieldList)>=3)
+			if (count($InfoFieldList) >= 3)
 			{
 				$selectkey = $InfoFieldList[2];
-				$keyList=$InfoFieldList[2].' as rowid';
+				$keyList = $InfoFieldList[2].' as rowid';
 			}
 
-			$fields_label = explode('|',$InfoFieldList[1]);
-			if(is_array($fields_label)) {
-				$keyList .=', ';
+			$fields_label = explode('|', $InfoFieldList[1]);
+			if (is_array($fields_label)) {
+				$keyList .= ', ';
 				$keyList .= implode(', ', $fields_label);
 			}
 
 			$sql = 'SELECT '.$keyList;
-			$sql.= ' FROM '.MAIN_DB_PREFIX .$InfoFieldList[0];
-			if (strpos($InfoFieldList[4], 'extra')!==false)
+			$sql .= ' FROM '.MAIN_DB_PREFIX.$InfoFieldList[0];
+			if (strpos($InfoFieldList[4], 'extra') !== false)
 			{
-				$sql.= ' as main';
+				$sql .= ' as main';
 			}
-			if ($selectkey=='rowid' && empty($value)) {
-				$sql.= " WHERE ".$selectkey."=0";
-			} elseif ($selectkey=='rowid') {
-				$sql.= " WHERE ".$selectkey."=".$this->db->escape($value);
-			}else {
-				$sql.= " WHERE ".$selectkey."='".$this->db->escape($value)."'";
+			if ($selectkey == 'rowid' && empty($value)) {
+				$sql .= " WHERE ".$selectkey."=0";
+			} elseif ($selectkey == 'rowid') {
+				$sql .= " WHERE ".$selectkey."=".$this->db->escape($value);
+			} else {
+				$sql .= " WHERE ".$selectkey."='".$this->db->escape($value)."'";
 			}
 
 			//$sql.= ' AND entity = '.$conf->entity;
@@ -1645,38 +1645,38 @@ 
 			$resql = $this->db->query($sql);
 			if ($resql)
 			{
-				$value='';	// value was used, so now we reste it to use it to build final output
+				$value = ''; // value was used, so now we reste it to use it to build final output
 
 				$obj = $this->db->fetch_object($resql);
 
 				// Several field into label (eq table:code|libelle:rowid)
-				$fields_label = explode('|',$InfoFieldList[1]);
+				$fields_label = explode('|', $InfoFieldList[1]);
 
-				if(is_array($fields_label) && count($fields_label)>1)
+				if (is_array($fields_label) && count($fields_label) > 1)
 				{
 					foreach ($fields_label as $field_toshow)
 					{
-						$translabel='';
+						$translabel = '';
 						if (!empty($obj->$field_toshow)) {
-							$translabel=$langs->trans($obj->$field_toshow);
+							$translabel = $langs->trans($obj->$field_toshow);
 						}
-						if ($translabel!=$field_toshow) {
-							$value.=dol_trunc($translabel,18).' ';
-						}else {
-							$value.=$obj->$field_toshow.' ';
+						if ($translabel != $field_toshow) {
+							$value .= dol_trunc($translabel, 18).' ';
+						} else {
+							$value .= $obj->$field_toshow.' ';
 						}
 					}
 				}
 				else
 				{
-					$translabel='';
+					$translabel = '';
 					if (!empty($obj->{$InfoFieldList[1]})) {
-						$translabel=$langs->trans($obj->{$InfoFieldList[1]});
+						$translabel = $langs->trans($obj->{$InfoFieldList[1]});
 					}
-					if ($translabel!=$obj->{$InfoFieldList[1]}) {
-						$value=dol_trunc($translabel,18);
-					}else {
-						$value=$obj->{$InfoFieldList[1]};
+					if ($translabel != $obj->{$InfoFieldList[1]}) {
+						$value = dol_trunc($translabel, 18);
+					} else {
+						$value = $obj->{$InfoFieldList[1]};
 					}
 				}
 			}
@@ -1684,20 +1684,20 @@ 
 		}
 		elseif ($type == 'radio')
 		{
-			$value=$param['options'][$value];
+			$value = $param['options'][$value];
 		}
 		elseif ($type == 'checkbox')
 		{
-			$value_arr=explode(',',$value);
-			$value='';
-			$toprint=array();
+			$value_arr = explode(',', $value);
+			$value = '';
+			$toprint = array();
 			if (is_array($value_arr))
 			{
 				foreach ($value_arr as $keyval=>$valueval) {
-					$toprint[]='<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$param['options'][$valueval].'</li>';
+					$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$param['options'][$valueval].'</li>';
 				}
 			}
-			$value='<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';
+			$value = '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';
 		}
 		elseif ($type == 'chkbxlst')
 		{
@@ -1711,7 +1711,7 @@ 
 
 			if (count($InfoFieldList) >= 3) {
 				$selectkey = $InfoFieldList[2];
-				$keyList = $InfoFieldList[2] . ' as rowid';
+				$keyList = $InfoFieldList[2].' as rowid';
 			}
 
 			$fields_label = explode('|', $InfoFieldList[1]);
@@ -1720,74 +1720,74 @@ 
 				$keyList .= implode(', ', $fields_label);
 			}
 
-			$sql = 'SELECT ' . $keyList;
-			$sql .= ' FROM ' . MAIN_DB_PREFIX . $InfoFieldList[0];
+			$sql = 'SELECT '.$keyList;
+			$sql .= ' FROM '.MAIN_DB_PREFIX.$InfoFieldList[0];
 			if (strpos($InfoFieldList[4], 'extra') !== false) {
 				$sql .= ' as main';
 			}
 			// $sql.= " WHERE ".$selectkey."='".$this->db->escape($value)."'";
 			// $sql.= ' AND entity = '.$conf->entity;
 
-			dol_syslog(get_class($this) . ':showOutputField:$type=chkbxlst',LOG_DEBUG);
+			dol_syslog(get_class($this).':showOutputField:$type=chkbxlst', LOG_DEBUG);
 			$resql = $this->db->query($sql);
 			if ($resql) {
 				$value = ''; // value was used, so now we reste it to use it to build final output
-				$toprint=array();
-				while ( $obj = $this->db->fetch_object($resql) ) {
+				$toprint = array();
+				while ($obj = $this->db->fetch_object($resql)) {
 
 					// Several field into label (eq table:code|libelle:rowid)
 					$fields_label = explode('|', $InfoFieldList[1]);
 					if (is_array($value_arr) && in_array($obj->rowid, $value_arr)) {
 						if (is_array($fields_label) && count($fields_label) > 1) {
-							foreach ( $fields_label as $field_toshow ) {
+							foreach ($fields_label as $field_toshow) {
 								$translabel = '';
-								if (! empty($obj->$field_toshow)) {
+								if (!empty($obj->$field_toshow)) {
 									$translabel = $langs->trans($obj->$field_toshow);
 								}
 								if ($translabel != $field_toshow) {
-									$toprint[]='<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.dol_trunc($translabel, 18).'</li>';
+									$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.dol_trunc($translabel, 18).'</li>';
 								} else {
-									$toprint[]='<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$obj->$field_toshow.'</li>';
+									$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$obj->$field_toshow.'</li>';
 								}
 							}
 						} else {
 							$translabel = '';
-							if (! empty($obj->{$InfoFieldList[1]})) {
+							if (!empty($obj->{$InfoFieldList[1]})) {
 								$translabel = $langs->trans($obj->{$InfoFieldList[1]});
 							}
 							if ($translabel != $obj->{$InfoFieldList[1]}) {
-								$toprint[]='<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.dol_trunc($translabel, 18).'</li>';
+								$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.dol_trunc($translabel, 18).'</li>';
 							} else {
-								$toprint[]='<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$obj->{$InfoFieldList[1]}.'</li>';
+								$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$obj->{$InfoFieldList[1]}.'</li>';
 							}
 						}
 					}
 				}
-				$value='<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';
+				$value = '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';
 			} else {
-				dol_syslog(get_class($this) . '::showOutputField error ' . $this->db->lasterror(), LOG_WARNING);
+				dol_syslog(get_class($this).'::showOutputField error '.$this->db->lasterror(), LOG_WARNING);
 			}
 		}
 		elseif ($type == 'link')
 		{
-			$out='';
+			$out = '';
 
 			// Only if something to display (perf)
 			if ($value)		// If we have -1 here, pb is into sert, not into ouptu
 			{
-				$param_list=array_keys($param['options']);				// $param_list='ObjectName:classPath'
+				$param_list = array_keys($param['options']); // $param_list='ObjectName:classPath'
 
 				$InfoFieldList = explode(":", $param_list[0]);
-				$classname=$InfoFieldList[0];
-				$classpath=$InfoFieldList[1];
-				if (! empty($classpath))
+				$classname = $InfoFieldList[0];
+				$classpath = $InfoFieldList[1];
+				if (!empty($classpath))
 				{
 					dol_include_once($InfoFieldList[1]);
 					if ($classname && class_exists($classname))
 					{
 						$object = new $classname($this->db);
 						$object->fetch($value);
-						$value=$object->getNomUrl(3);
+						$value = $object->getNomUrl(3);
 					}
 				}
 				else
@@ -1799,24 +1799,24 @@ 
 		}
 		elseif ($type == 'text')
 		{
-			$value=dol_htmlentitiesbr($value);
+			$value = dol_htmlentitiesbr($value);
 		}
 		elseif ($type == 'html')
 		{
-			$value=dol_htmlentitiesbr($value);
+			$value = dol_htmlentitiesbr($value);
 		}
 		elseif ($type == 'password')
 		{
-			$value=dol_trunc(preg_replace('/./i','*',$value), 8, 'right', 'UTF-8', 1);
+			$value = dol_trunc(preg_replace('/./i', '*', $value), 8, 'right', 'UTF-8', 1);
 		}
 		else
 		{
-			$showsize=round($size);
-			if ($showsize > 48) $showsize=48;
+			$showsize = round($size);
+			if ($showsize > 48) $showsize = 48;
 		}
 
 		//print $type.'-'.$size;
-		$out=$value;
+		$out = $value;
 
 		return $out;
 	}
@@ -1828,46 +1828,46 @@ 
 	 * @param	string	$extrafieldsobjectkey	If defined, use the new method to get extrafields data
 	 * @return	string							Formated value
 	 */
-	function getAlignFlag($key, $extrafieldsobjectkey='')
+	function getAlignFlag($key, $extrafieldsobjectkey = '')
 	{
-		global $conf,$langs;
+		global $conf, $langs;
 
-		if (! empty($extrafieldsobjectkey)) $type=$this->attributes[$extrafieldsobjectkey]['type'][$key];
-		else $type=$this->attribute_type[$key];
+		if (!empty($extrafieldsobjectkey)) $type = $this->attributes[$extrafieldsobjectkey]['type'][$key];
+		else $type = $this->attribute_type[$key];
 
-		$align='';
+		$align = '';
 
         if ($type == 'date')
 		{
-			$align="center";
+			$align = "center";
 		}
 		elseif ($type == 'datetime')
 		{
-			$align="center";
+			$align = "center";
 		}
 		elseif ($type == 'int')
 		{
-			$align="right";
+			$align = "right";
 		}
 		elseif ($type == 'double')
 		{
-			$align="right";
+			$align = "right";
 		}
 		elseif ($type == 'boolean')
 		{
-			$align="center";
+			$align = "center";
 		}
 		elseif ($type == 'radio')
 		{
-			$align="center";
+			$align = "center";
 		}
 		elseif ($type == 'checkbox')
 		{
-			$align="center";
+			$align = "center";
 		}
 		elseif ($type == 'price')
 		{
-			$align="right";
+			$align = "right";
 		}
 
 		return $align;
@@ -1885,8 +1885,8 @@ 
 		global $langs;
 
 		$out = '<tr class="trextrafieldseparator trextrafieldseparator'.$key.'"><td colspan="2"><strong>';
-		$out.= $langs->trans($this->attributes[$object->table_element]['label'][$key]);
-		$out.= '</strong></td></tr>';
+		$out .= $langs->trans($this->attributes[$object->table_element]['label'][$key]);
+		$out .= '</strong></td></tr>';
 		return $out;
 	}
 
@@ -1898,20 +1898,20 @@ 
 	 * @param	string	$onlykey		Only following key is filled. When we make update of only one extrafield ($action = 'update_extras'), calling page must must set this to avoid to have other extrafields being reset.
 	 * @return	int						1 if array_options set, 0 if no value, -1 if error (field required missing for example)
 	 */
-	function setOptionalsFromPost($extralabels, &$object, $onlykey='')
+	function setOptionalsFromPost($extralabels, &$object, $onlykey = '')
 	{
 		global $_POST, $langs;
-		$nofillrequired='';// For error when required field left blank
+		$nofillrequired = ''; // For error when required field left blank
 		$error_field_required = array();
 
-		if (is_array($this->attributes[$object->table_element]['label'])) $extralabels=$this->attributes[$object->table_element]['label'];
+		if (is_array($this->attributes[$object->table_element]['label'])) $extralabels = $this->attributes[$object->table_element]['label'];
 
 		if (is_array($extralabels))
 		{
 			// Get extra fields
 			foreach ($extralabels as $key => $value)
 			{
-				if (! empty($onlykey) && $key != $onlykey) continue;
+				if (!empty($onlykey) && $key != $onlykey) continue;
 
 				$key_type = $this->attributes[$object->table_element]['type'][$key];
 				if ($key_type == 'separate') continue;
@@ -1932,7 +1932,7 @@ 
 				if ($this->attributes[$object->table_element]['required'][$key])	// Value is required
 				{
 					// Check if empty without using GETPOST, value can be alpha, int, array, etc...
-					if ((! is_array($_POST["options_".$key]) && empty($_POST["options_".$key]) && $_POST["options_".$key] != '0')
+					if ((!is_array($_POST["options_".$key]) && empty($_POST["options_".$key]) && $_POST["options_".$key] != '0')
 						|| (is_array($_POST["options_".$key]) && empty($_POST["options_".$key])))
 					{
 						//print 'ccc'.$value.'-'.$this->attributes[$object->table_element]['required'][$key];
@@ -1941,43 +1941,43 @@ 
 					}
 				}
 
-				if (in_array($key_type,array('date')))
+				if (in_array($key_type, array('date')))
 				{
 					// Clean parameters
 					// TODO GMT date in memory must be GMT so we should add gm=true in parameters
-					$value_key=dol_mktime(0, 0, 0, $_POST["options_".$key."month"], $_POST["options_".$key."day"], $_POST["options_".$key."year"]);
+					$value_key = dol_mktime(0, 0, 0, $_POST["options_".$key."month"], $_POST["options_".$key."day"], $_POST["options_".$key."year"]);
 				}
-				elseif (in_array($key_type,array('datetime')))
+				elseif (in_array($key_type, array('datetime')))
 				{
 					// Clean parameters
 					// TODO GMT date in memory must be GMT so we should add gm=true in parameters
-					$value_key=dol_mktime($_POST["options_".$key."hour"], $_POST["options_".$key."min"], 0, $_POST["options_".$key."month"], $_POST["options_".$key."day"], $_POST["options_".$key."year"]);
+					$value_key = dol_mktime($_POST["options_".$key."hour"], $_POST["options_".$key."min"], 0, $_POST["options_".$key."month"], $_POST["options_".$key."day"], $_POST["options_".$key."year"]);
 				}
-				else if (in_array($key_type,array('checkbox','chkbxlst')))
+				else if (in_array($key_type, array('checkbox', 'chkbxlst')))
 				{
-					$value_arr=GETPOST("options_".$key, 'array'); // check if an array
+					$value_arr = GETPOST("options_".$key, 'array'); // check if an array
 					if (!empty($value_arr)) {
-						$value_key=implode($value_arr,',');
-					}else {
-						$value_key='';
+						$value_key = implode($value_arr, ',');
+					} else {
+						$value_key = '';
 					}
 				}
-				else if (in_array($key_type,array('price','double')))
+				else if (in_array($key_type, array('price', 'double')))
 				{
-					$value_arr=GETPOST("options_".$key, 'alpha');
-					$value_key=price2num($value_arr);
+					$value_arr = GETPOST("options_".$key, 'alpha');
+					$value_key = price2num($value_arr);
 				}
 				else
 				{
-					$value_key=GETPOST("options_".$key);
+					$value_key = GETPOST("options_".$key);
 				}
 
-				$object->array_options["options_".$key]=$value_key;
+				$object->array_options["options_".$key] = $value_key;
 			}
 
 			if ($nofillrequired) {
 				$langs->load('errors');
-				setEventMessages($langs->trans('ErrorFieldsRequired').' : '.implode(', ',$error_field_required), null, 'errors');
+				setEventMessages($langs->trans('ErrorFieldsRequired').' : '.implode(', ', $error_field_required), null, 'errors');
 				return -1;
 			}
 			else {
@@ -1997,7 +1997,7 @@ 
 	 * @param  string			$keysuffix      		Suffix string to add into name and id of field (can be used to avoid duplicate names)
 	 * @return array|int								array_options set or 0 if no value
 	 */
-	function getOptionalsFromPost($extrafieldsobjectkey, $keyprefix='', $keysuffix='')
+	function getOptionalsFromPost($extrafieldsobjectkey, $keyprefix = '', $keysuffix = '')
 	{
 		global $_POST;
 
@@ -2023,29 +2023,29 @@ 
 					$key_type = $this->attributes[$extrafieldsobjectkey]['type'][$key];
 				}
 
-				if (in_array($key_type,array('date','datetime')))
+				if (in_array($key_type, array('date', 'datetime')))
 				{
 					// Clean parameters
-					$value_key=dol_mktime($_POST[$keysuffix."options_".$key.$keyprefix."hour"], $_POST[$keysuffix."options_".$key.$keyprefix."min"], 0, $_POST[$keysuffix."options_".$key.$keyprefix."month"], $_POST[$keysuffix."options_".$key.$keyprefix."day"], $_POST[$keysuffix."options_".$key.$keyprefix."year"]);
+					$value_key = dol_mktime($_POST[$keysuffix."options_".$key.$keyprefix."hour"], $_POST[$keysuffix."options_".$key.$keyprefix."min"], 0, $_POST[$keysuffix."options_".$key.$keyprefix."month"], $_POST[$keysuffix."options_".$key.$keyprefix."day"], $_POST[$keysuffix."options_".$key.$keyprefix."year"]);
 				}
-				else if (in_array($key_type,array('checkbox', 'chkbxlst')))
+				else if (in_array($key_type, array('checkbox', 'chkbxlst')))
 				{
-					$value_arr=GETPOST($keysuffix."options_".$key.$keyprefix);
+					$value_arr = GETPOST($keysuffix."options_".$key.$keyprefix);
 					// Make sure we get an array even if there's only one checkbox
-					$value_arr=(array) $value_arr;
-					$value_key=implode(',', $value_arr);
+					$value_arr = (array) $value_arr;
+					$value_key = implode(',', $value_arr);
 				}
-				else if (in_array($key_type,array('price','double')))
+				else if (in_array($key_type, array('price', 'double')))
 				{
-					$value_arr=GETPOST($keysuffix."options_".$key.$keyprefix);
-					$value_key=price2num($value_arr);
+					$value_arr = GETPOST($keysuffix."options_".$key.$keyprefix);
+					$value_key = price2num($value_arr);
 				}
 				else
 				{
-					$value_key=GETPOST($keysuffix."options_".$key.$keyprefix);
+					$value_key = GETPOST($keysuffix."options_".$key.$keyprefix);
 				}
 
-				$array_options[$keysuffix."options_".$key]=$value_key;	// No keyprefix here. keyprefix is used only for read.
+				$array_options[$keysuffix."options_".$key] = $value_key; // No keyprefix here. keyprefix is used only for read.
 			}
 
 			return $array_options;

Braces +287 added lines, -258 removed lines

@@ -173,11 +173,19 @@ 
 	 */
 	function addExtraField($attrname, $label, $type, $pos, $size, $elementtype, $unique=0, $required=0, $default_value='', $param='', $alwayseditable=0, $perms='', $list='-1', $help='', $computed='', $entity='', $langfile='', $enabled='1')
 	{
-		if (empty($attrname)) return -1;
-		if (empty($label)) return -1;
+		if (empty($attrname)) {
+		    return -1;
+		}
+		if (empty($label)) {
+		    return -1;
+		}
 
-		if ($elementtype == 'thirdparty') $elementtype='societe';
-		if ($elementtype == 'contact') $elementtype='socpeople';
+		if ($elementtype == 'thirdparty') {
+		    $elementtype='societe';
+		}
+		if ($elementtype == 'contact') {
+		    $elementtype='socpeople';
+		}
 
 		// Create field into database except for separator type which is not stored in database
 		if ($type != 'separate')
@@ -195,10 +203,10 @@ 
 				$this->error='';
 				$this->errno=0;
 				return 1;
+			} else {
+			    return -2;
 			}
-			else return -2;
-		}
-		else
+		} else
 		{
 			return -1;
 		}
@@ -223,11 +231,17 @@ 
 	 */
 	private function create($attrname, $type='varchar', $length=255, $elementtype='member', $unique=0, $required=0, $default_value='',$param='', $perms='', $list='0', $computed='')
 	{
-		if ($elementtype == 'thirdparty') $elementtype='societe';
-		if ($elementtype == 'contact') $elementtype='socpeople';
+		if ($elementtype == 'thirdparty') {
+		    $elementtype='societe';
+		}
+		if ($elementtype == 'contact') {
+		    $elementtype='socpeople';
+		}
 
 		$table=$elementtype.'_extrafields';
-		if ($elementtype == 'categorie') $table='categories_extrafields';
+		if ($elementtype == 'categorie') {
+		    $table='categories_extrafields';
+		}
 
 		if (! empty($attrname) && preg_match("/^\w[a-zA-Z0-9_]*$/",$attrname) && ! is_numeric($attrname))
 		{
@@ -261,7 +275,9 @@ 
 			} else {
 				$typedb=$type;
 				$lengthdb=$length;
-				if ($type == 'varchar' && empty($lengthdb)) $lengthdb='255';
+				if ($type == 'varchar' && empty($lengthdb)) {
+				    $lengthdb='255';
+				}
 			}
 			$field_desc = array(
 				'type'=>$typedb,
@@ -279,15 +295,13 @@ 
 					$resql=$this->db->query($sql,1,'dml');
 				}
 				return 1;
-			}
-			else
+			} else
 			{
 				$this->error=$this->db->lasterror();
 				$this->errno=$this->db->lasterrno();
 				return -1;
 			}
-		}
-		else
+		} else
 		{
 			return 0;
 		}
@@ -322,27 +336,39 @@ 
         // phpcs:enable
 		global $conf,$user;
 
-		if ($elementtype == 'thirdparty') $elementtype='societe';
-		if ($elementtype == 'contact') $elementtype='socpeople';
+		if ($elementtype == 'thirdparty') {
+		    $elementtype='societe';
+		}
+		if ($elementtype == 'contact') {
+		    $elementtype='socpeople';
+		}
 
 		// Clean parameters
-		if (empty($pos)) $pos=0;
-		if (empty($list)) $list='0';
-		if (empty($required)) $required=0;
-		if (empty($unique)) $unique=0;
-		if (empty($alwayseditable)) $alwayseditable=0;
+		if (empty($pos)) {
+		    $pos=0;
+		}
+		if (empty($list)) {
+		    $list='0';
+		}
+		if (empty($required)) {
+		    $required=0;
+		}
+		if (empty($unique)) {
+		    $unique=0;
+		}
+		if (empty($alwayseditable)) {
+		    $alwayseditable=0;
+		}
 
 		if (! empty($attrname) && preg_match("/^\w[a-zA-Z0-9-_]*$/",$attrname) && ! is_numeric($attrname))
 		{
 			if (is_array($param) && count($param) > 0)
 			{
 				$params = serialize($param);
-			}
-			elseif (strlen($param) > 0)
+			} elseif (strlen($param) > 0)
 			{
 				$params = trim($param);
-			}
-			else
+			} else
 			{
 				$params='';
 			}
@@ -397,8 +423,7 @@ 
 			if ($this->db->query($sql))
 			{
 				return 1;
-			}
-			else
+			} else
 			{
 				$this->error=$this->db->lasterror();
 				$this->errno=$this->db->lasterrno();
@@ -416,11 +441,17 @@ 
 	 */
 	function delete($attrname, $elementtype='member')
 	{
-		if ($elementtype == 'thirdparty') $elementtype='societe';
-		if ($elementtype == 'contact') $elementtype='socpeople';
+		if ($elementtype == 'thirdparty') {
+		    $elementtype='societe';
+		}
+		if ($elementtype == 'contact') {
+		    $elementtype='socpeople';
+		}
 
 		$table=$elementtype.'_extrafields';
-		if ($elementtype == 'categorie') $table='categories_extrafields';
+		if ($elementtype == 'categorie') {
+		    $table='categories_extrafields';
+		}
 
 		$error=0;
 
@@ -457,8 +488,7 @@ 
 			}
 
 			return $result;
-		}
-		else
+		} else
 		{
 			return 0;
 		}
@@ -477,8 +507,12 @@ 
         // phpcs:enable
 		global $conf;
 
-		if ($elementtype == 'thirdparty') $elementtype='societe';
-		if ($elementtype == 'contact') $elementtype='socpeople';
+		if ($elementtype == 'thirdparty') {
+		    $elementtype='societe';
+		}
+		if ($elementtype == 'contact') {
+		    $elementtype='socpeople';
+		}
 
 		if (isset($attrname) && $attrname != '' && preg_match("/^\w[a-zA-Z0-9-_]*$/",$attrname))
 		{
@@ -492,14 +526,12 @@ 
 			if ($resql)
 			{
 				return 1;
-			}
-			else
+			} else
 			{
 				print dol_print_error($this->db);
 				return -1;
 			}
-		}
-		else
+		} else
 		{
 			return 0;
 		}
@@ -531,11 +563,17 @@ 
 	 */
 	function update($attrname, $label, $type, $length, $elementtype, $unique=0, $required=0, $pos=0, $param='', $alwayseditable=0, $perms='', $list='', $help='', $default='', $computed='', $entity='', $langfile='', $enabled='1', $totalizable=0)
 	{
-		if ($elementtype == 'thirdparty') $elementtype='societe';
-		if ($elementtype == 'contact') $elementtype='socpeople';
+		if ($elementtype == 'thirdparty') {
+		    $elementtype='societe';
+		}
+		if ($elementtype == 'contact') {
+		    $elementtype='socpeople';
+		}
 
         $table=$elementtype.'_extrafields';
-		if ($elementtype == 'categorie') $table='categories_extrafields';
+		if ($elementtype == 'categorie') {
+		    $table='categories_extrafields';
+		}
 
 		if (isset($attrname) && $attrname != '' && preg_match("/^\w[a-zA-Z0-9-_]*$/",$attrname))
 		{
@@ -571,10 +609,12 @@ 
 			}
 			$field_desc = array('type'=>$typedb, 'value'=>$lengthdb, 'null'=>($required?'NOT NULL':'NULL'), 'default'=>$default);
 
-			if ($type != 'separate') // No table update when separate type
+			if ($type != 'separate') {
+			    // No table update when separate type
 			{
 				$result=$this->db->DDLUpdateField(MAIN_DB_PREFIX.$table, $attrname, $field_desc);
 			}
+			}
 			if ($result > 0 || $type == 'separate')
 			{
 				if ($label)
@@ -587,28 +627,24 @@ 
 					if ($unique)
 					{
 						$sql="ALTER TABLE ".MAIN_DB_PREFIX.$table." ADD UNIQUE INDEX uk_".$table."_".$attrname." (".$attrname.")";
-					}
-					else
+					} else
 					{
 						$sql="ALTER TABLE ".MAIN_DB_PREFIX.$table." DROP INDEX uk_".$table."_".$attrname;
 					}
 					dol_syslog(get_class($this).'::update', LOG_DEBUG);
 					$resql=$this->db->query($sql,1,'dml');
 					return 1;
-				}
-				else
+				} else
 				{
 					$this->error=$this->db->lasterror();
 					return -1;
 				}
-			}
-			else
+			} else
 			{
 				$this->error=$this->db->lasterror();
 				return -1;
 			}
-		}
-		else
+		} else
 		{
 			return 0;
 		}
@@ -646,17 +682,31 @@ 
 		dol_syslog(get_class($this)."::update_label ".$attrname.", ".$label.", ".$type.", ".$size.", ".$elementtype.", ".$unique.", ".$required.", ".$pos.", ".$alwayseditable.", ".$perms.", ".$list.", ".$default.", ".$computed.", ".$entity.", ".$langfile.", ".$enabled.", ".$totalizable);
 
 		// Clean parameters
-		if ($elementtype == 'thirdparty') $elementtype='societe';
-		if ($elementtype == 'contact') $elementtype='socpeople';
+		if ($elementtype == 'thirdparty') {
+		    $elementtype='societe';
+		}
+		if ($elementtype == 'contact') {
+		    $elementtype='socpeople';
+		}
 
-		if (empty($pos)) $pos=0;
-		if (empty($list)) $list='0';
+		if (empty($pos)) {
+		    $pos=0;
+		}
+		if (empty($list)) {
+		    $list='0';
+		}
         if (empty($totalizable)) {
             $totalizable = 0;
         }
-		if (empty($required)) $required=0;
-		if (empty($unique)) $unique=0;
-		if (empty($alwayseditable)) $alwayseditable=0;
+		if (empty($required)) {
+		    $required=0;
+		}
+		if (empty($unique)) {
+		    $unique=0;
+		}
+		if (empty($alwayseditable)) {
+		    $alwayseditable=0;
+		}
 
 		if (isset($attrname) && $attrname != '' && preg_match("/^\w[a-zA-Z0-9-_]*$/",$attrname))
 		{
@@ -665,12 +715,10 @@ 
 			if (is_array($param) && count($param) > 0)
 			{
 				$params = serialize($param);
-			}
-			elseif (strlen($param) > 0)
+			} elseif (strlen($param) > 0)
 			{
 				$params = trim($param);
-			}
-			else
+			} else
 			{
 				$params='';
 			}
@@ -682,8 +730,7 @@ 
 				$sql_del.= " WHERE name = '".$attrname."'";
 				$sql_del.= " AND entity IN (0, ".($entity===''?$conf->entity:$entity).")";
 				$sql_del.= " AND elementtype = '".$elementtype."'";
-			}
-			else
+			} else
 			{
 				// We want on all entities ($entities = '0'), we delete on all only (we keep setup specific to each entity)
 				$sql_del = "DELETE FROM ".MAIN_DB_PREFIX."extrafields";
@@ -747,15 +794,13 @@ 
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else
+			} else
 			{
 				$this->db->rollback();
 				print dol_print_error($this->db);
 				return -1;
 			}
-		}
-		else
+		} else
 		{
 			return 0;
 		}
@@ -775,16 +820,26 @@ 
         // phpcs:enable
 		global $conf;
 
-		if (empty($elementtype)) return array();
+		if (empty($elementtype)) {
+		    return array();
+		}
 
-		if ($elementtype == 'thirdparty') $elementtype='societe';
-		if ($elementtype == 'contact') $elementtype='socpeople';
-		if ($elementtype == 'order_supplier') $elementtype='commande_fournisseur';
+		if ($elementtype == 'thirdparty') {
+		    $elementtype='societe';
+		}
+		if ($elementtype == 'contact') {
+		    $elementtype='socpeople';
+		}
+		if ($elementtype == 'order_supplier') {
+		    $elementtype='commande_fournisseur';
+		}
 
 		$array_name_label=array();
 
 		// To avoid conflicts with external modules. TODO Remove this.
-		if (!$forceload && !empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) return $array_name_label;
+		if (!$forceload && !empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) {
+		    return $array_name_label;
+		}
 
 		// Set array of label of entity
 		// TODO Remove completely loading of label. This should be done by presentation.
@@ -808,7 +863,10 @@ 
 		$sql = "SELECT rowid,name,label,type,size,elementtype,fieldunique,fieldrequired,param,pos,alwayseditable,perms,langs,list,totalizable,fielddefault,fieldcomputed,entity,enabled,help";
 		$sql.= " FROM ".MAIN_DB_PREFIX."extrafields";
 		$sql.= " WHERE entity IN (0,".$conf->entity.")";
-		if ($elementtype) $sql.= " AND elementtype = '".$elementtype."'";	// Filed with object->table_element
+		if ($elementtype) {
+		    $sql.= " AND elementtype = '".$elementtype."'";
+		}
+		// Filed with object->table_element
 		$sql.= " ORDER BY pos";
 
 		$resql=$this->db->query($sql);
@@ -867,9 +925,11 @@ 
 					$this->attributes[$tab->elementtype]['loaded']=1;
 				}
 			}
-			if ($elementtype) $this->attributes[$elementtype]['loaded']=1;	// If nothing found, we also save tag 'loaded'
-		}
-		else
+			if ($elementtype) {
+			    $this->attributes[$elementtype]['loaded']=1;
+			}
+			// If nothing found, we also save tag 'loaded'
+		} else
 		{
 			$this->error=$this->db->lasterror();
 			dol_syslog(get_class($this)."::fetch_name_optionals_label ".$this->error, LOG_ERR);
@@ -923,8 +983,7 @@ 
 			$totalizable=$this->attributes[$extrafieldsobjectkey]['totalizable'][$key];
 			$help=$this->attributes[$extrafieldsobjectkey]['help'][$key];
 			$hidden=(empty($list) ? 1 : 0);		// If empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
-		}
-		else	// Old usage
+		} else	// Old usage
 		{
 			$label=$this->attribute_label[$key];
 			$type =$this->attribute_type[$key];
@@ -943,8 +1002,11 @@ 
 
 		if ($computed)
 		{
-			if (! preg_match('/^search_/', $keyprefix)) return '<span class="opacitymedium">'.$langs->trans("AutomaticallyCalculated").'</span>';
-			else return '';
+			if (! preg_match('/^search_/', $keyprefix)) {
+			    return '<span class="opacitymedium">'.$langs->trans("AutomaticallyCalculated").'</span>';
+			} else {
+			    return '';
+			}
 		}
 
 		if (empty($morecss))
@@ -952,38 +1014,30 @@ 
 			if ($type == 'date')
 			{
 				$morecss = 'minwidth100imp';
-			}
-			elseif ($type == 'datetime')
+			} elseif ($type == 'datetime')
 			{
 				$morecss = 'minwidth200imp';
-			}
-			elseif (in_array($type,array('int','integer','double','price')))
+			} elseif (in_array($type,array('int','integer','double','price')))
 			{
 				$morecss = 'maxwidth75';
-			}
-			elseif ($type == 'password')
+			} elseif ($type == 'password')
 			{
 				$morecss='maxwidth100';
-			}
-			elseif ($type == 'url')
+			} elseif ($type == 'url')
 			{
 				$morecss='minwidth400';
-			}
-			elseif ($type == 'boolean')
+			} elseif ($type == 'boolean')
 			{
 				$morecss='';
-			}
-			else
+			} else
 			{
 				if (round($size) < 12)
 				{
 					$morecss = 'minwidth100';
-				}
-				else if (round($size) <= 48)
+				} else if (round($size) <= 48)
 				{
 					$morecss = 'minwidth200';
-				}
-				else
+				} else
 				{
 					$morecss = 'minwidth400';
 				}
@@ -998,52 +1052,50 @@ 
 			$showtime = in_array($type,array('datetime')) ? 1 : 0;
 
 			// Do not show current date when field not required (see selectDate() method)
-			if (!$required && $value == '') $value = '-1';
+			if (!$required && $value == '') {
+			    $value = '-1';
+			}
 
 			// TODO Must also support $moreparam
 			$out = $form->selectDate($value, $keyprefix.$key.$keysuffix, $showtime, $showtime, $required, '', 1, (($keyprefix != 'search_' && $keyprefix != 'search_options_') ? 1 : 0), 0, 1);
-		}
-		elseif (in_array($type,array('int','integer')))
+		} elseif (in_array($type,array('int','integer')))
 		{
 			$tmp=explode(',',$size);
 			$newsize=$tmp[0];
 			$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$newsize.'" value="'.dol_escape_htmltag($value).'"'.($moreparam?$moreparam:'').'>';
-		}
-		elseif (preg_match('/varchar/', $type))
+		} elseif (preg_match('/varchar/', $type))
 		{
 			$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$size.'" value="'.dol_escape_htmltag($value).'"'.($moreparam?$moreparam:'').'>';
-		}
-		elseif (in_array($type, array('mail', 'phone', 'url')))
+		} elseif (in_array($type, array('mail', 'phone', 'url')))
 		{
 			$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam?$moreparam:'').'>';
-		}
-		elseif ($type == 'text')
+		} elseif ($type == 'text')
 		{
-			if (! preg_match('/search_/', $keyprefix))		// If keyprefix is search_ or search_options_, we must just use a simple text field
+			if (! preg_match('/search_/', $keyprefix)) {
+			    // If keyprefix is search_ or search_options_, we must just use a simple text field
 			{
 				require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+			}
 				$doleditor=new DolEditor($keyprefix.$key.$keysuffix,$value,'',200,'dolibarr_notes','In',false,false,false,ROWS_5,'90%');
 				$out=$doleditor->Create(1);
-			}
-			else
+			} else
 			{
 				$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam?$moreparam:'').'>';
 			}
-		}
-		elseif ($type == 'html')
+		} elseif ($type == 'html')
 		{
-			if (! preg_match('/search_/', $keyprefix))		// If keyprefix is search_ or search_options_, we must just use a simple text field
+			if (! preg_match('/search_/', $keyprefix)) {
+			    // If keyprefix is search_ or search_options_, we must just use a simple text field
 			{
 				require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+			}
 				$doleditor=new DolEditor($keyprefix.$key.$keysuffix,$value,'',200,'dolibarr_notes','In',false,false,! empty($conf->fckeditor->enabled) && $conf->global->FCKEDITOR_ENABLE_SOCIETE,ROWS_5,'90%');
 				$out=$doleditor->Create(1);
-			}
-			else
+			} else
 			{
 				$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam?$moreparam:'').'>';
 			}
-		}
-		elseif ($type == 'boolean')
+		} elseif ($type == 'boolean')
 		{
 			$checked='';
 			if (!empty($value)) {
@@ -1052,22 +1104,19 @@ 
 				$checked=' value="1" ';
 			}
 			$out='<input type="checkbox" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.$checked.' '.($moreparam?$moreparam:'').'>';
-		}
-		elseif ($type == 'price')
+		} elseif ($type == 'price')
 		{
 			if (!empty($value)) {		// $value in memory is a php numeric, we format it into user number format.
 				$value=price($value);
 			}
 			$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam?$moreparam:'').'> '.$langs->getCurrencySymbol($conf->currency);
-		}
-		elseif ($type == 'double')
+		} elseif ($type == 'double')
 		{
 			if (!empty($value)) {		// $value in memory is a php numeric, we format it into user number format.
 				$value=price($value);
 			}
 			$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam?$moreparam:'').'> ';
-		}
-		elseif ($type == 'select')
+		} elseif ($type == 'select')
 		{
 			$out = '';
 			if (! empty($conf->use_javascript_ajax) && ! empty($conf->global->MAIN_EXTRAFIELDS_USE_SELECT2))
@@ -1080,19 +1129,23 @@ 
 			$out.='<option value="0">&nbsp;</option>';
 			foreach ($param['options'] as $key => $val)
 			{
-				if ((string) $key == '') continue;
+				if ((string) $key == '') {
+				    continue;
+				}
 				list($val, $parent) = explode('|', $val);
 				$out.='<option value="'.$key.'"';
 				$out.= (((string) $value == (string) $key)?' selected':'');
 				$out.= (!empty($parent)?' parent="'.$parent.'"':'');
 				$out.='>';
-				if ($langfile && $val) $out.=$langs->trans($val);
-				else $out.=$val;
+				if ($langfile && $val) {
+				    $out.=$langs->trans($val);
+				} else {
+				    $out.=$val;
+				}
 				$out.='</option>';
 			}
 			$out.='</select>';
-		}
-		elseif ($type == 'sellist')
+		} elseif ($type == 'sellist')
 		{
 			$out = '';
 			if (! empty($conf->use_javascript_ajax) && ! empty($conf->global->MAIN_EXTRAFIELDS_USE_SELECT2))
@@ -1163,13 +1216,11 @@ 
 					{
 						$sql.= ' as main, '.MAIN_DB_PREFIX .$InfoFieldList[0].'_extrafields as extra';
 						$sqlwhere.= ' WHERE extra.fk_object=main.'.$InfoFieldList[2]. ' AND '.$InfoFieldList[4];
-					}
-					else
+					} else
 					{
 						$sqlwhere.= ' WHERE '.$InfoFieldList[4];
 					}
-				}
-				else
+				} else
 				{
 					$sqlwhere.= ' WHERE 1=1';
 				}
@@ -1205,8 +1256,7 @@ 
 							{
 								$labeltoshow.= $obj->$field_toshow.' ';
 							}
-						}
-						else
+						} else
 						{
 							$labeltoshow=$obj->{$InfoFieldList[1]};
 						}
@@ -1219,25 +1269,25 @@ 
 								$translabel=$langs->trans($obj->$field_toshow);
 								if ($translabel!=$obj->$field_toshow) {
 									$labeltoshow=dol_trunc($translabel,18).' ';
-								}else {
+								} else {
 									$labeltoshow=dol_trunc($obj->$field_toshow,18).' ';
 								}
 							}
 							$out.='<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
-						}
-						else
+						} else
 						{
 							if (! $notrans)
 							{
 								$translabel=$langs->trans($obj->{$InfoFieldList[1]});
 								if ($translabel!=$obj->{$InfoFieldList[1]}) {
 									$labeltoshow=dol_trunc($translabel,18);
-								}
-								else {
+								} else {
 									$labeltoshow=dol_trunc($obj->{$InfoFieldList[1]},18);
 								}
 							}
-							if (empty($labeltoshow)) $labeltoshow='(not defined)';
+							if (empty($labeltoshow)) {
+							    $labeltoshow='(not defined)';
+							}
 							if ($value==$obj->rowid)
 							{
 								$out.='<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
@@ -1257,19 +1307,16 @@ 
 						$i++;
 					}
 					$this->db->free($resql);
-				}
-				else {
+				} else {
 					print 'Error in request '.$sql.' '.$this->db->lasterror().'. Check setup of extra parameters.<br>';
 				}
 			}
 			$out.='</select>';
-		}
-		elseif ($type == 'checkbox')
+		} elseif ($type == 'checkbox')
 		{
 			$value_arr=explode(',',$value);
 			$out=$form->multiselectarray($keyprefix.$key.$keysuffix, (empty($param['options'])?null:$param['options']), $value_arr, '', 0, '', 0, '100%');
-		}
-		elseif ($type == 'radio')
+		} elseif ($type == 'radio')
 		{
 			$out='';
 			foreach ($param['options'] as $keyopt => $val)
@@ -1280,13 +1327,11 @@ 
 				$out.= ($value==$keyopt?'checked':'');
 				$out.='/><label for="'.$keyprefix.$key.$keysuffix.'_'.$keyopt.'">'.$val.'</label><br>';
 			}
-		}
-		elseif ($type == 'chkbxlst')
+		} elseif ($type == 'chkbxlst')
 		{
 			if (is_array($value)) {
 				$value_arr = $value;
-			}
-			else {
+			} else {
 				$value_arr = explode(',', $value);
 			}
 
@@ -1365,17 +1410,14 @@ 
 							if (! empty($matchCondition[1]) && ! empty($matchCondition[3]) && $matchCondition[1] != $matchCondition[3] ) {
 								// Nobody sain would do that without parentheses
 								$InfoFieldList[4]=str_replace('$ID$','0',$InfoFieldList[4]);
-							}
-							else {
+							} else {
 								if (! empty($matchCondition[1])) {
 									$boolCond =(( $matchCondition[1] == "AND" )?' AND 1 ':' OR 0 ');
 									$InfoFieldList[4]=str_replace($matchCondition[0],$boolCond.$matchCondition[3],$InfoFieldList[4]);
-								}
-								else if (! empty($matchCondition[3])) {
+								} else if (! empty($matchCondition[3])) {
 									$boolCond =(( $matchCondition[3] == "AND" )?' 1 AND ':' 0 OR');
 									$InfoFieldList[4]=str_replace($matchCondition[0],$boolCond,$InfoFieldList[4]);
-								}
-								else {
+								} else {
 									$InfoFieldList[4] = 1;
 								}
 							}
@@ -1383,8 +1425,7 @@ 
 							// Si l'on a un AND ou un OR, avant ou après
 							preg_match('#(AND|OR|) *('.$word.') *(AND|OR|)#',$InfoFieldList[4],$matchCondition);
 						}
-					}
-					else {
+					} else {
 						$InfoFieldList[4]=str_replace('$ID$','0',$InfoFieldList[4]);
 					}
 
@@ -1452,8 +1493,9 @@ 
 									$labeltoshow = dol_trunc($obj->{$InfoFieldList[1]}, 18);
 								}
 							}
-							if (empty($labeltoshow))
-								$labeltoshow = '(not defined)';
+							if (empty($labeltoshow)) {
+															$labeltoshow = '(not defined)';
+							}
 
 								if (is_array($value_arr) && in_array($obj->rowid, $value_arr)) {
 									$data[$obj->rowid]=$labeltoshow;
@@ -1475,14 +1517,12 @@ 
 					print 'Error in request ' . $sql . ' ' . $this->db->lasterror() . '. Check setup of extra parameters.<br>';
 				}
 			}
-		}
-		elseif ($type == 'link')
+		} elseif ($type == 'link')
 		{
 			$param_list=array_keys($param['options']);				// $param_list='ObjectName:classPath'
 			$showempty=(($required && $default != '')?0:1);
 			$out=$form->selectForForms($param_list[0], $keyprefix.$key.$keysuffix, $value, $showempty);
-		}
-		elseif ($type == 'password')
+		} elseif ($type == 'password')
 		{
 			// If prefix is 'search_', field is used as a filter, we use a common text field.
 			$out='<input style="display:none" type="text" name="fakeusernameremembered">';	// Hidden field to reduce impact of evil Google Chrome autopopulate bug.
@@ -1527,8 +1567,7 @@ 
 			$list=dol_eval($this->attributes[$extrafieldsobjectkey]['list'][$key], 1);
 			$help=$this->attributes[$extrafieldsobjectkey]['help'][$key];
 			$hidden=(empty($list) ? 1 : 0);		// If $list empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
-		}
-		else	// Old usage
+		} else	// Old usage
 		{
 			$label=$this->attribute_label[$key];
 			$type=$this->attribute_type[$key];
@@ -1545,7 +1584,10 @@ 
 			$hidden=(empty($list) ? 1 : 0);		// If $list empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
 		}
 
-		if ($hidden) return '';		// This is a protection. If field is hidden, we should just not call this method.
+		if ($hidden) {
+		    return '';
+		}
+		// This is a protection. If field is hidden, we should just not call this method.
 
 		// If field is a computed field, value must become result of compute
 		if ($computed)
@@ -1560,52 +1602,45 @@ 
 		{
 			$showsize=10;
 			$value=dol_print_date($value, 'day');
-		}
-		elseif ($type == 'datetime')
+		} elseif ($type == 'datetime')
 		{
 			$showsize=19;
 			$value=dol_print_date($value, 'dayhour');
-		}
-		elseif ($type == 'int')
+		} elseif ($type == 'int')
 		{
 			$showsize=10;
-		}
-		elseif ($type == 'double')
+		} elseif ($type == 'double')
 		{
 			if (!empty($value)) {
 				$value=price($value);
 			}
-		}
-		elseif ($type == 'boolean')
+		} elseif ($type == 'boolean')
 		{
 			$checked='';
 			if (!empty($value)) {
 				$checked=' checked ';
 			}
 			$value='<input type="checkbox" '.$checked.' '.($moreparam?$moreparam:'').' readonly disabled>';
-		}
-		elseif ($type == 'mail')
+		} elseif ($type == 'mail')
 		{
 			$value=dol_print_email($value, 0, 0, 0, 64, 1, 1);
-		}
-		elseif ($type == 'url')
+		} elseif ($type == 'url')
 		{
 			$value=dol_print_url($value,'_blank',32,1);
-		}
-		elseif ($type == 'phone')
+		} elseif ($type == 'phone')
 		{
 			$value=dol_print_phone($value, '', 0, 0, '', '&nbsp;', 1);
-		}
-		elseif ($type == 'price')
+		} elseif ($type == 'price')
 		{
 			$value=price($value, 0, $langs, 0, 0, -1, $conf->currency);
-		}
-		elseif ($type == 'select')
+		} elseif ($type == 'select')
 		{
-			if ($langfile && $param['options'][$value]) $value=$langs->trans($param['options'][$value]);
-			else $value=$param['options'][$value];
-		}
-		elseif ($type == 'sellist')
+			if ($langfile && $param['options'][$value]) {
+			    $value=$langs->trans($param['options'][$value]);
+			} else {
+			    $value=$param['options'][$value];
+			}
+		} elseif ($type == 'sellist')
 		{
 			$param_list=array_keys($param['options']);
 			$InfoFieldList = explode(":", $param_list[0]);
@@ -1635,7 +1670,7 @@ 
 				$sql.= " WHERE ".$selectkey."=0";
 			} elseif ($selectkey=='rowid') {
 				$sql.= " WHERE ".$selectkey."=".$this->db->escape($value);
-			}else {
+			} else {
 				$sql.= " WHERE ".$selectkey."='".$this->db->escape($value)."'";
 			}
 
@@ -1662,12 +1697,11 @@ 
 						}
 						if ($translabel!=$field_toshow) {
 							$value.=dol_trunc($translabel,18).' ';
-						}else {
+						} else {
 							$value.=$obj->$field_toshow.' ';
 						}
 					}
-				}
-				else
+				} else
 				{
 					$translabel='';
 					if (!empty($obj->{$InfoFieldList[1]})) {
@@ -1675,18 +1709,17 @@ 
 					}
 					if ($translabel!=$obj->{$InfoFieldList[1]}) {
 						$value=dol_trunc($translabel,18);
-					}else {
+					} else {
 						$value=$obj->{$InfoFieldList[1]};
 					}
 				}
+			} else {
+			    dol_syslog(get_class($this).'::showOutputField error '.$this->db->lasterror(), LOG_WARNING);
 			}
-			else dol_syslog(get_class($this).'::showOutputField error '.$this->db->lasterror(), LOG_WARNING);
-		}
-		elseif ($type == 'radio')
+		} elseif ($type == 'radio')
 		{
 			$value=$param['options'][$value];
-		}
-		elseif ($type == 'checkbox')
+		} elseif ($type == 'checkbox')
 		{
 			$value_arr=explode(',',$value);
 			$value='';
@@ -1698,8 +1731,7 @@ 
 				}
 			}
 			$value='<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';
-		}
-		elseif ($type == 'chkbxlst')
+		} elseif ($type == 'chkbxlst')
 		{
 			$value_arr = explode(',', $value);
 
@@ -1767,15 +1799,17 @@ 
 			} else {
 				dol_syslog(get_class($this) . '::showOutputField error ' . $this->db->lasterror(), LOG_WARNING);
 			}
-		}
-		elseif ($type == 'link')
+		} elseif ($type == 'link')
 		{
 			$out='';
 
 			// Only if something to display (perf)
-			if ($value)		// If we have -1 here, pb is into sert, not into ouptu
+			if ($value) {
+			    // If we have -1 here, pb is into sert, not into ouptu
 			{
-				$param_list=array_keys($param['options']);				// $param_list='ObjectName:classPath'
+				$param_list=array_keys($param['options']);
+			}
+			// $param_list='ObjectName:classPath'
 
 				$InfoFieldList = explode(":", $param_list[0]);
 				$classname=$InfoFieldList[0];
@@ -1789,30 +1823,27 @@ 
 						$object->fetch($value);
 						$value=$object->getNomUrl(3);
 					}
-				}
-				else
+				} else
 				{
 					dol_syslog('Error bad setup of extrafield', LOG_WARNING);
 					return 'Error bad setup of extrafield';
 				}
 			}
-		}
-		elseif ($type == 'text')
+		} elseif ($type == 'text')
 		{
 			$value=dol_htmlentitiesbr($value);
-		}
-		elseif ($type == 'html')
+		} elseif ($type == 'html')
 		{
 			$value=dol_htmlentitiesbr($value);
-		}
-		elseif ($type == 'password')
+		} elseif ($type == 'password')
 		{
 			$value=dol_trunc(preg_replace('/./i','*',$value), 8, 'right', 'UTF-8', 1);
-		}
-		else
+		} else
 		{
 			$showsize=round($size);
-			if ($showsize > 48) $showsize=48;
+			if ($showsize > 48) {
+			    $showsize=48;
+			}
 		}
 
 		//print $type.'-'.$size;
@@ -1832,40 +1863,36 @@ 
 	{
 		global $conf,$langs;
 
-		if (! empty($extrafieldsobjectkey)) $type=$this->attributes[$extrafieldsobjectkey]['type'][$key];
-		else $type=$this->attribute_type[$key];
+		if (! empty($extrafieldsobjectkey)) {
+		    $type=$this->attributes[$extrafieldsobjectkey]['type'][$key];
+		} else {
+		    $type=$this->attribute_type[$key];
+		}
 
 		$align='';
 
         if ($type == 'date')
 		{
 			$align="center";
-		}
-		elseif ($type == 'datetime')
+		} elseif ($type == 'datetime')
 		{
 			$align="center";
-		}
-		elseif ($type == 'int')
+		} elseif ($type == 'int')
 		{
 			$align="right";
-		}
-		elseif ($type == 'double')
+		} elseif ($type == 'double')
 		{
 			$align="right";
-		}
-		elseif ($type == 'boolean')
+		} elseif ($type == 'boolean')
 		{
 			$align="center";
-		}
-		elseif ($type == 'radio')
+		} elseif ($type == 'radio')
 		{
 			$align="center";
-		}
-		elseif ($type == 'checkbox')
+		} elseif ($type == 'checkbox')
 		{
 			$align="center";
-		}
-		elseif ($type == 'price')
+		} elseif ($type == 'price')
 		{
 			$align="right";
 		}
@@ -1904,17 +1931,23 @@ 
 		$nofillrequired='';// For error when required field left blank
 		$error_field_required = array();
 
-		if (is_array($this->attributes[$object->table_element]['label'])) $extralabels=$this->attributes[$object->table_element]['label'];
+		if (is_array($this->attributes[$object->table_element]['label'])) {
+		    $extralabels=$this->attributes[$object->table_element]['label'];
+		}
 
 		if (is_array($extralabels))
 		{
 			// Get extra fields
 			foreach ($extralabels as $key => $value)
 			{
-				if (! empty($onlykey) && $key != $onlykey) continue;
+				if (! empty($onlykey) && $key != $onlykey) {
+				    continue;
+				}
 
 				$key_type = $this->attributes[$object->table_element]['type'][$key];
-				if ($key_type == 'separate') continue;
+				if ($key_type == 'separate') {
+				    continue;
+				}
 
 				$enabled = 1;
 				if (isset($this->attributes[$object->table_element]['list'][$key]))
@@ -1926,10 +1959,15 @@ 
 				{
 					$perms = dol_eval($this->attributes[$object->table_element]['perms'][$key], 1);
 				}
-				if (empty($enabled)) continue;
-				if (empty($perms)) continue;
+				if (empty($enabled)) {
+				    continue;
+				}
+				if (empty($perms)) {
+				    continue;
+				}
 
-				if ($this->attributes[$object->table_element]['required'][$key])	// Value is required
+				if ($this->attributes[$object->table_element]['required'][$key]) {
+				    // Value is required
 				{
 					// Check if empty without using GETPOST, value can be alpha, int, array, etc...
 					if ((! is_array($_POST["options_".$key]) && empty($_POST["options_".$key]) && $_POST["options_".$key] != '0')
@@ -1937,6 +1975,7 @@ 
 					{
 						//print 'ccc'.$value.'-'.$this->attributes[$object->table_element]['required'][$key];
 						$nofillrequired++;
+				}
 						$error_field_required[] = $langs->transnoentitiesnoconv($value);
 					}
 				}
@@ -1946,28 +1985,24 @@ 
 					// Clean parameters
 					// TODO GMT date in memory must be GMT so we should add gm=true in parameters
 					$value_key=dol_mktime(0, 0, 0, $_POST["options_".$key."month"], $_POST["options_".$key."day"], $_POST["options_".$key."year"]);
-				}
-				elseif (in_array($key_type,array('datetime')))
+				} elseif (in_array($key_type,array('datetime')))
 				{
 					// Clean parameters
 					// TODO GMT date in memory must be GMT so we should add gm=true in parameters
 					$value_key=dol_mktime($_POST["options_".$key."hour"], $_POST["options_".$key."min"], 0, $_POST["options_".$key."month"], $_POST["options_".$key."day"], $_POST["options_".$key."year"]);
-				}
-				else if (in_array($key_type,array('checkbox','chkbxlst')))
+				} else if (in_array($key_type,array('checkbox','chkbxlst')))
 				{
 					$value_arr=GETPOST("options_".$key, 'array'); // check if an array
 					if (!empty($value_arr)) {
 						$value_key=implode($value_arr,',');
-					}else {
+					} else {
 						$value_key='';
 					}
-				}
-				else if (in_array($key_type,array('price','double')))
+				} else if (in_array($key_type,array('price','double')))
 				{
 					$value_arr=GETPOST("options_".$key, 'alpha');
 					$value_key=price2num($value_arr);
-				}
-				else
+				} else
 				{
 					$value_key=GETPOST("options_".$key);
 				}
@@ -1979,12 +2014,10 @@ 
 				$langs->load('errors');
 				setEventMessages($langs->trans('ErrorFieldsRequired').' : '.implode(', ',$error_field_required), null, 'errors');
 				return -1;
-			}
-			else {
+			} else {
 				return 1;
 			}
-		}
-		else {
+		} else {
 			return 0;
 		}
 	}
@@ -2004,8 +2037,7 @@ 
 		if (is_string($extrafieldsobjectkey) && is_array($this->attributes[$extrafieldsobjectkey]['label']))
 		{
 			$extralabels = $this->attributes[$extrafieldsobjectkey]['label'];
-		}
-		else
+		} else
 		{
 			$extralabels = $extrafieldsobjectkey;
 		}
@@ -2027,20 +2059,17 @@ 
 				{
 					// Clean parameters
 					$value_key=dol_mktime($_POST[$keysuffix."options_".$key.$keyprefix."hour"], $_POST[$keysuffix."options_".$key.$keyprefix."min"], 0, $_POST[$keysuffix."options_".$key.$keyprefix."month"], $_POST[$keysuffix."options_".$key.$keyprefix."day"], $_POST[$keysuffix."options_".$key.$keyprefix."year"]);
-				}
-				else if (in_array($key_type,array('checkbox', 'chkbxlst')))
+				} else if (in_array($key_type,array('checkbox', 'chkbxlst')))
 				{
 					$value_arr=GETPOST($keysuffix."options_".$key.$keyprefix);
 					// Make sure we get an array even if there's only one checkbox
 					$value_arr=(array) $value_arr;
 					$value_key=implode(',', $value_arr);
-				}
-				else if (in_array($key_type,array('price','double')))
+				} else if (in_array($key_type,array('price','double')))
 				{
 					$value_arr=GETPOST($keysuffix."options_".$key.$keyprefix);
 					$value_key=price2num($value_arr);
-				}
-				else
+				} else
 				{
 					$value_key=GETPOST($keysuffix."options_".$key.$keyprefix);
 				}

dolibarr/htdocs/core/class/events.class.php

Indentation +237 added lines, -237 removed lines

@@ -34,62 +34,62 @@ 
  */
 class Events // extends CommonObject
 {
-	/**
-	 * @var string ID to identify managed object
-	 */
-	public $element='events';
+    /**
+     * @var string ID to identify managed object
+     */
+    public $element='events';
 
-	/**
-	 * @var string Name of table without prefix where object is stored
-	 */
-	public $table_element='events';
+    /**
+     * @var string Name of table without prefix where object is stored
+     */
+    public $table_element='events';
 
-	/**
-	 * @var int ID
-	 */
-	public $id;
+    /**
+     * @var int ID
+     */
+    public $id;
 
     /**
      * @var DoliDB Database handler.
      */
     public $db;
 
-	/**
-	 * @var string Error code (or message)
-	 */
-	public $error='';
-
-	public $tms;
-	public $type;
-
-	/**
-	 * @var int Entity
-	 */
-	public $entity;
-
-	public $dateevent;
-
-	/**
-	 * @var string description
-	 */
-	public $description;
-
-	// List of all Audit/Security events supported by triggers
-	public $eventstolog=array(
-		array('id'=>'USER_LOGIN',             'test'=>1),
-		array('id'=>'USER_LOGIN_FAILED',      'test'=>1),
-	    array('id'=>'USER_LOGOUT',            'test'=>1),
-		array('id'=>'USER_CREATE',            'test'=>1),
-		array('id'=>'USER_MODIFY',            'test'=>1),
-		array('id'=>'USER_NEW_PASSWORD',      'test'=>1),
-		array('id'=>'USER_ENABLEDISABLE',     'test'=>1),
-		array('id'=>'USER_DELETE',            'test'=>1),
-	/*    array('id'=>'USER_SETINGROUP',        'test'=>1), deprecated. Replace with USER_MODIFY
+    /**
+     * @var string Error code (or message)
+     */
+    public $error='';
+
+    public $tms;
+    public $type;
+
+    /**
+     * @var int Entity
+     */
+    public $entity;
+
+    public $dateevent;
+
+    /**
+     * @var string description
+     */
+    public $description;
+
+    // List of all Audit/Security events supported by triggers
+    public $eventstolog=array(
+        array('id'=>'USER_LOGIN',             'test'=>1),
+        array('id'=>'USER_LOGIN_FAILED',      'test'=>1),
+        array('id'=>'USER_LOGOUT',            'test'=>1),
+        array('id'=>'USER_CREATE',            'test'=>1),
+        array('id'=>'USER_MODIFY',            'test'=>1),
+        array('id'=>'USER_NEW_PASSWORD',      'test'=>1),
+        array('id'=>'USER_ENABLEDISABLE',     'test'=>1),
+        array('id'=>'USER_DELETE',            'test'=>1),
+    /*    array('id'=>'USER_SETINGROUP',        'test'=>1), deprecated. Replace with USER_MODIFY
 	    array('id'=>'USER_REMOVEFROMGROUP',   'test'=>1), deprecated. Replace with USER_MODIFY */
-		array('id'=>'GROUP_CREATE',           'test'=>1),
-		array('id'=>'GROUP_MODIFY',           'test'=>1),
-		array('id'=>'GROUP_DELETE',           'test'=>1),
-	/*	array('id'=>'ACTION_CREATE',          'test'=>$conf->societe->enabled),
+        array('id'=>'GROUP_CREATE',           'test'=>1),
+        array('id'=>'GROUP_MODIFY',           'test'=>1),
+        array('id'=>'GROUP_DELETE',           'test'=>1),
+    /*	array('id'=>'ACTION_CREATE',          'test'=>$conf->societe->enabled),
 		array('id'=>'COMPANY_CREATE',         'test'=>$conf->societe->enabled),
 		array('id'=>'CONTRACT_VALIDATE',      'test'=>$conf->contrat->enabled),
 		array('id'=>'PROPAL_VALIDATE',        'test'=>$conf->propal->enabled),
@@ -111,199 +111,199 @@ 
 		array('id'=>'MEMBER_RESILIATE',       'test'=>$conf->adherent->enabled),
 		array('id'=>'MEMBER_DELETE',          'test'=>$conf->adherent->enabled),
 	*/
-	);
-
-
-	/**
-	 *	Constructor
-	 *
-	 *  @param		DoliDB		$db      Database handler
-	 */
-	function __construct($db)
-	{
-		$this->db = $db;
-	}
-
-
-	/**
-	 *   Create in database
-	 *
-	 *   @param      User	$user       User that create
-	 *   @return     int     		    <0 if KO, >0 if OK
-	 */
-	function create($user)
-	{
-		global $conf, $langs;
-
-		// Clean parameters
-		$this->description=trim($this->description);
-		if (empty($this->user_agent) && !empty($_SERVER['HTTP_USER_AGENT'])) $this->user_agent=$_SERVER['HTTP_USER_AGENT'];
-
-		// Check parameters
-		if (empty($this->description)) { $this->error='ErrorBadValueForParameterCreateEventDesc'; return -1; }
-
-		// Insert request
-		$sql = "INSERT INTO ".MAIN_DB_PREFIX."events(";
-		$sql.= "type,";
-		$sql.= "entity,";
-		$sql.= "ip,";
-		$sql.= "user_agent,";
-		$sql.= "dateevent,";
-		$sql.= "fk_user,";
-		$sql.= "description";
-		$sql.= ") VALUES (";
-		$sql.= " '".$this->db->escape($this->type)."',";
-		$sql.= " ".$conf->entity.",";
-		$sql.= " '".$this->db->escape(getUserRemoteIP())."',";
-		$sql.= " ".($this->user_agent ? "'".$this->db->escape(dol_trunc($this->user_agent,250))."'" : 'NULL').",";
-		$sql.= " '".$this->db->idate($this->dateevent)."',";
-		$sql.= " ".($user->id?"'".$this->db->escape($user->id)."'":'NULL').",";
-		$sql.= " '".$this->db->escape(dol_trunc($this->description,250))."'";
-		$sql.= ")";
-
-		dol_syslog(get_class($this)."::create", LOG_DEBUG);
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."events");
-			return $this->id;
-		}
-		else
-		{
-			$this->error="Error ".$this->db->lasterror();
-			return -1;
-		}
-	}
-
-
-	/**
-	 * Update database
-	 *
-	 * @param	User    $user        	User that modify
-	 * @param   int		$notrigger	    0=no, 1=yes (no update trigger)
-	 * @return  int         			<0 if KO, >0 if OK
-	 */
-	function update($user=null, $notrigger=0)
-	{
-		global $conf, $langs;
-
-		// Clean parameters
-		$this->id=trim($this->id);
-		$this->type=trim($this->type);
-		$this->description=trim($this->description);
-
-		// Check parameters
-		// Put here code to add control on parameters values
-
-		// Update request
-		$sql = "UPDATE ".MAIN_DB_PREFIX."events SET";
-		$sql.= " type='".$this->db->escape($this->type)."',";
-		$sql.= " dateevent='".$this->db->idate($this->dateevent)."',";
-		$sql.= " description='".$this->db->escape($this->description)."'";
-		$sql.= " WHERE rowid=".$this->id;
-
-		dol_syslog(get_class($this)."::update", LOG_DEBUG);
-		$resql = $this->db->query($sql);
-		if (! $resql)
-		{
-			$this->error="Error ".$this->db->lasterror();
-			return -1;
-		}
-		return 1;
-	}
-
-
-	/**
-	 *  Load object in memory from database
-	 *
-	 *  @param	int		$id         Id object
-	 *  @param  User	$user       User that load
-	 *  @return int         		<0 if KO, >0 if OK
-	 */
-	function fetch($id, $user=null)
-	{
-		global $langs;
-
-		$sql = "SELECT";
-		$sql.= " t.rowid,";
-		$sql.= " t.tms,";
-		$sql.= " t.type,";
-		$sql.= " t.entity,";
-		$sql.= " t.dateevent,";
-		$sql.= " t.description,";
-		$sql.= " t.ip,";
-		$sql.= " t.user_agent";
-		$sql.= " FROM ".MAIN_DB_PREFIX."events as t";
-		$sql.= " WHERE t.rowid = ".$id;
-
-		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			if ($this->db->num_rows($resql))
-			{
-				$obj = $this->db->fetch_object($resql);
-
-				$this->id    = $obj->rowid;
-				$this->tms = $this->db->jdate($obj->tms);
-				$this->type = $obj->type;
-				$this->entity = $obj->entity;
-				$this->dateevent = $this->db->jdate($obj->dateevent);
-				$this->description = $obj->description;
-				$this->ip = $obj->ip;
-				$this->user_agent = $obj->user_agent;
-			}
-			$this->db->free($resql);
-
-			return 1;
-		}
-		else
-		{
-			$this->error="Error ".$this->db->lasterror();
-			return -1;
-		}
-	}
-
-
-	/**
-	 *  Delete object in database
-	 *
-	 *	@param	User	$user       User that delete
-	 *	@return	int					<0 if KO, >0 if OK
-	 */
-	function delete($user)
-	{
-		global $conf, $langs;
-
-		$sql = "DELETE FROM ".MAIN_DB_PREFIX."events";
-		$sql.= " WHERE rowid=".$this->id;
-
-		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
-		$resql = $this->db->query($sql);
-		if (! $resql)
-		{
-			$this->error="Error ".$this->db->lasterror();
-			return -1;
-		}
-
-		return 1;
-	}
-
-
-	/**
+    );
+
+
+    /**
+     *	Constructor
+     *
+     *  @param		DoliDB		$db      Database handler
+     */
+    function __construct($db)
+    {
+        $this->db = $db;
+    }
+
+
+    /**
+     *   Create in database
+     *
+     *   @param      User	$user       User that create
+     *   @return     int     		    <0 if KO, >0 if OK
+     */
+    function create($user)
+    {
+        global $conf, $langs;
+
+        // Clean parameters
+        $this->description=trim($this->description);
+        if (empty($this->user_agent) && !empty($_SERVER['HTTP_USER_AGENT'])) $this->user_agent=$_SERVER['HTTP_USER_AGENT'];
+
+        // Check parameters
+        if (empty($this->description)) { $this->error='ErrorBadValueForParameterCreateEventDesc'; return -1; }
+
+        // Insert request
+        $sql = "INSERT INTO ".MAIN_DB_PREFIX."events(";
+        $sql.= "type,";
+        $sql.= "entity,";
+        $sql.= "ip,";
+        $sql.= "user_agent,";
+        $sql.= "dateevent,";
+        $sql.= "fk_user,";
+        $sql.= "description";
+        $sql.= ") VALUES (";
+        $sql.= " '".$this->db->escape($this->type)."',";
+        $sql.= " ".$conf->entity.",";
+        $sql.= " '".$this->db->escape(getUserRemoteIP())."',";
+        $sql.= " ".($this->user_agent ? "'".$this->db->escape(dol_trunc($this->user_agent,250))."'" : 'NULL').",";
+        $sql.= " '".$this->db->idate($this->dateevent)."',";
+        $sql.= " ".($user->id?"'".$this->db->escape($user->id)."'":'NULL').",";
+        $sql.= " '".$this->db->escape(dol_trunc($this->description,250))."'";
+        $sql.= ")";
+
+        dol_syslog(get_class($this)."::create", LOG_DEBUG);
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."events");
+            return $this->id;
+        }
+        else
+        {
+            $this->error="Error ".$this->db->lasterror();
+            return -1;
+        }
+    }
+
+
+    /**
+     * Update database
+     *
+     * @param	User    $user        	User that modify
+     * @param   int		$notrigger	    0=no, 1=yes (no update trigger)
+     * @return  int         			<0 if KO, >0 if OK
+     */
+    function update($user=null, $notrigger=0)
+    {
+        global $conf, $langs;
+
+        // Clean parameters
+        $this->id=trim($this->id);
+        $this->type=trim($this->type);
+        $this->description=trim($this->description);
+
+        // Check parameters
+        // Put here code to add control on parameters values
+
+        // Update request
+        $sql = "UPDATE ".MAIN_DB_PREFIX."events SET";
+        $sql.= " type='".$this->db->escape($this->type)."',";
+        $sql.= " dateevent='".$this->db->idate($this->dateevent)."',";
+        $sql.= " description='".$this->db->escape($this->description)."'";
+        $sql.= " WHERE rowid=".$this->id;
+
+        dol_syslog(get_class($this)."::update", LOG_DEBUG);
+        $resql = $this->db->query($sql);
+        if (! $resql)
+        {
+            $this->error="Error ".$this->db->lasterror();
+            return -1;
+        }
+        return 1;
+    }
+
+
+    /**
+     *  Load object in memory from database
+     *
+     *  @param	int		$id         Id object
+     *  @param  User	$user       User that load
+     *  @return int         		<0 if KO, >0 if OK
+     */
+    function fetch($id, $user=null)
+    {
+        global $langs;
+
+        $sql = "SELECT";
+        $sql.= " t.rowid,";
+        $sql.= " t.tms,";
+        $sql.= " t.type,";
+        $sql.= " t.entity,";
+        $sql.= " t.dateevent,";
+        $sql.= " t.description,";
+        $sql.= " t.ip,";
+        $sql.= " t.user_agent";
+        $sql.= " FROM ".MAIN_DB_PREFIX."events as t";
+        $sql.= " WHERE t.rowid = ".$id;
+
+        dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            if ($this->db->num_rows($resql))
+            {
+                $obj = $this->db->fetch_object($resql);
+
+                $this->id    = $obj->rowid;
+                $this->tms = $this->db->jdate($obj->tms);
+                $this->type = $obj->type;
+                $this->entity = $obj->entity;
+                $this->dateevent = $this->db->jdate($obj->dateevent);
+                $this->description = $obj->description;
+                $this->ip = $obj->ip;
+                $this->user_agent = $obj->user_agent;
+            }
+            $this->db->free($resql);
+
+            return 1;
+        }
+        else
+        {
+            $this->error="Error ".$this->db->lasterror();
+            return -1;
+        }
+    }
+
+
+    /**
+     *  Delete object in database
+     *
+     *	@param	User	$user       User that delete
+     *	@return	int					<0 if KO, >0 if OK
+     */
+    function delete($user)
+    {
+        global $conf, $langs;
+
+        $sql = "DELETE FROM ".MAIN_DB_PREFIX."events";
+        $sql.= " WHERE rowid=".$this->id;
+
+        dol_syslog(get_class($this)."::delete", LOG_DEBUG);
+        $resql = $this->db->query($sql);
+        if (! $resql)
+        {
+            $this->error="Error ".$this->db->lasterror();
+            return -1;
+        }
+
+        return 1;
+    }
+
+
+    /**
      *  Initialise an instance with random values.
      *  Used to build previews or test instances.
      *	id must be 0 if object instance is a specimen.
      *
      *  @return	void
-	 */
-	function initAsSpecimen()
-	{
-		$this->id=0;
-
-		$this->tms=time();
-		$this->type='';
-		$this->dateevent=time();
-		$this->description='This is a specimen event';
-	}
+     */
+    function initAsSpecimen()
+    {
+        $this->id=0;
+
+        $this->tms=time();
+        $this->type='';
+        $this->dateevent=time();
+        $this->description='This is a specimen event';
+    }
 }

Spacing +68 added lines, -68 removed lines

@@ -37,12 +37,12 @@ 
 	/**
 	 * @var string ID to identify managed object
 	 */
-	public $element='events';
+	public $element = 'events';
 
 	/**
 	 * @var string Name of table without prefix where object is stored
 	 */
-	public $table_element='events';
+	public $table_element = 'events';
 
 	/**
 	 * @var int ID
@@ -57,7 +57,7 @@ 
 	/**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
 	public $tms;
 	public $type;
@@ -75,20 +75,20 @@ 
 	public $description;
 
 	// List of all Audit/Security events supported by triggers
-	public $eventstolog=array(
-		array('id'=>'USER_LOGIN',             'test'=>1),
-		array('id'=>'USER_LOGIN_FAILED',      'test'=>1),
-	    array('id'=>'USER_LOGOUT',            'test'=>1),
-		array('id'=>'USER_CREATE',            'test'=>1),
-		array('id'=>'USER_MODIFY',            'test'=>1),
-		array('id'=>'USER_NEW_PASSWORD',      'test'=>1),
-		array('id'=>'USER_ENABLEDISABLE',     'test'=>1),
-		array('id'=>'USER_DELETE',            'test'=>1),
+	public $eventstolog = array(
+		array('id'=>'USER_LOGIN', 'test'=>1),
+		array('id'=>'USER_LOGIN_FAILED', 'test'=>1),
+	    array('id'=>'USER_LOGOUT', 'test'=>1),
+		array('id'=>'USER_CREATE', 'test'=>1),
+		array('id'=>'USER_MODIFY', 'test'=>1),
+		array('id'=>'USER_NEW_PASSWORD', 'test'=>1),
+		array('id'=>'USER_ENABLEDISABLE', 'test'=>1),
+		array('id'=>'USER_DELETE', 'test'=>1),
 	/*    array('id'=>'USER_SETINGROUP',        'test'=>1), deprecated. Replace with USER_MODIFY
 	    array('id'=>'USER_REMOVEFROMGROUP',   'test'=>1), deprecated. Replace with USER_MODIFY */
-		array('id'=>'GROUP_CREATE',           'test'=>1),
-		array('id'=>'GROUP_MODIFY',           'test'=>1),
-		array('id'=>'GROUP_DELETE',           'test'=>1),
+		array('id'=>'GROUP_CREATE', 'test'=>1),
+		array('id'=>'GROUP_MODIFY', 'test'=>1),
+		array('id'=>'GROUP_DELETE', 'test'=>1),
 	/*	array('id'=>'ACTION_CREATE',          'test'=>$conf->societe->enabled),
 		array('id'=>'COMPANY_CREATE',         'test'=>$conf->societe->enabled),
 		array('id'=>'CONTRACT_VALIDATE',      'test'=>$conf->contrat->enabled),
@@ -136,33 +136,33 @@ 
 		global $conf, $langs;
 
 		// Clean parameters
-		$this->description=trim($this->description);
-		if (empty($this->user_agent) && !empty($_SERVER['HTTP_USER_AGENT'])) $this->user_agent=$_SERVER['HTTP_USER_AGENT'];
+		$this->description = trim($this->description);
+		if (empty($this->user_agent) && !empty($_SERVER['HTTP_USER_AGENT'])) $this->user_agent = $_SERVER['HTTP_USER_AGENT'];
 
 		// Check parameters
-		if (empty($this->description)) { $this->error='ErrorBadValueForParameterCreateEventDesc'; return -1; }
+		if (empty($this->description)) { $this->error = 'ErrorBadValueForParameterCreateEventDesc'; return -1; }
 
 		// Insert request
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."events(";
-		$sql.= "type,";
-		$sql.= "entity,";
-		$sql.= "ip,";
-		$sql.= "user_agent,";
-		$sql.= "dateevent,";
-		$sql.= "fk_user,";
-		$sql.= "description";
-		$sql.= ") VALUES (";
-		$sql.= " '".$this->db->escape($this->type)."',";
-		$sql.= " ".$conf->entity.",";
-		$sql.= " '".$this->db->escape(getUserRemoteIP())."',";
-		$sql.= " ".($this->user_agent ? "'".$this->db->escape(dol_trunc($this->user_agent,250))."'" : 'NULL').",";
-		$sql.= " '".$this->db->idate($this->dateevent)."',";
-		$sql.= " ".($user->id?"'".$this->db->escape($user->id)."'":'NULL').",";
-		$sql.= " '".$this->db->escape(dol_trunc($this->description,250))."'";
-		$sql.= ")";
+		$sql .= "type,";
+		$sql .= "entity,";
+		$sql .= "ip,";
+		$sql .= "user_agent,";
+		$sql .= "dateevent,";
+		$sql .= "fk_user,";
+		$sql .= "description";
+		$sql .= ") VALUES (";
+		$sql .= " '".$this->db->escape($this->type)."',";
+		$sql .= " ".$conf->entity.",";
+		$sql .= " '".$this->db->escape(getUserRemoteIP())."',";
+		$sql .= " ".($this->user_agent ? "'".$this->db->escape(dol_trunc($this->user_agent, 250))."'" : 'NULL').",";
+		$sql .= " '".$this->db->idate($this->dateevent)."',";
+		$sql .= " ".($user->id ? "'".$this->db->escape($user->id)."'" : 'NULL').",";
+		$sql .= " '".$this->db->escape(dol_trunc($this->description, 250))."'";
+		$sql .= ")";
 
 		dol_syslog(get_class($this)."::create", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."events");
@@ -170,7 +170,7 @@ 
 		}
 		else
 		{
-			$this->error="Error ".$this->db->lasterror();
+			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
 	}
@@ -183,30 +183,30 @@ 
 	 * @param   int		$notrigger	    0=no, 1=yes (no update trigger)
 	 * @return  int         			<0 if KO, >0 if OK
 	 */
-	function update($user=null, $notrigger=0)
+	function update($user = null, $notrigger = 0)
 	{
 		global $conf, $langs;
 
 		// Clean parameters
-		$this->id=trim($this->id);
-		$this->type=trim($this->type);
-		$this->description=trim($this->description);
+		$this->id = trim($this->id);
+		$this->type = trim($this->type);
+		$this->description = trim($this->description);
 
 		// Check parameters
 		// Put here code to add control on parameters values
 
 		// Update request
 		$sql = "UPDATE ".MAIN_DB_PREFIX."events SET";
-		$sql.= " type='".$this->db->escape($this->type)."',";
-		$sql.= " dateevent='".$this->db->idate($this->dateevent)."',";
-		$sql.= " description='".$this->db->escape($this->description)."'";
-		$sql.= " WHERE rowid=".$this->id;
+		$sql .= " type='".$this->db->escape($this->type)."',";
+		$sql .= " dateevent='".$this->db->idate($this->dateevent)."',";
+		$sql .= " description='".$this->db->escape($this->description)."'";
+		$sql .= " WHERE rowid=".$this->id;
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if (! $resql)
+		if (!$resql)
 		{
-			$this->error="Error ".$this->db->lasterror();
+			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
 		return 1;
@@ -220,31 +220,31 @@ 
 	 *  @param  User	$user       User that load
 	 *  @return int         		<0 if KO, >0 if OK
 	 */
-	function fetch($id, $user=null)
+	function fetch($id, $user = null)
 	{
 		global $langs;
 
 		$sql = "SELECT";
-		$sql.= " t.rowid,";
-		$sql.= " t.tms,";
-		$sql.= " t.type,";
-		$sql.= " t.entity,";
-		$sql.= " t.dateevent,";
-		$sql.= " t.description,";
-		$sql.= " t.ip,";
-		$sql.= " t.user_agent";
-		$sql.= " FROM ".MAIN_DB_PREFIX."events as t";
-		$sql.= " WHERE t.rowid = ".$id;
+		$sql .= " t.rowid,";
+		$sql .= " t.tms,";
+		$sql .= " t.type,";
+		$sql .= " t.entity,";
+		$sql .= " t.dateevent,";
+		$sql .= " t.description,";
+		$sql .= " t.ip,";
+		$sql .= " t.user_agent";
+		$sql .= " FROM ".MAIN_DB_PREFIX."events as t";
+		$sql .= " WHERE t.rowid = ".$id;
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			if ($this->db->num_rows($resql))
 			{
 				$obj = $this->db->fetch_object($resql);
 
-				$this->id    = $obj->rowid;
+				$this->id = $obj->rowid;
 				$this->tms = $this->db->jdate($obj->tms);
 				$this->type = $obj->type;
 				$this->entity = $obj->entity;
@@ -259,7 +259,7 @@ 
 		}
 		else
 		{
-			$this->error="Error ".$this->db->lasterror();
+			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
 	}
@@ -276,13 +276,13 @@ 
 		global $conf, $langs;
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."events";
-		$sql.= " WHERE rowid=".$this->id;
+		$sql .= " WHERE rowid=".$this->id;
 
 		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if (! $resql)
+		if (!$resql)
 		{
-			$this->error="Error ".$this->db->lasterror();
+			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
 
@@ -299,11 +299,11 @@ 
 	 */
 	function initAsSpecimen()
 	{
-		$this->id=0;
+		$this->id = 0;
 
-		$this->tms=time();
-		$this->type='';
-		$this->dateevent=time();
-		$this->description='This is a specimen event';
+		$this->tms = time();
+		$this->type = '';
+		$this->dateevent = time();
+		$this->description = 'This is a specimen event';
 	}
 }

Braces +5 added lines, -5 removed lines

@@ -137,7 +137,9 @@ 
 
 		// Clean parameters
 		$this->description=trim($this->description);
-		if (empty($this->user_agent) && !empty($_SERVER['HTTP_USER_AGENT'])) $this->user_agent=$_SERVER['HTTP_USER_AGENT'];
+		if (empty($this->user_agent) && !empty($_SERVER['HTTP_USER_AGENT'])) {
+		    $this->user_agent=$_SERVER['HTTP_USER_AGENT'];
+		}
 
 		// Check parameters
 		if (empty($this->description)) { $this->error='ErrorBadValueForParameterCreateEventDesc'; return -1; }
@@ -167,8 +169,7 @@ 
 		{
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."events");
 			return $this->id;
-		}
-		else
+		} else
 		{
 			$this->error="Error ".$this->db->lasterror();
 			return -1;
@@ -256,8 +257,7 @@ 
 			$this->db->free($resql);
 
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->error="Error ".$this->db->lasterror();
 			return -1;

dolibarr/htdocs/core/class/ctyperesource.class.php

Indentation +418 added lines, -418 removed lines

@@ -32,436 +32,436 @@ 
  */
 class Ctyperesource
 {
-	/**
-	 * @var string Id to identify managed objects
-	 */
-	public $element = 'ctyperesource';
+    /**
+     * @var string Id to identify managed objects
+     */
+    public $element = 'ctyperesource';
 
-	/**
-	 * @var string Name of table without prefix where object is stored
-	 */
-	public $table_element = 'c_type_resource';
+    /**
+     * @var string Name of table without prefix where object is stored
+     */
+    public $table_element = 'c_type_resource';
 
-	/**
-	 * @var CtyperesourceLine[] Lines
-	 */
-	public $lines = array();
+    /**
+     * @var CtyperesourceLine[] Lines
+     */
+    public $lines = array();
 
-	public $code;
+    public $code;
 
-	/**
+    /**
      * @var string Type resource label
      */
     public $label;
 
-	public $active;
+    public $active;
+
+
+    /**
+     * Constructor
+     *
+     * @param DoliDb $db Database handler
+     */
+    public function __construct(DoliDB $db)
+    {
+        $this->db = $db;
+    }
+
+    /**
+     * Create object into database
+     *
+     * @param  User $user      User that creates
+     * @param  bool $notrigger false=launch triggers after, true=disable triggers
+     *
+     * @return int <0 if KO, Id of created object if OK
+     */
+    public function create(User $user, $notrigger = false)
+    {
+        dol_syslog(__METHOD__, LOG_DEBUG);
+
+        $error = 0;
+
+        // Clean parameters
+
+        if (isset($this->code)) {
+                $this->code = trim($this->code);
+        }
+        if (isset($this->label)) {
+                $this->label = trim($this->label);
+        }
+        if (isset($this->active)) {
+                $this->active = trim($this->active);
+        }
+
 
 
-	/**
-	 * Constructor
-	 *
-	 * @param DoliDb $db Database handler
-	 */
-	public function __construct(DoliDB $db)
-	{
-		$this->db = $db;
-	}
+        // Check parameters
+        // Put here code to add control on parameters values
 
-	/**
-	 * Create object into database
-	 *
-	 * @param  User $user      User that creates
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 *
-	 * @return int <0 if KO, Id of created object if OK
-	 */
-	public function create(User $user, $notrigger = false)
-	{
-		dol_syslog(__METHOD__, LOG_DEBUG);
+        // Insert request
+        $sql = 'INSERT INTO ' . MAIN_DB_PREFIX . $this->table_element . '(';
 
-		$error = 0;
+        $sql.= 'code,';
+        $sql.= 'label';
+        $sql.= 'active';
 
-		// Clean parameters
 
-		if (isset($this->code)) {
-			 $this->code = trim($this->code);
-		}
-		if (isset($this->label)) {
-			 $this->label = trim($this->label);
-		}
-		if (isset($this->active)) {
-			 $this->active = trim($this->active);
-		}
+        $sql .= ') VALUES (';
 
+        $sql .= ' '.(! isset($this->code)?'NULL':"'".$this->db->escape($this->code)."'").',';
+        $sql .= ' '.(! isset($this->label)?'NULL':"'".$this->db->escape($this->label)."'").',';
+        $sql .= ' '.(! isset($this->active)?'NULL':$this->active);
 
 
-		// Check parameters
-		// Put here code to add control on parameters values
+        $sql .= ')';
 
-		// Insert request
-		$sql = 'INSERT INTO ' . MAIN_DB_PREFIX . $this->table_element . '(';
+        $this->db->begin();
 
-		$sql.= 'code,';
-		$sql.= 'label';
-		$sql.= 'active';
+        $resql = $this->db->query($sql);
+        if (!$resql) {
+            $error ++;
+            $this->errors[] = 'Error ' . $this->db->lasterror();
+            dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
+        }
 
+        if (!$error) {
+            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . $this->table_element);
 
-		$sql .= ') VALUES (';
+            // Uncomment this and change MYOBJECT to your own tag if you
+            // want this action to call a trigger.
+            //if (!$notrigger) {
 
-		$sql .= ' '.(! isset($this->code)?'NULL':"'".$this->db->escape($this->code)."'").',';
-		$sql .= ' '.(! isset($this->label)?'NULL':"'".$this->db->escape($this->label)."'").',';
-		$sql .= ' '.(! isset($this->active)?'NULL':$this->active);
+            //  // Call triggers
+            //  $result=$this->call_trigger('MYOBJECT_CREATE',$user);
+            //  if ($result < 0) $error++;
+            //  // End call triggers
+            //}
+        }
 
+        // Commit or rollback
+        if ($error) {
+            $this->db->rollback();
 
-		$sql .= ')';
+            return - 1 * $error;
+        } else {
+            $this->db->commit();
 
-		$this->db->begin();
-
-		$resql = $this->db->query($sql);
-		if (!$resql) {
-			$error ++;
-			$this->errors[] = 'Error ' . $this->db->lasterror();
-			dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
-		}
-
-		if (!$error) {
-			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . $this->table_element);
-
-			// Uncomment this and change MYOBJECT to your own tag if you
-			// want this action to call a trigger.
-			//if (!$notrigger) {
-
-			//  // Call triggers
-			//  $result=$this->call_trigger('MYOBJECT_CREATE',$user);
-			//  if ($result < 0) $error++;
-			//  // End call triggers
-			//}
-		}
-
-		// Commit or rollback
-		if ($error) {
-			$this->db->rollback();
-
-			return - 1 * $error;
-		} else {
-			$this->db->commit();
-
-			return $this->id;
-		}
-	}
-
-	/**
-	 * Load object in memory from the database
-	 *
-	 * @param int    $id  Id object
-	 * @param string $code code
-	 * @param string $label Label
-	 *
-	 * @return int <0 if KO, 0 if not found, >0 if OK
-	 */
-	public function fetch($id,$code='',$label='')
-	{
-		dol_syslog(__METHOD__, LOG_DEBUG);
-
-		$sql = 'SELECT';
-		$sql .= ' t.rowid,';
-
-		$sql .= " t.code,";
-		$sql .= " t.label,";
-		$sql .= " t.active";
-
-
-		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element . ' as t';
-		if ($id)   $sql.= " WHERE t.id = ".$id;
-		elseif ($code) $sql.= " WHERE t.code = '".$this->db->escape($code)."'";
-		elseif ($label) $sql.= " WHERE t.label = '".$this->db->escape($label)."'";
-
-
-		$resql = $this->db->query($sql);
-		if ($resql) {
-			$numrows = $this->db->num_rows($resql);
-			if ($numrows) {
-				$obj = $this->db->fetch_object($resql);
-
-				$this->id = $obj->rowid;
-
-				$this->code = $obj->code;
-				$this->label = $obj->label;
-				$this->active = $obj->active;
-			}
-
-			// Retrieve all extrafields for invoice
-			// fetch optionals attributes and labels
-			// $this->fetch_optionals();
-
-			// $this->fetch_lines();
-
-			$this->db->free($resql);
-
-			if ($numrows) {
-				return 1;
-			} else {
-				return 0;
-			}
-		} else {
-			$this->errors[] = 'Error ' . $this->db->lasterror();
-			dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
-
-			return - 1;
-		}
-	}
-
-	/**
-	 * Load object in memory from the database
-	 *
-	 * @param string $sortorder Sort Order
-	 * @param string $sortfield Sort field
-	 * @param int    $limit     offset limit
-	 * @param int    $offset    offset limit
-	 * @param array  $filter    filter array
-	 * @param string $filtermode filter mode (AND or OR)
-	 *
-	 * @return int <0 if KO, >0 if OK
-	 */
-	public function fetchAll($sortorder='', $sortfield='', $limit=0, $offset=0, array $filter = array(), $filtermode='AND')
-	{
-		dol_syslog(__METHOD__, LOG_DEBUG);
-
-		$sql = 'SELECT';
-		$sql .= ' t.rowid,';
-
-		$sql .= " t.code,";
-		$sql .= " t.label,";
-		$sql .= " t.active";
-
-
-		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element. ' as t';
-
-		// Manage filter
-		$sqlwhere = array();
-		if (count($filter) > 0) {
-			foreach ($filter as $key => $value) {
-				$sqlwhere [] = $key . ' LIKE \'%' . $this->db->escape($value) . '%\'';
-			}
-		}
-
-		if (count($sqlwhere) > 0) {
-			$sql .= ' WHERE ' . implode(' '.$filtermode.' ', $sqlwhere);
-		}
-		if (!empty($sortfield)) {
-			$sql .= $this->db->order($sortfield,$sortorder);
-		}
-		if (!empty($limit)) {
-		 $sql .=  ' ' . $this->db->plimit($limit, $offset);
-		}
-
-		$resql = $this->db->query($sql);
-		if ($resql) {
-			$num = $this->db->num_rows($resql);
-
-			while ($obj = $this->db->fetch_object($resql)) {
-				$line = new self($this->db);
-
-				$line->id = $obj->rowid;
-
-				$line->code = $obj->code;
-				$line->label = $obj->label;
-				$line->active = $obj->active;
-			}
-			$this->db->free($resql);
-
-			return $num;
-		} else {
-			$this->errors[] = 'Error ' . $this->db->lasterror();
-			dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
-
-			return - 1;
-		}
-	}
-
-	/**
-	 * Update object into database
-	 *
-	 * @param  User $user      User that modifies
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 *
-	 * @return int <0 if KO, >0 if OK
-	 */
-	public function update(User $user, $notrigger = false)
-	{
-		$error = 0;
-
-		dol_syslog(__METHOD__, LOG_DEBUG);
-
-		// Clean parameters
-
-		if (isset($this->code)) {
-			 $this->code = trim($this->code);
-		}
-		if (isset($this->label)) {
-			 $this->label = trim($this->label);
-		}
-		if (isset($this->active)) {
-			 $this->active = trim($this->active);
-		}
-
-		// Check parameters
-		// Put here code to add a control on parameters values
-
-		// Update request
-		$sql = 'UPDATE ' . MAIN_DB_PREFIX . $this->table_element . ' SET';
-
-		$sql .= ' code = '.(isset($this->code)?"'".$this->db->escape($this->code)."'":"null").',';
-		$sql .= ' label = '.(isset($this->label)?"'".$this->db->escape($this->label)."'":"null").',';
-		$sql .= ' active = '.(isset($this->active)?$this->active:"null");
-
-
-		$sql .= ' WHERE rowid=' . $this->id;
-
-		$this->db->begin();
-
-		$resql = $this->db->query($sql);
-		if (!$resql) {
-			$error ++;
-			$this->errors[] = 'Error ' . $this->db->lasterror();
-			dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
-		}
-
-		// Uncomment this and change MYOBJECT to your own tag if you
-		// want this action calls a trigger.
-		//if (!$error && !$notrigger) {
-
-		//  // Call triggers
-		//  $result=$this->call_trigger('MYOBJECT_MODIFY',$user);
-		//  if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
-		//  // End call triggers
-		//}
-
-		// Commit or rollback
-		if ($error) {
-			$this->db->rollback();
-
-			return - 1 * $error;
-		} else {
-			$this->db->commit();
-
-			return 1;
-		}
-	}
-
-	/**
-	 * Delete object in database
-	 *
-	 * @param User $user      User that deletes
-	 * @param bool $notrigger false=launch triggers after, true=disable triggers
-	 *
-	 * @return int <0 if KO, >0 if OK
-	 */
-	public function delete(User $user, $notrigger = false)
-	{
-		dol_syslog(__METHOD__, LOG_DEBUG);
-
-		$error = 0;
-
-		$this->db->begin();
-
-		// Uncomment this and change MYOBJECT to your own tag if you
-		// want this action calls a trigger.
-		//if (!$error && !$notrigger) {
-
-		//  // Call triggers
-		//  $result=$this->call_trigger('MYOBJECT_DELETE',$user);
-		//  if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
-		//  // End call triggers
-		//}
-
-		// If you need to delete child tables to, you can insert them here
-
-		if (!$error) {
-			$sql = 'DELETE FROM ' . MAIN_DB_PREFIX . $this->table_element;
-			$sql .= ' WHERE rowid=' . $this->id;
-
-			$resql = $this->db->query($sql);
-			if (!$resql) {
-				$error ++;
-				$this->errors[] = 'Error ' . $this->db->lasterror();
-				dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
-			}
-		}
-
-		// Commit or rollback
-		if ($error) {
-			$this->db->rollback();
-
-			return - 1 * $error;
-		} else {
-			$this->db->commit();
-
-			return 1;
-		}
-	}
-
-	/**
-	 * Load an object from its id and create a new one in database
-	 *
-	 * @param int $fromid Id of object to clone
-	 *
-	 * @return int New id of clone
-	 */
-	public function createFromClone($fromid)
-	{
-		dol_syslog(__METHOD__, LOG_DEBUG);
-
-		global $user;
-		$error = 0;
-		$object = new Ctyperesource($this->db);
-
-		$this->db->begin();
-
-		// Load source object
-		$object->fetch($fromid);
-		// Reset object
-		$object->id = 0;
-
-		// Clear fields
-		// ...
-
-		// Create clone
-		$result = $object->create($user);
-
-		// Other options
-		if ($result < 0) {
-			$error ++;
-			$this->errors = $object->errors;
-			dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
-		}
-
-		// End
-		if (!$error) {
-			$this->db->commit();
-
-			return $object->id;
-		} else {
-			$this->db->rollback();
-
-			return - 1;
-		}
-	}
-
-	/**
-	 * Initialise object with example values
-	 * Id must be 0 if object instance is a specimen
-	 *
-	 * @return void
-	 */
-	public function initAsSpecimen()
-	{
-		$this->id = 0;
-
-		$this->code = '';
-		$this->label = '';
-		$this->active = '';
-	}
+            return $this->id;
+        }
+    }
+
+    /**
+     * Load object in memory from the database
+     *
+     * @param int    $id  Id object
+     * @param string $code code
+     * @param string $label Label
+     *
+     * @return int <0 if KO, 0 if not found, >0 if OK
+     */
+    public function fetch($id,$code='',$label='')
+    {
+        dol_syslog(__METHOD__, LOG_DEBUG);
+
+        $sql = 'SELECT';
+        $sql .= ' t.rowid,';
+
+        $sql .= " t.code,";
+        $sql .= " t.label,";
+        $sql .= " t.active";
+
+
+        $sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element . ' as t';
+        if ($id)   $sql.= " WHERE t.id = ".$id;
+        elseif ($code) $sql.= " WHERE t.code = '".$this->db->escape($code)."'";
+        elseif ($label) $sql.= " WHERE t.label = '".$this->db->escape($label)."'";
+
+
+        $resql = $this->db->query($sql);
+        if ($resql) {
+            $numrows = $this->db->num_rows($resql);
+            if ($numrows) {
+                $obj = $this->db->fetch_object($resql);
+
+                $this->id = $obj->rowid;
+
+                $this->code = $obj->code;
+                $this->label = $obj->label;
+                $this->active = $obj->active;
+            }
+
+            // Retrieve all extrafields for invoice
+            // fetch optionals attributes and labels
+            // $this->fetch_optionals();
+
+            // $this->fetch_lines();
+
+            $this->db->free($resql);
+
+            if ($numrows) {
+                return 1;
+            } else {
+                return 0;
+            }
+        } else {
+            $this->errors[] = 'Error ' . $this->db->lasterror();
+            dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
+
+            return - 1;
+        }
+    }
+
+    /**
+     * Load object in memory from the database
+     *
+     * @param string $sortorder Sort Order
+     * @param string $sortfield Sort field
+     * @param int    $limit     offset limit
+     * @param int    $offset    offset limit
+     * @param array  $filter    filter array
+     * @param string $filtermode filter mode (AND or OR)
+     *
+     * @return int <0 if KO, >0 if OK
+     */
+    public function fetchAll($sortorder='', $sortfield='', $limit=0, $offset=0, array $filter = array(), $filtermode='AND')
+    {
+        dol_syslog(__METHOD__, LOG_DEBUG);
+
+        $sql = 'SELECT';
+        $sql .= ' t.rowid,';
+
+        $sql .= " t.code,";
+        $sql .= " t.label,";
+        $sql .= " t.active";
+
+
+        $sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element. ' as t';
+
+        // Manage filter
+        $sqlwhere = array();
+        if (count($filter) > 0) {
+            foreach ($filter as $key => $value) {
+                $sqlwhere [] = $key . ' LIKE \'%' . $this->db->escape($value) . '%\'';
+            }
+        }
+
+        if (count($sqlwhere) > 0) {
+            $sql .= ' WHERE ' . implode(' '.$filtermode.' ', $sqlwhere);
+        }
+        if (!empty($sortfield)) {
+            $sql .= $this->db->order($sortfield,$sortorder);
+        }
+        if (!empty($limit)) {
+            $sql .=  ' ' . $this->db->plimit($limit, $offset);
+        }
+
+        $resql = $this->db->query($sql);
+        if ($resql) {
+            $num = $this->db->num_rows($resql);
+
+            while ($obj = $this->db->fetch_object($resql)) {
+                $line = new self($this->db);
+
+                $line->id = $obj->rowid;
+
+                $line->code = $obj->code;
+                $line->label = $obj->label;
+                $line->active = $obj->active;
+            }
+            $this->db->free($resql);
+
+            return $num;
+        } else {
+            $this->errors[] = 'Error ' . $this->db->lasterror();
+            dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
+
+            return - 1;
+        }
+    }
+
+    /**
+     * Update object into database
+     *
+     * @param  User $user      User that modifies
+     * @param  bool $notrigger false=launch triggers after, true=disable triggers
+     *
+     * @return int <0 if KO, >0 if OK
+     */
+    public function update(User $user, $notrigger = false)
+    {
+        $error = 0;
+
+        dol_syslog(__METHOD__, LOG_DEBUG);
+
+        // Clean parameters
+
+        if (isset($this->code)) {
+                $this->code = trim($this->code);
+        }
+        if (isset($this->label)) {
+                $this->label = trim($this->label);
+        }
+        if (isset($this->active)) {
+                $this->active = trim($this->active);
+        }
+
+        // Check parameters
+        // Put here code to add a control on parameters values
+
+        // Update request
+        $sql = 'UPDATE ' . MAIN_DB_PREFIX . $this->table_element . ' SET';
+
+        $sql .= ' code = '.(isset($this->code)?"'".$this->db->escape($this->code)."'":"null").',';
+        $sql .= ' label = '.(isset($this->label)?"'".$this->db->escape($this->label)."'":"null").',';
+        $sql .= ' active = '.(isset($this->active)?$this->active:"null");
+
+
+        $sql .= ' WHERE rowid=' . $this->id;
+
+        $this->db->begin();
+
+        $resql = $this->db->query($sql);
+        if (!$resql) {
+            $error ++;
+            $this->errors[] = 'Error ' . $this->db->lasterror();
+            dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
+        }
+
+        // Uncomment this and change MYOBJECT to your own tag if you
+        // want this action calls a trigger.
+        //if (!$error && !$notrigger) {
+
+        //  // Call triggers
+        //  $result=$this->call_trigger('MYOBJECT_MODIFY',$user);
+        //  if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
+        //  // End call triggers
+        //}
+
+        // Commit or rollback
+        if ($error) {
+            $this->db->rollback();
+
+            return - 1 * $error;
+        } else {
+            $this->db->commit();
+
+            return 1;
+        }
+    }
+
+    /**
+     * Delete object in database
+     *
+     * @param User $user      User that deletes
+     * @param bool $notrigger false=launch triggers after, true=disable triggers
+     *
+     * @return int <0 if KO, >0 if OK
+     */
+    public function delete(User $user, $notrigger = false)
+    {
+        dol_syslog(__METHOD__, LOG_DEBUG);
+
+        $error = 0;
+
+        $this->db->begin();
+
+        // Uncomment this and change MYOBJECT to your own tag if you
+        // want this action calls a trigger.
+        //if (!$error && !$notrigger) {
+
+        //  // Call triggers
+        //  $result=$this->call_trigger('MYOBJECT_DELETE',$user);
+        //  if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
+        //  // End call triggers
+        //}
+
+        // If you need to delete child tables to, you can insert them here
+
+        if (!$error) {
+            $sql = 'DELETE FROM ' . MAIN_DB_PREFIX . $this->table_element;
+            $sql .= ' WHERE rowid=' . $this->id;
+
+            $resql = $this->db->query($sql);
+            if (!$resql) {
+                $error ++;
+                $this->errors[] = 'Error ' . $this->db->lasterror();
+                dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
+            }
+        }
+
+        // Commit or rollback
+        if ($error) {
+            $this->db->rollback();
+
+            return - 1 * $error;
+        } else {
+            $this->db->commit();
+
+            return 1;
+        }
+    }
+
+    /**
+     * Load an object from its id and create a new one in database
+     *
+     * @param int $fromid Id of object to clone
+     *
+     * @return int New id of clone
+     */
+    public function createFromClone($fromid)
+    {
+        dol_syslog(__METHOD__, LOG_DEBUG);
+
+        global $user;
+        $error = 0;
+        $object = new Ctyperesource($this->db);
+
+        $this->db->begin();
+
+        // Load source object
+        $object->fetch($fromid);
+        // Reset object
+        $object->id = 0;
+
+        // Clear fields
+        // ...
+
+        // Create clone
+        $result = $object->create($user);
+
+        // Other options
+        if ($result < 0) {
+            $error ++;
+            $this->errors = $object->errors;
+            dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
+        }
+
+        // End
+        if (!$error) {
+            $this->db->commit();
+
+            return $object->id;
+        } else {
+            $this->db->rollback();
+
+            return - 1;
+        }
+    }
+
+    /**
+     * Initialise object with example values
+     * Id must be 0 if object instance is a specimen
+     *
+     * @return void
+     */
+    public function initAsSpecimen()
+    {
+        $this->id = 0;
+
+        $this->code = '';
+        $this->label = '';
+        $this->active = '';
+    }
 }
 
 /**
@@ -469,24 +469,24 @@ 
  */
 class CtyperesourceLine
 {
-	/**
-	 * @var int ID
-	 */
-	public $id;
+    /**
+     * @var int ID
+     */
+    public $id;
 
-	/**
-	 * @var mixed Sample line property 1
-	 */
-	public $code;
+    /**
+     * @var mixed Sample line property 1
+     */
+    public $code;
 
-	/**
+    /**
      * @var string Type resource line label
      */
     public $label;
 
-	public $active;
+    public $active;
 
-	/**
-	 * @var mixed Sample line property 2
-	 */
+    /**
+     * @var mixed Sample line property 2
+     */
 }

Spacing +47 added lines, -47 removed lines

@@ -99,18 +99,18 @@ 
 		// Put here code to add control on parameters values
 
 		// Insert request
-		$sql = 'INSERT INTO ' . MAIN_DB_PREFIX . $this->table_element . '(';
+		$sql = 'INSERT INTO '.MAIN_DB_PREFIX.$this->table_element.'(';
 
-		$sql.= 'code,';
-		$sql.= 'label';
-		$sql.= 'active';
+		$sql .= 'code,';
+		$sql .= 'label';
+		$sql .= 'active';
 
 
 		$sql .= ') VALUES (';
 
-		$sql .= ' '.(! isset($this->code)?'NULL':"'".$this->db->escape($this->code)."'").',';
-		$sql .= ' '.(! isset($this->label)?'NULL':"'".$this->db->escape($this->label)."'").',';
-		$sql .= ' '.(! isset($this->active)?'NULL':$this->active);
+		$sql .= ' '.(!isset($this->code) ? 'NULL' : "'".$this->db->escape($this->code)."'").',';
+		$sql .= ' '.(!isset($this->label) ? 'NULL' : "'".$this->db->escape($this->label)."'").',';
+		$sql .= ' '.(!isset($this->active) ? 'NULL' : $this->active);
 
 
 		$sql .= ')';
@@ -119,13 +119,13 @@ 
 
 		$resql = $this->db->query($sql);
 		if (!$resql) {
-			$error ++;
-			$this->errors[] = 'Error ' . $this->db->lasterror();
-			dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
+			$error++;
+			$this->errors[] = 'Error '.$this->db->lasterror();
+			dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
 		}
 
 		if (!$error) {
-			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . $this->table_element);
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
 
 			// Uncomment this and change MYOBJECT to your own tag if you
 			// want this action to call a trigger.
@@ -142,7 +142,7 @@ 
 		if ($error) {
 			$this->db->rollback();
 
-			return - 1 * $error;
+			return -1 * $error;
 		} else {
 			$this->db->commit();
 
@@ -159,7 +159,7 @@ 
 	 *
 	 * @return int <0 if KO, 0 if not found, >0 if OK
 	 */
-	public function fetch($id,$code='',$label='')
+	public function fetch($id, $code = '', $label = '')
 	{
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
@@ -171,10 +171,10 @@ 
 		$sql .= " t.active";
 
 
-		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element . ' as t';
-		if ($id)   $sql.= " WHERE t.id = ".$id;
-		elseif ($code) $sql.= " WHERE t.code = '".$this->db->escape($code)."'";
-		elseif ($label) $sql.= " WHERE t.label = '".$this->db->escape($label)."'";
+		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
+		if ($id)   $sql .= " WHERE t.id = ".$id;
+		elseif ($code) $sql .= " WHERE t.code = '".$this->db->escape($code)."'";
+		elseif ($label) $sql .= " WHERE t.label = '".$this->db->escape($label)."'";
 
 
 		$resql = $this->db->query($sql);
@@ -204,10 +204,10 @@ 
 				return 0;
 			}
 		} else {
-			$this->errors[] = 'Error ' . $this->db->lasterror();
-			dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
+			$this->errors[] = 'Error '.$this->db->lasterror();
+			dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
 
-			return - 1;
+			return -1;
 		}
 	}
 
@@ -223,7 +223,7 @@ 
 	 *
 	 * @return int <0 if KO, >0 if OK
 	 */
-	public function fetchAll($sortorder='', $sortfield='', $limit=0, $offset=0, array $filter = array(), $filtermode='AND')
+	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
 	{
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
@@ -235,24 +235,24 @@ 
 		$sql .= " t.active";
 
 
-		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element. ' as t';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
 
 		// Manage filter
 		$sqlwhere = array();
 		if (count($filter) > 0) {
 			foreach ($filter as $key => $value) {
-				$sqlwhere [] = $key . ' LIKE \'%' . $this->db->escape($value) . '%\'';
+				$sqlwhere [] = $key.' LIKE \'%'.$this->db->escape($value).'%\'';
 			}
 		}
 
 		if (count($sqlwhere) > 0) {
-			$sql .= ' WHERE ' . implode(' '.$filtermode.' ', $sqlwhere);
+			$sql .= ' WHERE '.implode(' '.$filtermode.' ', $sqlwhere);
 		}
 		if (!empty($sortfield)) {
-			$sql .= $this->db->order($sortfield,$sortorder);
+			$sql .= $this->db->order($sortfield, $sortorder);
 		}
 		if (!empty($limit)) {
-		 $sql .=  ' ' . $this->db->plimit($limit, $offset);
+		 $sql .= ' '.$this->db->plimit($limit, $offset);
 		}
 
 		$resql = $this->db->query($sql);
@@ -272,10 +272,10 @@ 
 
 			return $num;
 		} else {
-			$this->errors[] = 'Error ' . $this->db->lasterror();
-			dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
+			$this->errors[] = 'Error '.$this->db->lasterror();
+			dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
 
-			return - 1;
+			return -1;
 		}
 	}
 
@@ -309,22 +309,22 @@ 
 		// Put here code to add a control on parameters values
 
 		// Update request
-		$sql = 'UPDATE ' . MAIN_DB_PREFIX . $this->table_element . ' SET';
+		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element.' SET';
 
-		$sql .= ' code = '.(isset($this->code)?"'".$this->db->escape($this->code)."'":"null").',';
-		$sql .= ' label = '.(isset($this->label)?"'".$this->db->escape($this->label)."'":"null").',';
-		$sql .= ' active = '.(isset($this->active)?$this->active:"null");
+		$sql .= ' code = '.(isset($this->code) ? "'".$this->db->escape($this->code)."'" : "null").',';
+		$sql .= ' label = '.(isset($this->label) ? "'".$this->db->escape($this->label)."'" : "null").',';
+		$sql .= ' active = '.(isset($this->active) ? $this->active : "null");
 
 
-		$sql .= ' WHERE rowid=' . $this->id;
+		$sql .= ' WHERE rowid='.$this->id;
 
 		$this->db->begin();
 
 		$resql = $this->db->query($sql);
 		if (!$resql) {
-			$error ++;
-			$this->errors[] = 'Error ' . $this->db->lasterror();
-			dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
+			$error++;
+			$this->errors[] = 'Error '.$this->db->lasterror();
+			dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
 		}
 
 		// Uncomment this and change MYOBJECT to your own tag if you
@@ -341,7 +341,7 @@ 
 		if ($error) {
 			$this->db->rollback();
 
-			return - 1 * $error;
+			return -1 * $error;
 		} else {
 			$this->db->commit();
 
@@ -378,14 +378,14 @@ 
 		// If you need to delete child tables to, you can insert them here
 
 		if (!$error) {
-			$sql = 'DELETE FROM ' . MAIN_DB_PREFIX . $this->table_element;
-			$sql .= ' WHERE rowid=' . $this->id;
+			$sql = 'DELETE FROM '.MAIN_DB_PREFIX.$this->table_element;
+			$sql .= ' WHERE rowid='.$this->id;
 
 			$resql = $this->db->query($sql);
 			if (!$resql) {
-				$error ++;
-				$this->errors[] = 'Error ' . $this->db->lasterror();
-				dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
+				$error++;
+				$this->errors[] = 'Error '.$this->db->lasterror();
+				dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
 			}
 		}
 
@@ -393,7 +393,7 @@ 
 		if ($error) {
 			$this->db->rollback();
 
-			return - 1 * $error;
+			return -1 * $error;
 		} else {
 			$this->db->commit();
 
@@ -431,9 +431,9 @@ 
 
 		// Other options
 		if ($result < 0) {
-			$error ++;
+			$error++;
 			$this->errors = $object->errors;
-			dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
+			dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
 		}
 
 		// End
@@ -444,7 +444,7 @@ 
 		} else {
 			$this->db->rollback();
 
-			return - 1;
+			return -1;
 		}
 	}
 

Braces +7 added lines, -3 removed lines

@@ -172,9 +172,13 @@
 
 
 		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element . ' as t';
-		if ($id)   $sql.= " WHERE t.id = ".$id;
-		elseif ($code) $sql.= " WHERE t.code = '".$this->db->escape($code)."'";
-		elseif ($label) $sql.= " WHERE t.label = '".$this->db->escape($label)."'";
+		if ($id) {
+		    $sql.= " WHERE t.id = ".$id;
+		} elseif ($code) {
+		    $sql.= " WHERE t.code = '".$this->db->escape($code)."'";
+		} elseif ($label) {
+		    $sql.= " WHERE t.label = '".$this->db->escape($label)."'";
+		}
 
 
 		$resql = $this->db->query($sql);

dolibarr/htdocs/core/class/html.formsms.class.php

Indentation +6 added lines, -6 removed lines

@@ -102,7 +102,7 @@ 
      */
     function show_form($morecss='titlefield', $showform=1)
     {
-     // phpcs:enable
+        // phpcs:enable
         global $conf, $langs, $user, $form;
 
         if (! is_object($form)) $form=new Form($this->db);
@@ -218,13 +218,13 @@ 
                         $classname=ucfirst($classfile);
                         if (class_exists($classname))
                         {
-                        	$sms = new $classname($this->db);
-                        	$resultsender = $sms->SmsSenderList();
+                            $sms = new $classname($this->db);
+                            $resultsender = $sms->SmsSenderList();
                         }
                         else
                         {
-                        	$sms = new stdClass();
-                        	$sms->error='The SMS manager "'.$classfile.'" defined into SMS setup MAIN_SMS_SENDMODE is not found';
+                            $sms = new stdClass();
+                            $sms->error='The SMS manager "'.$classfile.'" defined into SMS setup MAIN_SMS_SENDMODE is not found';
                         }
                     }
                     catch(Exception $e)
@@ -236,7 +236,7 @@ 
                 else
                 {
                     dol_syslog("Warning: The SMS sending method has not been defined into MAIN_SMS_SENDMODE", LOG_WARNING);
-	                $resultsender=array();
+                    $resultsender=array();
                     $resultsender[0]->number=$this->fromsms;
                 }
 

Spacing +50 added lines, -50 removed lines

@@ -22,7 +22,7 @@ 
  *       \ingroup    core
  *       \brief      Fichier de la classe permettant la generation du formulaire html d'envoi de mail unitaire
  */
-require_once DOL_DOCUMENT_ROOT .'/core/class/html.form.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
 
 
 /**
@@ -45,7 +45,7 @@ 
     public $toname;
     public $tomail;
 
-    public $withsubstit;			// Show substitution array
+    public $withsubstit; // Show substitution array
     public $withfrom;
     public $withto;
     public $withtopic;
@@ -57,18 +57,18 @@ 
     public $withtopicreadonly;
     public $withcancel;
 
-    public $substit=array();
-    public $param=array();
+    public $substit = array();
+    public $param = array();
 
     /**
      * @var string Error code (or message)
      */
-    public $error='';
+    public $error = '';
 
     /**
      * @var string[]	Array of error strings
      */
-    public $errors=array();
+    public $errors = array();
 
 
     /**
@@ -80,16 +80,16 @@ 
     {
         $this->db = $db;
 
-        $this->withfrom=1;
-        $this->withto=1;
-        $this->withtopic=1;
-        $this->withbody=1;
+        $this->withfrom = 1;
+        $this->withto = 1;
+        $this->withtopic = 1;
+        $this->withbody = 1;
 
-        $this->withfromreadonly=1;
-        $this->withreplytoreadonly=1;
-        $this->withtoreadonly=0;
-        $this->withtopicreadonly=0;
-        $this->withbodyreadonly=0;
+        $this->withfromreadonly = 1;
+        $this->withreplytoreadonly = 1;
+        $this->withtoreadonly = 0;
+        $this->withtopicreadonly = 0;
+        $this->withbodyreadonly = 0;
     }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -100,17 +100,17 @@ 
      *  @param int $showform Show form tags and submit button (recommanded is to use with value 0)
      *	@return	void
      */
-    function show_form($morecss='titlefield', $showform=1)
+    function show_form($morecss = 'titlefield', $showform = 1)
     {
      // phpcs:enable
         global $conf, $langs, $user, $form;
 
-        if (! is_object($form)) $form=new Form($this->db);
+        if (!is_object($form)) $form = new Form($this->db);
 
         // Load translation files required by the page
         $langs->loadLangs(array('other', 'mails', 'sms'));
 
-        $soc=new Societe($this->db);
+        $soc = new Societe($this->db);
         if (!empty($this->withtosocid) && $this->withtosocid > 0)
         {
             $soc->fetch($this->withtosocid);
@@ -141,15 +141,15 @@ 
         print "<table class=\"border centpercent\">\n";
 
         // Substitution array
-        if (! empty($this->withsubstit))		// Unset or set ->withsubstit=0 to disable this.
+        if (!empty($this->withsubstit))		// Unset or set ->withsubstit=0 to disable this.
         {
             print "<tr><td colspan=\"2\">";
-            $help="";
-            foreach($this->substit as $key => $val)
+            $help = "";
+            foreach ($this->substit as $key => $val)
             {
-                $help.=$key.' -> '.$langs->trans($val).'<br>';
+                $help .= $key.' -> '.$langs->trans($val).'<br>';
             }
-            print $form->textwithpicto($langs->trans("SmsTestSubstitutionReplacedByGenericValues"),$help);
+            print $form->textwithpicto($langs->trans("SmsTestSubstitutionReplacedByGenericValues"), $help);
             print "</td></tr>\n";
         }
 
@@ -164,7 +164,7 @@ 
                 if ($this->fromtype == 'user')
                 {
                     $langs->load("users");
-                    $fuser=new User($this->db);
+                    $fuser = new User($this->db);
                     $fuser->fetch($this->fromid);
                     print $fuser->getNomUrl(1);
                     print ' &nbsp; ';
@@ -203,19 +203,19 @@ 
                             $resultsender = $sms->SmsSenderList();
                         }
                     }
-                    catch(Exception $e)
+                    catch (Exception $e)
                     {
-                        dol_print_error('','Error to get list of senders: '.$e->getMessage());
+                        dol_print_error('', 'Error to get list of senders: '.$e->getMessage());
                     }
                 }
                 else if (!empty($conf->global->MAIN_SMS_SENDMODE))    // $conf->global->MAIN_SMS_SENDMODE looks like a value 'class@module'
                 {
-                    $tmp=explode('@',$conf->global->MAIN_SMS_SENDMODE);
-                    $classfile=$tmp[0]; $module=(empty($tmp[1])?$tmp[0]:$tmp[1]);
+                    $tmp = explode('@', $conf->global->MAIN_SMS_SENDMODE);
+                    $classfile = $tmp[0]; $module = (empty($tmp[1]) ? $tmp[0] : $tmp[1]);
                     dol_include_once('/'.$module.'/class/'.$classfile.'.class.php');
                     try
                     {
-                        $classname=ucfirst($classfile);
+                        $classname = ucfirst($classfile);
                         if (class_exists($classname))
                         {
                         	$sms = new $classname($this->db);
@@ -224,26 +224,26 @@ 
                         else
                         {
                         	$sms = new stdClass();
-                        	$sms->error='The SMS manager "'.$classfile.'" defined into SMS setup MAIN_SMS_SENDMODE is not found';
+                        	$sms->error = 'The SMS manager "'.$classfile.'" defined into SMS setup MAIN_SMS_SENDMODE is not found';
                         }
                     }
-                    catch(Exception $e)
+                    catch (Exception $e)
                     {
-                        dol_print_error('','Error to get list of senders: '.$e->getMessage());
+                        dol_print_error('', 'Error to get list of senders: '.$e->getMessage());
                         exit;
                     }
                 }
                 else
                 {
                     dol_syslog("Warning: The SMS sending method has not been defined into MAIN_SMS_SENDMODE", LOG_WARNING);
-	                $resultsender=array();
-                    $resultsender[0]->number=$this->fromsms;
+	                $resultsender = array();
+                    $resultsender[0]->number = $this->fromsms;
                 }
 
                 if (is_array($resultsender) && count($resultsender) > 0)
                 {
                     print '<select name="fromsms" id="fromsms" class="flat">';
-                    foreach($resultsender as $obj)
+                    foreach ($resultsender as $obj)
                     {
                         print '<option value="'.$obj->number.'">'.$obj->number.'</option>';
                     }
@@ -252,7 +252,7 @@ 
                 else
                 {
                     print '<span class="error">'.$langs->trans("SmsNoPossibleSenderFound");
-                    if (is_object($sms) && ! empty($sms->error)) print ' '.$sms->error;
+                    if (is_object($sms) && !empty($sms->error)) print ' '.$sms->error;
                     print '</span>';
                 }
                 print '</td>';
@@ -265,22 +265,22 @@ 
         {
             print '<tr><td>';
             //$moretext=$langs->trans("YouCanUseCommaSeparatorForSeveralRecipients");
-            $moretext='';
-            print $form->textwithpicto($langs->trans("SmsTo"),$moretext);
+            $moretext = '';
+            print $form->textwithpicto($langs->trans("SmsTo"), $moretext);
             print '</td><td>';
             if ($this->withtoreadonly)
             {
-                print (! is_array($this->withto) && ! is_numeric($this->withto))?$this->withto:"";
+                print (!is_array($this->withto) && !is_numeric($this->withto)) ? $this->withto : "";
             }
             else
             {
-                print "<input size=\"16\" id=\"sendto\" name=\"sendto\" value=\"".dol_escape_htmltag(! is_array($this->withto) && $this->withto != '1'? (isset($_REQUEST["sendto"])?GETPOST("sendto"):$this->withto):"+")."\">";
-                if (! empty($this->withtosocid) && $this->withtosocid > 0)
+                print "<input size=\"16\" id=\"sendto\" name=\"sendto\" value=\"".dol_escape_htmltag(!is_array($this->withto) && $this->withto != '1' ? (isset($_REQUEST["sendto"]) ?GETPOST("sendto") : $this->withto) : "+")."\">";
+                if (!empty($this->withtosocid) && $this->withtosocid > 0)
                 {
-                    $liste=array();
+                    $liste = array();
                     foreach ($soc->thirdparty_and_contact_phone_array() as $key => $value)
                     {
-                        $liste[$key]=$value;
+                        $liste[$key] = $value;
                     }
                     print " ".$langs->trans("or")." ";
                     //var_dump($_REQUEST);exit;
@@ -294,14 +294,14 @@ 
         // Message
         if ($this->withbody)
         {
-            $defaultmessage='';
-            if ($this->param["models"]=='body')
+            $defaultmessage = '';
+            if ($this->param["models"] == 'body')
             {
-                $defaultmessage=$this->withbody;
+                $defaultmessage = $this->withbody;
             }
-            $defaultmessage=make_substitutions($defaultmessage,$this->substit);
-            if (isset($_POST["message"])) $defaultmessage=$_POST["message"];
-            $defaultmessage=str_replace('\n',"\n",$defaultmessage);
+            $defaultmessage = make_substitutions($defaultmessage, $this->substit);
+            if (isset($_POST["message"])) $defaultmessage = $_POST["message"];
+            $defaultmessage = str_replace('\n', "\n", $defaultmessage);
 
             print "<tr>";
             print '<td class="tdtop">'.$langs->trans("SmsText")."</td>";
@@ -314,7 +314,7 @@ 
             else
             {
                 print '<textarea class="quatrevingtpercent" name="message" id="message" rows="'.ROWS_4.'" onkeyup="limitChars(this, 160, \'charlimitinfospan\')">'.$defaultmessage.'</textarea>';
-                print '<div id="charlimitinfo">'.$langs->trans("SmsInfoCharRemain").': <span id="charlimitinfospan">'.(160-dol_strlen($defaultmessage)).'</span></div></td>';
+                print '<div id="charlimitinfo">'.$langs->trans("SmsInfoCharRemain").': <span id="charlimitinfospan">'.(160 - dol_strlen($defaultmessage)).'</span></div></td>';
             }
             print "</td></tr>\n";
         }

Braces +31 added lines, -28 removed lines

@@ -105,7 +105,9 @@ 
      // phpcs:enable
         global $conf, $langs, $user, $form;
 
-        if (! is_object($form)) $form=new Form($this->db);
+        if (! is_object($form)) {
+            $form=new Form($this->db);
+        }
 
         // Load translation files required by the page
         $langs->loadLangs(array('other', 'mails', 'sms'));
@@ -131,7 +133,9 @@ 
 }
 </script>';
 
-        if ($showform) print "<form method=\"POST\" name=\"smsform\" enctype=\"multipart/form-data\" action=\"".$this->param["returnurl"]."\">\n";
+        if ($showform) {
+            print "<form method=\"POST\" name=\"smsform\" enctype=\"multipart/form-data\" action=\"".$this->param["returnurl"]."\">\n";
+        }
 
         print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
         foreach ($this->param as $key=>$value)
@@ -141,9 +145,11 @@ 
         print "<table class=\"border centpercent\">\n";
 
         // Substitution array
-        if (! empty($this->withsubstit))		// Unset or set ->withsubstit=0 to disable this.
+        if (! empty($this->withsubstit)) {
+            // Unset or set ->withsubstit=0 to disable this.
         {
             print "<tr><td colspan=\"2\">";
+        }
             $help="";
             foreach($this->substit as $key => $val)
             {
@@ -172,8 +178,7 @@ 
                 if ($this->fromsms)
                 {
                     print $this->fromsms;
-                }
-                else
+                } else
                 {
                     if ($this->fromtype)
                     {
@@ -183,34 +188,34 @@ 
                 }
                 print "</td></tr>\n";
                 print "</td></tr>\n";
-            }
-            else
+            } else
             {
                 print '<tr><td class="'.$morecss.'">'.$langs->trans("SmsFrom")."</td><td>";
                 //print '<input type="text" name="fromname" size="30" value="'.$this->fromsms.'">';
-                if ($conf->global->MAIN_SMS_SENDMODE == 'ovh')        // For backward compatibility        @deprecated
+                if ($conf->global->MAIN_SMS_SENDMODE == 'ovh') {
+                    // For backward compatibility        @deprecated
                 {
                     dol_include_once('/ovh/class/ovhsms.class.php');
+                }
                     try
                     {
                         $sms = new OvhSms($this->db);
                         if (empty($conf->global->OVHSMS_ACCOUNT))
                         {
                             $resultsender = 'ErrorOVHSMS_ACCOUNT not defined';
-                        }
-                        else
+                        } else
                         {
                             $resultsender = $sms->SmsSenderList();
                         }
-                    }
-                    catch(Exception $e)
+                    } catch(Exception $e)
                     {
                         dol_print_error('','Error to get list of senders: '.$e->getMessage());
                     }
-                }
-                else if (!empty($conf->global->MAIN_SMS_SENDMODE))    // $conf->global->MAIN_SMS_SENDMODE looks like a value 'class@module'
+                } else if (!empty($conf->global->MAIN_SMS_SENDMODE)) {
+                    // $conf->global->MAIN_SMS_SENDMODE looks like a value 'class@module'
                 {
                     $tmp=explode('@',$conf->global->MAIN_SMS_SENDMODE);
+                }
                     $classfile=$tmp[0]; $module=(empty($tmp[1])?$tmp[0]:$tmp[1]);
                     dol_include_once('/'.$module.'/class/'.$classfile.'.class.php');
                     try
@@ -220,20 +225,17 @@ 
                         {
                         	$sms = new $classname($this->db);
                         	$resultsender = $sms->SmsSenderList();
-                        }
-                        else
+                        } else
                         {
                         	$sms = new stdClass();
                         	$sms->error='The SMS manager "'.$classfile.'" defined into SMS setup MAIN_SMS_SENDMODE is not found';
                         }
-                    }
-                    catch(Exception $e)
+                    } catch(Exception $e)
                     {
                         dol_print_error('','Error to get list of senders: '.$e->getMessage());
                         exit;
                     }
-                }
-                else
+                } else
                 {
                     dol_syslog("Warning: The SMS sending method has not been defined into MAIN_SMS_SENDMODE", LOG_WARNING);
 	                $resultsender=array();
@@ -248,11 +250,12 @@ 
                         print '<option value="'.$obj->number.'">'.$obj->number.'</option>';
                     }
                     print '</select>';
-                }
-                else
+                } else
                 {
                     print '<span class="error">'.$langs->trans("SmsNoPossibleSenderFound");
-                    if (is_object($sms) && ! empty($sms->error)) print ' '.$sms->error;
+                    if (is_object($sms) && ! empty($sms->error)) {
+                        print ' '.$sms->error;
+                    }
                     print '</span>';
                 }
                 print '</td>';
@@ -271,8 +274,7 @@ 
             if ($this->withtoreadonly)
             {
                 print (! is_array($this->withto) && ! is_numeric($this->withto))?$this->withto:"";
-            }
-            else
+            } else
             {
                 print "<input size=\"16\" id=\"sendto\" name=\"sendto\" value=\"".dol_escape_htmltag(! is_array($this->withto) && $this->withto != '1'? (isset($_REQUEST["sendto"])?GETPOST("sendto"):$this->withto):"+")."\">";
                 if (! empty($this->withtosocid) && $this->withtosocid > 0)
@@ -300,7 +302,9 @@ 
                 $defaultmessage=$this->withbody;
             }
             $defaultmessage=make_substitutions($defaultmessage,$this->substit);
-            if (isset($_POST["message"])) $defaultmessage=$_POST["message"];
+            if (isset($_POST["message"])) {
+                $defaultmessage=$_POST["message"];
+            }
             $defaultmessage=str_replace('\n',"\n",$defaultmessage);
 
             print "<tr>";
@@ -310,8 +314,7 @@ 
             {
                 print nl2br($defaultmessage);
                 print '<input type="hidden" name="message" value="'.dol_escape_htmltag($defaultmessage).'">';
-            }
-            else
+            } else
             {
                 print '<textarea class="quatrevingtpercent" name="message" id="message" rows="'.ROWS_4.'" onkeyup="limitChars(this, 160, \'charlimitinfospan\')">'.$defaultmessage.'</textarea>';
                 print '<div id="charlimitinfo">'.$langs->trans("SmsInfoCharRemain").': <span id="charlimitinfospan">'.(160-dol_strlen($defaultmessage)).'</span></div></td>';

dolibarr/htdocs/core/class/rssparser.class.php

Indentation +39 added lines, -39 removed lines

@@ -32,9 +32,9 @@ 
     public $db;
 
     /**
-	 * @var string Error code (or message)
-	 */
-	public $error='';
+     * @var string Error code (or message)
+     */
+    public $error='';
 
     private $_format='';
     private $_urlRSS;
@@ -61,7 +61,7 @@ 
      */
     public function __construct($db)
     {
-    	$this->db = $db;
+        $this->db = $db;
     }
 
     /**
@@ -252,28 +252,28 @@ 
 
         if ($str !== false)
         {
-	        // Convert $str into xml
-	        if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
-	        {
-	            //print 'xx'.LIBXML_NOCDATA;
-	            libxml_use_internal_errors(false);
-	            $rss = simplexml_load_string($str, "SimpleXMLElement", LIBXML_NOCDATA);
-	        }
-	        else
-	        {
-	            $xmlparser=xml_parser_create('');
-	            if (!is_resource($xmlparser)) {
-	                $this->error="ErrorFailedToCreateParser"; return -1;
-	            }
-
-	            xml_set_object($xmlparser, $this);
-	            xml_set_element_handler($xmlparser, 'feed_start_element', 'feed_end_element');
-	            xml_set_character_data_handler($xmlparser, 'feed_cdata');
-	            $status = xml_parse($xmlparser, $str);
-	            xml_parser_free($xmlparser);
-	            $rss=$this;
-	            //var_dump($rss->_format);exit;
-	        }
+            // Convert $str into xml
+            if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
+            {
+                //print 'xx'.LIBXML_NOCDATA;
+                libxml_use_internal_errors(false);
+                $rss = simplexml_load_string($str, "SimpleXMLElement", LIBXML_NOCDATA);
+            }
+            else
+            {
+                $xmlparser=xml_parser_create('');
+                if (!is_resource($xmlparser)) {
+                    $this->error="ErrorFailedToCreateParser"; return -1;
+                }
+
+                xml_set_object($xmlparser, $this);
+                xml_set_element_handler($xmlparser, 'feed_start_element', 'feed_end_element');
+                xml_set_character_data_handler($xmlparser, 'feed_cdata');
+                $status = xml_parse($xmlparser, $str);
+                xml_parser_free($xmlparser);
+                $rss=$this;
+                //var_dump($rss->_format);exit;
+            }
         }
 
         // If $rss loaded
@@ -287,16 +287,16 @@ 
                 $fp = fopen($newpathofdestfile, 'w');
                 if ($fp)
                 {
-                	fwrite($fp, $str);
-                	fclose($fp);
-                	if (! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK;
-                	@chmod($newpathofdestfile, octdec($newmask));
+                    fwrite($fp, $str);
+                    fclose($fp);
+                    if (! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK;
+                    @chmod($newpathofdestfile, octdec($newmask));
 
-	                $this->_lastfetchdate=$nowgmt;
+                    $this->_lastfetchdate=$nowgmt;
                 }
                 else
                 {
-                	print 'Error, failed to open file '.$newpathofdestfile.' for write';
+                    print 'Error, failed to open file '.$newpathofdestfile.' for write';
                 }
             }
 
@@ -435,13 +435,13 @@ 
 
                     // Add record to result array
                     $this->_rssarray[$i] = array(
-    					'link'=>$itemLink,
-    					'title'=>$itemTitle,
-    					'description'=>$itemDescription,
-    					'pubDate'=>$itemPubDate,
-    					'category'=>$itemCategory,
-    				    'id'=>$itemId,
-    				    'author'=>$itemAuthor);
+                        'link'=>$itemLink,
+                        'title'=>$itemTitle,
+                        'description'=>$itemDescription,
+                        'pubDate'=>$itemPubDate,
+                        'category'=>$itemCategory,
+                        'id'=>$itemId,
+                        'author'=>$itemAuthor);
                     //var_dump($this->_rssarray);
 
                     $i++;

Spacing +86 added lines, -86 removed lines

@@ -34,9 +34,9 @@ 
     /**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
-    private $_format='';
+    private $_format = '';
     private $_urlRSS;
     private $_language;
     private $_generator;
@@ -46,8 +46,8 @@ 
     private $_link;
     private $_title;
     private $_description;
-    private $_lastfetchdate;    // Last successful fetch
-    private $_rssarray=array();
+    private $_lastfetchdate; // Last successful fetch
+    private $_rssarray = array();
 
     // For parsing with xmlparser
     var $stack               = array(); // parser stack
@@ -184,40 +184,40 @@ 
      * 	@param	string	$cachedir	Directory where to save cache file
      *	@return	int					<0 if KO, >0 if OK
      */
-    public function parser($urlRSS, $maxNb=0, $cachedelay=60, $cachedir='')
+    public function parser($urlRSS, $maxNb = 0, $cachedelay = 60, $cachedir = '')
     {
         global $conf;
 
         include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-        $rss='';
-        $str='';    // This will contain content of feed
+        $rss = '';
+        $str = ''; // This will contain content of feed
 
         // Check parameters
-        if (! dol_is_url($urlRSS))
+        if (!dol_is_url($urlRSS))
         {
-            $this->error="ErrorBadUrl";
+            $this->error = "ErrorBadUrl";
             return -1;
         }
 
         $this->_urlRSS = $urlRSS;
-        $newpathofdestfile=$cachedir.'/'.dol_hash($this->_urlRSS,3);	// Force md5 hash (does not contains special chars)
-        $newmask='0644';
+        $newpathofdestfile = $cachedir.'/'.dol_hash($this->_urlRSS, 3); // Force md5 hash (does not contains special chars)
+        $newmask = '0644';
 
         //dol_syslog("RssPArser::parser parse url=".$urlRSS." => cache file=".$newpathofdestfile);
         $nowgmt = dol_now();
 
         // Search into cache
-        $foundintocache=0;
+        $foundintocache = 0;
         if ($cachedelay > 0 && $cachedir)
         {
-            $filedate=dol_filemtime($newpathofdestfile);
+            $filedate = dol_filemtime($newpathofdestfile);
             if ($filedate >= ($nowgmt - $cachedelay))
             {
                 //dol_syslog("RssParser::parser cache file ".$newpathofdestfile." is not older than now - cachedelay (".$nowgmt." - ".$cachedelay.") so we use it.");
-                $foundintocache=1;
+                $foundintocache = 1;
 
-                $this->_lastfetchdate=$filedate;
+                $this->_lastfetchdate = $filedate;
             }
             else
             {
@@ -233,13 +233,13 @@ 
         else
         {
             try {
-                ini_set("user_agent","Dolibarr ERP-CRM RSS reader");
+                ini_set("user_agent", "Dolibarr ERP-CRM RSS reader");
                 ini_set("max_execution_time", $conf->global->MAIN_USE_RESPONSE_TIMEOUT);
                 ini_set("default_socket_timeout", $conf->global->MAIN_USE_RESPONSE_TIMEOUT);
 
                 $opts = array('http'=>array('method'=>"GET"));
-                if (! empty($conf->global->MAIN_USE_CONNECT_TIMEOUT)) $opts['http']['timeout']=$conf->global->MAIN_USE_CONNECT_TIMEOUT;
-                if (! empty($conf->global->MAIN_PROXY_USE))           $opts['http']['proxy']='tcp://'.$conf->global->MAIN_PROXY_HOST.':'.$conf->global->MAIN_PROXY_PORT;
+                if (!empty($conf->global->MAIN_USE_CONNECT_TIMEOUT)) $opts['http']['timeout'] = $conf->global->MAIN_USE_CONNECT_TIMEOUT;
+                if (!empty($conf->global->MAIN_PROXY_USE))           $opts['http']['proxy'] = 'tcp://'.$conf->global->MAIN_PROXY_HOST.':'.$conf->global->MAIN_PROXY_PORT;
                 //var_dump($opts);exit;
                 $context = stream_context_create($opts);
 
@@ -253,7 +253,7 @@ 
         if ($str !== false)
         {
 	        // Convert $str into xml
-	        if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
+	        if (!empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
 	        {
 	            //print 'xx'.LIBXML_NOCDATA;
 	            libxml_use_internal_errors(false);
@@ -261,9 +261,9 @@ 
 	        }
 	        else
 	        {
-	            $xmlparser=xml_parser_create('');
+	            $xmlparser = xml_parser_create('');
 	            if (!is_resource($xmlparser)) {
-	                $this->error="ErrorFailedToCreateParser"; return -1;
+	                $this->error = "ErrorFailedToCreateParser"; return -1;
 	            }
 
 	            xml_set_object($xmlparser, $this);
@@ -271,7 +271,7 @@ 
 	            xml_set_character_data_handler($xmlparser, 'feed_cdata');
 	            $status = xml_parse($xmlparser, $str);
 	            xml_parser_free($xmlparser);
-	            $rss=$this;
+	            $rss = $this;
 	            //var_dump($rss->_format);exit;
 	        }
         }
@@ -283,16 +283,16 @@ 
             if (empty($foundintocache) && $cachedir)
             {
                 dol_syslog(get_class($this)."::parser cache file ".$newpathofdestfile." is saved onto disk.");
-                if (! dol_is_dir($cachedir)) dol_mkdir($cachedir);
+                if (!dol_is_dir($cachedir)) dol_mkdir($cachedir);
                 $fp = fopen($newpathofdestfile, 'w');
                 if ($fp)
                 {
                 	fwrite($fp, $str);
                 	fclose($fp);
-                	if (! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK;
+                	if (!empty($conf->global->MAIN_UMASK)) $newmask = $conf->global->MAIN_UMASK;
                 	@chmod($newpathofdestfile, octdec($newmask));
 
-	                $this->_lastfetchdate=$nowgmt;
+	                $this->_lastfetchdate = $nowgmt;
                 }
                 else
                 {
@@ -300,21 +300,21 @@ 
                 }
             }
 
-            unset($str);    // Free memory
+            unset($str); // Free memory
 
             if (empty($rss->_format))    // If format not detected automatically
             {
-                $rss->_format='rss';
-                if (empty($rss->channel)) $rss->_format='atom';
+                $rss->_format = 'rss';
+                if (empty($rss->channel)) $rss->_format = 'atom';
             }
 
-            $items=array();
+            $items = array();
 
             // Save description entries
             if ($rss->_format == 'rss')
             {
                 //var_dump($rss);
-                if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
+                if (!empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
                 {
                     if (!empty($rss->channel->language))      $this->_language = (string) $rss->channel->language;
                     if (!empty($rss->channel->generator))     $this->_generator = (string) $rss->channel->generator;
@@ -338,14 +338,14 @@ 
                     if (!empty($rss->channel['description']))   $this->_description = (string) $rss->channel['description'];
                 }
 
-                if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML)) $items=$rss->channel->item;    // With simplexml
-                else $items=$rss->items;                                                              // With xmlparse
+                if (!empty($conf->global->EXTERNALRSS_USE_SIMPLEXML)) $items = $rss->channel->item; // With simplexml
+                else $items = $rss->items; // With xmlparse
                 //var_dump($items);exit;
             }
             else if ($rss->_format == 'atom')
             {
                 //var_dump($rss);
-                if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
+                if (!empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
                 {
                     if (!empty($rss->generator))     $this->_generator = (string) $rss->generator;
                     if (!empty($rss->lastbuilddate)) $this->_lastbuilddate = (string) $rss->modified;
@@ -364,10 +364,10 @@ 
                     if (!empty($rss->channel['title']))         $this->_title = (string) $rss->channel['title'];
                     //if (!empty($rss->channel['rss_description']))   $this->_description = (string) $rss->channel['rss_description'];
                 }
-                if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))  {
-                    $tmprss=xml2php($rss); $items=$tmprss['entry'];
+                if (!empty($conf->global->EXTERNALRSS_USE_SIMPLEXML)) {
+                    $tmprss = xml2php($rss); $items = $tmprss['entry'];
                 } // With simplexml
-                else $items=$rss->items;                                                              // With xmlparse
+                else $items = $rss->items; // With xmlparse
                 //var_dump($items);exit;
             }
 
@@ -376,12 +376,12 @@ 
             // Loop on each record
             if (is_array($items))
             {
-                foreach($items as $item)
+                foreach ($items as $item)
                 {
                     //var_dump($item);exit;
                     if ($rss->_format == 'rss')
                     {
-                        if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
+                        if (!empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
                         {
                             $itemLink = (string) $item->link;
                             $itemTitle = (string) $item->title;
@@ -401,7 +401,7 @@ 
                         }
 
                         // Loop on each category
-                        $itemCategory=array();
+                        $itemCategory = array();
                         if (is_array($item->category))
                         {
                             foreach ($item->category as $cat)
@@ -412,14 +412,14 @@ 
                     }
                     else if ($rss->_format == 'atom')
                     {
-                        if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
+                        if (!empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
                         {
                             $itemLink = (isset($item['link']['href']) ? (string) $item['link']['href'] : '');
                             $itemTitle = (string) $item['title'];
                             $itemDescription = (string) $item['summary'];
                             $itemPubDate = (string) $item['created'];
                             $itemId = (string) $item['id'];
-                            $itemAuthor = (string) ($item['author']?$item['author']:$item['author_name']);
+                            $itemAuthor = (string) ($item['author'] ? $item['author'] : $item['author_name']);
                         }
                         else
                         {
@@ -428,7 +428,7 @@ 
                             $itemDescription = (string) $item['summary'];
                             $itemPubDate = (string) $item['created'];
                             $itemId = (string) $item['id'];
-                            $itemAuthor = (string) ($item['author']?$item['author']:$item['author_name']);
+                            $itemAuthor = (string) ($item['author'] ? $item['author'] : $item['author_name']);
                         }
                     }
                     else print 'ErrorBadFeedFormat';
@@ -446,7 +446,7 @@ 
 
                     $i++;
 
-                    if ($i > $maxNb)    break;    // We get all records we want
+                    if ($i > $maxNb)    break; // We get all records we want
                 }
             }
 
@@ -454,7 +454,7 @@ 
         }
         else
         {
-            $this->error='ErrorFailedToLoadRSSFile';
+            $this->error = 'ErrorFailedToLoadRSSFile';
             return -1;
         }
     }
@@ -482,7 +482,7 @@ 
         {
             list($ns, $el) = explode(':', $element, 2);
         }
-        if ( $ns and $ns != 'rdf' )
+        if ($ns and $ns != 'rdf')
         {
             $this->current_namespace = $ns;
         }
@@ -490,15 +490,15 @@ 
         // if feed type isn't set, then this is first element of feed identify feed from root element
         if (empty($this->_format))
         {
-            if ( $el == 'rdf' ) {
+            if ($el == 'rdf') {
                 $this->_format = 'rss';
                 $this->feed_version = '1.0';
             }
-            elseif ( $el == 'rss' ) {
+            elseif ($el == 'rss') {
                 $this->_format = 'rss';
                 $this->feed_version = $attrs['version'];
             }
-            elseif ( $el == 'feed' ) {
+            elseif ($el == 'feed') {
                 $this->_format = 'atom';
                 $this->feed_version = $attrs['version'];
                 $this->inchannel = true;
@@ -506,14 +506,14 @@ 
             return;
         }
 
-        if ( $el == 'channel' )
+        if ($el == 'channel')
         {
             $this->inchannel = true;
         }
-        elseif ($el == 'item' or $el == 'entry' )
+        elseif ($el == 'item' or $el == 'entry')
         {
             $this->initem = true;
-            if ( isset($attrs['rdf:about']) ) {
+            if (isset($attrs['rdf:about'])) {
                 $this->current_item['about'] = $attrs['rdf:about'];
             }
         }
@@ -537,10 +537,10 @@ 
         }
 
         // handle atom content constructs
-        elseif ( $this->_format == 'atom' and in_array($el, $this->_CONTENT_CONSTRUCTS) )
+        elseif ($this->_format == 'atom' and in_array($el, $this->_CONTENT_CONSTRUCTS))
         {
             // avoid clashing w/ RSS mod_content
-            if ($el == 'content' ) {
+            if ($el == 'content') {
                 $el = 'atom_content';
             }
 
@@ -548,7 +548,7 @@ 
         }
 
         // if inside an Atom content construct (e.g. content or summary) field treat tags as text
-        elseif ($this->_format == 'atom' and $this->incontent )
+        elseif ($this->_format == 'atom' and $this->incontent)
         {
             // if tags are inlined, then flatten
             $attrs_str = join(' ', array_map('map_attrs', array_keys($attrs), array_values($attrs)));
@@ -562,14 +562,14 @@ 
         // Magpie treats link elements of type rel='alternate'
         // as being equivalent to RSS's simple link element.
         //
-        elseif ($this->_format == 'atom' and $el == 'link' )
+        elseif ($this->_format == 'atom' and $el == 'link')
         {
-            if ( isset($attrs['rel']) && $attrs['rel'] == 'alternate' )
+            if (isset($attrs['rel']) && $attrs['rel'] == 'alternate')
             {
                 $link_el = 'link';
             }
             else {
-                $link_el = 'link_' . $attrs['rel'];
+                $link_el = 'link_'.$attrs['rel'];
             }
 
             $this->append($link_el, $attrs['href']);
@@ -622,26 +622,26 @@ 
             $this->current_item = array();
             $this->initem = false;
         }
-        elseif ($this->_format == 'rss' and $this->current_namespace == '' and $el == 'textinput' )
+        elseif ($this->_format == 'rss' and $this->current_namespace == '' and $el == 'textinput')
         {
             $this->intextinput = false;
         }
-        elseif ($this->_format == 'rss' and $this->current_namespace == '' and $el == 'image' )
+        elseif ($this->_format == 'rss' and $this->current_namespace == '' and $el == 'image')
         {
             $this->inimage = false;
         }
-        elseif ($this->_format == 'atom' and in_array($el, $this->_CONTENT_CONSTRUCTS) )
+        elseif ($this->_format == 'atom' and in_array($el, $this->_CONTENT_CONSTRUCTS))
         {
             $this->incontent = false;
         }
-        elseif ($el == 'channel' or $el == 'feed' )
+        elseif ($el == 'channel' or $el == 'feed')
         {
             $this->inchannel = false;
         }
-        elseif ($this->_format == 'atom' and $this->incontent  ) {
+        elseif ($this->_format == 'atom' and $this->incontent) {
             // balance tags properly
             // note:  i don't think this is actually neccessary
-            if ( $this->stack[0] == $el )
+            if ($this->stack[0] == $el)
             {
                 $this->append_content("</$el>");
             }
@@ -666,10 +666,10 @@ 
      *  @param	string	$str2		Str2
      *  @return	string				String cancatenated
      */
-    function concat(&$str1, $str2="")
+    function concat(&$str1, $str2 = "")
     {
-        if (!isset($str1) ) {
-            $str1="";
+        if (!isset($str1)) {
+            $str1 = "";
         }
         $str1 .= $str2;
     }
@@ -684,11 +684,11 @@ 
     function append_content($text)
     {
         // phpcs:enable
-        if ( $this->initem ) {
-            $this->concat($this->current_item[ $this->incontent ], $text);
+        if ($this->initem) {
+            $this->concat($this->current_item[$this->incontent], $text);
         }
-        elseif ( $this->inchannel ) {
-            $this->concat($this->channel[ $this->incontent ], $text);
+        elseif ($this->inchannel) {
+            $this->concat($this->channel[$this->incontent], $text);
         }
     }
 
@@ -704,33 +704,33 @@ 
         if (!$el) {
             return;
         }
-        if ( $this->current_namespace )
+        if ($this->current_namespace)
         {
-            if ( $this->initem ) {
-                $this->concat($this->current_item[ $this->current_namespace ][ $el ], $text);
+            if ($this->initem) {
+                $this->concat($this->current_item[$this->current_namespace][$el], $text);
             }
             elseif ($this->inchannel) {
-                $this->concat($this->channel[ $this->current_namespace][ $el ], $text);
+                $this->concat($this->channel[$this->current_namespace][$el], $text);
             }
             elseif ($this->intextinput) {
-                $this->concat($this->textinput[ $this->current_namespace][ $el ], $text);
+                $this->concat($this->textinput[$this->current_namespace][$el], $text);
             }
             elseif ($this->inimage) {
-                $this->concat($this->image[ $this->current_namespace ][ $el ], $text);
+                $this->concat($this->image[$this->current_namespace][$el], $text);
             }
         }
         else {
-            if ( $this->initem ) {
-                $this->concat($this->current_item[ $el ], $text);
+            if ($this->initem) {
+                $this->concat($this->current_item[$el], $text);
             }
             elseif ($this->intextinput) {
-                $this->concat($this->textinput[ $el ], $text);
+                $this->concat($this->textinput[$el], $text);
             }
             elseif ($this->inimage) {
-                $this->concat($this->image[ $el ], $text);
+                $this->concat($this->image[$el], $text);
             }
             elseif ($this->inchannel) {
-                $this->concat($this->channel[ $el ], $text);
+                $this->concat($this->channel[$el], $text);
             }
         }
     }
@@ -748,18 +748,18 @@ 
     $fils = 0;
     $tab = false;
     $array = array();
-    foreach($xml->children() as $key => $value)
+    foreach ($xml->children() as $key => $value)
     {
         $child = xml2php($value);
 
         //To deal with the attributes
-        foreach($value->attributes() as $ak=>$av)
+        foreach ($value->attributes() as $ak=>$av)
         {
             $child[$ak] = (string) $av;
         }
 
         //Let see if the new child is not in the array
-        if ($tab === false && in_array($key,array_keys($array)))
+        if ($tab === false && in_array($key, array_keys($array)))
         {
             //If this element is already in the array we will create an indexed array
             $tmp = $array[$key];
@@ -768,7 +768,7 @@ 
             $array[$key][] = $child;
             $tab = true;
         }
-        elseif($tab === true)
+        elseif ($tab === true)
         {
             //Add an element in an existing array
             $array[$key][] = $child;
@@ -783,7 +783,7 @@ 
     }
 
 
-    if ($fils==0)
+    if ($fils == 0)
     {
         return (string) $xml;
     }

Braces +148 added lines, -107 removed lines

@@ -218,19 +218,19 @@ 
                 $foundintocache=1;
 
                 $this->_lastfetchdate=$filedate;
-            }
-            else
+            } else
             {
                 dol_syslog(get_class($this)."::parser cache file ".$newpathofdestfile." is not found or older than now - cachedelay (".$nowgmt." - ".$cachedelay.") so we can't use it.");
             }
         }
 
         // Load file into $str
-        if ($foundintocache)    // Cache file found and is not too old
+        if ($foundintocache) {
+            // Cache file found and is not too old
         {
             $str = file_get_contents($newpathofdestfile);
         }
-        else
+        } else
         {
             try {
                 ini_set("user_agent","Dolibarr ERP-CRM RSS reader");
@@ -238,14 +238,17 @@ 
                 ini_set("default_socket_timeout", $conf->global->MAIN_USE_RESPONSE_TIMEOUT);
 
                 $opts = array('http'=>array('method'=>"GET"));
-                if (! empty($conf->global->MAIN_USE_CONNECT_TIMEOUT)) $opts['http']['timeout']=$conf->global->MAIN_USE_CONNECT_TIMEOUT;
-                if (! empty($conf->global->MAIN_PROXY_USE))           $opts['http']['proxy']='tcp://'.$conf->global->MAIN_PROXY_HOST.':'.$conf->global->MAIN_PROXY_PORT;
+                if (! empty($conf->global->MAIN_USE_CONNECT_TIMEOUT)) {
+                    $opts['http']['timeout']=$conf->global->MAIN_USE_CONNECT_TIMEOUT;
+                }
+                if (! empty($conf->global->MAIN_PROXY_USE)) {
+                    $opts['http']['proxy']='tcp://'.$conf->global->MAIN_PROXY_HOST.':'.$conf->global->MAIN_PROXY_PORT;
+                }
                 //var_dump($opts);exit;
                 $context = stream_context_create($opts);
 
                 $str = file_get_contents($this->_urlRSS, false, $context);
-            }
-            catch (Exception $e) {
+            } catch (Exception $e) {
                 print 'Error retrieving URL '.$this->urlRSS.' - '.$e->getMessage();
             }
         }
@@ -258,8 +261,7 @@ 
 	            //print 'xx'.LIBXML_NOCDATA;
 	            libxml_use_internal_errors(false);
 	            $rss = simplexml_load_string($str, "SimpleXMLElement", LIBXML_NOCDATA);
-	        }
-	        else
+	        } else
 	        {
 	            $xmlparser=xml_parser_create('');
 	            if (!is_resource($xmlparser)) {
@@ -283,18 +285,21 @@ 
             if (empty($foundintocache) && $cachedir)
             {
                 dol_syslog(get_class($this)."::parser cache file ".$newpathofdestfile." is saved onto disk.");
-                if (! dol_is_dir($cachedir)) dol_mkdir($cachedir);
+                if (! dol_is_dir($cachedir)) {
+                    dol_mkdir($cachedir);
+                }
                 $fp = fopen($newpathofdestfile, 'w');
                 if ($fp)
                 {
                 	fwrite($fp, $str);
                 	fclose($fp);
-                	if (! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK;
+                	if (! empty($conf->global->MAIN_UMASK)) {
+                	    $newmask=$conf->global->MAIN_UMASK;
+                	}
                 	@chmod($newpathofdestfile, octdec($newmask));
 
 	                $this->_lastfetchdate=$nowgmt;
-                }
-                else
+                } else
                 {
                 	print 'Error, failed to open file '.$newpathofdestfile.' for write';
                 }
@@ -302,10 +307,14 @@ 
 
             unset($str);    // Free memory
 
-            if (empty($rss->_format))    // If format not detected automatically
+            if (empty($rss->_format)) {
+                // If format not detected automatically
             {
                 $rss->_format='rss';
-                if (empty($rss->channel)) $rss->_format='atom';
+            }
+                if (empty($rss->channel)) {
+                    $rss->_format='atom';
+                }
             }
 
             $items=array();
@@ -316,58 +325,114 @@ 
                 //var_dump($rss);
                 if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
                 {
-                    if (!empty($rss->channel->language))      $this->_language = (string) $rss->channel->language;
-                    if (!empty($rss->channel->generator))     $this->_generator = (string) $rss->channel->generator;
-                    if (!empty($rss->channel->copyright))     $this->_copyright = (string) $rss->channel->copyright;
-                    if (!empty($rss->channel->lastbuilddate)) $this->_lastbuilddate = (string) $rss->channel->lastbuilddate;
-                    if (!empty($rss->channel->image->url[0])) $this->_imageurl = (string) $rss->channel->image->url[0];
-                    if (!empty($rss->channel->link))		  $this->_link = (string) $rss->channel->link;
-                    if (!empty($rss->channel->title))         $this->_title = (string) $rss->channel->title;
-                    if (!empty($rss->channel->description))	  $this->_description = (string) $rss->channel->description;
-                }
-                else
+                    if (!empty($rss->channel->language)) {
+                        $this->_language = (string) $rss->channel->language;
+                    }
+                    if (!empty($rss->channel->generator)) {
+                        $this->_generator = (string) $rss->channel->generator;
+                    }
+                    if (!empty($rss->channel->copyright)) {
+                        $this->_copyright = (string) $rss->channel->copyright;
+                    }
+                    if (!empty($rss->channel->lastbuilddate)) {
+                        $this->_lastbuilddate = (string) $rss->channel->lastbuilddate;
+                    }
+                    if (!empty($rss->channel->image->url[0])) {
+                        $this->_imageurl = (string) $rss->channel->image->url[0];
+                    }
+                    if (!empty($rss->channel->link)) {
+                        $this->_link = (string) $rss->channel->link;
+                    }
+                    if (!empty($rss->channel->title)) {
+                        $this->_title = (string) $rss->channel->title;
+                    }
+                    if (!empty($rss->channel->description)) {
+                        $this->_description = (string) $rss->channel->description;
+                    }
+                } else
                 {
                     //var_dump($rss->channel);
-                    if (!empty($rss->channel['language']))      $this->_language = (string) $rss->channel['language'];
-                    if (!empty($rss->channel['generator']))     $this->_generator = (string) $rss->channel['generator'];
-                    if (!empty($rss->channel['copyright']))     $this->_copyright = (string) $rss->channel['copyright'];
-                    if (!empty($rss->channel['lastbuilddate'])) $this->_lastbuilddate = (string) $rss->channel['lastbuilddate'];
-                    if (!empty($rss->image['url']))             $this->_imageurl = (string) $rss->image['url'];
-                    if (!empty($rss->channel['link']))		    $this->_link = (string) $rss->channel['link'];
-                    if (!empty($rss->channel['title']))         $this->_title = (string) $rss->channel['title'];
-                    if (!empty($rss->channel['description']))   $this->_description = (string) $rss->channel['description'];
+                    if (!empty($rss->channel['language'])) {
+                        $this->_language = (string) $rss->channel['language'];
+                    }
+                    if (!empty($rss->channel['generator'])) {
+                        $this->_generator = (string) $rss->channel['generator'];
+                    }
+                    if (!empty($rss->channel['copyright'])) {
+                        $this->_copyright = (string) $rss->channel['copyright'];
+                    }
+                    if (!empty($rss->channel['lastbuilddate'])) {
+                        $this->_lastbuilddate = (string) $rss->channel['lastbuilddate'];
+                    }
+                    if (!empty($rss->image['url'])) {
+                        $this->_imageurl = (string) $rss->image['url'];
+                    }
+                    if (!empty($rss->channel['link'])) {
+                        $this->_link = (string) $rss->channel['link'];
+                    }
+                    if (!empty($rss->channel['title'])) {
+                        $this->_title = (string) $rss->channel['title'];
+                    }
+                    if (!empty($rss->channel['description'])) {
+                        $this->_description = (string) $rss->channel['description'];
+                    }
                 }
 
-                if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML)) $items=$rss->channel->item;    // With simplexml
-                else $items=$rss->items;                                                              // With xmlparse
+                if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML)) {
+                    $items=$rss->channel->item;
+                }
+                // With simplexml
+                else {
+                    $items=$rss->items;
+                }
+                // With xmlparse
                 //var_dump($items);exit;
-            }
-            else if ($rss->_format == 'atom')
+            } else if ($rss->_format == 'atom')
             {
                 //var_dump($rss);
                 if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
                 {
-                    if (!empty($rss->generator))     $this->_generator = (string) $rss->generator;
-                    if (!empty($rss->lastbuilddate)) $this->_lastbuilddate = (string) $rss->modified;
-                    if (!empty($rss->link->href))    $this->_link = (string) $rss->link->href;
-                    if (!empty($rss->title))         $this->_title = (string) $rss->title;
-                    if (!empty($rss->description))	 $this->_description = (string) $rss->description;
-                }
-                else
+                    if (!empty($rss->generator)) {
+                        $this->_generator = (string) $rss->generator;
+                    }
+                    if (!empty($rss->lastbuilddate)) {
+                        $this->_lastbuilddate = (string) $rss->modified;
+                    }
+                    if (!empty($rss->link->href)) {
+                        $this->_link = (string) $rss->link->href;
+                    }
+                    if (!empty($rss->title)) {
+                        $this->_title = (string) $rss->title;
+                    }
+                    if (!empty($rss->description)) {
+                        $this->_description = (string) $rss->description;
+                    }
+                } else
                 {
                     //if (!empty($rss->channel['rss_language']))      $this->_language = (string) $rss->channel['rss_language'];
-                    if (!empty($rss->channel['generator']))     $this->_generator = (string) $rss->channel['generator'];
+                    if (!empty($rss->channel['generator'])) {
+                        $this->_generator = (string) $rss->channel['generator'];
+                    }
                     //if (!empty($rss->channel['rss_copyright']))     $this->_copyright = (string) $rss->channel['rss_copyright'];
-                    if (!empty($rss->channel['modified'])) $this->_lastbuilddate = (string) $rss->channel['modified'];
+                    if (!empty($rss->channel['modified'])) {
+                        $this->_lastbuilddate = (string) $rss->channel['modified'];
+                    }
                     //if (!empty($rss->image['rss_url']))             $this->_imageurl = (string) $rss->image['rss_url'];
-                    if (!empty($rss->channel['link']))		    $this->_link = (string) $rss->channel['link'];
-                    if (!empty($rss->channel['title']))         $this->_title = (string) $rss->channel['title'];
+                    if (!empty($rss->channel['link'])) {
+                        $this->_link = (string) $rss->channel['link'];
+                    }
+                    if (!empty($rss->channel['title'])) {
+                        $this->_title = (string) $rss->channel['title'];
+                    }
                     //if (!empty($rss->channel['rss_description']))   $this->_description = (string) $rss->channel['rss_description'];
                 }
                 if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))  {
                     $tmprss=xml2php($rss); $items=$tmprss['entry'];
                 } // With simplexml
-                else $items=$rss->items;                                                              // With xmlparse
+                else {
+                    $items=$rss->items;
+                }
+                // With xmlparse
                 //var_dump($items);exit;
             }
 
@@ -389,8 +454,7 @@ 
                             $itemPubDate = (string) $item->pubDate;
                             $itemId = '';
                             $itemAuthor = '';
-                        }
-                        else
+                        } else
                         {
                             $itemLink = (string) $item['link'];
                             $itemTitle = (string) $item['title'];
@@ -409,8 +473,7 @@ 
                                 $itemCategory[] = (string) $cat;
                             }
                         }
-                    }
-                    else if ($rss->_format == 'atom')
+                    } else if ($rss->_format == 'atom')
                     {
                         if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
                         {
@@ -420,8 +483,7 @@ 
                             $itemPubDate = (string) $item['created'];
                             $itemId = (string) $item['id'];
                             $itemAuthor = (string) ($item['author']?$item['author']:$item['author_name']);
-                        }
-                        else
+                        } else
                         {
                             $itemLink = (isset($item['link']['href']) ? (string) $item['link']['href'] : '');
                             $itemTitle = (string) $item['title'];
@@ -430,8 +492,9 @@ 
                             $itemId = (string) $item['id'];
                             $itemAuthor = (string) ($item['author']?$item['author']:$item['author_name']);
                         }
+                    } else {
+                        print 'ErrorBadFeedFormat';
                     }
-                    else print 'ErrorBadFeedFormat';
 
                     // Add record to result array
                     $this->_rssarray[$i] = array(
@@ -446,13 +509,15 @@ 
 
                     $i++;
 
-                    if ($i > $maxNb)    break;    // We get all records we want
+                    if ($i > $maxNb) {
+                        break;
+                    }
+                    // We get all records we want
                 }
             }
 
             return 1;
-        }
-        else
+        } else
         {
             $this->error='ErrorFailedToLoadRSSFile';
             return -1;
@@ -493,12 +558,10 @@ 
             if ( $el == 'rdf' ) {
                 $this->_format = 'rss';
                 $this->feed_version = '1.0';
-            }
-            elseif ( $el == 'rss' ) {
+            } elseif ( $el == 'rss' ) {
                 $this->_format = 'rss';
                 $this->feed_version = $attrs['version'];
-            }
-            elseif ( $el == 'feed' ) {
+            } elseif ( $el == 'feed' ) {
                 $this->_format = 'atom';
                 $this->feed_version = $attrs['version'];
                 $this->inchannel = true;
@@ -509,8 +572,7 @@ 
         if ( $el == 'channel' )
         {
             $this->inchannel = true;
-        }
-        elseif ($el == 'item' or $el == 'entry' )
+        } elseif ($el == 'item' or $el == 'entry' )
         {
             $this->initem = true;
             if ( isset($attrs['rdf:about']) ) {
@@ -526,9 +588,7 @@ 
         $el == 'textinput' )
         {
             $this->intextinput = true;
-        }
-
-        elseif (
+        } elseif (
         $this->_format == 'rss' and
         $this->current_namespace == '' and
         $el == 'image' )
@@ -567,8 +627,7 @@ 
             if ( isset($attrs['rel']) && $attrs['rel'] == 'alternate' )
             {
                 $link_el = 'link';
-            }
-            else {
+            } else {
                 $link_el = 'link_' . $attrs['rel'];
             }
 
@@ -595,8 +654,7 @@ 
         if ($this->_format == 'atom' and $this->incontent)
         {
             $this->append_content($text);
-        }
-        else
+        } else
         {
             $current_el = join('_', array_reverse($this->stack));
             $this->append($current_el, $text);
@@ -621,37 +679,30 @@ 
             $this->items[] = $this->current_item;
             $this->current_item = array();
             $this->initem = false;
-        }
-        elseif ($this->_format == 'rss' and $this->current_namespace == '' and $el == 'textinput' )
+        } elseif ($this->_format == 'rss' and $this->current_namespace == '' and $el == 'textinput' )
         {
             $this->intextinput = false;
-        }
-        elseif ($this->_format == 'rss' and $this->current_namespace == '' and $el == 'image' )
+        } elseif ($this->_format == 'rss' and $this->current_namespace == '' and $el == 'image' )
         {
             $this->inimage = false;
-        }
-        elseif ($this->_format == 'atom' and in_array($el, $this->_CONTENT_CONSTRUCTS) )
+        } elseif ($this->_format == 'atom' and in_array($el, $this->_CONTENT_CONSTRUCTS) )
         {
             $this->incontent = false;
-        }
-        elseif ($el == 'channel' or $el == 'feed' )
+        } elseif ($el == 'channel' or $el == 'feed' )
         {
             $this->inchannel = false;
-        }
-        elseif ($this->_format == 'atom' and $this->incontent  ) {
+        } elseif ($this->_format == 'atom' and $this->incontent  ) {
             // balance tags properly
             // note:  i don't think this is actually neccessary
             if ( $this->stack[0] == $el )
             {
                 $this->append_content("</$el>");
-            }
-            else {
+            } else {
                 $this->append_content("<$el />");
             }
 
             array_shift($this->stack);
-        }
-        else {
+        } else {
             array_shift($this->stack);
         }
 
@@ -686,8 +737,7 @@ 
         // phpcs:enable
         if ( $this->initem ) {
             $this->concat($this->current_item[ $this->incontent ], $text);
-        }
-        elseif ( $this->inchannel ) {
+        } elseif ( $this->inchannel ) {
             $this->concat($this->channel[ $this->incontent ], $text);
         }
     }
@@ -708,28 +758,21 @@ 
         {
             if ( $this->initem ) {
                 $this->concat($this->current_item[ $this->current_namespace ][ $el ], $text);
-            }
-            elseif ($this->inchannel) {
+            } elseif ($this->inchannel) {
                 $this->concat($this->channel[ $this->current_namespace][ $el ], $text);
-            }
-            elseif ($this->intextinput) {
+            } elseif ($this->intextinput) {
                 $this->concat($this->textinput[ $this->current_namespace][ $el ], $text);
-            }
-            elseif ($this->inimage) {
+            } elseif ($this->inimage) {
                 $this->concat($this->image[ $this->current_namespace ][ $el ], $text);
             }
-        }
-        else {
+        } else {
             if ( $this->initem ) {
                 $this->concat($this->current_item[ $el ], $text);
-            }
-            elseif ($this->intextinput) {
+            } elseif ($this->intextinput) {
                 $this->concat($this->textinput[ $el ], $text);
-            }
-            elseif ($this->inimage) {
+            } elseif ($this->inimage) {
                 $this->concat($this->image[ $el ], $text);
-            }
-            elseif ($this->inchannel) {
+            } elseif ($this->inchannel) {
                 $this->concat($this->channel[ $el ], $text);
             }
         }
@@ -767,13 +810,11 @@ 
             $array[$key][] = $tmp;
             $array[$key][] = $child;
             $tab = true;
-        }
-        elseif($tab === true)
+        } elseif($tab === true)
         {
             //Add an element in an existing array
             $array[$key][] = $child;
-        }
-        else
+        } else
         {
             //Add a simple element
             $array[$key] = $child;

dolibarr/htdocs/core/class/genericobject.class.php

Spacing +2 added lines, -2 removed lines

@@ -20,7 +20,7 @@ 
  *	\ingroup    core
  *	\brief      File of class of generic business class
  */
-require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
 
 
 /**
@@ -36,6 +36,6 @@ 
      */
     function __construct($db)
     {
-        $this->db=$db;
+        $this->db = $db;
     }
 }

dolibarr/htdocs/core/class/menu.class.php

Indentation +3 added lines, -3 removed lines

@@ -31,11 +31,11 @@ 
     var $liste;
 
     /**
-	 *	Constructor
+     *	Constructor
      */
     function __construct()
     {
-      	$this->liste = array();
+            $this->liste = array();
     }
 
     /**
@@ -67,7 +67,7 @@ 
      */
     function add($url, $titre, $level=0, $enabled=1, $target='',$mainmenu='',$leftmenu='',$position=0, $id='', $idsel='', $classname='', $prefix='')
     {
-    	$this->liste[]=array('url'=>$url,'titre'=>$titre,'level'=>$level,'enabled'=>$enabled,'target'=>$target,'mainmenu'=>$mainmenu,'leftmenu'=>$leftmenu, 'position'=>$position, 'id'=>$id, 'idsel'=>$idsel, 'classname'=>$classname, 'prefix'=>$prefix);
+        $this->liste[]=array('url'=>$url,'titre'=>$titre,'level'=>$level,'enabled'=>$enabled,'target'=>$target,'mainmenu'=>$mainmenu,'leftmenu'=>$leftmenu, 'position'=>$position, 'id'=>$id, 'idsel'=>$idsel, 'classname'=>$classname, 'prefix'=>$prefix);
     }
 
     /**

Spacing +10 added lines, -10 removed lines

@@ -65,9 +65,9 @@ 
      * @param	string	$prefix		Prefix to title (image or picto)
      * @return	void
      */
-    function add($url, $titre, $level=0, $enabled=1, $target='',$mainmenu='',$leftmenu='',$position=0, $id='', $idsel='', $classname='', $prefix='')
+    function add($url, $titre, $level = 0, $enabled = 1, $target = '', $mainmenu = '', $leftmenu = '', $position = 0, $id = '', $idsel = '', $classname = '', $prefix = '')
     {
-    	$this->liste[]=array('url'=>$url,'titre'=>$titre,'level'=>$level,'enabled'=>$enabled,'target'=>$target,'mainmenu'=>$mainmenu,'leftmenu'=>$leftmenu, 'position'=>$position, 'id'=>$id, 'idsel'=>$idsel, 'classname'=>$classname, 'prefix'=>$prefix);
+    	$this->liste[] = array('url'=>$url, 'titre'=>$titre, 'level'=>$level, 'enabled'=>$enabled, 'target'=>$target, 'mainmenu'=>$mainmenu, 'leftmenu'=>$leftmenu, 'position'=>$position, 'id'=>$id, 'idsel'=>$idsel, 'classname'=>$classname, 'prefix'=>$prefix);
     }
 
     /**
@@ -88,12 +88,12 @@ 
      * @param	string	$prefix		Prefix to title (image or picto)
      * @return	void
      */
-    function insert($idafter, $url, $titre, $level=0, $enabled=1, $target='',$mainmenu='',$leftmenu='',$position=0, $id='', $idsel='', $classname='', $prefix='')
+    function insert($idafter, $url, $titre, $level = 0, $enabled = 1, $target = '', $mainmenu = '', $leftmenu = '', $position = 0, $id = '', $idsel = '', $classname = '', $prefix = '')
     {
-        $array_start = array_slice($this->liste,0,($idafter+1));
-        $array_new   = array(0=>array('url'=>$url,'titre'=>$titre,'level'=>$level,'enabled'=>$enabled,'target'=>$target,'mainmenu'=>$mainmenu,'leftmenu'=>$leftmenu,'position'=>$position, 'id'=>$id, 'idsel'=>$idsel, 'classname'=>$classname, 'prefix'=>$prefix));
-        $array_end   = array_slice($this->liste,($idafter+1));
-        $this->liste=array_merge($array_start,$array_new,$array_end);
+        $array_start = array_slice($this->liste, 0, ($idafter + 1));
+        $array_new   = array(0=>array('url'=>$url, 'titre'=>$titre, 'level'=>$level, 'enabled'=>$enabled, 'target'=>$target, 'mainmenu'=>$mainmenu, 'leftmenu'=>$leftmenu, 'position'=>$position, 'id'=>$id, 'idsel'=>$idsel, 'classname'=>$classname, 'prefix'=>$prefix));
+        $array_end   = array_slice($this->liste, ($idafter + 1));
+        $this->liste = array_merge($array_start, $array_new, $array_end);
     }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -117,10 +117,10 @@ 
      */
     function getNbOfVisibleMenuEntries()
     {
-        $nb=0;
-        foreach($this->liste as $val)
+        $nb = 0;
+        foreach ($this->liste as $val)
         {
-            if (! empty($val['enabled'])) $nb++;
+            if (!empty($val['enabled'])) $nb++;
         }
         return $nb;
     }

Braces +3 added lines, -1 removed lines

@@ -120,7 +120,9 @@
         $nb=0;
         foreach($this->liste as $val)
         {
-            if (! empty($val['enabled'])) $nb++;
+            if (! empty($val['enabled'])) {
+                $nb++;
+            }
         }
         return $nb;
     }