Dolibarr / dolibarr

htdocs/core/modules/societe/modules_societe.class.php

Doc Comments +3 added lines, -3 removed lines

@@ -111,7 +111,7 @@ 
     /**
      *  Return next value available
      *
-     *	@param	Societe		$objsoc		Object thirdparty
+     *	@param	integer		$objsoc		Object thirdparty
      *	@param	int			$type		Type
      *  @return string      			Value
      */
@@ -272,7 +272,7 @@ 
     /**		Return an example of result returned by getNextValue
      *
      *      @param	Translate	$langs		Object langs
-     *      @param	societe		$objsoc		Object thirdparty
+     *      @param	integer		$objsoc		Object thirdparty
      *      @param	int			$type		Type of third party (1:customer, 2:supplier, -1:autodetect)
      *      @return	string					Example
      */
@@ -367,7 +367,7 @@ 
  *  Create a document onto disk according to template module.
  *
  *	@param	DoliDB		$db  			Database handler
- *	@param  Facture		$object			Object invoice
+ *	@param  Societe		$object			Object invoice
  *  @param  string      $message        Message (not used, deprecated)
  *	@param	string		$modele			Force template to use ('' to not force)
  *	@param	Translate	$outputlangs	objet lang a utiliser pour traduction

Indentation +296 added lines, -296 removed lines

@@ -33,27 +33,27 @@ 
  */
 abstract class ModeleThirdPartyDoc extends CommonDocGenerator
 {
-    var $error='';
+	var $error='';
 
-    /**
-     *  Return list of active generation modules
-     *
+	/**
+	 *  Return list of active generation modules
+	 *
 	 * 	@param	DoliDB		$db					Database handler
-     *  @param	integer		$maxfilenamelength  Max length of value to show
-     * 	@return	array							List of templates
-     */
-    static function liste_modeles($db,$maxfilenamelength=0)
-    {
-        global $conf;
+	 *  @param	integer		$maxfilenamelength  Max length of value to show
+	 * 	@return	array							List of templates
+	 */
+	static function liste_modeles($db,$maxfilenamelength=0)
+	{
+		global $conf;
 
-        $type='company';
-        $liste=array();
+		$type='company';
+		$liste=array();
 
-        include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-        $liste=getListOfModels($db,$type,$maxfilenamelength);
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+		$liste=getListOfModels($db,$type,$maxfilenamelength);
 
-        return $liste;
-    }
+		return $liste;
+	}
 
 }
 
@@ -63,188 +63,188 @@ 
  */
 abstract class ModeleThirdPartyCode
 {
-    var $error='';
-
-    /**     Renvoi la description par defaut du modele de numerotation
-     *
-     *		@param	Translate	$langs		Object langs
-     *      @return string      			Texte descripif
-     */
-    function info($langs)
-    {
-        $langs->load("bills");
-        return $langs->trans("NoDescription");
-    }
-
-    /**     Renvoi nom module
-     *
-     *		@param	Translate	$langs		Object langs
-     *      @return string      			Nom du module
-     */
-    function getNom($langs)
-    {
-        return $this->nom;
-    }
-
-
-    /**     Renvoi un exemple de numerotation
-     *
-     *		@param	Translate	$langs		Object langs
-     *      @return string      			Example
-     */
-    function getExample($langs)
-    {
-        $langs->load("bills");
-        return $langs->trans("NoExample");
-    }
-
-    /**     Test si les numeros deja en vigueur dans la base ne provoquent pas de
-     *      de conflits qui empechera cette numerotation de fonctionner.
-     *
-     *      @return     boolean     false si conflit, true si ok
-     */
-    function canBeActivated()
-    {
-        return true;
-    }
-
-    /**
-     *  Return next value available
-     *
-     *	@param	Societe		$objsoc		Object thirdparty
-     *	@param	int			$type		Type
-     *  @return string      			Value
-     */
-    function getNextValue($objsoc=0,$type=-1)
-    {
-        global $langs;
-        return $langs->trans("Function_getNextValue_InModuleNotWorking");
-    }
-
-
-    /**     Return version of module
-     *
-     *      @return     string      Version
-     */
-    function getVersion()
-    {
-        global $langs;
-        $langs->load("admin");
-
-        if ($this->version == 'development') return $langs->trans("VersionDevelopment");
-        if ($this->version == 'experimental') return $langs->trans("VersionExperimental");
-        if ($this->version == 'dolibarr') return DOL_VERSION;
-        if ($this->version) return $this->version;
-        return $langs->trans("NotAvailable");
-    }
-
-    /**
-     *  Renvoi la liste des modeles de numéroation
-     *
-     *  @param	DoliDB	$db     			Database handler
-     *  @param  integer	$maxfilenamelength  Max length of value to show
-     *  @return	array						List of numbers
-     */
-    static function liste_modeles($db,$maxfilenamelength=0)
-    {
-        $liste=array();
-        $sql ="";
-
-        $resql = $db->query($sql);
-        if ($resql)
-        {
-            $num = $db->num_rows($resql);
-            $i = 0;
-            while ($i < $num)
-            {
-                $row = $db->fetch_row($resql);
-                $liste[$row[0]]=$row[1];
-                $i++;
-            }
-        }
-        else
-        {
-            return -1;
-        }
-        return $liste;
-    }
-
-    /**
-     *      Return description of module parameters
-     *
-     *      @param	Translate	$langs      Output language
-     *		@param	Societe		$soc		Third party object
-     *		@param	int			$type		-1=Nothing, 0=Customer, 1=Supplier
-     *		@return	string					HTML translated description
-     */
-    function getToolTip($langs,$soc,$type)
-    {
-        global $conf;
-
-        $langs->load("admin");
-
-        $s='';
-        if ($type == -1) $s.=$langs->trans("Name").': <b>'.$this->getNom($langs).'</b><br>';
-        if ($type == -1) $s.=$langs->trans("Version").': <b>'.$this->getVersion().'</b><br>';
-        if ($type == 0)  $s.=$langs->trans("CustomerCodeDesc").'<br>';
-        if ($type == 1)  $s.=$langs->trans("SupplierCodeDesc").'<br>';
-        if ($type != -1) $s.=$langs->trans("ValidityControledByModule").': <b>'.$this->getNom($langs).'</b><br>';
-        $s.='<br>';
-        $s.='<u>'.$langs->trans("ThisIsModuleRules").':</u><br>';
-        if ($type == 0)
-        {
-            $s.=$langs->trans("RequiredIfCustomer").': ';
-            if (! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.='<strike>';
-            $s.=yn(!$this->code_null,1,2);
-            if (! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.='</strike> '.yn(1,1,2).' ('.$langs->trans("ForcedToByAModule",$langs->transnoentities("yes")).')';
-            $s.='<br>';
-        }
-        if ($type == 1)
-        {
-            $s.=$langs->trans("RequiredIfSupplier").': ';
-            if (! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.='<strike>';
-            $s.=yn(!$this->code_null,1,2);
-            if (! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.='</strike> '.yn(1,1,2).' ('.$langs->trans("ForcedToByAModule",$langs->transnoentities("yes")).')';
-            $s.='<br>';
-        }
-        if ($type == -1)
-        {
-            $s.=$langs->trans("Required").': ';
-            if (! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.='<strike>';
-            $s.=yn(!$this->code_null,1,2);
-            if (! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.='</strike> '.yn(1,1,2).' ('.$langs->trans("ForcedToByAModule",$langs->transnoentities("yes")).')';
-            $s.='<br>';
-        }
-        $s.=$langs->trans("CanBeModifiedIfOk").': ';
-        $s.=yn($this->code_modifiable,1,2);
-        $s.='<br>';
-        $s.=$langs->trans("CanBeModifiedIfKo").': '.yn($this->code_modifiable_invalide,1,2).'<br>';
-        $s.=$langs->trans("AutomaticCode").': '.yn($this->code_auto,1,2).'<br>';
-        $s.='<br>';
-        if ($type == 0 || $type == -1)
-        {
-            $nextval=$this->getNextValue($soc,0);
-            if (empty($nextval)) $nextval=$langs->trans("Undefined");
-            $s.=$langs->trans("NextValue").($type == -1?' ('.$langs->trans("Customer").')':'').': <b>'.$nextval.'</b><br>';
-        }
-        if ($type == 1 || $type == -1)
-        {
-            $nextval=$this->getNextValue($soc,1);
-            if (empty($nextval)) $nextval=$langs->trans("Undefined");
-            $s.=$langs->trans("NextValue").($type == -1?' ('.$langs->trans("Supplier").')':'').': <b>'.$nextval.'</b>';
-        }
-        return $s;
-    }
+	var $error='';
+
+	/**     Renvoi la description par defaut du modele de numerotation
+	 *
+	 *		@param	Translate	$langs		Object langs
+	 *      @return string      			Texte descripif
+	 */
+	function info($langs)
+	{
+		$langs->load("bills");
+		return $langs->trans("NoDescription");
+	}
+
+	/**     Renvoi nom module
+	 *
+	 *		@param	Translate	$langs		Object langs
+	 *      @return string      			Nom du module
+	 */
+	function getNom($langs)
+	{
+		return $this->nom;
+	}
+
+
+	/**     Renvoi un exemple de numerotation
+	 *
+	 *		@param	Translate	$langs		Object langs
+	 *      @return string      			Example
+	 */
+	function getExample($langs)
+	{
+		$langs->load("bills");
+		return $langs->trans("NoExample");
+	}
+
+	/**     Test si les numeros deja en vigueur dans la base ne provoquent pas de
+	 *      de conflits qui empechera cette numerotation de fonctionner.
+	 *
+	 *      @return     boolean     false si conflit, true si ok
+	 */
+	function canBeActivated()
+	{
+		return true;
+	}
+
+	/**
+	 *  Return next value available
+	 *
+	 *	@param	Societe		$objsoc		Object thirdparty
+	 *	@param	int			$type		Type
+	 *  @return string      			Value
+	 */
+	function getNextValue($objsoc=0,$type=-1)
+	{
+		global $langs;
+		return $langs->trans("Function_getNextValue_InModuleNotWorking");
+	}
+
+
+	/**     Return version of module
+	 *
+	 *      @return     string      Version
+	 */
+	function getVersion()
+	{
+		global $langs;
+		$langs->load("admin");
+
+		if ($this->version == 'development') return $langs->trans("VersionDevelopment");
+		if ($this->version == 'experimental') return $langs->trans("VersionExperimental");
+		if ($this->version == 'dolibarr') return DOL_VERSION;
+		if ($this->version) return $this->version;
+		return $langs->trans("NotAvailable");
+	}
+
+	/**
+	 *  Renvoi la liste des modeles de numéroation
+	 *
+	 *  @param	DoliDB	$db     			Database handler
+	 *  @param  integer	$maxfilenamelength  Max length of value to show
+	 *  @return	array						List of numbers
+	 */
+	static function liste_modeles($db,$maxfilenamelength=0)
+	{
+		$liste=array();
+		$sql ="";
+
+		$resql = $db->query($sql);
+		if ($resql)
+		{
+			$num = $db->num_rows($resql);
+			$i = 0;
+			while ($i < $num)
+			{
+				$row = $db->fetch_row($resql);
+				$liste[$row[0]]=$row[1];
+				$i++;
+			}
+		}
+		else
+		{
+			return -1;
+		}
+		return $liste;
+	}
+
+	/**
+	 *      Return description of module parameters
+	 *
+	 *      @param	Translate	$langs      Output language
+	 *		@param	Societe		$soc		Third party object
+	 *		@param	int			$type		-1=Nothing, 0=Customer, 1=Supplier
+	 *		@return	string					HTML translated description
+	 */
+	function getToolTip($langs,$soc,$type)
+	{
+		global $conf;
+
+		$langs->load("admin");
+
+		$s='';
+		if ($type == -1) $s.=$langs->trans("Name").': <b>'.$this->getNom($langs).'</b><br>';
+		if ($type == -1) $s.=$langs->trans("Version").': <b>'.$this->getVersion().'</b><br>';
+		if ($type == 0)  $s.=$langs->trans("CustomerCodeDesc").'<br>';
+		if ($type == 1)  $s.=$langs->trans("SupplierCodeDesc").'<br>';
+		if ($type != -1) $s.=$langs->trans("ValidityControledByModule").': <b>'.$this->getNom($langs).'</b><br>';
+		$s.='<br>';
+		$s.='<u>'.$langs->trans("ThisIsModuleRules").':</u><br>';
+		if ($type == 0)
+		{
+			$s.=$langs->trans("RequiredIfCustomer").': ';
+			if (! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.='<strike>';
+			$s.=yn(!$this->code_null,1,2);
+			if (! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.='</strike> '.yn(1,1,2).' ('.$langs->trans("ForcedToByAModule",$langs->transnoentities("yes")).')';
+			$s.='<br>';
+		}
+		if ($type == 1)
+		{
+			$s.=$langs->trans("RequiredIfSupplier").': ';
+			if (! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.='<strike>';
+			$s.=yn(!$this->code_null,1,2);
+			if (! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.='</strike> '.yn(1,1,2).' ('.$langs->trans("ForcedToByAModule",$langs->transnoentities("yes")).')';
+			$s.='<br>';
+		}
+		if ($type == -1)
+		{
+			$s.=$langs->trans("Required").': ';
+			if (! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.='<strike>';
+			$s.=yn(!$this->code_null,1,2);
+			if (! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.='</strike> '.yn(1,1,2).' ('.$langs->trans("ForcedToByAModule",$langs->transnoentities("yes")).')';
+			$s.='<br>';
+		}
+		$s.=$langs->trans("CanBeModifiedIfOk").': ';
+		$s.=yn($this->code_modifiable,1,2);
+		$s.='<br>';
+		$s.=$langs->trans("CanBeModifiedIfKo").': '.yn($this->code_modifiable_invalide,1,2).'<br>';
+		$s.=$langs->trans("AutomaticCode").': '.yn($this->code_auto,1,2).'<br>';
+		$s.='<br>';
+		if ($type == 0 || $type == -1)
+		{
+			$nextval=$this->getNextValue($soc,0);
+			if (empty($nextval)) $nextval=$langs->trans("Undefined");
+			$s.=$langs->trans("NextValue").($type == -1?' ('.$langs->trans("Customer").')':'').': <b>'.$nextval.'</b><br>';
+		}
+		if ($type == 1 || $type == -1)
+		{
+			$nextval=$this->getNextValue($soc,1);
+			if (empty($nextval)) $nextval=$langs->trans("Undefined");
+			$s.=$langs->trans("NextValue").($type == -1?' ('.$langs->trans("Supplier").')':'').': <b>'.$nextval.'</b>';
+		}
+		return $s;
+	}
 
 	/**
 	 *   Check if mask/numbering use prefix
 	 *
 	 *   @return	int		0=no, 1=yes
 	 */
-    function verif_prefixIsUsed()
-    {
-        return 0;
-    }
+	function verif_prefixIsUsed()
+	{
+		return 0;
+	}
 
 }
 
@@ -255,110 +255,110 @@ 
  */
 abstract class ModeleAccountancyCode
 {
-    var $error='';
-
-
-    /**		Return description of module
-     *
-     * 		@param	Translate	$langs		Object langs
-     * 		@return string      			Description of module
-     */
-    function info($langs)
-    {
-        $langs->load("bills");
-        return $langs->trans("NoDescription");
-    }
-
-    /**		Return an example of result returned by getNextValue
-     *
-     *      @param	Translate	$langs		Object langs
-     *      @param	societe		$objsoc		Object thirdparty
-     *      @param	int			$type		Type of third party (1:customer, 2:supplier, -1:autodetect)
-     *      @return	string					Example
-     */
-    function getExample($langs,$objsoc=0,$type=-1)
-    {
-        $langs->load("bills");
-        return $langs->trans("NoExample");
-    }
-
-    /**     Test si les numeros deja en vigueur dans la base ne provoquent pas de
-     *      de conflits qui empechera cette numerotation de fonctionner.
-     *
-     *      @return     boolean     false si conflit, true si ok
-     */
-    function canBeActivated()
-    {
-        return true;
-    }
-
-    /**     Return version of module
-     *
-     *      @return     string      Version
-     */
-    function getVersion()
-    {
-        global $langs;
-        $langs->load("admin");
-
-        if ($this->version == 'development') return $langs->trans("VersionDevelopment");
-        if ($this->version == 'experimental') return $langs->trans("VersionExperimental");
-        if ($this->version == 'dolibarr') return DOL_VERSION;
-        if ($this->version) return $this->version;
-        return $langs->trans("NotAvailable");
-    }
-
-    /**
-     *      Return description of module parameters
-     *
-     *      @param	Translate	$langs      Output language
-     *		@param	Societe		$soc		Third party object
-     *		@param	int			$type		-1=Nothing, 0=Customer, 1=Supplier
-     *		@return	string					HTML translated description
-     */
-    function getToolTip($langs,$soc,$type)
-    {
-        global $conf,$db;
-
-        $langs->load("admin");
-
-        $s='';
-        if ($type == -1) $s.=$langs->trans("Name").': <b>'.$this->nom.'</b><br>';
-        if ($type == -1) $s.=$langs->trans("Version").': <b>'.$this->getVersion().'</b><br>';
-        //$s.='<br>';
-        //$s.='<u>'.$langs->trans("ThisIsModuleRules").':</u><br>';
-        $s.='<br>';
-        if ($type == 0 || $type == -1)
-        {
-            $result=$this->get_code($db,$soc,'customer');
-            $nextval=$this->code;
-            if (empty($nextval)) $nextval=$langs->trans("Undefined");
-            $s.=$langs->trans("NextValue").($type == -1?' ('.$langs->trans("Customer").')':'').': <b>'.$nextval.'</b><br>';
-        }
-        if ($type == 1 || $type == -1)
-        {
-            $result=$this->get_code($db,$soc,'supplier');
-            $nextval=$this->code;
-            if (empty($nextval)) $nextval=$langs->trans("Undefined");
-            $s.=$langs->trans("NextValue").($type == -1?' ('.$langs->trans("Supplier").')':'').': <b>'.$nextval.'</b>';
-        }
-        return $s;
-    }
-
-    /**
-     *  Set accountancy account code for a third party into this->code
-     *
-     *  @param	DoliDB	$db             Database handler
-     *  @param  Societe	$societe        Third party object
-     *  @param  int		$type			'customer' or 'supplier'
-     *  @return	int						>=0 if OK, <0 if KO
-     */
-    function get_code($db, $societe, $type='')
-    {
-	    global $langs;
-
-        return $langs->trans("NotAvailable");
-    }
+	var $error='';
+
+
+	/**		Return description of module
+	 *
+	 * 		@param	Translate	$langs		Object langs
+	 * 		@return string      			Description of module
+	 */
+	function info($langs)
+	{
+		$langs->load("bills");
+		return $langs->trans("NoDescription");
+	}
+
+	/**		Return an example of result returned by getNextValue
+	 *
+	 *      @param	Translate	$langs		Object langs
+	 *      @param	societe		$objsoc		Object thirdparty
+	 *      @param	int			$type		Type of third party (1:customer, 2:supplier, -1:autodetect)
+	 *      @return	string					Example
+	 */
+	function getExample($langs,$objsoc=0,$type=-1)
+	{
+		$langs->load("bills");
+		return $langs->trans("NoExample");
+	}
+
+	/**     Test si les numeros deja en vigueur dans la base ne provoquent pas de
+	 *      de conflits qui empechera cette numerotation de fonctionner.
+	 *
+	 *      @return     boolean     false si conflit, true si ok
+	 */
+	function canBeActivated()
+	{
+		return true;
+	}
+
+	/**     Return version of module
+	 *
+	 *      @return     string      Version
+	 */
+	function getVersion()
+	{
+		global $langs;
+		$langs->load("admin");
+
+		if ($this->version == 'development') return $langs->trans("VersionDevelopment");
+		if ($this->version == 'experimental') return $langs->trans("VersionExperimental");
+		if ($this->version == 'dolibarr') return DOL_VERSION;
+		if ($this->version) return $this->version;
+		return $langs->trans("NotAvailable");
+	}
+
+	/**
+	 *      Return description of module parameters
+	 *
+	 *      @param	Translate	$langs      Output language
+	 *		@param	Societe		$soc		Third party object
+	 *		@param	int			$type		-1=Nothing, 0=Customer, 1=Supplier
+	 *		@return	string					HTML translated description
+	 */
+	function getToolTip($langs,$soc,$type)
+	{
+		global $conf,$db;
+
+		$langs->load("admin");
+
+		$s='';
+		if ($type == -1) $s.=$langs->trans("Name").': <b>'.$this->nom.'</b><br>';
+		if ($type == -1) $s.=$langs->trans("Version").': <b>'.$this->getVersion().'</b><br>';
+		//$s.='<br>';
+		//$s.='<u>'.$langs->trans("ThisIsModuleRules").':</u><br>';
+		$s.='<br>';
+		if ($type == 0 || $type == -1)
+		{
+			$result=$this->get_code($db,$soc,'customer');
+			$nextval=$this->code;
+			if (empty($nextval)) $nextval=$langs->trans("Undefined");
+			$s.=$langs->trans("NextValue").($type == -1?' ('.$langs->trans("Customer").')':'').': <b>'.$nextval.'</b><br>';
+		}
+		if ($type == 1 || $type == -1)
+		{
+			$result=$this->get_code($db,$soc,'supplier');
+			$nextval=$this->code;
+			if (empty($nextval)) $nextval=$langs->trans("Undefined");
+			$s.=$langs->trans("NextValue").($type == -1?' ('.$langs->trans("Supplier").')':'').': <b>'.$nextval.'</b>';
+		}
+		return $s;
+	}
+
+	/**
+	 *  Set accountancy account code for a third party into this->code
+	 *
+	 *  @param	DoliDB	$db             Database handler
+	 *  @param  Societe	$societe        Third party object
+	 *  @param  int		$type			'customer' or 'supplier'
+	 *  @return	int						>=0 if OK, <0 if KO
+	 */
+	function get_code($db, $societe, $type='')
+	{
+		global $langs;
+
+		return $langs->trans("NotAvailable");
+	}
 }
 
 

Spacing +66 added lines, -66 removed lines

@@ -33,7 +33,7 @@ 
  */
 abstract class ModeleThirdPartyDoc extends CommonDocGenerator
 {
-    var $error='';
+    var $error = '';
 
     /**
      *  Return list of active generation modules
@@ -42,15 +42,15 @@ 
      *  @param	integer		$maxfilenamelength  Max length of value to show
      * 	@return	array							List of templates
      */
-    static function liste_modeles($db,$maxfilenamelength=0)
+    static function liste_modeles($db, $maxfilenamelength = 0)
     {
         global $conf;
 
-        $type='company';
-        $liste=array();
+        $type = 'company';
+        $liste = array();
 
         include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-        $liste=getListOfModels($db,$type,$maxfilenamelength);
+        $liste = getListOfModels($db, $type, $maxfilenamelength);
 
         return $liste;
     }
@@ -63,7 +63,7 @@ 
  */
 abstract class ModeleThirdPartyCode
 {
-    var $error='';
+    var $error = '';
 
     /**     Renvoi la description par defaut du modele de numerotation
      *
@@ -115,7 +115,7 @@ 
      *	@param	int			$type		Type
      *  @return string      			Value
      */
-    function getNextValue($objsoc=0,$type=-1)
+    function getNextValue($objsoc = 0, $type = -1)
     {
         global $langs;
         return $langs->trans("Function_getNextValue_InModuleNotWorking");
@@ -145,10 +145,10 @@ 
      *  @param  integer	$maxfilenamelength  Max length of value to show
      *  @return	array						List of numbers
      */
-    static function liste_modeles($db,$maxfilenamelength=0)
+    static function liste_modeles($db, $maxfilenamelength = 0)
     {
-        $liste=array();
-        $sql ="";
+        $liste = array();
+        $sql = "";
 
         $resql = $db->query($sql);
         if ($resql)
@@ -158,7 +158,7 @@ 
             while ($i < $num)
             {
                 $row = $db->fetch_row($resql);
-                $liste[$row[0]]=$row[1];
+                $liste[$row[0]] = $row[1];
                 $i++;
             }
         }
@@ -177,61 +177,61 @@ 
      *		@param	int			$type		-1=Nothing, 0=Customer, 1=Supplier
      *		@return	string					HTML translated description
      */
-    function getToolTip($langs,$soc,$type)
+    function getToolTip($langs, $soc, $type)
     {
         global $conf;
 
         $langs->load("admin");
 
-        $s='';
-        if ($type == -1) $s.=$langs->trans("Name").': <b>'.$this->getNom($langs).'</b><br>';
-        if ($type == -1) $s.=$langs->trans("Version").': <b>'.$this->getVersion().'</b><br>';
-        if ($type == 0)  $s.=$langs->trans("CustomerCodeDesc").'<br>';
-        if ($type == 1)  $s.=$langs->trans("SupplierCodeDesc").'<br>';
-        if ($type != -1) $s.=$langs->trans("ValidityControledByModule").': <b>'.$this->getNom($langs).'</b><br>';
-        $s.='<br>';
-        $s.='<u>'.$langs->trans("ThisIsModuleRules").':</u><br>';
+        $s = '';
+        if ($type == -1) $s .= $langs->trans("Name").': <b>'.$this->getNom($langs).'</b><br>';
+        if ($type == -1) $s .= $langs->trans("Version").': <b>'.$this->getVersion().'</b><br>';
+        if ($type == 0)  $s .= $langs->trans("CustomerCodeDesc").'<br>';
+        if ($type == 1)  $s .= $langs->trans("SupplierCodeDesc").'<br>';
+        if ($type != -1) $s .= $langs->trans("ValidityControledByModule").': <b>'.$this->getNom($langs).'</b><br>';
+        $s .= '<br>';
+        $s .= '<u>'.$langs->trans("ThisIsModuleRules").':</u><br>';
         if ($type == 0)
         {
-            $s.=$langs->trans("RequiredIfCustomer").': ';
-            if (! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.='<strike>';
-            $s.=yn(!$this->code_null,1,2);
-            if (! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.='</strike> '.yn(1,1,2).' ('.$langs->trans("ForcedToByAModule",$langs->transnoentities("yes")).')';
-            $s.='<br>';
+            $s .= $langs->trans("RequiredIfCustomer").': ';
+            if (!empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && !empty($this->code_null)) $s .= '<strike>';
+            $s .= yn(!$this->code_null, 1, 2);
+            if (!empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && !empty($this->code_null)) $s .= '</strike> '.yn(1, 1, 2).' ('.$langs->trans("ForcedToByAModule", $langs->transnoentities("yes")).')';
+            $s .= '<br>';
         }
         if ($type == 1)
         {
-            $s.=$langs->trans("RequiredIfSupplier").': ';
-            if (! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.='<strike>';
-            $s.=yn(!$this->code_null,1,2);
-            if (! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.='</strike> '.yn(1,1,2).' ('.$langs->trans("ForcedToByAModule",$langs->transnoentities("yes")).')';
-            $s.='<br>';
+            $s .= $langs->trans("RequiredIfSupplier").': ';
+            if (!empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && !empty($this->code_null)) $s .= '<strike>';
+            $s .= yn(!$this->code_null, 1, 2);
+            if (!empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && !empty($this->code_null)) $s .= '</strike> '.yn(1, 1, 2).' ('.$langs->trans("ForcedToByAModule", $langs->transnoentities("yes")).')';
+            $s .= '<br>';
         }
         if ($type == -1)
         {
-            $s.=$langs->trans("Required").': ';
-            if (! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.='<strike>';
-            $s.=yn(!$this->code_null,1,2);
-            if (! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.='</strike> '.yn(1,1,2).' ('.$langs->trans("ForcedToByAModule",$langs->transnoentities("yes")).')';
-            $s.='<br>';
+            $s .= $langs->trans("Required").': ';
+            if (!empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && !empty($this->code_null)) $s .= '<strike>';
+            $s .= yn(!$this->code_null, 1, 2);
+            if (!empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && !empty($this->code_null)) $s .= '</strike> '.yn(1, 1, 2).' ('.$langs->trans("ForcedToByAModule", $langs->transnoentities("yes")).')';
+            $s .= '<br>';
         }
-        $s.=$langs->trans("CanBeModifiedIfOk").': ';
-        $s.=yn($this->code_modifiable,1,2);
-        $s.='<br>';
-        $s.=$langs->trans("CanBeModifiedIfKo").': '.yn($this->code_modifiable_invalide,1,2).'<br>';
-        $s.=$langs->trans("AutomaticCode").': '.yn($this->code_auto,1,2).'<br>';
-        $s.='<br>';
+        $s .= $langs->trans("CanBeModifiedIfOk").': ';
+        $s .= yn($this->code_modifiable, 1, 2);
+        $s .= '<br>';
+        $s .= $langs->trans("CanBeModifiedIfKo").': '.yn($this->code_modifiable_invalide, 1, 2).'<br>';
+        $s .= $langs->trans("AutomaticCode").': '.yn($this->code_auto, 1, 2).'<br>';
+        $s .= '<br>';
         if ($type == 0 || $type == -1)
         {
-            $nextval=$this->getNextValue($soc,0);
-            if (empty($nextval)) $nextval=$langs->trans("Undefined");
-            $s.=$langs->trans("NextValue").($type == -1?' ('.$langs->trans("Customer").')':'').': <b>'.$nextval.'</b><br>';
+            $nextval = $this->getNextValue($soc, 0);
+            if (empty($nextval)) $nextval = $langs->trans("Undefined");
+            $s .= $langs->trans("NextValue").($type == -1 ? ' ('.$langs->trans("Customer").')' : '').': <b>'.$nextval.'</b><br>';
         }
         if ($type == 1 || $type == -1)
         {
-            $nextval=$this->getNextValue($soc,1);
-            if (empty($nextval)) $nextval=$langs->trans("Undefined");
-            $s.=$langs->trans("NextValue").($type == -1?' ('.$langs->trans("Supplier").')':'').': <b>'.$nextval.'</b>';
+            $nextval = $this->getNextValue($soc, 1);
+            if (empty($nextval)) $nextval = $langs->trans("Undefined");
+            $s .= $langs->trans("NextValue").($type == -1 ? ' ('.$langs->trans("Supplier").')' : '').': <b>'.$nextval.'</b>';
         }
         return $s;
     }
@@ -255,7 +255,7 @@ 
  */
 abstract class ModeleAccountancyCode
 {
-    var $error='';
+    var $error = '';
 
 
     /**		Return description of module
@@ -276,7 +276,7 @@ 
      *      @param	int			$type		Type of third party (1:customer, 2:supplier, -1:autodetect)
      *      @return	string					Example
      */
-    function getExample($langs,$objsoc=0,$type=-1)
+    function getExample($langs, $objsoc = 0, $type = -1)
     {
         $langs->load("bills");
         return $langs->trans("NoExample");
@@ -316,31 +316,31 @@ 
      *		@param	int			$type		-1=Nothing, 0=Customer, 1=Supplier
      *		@return	string					HTML translated description
      */
-    function getToolTip($langs,$soc,$type)
+    function getToolTip($langs, $soc, $type)
     {
-        global $conf,$db;
+        global $conf, $db;
 
         $langs->load("admin");
 
-        $s='';
-        if ($type == -1) $s.=$langs->trans("Name").': <b>'.$this->nom.'</b><br>';
-        if ($type == -1) $s.=$langs->trans("Version").': <b>'.$this->getVersion().'</b><br>';
+        $s = '';
+        if ($type == -1) $s .= $langs->trans("Name").': <b>'.$this->nom.'</b><br>';
+        if ($type == -1) $s .= $langs->trans("Version").': <b>'.$this->getVersion().'</b><br>';
         //$s.='<br>';
         //$s.='<u>'.$langs->trans("ThisIsModuleRules").':</u><br>';
-        $s.='<br>';
+        $s .= '<br>';
         if ($type == 0 || $type == -1)
         {
-            $result=$this->get_code($db,$soc,'customer');
-            $nextval=$this->code;
-            if (empty($nextval)) $nextval=$langs->trans("Undefined");
-            $s.=$langs->trans("NextValue").($type == -1?' ('.$langs->trans("Customer").')':'').': <b>'.$nextval.'</b><br>';
+            $result = $this->get_code($db, $soc, 'customer');
+            $nextval = $this->code;
+            if (empty($nextval)) $nextval = $langs->trans("Undefined");
+            $s .= $langs->trans("NextValue").($type == -1 ? ' ('.$langs->trans("Customer").')' : '').': <b>'.$nextval.'</b><br>';
         }
         if ($type == 1 || $type == -1)
         {
-            $result=$this->get_code($db,$soc,'supplier');
-            $nextval=$this->code;
-            if (empty($nextval)) $nextval=$langs->trans("Undefined");
-            $s.=$langs->trans("NextValue").($type == -1?' ('.$langs->trans("Supplier").')':'').': <b>'.$nextval.'</b>';
+            $result = $this->get_code($db, $soc, 'supplier');
+            $nextval = $this->code;
+            if (empty($nextval)) $nextval = $langs->trans("Undefined");
+            $s .= $langs->trans("NextValue").($type == -1 ? ' ('.$langs->trans("Supplier").')' : '').': <b>'.$nextval.'</b>';
         }
         return $s;
     }
@@ -353,7 +353,7 @@ 
      *  @param  int		$type			'customer' or 'supplier'
      *  @return	int						>=0 if OK, <0 if KO
      */
-    function get_code($db, $societe, $type='')
+    function get_code($db, $societe, $type = '')
     {
 	    global $langs;
 
@@ -378,9 +378,9 @@ 
  *  @deprecated Use the new function generateDocument of Facture class
  *  @see Societe::generateDocument()
  */
-function thirdparty_doc_create(DoliDB $db, Societe $object, $message, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0)
+function thirdparty_doc_create(DoliDB $db, Societe $object, $message, $modele, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
 {
-	dol_syslog(__METHOD__ . " is deprecated", LOG_WARNING);
+	dol_syslog(__METHOD__." is deprecated", LOG_WARNING);
 
 	return $object->generateDocument($modele, $outputlangs, $hidedetails, $hidedesc, $hideref);
 }

Braces +76 added lines, -27 removed lines

@@ -131,10 +131,18 @@ 
         global $langs;
         $langs->load("admin");
 
-        if ($this->version == 'development') return $langs->trans("VersionDevelopment");
-        if ($this->version == 'experimental') return $langs->trans("VersionExperimental");
-        if ($this->version == 'dolibarr') return DOL_VERSION;
-        if ($this->version) return $this->version;
+        if ($this->version == 'development') {
+        	return $langs->trans("VersionDevelopment");
+        }
+        if ($this->version == 'experimental') {
+        	return $langs->trans("VersionExperimental");
+        }
+        if ($this->version == 'dolibarr') {
+        	return DOL_VERSION;
+        }
+        if ($this->version) {
+        	return $this->version;
+        }
         return $langs->trans("NotAvailable");
     }
 
@@ -161,8 +169,7 @@ 
                 $liste[$row[0]]=$row[1];
                 $i++;
             }
-        }
-        else
+        } else
         {
             return -1;
         }
@@ -184,35 +191,57 @@ 
         $langs->load("admin");
 
         $s='';
-        if ($type == -1) $s.=$langs->trans("Name").': <b>'.$this->getNom($langs).'</b><br>';
-        if ($type == -1) $s.=$langs->trans("Version").': <b>'.$this->getVersion().'</b><br>';
-        if ($type == 0)  $s.=$langs->trans("CustomerCodeDesc").'<br>';
-        if ($type == 1)  $s.=$langs->trans("SupplierCodeDesc").'<br>';
-        if ($type != -1) $s.=$langs->trans("ValidityControledByModule").': <b>'.$this->getNom($langs).'</b><br>';
+        if ($type == -1) {
+        	$s.=$langs->trans("Name").': <b>'.$this->getNom($langs).'</b><br>';
+        }
+        if ($type == -1) {
+        	$s.=$langs->trans("Version").': <b>'.$this->getVersion().'</b><br>';
+        }
+        if ($type == 0) {
+        	$s.=$langs->trans("CustomerCodeDesc").'<br>';
+        }
+        if ($type == 1) {
+        	$s.=$langs->trans("SupplierCodeDesc").'<br>';
+        }
+        if ($type != -1) {
+        	$s.=$langs->trans("ValidityControledByModule").': <b>'.$this->getNom($langs).'</b><br>';
+        }
         $s.='<br>';
         $s.='<u>'.$langs->trans("ThisIsModuleRules").':</u><br>';
         if ($type == 0)
         {
             $s.=$langs->trans("RequiredIfCustomer").': ';
-            if (! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.='<strike>';
+            if (! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) {
+            	$s.='<strike>';
+            }
             $s.=yn(!$this->code_null,1,2);
-            if (! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.='</strike> '.yn(1,1,2).' ('.$langs->trans("ForcedToByAModule",$langs->transnoentities("yes")).')';
+            if (! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) {
+            	$s.='</strike> '.yn(1,1,2).' ('.$langs->trans("ForcedToByAModule",$langs->transnoentities("yes")).')';
+            }
             $s.='<br>';
         }
         if ($type == 1)
         {
             $s.=$langs->trans("RequiredIfSupplier").': ';
-            if (! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.='<strike>';
+            if (! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) {
+            	$s.='<strike>';
+            }
             $s.=yn(!$this->code_null,1,2);
-            if (! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.='</strike> '.yn(1,1,2).' ('.$langs->trans("ForcedToByAModule",$langs->transnoentities("yes")).')';
+            if (! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) {
+            	$s.='</strike> '.yn(1,1,2).' ('.$langs->trans("ForcedToByAModule",$langs->transnoentities("yes")).')';
+            }
             $s.='<br>';
         }
         if ($type == -1)
         {
             $s.=$langs->trans("Required").': ';
-            if (! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.='<strike>';
+            if (! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) {
+            	$s.='<strike>';
+            }
             $s.=yn(!$this->code_null,1,2);
-            if (! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.='</strike> '.yn(1,1,2).' ('.$langs->trans("ForcedToByAModule",$langs->transnoentities("yes")).')';
+            if (! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) {
+            	$s.='</strike> '.yn(1,1,2).' ('.$langs->trans("ForcedToByAModule",$langs->transnoentities("yes")).')';
+            }
             $s.='<br>';
         }
         $s.=$langs->trans("CanBeModifiedIfOk").': ';
@@ -224,13 +253,17 @@ 
         if ($type == 0 || $type == -1)
         {
             $nextval=$this->getNextValue($soc,0);
-            if (empty($nextval)) $nextval=$langs->trans("Undefined");
+            if (empty($nextval)) {
+            	$nextval=$langs->trans("Undefined");
+            }
             $s.=$langs->trans("NextValue").($type == -1?' ('.$langs->trans("Customer").')':'').': <b>'.$nextval.'</b><br>';
         }
         if ($type == 1 || $type == -1)
         {
             $nextval=$this->getNextValue($soc,1);
-            if (empty($nextval)) $nextval=$langs->trans("Undefined");
+            if (empty($nextval)) {
+            	$nextval=$langs->trans("Undefined");
+            }
             $s.=$langs->trans("NextValue").($type == -1?' ('.$langs->trans("Supplier").')':'').': <b>'.$nextval.'</b>';
         }
         return $s;
@@ -301,10 +334,18 @@ 
         global $langs;
         $langs->load("admin");
 
-        if ($this->version == 'development') return $langs->trans("VersionDevelopment");
-        if ($this->version == 'experimental') return $langs->trans("VersionExperimental");
-        if ($this->version == 'dolibarr') return DOL_VERSION;
-        if ($this->version) return $this->version;
+        if ($this->version == 'development') {
+        	return $langs->trans("VersionDevelopment");
+        }
+        if ($this->version == 'experimental') {
+        	return $langs->trans("VersionExperimental");
+        }
+        if ($this->version == 'dolibarr') {
+        	return DOL_VERSION;
+        }
+        if ($this->version) {
+        	return $this->version;
+        }
         return $langs->trans("NotAvailable");
     }
 
@@ -323,8 +364,12 @@ 
         $langs->load("admin");
 
         $s='';
-        if ($type == -1) $s.=$langs->trans("Name").': <b>'.$this->nom.'</b><br>';
-        if ($type == -1) $s.=$langs->trans("Version").': <b>'.$this->getVersion().'</b><br>';
+        if ($type == -1) {
+        	$s.=$langs->trans("Name").': <b>'.$this->nom.'</b><br>';
+        }
+        if ($type == -1) {
+        	$s.=$langs->trans("Version").': <b>'.$this->getVersion().'</b><br>';
+        }
         //$s.='<br>';
         //$s.='<u>'.$langs->trans("ThisIsModuleRules").':</u><br>';
         $s.='<br>';
@@ -332,14 +377,18 @@ 
         {
             $result=$this->get_code($db,$soc,'customer');
             $nextval=$this->code;
-            if (empty($nextval)) $nextval=$langs->trans("Undefined");
+            if (empty($nextval)) {
+            	$nextval=$langs->trans("Undefined");
+            }
             $s.=$langs->trans("NextValue").($type == -1?' ('.$langs->trans("Customer").')':'').': <b>'.$nextval.'</b><br>';
         }
         if ($type == 1 || $type == -1)
         {
             $result=$this->get_code($db,$soc,'supplier');
             $nextval=$this->code;
-            if (empty($nextval)) $nextval=$langs->trans("Undefined");
+            if (empty($nextval)) {
+            	$nextval=$langs->trans("Undefined");
+            }
             $s.=$langs->trans("NextValue").($type == -1?' ('.$langs->trans("Supplier").')':'').': <b>'.$nextval.'</b>';
         }
         return $s;

htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php

Doc Comments +2 added lines, -2 removed lines

@@ -98,7 +98,7 @@ 
     /**
      * 	Return next value
 	 *
-	 *  @param	Societe		$objsoc     Object third party
+	 *  @param	integer		$objsoc     Object third party
 	 *  @param  Object		$object		Object
 	 *  @return string      			Value if OK, 0 if KO
      */
@@ -136,7 +136,7 @@ 
     /**
      * 	Renvoie la reference de commande suivante non utilisee
      *
-	 *  @param	Societe		$objsoc     Object third party
+	 *  @param	integer		$objsoc     Object third party
 	 *  @param  Object	    $object		Object
      *  @return string      			Texte descripif
      */

Braces +21 added lines, -8 removed lines

@@ -44,7 +44,10 @@ 
 	{
 	    global $conf;
 	    
-	    if ((float) $conf->global->MAIN_VERSION_LAST_INSTALL >= 5.0) $this->prefix = 'PO';   // We use correct standard code "PO = Purchase Order"
+	    if ((float) $conf->global->MAIN_VERSION_LAST_INSTALL >= 5.0) {
+	    	$this->prefix = 'PO';
+	    }
+	    // We use correct standard code "PO = Purchase Order"
 	}
 	
     /**
@@ -96,8 +99,7 @@ 
         if (! $coyymm || preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i',$coyymm))
         {
             return true;
-        }
-        else
+        } else
         {
 			$langs->load("errors");
 			$this->error=$langs->trans('ErrorNumRefModel',$max);
@@ -127,17 +129,28 @@ 
         if ($resql)
         {
             $obj = $db->fetch_object($resql);
-            if ($obj) $max = intval($obj->max);
-            else $max=0;
+            if ($obj) {
+            	$max = intval($obj->max);
+            } else {
+            	$max=0;
+            }
         }
 
 		//$date=time();
         $date=$object->date_commande;   // Not always defined
-        if (empty($date)) $date=$object->date;  // Creation date is order date for suppliers orders
+        if (empty($date)) {
+        	$date=$object->date;
+        }
+        // Creation date is order date for suppliers orders
         $yymm = strftime("%y%m",$date);
         
-        if ($max >= (pow(10, 4) - 1)) $num=$max+1;	// If counter > 9999, we do not format on 4 chars, we take number as it is
-        else $num = sprintf("%04s",$max+1);
+        if ($max >= (pow(10, 4) - 1)) {
+        	$num=$max+1;
+        }
+        // If counter > 9999, we do not format on 4 chars, we take number as it is
+        else {
+        	$num = sprintf("%04s",$max+1);
+        }
 
         return $this->prefix.$yymm."-".$num;
     }

Indentation +88 added lines, -88 removed lines

@@ -42,117 +42,117 @@
 	 */
 	function __construct()
 	{
-	    global $conf;
+		global $conf;
 
-	    if ((float) $conf->global->MAIN_VERSION_LAST_INSTALL >= 5.0) $this->prefix = 'PO';   // We use correct standard code "PO = Purchase Order"
+		if ((float) $conf->global->MAIN_VERSION_LAST_INSTALL >= 5.0) $this->prefix = 'PO';   // We use correct standard code "PO = Purchase Order"
 	}
 
-    /**
-     * 	Return description of numbering module
-     *
-     *  @return     string      Text with description
-     */
-    function info()
-    {
-    	global $langs;
-      	return $langs->trans("SimpleNumRefModelDesc",$this->prefix);
-    }
-
-
-    /**
-     * 	Renvoi un exemple de numerotation
-     *
-     *  @return     string      Example
-     */
-    function getExample()
-    {
-        return $this->prefix."0501-0001";
-    }
-
-
-    /**
-     * 	Test si les numeros deja en vigueur dans la base ne provoquent pas de
-     *  de conflits qui empechera cette numerotation de fonctionner.
-     *
-     *  @return     boolean     false si conflit, true si ok
-     */
-    function canBeActivated()
-    {
-    	global $conf,$langs,$db;
-
-        $coyymm=''; $max='';
+	/**
+	 * 	Return description of numbering module
+	 *
+	 *  @return     string      Text with description
+	 */
+	function info()
+	{
+		global $langs;
+	  	return $langs->trans("SimpleNumRefModelDesc",$this->prefix);
+	}
+
+
+	/**
+	 * 	Renvoi un exemple de numerotation
+	 *
+	 *  @return     string      Example
+	 */
+	function getExample()
+	{
+		return $this->prefix."0501-0001";
+	}
+
+
+	/**
+	 * 	Test si les numeros deja en vigueur dans la base ne provoquent pas de
+	 *  de conflits qui empechera cette numerotation de fonctionner.
+	 *
+	 *  @return     boolean     false si conflit, true si ok
+	 */
+	function canBeActivated()
+	{
+		global $conf,$langs,$db;
+
+		$coyymm=''; $max='';
 
 		$posindice=8;
 		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
-        $sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseur";
+		$sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseur";
 		$sql.= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
-        $sql.= " AND entity = ".$conf->entity;
-        $resql=$db->query($sql);
-        if ($resql)
-        {
-            $row = $db->fetch_row($resql);
-            if ($row) { $coyymm = substr($row[0],0,6); $max=$row[0]; }
-        }
-        if (! $coyymm || preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i',$coyymm))
-        {
-            return true;
-        }
-        else
-        {
+		$sql.= " AND entity = ".$conf->entity;
+		$resql=$db->query($sql);
+		if ($resql)
+		{
+			$row = $db->fetch_row($resql);
+			if ($row) { $coyymm = substr($row[0],0,6); $max=$row[0]; }
+		}
+		if (! $coyymm || preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i',$coyymm))
+		{
+			return true;
+		}
+		else
+		{
 			$langs->load("errors");
 			$this->error=$langs->trans('ErrorNumRefModel',$max);
-            return false;
-        }
-    }
+			return false;
+		}
+	}
 
-    /**
-     * 	Return next value
+	/**
+	 * 	Return next value
 	 *
 	 *  @param	Societe		$objsoc     Object third party
 	 *  @param  Object		$object		Object
 	 *  @return string      			Value if OK, 0 if KO
-     */
-    function getNextValue($objsoc=0,$object='')
-    {
-        global $db,$conf;
-
-        // D'abord on recupere la valeur max
-        $posindice=8;
-        $sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
-        $sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseur";
+	 */
+	function getNextValue($objsoc=0,$object='')
+	{
+		global $db,$conf;
+
+		// D'abord on recupere la valeur max
+		$posindice=8;
+		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
+		$sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseur";
 		$sql.= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
-        $sql.= " AND entity = ".$conf->entity;
+		$sql.= " AND entity = ".$conf->entity;
 
-        $resql=$db->query($sql);
-        if ($resql)
-        {
-            $obj = $db->fetch_object($resql);
-            if ($obj) $max = intval($obj->max);
-            else $max=0;
-        }
+		$resql=$db->query($sql);
+		if ($resql)
+		{
+			$obj = $db->fetch_object($resql);
+			if ($obj) $max = intval($obj->max);
+			else $max=0;
+		}
 
 		//$date=time();
-        $date=$object->date_commande;   // Not always defined
-        if (empty($date)) $date=$object->date;  // Creation date is order date for suppliers orders
-        $yymm = strftime("%y%m",$date);
+		$date=$object->date_commande;   // Not always defined
+		if (empty($date)) $date=$object->date;  // Creation date is order date for suppliers orders
+		$yymm = strftime("%y%m",$date);
 
-        if ($max >= (pow(10, 4) - 1)) $num=$max+1;	// If counter > 9999, we do not format on 4 chars, we take number as it is
-        else $num = sprintf("%04s",$max+1);
+		if ($max >= (pow(10, 4) - 1)) $num=$max+1;	// If counter > 9999, we do not format on 4 chars, we take number as it is
+		else $num = sprintf("%04s",$max+1);
 
-        return $this->prefix.$yymm."-".$num;
-    }
+		return $this->prefix.$yymm."-".$num;
+	}
 
 
-    /**
-     * 	Renvoie la reference de commande suivante non utilisee
-     *
+	/**
+	 * 	Renvoie la reference de commande suivante non utilisee
+	 *
 	 *  @param	Societe		$objsoc     Object third party
 	 *  @param  Object	    $object		Object
-     *  @return string      			Texte descripif
-     */
-    function commande_get_num($objsoc=0,$object='')
-    {
-        return $this->getNextValue($objsoc,$object);
-    }
+	 *  @return string      			Texte descripif
+	 */
+	function commande_get_num($objsoc=0,$object='')
+	{
+		return $this->getNextValue($objsoc,$object);
+	}
 }
 

Spacing +30 added lines, -30 removed lines

@@ -23,7 +23,7 @@ 
  *		\brief      Fichier contenant la classe du modele de numerotation de reference de commande fournisseur Muguet
  */
 
-require_once DOL_DOCUMENT_ROOT .'/core/modules/supplier_order/modules_commandefournisseur.php';
+require_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_order/modules_commandefournisseur.php';
 
 
 /**
@@ -31,10 +31,10 @@ 
  */
 class mod_commande_fournisseur_muguet extends ModeleNumRefSuppliersOrders
 {
-	var $version='dolibarr';		// 'development', 'experimental', 'dolibarr'
+	var $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 	var $error = '';
 	var $nom = 'Muguet';
-	var $prefix='CF';
+	var $prefix = 'CF';
 
 
 	/**
@@ -44,7 +44,7 @@ 
 	{
 	    global $conf;
 
-	    if ((float) $conf->global->MAIN_VERSION_LAST_INSTALL >= 5.0) $this->prefix = 'PO';   // We use correct standard code "PO = Purchase Order"
+	    if ((float) $conf->global->MAIN_VERSION_LAST_INSTALL >= 5.0) $this->prefix = 'PO'; // We use correct standard code "PO = Purchase Order"
 	}
 
     /**
@@ -55,7 +55,7 @@ 
     function info()
     {
     	global $langs;
-      	return $langs->trans("SimpleNumRefModelDesc",$this->prefix);
+      	return $langs->trans("SimpleNumRefModelDesc", $this->prefix);
     }
 
 
@@ -78,29 +78,29 @@ 
      */
     function canBeActivated()
     {
-    	global $conf,$langs,$db;
+    	global $conf, $langs, $db;
 
-        $coyymm=''; $max='';
+        $coyymm = ''; $max = '';
 
-		$posindice=8;
+		$posindice = 8;
 		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
-        $sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseur";
-		$sql.= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
-        $sql.= " AND entity = ".$conf->entity;
-        $resql=$db->query($sql);
+        $sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseur";
+		$sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
+        $sql .= " AND entity = ".$conf->entity;
+        $resql = $db->query($sql);
         if ($resql)
         {
             $row = $db->fetch_row($resql);
-            if ($row) { $coyymm = substr($row[0],0,6); $max=$row[0]; }
+            if ($row) { $coyymm = substr($row[0], 0, 6); $max = $row[0]; }
         }
-        if (! $coyymm || preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i',$coyymm))
+        if (!$coyymm || preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i', $coyymm))
         {
             return true;
         }
         else
         {
 			$langs->load("errors");
-			$this->error=$langs->trans('ErrorNumRefModel',$max);
+			$this->error = $langs->trans('ErrorNumRefModel', $max);
             return false;
         }
     }
@@ -112,32 +112,32 @@ 
 	 *  @param  Object		$object		Object
 	 *  @return string      			Value if OK, 0 if KO
      */
-    function getNextValue($objsoc=0,$object='')
+    function getNextValue($objsoc = 0, $object = '')
     {
-        global $db,$conf;
+        global $db, $conf;
 
         // D'abord on recupere la valeur max
-        $posindice=8;
+        $posindice = 8;
         $sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
-        $sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseur";
-		$sql.= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
-        $sql.= " AND entity = ".$conf->entity;
+        $sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseur";
+		$sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
+        $sql .= " AND entity = ".$conf->entity;
 
-        $resql=$db->query($sql);
+        $resql = $db->query($sql);
         if ($resql)
         {
             $obj = $db->fetch_object($resql);
             if ($obj) $max = intval($obj->max);
-            else $max=0;
+            else $max = 0;
         }
 
 		//$date=time();
-        $date=$object->date_commande;   // Not always defined
-        if (empty($date)) $date=$object->date;  // Creation date is order date for suppliers orders
-        $yymm = strftime("%y%m",$date);
+        $date = $object->date_commande; // Not always defined
+        if (empty($date)) $date = $object->date; // Creation date is order date for suppliers orders
+        $yymm = strftime("%y%m", $date);
 
-        if ($max >= (pow(10, 4) - 1)) $num=$max+1;	// If counter > 9999, we do not format on 4 chars, we take number as it is
-        else $num = sprintf("%04s",$max+1);
+        if ($max >= (pow(10, 4) - 1)) $num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
+        else $num = sprintf("%04s", $max + 1);
 
         return $this->prefix.$yymm."-".$num;
     }
@@ -150,9 +150,9 @@ 
 	 *  @param  Object	    $object		Object
      *  @return string      			Texte descripif
      */
-    function commande_get_num($objsoc=0,$object='')
+    function commande_get_num($objsoc = 0, $object = '')
     {
-        return $this->getNextValue($objsoc,$object);
+        return $this->getNextValue($objsoc, $object);
     }
 }
 

htdocs/core/modules/supplier_order/mod_commande_fournisseur_orchidee.php

Doc Comments +2 added lines, -2 removed lines

@@ -102,7 +102,7 @@ 
 	/**
 	 *  Return next value
 	 *
-	 *  @param	Societe		$objsoc     Object third party
+	 *  @param	integer		$objsoc     Object third party
 	 *  @param  Object	    $object		Object
      *  @return string      			Value if OK, 0 if KO
 	*/
@@ -130,7 +130,7 @@ 
     /**
      *  Renvoie la reference de commande suivante non utilisee
      *
-	 *  @param	Societe		$objsoc     Object third party
+	 *  @param	integer		$objsoc     Object third party
 	 *  @param  Object	    $object		Object
      *  @return string      			Texte descripif
      */

Indentation +35 added lines, -35 removed lines

@@ -37,14 +37,14 @@ 
 	var $nom = 'Orchidee';
 
 
-    /**
-     *  Renvoi la description du modele de numerotation
-     *
-     * 	@return     string      Texte descripif
-     */
+	/**
+	 *  Renvoi la description du modele de numerotation
+	 *
+	 * 	@return     string      Texte descripif
+	 */
 	function info()
-    {
-    	global $conf,$langs;
+	{
+		global $conf,$langs;
 
 		$langs->load("bills");
 		$langs->load("admin");
@@ -76,20 +76,20 @@ 
 		$texte.= '</form>';
 
 		return $texte;
-    }
-
-    /**
-     *  Renvoi un exemple de numerotation
-     *
-     *  @return     string      Example
-     */
-    function getExample()
-    {
-    	global $conf,$langs,$mysoc;
-
-    	$old_code_client=$mysoc->code_client;
-    	$mysoc->code_client='CCCCCCCCCC';
-    	$numExample = $this->getNextValue($mysoc,'');
+	}
+
+	/**
+	 *  Renvoi un exemple de numerotation
+	 *
+	 *  @return     string      Example
+	 */
+	function getExample()
+	{
+		global $conf,$langs,$mysoc;
+
+		$old_code_client=$mysoc->code_client;
+		$mysoc->code_client='CCCCCCCCCC';
+		$numExample = $this->getNextValue($mysoc,'');
 		$mysoc->code_client=$old_code_client;
 
 		if (! $numExample)
@@ -97,17 +97,17 @@ 
 			$numExample = $langs->trans('NotConfigured');
 		}
 		return $numExample;
-    }
+	}
 
 	/**
 	 *  Return next value
 	 *
 	 *  @param	Societe		$objsoc     Object third party
 	 *  @param  Object	    $object		Object
-     *  @return string      			Value if OK, 0 if KO
-	*/
-    function getNextValue($objsoc=0,$object='')
-    {
+	 *  @return string      			Value if OK, 0 if KO
+	 */
+	function getNextValue($objsoc=0,$object='')
+	{
 		global $db,$conf;
 
 		require_once DOL_DOCUMENT_ROOT .'/core/lib/functions2.lib.php';
@@ -127,16 +127,16 @@ 
 	}
 
 
-    /**
-     *  Renvoie la reference de commande suivante non utilisee
-     *
+	/**
+	 *  Renvoie la reference de commande suivante non utilisee
+	 *
 	 *  @param	Societe		$objsoc     Object third party
 	 *  @param  Object	    $object		Object
-     *  @return string      			Texte descripif
-     */
-    function commande_get_num($objsoc=0,$object='')
-    {
-        return $this->getNextValue($objsoc,$object);
-    }
+	 *  @return string      			Texte descripif
+	 */
+	function commande_get_num($objsoc=0,$object='')
+	{
+		return $this->getNextValue($objsoc,$object);
+	}
 }
 

Spacing +35 added lines, -35 removed lines

@@ -24,7 +24,7 @@ 
  *	\brief      Fichier contenant la classe du modele de numerotation de reference de commande fournisseur Orchidee
  */
 
-require_once DOL_DOCUMENT_ROOT .'/core/modules/supplier_order/modules_commandefournisseur.php';
+require_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_order/modules_commandefournisseur.php';
 
 
 /**
@@ -32,7 +32,7 @@ 
  */
 class mod_commande_fournisseur_orchidee extends ModeleNumRefSuppliersOrders
 {
-	var $version='dolibarr';		// 'development', 'experimental', 'dolibarr'
+	var $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 	var $error = '';
 	var $nom = 'Orchidee';
 
@@ -44,7 +44,7 @@ 
      */
 	function info()
     {
-    	global $conf,$langs;
+    	global $conf, $langs;
 
 		$langs->load("bills");
 		$langs->load("admin");
@@ -52,28 +52,28 @@ 
 		$form = new Form($this->db);
 
 		$texte = $langs->trans('GenericNumRefModelDesc')."<br>\n";
-		$texte.= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-		$texte.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-		$texte.= '<input type="hidden" name="action" value="updateMask">';
-		$texte.= '<input type="hidden" name="maskconstorder" value="COMMANDE_FOURNISSEUR_ORCHIDEE_MASK">';
-		$texte.= '<table class="nobordernopadding" width="100%">';
-
-		$tooltip=$langs->trans("GenericMaskCodes",$langs->transnoentities("Order"),$langs->transnoentities("Order"));
-		$tooltip.=$langs->trans("GenericMaskCodes2");
-		$tooltip.=$langs->trans("GenericMaskCodes3");
-		$tooltip.=$langs->trans("GenericMaskCodes4a",$langs->transnoentities("Order"),$langs->transnoentities("Order"));
-		$tooltip.=$langs->trans("GenericMaskCodes5");
+		$texte .= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+		$texte .= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+		$texte .= '<input type="hidden" name="action" value="updateMask">';
+		$texte .= '<input type="hidden" name="maskconstorder" value="COMMANDE_FOURNISSEUR_ORCHIDEE_MASK">';
+		$texte .= '<table class="nobordernopadding" width="100%">';
+
+		$tooltip = $langs->trans("GenericMaskCodes", $langs->transnoentities("Order"), $langs->transnoentities("Order"));
+		$tooltip .= $langs->trans("GenericMaskCodes2");
+		$tooltip .= $langs->trans("GenericMaskCodes3");
+		$tooltip .= $langs->trans("GenericMaskCodes4a", $langs->transnoentities("Order"), $langs->transnoentities("Order"));
+		$tooltip .= $langs->trans("GenericMaskCodes5");
 
 		// Parametrage du prefix
-		$texte.= '<tr><td>'.$langs->trans("Mask").':</td>';
-		$texte.= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskorder" value="'.$conf->global->COMMANDE_FOURNISSEUR_ORCHIDEE_MASK.'">',$tooltip,1,1).'</td>';
+		$texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
+		$texte .= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskorder" value="'.$conf->global->COMMANDE_FOURNISSEUR_ORCHIDEE_MASK.'">', $tooltip, 1, 1).'</td>';
 
-		$texte.= '<td align="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
+		$texte .= '<td align="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
 
-		$texte.= '</tr>';
+		$texte .= '</tr>';
 
-		$texte.= '</table>';
-		$texte.= '</form>';
+		$texte .= '</table>';
+		$texte .= '</form>';
 
 		return $texte;
     }
@@ -85,14 +85,14 @@ 
      */
     function getExample()
     {
-    	global $conf,$langs,$mysoc;
+    	global $conf, $langs, $mysoc;
 
-    	$old_code_client=$mysoc->code_client;
-    	$mysoc->code_client='CCCCCCCCCC';
-    	$numExample = $this->getNextValue($mysoc,'');
-		$mysoc->code_client=$old_code_client;
+    	$old_code_client = $mysoc->code_client;
+    	$mysoc->code_client = 'CCCCCCCCCC';
+    	$numExample = $this->getNextValue($mysoc, '');
+		$mysoc->code_client = $old_code_client;
 
-		if (! $numExample)
+		if (!$numExample)
 		{
 			$numExample = $langs->trans('NotConfigured');
 		}
@@ -106,22 +106,22 @@ 
 	 *  @param  Object	    $object		Object
      *  @return string      			Value if OK, 0 if KO
 	*/
-    function getNextValue($objsoc=0,$object='')
+    function getNextValue($objsoc = 0, $object = '')
     {
-		global $db,$conf;
+		global $db, $conf;
 
-		require_once DOL_DOCUMENT_ROOT .'/core/lib/functions2.lib.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
 		// On defini critere recherche compteur
-		$mask=$conf->global->COMMANDE_FOURNISSEUR_ORCHIDEE_MASK;
+		$mask = $conf->global->COMMANDE_FOURNISSEUR_ORCHIDEE_MASK;
 
-		if (! $mask)
+		if (!$mask)
 		{
-			$this->error='NotConfigured';
+			$this->error = 'NotConfigured';
 			return 0;
 		}
 
-		$numFinal=get_next_value($db,$mask,'commande_fournisseur','ref','',$objsoc,$object->date_commande);
+		$numFinal = get_next_value($db, $mask, 'commande_fournisseur', 'ref', '', $objsoc, $object->date_commande);
 
 		return  $numFinal;
 	}
@@ -134,9 +134,9 @@ 
 	 *  @param  Object	    $object		Object
      *  @return string      			Texte descripif
      */
-    function commande_get_num($objsoc=0,$object='')
+    function commande_get_num($objsoc = 0, $object = '')
     {
-        return $this->getNextValue($objsoc,$object);
+        return $this->getNextValue($objsoc, $object);
     }
 }
 

htdocs/loan/class/paymentloan.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -226,7 +226,7 @@
 	/**
 	 *  Update database
 	 *
-	 *  @param	User	$user        	User that modify
+	 *  @param	integer	$user        	User that modify
 	 *  @param  int		$notrigger	    0=launch triggers after, 1=disable triggers
 	 *  @return int         			<0 if KO, >0 if OK
 	 */

Indentation +113 added lines, -113 removed lines

@@ -37,8 +37,8 @@ 
 	var $datec='';
 	var $tms='';
 	var $datep='';
-    var $amounts=array();   // Array of amounts
-    var $amount_capital;    // Total amount of payment
+	var $amounts=array();   // Array of amounts
+	var $amount_capital;    // Total amount of payment
 	var $amount_insurance;
 	var $amount_interest;
 	var $fk_typepayment;
@@ -65,8 +65,8 @@ 
 
 	/**
 	 *  Create payment of loan into database.
-     *  Use this->amounts to have list of lines for the payment
-     *
+	 *  Use this->amounts to have list of lines for the payment
+	 *
 	 *  @param      User		$user   User making payment
 	 *  @return     int     			<0 if KO, id of payment if OK
 	 */
@@ -76,9 +76,9 @@ 
 
 		$error=0;
 
-        $now=dol_now();
+		$now=dol_now();
 
-        // Validate parameters
+		// Validate parameters
 		if (! $this->datepaid)
 		{
 			$this->error='ErrorBadValueForParameter';
@@ -98,11 +98,11 @@ 
 		if (isset($this->fk_user_creat))	$this->fk_user_creat = trim($this->fk_user_creat);
 		if (isset($this->fk_user_modif))	$this->fk_user_modif = trim($this->fk_user_modif);
 
-        $totalamount = $this->amount_capital + $this->amount_insurance + $this->amount_interest;
-        $totalamount = price2num($totalamount);
+		$totalamount = $this->amount_capital + $this->amount_insurance + $this->amount_interest;
+		$totalamount = price2num($totalamount);
 
-        // Check parameters
-        if ($totalamount == 0) return -1; // Negative amounts are accepted for reject prelevement but not null
+		// Check parameters
+		if ($totalamount == 0) return -1; // Negative amounts are accepted for reject prelevement but not null
 
 
 		$this->db->begin();
@@ -127,7 +127,7 @@ 
 			}
 			else
 			{
-                $this->error=$this->db->lasterror();
+				$this->error=$this->db->lasterror();
 				$error++;
 			}
 
@@ -135,9 +135,9 @@ 
 
 		if ($totalamount != 0 && ! $error)
 		{
-		    $this->amount_capital=$totalamount;
-            $this->total=$totalamount;    // deprecated
-		    $this->db->commit();
+			$this->amount_capital=$totalamount;
+			$this->total=$totalamount;    // deprecated
+			$this->db->commit();
 			return $this->id;
 		}
 		else
@@ -168,8 +168,8 @@ 
 		$sql.= " t.amount_interest,";
 		$sql.= " t.fk_typepayment,";
 		$sql.= " t.num_payment,";
-        $sql.= " t.note_private,";
-        $sql.= " t.note_public,";
+		$sql.= " t.note_private,";
+		$sql.= " t.note_public,";
 		$sql.= " t.fk_bank,";
 		$sql.= " t.fk_user_creat,";
 		$sql.= " t.fk_user_modif,";
@@ -326,15 +326,15 @@ 
 
 		$this->db->begin();
 
-	    if (! $error)
-        {
-            $sql = "DELETE FROM ".MAIN_DB_PREFIX."bank_url";
-            $sql.= " WHERE type='payment_loan' AND url_id=".$this->id;
+		if (! $error)
+		{
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX."bank_url";
+			$sql.= " WHERE type='payment_loan' AND url_id=".$this->id;
 
-            dol_syslog(get_class($this)."::delete", LOG_DEBUG);
-            $resql = $this->db->query($sql);
-            if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
-        }
+			dol_syslog(get_class($this)."::delete", LOG_DEBUG);
+			$resql = $this->db->query($sql);
+			if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+		}
 
 		if (! $error)
 		{
@@ -380,95 +380,95 @@ 
 		}
 	}
 
-    /**
-     *      Add record into bank for payment with links between this bank record and invoices of payment.
-     *      All payment properties must have been set first like after a call to create().
-     *
-     *      @param	User	$user               Object of user making payment
-     *      @param  int		$fk_loan            Id of fk_loan to do link with this payment
-     *      @param  string	$mode               'payment_loan'
-     *      @param  string	$label              Label to use in bank record
-     *      @param  int		$accountid          Id of bank account to do link with
-     *      @param  string	$emetteur_nom       Name of transmitter
-     *      @param  string	$emetteur_banque    Name of bank
-     *      @return int                 		<0 if KO, >0 if OK
-     */
-    function addPaymentToBank($user, $fk_loan, $mode, $label, $accountid, $emetteur_nom, $emetteur_banque)
-    {
-        global $conf;
-
-        $error=0;
-
-        if (! empty($conf->banque->enabled))
-        {
-            require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
-
-            $acc = new Account($this->db);
-            $acc->fetch($accountid);
-
-            $total=$this->total;
-            if ($mode == 'payment_loan') $total=-$total;
-
-            // Insert payment into llx_bank
-            $bank_line_id = $acc->addline(
-                $this->datepaid,
-                $this->paymenttype,  // Payment mode id or code ("CHQ or VIR for example")
-                $label,
-                $total,
-                $this->num_payment,
-                '',
-                $user,
-                $emetteur_nom,
-                $emetteur_banque
-            );
-
-            // Update fk_bank into llx_paiement.
-            // We know the payment who generated the account write
-            if ($bank_line_id > 0)
-            {
-                $result=$this->update_fk_bank($bank_line_id);
-                if ($result <= 0)
-                {
-                    $error++;
-                    dol_print_error($this->db);
-                }
-
-                // Add link 'payment_loan' in bank_url between payment and bank transaction
-                $url='';
-                if ($mode == 'payment_loan') $url=DOL_URL_ROOT.'/loan/payment/card.php?id=';
-                if ($url)
-                {
-                    $result=$acc->add_url_line($bank_line_id, $this->id, $url, '(payment)', $mode);
-                    if ($result <= 0)
-                    {
-                        $error++;
-                        dol_print_error($this->db);
-                    }
-                }
-
-                // Add link 'loan' in bank_url between invoice and bank transaction (for each invoice concerned by payment)
-                if ($mode == 'payment_loan')
-                {
-                    $result=$acc->add_url_line($bank_line_id, $fk_loan, DOL_URL_ROOT.'/loan/card.php?id=', ($this->label?$this->label:''),'loan');
-                    if ($result <= 0) dol_print_error($this->db);
-                }
-            }
-            else
-            {
-                $this->error=$acc->error;
-                $error++;
-            }
-        }
-
-        if (! $error)
-        {
-            return 1;
-        }
-        else
-        {
-            return -1;
-        }
-    }
+	/**
+	 *      Add record into bank for payment with links between this bank record and invoices of payment.
+	 *      All payment properties must have been set first like after a call to create().
+	 *
+	 *      @param	User	$user               Object of user making payment
+	 *      @param  int		$fk_loan            Id of fk_loan to do link with this payment
+	 *      @param  string	$mode               'payment_loan'
+	 *      @param  string	$label              Label to use in bank record
+	 *      @param  int		$accountid          Id of bank account to do link with
+	 *      @param  string	$emetteur_nom       Name of transmitter
+	 *      @param  string	$emetteur_banque    Name of bank
+	 *      @return int                 		<0 if KO, >0 if OK
+	 */
+	function addPaymentToBank($user, $fk_loan, $mode, $label, $accountid, $emetteur_nom, $emetteur_banque)
+	{
+		global $conf;
+
+		$error=0;
+
+		if (! empty($conf->banque->enabled))
+		{
+			require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+
+			$acc = new Account($this->db);
+			$acc->fetch($accountid);
+
+			$total=$this->total;
+			if ($mode == 'payment_loan') $total=-$total;
+
+			// Insert payment into llx_bank
+			$bank_line_id = $acc->addline(
+				$this->datepaid,
+				$this->paymenttype,  // Payment mode id or code ("CHQ or VIR for example")
+				$label,
+				$total,
+				$this->num_payment,
+				'',
+				$user,
+				$emetteur_nom,
+				$emetteur_banque
+			);
+
+			// Update fk_bank into llx_paiement.
+			// We know the payment who generated the account write
+			if ($bank_line_id > 0)
+			{
+				$result=$this->update_fk_bank($bank_line_id);
+				if ($result <= 0)
+				{
+					$error++;
+					dol_print_error($this->db);
+				}
+
+				// Add link 'payment_loan' in bank_url between payment and bank transaction
+				$url='';
+				if ($mode == 'payment_loan') $url=DOL_URL_ROOT.'/loan/payment/card.php?id=';
+				if ($url)
+				{
+					$result=$acc->add_url_line($bank_line_id, $this->id, $url, '(payment)', $mode);
+					if ($result <= 0)
+					{
+						$error++;
+						dol_print_error($this->db);
+					}
+				}
+
+				// Add link 'loan' in bank_url between invoice and bank transaction (for each invoice concerned by payment)
+				if ($mode == 'payment_loan')
+				{
+					$result=$acc->add_url_line($bank_line_id, $fk_loan, DOL_URL_ROOT.'/loan/card.php?id=', ($this->label?$this->label:''),'loan');
+					if ($result <= 0) dol_print_error($this->db);
+				}
+			}
+			else
+			{
+				$this->error=$acc->error;
+				$error++;
+			}
+		}
+
+		if (! $error)
+		{
+			return 1;
+		}
+		else
+		{
+			return -1;
+		}
+	}
 
 
 	/**

Braces +99 added lines, -46 removed lines

@@ -86,23 +86,48 @@ 
 		}
 
 		// Clean parameters
-		if (isset($this->fk_loan)) 			$this->fk_loan = trim($this->fk_loan);
-		if (isset($this->amount_capital))	$this->amount_capital = price2num($this->amount_capital?$this->amount_capital:0);
-		if (isset($this->amount_insurance))	$this->amount_insurance = price2num($this->amount_insurance?$this->amount_insurance:0);
-		if (isset($this->amount_interest))	$this->amount_interest = price2num($this->amount_interest?$this->amount_interest:0);
-		if (isset($this->fk_typepayment))	$this->fk_typepayment = trim($this->fk_typepayment);
-		if (isset($this->num_payment))		$this->num_payment = trim($this->num_payment);
-		if (isset($this->note_private))     $this->note_private = trim($this->note_private);
-		if (isset($this->note_public))      $this->note_public = trim($this->note_public);
-		if (isset($this->fk_bank))			$this->fk_bank = trim($this->fk_bank);
-		if (isset($this->fk_user_creat))	$this->fk_user_creat = trim($this->fk_user_creat);
-		if (isset($this->fk_user_modif))	$this->fk_user_modif = trim($this->fk_user_modif);
+		if (isset($this->fk_loan)) {
+			$this->fk_loan = trim($this->fk_loan);
+		}
+		if (isset($this->amount_capital)) {
+			$this->amount_capital = price2num($this->amount_capital?$this->amount_capital:0);
+		}
+		if (isset($this->amount_insurance)) {
+			$this->amount_insurance = price2num($this->amount_insurance?$this->amount_insurance:0);
+		}
+		if (isset($this->amount_interest)) {
+			$this->amount_interest = price2num($this->amount_interest?$this->amount_interest:0);
+		}
+		if (isset($this->fk_typepayment)) {
+			$this->fk_typepayment = trim($this->fk_typepayment);
+		}
+		if (isset($this->num_payment)) {
+			$this->num_payment = trim($this->num_payment);
+		}
+		if (isset($this->note_private)) {
+			$this->note_private = trim($this->note_private);
+		}
+		if (isset($this->note_public)) {
+			$this->note_public = trim($this->note_public);
+		}
+		if (isset($this->fk_bank)) {
+			$this->fk_bank = trim($this->fk_bank);
+		}
+		if (isset($this->fk_user_creat)) {
+			$this->fk_user_creat = trim($this->fk_user_creat);
+		}
+		if (isset($this->fk_user_modif)) {
+			$this->fk_user_modif = trim($this->fk_user_modif);
+		}
 
         $totalamount = $this->amount_capital + $this->amount_insurance + $this->amount_interest;
         $totalamount = price2num($totalamount);
 
         // Check parameters
-        if ($totalamount == 0) return -1; // Negative amounts are accepted for reject prelevement but not null
+        if ($totalamount == 0) {
+        	return -1;
+        }
+        // Negative amounts are accepted for reject prelevement but not null
 
 
 		$this->db->begin();
@@ -124,8 +149,7 @@ 
 			if ($resql)
 			{
 				$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."payment_loan");
-			}
-			else
+			} else
 			{
                 $this->error=$this->db->lasterror();
 				$error++;
@@ -139,8 +163,7 @@ 
             $this->total=$totalamount;    // deprecated
 		    $this->db->commit();
 			return $this->id;
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->lasterror();
 			$this->db->rollback();
@@ -214,8 +237,7 @@ 
 			$this->db->free($resql);
 
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->error="Error ".$this->db->lasterror();
 			return -1;
@@ -236,17 +258,39 @@ 
 		$error=0;
 
 		// Clean parameters
-		if (isset($this->fk_loan)) $this->fk_loan=trim($this->fk_loan);
-		if (isset($this->amount_capital)) $this->amount_capital=trim($this->amount_capital);
-		if (isset($this->amount_insurance)) $this->amount_insurance=trim($this->amount_insurance);
-		if (isset($this->amount_interest)) $this->amount_interest=trim($this->amount_interest);
-		if (isset($this->fk_typepayment)) $this->fk_typepayment=trim($this->fk_typepayment);
-		if (isset($this->num_payment)) $this->num_payment=trim($this->num_payment);
-		if (isset($this->note_private)) $this->note=trim($this->note_private);
-		if (isset($this->note_public)) $this->note=trim($this->note_public);
-		if (isset($this->fk_bank)) $this->fk_bank=trim($this->fk_bank);
-		if (isset($this->fk_user_creat)) $this->fk_user_creat=trim($this->fk_user_creat);
-		if (isset($this->fk_user_modif)) $this->fk_user_modif=trim($this->fk_user_modif);
+		if (isset($this->fk_loan)) {
+			$this->fk_loan=trim($this->fk_loan);
+		}
+		if (isset($this->amount_capital)) {
+			$this->amount_capital=trim($this->amount_capital);
+		}
+		if (isset($this->amount_insurance)) {
+			$this->amount_insurance=trim($this->amount_insurance);
+		}
+		if (isset($this->amount_interest)) {
+			$this->amount_interest=trim($this->amount_interest);
+		}
+		if (isset($this->fk_typepayment)) {
+			$this->fk_typepayment=trim($this->fk_typepayment);
+		}
+		if (isset($this->num_payment)) {
+			$this->num_payment=trim($this->num_payment);
+		}
+		if (isset($this->note_private)) {
+			$this->note=trim($this->note_private);
+		}
+		if (isset($this->note_public)) {
+			$this->note=trim($this->note_public);
+		}
+		if (isset($this->fk_bank)) {
+			$this->fk_bank=trim($this->fk_bank);
+		}
+		if (isset($this->fk_user_creat)) {
+			$this->fk_user_creat=trim($this->fk_user_creat);
+		}
+		if (isset($this->fk_user_modif)) {
+			$this->fk_user_modif=trim($this->fk_user_modif);
+		}
 
 		// Check parameters
 		// Put here code to add control on parameters values
@@ -303,8 +347,7 @@ 
 			}
 			$this->db->rollback();
 			return -1*$error;
-		}
-		else
+		} else
 		{
 			$this->db->commit();
 			return 1;
@@ -372,8 +415,7 @@ 
 			}
 			$this->db->rollback();
 			return -1*$error;
-		}
-		else
+		} else
 		{
 			$this->db->commit();
 			return 1;
@@ -407,7 +449,9 @@ 
             $acc->fetch($accountid);
 
             $total=$this->total;
-            if ($mode == 'payment_loan') $total=-$total;
+            if ($mode == 'payment_loan') {
+            	$total=-$total;
+            }
 
             // Insert payment into llx_bank
             $bank_line_id = $acc->addline(
@@ -435,7 +479,9 @@ 
 
                 // Add link 'payment_loan' in bank_url between payment and bank transaction
                 $url='';
-                if ($mode == 'payment_loan') $url=DOL_URL_ROOT.'/loan/payment/card.php?id=';
+                if ($mode == 'payment_loan') {
+                	$url=DOL_URL_ROOT.'/loan/payment/card.php?id=';
+                }
                 if ($url)
                 {
                     $result=$acc->add_url_line($bank_line_id, $this->id, $url, '(payment)', $mode);
@@ -450,10 +496,11 @@ 
                 if ($mode == 'payment_loan')
                 {
                     $result=$acc->add_url_line($bank_line_id, $fk_loan, DOL_URL_ROOT.'/loan/card.php?id=', ($this->label?$this->label:''),'loan');
-                    if ($result <= 0) dol_print_error($this->db);
+                    if ($result <= 0) {
+                    	dol_print_error($this->db);
+                    }
                 }
-            }
-            else
+            } else
             {
                 $this->error=$acc->error;
                 $error++;
@@ -463,8 +510,7 @@ 
         if (! $error)
         {
             return 1;
-        }
-        else
+        } else
         {
             return -1;
         }
@@ -486,8 +532,7 @@ 
 		if ($result)
 		{
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->error();
 			return 0;
@@ -507,16 +552,24 @@ 
 
 		$result='';
 
-		if (empty($this->ref)) $this->ref=$this->lib;
+		if (empty($this->ref)) {
+			$this->ref=$this->lib;
+		}
 
 		if (!empty($this->id))
 		{
 			$link = '<a href="'.DOL_URL_ROOT.'/compta/payment/card.php?id='.$this->id.'">';
 			$linkend='</a>';
 
-			if ($withpicto) $result.=($link.img_object($langs->trans("ShowPayment").': '.$this->ref,'payment').$linkend.' ');
-			if ($withpicto && $withpicto != 2) $result.=' ';
-			if ($withpicto != 2) $result.=$link.($maxlen?dol_trunc($this->ref,$maxlen):$this->ref).$linkend;
+			if ($withpicto) {
+				$result.=($link.img_object($langs->trans("ShowPayment").': '.$this->ref,'payment').$linkend.' ');
+			}
+			if ($withpicto && $withpicto != 2) {
+				$result.=' ';
+			}
+			if ($withpicto != 2) {
+				$result.=$link.($maxlen?dol_trunc($this->ref,$maxlen):$this->ref).$linkend;
+			}
 		}
 
 		return $result;

Spacing +119 added lines, -119 removed lines

@@ -30,15 +30,15 @@ 
  */
 class PaymentLoan extends CommonObject
 {
-	public $element='payment_loan';			//!< Id that identify managed objects
-	public $table_element='payment_loan';	//!< Name of table without prefix where object is stored
+	public $element = 'payment_loan'; //!< Id that identify managed objects
+	public $table_element = 'payment_loan'; //!< Name of table without prefix where object is stored
 
 	var $fk_loan;
-	var $datec='';
-	var $tms='';
-	var $datep='';
-    var $amounts=array();   // Array of amounts
-    var $amount_capital;    // Total amount of payment
+	var $datec = '';
+	var $tms = '';
+	var $datep = '';
+    var $amounts = array(); // Array of amounts
+    var $amount_capital; // Total amount of payment
 	var $amount_insurance;
 	var $amount_interest;
 	var $fk_typepayment;
@@ -74,22 +74,22 @@ 
 	{
 		global $conf, $langs;
 
-		$error=0;
+		$error = 0;
 
-        $now=dol_now();
+        $now = dol_now();
 
         // Validate parameters
-		if (! $this->datepaid)
+		if (!$this->datepaid)
 		{
-			$this->error='ErrorBadValueForParameter';
+			$this->error = 'ErrorBadValueForParameter';
 			return -1;
 		}
 
 		// Clean parameters
 		if (isset($this->fk_loan)) 			$this->fk_loan = trim($this->fk_loan);
-		if (isset($this->amount_capital))	$this->amount_capital = price2num($this->amount_capital?$this->amount_capital:0);
-		if (isset($this->amount_insurance))	$this->amount_insurance = price2num($this->amount_insurance?$this->amount_insurance:0);
-		if (isset($this->amount_interest))	$this->amount_interest = price2num($this->amount_interest?$this->amount_interest:0);
+		if (isset($this->amount_capital))	$this->amount_capital = price2num($this->amount_capital ? $this->amount_capital : 0);
+		if (isset($this->amount_insurance))	$this->amount_insurance = price2num($this->amount_insurance ? $this->amount_insurance : 0);
+		if (isset($this->amount_interest))	$this->amount_interest = price2num($this->amount_interest ? $this->amount_interest : 0);
 		if (isset($this->fk_typepayment))	$this->fk_typepayment = trim($this->fk_typepayment);
 		if (isset($this->num_payment))		$this->num_payment = trim($this->num_payment);
 		if (isset($this->note_private))     $this->note_private = trim($this->note_private);
@@ -110,39 +110,39 @@ 
 		if ($totalamount != 0)
 		{
 			$sql = "INSERT INTO ".MAIN_DB_PREFIX."payment_loan (fk_loan, datec, datep, amount_capital, amount_insurance, amount_interest,";
-			$sql.= " fk_typepayment, num_payment, note_private, note_public, fk_user_creat, fk_bank)";
-			$sql.= " VALUES (".$this->chid.", '".$this->db->idate($now)."',";
-			$sql.= " '".$this->db->idate($this->datepaid)."',";
-			$sql.= " ".$this->amount_capital.",";
-			$sql.= " ".$this->amount_insurance.",";
-			$sql.= " ".$this->amount_interest.",";
-			$sql.= " ".$this->paymenttype.", '".$this->db->escape($this->num_payment)."', '".$this->db->escape($this->note_private)."', '".$this->db->escape($this->note_public)."', ".$user->id.",";
-			$sql.= " 0)";
+			$sql .= " fk_typepayment, num_payment, note_private, note_public, fk_user_creat, fk_bank)";
+			$sql .= " VALUES (".$this->chid.", '".$this->db->idate($now)."',";
+			$sql .= " '".$this->db->idate($this->datepaid)."',";
+			$sql .= " ".$this->amount_capital.",";
+			$sql .= " ".$this->amount_insurance.",";
+			$sql .= " ".$this->amount_interest.",";
+			$sql .= " ".$this->paymenttype.", '".$this->db->escape($this->num_payment)."', '".$this->db->escape($this->note_private)."', '".$this->db->escape($this->note_public)."', ".$user->id.",";
+			$sql .= " 0)";
 
 			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."payment_loan");
 			}
 			else
 			{
-                $this->error=$this->db->lasterror();
+                $this->error = $this->db->lasterror();
 				$error++;
 			}
 
 		}
 
-		if ($totalamount != 0 && ! $error)
+		if ($totalamount != 0 && !$error)
 		{
-		    $this->amount_capital=$totalamount;
-            $this->total=$totalamount;    // deprecated
+		    $this->amount_capital = $totalamount;
+            $this->total = $totalamount; // deprecated
 		    $this->db->commit();
 			return $this->id;
 		}
 		else
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
 		}
@@ -158,30 +158,30 @@ 
 	{
 		global $langs;
 		$sql = "SELECT";
-		$sql.= " t.rowid,";
-		$sql.= " t.fk_loan,";
-		$sql.= " t.datec,";
-		$sql.= " t.tms,";
-		$sql.= " t.datep,";
-		$sql.= " t.amount_capital,";
-		$sql.= " t.amount_insurance,";
-		$sql.= " t.amount_interest,";
-		$sql.= " t.fk_typepayment,";
-		$sql.= " t.num_payment,";
-        $sql.= " t.note_private,";
-        $sql.= " t.note_public,";
-		$sql.= " t.fk_bank,";
-		$sql.= " t.fk_user_creat,";
-		$sql.= " t.fk_user_modif,";
-		$sql.= " pt.code as type_code, pt.libelle as type_libelle,";
-		$sql.= ' b.fk_account';
-		$sql.= " FROM (".MAIN_DB_PREFIX."c_paiement as pt, ".MAIN_DB_PREFIX."payment_loan as t)";
-		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank as b ON t.fk_bank = b.rowid';
-		$sql.= " WHERE t.rowid = ".$id." AND t.fk_typepayment = pt.id";
-		$sql.= " AND pt.entity = " . getEntity('c_paiement');
+		$sql .= " t.rowid,";
+		$sql .= " t.fk_loan,";
+		$sql .= " t.datec,";
+		$sql .= " t.tms,";
+		$sql .= " t.datep,";
+		$sql .= " t.amount_capital,";
+		$sql .= " t.amount_insurance,";
+		$sql .= " t.amount_interest,";
+		$sql .= " t.fk_typepayment,";
+		$sql .= " t.num_payment,";
+        $sql .= " t.note_private,";
+        $sql .= " t.note_public,";
+		$sql .= " t.fk_bank,";
+		$sql .= " t.fk_user_creat,";
+		$sql .= " t.fk_user_modif,";
+		$sql .= " pt.code as type_code, pt.libelle as type_libelle,";
+		$sql .= ' b.fk_account';
+		$sql .= " FROM (".MAIN_DB_PREFIX."c_paiement as pt, ".MAIN_DB_PREFIX."payment_loan as t)";
+		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank as b ON t.fk_bank = b.rowid';
+		$sql .= " WHERE t.rowid = ".$id." AND t.fk_typepayment = pt.id";
+		$sql .= " AND pt.entity = ".getEntity('c_paiement');
 
 		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))
@@ -218,7 +218,7 @@ 
 		}
 		else
 		{
-			$this->error="Error ".$this->db->lasterror();
+			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
 	}
@@ -231,23 +231,23 @@ 
 	 *  @param  int		$notrigger	    0=launch triggers after, 1=disable triggers
 	 *  @return int         			<0 if KO, >0 if OK
 	 */
-	function update($user=0, $notrigger=0)
+	function update($user = 0, $notrigger = 0)
 	{
 		global $conf, $langs;
-		$error=0;
+		$error = 0;
 
 		// Clean parameters
-		if (isset($this->fk_loan)) $this->fk_loan=trim($this->fk_loan);
-		if (isset($this->amount_capital)) $this->amount_capital=trim($this->amount_capital);
-		if (isset($this->amount_insurance)) $this->amount_insurance=trim($this->amount_insurance);
-		if (isset($this->amount_interest)) $this->amount_interest=trim($this->amount_interest);
-		if (isset($this->fk_typepayment)) $this->fk_typepayment=trim($this->fk_typepayment);
-		if (isset($this->num_payment)) $this->num_payment=trim($this->num_payment);
-		if (isset($this->note_private)) $this->note=trim($this->note_private);
-		if (isset($this->note_public)) $this->note=trim($this->note_public);
-		if (isset($this->fk_bank)) $this->fk_bank=trim($this->fk_bank);
-		if (isset($this->fk_user_creat)) $this->fk_user_creat=trim($this->fk_user_creat);
-		if (isset($this->fk_user_modif)) $this->fk_user_modif=trim($this->fk_user_modif);
+		if (isset($this->fk_loan)) $this->fk_loan = trim($this->fk_loan);
+		if (isset($this->amount_capital)) $this->amount_capital = trim($this->amount_capital);
+		if (isset($this->amount_insurance)) $this->amount_insurance = trim($this->amount_insurance);
+		if (isset($this->amount_interest)) $this->amount_interest = trim($this->amount_interest);
+		if (isset($this->fk_typepayment)) $this->fk_typepayment = trim($this->fk_typepayment);
+		if (isset($this->num_payment)) $this->num_payment = trim($this->num_payment);
+		if (isset($this->note_private)) $this->note = trim($this->note_private);
+		if (isset($this->note_public)) $this->note = trim($this->note_public);
+		if (isset($this->fk_bank)) $this->fk_bank = trim($this->fk_bank);
+		if (isset($this->fk_user_creat)) $this->fk_user_creat = trim($this->fk_user_creat);
+		if (isset($this->fk_user_modif)) $this->fk_user_modif = trim($this->fk_user_modif);
 
 		// Check parameters
 		// Put here code to add control on parameters values
@@ -255,32 +255,32 @@ 
 		// Update request
 		$sql = "UPDATE ".MAIN_DB_PREFIX."payment_loan SET";
 
-		$sql.= " fk_loan=".(isset($this->fk_loan)?$this->fk_loan:"null").",";
-		$sql.= " datec=".(dol_strlen($this->datec)!=0 ? "'".$this->db->idate($this->datec)."'" : 'null').",";
-		$sql.= " tms=".(dol_strlen($this->tms)!=0 ? "'".$this->db->idate($this->tms)."'" : 'null').",";
-		$sql.= " datep=".(dol_strlen($this->datep)!=0 ? "'".$this->db->idate($this->datep)."'" : 'null').",";
-		$sql.= " amount_capital=".(isset($this->amount_capital)?$this->amount_capital:"null").",";
-		$sql.= " amount_insurance=".(isset($this->amount_insurance)?$this->amount_insurance:"null").",";
-		$sql.= " amount_interest=".(isset($this->amount_interest)?$this->amount_interest:"null").",";
-		$sql.= " fk_typepayment=".(isset($this->fk_typepayment)?$this->fk_typepayment:"null").",";
-		$sql.= " num_payment=".(isset($this->num_payment)?"'".$this->db->escape($this->num_payment)."'":"null").",";
-		$sql.= " note_private=".(isset($this->note_private)?"'".$this->db->escape($this->note_private)."'":"null").",";
-		$sql.= " note_public=".(isset($this->note_public)?"'".$this->db->escape($this->note_public)."'":"null").",";
-		$sql.= " fk_bank=".(isset($this->fk_bank)?$this->fk_bank:"null").",";
-		$sql.= " fk_user_creat=".(isset($this->fk_user_creat)?$this->fk_user_creat:"null").",";
-		$sql.= " fk_user_modif=".(isset($this->fk_user_modif)?$this->fk_user_modif:"null")."";
-
-		$sql.= " WHERE rowid=".$this->id;
+		$sql .= " fk_loan=".(isset($this->fk_loan) ? $this->fk_loan : "null").",";
+		$sql .= " datec=".(dol_strlen($this->datec) != 0 ? "'".$this->db->idate($this->datec)."'" : 'null').",";
+		$sql .= " tms=".(dol_strlen($this->tms) != 0 ? "'".$this->db->idate($this->tms)."'" : 'null').",";
+		$sql .= " datep=".(dol_strlen($this->datep) != 0 ? "'".$this->db->idate($this->datep)."'" : 'null').",";
+		$sql .= " amount_capital=".(isset($this->amount_capital) ? $this->amount_capital : "null").",";
+		$sql .= " amount_insurance=".(isset($this->amount_insurance) ? $this->amount_insurance : "null").",";
+		$sql .= " amount_interest=".(isset($this->amount_interest) ? $this->amount_interest : "null").",";
+		$sql .= " fk_typepayment=".(isset($this->fk_typepayment) ? $this->fk_typepayment : "null").",";
+		$sql .= " num_payment=".(isset($this->num_payment) ? "'".$this->db->escape($this->num_payment)."'" : "null").",";
+		$sql .= " note_private=".(isset($this->note_private) ? "'".$this->db->escape($this->note_private)."'" : "null").",";
+		$sql .= " note_public=".(isset($this->note_public) ? "'".$this->db->escape($this->note_public)."'" : "null").",";
+		$sql .= " fk_bank=".(isset($this->fk_bank) ? $this->fk_bank : "null").",";
+		$sql .= " fk_user_creat=".(isset($this->fk_user_creat) ? $this->fk_user_creat : "null").",";
+		$sql .= " fk_user_modif=".(isset($this->fk_user_modif) ? $this->fk_user_modif : "null")."";
+
+		$sql .= " WHERE rowid=".$this->id;
 
 		$this->db->begin();
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
-		if (! $error)
+		if (!$error)
 		{
-			if (! $notrigger)
+			if (!$notrigger)
 			{
 				// Uncomment this and change MYOBJECT to your own tag if you
 				// want this action call a trigger.
@@ -297,13 +297,13 @@ 
 		// Commit or rollback
 		if ($error)
 		{
-			foreach($this->errors as $errmsg)
+			foreach ($this->errors as $errmsg)
 			{
 				dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
-				$this->error.=($this->error?', '.$errmsg:$errmsg);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
-			return -1*$error;
+			return -1 * $error;
 		}
 		else
 		{
@@ -320,36 +320,36 @@ 
 	 *  @param  int		$notrigger		0=launch triggers after, 1=disable triggers
 	 *  @return int						<0 if KO, >0 if OK
 	 */
-	function delete($user, $notrigger=0)
+	function delete($user, $notrigger = 0)
 	{
 		global $conf, $langs;
-		$error=0;
+		$error = 0;
 
 		$this->db->begin();
 
-	    if (! $error)
+	    if (!$error)
         {
             $sql = "DELETE FROM ".MAIN_DB_PREFIX."bank_url";
-            $sql.= " WHERE type='payment_loan' AND url_id=".$this->id;
+            $sql .= " WHERE type='payment_loan' AND url_id=".$this->id;
 
             dol_syslog(get_class($this)."::delete", LOG_DEBUG);
             $resql = $this->db->query($sql);
-            if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+            if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
         }
 
-		if (! $error)
+		if (!$error)
 		{
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."payment_loan";
-			$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) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+			if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 		}
 
-		if (! $error)
+		if (!$error)
 		{
-			if (! $notrigger)
+			if (!$notrigger)
 			{
 				// Uncomment this and change MYOBJECT to your own tag if you
 				// want this action call a trigger.
@@ -366,13 +366,13 @@ 
 		// Commit or rollback
 		if ($error)
 		{
-			foreach($this->errors as $errmsg)
+			foreach ($this->errors as $errmsg)
 			{
 				dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
-				$this->error.=($this->error?', '.$errmsg:$errmsg);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
-			return -1*$error;
+			return -1 * $error;
 		}
 		else
 		{
@@ -398,22 +398,22 @@ 
     {
         global $conf;
 
-        $error=0;
+        $error = 0;
 
-        if (! empty($conf->banque->enabled))
+        if (!empty($conf->banque->enabled))
         {
             require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 
             $acc = new Account($this->db);
             $acc->fetch($accountid);
 
-            $total=$this->total;
-            if ($mode == 'payment_loan') $total=-$total;
+            $total = $this->total;
+            if ($mode == 'payment_loan') $total = -$total;
 
             // Insert payment into llx_bank
             $bank_line_id = $acc->addline(
                 $this->datepaid,
-                $this->paymenttype,  // Payment mode id or code ("CHQ or VIR for example")
+                $this->paymenttype, // Payment mode id or code ("CHQ or VIR for example")
                 $label,
                 $total,
                 $this->num_payment,
@@ -427,7 +427,7 @@ 
             // We know the payment who generated the account write
             if ($bank_line_id > 0)
             {
-                $result=$this->update_fk_bank($bank_line_id);
+                $result = $this->update_fk_bank($bank_line_id);
                 if ($result <= 0)
                 {
                     $error++;
@@ -435,11 +435,11 @@ 
                 }
 
                 // Add link 'payment_loan' in bank_url between payment and bank transaction
-                $url='';
-                if ($mode == 'payment_loan') $url=DOL_URL_ROOT.'/loan/payment/card.php?id=';
+                $url = '';
+                if ($mode == 'payment_loan') $url = DOL_URL_ROOT.'/loan/payment/card.php?id=';
                 if ($url)
                 {
-                    $result=$acc->add_url_line($bank_line_id, $this->id, $url, '(payment)', $mode);
+                    $result = $acc->add_url_line($bank_line_id, $this->id, $url, '(payment)', $mode);
                     if ($result <= 0)
                     {
                         $error++;
@@ -450,18 +450,18 @@ 
                 // Add link 'loan' in bank_url between invoice and bank transaction (for each invoice concerned by payment)
                 if ($mode == 'payment_loan')
                 {
-                    $result=$acc->add_url_line($bank_line_id, $fk_loan, DOL_URL_ROOT.'/loan/card.php?id=', ($this->label?$this->label:''),'loan');
+                    $result = $acc->add_url_line($bank_line_id, $fk_loan, DOL_URL_ROOT.'/loan/card.php?id=', ($this->label ? $this->label : ''), 'loan');
                     if ($result <= 0) dol_print_error($this->db);
                 }
             }
             else
             {
-                $this->error=$acc->error;
+                $this->error = $acc->error;
                 $error++;
             }
         }
 
-        if (! $error)
+        if (!$error)
         {
             return 1;
         }
@@ -490,7 +490,7 @@ 
 		}
 		else
 		{
-			$this->error=$this->db->error();
+			$this->error = $this->db->error();
 			return 0;
 		}
 	}
@@ -502,22 +502,22 @@ 
 	 * 	@param	int		$maxlen			Max length label
 	 *	@return	string					Chaine with URL
 	 */
-	function getNomUrl($withpicto=0,$maxlen=0)
+	function getNomUrl($withpicto = 0, $maxlen = 0)
 	{
 		global $langs;
 
-		$result='';
+		$result = '';
 
-		if (empty($this->ref)) $this->ref=$this->lib;
+		if (empty($this->ref)) $this->ref = $this->lib;
 
 		if (!empty($this->id))
 		{
 			$link = '<a href="'.DOL_URL_ROOT.'/compta/payment/card.php?id='.$this->id.'">';
-			$linkend='</a>';
+			$linkend = '</a>';
 
-			if ($withpicto) $result.=($link.img_object($langs->trans("ShowPayment").': '.$this->ref,'payment').$linkend.' ');
-			if ($withpicto && $withpicto != 2) $result.=' ';
-			if ($withpicto != 2) $result.=$link.($maxlen?dol_trunc($this->ref,$maxlen):$this->ref).$linkend;
+			if ($withpicto) $result .= ($link.img_object($langs->trans("ShowPayment").': '.$this->ref, 'payment').$linkend.' ');
+			if ($withpicto && $withpicto != 2) $result .= ' ';
+			if ($withpicto != 2) $result .= $link.($maxlen ?dol_trunc($this->ref, $maxlen) : $this->ref).$linkend;
 		}
 
 		return $result;

htdocs/main.inc.php

Doc Comments +2 added lines, -2 removed lines

@@ -1590,7 +1590,7 @@ 
 /**
  *  Show left menu bar
  *
- *  @param  array	$menu_array_before 	       	Table of menu entries to show before entries of menu handler. This param is deprectaed and must be provided to ''.
+ *  @param  string	$menu_array_before 	       	Table of menu entries to show before entries of menu handler. This param is deprectaed and must be provided to ''.
  *  @param  string	$helppagename    	       	Name of wiki page for help ('' by default).
  * 				     		                   	Syntax is: For a wiki page: EN:EnglishPage|FR:FrenchPage|ES:SpanishPage
  * 									         		       For other external page: http://server/url
@@ -1598,7 +1598,7 @@ 
  *  @param  array	$menu_array_after           Table of menu entries to show after entries of menu handler
  *  @param  int		$leftmenuwithoutmainarea    Must be set to 1. 0 by default for backward compatibility with old modules.
  *  @param  string	$title                      Title of web page
- *  @param  string  $acceptdelayedhtml          1 if caller request to have html delayed content not returned but saved into global $delayedhtmlcontent (so caller can show it at end of page to avoid flash FOUC effect)
+ *  @param  integer  $acceptdelayedhtml          1 if caller request to have html delayed content not returned but saved into global $delayedhtmlcontent (so caller can show it at end of page to avoid flash FOUC effect)
  *  @return	void
  */
 function left_menu($menu_array_before, $helppagename='', $notused='', $menu_array_after='', $leftmenuwithoutmainarea=0, $title='', $acceptdelayedhtml=0)

Indentation +1386 added lines, -1386 removed lines

@@ -38,34 +38,34 @@ 
 $micro_start_time=0;
 if (! empty($_SERVER['MAIN_SHOW_TUNING_INFO']))
 {
-    list($usec, $sec) = explode(" ", microtime());
-    $micro_start_time=((float) $usec + (float) $sec);
-    // Add Xdebug code coverage
-    //define('XDEBUGCOVERAGE',1);
-    if (defined('XDEBUGCOVERAGE')) {
-        xdebug_start_code_coverage();
-    }
+	list($usec, $sec) = explode(" ", microtime());
+	$micro_start_time=((float) $usec + (float) $sec);
+	// Add Xdebug code coverage
+	//define('XDEBUGCOVERAGE',1);
+	if (defined('XDEBUGCOVERAGE')) {
+		xdebug_start_code_coverage();
+	}
 }
 
 // Removed magic_quotes
 if (function_exists('get_magic_quotes_gpc'))	// magic_quotes_* deprecated in PHP 5.0 and removed in PHP 5.5
 {
-    if (get_magic_quotes_gpc())
-    {
-        // Forcing parameter setting magic_quotes_gpc and cleaning parameters
-        // (Otherwise he would have for each position, condition
-        // Reading stripslashes variable according to state get_magic_quotes_gpc).
-        // Off mode recommended (just do $db->escape for insert / update).
-        function stripslashes_deep($value)
-        {
-            return (is_array($value) ? array_map('stripslashes_deep', $value) : stripslashes($value));
-        }
-        $_GET     = array_map('stripslashes_deep', $_GET);
-        $_POST    = array_map('stripslashes_deep', $_POST);
-        $_FILES   = array_map('stripslashes_deep', $_FILES);
-        //$_COOKIE  = array_map('stripslashes_deep', $_COOKIE); // Useless because a cookie should never be outputed on screen nor used into sql
-        @set_magic_quotes_runtime(0);
-    }
+	if (get_magic_quotes_gpc())
+	{
+		// Forcing parameter setting magic_quotes_gpc and cleaning parameters
+		// (Otherwise he would have for each position, condition
+		// Reading stripslashes variable according to state get_magic_quotes_gpc).
+		// Off mode recommended (just do $db->escape for insert / update).
+		function stripslashes_deep($value)
+		{
+			return (is_array($value) ? array_map('stripslashes_deep', $value) : stripslashes($value));
+		}
+		$_GET     = array_map('stripslashes_deep', $_GET);
+		$_POST    = array_map('stripslashes_deep', $_POST);
+		$_FILES   = array_map('stripslashes_deep', $_FILES);
+		//$_COOKIE  = array_map('stripslashes_deep', $_COOKIE); // Useless because a cookie should never be outputed on screen nor used into sql
+		@set_magic_quotes_runtime(0);
+	}
 }
 
 /**
@@ -77,44 +77,44 @@ 
  */
 function test_sql_and_script_inject($val, $type)
 {
-    $inj = 0;
-    // For SQL Injection (only GET and POST are used to be included into bad escaped SQL requests)
-    if ($type != 2)
-    {
-        $inj += preg_match('/delete\s+from/i',	 $val);
-        $inj += preg_match('/create\s+table/i',	 $val);
-        $inj += preg_match('/update.+set.+=/i',  $val);
-        $inj += preg_match('/insert\s+into/i', 	 $val);
-        $inj += preg_match('/select.+from/i', 	 $val);
-        $inj += preg_match('/union.+select/i', 	 $val);
-        $inj += preg_match('/into\s+(outfile|dumpfile)/i',  $val);
-        $inj += preg_match('/(\.\.%2f)+/i',		 $val);
-    }
-    // For XSS Injection done by adding javascript with script
-    // This is all cases a browser consider text is javascript:
-    // When it found '<script', 'javascript:', '<style', 'onload\s=' on body tag, '="&' on a tag size with old browsers
-    // All examples on page: http://ha.ckers.org/xss.html#XSScalc
+	$inj = 0;
+	// For SQL Injection (only GET and POST are used to be included into bad escaped SQL requests)
+	if ($type != 2)
+	{
+		$inj += preg_match('/delete\s+from/i',	 $val);
+		$inj += preg_match('/create\s+table/i',	 $val);
+		$inj += preg_match('/update.+set.+=/i',  $val);
+		$inj += preg_match('/insert\s+into/i', 	 $val);
+		$inj += preg_match('/select.+from/i', 	 $val);
+		$inj += preg_match('/union.+select/i', 	 $val);
+		$inj += preg_match('/into\s+(outfile|dumpfile)/i',  $val);
+		$inj += preg_match('/(\.\.%2f)+/i',		 $val);
+	}
+	// For XSS Injection done by adding javascript with script
+	// This is all cases a browser consider text is javascript:
+	// When it found '<script', 'javascript:', '<style', 'onload\s=' on body tag, '="&' on a tag size with old browsers
+	// All examples on page: http://ha.ckers.org/xss.html#XSScalc
 	// More on https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet
-    $inj += preg_match('/<script/i', $val);
+	$inj += preg_match('/<script/i', $val);
 	$inj += preg_match('/<iframe/i', $val);
 	$inj += preg_match('/Set\.constructor/i', $val);	// ECMA script 6
-    if (! defined('NOSTYLECHECK')) $inj += preg_match('/<style/i', $val);
-    $inj += preg_match('/base[\s]+href/si', $val);
-    $inj += preg_match('/<.*onmouse/si', $val);       // onmousexxx can be set on img or any html tag like <img title='...' onmouseover=alert(1)>
-    $inj += preg_match('/onerror\s*=/i', $val);       // onerror can be set on img or any html tag like <img title='...' onerror = alert(1)>
-    $inj += preg_match('/onfocus\s*=/i', $val);       // onfocus can be set on input text html tag like <input type='text' value='...' onfocus = alert(1)>
-    $inj += preg_match('/onload\s*=/i', $val);        // onload can be set on svg tag <svg/onload=alert(1)> or other tag like body <body onload=alert(1)>
-    //$inj += preg_match('/on[A-Z][a-z]+\*=/', $val);   // To lock event handlers onAbort(), ...
+	if (! defined('NOSTYLECHECK')) $inj += preg_match('/<style/i', $val);
+	$inj += preg_match('/base[\s]+href/si', $val);
+	$inj += preg_match('/<.*onmouse/si', $val);       // onmousexxx can be set on img or any html tag like <img title='...' onmouseover=alert(1)>
+	$inj += preg_match('/onerror\s*=/i', $val);       // onerror can be set on img or any html tag like <img title='...' onerror = alert(1)>
+	$inj += preg_match('/onfocus\s*=/i', $val);       // onfocus can be set on input text html tag like <input type='text' value='...' onfocus = alert(1)>
+	$inj += preg_match('/onload\s*=/i', $val);        // onload can be set on svg tag <svg/onload=alert(1)> or other tag like body <body onload=alert(1)>
+	//$inj += preg_match('/on[A-Z][a-z]+\*=/', $val);   // To lock event handlers onAbort(), ...
 	$inj += preg_match('/&#58;|&#0000058|&#x3A/i', $val);		// refused string ':' encoded (no reason to have it encoded) to lock 'javascript:...'
-    //if ($type == 1)
-    //{
-        $inj += preg_match('/javascript:/i', $val);
-        $inj += preg_match('/vbscript:/i', $val);
-    //}
-    // For XSS Injection done by adding javascript closing html tags like with onmousemove, etc... (closing a src or href tag with not cleaned param)
-    if ($type == 1) $inj += preg_match('/"/i', $val);		// We refused " in GET parameters value
-    if ($type == 2) $inj += preg_match('/[;"]/', $val);		// PHP_SELF is a file system path. It can contains spaces.
-    return $inj;
+	//if ($type == 1)
+	//{
+		$inj += preg_match('/javascript:/i', $val);
+		$inj += preg_match('/vbscript:/i', $val);
+	//}
+	// For XSS Injection done by adding javascript closing html tags like with onmousemove, etc... (closing a src or href tag with not cleaned param)
+	if ($type == 1) $inj += preg_match('/"/i', $val);		// We refused " in GET parameters value
+	if ($type == 2) $inj += preg_match('/[;"]/', $val);		// PHP_SELF is a file system path. It can contains spaces.
+	return $inj;
 }
 
 /**
@@ -126,26 +126,26 @@ 
  */
 function analyseVarsForSqlAndScriptsInjection(&$var, $type)
 {
-    if (is_array($var))
-    {
-        foreach ($var as $key => $value)
-        {
-            if (analyseVarsForSqlAndScriptsInjection($value,$type))
-            {
-                $var[$key] = $value;
-            }
-            else
+	if (is_array($var))
+	{
+		foreach ($var as $key => $value)
+		{
+			if (analyseVarsForSqlAndScriptsInjection($value,$type))
 			{
-                print 'Access refused by SQL/Script injection protection in main.inc.php (type='.htmlentities($type).' key='.htmlentities($key).' value='.htmlentities($value).' page='.htmlentities($_SERVER["REQUEST_URI"]).')';
-                exit;
-            }
-        }
-        return true;
-    }
-    else
-    {
-        return (test_sql_and_script_inject($var,$type) <= 0);
-    }
+				$var[$key] = $value;
+			}
+			else
+			{
+				print 'Access refused by SQL/Script injection protection in main.inc.php (type='.htmlentities($type).' key='.htmlentities($key).' value='.htmlentities($value).' page='.htmlentities($_SERVER["REQUEST_URI"]).')';
+				exit;
+			}
+		}
+		return true;
+	}
+	else
+	{
+		return (test_sql_and_script_inject($var,$type) <= 0);
+	}
 }
 
 
@@ -155,14 +155,14 @@ 
 // Sanity check on URL
 if (! empty($_SERVER["PHP_SELF"]))
 {
-    $morevaltochecklikepost=array($_SERVER["PHP_SELF"]);
-    analyseVarsForSqlAndScriptsInjection($morevaltochecklikepost,2);
+	$morevaltochecklikepost=array($_SERVER["PHP_SELF"]);
+	analyseVarsForSqlAndScriptsInjection($morevaltochecklikepost,2);
 }
 // Sanity check on GET parameters
 if (! defined('NOSCANGETFORINJECTION') && ! empty($_SERVER["QUERY_STRING"]))
 {
-    $morevaltochecklikeget=array($_SERVER["QUERY_STRING"]);
-    analyseVarsForSqlAndScriptsInjection($morevaltochecklikeget,1);
+	$morevaltochecklikeget=array($_SERVER["QUERY_STRING"]);
+	analyseVarsForSqlAndScriptsInjection($morevaltochecklikeget,1);
 }
 // Sanity check on POST
 if (! defined('NOSCANPOSTFORINJECTION'))
@@ -211,14 +211,14 @@ 
 // We need this lock as long as we read/write $_SESSION ['vars']. We can close released when finished.
 if (! defined('NOSESSION'))
 {
-    session_start();
-    if (ini_get('register_globals'))    // Deprecated in 5.3 and removed in 5.4. To solve bug in using $_SESSION
-    {
-        foreach ($_SESSION as $key=>$value)
-        {
-            if (isset($GLOBALS[$key])) unset($GLOBALS[$key]);
-        }
-    }
+	session_start();
+	if (ini_get('register_globals'))    // Deprecated in 5.3 and removed in 5.4. To solve bug in using $_SESSION
+	{
+		foreach ($_SESSION as $key=>$value)
+		{
+			if (isset($GLOBALS[$key])) unset($GLOBALS[$key]);
+		}
+	}
 }
 
 // Init the 5 global objects, this include will make the new and set properties for: $conf, $db, $langs, $user, $mysoc
@@ -230,54 +230,54 @@ 
 // Detection browser
 if (isset($_SERVER["HTTP_USER_AGENT"]))
 {
-    $tmp=getBrowserInfo($_SERVER["HTTP_USER_AGENT"]);
-    $conf->browser->name=$tmp['browsername'];
-    $conf->browser->os=$tmp['browseros'];
-    $conf->browser->version=$tmp['browserversion'];
-    $conf->browser->layout=$tmp['layout'];     // 'classic', 'phone', 'tablet'
-    $conf->browser->phone=$tmp['phone'];	   // TODO deprecated, use ->layout
-    $conf->browser->tablet=$tmp['tablet'];	   // TODO deprecated, use ->layout
-    //var_dump($conf->browser);
-
-    if ($conf->browser->layout == 'phone') $conf->dol_no_mouse_hover=1;
-    if ($conf->browser->layout == 'phone') $conf->global->MAIN_TESTMENUHIDER=1;
+	$tmp=getBrowserInfo($_SERVER["HTTP_USER_AGENT"]);
+	$conf->browser->name=$tmp['browsername'];
+	$conf->browser->os=$tmp['browseros'];
+	$conf->browser->version=$tmp['browserversion'];
+	$conf->browser->layout=$tmp['layout'];     // 'classic', 'phone', 'tablet'
+	$conf->browser->phone=$tmp['phone'];	   // TODO deprecated, use ->layout
+	$conf->browser->tablet=$tmp['tablet'];	   // TODO deprecated, use ->layout
+	//var_dump($conf->browser);
+
+	if ($conf->browser->layout == 'phone') $conf->dol_no_mouse_hover=1;
+	if ($conf->browser->layout == 'phone') $conf->global->MAIN_TESTMENUHIDER=1;
 }
 
 // Force HTTPS if required ($conf->file->main_force_https is 0/1 or https dolibarr root url)
 // $_SERVER["HTTPS"] is 'on' when link is https, otherwise $_SERVER["HTTPS"] is empty or 'off'
 if (! empty($conf->file->main_force_https) && (empty($_SERVER["HTTPS"]) || $_SERVER["HTTPS"] != 'on'))
 {
-    $newurl='';
-    if (is_numeric($conf->file->main_force_https))
-    {
-        if ($conf->file->main_force_https == '1' && ! empty($_SERVER["SCRIPT_URI"]))	// If SCRIPT_URI supported by server
-        {
-            if (preg_match('/^http:/i',$_SERVER["SCRIPT_URI"]) && ! preg_match('/^https:/i',$_SERVER["SCRIPT_URI"]))	// If link is http
-            {
-                $newurl=preg_replace('/^http:/i','https:',$_SERVER["SCRIPT_URI"]);
-            }
-        }
-        else	// Check HTTPS environment variable (Apache/mod_ssl only)
-        {
-            $newurl=preg_replace('/^http:/i','https:',DOL_MAIN_URL_ROOT).$_SERVER["REQUEST_URI"];
-        }
-    }
-    else
-    {
-        // Check HTTPS environment variable (Apache/mod_ssl only)
-        $newurl=$conf->file->main_force_https.$_SERVER["REQUEST_URI"];
-    }
-    // Start redirect
-    if ($newurl)
-    {
-        dol_syslog("main.inc: dolibarr_main_force_https is on, we make a redirect to ".$newurl);
-        header("Location: ".$newurl);
-        exit;
-    }
-    else
-    {
-        dol_syslog("main.inc: dolibarr_main_force_https is on but we failed to forge new https url so no redirect is done", LOG_WARNING);
-    }
+	$newurl='';
+	if (is_numeric($conf->file->main_force_https))
+	{
+		if ($conf->file->main_force_https == '1' && ! empty($_SERVER["SCRIPT_URI"]))	// If SCRIPT_URI supported by server
+		{
+			if (preg_match('/^http:/i',$_SERVER["SCRIPT_URI"]) && ! preg_match('/^https:/i',$_SERVER["SCRIPT_URI"]))	// If link is http
+			{
+				$newurl=preg_replace('/^http:/i','https:',$_SERVER["SCRIPT_URI"]);
+			}
+		}
+		else	// Check HTTPS environment variable (Apache/mod_ssl only)
+		{
+			$newurl=preg_replace('/^http:/i','https:',DOL_MAIN_URL_ROOT).$_SERVER["REQUEST_URI"];
+		}
+	}
+	else
+	{
+		// Check HTTPS environment variable (Apache/mod_ssl only)
+		$newurl=$conf->file->main_force_https.$_SERVER["REQUEST_URI"];
+	}
+	// Start redirect
+	if ($newurl)
+	{
+		dol_syslog("main.inc: dolibarr_main_force_https is on, we make a redirect to ".$newurl);
+		header("Location: ".$newurl);
+		exit;
+	}
+	else
+	{
+		dol_syslog("main.inc: dolibarr_main_force_https is on but we failed to forge new https url so no redirect is done", LOG_WARNING);
+	}
 }
 
 
@@ -288,74 +288,74 @@ 
 // If install or upgrade process not done or not completely finished, we call the install page.
 if (! empty($conf->global->MAIN_NOT_INSTALLED) || ! empty($conf->global->MAIN_NOT_UPGRADED))
 {
-    dol_syslog("main.inc: A previous install or upgrade was not complete. Redirect to install page.", LOG_WARNING);
-    header("Location: ".DOL_URL_ROOT."/install/index.php");
-    exit;
+	dol_syslog("main.inc: A previous install or upgrade was not complete. Redirect to install page.", LOG_WARNING);
+	header("Location: ".DOL_URL_ROOT."/install/index.php");
+	exit;
 }
 // If an upgrade process is required, we call the install page.
 if ((! empty($conf->global->MAIN_VERSION_LAST_UPGRADE) && ($conf->global->MAIN_VERSION_LAST_UPGRADE != DOL_VERSION))
 || (empty($conf->global->MAIN_VERSION_LAST_UPGRADE) && ! empty($conf->global->MAIN_VERSION_LAST_INSTALL) && ($conf->global->MAIN_VERSION_LAST_INSTALL != DOL_VERSION)))
 {
-    $versiontocompare=empty($conf->global->MAIN_VERSION_LAST_UPGRADE)?$conf->global->MAIN_VERSION_LAST_INSTALL:$conf->global->MAIN_VERSION_LAST_UPGRADE;
-    require_once DOL_DOCUMENT_ROOT .'/core/lib/admin.lib.php';
-    $dolibarrversionlastupgrade=preg_split('/[.-]/',$versiontocompare);
-    $dolibarrversionprogram=preg_split('/[.-]/',DOL_VERSION);
-    $rescomp=versioncompare($dolibarrversionprogram,$dolibarrversionlastupgrade);
-    if ($rescomp > 0)   // Programs have a version higher than database. We did not add "&& $rescomp < 3" because we want upgrade process for build upgrades
-    {
-        dol_syslog("main.inc: database version ".$versiontocompare." is lower than programs version ".DOL_VERSION.". Redirect to install page.", LOG_WARNING);
-        header("Location: ".DOL_URL_ROOT."/install/index.php");
-        exit;
-    }
+	$versiontocompare=empty($conf->global->MAIN_VERSION_LAST_UPGRADE)?$conf->global->MAIN_VERSION_LAST_INSTALL:$conf->global->MAIN_VERSION_LAST_UPGRADE;
+	require_once DOL_DOCUMENT_ROOT .'/core/lib/admin.lib.php';
+	$dolibarrversionlastupgrade=preg_split('/[.-]/',$versiontocompare);
+	$dolibarrversionprogram=preg_split('/[.-]/',DOL_VERSION);
+	$rescomp=versioncompare($dolibarrversionprogram,$dolibarrversionlastupgrade);
+	if ($rescomp > 0)   // Programs have a version higher than database. We did not add "&& $rescomp < 3" because we want upgrade process for build upgrades
+	{
+		dol_syslog("main.inc: database version ".$versiontocompare." is lower than programs version ".DOL_VERSION.". Redirect to install page.", LOG_WARNING);
+		header("Location: ".DOL_URL_ROOT."/install/index.php");
+		exit;
+	}
 }
 
 // Creation of a token against CSRF vulnerabilities
 if (! defined('NOTOKENRENEWAL'))
 {
-    // roulement des jetons car cree a chaque appel
-    if (isset($_SESSION['newtoken'])) $_SESSION['token'] = $_SESSION['newtoken'];
+	// roulement des jetons car cree a chaque appel
+	if (isset($_SESSION['newtoken'])) $_SESSION['token'] = $_SESSION['newtoken'];
 
-    // Save in $_SESSION['newtoken'] what will be next token. Into forms, we will add param token = $_SESSION['newtoken']
-    $token = dol_hash(uniqid(mt_rand(),TRUE)); // Generates a hash of a random number
-    $_SESSION['newtoken'] = $token;
+	// Save in $_SESSION['newtoken'] what will be next token. Into forms, we will add param token = $_SESSION['newtoken']
+	$token = dol_hash(uniqid(mt_rand(),TRUE)); // Generates a hash of a random number
+	$_SESSION['newtoken'] = $token;
 }
 if (! defined('NOCSRFCHECK') && empty($dolibarr_nocsrfcheck) && ! empty($conf->global->MAIN_SECURITY_CSRF_WITH_TOKEN))	// Check validity of token, only if option enabled (this option breaks some features sometimes)
 {
-    if ($_SERVER['REQUEST_METHOD'] == 'POST' && ! GETPOST('token','alpha')) // Note, offender can still send request by GET
-    {
-        print "Access refused by CSRF protection in main.inc.php. Token not provided.\n";
-        print "If you access your server behind a proxy using url rewriting, you might check that all HTTP header is propagated (or add the line \$dolibarr_nocsrfcheck=1 into your conf.php file).\n";
-        die;
-    }
-    if ($_SERVER['REQUEST_METHOD'] === 'POST')  // This test must be after loading $_SESSION['token'].
-    {
-        if (GETPOST('token', 'alpha') != $_SESSION['token'])
-        {
-            dol_syslog("Invalid token in ".$_SERVER['HTTP_REFERER'].", action=".GETPOST('action','aZ09').", _POST['token']=".GETPOST('token','alpha').", _SESSION['token']=".$_SESSION['token'], LOG_WARNING);
-            //print 'Unset POST by CSRF protection in main.inc.php.';	// Do not output anything because this create problems when using the BACK button on browsers.
-            unset($_POST);
-        }
-    }
+	if ($_SERVER['REQUEST_METHOD'] == 'POST' && ! GETPOST('token','alpha')) // Note, offender can still send request by GET
+	{
+		print "Access refused by CSRF protection in main.inc.php. Token not provided.\n";
+		print "If you access your server behind a proxy using url rewriting, you might check that all HTTP header is propagated (or add the line \$dolibarr_nocsrfcheck=1 into your conf.php file).\n";
+		die;
+	}
+	if ($_SERVER['REQUEST_METHOD'] === 'POST')  // This test must be after loading $_SESSION['token'].
+	{
+		if (GETPOST('token', 'alpha') != $_SESSION['token'])
+		{
+			dol_syslog("Invalid token in ".$_SERVER['HTTP_REFERER'].", action=".GETPOST('action','aZ09').", _POST['token']=".GETPOST('token','alpha').", _SESSION['token']=".$_SESSION['token'], LOG_WARNING);
+			//print 'Unset POST by CSRF protection in main.inc.php.';	// Do not output anything because this create problems when using the BACK button on browsers.
+			unset($_POST);
+		}
+	}
 }
 
 // Disable modules (this must be after session_start and after conf has been loaded)
 if (GETPOST('disablemodules','alpha'))  $_SESSION["disablemodules"]=GETPOST('disablemodules','alpha');
 if (! empty($_SESSION["disablemodules"]))
 {
-    $disabled_modules=explode(',',$_SESSION["disablemodules"]);
-    foreach($disabled_modules as $module)
-    {
-        if ($module)
-        {
-        	if (empty($conf->$module)) $conf->$module=new stdClass();
-        	$conf->$module->enabled=false;
-        	if ($module == 'fournisseur')		// Special case
-        	{
-        		$conf->supplier_order->enabled=0;
-        		$conf->supplier_invoice->enabled=0;
-        	}
-        }
-    }
+	$disabled_modules=explode(',',$_SESSION["disablemodules"]);
+	foreach($disabled_modules as $module)
+	{
+		if ($module)
+		{
+			if (empty($conf->$module)) $conf->$module=new stdClass();
+			$conf->$module->enabled=false;
+			if ($module == 'fournisseur')		// Special case
+			{
+				$conf->supplier_order->enabled=0;
+				$conf->supplier_invoice->enabled=0;
+			}
+		}
+	}
 }
 
 
@@ -365,433 +365,433 @@ 
 $login='';
 if (! defined('NOLOGIN'))
 {
-    // $authmode lists the different means of identification to be tested in order of preference.
-    // Example: 'http', 'dolibarr', 'ldap', 'http,forceuser'
-
-    // Authentication mode
-    if (empty($dolibarr_main_authentication)) $dolibarr_main_authentication='http,dolibarr';
-    // Authentication mode: forceuser
-    if ($dolibarr_main_authentication == 'forceuser' && empty($dolibarr_auto_user)) $dolibarr_auto_user='auto';
-    // Set authmode
-    $authmode=explode(',',$dolibarr_main_authentication);
-
-    // No authentication mode
-    if (! count($authmode))
-    {
-        $langs->load('main');
-        dol_print_error('',$langs->trans("ErrorConfigParameterNotDefined",'dolibarr_main_authentication'));
-        exit;
-    }
-
-    // If login request was already post, we retrieve login from the session
-    // Call module if not realized that his request.
-    // At the end of this phase, the variable $login is defined.
-    $resultFetchUser='';
-    $test=true;
-    if (! isset($_SESSION["dol_login"]))
-    {
-        // It is not already authenticated and it requests the login / password
-        include_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
-
-        $dol_dst_observed=GETPOST("dst_observed",'int',3);
-        $dol_dst_first=GETPOST("dst_first",'int',3);
-        $dol_dst_second=GETPOST("dst_second",'int',3);
-        $dol_screenwidth=GETPOST("screenwidth",'int',3);
-        $dol_screenheight=GETPOST("screenheight",'int',3);
-        $dol_hide_topmenu=GETPOST('dol_hide_topmenu','int',3);
-        $dol_hide_leftmenu=GETPOST('dol_hide_leftmenu','int',3);
-        $dol_optimize_smallscreen=GETPOST('dol_optimize_smallscreen','int',3);
-        $dol_no_mouse_hover=GETPOST('dol_no_mouse_hover','int',3);
-        $dol_use_jmobile=GETPOST('dol_use_jmobile','int',3);
-        //dol_syslog("POST key=".join(array_keys($_POST),',').' value='.join($_POST,','));
-
-        // If in demo mode, we check we go to home page through the public/demo/index.php page
-        if (! empty($dolibarr_main_demo) && $_SERVER['PHP_SELF'] == DOL_URL_ROOT.'/index.php')  // We ask index page
-        {
-            if (empty($_SERVER['HTTP_REFERER']) || ! preg_match('/public/',$_SERVER['HTTP_REFERER']))
-            {
-                dol_syslog("Call index page from another url than demo page (call is done from page ".$_SERVER['HTTP_REFERER'].")");
-                $url='';
-                $url.=($url?'&':'').($dol_hide_topmenu?'dol_hide_topmenu='.$dol_hide_topmenu:'');
-                $url.=($url?'&':'').($dol_hide_leftmenu?'dol_hide_leftmenu='.$dol_hide_leftmenu:'');
-                $url.=($url?'&':'').($dol_optimize_smallscreen?'dol_optimize_smallscreen='.$dol_optimize_smallscreen:'');
-                $url.=($url?'&':'').($dol_no_mouse_hover?'dol_no_mouse_hover='.$dol_no_mouse_hover:'');
-                $url.=($url?'&':'').($dol_use_jmobile?'dol_use_jmobile='.$dol_use_jmobile:'');
-                $url=DOL_URL_ROOT.'/public/demo/index.php'.($url?'?'.$url:'');
-                header("Location: ".$url);
-                exit;
-            }
-        }
-
-        // Verification security graphic code
-        if (GETPOST("username","alpha",2) && ! empty($conf->global->MAIN_SECURITY_ENABLECAPTCHA))
-        {
-            $sessionkey = 'dol_antispam_value';
-            $ok=(array_key_exists($sessionkey, $_SESSION) === TRUE && (strtolower($_SESSION[$sessionkey]) == strtolower($_POST['code'])));
-
-            // Check code
-            if (! $ok)
-            {
-                dol_syslog('Bad value for code, connexion refused');
-                $langs->load('main');
-                $langs->load('errors');
-
-                $_SESSION["dol_loginmesg"]=$langs->trans("ErrorBadValueForCode");
-                $test=false;
-
-                // TODO @deprecated Remove this. Hook must be used, not this trigger.
-                $user->trigger_mesg='ErrorBadValueForCode - login='.GETPOST("username","alpha",2);
-                // Call of triggers
-                include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-                $interface=new Interfaces($db);
-                $result=$interface->run_triggers('USER_LOGIN_FAILED',$user,$user,$langs,$conf);
-                if ($result < 0) {
-                    $error++;
-                }
-                // End Call of triggers
-
-                // Hooks on failed login
-		        $action='';
-		        $hookmanager->initHooks(array('login'));
-		        $parameters=array('dol_authmode'=>$dol_authmode, 'dol_loginmesg'=>$_SESSION["dol_loginmesg"]);
-		        $reshook=$hookmanager->executeHooks('afterLoginFailed',$parameters,$user,$action);    // Note that $action and $object may have been modified by some hooks
-		        if ($reshook < 0) $error++;
-
-		        // Note: exit is done later
-            }
-        }
-
-        $usertotest		= (! empty($_COOKIE['login_dolibarr']) ? $_COOKIE['login_dolibarr'] : GETPOST("username","alpha",2));
-        $passwordtotest	= GETPOST('password','none',2);
-        $entitytotest	= (GETPOST('entity','int') ? GETPOST('entity','int') : (!empty($conf->entity) ? $conf->entity : 1));
-
-        // Define if we received data to test the login.
-        $goontestloop=false;
-        if (isset($_SERVER["REMOTE_USER"]) && in_array('http',$authmode)) $goontestloop=true;
-        if ($dolibarr_main_authentication == 'forceuser' && ! empty($dolibarr_auto_user)) $goontestloop=true;
-        if (GETPOST("username","alpha",2) || ! empty($_COOKIE['login_dolibarr']) || GETPOST('openid_mode','alpha',1)) $goontestloop=true;
-
-        if (! is_object($langs)) // This can occurs when calling page with NOREQUIRETRAN defined, however we need langs for error messages.
-        {
-            include_once DOL_DOCUMENT_ROOT.'/core/class/translate.class.php';
-            $langs=new Translate("",$conf);
-    		$langcode=(GETPOST('lang','aZ09',1)?GETPOST('lang','aZ09',1):(empty($conf->global->MAIN_LANG_DEFAULT)?'auto':$conf->global->MAIN_LANG_DEFAULT));
-        	$langs->setDefaultLang($langcode);
-        }
-
-        // Validation of login/pass/entity
-        // If ok, the variable login will be returned
-        // If error, we will put error message in session under the name dol_loginmesg
-        if ($test && $goontestloop)
-        {
-        	$login = checkLoginPassEntity($usertotest,$passwordtotest,$entitytotest,$authmode);
-        	if ($login)
-            {
-                $dol_authmode=$conf->authmode;	// This properties is defined only when logged, to say what mode was successfully used
-                $dol_tz=$_POST["tz"];
-                $dol_tz_string=$_POST["tz_string"];
-                $dol_tz_string=preg_replace('/\s*\(.+\)$/','',$dol_tz_string);
-                $dol_tz_string=preg_replace('/,/','/',$dol_tz_string);
-                $dol_tz_string=preg_replace('/\s/','_',$dol_tz_string);
-                $dol_dst=0;
-                if (isset($_POST["dst_first"]) && isset($_POST["dst_second"]))
-                {
-                    include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-                    $datenow=dol_now();
-                    $datefirst=dol_stringtotime($_POST["dst_first"]);
-                    $datesecond=dol_stringtotime($_POST["dst_second"]);
-                    if ($datenow >= $datefirst && $datenow < $datesecond) $dol_dst=1;
-                }
-                //print $datefirst.'-'.$datesecond.'-'.$datenow.'-'.$dol_tz.'-'.$dol_tzstring.'-'.$dol_dst; exit;
-            }
-
-            if (! $login)
-            {
-                dol_syslog('Bad password, connexion refused',LOG_DEBUG);
-                $langs->load('main');
-                $langs->load('errors');
-
-                // Bad password. No authmode has found a good password.
-                // We set a generic message if not defined inside function checkLoginPassEntity or subfunctions
-                if (empty($_SESSION["dol_loginmesg"])) $_SESSION["dol_loginmesg"]=$langs->trans("ErrorBadLoginPassword");
-
-                // TODO @deprecated Remove this. Hook must be used, not this trigger.
-                $user->trigger_mesg=$langs->trans("ErrorBadLoginPassword").' - login='.GETPOST("username","alpha",2);
-                // Call of triggers
-                include_once DOL_DOCUMENT_ROOT.'/core/class/interfaces.class.php';
-                $interface=new Interfaces($db);
-                $result=$interface->run_triggers('USER_LOGIN_FAILED',$user,$user,$langs,$conf,GETPOST("username","alpha",2));
-                if ($result < 0) {
-                    $error++;
-                }
-                // End Call of triggers
-
-                // Hooks on failed login
-		        $action='';
-		        $hookmanager->initHooks(array('login'));
-		        $parameters=array('dol_authmode'=>$dol_authmode, 'dol_loginmesg'=>$_SESSION["dol_loginmesg"]);
-		        $reshook=$hookmanager->executeHooks('afterLoginFailed',$parameters,$user,$action);    // Note that $action and $object may have been modified by some hooks
-		        if ($reshook < 0) $error++;
-
-		        // Note: exit is done in next chapter
-            }
-        }
-
-        // End test login / passwords
-        if (! $login || (in_array('ldap',$authmode) && empty($passwordtotest)))	// With LDAP we refused empty password because some LDAP are "opened" for anonymous access so connexion is a success.
-        {
-            // No data to test login, so we show the login page
+	// $authmode lists the different means of identification to be tested in order of preference.
+	// Example: 'http', 'dolibarr', 'ldap', 'http,forceuser'
+
+	// Authentication mode
+	if (empty($dolibarr_main_authentication)) $dolibarr_main_authentication='http,dolibarr';
+	// Authentication mode: forceuser
+	if ($dolibarr_main_authentication == 'forceuser' && empty($dolibarr_auto_user)) $dolibarr_auto_user='auto';
+	// Set authmode
+	$authmode=explode(',',$dolibarr_main_authentication);
+
+	// No authentication mode
+	if (! count($authmode))
+	{
+		$langs->load('main');
+		dol_print_error('',$langs->trans("ErrorConfigParameterNotDefined",'dolibarr_main_authentication'));
+		exit;
+	}
+
+	// If login request was already post, we retrieve login from the session
+	// Call module if not realized that his request.
+	// At the end of this phase, the variable $login is defined.
+	$resultFetchUser='';
+	$test=true;
+	if (! isset($_SESSION["dol_login"]))
+	{
+		// It is not already authenticated and it requests the login / password
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
+
+		$dol_dst_observed=GETPOST("dst_observed",'int',3);
+		$dol_dst_first=GETPOST("dst_first",'int',3);
+		$dol_dst_second=GETPOST("dst_second",'int',3);
+		$dol_screenwidth=GETPOST("screenwidth",'int',3);
+		$dol_screenheight=GETPOST("screenheight",'int',3);
+		$dol_hide_topmenu=GETPOST('dol_hide_topmenu','int',3);
+		$dol_hide_leftmenu=GETPOST('dol_hide_leftmenu','int',3);
+		$dol_optimize_smallscreen=GETPOST('dol_optimize_smallscreen','int',3);
+		$dol_no_mouse_hover=GETPOST('dol_no_mouse_hover','int',3);
+		$dol_use_jmobile=GETPOST('dol_use_jmobile','int',3);
+		//dol_syslog("POST key=".join(array_keys($_POST),',').' value='.join($_POST,','));
+
+		// If in demo mode, we check we go to home page through the public/demo/index.php page
+		if (! empty($dolibarr_main_demo) && $_SERVER['PHP_SELF'] == DOL_URL_ROOT.'/index.php')  // We ask index page
+		{
+			if (empty($_SERVER['HTTP_REFERER']) || ! preg_match('/public/',$_SERVER['HTTP_REFERER']))
+			{
+				dol_syslog("Call index page from another url than demo page (call is done from page ".$_SERVER['HTTP_REFERER'].")");
+				$url='';
+				$url.=($url?'&':'').($dol_hide_topmenu?'dol_hide_topmenu='.$dol_hide_topmenu:'');
+				$url.=($url?'&':'').($dol_hide_leftmenu?'dol_hide_leftmenu='.$dol_hide_leftmenu:'');
+				$url.=($url?'&':'').($dol_optimize_smallscreen?'dol_optimize_smallscreen='.$dol_optimize_smallscreen:'');
+				$url.=($url?'&':'').($dol_no_mouse_hover?'dol_no_mouse_hover='.$dol_no_mouse_hover:'');
+				$url.=($url?'&':'').($dol_use_jmobile?'dol_use_jmobile='.$dol_use_jmobile:'');
+				$url=DOL_URL_ROOT.'/public/demo/index.php'.($url?'?'.$url:'');
+				header("Location: ".$url);
+				exit;
+			}
+		}
+
+		// Verification security graphic code
+		if (GETPOST("username","alpha",2) && ! empty($conf->global->MAIN_SECURITY_ENABLECAPTCHA))
+		{
+			$sessionkey = 'dol_antispam_value';
+			$ok=(array_key_exists($sessionkey, $_SESSION) === TRUE && (strtolower($_SESSION[$sessionkey]) == strtolower($_POST['code'])));
+
+			// Check code
+			if (! $ok)
+			{
+				dol_syslog('Bad value for code, connexion refused');
+				$langs->load('main');
+				$langs->load('errors');
+
+				$_SESSION["dol_loginmesg"]=$langs->trans("ErrorBadValueForCode");
+				$test=false;
+
+				// TODO @deprecated Remove this. Hook must be used, not this trigger.
+				$user->trigger_mesg='ErrorBadValueForCode - login='.GETPOST("username","alpha",2);
+				// Call of triggers
+				include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+				$interface=new Interfaces($db);
+				$result=$interface->run_triggers('USER_LOGIN_FAILED',$user,$user,$langs,$conf);
+				if ($result < 0) {
+					$error++;
+				}
+				// End Call of triggers
+
+				// Hooks on failed login
+				$action='';
+				$hookmanager->initHooks(array('login'));
+				$parameters=array('dol_authmode'=>$dol_authmode, 'dol_loginmesg'=>$_SESSION["dol_loginmesg"]);
+				$reshook=$hookmanager->executeHooks('afterLoginFailed',$parameters,$user,$action);    // Note that $action and $object may have been modified by some hooks
+				if ($reshook < 0) $error++;
+
+				// Note: exit is done later
+			}
+		}
+
+		$usertotest		= (! empty($_COOKIE['login_dolibarr']) ? $_COOKIE['login_dolibarr'] : GETPOST("username","alpha",2));
+		$passwordtotest	= GETPOST('password','none',2);
+		$entitytotest	= (GETPOST('entity','int') ? GETPOST('entity','int') : (!empty($conf->entity) ? $conf->entity : 1));
+
+		// Define if we received data to test the login.
+		$goontestloop=false;
+		if (isset($_SERVER["REMOTE_USER"]) && in_array('http',$authmode)) $goontestloop=true;
+		if ($dolibarr_main_authentication == 'forceuser' && ! empty($dolibarr_auto_user)) $goontestloop=true;
+		if (GETPOST("username","alpha",2) || ! empty($_COOKIE['login_dolibarr']) || GETPOST('openid_mode','alpha',1)) $goontestloop=true;
+
+		if (! is_object($langs)) // This can occurs when calling page with NOREQUIRETRAN defined, however we need langs for error messages.
+		{
+			include_once DOL_DOCUMENT_ROOT.'/core/class/translate.class.php';
+			$langs=new Translate("",$conf);
+			$langcode=(GETPOST('lang','aZ09',1)?GETPOST('lang','aZ09',1):(empty($conf->global->MAIN_LANG_DEFAULT)?'auto':$conf->global->MAIN_LANG_DEFAULT));
+			$langs->setDefaultLang($langcode);
+		}
+
+		// Validation of login/pass/entity
+		// If ok, the variable login will be returned
+		// If error, we will put error message in session under the name dol_loginmesg
+		if ($test && $goontestloop)
+		{
+			$login = checkLoginPassEntity($usertotest,$passwordtotest,$entitytotest,$authmode);
+			if ($login)
+			{
+				$dol_authmode=$conf->authmode;	// This properties is defined only when logged, to say what mode was successfully used
+				$dol_tz=$_POST["tz"];
+				$dol_tz_string=$_POST["tz_string"];
+				$dol_tz_string=preg_replace('/\s*\(.+\)$/','',$dol_tz_string);
+				$dol_tz_string=preg_replace('/,/','/',$dol_tz_string);
+				$dol_tz_string=preg_replace('/\s/','_',$dol_tz_string);
+				$dol_dst=0;
+				if (isset($_POST["dst_first"]) && isset($_POST["dst_second"]))
+				{
+					include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+					$datenow=dol_now();
+					$datefirst=dol_stringtotime($_POST["dst_first"]);
+					$datesecond=dol_stringtotime($_POST["dst_second"]);
+					if ($datenow >= $datefirst && $datenow < $datesecond) $dol_dst=1;
+				}
+				//print $datefirst.'-'.$datesecond.'-'.$datenow.'-'.$dol_tz.'-'.$dol_tzstring.'-'.$dol_dst; exit;
+			}
+
+			if (! $login)
+			{
+				dol_syslog('Bad password, connexion refused',LOG_DEBUG);
+				$langs->load('main');
+				$langs->load('errors');
+
+				// Bad password. No authmode has found a good password.
+				// We set a generic message if not defined inside function checkLoginPassEntity or subfunctions
+				if (empty($_SESSION["dol_loginmesg"])) $_SESSION["dol_loginmesg"]=$langs->trans("ErrorBadLoginPassword");
+
+				// TODO @deprecated Remove this. Hook must be used, not this trigger.
+				$user->trigger_mesg=$langs->trans("ErrorBadLoginPassword").' - login='.GETPOST("username","alpha",2);
+				// Call of triggers
+				include_once DOL_DOCUMENT_ROOT.'/core/class/interfaces.class.php';
+				$interface=new Interfaces($db);
+				$result=$interface->run_triggers('USER_LOGIN_FAILED',$user,$user,$langs,$conf,GETPOST("username","alpha",2));
+				if ($result < 0) {
+					$error++;
+				}
+				// End Call of triggers
+
+				// Hooks on failed login
+				$action='';
+				$hookmanager->initHooks(array('login'));
+				$parameters=array('dol_authmode'=>$dol_authmode, 'dol_loginmesg'=>$_SESSION["dol_loginmesg"]);
+				$reshook=$hookmanager->executeHooks('afterLoginFailed',$parameters,$user,$action);    // Note that $action and $object may have been modified by some hooks
+				if ($reshook < 0) $error++;
+
+				// Note: exit is done in next chapter
+			}
+		}
+
+		// End test login / passwords
+		if (! $login || (in_array('ldap',$authmode) && empty($passwordtotest)))	// With LDAP we refused empty password because some LDAP are "opened" for anonymous access so connexion is a success.
+		{
+			// No data to test login, so we show the login page
 			dol_syslog("--- Access to ".$_SERVER["PHP_SELF"]." showing the login form and exit");
 			if (defined('NOREDIRECTBYMAINTOLOGIN')) return 'ERROR_NOT_LOGGED';
-        	else dol_loginfunction($langs,$conf,(! empty($mysoc)?$mysoc:''));
-            exit;
-        }
-
-        $resultFetchUser=$user->fetch('', $login, '', 1, ($entitytotest > 0 ? $entitytotest : -1));
-        if ($resultFetchUser <= 0)
-        {
-            dol_syslog('User not found, connexion refused');
-            session_destroy();
-            session_name($sessionname);
-            session_set_cookie_params(0, '/', null, false, true);   // Add tag httponly on session cookie
-            session_start();    // Fixing the bug of register_globals here is useless since session is empty
-
-            if ($resultFetchUser == 0)
-            {
-                $langs->load('main');
-                $langs->load('errors');
+			else dol_loginfunction($langs,$conf,(! empty($mysoc)?$mysoc:''));
+			exit;
+		}
 
-                $_SESSION["dol_loginmesg"]=$langs->trans("ErrorCantLoadUserFromDolibarrDatabase",$login);
+		$resultFetchUser=$user->fetch('', $login, '', 1, ($entitytotest > 0 ? $entitytotest : -1));
+		if ($resultFetchUser <= 0)
+		{
+			dol_syslog('User not found, connexion refused');
+			session_destroy();
+			session_name($sessionname);
+			session_set_cookie_params(0, '/', null, false, true);   // Add tag httponly on session cookie
+			session_start();    // Fixing the bug of register_globals here is useless since session is empty
 
-                // TODO @deprecated Remove this. Hook must be used, not this trigger.
-                $user->trigger_mesg='ErrorCantLoadUserFromDolibarrDatabase - login='.$login;
-            }
-            if ($resultFetchUser < 0)
-            {
-                $_SESSION["dol_loginmesg"]=$user->error;
-
-                // TODO @deprecated Remove this. Hook must be used, not this trigger.
-                $user->trigger_mesg=$user->error;
-            }
-
-            // Call triggers
-            include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-            $interface=new Interfaces($db);
-            $result=$interface->run_triggers('USER_LOGIN_FAILED',$user,$user,$langs,$conf);
-            if ($result < 0) {
-                $error++;
-            }
-            // End call triggers
-
-	        // Hooks on failed login
-	        $action='';
-	        $hookmanager->initHooks(array('login'));
-	        $parameters=array('dol_authmode'=>$dol_authmode, 'dol_loginmesg'=>$_SESSION["dol_loginmesg"]);
-	        $reshook=$hookmanager->executeHooks('afterLoginFailed',$parameters,$user,$action);    // Note that $action and $object may have been modified by some hooks
-	        if ($reshook < 0) $error++;
-
-	        $paramsurl=array();
-	        if (GETPOST('textbrowser','int')) $paramsurl[]='textbrowser='.GETPOST('textbrowser','int');
-	        if (GETPOST('nojs','int'))        $paramsurl[]='nojs='.GETPOST('nojs','int');
-	        if (GETPOST('lang','aZ09'))       $paramsurl[]='lang='.GETPOST('lang','aZ09');
-            header('Location: '.DOL_URL_ROOT.'/index.php'.(count($paramsurl)?'?'.implode('&',$paramsurl):''));
-            exit;
-        }
-    }
-    else
-    {
-        // We are already into an authenticated session
-        $login=$_SESSION["dol_login"];
-        $entity=$_SESSION["dol_entity"];
-        dol_syslog("- This is an already logged session. _SESSION['dol_login']=".$login." _SESSION['dol_entity']=".$entity, LOG_DEBUG);
-
-        $resultFetchUser=$user->fetch('', $login, '', 1, ($entity > 0 ? $entity : -1));
-        if ($resultFetchUser <= 0)
-        {
-            // Account has been removed after login
-            dol_syslog("Can't load user even if session logged. _SESSION['dol_login']=".$login, LOG_WARNING);
-            session_destroy();
-            session_name($sessionname);
-            session_set_cookie_params(0, '/', null, false, true);   // Add tag httponly on session cookie
-            session_start();    // Fixing the bug of register_globals here is useless since session is empty
-
-            if ($resultFetchUser == 0)
-            {
-                $langs->load('main');
-                $langs->load('errors');
+			if ($resultFetchUser == 0)
+			{
+				$langs->load('main');
+				$langs->load('errors');
 
-                $_SESSION["dol_loginmesg"]=$langs->trans("ErrorCantLoadUserFromDolibarrDatabase",$login);
+				$_SESSION["dol_loginmesg"]=$langs->trans("ErrorCantLoadUserFromDolibarrDatabase",$login);
 
-                // TODO @deprecated Remove this. Hook must be used, not this trigger.
-                $user->trigger_mesg='ErrorCantLoadUserFromDolibarrDatabase - login='.$login;
-            }
-            if ($resultFetchUser < 0)
-            {
-                $_SESSION["dol_loginmesg"]=$user->error;
-
-                // TODO @deprecated Remove this. Hook must be used, not this trigger.
-                $user->trigger_mesg=$user->error;
-            }
-
-            // TODO @deprecated Remove this. Hook must be used, not this trigger.
-            // Call triggers
-            include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-            $interface=new Interfaces($db);
-            $result=$interface->run_triggers('USER_LOGIN_FAILED',$user,$user,$langs,$conf);
-            if ($result < 0) {
-                $error++;
-            }
-            // End call triggers
-
-	        // Hooks on failed login
-	        $action='';
-	        $hookmanager->initHooks(array('login'));
-	        $parameters=array('dol_authmode'=>$dol_authmode, 'dol_loginmesg'=>$_SESSION["dol_loginmesg"]);
-	        $reshook=$hookmanager->executeHooks('afterLoginFailed',$parameters,$user,$action);    // Note that $action and $object may have been modified by some hooks
-	        if ($reshook < 0) $error++;
-
-	        $paramsurl=array();
-	        if (GETPOST('textbrowser','int')) $paramsurl[]='textbrowser='.GETPOST('textbrowser','int');
-	        if (GETPOST('nojs','int'))        $paramsurl[]='nojs='.GETPOST('nojs','int');
-	        if (GETPOST('lang','aZ09'))       $paramsurl[]='lang='.GETPOST('lang','aZ09');
-            header('Location: '.DOL_URL_ROOT.'/index.php'.(count($paramsurl)?'?'.implode('&',$paramsurl):''));
-            exit;
-        }
-        else
+				// TODO @deprecated Remove this. Hook must be used, not this trigger.
+				$user->trigger_mesg='ErrorCantLoadUserFromDolibarrDatabase - login='.$login;
+			}
+			if ($resultFetchUser < 0)
+			{
+				$_SESSION["dol_loginmesg"]=$user->error;
+
+				// TODO @deprecated Remove this. Hook must be used, not this trigger.
+				$user->trigger_mesg=$user->error;
+			}
+
+			// Call triggers
+			include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+			$interface=new Interfaces($db);
+			$result=$interface->run_triggers('USER_LOGIN_FAILED',$user,$user,$langs,$conf);
+			if ($result < 0) {
+				$error++;
+			}
+			// End call triggers
+
+			// Hooks on failed login
+			$action='';
+			$hookmanager->initHooks(array('login'));
+			$parameters=array('dol_authmode'=>$dol_authmode, 'dol_loginmesg'=>$_SESSION["dol_loginmesg"]);
+			$reshook=$hookmanager->executeHooks('afterLoginFailed',$parameters,$user,$action);    // Note that $action and $object may have been modified by some hooks
+			if ($reshook < 0) $error++;
+
+			$paramsurl=array();
+			if (GETPOST('textbrowser','int')) $paramsurl[]='textbrowser='.GETPOST('textbrowser','int');
+			if (GETPOST('nojs','int'))        $paramsurl[]='nojs='.GETPOST('nojs','int');
+			if (GETPOST('lang','aZ09'))       $paramsurl[]='lang='.GETPOST('lang','aZ09');
+			header('Location: '.DOL_URL_ROOT.'/index.php'.(count($paramsurl)?'?'.implode('&',$paramsurl):''));
+			exit;
+		}
+	}
+	else
+	{
+		// We are already into an authenticated session
+		$login=$_SESSION["dol_login"];
+		$entity=$_SESSION["dol_entity"];
+		dol_syslog("- This is an already logged session. _SESSION['dol_login']=".$login." _SESSION['dol_entity']=".$entity, LOG_DEBUG);
+
+		$resultFetchUser=$user->fetch('', $login, '', 1, ($entity > 0 ? $entity : -1));
+		if ($resultFetchUser <= 0)
 		{
-	       // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
-	       $hookmanager->initHooks(array('main'));
-
-	       // Code for search criteria persistence.
-	       if (! empty($_GET['save_lastsearch_values']))    // Keep $_GET here
-	       {
-               $relativepathstring = preg_replace('/\?.*$/','',$_SERVER["HTTP_REFERER"]);
-               $relativepathstring = preg_replace('/^https?:\/\/[^\/]*/','',$relativepathstring);     // Get full path except host server
-               // Clean $relativepathstring
-   	           if (constant('DOL_URL_ROOT')) $relativepathstring = preg_replace('/^'.preg_quote(constant('DOL_URL_ROOT'),'/').'/', '', $relativepathstring);
-               $relativepathstring = preg_replace('/^\//', '', $relativepathstring);
-               $relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);
-               //var_dump($relativepathstring);
-
-               if (! empty($_SESSION['lastsearch_values_tmp_'.$relativepathstring]))
-               {
-                   $_SESSION['lastsearch_values_'.$relativepathstring]=$_SESSION['lastsearch_values_tmp_'.$relativepathstring];
-                   unset($_SESSION['lastsearch_values_tmp_'.$relativepathstring]);
-               }
-	       }
-
-	       $action = '';
-	       $reshook = $hookmanager->executeHooks('updateSession', array(), $user, $action);
-	       if ($reshook < 0) {
-		       setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-	       }
-        }
-    }
-
-    // Is it a new session that has started ?
-    // If we are here, this means authentication was successfull.
-    if (! isset($_SESSION["dol_login"]))
-    {
-        // New session for this login has started.
-    	$error=0;
-
-    	// Store value into session (values always stored)
-        $_SESSION["dol_login"]=$user->login;
-        $_SESSION["dol_authmode"]=isset($dol_authmode)?$dol_authmode:'';
-        $_SESSION["dol_tz"]=isset($dol_tz)?$dol_tz:'';
-        $_SESSION["dol_tz_string"]=isset($dol_tz_string)?$dol_tz_string:'';
-        $_SESSION["dol_dst"]=isset($dol_dst)?$dol_dst:'';
-        $_SESSION["dol_dst_observed"]=isset($dol_dst_observed)?$dol_dst_observed:'';
-        $_SESSION["dol_dst_first"]=isset($dol_dst_first)?$dol_dst_first:'';
-        $_SESSION["dol_dst_second"]=isset($dol_dst_second)?$dol_dst_second:'';
-        $_SESSION["dol_screenwidth"]=isset($dol_screenwidth)?$dol_screenwidth:'';
-        $_SESSION["dol_screenheight"]=isset($dol_screenheight)?$dol_screenheight:'';
-        $_SESSION["dol_company"]=$conf->global->MAIN_INFO_SOCIETE_NOM;
-        $_SESSION["dol_entity"]=$conf->entity;
-    	// Store value into session (values stored only if defined)
-        if (! empty($dol_hide_topmenu))         $_SESSION['dol_hide_topmenu']=$dol_hide_topmenu;
-        if (! empty($dol_hide_leftmenu))        $_SESSION['dol_hide_leftmenu']=$dol_hide_leftmenu;
-        if (! empty($dol_optimize_smallscreen)) $_SESSION['dol_optimize_smallscreen']=$dol_optimize_smallscreen;
-        if (! empty($dol_no_mouse_hover))       $_SESSION['dol_no_mouse_hover']=$dol_no_mouse_hover;
-        if (! empty($dol_use_jmobile))          $_SESSION['dol_use_jmobile']=$dol_use_jmobile;
-
-        dol_syslog("This is a new started user session. _SESSION['dol_login']=".$_SESSION["dol_login"]." Session id=".session_id());
-
-        $db->begin();
-
-        $user->update_last_login_date();
-
-        $loginfo = 'TZ='.$_SESSION["dol_tz"].';TZString='.$_SESSION["dol_tz_string"].';Screen='.$_SESSION["dol_screenwidth"].'x'.$_SESSION["dol_screenheight"];
-
-        // TODO @deprecated Remove this. Hook must be used, not this trigger.
-        $user->trigger_mesg = $loginfo;
-        // Call triggers
-        include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-        $interface=new Interfaces($db);
-        $result=$interface->run_triggers('USER_LOGIN',$user,$user,$langs,$conf);
-        if ($result < 0) {
-            $error++;
-        }
-        // End call triggers
-
-        // Hooks on successfull login
-        $action='';
-        $hookmanager->initHooks(array('login'));
-        $parameters=array('dol_authmode'=>$dol_authmode, 'dol_loginfo'=>$loginfo);
-        $reshook=$hookmanager->executeHooks('afterLogin',$parameters,$user,$action);    // Note that $action and $object may have been modified by some hooks
-        if ($reshook < 0) $error++;
-
-        if ($error)
-        {
-            $db->rollback();
-            session_destroy();
-            dol_print_error($db,'Error in some hooks afterLogin (or old trigger USER_LOGIN)');
-            exit;
-        }
-        else
+			// Account has been removed after login
+			dol_syslog("Can't load user even if session logged. _SESSION['dol_login']=".$login, LOG_WARNING);
+			session_destroy();
+			session_name($sessionname);
+			session_set_cookie_params(0, '/', null, false, true);   // Add tag httponly on session cookie
+			session_start();    // Fixing the bug of register_globals here is useless since session is empty
+
+			if ($resultFetchUser == 0)
+			{
+				$langs->load('main');
+				$langs->load('errors');
+
+				$_SESSION["dol_loginmesg"]=$langs->trans("ErrorCantLoadUserFromDolibarrDatabase",$login);
+
+				// TODO @deprecated Remove this. Hook must be used, not this trigger.
+				$user->trigger_mesg='ErrorCantLoadUserFromDolibarrDatabase - login='.$login;
+			}
+			if ($resultFetchUser < 0)
+			{
+				$_SESSION["dol_loginmesg"]=$user->error;
+
+				// TODO @deprecated Remove this. Hook must be used, not this trigger.
+				$user->trigger_mesg=$user->error;
+			}
+
+			// TODO @deprecated Remove this. Hook must be used, not this trigger.
+			// Call triggers
+			include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+			$interface=new Interfaces($db);
+			$result=$interface->run_triggers('USER_LOGIN_FAILED',$user,$user,$langs,$conf);
+			if ($result < 0) {
+				$error++;
+			}
+			// End call triggers
+
+			// Hooks on failed login
+			$action='';
+			$hookmanager->initHooks(array('login'));
+			$parameters=array('dol_authmode'=>$dol_authmode, 'dol_loginmesg'=>$_SESSION["dol_loginmesg"]);
+			$reshook=$hookmanager->executeHooks('afterLoginFailed',$parameters,$user,$action);    // Note that $action and $object may have been modified by some hooks
+			if ($reshook < 0) $error++;
+
+			$paramsurl=array();
+			if (GETPOST('textbrowser','int')) $paramsurl[]='textbrowser='.GETPOST('textbrowser','int');
+			if (GETPOST('nojs','int'))        $paramsurl[]='nojs='.GETPOST('nojs','int');
+			if (GETPOST('lang','aZ09'))       $paramsurl[]='lang='.GETPOST('lang','aZ09');
+			header('Location: '.DOL_URL_ROOT.'/index.php'.(count($paramsurl)?'?'.implode('&',$paramsurl):''));
+			exit;
+		}
+		else
 		{
-            $db->commit();
-        }
-
-        // Change landing page if defined.
-        $landingpage=(empty($user->conf->MAIN_LANDING_PAGE)?(empty($conf->global->MAIN_LANDING_PAGE)?'':$conf->global->MAIN_LANDING_PAGE):$user->conf->MAIN_LANDING_PAGE);
-        if (! empty($landingpage))    // Example: /index.php
-        {
-            $newpath=dol_buildpath($landingpage, 1);
-            if ($_SERVER["PHP_SELF"] != $newpath)   // not already on landing page (avoid infinite loop)
-            {
-                header('Location: '.$newpath);
-                exit;
-            }
-        }
-    }
-
-
-    // If user admin, we force the rights-based modules
-    if ($user->admin)
-    {
-        $user->rights->user->user->lire=1;
-        $user->rights->user->user->creer=1;
-        $user->rights->user->user->password=1;
-        $user->rights->user->user->supprimer=1;
-        $user->rights->user->self->creer=1;
-        $user->rights->user->self->password=1;
-    }
-
-    /*
+		   // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+		   $hookmanager->initHooks(array('main'));
+
+		   // Code for search criteria persistence.
+		   if (! empty($_GET['save_lastsearch_values']))    // Keep $_GET here
+		   {
+			   $relativepathstring = preg_replace('/\?.*$/','',$_SERVER["HTTP_REFERER"]);
+			   $relativepathstring = preg_replace('/^https?:\/\/[^\/]*/','',$relativepathstring);     // Get full path except host server
+			   // Clean $relativepathstring
+   			   if (constant('DOL_URL_ROOT')) $relativepathstring = preg_replace('/^'.preg_quote(constant('DOL_URL_ROOT'),'/').'/', '', $relativepathstring);
+			   $relativepathstring = preg_replace('/^\//', '', $relativepathstring);
+			   $relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);
+			   //var_dump($relativepathstring);
+
+			   if (! empty($_SESSION['lastsearch_values_tmp_'.$relativepathstring]))
+			   {
+				   $_SESSION['lastsearch_values_'.$relativepathstring]=$_SESSION['lastsearch_values_tmp_'.$relativepathstring];
+				   unset($_SESSION['lastsearch_values_tmp_'.$relativepathstring]);
+			   }
+		   }
+
+		   $action = '';
+		   $reshook = $hookmanager->executeHooks('updateSession', array(), $user, $action);
+		   if ($reshook < 0) {
+			   setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+		   }
+		}
+	}
+
+	// Is it a new session that has started ?
+	// If we are here, this means authentication was successfull.
+	if (! isset($_SESSION["dol_login"]))
+	{
+		// New session for this login has started.
+		$error=0;
+
+		// Store value into session (values always stored)
+		$_SESSION["dol_login"]=$user->login;
+		$_SESSION["dol_authmode"]=isset($dol_authmode)?$dol_authmode:'';
+		$_SESSION["dol_tz"]=isset($dol_tz)?$dol_tz:'';
+		$_SESSION["dol_tz_string"]=isset($dol_tz_string)?$dol_tz_string:'';
+		$_SESSION["dol_dst"]=isset($dol_dst)?$dol_dst:'';
+		$_SESSION["dol_dst_observed"]=isset($dol_dst_observed)?$dol_dst_observed:'';
+		$_SESSION["dol_dst_first"]=isset($dol_dst_first)?$dol_dst_first:'';
+		$_SESSION["dol_dst_second"]=isset($dol_dst_second)?$dol_dst_second:'';
+		$_SESSION["dol_screenwidth"]=isset($dol_screenwidth)?$dol_screenwidth:'';
+		$_SESSION["dol_screenheight"]=isset($dol_screenheight)?$dol_screenheight:'';
+		$_SESSION["dol_company"]=$conf->global->MAIN_INFO_SOCIETE_NOM;
+		$_SESSION["dol_entity"]=$conf->entity;
+		// Store value into session (values stored only if defined)
+		if (! empty($dol_hide_topmenu))         $_SESSION['dol_hide_topmenu']=$dol_hide_topmenu;
+		if (! empty($dol_hide_leftmenu))        $_SESSION['dol_hide_leftmenu']=$dol_hide_leftmenu;
+		if (! empty($dol_optimize_smallscreen)) $_SESSION['dol_optimize_smallscreen']=$dol_optimize_smallscreen;
+		if (! empty($dol_no_mouse_hover))       $_SESSION['dol_no_mouse_hover']=$dol_no_mouse_hover;
+		if (! empty($dol_use_jmobile))          $_SESSION['dol_use_jmobile']=$dol_use_jmobile;
+
+		dol_syslog("This is a new started user session. _SESSION['dol_login']=".$_SESSION["dol_login"]." Session id=".session_id());
+
+		$db->begin();
+
+		$user->update_last_login_date();
+
+		$loginfo = 'TZ='.$_SESSION["dol_tz"].';TZString='.$_SESSION["dol_tz_string"].';Screen='.$_SESSION["dol_screenwidth"].'x'.$_SESSION["dol_screenheight"];
+
+		// TODO @deprecated Remove this. Hook must be used, not this trigger.
+		$user->trigger_mesg = $loginfo;
+		// Call triggers
+		include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+		$interface=new Interfaces($db);
+		$result=$interface->run_triggers('USER_LOGIN',$user,$user,$langs,$conf);
+		if ($result < 0) {
+			$error++;
+		}
+		// End call triggers
+
+		// Hooks on successfull login
+		$action='';
+		$hookmanager->initHooks(array('login'));
+		$parameters=array('dol_authmode'=>$dol_authmode, 'dol_loginfo'=>$loginfo);
+		$reshook=$hookmanager->executeHooks('afterLogin',$parameters,$user,$action);    // Note that $action and $object may have been modified by some hooks
+		if ($reshook < 0) $error++;
+
+		if ($error)
+		{
+			$db->rollback();
+			session_destroy();
+			dol_print_error($db,'Error in some hooks afterLogin (or old trigger USER_LOGIN)');
+			exit;
+		}
+		else
+		{
+			$db->commit();
+		}
+
+		// Change landing page if defined.
+		$landingpage=(empty($user->conf->MAIN_LANDING_PAGE)?(empty($conf->global->MAIN_LANDING_PAGE)?'':$conf->global->MAIN_LANDING_PAGE):$user->conf->MAIN_LANDING_PAGE);
+		if (! empty($landingpage))    // Example: /index.php
+		{
+			$newpath=dol_buildpath($landingpage, 1);
+			if ($_SERVER["PHP_SELF"] != $newpath)   // not already on landing page (avoid infinite loop)
+			{
+				header('Location: '.$newpath);
+				exit;
+			}
+		}
+	}
+
+
+	// If user admin, we force the rights-based modules
+	if ($user->admin)
+	{
+		$user->rights->user->user->lire=1;
+		$user->rights->user->user->creer=1;
+		$user->rights->user->user->password=1;
+		$user->rights->user->user->supprimer=1;
+		$user->rights->user->self->creer=1;
+		$user->rights->user->self->password=1;
+	}
+
+	/*
      * Overwrite some configs globals (try to avoid this and have code to use instead $user->conf->xxx)
      */
 
-    // Set liste_limit
-    if (isset($user->conf->MAIN_SIZE_LISTE_LIMIT))	$conf->liste_limit = $user->conf->MAIN_SIZE_LISTE_LIMIT;	// Can be 0
-    if (isset($user->conf->PRODUIT_LIMIT_SIZE))	$conf->product->limit_size = $user->conf->PRODUIT_LIMIT_SIZE;	// Can be 0
+	// Set liste_limit
+	if (isset($user->conf->MAIN_SIZE_LISTE_LIMIT))	$conf->liste_limit = $user->conf->MAIN_SIZE_LISTE_LIMIT;	// Can be 0
+	if (isset($user->conf->PRODUIT_LIMIT_SIZE))	$conf->product->limit_size = $user->conf->PRODUIT_LIMIT_SIZE;	// Can be 0
 
-    // Replace conf->css by personalized value if theme not forced
-    if (empty($conf->global->MAIN_FORCETHEME) && ! empty($user->conf->MAIN_THEME))
-    {
-        $conf->theme=$user->conf->MAIN_THEME;
-        $conf->css  = "/theme/".$conf->theme."/style.css.php";
-    }
+	// Replace conf->css by personalized value if theme not forced
+	if (empty($conf->global->MAIN_FORCETHEME) && ! empty($user->conf->MAIN_THEME))
+	{
+		$conf->theme=$user->conf->MAIN_THEME;
+		$conf->css  = "/theme/".$conf->theme."/style.css.php";
+	}
 }
 
 // Case forcing style from url
@@ -814,7 +814,7 @@ 
 // Set MAIN_OPTIMIZEFORTEXTBROWSER
 if (GETPOST('textbrowser','int') || (! empty($conf->browser->name) && $conf->browser->name == 'lynxlinks') || ! empty($user->conf->MAIN_OPTIMIZEFORTEXTBROWSER))   // If we must enable text browser
 {
-    $conf->global->MAIN_OPTIMIZEFORTEXTBROWSER=1;
+	$conf->global->MAIN_OPTIMIZEFORTEXTBROWSER=1;
 }
 
 // Set terminal output option according to conf->browser.
@@ -843,39 +843,39 @@ 
 
 if (! defined('NOREQUIRETRAN'))
 {
-    if (! GETPOST('lang','aZ09'))	// If language was not forced on URL
-    {
-        // If user has chosen its own language
-        if (! empty($user->conf->MAIN_LANG_DEFAULT))
-        {
-            // If different than current language
-            //print ">>>".$langs->getDefaultLang()."-".$user->conf->MAIN_LANG_DEFAULT;
-            if ($langs->getDefaultLang() != $user->conf->MAIN_LANG_DEFAULT)
-            {
-                $langs->setDefaultLang($user->conf->MAIN_LANG_DEFAULT);
-            }
-        }
-    }
+	if (! GETPOST('lang','aZ09'))	// If language was not forced on URL
+	{
+		// If user has chosen its own language
+		if (! empty($user->conf->MAIN_LANG_DEFAULT))
+		{
+			// If different than current language
+			//print ">>>".$langs->getDefaultLang()."-".$user->conf->MAIN_LANG_DEFAULT;
+			if ($langs->getDefaultLang() != $user->conf->MAIN_LANG_DEFAULT)
+			{
+				$langs->setDefaultLang($user->conf->MAIN_LANG_DEFAULT);
+			}
+		}
+	}
 }
 
 if (! defined('NOLOGIN'))
 {
-    // If the login is not recovered, it is identified with an account that does not exist.
-    // Hacking attempt?
-    if (! $user->login) accessforbidden();
-
-    // Check if user is active
-    if ($user->statut < 1)
-    {
-        // If not active, we refuse the user
-        $langs->load("other");
-        dol_syslog("Authentification ko as login is disabled");
-        accessforbidden($langs->trans("ErrorLoginDisabled"));
-        exit;
-    }
-
-    // Load permissions
-    $user->getrights();
+	// If the login is not recovered, it is identified with an account that does not exist.
+	// Hacking attempt?
+	if (! $user->login) accessforbidden();
+
+	// Check if user is active
+	if ($user->statut < 1)
+	{
+		// If not active, we refuse the user
+		$langs->load("other");
+		dol_syslog("Authentification ko as login is disabled");
+		accessforbidden($langs->trans("ErrorLoginDisabled"));
+		exit;
+	}
+
+	// Load permissions
+	$user->getrights();
 }
 
 
@@ -886,8 +886,8 @@ 
 // Load main languages files
 if (! defined('NOREQUIRETRAN'))
 {
-    $langs->load("main");
-    $langs->load("dict");
+	$langs->load("main");
+	$langs->load("dict");
 }
 
 // Define some constants used for style of arrays
@@ -904,27 +904,27 @@ 
 // Constants used to defined number of lines in textarea
 if (empty($conf->browser->firefox))
 {
-    define('ROWS_1',1);
-    define('ROWS_2',2);
-    define('ROWS_3',3);
-    define('ROWS_4',4);
-    define('ROWS_5',5);
-    define('ROWS_6',6);
-    define('ROWS_7',7);
-    define('ROWS_8',8);
-    define('ROWS_9',9);
+	define('ROWS_1',1);
+	define('ROWS_2',2);
+	define('ROWS_3',3);
+	define('ROWS_4',4);
+	define('ROWS_5',5);
+	define('ROWS_6',6);
+	define('ROWS_7',7);
+	define('ROWS_8',8);
+	define('ROWS_9',9);
 }
 else
 {
-    define('ROWS_1',0);
-    define('ROWS_2',1);
-    define('ROWS_3',2);
-    define('ROWS_4',3);
-    define('ROWS_5',4);
-    define('ROWS_6',5);
-    define('ROWS_7',6);
-    define('ROWS_8',7);
-    define('ROWS_9',8);
+	define('ROWS_1',0);
+	define('ROWS_2',1);
+	define('ROWS_3',2);
+	define('ROWS_4',3);
+	define('ROWS_5',4);
+	define('ROWS_6',5);
+	define('ROWS_7',6);
+	define('ROWS_8',7);
+	define('ROWS_9',8);
 }
 
 $heightforframes=48;
@@ -970,31 +970,31 @@ 
 
 if (! function_exists("llxHeader"))
 {
-    /**
-     *	Show HTML header HTML + BODY + Top menu + left menu + DIV
-     *
-     * @param 	string 	$head				Optionnal head lines
-     * @param 	string 	$title				HTML title
-     * @param	string	$help_url			Url links to help page
-     * 		                            	Syntax is: For a wiki page: EN:EnglishPage|FR:FrenchPage|ES:SpanishPage
-     *                                  	For other external page: http://server/url
-     * @param	string	$target				Target to use on links
-     * @param 	int    	$disablejs			More content into html header
-     * @param 	int    	$disablehead		More content into html header
-     * @param 	array  	$arrayofjs			Array of complementary js files
-     * @param 	array  	$arrayofcss			Array of complementary css files
-     * @param	string	$morequerystring	Query string to add to the link "print" to get same parameters (use only if autodetect fails)
-     * @param   string  $morecssonbody      More CSS on body tag.
-     * @return	void
-     */
+	/**
+	 *	Show HTML header HTML + BODY + Top menu + left menu + DIV
+	 *
+	 * @param 	string 	$head				Optionnal head lines
+	 * @param 	string 	$title				HTML title
+	 * @param	string	$help_url			Url links to help page
+	 * 		                            	Syntax is: For a wiki page: EN:EnglishPage|FR:FrenchPage|ES:SpanishPage
+	 *                                  	For other external page: http://server/url
+	 * @param	string	$target				Target to use on links
+	 * @param 	int    	$disablejs			More content into html header
+	 * @param 	int    	$disablehead		More content into html header
+	 * @param 	array  	$arrayofjs			Array of complementary js files
+	 * @param 	array  	$arrayofcss			Array of complementary css files
+	 * @param	string	$morequerystring	Query string to add to the link "print" to get same parameters (use only if autodetect fails)
+	 * @param   string  $morecssonbody      More CSS on body tag.
+	 * @return	void
+	 */
 	function llxHeader($head='', $title='', $help_url='', $target='', $disablejs=0, $disablehead=0, $arrayofjs='', $arrayofcss='', $morequerystring='', $morecssonbody='')
 	{
-	    global $conf;
+		global $conf;
 
-	    // html header
+		// html header
 		top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss);
 
-        print '<body id="mainbody"'.($morecssonbody?' class="'.$morecssonbody.'"':'').'>' . "\n";
+		print '<body id="mainbody"'.($morecssonbody?' class="'.$morecssonbody.'"':'').'>' . "\n";
 
 		// top menu and left menu area
 		if (empty($conf->dol_hide_topmenu))
@@ -1021,25 +1021,25 @@ 
  */
 function top_httphead($contenttype='text/html')
 {
-    global $conf;
-
-    if ($contenttype == 'text/html' ) header("Content-Type: text/html; charset=".$conf->file->character_set_client);
-    else header("Content-Type: ".$contenttype);
-    // Security options
-    header("X-Content-Type-Options: nosniff");  // With the nosniff option, if the server says the content is text/html, the browser will render it as text/html (note that most browsers now force this option to on)
-    header("X-Frame-Options: SAMEORIGIN");      // Frames allowed only if on same domain (stop some XSS attacks)
-    if (! empty($conf->global->MAIN_HTTP_CONTENT_SECURITY_POLICY))
-    {
-        // For example, to restrict script, object, frames or img to some domains
-        // script-src https://api.google.com https://anotherhost.com; object-src https://youtube.com; child-src https://youtube.com; img-src: https://static.example.com
-        // For example, to restrict everything to one domain, except object, ...
-        // default-src https://cdn.example.net; object-src 'none'
-        header("Content-Security-Policy: ".$conf->global->MAIN_HTTP_CONTENT_SECURITY_POLICY);
-    }
-
-
-    // On the fly GZIP compression for all pages (if browser support it). Must set the bit 3 of constant to 1.
-    /*if (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_SPEED & 0x04)) {
+	global $conf;
+
+	if ($contenttype == 'text/html' ) header("Content-Type: text/html; charset=".$conf->file->character_set_client);
+	else header("Content-Type: ".$contenttype);
+	// Security options
+	header("X-Content-Type-Options: nosniff");  // With the nosniff option, if the server says the content is text/html, the browser will render it as text/html (note that most browsers now force this option to on)
+	header("X-Frame-Options: SAMEORIGIN");      // Frames allowed only if on same domain (stop some XSS attacks)
+	if (! empty($conf->global->MAIN_HTTP_CONTENT_SECURITY_POLICY))
+	{
+		// For example, to restrict script, object, frames or img to some domains
+		// script-src https://api.google.com https://anotherhost.com; object-src https://youtube.com; child-src https://youtube.com; img-src: https://static.example.com
+		// For example, to restrict everything to one domain, except object, ...
+		// default-src https://cdn.example.net; object-src 'none'
+		header("Content-Security-Policy: ".$conf->global->MAIN_HTTP_CONTENT_SECURITY_POLICY);
+	}
+
+
+	// On the fly GZIP compression for all pages (if browser support it). Must set the bit 3 of constant to 1.
+	/*if (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_SPEED & 0x04)) {
         ob_start("ob_gzhandler");
     }*/
 }
@@ -1060,206 +1060,206 @@ 
  */
 function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs='', $arrayofcss='', $disablejmobile=0, $disablenofollow=0)
 {
-    global $user, $conf, $langs, $db;
-
-    top_httphead();
-
-    if (empty($conf->css)) $conf->css = '/theme/eldy/style.css.php';	// If not defined, eldy by default
-
-    if (! empty($conf->global->MAIN_ACTIVATE_HTML4)) {
-        $doctype = '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">';
-    }else {
-        $doctype = '<!doctype html>';
-    }
-    print $doctype."\n";
-    if (! empty($conf->global->MAIN_USE_CACHE_MANIFEST)) print '<html lang="'.substr($langs->defaultlang,0,2).'" manifest="'.DOL_URL_ROOT.'/cache.manifest">'."\n";
-    else print '<html lang="'.substr($langs->defaultlang,0,2).'">'."\n";
-    //print '<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr">'."\n";
-    if (empty($disablehead))
-    {
-        print "<head>\n";
+	global $user, $conf, $langs, $db;
+
+	top_httphead();
+
+	if (empty($conf->css)) $conf->css = '/theme/eldy/style.css.php';	// If not defined, eldy by default
+
+	if (! empty($conf->global->MAIN_ACTIVATE_HTML4)) {
+		$doctype = '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">';
+	}else {
+		$doctype = '<!doctype html>';
+	}
+	print $doctype."\n";
+	if (! empty($conf->global->MAIN_USE_CACHE_MANIFEST)) print '<html lang="'.substr($langs->defaultlang,0,2).'" manifest="'.DOL_URL_ROOT.'/cache.manifest">'."\n";
+	else print '<html lang="'.substr($langs->defaultlang,0,2).'">'."\n";
+	//print '<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr">'."\n";
+	if (empty($disablehead))
+	{
+		print "<head>\n";
 		if (GETPOST('dol_basehref','alpha')) print '<base href="'.dol_escape_htmltag(GETPOST('dol_basehref','alpha')).'">'."\n";
-        // Displays meta
-        print '<meta name="robots" content="noindex'.($disablenofollow?'':',nofollow').'">'."\n";      				// Do not index
-        print '<meta name="viewport" content="width=device-width, initial-scale=1.0">';	// Scale for mobile device
-        print '<meta name="author" content="Dolibarr Development Team">'."\n";
-        // Favicon
+		// Displays meta
+		print '<meta name="robots" content="noindex'.($disablenofollow?'':',nofollow').'">'."\n";      				// Do not index
+		print '<meta name="viewport" content="width=device-width, initial-scale=1.0">';	// Scale for mobile device
+		print '<meta name="author" content="Dolibarr Development Team">'."\n";
+		// Favicon
 		$favicon=dol_buildpath('/theme/'.$conf->theme.'/img/favicon.ico',1);
-        if (! empty($conf->global->MAIN_FAVICON_URL)) $favicon=$conf->global->MAIN_FAVICON_URL;
-        if (empty($conf->dol_use_jmobile)) print '<link rel="shortcut icon" type="image/x-icon" href="'.$favicon.'"/>'."\n";	// Not required into an Android webview
-        //if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) && ! GETPOST('textbrowser','int')) print '<link rel="top" title="'.$langs->trans("Home").'" href="'.(DOL_URL_ROOT?DOL_URL_ROOT:'/').'">'."\n";
-        if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) && ! GETPOST('textbrowser','int')) print '<link rel="copyright" title="GNU General Public License" href="http://www.gnu.org/copyleft/gpl.html#SEC1">'."\n";
-        if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) && ! GETPOST('textbrowser','int')) print '<link rel="author" title="Dolibarr Development Team" href="https://www.dolibarr.org">'."\n";
-
-        // Displays title
-        $appli=constant('DOL_APPLICATION_TITLE');
-        if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $appli=$conf->global->MAIN_APPLICATION_TITLE;
-
-        if ($title && ! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/noapp/',$conf->global->MAIN_HTML_TITLE)) print '<title>'.dol_htmlentities($title).'</title>';
-        else if ($title) print '<title>'.dol_htmlentities($appli.' - '.$title).'</title>';
-        else print "<title>".dol_htmlentities($appli)."</title>";
-        print "\n";
-
-        //$ext='';
-        //if (! empty($conf->dol_use_jmobile)) $ext='version='.urlencode(DOL_VERSION);
-        $ext='version='.urlencode(DOL_VERSION);
-
-        if (GETPOST('version','int')) $ext='version='.GETPOST('version','int');	// usefull to force no cache on css/js
-        if (GETPOST('testmenuhider','int') || ! empty($conf->global->MAIN_TESTMENUHIDER)) $ext.='&testmenuhider='.(GETPOST('testmenuhider','int')?GETPOST('testmenuhider','int'):$conf->global->MAIN_TESTMENUHIDER);
-
-        $themeparam='?lang='.$langs->defaultlang.'&amp;theme='.$conf->theme.(GETPOST('optioncss','aZ09')?'&amp;optioncss='.GETPOST('optioncss','aZ09',1):'').'&amp;userid='.$user->id.'&amp;entity='.$conf->entity;
-        $themeparam.=($ext?'&amp;'.$ext:'');
-        if (! empty($_SESSION['dol_resetcache'])) $themeparam.='&amp;dol_resetcache='.$_SESSION['dol_resetcache'];
-        if (GETPOST('dol_hide_topmenu','int'))           { $themeparam.='&amp;dol_hide_topmenu='.GETPOST('dol_hide_topmenu','int'); }
-        if (GETPOST('dol_hide_leftmenu','int'))          { $themeparam.='&amp;dol_hide_leftmenu='.GETPOST('dol_hide_leftmenu','int'); }
-        if (GETPOST('dol_optimize_smallscreen','int'))   { $themeparam.='&amp;dol_optimize_smallscreen='.GETPOST('dol_optimize_smallscreen','int'); }
-        if (GETPOST('dol_no_mouse_hover','int'))         { $themeparam.='&amp;dol_no_mouse_hover='.GETPOST('dol_no_mouse_hover','int'); }
-        if (GETPOST('dol_use_jmobile','int'))            { $themeparam.='&amp;dol_use_jmobile='.GETPOST('dol_use_jmobile','int'); $conf->dol_use_jmobile=GETPOST('dol_use_jmobile','int'); }
-
-        if (! defined('DISABLE_JQUERY') && ! $disablejs && $conf->use_javascript_ajax)
-        {
-            print '<!-- Includes CSS for JQuery (Ajax library) -->'."\n";
-            $jquerytheme = 'smoothness';
-            if (!empty($conf->global->MAIN_USE_JQUERY_THEME)) $jquerytheme = $conf->global->MAIN_USE_JQUERY_THEME;
-            if (constant('JS_JQUERY_UI')) print '<link rel="stylesheet" type="text/css" href="'.JS_JQUERY_UI.'css/'.$jquerytheme.'/jquery-ui.min.css'.($ext?'?'.$ext:'').'">'."\n";  // JQuery
-            else print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/css/'.$jquerytheme.'/jquery-ui.css'.($ext?'?'.$ext:'').'">'."\n";    // JQuery
-            if (! defined('DISABLE_JQUERY_TIPTIP')) print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/tiptip/tipTip.css'.($ext?'?'.$ext:'').'">'."\n";                           // Tooltip
-            if (! defined('DISABLE_JQUERY_JNOTIFY')) print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/jnotify/jquery.jnotify-alt.min.css'.($ext?'?'.$ext:'').'">'."\n";          // JNotify
-            /* Removed a old hidden problematic feature never used in Dolibarr. If an external module need datatable, the module must provide all lib it needs and manage version problems with other dolibarr components
+		if (! empty($conf->global->MAIN_FAVICON_URL)) $favicon=$conf->global->MAIN_FAVICON_URL;
+		if (empty($conf->dol_use_jmobile)) print '<link rel="shortcut icon" type="image/x-icon" href="'.$favicon.'"/>'."\n";	// Not required into an Android webview
+		//if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) && ! GETPOST('textbrowser','int')) print '<link rel="top" title="'.$langs->trans("Home").'" href="'.(DOL_URL_ROOT?DOL_URL_ROOT:'/').'">'."\n";
+		if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) && ! GETPOST('textbrowser','int')) print '<link rel="copyright" title="GNU General Public License" href="http://www.gnu.org/copyleft/gpl.html#SEC1">'."\n";
+		if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) && ! GETPOST('textbrowser','int')) print '<link rel="author" title="Dolibarr Development Team" href="https://www.dolibarr.org">'."\n";
+
+		// Displays title
+		$appli=constant('DOL_APPLICATION_TITLE');
+		if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $appli=$conf->global->MAIN_APPLICATION_TITLE;
+
+		if ($title && ! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/noapp/',$conf->global->MAIN_HTML_TITLE)) print '<title>'.dol_htmlentities($title).'</title>';
+		else if ($title) print '<title>'.dol_htmlentities($appli.' - '.$title).'</title>';
+		else print "<title>".dol_htmlentities($appli)."</title>";
+		print "\n";
+
+		//$ext='';
+		//if (! empty($conf->dol_use_jmobile)) $ext='version='.urlencode(DOL_VERSION);
+		$ext='version='.urlencode(DOL_VERSION);
+
+		if (GETPOST('version','int')) $ext='version='.GETPOST('version','int');	// usefull to force no cache on css/js
+		if (GETPOST('testmenuhider','int') || ! empty($conf->global->MAIN_TESTMENUHIDER)) $ext.='&testmenuhider='.(GETPOST('testmenuhider','int')?GETPOST('testmenuhider','int'):$conf->global->MAIN_TESTMENUHIDER);
+
+		$themeparam='?lang='.$langs->defaultlang.'&amp;theme='.$conf->theme.(GETPOST('optioncss','aZ09')?'&amp;optioncss='.GETPOST('optioncss','aZ09',1):'').'&amp;userid='.$user->id.'&amp;entity='.$conf->entity;
+		$themeparam.=($ext?'&amp;'.$ext:'');
+		if (! empty($_SESSION['dol_resetcache'])) $themeparam.='&amp;dol_resetcache='.$_SESSION['dol_resetcache'];
+		if (GETPOST('dol_hide_topmenu','int'))           { $themeparam.='&amp;dol_hide_topmenu='.GETPOST('dol_hide_topmenu','int'); }
+		if (GETPOST('dol_hide_leftmenu','int'))          { $themeparam.='&amp;dol_hide_leftmenu='.GETPOST('dol_hide_leftmenu','int'); }
+		if (GETPOST('dol_optimize_smallscreen','int'))   { $themeparam.='&amp;dol_optimize_smallscreen='.GETPOST('dol_optimize_smallscreen','int'); }
+		if (GETPOST('dol_no_mouse_hover','int'))         { $themeparam.='&amp;dol_no_mouse_hover='.GETPOST('dol_no_mouse_hover','int'); }
+		if (GETPOST('dol_use_jmobile','int'))            { $themeparam.='&amp;dol_use_jmobile='.GETPOST('dol_use_jmobile','int'); $conf->dol_use_jmobile=GETPOST('dol_use_jmobile','int'); }
+
+		if (! defined('DISABLE_JQUERY') && ! $disablejs && $conf->use_javascript_ajax)
+		{
+			print '<!-- Includes CSS for JQuery (Ajax library) -->'."\n";
+			$jquerytheme = 'smoothness';
+			if (!empty($conf->global->MAIN_USE_JQUERY_THEME)) $jquerytheme = $conf->global->MAIN_USE_JQUERY_THEME;
+			if (constant('JS_JQUERY_UI')) print '<link rel="stylesheet" type="text/css" href="'.JS_JQUERY_UI.'css/'.$jquerytheme.'/jquery-ui.min.css'.($ext?'?'.$ext:'').'">'."\n";  // JQuery
+			else print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/css/'.$jquerytheme.'/jquery-ui.css'.($ext?'?'.$ext:'').'">'."\n";    // JQuery
+			if (! defined('DISABLE_JQUERY_TIPTIP')) print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/tiptip/tipTip.css'.($ext?'?'.$ext:'').'">'."\n";                           // Tooltip
+			if (! defined('DISABLE_JQUERY_JNOTIFY')) print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/jnotify/jquery.jnotify-alt.min.css'.($ext?'?'.$ext:'').'">'."\n";          // JNotify
+			/* Removed a old hidden problematic feature never used in Dolibarr. If an external module need datatable, the module must provide all lib it needs and manage version problems with other dolibarr components
             if (! empty($conf->global->MAIN_USE_JQUERY_DATATABLES) || (defined('REQUIRE_JQUERY_DATATABLES') && constant('REQUIRE_JQUERY_DATATABLES')))     // jQuery datatables
             {
                 print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/datatables/media/css/jquery.dataTables.min.css'.($ext?'?'.$ext:'').'">'."\n";
                 print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/datatables/extensions/Buttons/css/buttons.dataTables.min.css'.($ext?'?'.$ext:'').'">'."\n";
                 print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/datatables/extensions/ColReorder/css/colReorder.dataTables.min.css'.($ext?'?'.$ext:'').'"></script>'."\n";
             }*/
-            if (! defined('DISABLE_SELECT2') && (! empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) || defined('REQUIRE_JQUERY_MULTISELECT')))     // jQuery plugin "mutiselect", "multiple-select", "select2"...
-            {
-            	$tmpplugin=empty($conf->global->MAIN_USE_JQUERY_MULTISELECT)?constant('REQUIRE_JQUERY_MULTISELECT'):$conf->global->MAIN_USE_JQUERY_MULTISELECT;
-            	print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/'.$tmpplugin.'/'.$tmpplugin.'.css'.($ext?'?'.$ext:'').'">'."\n";
-            }
-            // jQuery Timepicker
-            if (! empty($conf->global->MAIN_USE_JQUERY_TIMEPICKER) || defined('REQUIRE_JQUERY_TIMEPICKER'))
-            {
-            	print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/timepicker/jquery-ui-timepicker-addon.css'.($ext?'?'.$ext:'').'">'."\n";
-            }
-        }
-
-        if (! defined('DISABLE_FONT_AWSOME'))
-        {
-            print '<!-- Includes CSS for font awesome -->'."\n";
-            print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/theme/common/fontawesome/css/font-awesome.min.css'.($ext?'?'.$ext:'').'">'."\n";
-        }
-
-        print '<!-- Includes CSS for Dolibarr theme -->'."\n";
-        // Output style sheets (optioncss='print' or ''). Note: $conf->css looks like '/theme/eldy/style.css.php'
-        $themepath=dol_buildpath($conf->css,1);
-        $themesubdir='';
-        if (! empty($conf->modules_parts['theme']))	// This slow down
-        {
-	        foreach($conf->modules_parts['theme'] as $reldir)
-	        {
-	        	if (file_exists(dol_buildpath($reldir.$conf->css, 0)))
-	        	{
+			if (! defined('DISABLE_SELECT2') && (! empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) || defined('REQUIRE_JQUERY_MULTISELECT')))     // jQuery plugin "mutiselect", "multiple-select", "select2"...
+			{
+				$tmpplugin=empty($conf->global->MAIN_USE_JQUERY_MULTISELECT)?constant('REQUIRE_JQUERY_MULTISELECT'):$conf->global->MAIN_USE_JQUERY_MULTISELECT;
+				print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/'.$tmpplugin.'/'.$tmpplugin.'.css'.($ext?'?'.$ext:'').'">'."\n";
+			}
+			// jQuery Timepicker
+			if (! empty($conf->global->MAIN_USE_JQUERY_TIMEPICKER) || defined('REQUIRE_JQUERY_TIMEPICKER'))
+			{
+				print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/timepicker/jquery-ui-timepicker-addon.css'.($ext?'?'.$ext:'').'">'."\n";
+			}
+		}
+
+		if (! defined('DISABLE_FONT_AWSOME'))
+		{
+			print '<!-- Includes CSS for font awesome -->'."\n";
+			print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/theme/common/fontawesome/css/font-awesome.min.css'.($ext?'?'.$ext:'').'">'."\n";
+		}
+
+		print '<!-- Includes CSS for Dolibarr theme -->'."\n";
+		// Output style sheets (optioncss='print' or ''). Note: $conf->css looks like '/theme/eldy/style.css.php'
+		$themepath=dol_buildpath($conf->css,1);
+		$themesubdir='';
+		if (! empty($conf->modules_parts['theme']))	// This slow down
+		{
+			foreach($conf->modules_parts['theme'] as $reldir)
+			{
+				if (file_exists(dol_buildpath($reldir.$conf->css, 0)))
+				{
 					$themepath=dol_buildpath($reldir.$conf->css, 1);
 					$themesubdir=$reldir;
 					break;
-	        	}
-	        }
-        }
-        //print 'themepath='.$themepath.' themeparam='.$themeparam;exit;
-        print '<link rel="stylesheet" type="text/css" href="'.$themepath.$themeparam.'">'."\n";
-	    if (! empty($conf->global->MAIN_FIX_FLASH_ON_CHROME)) print '<!-- Includes CSS that does not exists as a workaround of flash bug of chrome -->'."\n".'<link rel="stylesheet" type="text/css" href="filethatdoesnotexiststosolvechromeflashbug">'."\n";
-
-        // CSS forced by modules (relative url starting with /)
-        if (! empty($conf->modules_parts['css']))
-        {
-        	$arraycss=(array) $conf->modules_parts['css'];
-        	foreach($arraycss as $modcss => $filescss)
-        	{
-        		$filescss=(array) $filescss;	// To be sure filecss is an array
-        		foreach($filescss as $cssfile)
-        		{
-        			if (empty($cssfile)) dol_syslog("Warning: module ".$modcss." declared a css path file into its descriptor that is empty.", LOG_WARNING);
-        			// cssfile is a relative path
-	        		print '<!-- Includes CSS added by module '.$modcss. ' -->'."\n".'<link rel="stylesheet" type="text/css" href="'.dol_buildpath($cssfile,1);
-	        		// We add params only if page is not static, because some web server setup does not return content type text/css if url has parameters, so browser cache is not used.
-	        		if (!preg_match('/\.css$/i',$cssfile)) print $themeparam;
-	        		print '">'."\n";
-        		}
-        	}
-        }
-        // CSS forced by page in top_htmlhead call (relative url starting with /)
-        if (is_array($arrayofcss))
-        {
-            foreach($arrayofcss as $cssfile)
-            {
-            	print '<!-- Includes CSS added by page -->'."\n".'<link rel="stylesheet" type="text/css" title="default" href="'.dol_buildpath($cssfile,1);
-                // We add params only if page is not static, because some web server setup does not return content type text/css if url has parameters and browser cache is not used.
-                if (!preg_match('/\.css$/i',$cssfile)) print $themeparam;
-                print '">'."\n";
-            }
-        }
-
-        // Output standard javascript links
-        if (! defined('DISABLE_JQUERY') && ! $disablejs && ! empty($conf->use_javascript_ajax))
-        {
-            // JQuery. Must be before other includes
-            print '<!-- Includes JS for JQuery -->'."\n";
-            if (defined('JS_JQUERY') && constant('JS_JQUERY')) print '<script type="text/javascript" src="'.JS_JQUERY.'jquery.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-            else print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-            if (! empty($conf->global->MAIN_FEATURES_LEVEL) && ! defined('JS_JQUERY_MIGRATE_DISABLED'))
-            {
-                if (defined('JS_JQUERY_MIGRATE') && constant('JS_JQUERY_MIGRATE')) print '<script type="text/javascript" src="'.JS_JQUERY_MIGRATE.'jquery-migrate.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-                else print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery-migrate.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-            }
-            if (defined('JS_JQUERY_UI') && constant('JS_JQUERY_UI')) print '<script type="text/javascript" src="'.JS_JQUERY_UI.'jquery-ui.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-            else print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery-ui.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-            if (! defined('DISABLE_JQUERY_TABLEDND')) print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/tablednd/jquery.tablednd.0.6.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-            if (! defined('DISABLE_JQUERY_TIPTIP')) print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/tiptip/jquery.tipTip.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-            // jQuery jnotify
-            if (empty($conf->global->MAIN_DISABLE_JQUERY_JNOTIFY) && ! defined('DISABLE_JQUERY_JNOTIFY'))
-            {
-                print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jnotify/jquery.jnotify.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-                print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/jnotify.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-            }
-            // Flot
-            if (empty($conf->global->MAIN_DISABLE_JQUERY_FLOT) && ! defined('DISABLE_JQUERY_FLOT'))
-            {
-                if (constant('JS_JQUERY_FLOT'))
-                {
-                    print '<script type="text/javascript" src="'.JS_JQUERY_FLOT.'jquery.flot.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-                    print '<script type="text/javascript" src="'.JS_JQUERY_FLOT.'jquery.flot.pie.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-                    print '<script type="text/javascript" src="'.JS_JQUERY_FLOT.'jquery.flot.stack.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-                }
-                else
-                {
-                    print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/flot/jquery.flot.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-                    print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/flot/jquery.flot.pie.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-                    print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/flot/jquery.flot.stack.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-                }
-            }
-            // jQuery jeditable
-            if (! empty($conf->global->MAIN_USE_JQUERY_JEDITABLE) && ! defined('DISABLE_JQUERY_JEDITABLE'))
-            {
-            	print '<!-- JS to manage editInPlace feature -->'."\n";
-                print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jeditable/jquery.jeditable.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-                print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jeditable/jquery.jeditable.ui-datepicker.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-                print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jeditable/jquery.jeditable.ui-autocomplete.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-                print '<script type="text/javascript">'."\n";
-                print 'var urlSaveInPlace = \''.DOL_URL_ROOT.'/core/ajax/saveinplace.php\';'."\n";
-                print 'var urlLoadInPlace = \''.DOL_URL_ROOT.'/core/ajax/loadinplace.php\';'."\n";
-                print 'var tooltipInPlace = \''.$langs->transnoentities('ClickToEdit').'\';'."\n";	// Added in title attribute of span
-                print 'var placeholderInPlace = \'&nbsp;\';'."\n";	// If we put another string than $langs->trans("ClickToEdit") here, nothing is shown. If we put empty string, there is error, Why ?
-                print 'var cancelInPlace = \''.$langs->trans('Cancel').'\';'."\n";
-                print 'var submitInPlace = \''.$langs->trans('Ok').'\';'."\n";
-                print 'var indicatorInPlace = \'<img src="'.DOL_URL_ROOT."/theme/".$conf->theme."/img/working.gif".'">\';'."\n";
-                print 'var withInPlace = 300;';		// width in pixel for default string edit
-                print '</script>'."\n";
-                print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/editinplace.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-                print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jeditable/jquery.jeditable.ckeditor.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-            }
-            // jQuery DataTables
-            /* Removed a old hidden problematic feature never used in Dolibarr. If an external module need datatable, the module must provide all lib it needs and manage version problems with other dolibarr components
+				}
+			}
+		}
+		//print 'themepath='.$themepath.' themeparam='.$themeparam;exit;
+		print '<link rel="stylesheet" type="text/css" href="'.$themepath.$themeparam.'">'."\n";
+		if (! empty($conf->global->MAIN_FIX_FLASH_ON_CHROME)) print '<!-- Includes CSS that does not exists as a workaround of flash bug of chrome -->'."\n".'<link rel="stylesheet" type="text/css" href="filethatdoesnotexiststosolvechromeflashbug">'."\n";
+
+		// CSS forced by modules (relative url starting with /)
+		if (! empty($conf->modules_parts['css']))
+		{
+			$arraycss=(array) $conf->modules_parts['css'];
+			foreach($arraycss as $modcss => $filescss)
+			{
+				$filescss=(array) $filescss;	// To be sure filecss is an array
+				foreach($filescss as $cssfile)
+				{
+					if (empty($cssfile)) dol_syslog("Warning: module ".$modcss." declared a css path file into its descriptor that is empty.", LOG_WARNING);
+					// cssfile is a relative path
+					print '<!-- Includes CSS added by module '.$modcss. ' -->'."\n".'<link rel="stylesheet" type="text/css" href="'.dol_buildpath($cssfile,1);
+					// We add params only if page is not static, because some web server setup does not return content type text/css if url has parameters, so browser cache is not used.
+					if (!preg_match('/\.css$/i',$cssfile)) print $themeparam;
+					print '">'."\n";
+				}
+			}
+		}
+		// CSS forced by page in top_htmlhead call (relative url starting with /)
+		if (is_array($arrayofcss))
+		{
+			foreach($arrayofcss as $cssfile)
+			{
+				print '<!-- Includes CSS added by page -->'."\n".'<link rel="stylesheet" type="text/css" title="default" href="'.dol_buildpath($cssfile,1);
+				// We add params only if page is not static, because some web server setup does not return content type text/css if url has parameters and browser cache is not used.
+				if (!preg_match('/\.css$/i',$cssfile)) print $themeparam;
+				print '">'."\n";
+			}
+		}
+
+		// Output standard javascript links
+		if (! defined('DISABLE_JQUERY') && ! $disablejs && ! empty($conf->use_javascript_ajax))
+		{
+			// JQuery. Must be before other includes
+			print '<!-- Includes JS for JQuery -->'."\n";
+			if (defined('JS_JQUERY') && constant('JS_JQUERY')) print '<script type="text/javascript" src="'.JS_JQUERY.'jquery.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+			else print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+			if (! empty($conf->global->MAIN_FEATURES_LEVEL) && ! defined('JS_JQUERY_MIGRATE_DISABLED'))
+			{
+				if (defined('JS_JQUERY_MIGRATE') && constant('JS_JQUERY_MIGRATE')) print '<script type="text/javascript" src="'.JS_JQUERY_MIGRATE.'jquery-migrate.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+				else print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery-migrate.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+			}
+			if (defined('JS_JQUERY_UI') && constant('JS_JQUERY_UI')) print '<script type="text/javascript" src="'.JS_JQUERY_UI.'jquery-ui.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+			else print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery-ui.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+			if (! defined('DISABLE_JQUERY_TABLEDND')) print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/tablednd/jquery.tablednd.0.6.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+			if (! defined('DISABLE_JQUERY_TIPTIP')) print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/tiptip/jquery.tipTip.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+			// jQuery jnotify
+			if (empty($conf->global->MAIN_DISABLE_JQUERY_JNOTIFY) && ! defined('DISABLE_JQUERY_JNOTIFY'))
+			{
+				print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jnotify/jquery.jnotify.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+				print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/jnotify.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+			}
+			// Flot
+			if (empty($conf->global->MAIN_DISABLE_JQUERY_FLOT) && ! defined('DISABLE_JQUERY_FLOT'))
+			{
+				if (constant('JS_JQUERY_FLOT'))
+				{
+					print '<script type="text/javascript" src="'.JS_JQUERY_FLOT.'jquery.flot.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+					print '<script type="text/javascript" src="'.JS_JQUERY_FLOT.'jquery.flot.pie.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+					print '<script type="text/javascript" src="'.JS_JQUERY_FLOT.'jquery.flot.stack.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+				}
+				else
+				{
+					print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/flot/jquery.flot.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+					print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/flot/jquery.flot.pie.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+					print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/flot/jquery.flot.stack.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+				}
+			}
+			// jQuery jeditable
+			if (! empty($conf->global->MAIN_USE_JQUERY_JEDITABLE) && ! defined('DISABLE_JQUERY_JEDITABLE'))
+			{
+				print '<!-- JS to manage editInPlace feature -->'."\n";
+				print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jeditable/jquery.jeditable.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+				print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jeditable/jquery.jeditable.ui-datepicker.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+				print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jeditable/jquery.jeditable.ui-autocomplete.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+				print '<script type="text/javascript">'."\n";
+				print 'var urlSaveInPlace = \''.DOL_URL_ROOT.'/core/ajax/saveinplace.php\';'."\n";
+				print 'var urlLoadInPlace = \''.DOL_URL_ROOT.'/core/ajax/loadinplace.php\';'."\n";
+				print 'var tooltipInPlace = \''.$langs->transnoentities('ClickToEdit').'\';'."\n";	// Added in title attribute of span
+				print 'var placeholderInPlace = \'&nbsp;\';'."\n";	// If we put another string than $langs->trans("ClickToEdit") here, nothing is shown. If we put empty string, there is error, Why ?
+				print 'var cancelInPlace = \''.$langs->trans('Cancel').'\';'."\n";
+				print 'var submitInPlace = \''.$langs->trans('Ok').'\';'."\n";
+				print 'var indicatorInPlace = \'<img src="'.DOL_URL_ROOT."/theme/".$conf->theme."/img/working.gif".'">\';'."\n";
+				print 'var withInPlace = 300;';		// width in pixel for default string edit
+				print '</script>'."\n";
+				print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/editinplace.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+				print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jeditable/jquery.jeditable.ckeditor.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+			}
+			// jQuery DataTables
+			/* Removed a old hidden problematic feature never used in Dolibarr. If an external module need datatable, the module must provide all lib it needs and manage version problems with other dolibarr components
             if (! empty($conf->global->MAIN_USE_JQUERY_DATATABLES) || (defined('REQUIRE_JQUERY_DATATABLES') && constant('REQUIRE_JQUERY_DATATABLES')))
             {
                 print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/datatables/media/js/jquery.dataTables.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
@@ -1271,103 +1271,103 @@ 
                 print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/datatables/extensions/ColReorder/js/dataTables.colReorder.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
                 print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jszip/jszip.min.js"></script>'."\n";
             }*/
-            // jQuery Timepicker
-            if (! empty($conf->global->MAIN_USE_JQUERY_TIMEPICKER) || defined('REQUIRE_JQUERY_TIMEPICKER'))
-            {
-            	print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/timepicker/jquery-ui-timepicker-addon.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-            	print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/timepicker.js.php?lang='.$langs->defaultlang.($ext?'&amp;'.$ext:'').'"></script>'."\n";
-            }
-            if (! defined('DISABLE_SELECT2') && (! empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) || defined('REQUIRE_JQUERY_MULTISELECT')))     // jQuery plugin "mutiselect", "multiple-select", "select2", ...
-            {
-            	$tmpplugin=empty($conf->global->MAIN_USE_JQUERY_MULTISELECT)?constant('REQUIRE_JQUERY_MULTISELECT'):$conf->global->MAIN_USE_JQUERY_MULTISELECT;
-            	print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/'.$tmpplugin.'/'.$tmpplugin.'.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-            }
-        }
-
-        if (! $disablejs && ! empty($conf->use_javascript_ajax))
-        {
-            // CKEditor
-            if (! empty($conf->fckeditor->enabled) && (empty($conf->global->FCKEDITOR_EDITORNAME) || $conf->global->FCKEDITOR_EDITORNAME == 'ckeditor') && ! defined('DISABLE_CKEDITOR'))
-            {
-                print '<!-- Includes JS for CKEditor -->'."\n";
-                $pathckeditor = DOL_URL_ROOT . '/includes/ckeditor/ckeditor/';
-                $jsckeditor='ckeditor.js';
-                if (constant('JS_CKEDITOR'))	// To use external ckeditor 4 js lib
-                {
-                	$pathckeditor=constant('JS_CKEDITOR');
-                }
-                print '<script type="text/javascript">';
-                print 'var CKEDITOR_BASEPATH = \''.$pathckeditor.'\';'."\n";
-                print 'var ckeditorConfig = \''.dol_buildpath($themesubdir.'/theme/'.$conf->theme.'/ckeditor/config.js'.($ext?'?'.$ext:''),1).'\';'."\n";		// $themesubdir='' in standard usage
-                print 'var ckeditorFilebrowserBrowseUrl = \''.DOL_URL_ROOT.'/core/filemanagerdol/browser/default/browser.php?Connector='.DOL_URL_ROOT.'/core/filemanagerdol/connectors/php/connector.php\';'."\n";
-                print 'var ckeditorFilebrowserImageBrowseUrl = \''.DOL_URL_ROOT.'/core/filemanagerdol/browser/default/browser.php?Type=Image&Connector='.DOL_URL_ROOT.'/core/filemanagerdol/connectors/php/connector.php\';'."\n";
-                print '</script>'."\n";
-                print '<script type="text/javascript" src="'.$pathckeditor.$jsckeditor.($ext?'?'.$ext:'').'"></script>'."\n";
-            }
-
-            // Browser notifications
-            if (! defined('DISABLE_BROWSER_NOTIF'))
-            {
-                $enablebrowsernotif=false;
-                if (! empty($conf->agenda->enabled) && ! empty($conf->global->AGENDA_REMINDER_BROWSER)) $enablebrowsernotif=true;
-                if ($conf->browser->layout == 'phone') $enablebrowsernotif=false;
-                if ($enablebrowsernotif)
-                {
-                    print '<!-- Includes JS of Dolibarr (brwoser layout = '.$conf->browser->layout.')-->'."\n";
-                    print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/lib_notification.js.php'.($ext?'?'.$ext:'').'"></script>'."\n";
-                }
-            }
-
-            // Global js function
-            print '<!-- Includes JS of Dolibarr -->'."\n";
-            print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/lib_head.js.php?lang='.$langs->defaultlang.($ext?'&amp;'.$ext:'').'"></script>'."\n";
-
-            // Add datepicker default options
-            /*if (! defined('DISABLE_DATE_PICKER'))
+			// jQuery Timepicker
+			if (! empty($conf->global->MAIN_USE_JQUERY_TIMEPICKER) || defined('REQUIRE_JQUERY_TIMEPICKER'))
+			{
+				print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/timepicker/jquery-ui-timepicker-addon.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+				print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/timepicker.js.php?lang='.$langs->defaultlang.($ext?'&amp;'.$ext:'').'"></script>'."\n";
+			}
+			if (! defined('DISABLE_SELECT2') && (! empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) || defined('REQUIRE_JQUERY_MULTISELECT')))     // jQuery plugin "mutiselect", "multiple-select", "select2", ...
+			{
+				$tmpplugin=empty($conf->global->MAIN_USE_JQUERY_MULTISELECT)?constant('REQUIRE_JQUERY_MULTISELECT'):$conf->global->MAIN_USE_JQUERY_MULTISELECT;
+				print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/'.$tmpplugin.'/'.$tmpplugin.'.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+			}
+		}
+
+		if (! $disablejs && ! empty($conf->use_javascript_ajax))
+		{
+			// CKEditor
+			if (! empty($conf->fckeditor->enabled) && (empty($conf->global->FCKEDITOR_EDITORNAME) || $conf->global->FCKEDITOR_EDITORNAME == 'ckeditor') && ! defined('DISABLE_CKEDITOR'))
+			{
+				print '<!-- Includes JS for CKEditor -->'."\n";
+				$pathckeditor = DOL_URL_ROOT . '/includes/ckeditor/ckeditor/';
+				$jsckeditor='ckeditor.js';
+				if (constant('JS_CKEDITOR'))	// To use external ckeditor 4 js lib
+				{
+					$pathckeditor=constant('JS_CKEDITOR');
+				}
+				print '<script type="text/javascript">';
+				print 'var CKEDITOR_BASEPATH = \''.$pathckeditor.'\';'."\n";
+				print 'var ckeditorConfig = \''.dol_buildpath($themesubdir.'/theme/'.$conf->theme.'/ckeditor/config.js'.($ext?'?'.$ext:''),1).'\';'."\n";		// $themesubdir='' in standard usage
+				print 'var ckeditorFilebrowserBrowseUrl = \''.DOL_URL_ROOT.'/core/filemanagerdol/browser/default/browser.php?Connector='.DOL_URL_ROOT.'/core/filemanagerdol/connectors/php/connector.php\';'."\n";
+				print 'var ckeditorFilebrowserImageBrowseUrl = \''.DOL_URL_ROOT.'/core/filemanagerdol/browser/default/browser.php?Type=Image&Connector='.DOL_URL_ROOT.'/core/filemanagerdol/connectors/php/connector.php\';'."\n";
+				print '</script>'."\n";
+				print '<script type="text/javascript" src="'.$pathckeditor.$jsckeditor.($ext?'?'.$ext:'').'"></script>'."\n";
+			}
+
+			// Browser notifications
+			if (! defined('DISABLE_BROWSER_NOTIF'))
+			{
+				$enablebrowsernotif=false;
+				if (! empty($conf->agenda->enabled) && ! empty($conf->global->AGENDA_REMINDER_BROWSER)) $enablebrowsernotif=true;
+				if ($conf->browser->layout == 'phone') $enablebrowsernotif=false;
+				if ($enablebrowsernotif)
+				{
+					print '<!-- Includes JS of Dolibarr (brwoser layout = '.$conf->browser->layout.')-->'."\n";
+					print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/lib_notification.js.php'.($ext?'?'.$ext:'').'"></script>'."\n";
+				}
+			}
+
+			// Global js function
+			print '<!-- Includes JS of Dolibarr -->'."\n";
+			print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/lib_head.js.php?lang='.$langs->defaultlang.($ext?'&amp;'.$ext:'').'"></script>'."\n";
+
+			// Add datepicker default options
+			/*if (! defined('DISABLE_DATE_PICKER'))
             {
                 print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/datepicker.js.php?lang='.$langs->defaultlang.($ext?'&'.$ext:'').'"></script>'."\n";
             }*/
 
-            // JS forced by modules (relative url starting with /)
-            if (! empty($conf->modules_parts['js']))		// $conf->modules_parts['js'] is array('module'=>array('file1','file2'))
-        	{
-        		$arrayjs=(array) $conf->modules_parts['js'];
-	            foreach($arrayjs as $modjs => $filesjs)
-	            {
-        			$filesjs=(array) $filesjs;	// To be sure filejs is an array
-		            foreach($filesjs as $jsfile)
-		            {
-	    	    		// jsfile is a relative path
-	        	    	print '<!-- Include JS added by module '.$modjs. '-->'."\n".'<script type="text/javascript" src="'.dol_buildpath($jsfile,1).'"></script>'."\n";
-		            }
-	            }
-        	}
-            // JS forced by page in top_htmlhead (relative url starting with /)
-            if (is_array($arrayofjs))
-            {
-                print '<!-- Includes JS added by page -->'."\n";
-                foreach($arrayofjs as $jsfile)
-                {
-                    if (preg_match('/^http/i',$jsfile))
-                    {
-                        print '<script type="text/javascript" src="'.$jsfile.'"></script>'."\n";
-                    }
-                    else
-                    {
-                        if (! preg_match('/^\//',$jsfile)) $jsfile='/'.$jsfile;	// For backward compatibility
-                        print '<script type="text/javascript" src="'.dol_buildpath($jsfile,1).'"></script>'."\n";
-                    }
-                }
-            }
-        }
-
-        if (! empty($head)) print $head."\n";
-        if (! empty($conf->global->MAIN_HTML_HEADER)) print $conf->global->MAIN_HTML_HEADER."\n";
-
-        print "</head>\n\n";
-    }
-
-    $conf->headerdone=1;	// To tell header was output
+			// JS forced by modules (relative url starting with /)
+			if (! empty($conf->modules_parts['js']))		// $conf->modules_parts['js'] is array('module'=>array('file1','file2'))
+			{
+				$arrayjs=(array) $conf->modules_parts['js'];
+				foreach($arrayjs as $modjs => $filesjs)
+				{
+					$filesjs=(array) $filesjs;	// To be sure filejs is an array
+					foreach($filesjs as $jsfile)
+					{
+						// jsfile is a relative path
+						print '<!-- Include JS added by module '.$modjs. '-->'."\n".'<script type="text/javascript" src="'.dol_buildpath($jsfile,1).'"></script>'."\n";
+					}
+				}
+			}
+			// JS forced by page in top_htmlhead (relative url starting with /)
+			if (is_array($arrayofjs))
+			{
+				print '<!-- Includes JS added by page -->'."\n";
+				foreach($arrayofjs as $jsfile)
+				{
+					if (preg_match('/^http/i',$jsfile))
+					{
+						print '<script type="text/javascript" src="'.$jsfile.'"></script>'."\n";
+					}
+					else
+					{
+						if (! preg_match('/^\//',$jsfile)) $jsfile='/'.$jsfile;	// For backward compatibility
+						print '<script type="text/javascript" src="'.dol_buildpath($jsfile,1).'"></script>'."\n";
+					}
+				}
+			}
+		}
+
+		if (! empty($head)) print $head."\n";
+		if (! empty($conf->global->MAIN_HTML_HEADER)) print $conf->global->MAIN_HTML_HEADER."\n";
+
+		print "</head>\n\n";
+	}
+
+	$conf->headerdone=1;	// To tell header was output
 }
 
 
@@ -1389,93 +1389,93 @@ 
  */
 function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $arrayofjs='', $arrayofcss='', $morequerystring='', $helppagename='')
 {
-    global $user, $conf, $langs, $db;
-    global $dolibarr_main_authentication, $dolibarr_main_demo;
-    global $hookmanager,$menumanager;
+	global $user, $conf, $langs, $db;
+	global $dolibarr_main_authentication, $dolibarr_main_demo;
+	global $hookmanager,$menumanager;
 
-    $searchform='';
-    $bookmarks='';
+	$searchform='';
+	$bookmarks='';
 
-    // Instantiate hooks of thirdparty module
-    $hookmanager->initHooks(array('toprightmenu'));
+	// Instantiate hooks of thirdparty module
+	$hookmanager->initHooks(array('toprightmenu'));
 
-    $toprightmenu='';
+	$toprightmenu='';
 
-    // For backward compatibility with old modules
-    if (empty($conf->headerdone))
-    {
-        top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss);
-        print '<body id="mainbody">';
-    }
+	// For backward compatibility with old modules
+	if (empty($conf->headerdone))
+	{
+		top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss);
+		print '<body id="mainbody">';
+	}
 
-    /*
+	/*
      * Top menu
      */
-    if (empty($conf->dol_hide_topmenu) && (! defined('NOREQUIREMENU') || ! constant('NOREQUIREMENU')))
-    {
-        print "\n".'<!-- Start top horizontal -->'."\n";
-
-        print '<div class="side-nav-vert"><div id="id-top">';
-
-	    // Show menu entries
-    	print '<div id="tmenu_tooltip'.(empty($conf->global->MAIN_MENU_INVERT)?'':'invert').'" class="tmenu">'."\n";
-    	$menumanager->atarget=$target;
-	    $menumanager->showmenu('top', array('searchform'=>$searchform, 'bookmarks'=>$bookmarks));      // This contains a \n
-	    print "</div>\n";
-
-	    // Define link to login card
-        $appli=constant('DOL_APPLICATION_TITLE');
-	    if (! empty($conf->global->MAIN_APPLICATION_TITLE))
-	    {
-	    	$appli=$conf->global->MAIN_APPLICATION_TITLE;
-	    	if (preg_match('/\d\.\d/', $appli))
-	    	{
+	if (empty($conf->dol_hide_topmenu) && (! defined('NOREQUIREMENU') || ! constant('NOREQUIREMENU')))
+	{
+		print "\n".'<!-- Start top horizontal -->'."\n";
+
+		print '<div class="side-nav-vert"><div id="id-top">';
+
+		// Show menu entries
+		print '<div id="tmenu_tooltip'.(empty($conf->global->MAIN_MENU_INVERT)?'':'invert').'" class="tmenu">'."\n";
+		$menumanager->atarget=$target;
+		$menumanager->showmenu('top', array('searchform'=>$searchform, 'bookmarks'=>$bookmarks));      // This contains a \n
+		print "</div>\n";
+
+		// Define link to login card
+		$appli=constant('DOL_APPLICATION_TITLE');
+		if (! empty($conf->global->MAIN_APPLICATION_TITLE))
+		{
+			$appli=$conf->global->MAIN_APPLICATION_TITLE;
+			if (preg_match('/\d\.\d/', $appli))
+			{
 				if (! preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli.=" (".DOL_VERSION.")";	// If new title contains a version that is different than core
-	    	}
-	    	else $appli.=" ".DOL_VERSION;
-	    }
-	    else $appli.=" ".DOL_VERSION;
-
-	    if (! empty($conf->global->MAIN_FEATURES_LEVEL)) $appli.="<br>".$langs->trans("LevelOfFeature").': '.$conf->global->MAIN_FEATURES_LEVEL;
-
-	    $logouttext='';
-	    if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-	    {
-    	    //$logouthtmltext=$appli.'<br>';
-    	    if ($_SESSION["dol_authmode"] != 'forceuser' && $_SESSION["dol_authmode"] != 'http')
-    	    {
-    	    	$logouthtmltext.=$langs->trans("Logout").'<br>';
-
-    	    	$logouttext .='<a href="'.DOL_URL_ROOT.'/user/logout.php">';
-    	        //$logouttext .= img_picto($langs->trans('Logout').":".$langs->trans('Logout'), 'logout_top.png', 'class="login"', 0, 0, 1);
-    	    	$logouttext .='<span class="fa fa-sign-out atoplogin"></span>';
-    	        $logouttext .='</a>';
-    	    }
-    	    else
-    	    {
-    	    	$logouthtmltext.=$langs->trans("NoLogoutProcessWithAuthMode",$_SESSION["dol_authmode"]);
-    	        $logouttext .= img_picto($langs->trans('Logout').":".$langs->trans('Logout'), 'logout_top.png', 'class="login"', 0, 0, 1);
-    	    }
-	    }
-
-	    print '<div class="login_block">'."\n";
-
-	    // Add login user link
-	    $toprightmenu.='<div class="login_block_user">';
-
-	    // Login name with photo and tooltip
+			}
+			else $appli.=" ".DOL_VERSION;
+		}
+		else $appli.=" ".DOL_VERSION;
+
+		if (! empty($conf->global->MAIN_FEATURES_LEVEL)) $appli.="<br>".$langs->trans("LevelOfFeature").': '.$conf->global->MAIN_FEATURES_LEVEL;
+
+		$logouttext='';
+		if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+		{
+			//$logouthtmltext=$appli.'<br>';
+			if ($_SESSION["dol_authmode"] != 'forceuser' && $_SESSION["dol_authmode"] != 'http')
+			{
+				$logouthtmltext.=$langs->trans("Logout").'<br>';
+
+				$logouttext .='<a href="'.DOL_URL_ROOT.'/user/logout.php">';
+				//$logouttext .= img_picto($langs->trans('Logout').":".$langs->trans('Logout'), 'logout_top.png', 'class="login"', 0, 0, 1);
+				$logouttext .='<span class="fa fa-sign-out atoplogin"></span>';
+				$logouttext .='</a>';
+			}
+			else
+			{
+				$logouthtmltext.=$langs->trans("NoLogoutProcessWithAuthMode",$_SESSION["dol_authmode"]);
+				$logouttext .= img_picto($langs->trans('Logout').":".$langs->trans('Logout'), 'logout_top.png', 'class="login"', 0, 0, 1);
+			}
+		}
+
+		print '<div class="login_block">'."\n";
+
+		// Add login user link
+		$toprightmenu.='<div class="login_block_user">';
+
+		// Login name with photo and tooltip
 		$mode=-1;
-	    $toprightmenu.='<div class="inline-block nowrap"><div class="inline-block login_block_elem login_block_elem_name" style="padding: 0px;">';
-        $toprightmenu.=$user->getNomUrl($mode, '', true, 0, 11, 0, ($user->firstname ? 'firstname' : -1),'atoplogin');
-        $toprightmenu.='</div></div>';
+		$toprightmenu.='<div class="inline-block nowrap"><div class="inline-block login_block_elem login_block_elem_name" style="padding: 0px;">';
+		$toprightmenu.=$user->getNomUrl($mode, '', true, 0, 11, 0, ($user->firstname ? 'firstname' : -1),'atoplogin');
+		$toprightmenu.='</div></div>';
 
 		$toprightmenu.='</div>';
 
-	    $toprightmenu.='<div class="login_block_other">';
+		$toprightmenu.='<div class="login_block_other">';
 
 		// Execute hook printTopRightMenu (hooks should output string like '<div class="login"><a href="">mylink</a></div>')
-	    $parameters=array();
-	    $result=$hookmanager->executeHooks('printTopRightMenu',$parameters);    // Note that $action and $object may have been modified by some hooks
+		$parameters=array();
+		$result=$hookmanager->executeHooks('printTopRightMenu',$parameters);    // Note that $action and $object may have been modified by some hooks
 		if (is_numeric($result))
 		{
 			if (empty($result)) $toprightmenu.=$hookmanager->resPrint;		// add
@@ -1483,90 +1483,90 @@ 
 		}
 		else $toprightmenu.=$result;	// For backward compatibility
 
-    	// Link to module builder
-	    if (! empty($conf->modulebuilder->enabled))
-	    {
-	        $text ='<a href="'.DOL_URL_ROOT.'/modulebuilder/index.php?mainmenu=home&leftmenu=admintools" target="_modulebuilder">';
-	        //$text.= img_picto(":".$langs->trans("ModuleBuilder"), 'printer_top.png', 'class="printer"');
-	        $text.='<span class="fa fa-bug atoplogin"></span>';
-	        $text.='</a>';
-	        $toprightmenu.=@Form::textwithtooltip('',$langs->trans("ModuleBuilder"),2,1,$text,'login_block_elem',2);
-	    }
+		// Link to module builder
+		if (! empty($conf->modulebuilder->enabled))
+		{
+			$text ='<a href="'.DOL_URL_ROOT.'/modulebuilder/index.php?mainmenu=home&leftmenu=admintools" target="_modulebuilder">';
+			//$text.= img_picto(":".$langs->trans("ModuleBuilder"), 'printer_top.png', 'class="printer"');
+			$text.='<span class="fa fa-bug atoplogin"></span>';
+			$text.='</a>';
+			$toprightmenu.=@Form::textwithtooltip('',$langs->trans("ModuleBuilder"),2,1,$text,'login_block_elem',2);
+		}
 
 		// Link to print main content area
-	    if (empty($conf->global->MAIN_PRINT_DISABLELINK) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) && empty($conf->browser->phone))
-	    {
-	        $qs=dol_escape_htmltag($_SERVER["QUERY_STRING"]);
-
-	        if (is_array($_POST))
-	        {
-    			foreach($_POST as $key=>$value) {
-    				if ($key!=='action' && !is_array($value)) $qs.='&'.$key.'='.urlencode($value);
-    			}
-	        }
+		if (empty($conf->global->MAIN_PRINT_DISABLELINK) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) && empty($conf->browser->phone))
+		{
+			$qs=dol_escape_htmltag($_SERVER["QUERY_STRING"]);
+
+			if (is_array($_POST))
+			{
+				foreach($_POST as $key=>$value) {
+					if ($key!=='action' && !is_array($value)) $qs.='&'.$key.'='.urlencode($value);
+				}
+			}
 			$qs.=(($qs && $morequerystring)?'&':'').$morequerystring;
-	        $text ='<a href="'.dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.$qs.($qs?'&':'').'optioncss=print" target="_blank">';
-	        //$text.= img_picto(":".$langs->trans("PrintContentArea"), 'printer_top.png', 'class="printer"');
-	        $text.='<span class="fa fa-print atoplogin"></span>';
-	        $text.='</a>';
-	        $toprightmenu.=@Form::textwithtooltip('',$langs->trans("PrintContentArea"),2,1,$text,'login_block_elem',2);
-	    }
-
-	    // Link to Dolibarr wiki pages
-	    if (empty($conf->global->MAIN_HELP_DISABLELINK) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-	    {
-	        $langs->load("help");
-
-	        $helpbaseurl='';
-	        $helppage='';
-	        $mode='';
-
-	        if (empty($helppagename)) $helppagename='EN:User_documentation|FR:Documentation_utilisateur|ES:Documentación_usuarios';
-
-	        // Get helpbaseurl, helppage and mode from helppagename and langs
-	        $arrayres=getHelpParamFor($helppagename,$langs);
-	        $helpbaseurl=$arrayres['helpbaseurl'];
-	        $helppage=$arrayres['helppage'];
-	        $mode=$arrayres['mode'];
-
-	        // Link to help pages
-	        if ($helpbaseurl && $helppage)
-	        {
-	            $text='';
-	            $title=$appli.'<br>';
-	            $title.=$langs->trans($mode == 'wiki' ? 'GoToWikiHelpPage': 'GoToHelpPage');
-	            if ($mode == 'wiki') $title.=' - '.$langs->trans("PageWiki").' &quot;'.dol_escape_htmltag(strtr($helppage,'_',' ')).'&quot;';
-	            $text.='<a class="help" target="_blank" href="';
-	            if ($mode == 'wiki') $text.=sprintf($helpbaseurl,urlencode(html_entity_decode($helppage)));
-	            else $text.=sprintf($helpbaseurl,$helppage);
-	            $text.='">';
-	            //$text.=img_picto('', 'helpdoc_top').' ';
-	            $text.='<span class="fa fa-question-circle atoplogin"></span>';
-	            //$toprightmenu.=$langs->trans($mode == 'wiki' ? 'OnlineHelp': 'Help');
-	            //if ($mode == 'wiki') $text.=' ('.dol_trunc(strtr($helppage,'_',' '),8).')';
-	            $text.='</a>';
-	            //$toprightmenu.='</div>'."\n";
-	            $toprightmenu.=@Form::textwithtooltip('',$title,2,1,$text,'login_block_elem',2);
-	        }
-	    }
+			$text ='<a href="'.dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.$qs.($qs?'&':'').'optioncss=print" target="_blank">';
+			//$text.= img_picto(":".$langs->trans("PrintContentArea"), 'printer_top.png', 'class="printer"');
+			$text.='<span class="fa fa-print atoplogin"></span>';
+			$text.='</a>';
+			$toprightmenu.=@Form::textwithtooltip('',$langs->trans("PrintContentArea"),2,1,$text,'login_block_elem',2);
+		}
+
+		// Link to Dolibarr wiki pages
+		if (empty($conf->global->MAIN_HELP_DISABLELINK) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+		{
+			$langs->load("help");
+
+			$helpbaseurl='';
+			$helppage='';
+			$mode='';
+
+			if (empty($helppagename)) $helppagename='EN:User_documentation|FR:Documentation_utilisateur|ES:Documentación_usuarios';
+
+			// Get helpbaseurl, helppage and mode from helppagename and langs
+			$arrayres=getHelpParamFor($helppagename,$langs);
+			$helpbaseurl=$arrayres['helpbaseurl'];
+			$helppage=$arrayres['helppage'];
+			$mode=$arrayres['mode'];
+
+			// Link to help pages
+			if ($helpbaseurl && $helppage)
+			{
+				$text='';
+				$title=$appli.'<br>';
+				$title.=$langs->trans($mode == 'wiki' ? 'GoToWikiHelpPage': 'GoToHelpPage');
+				if ($mode == 'wiki') $title.=' - '.$langs->trans("PageWiki").' &quot;'.dol_escape_htmltag(strtr($helppage,'_',' ')).'&quot;';
+				$text.='<a class="help" target="_blank" href="';
+				if ($mode == 'wiki') $text.=sprintf($helpbaseurl,urlencode(html_entity_decode($helppage)));
+				else $text.=sprintf($helpbaseurl,$helppage);
+				$text.='">';
+				//$text.=img_picto('', 'helpdoc_top').' ';
+				$text.='<span class="fa fa-question-circle atoplogin"></span>';
+				//$toprightmenu.=$langs->trans($mode == 'wiki' ? 'OnlineHelp': 'Help');
+				//if ($mode == 'wiki') $text.=' ('.dol_trunc(strtr($helppage,'_',' '),8).')';
+				$text.='</a>';
+				//$toprightmenu.='</div>'."\n";
+				$toprightmenu.=@Form::textwithtooltip('',$title,2,1,$text,'login_block_elem',2);
+			}
+		}
 
 		// Logout link
-	    $toprightmenu.=@Form::textwithtooltip('',$logouthtmltext,2,1,$logouttext,'login_block_elem',2);
+		$toprightmenu.=@Form::textwithtooltip('',$logouthtmltext,2,1,$logouttext,'login_block_elem',2);
 
-	    $toprightmenu.='</div>';
+		$toprightmenu.='</div>';
 
-	    print $toprightmenu;
+		print $toprightmenu;
 
-	    print "</div>\n";
+		print "</div>\n";
 		print '</div></div>';
 
-	    //unset($form);
+		//unset($form);
 
 		print '<div style="clear: both;"></div>';
-        print "<!-- End top horizontal menu -->\n\n";
-    }
+		print "<!-- End top horizontal menu -->\n\n";
+	}
 
-    if (empty($conf->dol_hide_leftmenu) && empty($conf->dol_use_jmobile)) print '<!-- Begin div id-container --><div id="id-container" class="id-container'.($morecss?' '.$morecss:'').'">';
+	if (empty($conf->dol_hide_leftmenu) && empty($conf->dol_use_jmobile)) print '<!-- Begin div id-container --><div id="id-container" class="id-container'.($morecss?' '.$morecss:'').'">';
 }
 
 
@@ -1586,73 +1586,73 @@ 
  */
 function left_menu($menu_array_before, $helppagename='', $notused='', $menu_array_after='', $leftmenuwithoutmainarea=0, $title='', $acceptdelayedhtml=0)
 {
-    global $user, $conf, $langs, $db, $form;
-    global $hookmanager, $menumanager;
+	global $user, $conf, $langs, $db, $form;
+	global $hookmanager, $menumanager;
 
-    $searchform='';
-    $bookmarks='';
+	$searchform='';
+	$bookmarks='';
 
-    if (! empty($menu_array_before)) dol_syslog("Deprecated parameter menu_array_before was used when calling main::left_menu function. Menu entries of module should now be defined into module descriptor and not provided when calling left_menu.", LOG_WARNING);
+	if (! empty($menu_array_before)) dol_syslog("Deprecated parameter menu_array_before was used when calling main::left_menu function. Menu entries of module should now be defined into module descriptor and not provided when calling left_menu.", LOG_WARNING);
 
-    if (empty($conf->dol_hide_leftmenu) && (! defined('NOREQUIREMENU') || ! constant('NOREQUIREMENU')))
-    {
-	    // Instantiate hooks of thirdparty module
-	    $hookmanager->initHooks(array('searchform','leftblock'));
+	if (empty($conf->dol_hide_leftmenu) && (! defined('NOREQUIREMENU') || ! constant('NOREQUIREMENU')))
+	{
+		// Instantiate hooks of thirdparty module
+		$hookmanager->initHooks(array('searchform','leftblock'));
 
 		print "\n".'<!-- Begin side-nav id-left -->'."\n".'<div class="side-nav"><div id="id-left">'."\n";
 
-	    print "\n";
-
-	    if ($conf->use_javascript_ajax && $conf->browser->layout != 'phone' && empty($conf->global->MAIN_USE_OLD_SEARCH_FORM))
-	    {
-    	    if (! is_object($form)) $form=new Form($db);
-    	    $selected=-1;
-            $searchform.=$form->selectArrayAjax('searchselectcombo', DOL_URL_ROOT.'/core/ajax/selectsearchbox.php', $selected, '', '', 0, 1, 'vmenusearchselectcombo', 1, $langs->trans("Search"), 1);
-	    }
-	    else
-	    {
-    	    // Define $searchform
-    	    if ((( ! empty($conf->societe->enabled) && (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) || empty($conf->global->SOCIETE_DISABLE_CUSTOMERS))) || ! empty($conf->fournisseur->enabled)) && $user->rights->societe->lire)
-    	    {
-    	        $langs->load("companies");
-    	        $searchform.=printSearchForm(DOL_URL_ROOT.'/societe/list.php', DOL_URL_ROOT.'/societe/list.php', $langs->trans("ThirdParties"), 'maxwidth100', 'sall', 'T', 'searchleftt', img_object('','company'));
-    	    }
-
-    	    if (! empty($conf->societe->enabled) && $user->rights->societe->lire)
-    	    {
-    	        $langs->load("companies");
-    	        $searchform.=printSearchForm(DOL_URL_ROOT.'/contact/list.php', DOL_URL_ROOT.'/contact/list.php', $langs->trans("Contacts"), 'maxwidth100', 'sall', 'A', 'searchleftc', img_object('','contact'));
-    	    }
-
-    	    if (((! empty($conf->product->enabled) && $user->rights->produit->lire) || (! empty($conf->service->enabled) && $user->rights->service->lire))
-    	    )
-    	    {
-    	        $langs->load("products");
-    	        $searchform.=printSearchForm(DOL_URL_ROOT.'/product/list.php', DOL_URL_ROOT.'/product/list.php', $langs->trans("Products")."/".$langs->trans("Services"), 'maxwidth100', 'sall', 'P', 'searchleftp', img_object('','product'));
-    	    }
-
-            if (! empty($conf->projet->enabled) && $user->rights->projet->lire)
-    	    {
-    	        $langs->load("projects");
-    	        $searchform.=printSearchForm(DOL_URL_ROOT.'/projet/list.php', DOL_URL_ROOT.'/projet/list.php', $langs->trans("Projects"), 'maxwidth100', 'search_all', 'Q', 'searchleftproj', img_object('','projectpub'));
-    	    }
-
-    	    if (! empty($conf->adherent->enabled) && $user->rights->adherent->lire)
-    	    {
-    	        $langs->load("members");
-    	        $searchform.=printSearchForm(DOL_URL_ROOT.'/adherents/list.php', DOL_URL_ROOT.'/adherents/list.php', $langs->trans("Members"), 'maxwidth100', 'sall', 'M', 'searchleftm', img_object('','user'));
-    	    }
-
-    		if (! empty($conf->user->enabled) && $user->rights->user->user->lire)
-    	    {
-    	        $langs->load("users");
-    	        $searchform.=printSearchForm(DOL_URL_ROOT.'/user/list.php', DOL_URL_ROOT.'/user/list.php', $langs->trans("Users"), 'maxwidth100', 'sall', 'M', 'searchleftuser', img_object('','user'));
-    	    }
-	    }
-
-	    // Execute hook printSearchForm
-	    $parameters=array('searchform'=>$searchform);
-	    $reshook=$hookmanager->executeHooks('printSearchForm',$parameters);    // Note that $action and $object may have been modified by some hooks
+		print "\n";
+
+		if ($conf->use_javascript_ajax && $conf->browser->layout != 'phone' && empty($conf->global->MAIN_USE_OLD_SEARCH_FORM))
+		{
+			if (! is_object($form)) $form=new Form($db);
+			$selected=-1;
+			$searchform.=$form->selectArrayAjax('searchselectcombo', DOL_URL_ROOT.'/core/ajax/selectsearchbox.php', $selected, '', '', 0, 1, 'vmenusearchselectcombo', 1, $langs->trans("Search"), 1);
+		}
+		else
+		{
+			// Define $searchform
+			if ((( ! empty($conf->societe->enabled) && (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) || empty($conf->global->SOCIETE_DISABLE_CUSTOMERS))) || ! empty($conf->fournisseur->enabled)) && $user->rights->societe->lire)
+			{
+				$langs->load("companies");
+				$searchform.=printSearchForm(DOL_URL_ROOT.'/societe/list.php', DOL_URL_ROOT.'/societe/list.php', $langs->trans("ThirdParties"), 'maxwidth100', 'sall', 'T', 'searchleftt', img_object('','company'));
+			}
+
+			if (! empty($conf->societe->enabled) && $user->rights->societe->lire)
+			{
+				$langs->load("companies");
+				$searchform.=printSearchForm(DOL_URL_ROOT.'/contact/list.php', DOL_URL_ROOT.'/contact/list.php', $langs->trans("Contacts"), 'maxwidth100', 'sall', 'A', 'searchleftc', img_object('','contact'));
+			}
+
+			if (((! empty($conf->product->enabled) && $user->rights->produit->lire) || (! empty($conf->service->enabled) && $user->rights->service->lire))
+			)
+			{
+				$langs->load("products");
+				$searchform.=printSearchForm(DOL_URL_ROOT.'/product/list.php', DOL_URL_ROOT.'/product/list.php', $langs->trans("Products")."/".$langs->trans("Services"), 'maxwidth100', 'sall', 'P', 'searchleftp', img_object('','product'));
+			}
+
+			if (! empty($conf->projet->enabled) && $user->rights->projet->lire)
+			{
+				$langs->load("projects");
+				$searchform.=printSearchForm(DOL_URL_ROOT.'/projet/list.php', DOL_URL_ROOT.'/projet/list.php', $langs->trans("Projects"), 'maxwidth100', 'search_all', 'Q', 'searchleftproj', img_object('','projectpub'));
+			}
+
+			if (! empty($conf->adherent->enabled) && $user->rights->adherent->lire)
+			{
+				$langs->load("members");
+				$searchform.=printSearchForm(DOL_URL_ROOT.'/adherents/list.php', DOL_URL_ROOT.'/adherents/list.php', $langs->trans("Members"), 'maxwidth100', 'sall', 'M', 'searchleftm', img_object('','user'));
+			}
+
+			if (! empty($conf->user->enabled) && $user->rights->user->user->lire)
+			{
+				$langs->load("users");
+				$searchform.=printSearchForm(DOL_URL_ROOT.'/user/list.php', DOL_URL_ROOT.'/user/list.php', $langs->trans("Users"), 'maxwidth100', 'sall', 'M', 'searchleftuser', img_object('','user'));
+			}
+		}
+
+		// Execute hook printSearchForm
+		$parameters=array('searchform'=>$searchform);
+		$reshook=$hookmanager->executeHooks('printSearchForm',$parameters);    // Note that $action and $object may have been modified by some hooks
 		if (empty($reshook))
 		{
 			$searchform.=$hookmanager->resPrint;
@@ -1660,72 +1660,72 @@ 
 		else $searchform=$hookmanager->resPrint;
 
 		if ($conf->use_javascript_ajax && $conf->browser->layout == 'phone')
-	    {
-	        $searchform='<div class="blockvmenuimpair blockvmenusearchphone"><div id="divsearchforms1"><a href="#" alt="'.dol_escape_htmltag($langs->trans("ShowSearchFields")).'">'.$langs->trans("Search").'...</a></div><div id="divsearchforms2" style="display: none">'.$searchform.'</div>';
-	        $searchform.='<script type="text/javascript">
+		{
+			$searchform='<div class="blockvmenuimpair blockvmenusearchphone"><div id="divsearchforms1"><a href="#" alt="'.dol_escape_htmltag($langs->trans("ShowSearchFields")).'">'.$langs->trans("Search").'...</a></div><div id="divsearchforms2" style="display: none">'.$searchform.'</div>';
+			$searchform.='<script type="text/javascript">
             	jQuery(document).ready(function () {
             		jQuery("#divsearchforms1").click(function(){
 	                   jQuery("#divsearchforms2").toggle();
 	               });
             	});
                 </script>' . "\n";
-	        $searchform.='</div>';
-	    }
+			$searchform.='</div>';
+		}
 
-	    // Define $bookmarks
-	    if (! empty($conf->bookmark->enabled) && $user->rights->bookmark->lire)
-	    {
-	        include_once (DOL_DOCUMENT_ROOT.'/bookmarks/bookmarks.lib.php');
-	        $langs->load("bookmarks");
+		// Define $bookmarks
+		if (! empty($conf->bookmark->enabled) && $user->rights->bookmark->lire)
+		{
+			include_once (DOL_DOCUMENT_ROOT.'/bookmarks/bookmarks.lib.php');
+			$langs->load("bookmarks");
 
-	        $bookmarks=printBookmarksList($db, $langs);
-	    }
+			$bookmarks=printBookmarksList($db, $langs);
+		}
 
-	    // Left column
-	    print '<!-- Begin left menu -->'."\n";
+		// Left column
+		print '<!-- Begin left menu -->'."\n";
 
-	    print '<div class="vmenu"'.(empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)?'':' title="Left menu"').'>'."\n\n";
+		print '<div class="vmenu"'.(empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)?'':' title="Left menu"').'>'."\n\n";
 
-    	// Show left menu with other forms
-	    $menumanager->menu_array = $menu_array_before;
-    	$menumanager->menu_array_after = $menu_array_after;
-	    $menumanager->showmenu('left', array('searchform'=>$searchform, 'bookmarks'=>$bookmarks)); // output menu_array and menu found in database
+		// Show left menu with other forms
+		$menumanager->menu_array = $menu_array_before;
+		$menumanager->menu_array_after = $menu_array_after;
+		$menumanager->showmenu('left', array('searchform'=>$searchform, 'bookmarks'=>$bookmarks)); // output menu_array and menu found in database
 
-        // Dolibarr version + help + bug report link
+		// Dolibarr version + help + bug report link
 		print "\n";
-	    print "<!-- Begin Help Block-->\n";
-        print '<div id="blockvmenuhelp" class="blockvmenuhelp">'."\n";
-
-        // Version
-        if (empty($conf->global->MAIN_HIDE_VERSION))    // Version is already on help picto and on login page.
-        {
-            $doliurl='https://www.dolibarr.org';
-    		//local communities
-    		if (preg_match('/fr/i',$langs->defaultlang)) $doliurl='https://www.dolibarr.fr';
-    		if (preg_match('/es/i',$langs->defaultlang)) $doliurl='https://www.dolibarr.es';
-    		if (preg_match('/de/i',$langs->defaultlang)) $doliurl='https://www.dolibarr.de';
-    		if (preg_match('/it/i',$langs->defaultlang)) $doliurl='https://www.dolibarr.it';
-    		if (preg_match('/gr/i',$langs->defaultlang)) $doliurl='https://www.dolibarr.gr';
-
-            $appli=constant('DOL_APPLICATION_TITLE');
-    	    if (! empty($conf->global->MAIN_APPLICATION_TITLE))
-    	    {
-    	    	$appli=$conf->global->MAIN_APPLICATION_TITLE; $doliurl='';
-    	    	if (preg_match('/\d\.\d/', $appli))
-    	    	{
-    				if (! preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli.=" (".DOL_VERSION.")";	// If new title contains a version that is different than core
-    	    	}
-    	    	else $appli.=" ".DOL_VERSION;
-    	    }
-    	    else $appli.=" ".DOL_VERSION;
-    	    print '<div id="blockvmenuhelpapp" class="blockvmenuhelp">';
-    	    if ($doliurl) print '<a class="help" target="_blank" href="'.$doliurl.'">';
-    	    else print '<span class="help">';
-    	    print $appli;
-    	    if ($doliurl) print '</a>';
-    	    else print '</span>';
-    	    print '</div>'."\n";
-        }
+		print "<!-- Begin Help Block-->\n";
+		print '<div id="blockvmenuhelp" class="blockvmenuhelp">'."\n";
+
+		// Version
+		if (empty($conf->global->MAIN_HIDE_VERSION))    // Version is already on help picto and on login page.
+		{
+			$doliurl='https://www.dolibarr.org';
+			//local communities
+			if (preg_match('/fr/i',$langs->defaultlang)) $doliurl='https://www.dolibarr.fr';
+			if (preg_match('/es/i',$langs->defaultlang)) $doliurl='https://www.dolibarr.es';
+			if (preg_match('/de/i',$langs->defaultlang)) $doliurl='https://www.dolibarr.de';
+			if (preg_match('/it/i',$langs->defaultlang)) $doliurl='https://www.dolibarr.it';
+			if (preg_match('/gr/i',$langs->defaultlang)) $doliurl='https://www.dolibarr.gr';
+
+			$appli=constant('DOL_APPLICATION_TITLE');
+			if (! empty($conf->global->MAIN_APPLICATION_TITLE))
+			{
+				$appli=$conf->global->MAIN_APPLICATION_TITLE; $doliurl='';
+				if (preg_match('/\d\.\d/', $appli))
+				{
+					if (! preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli.=" (".DOL_VERSION.")";	// If new title contains a version that is different than core
+				}
+				else $appli.=" ".DOL_VERSION;
+			}
+			else $appli.=" ".DOL_VERSION;
+			print '<div id="blockvmenuhelpapp" class="blockvmenuhelp">';
+			if ($doliurl) print '<a class="help" target="_blank" href="'.$doliurl.'">';
+			else print '<span class="help">';
+			print $appli;
+			if ($doliurl) print '</a>';
+			else print '</span>';
+			print '</div>'."\n";
+		}
 
 		// Link to bugtrack
 		if (! empty($conf->global->MAIN_BUGTRACK_ENABLELINK))
@@ -1753,26 +1753,26 @@ 
 			print '</div>';
 		}
 
-        print "</div>\n";
-        print "<!-- End Help Block-->\n";
-        print "\n";
+		print "</div>\n";
+		print "<!-- End Help Block-->\n";
+		print "\n";
 
-        print "</div>\n";
-        print "<!-- End left menu -->\n";
-        print "\n";
+		print "</div>\n";
+		print "<!-- End left menu -->\n";
+		print "\n";
 
-	    // Execute hook printLeftBlock
-	    $parameters=array();
-	    $reshook=$hookmanager->executeHooks('printLeftBlock',$parameters);    // Note that $action and $object may have been modified by some hooks
-	    print $hookmanager->resPrint;
+		// Execute hook printLeftBlock
+		$parameters=array();
+		$reshook=$hookmanager->executeHooks('printLeftBlock',$parameters);    // Note that $action and $object may have been modified by some hooks
+		print $hookmanager->resPrint;
 
-	    print '</div></div> <!-- End side-nav id-left -->';	// End div id="side-nav" div id="id-left"
-    }
+		print '</div></div> <!-- End side-nav id-left -->';	// End div id="side-nav" div id="id-left"
+	}
 
-    print "\n";
-    print '<!-- Begin right area -->'."\n";
+	print "\n";
+	print '<!-- Begin right area -->'."\n";
 
-    if (empty($leftmenuwithoutmainarea)) main_area($title);
+	if (empty($leftmenuwithoutmainarea)) main_area($title);
 }
 
 
@@ -1784,15 +1784,15 @@ 
  */
 function main_area($title='')
 {
-    global $conf, $langs;
+	global $conf, $langs;
 
 	if (empty($conf->dol_hide_leftmenu)) print '<div id="id-right">';
 
-    print "\n";
+	print "\n";
 
-    print '<!-- Begin div class="fiche" -->'."\n".'<div class="fiche">'."\n";
+	print '<!-- Begin div class="fiche" -->'."\n".'<div class="fiche">'."\n";
 
-    if (! empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED)) print info_admin($langs->trans("WarningYouAreInMaintenanceMode",$conf->global->MAIN_ONLY_LOGIN_ALLOWED));
+	if (! empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED)) print info_admin($langs->trans("WarningYouAreInMaintenanceMode",$conf->global->MAIN_ONLY_LOGIN_ALLOWED));
 }
 
 
@@ -1809,34 +1809,34 @@ 
 	$helppage='';
 	$mode='';
 
-    if (preg_match('/^http/i',$helppagename))
-    {
-        // If complete URL
-        $helpbaseurl='%s';
-        $helppage=$helppagename;
-        $mode='local';
-    }
-    else
-    {
-        // If WIKI URL
-        if (preg_match('/^es/i',$langs->defaultlang))
-        {
-            $helpbaseurl='http://wiki.dolibarr.org/index.php/%s';
-            if (preg_match('/ES:([^|]+)/i',$helppagename,$reg)) $helppage=$reg[1];
-        }
-        if (preg_match('/^fr/i',$langs->defaultlang))
-        {
-            $helpbaseurl='http://wiki.dolibarr.org/index.php/%s';
-            if (preg_match('/FR:([^|]+)/i',$helppagename,$reg)) $helppage=$reg[1];
-        }
-        if (empty($helppage))	// If help page not already found
-        {
-            $helpbaseurl='http://wiki.dolibarr.org/index.php/%s';
-            if (preg_match('/EN:([^|]+)/i',$helppagename,$reg)) $helppage=$reg[1];
-        }
-        $mode='wiki';
-    }
-    return array('helpbaseurl'=>$helpbaseurl,'helppage'=>$helppage,'mode'=>$mode);
+	if (preg_match('/^http/i',$helppagename))
+	{
+		// If complete URL
+		$helpbaseurl='%s';
+		$helppage=$helppagename;
+		$mode='local';
+	}
+	else
+	{
+		// If WIKI URL
+		if (preg_match('/^es/i',$langs->defaultlang))
+		{
+			$helpbaseurl='http://wiki.dolibarr.org/index.php/%s';
+			if (preg_match('/ES:([^|]+)/i',$helppagename,$reg)) $helppage=$reg[1];
+		}
+		if (preg_match('/^fr/i',$langs->defaultlang))
+		{
+			$helpbaseurl='http://wiki.dolibarr.org/index.php/%s';
+			if (preg_match('/FR:([^|]+)/i',$helppagename,$reg)) $helppage=$reg[1];
+		}
+		if (empty($helppage))	// If help page not already found
+		{
+			$helpbaseurl='http://wiki.dolibarr.org/index.php/%s';
+			if (preg_match('/EN:([^|]+)/i',$helppagename,$reg)) $helppage=$reg[1];
+		}
+		$mode='wiki';
+	}
+	return array('helpbaseurl'=>$helpbaseurl,'helppage'=>$helppage,'mode'=>$mode);
 }
 
 
@@ -1855,120 +1855,120 @@ 
  */
 function printSearchForm($urlaction, $urlobject, $title, $htmlmorecss, $htmlinputname, $accesskey='', $prefhtmlinputname='',$img='')
 {
-    global $conf,$langs;
+	global $conf,$langs;
 
-    if (empty($htmlinputid)) {
-        $htmlinputid = $htmlinputname;
-    }
+	if (empty($htmlinputid)) {
+		$htmlinputid = $htmlinputname;
+	}
 
-    $ret='';
-    $ret.='<form action="'.$urlaction.'" method="post" class="searchform">';
+	$ret='';
+	$ret.='<form action="'.$urlaction.'" method="post" class="searchform">';
 	if (empty($conf->global->MAIN_HTML5_PLACEHOLDER))
 	{
-        $ret.='<div class="menu_titre menu_titre_search"';
-    	if (! empty($conf->global->MAIN_HTML5_PLACEHOLDER)) $ret.=' style="display: inline-block"';
-    	$ret.='>';
-    	$ret.='<label for="'.$prefhtmlinputname.$htmlinputname.'">';
-    	$ret.='<a class="vsmenu" href="'.$urlobject.'">';
-       	if ($img && ! empty($conf->global->MAIN_HTML5_PLACEHOLDER)) $ret.=$img;
-       	else if ($img || $title) $ret.=$img.' '.$title;
-    	$ret.='</a>';
-    	$ret.='</label>';
-    	$ret.='</div>';
+		$ret.='<div class="menu_titre menu_titre_search"';
+		if (! empty($conf->global->MAIN_HTML5_PLACEHOLDER)) $ret.=' style="display: inline-block"';
+		$ret.='>';
+		$ret.='<label for="'.$prefhtmlinputname.$htmlinputname.'">';
+		$ret.='<a class="vsmenu" href="'.$urlobject.'">';
+	   	if ($img && ! empty($conf->global->MAIN_HTML5_PLACEHOLDER)) $ret.=$img;
+	   	else if ($img || $title) $ret.=$img.' '.$title;
+		$ret.='</a>';
+		$ret.='</label>';
+		$ret.='</div>';
 	}
-    $ret.='<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-    $ret.='<input type="hidden" name="mode" value="search">';
-    $ret.='<input type="text" class="flat '.$htmlmorecss.'"';
-    if (! empty($conf->global->MAIN_HTML5_PLACEHOLDER)) $ret.=' style="text-indent: 22px; background-image: url(\''.$img.'\'); background-repeat: no-repeat; background-position: 3px;"';
-    $ret.=($accesskey?' accesskey="'.$accesskey.'"':'');
-    if (! empty($conf->global->MAIN_HTML5_PLACEHOLDER)) $ret.=' placeholder="'.strip_tags($title).'"';		// Will work only if MAIN_HTML5_PLACEHOLDER is set to 1
-    else $ret.=' title="'.$langs->trans("SearchOf").''.strip_tags($title).'"';
-    $ret.=' name="'.$htmlinputname.'" id="'.$prefhtmlinputname.$htmlinputname.'" />';
-    $ret.='<input type="submit" class="button" style="padding-top: 4px; padding-bottom: 4px; padding-left: 6px; padding-right: 6px" value="'.$langs->trans("Go").'">';
-    $ret.="</form>\n";
-    return $ret;
+	$ret.='<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+	$ret.='<input type="hidden" name="mode" value="search">';
+	$ret.='<input type="text" class="flat '.$htmlmorecss.'"';
+	if (! empty($conf->global->MAIN_HTML5_PLACEHOLDER)) $ret.=' style="text-indent: 22px; background-image: url(\''.$img.'\'); background-repeat: no-repeat; background-position: 3px;"';
+	$ret.=($accesskey?' accesskey="'.$accesskey.'"':'');
+	if (! empty($conf->global->MAIN_HTML5_PLACEHOLDER)) $ret.=' placeholder="'.strip_tags($title).'"';		// Will work only if MAIN_HTML5_PLACEHOLDER is set to 1
+	else $ret.=' title="'.$langs->trans("SearchOf").''.strip_tags($title).'"';
+	$ret.=' name="'.$htmlinputname.'" id="'.$prefhtmlinputname.$htmlinputname.'" />';
+	$ret.='<input type="submit" class="button" style="padding-top: 4px; padding-bottom: 4px; padding-left: 6px; padding-right: 6px" value="'.$langs->trans("Go").'">';
+	$ret.="</form>\n";
+	return $ret;
 }
 
 
 if (! function_exists("llxFooter"))
 {
-    /**
-     * Show HTML footer
-     * Close div /DIV class=fiche + /DIV id-right + /DIV id-container + /BODY + /HTML.
-     * If global var $delayedhtmlcontent was filled, we output it just before closing the body.
-     *
-     * @param	string	$comment    A text to add as HTML comment into HTML generated page
+	/**
+	 * Show HTML footer
+	 * Close div /DIV class=fiche + /DIV id-right + /DIV id-container + /BODY + /HTML.
+	 * If global var $delayedhtmlcontent was filled, we output it just before closing the body.
+	 *
+	 * @param	string	$comment    A text to add as HTML comment into HTML generated page
 	 * @param	string	$zone		'private' (for private pages) or 'public' (for public pages)
-     * @return	void
-     */
-    function llxFooter($comment='',$zone='private')
-    {
-        global $conf, $langs, $user, $object;
-        global $delayedhtmlcontent;
-
-        // Global html output events ($mesgs, $errors, $warnings)
-        dol_htmloutput_events();
-
-        // Code for search criteria persistence.
-        // Save $user->lastsearch_values if defined (define on list pages when a form field search_xxx exists)
-        if (is_object($user) && ! empty($user->lastsearch_values_tmp) && is_array($user->lastsearch_values_tmp))
-        {
-            // Clean data
-            foreach($user->lastsearch_values_tmp as $key => $val)
-            {
-                unset($_SESSION['lastsearch_values_tmp_'.$key]);
-                if (count($val))
-                {
-                    if (empty($val['sortfield'])) unset($val['sortfield']);
-                    if (empty($val['sortorder'])) unset($val['sortorder']);
-                    dol_syslog('Save lastsearch_values_tmp_'.$key.'='.json_encode($val, 0)." (systematic recording of last search criteria)");
-                    $_SESSION['lastsearch_values_tmp_'.$key]=json_encode($val);
-                    unset($_SESSION['lastsearch_values_'.$key]);
-                }
-            }
-        }
-
-        // Core error message
-        if (! empty($conf->global->MAIN_CORE_ERROR))
-        {
-            // Ajax version
-            if ($conf->use_javascript_ajax)
-            {
-                $title = img_warning().' '.$langs->trans('CoreErrorTitle');
-                print ajax_dialog($title, $langs->trans('CoreErrorMessage'));
-            }
-            // html version
-            else
-            {
-                $msg = img_warning().' '.$langs->trans('CoreErrorMessage');
-                print '<div class="error">'.$msg.'</div>';
-            }
+	 * @return	void
+	 */
+	function llxFooter($comment='',$zone='private')
+	{
+		global $conf, $langs, $user, $object;
+		global $delayedhtmlcontent;
+
+		// Global html output events ($mesgs, $errors, $warnings)
+		dol_htmloutput_events();
+
+		// Code for search criteria persistence.
+		// Save $user->lastsearch_values if defined (define on list pages when a form field search_xxx exists)
+		if (is_object($user) && ! empty($user->lastsearch_values_tmp) && is_array($user->lastsearch_values_tmp))
+		{
+			// Clean data
+			foreach($user->lastsearch_values_tmp as $key => $val)
+			{
+				unset($_SESSION['lastsearch_values_tmp_'.$key]);
+				if (count($val))
+				{
+					if (empty($val['sortfield'])) unset($val['sortfield']);
+					if (empty($val['sortorder'])) unset($val['sortorder']);
+					dol_syslog('Save lastsearch_values_tmp_'.$key.'='.json_encode($val, 0)." (systematic recording of last search criteria)");
+					$_SESSION['lastsearch_values_tmp_'.$key]=json_encode($val);
+					unset($_SESSION['lastsearch_values_'.$key]);
+				}
+			}
+		}
 
-            //define("MAIN_CORE_ERROR",0);      // Constant was defined and we can't change value of a constant
-        }
+		// Core error message
+		if (! empty($conf->global->MAIN_CORE_ERROR))
+		{
+			// Ajax version
+			if ($conf->use_javascript_ajax)
+			{
+				$title = img_warning().' '.$langs->trans('CoreErrorTitle');
+				print ajax_dialog($title, $langs->trans('CoreErrorMessage'));
+			}
+			// html version
+			else
+			{
+				$msg = img_warning().' '.$langs->trans('CoreErrorMessage');
+				print '<div class="error">'.$msg.'</div>';
+			}
 
-        print "\n\n";
+			//define("MAIN_CORE_ERROR",0);      // Constant was defined and we can't change value of a constant
+		}
+
+		print "\n\n";
 
-        print '</div> <!-- End div class="fiche" -->'."\n"; // End div fiche
+		print '</div> <!-- End div class="fiche" -->'."\n"; // End div fiche
 
 		if (empty($conf->dol_hide_leftmenu)) print '</div> <!-- End div id-right -->'; // End div id-right
 
-        print "\n";
-        if ($comment) print '<!-- '.$comment.' -->'."\n";
+		print "\n";
+		if ($comment) print '<!-- '.$comment.' -->'."\n";
 
-        printCommonFooter($zone);
+		printCommonFooter($zone);
 
-        if (empty($conf->dol_hide_leftmenu) && empty($conf->dol_use_jmobile)) print '</div> <!-- End div id-container -->'."\n";	// End div container
+		if (empty($conf->dol_hide_leftmenu) && empty($conf->dol_use_jmobile)) print '</div> <!-- End div id-container -->'."\n";	// End div container
 
-        if (! empty($delayedhtmlcontent)) print $delayedhtmlcontent;
+		if (! empty($delayedhtmlcontent)) print $delayedhtmlcontent;
 
-        // TODO Move this in lib_head.js.php
+		// TODO Move this in lib_head.js.php
 
-        // Wrapper to show tooltips (html or onclick popup)
-        if (! empty($conf->use_javascript_ajax) && empty($conf->dol_no_mouse_hover))
-        {
-    		print "\n<!-- JS CODE TO ENABLE tipTip on all object with class classfortooltip -->\n";
-    		print '<script type="text/javascript">
+		// Wrapper to show tooltips (html or onclick popup)
+		if (! empty($conf->use_javascript_ajax) && empty($conf->dol_no_mouse_hover))
+		{
+			print "\n<!-- JS CODE TO ENABLE tipTip on all object with class classfortooltip -->\n";
+			print '<script type="text/javascript">
             	jQuery(document).ready(function () {
             		jQuery(".classfortooltip").tipTip({maxWidth: "'.dol_size(($conf->browser->layout == 'phone' ? 400 : 700),'width').'px", edgeOffset: 10, delay: 50, fadeIn: 50, fadeOut: 50});
             		jQuery(".classfortooltiponclicktext").dialog({ width: '.($conf->browser->layout == 'phone' ? 400 : 700).', autoOpen: false });
@@ -1982,13 +1982,13 @@ 
             		});
                 });
             </script>' . "\n";
-        }
+		}
 
-        // Wrapper to manage document_preview
-        if (! empty($conf->use_javascript_ajax) && ($conf->browser->layout != 'phone'))
-        {
-            print "\n<!-- JS CODE TO ENABLE document_preview -->\n";
-            print '<script type="text/javascript">
+		// Wrapper to manage document_preview
+		if (! empty($conf->use_javascript_ajax) && ($conf->browser->layout != 'phone'))
+		{
+			print "\n<!-- JS CODE TO ENABLE document_preview -->\n";
+			print '<script type="text/javascript">
                 jQuery(document).ready(function () {
 			        jQuery(".documentpreview").click(function () {
             		    console.log("We click on preview for element with href="+$(this).attr(\'href\')+" mime="+$(this).attr(\'mime\'));
@@ -1997,13 +1997,13 @@ 
         			});
         		});
             </script>' . "\n";
-        }
+		}
 
-        // Wrapper to manage dropdown
-        if (! empty($conf->use_javascript_ajax) && ! defined('JS_JQUERY_DISABLE_DROPDOWN'))
-        {
-            print "\n<!-- JS CODE TO ENABLE dropdown -->\n";
-            print '<script type="text/javascript">
+		// Wrapper to manage dropdown
+		if (! empty($conf->use_javascript_ajax) && ! defined('JS_JQUERY_DISABLE_DROPDOWN'))
+		{
+			print "\n<!-- JS CODE TO ENABLE dropdown -->\n";
+			print '<script type="text/javascript">
                 jQuery(document).ready(function () {
                   $(".dropdown dt a").on(\'click\', function () {
                       //console.log($(this).parent().parent().find(\'dd ul\'));
@@ -2036,15 +2036,15 @@ 
                   });
                 });
                 </script>';
-        }
+		}
 
-        // Wrapper to add log when clicking on download or preview
-        if (! empty($conf->blockedlog->enabled) && is_object($object) && $object->id > 0 && $object->statut > 0)
-        {
-            if (in_array($object->element, array('facture')))       // Restrict for the moment to element 'facture'
-            {
-                print "\n<!-- JS CODE TO ENABLE log when making a download or a preview of a document -->\n";
-                ?>
+		// Wrapper to add log when clicking on download or preview
+		if (! empty($conf->blockedlog->enabled) && is_object($object) && $object->id > 0 && $object->statut > 0)
+		{
+			if (in_array($object->element, array('facture')))       // Restrict for the moment to element 'facture'
+			{
+				print "\n<!-- JS CODE TO ENABLE log when making a download or a preview of a document -->\n";
+				?>
     			<script type="text/javascript">
     			jQuery(document).ready(function () {
     				$('a.documentpreview').click(function() {
@@ -2068,16 +2068,16 @@ 
     			});
     			</script>
 				<?php
-    		}
-       	}
+			}
+	   	}
 
 
 		// A div for the address popup
 		print "\n<!-- A div to allow dialog popup -->\n";
 		print '<div id="dialogforpopup" style="display: none;"></div>'."\n";
 
-        print "</body>\n";
-        print "</html>\n";
-    }
+		print "</body>\n";
+		print "</html>\n";
+	}
 }
 

Spacing +623 added lines, -623 removed lines

@@ -35,11 +35,11 @@ 
 //@ini_set('memory_limit', '128M');	// This may be useless if memory is hard limited by your PHP
 
 // For optional tuning. Enabled if environment variable MAIN_SHOW_TUNING_INFO is defined.
-$micro_start_time=0;
-if (! empty($_SERVER['MAIN_SHOW_TUNING_INFO']))
+$micro_start_time = 0;
+if (!empty($_SERVER['MAIN_SHOW_TUNING_INFO']))
 {
     list($usec, $sec) = explode(" ", microtime());
-    $micro_start_time=((float) $usec + (float) $sec);
+    $micro_start_time = ((float) $usec + (float) $sec);
     // Add Xdebug code coverage
     //define('XDEBUGCOVERAGE',1);
     if (defined('XDEBUGCOVERAGE')) {
@@ -81,14 +81,14 @@ 
     // For SQL Injection (only GET and POST are used to be included into bad escaped SQL requests)
     if ($type != 2)
     {
-        $inj += preg_match('/delete\s+from/i',	 $val);
-        $inj += preg_match('/create\s+table/i',	 $val);
-        $inj += preg_match('/update.+set.+=/i',  $val);
-        $inj += preg_match('/insert\s+into/i', 	 $val);
-        $inj += preg_match('/select.+from/i', 	 $val);
-        $inj += preg_match('/union.+select/i', 	 $val);
-        $inj += preg_match('/into\s+(outfile|dumpfile)/i',  $val);
-        $inj += preg_match('/(\.\.%2f)+/i',		 $val);
+        $inj += preg_match('/delete\s+from/i', $val);
+        $inj += preg_match('/create\s+table/i', $val);
+        $inj += preg_match('/update.+set.+=/i', $val);
+        $inj += preg_match('/insert\s+into/i', $val);
+        $inj += preg_match('/select.+from/i', $val);
+        $inj += preg_match('/union.+select/i', $val);
+        $inj += preg_match('/into\s+(outfile|dumpfile)/i', $val);
+        $inj += preg_match('/(\.\.%2f)+/i', $val);
     }
     // For XSS Injection done by adding javascript with script
     // This is all cases a browser consider text is javascript:
@@ -97,23 +97,23 @@ 
 	// More on https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet
     $inj += preg_match('/<script/i', $val);
 	$inj += preg_match('/<iframe/i', $val);
-	$inj += preg_match('/Set\.constructor/i', $val);	// ECMA script 6
-    if (! defined('NOSTYLECHECK')) $inj += preg_match('/<style/i', $val);
+	$inj += preg_match('/Set\.constructor/i', $val); // ECMA script 6
+    if (!defined('NOSTYLECHECK')) $inj += preg_match('/<style/i', $val);
     $inj += preg_match('/base[\s]+href/si', $val);
-    $inj += preg_match('/<.*onmouse/si', $val);       // onmousexxx can be set on img or any html tag like <img title='...' onmouseover=alert(1)>
-    $inj += preg_match('/onerror\s*=/i', $val);       // onerror can be set on img or any html tag like <img title='...' onerror = alert(1)>
-    $inj += preg_match('/onfocus\s*=/i', $val);       // onfocus can be set on input text html tag like <input type='text' value='...' onfocus = alert(1)>
-    $inj += preg_match('/onload\s*=/i', $val);        // onload can be set on svg tag <svg/onload=alert(1)> or other tag like body <body onload=alert(1)>
+    $inj += preg_match('/<.*onmouse/si', $val); // onmousexxx can be set on img or any html tag like <img title='...' onmouseover=alert(1)>
+    $inj += preg_match('/onerror\s*=/i', $val); // onerror can be set on img or any html tag like <img title='...' onerror = alert(1)>
+    $inj += preg_match('/onfocus\s*=/i', $val); // onfocus can be set on input text html tag like <input type='text' value='...' onfocus = alert(1)>
+    $inj += preg_match('/onload\s*=/i', $val); // onload can be set on svg tag <svg/onload=alert(1)> or other tag like body <body onload=alert(1)>
     //$inj += preg_match('/on[A-Z][a-z]+\*=/', $val);   // To lock event handlers onAbort(), ...
-	$inj += preg_match('/&#58;|&#0000058|&#x3A/i', $val);		// refused string ':' encoded (no reason to have it encoded) to lock 'javascript:...'
+	$inj += preg_match('/&#58;|&#0000058|&#x3A/i', $val); // refused string ':' encoded (no reason to have it encoded) to lock 'javascript:...'
     //if ($type == 1)
     //{
         $inj += preg_match('/javascript:/i', $val);
         $inj += preg_match('/vbscript:/i', $val);
     //}
     // For XSS Injection done by adding javascript closing html tags like with onmousemove, etc... (closing a src or href tag with not cleaned param)
-    if ($type == 1) $inj += preg_match('/"/i', $val);		// We refused " in GET parameters value
-    if ($type == 2) $inj += preg_match('/[;"]/', $val);		// PHP_SELF is a file system path. It can contains spaces.
+    if ($type == 1) $inj += preg_match('/"/i', $val); // We refused " in GET parameters value
+    if ($type == 2) $inj += preg_match('/[;"]/', $val); // PHP_SELF is a file system path. It can contains spaces.
     return $inj;
 }
 
@@ -130,7 +130,7 @@ 
     {
         foreach ($var as $key => $value)
         {
-            if (analyseVarsForSqlAndScriptsInjection($value,$type))
+            if (analyseVarsForSqlAndScriptsInjection($value, $type))
             {
                 $var[$key] = $value;
             }
@@ -144,36 +144,36 @@ 
     }
     else
     {
-        return (test_sql_and_script_inject($var,$type) <= 0);
+        return (test_sql_and_script_inject($var, $type) <= 0);
     }
 }
 
 
 // Check consistency of NOREQUIREXXX DEFINES
-if ((defined('NOREQUIREDB') || defined('NOREQUIRETRAN')) && ! defined('NOREQUIREMENU')) dol_print_error('','If define NOREQUIREDB or NOREQUIRETRAN are set, you must also set NOREQUIREMENU or not use them');
+if ((defined('NOREQUIREDB') || defined('NOREQUIRETRAN')) && !defined('NOREQUIREMENU')) dol_print_error('', 'If define NOREQUIREDB or NOREQUIRETRAN are set, you must also set NOREQUIREMENU or not use them');
 
 // Sanity check on URL
-if (! empty($_SERVER["PHP_SELF"]))
+if (!empty($_SERVER["PHP_SELF"]))
 {
-    $morevaltochecklikepost=array($_SERVER["PHP_SELF"]);
-    analyseVarsForSqlAndScriptsInjection($morevaltochecklikepost,2);
+    $morevaltochecklikepost = array($_SERVER["PHP_SELF"]);
+    analyseVarsForSqlAndScriptsInjection($morevaltochecklikepost, 2);
 }
 // Sanity check on GET parameters
-if (! defined('NOSCANGETFORINJECTION') && ! empty($_SERVER["QUERY_STRING"]))
+if (!defined('NOSCANGETFORINJECTION') && !empty($_SERVER["QUERY_STRING"]))
 {
-    $morevaltochecklikeget=array($_SERVER["QUERY_STRING"]);
-    analyseVarsForSqlAndScriptsInjection($morevaltochecklikeget,1);
+    $morevaltochecklikeget = array($_SERVER["QUERY_STRING"]);
+    analyseVarsForSqlAndScriptsInjection($morevaltochecklikeget, 1);
 }
 // Sanity check on POST
-if (! defined('NOSCANPOSTFORINJECTION'))
+if (!defined('NOSCANPOSTFORINJECTION'))
 {
-	analyseVarsForSqlAndScriptsInjection($_POST,0);
+	analyseVarsForSqlAndScriptsInjection($_POST, 0);
 }
 
 // This is to make Dolibarr working with Plesk
-if (! empty($_SERVER['DOCUMENT_ROOT']) && substr($_SERVER['DOCUMENT_ROOT'], -6) !== 'htdocs')
+if (!empty($_SERVER['DOCUMENT_ROOT']) && substr($_SERVER['DOCUMENT_ROOT'], -6) !== 'htdocs')
 {
-	set_include_path($_SERVER['DOCUMENT_ROOT'] . '/htdocs');
+	set_include_path($_SERVER['DOCUMENT_ROOT'].'/htdocs');
 }
 
 // Include the conf.php and functions.lib.php
@@ -182,34 +182,34 @@ 
 // If there is a POST parameter to tell to save automatically some POST parameters into cookies, we do it.
 // This is used for example by form of boxes to save personalization of some options.
 // DOL_AUTOSET_COOKIE=cookiename:val1,val2 and  cookiename_val1=aaa cookiename_val2=bbb will set cookie_name with value json_encode(array('val1'=> , ))
-if (! empty($_POST["DOL_AUTOSET_COOKIE"]))
+if (!empty($_POST["DOL_AUTOSET_COOKIE"]))
 {
-	$tmpautoset=explode(':',$_POST["DOL_AUTOSET_COOKIE"],2);
-	$tmplist=explode(',',$tmpautoset[1]);
-	$cookiearrayvalue='';
+	$tmpautoset = explode(':', $_POST["DOL_AUTOSET_COOKIE"], 2);
+	$tmplist = explode(',', $tmpautoset[1]);
+	$cookiearrayvalue = '';
 	foreach ($tmplist as $tmpkey)
 	{
-		$postkey=$tmpautoset[0].'_'.$tmpkey;
+		$postkey = $tmpautoset[0].'_'.$tmpkey;
 		//var_dump('tmpkey='.$tmpkey.' postkey='.$postkey.' value='.$_POST[$postkey]);
-		if (! empty($_POST[$postkey])) $cookiearrayvalue[$tmpkey]=$_POST[$postkey];
+		if (!empty($_POST[$postkey])) $cookiearrayvalue[$tmpkey] = $_POST[$postkey];
 	}
-	$cookiename=$tmpautoset[0];
-	$cookievalue=json_encode($cookiearrayvalue);
+	$cookiename = $tmpautoset[0];
+	$cookievalue = json_encode($cookiearrayvalue);
 	//var_dump('setcookie cookiename='.$cookiename.' cookievalue='.$cookievalue);
-	setcookie($cookiename, empty($cookievalue)?'':$cookievalue, empty($cookievalue)?0:(time()+(86400*354)), '/', null, false, true);	// keep cookie 1 year and add tag httponly
+	setcookie($cookiename, empty($cookievalue) ? '' : $cookievalue, empty($cookievalue) ? 0 : (time() + (86400 * 354)), '/', null, false, true); // keep cookie 1 year and add tag httponly
 	if (empty($cookievalue)) unset($_COOKIE[$cookiename]);
 }
 
 // Init session. Name of session is specific to Dolibarr instance.
-$prefix=dol_getprefix();
-$sessionname='DOLSESSID_'.$prefix;
-$sessiontimeout='DOLSESSTIMEOUT_'.$prefix;
-if (! empty($_COOKIE[$sessiontimeout])) ini_set('session.gc_maxlifetime',$_COOKIE[$sessiontimeout]);
+$prefix = dol_getprefix();
+$sessionname = 'DOLSESSID_'.$prefix;
+$sessiontimeout = 'DOLSESSTIMEOUT_'.$prefix;
+if (!empty($_COOKIE[$sessiontimeout])) ini_set('session.gc_maxlifetime', $_COOKIE[$sessiontimeout]);
 session_name($sessionname);
-session_set_cookie_params(0, '/', null, false, true);   // Add tag httponly on session cookie (same as setting session.cookie_httponly into php.ini). Must be called before the session_start.
+session_set_cookie_params(0, '/', null, false, true); // Add tag httponly on session cookie (same as setting session.cookie_httponly into php.ini). Must be called before the session_start.
 // This create lock released until session_write_close() or end of page.
 // We need this lock as long as we read/write $_SESSION ['vars']. We can close released when finished.
-if (! defined('NOSESSION'))
+if (!defined('NOSESSION'))
 {
     session_start();
     if (ini_get('register_globals'))    // Deprecated in 5.3 and removed in 5.4. To solve bug in using $_SESSION
@@ -230,42 +230,42 @@ 
 // Detection browser
 if (isset($_SERVER["HTTP_USER_AGENT"]))
 {
-    $tmp=getBrowserInfo($_SERVER["HTTP_USER_AGENT"]);
-    $conf->browser->name=$tmp['browsername'];
-    $conf->browser->os=$tmp['browseros'];
-    $conf->browser->version=$tmp['browserversion'];
-    $conf->browser->layout=$tmp['layout'];     // 'classic', 'phone', 'tablet'
-    $conf->browser->phone=$tmp['phone'];	   // TODO deprecated, use ->layout
-    $conf->browser->tablet=$tmp['tablet'];	   // TODO deprecated, use ->layout
+    $tmp = getBrowserInfo($_SERVER["HTTP_USER_AGENT"]);
+    $conf->browser->name = $tmp['browsername'];
+    $conf->browser->os = $tmp['browseros'];
+    $conf->browser->version = $tmp['browserversion'];
+    $conf->browser->layout = $tmp['layout']; // 'classic', 'phone', 'tablet'
+    $conf->browser->phone = $tmp['phone']; // TODO deprecated, use ->layout
+    $conf->browser->tablet = $tmp['tablet']; // TODO deprecated, use ->layout
     //var_dump($conf->browser);
 
-    if ($conf->browser->layout == 'phone') $conf->dol_no_mouse_hover=1;
-    if ($conf->browser->layout == 'phone') $conf->global->MAIN_TESTMENUHIDER=1;
+    if ($conf->browser->layout == 'phone') $conf->dol_no_mouse_hover = 1;
+    if ($conf->browser->layout == 'phone') $conf->global->MAIN_TESTMENUHIDER = 1;
 }
 
 // Force HTTPS if required ($conf->file->main_force_https is 0/1 or https dolibarr root url)
 // $_SERVER["HTTPS"] is 'on' when link is https, otherwise $_SERVER["HTTPS"] is empty or 'off'
-if (! empty($conf->file->main_force_https) && (empty($_SERVER["HTTPS"]) || $_SERVER["HTTPS"] != 'on'))
+if (!empty($conf->file->main_force_https) && (empty($_SERVER["HTTPS"]) || $_SERVER["HTTPS"] != 'on'))
 {
-    $newurl='';
+    $newurl = '';
     if (is_numeric($conf->file->main_force_https))
     {
-        if ($conf->file->main_force_https == '1' && ! empty($_SERVER["SCRIPT_URI"]))	// If SCRIPT_URI supported by server
+        if ($conf->file->main_force_https == '1' && !empty($_SERVER["SCRIPT_URI"]))	// If SCRIPT_URI supported by server
         {
-            if (preg_match('/^http:/i',$_SERVER["SCRIPT_URI"]) && ! preg_match('/^https:/i',$_SERVER["SCRIPT_URI"]))	// If link is http
+            if (preg_match('/^http:/i', $_SERVER["SCRIPT_URI"]) && !preg_match('/^https:/i', $_SERVER["SCRIPT_URI"]))	// If link is http
             {
-                $newurl=preg_replace('/^http:/i','https:',$_SERVER["SCRIPT_URI"]);
+                $newurl = preg_replace('/^http:/i', 'https:', $_SERVER["SCRIPT_URI"]);
             }
         }
         else	// Check HTTPS environment variable (Apache/mod_ssl only)
         {
-            $newurl=preg_replace('/^http:/i','https:',DOL_MAIN_URL_ROOT).$_SERVER["REQUEST_URI"];
+            $newurl = preg_replace('/^http:/i', 'https:', DOL_MAIN_URL_ROOT).$_SERVER["REQUEST_URI"];
         }
     }
     else
     {
         // Check HTTPS environment variable (Apache/mod_ssl only)
-        $newurl=$conf->file->main_force_https.$_SERVER["REQUEST_URI"];
+        $newurl = $conf->file->main_force_https.$_SERVER["REQUEST_URI"];
     }
     // Start redirect
     if ($newurl)
@@ -282,25 +282,25 @@ 
 
 
 // Loading of additional presentation includes
-if (! defined('NOREQUIREHTML')) require_once DOL_DOCUMENT_ROOT .'/core/class/html.form.class.php';	    // Need 660ko memory (800ko in 2.2)
-if (! defined('NOREQUIREAJAX') && $conf->use_javascript_ajax) require_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';	// Need 22ko memory
+if (!defined('NOREQUIREHTML')) require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php'; // Need 660ko memory (800ko in 2.2)
+if (!defined('NOREQUIREAJAX') && $conf->use_javascript_ajax) require_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php'; // Need 22ko memory
 
 // If install or upgrade process not done or not completely finished, we call the install page.
-if (! empty($conf->global->MAIN_NOT_INSTALLED) || ! empty($conf->global->MAIN_NOT_UPGRADED))
+if (!empty($conf->global->MAIN_NOT_INSTALLED) || !empty($conf->global->MAIN_NOT_UPGRADED))
 {
     dol_syslog("main.inc: A previous install or upgrade was not complete. Redirect to install page.", LOG_WARNING);
     header("Location: ".DOL_URL_ROOT."/install/index.php");
     exit;
 }
 // If an upgrade process is required, we call the install page.
-if ((! empty($conf->global->MAIN_VERSION_LAST_UPGRADE) && ($conf->global->MAIN_VERSION_LAST_UPGRADE != DOL_VERSION))
-|| (empty($conf->global->MAIN_VERSION_LAST_UPGRADE) && ! empty($conf->global->MAIN_VERSION_LAST_INSTALL) && ($conf->global->MAIN_VERSION_LAST_INSTALL != DOL_VERSION)))
+if ((!empty($conf->global->MAIN_VERSION_LAST_UPGRADE) && ($conf->global->MAIN_VERSION_LAST_UPGRADE != DOL_VERSION))
+|| (empty($conf->global->MAIN_VERSION_LAST_UPGRADE) && !empty($conf->global->MAIN_VERSION_LAST_INSTALL) && ($conf->global->MAIN_VERSION_LAST_INSTALL != DOL_VERSION)))
 {
-    $versiontocompare=empty($conf->global->MAIN_VERSION_LAST_UPGRADE)?$conf->global->MAIN_VERSION_LAST_INSTALL:$conf->global->MAIN_VERSION_LAST_UPGRADE;
-    require_once DOL_DOCUMENT_ROOT .'/core/lib/admin.lib.php';
-    $dolibarrversionlastupgrade=preg_split('/[.-]/',$versiontocompare);
-    $dolibarrversionprogram=preg_split('/[.-]/',DOL_VERSION);
-    $rescomp=versioncompare($dolibarrversionprogram,$dolibarrversionlastupgrade);
+    $versiontocompare = empty($conf->global->MAIN_VERSION_LAST_UPGRADE) ? $conf->global->MAIN_VERSION_LAST_INSTALL : $conf->global->MAIN_VERSION_LAST_UPGRADE;
+    require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+    $dolibarrversionlastupgrade = preg_split('/[.-]/', $versiontocompare);
+    $dolibarrversionprogram = preg_split('/[.-]/', DOL_VERSION);
+    $rescomp = versioncompare($dolibarrversionprogram, $dolibarrversionlastupgrade);
     if ($rescomp > 0)   // Programs have a version higher than database. We did not add "&& $rescomp < 3" because we want upgrade process for build upgrades
     {
         dol_syslog("main.inc: database version ".$versiontocompare." is lower than programs version ".DOL_VERSION.". Redirect to install page.", LOG_WARNING);
@@ -310,18 +310,18 @@ 
 }
 
 // Creation of a token against CSRF vulnerabilities
-if (! defined('NOTOKENRENEWAL'))
+if (!defined('NOTOKENRENEWAL'))
 {
     // roulement des jetons car cree a chaque appel
     if (isset($_SESSION['newtoken'])) $_SESSION['token'] = $_SESSION['newtoken'];
 
     // Save in $_SESSION['newtoken'] what will be next token. Into forms, we will add param token = $_SESSION['newtoken']
-    $token = dol_hash(uniqid(mt_rand(),TRUE)); // Generates a hash of a random number
+    $token = dol_hash(uniqid(mt_rand(), TRUE)); // Generates a hash of a random number
     $_SESSION['newtoken'] = $token;
 }
-if (! defined('NOCSRFCHECK') && empty($dolibarr_nocsrfcheck) && ! empty($conf->global->MAIN_SECURITY_CSRF_WITH_TOKEN))	// Check validity of token, only if option enabled (this option breaks some features sometimes)
+if (!defined('NOCSRFCHECK') && empty($dolibarr_nocsrfcheck) && !empty($conf->global->MAIN_SECURITY_CSRF_WITH_TOKEN))	// Check validity of token, only if option enabled (this option breaks some features sometimes)
 {
-    if ($_SERVER['REQUEST_METHOD'] == 'POST' && ! GETPOST('token','alpha')) // Note, offender can still send request by GET
+    if ($_SERVER['REQUEST_METHOD'] == 'POST' && !GETPOST('token', 'alpha')) // Note, offender can still send request by GET
     {
         print "Access refused by CSRF protection in main.inc.php. Token not provided.\n";
         print "If you access your server behind a proxy using url rewriting, you might check that all HTTP header is propagated (or add the line \$dolibarr_nocsrfcheck=1 into your conf.php file).\n";
@@ -331,7 +331,7 @@ 
     {
         if (GETPOST('token', 'alpha') != $_SESSION['token'])
         {
-            dol_syslog("Invalid token in ".$_SERVER['HTTP_REFERER'].", action=".GETPOST('action','aZ09').", _POST['token']=".GETPOST('token','alpha').", _SESSION['token']=".$_SESSION['token'], LOG_WARNING);
+            dol_syslog("Invalid token in ".$_SERVER['HTTP_REFERER'].", action=".GETPOST('action', 'aZ09').", _POST['token']=".GETPOST('token', 'alpha').", _SESSION['token']=".$_SESSION['token'], LOG_WARNING);
             //print 'Unset POST by CSRF protection in main.inc.php.';	// Do not output anything because this create problems when using the BACK button on browsers.
             unset($_POST);
         }
@@ -339,20 +339,20 @@ 
 }
 
 // Disable modules (this must be after session_start and after conf has been loaded)
-if (GETPOST('disablemodules','alpha'))  $_SESSION["disablemodules"]=GETPOST('disablemodules','alpha');
-if (! empty($_SESSION["disablemodules"]))
+if (GETPOST('disablemodules', 'alpha'))  $_SESSION["disablemodules"] = GETPOST('disablemodules', 'alpha');
+if (!empty($_SESSION["disablemodules"]))
 {
-    $disabled_modules=explode(',',$_SESSION["disablemodules"]);
-    foreach($disabled_modules as $module)
+    $disabled_modules = explode(',', $_SESSION["disablemodules"]);
+    foreach ($disabled_modules as $module)
     {
         if ($module)
         {
-        	if (empty($conf->$module)) $conf->$module=new stdClass();
-        	$conf->$module->enabled=false;
+        	if (empty($conf->$module)) $conf->$module = new stdClass();
+        	$conf->$module->enabled = false;
         	if ($module == 'fournisseur')		// Special case
         	{
-        		$conf->supplier_order->enabled=0;
-        		$conf->supplier_invoice->enabled=0;
+        		$conf->supplier_order->enabled = 0;
+        		$conf->supplier_invoice->enabled = 0;
         	}
         }
     }
@@ -362,120 +362,120 @@ 
 /*
  * Phase authentication / login
  */
-$login='';
-if (! defined('NOLOGIN'))
+$login = '';
+if (!defined('NOLOGIN'))
 {
     // $authmode lists the different means of identification to be tested in order of preference.
     // Example: 'http', 'dolibarr', 'ldap', 'http,forceuser'
 
     // Authentication mode
-    if (empty($dolibarr_main_authentication)) $dolibarr_main_authentication='http,dolibarr';
+    if (empty($dolibarr_main_authentication)) $dolibarr_main_authentication = 'http,dolibarr';
     // Authentication mode: forceuser
-    if ($dolibarr_main_authentication == 'forceuser' && empty($dolibarr_auto_user)) $dolibarr_auto_user='auto';
+    if ($dolibarr_main_authentication == 'forceuser' && empty($dolibarr_auto_user)) $dolibarr_auto_user = 'auto';
     // Set authmode
-    $authmode=explode(',',$dolibarr_main_authentication);
+    $authmode = explode(',', $dolibarr_main_authentication);
 
     // No authentication mode
-    if (! count($authmode))
+    if (!count($authmode))
     {
         $langs->load('main');
-        dol_print_error('',$langs->trans("ErrorConfigParameterNotDefined",'dolibarr_main_authentication'));
+        dol_print_error('', $langs->trans("ErrorConfigParameterNotDefined", 'dolibarr_main_authentication'));
         exit;
     }
 
     // If login request was already post, we retrieve login from the session
     // Call module if not realized that his request.
     // At the end of this phase, the variable $login is defined.
-    $resultFetchUser='';
-    $test=true;
-    if (! isset($_SESSION["dol_login"]))
+    $resultFetchUser = '';
+    $test = true;
+    if (!isset($_SESSION["dol_login"]))
     {
         // It is not already authenticated and it requests the login / password
         include_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
 
-        $dol_dst_observed=GETPOST("dst_observed",'int',3);
-        $dol_dst_first=GETPOST("dst_first",'int',3);
-        $dol_dst_second=GETPOST("dst_second",'int',3);
-        $dol_screenwidth=GETPOST("screenwidth",'int',3);
-        $dol_screenheight=GETPOST("screenheight",'int',3);
-        $dol_hide_topmenu=GETPOST('dol_hide_topmenu','int',3);
-        $dol_hide_leftmenu=GETPOST('dol_hide_leftmenu','int',3);
-        $dol_optimize_smallscreen=GETPOST('dol_optimize_smallscreen','int',3);
-        $dol_no_mouse_hover=GETPOST('dol_no_mouse_hover','int',3);
-        $dol_use_jmobile=GETPOST('dol_use_jmobile','int',3);
+        $dol_dst_observed = GETPOST("dst_observed", 'int', 3);
+        $dol_dst_first = GETPOST("dst_first", 'int', 3);
+        $dol_dst_second = GETPOST("dst_second", 'int', 3);
+        $dol_screenwidth = GETPOST("screenwidth", 'int', 3);
+        $dol_screenheight = GETPOST("screenheight", 'int', 3);
+        $dol_hide_topmenu = GETPOST('dol_hide_topmenu', 'int', 3);
+        $dol_hide_leftmenu = GETPOST('dol_hide_leftmenu', 'int', 3);
+        $dol_optimize_smallscreen = GETPOST('dol_optimize_smallscreen', 'int', 3);
+        $dol_no_mouse_hover = GETPOST('dol_no_mouse_hover', 'int', 3);
+        $dol_use_jmobile = GETPOST('dol_use_jmobile', 'int', 3);
         //dol_syslog("POST key=".join(array_keys($_POST),',').' value='.join($_POST,','));
 
         // If in demo mode, we check we go to home page through the public/demo/index.php page
-        if (! empty($dolibarr_main_demo) && $_SERVER['PHP_SELF'] == DOL_URL_ROOT.'/index.php')  // We ask index page
+        if (!empty($dolibarr_main_demo) && $_SERVER['PHP_SELF'] == DOL_URL_ROOT.'/index.php')  // We ask index page
         {
-            if (empty($_SERVER['HTTP_REFERER']) || ! preg_match('/public/',$_SERVER['HTTP_REFERER']))
+            if (empty($_SERVER['HTTP_REFERER']) || !preg_match('/public/', $_SERVER['HTTP_REFERER']))
             {
                 dol_syslog("Call index page from another url than demo page (call is done from page ".$_SERVER['HTTP_REFERER'].")");
-                $url='';
-                $url.=($url?'&':'').($dol_hide_topmenu?'dol_hide_topmenu='.$dol_hide_topmenu:'');
-                $url.=($url?'&':'').($dol_hide_leftmenu?'dol_hide_leftmenu='.$dol_hide_leftmenu:'');
-                $url.=($url?'&':'').($dol_optimize_smallscreen?'dol_optimize_smallscreen='.$dol_optimize_smallscreen:'');
-                $url.=($url?'&':'').($dol_no_mouse_hover?'dol_no_mouse_hover='.$dol_no_mouse_hover:'');
-                $url.=($url?'&':'').($dol_use_jmobile?'dol_use_jmobile='.$dol_use_jmobile:'');
-                $url=DOL_URL_ROOT.'/public/demo/index.php'.($url?'?'.$url:'');
+                $url = '';
+                $url .= ($url ? '&' : '').($dol_hide_topmenu ? 'dol_hide_topmenu='.$dol_hide_topmenu : '');
+                $url .= ($url ? '&' : '').($dol_hide_leftmenu ? 'dol_hide_leftmenu='.$dol_hide_leftmenu : '');
+                $url .= ($url ? '&' : '').($dol_optimize_smallscreen ? 'dol_optimize_smallscreen='.$dol_optimize_smallscreen : '');
+                $url .= ($url ? '&' : '').($dol_no_mouse_hover ? 'dol_no_mouse_hover='.$dol_no_mouse_hover : '');
+                $url .= ($url ? '&' : '').($dol_use_jmobile ? 'dol_use_jmobile='.$dol_use_jmobile : '');
+                $url = DOL_URL_ROOT.'/public/demo/index.php'.($url ? '?'.$url : '');
                 header("Location: ".$url);
                 exit;
             }
         }
 
         // Verification security graphic code
-        if (GETPOST("username","alpha",2) && ! empty($conf->global->MAIN_SECURITY_ENABLECAPTCHA))
+        if (GETPOST("username", "alpha", 2) && !empty($conf->global->MAIN_SECURITY_ENABLECAPTCHA))
         {
             $sessionkey = 'dol_antispam_value';
-            $ok=(array_key_exists($sessionkey, $_SESSION) === TRUE && (strtolower($_SESSION[$sessionkey]) == strtolower($_POST['code'])));
+            $ok = (array_key_exists($sessionkey, $_SESSION) === TRUE && (strtolower($_SESSION[$sessionkey]) == strtolower($_POST['code'])));
 
             // Check code
-            if (! $ok)
+            if (!$ok)
             {
                 dol_syslog('Bad value for code, connexion refused');
                 $langs->load('main');
                 $langs->load('errors');
 
-                $_SESSION["dol_loginmesg"]=$langs->trans("ErrorBadValueForCode");
-                $test=false;
+                $_SESSION["dol_loginmesg"] = $langs->trans("ErrorBadValueForCode");
+                $test = false;
 
                 // TODO @deprecated Remove this. Hook must be used, not this trigger.
-                $user->trigger_mesg='ErrorBadValueForCode - login='.GETPOST("username","alpha",2);
+                $user->trigger_mesg = 'ErrorBadValueForCode - login='.GETPOST("username", "alpha", 2);
                 // Call of triggers
-                include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-                $interface=new Interfaces($db);
-                $result=$interface->run_triggers('USER_LOGIN_FAILED',$user,$user,$langs,$conf);
+                include_once DOL_DOCUMENT_ROOT.'/core/class/interfaces.class.php';
+                $interface = new Interfaces($db);
+                $result = $interface->run_triggers('USER_LOGIN_FAILED', $user, $user, $langs, $conf);
                 if ($result < 0) {
                     $error++;
                 }
                 // End Call of triggers
 
                 // Hooks on failed login
-		        $action='';
+		        $action = '';
 		        $hookmanager->initHooks(array('login'));
-		        $parameters=array('dol_authmode'=>$dol_authmode, 'dol_loginmesg'=>$_SESSION["dol_loginmesg"]);
-		        $reshook=$hookmanager->executeHooks('afterLoginFailed',$parameters,$user,$action);    // Note that $action and $object may have been modified by some hooks
+		        $parameters = array('dol_authmode'=>$dol_authmode, 'dol_loginmesg'=>$_SESSION["dol_loginmesg"]);
+		        $reshook = $hookmanager->executeHooks('afterLoginFailed', $parameters, $user, $action); // Note that $action and $object may have been modified by some hooks
 		        if ($reshook < 0) $error++;
 
 		        // Note: exit is done later
             }
         }
 
-        $usertotest		= (! empty($_COOKIE['login_dolibarr']) ? $_COOKIE['login_dolibarr'] : GETPOST("username","alpha",2));
-        $passwordtotest	= GETPOST('password','none',2);
-        $entitytotest	= (GETPOST('entity','int') ? GETPOST('entity','int') : (!empty($conf->entity) ? $conf->entity : 1));
+        $usertotest = (!empty($_COOKIE['login_dolibarr']) ? $_COOKIE['login_dolibarr'] : GETPOST("username", "alpha", 2));
+        $passwordtotest = GETPOST('password', 'none', 2);
+        $entitytotest = (GETPOST('entity', 'int') ? GETPOST('entity', 'int') : (!empty($conf->entity) ? $conf->entity : 1));
 
         // Define if we received data to test the login.
-        $goontestloop=false;
-        if (isset($_SERVER["REMOTE_USER"]) && in_array('http',$authmode)) $goontestloop=true;
-        if ($dolibarr_main_authentication == 'forceuser' && ! empty($dolibarr_auto_user)) $goontestloop=true;
-        if (GETPOST("username","alpha",2) || ! empty($_COOKIE['login_dolibarr']) || GETPOST('openid_mode','alpha',1)) $goontestloop=true;
+        $goontestloop = false;
+        if (isset($_SERVER["REMOTE_USER"]) && in_array('http', $authmode)) $goontestloop = true;
+        if ($dolibarr_main_authentication == 'forceuser' && !empty($dolibarr_auto_user)) $goontestloop = true;
+        if (GETPOST("username", "alpha", 2) || !empty($_COOKIE['login_dolibarr']) || GETPOST('openid_mode', 'alpha', 1)) $goontestloop = true;
 
-        if (! is_object($langs)) // This can occurs when calling page with NOREQUIRETRAN defined, however we need langs for error messages.
+        if (!is_object($langs)) // This can occurs when calling page with NOREQUIRETRAN defined, however we need langs for error messages.
         {
             include_once DOL_DOCUMENT_ROOT.'/core/class/translate.class.php';
-            $langs=new Translate("",$conf);
-    		$langcode=(GETPOST('lang','aZ09',1)?GETPOST('lang','aZ09',1):(empty($conf->global->MAIN_LANG_DEFAULT)?'auto':$conf->global->MAIN_LANG_DEFAULT));
+            $langs = new Translate("", $conf);
+    		$langcode = (GETPOST('lang', 'aZ09', 1) ?GETPOST('lang', 'aZ09', 1) : (empty($conf->global->MAIN_LANG_DEFAULT) ? 'auto' : $conf->global->MAIN_LANG_DEFAULT));
         	$langs->setDefaultLang($langcode);
         }
 
@@ -484,53 +484,53 @@ 
         // If error, we will put error message in session under the name dol_loginmesg
         if ($test && $goontestloop)
         {
-        	$login = checkLoginPassEntity($usertotest,$passwordtotest,$entitytotest,$authmode);
+        	$login = checkLoginPassEntity($usertotest, $passwordtotest, $entitytotest, $authmode);
         	if ($login)
             {
-                $dol_authmode=$conf->authmode;	// This properties is defined only when logged, to say what mode was successfully used
-                $dol_tz=$_POST["tz"];
-                $dol_tz_string=$_POST["tz_string"];
-                $dol_tz_string=preg_replace('/\s*\(.+\)$/','',$dol_tz_string);
-                $dol_tz_string=preg_replace('/,/','/',$dol_tz_string);
-                $dol_tz_string=preg_replace('/\s/','_',$dol_tz_string);
-                $dol_dst=0;
+                $dol_authmode = $conf->authmode; // This properties is defined only when logged, to say what mode was successfully used
+                $dol_tz = $_POST["tz"];
+                $dol_tz_string = $_POST["tz_string"];
+                $dol_tz_string = preg_replace('/\s*\(.+\)$/', '', $dol_tz_string);
+                $dol_tz_string = preg_replace('/,/', '/', $dol_tz_string);
+                $dol_tz_string = preg_replace('/\s/', '_', $dol_tz_string);
+                $dol_dst = 0;
                 if (isset($_POST["dst_first"]) && isset($_POST["dst_second"]))
                 {
                     include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-                    $datenow=dol_now();
-                    $datefirst=dol_stringtotime($_POST["dst_first"]);
-                    $datesecond=dol_stringtotime($_POST["dst_second"]);
-                    if ($datenow >= $datefirst && $datenow < $datesecond) $dol_dst=1;
+                    $datenow = dol_now();
+                    $datefirst = dol_stringtotime($_POST["dst_first"]);
+                    $datesecond = dol_stringtotime($_POST["dst_second"]);
+                    if ($datenow >= $datefirst && $datenow < $datesecond) $dol_dst = 1;
                 }
                 //print $datefirst.'-'.$datesecond.'-'.$datenow.'-'.$dol_tz.'-'.$dol_tzstring.'-'.$dol_dst; exit;
             }
 
-            if (! $login)
+            if (!$login)
             {
-                dol_syslog('Bad password, connexion refused',LOG_DEBUG);
+                dol_syslog('Bad password, connexion refused', LOG_DEBUG);
                 $langs->load('main');
                 $langs->load('errors');
 
                 // Bad password. No authmode has found a good password.
                 // We set a generic message if not defined inside function checkLoginPassEntity or subfunctions
-                if (empty($_SESSION["dol_loginmesg"])) $_SESSION["dol_loginmesg"]=$langs->trans("ErrorBadLoginPassword");
+                if (empty($_SESSION["dol_loginmesg"])) $_SESSION["dol_loginmesg"] = $langs->trans("ErrorBadLoginPassword");
 
                 // TODO @deprecated Remove this. Hook must be used, not this trigger.
-                $user->trigger_mesg=$langs->trans("ErrorBadLoginPassword").' - login='.GETPOST("username","alpha",2);
+                $user->trigger_mesg = $langs->trans("ErrorBadLoginPassword").' - login='.GETPOST("username", "alpha", 2);
                 // Call of triggers
                 include_once DOL_DOCUMENT_ROOT.'/core/class/interfaces.class.php';
-                $interface=new Interfaces($db);
-                $result=$interface->run_triggers('USER_LOGIN_FAILED',$user,$user,$langs,$conf,GETPOST("username","alpha",2));
+                $interface = new Interfaces($db);
+                $result = $interface->run_triggers('USER_LOGIN_FAILED', $user, $user, $langs, $conf, GETPOST("username", "alpha", 2));
                 if ($result < 0) {
                     $error++;
                 }
                 // End Call of triggers
 
                 // Hooks on failed login
-		        $action='';
+		        $action = '';
 		        $hookmanager->initHooks(array('login'));
-		        $parameters=array('dol_authmode'=>$dol_authmode, 'dol_loginmesg'=>$_SESSION["dol_loginmesg"]);
-		        $reshook=$hookmanager->executeHooks('afterLoginFailed',$parameters,$user,$action);    // Note that $action and $object may have been modified by some hooks
+		        $parameters = array('dol_authmode'=>$dol_authmode, 'dol_loginmesg'=>$_SESSION["dol_loginmesg"]);
+		        $reshook = $hookmanager->executeHooks('afterLoginFailed', $parameters, $user, $action); // Note that $action and $object may have been modified by some hooks
 		        if ($reshook < 0) $error++;
 
 		        // Note: exit is done in next chapter
@@ -538,123 +538,123 @@ 
         }
 
         // End test login / passwords
-        if (! $login || (in_array('ldap',$authmode) && empty($passwordtotest)))	// With LDAP we refused empty password because some LDAP are "opened" for anonymous access so connexion is a success.
+        if (!$login || (in_array('ldap', $authmode) && empty($passwordtotest)))	// With LDAP we refused empty password because some LDAP are "opened" for anonymous access so connexion is a success.
         {
             // No data to test login, so we show the login page
 			dol_syslog("--- Access to ".$_SERVER["PHP_SELF"]." showing the login form and exit");
 			if (defined('NOREDIRECTBYMAINTOLOGIN')) return 'ERROR_NOT_LOGGED';
-        	else dol_loginfunction($langs,$conf,(! empty($mysoc)?$mysoc:''));
+        	else dol_loginfunction($langs, $conf, (!empty($mysoc) ? $mysoc : ''));
             exit;
         }
 
-        $resultFetchUser=$user->fetch('', $login, '', 1, ($entitytotest > 0 ? $entitytotest : -1));
+        $resultFetchUser = $user->fetch('', $login, '', 1, ($entitytotest > 0 ? $entitytotest : -1));
         if ($resultFetchUser <= 0)
         {
             dol_syslog('User not found, connexion refused');
             session_destroy();
             session_name($sessionname);
-            session_set_cookie_params(0, '/', null, false, true);   // Add tag httponly on session cookie
-            session_start();    // Fixing the bug of register_globals here is useless since session is empty
+            session_set_cookie_params(0, '/', null, false, true); // Add tag httponly on session cookie
+            session_start(); // Fixing the bug of register_globals here is useless since session is empty
 
             if ($resultFetchUser == 0)
             {
                 $langs->load('main');
                 $langs->load('errors');
 
-                $_SESSION["dol_loginmesg"]=$langs->trans("ErrorCantLoadUserFromDolibarrDatabase",$login);
+                $_SESSION["dol_loginmesg"] = $langs->trans("ErrorCantLoadUserFromDolibarrDatabase", $login);
 
                 // TODO @deprecated Remove this. Hook must be used, not this trigger.
-                $user->trigger_mesg='ErrorCantLoadUserFromDolibarrDatabase - login='.$login;
+                $user->trigger_mesg = 'ErrorCantLoadUserFromDolibarrDatabase - login='.$login;
             }
             if ($resultFetchUser < 0)
             {
-                $_SESSION["dol_loginmesg"]=$user->error;
+                $_SESSION["dol_loginmesg"] = $user->error;
 
                 // TODO @deprecated Remove this. Hook must be used, not this trigger.
-                $user->trigger_mesg=$user->error;
+                $user->trigger_mesg = $user->error;
             }
 
             // Call triggers
-            include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-            $interface=new Interfaces($db);
-            $result=$interface->run_triggers('USER_LOGIN_FAILED',$user,$user,$langs,$conf);
+            include_once DOL_DOCUMENT_ROOT.'/core/class/interfaces.class.php';
+            $interface = new Interfaces($db);
+            $result = $interface->run_triggers('USER_LOGIN_FAILED', $user, $user, $langs, $conf);
             if ($result < 0) {
                 $error++;
             }
             // End call triggers
 
 	        // Hooks on failed login
-	        $action='';
+	        $action = '';
 	        $hookmanager->initHooks(array('login'));
-	        $parameters=array('dol_authmode'=>$dol_authmode, 'dol_loginmesg'=>$_SESSION["dol_loginmesg"]);
-	        $reshook=$hookmanager->executeHooks('afterLoginFailed',$parameters,$user,$action);    // Note that $action and $object may have been modified by some hooks
+	        $parameters = array('dol_authmode'=>$dol_authmode, 'dol_loginmesg'=>$_SESSION["dol_loginmesg"]);
+	        $reshook = $hookmanager->executeHooks('afterLoginFailed', $parameters, $user, $action); // Note that $action and $object may have been modified by some hooks
 	        if ($reshook < 0) $error++;
 
-	        $paramsurl=array();
-	        if (GETPOST('textbrowser','int')) $paramsurl[]='textbrowser='.GETPOST('textbrowser','int');
-	        if (GETPOST('nojs','int'))        $paramsurl[]='nojs='.GETPOST('nojs','int');
-	        if (GETPOST('lang','aZ09'))       $paramsurl[]='lang='.GETPOST('lang','aZ09');
-            header('Location: '.DOL_URL_ROOT.'/index.php'.(count($paramsurl)?'?'.implode('&',$paramsurl):''));
+	        $paramsurl = array();
+	        if (GETPOST('textbrowser', 'int')) $paramsurl[] = 'textbrowser='.GETPOST('textbrowser', 'int');
+	        if (GETPOST('nojs', 'int'))        $paramsurl[] = 'nojs='.GETPOST('nojs', 'int');
+	        if (GETPOST('lang', 'aZ09'))       $paramsurl[] = 'lang='.GETPOST('lang', 'aZ09');
+            header('Location: '.DOL_URL_ROOT.'/index.php'.(count($paramsurl) ? '?'.implode('&', $paramsurl) : ''));
             exit;
         }
     }
     else
     {
         // We are already into an authenticated session
-        $login=$_SESSION["dol_login"];
-        $entity=$_SESSION["dol_entity"];
+        $login = $_SESSION["dol_login"];
+        $entity = $_SESSION["dol_entity"];
         dol_syslog("- This is an already logged session. _SESSION['dol_login']=".$login." _SESSION['dol_entity']=".$entity, LOG_DEBUG);
 
-        $resultFetchUser=$user->fetch('', $login, '', 1, ($entity > 0 ? $entity : -1));
+        $resultFetchUser = $user->fetch('', $login, '', 1, ($entity > 0 ? $entity : -1));
         if ($resultFetchUser <= 0)
         {
             // Account has been removed after login
             dol_syslog("Can't load user even if session logged. _SESSION['dol_login']=".$login, LOG_WARNING);
             session_destroy();
             session_name($sessionname);
-            session_set_cookie_params(0, '/', null, false, true);   // Add tag httponly on session cookie
-            session_start();    // Fixing the bug of register_globals here is useless since session is empty
+            session_set_cookie_params(0, '/', null, false, true); // Add tag httponly on session cookie
+            session_start(); // Fixing the bug of register_globals here is useless since session is empty
 
             if ($resultFetchUser == 0)
             {
                 $langs->load('main');
                 $langs->load('errors');
 
-                $_SESSION["dol_loginmesg"]=$langs->trans("ErrorCantLoadUserFromDolibarrDatabase",$login);
+                $_SESSION["dol_loginmesg"] = $langs->trans("ErrorCantLoadUserFromDolibarrDatabase", $login);
 
                 // TODO @deprecated Remove this. Hook must be used, not this trigger.
-                $user->trigger_mesg='ErrorCantLoadUserFromDolibarrDatabase - login='.$login;
+                $user->trigger_mesg = 'ErrorCantLoadUserFromDolibarrDatabase - login='.$login;
             }
             if ($resultFetchUser < 0)
             {
-                $_SESSION["dol_loginmesg"]=$user->error;
+                $_SESSION["dol_loginmesg"] = $user->error;
 
                 // TODO @deprecated Remove this. Hook must be used, not this trigger.
-                $user->trigger_mesg=$user->error;
+                $user->trigger_mesg = $user->error;
             }
 
             // TODO @deprecated Remove this. Hook must be used, not this trigger.
             // Call triggers
-            include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-            $interface=new Interfaces($db);
-            $result=$interface->run_triggers('USER_LOGIN_FAILED',$user,$user,$langs,$conf);
+            include_once DOL_DOCUMENT_ROOT.'/core/class/interfaces.class.php';
+            $interface = new Interfaces($db);
+            $result = $interface->run_triggers('USER_LOGIN_FAILED', $user, $user, $langs, $conf);
             if ($result < 0) {
                 $error++;
             }
             // End call triggers
 
 	        // Hooks on failed login
-	        $action='';
+	        $action = '';
 	        $hookmanager->initHooks(array('login'));
-	        $parameters=array('dol_authmode'=>$dol_authmode, 'dol_loginmesg'=>$_SESSION["dol_loginmesg"]);
-	        $reshook=$hookmanager->executeHooks('afterLoginFailed',$parameters,$user,$action);    // Note that $action and $object may have been modified by some hooks
+	        $parameters = array('dol_authmode'=>$dol_authmode, 'dol_loginmesg'=>$_SESSION["dol_loginmesg"]);
+	        $reshook = $hookmanager->executeHooks('afterLoginFailed', $parameters, $user, $action); // Note that $action and $object may have been modified by some hooks
 	        if ($reshook < 0) $error++;
 
-	        $paramsurl=array();
-	        if (GETPOST('textbrowser','int')) $paramsurl[]='textbrowser='.GETPOST('textbrowser','int');
-	        if (GETPOST('nojs','int'))        $paramsurl[]='nojs='.GETPOST('nojs','int');
-	        if (GETPOST('lang','aZ09'))       $paramsurl[]='lang='.GETPOST('lang','aZ09');
-            header('Location: '.DOL_URL_ROOT.'/index.php'.(count($paramsurl)?'?'.implode('&',$paramsurl):''));
+	        $paramsurl = array();
+	        if (GETPOST('textbrowser', 'int')) $paramsurl[] = 'textbrowser='.GETPOST('textbrowser', 'int');
+	        if (GETPOST('nojs', 'int'))        $paramsurl[] = 'nojs='.GETPOST('nojs', 'int');
+	        if (GETPOST('lang', 'aZ09'))       $paramsurl[] = 'lang='.GETPOST('lang', 'aZ09');
+            header('Location: '.DOL_URL_ROOT.'/index.php'.(count($paramsurl) ? '?'.implode('&', $paramsurl) : ''));
             exit;
         }
         else
@@ -663,19 +663,19 @@ 
 	       $hookmanager->initHooks(array('main'));
 
 	       // Code for search criteria persistence.
-	       if (! empty($_GET['save_lastsearch_values']))    // Keep $_GET here
+	       if (!empty($_GET['save_lastsearch_values']))    // Keep $_GET here
 	       {
-               $relativepathstring = preg_replace('/\?.*$/','',$_SERVER["HTTP_REFERER"]);
-               $relativepathstring = preg_replace('/^https?:\/\/[^\/]*/','',$relativepathstring);     // Get full path except host server
+               $relativepathstring = preg_replace('/\?.*$/', '', $_SERVER["HTTP_REFERER"]);
+               $relativepathstring = preg_replace('/^https?:\/\/[^\/]*/', '', $relativepathstring); // Get full path except host server
                // Clean $relativepathstring
-   	           if (constant('DOL_URL_ROOT')) $relativepathstring = preg_replace('/^'.preg_quote(constant('DOL_URL_ROOT'),'/').'/', '', $relativepathstring);
+   	           if (constant('DOL_URL_ROOT')) $relativepathstring = preg_replace('/^'.preg_quote(constant('DOL_URL_ROOT'), '/').'/', '', $relativepathstring);
                $relativepathstring = preg_replace('/^\//', '', $relativepathstring);
                $relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);
                //var_dump($relativepathstring);
 
-               if (! empty($_SESSION['lastsearch_values_tmp_'.$relativepathstring]))
+               if (!empty($_SESSION['lastsearch_values_tmp_'.$relativepathstring]))
                {
-                   $_SESSION['lastsearch_values_'.$relativepathstring]=$_SESSION['lastsearch_values_tmp_'.$relativepathstring];
+                   $_SESSION['lastsearch_values_'.$relativepathstring] = $_SESSION['lastsearch_values_tmp_'.$relativepathstring];
                    unset($_SESSION['lastsearch_values_tmp_'.$relativepathstring]);
                }
 	       }
@@ -690,30 +690,30 @@ 
 
     // Is it a new session that has started ?
     // If we are here, this means authentication was successfull.
-    if (! isset($_SESSION["dol_login"]))
+    if (!isset($_SESSION["dol_login"]))
     {
         // New session for this login has started.
-    	$error=0;
+    	$error = 0;
 
     	// Store value into session (values always stored)
-        $_SESSION["dol_login"]=$user->login;
-        $_SESSION["dol_authmode"]=isset($dol_authmode)?$dol_authmode:'';
-        $_SESSION["dol_tz"]=isset($dol_tz)?$dol_tz:'';
-        $_SESSION["dol_tz_string"]=isset($dol_tz_string)?$dol_tz_string:'';
-        $_SESSION["dol_dst"]=isset($dol_dst)?$dol_dst:'';
-        $_SESSION["dol_dst_observed"]=isset($dol_dst_observed)?$dol_dst_observed:'';
-        $_SESSION["dol_dst_first"]=isset($dol_dst_first)?$dol_dst_first:'';
-        $_SESSION["dol_dst_second"]=isset($dol_dst_second)?$dol_dst_second:'';
-        $_SESSION["dol_screenwidth"]=isset($dol_screenwidth)?$dol_screenwidth:'';
-        $_SESSION["dol_screenheight"]=isset($dol_screenheight)?$dol_screenheight:'';
-        $_SESSION["dol_company"]=$conf->global->MAIN_INFO_SOCIETE_NOM;
-        $_SESSION["dol_entity"]=$conf->entity;
+        $_SESSION["dol_login"] = $user->login;
+        $_SESSION["dol_authmode"] = isset($dol_authmode) ? $dol_authmode : '';
+        $_SESSION["dol_tz"] = isset($dol_tz) ? $dol_tz : '';
+        $_SESSION["dol_tz_string"] = isset($dol_tz_string) ? $dol_tz_string : '';
+        $_SESSION["dol_dst"] = isset($dol_dst) ? $dol_dst : '';
+        $_SESSION["dol_dst_observed"] = isset($dol_dst_observed) ? $dol_dst_observed : '';
+        $_SESSION["dol_dst_first"] = isset($dol_dst_first) ? $dol_dst_first : '';
+        $_SESSION["dol_dst_second"] = isset($dol_dst_second) ? $dol_dst_second : '';
+        $_SESSION["dol_screenwidth"] = isset($dol_screenwidth) ? $dol_screenwidth : '';
+        $_SESSION["dol_screenheight"] = isset($dol_screenheight) ? $dol_screenheight : '';
+        $_SESSION["dol_company"] = $conf->global->MAIN_INFO_SOCIETE_NOM;
+        $_SESSION["dol_entity"] = $conf->entity;
     	// Store value into session (values stored only if defined)
-        if (! empty($dol_hide_topmenu))         $_SESSION['dol_hide_topmenu']=$dol_hide_topmenu;
-        if (! empty($dol_hide_leftmenu))        $_SESSION['dol_hide_leftmenu']=$dol_hide_leftmenu;
-        if (! empty($dol_optimize_smallscreen)) $_SESSION['dol_optimize_smallscreen']=$dol_optimize_smallscreen;
-        if (! empty($dol_no_mouse_hover))       $_SESSION['dol_no_mouse_hover']=$dol_no_mouse_hover;
-        if (! empty($dol_use_jmobile))          $_SESSION['dol_use_jmobile']=$dol_use_jmobile;
+        if (!empty($dol_hide_topmenu))         $_SESSION['dol_hide_topmenu'] = $dol_hide_topmenu;
+        if (!empty($dol_hide_leftmenu))        $_SESSION['dol_hide_leftmenu'] = $dol_hide_leftmenu;
+        if (!empty($dol_optimize_smallscreen)) $_SESSION['dol_optimize_smallscreen'] = $dol_optimize_smallscreen;
+        if (!empty($dol_no_mouse_hover))       $_SESSION['dol_no_mouse_hover'] = $dol_no_mouse_hover;
+        if (!empty($dol_use_jmobile))          $_SESSION['dol_use_jmobile'] = $dol_use_jmobile;
 
         dol_syslog("This is a new started user session. _SESSION['dol_login']=".$_SESSION["dol_login"]." Session id=".session_id());
 
@@ -726,26 +726,26 @@ 
         // TODO @deprecated Remove this. Hook must be used, not this trigger.
         $user->trigger_mesg = $loginfo;
         // Call triggers
-        include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-        $interface=new Interfaces($db);
-        $result=$interface->run_triggers('USER_LOGIN',$user,$user,$langs,$conf);
+        include_once DOL_DOCUMENT_ROOT.'/core/class/interfaces.class.php';
+        $interface = new Interfaces($db);
+        $result = $interface->run_triggers('USER_LOGIN', $user, $user, $langs, $conf);
         if ($result < 0) {
             $error++;
         }
         // End call triggers
 
         // Hooks on successfull login
-        $action='';
+        $action = '';
         $hookmanager->initHooks(array('login'));
-        $parameters=array('dol_authmode'=>$dol_authmode, 'dol_loginfo'=>$loginfo);
-        $reshook=$hookmanager->executeHooks('afterLogin',$parameters,$user,$action);    // Note that $action and $object may have been modified by some hooks
+        $parameters = array('dol_authmode'=>$dol_authmode, 'dol_loginfo'=>$loginfo);
+        $reshook = $hookmanager->executeHooks('afterLogin', $parameters, $user, $action); // Note that $action and $object may have been modified by some hooks
         if ($reshook < 0) $error++;
 
         if ($error)
         {
             $db->rollback();
             session_destroy();
-            dol_print_error($db,'Error in some hooks afterLogin (or old trigger USER_LOGIN)');
+            dol_print_error($db, 'Error in some hooks afterLogin (or old trigger USER_LOGIN)');
             exit;
         }
         else
@@ -754,10 +754,10 @@ 
         }
 
         // Change landing page if defined.
-        $landingpage=(empty($user->conf->MAIN_LANDING_PAGE)?(empty($conf->global->MAIN_LANDING_PAGE)?'':$conf->global->MAIN_LANDING_PAGE):$user->conf->MAIN_LANDING_PAGE);
-        if (! empty($landingpage))    // Example: /index.php
+        $landingpage = (empty($user->conf->MAIN_LANDING_PAGE) ? (empty($conf->global->MAIN_LANDING_PAGE) ? '' : $conf->global->MAIN_LANDING_PAGE) : $user->conf->MAIN_LANDING_PAGE);
+        if (!empty($landingpage))    // Example: /index.php
         {
-            $newpath=dol_buildpath($landingpage, 1);
+            $newpath = dol_buildpath($landingpage, 1);
             if ($_SERVER["PHP_SELF"] != $newpath)   // not already on landing page (avoid infinite loop)
             {
                 header('Location: '.$newpath);
@@ -770,12 +770,12 @@ 
     // If user admin, we force the rights-based modules
     if ($user->admin)
     {
-        $user->rights->user->user->lire=1;
-        $user->rights->user->user->creer=1;
-        $user->rights->user->user->password=1;
-        $user->rights->user->user->supprimer=1;
-        $user->rights->user->self->creer=1;
-        $user->rights->user->self->password=1;
+        $user->rights->user->user->lire = 1;
+        $user->rights->user->user->creer = 1;
+        $user->rights->user->user->password = 1;
+        $user->rights->user->user->supprimer = 1;
+        $user->rights->user->self->creer = 1;
+        $user->rights->user->self->password = 1;
     }
 
     /*
@@ -783,70 +783,70 @@ 
      */
 
     // Set liste_limit
-    if (isset($user->conf->MAIN_SIZE_LISTE_LIMIT))	$conf->liste_limit = $user->conf->MAIN_SIZE_LISTE_LIMIT;	// Can be 0
-    if (isset($user->conf->PRODUIT_LIMIT_SIZE))	$conf->product->limit_size = $user->conf->PRODUIT_LIMIT_SIZE;	// Can be 0
+    if (isset($user->conf->MAIN_SIZE_LISTE_LIMIT))	$conf->liste_limit = $user->conf->MAIN_SIZE_LISTE_LIMIT; // Can be 0
+    if (isset($user->conf->PRODUIT_LIMIT_SIZE))	$conf->product->limit_size = $user->conf->PRODUIT_LIMIT_SIZE; // Can be 0
 
     // Replace conf->css by personalized value if theme not forced
-    if (empty($conf->global->MAIN_FORCETHEME) && ! empty($user->conf->MAIN_THEME))
+    if (empty($conf->global->MAIN_FORCETHEME) && !empty($user->conf->MAIN_THEME))
     {
-        $conf->theme=$user->conf->MAIN_THEME;
+        $conf->theme = $user->conf->MAIN_THEME;
         $conf->css  = "/theme/".$conf->theme."/style.css.php";
     }
 }
 
 // Case forcing style from url
-if (GETPOST('theme','alpha'))
+if (GETPOST('theme', 'alpha'))
 {
-	$conf->theme=GETPOST('theme','alpha',1);
+	$conf->theme = GETPOST('theme', 'alpha', 1);
 	$conf->css  = "/theme/".$conf->theme."/style.css.php";
 }
 
 
 // Set javascript option
-if (! GETPOST('nojs','int'))   // If javascript was not disabled on URL
+if (!GETPOST('nojs', 'int'))   // If javascript was not disabled on URL
 {
-	if (! empty($user->conf->MAIN_DISABLE_JAVASCRIPT))
+	if (!empty($user->conf->MAIN_DISABLE_JAVASCRIPT))
 	{
-		$conf->use_javascript_ajax=! $user->conf->MAIN_DISABLE_JAVASCRIPT;
+		$conf->use_javascript_ajax = !$user->conf->MAIN_DISABLE_JAVASCRIPT;
 	}
 }
-else $conf->use_javascript_ajax=0;
+else $conf->use_javascript_ajax = 0;
 // Set MAIN_OPTIMIZEFORTEXTBROWSER
-if (GETPOST('textbrowser','int') || (! empty($conf->browser->name) && $conf->browser->name == 'lynxlinks') || ! empty($user->conf->MAIN_OPTIMIZEFORTEXTBROWSER))   // If we must enable text browser
+if (GETPOST('textbrowser', 'int') || (!empty($conf->browser->name) && $conf->browser->name == 'lynxlinks') || !empty($user->conf->MAIN_OPTIMIZEFORTEXTBROWSER))   // If we must enable text browser
 {
-    $conf->global->MAIN_OPTIMIZEFORTEXTBROWSER=1;
+    $conf->global->MAIN_OPTIMIZEFORTEXTBROWSER = 1;
 }
 
 // Set terminal output option according to conf->browser.
-if (GETPOST('dol_hide_leftmenu','int') || ! empty($_SESSION['dol_hide_leftmenu']))               $conf->dol_hide_leftmenu=1;
-if (GETPOST('dol_hide_topmenu','int') || ! empty($_SESSION['dol_hide_topmenu']))                 $conf->dol_hide_topmenu=1;
-if (GETPOST('dol_optimize_smallscreen','int') || ! empty($_SESSION['dol_optimize_smallscreen'])) $conf->dol_optimize_smallscreen=1;
-if (GETPOST('dol_no_mouse_hover','int') || ! empty($_SESSION['dol_no_mouse_hover']))             $conf->dol_no_mouse_hover=1;
-if (GETPOST('dol_use_jmobile','int') || ! empty($_SESSION['dol_use_jmobile']))                   $conf->dol_use_jmobile=1;
-if (! empty($conf->browser->layout) && $conf->browser->layout != 'classic') $conf->dol_no_mouse_hover=1;
-if ((! empty($conf->browser->layout) && $conf->browser->layout == 'phone')
-	|| (! empty($_SESSION['dol_screenwidth']) && $_SESSION['dol_screenwidth'] < 400)
-	|| (! empty($_SESSION['dol_screenheight']) && $_SESSION['dol_screenheight'] < 400)
+if (GETPOST('dol_hide_leftmenu', 'int') || !empty($_SESSION['dol_hide_leftmenu']))               $conf->dol_hide_leftmenu = 1;
+if (GETPOST('dol_hide_topmenu', 'int') || !empty($_SESSION['dol_hide_topmenu']))                 $conf->dol_hide_topmenu = 1;
+if (GETPOST('dol_optimize_smallscreen', 'int') || !empty($_SESSION['dol_optimize_smallscreen'])) $conf->dol_optimize_smallscreen = 1;
+if (GETPOST('dol_no_mouse_hover', 'int') || !empty($_SESSION['dol_no_mouse_hover']))             $conf->dol_no_mouse_hover = 1;
+if (GETPOST('dol_use_jmobile', 'int') || !empty($_SESSION['dol_use_jmobile']))                   $conf->dol_use_jmobile = 1;
+if (!empty($conf->browser->layout) && $conf->browser->layout != 'classic') $conf->dol_no_mouse_hover = 1;
+if ((!empty($conf->browser->layout) && $conf->browser->layout == 'phone')
+	|| (!empty($_SESSION['dol_screenwidth']) && $_SESSION['dol_screenwidth'] < 400)
+	|| (!empty($_SESSION['dol_screenheight']) && $_SESSION['dol_screenheight'] < 400)
 )
 {
-	$conf->dol_optimize_smallscreen=1;
+	$conf->dol_optimize_smallscreen = 1;
 }
 // If we force to use jmobile, then we reenable javascript
-if (! empty($conf->dol_use_jmobile)) $conf->use_javascript_ajax=1;
+if (!empty($conf->dol_use_jmobile)) $conf->use_javascript_ajax = 1;
 // Replace themes bugged with jmobile with eldy
-if (! empty($conf->dol_use_jmobile) && in_array($conf->theme,array('bureau2crea','cameleo','amarok')))
+if (!empty($conf->dol_use_jmobile) && in_array($conf->theme, array('bureau2crea', 'cameleo', 'amarok')))
 {
-	$conf->theme='eldy';
-	$conf->css  =  "/theme/".$conf->theme."/style.css.php";
+	$conf->theme = 'eldy';
+	$conf->css  = "/theme/".$conf->theme."/style.css.php";
 }
 //var_dump($conf->browser->phone);
 
-if (! defined('NOREQUIRETRAN'))
+if (!defined('NOREQUIRETRAN'))
 {
-    if (! GETPOST('lang','aZ09'))	// If language was not forced on URL
+    if (!GETPOST('lang', 'aZ09'))	// If language was not forced on URL
     {
         // If user has chosen its own language
-        if (! empty($user->conf->MAIN_LANG_DEFAULT))
+        if (!empty($user->conf->MAIN_LANG_DEFAULT))
         {
             // If different than current language
             //print ">>>".$langs->getDefaultLang()."-".$user->conf->MAIN_LANG_DEFAULT;
@@ -858,11 +858,11 @@ 
     }
 }
 
-if (! defined('NOLOGIN'))
+if (!defined('NOLOGIN'))
 {
     // If the login is not recovered, it is identified with an account that does not exist.
     // Hacking attempt?
-    if (! $user->login) accessforbidden();
+    if (!$user->login) accessforbidden();
 
     // Check if user is active
     if ($user->statut < 1)
@@ -879,88 +879,88 @@ 
 }
 
 
-dol_syslog("--- Access to ".$_SERVER["PHP_SELF"].' - action='.GETPOST('action','az09').', massaction='.GETPOST('massaction','az09'));
+dol_syslog("--- Access to ".$_SERVER["PHP_SELF"].' - action='.GETPOST('action', 'az09').', massaction='.GETPOST('massaction', 'az09'));
 //Another call for easy debugg
 //dol_syslog("Access to ".$_SERVER["PHP_SELF"].' GET='.join(',',array_keys($_GET)).'->'.join(',',$_GET).' POST:'.join(',',array_keys($_POST)).'->'.join(',',$_POST));
 
 // Load main languages files
-if (! defined('NOREQUIRETRAN'))
+if (!defined('NOREQUIRETRAN'))
 {
     $langs->load("main");
     $langs->load("dict");
 }
 
 // Define some constants used for style of arrays
-$bc=array(0=>'class="impair"',1=>'class="pair"');
-$bcdd=array(0=>'class="drag drop oddeven"',1=>'class="drag drop oddeven"');
-$bcnd=array(0=>'class="nodrag nodrop nohover"',1=>'class="nodrag nodrop nohoverpair"');		// Used for tr to add new lines
-$bctag=array(0=>'class="impair tagtr"',1=>'class="pair tagtr"');
+$bc = array(0=>'class="impair"', 1=>'class="pair"');
+$bcdd = array(0=>'class="drag drop oddeven"', 1=>'class="drag drop oddeven"');
+$bcnd = array(0=>'class="nodrag nodrop nohover"', 1=>'class="nodrag nodrop nohoverpair"'); // Used for tr to add new lines
+$bctag = array(0=>'class="impair tagtr"', 1=>'class="pair tagtr"');
 
 // Define messages variables
-$mesg=''; $warning=''; $error=0;
+$mesg = ''; $warning = ''; $error = 0;
 // deprecated, see setEventMessages() and dol_htmloutput_events()
-$mesgs=array(); $warnings=array(); $errors=array();
+$mesgs = array(); $warnings = array(); $errors = array();
 
 // Constants used to defined number of lines in textarea
 if (empty($conf->browser->firefox))
 {
-    define('ROWS_1',1);
-    define('ROWS_2',2);
-    define('ROWS_3',3);
-    define('ROWS_4',4);
-    define('ROWS_5',5);
-    define('ROWS_6',6);
-    define('ROWS_7',7);
-    define('ROWS_8',8);
-    define('ROWS_9',9);
+    define('ROWS_1', 1);
+    define('ROWS_2', 2);
+    define('ROWS_3', 3);
+    define('ROWS_4', 4);
+    define('ROWS_5', 5);
+    define('ROWS_6', 6);
+    define('ROWS_7', 7);
+    define('ROWS_8', 8);
+    define('ROWS_9', 9);
 }
 else
 {
-    define('ROWS_1',0);
-    define('ROWS_2',1);
-    define('ROWS_3',2);
-    define('ROWS_4',3);
-    define('ROWS_5',4);
-    define('ROWS_6',5);
-    define('ROWS_7',6);
-    define('ROWS_8',7);
-    define('ROWS_9',8);
+    define('ROWS_1', 0);
+    define('ROWS_2', 1);
+    define('ROWS_3', 2);
+    define('ROWS_4', 3);
+    define('ROWS_5', 4);
+    define('ROWS_6', 5);
+    define('ROWS_7', 6);
+    define('ROWS_8', 7);
+    define('ROWS_9', 8);
 }
 
-$heightforframes=48;
+$heightforframes = 48;
 
 // Init menu manager
-if (! defined('NOREQUIREMENU'))
+if (!defined('NOREQUIREMENU'))
 {
 	if (empty($user->societe_id))    // If internal user or not defined
 	{
-		$conf->standard_menu=(empty($conf->global->MAIN_MENU_STANDARD_FORCED)?(empty($conf->global->MAIN_MENU_STANDARD)?'eldy_menu.php':$conf->global->MAIN_MENU_STANDARD):$conf->global->MAIN_MENU_STANDARD_FORCED);
+		$conf->standard_menu = (empty($conf->global->MAIN_MENU_STANDARD_FORCED) ? (empty($conf->global->MAIN_MENU_STANDARD) ? 'eldy_menu.php' : $conf->global->MAIN_MENU_STANDARD) : $conf->global->MAIN_MENU_STANDARD_FORCED);
 	}
 	else                        // If external user
 	{
-		$conf->standard_menu=(empty($conf->global->MAIN_MENUFRONT_STANDARD_FORCED)?(empty($conf->global->MAIN_MENUFRONT_STANDARD)?'eldy_menu.php':$conf->global->MAIN_MENUFRONT_STANDARD):$conf->global->MAIN_MENUFRONT_STANDARD_FORCED);
+		$conf->standard_menu = (empty($conf->global->MAIN_MENUFRONT_STANDARD_FORCED) ? (empty($conf->global->MAIN_MENUFRONT_STANDARD) ? 'eldy_menu.php' : $conf->global->MAIN_MENUFRONT_STANDARD) : $conf->global->MAIN_MENUFRONT_STANDARD_FORCED);
 	}
 
 	// Load the menu manager (only if not already done)
-	$file_menu=$conf->standard_menu;
-	if (GETPOST('menu','alpha')) $file_menu=GETPOST('menu','alpha');     // example: menu=eldy_menu.php
-	if (! class_exists('MenuManager'))
+	$file_menu = $conf->standard_menu;
+	if (GETPOST('menu', 'alpha')) $file_menu = GETPOST('menu', 'alpha'); // example: menu=eldy_menu.php
+	if (!class_exists('MenuManager'))
 	{
-		$menufound=0;
-		$dirmenus=array_merge(array("/core/menus/"),(array) $conf->modules_parts['menus']);
-		foreach($dirmenus as $dirmenu)
+		$menufound = 0;
+		$dirmenus = array_merge(array("/core/menus/"), (array) $conf->modules_parts['menus']);
+		foreach ($dirmenus as $dirmenu)
 		{
-			$menufound=dol_include_once($dirmenu."standard/".$file_menu);
+			$menufound = dol_include_once($dirmenu."standard/".$file_menu);
 			if (class_exists('MenuManager')) break;
 		}
-		if (! class_exists('MenuManager'))	// If failed to include, we try with standard eldy_menu.php
+		if (!class_exists('MenuManager'))	// If failed to include, we try with standard eldy_menu.php
 		{
 			dol_syslog("You define a menu manager '".$file_menu."' that can not be loaded.", LOG_WARNING);
-			$file_menu='eldy_menu.php';
+			$file_menu = 'eldy_menu.php';
 			include_once DOL_DOCUMENT_ROOT."/core/menus/standard/".$file_menu;
 		}
 	}
-	$menumanager = new MenuManager($db, empty($user->societe_id)?0:1);
+	$menumanager = new MenuManager($db, empty($user->societe_id) ? 0 : 1);
 	$menumanager->loadMenu();
 }
 
@@ -968,7 +968,7 @@ 
 
 // Functions
 
-if (! function_exists("llxHeader"))
+if (!function_exists("llxHeader"))
 {
     /**
      *	Show HTML header HTML + BODY + Top menu + left menu + DIV
@@ -987,14 +987,14 @@ 
      * @param   string  $morecssonbody      More CSS on body tag.
      * @return	void
      */
-	function llxHeader($head='', $title='', $help_url='', $target='', $disablejs=0, $disablehead=0, $arrayofjs='', $arrayofcss='', $morequerystring='', $morecssonbody='')
+	function llxHeader($head = '', $title = '', $help_url = '', $target = '', $disablejs = 0, $disablehead = 0, $arrayofjs = '', $arrayofcss = '', $morequerystring = '', $morecssonbody = '')
 	{
 	    global $conf;
 
 	    // html header
 		top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss);
 
-        print '<body id="mainbody"'.($morecssonbody?' class="'.$morecssonbody.'"':'').'>' . "\n";
+        print '<body id="mainbody"'.($morecssonbody ? ' class="'.$morecssonbody.'"' : '').'>'."\n";
 
 		// top menu and left menu area
 		if (empty($conf->dol_hide_topmenu))
@@ -1019,16 +1019,16 @@ 
  *  @param  string  $contenttype    Content type. For example, 'text/html'
  *  @return	void
  */
-function top_httphead($contenttype='text/html')
+function top_httphead($contenttype = 'text/html')
 {
     global $conf;
 
-    if ($contenttype == 'text/html' ) header("Content-Type: text/html; charset=".$conf->file->character_set_client);
+    if ($contenttype == 'text/html') header("Content-Type: text/html; charset=".$conf->file->character_set_client);
     else header("Content-Type: ".$contenttype);
     // Security options
-    header("X-Content-Type-Options: nosniff");  // With the nosniff option, if the server says the content is text/html, the browser will render it as text/html (note that most browsers now force this option to on)
-    header("X-Frame-Options: SAMEORIGIN");      // Frames allowed only if on same domain (stop some XSS attacks)
-    if (! empty($conf->global->MAIN_HTTP_CONTENT_SECURITY_POLICY))
+    header("X-Content-Type-Options: nosniff"); // With the nosniff option, if the server says the content is text/html, the browser will render it as text/html (note that most browsers now force this option to on)
+    header("X-Frame-Options: SAMEORIGIN"); // Frames allowed only if on same domain (stop some XSS attacks)
+    if (!empty($conf->global->MAIN_HTTP_CONTENT_SECURITY_POLICY))
     {
         // For example, to restrict script, object, frames or img to some domains
         // script-src https://api.google.com https://anotherhost.com; object-src https://youtube.com; child-src https://youtube.com; img-src: https://static.example.com
@@ -1058,73 +1058,73 @@ 
  * @param   int     $disablenofollow Disable no follow tag
  * @return	void
  */
-function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs='', $arrayofcss='', $disablejmobile=0, $disablenofollow=0)
+function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arrayofjs = '', $arrayofcss = '', $disablejmobile = 0, $disablenofollow = 0)
 {
     global $user, $conf, $langs, $db;
 
     top_httphead();
 
-    if (empty($conf->css)) $conf->css = '/theme/eldy/style.css.php';	// If not defined, eldy by default
+    if (empty($conf->css)) $conf->css = '/theme/eldy/style.css.php'; // If not defined, eldy by default
 
-    if (! empty($conf->global->MAIN_ACTIVATE_HTML4)) {
+    if (!empty($conf->global->MAIN_ACTIVATE_HTML4)) {
         $doctype = '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">';
-    }else {
+    } else {
         $doctype = '<!doctype html>';
     }
     print $doctype."\n";
-    if (! empty($conf->global->MAIN_USE_CACHE_MANIFEST)) print '<html lang="'.substr($langs->defaultlang,0,2).'" manifest="'.DOL_URL_ROOT.'/cache.manifest">'."\n";
-    else print '<html lang="'.substr($langs->defaultlang,0,2).'">'."\n";
+    if (!empty($conf->global->MAIN_USE_CACHE_MANIFEST)) print '<html lang="'.substr($langs->defaultlang, 0, 2).'" manifest="'.DOL_URL_ROOT.'/cache.manifest">'."\n";
+    else print '<html lang="'.substr($langs->defaultlang, 0, 2).'">'."\n";
     //print '<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr">'."\n";
     if (empty($disablehead))
     {
         print "<head>\n";
-		if (GETPOST('dol_basehref','alpha')) print '<base href="'.dol_escape_htmltag(GETPOST('dol_basehref','alpha')).'">'."\n";
+		if (GETPOST('dol_basehref', 'alpha')) print '<base href="'.dol_escape_htmltag(GETPOST('dol_basehref', 'alpha')).'">'."\n";
         // Displays meta
-        print '<meta name="robots" content="noindex'.($disablenofollow?'':',nofollow').'">'."\n";      				// Do not index
-        print '<meta name="viewport" content="width=device-width, initial-scale=1.0">';	// Scale for mobile device
+        print '<meta name="robots" content="noindex'.($disablenofollow ? '' : ',nofollow').'">'."\n"; // Do not index
+        print '<meta name="viewport" content="width=device-width, initial-scale=1.0">'; // Scale for mobile device
         print '<meta name="author" content="Dolibarr Development Team">'."\n";
         // Favicon
-		$favicon=dol_buildpath('/theme/'.$conf->theme.'/img/favicon.ico',1);
-        if (! empty($conf->global->MAIN_FAVICON_URL)) $favicon=$conf->global->MAIN_FAVICON_URL;
-        if (empty($conf->dol_use_jmobile)) print '<link rel="shortcut icon" type="image/x-icon" href="'.$favicon.'"/>'."\n";	// Not required into an Android webview
+		$favicon = dol_buildpath('/theme/'.$conf->theme.'/img/favicon.ico', 1);
+        if (!empty($conf->global->MAIN_FAVICON_URL)) $favicon = $conf->global->MAIN_FAVICON_URL;
+        if (empty($conf->dol_use_jmobile)) print '<link rel="shortcut icon" type="image/x-icon" href="'.$favicon.'"/>'."\n"; // Not required into an Android webview
         //if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) && ! GETPOST('textbrowser','int')) print '<link rel="top" title="'.$langs->trans("Home").'" href="'.(DOL_URL_ROOT?DOL_URL_ROOT:'/').'">'."\n";
-        if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) && ! GETPOST('textbrowser','int')) print '<link rel="copyright" title="GNU General Public License" href="http://www.gnu.org/copyleft/gpl.html#SEC1">'."\n";
-        if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) && ! GETPOST('textbrowser','int')) print '<link rel="author" title="Dolibarr Development Team" href="https://www.dolibarr.org">'."\n";
+        if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) && !GETPOST('textbrowser', 'int')) print '<link rel="copyright" title="GNU General Public License" href="http://www.gnu.org/copyleft/gpl.html#SEC1">'."\n";
+        if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) && !GETPOST('textbrowser', 'int')) print '<link rel="author" title="Dolibarr Development Team" href="https://www.dolibarr.org">'."\n";
 
         // Displays title
-        $appli=constant('DOL_APPLICATION_TITLE');
-        if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $appli=$conf->global->MAIN_APPLICATION_TITLE;
+        $appli = constant('DOL_APPLICATION_TITLE');
+        if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $appli = $conf->global->MAIN_APPLICATION_TITLE;
 
-        if ($title && ! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/noapp/',$conf->global->MAIN_HTML_TITLE)) print '<title>'.dol_htmlentities($title).'</title>';
+        if ($title && !empty($conf->global->MAIN_HTML_TITLE) && preg_match('/noapp/', $conf->global->MAIN_HTML_TITLE)) print '<title>'.dol_htmlentities($title).'</title>';
         else if ($title) print '<title>'.dol_htmlentities($appli.' - '.$title).'</title>';
         else print "<title>".dol_htmlentities($appli)."</title>";
         print "\n";
 
         //$ext='';
         //if (! empty($conf->dol_use_jmobile)) $ext='version='.urlencode(DOL_VERSION);
-        $ext='version='.urlencode(DOL_VERSION);
+        $ext = 'version='.urlencode(DOL_VERSION);
 
-        if (GETPOST('version','int')) $ext='version='.GETPOST('version','int');	// usefull to force no cache on css/js
-        if (GETPOST('testmenuhider','int') || ! empty($conf->global->MAIN_TESTMENUHIDER)) $ext.='&testmenuhider='.(GETPOST('testmenuhider','int')?GETPOST('testmenuhider','int'):$conf->global->MAIN_TESTMENUHIDER);
+        if (GETPOST('version', 'int')) $ext = 'version='.GETPOST('version', 'int'); // usefull to force no cache on css/js
+        if (GETPOST('testmenuhider', 'int') || !empty($conf->global->MAIN_TESTMENUHIDER)) $ext .= '&testmenuhider='.(GETPOST('testmenuhider', 'int') ?GETPOST('testmenuhider', 'int') : $conf->global->MAIN_TESTMENUHIDER);
 
-        $themeparam='?lang='.$langs->defaultlang.'&amp;theme='.$conf->theme.(GETPOST('optioncss','aZ09')?'&amp;optioncss='.GETPOST('optioncss','aZ09',1):'').'&amp;userid='.$user->id.'&amp;entity='.$conf->entity;
-        $themeparam.=($ext?'&amp;'.$ext:'');
-        if (! empty($_SESSION['dol_resetcache'])) $themeparam.='&amp;dol_resetcache='.$_SESSION['dol_resetcache'];
-        if (GETPOST('dol_hide_topmenu','int'))           { $themeparam.='&amp;dol_hide_topmenu='.GETPOST('dol_hide_topmenu','int'); }
-        if (GETPOST('dol_hide_leftmenu','int'))          { $themeparam.='&amp;dol_hide_leftmenu='.GETPOST('dol_hide_leftmenu','int'); }
-        if (GETPOST('dol_optimize_smallscreen','int'))   { $themeparam.='&amp;dol_optimize_smallscreen='.GETPOST('dol_optimize_smallscreen','int'); }
-        if (GETPOST('dol_no_mouse_hover','int'))         { $themeparam.='&amp;dol_no_mouse_hover='.GETPOST('dol_no_mouse_hover','int'); }
-        if (GETPOST('dol_use_jmobile','int'))            { $themeparam.='&amp;dol_use_jmobile='.GETPOST('dol_use_jmobile','int'); $conf->dol_use_jmobile=GETPOST('dol_use_jmobile','int'); }
+        $themeparam = '?lang='.$langs->defaultlang.'&amp;theme='.$conf->theme.(GETPOST('optioncss', 'aZ09') ? '&amp;optioncss='.GETPOST('optioncss', 'aZ09', 1) : '').'&amp;userid='.$user->id.'&amp;entity='.$conf->entity;
+        $themeparam .= ($ext ? '&amp;'.$ext : '');
+        if (!empty($_SESSION['dol_resetcache'])) $themeparam .= '&amp;dol_resetcache='.$_SESSION['dol_resetcache'];
+        if (GETPOST('dol_hide_topmenu', 'int')) { $themeparam .= '&amp;dol_hide_topmenu='.GETPOST('dol_hide_topmenu', 'int'); }
+        if (GETPOST('dol_hide_leftmenu', 'int')) { $themeparam .= '&amp;dol_hide_leftmenu='.GETPOST('dol_hide_leftmenu', 'int'); }
+        if (GETPOST('dol_optimize_smallscreen', 'int')) { $themeparam .= '&amp;dol_optimize_smallscreen='.GETPOST('dol_optimize_smallscreen', 'int'); }
+        if (GETPOST('dol_no_mouse_hover', 'int')) { $themeparam .= '&amp;dol_no_mouse_hover='.GETPOST('dol_no_mouse_hover', 'int'); }
+        if (GETPOST('dol_use_jmobile', 'int')) { $themeparam .= '&amp;dol_use_jmobile='.GETPOST('dol_use_jmobile', 'int'); $conf->dol_use_jmobile = GETPOST('dol_use_jmobile', 'int'); }
 
-        if (! defined('DISABLE_JQUERY') && ! $disablejs && $conf->use_javascript_ajax)
+        if (!defined('DISABLE_JQUERY') && !$disablejs && $conf->use_javascript_ajax)
         {
             print '<!-- Includes CSS for JQuery (Ajax library) -->'."\n";
             $jquerytheme = 'smoothness';
             if (!empty($conf->global->MAIN_USE_JQUERY_THEME)) $jquerytheme = $conf->global->MAIN_USE_JQUERY_THEME;
-            if (constant('JS_JQUERY_UI')) print '<link rel="stylesheet" type="text/css" href="'.JS_JQUERY_UI.'css/'.$jquerytheme.'/jquery-ui.min.css'.($ext?'?'.$ext:'').'">'."\n";  // JQuery
-            else print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/css/'.$jquerytheme.'/jquery-ui.css'.($ext?'?'.$ext:'').'">'."\n";    // JQuery
-            if (! defined('DISABLE_JQUERY_TIPTIP')) print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/tiptip/tipTip.css'.($ext?'?'.$ext:'').'">'."\n";                           // Tooltip
-            if (! defined('DISABLE_JQUERY_JNOTIFY')) print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/jnotify/jquery.jnotify-alt.min.css'.($ext?'?'.$ext:'').'">'."\n";          // JNotify
+            if (constant('JS_JQUERY_UI')) print '<link rel="stylesheet" type="text/css" href="'.JS_JQUERY_UI.'css/'.$jquerytheme.'/jquery-ui.min.css'.($ext ? '?'.$ext : '').'">'."\n"; // JQuery
+            else print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/css/'.$jquerytheme.'/jquery-ui.css'.($ext ? '?'.$ext : '').'">'."\n"; // JQuery
+            if (!defined('DISABLE_JQUERY_TIPTIP')) print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/tiptip/tipTip.css'.($ext ? '?'.$ext : '').'">'."\n"; // Tooltip
+            if (!defined('DISABLE_JQUERY_JNOTIFY')) print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/jnotify/jquery.jnotify-alt.min.css'.($ext ? '?'.$ext : '').'">'."\n"; // JNotify
             /* Removed a old hidden problematic feature never used in Dolibarr. If an external module need datatable, the module must provide all lib it needs and manage version problems with other dolibarr components
             if (! empty($conf->global->MAIN_USE_JQUERY_DATATABLES) || (defined('REQUIRE_JQUERY_DATATABLES') && constant('REQUIRE_JQUERY_DATATABLES')))     // jQuery datatables
             {
@@ -1132,58 +1132,58 @@ 
                 print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/datatables/extensions/Buttons/css/buttons.dataTables.min.css'.($ext?'?'.$ext:'').'">'."\n";
                 print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/datatables/extensions/ColReorder/css/colReorder.dataTables.min.css'.($ext?'?'.$ext:'').'"></script>'."\n";
             }*/
-            if (! defined('DISABLE_SELECT2') && (! empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) || defined('REQUIRE_JQUERY_MULTISELECT')))     // jQuery plugin "mutiselect", "multiple-select", "select2"...
+            if (!defined('DISABLE_SELECT2') && (!empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) || defined('REQUIRE_JQUERY_MULTISELECT')))     // jQuery plugin "mutiselect", "multiple-select", "select2"...
             {
-            	$tmpplugin=empty($conf->global->MAIN_USE_JQUERY_MULTISELECT)?constant('REQUIRE_JQUERY_MULTISELECT'):$conf->global->MAIN_USE_JQUERY_MULTISELECT;
-            	print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/'.$tmpplugin.'/'.$tmpplugin.'.css'.($ext?'?'.$ext:'').'">'."\n";
+            	$tmpplugin = empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) ?constant('REQUIRE_JQUERY_MULTISELECT') : $conf->global->MAIN_USE_JQUERY_MULTISELECT;
+            	print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/'.$tmpplugin.'/'.$tmpplugin.'.css'.($ext ? '?'.$ext : '').'">'."\n";
             }
             // jQuery Timepicker
-            if (! empty($conf->global->MAIN_USE_JQUERY_TIMEPICKER) || defined('REQUIRE_JQUERY_TIMEPICKER'))
+            if (!empty($conf->global->MAIN_USE_JQUERY_TIMEPICKER) || defined('REQUIRE_JQUERY_TIMEPICKER'))
             {
-            	print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/timepicker/jquery-ui-timepicker-addon.css'.($ext?'?'.$ext:'').'">'."\n";
+            	print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/timepicker/jquery-ui-timepicker-addon.css'.($ext ? '?'.$ext : '').'">'."\n";
             }
         }
 
-        if (! defined('DISABLE_FONT_AWSOME'))
+        if (!defined('DISABLE_FONT_AWSOME'))
         {
             print '<!-- Includes CSS for font awesome -->'."\n";
-            print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/theme/common/fontawesome/css/font-awesome.min.css'.($ext?'?'.$ext:'').'">'."\n";
+            print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/theme/common/fontawesome/css/font-awesome.min.css'.($ext ? '?'.$ext : '').'">'."\n";
         }
 
         print '<!-- Includes CSS for Dolibarr theme -->'."\n";
         // Output style sheets (optioncss='print' or ''). Note: $conf->css looks like '/theme/eldy/style.css.php'
-        $themepath=dol_buildpath($conf->css,1);
-        $themesubdir='';
-        if (! empty($conf->modules_parts['theme']))	// This slow down
+        $themepath = dol_buildpath($conf->css, 1);
+        $themesubdir = '';
+        if (!empty($conf->modules_parts['theme']))	// This slow down
         {
-	        foreach($conf->modules_parts['theme'] as $reldir)
+	        foreach ($conf->modules_parts['theme'] as $reldir)
 	        {
 	        	if (file_exists(dol_buildpath($reldir.$conf->css, 0)))
 	        	{
-					$themepath=dol_buildpath($reldir.$conf->css, 1);
-					$themesubdir=$reldir;
+					$themepath = dol_buildpath($reldir.$conf->css, 1);
+					$themesubdir = $reldir;
 					break;
 	        	}
 	        }
         }
         //print 'themepath='.$themepath.' themeparam='.$themeparam;exit;
         print '<link rel="stylesheet" type="text/css" href="'.$themepath.$themeparam.'">'."\n";
-	    if (! empty($conf->global->MAIN_FIX_FLASH_ON_CHROME)) print '<!-- Includes CSS that does not exists as a workaround of flash bug of chrome -->'."\n".'<link rel="stylesheet" type="text/css" href="filethatdoesnotexiststosolvechromeflashbug">'."\n";
+	    if (!empty($conf->global->MAIN_FIX_FLASH_ON_CHROME)) print '<!-- Includes CSS that does not exists as a workaround of flash bug of chrome -->'."\n".'<link rel="stylesheet" type="text/css" href="filethatdoesnotexiststosolvechromeflashbug">'."\n";
 
         // CSS forced by modules (relative url starting with /)
-        if (! empty($conf->modules_parts['css']))
+        if (!empty($conf->modules_parts['css']))
         {
-        	$arraycss=(array) $conf->modules_parts['css'];
-        	foreach($arraycss as $modcss => $filescss)
+        	$arraycss = (array) $conf->modules_parts['css'];
+        	foreach ($arraycss as $modcss => $filescss)
         	{
-        		$filescss=(array) $filescss;	// To be sure filecss is an array
-        		foreach($filescss as $cssfile)
+        		$filescss = (array) $filescss; // To be sure filecss is an array
+        		foreach ($filescss as $cssfile)
         		{
         			if (empty($cssfile)) dol_syslog("Warning: module ".$modcss." declared a css path file into its descriptor that is empty.", LOG_WARNING);
         			// cssfile is a relative path
-	        		print '<!-- Includes CSS added by module '.$modcss. ' -->'."\n".'<link rel="stylesheet" type="text/css" href="'.dol_buildpath($cssfile,1);
+	        		print '<!-- Includes CSS added by module '.$modcss.' -->'."\n".'<link rel="stylesheet" type="text/css" href="'.dol_buildpath($cssfile, 1);
 	        		// We add params only if page is not static, because some web server setup does not return content type text/css if url has parameters, so browser cache is not used.
-	        		if (!preg_match('/\.css$/i',$cssfile)) print $themeparam;
+	        		if (!preg_match('/\.css$/i', $cssfile)) print $themeparam;
 	        		print '">'."\n";
         		}
         	}
@@ -1191,72 +1191,72 @@ 
         // CSS forced by page in top_htmlhead call (relative url starting with /)
         if (is_array($arrayofcss))
         {
-            foreach($arrayofcss as $cssfile)
+            foreach ($arrayofcss as $cssfile)
             {
-            	print '<!-- Includes CSS added by page -->'."\n".'<link rel="stylesheet" type="text/css" title="default" href="'.dol_buildpath($cssfile,1);
+            	print '<!-- Includes CSS added by page -->'."\n".'<link rel="stylesheet" type="text/css" title="default" href="'.dol_buildpath($cssfile, 1);
                 // We add params only if page is not static, because some web server setup does not return content type text/css if url has parameters and browser cache is not used.
-                if (!preg_match('/\.css$/i',$cssfile)) print $themeparam;
+                if (!preg_match('/\.css$/i', $cssfile)) print $themeparam;
                 print '">'."\n";
             }
         }
 
         // Output standard javascript links
-        if (! defined('DISABLE_JQUERY') && ! $disablejs && ! empty($conf->use_javascript_ajax))
+        if (!defined('DISABLE_JQUERY') && !$disablejs && !empty($conf->use_javascript_ajax))
         {
             // JQuery. Must be before other includes
             print '<!-- Includes JS for JQuery -->'."\n";
-            if (defined('JS_JQUERY') && constant('JS_JQUERY')) print '<script type="text/javascript" src="'.JS_JQUERY.'jquery.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-            else print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-            if (! empty($conf->global->MAIN_FEATURES_LEVEL) && ! defined('JS_JQUERY_MIGRATE_DISABLED'))
+            if (defined('JS_JQUERY') && constant('JS_JQUERY')) print '<script type="text/javascript" src="'.JS_JQUERY.'jquery.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
+            else print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
+            if (!empty($conf->global->MAIN_FEATURES_LEVEL) && !defined('JS_JQUERY_MIGRATE_DISABLED'))
             {
-                if (defined('JS_JQUERY_MIGRATE') && constant('JS_JQUERY_MIGRATE')) print '<script type="text/javascript" src="'.JS_JQUERY_MIGRATE.'jquery-migrate.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-                else print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery-migrate.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+                if (defined('JS_JQUERY_MIGRATE') && constant('JS_JQUERY_MIGRATE')) print '<script type="text/javascript" src="'.JS_JQUERY_MIGRATE.'jquery-migrate.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
+                else print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery-migrate.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
             }
-            if (defined('JS_JQUERY_UI') && constant('JS_JQUERY_UI')) print '<script type="text/javascript" src="'.JS_JQUERY_UI.'jquery-ui.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-            else print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery-ui.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-            if (! defined('DISABLE_JQUERY_TABLEDND')) print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/tablednd/jquery.tablednd.0.6.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-            if (! defined('DISABLE_JQUERY_TIPTIP')) print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/tiptip/jquery.tipTip.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+            if (defined('JS_JQUERY_UI') && constant('JS_JQUERY_UI')) print '<script type="text/javascript" src="'.JS_JQUERY_UI.'jquery-ui.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
+            else print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery-ui.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
+            if (!defined('DISABLE_JQUERY_TABLEDND')) print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/tablednd/jquery.tablednd.0.6.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
+            if (!defined('DISABLE_JQUERY_TIPTIP')) print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/tiptip/jquery.tipTip.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
             // jQuery jnotify
-            if (empty($conf->global->MAIN_DISABLE_JQUERY_JNOTIFY) && ! defined('DISABLE_JQUERY_JNOTIFY'))
+            if (empty($conf->global->MAIN_DISABLE_JQUERY_JNOTIFY) && !defined('DISABLE_JQUERY_JNOTIFY'))
             {
-                print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jnotify/jquery.jnotify.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-                print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/jnotify.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+                print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jnotify/jquery.jnotify.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
+                print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/jnotify.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
             }
             // Flot
-            if (empty($conf->global->MAIN_DISABLE_JQUERY_FLOT) && ! defined('DISABLE_JQUERY_FLOT'))
+            if (empty($conf->global->MAIN_DISABLE_JQUERY_FLOT) && !defined('DISABLE_JQUERY_FLOT'))
             {
                 if (constant('JS_JQUERY_FLOT'))
                 {
-                    print '<script type="text/javascript" src="'.JS_JQUERY_FLOT.'jquery.flot.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-                    print '<script type="text/javascript" src="'.JS_JQUERY_FLOT.'jquery.flot.pie.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-                    print '<script type="text/javascript" src="'.JS_JQUERY_FLOT.'jquery.flot.stack.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+                    print '<script type="text/javascript" src="'.JS_JQUERY_FLOT.'jquery.flot.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
+                    print '<script type="text/javascript" src="'.JS_JQUERY_FLOT.'jquery.flot.pie.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
+                    print '<script type="text/javascript" src="'.JS_JQUERY_FLOT.'jquery.flot.stack.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
                 }
                 else
                 {
-                    print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/flot/jquery.flot.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-                    print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/flot/jquery.flot.pie.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-                    print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/flot/jquery.flot.stack.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+                    print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/flot/jquery.flot.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
+                    print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/flot/jquery.flot.pie.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
+                    print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/flot/jquery.flot.stack.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
                 }
             }
             // jQuery jeditable
-            if (! empty($conf->global->MAIN_USE_JQUERY_JEDITABLE) && ! defined('DISABLE_JQUERY_JEDITABLE'))
+            if (!empty($conf->global->MAIN_USE_JQUERY_JEDITABLE) && !defined('DISABLE_JQUERY_JEDITABLE'))
             {
             	print '<!-- JS to manage editInPlace feature -->'."\n";
-                print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jeditable/jquery.jeditable.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-                print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jeditable/jquery.jeditable.ui-datepicker.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-                print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jeditable/jquery.jeditable.ui-autocomplete.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+                print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jeditable/jquery.jeditable.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
+                print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jeditable/jquery.jeditable.ui-datepicker.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
+                print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jeditable/jquery.jeditable.ui-autocomplete.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
                 print '<script type="text/javascript">'."\n";
                 print 'var urlSaveInPlace = \''.DOL_URL_ROOT.'/core/ajax/saveinplace.php\';'."\n";
                 print 'var urlLoadInPlace = \''.DOL_URL_ROOT.'/core/ajax/loadinplace.php\';'."\n";
-                print 'var tooltipInPlace = \''.$langs->transnoentities('ClickToEdit').'\';'."\n";	// Added in title attribute of span
-                print 'var placeholderInPlace = \'&nbsp;\';'."\n";	// If we put another string than $langs->trans("ClickToEdit") here, nothing is shown. If we put empty string, there is error, Why ?
+                print 'var tooltipInPlace = \''.$langs->transnoentities('ClickToEdit').'\';'."\n"; // Added in title attribute of span
+                print 'var placeholderInPlace = \'&nbsp;\';'."\n"; // If we put another string than $langs->trans("ClickToEdit") here, nothing is shown. If we put empty string, there is error, Why ?
                 print 'var cancelInPlace = \''.$langs->trans('Cancel').'\';'."\n";
                 print 'var submitInPlace = \''.$langs->trans('Ok').'\';'."\n";
                 print 'var indicatorInPlace = \'<img src="'.DOL_URL_ROOT."/theme/".$conf->theme."/img/working.gif".'">\';'."\n";
-                print 'var withInPlace = 300;';		// width in pixel for default string edit
+                print 'var withInPlace = 300;'; // width in pixel for default string edit
                 print '</script>'."\n";
-                print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/editinplace.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-                print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jeditable/jquery.jeditable.ckeditor.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+                print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/editinplace.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
+                print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jeditable/jquery.jeditable.ckeditor.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
             }
             // jQuery DataTables
             /* Removed a old hidden problematic feature never used in Dolibarr. If an external module need datatable, the module must provide all lib it needs and manage version problems with other dolibarr components
@@ -1272,55 +1272,55 @@ 
                 print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jszip/jszip.min.js"></script>'."\n";
             }*/
             // jQuery Timepicker
-            if (! empty($conf->global->MAIN_USE_JQUERY_TIMEPICKER) || defined('REQUIRE_JQUERY_TIMEPICKER'))
+            if (!empty($conf->global->MAIN_USE_JQUERY_TIMEPICKER) || defined('REQUIRE_JQUERY_TIMEPICKER'))
             {
-            	print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/timepicker/jquery-ui-timepicker-addon.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-            	print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/timepicker.js.php?lang='.$langs->defaultlang.($ext?'&amp;'.$ext:'').'"></script>'."\n";
+            	print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/timepicker/jquery-ui-timepicker-addon.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
+            	print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/timepicker.js.php?lang='.$langs->defaultlang.($ext ? '&amp;'.$ext : '').'"></script>'."\n";
             }
-            if (! defined('DISABLE_SELECT2') && (! empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) || defined('REQUIRE_JQUERY_MULTISELECT')))     // jQuery plugin "mutiselect", "multiple-select", "select2", ...
+            if (!defined('DISABLE_SELECT2') && (!empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) || defined('REQUIRE_JQUERY_MULTISELECT')))     // jQuery plugin "mutiselect", "multiple-select", "select2", ...
             {
-            	$tmpplugin=empty($conf->global->MAIN_USE_JQUERY_MULTISELECT)?constant('REQUIRE_JQUERY_MULTISELECT'):$conf->global->MAIN_USE_JQUERY_MULTISELECT;
-            	print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/'.$tmpplugin.'/'.$tmpplugin.'.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+            	$tmpplugin = empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) ?constant('REQUIRE_JQUERY_MULTISELECT') : $conf->global->MAIN_USE_JQUERY_MULTISELECT;
+            	print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/'.$tmpplugin.'/'.$tmpplugin.'.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
             }
         }
 
-        if (! $disablejs && ! empty($conf->use_javascript_ajax))
+        if (!$disablejs && !empty($conf->use_javascript_ajax))
         {
             // CKEditor
-            if (! empty($conf->fckeditor->enabled) && (empty($conf->global->FCKEDITOR_EDITORNAME) || $conf->global->FCKEDITOR_EDITORNAME == 'ckeditor') && ! defined('DISABLE_CKEDITOR'))
+            if (!empty($conf->fckeditor->enabled) && (empty($conf->global->FCKEDITOR_EDITORNAME) || $conf->global->FCKEDITOR_EDITORNAME == 'ckeditor') && !defined('DISABLE_CKEDITOR'))
             {
                 print '<!-- Includes JS for CKEditor -->'."\n";
-                $pathckeditor = DOL_URL_ROOT . '/includes/ckeditor/ckeditor/';
-                $jsckeditor='ckeditor.js';
+                $pathckeditor = DOL_URL_ROOT.'/includes/ckeditor/ckeditor/';
+                $jsckeditor = 'ckeditor.js';
                 if (constant('JS_CKEDITOR'))	// To use external ckeditor 4 js lib
                 {
-                	$pathckeditor=constant('JS_CKEDITOR');
+                	$pathckeditor = constant('JS_CKEDITOR');
                 }
                 print '<script type="text/javascript">';
                 print 'var CKEDITOR_BASEPATH = \''.$pathckeditor.'\';'."\n";
-                print 'var ckeditorConfig = \''.dol_buildpath($themesubdir.'/theme/'.$conf->theme.'/ckeditor/config.js'.($ext?'?'.$ext:''),1).'\';'."\n";		// $themesubdir='' in standard usage
+                print 'var ckeditorConfig = \''.dol_buildpath($themesubdir.'/theme/'.$conf->theme.'/ckeditor/config.js'.($ext ? '?'.$ext : ''), 1).'\';'."\n"; // $themesubdir='' in standard usage
                 print 'var ckeditorFilebrowserBrowseUrl = \''.DOL_URL_ROOT.'/core/filemanagerdol/browser/default/browser.php?Connector='.DOL_URL_ROOT.'/core/filemanagerdol/connectors/php/connector.php\';'."\n";
                 print 'var ckeditorFilebrowserImageBrowseUrl = \''.DOL_URL_ROOT.'/core/filemanagerdol/browser/default/browser.php?Type=Image&Connector='.DOL_URL_ROOT.'/core/filemanagerdol/connectors/php/connector.php\';'."\n";
                 print '</script>'."\n";
-                print '<script type="text/javascript" src="'.$pathckeditor.$jsckeditor.($ext?'?'.$ext:'').'"></script>'."\n";
+                print '<script type="text/javascript" src="'.$pathckeditor.$jsckeditor.($ext ? '?'.$ext : '').'"></script>'."\n";
             }
 
             // Browser notifications
-            if (! defined('DISABLE_BROWSER_NOTIF'))
+            if (!defined('DISABLE_BROWSER_NOTIF'))
             {
-                $enablebrowsernotif=false;
-                if (! empty($conf->agenda->enabled) && ! empty($conf->global->AGENDA_REMINDER_BROWSER)) $enablebrowsernotif=true;
-                if ($conf->browser->layout == 'phone') $enablebrowsernotif=false;
+                $enablebrowsernotif = false;
+                if (!empty($conf->agenda->enabled) && !empty($conf->global->AGENDA_REMINDER_BROWSER)) $enablebrowsernotif = true;
+                if ($conf->browser->layout == 'phone') $enablebrowsernotif = false;
                 if ($enablebrowsernotif)
                 {
                     print '<!-- Includes JS of Dolibarr (brwoser layout = '.$conf->browser->layout.')-->'."\n";
-                    print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/lib_notification.js.php'.($ext?'?'.$ext:'').'"></script>'."\n";
+                    print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/lib_notification.js.php'.($ext ? '?'.$ext : '').'"></script>'."\n";
                 }
             }
 
             // Global js function
             print '<!-- Includes JS of Dolibarr -->'."\n";
-            print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/lib_head.js.php?lang='.$langs->defaultlang.($ext?'&amp;'.$ext:'').'"></script>'."\n";
+            print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/lib_head.js.php?lang='.$langs->defaultlang.($ext ? '&amp;'.$ext : '').'"></script>'."\n";
 
             // Add datepicker default options
             /*if (! defined('DISABLE_DATE_PICKER'))
@@ -1329,16 +1329,16 @@ 
             }*/
 
             // JS forced by modules (relative url starting with /)
-            if (! empty($conf->modules_parts['js']))		// $conf->modules_parts['js'] is array('module'=>array('file1','file2'))
+            if (!empty($conf->modules_parts['js']))		// $conf->modules_parts['js'] is array('module'=>array('file1','file2'))
         	{
-        		$arrayjs=(array) $conf->modules_parts['js'];
-	            foreach($arrayjs as $modjs => $filesjs)
+        		$arrayjs = (array) $conf->modules_parts['js'];
+	            foreach ($arrayjs as $modjs => $filesjs)
 	            {
-        			$filesjs=(array) $filesjs;	// To be sure filejs is an array
-		            foreach($filesjs as $jsfile)
+        			$filesjs = (array) $filesjs; // To be sure filejs is an array
+		            foreach ($filesjs as $jsfile)
 		            {
 	    	    		// jsfile is a relative path
-	        	    	print '<!-- Include JS added by module '.$modjs. '-->'."\n".'<script type="text/javascript" src="'.dol_buildpath($jsfile,1).'"></script>'."\n";
+	        	    	print '<!-- Include JS added by module '.$modjs.'-->'."\n".'<script type="text/javascript" src="'.dol_buildpath($jsfile, 1).'"></script>'."\n";
 		            }
 	            }
         	}
@@ -1346,28 +1346,28 @@ 
             if (is_array($arrayofjs))
             {
                 print '<!-- Includes JS added by page -->'."\n";
-                foreach($arrayofjs as $jsfile)
+                foreach ($arrayofjs as $jsfile)
                 {
-                    if (preg_match('/^http/i',$jsfile))
+                    if (preg_match('/^http/i', $jsfile))
                     {
                         print '<script type="text/javascript" src="'.$jsfile.'"></script>'."\n";
                     }
                     else
                     {
-                        if (! preg_match('/^\//',$jsfile)) $jsfile='/'.$jsfile;	// For backward compatibility
-                        print '<script type="text/javascript" src="'.dol_buildpath($jsfile,1).'"></script>'."\n";
+                        if (!preg_match('/^\//', $jsfile)) $jsfile = '/'.$jsfile; // For backward compatibility
+                        print '<script type="text/javascript" src="'.dol_buildpath($jsfile, 1).'"></script>'."\n";
                     }
                 }
             }
         }
 
-        if (! empty($head)) print $head."\n";
-        if (! empty($conf->global->MAIN_HTML_HEADER)) print $conf->global->MAIN_HTML_HEADER."\n";
+        if (!empty($head)) print $head."\n";
+        if (!empty($conf->global->MAIN_HTML_HEADER)) print $conf->global->MAIN_HTML_HEADER."\n";
 
         print "</head>\n\n";
     }
 
-    $conf->headerdone=1;	// To tell header was output
+    $conf->headerdone = 1; // To tell header was output
 }
 
 
@@ -1387,19 +1387,19 @@ 
  * 									                   For other external page: http://server/url
  *  @return		void
  */
-function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $arrayofjs='', $arrayofcss='', $morequerystring='', $helppagename='')
+function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead = 0, $arrayofjs = '', $arrayofcss = '', $morequerystring = '', $helppagename = '')
 {
     global $user, $conf, $langs, $db;
     global $dolibarr_main_authentication, $dolibarr_main_demo;
-    global $hookmanager,$menumanager;
+    global $hookmanager, $menumanager;
 
-    $searchform='';
-    $bookmarks='';
+    $searchform = '';
+    $bookmarks = '';
 
     // Instantiate hooks of thirdparty module
     $hookmanager->initHooks(array('toprightmenu'));
 
-    $toprightmenu='';
+    $toprightmenu = '';
 
     // For backward compatibility with old modules
     if (empty($conf->headerdone))
@@ -1411,49 +1411,49 @@ 
     /*
      * Top menu
      */
-    if (empty($conf->dol_hide_topmenu) && (! defined('NOREQUIREMENU') || ! constant('NOREQUIREMENU')))
+    if (empty($conf->dol_hide_topmenu) && (!defined('NOREQUIREMENU') || !constant('NOREQUIREMENU')))
     {
         print "\n".'<!-- Start top horizontal -->'."\n";
 
         print '<div class="side-nav-vert"><div id="id-top">';
 
 	    // Show menu entries
-    	print '<div id="tmenu_tooltip'.(empty($conf->global->MAIN_MENU_INVERT)?'':'invert').'" class="tmenu">'."\n";
-    	$menumanager->atarget=$target;
-	    $menumanager->showmenu('top', array('searchform'=>$searchform, 'bookmarks'=>$bookmarks));      // This contains a \n
+    	print '<div id="tmenu_tooltip'.(empty($conf->global->MAIN_MENU_INVERT) ? '' : 'invert').'" class="tmenu">'."\n";
+    	$menumanager->atarget = $target;
+	    $menumanager->showmenu('top', array('searchform'=>$searchform, 'bookmarks'=>$bookmarks)); // This contains a \n
 	    print "</div>\n";
 
 	    // Define link to login card
-        $appli=constant('DOL_APPLICATION_TITLE');
-	    if (! empty($conf->global->MAIN_APPLICATION_TITLE))
+        $appli = constant('DOL_APPLICATION_TITLE');
+	    if (!empty($conf->global->MAIN_APPLICATION_TITLE))
 	    {
-	    	$appli=$conf->global->MAIN_APPLICATION_TITLE;
+	    	$appli = $conf->global->MAIN_APPLICATION_TITLE;
 	    	if (preg_match('/\d\.\d/', $appli))
 	    	{
-				if (! preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli.=" (".DOL_VERSION.")";	// If new title contains a version that is different than core
+				if (!preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli .= " (".DOL_VERSION.")"; // If new title contains a version that is different than core
 	    	}
-	    	else $appli.=" ".DOL_VERSION;
+	    	else $appli .= " ".DOL_VERSION;
 	    }
-	    else $appli.=" ".DOL_VERSION;
+	    else $appli .= " ".DOL_VERSION;
 
-	    if (! empty($conf->global->MAIN_FEATURES_LEVEL)) $appli.="<br>".$langs->trans("LevelOfFeature").': '.$conf->global->MAIN_FEATURES_LEVEL;
+	    if (!empty($conf->global->MAIN_FEATURES_LEVEL)) $appli .= "<br>".$langs->trans("LevelOfFeature").': '.$conf->global->MAIN_FEATURES_LEVEL;
 
-	    $logouttext='';
+	    $logouttext = '';
 	    if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
 	    {
     	    //$logouthtmltext=$appli.'<br>';
     	    if ($_SESSION["dol_authmode"] != 'forceuser' && $_SESSION["dol_authmode"] != 'http')
     	    {
-    	    	$logouthtmltext.=$langs->trans("Logout").'<br>';
+    	    	$logouthtmltext .= $langs->trans("Logout").'<br>';
 
-    	    	$logouttext .='<a href="'.DOL_URL_ROOT.'/user/logout.php">';
+    	    	$logouttext .= '<a href="'.DOL_URL_ROOT.'/user/logout.php">';
     	        //$logouttext .= img_picto($langs->trans('Logout').":".$langs->trans('Logout'), 'logout_top.png', 'class="login"', 0, 0, 1);
-    	    	$logouttext .='<span class="fa fa-sign-out atoplogin"></span>';
-    	        $logouttext .='</a>';
+    	    	$logouttext .= '<span class="fa fa-sign-out atoplogin"></span>';
+    	        $logouttext .= '</a>';
     	    }
     	    else
     	    {
-    	    	$logouthtmltext.=$langs->trans("NoLogoutProcessWithAuthMode",$_SESSION["dol_authmode"]);
+    	    	$logouthtmltext .= $langs->trans("NoLogoutProcessWithAuthMode", $_SESSION["dol_authmode"]);
     	        $logouttext .= img_picto($langs->trans('Logout').":".$langs->trans('Logout'), 'logout_top.png', 'class="login"', 0, 0, 1);
     	    }
 	    }
@@ -1461,55 +1461,55 @@ 
 	    print '<div class="login_block">'."\n";
 
 	    // Add login user link
-	    $toprightmenu.='<div class="login_block_user">';
+	    $toprightmenu .= '<div class="login_block_user">';
 
 	    // Login name with photo and tooltip
-		$mode=-1;
-	    $toprightmenu.='<div class="inline-block nowrap"><div class="inline-block login_block_elem login_block_elem_name" style="padding: 0px;">';
-        $toprightmenu.=$user->getNomUrl($mode, '', true, 0, 11, 0, ($user->firstname ? 'firstname' : -1),'atoplogin');
-        $toprightmenu.='</div></div>';
+		$mode = -1;
+	    $toprightmenu .= '<div class="inline-block nowrap"><div class="inline-block login_block_elem login_block_elem_name" style="padding: 0px;">';
+        $toprightmenu .= $user->getNomUrl($mode, '', true, 0, 11, 0, ($user->firstname ? 'firstname' : -1), 'atoplogin');
+        $toprightmenu .= '</div></div>';
 
-		$toprightmenu.='</div>';
+		$toprightmenu .= '</div>';
 
-	    $toprightmenu.='<div class="login_block_other">';
+	    $toprightmenu .= '<div class="login_block_other">';
 
 		// Execute hook printTopRightMenu (hooks should output string like '<div class="login"><a href="">mylink</a></div>')
-	    $parameters=array();
-	    $result=$hookmanager->executeHooks('printTopRightMenu',$parameters);    // Note that $action and $object may have been modified by some hooks
+	    $parameters = array();
+	    $result = $hookmanager->executeHooks('printTopRightMenu', $parameters); // Note that $action and $object may have been modified by some hooks
 		if (is_numeric($result))
 		{
-			if (empty($result)) $toprightmenu.=$hookmanager->resPrint;		// add
-			else  $toprightmenu=$hookmanager->resPrint;						// replace
+			if (empty($result)) $toprightmenu .= $hookmanager->resPrint; // add
+			else  $toprightmenu = $hookmanager->resPrint; // replace
 		}
-		else $toprightmenu.=$result;	// For backward compatibility
+		else $toprightmenu .= $result; // For backward compatibility
 
     	// Link to module builder
-	    if (! empty($conf->modulebuilder->enabled))
+	    if (!empty($conf->modulebuilder->enabled))
 	    {
-	        $text ='<a href="'.DOL_URL_ROOT.'/modulebuilder/index.php?mainmenu=home&leftmenu=admintools" target="_modulebuilder">';
+	        $text = '<a href="'.DOL_URL_ROOT.'/modulebuilder/index.php?mainmenu=home&leftmenu=admintools" target="_modulebuilder">';
 	        //$text.= img_picto(":".$langs->trans("ModuleBuilder"), 'printer_top.png', 'class="printer"');
-	        $text.='<span class="fa fa-bug atoplogin"></span>';
-	        $text.='</a>';
-	        $toprightmenu.=@Form::textwithtooltip('',$langs->trans("ModuleBuilder"),2,1,$text,'login_block_elem',2);
+	        $text .= '<span class="fa fa-bug atoplogin"></span>';
+	        $text .= '</a>';
+	        $toprightmenu .= @Form::textwithtooltip('', $langs->trans("ModuleBuilder"), 2, 1, $text, 'login_block_elem', 2);
 	    }
 
 		// Link to print main content area
 	    if (empty($conf->global->MAIN_PRINT_DISABLELINK) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) && empty($conf->browser->phone))
 	    {
-	        $qs=dol_escape_htmltag($_SERVER["QUERY_STRING"]);
+	        $qs = dol_escape_htmltag($_SERVER["QUERY_STRING"]);
 
 	        if (is_array($_POST))
 	        {
-    			foreach($_POST as $key=>$value) {
-    				if ($key!=='action' && !is_array($value)) $qs.='&'.$key.'='.urlencode($value);
+    			foreach ($_POST as $key=>$value) {
+    				if ($key !== 'action' && !is_array($value)) $qs .= '&'.$key.'='.urlencode($value);
     			}
 	        }
-			$qs.=(($qs && $morequerystring)?'&':'').$morequerystring;
-	        $text ='<a href="'.dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.$qs.($qs?'&':'').'optioncss=print" target="_blank">';
+			$qs .= (($qs && $morequerystring) ? '&' : '').$morequerystring;
+	        $text = '<a href="'.dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.$qs.($qs ? '&' : '').'optioncss=print" target="_blank">';
 	        //$text.= img_picto(":".$langs->trans("PrintContentArea"), 'printer_top.png', 'class="printer"');
-	        $text.='<span class="fa fa-print atoplogin"></span>';
-	        $text.='</a>';
-	        $toprightmenu.=@Form::textwithtooltip('',$langs->trans("PrintContentArea"),2,1,$text,'login_block_elem',2);
+	        $text .= '<span class="fa fa-print atoplogin"></span>';
+	        $text .= '</a>';
+	        $toprightmenu .= @Form::textwithtooltip('', $langs->trans("PrintContentArea"), 2, 1, $text, 'login_block_elem', 2);
 	    }
 
 	    // Link to Dolibarr wiki pages
@@ -1517,43 +1517,43 @@ 
 	    {
 	        $langs->load("help");
 
-	        $helpbaseurl='';
-	        $helppage='';
-	        $mode='';
+	        $helpbaseurl = '';
+	        $helppage = '';
+	        $mode = '';
 
-	        if (empty($helppagename)) $helppagename='EN:User_documentation|FR:Documentation_utilisateur|ES:Documentación_usuarios';
+	        if (empty($helppagename)) $helppagename = 'EN:User_documentation|FR:Documentation_utilisateur|ES:Documentación_usuarios';
 
 	        // Get helpbaseurl, helppage and mode from helppagename and langs
-	        $arrayres=getHelpParamFor($helppagename,$langs);
-	        $helpbaseurl=$arrayres['helpbaseurl'];
-	        $helppage=$arrayres['helppage'];
-	        $mode=$arrayres['mode'];
+	        $arrayres = getHelpParamFor($helppagename, $langs);
+	        $helpbaseurl = $arrayres['helpbaseurl'];
+	        $helppage = $arrayres['helppage'];
+	        $mode = $arrayres['mode'];
 
 	        // Link to help pages
 	        if ($helpbaseurl && $helppage)
 	        {
-	            $text='';
-	            $title=$appli.'<br>';
-	            $title.=$langs->trans($mode == 'wiki' ? 'GoToWikiHelpPage': 'GoToHelpPage');
-	            if ($mode == 'wiki') $title.=' - '.$langs->trans("PageWiki").' &quot;'.dol_escape_htmltag(strtr($helppage,'_',' ')).'&quot;';
-	            $text.='<a class="help" target="_blank" href="';
-	            if ($mode == 'wiki') $text.=sprintf($helpbaseurl,urlencode(html_entity_decode($helppage)));
-	            else $text.=sprintf($helpbaseurl,$helppage);
-	            $text.='">';
+	            $text = '';
+	            $title = $appli.'<br>';
+	            $title .= $langs->trans($mode == 'wiki' ? 'GoToWikiHelpPage' : 'GoToHelpPage');
+	            if ($mode == 'wiki') $title .= ' - '.$langs->trans("PageWiki").' &quot;'.dol_escape_htmltag(strtr($helppage, '_', ' ')).'&quot;';
+	            $text .= '<a class="help" target="_blank" href="';
+	            if ($mode == 'wiki') $text .= sprintf($helpbaseurl, urlencode(html_entity_decode($helppage)));
+	            else $text .= sprintf($helpbaseurl, $helppage);
+	            $text .= '">';
 	            //$text.=img_picto('', 'helpdoc_top').' ';
-	            $text.='<span class="fa fa-question-circle atoplogin"></span>';
+	            $text .= '<span class="fa fa-question-circle atoplogin"></span>';
 	            //$toprightmenu.=$langs->trans($mode == 'wiki' ? 'OnlineHelp': 'Help');
 	            //if ($mode == 'wiki') $text.=' ('.dol_trunc(strtr($helppage,'_',' '),8).')';
-	            $text.='</a>';
+	            $text .= '</a>';
 	            //$toprightmenu.='</div>'."\n";
-	            $toprightmenu.=@Form::textwithtooltip('',$title,2,1,$text,'login_block_elem',2);
+	            $toprightmenu .= @Form::textwithtooltip('', $title, 2, 1, $text, 'login_block_elem', 2);
 	        }
 	    }
 
 		// Logout link
-	    $toprightmenu.=@Form::textwithtooltip('',$logouthtmltext,2,1,$logouttext,'login_block_elem',2);
+	    $toprightmenu .= @Form::textwithtooltip('', $logouthtmltext, 2, 1, $logouttext, 'login_block_elem', 2);
 
-	    $toprightmenu.='</div>';
+	    $toprightmenu .= '</div>';
 
 	    print $toprightmenu;
 
@@ -1566,7 +1566,7 @@ 
         print "<!-- End top horizontal menu -->\n\n";
     }
 
-    if (empty($conf->dol_hide_leftmenu) && empty($conf->dol_use_jmobile)) print '<!-- Begin div id-container --><div id="id-container" class="id-container'.($morecss?' '.$morecss:'').'">';
+    if (empty($conf->dol_hide_leftmenu) && empty($conf->dol_use_jmobile)) print '<!-- Begin div id-container --><div id="id-container" class="id-container'.($morecss ? ' '.$morecss : '').'">';
 }
 
 
@@ -1584,20 +1584,20 @@ 
  *  @param  string  $acceptdelayedhtml          1 if caller request to have html delayed content not returned but saved into global $delayedhtmlcontent (so caller can show it at end of page to avoid flash FOUC effect)
  *  @return	void
  */
-function left_menu($menu_array_before, $helppagename='', $notused='', $menu_array_after='', $leftmenuwithoutmainarea=0, $title='', $acceptdelayedhtml=0)
+function left_menu($menu_array_before, $helppagename = '', $notused = '', $menu_array_after = '', $leftmenuwithoutmainarea = 0, $title = '', $acceptdelayedhtml = 0)
 {
     global $user, $conf, $langs, $db, $form;
     global $hookmanager, $menumanager;
 
-    $searchform='';
-    $bookmarks='';
+    $searchform = '';
+    $bookmarks = '';
 
-    if (! empty($menu_array_before)) dol_syslog("Deprecated parameter menu_array_before was used when calling main::left_menu function. Menu entries of module should now be defined into module descriptor and not provided when calling left_menu.", LOG_WARNING);
+    if (!empty($menu_array_before)) dol_syslog("Deprecated parameter menu_array_before was used when calling main::left_menu function. Menu entries of module should now be defined into module descriptor and not provided when calling left_menu.", LOG_WARNING);
 
-    if (empty($conf->dol_hide_leftmenu) && (! defined('NOREQUIREMENU') || ! constant('NOREQUIREMENU')))
+    if (empty($conf->dol_hide_leftmenu) && (!defined('NOREQUIREMENU') || !constant('NOREQUIREMENU')))
     {
 	    // Instantiate hooks of thirdparty module
-	    $hookmanager->initHooks(array('searchform','leftblock'));
+	    $hookmanager->initHooks(array('searchform', 'leftblock'));
 
 		print "\n".'<!-- Begin side-nav id-left -->'."\n".'<div class="side-nav"><div id="id-left">'."\n";
 
@@ -1605,86 +1605,86 @@ 
 
 	    if ($conf->use_javascript_ajax && $conf->browser->layout != 'phone' && empty($conf->global->MAIN_USE_OLD_SEARCH_FORM))
 	    {
-    	    if (! is_object($form)) $form=new Form($db);
-    	    $selected=-1;
-            $searchform.=$form->selectArrayAjax('searchselectcombo', DOL_URL_ROOT.'/core/ajax/selectsearchbox.php', $selected, '', '', 0, 1, 'vmenusearchselectcombo', 1, $langs->trans("Search"), 1);
+    	    if (!is_object($form)) $form = new Form($db);
+    	    $selected = -1;
+            $searchform .= $form->selectArrayAjax('searchselectcombo', DOL_URL_ROOT.'/core/ajax/selectsearchbox.php', $selected, '', '', 0, 1, 'vmenusearchselectcombo', 1, $langs->trans("Search"), 1);
 	    }
 	    else
 	    {
     	    // Define $searchform
-    	    if ((( ! empty($conf->societe->enabled) && (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) || empty($conf->global->SOCIETE_DISABLE_CUSTOMERS))) || ! empty($conf->fournisseur->enabled)) && $user->rights->societe->lire)
+    	    if (((!empty($conf->societe->enabled) && (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) || empty($conf->global->SOCIETE_DISABLE_CUSTOMERS))) || !empty($conf->fournisseur->enabled)) && $user->rights->societe->lire)
     	    {
     	        $langs->load("companies");
-    	        $searchform.=printSearchForm(DOL_URL_ROOT.'/societe/list.php', DOL_URL_ROOT.'/societe/list.php', $langs->trans("ThirdParties"), 'maxwidth100', 'sall', 'T', 'searchleftt', img_object('','company'));
+    	        $searchform .= printSearchForm(DOL_URL_ROOT.'/societe/list.php', DOL_URL_ROOT.'/societe/list.php', $langs->trans("ThirdParties"), 'maxwidth100', 'sall', 'T', 'searchleftt', img_object('', 'company'));
     	    }
 
-    	    if (! empty($conf->societe->enabled) && $user->rights->societe->lire)
+    	    if (!empty($conf->societe->enabled) && $user->rights->societe->lire)
     	    {
     	        $langs->load("companies");
-    	        $searchform.=printSearchForm(DOL_URL_ROOT.'/contact/list.php', DOL_URL_ROOT.'/contact/list.php', $langs->trans("Contacts"), 'maxwidth100', 'sall', 'A', 'searchleftc', img_object('','contact'));
+    	        $searchform .= printSearchForm(DOL_URL_ROOT.'/contact/list.php', DOL_URL_ROOT.'/contact/list.php', $langs->trans("Contacts"), 'maxwidth100', 'sall', 'A', 'searchleftc', img_object('', 'contact'));
     	    }
 
-    	    if (((! empty($conf->product->enabled) && $user->rights->produit->lire) || (! empty($conf->service->enabled) && $user->rights->service->lire))
+    	    if (((!empty($conf->product->enabled) && $user->rights->produit->lire) || (!empty($conf->service->enabled) && $user->rights->service->lire))
     	    )
     	    {
     	        $langs->load("products");
-    	        $searchform.=printSearchForm(DOL_URL_ROOT.'/product/list.php', DOL_URL_ROOT.'/product/list.php', $langs->trans("Products")."/".$langs->trans("Services"), 'maxwidth100', 'sall', 'P', 'searchleftp', img_object('','product'));
+    	        $searchform .= printSearchForm(DOL_URL_ROOT.'/product/list.php', DOL_URL_ROOT.'/product/list.php', $langs->trans("Products")."/".$langs->trans("Services"), 'maxwidth100', 'sall', 'P', 'searchleftp', img_object('', 'product'));
     	    }
 
-            if (! empty($conf->projet->enabled) && $user->rights->projet->lire)
+            if (!empty($conf->projet->enabled) && $user->rights->projet->lire)
     	    {
     	        $langs->load("projects");
-    	        $searchform.=printSearchForm(DOL_URL_ROOT.'/projet/list.php', DOL_URL_ROOT.'/projet/list.php', $langs->trans("Projects"), 'maxwidth100', 'search_all', 'Q', 'searchleftproj', img_object('','projectpub'));
+    	        $searchform .= printSearchForm(DOL_URL_ROOT.'/projet/list.php', DOL_URL_ROOT.'/projet/list.php', $langs->trans("Projects"), 'maxwidth100', 'search_all', 'Q', 'searchleftproj', img_object('', 'projectpub'));
     	    }
 
-    	    if (! empty($conf->adherent->enabled) && $user->rights->adherent->lire)
+    	    if (!empty($conf->adherent->enabled) && $user->rights->adherent->lire)
     	    {
     	        $langs->load("members");
-    	        $searchform.=printSearchForm(DOL_URL_ROOT.'/adherents/list.php', DOL_URL_ROOT.'/adherents/list.php', $langs->trans("Members"), 'maxwidth100', 'sall', 'M', 'searchleftm', img_object('','user'));
+    	        $searchform .= printSearchForm(DOL_URL_ROOT.'/adherents/list.php', DOL_URL_ROOT.'/adherents/list.php', $langs->trans("Members"), 'maxwidth100', 'sall', 'M', 'searchleftm', img_object('', 'user'));
     	    }
 
-    		if (! empty($conf->user->enabled) && $user->rights->user->user->lire)
+    		if (!empty($conf->user->enabled) && $user->rights->user->user->lire)
     	    {
     	        $langs->load("users");
-    	        $searchform.=printSearchForm(DOL_URL_ROOT.'/user/list.php', DOL_URL_ROOT.'/user/list.php', $langs->trans("Users"), 'maxwidth100', 'sall', 'M', 'searchleftuser', img_object('','user'));
+    	        $searchform .= printSearchForm(DOL_URL_ROOT.'/user/list.php', DOL_URL_ROOT.'/user/list.php', $langs->trans("Users"), 'maxwidth100', 'sall', 'M', 'searchleftuser', img_object('', 'user'));
     	    }
 	    }
 
 	    // Execute hook printSearchForm
-	    $parameters=array('searchform'=>$searchform);
-	    $reshook=$hookmanager->executeHooks('printSearchForm',$parameters);    // Note that $action and $object may have been modified by some hooks
+	    $parameters = array('searchform'=>$searchform);
+	    $reshook = $hookmanager->executeHooks('printSearchForm', $parameters); // Note that $action and $object may have been modified by some hooks
 		if (empty($reshook))
 		{
-			$searchform.=$hookmanager->resPrint;
+			$searchform .= $hookmanager->resPrint;
 		}
-		else $searchform=$hookmanager->resPrint;
+		else $searchform = $hookmanager->resPrint;
 
 		if ($conf->use_javascript_ajax && $conf->browser->layout == 'phone')
 	    {
-	        $searchform='<div class="blockvmenuimpair blockvmenusearchphone"><div id="divsearchforms1"><a href="#" alt="'.dol_escape_htmltag($langs->trans("ShowSearchFields")).'">'.$langs->trans("Search").'...</a></div><div id="divsearchforms2" style="display: none">'.$searchform.'</div>';
-	        $searchform.='<script type="text/javascript">
+	        $searchform = '<div class="blockvmenuimpair blockvmenusearchphone"><div id="divsearchforms1"><a href="#" alt="'.dol_escape_htmltag($langs->trans("ShowSearchFields")).'">'.$langs->trans("Search").'...</a></div><div id="divsearchforms2" style="display: none">'.$searchform.'</div>';
+	        $searchform .= '<script type="text/javascript">
             	jQuery(document).ready(function () {
             		jQuery("#divsearchforms1").click(function(){
 	                   jQuery("#divsearchforms2").toggle();
 	               });
             	});
                 </script>' . "\n";
-	        $searchform.='</div>';
+	        $searchform .= '</div>';
 	    }
 
 	    // Define $bookmarks
-	    if (! empty($conf->bookmark->enabled) && $user->rights->bookmark->lire)
+	    if (!empty($conf->bookmark->enabled) && $user->rights->bookmark->lire)
 	    {
 	        include_once (DOL_DOCUMENT_ROOT.'/bookmarks/bookmarks.lib.php');
 	        $langs->load("bookmarks");
 
-	        $bookmarks=printBookmarksList($db, $langs);
+	        $bookmarks = printBookmarksList($db, $langs);
 	    }
 
 	    // Left column
 	    print '<!-- Begin left menu -->'."\n";
 
-	    print '<div class="vmenu"'.(empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)?'':' title="Left menu"').'>'."\n\n";
+	    print '<div class="vmenu"'.(empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '' : ' title="Left menu"').'>'."\n\n";
 
     	// Show left menu with other forms
 	    $menumanager->menu_array = $menu_array_before;
@@ -1699,25 +1699,25 @@ 
         // Version
         if (empty($conf->global->MAIN_HIDE_VERSION))    // Version is already on help picto and on login page.
         {
-            $doliurl='https://www.dolibarr.org';
+            $doliurl = 'https://www.dolibarr.org';
     		//local communities
-    		if (preg_match('/fr/i',$langs->defaultlang)) $doliurl='https://www.dolibarr.fr';
-    		if (preg_match('/es/i',$langs->defaultlang)) $doliurl='https://www.dolibarr.es';
-    		if (preg_match('/de/i',$langs->defaultlang)) $doliurl='https://www.dolibarr.de';
-    		if (preg_match('/it/i',$langs->defaultlang)) $doliurl='https://www.dolibarr.it';
-    		if (preg_match('/gr/i',$langs->defaultlang)) $doliurl='https://www.dolibarr.gr';
-
-            $appli=constant('DOL_APPLICATION_TITLE');
-    	    if (! empty($conf->global->MAIN_APPLICATION_TITLE))
+    		if (preg_match('/fr/i', $langs->defaultlang)) $doliurl = 'https://www.dolibarr.fr';
+    		if (preg_match('/es/i', $langs->defaultlang)) $doliurl = 'https://www.dolibarr.es';
+    		if (preg_match('/de/i', $langs->defaultlang)) $doliurl = 'https://www.dolibarr.de';
+    		if (preg_match('/it/i', $langs->defaultlang)) $doliurl = 'https://www.dolibarr.it';
+    		if (preg_match('/gr/i', $langs->defaultlang)) $doliurl = 'https://www.dolibarr.gr';
+
+            $appli = constant('DOL_APPLICATION_TITLE');
+    	    if (!empty($conf->global->MAIN_APPLICATION_TITLE))
     	    {
-    	    	$appli=$conf->global->MAIN_APPLICATION_TITLE; $doliurl='';
+    	    	$appli = $conf->global->MAIN_APPLICATION_TITLE; $doliurl = '';
     	    	if (preg_match('/\d\.\d/', $appli))
     	    	{
-    				if (! preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli.=" (".DOL_VERSION.")";	// If new title contains a version that is different than core
+    				if (!preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli .= " (".DOL_VERSION.")"; // If new title contains a version that is different than core
     	    	}
-    	    	else $appli.=" ".DOL_VERSION;
+    	    	else $appli .= " ".DOL_VERSION;
     	    }
-    	    else $appli.=" ".DOL_VERSION;
+    	    else $appli .= " ".DOL_VERSION;
     	    print '<div id="blockvmenuhelpapp" class="blockvmenuhelp">';
     	    if ($doliurl) print '<a class="help" target="_blank" href="'.$doliurl.'">';
     	    else print '<span class="help">';
@@ -1728,26 +1728,26 @@ 
         }
 
 		// Link to bugtrack
-		if (! empty($conf->global->MAIN_BUGTRACK_ENABLELINK))
+		if (!empty($conf->global->MAIN_BUGTRACK_ENABLELINK))
 		{
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
 			$bugbaseurl = 'https://github.com/Dolibarr/dolibarr/issues/new';
-			$bugbaseurl.= '?title=';
-			$bugbaseurl.= urlencode("Bug: ");
-			$bugbaseurl.= '&body=';
+			$bugbaseurl .= '?title=';
+			$bugbaseurl .= urlencode("Bug: ");
+			$bugbaseurl .= '&body=';
 			// TODO use .github/ISSUE_TEMPLATE.md to generate?
 			$bugbaseurl .= urlencode("# Bug\n");
 			$bugbaseurl .= urlencode("\n");
-			$bugbaseurl.= urlencode("## Environment\n");
-			$bugbaseurl.= urlencode("- **Version**: " . DOL_VERSION . "\n");
-			$bugbaseurl.= urlencode("- **OS**: " . php_uname('s') . "\n");
-			$bugbaseurl.= urlencode("- **Web server**: " . $_SERVER["SERVER_SOFTWARE"] . "\n");
-			$bugbaseurl.= urlencode("- **PHP**: " . php_sapi_name() . ' ' . phpversion() . "\n");
-			$bugbaseurl.= urlencode("- **Database**: " . $db::LABEL . ' ' . $db->getVersion() . "\n");
-			$bugbaseurl.= urlencode("- **URL**: " . $_SERVER["REQUEST_URI"] . "\n");
-			$bugbaseurl.= urlencode("\n");
-			$bugbaseurl.= urlencode("## Report\n");
+			$bugbaseurl .= urlencode("## Environment\n");
+			$bugbaseurl .= urlencode("- **Version**: ".DOL_VERSION."\n");
+			$bugbaseurl .= urlencode("- **OS**: ".php_uname('s')."\n");
+			$bugbaseurl .= urlencode("- **Web server**: ".$_SERVER["SERVER_SOFTWARE"]."\n");
+			$bugbaseurl .= urlencode("- **PHP**: ".php_sapi_name().' '.phpversion()."\n");
+			$bugbaseurl .= urlencode("- **Database**: ".$db::LABEL.' '.$db->getVersion()."\n");
+			$bugbaseurl .= urlencode("- **URL**: ".$_SERVER["REQUEST_URI"]."\n");
+			$bugbaseurl .= urlencode("\n");
+			$bugbaseurl .= urlencode("## Report\n");
 			print '<div id="blockvmenuhelpbugreport" class="blockvmenuhelp">';
 			print '<a class="help" target="_blank" href="'.$bugbaseurl.'">'.$langs->trans("FindBug").'</a>';
 			print '</div>';
@@ -1762,11 +1762,11 @@ 
         print "\n";
 
 	    // Execute hook printLeftBlock
-	    $parameters=array();
-	    $reshook=$hookmanager->executeHooks('printLeftBlock',$parameters);    // Note that $action and $object may have been modified by some hooks
+	    $parameters = array();
+	    $reshook = $hookmanager->executeHooks('printLeftBlock', $parameters); // Note that $action and $object may have been modified by some hooks
 	    print $hookmanager->resPrint;
 
-	    print '</div></div> <!-- End side-nav id-left -->';	// End div id="side-nav" div id="id-left"
+	    print '</div></div> <!-- End side-nav id-left -->'; // End div id="side-nav" div id="id-left"
     }
 
     print "\n";
@@ -1782,7 +1782,7 @@ 
  *  @param	string	$title		Title
  *  @return	void
  */
-function main_area($title='')
+function main_area($title = '')
 {
     global $conf, $langs;
 
@@ -1792,7 +1792,7 @@ 
 
     print '<!-- Begin div class="fiche" -->'."\n".'<div class="fiche">'."\n";
 
-    if (! empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED)) print info_admin($langs->trans("WarningYouAreInMaintenanceMode",$conf->global->MAIN_ONLY_LOGIN_ALLOWED));
+    if (!empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED)) print info_admin($langs->trans("WarningYouAreInMaintenanceMode", $conf->global->MAIN_ONLY_LOGIN_ALLOWED));
 }
 
 
@@ -1803,40 +1803,40 @@ 
  *  @param  Translate	$langs				Language
  *  @return	array		Array of help urls
  */
-function getHelpParamFor($helppagename,$langs)
+function getHelpParamFor($helppagename, $langs)
 {
-	$helpbaseurl='';
-	$helppage='';
-	$mode='';
+	$helpbaseurl = '';
+	$helppage = '';
+	$mode = '';
 
-    if (preg_match('/^http/i',$helppagename))
+    if (preg_match('/^http/i', $helppagename))
     {
         // If complete URL
-        $helpbaseurl='%s';
-        $helppage=$helppagename;
-        $mode='local';
+        $helpbaseurl = '%s';
+        $helppage = $helppagename;
+        $mode = 'local';
     }
     else
     {
         // If WIKI URL
-        if (preg_match('/^es/i',$langs->defaultlang))
+        if (preg_match('/^es/i', $langs->defaultlang))
         {
-            $helpbaseurl='http://wiki.dolibarr.org/index.php/%s';
-            if (preg_match('/ES:([^|]+)/i',$helppagename,$reg)) $helppage=$reg[1];
+            $helpbaseurl = 'http://wiki.dolibarr.org/index.php/%s';
+            if (preg_match('/ES:([^|]+)/i', $helppagename, $reg)) $helppage = $reg[1];
         }
-        if (preg_match('/^fr/i',$langs->defaultlang))
+        if (preg_match('/^fr/i', $langs->defaultlang))
         {
-            $helpbaseurl='http://wiki.dolibarr.org/index.php/%s';
-            if (preg_match('/FR:([^|]+)/i',$helppagename,$reg)) $helppage=$reg[1];
+            $helpbaseurl = 'http://wiki.dolibarr.org/index.php/%s';
+            if (preg_match('/FR:([^|]+)/i', $helppagename, $reg)) $helppage = $reg[1];
         }
         if (empty($helppage))	// If help page not already found
         {
-            $helpbaseurl='http://wiki.dolibarr.org/index.php/%s';
-            if (preg_match('/EN:([^|]+)/i',$helppagename,$reg)) $helppage=$reg[1];
+            $helpbaseurl = 'http://wiki.dolibarr.org/index.php/%s';
+            if (preg_match('/EN:([^|]+)/i', $helppagename, $reg)) $helppage = $reg[1];
         }
-        $mode='wiki';
+        $mode = 'wiki';
     }
-    return array('helpbaseurl'=>$helpbaseurl,'helppage'=>$helppage,'mode'=>$mode);
+    return array('helpbaseurl'=>$helpbaseurl, 'helppage'=>$helppage, 'mode'=>$mode);
 }
 
 
@@ -1853,44 +1853,44 @@ 
  *  @param	string	$img				Image to use
  *  @return	string
  */
-function printSearchForm($urlaction, $urlobject, $title, $htmlmorecss, $htmlinputname, $accesskey='', $prefhtmlinputname='',$img='')
+function printSearchForm($urlaction, $urlobject, $title, $htmlmorecss, $htmlinputname, $accesskey = '', $prefhtmlinputname = '', $img = '')
 {
-    global $conf,$langs;
+    global $conf, $langs;
 
     if (empty($htmlinputid)) {
         $htmlinputid = $htmlinputname;
     }
 
-    $ret='';
-    $ret.='<form action="'.$urlaction.'" method="post" class="searchform">';
+    $ret = '';
+    $ret .= '<form action="'.$urlaction.'" method="post" class="searchform">';
 	if (empty($conf->global->MAIN_HTML5_PLACEHOLDER))
 	{
-        $ret.='<div class="menu_titre menu_titre_search"';
-    	if (! empty($conf->global->MAIN_HTML5_PLACEHOLDER)) $ret.=' style="display: inline-block"';
-    	$ret.='>';
-    	$ret.='<label for="'.$prefhtmlinputname.$htmlinputname.'">';
-    	$ret.='<a class="vsmenu" href="'.$urlobject.'">';
-       	if ($img && ! empty($conf->global->MAIN_HTML5_PLACEHOLDER)) $ret.=$img;
-       	else if ($img || $title) $ret.=$img.' '.$title;
-    	$ret.='</a>';
-    	$ret.='</label>';
-    	$ret.='</div>';
+        $ret .= '<div class="menu_titre menu_titre_search"';
+    	if (!empty($conf->global->MAIN_HTML5_PLACEHOLDER)) $ret .= ' style="display: inline-block"';
+    	$ret .= '>';
+    	$ret .= '<label for="'.$prefhtmlinputname.$htmlinputname.'">';
+    	$ret .= '<a class="vsmenu" href="'.$urlobject.'">';
+       	if ($img && !empty($conf->global->MAIN_HTML5_PLACEHOLDER)) $ret .= $img;
+       	else if ($img || $title) $ret .= $img.' '.$title;
+    	$ret .= '</a>';
+    	$ret .= '</label>';
+    	$ret .= '</div>';
 	}
-    $ret.='<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-    $ret.='<input type="hidden" name="mode" value="search">';
-    $ret.='<input type="text" class="flat '.$htmlmorecss.'"';
-    if (! empty($conf->global->MAIN_HTML5_PLACEHOLDER)) $ret.=' style="text-indent: 22px; background-image: url(\''.$img.'\'); background-repeat: no-repeat; background-position: 3px;"';
-    $ret.=($accesskey?' accesskey="'.$accesskey.'"':'');
-    if (! empty($conf->global->MAIN_HTML5_PLACEHOLDER)) $ret.=' placeholder="'.strip_tags($title).'"';		// Will work only if MAIN_HTML5_PLACEHOLDER is set to 1
-    else $ret.=' title="'.$langs->trans("SearchOf").''.strip_tags($title).'"';
-    $ret.=' name="'.$htmlinputname.'" id="'.$prefhtmlinputname.$htmlinputname.'" />';
-    $ret.='<input type="submit" class="button" style="padding-top: 4px; padding-bottom: 4px; padding-left: 6px; padding-right: 6px" value="'.$langs->trans("Go").'">';
-    $ret.="</form>\n";
+    $ret .= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+    $ret .= '<input type="hidden" name="mode" value="search">';
+    $ret .= '<input type="text" class="flat '.$htmlmorecss.'"';
+    if (!empty($conf->global->MAIN_HTML5_PLACEHOLDER)) $ret .= ' style="text-indent: 22px; background-image: url(\''.$img.'\'); background-repeat: no-repeat; background-position: 3px;"';
+    $ret .= ($accesskey ? ' accesskey="'.$accesskey.'"' : '');
+    if (!empty($conf->global->MAIN_HTML5_PLACEHOLDER)) $ret .= ' placeholder="'.strip_tags($title).'"'; // Will work only if MAIN_HTML5_PLACEHOLDER is set to 1
+    else $ret .= ' title="'.$langs->trans("SearchOf").''.strip_tags($title).'"';
+    $ret .= ' name="'.$htmlinputname.'" id="'.$prefhtmlinputname.$htmlinputname.'" />';
+    $ret .= '<input type="submit" class="button" style="padding-top: 4px; padding-bottom: 4px; padding-left: 6px; padding-right: 6px" value="'.$langs->trans("Go").'">';
+    $ret .= "</form>\n";
     return $ret;
 }
 
 
-if (! function_exists("llxFooter"))
+if (!function_exists("llxFooter"))
 {
     /**
      * Show HTML footer
@@ -1901,7 +1901,7 @@ 
 	 * @param	string	$zone		'private' (for private pages) or 'public' (for public pages)
      * @return	void
      */
-    function llxFooter($comment='',$zone='private')
+    function llxFooter($comment = '', $zone = 'private')
     {
         global $conf, $langs, $user, $object;
         global $delayedhtmlcontent;
@@ -1911,10 +1911,10 @@ 
 
         // Code for search criteria persistence.
         // Save $user->lastsearch_values if defined (define on list pages when a form field search_xxx exists)
-        if (is_object($user) && ! empty($user->lastsearch_values_tmp) && is_array($user->lastsearch_values_tmp))
+        if (is_object($user) && !empty($user->lastsearch_values_tmp) && is_array($user->lastsearch_values_tmp))
         {
             // Clean data
-            foreach($user->lastsearch_values_tmp as $key => $val)
+            foreach ($user->lastsearch_values_tmp as $key => $val)
             {
                 unset($_SESSION['lastsearch_values_tmp_'.$key]);
                 if (count($val))
@@ -1922,14 +1922,14 @@ 
                     if (empty($val['sortfield'])) unset($val['sortfield']);
                     if (empty($val['sortorder'])) unset($val['sortorder']);
                     dol_syslog('Save lastsearch_values_tmp_'.$key.'='.json_encode($val, 0)." (systematic recording of last search criteria)");
-                    $_SESSION['lastsearch_values_tmp_'.$key]=json_encode($val);
+                    $_SESSION['lastsearch_values_tmp_'.$key] = json_encode($val);
                     unset($_SESSION['lastsearch_values_'.$key]);
                 }
             }
         }
 
         // Core error message
-        if (! empty($conf->global->MAIN_CORE_ERROR))
+        if (!empty($conf->global->MAIN_CORE_ERROR))
         {
             // Ajax version
             if ($conf->use_javascript_ajax)
@@ -1958,19 +1958,19 @@ 
 
         printCommonFooter($zone);
 
-        if (empty($conf->dol_hide_leftmenu) && empty($conf->dol_use_jmobile)) print '</div> <!-- End div id-container -->'."\n";	// End div container
+        if (empty($conf->dol_hide_leftmenu) && empty($conf->dol_use_jmobile)) print '</div> <!-- End div id-container -->'."\n"; // End div container
 
-        if (! empty($delayedhtmlcontent)) print $delayedhtmlcontent;
+        if (!empty($delayedhtmlcontent)) print $delayedhtmlcontent;
 
         // TODO Move this in lib_head.js.php
 
         // Wrapper to show tooltips (html or onclick popup)
-        if (! empty($conf->use_javascript_ajax) && empty($conf->dol_no_mouse_hover))
+        if (!empty($conf->use_javascript_ajax) && empty($conf->dol_no_mouse_hover))
         {
     		print "\n<!-- JS CODE TO ENABLE tipTip on all object with class classfortooltip -->\n";
     		print '<script type="text/javascript">
             	jQuery(document).ready(function () {
-            		jQuery(".classfortooltip").tipTip({maxWidth: "'.dol_size(($conf->browser->layout == 'phone' ? 400 : 700),'width').'px", edgeOffset: 10, delay: 50, fadeIn: 50, fadeOut: 50});
+            		jQuery(".classfortooltip").tipTip({maxWidth: "'.dol_size(($conf->browser->layout == 'phone' ? 400 : 700), 'width').'px", edgeOffset: 10, delay: 50, fadeIn: 50, fadeOut: 50});
             		jQuery(".classfortooltiponclicktext").dialog({ width: '.($conf->browser->layout == 'phone' ? 400 : 700).', autoOpen: false });
             		jQuery(".classfortooltiponclick").click(function () {
             		    console.log("We click on tooltip for element with dolid="+$(this).attr(\'dolid\'));
@@ -1985,7 +1985,7 @@ 
         }
 
         // Wrapper to manage document_preview
-        if (! empty($conf->use_javascript_ajax) && ($conf->browser->layout != 'phone'))
+        if (!empty($conf->use_javascript_ajax) && ($conf->browser->layout != 'phone'))
         {
             print "\n<!-- JS CODE TO ENABLE document_preview -->\n";
             print '<script type="text/javascript">
@@ -2000,7 +2000,7 @@ 
         }
 
         // Wrapper to manage dropdown
-        if (! empty($conf->use_javascript_ajax) && ! defined('JS_JQUERY_DISABLE_DROPDOWN'))
+        if (!empty($conf->use_javascript_ajax) && !defined('JS_JQUERY_DISABLE_DROPDOWN'))
         {
             print "\n<!-- JS CODE TO ENABLE dropdown -->\n";
             print '<script type="text/javascript">
@@ -2039,7 +2039,7 @@ 
         }
 
         // Wrapper to add log when clicking on download or preview
-        if (! empty($conf->blockedlog->enabled) && is_object($object) && $object->id > 0 && $object->statut > 0)
+        if (!empty($conf->blockedlog->enabled) && is_object($object) && $object->id > 0 && $object->statut > 0)
         {
             if (in_array($object->element, array('facture')))       // Restrict for the moment to element 'facture'
             {

Braces +516 added lines, -199 removed lines

@@ -48,7 +48,8 @@ 
 }
 
 // Removed magic_quotes
-if (function_exists('get_magic_quotes_gpc'))	// magic_quotes_* deprecated in PHP 5.0 and removed in PHP 5.5
+if (function_exists('get_magic_quotes_gpc')) {
+	// magic_quotes_* deprecated in PHP 5.0 and removed in PHP 5.5
 {
     if (get_magic_quotes_gpc())
     {
@@ -59,6 +60,7 @@ 
         function stripslashes_deep($value)
         {
             return (is_array($value) ? array_map('stripslashes_deep', $value) : stripslashes($value));
+}
         }
         $_GET     = array_map('stripslashes_deep', $_GET);
         $_POST    = array_map('stripslashes_deep', $_POST);
@@ -98,7 +100,9 @@ 
     $inj += preg_match('/<script/i', $val);
 	$inj += preg_match('/<iframe/i', $val);
 	$inj += preg_match('/Set\.constructor/i', $val);	// ECMA script 6
-    if (! defined('NOSTYLECHECK')) $inj += preg_match('/<style/i', $val);
+    if (! defined('NOSTYLECHECK')) {
+    	$inj += preg_match('/<style/i', $val);
+    }
     $inj += preg_match('/base[\s]+href/si', $val);
     $inj += preg_match('/<.*onmouse/si', $val);       // onmousexxx can be set on img or any html tag like <img title='...' onmouseover=alert(1)>
     $inj += preg_match('/onerror\s*=/i', $val);       // onerror can be set on img or any html tag like <img title='...' onerror = alert(1)>
@@ -112,8 +116,14 @@ 
         $inj += preg_match('/vbscript:/i', $val);
     //}
     // For XSS Injection done by adding javascript closing html tags like with onmousemove, etc... (closing a src or href tag with not cleaned param)
-    if ($type == 1) $inj += preg_match('/"/i', $val);		// We refused " in GET parameters value
-    if ($type == 2) $inj += preg_match('/[;"]/', $val);		// PHP_SELF is a file system path. It can contains spaces.
+    if ($type == 1) {
+    	$inj += preg_match('/"/i', $val);
+    }
+    // We refused " in GET parameters value
+    if ($type == 2) {
+    	$inj += preg_match('/[;"]/', $val);
+    }
+    // PHP_SELF is a file system path. It can contains spaces.
     return $inj;
 }
 
@@ -133,16 +143,14 @@ 
             if (analyseVarsForSqlAndScriptsInjection($value,$type))
             {
                 $var[$key] = $value;
-            }
-            else
+            } else
 			{
                 print 'Access refused by SQL/Script injection protection in main.inc.php (type='.htmlentities($type).' key='.htmlentities($key).' value='.htmlentities($value).' page='.htmlentities($_SERVER["REQUEST_URI"]).')';
                 exit;
             }
         }
         return true;
-    }
-    else
+    } else
     {
         return (test_sql_and_script_inject($var,$type) <= 0);
     }
@@ -150,7 +158,9 @@ 
 
 
 // Check consistency of NOREQUIREXXX DEFINES
-if ((defined('NOREQUIREDB') || defined('NOREQUIRETRAN')) && ! defined('NOREQUIREMENU')) dol_print_error('','If define NOREQUIREDB or NOREQUIRETRAN are set, you must also set NOREQUIREMENU or not use them');
+if ((defined('NOREQUIREDB') || defined('NOREQUIRETRAN')) && ! defined('NOREQUIREMENU')) {
+	dol_print_error('','If define NOREQUIREDB or NOREQUIRETRAN are set, you must also set NOREQUIREMENU or not use them');
+}
 
 // Sanity check on URL
 if (! empty($_SERVER["PHP_SELF"]))
@@ -191,20 +201,26 @@ 
 	{
 		$postkey=$tmpautoset[0].'_'.$tmpkey;
 		//var_dump('tmpkey='.$tmpkey.' postkey='.$postkey.' value='.$_POST[$postkey]);
-		if (! empty($_POST[$postkey])) $cookiearrayvalue[$tmpkey]=$_POST[$postkey];
+		if (! empty($_POST[$postkey])) {
+			$cookiearrayvalue[$tmpkey]=$_POST[$postkey];
+		}
 	}
 	$cookiename=$tmpautoset[0];
 	$cookievalue=json_encode($cookiearrayvalue);
 	//var_dump('setcookie cookiename='.$cookiename.' cookievalue='.$cookievalue);
 	setcookie($cookiename, empty($cookievalue)?'':$cookievalue, empty($cookievalue)?0:(time()+(86400*354)), '/', null, false, true);	// keep cookie 1 year and add tag httponly
-	if (empty($cookievalue)) unset($_COOKIE[$cookiename]);
-}
+	if (empty($cookievalue)) {
+		unset($_COOKIE[$cookiename]);
+	}
+	}
 
 // Init session. Name of session is specific to Dolibarr instance.
 $prefix=dol_getprefix();
 $sessionname='DOLSESSID_'.$prefix;
 $sessiontimeout='DOLSESSTIMEOUT_'.$prefix;
-if (! empty($_COOKIE[$sessiontimeout])) ini_set('session.gc_maxlifetime',$_COOKIE[$sessiontimeout]);
+if (! empty($_COOKIE[$sessiontimeout])) {
+	ini_set('session.gc_maxlifetime',$_COOKIE[$sessiontimeout]);
+}
 session_name($sessionname);
 session_set_cookie_params(0, '/', null, false, true);   // Add tag httponly on session cookie (same as setting session.cookie_httponly into php.ini). Must be called before the session_start.
 // This create lock released until session_write_close() or end of page.
@@ -212,11 +228,13 @@ 
 if (! defined('NOSESSION'))
 {
     session_start();
-    if (ini_get('register_globals'))    // Deprecated in 5.3 and removed in 5.4. To solve bug in using $_SESSION
+    if (ini_get('register_globals')) {
+    	// Deprecated in 5.3 and removed in 5.4. To solve bug in using $_SESSION
     {
         foreach ($_SESSION as $key=>$value)
         {
             if (isset($GLOBALS[$key])) unset($GLOBALS[$key]);
+    }
         }
     }
 }
@@ -239,9 +257,13 @@ 
     $conf->browser->tablet=$tmp['tablet'];	   // TODO deprecated, use ->layout
     //var_dump($conf->browser);
 
-    if ($conf->browser->layout == 'phone') $conf->dol_no_mouse_hover=1;
-    if ($conf->browser->layout == 'phone') $conf->global->MAIN_TESTMENUHIDER=1;
-}
+    if ($conf->browser->layout == 'phone') {
+    	$conf->dol_no_mouse_hover=1;
+    }
+    if ($conf->browser->layout == 'phone') {
+    	$conf->global->MAIN_TESTMENUHIDER=1;
+    }
+    }
 
 // Force HTTPS if required ($conf->file->main_force_https is 0/1 or https dolibarr root url)
 // $_SERVER["HTTPS"] is 'on' when link is https, otherwise $_SERVER["HTTPS"] is empty or 'off'
@@ -250,19 +272,19 @@ 
     $newurl='';
     if (is_numeric($conf->file->main_force_https))
     {
-        if ($conf->file->main_force_https == '1' && ! empty($_SERVER["SCRIPT_URI"]))	// If SCRIPT_URI supported by server
+        if ($conf->file->main_force_https == '1' && ! empty($_SERVER["SCRIPT_URI"])) {
+        	// If SCRIPT_URI supported by server
         {
             if (preg_match('/^http:/i',$_SERVER["SCRIPT_URI"]) && ! preg_match('/^https:/i',$_SERVER["SCRIPT_URI"]))	// If link is http
             {
                 $newurl=preg_replace('/^http:/i','https:',$_SERVER["SCRIPT_URI"]);
-            }
         }
-        else	// Check HTTPS environment variable (Apache/mod_ssl only)
+            }
+        } else	// Check HTTPS environment variable (Apache/mod_ssl only)
         {
             $newurl=preg_replace('/^http:/i','https:',DOL_MAIN_URL_ROOT).$_SERVER["REQUEST_URI"];
         }
-    }
-    else
+    } else
     {
         // Check HTTPS environment variable (Apache/mod_ssl only)
         $newurl=$conf->file->main_force_https.$_SERVER["REQUEST_URI"];
@@ -273,8 +295,7 @@ 
         dol_syslog("main.inc: dolibarr_main_force_https is on, we make a redirect to ".$newurl);
         header("Location: ".$newurl);
         exit;
-    }
-    else
+    } else
     {
         dol_syslog("main.inc: dolibarr_main_force_https is on but we failed to forge new https url so no redirect is done", LOG_WARNING);
     }
@@ -282,8 +303,14 @@ 
 
 
 // Loading of additional presentation includes
-if (! defined('NOREQUIREHTML')) require_once DOL_DOCUMENT_ROOT .'/core/class/html.form.class.php';	    // Need 660ko memory (800ko in 2.2)
-if (! defined('NOREQUIREAJAX') && $conf->use_javascript_ajax) require_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';	// Need 22ko memory
+if (! defined('NOREQUIREHTML')) {
+	require_once DOL_DOCUMENT_ROOT .'/core/class/html.form.class.php';
+}
+// Need 660ko memory (800ko in 2.2)
+if (! defined('NOREQUIREAJAX') && $conf->use_javascript_ajax) {
+	require_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
+}
+// Need 22ko memory
 
 // If install or upgrade process not done or not completely finished, we call the install page.
 if (! empty($conf->global->MAIN_NOT_INSTALLED) || ! empty($conf->global->MAIN_NOT_UPGRADED))
@@ -301,9 +328,11 @@ 
     $dolibarrversionlastupgrade=preg_split('/[.-]/',$versiontocompare);
     $dolibarrversionprogram=preg_split('/[.-]/',DOL_VERSION);
     $rescomp=versioncompare($dolibarrversionprogram,$dolibarrversionlastupgrade);
-    if ($rescomp > 0)   // Programs have a version higher than database. We did not add "&& $rescomp < 3" because we want upgrade process for build upgrades
+    if ($rescomp > 0) {
+    	// Programs have a version higher than database. We did not add "&& $rescomp < 3" because we want upgrade process for build upgrades
     {
         dol_syslog("main.inc: database version ".$versiontocompare." is lower than programs version ".DOL_VERSION.". Redirect to install page.", LOG_WARNING);
+    }
         header("Location: ".DOL_URL_ROOT."/install/index.php");
         exit;
     }
@@ -313,25 +342,31 @@ 
 if (! defined('NOTOKENRENEWAL'))
 {
     // roulement des jetons car cree a chaque appel
-    if (isset($_SESSION['newtoken'])) $_SESSION['token'] = $_SESSION['newtoken'];
+    if (isset($_SESSION['newtoken'])) {
+    	$_SESSION['token'] = $_SESSION['newtoken'];
+    }
 
     // Save in $_SESSION['newtoken'] what will be next token. Into forms, we will add param token = $_SESSION['newtoken']
     $token = dol_hash(uniqid(mt_rand(),TRUE)); // Generates a hash of a random number
     $_SESSION['newtoken'] = $token;
 }
-if (! defined('NOCSRFCHECK') && empty($dolibarr_nocsrfcheck) && ! empty($conf->global->MAIN_SECURITY_CSRF_WITH_TOKEN))	// Check validity of token, only if option enabled (this option breaks some features sometimes)
+if (! defined('NOCSRFCHECK') && empty($dolibarr_nocsrfcheck) && ! empty($conf->global->MAIN_SECURITY_CSRF_WITH_TOKEN)) {
+	// Check validity of token, only if option enabled (this option breaks some features sometimes)
 {
     if ($_SERVER['REQUEST_METHOD'] == 'POST' && ! GETPOST('token','alpha')) // Note, offender can still send request by GET
     {
         print "Access refused by CSRF protection in main.inc.php. Token not provided.\n";
+}
         print "If you access your server behind a proxy using url rewriting, you might check that all HTTP header is propagated (or add the line \$dolibarr_nocsrfcheck=1 into your conf.php file).\n";
         die;
     }
-    if ($_SERVER['REQUEST_METHOD'] === 'POST')  // This test must be after loading $_SESSION['token'].
+    if ($_SERVER['REQUEST_METHOD'] === 'POST') {
+    	// This test must be after loading $_SESSION['token'].
     {
         if (GETPOST('token', 'alpha') != $_SESSION['token'])
         {
             dol_syslog("Invalid token in ".$_SERVER['HTTP_REFERER'].", action=".GETPOST('action','aZ09').", _POST['token']=".GETPOST('token','alpha').", _SESSION['token']=".$_SESSION['token'], LOG_WARNING);
+    }
             //print 'Unset POST by CSRF protection in main.inc.php.';	// Do not output anything because this create problems when using the BACK button on browsers.
             unset($_POST);
         }
@@ -339,7 +374,9 @@ 
 }
 
 // Disable modules (this must be after session_start and after conf has been loaded)
-if (GETPOST('disablemodules','alpha'))  $_SESSION["disablemodules"]=GETPOST('disablemodules','alpha');
+if (GETPOST('disablemodules','alpha')) {
+	$_SESSION["disablemodules"]=GETPOST('disablemodules','alpha');
+}
 if (! empty($_SESSION["disablemodules"]))
 {
     $disabled_modules=explode(',',$_SESSION["disablemodules"]);
@@ -347,11 +384,15 @@ 
     {
         if ($module)
         {
-        	if (empty($conf->$module)) $conf->$module=new stdClass();
+        	if (empty($conf->$module)) {
+        		$conf->$module=new stdClass();
+        	}
         	$conf->$module->enabled=false;
-        	if ($module == 'fournisseur')		// Special case
+        	if ($module == 'fournisseur') {
+        		// Special case
         	{
         		$conf->supplier_order->enabled=0;
+        	}
         		$conf->supplier_invoice->enabled=0;
         	}
         }
@@ -369,9 +410,13 @@ 
     // Example: 'http', 'dolibarr', 'ldap', 'http,forceuser'
 
     // Authentication mode
-    if (empty($dolibarr_main_authentication)) $dolibarr_main_authentication='http,dolibarr';
+    if (empty($dolibarr_main_authentication)) {
+    	$dolibarr_main_authentication='http,dolibarr';
+    }
     // Authentication mode: forceuser
-    if ($dolibarr_main_authentication == 'forceuser' && empty($dolibarr_auto_user)) $dolibarr_auto_user='auto';
+    if ($dolibarr_main_authentication == 'forceuser' && empty($dolibarr_auto_user)) {
+    	$dolibarr_auto_user='auto';
+    }
     // Set authmode
     $authmode=explode(',',$dolibarr_main_authentication);
 
@@ -406,11 +451,13 @@ 
         //dol_syslog("POST key=".join(array_keys($_POST),',').' value='.join($_POST,','));
 
         // If in demo mode, we check we go to home page through the public/demo/index.php page
-        if (! empty($dolibarr_main_demo) && $_SERVER['PHP_SELF'] == DOL_URL_ROOT.'/index.php')  // We ask index page
+        if (! empty($dolibarr_main_demo) && $_SERVER['PHP_SELF'] == DOL_URL_ROOT.'/index.php') {
+        	// We ask index page
         {
             if (empty($_SERVER['HTTP_REFERER']) || ! preg_match('/public/',$_SERVER['HTTP_REFERER']))
             {
                 dol_syslog("Call index page from another url than demo page (call is done from page ".$_SERVER['HTTP_REFERER'].")");
+        }
                 $url='';
                 $url.=($url?'&':'').($dol_hide_topmenu?'dol_hide_topmenu='.$dol_hide_topmenu:'');
                 $url.=($url?'&':'').($dol_hide_leftmenu?'dol_hide_leftmenu='.$dol_hide_leftmenu:'');
@@ -455,7 +502,9 @@ 
 		        $hookmanager->initHooks(array('login'));
 		        $parameters=array('dol_authmode'=>$dol_authmode, 'dol_loginmesg'=>$_SESSION["dol_loginmesg"]);
 		        $reshook=$hookmanager->executeHooks('afterLoginFailed',$parameters,$user,$action);    // Note that $action and $object may have been modified by some hooks
-		        if ($reshook < 0) $error++;
+		        if ($reshook < 0) {
+		        	$error++;
+		        }
 
 		        // Note: exit is done later
             }
@@ -467,13 +516,21 @@ 
 
         // Define if we received data to test the login.
         $goontestloop=false;
-        if (isset($_SERVER["REMOTE_USER"]) && in_array('http',$authmode)) $goontestloop=true;
-        if ($dolibarr_main_authentication == 'forceuser' && ! empty($dolibarr_auto_user)) $goontestloop=true;
-        if (GETPOST("username","alpha",2) || ! empty($_COOKIE['login_dolibarr']) || GETPOST('openid_mode','alpha',1)) $goontestloop=true;
+        if (isset($_SERVER["REMOTE_USER"]) && in_array('http',$authmode)) {
+        	$goontestloop=true;
+        }
+        if ($dolibarr_main_authentication == 'forceuser' && ! empty($dolibarr_auto_user)) {
+        	$goontestloop=true;
+        }
+        if (GETPOST("username","alpha",2) || ! empty($_COOKIE['login_dolibarr']) || GETPOST('openid_mode','alpha',1)) {
+        	$goontestloop=true;
+        }
 
-        if (! is_object($langs)) // This can occurs when calling page with NOREQUIRETRAN defined, however we need langs for error messages.
+        if (! is_object($langs)) {
+        	// This can occurs when calling page with NOREQUIRETRAN defined, however we need langs for error messages.
         {
             include_once DOL_DOCUMENT_ROOT.'/core/class/translate.class.php';
+        }
             $langs=new Translate("",$conf);
     		$langcode=(GETPOST('lang','aZ09',1)?GETPOST('lang','aZ09',1):(empty($conf->global->MAIN_LANG_DEFAULT)?'auto':$conf->global->MAIN_LANG_DEFAULT));
         	$langs->setDefaultLang($langcode);
@@ -500,7 +557,9 @@ 
                     $datenow=dol_now();
                     $datefirst=dol_stringtotime($_POST["dst_first"]);
                     $datesecond=dol_stringtotime($_POST["dst_second"]);
-                    if ($datenow >= $datefirst && $datenow < $datesecond) $dol_dst=1;
+                    if ($datenow >= $datefirst && $datenow < $datesecond) {
+                    	$dol_dst=1;
+                    }
                 }
                 //print $datefirst.'-'.$datesecond.'-'.$datenow.'-'.$dol_tz.'-'.$dol_tzstring.'-'.$dol_dst; exit;
             }
@@ -513,7 +572,9 @@ 
 
                 // Bad password. No authmode has found a good password.
                 // We set a generic message if not defined inside function checkLoginPassEntity or subfunctions
-                if (empty($_SESSION["dol_loginmesg"])) $_SESSION["dol_loginmesg"]=$langs->trans("ErrorBadLoginPassword");
+                if (empty($_SESSION["dol_loginmesg"])) {
+                	$_SESSION["dol_loginmesg"]=$langs->trans("ErrorBadLoginPassword");
+                }
 
                 // TODO @deprecated Remove this. Hook must be used, not this trigger.
                 $user->trigger_mesg=$langs->trans("ErrorBadLoginPassword").' - login='.GETPOST("username","alpha",2);
@@ -531,19 +592,26 @@ 
 		        $hookmanager->initHooks(array('login'));
 		        $parameters=array('dol_authmode'=>$dol_authmode, 'dol_loginmesg'=>$_SESSION["dol_loginmesg"]);
 		        $reshook=$hookmanager->executeHooks('afterLoginFailed',$parameters,$user,$action);    // Note that $action and $object may have been modified by some hooks
-		        if ($reshook < 0) $error++;
+		        if ($reshook < 0) {
+		        	$error++;
+		        }
 
 		        // Note: exit is done in next chapter
             }
         }
 
         // End test login / passwords
-        if (! $login || (in_array('ldap',$authmode) && empty($passwordtotest)))	// With LDAP we refused empty password because some LDAP are "opened" for anonymous access so connexion is a success.
+        if (! $login || (in_array('ldap',$authmode) && empty($passwordtotest))) {
+        	// With LDAP we refused empty password because some LDAP are "opened" for anonymous access so connexion is a success.
         {
             // No data to test login, so we show the login page
 			dol_syslog("--- Access to ".$_SERVER["PHP_SELF"]." showing the login form and exit");
-			if (defined('NOREDIRECTBYMAINTOLOGIN')) return 'ERROR_NOT_LOGGED';
-        	else dol_loginfunction($langs,$conf,(! empty($mysoc)?$mysoc:''));
+        }
+			if (defined('NOREDIRECTBYMAINTOLOGIN')) {
+				return 'ERROR_NOT_LOGGED';
+			} else {
+        		dol_loginfunction($langs,$conf,(! empty($mysoc)?$mysoc:''));
+        	}
             exit;
         }
 
@@ -588,17 +656,24 @@ 
 	        $hookmanager->initHooks(array('login'));
 	        $parameters=array('dol_authmode'=>$dol_authmode, 'dol_loginmesg'=>$_SESSION["dol_loginmesg"]);
 	        $reshook=$hookmanager->executeHooks('afterLoginFailed',$parameters,$user,$action);    // Note that $action and $object may have been modified by some hooks
-	        if ($reshook < 0) $error++;
+	        if ($reshook < 0) {
+	        	$error++;
+	        }
 
 	        $paramsurl=array();
-	        if (GETPOST('textbrowser','int')) $paramsurl[]='textbrowser='.GETPOST('textbrowser','int');
-	        if (GETPOST('nojs','int'))        $paramsurl[]='nojs='.GETPOST('nojs','int');
-	        if (GETPOST('lang','aZ09'))       $paramsurl[]='lang='.GETPOST('lang','aZ09');
+	        if (GETPOST('textbrowser','int')) {
+	        	$paramsurl[]='textbrowser='.GETPOST('textbrowser','int');
+	        }
+	        if (GETPOST('nojs','int')) {
+	        	$paramsurl[]='nojs='.GETPOST('nojs','int');
+	        }
+	        if (GETPOST('lang','aZ09')) {
+	        	$paramsurl[]='lang='.GETPOST('lang','aZ09');
+	        }
             header('Location: '.DOL_URL_ROOT.'/index.php'.(count($paramsurl)?'?'.implode('&',$paramsurl):''));
             exit;
         }
-    }
-    else
+    } else
     {
         // We are already into an authenticated session
         $login=$_SESSION["dol_login"];
@@ -648,27 +723,38 @@ 
 	        $hookmanager->initHooks(array('login'));
 	        $parameters=array('dol_authmode'=>$dol_authmode, 'dol_loginmesg'=>$_SESSION["dol_loginmesg"]);
 	        $reshook=$hookmanager->executeHooks('afterLoginFailed',$parameters,$user,$action);    // Note that $action and $object may have been modified by some hooks
-	        if ($reshook < 0) $error++;
+	        if ($reshook < 0) {
+	        	$error++;
+	        }
 
 	        $paramsurl=array();
-	        if (GETPOST('textbrowser','int')) $paramsurl[]='textbrowser='.GETPOST('textbrowser','int');
-	        if (GETPOST('nojs','int'))        $paramsurl[]='nojs='.GETPOST('nojs','int');
-	        if (GETPOST('lang','aZ09'))       $paramsurl[]='lang='.GETPOST('lang','aZ09');
+	        if (GETPOST('textbrowser','int')) {
+	        	$paramsurl[]='textbrowser='.GETPOST('textbrowser','int');
+	        }
+	        if (GETPOST('nojs','int')) {
+	        	$paramsurl[]='nojs='.GETPOST('nojs','int');
+	        }
+	        if (GETPOST('lang','aZ09')) {
+	        	$paramsurl[]='lang='.GETPOST('lang','aZ09');
+	        }
             header('Location: '.DOL_URL_ROOT.'/index.php'.(count($paramsurl)?'?'.implode('&',$paramsurl):''));
             exit;
-        }
-        else
+        } else
 		{
 	       // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 	       $hookmanager->initHooks(array('main'));
 
 	       // Code for search criteria persistence.
-	       if (! empty($_GET['save_lastsearch_values']))    // Keep $_GET here
+	       if (! empty($_GET['save_lastsearch_values'])) {
+	       	// Keep $_GET here
 	       {
                $relativepathstring = preg_replace('/\?.*$/','',$_SERVER["HTTP_REFERER"]);
+	       }
                $relativepathstring = preg_replace('/^https?:\/\/[^\/]*/','',$relativepathstring);     // Get full path except host server
                // Clean $relativepathstring
-   	           if (constant('DOL_URL_ROOT')) $relativepathstring = preg_replace('/^'.preg_quote(constant('DOL_URL_ROOT'),'/').'/', '', $relativepathstring);
+   	           if (constant('DOL_URL_ROOT')) {
+   	           	$relativepathstring = preg_replace('/^'.preg_quote(constant('DOL_URL_ROOT'),'/').'/', '', $relativepathstring);
+   	           }
                $relativepathstring = preg_replace('/^\//', '', $relativepathstring);
                $relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);
                //var_dump($relativepathstring);
@@ -709,11 +795,21 @@ 
         $_SESSION["dol_company"]=$conf->global->MAIN_INFO_SOCIETE_NOM;
         $_SESSION["dol_entity"]=$conf->entity;
     	// Store value into session (values stored only if defined)
-        if (! empty($dol_hide_topmenu))         $_SESSION['dol_hide_topmenu']=$dol_hide_topmenu;
-        if (! empty($dol_hide_leftmenu))        $_SESSION['dol_hide_leftmenu']=$dol_hide_leftmenu;
-        if (! empty($dol_optimize_smallscreen)) $_SESSION['dol_optimize_smallscreen']=$dol_optimize_smallscreen;
-        if (! empty($dol_no_mouse_hover))       $_SESSION['dol_no_mouse_hover']=$dol_no_mouse_hover;
-        if (! empty($dol_use_jmobile))          $_SESSION['dol_use_jmobile']=$dol_use_jmobile;
+        if (! empty($dol_hide_topmenu)) {
+        	$_SESSION['dol_hide_topmenu']=$dol_hide_topmenu;
+        }
+        if (! empty($dol_hide_leftmenu)) {
+        	$_SESSION['dol_hide_leftmenu']=$dol_hide_leftmenu;
+        }
+        if (! empty($dol_optimize_smallscreen)) {
+        	$_SESSION['dol_optimize_smallscreen']=$dol_optimize_smallscreen;
+        }
+        if (! empty($dol_no_mouse_hover)) {
+        	$_SESSION['dol_no_mouse_hover']=$dol_no_mouse_hover;
+        }
+        if (! empty($dol_use_jmobile)) {
+        	$_SESSION['dol_use_jmobile']=$dol_use_jmobile;
+        }
 
         dol_syslog("This is a new started user session. _SESSION['dol_login']=".$_SESSION["dol_login"]." Session id=".session_id());
 
@@ -739,7 +835,9 @@ 
         $hookmanager->initHooks(array('login'));
         $parameters=array('dol_authmode'=>$dol_authmode, 'dol_loginfo'=>$loginfo);
         $reshook=$hookmanager->executeHooks('afterLogin',$parameters,$user,$action);    // Note that $action and $object may have been modified by some hooks
-        if ($reshook < 0) $error++;
+        if ($reshook < 0) {
+        	$error++;
+        }
 
         if ($error)
         {
@@ -747,20 +845,23 @@ 
             session_destroy();
             dol_print_error($db,'Error in some hooks afterLogin (or old trigger USER_LOGIN)');
             exit;
-        }
-        else
+        } else
 		{
             $db->commit();
         }
 
         // Change landing page if defined.
         $landingpage=(empty($user->conf->MAIN_LANDING_PAGE)?(empty($conf->global->MAIN_LANDING_PAGE)?'':$conf->global->MAIN_LANDING_PAGE):$user->conf->MAIN_LANDING_PAGE);
-        if (! empty($landingpage))    // Example: /index.php
+        if (! empty($landingpage)) {
+        	// Example: /index.php
         {
             $newpath=dol_buildpath($landingpage, 1);
-            if ($_SERVER["PHP_SELF"] != $newpath)   // not already on landing page (avoid infinite loop)
+        }
+            if ($_SERVER["PHP_SELF"] != $newpath) {
+            	// not already on landing page (avoid infinite loop)
             {
                 header('Location: '.$newpath);
+            }
                 exit;
             }
         }
@@ -783,8 +884,14 @@ 
      */
 
     // Set liste_limit
-    if (isset($user->conf->MAIN_SIZE_LISTE_LIMIT))	$conf->liste_limit = $user->conf->MAIN_SIZE_LISTE_LIMIT;	// Can be 0
-    if (isset($user->conf->PRODUIT_LIMIT_SIZE))	$conf->product->limit_size = $user->conf->PRODUIT_LIMIT_SIZE;	// Can be 0
+    if (isset($user->conf->MAIN_SIZE_LISTE_LIMIT)) {
+    	$conf->liste_limit = $user->conf->MAIN_SIZE_LISTE_LIMIT;
+    }
+    // Can be 0
+    if (isset($user->conf->PRODUIT_LIMIT_SIZE)) {
+    	$conf->product->limit_size = $user->conf->PRODUIT_LIMIT_SIZE;
+    }
+    // Can be 0
 
     // Replace conf->css by personalized value if theme not forced
     if (empty($conf->global->MAIN_FORCETHEME) && ! empty($user->conf->MAIN_THEME))
@@ -803,27 +910,44 @@ 
 
 
 // Set javascript option
-if (! GETPOST('nojs','int'))   // If javascript was not disabled on URL
+if (! GETPOST('nojs','int')) {
+	// If javascript was not disabled on URL
 {
 	if (! empty($user->conf->MAIN_DISABLE_JAVASCRIPT))
 	{
 		$conf->use_javascript_ajax=! $user->conf->MAIN_DISABLE_JAVASCRIPT;
+}
 	}
+} else {
+	$conf->use_javascript_ajax=0;
 }
-else $conf->use_javascript_ajax=0;
 // Set MAIN_OPTIMIZEFORTEXTBROWSER
-if (GETPOST('textbrowser','int') || (! empty($conf->browser->name) && $conf->browser->name == 'lynxlinks') || ! empty($user->conf->MAIN_OPTIMIZEFORTEXTBROWSER))   // If we must enable text browser
+if (GETPOST('textbrowser','int') || (! empty($conf->browser->name) && $conf->browser->name == 'lynxlinks') || ! empty($user->conf->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+	// If we must enable text browser
 {
     $conf->global->MAIN_OPTIMIZEFORTEXTBROWSER=1;
 }
+}
 
 // Set terminal output option according to conf->browser.
-if (GETPOST('dol_hide_leftmenu','int') || ! empty($_SESSION['dol_hide_leftmenu']))               $conf->dol_hide_leftmenu=1;
-if (GETPOST('dol_hide_topmenu','int') || ! empty($_SESSION['dol_hide_topmenu']))                 $conf->dol_hide_topmenu=1;
-if (GETPOST('dol_optimize_smallscreen','int') || ! empty($_SESSION['dol_optimize_smallscreen'])) $conf->dol_optimize_smallscreen=1;
-if (GETPOST('dol_no_mouse_hover','int') || ! empty($_SESSION['dol_no_mouse_hover']))             $conf->dol_no_mouse_hover=1;
-if (GETPOST('dol_use_jmobile','int') || ! empty($_SESSION['dol_use_jmobile']))                   $conf->dol_use_jmobile=1;
-if (! empty($conf->browser->layout) && $conf->browser->layout != 'classic') $conf->dol_no_mouse_hover=1;
+if (GETPOST('dol_hide_leftmenu','int') || ! empty($_SESSION['dol_hide_leftmenu'])) {
+	$conf->dol_hide_leftmenu=1;
+}
+if (GETPOST('dol_hide_topmenu','int') || ! empty($_SESSION['dol_hide_topmenu'])) {
+	$conf->dol_hide_topmenu=1;
+}
+if (GETPOST('dol_optimize_smallscreen','int') || ! empty($_SESSION['dol_optimize_smallscreen'])) {
+	$conf->dol_optimize_smallscreen=1;
+}
+if (GETPOST('dol_no_mouse_hover','int') || ! empty($_SESSION['dol_no_mouse_hover'])) {
+	$conf->dol_no_mouse_hover=1;
+}
+if (GETPOST('dol_use_jmobile','int') || ! empty($_SESSION['dol_use_jmobile'])) {
+	$conf->dol_use_jmobile=1;
+}
+if (! empty($conf->browser->layout) && $conf->browser->layout != 'classic') {
+	$conf->dol_no_mouse_hover=1;
+}
 if ((! empty($conf->browser->layout) && $conf->browser->layout == 'phone')
 	|| (! empty($_SESSION['dol_screenwidth']) && $_SESSION['dol_screenwidth'] < 400)
 	|| (! empty($_SESSION['dol_screenheight']) && $_SESSION['dol_screenheight'] < 400)
@@ -832,7 +956,9 @@ 
 	$conf->dol_optimize_smallscreen=1;
 }
 // If we force to use jmobile, then we reenable javascript
-if (! empty($conf->dol_use_jmobile)) $conf->use_javascript_ajax=1;
+if (! empty($conf->dol_use_jmobile)) {
+	$conf->use_javascript_ajax=1;
+}
 // Replace themes bugged with jmobile with eldy
 if (! empty($conf->dol_use_jmobile) && in_array($conf->theme,array('bureau2crea','cameleo','amarok')))
 {
@@ -843,7 +969,8 @@ 
 
 if (! defined('NOREQUIRETRAN'))
 {
-    if (! GETPOST('lang','aZ09'))	// If language was not forced on URL
+    if (! GETPOST('lang','aZ09')) {
+    	// If language was not forced on URL
     {
         // If user has chosen its own language
         if (! empty($user->conf->MAIN_LANG_DEFAULT))
@@ -853,6 +980,7 @@ 
             if ($langs->getDefaultLang() != $user->conf->MAIN_LANG_DEFAULT)
             {
                 $langs->setDefaultLang($user->conf->MAIN_LANG_DEFAULT);
+    }
             }
         }
     }
@@ -862,7 +990,9 @@ 
 {
     // If the login is not recovered, it is identified with an account that does not exist.
     // Hacking attempt?
-    if (! $user->login) accessforbidden();
+    if (! $user->login) {
+    	accessforbidden();
+    }
 
     // Check if user is active
     if ($user->statut < 1)
@@ -913,8 +1043,7 @@ 
     define('ROWS_7',7);
     define('ROWS_8',8);
     define('ROWS_9',9);
-}
-else
+} else
 {
     define('ROWS_1',0);
     define('ROWS_2',1);
@@ -932,18 +1061,22 @@ 
 // Init menu manager
 if (! defined('NOREQUIREMENU'))
 {
-	if (empty($user->societe_id))    // If internal user or not defined
+	if (empty($user->societe_id)) {
+		// If internal user or not defined
 	{
 		$conf->standard_menu=(empty($conf->global->MAIN_MENU_STANDARD_FORCED)?(empty($conf->global->MAIN_MENU_STANDARD)?'eldy_menu.php':$conf->global->MAIN_MENU_STANDARD):$conf->global->MAIN_MENU_STANDARD_FORCED);
 	}
-	else                        // If external user
+	} else                        // If external user
 	{
 		$conf->standard_menu=(empty($conf->global->MAIN_MENUFRONT_STANDARD_FORCED)?(empty($conf->global->MAIN_MENUFRONT_STANDARD)?'eldy_menu.php':$conf->global->MAIN_MENUFRONT_STANDARD):$conf->global->MAIN_MENUFRONT_STANDARD_FORCED);
 	}
 
 	// Load the menu manager (only if not already done)
 	$file_menu=$conf->standard_menu;
-	if (GETPOST('menu','alpha')) $file_menu=GETPOST('menu','alpha');     // example: menu=eldy_menu.php
+	if (GETPOST('menu','alpha')) {
+		$file_menu=GETPOST('menu','alpha');
+	}
+	// example: menu=eldy_menu.php
 	if (! class_exists('MenuManager'))
 	{
 		$menufound=0;
@@ -951,11 +1084,15 @@ 
 		foreach($dirmenus as $dirmenu)
 		{
 			$menufound=dol_include_once($dirmenu."standard/".$file_menu);
-			if (class_exists('MenuManager')) break;
+			if (class_exists('MenuManager')) {
+				break;
+			}
 		}
-		if (! class_exists('MenuManager'))	// If failed to include, we try with standard eldy_menu.php
+		if (! class_exists('MenuManager')) {
+			// If failed to include, we try with standard eldy_menu.php
 		{
 			dol_syslog("You define a menu manager '".$file_menu."' that can not be loaded.", LOG_WARNING);
+		}
 			$file_menu='eldy_menu.php';
 			include_once DOL_DOCUMENT_ROOT."/core/menus/standard/".$file_menu;
 		}
@@ -1023,8 +1160,11 @@ 
 {
     global $conf;
 
-    if ($contenttype == 'text/html' ) header("Content-Type: text/html; charset=".$conf->file->character_set_client);
-    else header("Content-Type: ".$contenttype);
+    if ($contenttype == 'text/html' ) {
+    	header("Content-Type: text/html; charset=".$conf->file->character_set_client);
+    } else {
+    	header("Content-Type: ".$contenttype);
+    }
     // Security options
     header("X-Content-Type-Options: nosniff");  // With the nosniff option, if the server says the content is text/html, the browser will render it as text/html (note that most browsers now force this option to on)
     header("X-Frame-Options: SAMEORIGIN");      // Frames allowed only if on same domain (stop some XSS attacks)
@@ -1064,52 +1204,82 @@ 
 
     top_httphead();
 
-    if (empty($conf->css)) $conf->css = '/theme/eldy/style.css.php';	// If not defined, eldy by default
+    if (empty($conf->css)) {
+    	$conf->css = '/theme/eldy/style.css.php';
+    }
+    // If not defined, eldy by default
 
     if (! empty($conf->global->MAIN_ACTIVATE_HTML4)) {
         $doctype = '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">';
-    }else {
+    } else {
         $doctype = '<!doctype html>';
     }
     print $doctype."\n";
-    if (! empty($conf->global->MAIN_USE_CACHE_MANIFEST)) print '<html lang="'.substr($langs->defaultlang,0,2).'" manifest="'.DOL_URL_ROOT.'/cache.manifest">'."\n";
-    else print '<html lang="'.substr($langs->defaultlang,0,2).'">'."\n";
+    if (! empty($conf->global->MAIN_USE_CACHE_MANIFEST)) {
+    	print '<html lang="'.substr($langs->defaultlang,0,2).'" manifest="'.DOL_URL_ROOT.'/cache.manifest">'."\n";
+    } else {
+    	print '<html lang="'.substr($langs->defaultlang,0,2).'">'."\n";
+    }
     //print '<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr">'."\n";
     if (empty($disablehead))
     {
         print "<head>\n";
-		if (GETPOST('dol_basehref','alpha')) print '<base href="'.dol_escape_htmltag(GETPOST('dol_basehref','alpha')).'">'."\n";
+		if (GETPOST('dol_basehref','alpha')) {
+			print '<base href="'.dol_escape_htmltag(GETPOST('dol_basehref','alpha')).'">'."\n";
+		}
         // Displays meta
         print '<meta name="robots" content="noindex'.($disablenofollow?'':',nofollow').'">'."\n";      				// Do not index
         print '<meta name="viewport" content="width=device-width, initial-scale=1.0">';	// Scale for mobile device
         print '<meta name="author" content="Dolibarr Development Team">'."\n";
         // Favicon
 		$favicon=dol_buildpath('/theme/'.$conf->theme.'/img/favicon.ico',1);
-        if (! empty($conf->global->MAIN_FAVICON_URL)) $favicon=$conf->global->MAIN_FAVICON_URL;
-        if (empty($conf->dol_use_jmobile)) print '<link rel="shortcut icon" type="image/x-icon" href="'.$favicon.'"/>'."\n";	// Not required into an Android webview
+        if (! empty($conf->global->MAIN_FAVICON_URL)) {
+        	$favicon=$conf->global->MAIN_FAVICON_URL;
+        }
+        if (empty($conf->dol_use_jmobile)) {
+        	print '<link rel="shortcut icon" type="image/x-icon" href="'.$favicon.'"/>'."\n";
+        }
+        // Not required into an Android webview
         //if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) && ! GETPOST('textbrowser','int')) print '<link rel="top" title="'.$langs->trans("Home").'" href="'.(DOL_URL_ROOT?DOL_URL_ROOT:'/').'">'."\n";
-        if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) && ! GETPOST('textbrowser','int')) print '<link rel="copyright" title="GNU General Public License" href="http://www.gnu.org/copyleft/gpl.html#SEC1">'."\n";
-        if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) && ! GETPOST('textbrowser','int')) print '<link rel="author" title="Dolibarr Development Team" href="https://www.dolibarr.org">'."\n";
+        if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) && ! GETPOST('textbrowser','int')) {
+        	print '<link rel="copyright" title="GNU General Public License" href="http://www.gnu.org/copyleft/gpl.html#SEC1">'."\n";
+        }
+        if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) && ! GETPOST('textbrowser','int')) {
+        	print '<link rel="author" title="Dolibarr Development Team" href="https://www.dolibarr.org">'."\n";
+        }
 
         // Displays title
         $appli=constant('DOL_APPLICATION_TITLE');
-        if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $appli=$conf->global->MAIN_APPLICATION_TITLE;
+        if (!empty($conf->global->MAIN_APPLICATION_TITLE)) {
+        	$appli=$conf->global->MAIN_APPLICATION_TITLE;
+        }
 
-        if ($title && ! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/noapp/',$conf->global->MAIN_HTML_TITLE)) print '<title>'.dol_htmlentities($title).'</title>';
-        else if ($title) print '<title>'.dol_htmlentities($appli.' - '.$title).'</title>';
-        else print "<title>".dol_htmlentities($appli)."</title>";
+        if ($title && ! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/noapp/',$conf->global->MAIN_HTML_TITLE)) {
+        	print '<title>'.dol_htmlentities($title).'</title>';
+        } else if ($title) {
+        	print '<title>'.dol_htmlentities($appli.' - '.$title).'</title>';
+        } else {
+        	print "<title>".dol_htmlentities($appli)."</title>";
+        }
         print "\n";
 
         //$ext='';
         //if (! empty($conf->dol_use_jmobile)) $ext='version='.urlencode(DOL_VERSION);
         $ext='version='.urlencode(DOL_VERSION);
 
-        if (GETPOST('version','int')) $ext='version='.GETPOST('version','int');	// usefull to force no cache on css/js
-        if (GETPOST('testmenuhider','int') || ! empty($conf->global->MAIN_TESTMENUHIDER)) $ext.='&testmenuhider='.(GETPOST('testmenuhider','int')?GETPOST('testmenuhider','int'):$conf->global->MAIN_TESTMENUHIDER);
+        if (GETPOST('version','int')) {
+        	$ext='version='.GETPOST('version','int');
+        }
+        // usefull to force no cache on css/js
+        if (GETPOST('testmenuhider','int') || ! empty($conf->global->MAIN_TESTMENUHIDER)) {
+        	$ext.='&testmenuhider='.(GETPOST('testmenuhider','int')?GETPOST('testmenuhider','int'):$conf->global->MAIN_TESTMENUHIDER);
+        }
 
         $themeparam='?lang='.$langs->defaultlang.'&amp;theme='.$conf->theme.(GETPOST('optioncss','aZ09')?'&amp;optioncss='.GETPOST('optioncss','aZ09',1):'').'&amp;userid='.$user->id.'&amp;entity='.$conf->entity;
         $themeparam.=($ext?'&amp;'.$ext:'');
-        if (! empty($_SESSION['dol_resetcache'])) $themeparam.='&amp;dol_resetcache='.$_SESSION['dol_resetcache'];
+        if (! empty($_SESSION['dol_resetcache'])) {
+        	$themeparam.='&amp;dol_resetcache='.$_SESSION['dol_resetcache'];
+        }
         if (GETPOST('dol_hide_topmenu','int'))           { $themeparam.='&amp;dol_hide_topmenu='.GETPOST('dol_hide_topmenu','int'); }
         if (GETPOST('dol_hide_leftmenu','int'))          { $themeparam.='&amp;dol_hide_leftmenu='.GETPOST('dol_hide_leftmenu','int'); }
         if (GETPOST('dol_optimize_smallscreen','int'))   { $themeparam.='&amp;dol_optimize_smallscreen='.GETPOST('dol_optimize_smallscreen','int'); }
@@ -1120,11 +1290,25 @@ 
         {
             print '<!-- Includes CSS for JQuery (Ajax library) -->'."\n";
             $jquerytheme = 'smoothness';
-            if (!empty($conf->global->MAIN_USE_JQUERY_THEME)) $jquerytheme = $conf->global->MAIN_USE_JQUERY_THEME;
-            if (constant('JS_JQUERY_UI')) print '<link rel="stylesheet" type="text/css" href="'.JS_JQUERY_UI.'css/'.$jquerytheme.'/jquery-ui.min.css'.($ext?'?'.$ext:'').'">'."\n";  // JQuery
-            else print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/css/'.$jquerytheme.'/jquery-ui.css'.($ext?'?'.$ext:'').'">'."\n";    // JQuery
-            if (! defined('DISABLE_JQUERY_TIPTIP')) print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/tiptip/tipTip.css'.($ext?'?'.$ext:'').'">'."\n";                           // Tooltip
-            if (! defined('DISABLE_JQUERY_JNOTIFY')) print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/jnotify/jquery.jnotify-alt.min.css'.($ext?'?'.$ext:'').'">'."\n";          // JNotify
+            if (!empty($conf->global->MAIN_USE_JQUERY_THEME)) {
+            	$jquerytheme = $conf->global->MAIN_USE_JQUERY_THEME;
+            }
+            if (constant('JS_JQUERY_UI')) {
+            	print '<link rel="stylesheet" type="text/css" href="'.JS_JQUERY_UI.'css/'.$jquerytheme.'/jquery-ui.min.css'.($ext?'?'.$ext:'').'">'."\n";
+            }
+            // JQuery
+            else {
+            	print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/css/'.$jquerytheme.'/jquery-ui.css'.($ext?'?'.$ext:'').'">'."\n";
+            }
+            // JQuery
+            if (! defined('DISABLE_JQUERY_TIPTIP')) {
+            	print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/tiptip/tipTip.css'.($ext?'?'.$ext:'').'">'."\n";
+            }
+            // Tooltip
+            if (! defined('DISABLE_JQUERY_JNOTIFY')) {
+            	print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/jnotify/jquery.jnotify-alt.min.css'.($ext?'?'.$ext:'').'">'."\n";
+            }
+            // JNotify
             /* Removed a old hidden problematic feature never used in Dolibarr. If an external module need datatable, the module must provide all lib it needs and manage version problems with other dolibarr components
             if (! empty($conf->global->MAIN_USE_JQUERY_DATATABLES) || (defined('REQUIRE_JQUERY_DATATABLES') && constant('REQUIRE_JQUERY_DATATABLES')))     // jQuery datatables
             {
@@ -1132,9 +1316,11 @@ 
                 print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/datatables/extensions/Buttons/css/buttons.dataTables.min.css'.($ext?'?'.$ext:'').'">'."\n";
                 print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/datatables/extensions/ColReorder/css/colReorder.dataTables.min.css'.($ext?'?'.$ext:'').'"></script>'."\n";
             }*/
-            if (! defined('DISABLE_SELECT2') && (! empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) || defined('REQUIRE_JQUERY_MULTISELECT')))     // jQuery plugin "mutiselect", "multiple-select", "select2"...
+            if (! defined('DISABLE_SELECT2') && (! empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) || defined('REQUIRE_JQUERY_MULTISELECT'))) {
+            	// jQuery plugin "mutiselect", "multiple-select", "select2"...
             {
             	$tmpplugin=empty($conf->global->MAIN_USE_JQUERY_MULTISELECT)?constant('REQUIRE_JQUERY_MULTISELECT'):$conf->global->MAIN_USE_JQUERY_MULTISELECT;
+            }
             	print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/'.$tmpplugin.'/'.$tmpplugin.'.css'.($ext?'?'.$ext:'').'">'."\n";
             }
             // jQuery Timepicker
@@ -1154,13 +1340,15 @@ 
         // Output style sheets (optioncss='print' or ''). Note: $conf->css looks like '/theme/eldy/style.css.php'
         $themepath=dol_buildpath($conf->css,1);
         $themesubdir='';
-        if (! empty($conf->modules_parts['theme']))	// This slow down
+        if (! empty($conf->modules_parts['theme'])) {
+        	// This slow down
         {
 	        foreach($conf->modules_parts['theme'] as $reldir)
 	        {
 	        	if (file_exists(dol_buildpath($reldir.$conf->css, 0)))
 	        	{
 					$themepath=dol_buildpath($reldir.$conf->css, 1);
+        }
 					$themesubdir=$reldir;
 					break;
 	        	}
@@ -1168,7 +1356,9 @@ 
         }
         //print 'themepath='.$themepath.' themeparam='.$themeparam;exit;
         print '<link rel="stylesheet" type="text/css" href="'.$themepath.$themeparam.'">'."\n";
-	    if (! empty($conf->global->MAIN_FIX_FLASH_ON_CHROME)) print '<!-- Includes CSS that does not exists as a workaround of flash bug of chrome -->'."\n".'<link rel="stylesheet" type="text/css" href="filethatdoesnotexiststosolvechromeflashbug">'."\n";
+	    if (! empty($conf->global->MAIN_FIX_FLASH_ON_CHROME)) {
+	    	print '<!-- Includes CSS that does not exists as a workaround of flash bug of chrome -->'."\n".'<link rel="stylesheet" type="text/css" href="filethatdoesnotexiststosolvechromeflashbug">'."\n";
+	    }
 
         // CSS forced by modules (relative url starting with /)
         if (! empty($conf->modules_parts['css']))
@@ -1179,11 +1369,15 @@ 
         		$filescss=(array) $filescss;	// To be sure filecss is an array
         		foreach($filescss as $cssfile)
         		{
-        			if (empty($cssfile)) dol_syslog("Warning: module ".$modcss." declared a css path file into its descriptor that is empty.", LOG_WARNING);
+        			if (empty($cssfile)) {
+        				dol_syslog("Warning: module ".$modcss." declared a css path file into its descriptor that is empty.", LOG_WARNING);
+        			}
         			// cssfile is a relative path
 	        		print '<!-- Includes CSS added by module '.$modcss. ' -->'."\n".'<link rel="stylesheet" type="text/css" href="'.dol_buildpath($cssfile,1);
 	        		// We add params only if page is not static, because some web server setup does not return content type text/css if url has parameters, so browser cache is not used.
-	        		if (!preg_match('/\.css$/i',$cssfile)) print $themeparam;
+	        		if (!preg_match('/\.css$/i',$cssfile)) {
+	        			print $themeparam;
+	        		}
 	        		print '">'."\n";
         		}
         	}
@@ -1195,7 +1389,9 @@ 
             {
             	print '<!-- Includes CSS added by page -->'."\n".'<link rel="stylesheet" type="text/css" title="default" href="'.dol_buildpath($cssfile,1);
                 // We add params only if page is not static, because some web server setup does not return content type text/css if url has parameters and browser cache is not used.
-                if (!preg_match('/\.css$/i',$cssfile)) print $themeparam;
+                if (!preg_match('/\.css$/i',$cssfile)) {
+                	print $themeparam;
+                }
                 print '">'."\n";
             }
         }
@@ -1205,17 +1401,30 @@ 
         {
             // JQuery. Must be before other includes
             print '<!-- Includes JS for JQuery -->'."\n";
-            if (defined('JS_JQUERY') && constant('JS_JQUERY')) print '<script type="text/javascript" src="'.JS_JQUERY.'jquery.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-            else print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+            if (defined('JS_JQUERY') && constant('JS_JQUERY')) {
+            	print '<script type="text/javascript" src="'.JS_JQUERY.'jquery.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+            } else {
+            	print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+            }
             if (! empty($conf->global->MAIN_FEATURES_LEVEL) && ! defined('JS_JQUERY_MIGRATE_DISABLED'))
             {
-                if (defined('JS_JQUERY_MIGRATE') && constant('JS_JQUERY_MIGRATE')) print '<script type="text/javascript" src="'.JS_JQUERY_MIGRATE.'jquery-migrate.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-                else print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery-migrate.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+                if (defined('JS_JQUERY_MIGRATE') && constant('JS_JQUERY_MIGRATE')) {
+                	print '<script type="text/javascript" src="'.JS_JQUERY_MIGRATE.'jquery-migrate.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+                } else {
+                	print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery-migrate.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+                }
+            }
+            if (defined('JS_JQUERY_UI') && constant('JS_JQUERY_UI')) {
+            	print '<script type="text/javascript" src="'.JS_JQUERY_UI.'jquery-ui.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+            } else {
+            	print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery-ui.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+            }
+            if (! defined('DISABLE_JQUERY_TABLEDND')) {
+            	print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/tablednd/jquery.tablednd.0.6.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+            }
+            if (! defined('DISABLE_JQUERY_TIPTIP')) {
+            	print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/tiptip/jquery.tipTip.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
             }
-            if (defined('JS_JQUERY_UI') && constant('JS_JQUERY_UI')) print '<script type="text/javascript" src="'.JS_JQUERY_UI.'jquery-ui.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-            else print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery-ui.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-            if (! defined('DISABLE_JQUERY_TABLEDND')) print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/tablednd/jquery.tablednd.0.6.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-            if (! defined('DISABLE_JQUERY_TIPTIP')) print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/tiptip/jquery.tipTip.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
             // jQuery jnotify
             if (empty($conf->global->MAIN_DISABLE_JQUERY_JNOTIFY) && ! defined('DISABLE_JQUERY_JNOTIFY'))
             {
@@ -1230,8 +1439,7 @@ 
                     print '<script type="text/javascript" src="'.JS_JQUERY_FLOT.'jquery.flot.js'.($ext?'?'.$ext:'').'"></script>'."\n";
                     print '<script type="text/javascript" src="'.JS_JQUERY_FLOT.'jquery.flot.pie.js'.($ext?'?'.$ext:'').'"></script>'."\n";
                     print '<script type="text/javascript" src="'.JS_JQUERY_FLOT.'jquery.flot.stack.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-                }
-                else
+                } else
                 {
                     print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/flot/jquery.flot.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
                     print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/flot/jquery.flot.pie.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
@@ -1277,9 +1485,11 @@ 
             	print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/timepicker/jquery-ui-timepicker-addon.js'.($ext?'?'.$ext:'').'"></script>'."\n";
             	print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/timepicker.js.php?lang='.$langs->defaultlang.($ext?'&amp;'.$ext:'').'"></script>'."\n";
             }
-            if (! defined('DISABLE_SELECT2') && (! empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) || defined('REQUIRE_JQUERY_MULTISELECT')))     // jQuery plugin "mutiselect", "multiple-select", "select2", ...
+            if (! defined('DISABLE_SELECT2') && (! empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) || defined('REQUIRE_JQUERY_MULTISELECT'))) {
+            	// jQuery plugin "mutiselect", "multiple-select", "select2", ...
             {
             	$tmpplugin=empty($conf->global->MAIN_USE_JQUERY_MULTISELECT)?constant('REQUIRE_JQUERY_MULTISELECT'):$conf->global->MAIN_USE_JQUERY_MULTISELECT;
+            }
             	print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/'.$tmpplugin.'/'.$tmpplugin.'.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
             }
         }
@@ -1292,10 +1502,12 @@ 
                 print '<!-- Includes JS for CKEditor -->'."\n";
                 $pathckeditor = DOL_URL_ROOT . '/includes/ckeditor/ckeditor/';
                 $jsckeditor='ckeditor.js';
-                if (constant('JS_CKEDITOR'))	// To use external ckeditor 4 js lib
+                if (constant('JS_CKEDITOR')) {
+                	// To use external ckeditor 4 js lib
                 {
                 	$pathckeditor=constant('JS_CKEDITOR');
                 }
+                }
                 print '<script type="text/javascript">';
                 print 'var CKEDITOR_BASEPATH = \''.$pathckeditor.'\';'."\n";
                 print 'var ckeditorConfig = \''.dol_buildpath($themesubdir.'/theme/'.$conf->theme.'/ckeditor/config.js'.($ext?'?'.$ext:''),1).'\';'."\n";		// $themesubdir='' in standard usage
@@ -1309,8 +1521,12 @@ 
             if (! defined('DISABLE_BROWSER_NOTIF'))
             {
                 $enablebrowsernotif=false;
-                if (! empty($conf->agenda->enabled) && ! empty($conf->global->AGENDA_REMINDER_BROWSER)) $enablebrowsernotif=true;
-                if ($conf->browser->layout == 'phone') $enablebrowsernotif=false;
+                if (! empty($conf->agenda->enabled) && ! empty($conf->global->AGENDA_REMINDER_BROWSER)) {
+                	$enablebrowsernotif=true;
+                }
+                if ($conf->browser->layout == 'phone') {
+                	$enablebrowsernotif=false;
+                }
                 if ($enablebrowsernotif)
                 {
                     print '<!-- Includes JS of Dolibarr (brwoser layout = '.$conf->browser->layout.')-->'."\n";
@@ -1329,9 +1545,11 @@ 
             }*/
 
             // JS forced by modules (relative url starting with /)
-            if (! empty($conf->modules_parts['js']))		// $conf->modules_parts['js'] is array('module'=>array('file1','file2'))
+            if (! empty($conf->modules_parts['js'])) {
+            	// $conf->modules_parts['js'] is array('module'=>array('file1','file2'))
         	{
         		$arrayjs=(array) $conf->modules_parts['js'];
+            }
 	            foreach($arrayjs as $modjs => $filesjs)
 	            {
         			$filesjs=(array) $filesjs;	// To be sure filejs is an array
@@ -1351,18 +1569,24 @@ 
                     if (preg_match('/^http/i',$jsfile))
                     {
                         print '<script type="text/javascript" src="'.$jsfile.'"></script>'."\n";
-                    }
-                    else
+                    } else
                     {
-                        if (! preg_match('/^\//',$jsfile)) $jsfile='/'.$jsfile;	// For backward compatibility
+                        if (! preg_match('/^\//',$jsfile)) {
+                        	$jsfile='/'.$jsfile;
+                        }
+                        // For backward compatibility
                         print '<script type="text/javascript" src="'.dol_buildpath($jsfile,1).'"></script>'."\n";
                     }
                 }
             }
         }
 
-        if (! empty($head)) print $head."\n";
-        if (! empty($conf->global->MAIN_HTML_HEADER)) print $conf->global->MAIN_HTML_HEADER."\n";
+        if (! empty($head)) {
+        	print $head."\n";
+        }
+        if (! empty($conf->global->MAIN_HTML_HEADER)) {
+        	print $conf->global->MAIN_HTML_HEADER."\n";
+        }
 
         print "</head>\n\n";
     }
@@ -1430,13 +1654,20 @@ 
 	    	$appli=$conf->global->MAIN_APPLICATION_TITLE;
 	    	if (preg_match('/\d\.\d/', $appli))
 	    	{
-				if (! preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli.=" (".DOL_VERSION.")";	// If new title contains a version that is different than core
+				if (! preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) {
+					$appli.=" (".DOL_VERSION.")";
+				}
+				// If new title contains a version that is different than core
+	    	} else {
+	    		$appli.=" ".DOL_VERSION;
 	    	}
-	    	else $appli.=" ".DOL_VERSION;
+	    } else {
+	    	$appli.=" ".DOL_VERSION;
 	    }
-	    else $appli.=" ".DOL_VERSION;
 
-	    if (! empty($conf->global->MAIN_FEATURES_LEVEL)) $appli.="<br>".$langs->trans("LevelOfFeature").': '.$conf->global->MAIN_FEATURES_LEVEL;
+	    if (! empty($conf->global->MAIN_FEATURES_LEVEL)) {
+	    	$appli.="<br>".$langs->trans("LevelOfFeature").': '.$conf->global->MAIN_FEATURES_LEVEL;
+	    }
 
 	    $logouttext='';
 	    if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
@@ -1450,8 +1681,7 @@ 
     	        //$logouttext .= img_picto($langs->trans('Logout').":".$langs->trans('Logout'), 'logout_top.png', 'class="login"', 0, 0, 1);
     	    	$logouttext .='<span class="fa fa-sign-out atoplogin"></span>';
     	        $logouttext .='</a>';
-    	    }
-    	    else
+    	    } else
     	    {
     	    	$logouthtmltext.=$langs->trans("NoLogoutProcessWithAuthMode",$_SESSION["dol_authmode"]);
     	        $logouttext .= img_picto($langs->trans('Logout').":".$langs->trans('Logout'), 'logout_top.png', 'class="login"', 0, 0, 1);
@@ -1478,10 +1708,18 @@ 
 	    $result=$hookmanager->executeHooks('printTopRightMenu',$parameters);    // Note that $action and $object may have been modified by some hooks
 		if (is_numeric($result))
 		{
-			if (empty($result)) $toprightmenu.=$hookmanager->resPrint;		// add
-			else  $toprightmenu=$hookmanager->resPrint;						// replace
+			if (empty($result)) {
+				$toprightmenu.=$hookmanager->resPrint;
+			}
+			// add
+			else {
+				$toprightmenu=$hookmanager->resPrint;
+			}
+			// replace
+		} else {
+			$toprightmenu.=$result;
 		}
-		else $toprightmenu.=$result;	// For backward compatibility
+		// For backward compatibility
 
     	// Link to module builder
 	    if (! empty($conf->modulebuilder->enabled))
@@ -1501,7 +1739,9 @@ 
 	        if (is_array($_POST))
 	        {
     			foreach($_POST as $key=>$value) {
-    				if ($key!=='action' && !is_array($value)) $qs.='&'.$key.'='.urlencode($value);
+    				if ($key!=='action' && !is_array($value)) {
+    					$qs.='&'.$key.'='.urlencode($value);
+    				}
     			}
 	        }
 			$qs.=(($qs && $morequerystring)?'&':'').$morequerystring;
@@ -1521,7 +1761,9 @@ 
 	        $helppage='';
 	        $mode='';
 
-	        if (empty($helppagename)) $helppagename='EN:User_documentation|FR:Documentation_utilisateur|ES:Documentación_usuarios';
+	        if (empty($helppagename)) {
+	        	$helppagename='EN:User_documentation|FR:Documentation_utilisateur|ES:Documentación_usuarios';
+	        }
 
 	        // Get helpbaseurl, helppage and mode from helppagename and langs
 	        $arrayres=getHelpParamFor($helppagename,$langs);
@@ -1535,10 +1777,15 @@ 
 	            $text='';
 	            $title=$appli.'<br>';
 	            $title.=$langs->trans($mode == 'wiki' ? 'GoToWikiHelpPage': 'GoToHelpPage');
-	            if ($mode == 'wiki') $title.=' - '.$langs->trans("PageWiki").' &quot;'.dol_escape_htmltag(strtr($helppage,'_',' ')).'&quot;';
+	            if ($mode == 'wiki') {
+	            	$title.=' - '.$langs->trans("PageWiki").' &quot;'.dol_escape_htmltag(strtr($helppage,'_',' ')).'&quot;';
+	            }
 	            $text.='<a class="help" target="_blank" href="';
-	            if ($mode == 'wiki') $text.=sprintf($helpbaseurl,urlencode(html_entity_decode($helppage)));
-	            else $text.=sprintf($helpbaseurl,$helppage);
+	            if ($mode == 'wiki') {
+	            	$text.=sprintf($helpbaseurl,urlencode(html_entity_decode($helppage)));
+	            } else {
+	            	$text.=sprintf($helpbaseurl,$helppage);
+	            }
 	            $text.='">';
 	            //$text.=img_picto('', 'helpdoc_top').' ';
 	            $text.='<span class="fa fa-question-circle atoplogin"></span>';
@@ -1566,8 +1813,10 @@ 
         print "<!-- End top horizontal menu -->\n\n";
     }
 
-    if (empty($conf->dol_hide_leftmenu) && empty($conf->dol_use_jmobile)) print '<!-- Begin div id-container --><div id="id-container" class="id-container'.($morecss?' '.$morecss:'').'">';
-}
+    if (empty($conf->dol_hide_leftmenu) && empty($conf->dol_use_jmobile)) {
+    	print '<!-- Begin div id-container --><div id="id-container" class="id-container'.($morecss?' '.$morecss:'').'">';
+    }
+    }
 
 
 /**
@@ -1592,7 +1841,9 @@ 
     $searchform='';
     $bookmarks='';
 
-    if (! empty($menu_array_before)) dol_syslog("Deprecated parameter menu_array_before was used when calling main::left_menu function. Menu entries of module should now be defined into module descriptor and not provided when calling left_menu.", LOG_WARNING);
+    if (! empty($menu_array_before)) {
+    	dol_syslog("Deprecated parameter menu_array_before was used when calling main::left_menu function. Menu entries of module should now be defined into module descriptor and not provided when calling left_menu.", LOG_WARNING);
+    }
 
     if (empty($conf->dol_hide_leftmenu) && (! defined('NOREQUIREMENU') || ! constant('NOREQUIREMENU')))
     {
@@ -1605,11 +1856,12 @@ 
 
 	    if ($conf->use_javascript_ajax && $conf->browser->layout != 'phone' && empty($conf->global->MAIN_USE_OLD_SEARCH_FORM))
 	    {
-    	    if (! is_object($form)) $form=new Form($db);
+    	    if (! is_object($form)) {
+    	    	$form=new Form($db);
+    	    }
     	    $selected=-1;
             $searchform.=$form->selectArrayAjax('searchselectcombo', DOL_URL_ROOT.'/core/ajax/selectsearchbox.php', $selected, '', '', 0, 1, 'vmenusearchselectcombo', 1, $langs->trans("Search"), 1);
-	    }
-	    else
+	    } else
 	    {
     	    // Define $searchform
     	    if ((( ! empty($conf->societe->enabled) && (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) || empty($conf->global->SOCIETE_DISABLE_CUSTOMERS))) || ! empty($conf->fournisseur->enabled)) && $user->rights->societe->lire)
@@ -1656,8 +1908,9 @@ 
 		if (empty($reshook))
 		{
 			$searchform.=$hookmanager->resPrint;
+		} else {
+			$searchform=$hookmanager->resPrint;
 		}
-		else $searchform=$hookmanager->resPrint;
 
 		if ($conf->use_javascript_ajax && $conf->browser->layout == 'phone')
 	    {
@@ -1697,15 +1950,27 @@ 
         print '<div id="blockvmenuhelp" class="blockvmenuhelp">'."\n";
 
         // Version
-        if (empty($conf->global->MAIN_HIDE_VERSION))    // Version is already on help picto and on login page.
+        if (empty($conf->global->MAIN_HIDE_VERSION)) {
+        	// Version is already on help picto and on login page.
         {
             $doliurl='https://www.dolibarr.org';
+        }
     		//local communities
-    		if (preg_match('/fr/i',$langs->defaultlang)) $doliurl='https://www.dolibarr.fr';
-    		if (preg_match('/es/i',$langs->defaultlang)) $doliurl='https://www.dolibarr.es';
-    		if (preg_match('/de/i',$langs->defaultlang)) $doliurl='https://www.dolibarr.de';
-    		if (preg_match('/it/i',$langs->defaultlang)) $doliurl='https://www.dolibarr.it';
-    		if (preg_match('/gr/i',$langs->defaultlang)) $doliurl='https://www.dolibarr.gr';
+    		if (preg_match('/fr/i',$langs->defaultlang)) {
+    			$doliurl='https://www.dolibarr.fr';
+    		}
+    		if (preg_match('/es/i',$langs->defaultlang)) {
+    			$doliurl='https://www.dolibarr.es';
+    		}
+    		if (preg_match('/de/i',$langs->defaultlang)) {
+    			$doliurl='https://www.dolibarr.de';
+    		}
+    		if (preg_match('/it/i',$langs->defaultlang)) {
+    			$doliurl='https://www.dolibarr.it';
+    		}
+    		if (preg_match('/gr/i',$langs->defaultlang)) {
+    			$doliurl='https://www.dolibarr.gr';
+    		}
 
             $appli=constant('DOL_APPLICATION_TITLE');
     	    if (! empty($conf->global->MAIN_APPLICATION_TITLE))
@@ -1713,17 +1978,28 @@ 
     	    	$appli=$conf->global->MAIN_APPLICATION_TITLE; $doliurl='';
     	    	if (preg_match('/\d\.\d/', $appli))
     	    	{
-    				if (! preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli.=" (".DOL_VERSION.")";	// If new title contains a version that is different than core
+    				if (! preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) {
+    					$appli.=" (".DOL_VERSION.")";
+    				}
+    				// If new title contains a version that is different than core
+    	    	} else {
+    	    		$appli.=" ".DOL_VERSION;
     	    	}
-    	    	else $appli.=" ".DOL_VERSION;
+    	    } else {
+    	    	$appli.=" ".DOL_VERSION;
     	    }
-    	    else $appli.=" ".DOL_VERSION;
     	    print '<div id="blockvmenuhelpapp" class="blockvmenuhelp">';
-    	    if ($doliurl) print '<a class="help" target="_blank" href="'.$doliurl.'">';
-    	    else print '<span class="help">';
+    	    if ($doliurl) {
+    	    	print '<a class="help" target="_blank" href="'.$doliurl.'">';
+    	    } else {
+    	    	print '<span class="help">';
+    	    }
     	    print $appli;
-    	    if ($doliurl) print '</a>';
-    	    else print '</span>';
+    	    if ($doliurl) {
+    	    	print '</a>';
+    	    } else {
+    	    	print '</span>';
+    	    }
     	    print '</div>'."\n";
         }
 
@@ -1772,8 +2048,10 @@ 
     print "\n";
     print '<!-- Begin right area -->'."\n";
 
-    if (empty($leftmenuwithoutmainarea)) main_area($title);
-}
+    if (empty($leftmenuwithoutmainarea)) {
+    	main_area($title);
+    }
+    }
 
 
 /**
@@ -1786,14 +2064,18 @@ 
 {
     global $conf, $langs;
 
-	if (empty($conf->dol_hide_leftmenu)) print '<div id="id-right">';
+	if (empty($conf->dol_hide_leftmenu)) {
+		print '<div id="id-right">';
+	}
 
     print "\n";
 
     print '<!-- Begin div class="fiche" -->'."\n".'<div class="fiche">'."\n";
 
-    if (! empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED)) print info_admin($langs->trans("WarningYouAreInMaintenanceMode",$conf->global->MAIN_ONLY_LOGIN_ALLOWED));
-}
+    if (! empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED)) {
+    	print info_admin($langs->trans("WarningYouAreInMaintenanceMode",$conf->global->MAIN_ONLY_LOGIN_ALLOWED));
+    }
+    }
 
 
 /**
@@ -1815,24 +2097,31 @@ 
         $helpbaseurl='%s';
         $helppage=$helppagename;
         $mode='local';
-    }
-    else
+    } else
     {
         // If WIKI URL
         if (preg_match('/^es/i',$langs->defaultlang))
         {
             $helpbaseurl='http://wiki.dolibarr.org/index.php/%s';
-            if (preg_match('/ES:([^|]+)/i',$helppagename,$reg)) $helppage=$reg[1];
+            if (preg_match('/ES:([^|]+)/i',$helppagename,$reg)) {
+            	$helppage=$reg[1];
+            }
         }
         if (preg_match('/^fr/i',$langs->defaultlang))
         {
             $helpbaseurl='http://wiki.dolibarr.org/index.php/%s';
-            if (preg_match('/FR:([^|]+)/i',$helppagename,$reg)) $helppage=$reg[1];
+            if (preg_match('/FR:([^|]+)/i',$helppagename,$reg)) {
+            	$helppage=$reg[1];
+            }
         }
-        if (empty($helppage))	// If help page not already found
+        if (empty($helppage)) {
+        	// If help page not already found
         {
             $helpbaseurl='http://wiki.dolibarr.org/index.php/%s';
-            if (preg_match('/EN:([^|]+)/i',$helppagename,$reg)) $helppage=$reg[1];
+        }
+            if (preg_match('/EN:([^|]+)/i',$helppagename,$reg)) {
+            	$helppage=$reg[1];
+            }
         }
         $mode='wiki';
     }
@@ -1866,12 +2155,17 @@ 
 	if (empty($conf->global->MAIN_HTML5_PLACEHOLDER))
 	{
         $ret.='<div class="menu_titre menu_titre_search"';
-    	if (! empty($conf->global->MAIN_HTML5_PLACEHOLDER)) $ret.=' style="display: inline-block"';
+    	if (! empty($conf->global->MAIN_HTML5_PLACEHOLDER)) {
+    		$ret.=' style="display: inline-block"';
+    	}
     	$ret.='>';
     	$ret.='<label for="'.$prefhtmlinputname.$htmlinputname.'">';
     	$ret.='<a class="vsmenu" href="'.$urlobject.'">';
-       	if ($img && ! empty($conf->global->MAIN_HTML5_PLACEHOLDER)) $ret.=$img;
-       	else if ($img || $title) $ret.=$img.' '.$title;
+       	if ($img && ! empty($conf->global->MAIN_HTML5_PLACEHOLDER)) {
+       		$ret.=$img;
+       	} else if ($img || $title) {
+       		$ret.=$img.' '.$title;
+       	}
     	$ret.='</a>';
     	$ret.='</label>';
     	$ret.='</div>';
@@ -1879,10 +2173,17 @@ 
     $ret.='<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
     $ret.='<input type="hidden" name="mode" value="search">';
     $ret.='<input type="text" class="flat '.$htmlmorecss.'"';
-    if (! empty($conf->global->MAIN_HTML5_PLACEHOLDER)) $ret.=' style="text-indent: 22px; background-image: url(\''.$img.'\'); background-repeat: no-repeat; background-position: 3px;"';
+    if (! empty($conf->global->MAIN_HTML5_PLACEHOLDER)) {
+    	$ret.=' style="text-indent: 22px; background-image: url(\''.$img.'\'); background-repeat: no-repeat; background-position: 3px;"';
+    }
     $ret.=($accesskey?' accesskey="'.$accesskey.'"':'');
-    if (! empty($conf->global->MAIN_HTML5_PLACEHOLDER)) $ret.=' placeholder="'.strip_tags($title).'"';		// Will work only if MAIN_HTML5_PLACEHOLDER is set to 1
-    else $ret.=' title="'.$langs->trans("SearchOf").''.strip_tags($title).'"';
+    if (! empty($conf->global->MAIN_HTML5_PLACEHOLDER)) {
+    	$ret.=' placeholder="'.strip_tags($title).'"';
+    }
+    // Will work only if MAIN_HTML5_PLACEHOLDER is set to 1
+    else {
+    	$ret.=' title="'.$langs->trans("SearchOf").''.strip_tags($title).'"';
+    }
     $ret.=' name="'.$htmlinputname.'" id="'.$prefhtmlinputname.$htmlinputname.'" />';
     $ret.='<input type="submit" class="button" style="padding-top: 4px; padding-bottom: 4px; padding-left: 6px; padding-right: 6px" value="'.$langs->trans("Go").'">';
     $ret.="</form>\n";
@@ -1919,8 +2220,12 @@ 
                 unset($_SESSION['lastsearch_values_tmp_'.$key]);
                 if (count($val))
                 {
-                    if (empty($val['sortfield'])) unset($val['sortfield']);
-                    if (empty($val['sortorder'])) unset($val['sortorder']);
+                    if (empty($val['sortfield'])) {
+                    	unset($val['sortfield']);
+                    }
+                    if (empty($val['sortorder'])) {
+                    	unset($val['sortorder']);
+                    }
                     dol_syslog('Save lastsearch_values_tmp_'.$key.'='.json_encode($val, 0)." (systematic recording of last search criteria)");
                     $_SESSION['lastsearch_values_tmp_'.$key]=json_encode($val);
                     unset($_SESSION['lastsearch_values_'.$key]);
@@ -1951,16 +2256,26 @@ 
 
         print '</div> <!-- End div class="fiche" -->'."\n"; // End div fiche
 
-		if (empty($conf->dol_hide_leftmenu)) print '</div> <!-- End div id-right -->'; // End div id-right
+		if (empty($conf->dol_hide_leftmenu)) {
+			print '</div> <!-- End div id-right -->';
+		}
+		// End div id-right
 
         print "\n";
-        if ($comment) print '<!-- '.$comment.' -->'."\n";
+        if ($comment) {
+        	print '<!-- '.$comment.' -->'."\n";
+        }
 
         printCommonFooter($zone);
 
-        if (empty($conf->dol_hide_leftmenu) && empty($conf->dol_use_jmobile)) print '</div> <!-- End div id-container -->'."\n";	// End div container
+        if (empty($conf->dol_hide_leftmenu) && empty($conf->dol_use_jmobile)) {
+        	print '</div> <!-- End div id-container -->'."\n";
+        }
+        // End div container
 
-        if (! empty($delayedhtmlcontent)) print $delayedhtmlcontent;
+        if (! empty($delayedhtmlcontent)) {
+        	print $delayedhtmlcontent;
+        }
 
         // TODO Move this in lib_head.js.php
 
@@ -2041,9 +2356,11 @@ 
         // Wrapper to add log when clicking on download or preview
         if (! empty($conf->blockedlog->enabled) && is_object($object) && $object->id > 0 && $object->statut > 0)
         {
-            if (in_array($object->element, array('facture')))       // Restrict for the moment to element 'facture'
+            if (in_array($object->element, array('facture'))) {
+            	// Restrict for the moment to element 'facture'
             {
                 print "\n<!-- JS CODE TO ENABLE log when making a download or a preview of a document -->\n";
+            }
                 ?>
     			<script type="text/javascript">
     			jQuery(document).ready(function () {

htdocs/product/class/productcustomerprice.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -507,7 +507,7 @@
 	/**
 	 * Update object into database
 	 *
-	 * @param User $user that modifies
+	 * @param integer $user that modifies
 	 * @param int $notrigger triggers after, 1=disable triggers
 	 * @param int $forceupdateaffiliate update price on each soc child
 	 * @return int <0 if KO, >0 if OK

Braces +108 added lines, -64 removed lines

@@ -75,34 +75,48 @@ 
 
 		// Clean parameters
 
-		if (isset($this->entity))
-			$this->entity = trim($this->entity);
-		if (isset($this->fk_product))
-			$this->fk_product = trim($this->fk_product);
-		if (isset($this->fk_soc))
-			$this->fk_soc = trim($this->fk_soc);
-		if (isset($this->price))
-			$this->price = trim($this->price);
-		if (isset($this->price_ttc))
-			$this->price_ttc = trim($this->price_ttc);
-		if (isset($this->price_min))
-			$this->price_min = trim($this->price_min);
-		if (isset($this->price_min_ttc))
-			$this->price_min_ttc = trim($this->price_min_ttc);
-		if (isset($this->price_base_type))
-			$this->price_base_type = trim($this->price_base_type);
-		if (isset($this->tva_tx))
-			$this->tva_tx = trim($this->tva_tx);
-		if (isset($this->recuperableonly))
-			$this->recuperableonly = trim($this->recuperableonly);
-		if (isset($this->localtax1_tx))
-			$this->localtax1_tx = trim($this->localtax1_tx);
-		if (isset($this->localtax2_tx))
-			$this->localtax2_tx = trim($this->localtax2_tx);
-		if (isset($this->fk_user))
-			$this->fk_user = trim($this->fk_user);
-		if (isset($this->import_key))
-			$this->import_key = trim($this->import_key);
+		if (isset($this->entity)) {
+					$this->entity = trim($this->entity);
+		}
+		if (isset($this->fk_product)) {
+					$this->fk_product = trim($this->fk_product);
+		}
+		if (isset($this->fk_soc)) {
+					$this->fk_soc = trim($this->fk_soc);
+		}
+		if (isset($this->price)) {
+					$this->price = trim($this->price);
+		}
+		if (isset($this->price_ttc)) {
+					$this->price_ttc = trim($this->price_ttc);
+		}
+		if (isset($this->price_min)) {
+					$this->price_min = trim($this->price_min);
+		}
+		if (isset($this->price_min_ttc)) {
+					$this->price_min_ttc = trim($this->price_min_ttc);
+		}
+		if (isset($this->price_base_type)) {
+					$this->price_base_type = trim($this->price_base_type);
+		}
+		if (isset($this->tva_tx)) {
+					$this->tva_tx = trim($this->tva_tx);
+		}
+		if (isset($this->recuperableonly)) {
+					$this->recuperableonly = trim($this->recuperableonly);
+		}
+		if (isset($this->localtax1_tx)) {
+					$this->localtax1_tx = trim($this->localtax1_tx);
+		}
+		if (isset($this->localtax2_tx)) {
+					$this->localtax2_tx = trim($this->localtax2_tx);
+		}
+		if (isset($this->fk_user)) {
+					$this->fk_user = trim($this->fk_user);
+		}
+		if (isset($this->import_key)) {
+					$this->import_key = trim($this->import_key);
+		}
 
 			// Check parameters
 			// Put here code to add control on parameters values
@@ -308,8 +322,12 @@ 
 	{
 		global $langs;
 
-		if ( empty($sortfield)) $sortfield = "t.rowid";
-		if ( empty($sortorder)) $sortorder = "DESC";
+		if ( empty($sortfield)) {
+			$sortfield = "t.rowid";
+		}
+		if ( empty($sortorder)) {
+			$sortorder = "DESC";
+		}
 
 		$sql = "SELECT";
 		$sql .= " t.rowid,";
@@ -343,9 +361,11 @@ 
 		// Manage filter
 		if (count($filter) > 0) {
 			foreach ( $filter as $key => $value ) {
-				if (strpos($key, 'date')) 				// To allow $filter['YEAR(s.dated)']=>$year
+				if (strpos($key, 'date')) {
+					// To allow $filter['YEAR(s.dated)']=>$year
 				{
 					$sql .= ' AND ' . $key . ' = \'' . $value . '\'';
+				}
 				} elseif ($key == 'soc.nom') {
 					$sql .= ' AND ' . $key . ' LIKE \'%' . $value . '%\'';
 				} elseif ($key == 'prod.ref') {
@@ -356,7 +376,9 @@ 
 			}
 		}
 		$sql.= $this->db->order($sortfield, $sortorder);
-		if (! empty($limit)) $sql .= ' ' . $this->db->plimit($limit + 1, $offset);
+		if (! empty($limit)) {
+			$sql .= ' ' . $this->db->plimit($limit + 1, $offset);
+		}
 
 		dol_syslog(get_class($this) . "::fetch_all", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -416,8 +438,12 @@ 
 	{
 		global $langs;
 
-		if (! empty($sortfield)) $sortfield = "t.rowid";
-		if (! empty($sortorder)) $sortorder = "DESC";
+		if (! empty($sortfield)) {
+			$sortfield = "t.rowid";
+		}
+		if (! empty($sortorder)) {
+			$sortorder = "DESC";
+		}
 
 		$sql = "SELECT";
 		$sql .= " t.rowid,";
@@ -450,9 +476,11 @@ 
 		// Manage filter
 		if (count($filter) > 0) {
 			foreach ( $filter as $key => $value ) {
-				if (strpos($key, 'date')) 				// To allow $filter['YEAR(s.dated)']=>$year
+				if (strpos($key, 'date')) {
+					// To allow $filter['YEAR(s.dated)']=>$year
 				{
 					$sql .= ' AND ' . $key . ' = \'' . $value . '\'';
+				}
 				} elseif ($key == 'soc.nom') {
 					$sql .= ' AND ' . $key . ' LIKE \'%' . $value . '%\'';
 				} else {
@@ -462,7 +490,9 @@ 
 		}
 
 		$sql.= $this->db->order($sortfield, $sortorder);
-		if (! empty($limit)) $sql .= ' ' . $this->db->plimit($limit + 1, $offset);
+		if (! empty($limit)) {
+			$sql .= ' ' . $this->db->plimit($limit + 1, $offset);
+		}
 
 		dol_syslog(get_class($this) . "::fetch_all_log", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -523,34 +553,48 @@ 
 
 		// Clean parameters
 
-		if (isset($this->entity))
-			$this->entity = trim($this->entity);
-		if (isset($this->fk_product))
-			$this->fk_product = trim($this->fk_product);
-		if (isset($this->fk_soc))
-			$this->fk_soc = trim($this->fk_soc);
-		if (isset($this->price))
-			$this->price = trim($this->price);
-		if (isset($this->price_ttc))
-			$this->price_ttc = trim($this->price_ttc);
-		if (isset($this->price_min))
-			$this->price_min = trim($this->price_min);
-		if (isset($this->price_min_ttc))
-			$this->price_min_ttc = trim($this->price_min_ttc);
-		if (isset($this->price_base_type))
-			$this->price_base_type = trim($this->price_base_type);
-		if (isset($this->tva_tx))
-			$this->tva_tx = trim($this->tva_tx);
-		if (isset($this->recuperableonly))
-			$this->recuperableonly = trim($this->recuperableonly);
-		if (isset($this->localtax1_tx))
-			$this->localtax1_tx = trim($this->localtax1_tx);
-		if (isset($this->localtax2_tx))
-			$this->localtax2_tx = trim($this->localtax2_tx);
-		if (isset($this->fk_user))
-			$this->fk_user = trim($this->fk_user);
-		if (isset($this->import_key))
-			$this->import_key = trim($this->import_key);
+		if (isset($this->entity)) {
+					$this->entity = trim($this->entity);
+		}
+		if (isset($this->fk_product)) {
+					$this->fk_product = trim($this->fk_product);
+		}
+		if (isset($this->fk_soc)) {
+					$this->fk_soc = trim($this->fk_soc);
+		}
+		if (isset($this->price)) {
+					$this->price = trim($this->price);
+		}
+		if (isset($this->price_ttc)) {
+					$this->price_ttc = trim($this->price_ttc);
+		}
+		if (isset($this->price_min)) {
+					$this->price_min = trim($this->price_min);
+		}
+		if (isset($this->price_min_ttc)) {
+					$this->price_min_ttc = trim($this->price_min_ttc);
+		}
+		if (isset($this->price_base_type)) {
+					$this->price_base_type = trim($this->price_base_type);
+		}
+		if (isset($this->tva_tx)) {
+					$this->tva_tx = trim($this->tva_tx);
+		}
+		if (isset($this->recuperableonly)) {
+					$this->recuperableonly = trim($this->recuperableonly);
+		}
+		if (isset($this->localtax1_tx)) {
+					$this->localtax1_tx = trim($this->localtax1_tx);
+		}
+		if (isset($this->localtax2_tx)) {
+					$this->localtax2_tx = trim($this->localtax2_tx);
+		}
+		if (isset($this->fk_user)) {
+					$this->fk_user = trim($this->fk_user);
+		}
+		if (isset($this->import_key)) {
+					$this->import_key = trim($this->import_key);
+		}
 
 			// Check parameters
 			// Put here code to add a control on parameters values

Spacing +152 added lines, -152 removed lines

@@ -21,7 +21,7 @@ 
  * \ingroup produit
  * \brief File of class to manage predefined price products or services by customer
  */
-require_once DOL_DOCUMENT_ROOT . '/core/class/commonobject.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
 
 /**
  * File of class to manage predefined price products or services by customer
@@ -47,7 +47,7 @@ 
 	var $localtax2_type;
 	var $localtax2_tx;
 	var $fk_user;
-	var $lines = array ();
+	var $lines = array();
 
 	/**
 	 * Constructor
@@ -139,7 +139,7 @@ 
 		}
 
 		// Insert request
-		$sql = "INSERT INTO " . MAIN_DB_PREFIX . "product_customer_price(";
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."product_customer_price(";
 		$sql .= "entity,";
 		$sql .= "datec,";
 		$sql .= "fk_product,";
@@ -159,39 +159,39 @@ 
 		$sql .= "fk_user,";
 		$sql .= "import_key";
 		$sql .= ") VALUES (";
-		$sql .= " " . $conf->entity . ",";
-		$sql .= " '" . $this->db->idate(dol_now()) . "',";
-		$sql .= " " . (! isset($this->fk_product) ? 'NULL' : "'" . $this->db->escape($this->fk_product) . "'") . ",";
-		$sql .= " " . (! isset($this->fk_soc) ? 'NULL' : "'" . $this->db->escape($this->fk_soc) . "'") . ",";
-		$sql .= " " . (empty($this->price) ? '0' : "'" . $this->db->escape($this->price) . "'") . ",";
-		$sql .= " " . (empty($this->price_ttc) ? '0' : "'" . $this->db->escape($this->price_ttc) . "'") . ",";
-		$sql .= " " . (empty($this->price_min) ? '0' : "'" . $this->db->escape($this->price_min) . "'") . ",";
-		$sql .= " " . (empty($this->price_min_ttc) ? '0' : "'" . $this->db->escape($this->price_min_ttc) . "'") . ",";
-		$sql .= " " . (! isset($this->price_base_type) ? 'NULL' : "'" . $this->db->escape($this->price_base_type) . "'") . ",";
+		$sql .= " ".$conf->entity.",";
+		$sql .= " '".$this->db->idate(dol_now())."',";
+		$sql .= " ".(!isset($this->fk_product) ? 'NULL' : "'".$this->db->escape($this->fk_product)."'").",";
+		$sql .= " ".(!isset($this->fk_soc) ? 'NULL' : "'".$this->db->escape($this->fk_soc)."'").",";
+		$sql .= " ".(empty($this->price) ? '0' : "'".$this->db->escape($this->price)."'").",";
+		$sql .= " ".(empty($this->price_ttc) ? '0' : "'".$this->db->escape($this->price_ttc)."'").",";
+		$sql .= " ".(empty($this->price_min) ? '0' : "'".$this->db->escape($this->price_min)."'").",";
+		$sql .= " ".(empty($this->price_min_ttc) ? '0' : "'".$this->db->escape($this->price_min_ttc)."'").",";
+		$sql .= " ".(!isset($this->price_base_type) ? 'NULL' : "'".$this->db->escape($this->price_base_type)."'").",";
 		$sql .= " ".($this->default_vat_code ? "'".$this->db->escape($this->default_vat_code)."'" : "null").",";
-		$sql .= " " . (! isset($this->tva_tx) ? 'NULL' : (empty($this->tva_tx)?0:$this->tva_tx)) . ",";
-		$sql .= " " . (! isset($this->recuperableonly) ? 'NULL' : "'" . $this->db->escape($this->recuperableonly) . "'") . ",";
-		$sql .= " " . (empty($this->localtax1_type) ? "'0'" : "'" . $this->db->escape($this->localtax1_type) . "'") . ",";
-		$sql .= " " . (! isset($this->localtax1_tx) ? 'NULL' : (empty($this->localtax1_tx)?0:$this->localtax1_tx)) . ",";
-		$sql .= " " . (empty($this->localtax2_type) ? "'0'" : "'" . $this->db->escape($this->localtax2_type) . "'") . ",";
-		$sql .= " " . (! isset($this->localtax2_tx) ? 'NULL' : (empty($this->localtax2_tx)?0:$this->localtax2_tx)) . ",";
-		$sql .= " " . $user->id . ",";
-		$sql .= " " . (! isset($this->import_key) ? 'NULL' : "'" . $this->db->escape($this->import_key) . "'") . "";
+		$sql .= " ".(!isset($this->tva_tx) ? 'NULL' : (empty($this->tva_tx) ? 0 : $this->tva_tx)).",";
+		$sql .= " ".(!isset($this->recuperableonly) ? 'NULL' : "'".$this->db->escape($this->recuperableonly)."'").",";
+		$sql .= " ".(empty($this->localtax1_type) ? "'0'" : "'".$this->db->escape($this->localtax1_type)."'").",";
+		$sql .= " ".(!isset($this->localtax1_tx) ? 'NULL' : (empty($this->localtax1_tx) ? 0 : $this->localtax1_tx)).",";
+		$sql .= " ".(empty($this->localtax2_type) ? "'0'" : "'".$this->db->escape($this->localtax2_type)."'").",";
+		$sql .= " ".(!isset($this->localtax2_tx) ? 'NULL' : (empty($this->localtax2_tx) ? 0 : $this->localtax2_tx)).",";
+		$sql .= " ".$user->id.",";
+		$sql .= " ".(!isset($this->import_key) ? 'NULL' : "'".$this->db->escape($this->import_key)."'")."";
 		$sql .= ")";
 
 		$this->db->begin();
 
-		dol_syslog(get_class($this) . "::create", LOG_DEBUG);
+		dol_syslog(get_class($this)."::create", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if (! $resql) {
-			$error ++;
-			$this->errors [] = "Error " . $this->db->lasterror();
+		if (!$resql) {
+			$error++;
+			$this->errors [] = "Error ".$this->db->lasterror();
 		}
 
-		if (! $error) {
-			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . "product_customer_price");
+		if (!$error) {
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."product_customer_price");
 
-			if (! $notrigger) {
+			if (!$notrigger) {
 				// Uncomment this and change MYOBJECT to your own tag if you
 				// want this action calls a trigger.
 
@@ -204,21 +204,21 @@ 
 			}
 		}
 
-		if (! $error) {
+		if (!$error) {
 			$result = $this->setPriceOnAffiliateThirdparty($user, $forceupdateaffiliate);
 			if ($result < 0) {
-				$error ++;
+				$error++;
 			}
 		}
 
 		// Commit or rollback
 		if ($error) {
-			foreach ( $this->errors as $errmsg ) {
-				dol_syslog(get_class($this) . "::create " . $errmsg, LOG_ERR);
-				$this->error .= ($this->error ? ', ' . $errmsg : $errmsg);
+			foreach ($this->errors as $errmsg) {
+				dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
-			return - 1 * $error;
+			return -1 * $error;
 		} else {
 			$this->db->commit();
 			return $this->id;
@@ -256,10 +256,10 @@ 
 		$sql .= " t.fk_user,";
 		$sql .= " t.import_key";
 
-		$sql .= " FROM " . MAIN_DB_PREFIX . "product_customer_price as t";
-		$sql .= " WHERE t.rowid = " . $id;
+		$sql .= " FROM ".MAIN_DB_PREFIX."product_customer_price as t";
+		$sql .= " WHERE t.rowid = ".$id;
 
-		dol_syslog(get_class($this) . "::fetch", LOG_DEBUG);
+		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			if ($this->db->num_rows($resql)) {
@@ -289,8 +289,8 @@ 
 
 			return 1;
 		} else {
-			$this->error = "Error " . $this->db->lasterror();
-			return - 1;
+			$this->error = "Error ".$this->db->lasterror();
+			return -1;
 		}
 	}
 
@@ -308,8 +308,8 @@ 
 	{
 		global $langs;
 
-		if ( empty($sortfield)) $sortfield = "t.rowid";
-		if ( empty($sortorder)) $sortorder = "DESC";
+		if (empty($sortfield)) $sortfield = "t.rowid";
+		if (empty($sortorder)) $sortorder = "DESC";
 
 		$sql = "SELECT";
 		$sql .= " t.rowid,";
@@ -333,39 +333,39 @@ 
 		$sql .= " t.import_key,";
 		$sql .= " soc.nom as socname,";
 		$sql .= " prod.ref as prodref";
-		$sql .= " FROM " . MAIN_DB_PREFIX . "product_customer_price as t ";
-		$sql .= " ," . MAIN_DB_PREFIX . "product as prod ";
-		$sql .= " ," . MAIN_DB_PREFIX . "societe as soc ";
+		$sql .= " FROM ".MAIN_DB_PREFIX."product_customer_price as t ";
+		$sql .= " ,".MAIN_DB_PREFIX."product as prod ";
+		$sql .= " ,".MAIN_DB_PREFIX."societe as soc ";
 		$sql .= " WHERE soc.rowid=t.fk_soc ";
 		$sql .= " AND prod.rowid=t.fk_product ";
-		$sql .= " AND prod.entity IN (" . getEntity('product') . ")";
+		$sql .= " AND prod.entity IN (".getEntity('product').")";
 
 		// Manage filter
 		if (count($filter) > 0) {
-			foreach ( $filter as $key => $value ) {
+			foreach ($filter as $key => $value) {
 				if (strpos($key, 'date')) 				// To allow $filter['YEAR(s.dated)']=>$year
 				{
-					$sql .= ' AND ' . $key . ' = \'' . $value . '\'';
+					$sql .= ' AND '.$key.' = \''.$value.'\'';
 				} elseif ($key == 'soc.nom') {
-					$sql .= ' AND ' . $key . ' LIKE \'%' . $value . '%\'';
+					$sql .= ' AND '.$key.' LIKE \'%'.$value.'%\'';
 				} elseif ($key == 'prod.ref') {
-					$sql .= ' AND ' . $key . ' LIKE \'%' . $value . '%\'';
+					$sql .= ' AND '.$key.' LIKE \'%'.$value.'%\'';
 				} else {
-					$sql .= ' AND ' . $key . ' = ' . $value;
+					$sql .= ' AND '.$key.' = '.$value;
 				}
 			}
 		}
-		$sql.= $this->db->order($sortfield, $sortorder);
-		if (! empty($limit)) $sql .= ' ' . $this->db->plimit($limit + 1, $offset);
+		$sql .= $this->db->order($sortfield, $sortorder);
+		if (!empty($limit)) $sql .= ' '.$this->db->plimit($limit + 1, $offset);
 
-		dol_syslog(get_class($this) . "::fetch_all", LOG_DEBUG);
+		dol_syslog(get_class($this)."::fetch_all", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql) {
 
-			$this->lines = array ();
+			$this->lines = array();
 			$num = $this->db->num_rows($resql);
 
-			while ( $obj = $this->db->fetch_object($resql) ) {
+			while ($obj = $this->db->fetch_object($resql)) {
 
 				$line = new PriceByCustomerLine();
 
@@ -397,8 +397,8 @@ 
 
 			return $num;
 		} else {
-			$this->error = "Error " . $this->db->lasterror();
-			return - 1;
+			$this->error = "Error ".$this->db->lasterror();
+			return -1;
 		}
 	}
 
@@ -416,8 +416,8 @@ 
 	{
 		global $langs;
 
-		if (! empty($sortfield)) $sortfield = "t.rowid";
-		if (! empty($sortorder)) $sortorder = "DESC";
+		if (!empty($sortfield)) $sortfield = "t.rowid";
+		if (!empty($sortorder)) $sortorder = "DESC";
 
 		$sql = "SELECT";
 		$sql .= " t.rowid,";
@@ -440,38 +440,38 @@ 
 		$sql .= " t.import_key,";
 		$sql .= " soc.nom as socname,";
 		$sql .= " prod.ref as prodref";
-		$sql .= " FROM " . MAIN_DB_PREFIX . "product_customer_price_log as t ";
-		$sql .= " ," . MAIN_DB_PREFIX . "product as prod ";
-		$sql .= " ," . MAIN_DB_PREFIX . "societe as soc ";
+		$sql .= " FROM ".MAIN_DB_PREFIX."product_customer_price_log as t ";
+		$sql .= " ,".MAIN_DB_PREFIX."product as prod ";
+		$sql .= " ,".MAIN_DB_PREFIX."societe as soc ";
 		$sql .= " WHERE soc.rowid=t.fk_soc ";
 		$sql .= " AND prod.rowid=t.fk_product ";
-		$sql .= " AND prod.entity IN (" . getEntity('product') . ")";
+		$sql .= " AND prod.entity IN (".getEntity('product').")";
 
 		// Manage filter
 		if (count($filter) > 0) {
-			foreach ( $filter as $key => $value ) {
+			foreach ($filter as $key => $value) {
 				if (strpos($key, 'date')) 				// To allow $filter['YEAR(s.dated)']=>$year
 				{
-					$sql .= ' AND ' . $key . ' = \'' . $value . '\'';
+					$sql .= ' AND '.$key.' = \''.$value.'\'';
 				} elseif ($key == 'soc.nom') {
-					$sql .= ' AND ' . $key . ' LIKE \'%' . $value . '%\'';
+					$sql .= ' AND '.$key.' LIKE \'%'.$value.'%\'';
 				} else {
-					$sql .= ' AND ' . $key . ' = ' . $value;
+					$sql .= ' AND '.$key.' = '.$value;
 				}
 			}
 		}
 
-		$sql.= $this->db->order($sortfield, $sortorder);
-		if (! empty($limit)) $sql .= ' ' . $this->db->plimit($limit + 1, $offset);
+		$sql .= $this->db->order($sortfield, $sortorder);
+		if (!empty($limit)) $sql .= ' '.$this->db->plimit($limit + 1, $offset);
 
-		dol_syslog(get_class($this) . "::fetch_all_log", LOG_DEBUG);
+		dol_syslog(get_class($this)."::fetch_all_log", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql) {
 
-			$this->lines = array ();
+			$this->lines = array();
 			$num = $this->db->num_rows($resql);
 
-			while ( $obj = $this->db->fetch_object($resql) ) {
+			while ($obj = $this->db->fetch_object($resql)) {
 
 				$line = new PriceByCustomerLine();
 
@@ -503,8 +503,8 @@ 
 
 			return $num;
 		} else {
-			$this->error = "Error " . $this->db->lasterror();
-			return - 1;
+			$this->error = "Error ".$this->db->lasterror();
+			return -1;
 		}
 	}
 
@@ -588,7 +588,7 @@ 
 
 		// Do a copy of current record into log table
 		// Insert request
-		$sql = "INSERT INTO " . MAIN_DB_PREFIX . "product_customer_price_log(";
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."product_customer_price_log(";
 
 		$sql .= "entity,";
 		$sql .= "datec,";
@@ -631,75 +631,75 @@ 
 		$sql .= " t.fk_user,";
 		$sql .= " t.import_key";
 
-		$sql .= " FROM " . MAIN_DB_PREFIX . "product_customer_price as t";
-		$sql .= " WHERE t.rowid = " . $this->id;
+		$sql .= " FROM ".MAIN_DB_PREFIX."product_customer_price as t";
+		$sql .= " WHERE t.rowid = ".$this->id;
 
 		$this->db->begin();
-		dol_syslog(get_class($this) . "::update", LOG_DEBUG);
+		dol_syslog(get_class($this)."::update", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if (! $resql) {
-			$error ++;
-			$this->errors [] = "Error " . $this->db->lasterror();
+		if (!$resql) {
+			$error++;
+			$this->errors [] = "Error ".$this->db->lasterror();
 		}
 
 		// Update request
-		$sql = "UPDATE " . MAIN_DB_PREFIX . "product_customer_price SET";
-
-		$sql .= " entity=" . $conf->entity . ",";
-		$sql .= " datec='" . $this->db->idate(dol_now()) . "',";
-		$sql .= " tms=" . (dol_strlen($this->tms) != 0 ? "'" . $this->db->idate($this->tms) . "'" : 'null') . ",";
-		$sql .= " fk_product=" . (isset($this->fk_product) ? $this->fk_product : "null") . ",";
-		$sql .= " fk_soc=" . (isset($this->fk_soc) ? $this->fk_soc : "null") . ",";
-		$sql .= " price=" . (isset($this->price) ? $this->price : "null") . ",";
-		$sql .= " price_ttc=" . (isset($this->price_ttc) ? $this->price_ttc : "null") . ",";
-		$sql .= " price_min=" . (isset($this->price_min) ? $this->price_min : "null") . ",";
-		$sql .= " price_min_ttc=" . (isset($this->price_min_ttc) ? $this->price_min_ttc : "null") . ",";
-		$sql .= " price_base_type=" . (isset($this->price_base_type) ? "'" . $this->db->escape($this->price_base_type) . "'" : "null") . ",";
+		$sql = "UPDATE ".MAIN_DB_PREFIX."product_customer_price SET";
+
+		$sql .= " entity=".$conf->entity.",";
+		$sql .= " datec='".$this->db->idate(dol_now())."',";
+		$sql .= " tms=".(dol_strlen($this->tms) != 0 ? "'".$this->db->idate($this->tms)."'" : 'null').",";
+		$sql .= " fk_product=".(isset($this->fk_product) ? $this->fk_product : "null").",";
+		$sql .= " fk_soc=".(isset($this->fk_soc) ? $this->fk_soc : "null").",";
+		$sql .= " price=".(isset($this->price) ? $this->price : "null").",";
+		$sql .= " price_ttc=".(isset($this->price_ttc) ? $this->price_ttc : "null").",";
+		$sql .= " price_min=".(isset($this->price_min) ? $this->price_min : "null").",";
+		$sql .= " price_min_ttc=".(isset($this->price_min_ttc) ? $this->price_min_ttc : "null").",";
+		$sql .= " price_base_type=".(isset($this->price_base_type) ? "'".$this->db->escape($this->price_base_type)."'" : "null").",";
 		$sql .= " default_vat_code = ".($this->default_vat_code ? "'".$this->db->escape($this->default_vat_code)."'" : "null").",";
-		$sql .= " tva_tx=" . (isset($this->tva_tx) ? (empty($this->tva_tx)?0:$this->tva_tx) : "null") . ",";
-		$sql .= " recuperableonly=" . (isset($this->recuperableonly) ? $this->recuperableonly : "null") . ",";
-		$sql .= " localtax1_tx=" . (isset($this->localtax1_tx) ? (empty($this->localtax1_tx)?0:$this->localtax1_tx) : "null") . ",";
-		$sql .= " localtax2_tx=" . (isset($this->localtax2_tx) ? (empty($this->localtax2_tx)?0:$this->localtax2_tx) : "null") . ",";
-		$sql .= " localtax1_type=" . (! empty($this->localtax1_type) ? "'".$this->db->escape($this->localtax1_type)."'": "'0'") . ",";
-		$sql .= " localtax2_type=" . (! empty($this->localtax2_type) ? "'".$this->db->escape($this->localtax2_type)."'": "'0'") . ",";
-		$sql .= " fk_user=" . $user->id . ",";
-		$sql .= " import_key=" . (isset($this->import_key) ? "'" . $this->db->escape($this->import_key) . "'" : "null") . "";
-
-		$sql .= " WHERE rowid=" . $this->id;
-
-		dol_syslog(get_class($this) . "::update", LOG_DEBUG);
+		$sql .= " tva_tx=".(isset($this->tva_tx) ? (empty($this->tva_tx) ? 0 : $this->tva_tx) : "null").",";
+		$sql .= " recuperableonly=".(isset($this->recuperableonly) ? $this->recuperableonly : "null").",";
+		$sql .= " localtax1_tx=".(isset($this->localtax1_tx) ? (empty($this->localtax1_tx) ? 0 : $this->localtax1_tx) : "null").",";
+		$sql .= " localtax2_tx=".(isset($this->localtax2_tx) ? (empty($this->localtax2_tx) ? 0 : $this->localtax2_tx) : "null").",";
+		$sql .= " localtax1_type=".(!empty($this->localtax1_type) ? "'".$this->db->escape($this->localtax1_type)."'" : "'0'").",";
+		$sql .= " localtax2_type=".(!empty($this->localtax2_type) ? "'".$this->db->escape($this->localtax2_type)."'" : "'0'").",";
+		$sql .= " fk_user=".$user->id.",";
+		$sql .= " import_key=".(isset($this->import_key) ? "'".$this->db->escape($this->import_key)."'" : "null")."";
+
+		$sql .= " WHERE rowid=".$this->id;
+
+		dol_syslog(get_class($this)."::update", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if (! $resql) {
-			$error ++;
-			$this->errors [] = "Error " . $this->db->lasterror();
+		if (!$resql) {
+			$error++;
+			$this->errors [] = "Error ".$this->db->lasterror();
 		}
 
-		if (! $error) {
-			if (! $notrigger) {
+		if (!$error) {
+			if (!$notrigger) {
 				// Call triggers
-				include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-				$interface=new Interfaces($this->db);
-				$result=$interface->run_triggers('PRODUCT_CUSTOMER_PRICE_UPDATE',$this,$user,$langs,$conf);
-				if ($result < 0) { $error++; $this->errors=$interface->errors; }
+				include_once DOL_DOCUMENT_ROOT.'/core/class/interfaces.class.php';
+				$interface = new Interfaces($this->db);
+				$result = $interface->run_triggers('PRODUCT_CUSTOMER_PRICE_UPDATE', $this, $user, $langs, $conf);
+				if ($result < 0) { $error++; $this->errors = $interface->errors; }
 				// End call triggers
 			}
 		}
 
-		if (! $error) {
+		if (!$error) {
 			$result = $this->setPriceOnAffiliateThirdparty($user, $forceupdateaffiliate);
 			if ($result < 0) {
-				$error ++;
+				$error++;
 			}
 		}
 
 		// Commit or rollback
 		if ($error) {
-			foreach ( $this->errors as $errmsg ) {
-				dol_syslog(get_class($this) . "::update " . $errmsg, LOG_ERR);
-				$this->error .= ($this->error ? ', ' . $errmsg : $errmsg);
+			foreach ($this->errors as $errmsg) {
+				dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
-			return - 1 * $error;
+			return -1 * $error;
 		} else {
 			$this->db->commit();
 			return 1;
@@ -719,37 +719,37 @@ 
 
 		// Find all susidiaries
 		$sql = "SELECT s.rowid";
-		$sql .= " FROM " . MAIN_DB_PREFIX . "societe as s";
-		$sql .= " WHERE s.parent = " . $this->fk_soc;
-		$sql .= " AND s.entity IN (" . getEntity('societe') . ")";
+		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+		$sql .= " WHERE s.parent = ".$this->fk_soc;
+		$sql .= " AND s.entity IN (".getEntity('societe').")";
 
-		dol_syslog(get_class($this) . "::setPriceOnAffiliateThirdparty", LOG_DEBUG);
+		dol_syslog(get_class($this)."::setPriceOnAffiliateThirdparty", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 
 		if ($resql) {
 
-			$this->lines = array ();
+			$this->lines = array();
 			$num = $this->db->num_rows($resql);
 
-			while ( ($obj = $this->db->fetch_object($resql)) && (empty($error)) ) {
+			while (($obj = $this->db->fetch_object($resql)) && (empty($error))) {
 
 				// find if there is an existing line for the product and the subsidiaries
 				$prodsocprice = new Productcustomerprice($this->db);
 
-				$filter = array (
-					't.fk_product' => $this->fk_product,'t.fk_soc' => $obj->rowid
+				$filter = array(
+					't.fk_product' => $this->fk_product, 't.fk_soc' => $obj->rowid
 				);
 
 				$result = $prodsocprice->fetch_all('', '', 0, 0, $filter);
 				if ($result < 0) {
-					$error ++;
+					$error++;
 					$this->error = $prodsocprice->error;
 				} else {
 
 					// There is one line
 					if (count($prodsocprice->lines) > 0) {
 						// If force update => Update
-						if (! empty($forceupdateaffiliate)) {
+						if (!empty($forceupdateaffiliate)) {
 
 							$prodsocpriceupd = new Productcustomerprice($this->db);
 							$prodsocpriceupd->fetch($prodsocprice->lines [0]->id);
@@ -762,7 +762,7 @@ 
 
 							$resultupd = $prodsocpriceupd->update($user, 0, $forceupdateaffiliate);
 							if ($result < 0) {
-								$error ++;
+								$error++;
 								$this->error = $prodsocpriceupd->error;
 							}
 						}
@@ -779,7 +779,7 @@ 
 
 						$resultupd = $prodsocpricenew->create($user, 0, $forceupdateaffiliate);
 						if ($result < 0) {
-							$error ++;
+							$error++;
 							$this->error = $prodsocpriceupd->error;
 						}
 					}
@@ -790,11 +790,11 @@ 
 			if (empty($error)) {
 				return 1;
 			} else {
-				return - 1;
+				return -1;
 			}
 		} else {
-			$this->error = "Error " . $this->db->lasterror();
-			return - 1;
+			$this->error = "Error ".$this->db->lasterror();
+			return -1;
 		}
 	}
 
@@ -812,8 +812,8 @@ 
 
 		$this->db->begin();
 
-		if (! $error) {
-			if (! $notrigger) {
+		if (!$error) {
+			if (!$notrigger) {
 				// Uncomment this and change MYOBJECT to your own tag if you
 				// want this action calls a trigger.
 
@@ -826,26 +826,26 @@ 
 			}
 		}
 
-		if (! $error) {
-			$sql = "DELETE FROM " . MAIN_DB_PREFIX . "product_customer_price";
-			$sql .= " WHERE rowid=" . $this->id;
+		if (!$error) {
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX."product_customer_price";
+			$sql .= " WHERE rowid=".$this->id;
 
-			dol_syslog(get_class($this) . "::delete", LOG_DEBUG);
+			dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 			$resql = $this->db->query($sql);
-			if (! $resql) {
-				$error ++;
-				$this->errors [] = "Error " . $this->db->lasterror();
+			if (!$resql) {
+				$error++;
+				$this->errors [] = "Error ".$this->db->lasterror();
 			}
 		}
 
 		// Commit or rollback
 		if ($error) {
-			foreach ( $this->errors as $errmsg ) {
-				dol_syslog(get_class($this) . "::delete " . $errmsg, LOG_ERR);
-				$this->error .= ($this->error ? ', ' . $errmsg : $errmsg);
+			foreach ($this->errors as $errmsg) {
+				dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
-			return - 1 * $error;
+			return -1 * $error;
 		} else {
 			$this->db->commit();
 			return 1;
@@ -866,7 +866,7 @@ 
 
 		$object = new Productcustomerprice($this->db);
 
-		$object->context['createfromclone']='createfromclone';
+		$object->context['createfromclone'] = 'createfromclone';
 
 		$this->db->begin();
 
@@ -884,21 +884,21 @@ 
 		// Other options
 		if ($result < 0) {
 			$this->error = $object->error;
-			$error ++;
+			$error++;
 		}
 
-		if (! $error) {
+		if (!$error) {
 		}
 
 		unset($object->context['createfromclone']);
 
 		// End
-		if (! $error) {
+		if (!$error) {
 			$this->db->commit();
 			return $object->id;
 		} else {
 			$this->db->rollback();
-			return - 1;
+			return -1;
 		}
 	}
 

htdocs/product/class/propalmergepdfproduct.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -297,7 +297,7 @@
     /**
      *  Update object into database
      *
-     *  @param	User	$user        User that modifies
+     *  @param	integer	$user        User that modifies
      *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
      *  @return int     		   	 <0 if KO, >0 if OK
      */

Braces +39 added lines, -27 removed lines

@@ -73,12 +73,24 @@ 
 
 		// Clean parameters
         
-		if (isset($this->fk_product)) $this->fk_product=trim($this->fk_product);
-		if (isset($this->file_name)) $this->file_name=trim($this->file_name);
-		if (isset($this->fk_user_author)) $this->fk_user_author=trim($this->fk_user_author);
-		if (isset($this->fk_user_mod)) $this->fk_user_mod=trim($this->fk_user_mod);
-		if (isset($this->lang)) $this->lang=trim($this->lang);
-		if (isset($this->import_key)) $this->import_key=trim($this->import_key);
+		if (isset($this->fk_product)) {
+			$this->fk_product=trim($this->fk_product);
+		}
+		if (isset($this->file_name)) {
+			$this->file_name=trim($this->file_name);
+		}
+		if (isset($this->fk_user_author)) {
+			$this->fk_user_author=trim($this->fk_user_author);
+		}
+		if (isset($this->fk_user_mod)) {
+			$this->fk_user_mod=trim($this->fk_user_mod);
+		}
+		if (isset($this->lang)) {
+			$this->lang=trim($this->lang);
+		}
+		if (isset($this->import_key)) {
+			$this->import_key=trim($this->import_key);
+		}
 
         
 
@@ -146,8 +158,7 @@ 
 			}
 			$this->db->rollback();
 			return -1*$error;
-		}
-		else
+		} else
 		{
 			$this->db->commit();
             return $this->id;
@@ -207,8 +218,7 @@ 
             $this->db->free($resql);
 
             return 1;
-        }
-        else
+        } else
         {
       	    $this->error="Error ".$this->db->lasterror();
             dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR);
@@ -272,7 +282,7 @@ 
 	    			
 	    			if ($conf->global->MAIN_MULTILANGS) {
 	    				$this->lines[$obj->file_name.'_'.$obj->lang]=$line;
-	    			}else {
+	    			} else {
 	    				$this->lines[$obj->file_name]=$line;
 	    			}
 	    			
@@ -284,8 +294,7 @@ 
     		$this->db->free($resql);
     
     		return 1;
-    	}
-    	else
+    	} else
     	{
     		$this->error="Error ".$this->db->lasterror();
     		dol_syslog(get_class($this)."::fetch_by_product ".$this->error, LOG_ERR);
@@ -308,10 +317,18 @@ 
 
 		// Clean parameters
         
-		if (isset($this->fk_product)) $this->fk_product=trim($this->fk_product);
-		if (isset($this->file_name)) $this->file_name=trim($this->file_name);
-		if (isset($this->fk_user_mod)) $this->fk_user_mod=trim($this->fk_user_mod);
-		if (isset($this->lang)) $this->lang=trim($this->lang);
+		if (isset($this->fk_product)) {
+			$this->fk_product=trim($this->fk_product);
+		}
+		if (isset($this->file_name)) {
+			$this->file_name=trim($this->file_name);
+		}
+		if (isset($this->fk_user_mod)) {
+			$this->fk_user_mod=trim($this->fk_user_mod);
+		}
+		if (isset($this->lang)) {
+			$this->lang=trim($this->lang);
+		}
 		
 
         
@@ -364,8 +381,7 @@ 
 			}
 			$this->db->rollback();
 			return -1*$error;
-		}
-		else
+		} else
 		{
 			$this->db->commit();
 			return 1;
@@ -423,8 +439,7 @@ 
 			}
 			$this->db->rollback();
 			return -1*$error;
-		}
-		else
+		} else
 		{
 			$this->db->commit();
 			return 1;
@@ -487,8 +502,7 @@ 
 			}
 			$this->db->rollback();
 			return -1*$error;
-		}
-		else
+		} else
 		{
 			$this->db->commit();
 			return 1;
@@ -544,8 +558,7 @@ 
 			}
 			$this->db->rollback();
 			return -1*$error;
-		}
-		else
+		} else
 		{
 			$this->db->commit();
 			return 1;
@@ -599,8 +612,7 @@ 
 		{
 			$this->db->commit();
 			return $object->id;
-		}
-		else
+		} else
 		{
 			$this->db->rollback();
 			return -1;

Indentation +206 added lines, -206 removed lines

@@ -47,28 +47,28 @@ 
 
 
 
-    /**
-     *  Constructor
-     *
-     *  @param	DoliDb		$db      Database handler
-     */
-    function __construct($db)
-    {
-        $this->db = $db;
-        return 1;
-    }
-
-
-    /**
-     *  Create object into database
-     *
-     *  @param	User	$user        User that creates
-     *  @param  int		$notrigger   0=launch triggers after, 1=disable triggers
-     *  @return int      		   	 <0 if KO, Id of created object if OK
-     */
-    function create($user, $notrigger=0)
-    {
-    	global $conf, $langs;
+	/**
+	 *  Constructor
+	 *
+	 *  @param	DoliDb		$db      Database handler
+	 */
+	function __construct($db)
+	{
+		$this->db = $db;
+		return 1;
+	}
+
+
+	/**
+	 *  Create object into database
+	 *
+	 *  @param	User	$user        User that creates
+	 *  @param  int		$notrigger   0=launch triggers after, 1=disable triggers
+	 *  @return int      		   	 <0 if KO, Id of created object if OK
+	 */
+	function create($user, $notrigger=0)
+	{
+		global $conf, $langs;
 		$error=0;
 
 		// Clean parameters
@@ -85,7 +85,7 @@ 
 		// Check parameters
 		// Put here code to add control on parameters values
 
-        // Insert request
+		// Insert request
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."propal_merge_pdf_product(";
 
 		$sql.= "fk_product,";
@@ -98,7 +98,7 @@ 
 		$sql.= "datec";
 
 
-        $sql.= ") VALUES (";
+		$sql.= ") VALUES (";
 
 		$sql.= " ".(! isset($this->fk_product)?'NULL':"'".$this->db->escape($this->fk_product)."'").",";
 		$sql.= " ".(! isset($this->file_name)?'NULL':"'".$this->db->escape($this->file_name)."'").",";
@@ -115,34 +115,34 @@ 
 		$this->db->begin();
 
 	   	dol_syslog(get_class($this)."::".__METHOD__, LOG_DEBUG);
-        $resql=$this->db->query($sql);
-    	if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+		$resql=$this->db->query($sql);
+		if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
 
 		if (! $error)
-        {
-            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."propal_merge_pdf_product");
+		{
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."propal_merge_pdf_product");
 
 			if (! $notrigger)
 			{
-	            // Uncomment this and change MYOBJECT to your own tag if you
-	            // want this action calls a trigger.
-
-	            //// Call triggers
-	            //include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-	            //$interface=new Interfaces($this->db);
-	            //$result=$interface->run_triggers('MYOBJECT_CREATE',$this,$user,$langs,$conf);
-	            //if ($result < 0) { $error++; $this->errors=$interface->errors; }
-	            //// End call triggers
+				// Uncomment this and change MYOBJECT to your own tag if you
+				// want this action calls a trigger.
+
+				//// Call triggers
+				//include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+				//$interface=new Interfaces($this->db);
+				//$result=$interface->run_triggers('MYOBJECT_CREATE',$this,$user,$langs,$conf);
+				//if ($result < 0) { $error++; $this->errors=$interface->errors; }
+				//// End call triggers
 			}
-        }
+		}
 
-        // Commit or rollback
-        if ($error)
+		// Commit or rollback
+		if ($error)
 		{
 			foreach($this->errors as $errmsg)
 			{
-	            dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
-	            $this->error.=($this->error?', '.$errmsg:$errmsg);
+				dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
+				$this->error.=($this->error?', '.$errmsg:$errmsg);
 			}
 			$this->db->rollback();
 			return -1*$error;
@@ -150,22 +150,22 @@ 
 		else
 		{
 			$this->db->commit();
-            return $this->id;
+			return $this->id;
 		}
-    }
+	}
 
 
-    /**
-     *  Load object in memory from the database
-     *
-     *  @param	int		$id    Id object
-     *  @return int          	<0 if KO, >0 if OK
-     */
-    function fetch($id)
-    {
-    	global $langs,$conf;
+	/**
+	 *  Load object in memory from the database
+	 *
+	 *  @param	int		$id    Id object
+	 *  @return int          	<0 if KO, >0 if OK
+	 */
+	function fetch($id)
+	{
+		global $langs,$conf;
 
-        $sql = "SELECT";
+		$sql = "SELECT";
 		$sql.= " t.rowid,";
 
 		$sql.= " t.fk_product,";
@@ -178,18 +178,18 @@ 
 		$sql.= " t.import_key";
 
 
-        $sql.= " FROM ".MAIN_DB_PREFIX."propal_merge_pdf_product as t";
-        $sql.= " WHERE t.rowid = ".$id;
+		$sql.= " FROM ".MAIN_DB_PREFIX."propal_merge_pdf_product as t";
+		$sql.= " WHERE t.rowid = ".$id;
 
-    	dol_syslog(get_class($this)."::".__METHOD__, LOG_DEBUG);
-        $resql=$this->db->query($sql);
-        if ($resql)
-        {
-            if ($this->db->num_rows($resql))
-            {
-                $obj = $this->db->fetch_object($resql);
+		dol_syslog(get_class($this)."::".__METHOD__, 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->id    = $obj->rowid;
 
 				$this->fk_product = $obj->fk_product;
 				$this->file_name = $obj->file_name;
@@ -203,107 +203,107 @@ 
 				$this->import_key = $obj->import_key;
 
 
-            }
-            $this->db->free($resql);
-
-            return 1;
-        }
-        else
-        {
-      	    $this->error="Error ".$this->db->lasterror();
-            dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR);
-            return -1;
-        }
-    }
-
-    /**
-     *  Load object in memory from the database
-     *
-     *  @param	int		$product_id    	Id object
-     *  @param	string	$lang  			Lang string code
-     *  @return int          	<0 if KO, >0 if OK
-     */
-    function fetch_by_product($product_id, $lang='')
-    {
-    	global $langs,$conf;
-
-    	$sql = "SELECT";
-    	$sql.= " t.rowid,";
-
-    	$sql.= " t.fk_product,";
-    	$sql.= " t.file_name,";
-    	$sql.= " t.lang,";
-    	$sql.= " t.fk_user_author,";
-    	$sql.= " t.fk_user_mod,";
-    	$sql.= " t.datec,";
-    	$sql.= " t.tms,";
-    	$sql.= " t.import_key";
-
-
-    	$sql.= " FROM ".MAIN_DB_PREFIX."propal_merge_pdf_product as t";
-    	$sql.= " WHERE t.fk_product = ".$product_id;
-    	if ($conf->global->MAIN_MULTILANGS && !empty($lang)) {
-    		$sql.= " AND t.lang = '".$lang."'";
-    	}
-
-    	dol_syslog(get_class($this)."::".__METHOD__, LOG_DEBUG);
-    	$resql=$this->db->query($sql);
-    	if ($resql)
-    	{
-    		if ($this->db->num_rows($resql))
-    		{
-    			while($obj = $this->db->fetch_object($resql)) {
-
-    				$line = new PropalmergepdfproductLine();
-
-	    			$line->id    = $obj->rowid;
-
-	    			$line->fk_product = $obj->fk_product;
-	    			$line->file_name = $obj->file_name;
-	    			if ($conf->global->MAIN_MULTILANGS) {
-	    				$line->lang = $obj->lang;
-	    			}
-	    			$line->fk_user_author = $obj->fk_user_author;
-	    			$line->fk_user_mod = $obj->fk_user_mod;
-	    			$line->datec = $this->db->jdate($obj->datec);
-	    			$line->tms = $this->db->jdate($obj->tms);
-	    			$line->import_key = $obj->import_key;
-
-
-	    			if ($conf->global->MAIN_MULTILANGS) {
-	    				$this->lines[$obj->file_name.'_'.$obj->lang]=$line;
-	    			}else {
-	    				$this->lines[$obj->file_name]=$line;
-	    			}
-
-
-    			}
-
-
-    		}
-    		$this->db->free($resql);
-
-    		return 1;
-    	}
-    	else
-    	{
-    		$this->error="Error ".$this->db->lasterror();
-    		dol_syslog(get_class($this)."::fetch_by_product ".$this->error, LOG_ERR);
-    		return -1;
-    	}
-    }
-
-
-    /**
-     *  Update object into database
-     *
-     *  @param	User	$user        User that modifies
-     *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
-     *  @return int     		   	 <0 if KO, >0 if OK
-     */
-    function update($user=0, $notrigger=0)
-    {
-    	global $conf, $langs;
+			}
+			$this->db->free($resql);
+
+			return 1;
+		}
+		else
+		{
+	  		$this->error="Error ".$this->db->lasterror();
+			dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR);
+			return -1;
+		}
+	}
+
+	/**
+	 *  Load object in memory from the database
+	 *
+	 *  @param	int		$product_id    	Id object
+	 *  @param	string	$lang  			Lang string code
+	 *  @return int          	<0 if KO, >0 if OK
+	 */
+	function fetch_by_product($product_id, $lang='')
+	{
+		global $langs,$conf;
+
+		$sql = "SELECT";
+		$sql.= " t.rowid,";
+
+		$sql.= " t.fk_product,";
+		$sql.= " t.file_name,";
+		$sql.= " t.lang,";
+		$sql.= " t.fk_user_author,";
+		$sql.= " t.fk_user_mod,";
+		$sql.= " t.datec,";
+		$sql.= " t.tms,";
+		$sql.= " t.import_key";
+
+
+		$sql.= " FROM ".MAIN_DB_PREFIX."propal_merge_pdf_product as t";
+		$sql.= " WHERE t.fk_product = ".$product_id;
+		if ($conf->global->MAIN_MULTILANGS && !empty($lang)) {
+			$sql.= " AND t.lang = '".$lang."'";
+		}
+
+		dol_syslog(get_class($this)."::".__METHOD__, LOG_DEBUG);
+		$resql=$this->db->query($sql);
+		if ($resql)
+		{
+			if ($this->db->num_rows($resql))
+			{
+				while($obj = $this->db->fetch_object($resql)) {
+
+					$line = new PropalmergepdfproductLine();
+
+					$line->id    = $obj->rowid;
+
+					$line->fk_product = $obj->fk_product;
+					$line->file_name = $obj->file_name;
+					if ($conf->global->MAIN_MULTILANGS) {
+						$line->lang = $obj->lang;
+					}
+					$line->fk_user_author = $obj->fk_user_author;
+					$line->fk_user_mod = $obj->fk_user_mod;
+					$line->datec = $this->db->jdate($obj->datec);
+					$line->tms = $this->db->jdate($obj->tms);
+					$line->import_key = $obj->import_key;
+
+
+					if ($conf->global->MAIN_MULTILANGS) {
+						$this->lines[$obj->file_name.'_'.$obj->lang]=$line;
+					}else {
+						$this->lines[$obj->file_name]=$line;
+					}
+
+
+				}
+
+
+			}
+			$this->db->free($resql);
+
+			return 1;
+		}
+		else
+		{
+			$this->error="Error ".$this->db->lasterror();
+			dol_syslog(get_class($this)."::fetch_by_product ".$this->error, LOG_ERR);
+			return -1;
+		}
+	}
+
+
+	/**
+	 *  Update object into database
+	 *
+	 *  @param	User	$user        User that modifies
+	 *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
+	 *  @return int     		   	 <0 if KO, >0 if OK
+	 */
+	function update($user=0, $notrigger=0)
+	{
+		global $conf, $langs;
 		$error=0;
 
 		// Clean parameters
@@ -319,8 +319,8 @@ 
 		// Check parameters
 		// Put here code to add a control on parameters values
 
-        // Update request
-        $sql = "UPDATE ".MAIN_DB_PREFIX."propal_merge_pdf_product SET";
+		// Update request
+		$sql = "UPDATE ".MAIN_DB_PREFIX."propal_merge_pdf_product SET";
 
 		$sql.= " fk_product=".(isset($this->fk_product)?$this->fk_product:"null").",";
 		$sql.= " file_name=".(isset($this->file_name)?"'".$this->db->escape($this->file_name)."'":"null").",";
@@ -330,37 +330,37 @@ 
 		$sql.= " fk_user_mod=".$user->id;
 
 
-        $sql.= " WHERE rowid=".$this->id;
+		$sql.= " WHERE rowid=".$this->id;
 
 		$this->db->begin();
 
 		dol_syslog(get_class($this)."::".__METHOD__, LOG_DEBUG);
-        $resql = $this->db->query($sql);
-    	if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+		$resql = $this->db->query($sql);
+		if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
 
 		if (! $error)
 		{
 			if (! $notrigger)
 			{
-	            // Uncomment this and change MYOBJECT to your own tag if you
-	            // want this action calls a trigger.
-
-	            //// Call triggers
-	            //include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-	            //$interface=new Interfaces($this->db);
-	            //$result=$interface->run_triggers('MYOBJECT_MODIFY',$this,$user,$langs,$conf);
-	            //if ($result < 0) { $error++; $this->errors=$interface->errors; }
-	            //// End call triggers
-	    	}
+				// Uncomment this and change MYOBJECT to your own tag if you
+				// want this action calls a trigger.
+
+				//// Call triggers
+				//include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+				//$interface=new Interfaces($this->db);
+				//$result=$interface->run_triggers('MYOBJECT_MODIFY',$this,$user,$langs,$conf);
+				//if ($result < 0) { $error++; $this->errors=$interface->errors; }
+				//// End call triggers
+			}
 		}
 
-        // Commit or rollback
+		// Commit or rollback
 		if ($error)
 		{
 			foreach($this->errors as $errmsg)
 			{
-	            dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
-	            $this->error.=($this->error?', '.$errmsg:$errmsg);
+				dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
+				$this->error.=($this->error?', '.$errmsg:$errmsg);
 			}
 			$this->db->rollback();
 			return -1*$error;
@@ -370,16 +370,16 @@ 
 			$this->db->commit();
 			return 1;
 		}
-    }
+	}
 
 
  	/**
-	 *  Delete object in database
-	 *
-     *	@param  User	$user        User that deletes
-     *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
-	 *  @return	int					 <0 if KO, >0 if OK
-	 */
+ 	 *  Delete object in database
+ 	 *
+ 	 *	@param  User	$user        User that deletes
+ 	 *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
+ 	 *  @return	int					 <0 if KO, >0 if OK
+ 	 */
 	function delete($user, $notrigger=0)
 	{
 		global $conf, $langs;
@@ -392,34 +392,34 @@ 
 			if (! $notrigger)
 			{
 				// Uncomment this and change MYOBJECT to your own tag if you
-		        // want this action calls a trigger.
-
-		        //// Call triggers
-		        //include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-		        //$interface=new Interfaces($this->db);
-		        //$result=$interface->run_triggers('MYOBJECT_DELETE',$this,$user,$langs,$conf);
-		        //if ($result < 0) { $error++; $this->errors=$interface->errors; }
-		        //// End call triggers
+				// want this action calls a trigger.
+
+				//// Call triggers
+				//include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+				//$interface=new Interfaces($this->db);
+				//$result=$interface->run_triggers('MYOBJECT_DELETE',$this,$user,$langs,$conf);
+				//if ($result < 0) { $error++; $this->errors=$interface->errors; }
+				//// End call triggers
 			}
 		}
 
 		if (! $error)
 		{
-    		$sql = "DELETE FROM ".MAIN_DB_PREFIX."propal_merge_pdf_product";
-    		$sql.= " WHERE rowid=".$this->id;
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX."propal_merge_pdf_product";
+			$sql.= " WHERE rowid=".$this->id;
 
-    		dol_syslog(get_class($this)."::".__METHOD__, LOG_DEBUG);
-    		$resql = $this->db->query($sql);
-        	if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+			dol_syslog(get_class($this)."::".__METHOD__, LOG_DEBUG);
+			$resql = $this->db->query($sql);
+			if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
 		}
 
-        // Commit or rollback
+		// Commit or rollback
 		if ($error)
 		{
 			foreach($this->errors as $errmsg)
 			{
-	            dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
-	            $this->error.=($this->error?', '.$errmsg:$errmsg);
+				dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
+				$this->error.=($this->error?', '.$errmsg:$errmsg);
 			}
 			$this->db->rollback();
 			return -1*$error;

Spacing +136 added lines, -136 removed lines

@@ -31,18 +31,18 @@ 
  */
 class Propalmergepdfproduct extends CommonObject
 {
-	var $element='propal_merge_pdf_product';			//!< Id that identify managed objects
-	var $table_element='propal_merge_pdf_product';		//!< Name of table without prefix where object is stored
+	var $element = 'propal_merge_pdf_product'; //!< Id that identify managed objects
+	var $table_element = 'propal_merge_pdf_product'; //!< Name of table without prefix where object is stored
 
 	var $fk_product;
 	var $file_name;
 	var $fk_user_author;
 	var $fk_user_mod;
-	var $datec='';
-	var $tms='';
+	var $datec = '';
+	var $tms = '';
 	var $lang;
 
-	var $lines=array();
+	var $lines = array();
 
 
 
@@ -66,19 +66,19 @@ 
      *  @param  int		$notrigger   0=launch triggers after, 1=disable triggers
      *  @return int      		   	 <0 if KO, Id of created object if OK
      */
-    function create($user, $notrigger=0)
+    function create($user, $notrigger = 0)
     {
     	global $conf, $langs;
-		$error=0;
+		$error = 0;
 
 		// Clean parameters
 
-		if (isset($this->fk_product)) $this->fk_product=trim($this->fk_product);
-		if (isset($this->file_name)) $this->file_name=trim($this->file_name);
-		if (isset($this->fk_user_author)) $this->fk_user_author=trim($this->fk_user_author);
-		if (isset($this->fk_user_mod)) $this->fk_user_mod=trim($this->fk_user_mod);
-		if (isset($this->lang)) $this->lang=trim($this->lang);
-		if (isset($this->import_key)) $this->import_key=trim($this->import_key);
+		if (isset($this->fk_product)) $this->fk_product = trim($this->fk_product);
+		if (isset($this->file_name)) $this->file_name = trim($this->file_name);
+		if (isset($this->fk_user_author)) $this->fk_user_author = trim($this->fk_user_author);
+		if (isset($this->fk_user_mod)) $this->fk_user_mod = trim($this->fk_user_mod);
+		if (isset($this->lang)) $this->lang = trim($this->lang);
+		if (isset($this->import_key)) $this->import_key = trim($this->import_key);
 
 
 
@@ -88,41 +88,41 @@ 
         // Insert request
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."propal_merge_pdf_product(";
 
-		$sql.= "fk_product,";
-		$sql.= "file_name,";
+		$sql .= "fk_product,";
+		$sql .= "file_name,";
 		if ($conf->global->MAIN_MULTILANGS) {
-			$sql.= "lang,";
+			$sql .= "lang,";
 		}
-		$sql.= "fk_user_author,";
-		$sql.= "fk_user_mod,";
-		$sql.= "datec";
+		$sql .= "fk_user_author,";
+		$sql .= "fk_user_mod,";
+		$sql .= "datec";
 
 
-        $sql.= ") VALUES (";
+        $sql .= ") VALUES (";
 
-		$sql.= " ".(! isset($this->fk_product)?'NULL':"'".$this->db->escape($this->fk_product)."'").",";
-		$sql.= " ".(! isset($this->file_name)?'NULL':"'".$this->db->escape($this->file_name)."'").",";
+		$sql .= " ".(!isset($this->fk_product) ? 'NULL' : "'".$this->db->escape($this->fk_product)."'").",";
+		$sql .= " ".(!isset($this->file_name) ? 'NULL' : "'".$this->db->escape($this->file_name)."'").",";
 		if ($conf->global->MAIN_MULTILANGS) {
-			$sql.= " ".(! isset($this->lang)?'NULL':"'".$this->db->escape($this->lang)."'").",";
+			$sql .= " ".(!isset($this->lang) ? 'NULL' : "'".$this->db->escape($this->lang)."'").",";
 		}
-		$sql.= " ".$user->id.",";
-		$sql.= " ".$user->id.",";
-		$sql.= " '".$this->db->idate(dol_now())."'";
+		$sql .= " ".$user->id.",";
+		$sql .= " ".$user->id.",";
+		$sql .= " '".$this->db->idate(dol_now())."'";
 
 
-		$sql.= ")";
+		$sql .= ")";
 
 		$this->db->begin();
 
 	   	dol_syslog(get_class($this)."::".__METHOD__, LOG_DEBUG);
-        $resql=$this->db->query($sql);
-    	if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+        $resql = $this->db->query($sql);
+    	if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
-		if (! $error)
+		if (!$error)
         {
             $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."propal_merge_pdf_product");
 
-			if (! $notrigger)
+			if (!$notrigger)
 			{
 	            // Uncomment this and change MYOBJECT to your own tag if you
 	            // want this action calls a trigger.
@@ -139,13 +139,13 @@ 
         // Commit or rollback
         if ($error)
 		{
-			foreach($this->errors as $errmsg)
+			foreach ($this->errors as $errmsg)
 			{
 	            dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
-	            $this->error.=($this->error?', '.$errmsg:$errmsg);
+	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
-			return -1*$error;
+			return -1 * $error;
 		}
 		else
 		{
@@ -163,33 +163,33 @@ 
      */
     function fetch($id)
     {
-    	global $langs,$conf;
+    	global $langs, $conf;
 
         $sql = "SELECT";
-		$sql.= " t.rowid,";
+		$sql .= " t.rowid,";
 
-		$sql.= " t.fk_product,";
-		$sql.= " t.file_name,";
-		$sql.= " t.lang,";
-		$sql.= " t.fk_user_author,";
-		$sql.= " t.fk_user_mod,";
-		$sql.= " t.datec,";
-		$sql.= " t.tms,";
-		$sql.= " t.import_key";
+		$sql .= " t.fk_product,";
+		$sql .= " t.file_name,";
+		$sql .= " t.lang,";
+		$sql .= " t.fk_user_author,";
+		$sql .= " t.fk_user_mod,";
+		$sql .= " t.datec,";
+		$sql .= " t.tms,";
+		$sql .= " t.import_key";
 
 
-        $sql.= " FROM ".MAIN_DB_PREFIX."propal_merge_pdf_product as t";
-        $sql.= " WHERE t.rowid = ".$id;
+        $sql .= " FROM ".MAIN_DB_PREFIX."propal_merge_pdf_product as t";
+        $sql .= " WHERE t.rowid = ".$id;
 
     	dol_syslog(get_class($this)."::".__METHOD__, 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->fk_product = $obj->fk_product;
 				$this->file_name = $obj->file_name;
@@ -210,7 +210,7 @@ 
         }
         else
         {
-      	    $this->error="Error ".$this->db->lasterror();
+      	    $this->error = "Error ".$this->db->lasterror();
             dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR);
             return -1;
         }
@@ -223,40 +223,40 @@ 
      *  @param	string	$lang  			Lang string code
      *  @return int          	<0 if KO, >0 if OK
      */
-    function fetch_by_product($product_id, $lang='')
+    function fetch_by_product($product_id, $lang = '')
     {
-    	global $langs,$conf;
+    	global $langs, $conf;
 
     	$sql = "SELECT";
-    	$sql.= " t.rowid,";
+    	$sql .= " t.rowid,";
 
-    	$sql.= " t.fk_product,";
-    	$sql.= " t.file_name,";
-    	$sql.= " t.lang,";
-    	$sql.= " t.fk_user_author,";
-    	$sql.= " t.fk_user_mod,";
-    	$sql.= " t.datec,";
-    	$sql.= " t.tms,";
-    	$sql.= " t.import_key";
+    	$sql .= " t.fk_product,";
+    	$sql .= " t.file_name,";
+    	$sql .= " t.lang,";
+    	$sql .= " t.fk_user_author,";
+    	$sql .= " t.fk_user_mod,";
+    	$sql .= " t.datec,";
+    	$sql .= " t.tms,";
+    	$sql .= " t.import_key";
 
 
-    	$sql.= " FROM ".MAIN_DB_PREFIX."propal_merge_pdf_product as t";
-    	$sql.= " WHERE t.fk_product = ".$product_id;
+    	$sql .= " FROM ".MAIN_DB_PREFIX."propal_merge_pdf_product as t";
+    	$sql .= " WHERE t.fk_product = ".$product_id;
     	if ($conf->global->MAIN_MULTILANGS && !empty($lang)) {
-    		$sql.= " AND t.lang = '".$lang."'";
+    		$sql .= " AND t.lang = '".$lang."'";
     	}
 
     	dol_syslog(get_class($this)."::".__METHOD__, LOG_DEBUG);
-    	$resql=$this->db->query($sql);
+    	$resql = $this->db->query($sql);
     	if ($resql)
     	{
     		if ($this->db->num_rows($resql))
     		{
-    			while($obj = $this->db->fetch_object($resql)) {
+    			while ($obj = $this->db->fetch_object($resql)) {
 
     				$line = new PropalmergepdfproductLine();
 
-	    			$line->id    = $obj->rowid;
+	    			$line->id = $obj->rowid;
 
 	    			$line->fk_product = $obj->fk_product;
 	    			$line->file_name = $obj->file_name;
@@ -271,9 +271,9 @@ 
 
 
 	    			if ($conf->global->MAIN_MULTILANGS) {
-	    				$this->lines[$obj->file_name.'_'.$obj->lang]=$line;
-	    			}else {
-	    				$this->lines[$obj->file_name]=$line;
+	    				$this->lines[$obj->file_name.'_'.$obj->lang] = $line;
+	    			} else {
+	    				$this->lines[$obj->file_name] = $line;
 	    			}
 
 
@@ -287,7 +287,7 @@ 
     	}
     	else
     	{
-    		$this->error="Error ".$this->db->lasterror();
+    		$this->error = "Error ".$this->db->lasterror();
     		dol_syslog(get_class($this)."::fetch_by_product ".$this->error, LOG_ERR);
     		return -1;
     	}
@@ -301,17 +301,17 @@ 
      *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
      *  @return int     		   	 <0 if KO, >0 if OK
      */
-    function update($user=0, $notrigger=0)
+    function update($user = 0, $notrigger = 0)
     {
     	global $conf, $langs;
-		$error=0;
+		$error = 0;
 
 		// Clean parameters
 
-		if (isset($this->fk_product)) $this->fk_product=trim($this->fk_product);
-		if (isset($this->file_name)) $this->file_name=trim($this->file_name);
-		if (isset($this->fk_user_mod)) $this->fk_user_mod=trim($this->fk_user_mod);
-		if (isset($this->lang)) $this->lang=trim($this->lang);
+		if (isset($this->fk_product)) $this->fk_product = trim($this->fk_product);
+		if (isset($this->file_name)) $this->file_name = trim($this->file_name);
+		if (isset($this->fk_user_mod)) $this->fk_user_mod = trim($this->fk_user_mod);
+		if (isset($this->lang)) $this->lang = trim($this->lang);
 
 
 
@@ -322,25 +322,25 @@ 
         // Update request
         $sql = "UPDATE ".MAIN_DB_PREFIX."propal_merge_pdf_product SET";
 
-		$sql.= " fk_product=".(isset($this->fk_product)?$this->fk_product:"null").",";
-		$sql.= " file_name=".(isset($this->file_name)?"'".$this->db->escape($this->file_name)."'":"null").",";
+		$sql .= " fk_product=".(isset($this->fk_product) ? $this->fk_product : "null").",";
+		$sql .= " file_name=".(isset($this->file_name) ? "'".$this->db->escape($this->file_name)."'" : "null").",";
 		if ($conf->global->MAIN_MULTILANGS) {
-			$sql.= " lang=".(isset($this->lang)?"'".$this->db->escape($this->lang)."'":"null").",";
+			$sql .= " lang=".(isset($this->lang) ? "'".$this->db->escape($this->lang)."'" : "null").",";
 		}
-		$sql.= " fk_user_mod=".$user->id;
+		$sql .= " fk_user_mod=".$user->id;
 
 
-        $sql.= " WHERE rowid=".$this->id;
+        $sql .= " WHERE rowid=".$this->id;
 
 		$this->db->begin();
 
 		dol_syslog(get_class($this)."::".__METHOD__, LOG_DEBUG);
         $resql = $this->db->query($sql);
-    	if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+    	if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
-		if (! $error)
+		if (!$error)
 		{
-			if (! $notrigger)
+			if (!$notrigger)
 			{
 	            // Uncomment this and change MYOBJECT to your own tag if you
 	            // want this action calls a trigger.
@@ -357,13 +357,13 @@ 
         // Commit or rollback
 		if ($error)
 		{
-			foreach($this->errors as $errmsg)
+			foreach ($this->errors as $errmsg)
 			{
 	            dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
-	            $this->error.=($this->error?', '.$errmsg:$errmsg);
+	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
-			return -1*$error;
+			return -1 * $error;
 		}
 		else
 		{
@@ -380,16 +380,16 @@ 
      *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
 	 *  @return	int					 <0 if KO, >0 if OK
 	 */
-	function delete($user, $notrigger=0)
+	function delete($user, $notrigger = 0)
 	{
 		global $conf, $langs;
-		$error=0;
+		$error = 0;
 
 		$this->db->begin();
 
-		if (! $error)
+		if (!$error)
 		{
-			if (! $notrigger)
+			if (!$notrigger)
 			{
 				// Uncomment this and change MYOBJECT to your own tag if you
 		        // want this action calls a trigger.
@@ -403,26 +403,26 @@ 
 			}
 		}
 
-		if (! $error)
+		if (!$error)
 		{
     		$sql = "DELETE FROM ".MAIN_DB_PREFIX."propal_merge_pdf_product";
-    		$sql.= " WHERE rowid=".$this->id;
+    		$sql .= " WHERE rowid=".$this->id;
 
     		dol_syslog(get_class($this)."::".__METHOD__, LOG_DEBUG);
     		$resql = $this->db->query($sql);
-        	if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+        	if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 		}
 
         // Commit or rollback
 		if ($error)
 		{
-			foreach($this->errors as $errmsg)
+			foreach ($this->errors as $errmsg)
 			{
 	            dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
-	            $this->error.=($this->error?', '.$errmsg:$errmsg);
+	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
-			return -1*$error;
+			return -1 * $error;
 		}
 		else
 		{
@@ -440,16 +440,16 @@ 
 	 *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
 	 *  @return	int					 <0 if KO, >0 if OK
 	 */
-	function delete_by_product($user, $product_id, $lang_id='',  $notrigger=0)
+	function delete_by_product($user, $product_id, $lang_id = '', $notrigger = 0)
 	{
 		global $conf, $langs;
-		$error=0;
+		$error = 0;
 
 		$this->db->begin();
 
-		if (! $error)
+		if (!$error)
 		{
-			if (! $notrigger)
+			if (!$notrigger)
 			{
 				// Uncomment this and change MYOBJECT to your own tag if you
 				// want this action calls a trigger.
@@ -463,30 +463,30 @@ 
 			}
 		}
 
-		if (! $error)
+		if (!$error)
 		{
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."propal_merge_pdf_product";
-			$sql.= " WHERE fk_product=".$product_id;
+			$sql .= " WHERE fk_product=".$product_id;
 
 			if ($conf->global->MAIN_MULTILANGS && !empty($lang_id)) {
-				$sql.= " AND lang='".$lang_id."'";
+				$sql .= " AND lang='".$lang_id."'";
 			}
 
 			dol_syslog(get_class($this)."::".__METHOD__, LOG_DEBUG);
 			$resql = $this->db->query($sql);
-			if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+			if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 		}
 
 		// Commit or rollback
 		if ($error)
 		{
-			foreach($this->errors as $errmsg)
+			foreach ($this->errors as $errmsg)
 			{
 				dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
-				$this->error.=($this->error?', '.$errmsg:$errmsg);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
-			return -1*$error;
+			return -1 * $error;
 		}
 		else
 		{
@@ -504,13 +504,13 @@ 
 	function delete_by_file($user)
 	{
 		global $conf, $langs;
-		$error=0;
+		$error = 0;
 
 		$this->db->begin();
 
-		if (! $error)
+		if (!$error)
 		{
-			if (! $notrigger)
+			if (!$notrigger)
 			{
 				// Uncomment this and change MYOBJECT to your own tag if you
 				// want this action calls a trigger.
@@ -524,26 +524,26 @@ 
 			}
 		}
 
-		if (! $error)
+		if (!$error)
 		{
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."propal_merge_pdf_product";
-			$sql.= " WHERE fk_product=".$this->fk_product." AND file_name='".$this->db->escape($this->file_name)."'";
+			$sql .= " WHERE fk_product=".$this->fk_product." AND file_name='".$this->db->escape($this->file_name)."'";
 
 			dol_syslog(get_class($this)."::".__METHOD__, LOG_DEBUG);
 			$resql = $this->db->query($sql);
-			if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+			if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 		}
 
 		// Commit or rollback
 		if ($error)
 		{
-			foreach($this->errors as $errmsg)
+			foreach ($this->errors as $errmsg)
 			{
 				dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
-				$this->error.=($this->error?', '.$errmsg:$errmsg);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
-			return -1*$error;
+			return -1 * $error;
 		}
 		else
 		{
@@ -562,40 +562,40 @@ 
 	 */
 	function createFromClone($fromid)
 	{
-		global $user,$langs;
+		global $user, $langs;
 
-		$error=0;
+		$error = 0;
 
-		$object=new Propalmergepdfproduct($this->db);
+		$object = new Propalmergepdfproduct($this->db);
 
 		$this->db->begin();
 
 		// Load source object
 		$object->fetch($fromid);
-		$object->id=0;
-		$object->statut=0;
+		$object->id = 0;
+		$object->statut = 0;
 
 		// Clear fields
 		// ...
 
 		// Create clone
-		$result=$object->create($user);
+		$result = $object->create($user);
 
 		// Other options
 		if ($result < 0)
 		{
-			$this->error=$object->error;
+			$this->error = $object->error;
 			$error++;
 		}
 
-		if (! $error)
+		if (!$error)
 		{
 
 
 		}
 
 		// End
-		if (! $error)
+		if (!$error)
 		{
 			$this->db->commit();
 			return $object->id;
@@ -616,15 +616,15 @@ 
 	 */
 	function initAsSpecimen()
 	{
-		$this->id=0;
+		$this->id = 0;
 
-		$this->fk_product='';
-		$this->file_name='';
-		$this->fk_user_author='';
-		$this->fk_user_mod='';
-		$this->datec='';
-		$this->tms='';
-		$this->import_key='';
+		$this->fk_product = '';
+		$this->file_name = '';
+		$this->fk_user_author = '';
+		$this->fk_user_mod = '';
+		$this->datec = '';
+		$this->tms = '';
+		$this->import_key = '';
 
 
 	}
@@ -643,8 +643,8 @@ 
 	var $lang;
 	var $fk_user_author;
 	var $fk_user_mod;
-	var $datec='';
-	var $tms='';
+	var $datec = '';
+	var $tms = '';
 	var $import_key;
 
 	function __construct() {

htdocs/product/dynamic_price/class/price_global_variable_updater.class.php

Doc Comments +3 added lines, -3 removed lines

@@ -168,7 +168,7 @@ 
     /**
      *  Update object into database
      *
-     *  @param	User	$user        User that modifies
+     *  @param	integer	$user        User that modifies
      *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
      *  @return int     		   	 <0 if KO, >0 if OK
      */
@@ -539,7 +539,7 @@ 
      *  Update next_update into database
      *
      *  @param	string	$next_update Next update to write
-     *  @param	User	$user        User that modifies
+     *  @param	integer	$user        User that modifies
      *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
      *  @return int     		   	 <0 if KO, >0 if OK
      */
@@ -583,7 +583,7 @@ 
      *  Update last_status into database
      *
      *  @param	string	$last_status Status to write
-     *  @param	User	$user        User that modifies
+     *  @param	integer	$user        User that modifies
      *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
      *  @return int     		   	 <0 if KO, >0 if OK
      */

Indentation +587 added lines, -587 removed lines

@@ -29,591 +29,591 @@
  */
 class PriceGlobalVariableUpdater
 {
-    var $db;							//!< To store db handler
-    var $error;							//!< To return error code (or message)
-    var $errors=array();				//!< To return several error codes (or messages)
-    var $types=array(0, 1);				//!< Updater types
-    var $update_min = 5;				//!< Minimal update rate
-    var $id;
-    var $type;
-    var $description;
-    var $parameters;
-    var $fk_variable;
-    var $update_interval;				//!< Interval in mins
-    var $next_update;					//!< Next update timestamp
-    var $last_status;
-    public $table_element = "c_price_global_variable_updater";
-
-    /**
-     *  Constructor
-     *
-     *  @param	DoliDb		$db      Database handler
-     */
-    function __construct($db)
-    {
-        $this->db = $db;
-        return 1;
-    }
-
-
-    /**
-     *  Create object into database
-     *
-     *  @param	User	$user        User that creates
-     *  @param  int		$notrigger   0=launch triggers after, 1=disable triggers
-     *  @return int      		   	 <0 if KO, Id of created object if OK
-     */
-    function create($user, $notrigger=0)
-    {
-        $error=0;
-
-        $this->checkParameters();
-
-        // Insert request
-        $sql = "INSERT INTO ".MAIN_DB_PREFIX.$this->table_element." (";
-        $sql.= "type, description, parameters, fk_variable, update_interval, next_update, last_status";
-        $sql.= ") VALUES (";
-        $sql.= " ".$this->type.",";
-        $sql.= " ".(isset($this->description)?"'".$this->db->escape($this->description)."'":"''").",";
-        $sql.= " ".(isset($this->parameters)?"'".$this->db->escape($this->parameters)."'":"''").",";
-        $sql.= " ".$this->fk_variable.",";
-        $sql.= " ".$this->update_interval.",";
-        $sql.= " ".$this->next_update.",";
-        $sql.= " ".(isset($this->last_status)?"'".$this->db->escape($this->last_status)."'":"''");
-        $sql.= ")";
-
-        $this->db->begin();
-
-        dol_syslog(get_class($this)."::create", LOG_DEBUG);
-        $resql=$this->db->query($sql);
-        if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
-
-        if (! $error)
-        {
-            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
-
-            if (! $notrigger)
-            {
-                // Uncomment this and change MYOBJECT to your own tag if you
-                // want this action calls a trigger.
-
-                //// Call triggers
-                //$result=$this->call_trigger('MYOBJECT_CREATE',$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)
-        {
-            foreach($this->errors as $errmsg)
-            {
-                dol_syslog(__METHOD__." ".$errmsg, LOG_ERR);
-                $this->error.=($this->error?', '.$errmsg:$errmsg);
-            }
-            $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
-     *  @return		int			    < 0 if KO, 0 if OK but not found, > 0 if OK
-     */
-    function fetch($id)
-    {
-        $sql = "SELECT type, description, parameters, fk_variable, update_interval, next_update, last_status";
-        $sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element;
-        $sql.= " WHERE rowid = ".$id;
-
-        dol_syslog(get_class($this)."::fetch");
-        $resql=$this->db->query($sql);
-        if ($resql)
-        {
-            $obj = $this->db->fetch_object($resql);
-            if ($obj)
-            {
-                $this->id				= $id;
-                $this->type				= $obj->type;
-                $this->description		= $obj->description;
-                $this->parameters		= $obj->parameters;
-                $this->fk_variable		= $obj->fk_variable;
-                $this->update_interval	= $obj->update_interval;
-                $this->next_update		= $obj->next_update;
-                $this->last_status		= $obj->last_status;
-                $this->checkParameters();
-                return 1;
-            }
-            else
-            {
-                return 0;
-            }
-        }
-        else
-        {
-            $this->error="Error ".$this->db->lasterror();
-            return -1;
-        }
-    }
-
-    /**
-     *  Update object into database
-     *
-     *  @param	User	$user        User that modifies
-     *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
-     *  @return int     		   	 <0 if KO, >0 if OK
-     */
-    function update($user=0, $notrigger=0)
-    {
-        $error=0;
-
-        $this->checkParameters();
-
-        // Update request
-        $sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
-        $sql.= " type = ".$this->type.",";
-        $sql.= " description = ".(isset($this->description)?"'".$this->db->escape($this->description)."'":"''").",";
-        $sql.= " parameters = ".(isset($this->parameters)?"'".$this->db->escape($this->parameters)."'":"''").",";
-        $sql.= " fk_variable = ".$this->fk_variable.",";
-        $sql.= " update_interval = ".$this->update_interval.",";
-        $sql.= " next_update = ".$this->next_update.",";
-        $sql.= " last_status = ".(isset($this->last_status)?"'".$this->db->escape($this->last_status)."'":"''");
-        $sql.= " WHERE rowid = ".$this->id;
-
-        $this->db->begin();
-
-        dol_syslog(get_class($this)."::update");
-        $resql = $this->db->query($sql);
-        if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
-
-        if (! $error)
-        {
-            if (! $notrigger)
-            {
-                // Uncomment this and change MYOBJECT to your own tag if you
-                // want this action calls a trigger.
-
-                //// 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)
-        {
-            foreach($this->errors as $errmsg)
-            {
-                dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
-                $this->error.=($this->error?', '.$errmsg:$errmsg);
-            }
-            $this->db->rollback();
-            return -1*$error;
-        }
-        else
-        {
-            $this->db->commit();
-            return 1;
-        }
-    }
-
-    /**
-     *  Delete object in database
-     *
-     * 	@param	int		$rowid		 Row id of global variable
-     *	@param  User	$user        User that deletes
-     *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
-     *  @return	int					 <0 if KO, >0 if OK
-     */
-    function delete($rowid, $user, $notrigger=0)
-    {
-        $error=0;
-
-        $this->db->begin();
-
-        if (! $error)
-        {
-            if (! $notrigger)
-            {
-                // Uncomment this and change MYOBJECT to your own tag if you
-                // want this action calls a trigger.
-
-                //// 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 (! $error)
-        {
-            $sql = "DELETE FROM ".MAIN_DB_PREFIX.$this->table_element;
-            $sql.= " WHERE rowid = ".$rowid;
-
-            dol_syslog(get_class($this)."::delete");
-            $resql = $this->db->query($sql);
-            if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
-        }
-
-        // Commit or rollback
-        if ($error)
-        {
-            foreach($this->errors as $errmsg)
-            {
-                dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
-                $this->error.=($this->error?', '.$errmsg:$errmsg);
-            }
-            $this->db->rollback();
-            return -1*$error;
-        }
-        else
-        {
-            $this->db->commit();
-            return 1;
-        }
-    }
-
-    /**
-     *	Initialise object with example values
-     *	Id must be 0 if object instance is a specimen
-     *
-     *	@return	void
-     */
-    function initAsSpecimen()
-    {
-        $this->id=0;
-        $this->type=0;
-        $this->description='';
-        $this->parameters='';
-        $this->fk_variable=0;
-        $this->update_interval=0;
-        $this->next_update=0;
-        $this->last_status='';
-    }
-
-    /**
-     *	Returns the last updated time in string html format, returns "never" if its less than 1
-     *
-     *	@return	string
-     */
-    function getLastUpdated()
-    {
-        global $langs;
-        $last = $this->next_update - ($this->update_interval * 60);
-        if ($last < 1) {
-            return $langs->trans("Never");
-        }
-        $status = empty($this->last_status) ? $langs->trans("CorrectlyUpdated") : $this->last_status;
-        return $status.'<br>'.dol_print_date($last, '%d/%m/%Y %H:%M:%S');
-    }
-
-    /**
-     *	Checks if all parameters are in order
-     *
-     *	@return	void
-     */
-    function checkParameters()
-    {
-        // Clean parameters
-        if (isset($this->description)) $this->description=trim($this->description);
-        if (isset($this->parameters)) $this->parameters=trim($this->parameters);
-        else $this->parameters="";
-        if (isset($this->last_status)) $this->last_status=trim($this->last_status);
-
-        // Check parameters
-        if (empty($this->type) || !is_numeric($this->type) || !in_array($this->type, $this->types)) $this->type=0;
-        if (empty($this->update_interval) || !is_numeric($this->update_interval) || $this->update_interval < 1) $this->update_interval=$this->update_min;
-        if (empty($this->next_update) || !is_numeric($this->next_update) || $this->next_update < 0) $this->next_update=0;
-    }
-
-    /**
-     *  List all price global variables
-     *
-     *  @return	array				Array of price global variable updaters
-     */
-    function listUpdaters()
-    {
-        $sql = "SELECT rowid, type, description, parameters, fk_variable, update_interval, next_update, last_status";
-        $sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element;
-
-        dol_syslog(get_class($this)."::listUpdaters");
-        $resql=$this->db->query($sql);
-        if ($resql)
-        {
-            $retarray = array();
-
-            while ($record = $this->db->fetch_array($resql))
-            {
-                $updater_obj = new PriceGlobalVariableUpdater($this->db);
-                $updater_obj->id				= $record["rowid"];
-                $updater_obj->type				= $record["type"];
-                $updater_obj->description		= $record["description"];
-                $updater_obj->parameters		= $record["parameters"];
-                $updater_obj->fk_variable		= $record["fk_variable"];
-                $updater_obj->update_interval	= $record["update_interval"];
-                $updater_obj->next_update		= $record["next_update"];
-                $updater_obj->last_status		= $record["last_status"];
-                $updater_obj->checkParameters();
-                $retarray[]=$updater_obj;
-            }
-
-            $this->db->free($resql);
-            return $retarray;
-        }
-        else
-        {
-            $this->error=$this->db->error();
-            return -1;
-        }
-    }
-
-    /**
-     *  List all updaters which need to be processed
-     *
-     *  @return	array				Array of price global variable updaters
-     */
-    function listPendingUpdaters()
-    {
-        $sql = "SELECT rowid, type, description, parameters, fk_variable, update_interval, next_update, last_status";
-        $sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element;
-        $sql.= " WHERE next_update < ".dol_now();
-
-        dol_syslog(get_class($this)."::processUpdaters");
-        $resql=$this->db->query($sql);
-        if ($resql)
-        {
-            $retarray = array();
-
-            while ($record = $this->db->fetch_array($resql))
-            {
-                $updater_obj = new PriceGlobalVariableUpdater($this->db);
-                $updater_obj->id				= $record["rowid"];
-                $updater_obj->type				= $record["type"];
-                $updater_obj->description		= $record["description"];
-                $updater_obj->parameters		= $record["parameters"];
-                $updater_obj->fk_variable		= $record["fk_variable"];
-                $updater_obj->update_interval	= $record["update_interval"];
-                $updater_obj->next_update		= $record["next_update"];
-                $updater_obj->last_status		= $record["last_status"];
-                $updater_obj->checkParameters();
-                $retarray[]=$updater_obj;
-            }
-
-            $this->db->free($resql);
-            return $retarray;
-        }
-        else
-        {
-            $this->error=$this->db->error();
-            return -1;
-        }
-    }
-
-    /**
-     *	Handles the processing of this updater
-     *
-     *  @return	int					 <0 if KO, 0 if OK but no global variable found, >0 if OK
-     */
-    function process()
-    {
-        global $langs, $user;
-        $langs->load("errors");
-
-        $this->error = null;
-        $this->checkParameters();
-
-        //Try to load the target global variable and abort if fails
-        if ($this->fk_variable < 1) {
-            $this->error = $langs->trans("ErrorGlobalVariableUpdater5");
-            return 0;
-        }
-        $price_globals = new PriceGlobalVariable($this->db);
-        $res = $price_globals->fetch($this->fk_variable);
-        if ($res < 1) {
-            $this->error = $langs->trans("ErrorGlobalVariableUpdater5");
-            return 0;
-        }
-
-        //Process depending of type
-        if ($this->type == 0 || $this->type == 1) {
-            //Get and check if required parameters are present
-            $parameters = json_decode($this->parameters, true);
-            if (!isset($parameters)) {
-                $this->error = $langs->trans("ErrorGlobalVariableUpdater1", $this->parameters);
-                return -1;
-            }
-            $url = $parameters['URL'];
-            if (!isset($url)) {
-                $this->error = $langs->trans("ErrorGlobalVariableUpdater2", 'URL');
-                return -1;
-            }
-            $value = $parameters['VALUE'];
-            if (!isset($value)) {
-                $this->error = $langs->trans("ErrorGlobalVariableUpdater2", 'VALUE');
-                return -1;
-            }
-            $result = "";
-            if ($this->type == 0) {
-                // Call JSON request
-                include_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
-                $tmpresult=getURLContent($url);
-                $code=$tmpresult['http_code'];
-                $result=$tmpresult['content'];
-
-                if (!isset($result)) {
-                    $this->error = $langs->trans("ErrorGlobalVariableUpdater0", "empty response");
-                    return -1;
-                }
-                if ($code !== 200) {
-                    $this->error = $langs->trans("ErrorGlobalVariableUpdater0", $code.' '.$tmpresult['curl_error_msg']);
-                    return -1;
-                }
-
-                //Decode returned response
-                $result = json_decode($result, true);
-            } elseif ($this->type == 1) {
-                $ns = $parameters['NS'];
-                if (!isset($ns)) {
-                    $this->error = $langs->trans("ErrorGlobalVariableUpdater2", 'NS');
-                    return -1;
-                }
-                $method = $parameters['METHOD'];
-                if (!isset($method)) {
-                    $this->error = $langs->trans("ErrorGlobalVariableUpdater2", 'METHOD');
-                    return -1;
-                }
-                $data = $parameters['DATA'];
-                if (!isset($data)) {
-                    $this->error = $langs->trans("ErrorGlobalVariableUpdater2", 'DATA');
-                    return -1;
-                }
-
-                //SOAP client
-                require_once NUSOAP_PATH.'/nusoap.php';
-                $soap_client = new nusoap_client($url);
-                $soap_client->soap_defencoding='UTF-8';
-                $soap_client->decodeUTF8(false);
-                $result = $soap_client->call($method, $data, $ns,'');
-
-                //Check if result is a error
-                if ($result === false) {
-                    $this->error = $langs->trans("ErrorGlobalVariableUpdater4", $soap_client->error_str);
-                    return -1;
-                }
-            }
-
-            //Explode value and walk for each key in value array to get the relevant key
-            $value = explode(',', $value);
-            foreach ($value as $key) {
-                $result = $result[$key];
-            }
-            if (!isset($result)) {
-                $this->error = $langs->trans("ErrorGlobalVariableUpdater3");
-                return -1;
-            }
-
-            //Save data to global and update it
-            $price_globals->value = $result;
-            $price_globals->update($user);
-        }
-        return 1;
-    }
-
-    /**
-     *  Update next_update into database
-     *
-     *  @param	string	$next_update Next update to write
-     *  @param	User	$user        User that modifies
-     *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
-     *  @return int     		   	 <0 if KO, >0 if OK
-     */
-    function update_next_update($next_update, $user=0, $notrigger=0)
-    {
-        $error=0;
-
-        $this->next_update = $next_update;
-        $this->checkParameters();
-
-        // Update request
-        $sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
-        $sql.= " next_update = ".$this->next_update;
-        $sql.= " WHERE rowid = ".$this->id;
-
-        $this->db->begin();
-
-        dol_syslog(get_class($this)."::update_next_update");
-        $resql = $this->db->query($sql);
-        if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
-
-        // Commit or rollback
-        if ($error)
-        {
-            foreach($this->errors as $errmsg)
-            {
-                dol_syslog(get_class($this)."::update_next_update ".$errmsg, LOG_ERR);
-                $this->error.=($this->error?', '.$errmsg:$errmsg);
-            }
-            $this->db->rollback();
-            return -1*$error;
-        }
-        else
-        {
-            $this->db->commit();
-            return 1;
-        }
-    }
-
-    /**
-     *  Update last_status into database
-     *
-     *  @param	string	$last_status Status to write
-     *  @param	User	$user        User that modifies
-     *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
-     *  @return int     		   	 <0 if KO, >0 if OK
-     */
-    function update_status($last_status, $user=0, $notrigger=0)
-    {
-        $error=0;
-
-        $this->last_status = $last_status;
-        $this->checkParameters();
-
-        // Update request
-        $sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
-        $sql.= " last_status = ".(isset($this->last_status)?"'".$this->db->escape($this->last_status)."'":"''");
-        $sql.= " WHERE rowid = ".$this->id;
-
-        $this->db->begin();
-
-        dol_syslog(get_class($this)."::update_status");
-        $resql = $this->db->query($sql);
-        if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
-
-        // Commit or rollback
-        if ($error)
-        {
-            foreach($this->errors as $errmsg)
-            {
-                dol_syslog(get_class($this)."::update_status ".$errmsg, LOG_ERR);
-                $this->error.=($this->error?', '.$errmsg:$errmsg);
-            }
-            $this->db->rollback();
-            return -1*$error;
-        }
-        else
-        {
-            $this->db->commit();
-            return 1;
-        }
-    }
+	var $db;							//!< To store db handler
+	var $error;							//!< To return error code (or message)
+	var $errors=array();				//!< To return several error codes (or messages)
+	var $types=array(0, 1);				//!< Updater types
+	var $update_min = 5;				//!< Minimal update rate
+	var $id;
+	var $type;
+	var $description;
+	var $parameters;
+	var $fk_variable;
+	var $update_interval;				//!< Interval in mins
+	var $next_update;					//!< Next update timestamp
+	var $last_status;
+	public $table_element = "c_price_global_variable_updater";
+
+	/**
+	 *  Constructor
+	 *
+	 *  @param	DoliDb		$db      Database handler
+	 */
+	function __construct($db)
+	{
+		$this->db = $db;
+		return 1;
+	}
+
+
+	/**
+	 *  Create object into database
+	 *
+	 *  @param	User	$user        User that creates
+	 *  @param  int		$notrigger   0=launch triggers after, 1=disable triggers
+	 *  @return int      		   	 <0 if KO, Id of created object if OK
+	 */
+	function create($user, $notrigger=0)
+	{
+		$error=0;
+
+		$this->checkParameters();
+
+		// Insert request
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX.$this->table_element." (";
+		$sql.= "type, description, parameters, fk_variable, update_interval, next_update, last_status";
+		$sql.= ") VALUES (";
+		$sql.= " ".$this->type.",";
+		$sql.= " ".(isset($this->description)?"'".$this->db->escape($this->description)."'":"''").",";
+		$sql.= " ".(isset($this->parameters)?"'".$this->db->escape($this->parameters)."'":"''").",";
+		$sql.= " ".$this->fk_variable.",";
+		$sql.= " ".$this->update_interval.",";
+		$sql.= " ".$this->next_update.",";
+		$sql.= " ".(isset($this->last_status)?"'".$this->db->escape($this->last_status)."'":"''");
+		$sql.= ")";
+
+		$this->db->begin();
+
+		dol_syslog(get_class($this)."::create", LOG_DEBUG);
+		$resql=$this->db->query($sql);
+		if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+
+		if (! $error)
+		{
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
+
+			if (! $notrigger)
+			{
+				// Uncomment this and change MYOBJECT to your own tag if you
+				// want this action calls a trigger.
+
+				//// Call triggers
+				//$result=$this->call_trigger('MYOBJECT_CREATE',$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)
+		{
+			foreach($this->errors as $errmsg)
+			{
+				dol_syslog(__METHOD__." ".$errmsg, LOG_ERR);
+				$this->error.=($this->error?', '.$errmsg:$errmsg);
+			}
+			$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
+	 *  @return		int			    < 0 if KO, 0 if OK but not found, > 0 if OK
+	 */
+	function fetch($id)
+	{
+		$sql = "SELECT type, description, parameters, fk_variable, update_interval, next_update, last_status";
+		$sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element;
+		$sql.= " WHERE rowid = ".$id;
+
+		dol_syslog(get_class($this)."::fetch");
+		$resql=$this->db->query($sql);
+		if ($resql)
+		{
+			$obj = $this->db->fetch_object($resql);
+			if ($obj)
+			{
+				$this->id				= $id;
+				$this->type				= $obj->type;
+				$this->description		= $obj->description;
+				$this->parameters		= $obj->parameters;
+				$this->fk_variable		= $obj->fk_variable;
+				$this->update_interval	= $obj->update_interval;
+				$this->next_update		= $obj->next_update;
+				$this->last_status		= $obj->last_status;
+				$this->checkParameters();
+				return 1;
+			}
+			else
+			{
+				return 0;
+			}
+		}
+		else
+		{
+			$this->error="Error ".$this->db->lasterror();
+			return -1;
+		}
+	}
+
+	/**
+	 *  Update object into database
+	 *
+	 *  @param	User	$user        User that modifies
+	 *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
+	 *  @return int     		   	 <0 if KO, >0 if OK
+	 */
+	function update($user=0, $notrigger=0)
+	{
+		$error=0;
+
+		$this->checkParameters();
+
+		// Update request
+		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
+		$sql.= " type = ".$this->type.",";
+		$sql.= " description = ".(isset($this->description)?"'".$this->db->escape($this->description)."'":"''").",";
+		$sql.= " parameters = ".(isset($this->parameters)?"'".$this->db->escape($this->parameters)."'":"''").",";
+		$sql.= " fk_variable = ".$this->fk_variable.",";
+		$sql.= " update_interval = ".$this->update_interval.",";
+		$sql.= " next_update = ".$this->next_update.",";
+		$sql.= " last_status = ".(isset($this->last_status)?"'".$this->db->escape($this->last_status)."'":"''");
+		$sql.= " WHERE rowid = ".$this->id;
+
+		$this->db->begin();
+
+		dol_syslog(get_class($this)."::update");
+		$resql = $this->db->query($sql);
+		if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+
+		if (! $error)
+		{
+			if (! $notrigger)
+			{
+				// Uncomment this and change MYOBJECT to your own tag if you
+				// want this action calls a trigger.
+
+				//// 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)
+		{
+			foreach($this->errors as $errmsg)
+			{
+				dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
+				$this->error.=($this->error?', '.$errmsg:$errmsg);
+			}
+			$this->db->rollback();
+			return -1*$error;
+		}
+		else
+		{
+			$this->db->commit();
+			return 1;
+		}
+	}
+
+	/**
+	 *  Delete object in database
+	 *
+	 * 	@param	int		$rowid		 Row id of global variable
+	 *	@param  User	$user        User that deletes
+	 *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
+	 *  @return	int					 <0 if KO, >0 if OK
+	 */
+	function delete($rowid, $user, $notrigger=0)
+	{
+		$error=0;
+
+		$this->db->begin();
+
+		if (! $error)
+		{
+			if (! $notrigger)
+			{
+				// Uncomment this and change MYOBJECT to your own tag if you
+				// want this action calls a trigger.
+
+				//// 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 (! $error)
+		{
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX.$this->table_element;
+			$sql.= " WHERE rowid = ".$rowid;
+
+			dol_syslog(get_class($this)."::delete");
+			$resql = $this->db->query($sql);
+			if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+		}
+
+		// Commit or rollback
+		if ($error)
+		{
+			foreach($this->errors as $errmsg)
+			{
+				dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
+				$this->error.=($this->error?', '.$errmsg:$errmsg);
+			}
+			$this->db->rollback();
+			return -1*$error;
+		}
+		else
+		{
+			$this->db->commit();
+			return 1;
+		}
+	}
+
+	/**
+	 *	Initialise object with example values
+	 *	Id must be 0 if object instance is a specimen
+	 *
+	 *	@return	void
+	 */
+	function initAsSpecimen()
+	{
+		$this->id=0;
+		$this->type=0;
+		$this->description='';
+		$this->parameters='';
+		$this->fk_variable=0;
+		$this->update_interval=0;
+		$this->next_update=0;
+		$this->last_status='';
+	}
+
+	/**
+	 *	Returns the last updated time in string html format, returns "never" if its less than 1
+	 *
+	 *	@return	string
+	 */
+	function getLastUpdated()
+	{
+		global $langs;
+		$last = $this->next_update - ($this->update_interval * 60);
+		if ($last < 1) {
+			return $langs->trans("Never");
+		}
+		$status = empty($this->last_status) ? $langs->trans("CorrectlyUpdated") : $this->last_status;
+		return $status.'<br>'.dol_print_date($last, '%d/%m/%Y %H:%M:%S');
+	}
+
+	/**
+	 *	Checks if all parameters are in order
+	 *
+	 *	@return	void
+	 */
+	function checkParameters()
+	{
+		// Clean parameters
+		if (isset($this->description)) $this->description=trim($this->description);
+		if (isset($this->parameters)) $this->parameters=trim($this->parameters);
+		else $this->parameters="";
+		if (isset($this->last_status)) $this->last_status=trim($this->last_status);
+
+		// Check parameters
+		if (empty($this->type) || !is_numeric($this->type) || !in_array($this->type, $this->types)) $this->type=0;
+		if (empty($this->update_interval) || !is_numeric($this->update_interval) || $this->update_interval < 1) $this->update_interval=$this->update_min;
+		if (empty($this->next_update) || !is_numeric($this->next_update) || $this->next_update < 0) $this->next_update=0;
+	}
+
+	/**
+	 *  List all price global variables
+	 *
+	 *  @return	array				Array of price global variable updaters
+	 */
+	function listUpdaters()
+	{
+		$sql = "SELECT rowid, type, description, parameters, fk_variable, update_interval, next_update, last_status";
+		$sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element;
+
+		dol_syslog(get_class($this)."::listUpdaters");
+		$resql=$this->db->query($sql);
+		if ($resql)
+		{
+			$retarray = array();
+
+			while ($record = $this->db->fetch_array($resql))
+			{
+				$updater_obj = new PriceGlobalVariableUpdater($this->db);
+				$updater_obj->id				= $record["rowid"];
+				$updater_obj->type				= $record["type"];
+				$updater_obj->description		= $record["description"];
+				$updater_obj->parameters		= $record["parameters"];
+				$updater_obj->fk_variable		= $record["fk_variable"];
+				$updater_obj->update_interval	= $record["update_interval"];
+				$updater_obj->next_update		= $record["next_update"];
+				$updater_obj->last_status		= $record["last_status"];
+				$updater_obj->checkParameters();
+				$retarray[]=$updater_obj;
+			}
+
+			$this->db->free($resql);
+			return $retarray;
+		}
+		else
+		{
+			$this->error=$this->db->error();
+			return -1;
+		}
+	}
+
+	/**
+	 *  List all updaters which need to be processed
+	 *
+	 *  @return	array				Array of price global variable updaters
+	 */
+	function listPendingUpdaters()
+	{
+		$sql = "SELECT rowid, type, description, parameters, fk_variable, update_interval, next_update, last_status";
+		$sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element;
+		$sql.= " WHERE next_update < ".dol_now();
+
+		dol_syslog(get_class($this)."::processUpdaters");
+		$resql=$this->db->query($sql);
+		if ($resql)
+		{
+			$retarray = array();
+
+			while ($record = $this->db->fetch_array($resql))
+			{
+				$updater_obj = new PriceGlobalVariableUpdater($this->db);
+				$updater_obj->id				= $record["rowid"];
+				$updater_obj->type				= $record["type"];
+				$updater_obj->description		= $record["description"];
+				$updater_obj->parameters		= $record["parameters"];
+				$updater_obj->fk_variable		= $record["fk_variable"];
+				$updater_obj->update_interval	= $record["update_interval"];
+				$updater_obj->next_update		= $record["next_update"];
+				$updater_obj->last_status		= $record["last_status"];
+				$updater_obj->checkParameters();
+				$retarray[]=$updater_obj;
+			}
+
+			$this->db->free($resql);
+			return $retarray;
+		}
+		else
+		{
+			$this->error=$this->db->error();
+			return -1;
+		}
+	}
+
+	/**
+	 *	Handles the processing of this updater
+	 *
+	 *  @return	int					 <0 if KO, 0 if OK but no global variable found, >0 if OK
+	 */
+	function process()
+	{
+		global $langs, $user;
+		$langs->load("errors");
+
+		$this->error = null;
+		$this->checkParameters();
+
+		//Try to load the target global variable and abort if fails
+		if ($this->fk_variable < 1) {
+			$this->error = $langs->trans("ErrorGlobalVariableUpdater5");
+			return 0;
+		}
+		$price_globals = new PriceGlobalVariable($this->db);
+		$res = $price_globals->fetch($this->fk_variable);
+		if ($res < 1) {
+			$this->error = $langs->trans("ErrorGlobalVariableUpdater5");
+			return 0;
+		}
+
+		//Process depending of type
+		if ($this->type == 0 || $this->type == 1) {
+			//Get and check if required parameters are present
+			$parameters = json_decode($this->parameters, true);
+			if (!isset($parameters)) {
+				$this->error = $langs->trans("ErrorGlobalVariableUpdater1", $this->parameters);
+				return -1;
+			}
+			$url = $parameters['URL'];
+			if (!isset($url)) {
+				$this->error = $langs->trans("ErrorGlobalVariableUpdater2", 'URL');
+				return -1;
+			}
+			$value = $parameters['VALUE'];
+			if (!isset($value)) {
+				$this->error = $langs->trans("ErrorGlobalVariableUpdater2", 'VALUE');
+				return -1;
+			}
+			$result = "";
+			if ($this->type == 0) {
+				// Call JSON request
+				include_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
+				$tmpresult=getURLContent($url);
+				$code=$tmpresult['http_code'];
+				$result=$tmpresult['content'];
+
+				if (!isset($result)) {
+					$this->error = $langs->trans("ErrorGlobalVariableUpdater0", "empty response");
+					return -1;
+				}
+				if ($code !== 200) {
+					$this->error = $langs->trans("ErrorGlobalVariableUpdater0", $code.' '.$tmpresult['curl_error_msg']);
+					return -1;
+				}
+
+				//Decode returned response
+				$result = json_decode($result, true);
+			} elseif ($this->type == 1) {
+				$ns = $parameters['NS'];
+				if (!isset($ns)) {
+					$this->error = $langs->trans("ErrorGlobalVariableUpdater2", 'NS');
+					return -1;
+				}
+				$method = $parameters['METHOD'];
+				if (!isset($method)) {
+					$this->error = $langs->trans("ErrorGlobalVariableUpdater2", 'METHOD');
+					return -1;
+				}
+				$data = $parameters['DATA'];
+				if (!isset($data)) {
+					$this->error = $langs->trans("ErrorGlobalVariableUpdater2", 'DATA');
+					return -1;
+				}
+
+				//SOAP client
+				require_once NUSOAP_PATH.'/nusoap.php';
+				$soap_client = new nusoap_client($url);
+				$soap_client->soap_defencoding='UTF-8';
+				$soap_client->decodeUTF8(false);
+				$result = $soap_client->call($method, $data, $ns,'');
+
+				//Check if result is a error
+				if ($result === false) {
+					$this->error = $langs->trans("ErrorGlobalVariableUpdater4", $soap_client->error_str);
+					return -1;
+				}
+			}
+
+			//Explode value and walk for each key in value array to get the relevant key
+			$value = explode(',', $value);
+			foreach ($value as $key) {
+				$result = $result[$key];
+			}
+			if (!isset($result)) {
+				$this->error = $langs->trans("ErrorGlobalVariableUpdater3");
+				return -1;
+			}
+
+			//Save data to global and update it
+			$price_globals->value = $result;
+			$price_globals->update($user);
+		}
+		return 1;
+	}
+
+	/**
+	 *  Update next_update into database
+	 *
+	 *  @param	string	$next_update Next update to write
+	 *  @param	User	$user        User that modifies
+	 *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
+	 *  @return int     		   	 <0 if KO, >0 if OK
+	 */
+	function update_next_update($next_update, $user=0, $notrigger=0)
+	{
+		$error=0;
+
+		$this->next_update = $next_update;
+		$this->checkParameters();
+
+		// Update request
+		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
+		$sql.= " next_update = ".$this->next_update;
+		$sql.= " WHERE rowid = ".$this->id;
+
+		$this->db->begin();
+
+		dol_syslog(get_class($this)."::update_next_update");
+		$resql = $this->db->query($sql);
+		if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+
+		// Commit or rollback
+		if ($error)
+		{
+			foreach($this->errors as $errmsg)
+			{
+				dol_syslog(get_class($this)."::update_next_update ".$errmsg, LOG_ERR);
+				$this->error.=($this->error?', '.$errmsg:$errmsg);
+			}
+			$this->db->rollback();
+			return -1*$error;
+		}
+		else
+		{
+			$this->db->commit();
+			return 1;
+		}
+	}
+
+	/**
+	 *  Update last_status into database
+	 *
+	 *  @param	string	$last_status Status to write
+	 *  @param	User	$user        User that modifies
+	 *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
+	 *  @return int     		   	 <0 if KO, >0 if OK
+	 */
+	function update_status($last_status, $user=0, $notrigger=0)
+	{
+		$error=0;
+
+		$this->last_status = $last_status;
+		$this->checkParameters();
+
+		// Update request
+		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
+		$sql.= " last_status = ".(isset($this->last_status)?"'".$this->db->escape($this->last_status)."'":"''");
+		$sql.= " WHERE rowid = ".$this->id;
+
+		$this->db->begin();
+
+		dol_syslog(get_class($this)."::update_status");
+		$resql = $this->db->query($sql);
+		if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+
+		// Commit or rollback
+		if ($error)
+		{
+			foreach($this->errors as $errmsg)
+			{
+				dol_syslog(get_class($this)."::update_status ".$errmsg, LOG_ERR);
+				$this->error.=($this->error?', '.$errmsg:$errmsg);
+			}
+			$this->db->rollback();
+			return -1*$error;
+		}
+		else
+		{
+			$this->db->commit();
+			return 1;
+		}
+	}
 }

Spacing +113 added lines, -113 removed lines

@@ -29,18 +29,18 @@ 
  */
 class PriceGlobalVariableUpdater
 {
-    var $db;							//!< To store db handler
-    var $error;							//!< To return error code (or message)
-    var $errors=array();				//!< To return several error codes (or messages)
-    var $types=array(0, 1);				//!< Updater types
-    var $update_min = 5;				//!< Minimal update rate
+    var $db; //!< To store db handler
+    var $error; //!< To return error code (or message)
+    var $errors = array(); //!< To return several error codes (or messages)
+    var $types = array(0, 1); //!< Updater types
+    var $update_min = 5; //!< Minimal update rate
     var $id;
     var $type;
     var $description;
     var $parameters;
     var $fk_variable;
-    var $update_interval;				//!< Interval in mins
-    var $next_update;					//!< Next update timestamp
+    var $update_interval; //!< Interval in mins
+    var $next_update; //!< Next update timestamp
     var $last_status;
     public $table_element = "c_price_global_variable_updater";
 
@@ -63,36 +63,36 @@ 
      *  @param  int		$notrigger   0=launch triggers after, 1=disable triggers
      *  @return int      		   	 <0 if KO, Id of created object if OK
      */
-    function create($user, $notrigger=0)
+    function create($user, $notrigger = 0)
     {
-        $error=0;
+        $error = 0;
 
         $this->checkParameters();
 
         // Insert request
         $sql = "INSERT INTO ".MAIN_DB_PREFIX.$this->table_element." (";
-        $sql.= "type, description, parameters, fk_variable, update_interval, next_update, last_status";
-        $sql.= ") VALUES (";
-        $sql.= " ".$this->type.",";
-        $sql.= " ".(isset($this->description)?"'".$this->db->escape($this->description)."'":"''").",";
-        $sql.= " ".(isset($this->parameters)?"'".$this->db->escape($this->parameters)."'":"''").",";
-        $sql.= " ".$this->fk_variable.",";
-        $sql.= " ".$this->update_interval.",";
-        $sql.= " ".$this->next_update.",";
-        $sql.= " ".(isset($this->last_status)?"'".$this->db->escape($this->last_status)."'":"''");
-        $sql.= ")";
+        $sql .= "type, description, parameters, fk_variable, update_interval, next_update, last_status";
+        $sql .= ") VALUES (";
+        $sql .= " ".$this->type.",";
+        $sql .= " ".(isset($this->description) ? "'".$this->db->escape($this->description)."'" : "''").",";
+        $sql .= " ".(isset($this->parameters) ? "'".$this->db->escape($this->parameters)."'" : "''").",";
+        $sql .= " ".$this->fk_variable.",";
+        $sql .= " ".$this->update_interval.",";
+        $sql .= " ".$this->next_update.",";
+        $sql .= " ".(isset($this->last_status) ? "'".$this->db->escape($this->last_status)."'" : "''");
+        $sql .= ")";
 
         $this->db->begin();
 
         dol_syslog(get_class($this)."::create", LOG_DEBUG);
-        $resql=$this->db->query($sql);
-        if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+        $resql = $this->db->query($sql);
+        if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
-        if (! $error)
+        if (!$error)
         {
             $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
 
-            if (! $notrigger)
+            if (!$notrigger)
             {
                 // Uncomment this and change MYOBJECT to your own tag if you
                 // want this action calls a trigger.
@@ -107,13 +107,13 @@ 
         // Commit or rollback
         if ($error)
         {
-            foreach($this->errors as $errmsg)
+            foreach ($this->errors as $errmsg)
             {
                 dol_syslog(__METHOD__." ".$errmsg, LOG_ERR);
-                $this->error.=($this->error?', '.$errmsg:$errmsg);
+                $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
             }
             $this->db->rollback();
-            return -1*$error;
+            return -1 * $error;
         }
         else
         {
@@ -132,22 +132,22 @@ 
     function fetch($id)
     {
         $sql = "SELECT type, description, parameters, fk_variable, update_interval, next_update, last_status";
-        $sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element;
-        $sql.= " WHERE rowid = ".$id;
+        $sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element;
+        $sql .= " WHERE rowid = ".$id;
 
         dol_syslog(get_class($this)."::fetch");
-        $resql=$this->db->query($sql);
+        $resql = $this->db->query($sql);
         if ($resql)
         {
             $obj = $this->db->fetch_object($resql);
             if ($obj)
             {
-                $this->id				= $id;
-                $this->type				= $obj->type;
+                $this->id = $id;
+                $this->type = $obj->type;
                 $this->description		= $obj->description;
-                $this->parameters		= $obj->parameters;
+                $this->parameters = $obj->parameters;
                 $this->fk_variable		= $obj->fk_variable;
-                $this->update_interval	= $obj->update_interval;
+                $this->update_interval = $obj->update_interval;
                 $this->next_update		= $obj->next_update;
                 $this->last_status		= $obj->last_status;
                 $this->checkParameters();
@@ -160,7 +160,7 @@ 
         }
         else
         {
-            $this->error="Error ".$this->db->lasterror();
+            $this->error = "Error ".$this->db->lasterror();
             return -1;
         }
     }
@@ -172,32 +172,32 @@ 
      *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
      *  @return int     		   	 <0 if KO, >0 if OK
      */
-    function update($user=0, $notrigger=0)
+    function update($user = 0, $notrigger = 0)
     {
-        $error=0;
+        $error = 0;
 
         $this->checkParameters();
 
         // Update request
         $sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
-        $sql.= " type = ".$this->type.",";
-        $sql.= " description = ".(isset($this->description)?"'".$this->db->escape($this->description)."'":"''").",";
-        $sql.= " parameters = ".(isset($this->parameters)?"'".$this->db->escape($this->parameters)."'":"''").",";
-        $sql.= " fk_variable = ".$this->fk_variable.",";
-        $sql.= " update_interval = ".$this->update_interval.",";
-        $sql.= " next_update = ".$this->next_update.",";
-        $sql.= " last_status = ".(isset($this->last_status)?"'".$this->db->escape($this->last_status)."'":"''");
-        $sql.= " WHERE rowid = ".$this->id;
+        $sql .= " type = ".$this->type.",";
+        $sql .= " description = ".(isset($this->description) ? "'".$this->db->escape($this->description)."'" : "''").",";
+        $sql .= " parameters = ".(isset($this->parameters) ? "'".$this->db->escape($this->parameters)."'" : "''").",";
+        $sql .= " fk_variable = ".$this->fk_variable.",";
+        $sql .= " update_interval = ".$this->update_interval.",";
+        $sql .= " next_update = ".$this->next_update.",";
+        $sql .= " last_status = ".(isset($this->last_status) ? "'".$this->db->escape($this->last_status)."'" : "''");
+        $sql .= " WHERE rowid = ".$this->id;
 
         $this->db->begin();
 
         dol_syslog(get_class($this)."::update");
         $resql = $this->db->query($sql);
-        if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+        if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
-        if (! $error)
+        if (!$error)
         {
-            if (! $notrigger)
+            if (!$notrigger)
             {
                 // Uncomment this and change MYOBJECT to your own tag if you
                 // want this action calls a trigger.
@@ -212,13 +212,13 @@ 
         // Commit or rollback
         if ($error)
         {
-            foreach($this->errors as $errmsg)
+            foreach ($this->errors as $errmsg)
             {
                 dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
-                $this->error.=($this->error?', '.$errmsg:$errmsg);
+                $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
             }
             $this->db->rollback();
-            return -1*$error;
+            return -1 * $error;
         }
         else
         {
@@ -235,15 +235,15 @@ 
      *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
      *  @return	int					 <0 if KO, >0 if OK
      */
-    function delete($rowid, $user, $notrigger=0)
+    function delete($rowid, $user, $notrigger = 0)
     {
-        $error=0;
+        $error = 0;
 
         $this->db->begin();
 
-        if (! $error)
+        if (!$error)
         {
-            if (! $notrigger)
+            if (!$notrigger)
             {
                 // Uncomment this and change MYOBJECT to your own tag if you
                 // want this action calls a trigger.
@@ -255,26 +255,26 @@ 
             }
         }
 
-        if (! $error)
+        if (!$error)
         {
             $sql = "DELETE FROM ".MAIN_DB_PREFIX.$this->table_element;
-            $sql.= " WHERE rowid = ".$rowid;
+            $sql .= " WHERE rowid = ".$rowid;
 
             dol_syslog(get_class($this)."::delete");
             $resql = $this->db->query($sql);
-            if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+            if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
         }
 
         // Commit or rollback
         if ($error)
         {
-            foreach($this->errors as $errmsg)
+            foreach ($this->errors as $errmsg)
             {
                 dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
-                $this->error.=($this->error?', '.$errmsg:$errmsg);
+                $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
             }
             $this->db->rollback();
-            return -1*$error;
+            return -1 * $error;
         }
         else
         {
@@ -291,14 +291,14 @@ 
      */
     function initAsSpecimen()
     {
-        $this->id=0;
-        $this->type=0;
-        $this->description='';
-        $this->parameters='';
-        $this->fk_variable=0;
-        $this->update_interval=0;
-        $this->next_update=0;
-        $this->last_status='';
+        $this->id = 0;
+        $this->type = 0;
+        $this->description = '';
+        $this->parameters = '';
+        $this->fk_variable = 0;
+        $this->update_interval = 0;
+        $this->next_update = 0;
+        $this->last_status = '';
     }
 
     /**
@@ -325,15 +325,15 @@ 
     function checkParameters()
     {
         // Clean parameters
-        if (isset($this->description)) $this->description=trim($this->description);
-        if (isset($this->parameters)) $this->parameters=trim($this->parameters);
-        else $this->parameters="";
-        if (isset($this->last_status)) $this->last_status=trim($this->last_status);
+        if (isset($this->description)) $this->description = trim($this->description);
+        if (isset($this->parameters)) $this->parameters = trim($this->parameters);
+        else $this->parameters = "";
+        if (isset($this->last_status)) $this->last_status = trim($this->last_status);
 
         // Check parameters
-        if (empty($this->type) || !is_numeric($this->type) || !in_array($this->type, $this->types)) $this->type=0;
-        if (empty($this->update_interval) || !is_numeric($this->update_interval) || $this->update_interval < 1) $this->update_interval=$this->update_min;
-        if (empty($this->next_update) || !is_numeric($this->next_update) || $this->next_update < 0) $this->next_update=0;
+        if (empty($this->type) || !is_numeric($this->type) || !in_array($this->type, $this->types)) $this->type = 0;
+        if (empty($this->update_interval) || !is_numeric($this->update_interval) || $this->update_interval < 1) $this->update_interval = $this->update_min;
+        if (empty($this->next_update) || !is_numeric($this->next_update) || $this->next_update < 0) $this->next_update = 0;
     }
 
     /**
@@ -344,10 +344,10 @@ 
     function listUpdaters()
     {
         $sql = "SELECT rowid, type, description, parameters, fk_variable, update_interval, next_update, last_status";
-        $sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element;
+        $sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element;
 
         dol_syslog(get_class($this)."::listUpdaters");
-        $resql=$this->db->query($sql);
+        $resql = $this->db->query($sql);
         if ($resql)
         {
             $retarray = array();
@@ -355,16 +355,16 @@ 
             while ($record = $this->db->fetch_array($resql))
             {
                 $updater_obj = new PriceGlobalVariableUpdater($this->db);
-                $updater_obj->id				= $record["rowid"];
-                $updater_obj->type				= $record["type"];
+                $updater_obj->id = $record["rowid"];
+                $updater_obj->type = $record["type"];
                 $updater_obj->description		= $record["description"];
-                $updater_obj->parameters		= $record["parameters"];
+                $updater_obj->parameters = $record["parameters"];
                 $updater_obj->fk_variable		= $record["fk_variable"];
-                $updater_obj->update_interval	= $record["update_interval"];
+                $updater_obj->update_interval = $record["update_interval"];
                 $updater_obj->next_update		= $record["next_update"];
                 $updater_obj->last_status		= $record["last_status"];
                 $updater_obj->checkParameters();
-                $retarray[]=$updater_obj;
+                $retarray[] = $updater_obj;
             }
 
             $this->db->free($resql);
@@ -372,7 +372,7 @@ 
         }
         else
         {
-            $this->error=$this->db->error();
+            $this->error = $this->db->error();
             return -1;
         }
     }
@@ -385,11 +385,11 @@ 
     function listPendingUpdaters()
     {
         $sql = "SELECT rowid, type, description, parameters, fk_variable, update_interval, next_update, last_status";
-        $sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element;
-        $sql.= " WHERE next_update < ".dol_now();
+        $sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element;
+        $sql .= " WHERE next_update < ".dol_now();
 
         dol_syslog(get_class($this)."::processUpdaters");
-        $resql=$this->db->query($sql);
+        $resql = $this->db->query($sql);
         if ($resql)
         {
             $retarray = array();
@@ -397,16 +397,16 @@ 
             while ($record = $this->db->fetch_array($resql))
             {
                 $updater_obj = new PriceGlobalVariableUpdater($this->db);
-                $updater_obj->id				= $record["rowid"];
-                $updater_obj->type				= $record["type"];
+                $updater_obj->id = $record["rowid"];
+                $updater_obj->type = $record["type"];
                 $updater_obj->description		= $record["description"];
-                $updater_obj->parameters		= $record["parameters"];
+                $updater_obj->parameters = $record["parameters"];
                 $updater_obj->fk_variable		= $record["fk_variable"];
-                $updater_obj->update_interval	= $record["update_interval"];
+                $updater_obj->update_interval = $record["update_interval"];
                 $updater_obj->next_update		= $record["next_update"];
                 $updater_obj->last_status		= $record["last_status"];
                 $updater_obj->checkParameters();
-                $retarray[]=$updater_obj;
+                $retarray[] = $updater_obj;
             }
 
             $this->db->free($resql);
@@ -414,7 +414,7 @@ 
         }
         else
         {
-            $this->error=$this->db->error();
+            $this->error = $this->db->error();
             return -1;
         }
     }
@@ -466,9 +466,9 @@ 
             if ($this->type == 0) {
                 // Call JSON request
                 include_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
-                $tmpresult=getURLContent($url);
-                $code=$tmpresult['http_code'];
-                $result=$tmpresult['content'];
+                $tmpresult = getURLContent($url);
+                $code = $tmpresult['http_code'];
+                $result = $tmpresult['content'];
 
                 if (!isset($result)) {
                     $this->error = $langs->trans("ErrorGlobalVariableUpdater0", "empty response");
@@ -501,9 +501,9 @@ 
                 //SOAP client
                 require_once NUSOAP_PATH.'/nusoap.php';
                 $soap_client = new nusoap_client($url);
-                $soap_client->soap_defencoding='UTF-8';
+                $soap_client->soap_defencoding = 'UTF-8';
                 $soap_client->decodeUTF8(false);
-                $result = $soap_client->call($method, $data, $ns,'');
+                $result = $soap_client->call($method, $data, $ns, '');
 
                 //Check if result is a error
                 if ($result === false) {
@@ -537,34 +537,34 @@ 
      *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
      *  @return int     		   	 <0 if KO, >0 if OK
      */
-    function update_next_update($next_update, $user=0, $notrigger=0)
+    function update_next_update($next_update, $user = 0, $notrigger = 0)
     {
-        $error=0;
+        $error = 0;
 
         $this->next_update = $next_update;
         $this->checkParameters();
 
         // Update request
         $sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
-        $sql.= " next_update = ".$this->next_update;
-        $sql.= " WHERE rowid = ".$this->id;
+        $sql .= " next_update = ".$this->next_update;
+        $sql .= " WHERE rowid = ".$this->id;
 
         $this->db->begin();
 
         dol_syslog(get_class($this)."::update_next_update");
         $resql = $this->db->query($sql);
-        if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+        if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
         // Commit or rollback
         if ($error)
         {
-            foreach($this->errors as $errmsg)
+            foreach ($this->errors as $errmsg)
             {
                 dol_syslog(get_class($this)."::update_next_update ".$errmsg, LOG_ERR);
-                $this->error.=($this->error?', '.$errmsg:$errmsg);
+                $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
             }
             $this->db->rollback();
-            return -1*$error;
+            return -1 * $error;
         }
         else
         {
@@ -581,34 +581,34 @@ 
      *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
      *  @return int     		   	 <0 if KO, >0 if OK
      */
-    function update_status($last_status, $user=0, $notrigger=0)
+    function update_status($last_status, $user = 0, $notrigger = 0)
     {
-        $error=0;
+        $error = 0;
 
         $this->last_status = $last_status;
         $this->checkParameters();
 
         // Update request
         $sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
-        $sql.= " last_status = ".(isset($this->last_status)?"'".$this->db->escape($this->last_status)."'":"''");
-        $sql.= " WHERE rowid = ".$this->id;
+        $sql .= " last_status = ".(isset($this->last_status) ? "'".$this->db->escape($this->last_status)."'" : "''");
+        $sql .= " WHERE rowid = ".$this->id;
 
         $this->db->begin();
 
         dol_syslog(get_class($this)."::update_status");
         $resql = $this->db->query($sql);
-        if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+        if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
         // Commit or rollback
         if ($error)
         {
-            foreach($this->errors as $errmsg)
+            foreach ($this->errors as $errmsg)
             {
                 dol_syslog(get_class($this)."::update_status ".$errmsg, LOG_ERR);
-                $this->error.=($this->error?', '.$errmsg:$errmsg);
+                $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
             }
             $this->db->rollback();
-            return -1*$error;
+            return -1 * $error;
         }
         else
         {

Braces +29 added lines, -25 removed lines

@@ -114,8 +114,7 @@ 
             }
             $this->db->rollback();
             return -1*$error;
-        }
-        else
+        } else
         {
             $this->db->commit();
             return $this->id;
@@ -152,13 +151,11 @@ 
                 $this->last_status		= $obj->last_status;
                 $this->checkParameters();
                 return 1;
-            }
-            else
+            } else
             {
                 return 0;
             }
-        }
-        else
+        } else
         {
             $this->error="Error ".$this->db->lasterror();
             return -1;
@@ -219,8 +216,7 @@ 
             }
             $this->db->rollback();
             return -1*$error;
-        }
-        else
+        } else
         {
             $this->db->commit();
             return 1;
@@ -275,8 +271,7 @@ 
             }
             $this->db->rollback();
             return -1*$error;
-        }
-        else
+        } else
         {
             $this->db->commit();
             return 1;
@@ -325,15 +320,28 @@ 
     function checkParameters()
     {
         // Clean parameters
-        if (isset($this->description)) $this->description=trim($this->description);
-        if (isset($this->parameters)) $this->parameters=trim($this->parameters);
-        else $this->parameters="";
-        if (isset($this->last_status)) $this->last_status=trim($this->last_status);
+        if (isset($this->description)) {
+        	$this->description=trim($this->description);
+        }
+        if (isset($this->parameters)) {
+        	$this->parameters=trim($this->parameters);
+        } else {
+        	$this->parameters="";
+        }
+        if (isset($this->last_status)) {
+        	$this->last_status=trim($this->last_status);
+        }
 
         // Check parameters
-        if (empty($this->type) || !is_numeric($this->type) || !in_array($this->type, $this->types)) $this->type=0;
-        if (empty($this->update_interval) || !is_numeric($this->update_interval) || $this->update_interval < 1) $this->update_interval=$this->update_min;
-        if (empty($this->next_update) || !is_numeric($this->next_update) || $this->next_update < 0) $this->next_update=0;
+        if (empty($this->type) || !is_numeric($this->type) || !in_array($this->type, $this->types)) {
+        	$this->type=0;
+        }
+        if (empty($this->update_interval) || !is_numeric($this->update_interval) || $this->update_interval < 1) {
+        	$this->update_interval=$this->update_min;
+        }
+        if (empty($this->next_update) || !is_numeric($this->next_update) || $this->next_update < 0) {
+        	$this->next_update=0;
+        }
     }
 
     /**
@@ -369,8 +377,7 @@ 
 
             $this->db->free($resql);
             return $retarray;
-        }
-        else
+        } else
         {
             $this->error=$this->db->error();
             return -1;
@@ -411,8 +418,7 @@ 
 
             $this->db->free($resql);
             return $retarray;
-        }
-        else
+        } else
         {
             $this->error=$this->db->error();
             return -1;
@@ -565,8 +571,7 @@ 
             }
             $this->db->rollback();
             return -1*$error;
-        }
-        else
+        } else
         {
             $this->db->commit();
             return 1;
@@ -609,8 +614,7 @@ 
             }
             $this->db->rollback();
             return -1*$error;
-        }
-        else
+        } else
         {
             $this->db->commit();
             return 1;

htdocs/societe/class/societe.class.php

Doc Comments +4 added lines, -4 removed lines

@@ -1577,7 +1577,7 @@ 
      *    	@param	float	$remise     Amount of discount
      *    	@param  User	$user       User adding discount
      *    	@param  string	$desc		Reason of discount
-     *      @param  float	$tva_tx     VAT rate
+     *      @param  integer	$tva_tx     VAT rate
      *		@return	int					<0 if KO, id of discount record if OK
      */
     function set_remise_except($remise, User $user, $desc, $tva_tx=0)
@@ -2235,7 +2235,7 @@ 
      *  Attribut un code client a partir du module de controle des codes.
      *  Return value is stored into this->code_client
      *
-     *	@param	Societe		$objsoc		Object thirdparty
+     *	@param	integer		$objsoc		Object thirdparty
      *	@param	int			$type		Should be 0 to say customer
      *  @return void
      */
@@ -2265,7 +2265,7 @@ 
      *  Attribut un code fournisseur a partir du module de controle des codes.
      *  Return value is stored into this->code_fournisseur
      *
-     *	@param	Societe		$objsoc		Object thirdparty
+     *	@param	integer		$objsoc		Object thirdparty
      *	@param	int			$type		Should be 1 to say supplier
      *  @return void
      */
@@ -2806,7 +2806,7 @@ 
     /**
      *  Return if third party is a company (Business) or an end user (Consumer)
      *
-     *  @return    boolean     true=is a company, false=a and user
+     *  @return    integer     true=is a company, false=a and user
      */
     function isACompany()
     {

Indentation +3077 added lines, -3077 removed lines

@@ -40,28 +40,28 @@ 
  */
 class Societe extends CommonObject
 {
-    public $element='societe';
-    public $table_element = 'societe';
+	public $element='societe';
+	public $table_element = 'societe';
 	public $fk_element='fk_soc';
-    protected $childtables=array("supplier_proposal"=>'SupplierProposal',"propal"=>'Proposal',"commande"=>'Order',"facture"=>'Invoice',"facture_rec"=>'RecurringInvoiceTemplate',"contrat"=>'Contract',"fichinter"=>'Fichinter',"facture_fourn"=>'SupplierInvoice',"commande_fournisseur"=>'SupplierOrder',"projet"=>'Project',"expedition"=>'Shipment',"prelevement_lignes"=>'DirectDebitRecord');    // To test if we can delete object
+	protected $childtables=array("supplier_proposal"=>'SupplierProposal',"propal"=>'Proposal',"commande"=>'Order',"facture"=>'Invoice',"facture_rec"=>'RecurringInvoiceTemplate',"contrat"=>'Contract',"fichinter"=>'Fichinter',"facture_fourn"=>'SupplierInvoice',"commande_fournisseur"=>'SupplierOrder',"projet"=>'Project',"expedition"=>'Shipment',"prelevement_lignes"=>'DirectDebitRecord');    // To test if we can delete object
 	protected $childtablesoncascade=array("societe_prices", "societe_log", "societe_address", "product_fournisseur_price", "product_customer_price_log", "product_customer_price", "socpeople", "adherent", "societe_rib", "societe_remise", "societe_remise_except", "societe_commerciaux", "categorie", "notify", "notify_def", "actioncomm");
 
 
 	/**
-     * 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
-     * @var int
-     */
-    protected $ismultientitymanaged = 1;
+	 * 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
+	 * @var int
+	 */
+	protected $ismultientitymanaged = 1;
 
-    public $entity;
+	public $entity;
 
-    /**
-     * Thirdparty name
-     * @var string
-     * @deprecated Use $name instead
-     * @see name
-     */
-    public $nom;
+	/**
+	 * Thirdparty name
+	 * @var string
+	 * @deprecated Use $name instead
+	 * @see name
+	 */
+	public $nom;
 
 	/**
 	 * Alias names (commercial, trademark or alias names)
@@ -69,46 +69,46 @@ 
 	 */
 	public $name_alias;
 
-    public $particulier;
-    public $address;
-    public $zip;
-    public $town;
-
-    /**
-     * Thirdparty status : 0=activity ceased, 1= in activity
-     * @var int
-     */
-    var $status;
-
-    /**
-     * Id of department
-     * @var int
-     */
-    var $state_id;
-    var $state_code;
-    var $state;
-
-    /**
-     * State code
-     * @var string
-     * @deprecated Use state_code instead
-     * @see state_code
-     */
-    var $departement_code;
-
-    /**
-     * @var string
-     * @deprecated Use state instead
-     * @see state
-     */
-    var $departement;
-
-    /**
-     * @var string
-     * @deprecated Use country instead
-     * @see country
-     */
-    var $pays;
+	public $particulier;
+	public $address;
+	public $zip;
+	public $town;
+
+	/**
+	 * Thirdparty status : 0=activity ceased, 1= in activity
+	 * @var int
+	 */
+	var $status;
+
+	/**
+	 * Id of department
+	 * @var int
+	 */
+	var $state_id;
+	var $state_code;
+	var $state;
+
+	/**
+	 * State code
+	 * @var string
+	 * @deprecated Use state_code instead
+	 * @see state_code
+	 */
+	var $departement_code;
+
+	/**
+	 * @var string
+	 * @deprecated Use state instead
+	 * @see state
+	 */
+	var $departement;
+
+	/**
+	 * @var string
+	 * @deprecated Use country instead
+	 * @see country
+	 */
+	var $pays;
 
 	/**
 	 * Phone number
@@ -137,77 +137,77 @@ 
 	var $url;
 
 	//! barcode
-    /**
-     * Barcode value
-     * @var string
-     */
-    var $barcode;
-
-    // 6 professional id (usage depends on country)
-
-    /**
-     * Professional ID 1 (Ex: Siren in France)
-     * @var string
-     */
-    var $idprof1;
-
-    /**
-     * Professional ID 2 (Ex: Siret in France)
-     * @var string
-     */
-    var $idprof2;
-
-    /**
-     * Professional ID 3 (Ex: Ape in France)
-     * @var string
-     */
-    var $idprof3;
-
-    /**
-     * Professional ID 4 (Ex: RCS in France)
-     * @var string
-     */
-    var $idprof4;
-
-    /**
-     * Professional ID 5
-     * @var string
-     */
-    var $idprof5;
-
-    /**
-     * Professional ID 6
-     * @var string
-     */
-    var $idprof6;
-
-    var $prefix_comm;
-
-    var $tva_assuj;
-    /**
-     * Intracommunitary VAT ID
-     * @var string
-     */
-    var $tva_intra;
-
-    // Local taxes
-    var $localtax1_assuj;
-    var $localtax1_value;
-    var $localtax2_assuj;
-    var $localtax2_value;
-
-    var $managers;
-    var $capital;
-    var $typent_id;
-    var $typent_code;
-    var $effectif;
-    var $effectif_id;
-    var $forme_juridique_code;
-    var $forme_juridique;
-
-    var $remise_percent;
-    var $mode_reglement_supplier_id;
-    var $cond_reglement_supplier_id;
+	/**
+	 * Barcode value
+	 * @var string
+	 */
+	var $barcode;
+
+	// 6 professional id (usage depends on country)
+
+	/**
+	 * Professional ID 1 (Ex: Siren in France)
+	 * @var string
+	 */
+	var $idprof1;
+
+	/**
+	 * Professional ID 2 (Ex: Siret in France)
+	 * @var string
+	 */
+	var $idprof2;
+
+	/**
+	 * Professional ID 3 (Ex: Ape in France)
+	 * @var string
+	 */
+	var $idprof3;
+
+	/**
+	 * Professional ID 4 (Ex: RCS in France)
+	 * @var string
+	 */
+	var $idprof4;
+
+	/**
+	 * Professional ID 5
+	 * @var string
+	 */
+	var $idprof5;
+
+	/**
+	 * Professional ID 6
+	 * @var string
+	 */
+	var $idprof6;
+
+	var $prefix_comm;
+
+	var $tva_assuj;
+	/**
+	 * Intracommunitary VAT ID
+	 * @var string
+	 */
+	var $tva_intra;
+
+	// Local taxes
+	var $localtax1_assuj;
+	var $localtax1_value;
+	var $localtax2_assuj;
+	var $localtax2_value;
+
+	var $managers;
+	var $capital;
+	var $typent_id;
+	var $typent_code;
+	var $effectif;
+	var $effectif_id;
+	var $forme_juridique_code;
+	var $forme_juridique;
+
+	var $remise_percent;
+	var $mode_reglement_supplier_id;
+	var $cond_reglement_supplier_id;
 	var $fk_prospectlevel;
 	var $name_bis;
 
@@ -215,541 +215,206 @@ 
 
 	/**
 	 * Date of last update
-     * @var string
+	 * @var string
 	 */
 	var $date_modification;
 	/**
 	 * User that made last update
-     * @var string
+	 * @var string
 	 */
 	var $user_modification;
 	/**
 	 * Date of creation
-     * @var string
+	 * @var string
 	 */
 	var $date_creation;
 	/**
 	 * User that created the thirdparty
-     * @var User
+	 * @var User
 	 */
 	var $user_creation;
 
 
-    var $specimen;
-
-    /**
-     * 0=no customer, 1=customer, 2=prospect, 3=customer and prospect
-     * @var int
-     */
-    var $client;
-    /**
-     * 0=no prospect, 1=prospect
-     * @var int
-     */
-    var $prospect;
-    /**
-     * 0=no supplier, 1=supplier
-     * @var int
-     */
-    var $fournisseur;
-
-    /**
-     * Client code. E.g: CU2014-003
-     * @var string
-     */
-    var $code_client;
-
-    /**
-     * Supplier code. E.g: SU2014-003
-     * @var string
-     */
-    var $code_fournisseur;
-
-    /**
-     * Accounting code for client
-     * @var string
-     */
-    var $code_compta;
-
-    /**
-     * Accounting code for suppliers
-     * @var string
-     */
-    var $code_compta_fournisseur;
-
-    /**
-     * @var string
-     * @deprecated Note is split in public and private notes
-     * @see note_public, note_private
-     */
-    var $note;
-
-    /**
-     * Private note
-     * @var string
-     */
-    var $note_private;
-
-    /**
-     * Public note
-     * @var string
-     */
-    var $note_public;
-
-    //! code statut prospect
-    var $stcomm_id;
-    var $statut_commercial;
-
-    /**
-     * Assigned price level
-     * @var int
-     */
-    var $price_level;
-    var $outstanding_limit;
-
-    /**
-     * Id of sales representative to link (used for thirdparty creation). Not filled by a fetch, because we can have several sales representatives.
-     * @var int
-     */
-    var $commercial_id;
-    /**
-     * Id of parent thirdparty (if one)
-     * @var int
-     */
-    var $parent;
-    /**
-     * Default language code of thirdparty (en_US, ...)
-     * @var string
-     */
-    var $default_lang;
-
-    var $ref;
-    var $ref_int;
-    /**
-     * External user reference.
-     * This is to allow external systems to store their id and make self-developed synchronizing functions easier to
-     * build.
-     * @var string
-     */
-    var $ref_ext;
-
-    /**
-     * Import key.
-     * Set when the thirdparty has been created through an import process. This is to relate those created thirdparties
-     * to an import process
-     * @var string
-     */
-    var $import_key;
-
-    /**
-     * Supplier WebServices URL
-     * @var string
-     */
-    var $webservices_url;
-
-    /**
-     * Supplier WebServices Key
-     * @var string
-     */
-    var $webservices_key;
-
-    var $logo;
-    var $logo_small;
-    var $logo_mini;
-
-    var $array_options;
+	var $specimen;
 
-	// Incoterms
-	var $fk_incoterms;
-	var $location_incoterms;
-	var $libelle_incoterms;  //Used into tooltip
+	/**
+	 * 0=no customer, 1=customer, 2=prospect, 3=customer and prospect
+	 * @var int
+	 */
+	var $client;
+	/**
+	 * 0=no prospect, 1=prospect
+	 * @var int
+	 */
+	var $prospect;
+	/**
+	 * 0=no supplier, 1=supplier
+	 * @var int
+	 */
+	var $fournisseur;
 
-	// Multicurrency
-	var $fk_multicurrency;
-	var $multicurrency_code;
+	/**
+	 * Client code. E.g: CU2014-003
+	 * @var string
+	 */
+	var $code_client;
 
-    /**
-     * To contains a clone of this when we need to save old properties of object
-     *  @var Societe
-     */
-    var $oldcopy;
-
-    /**
-     *    Constructor
-     *
-     *    @param	DoliDB		$db		Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-
-        $this->client = 0;
-        $this->prospect = 0;
-        $this->fournisseur = 0;
-        $this->typent_id  = 0;
-        $this->effectif_id  = 0;
-        $this->forme_juridique_code  = 0;
-        $this->tva_assuj = 1;
-        $this->status = 1;
-    }
-
-
-    /**
-     *    Create third party in database.
-     *    $this->code_client = -1 and $this->code_fournisseur = -1 means automatic assignement.
-     *
-     *    @param	User	$user       Object of user that ask creation
-     *    @return   int         		>= 0 if OK, < 0 if KO
-     */
-    function create($user)
-    {
-        global $langs,$conf,$mysoc;
+	/**
+	 * Supplier code. E.g: SU2014-003
+	 * @var string
+	 */
+	var $code_fournisseur;
 
-		$error=0;
+	/**
+	 * Accounting code for client
+	 * @var string
+	 */
+	var $code_compta;
 
-        // Clean parameters
-        if (empty($this->status)) $this->status=0;
-        $this->name=$this->name?trim($this->name):trim($this->nom);
-        if (! empty($conf->global->MAIN_FIRST_TO_UPPER)) $this->name=ucwords($this->name);
-        $this->nom=$this->name; // For backward compatibility
-        if (empty($this->client))      $this->client=0;
-        if (empty($this->fournisseur)) $this->fournisseur=0;
-        $this->import_key = trim($this->import_key);
+	/**
+	 * Accounting code for suppliers
+	 * @var string
+	 */
+	var $code_compta_fournisseur;
 
-		if (!empty($this->multicurrency_code)) $this->fk_multicurrency = MultiCurrency::getIdFromCode($this->db, $this->multicurrency_code);
-		if (empty($this->fk_multicurrency))
-		{
-			$this->multicurrency_code = '';
-			$this->fk_multicurrency = 0;
-		}
+	/**
+	 * @var string
+	 * @deprecated Note is split in public and private notes
+	 * @see note_public, note_private
+	 */
+	var $note;
 
-        dol_syslog(get_class($this)."::create ".$this->name);
+	/**
+	 * Private note
+	 * @var string
+	 */
+	var $note_private;
 
-        $now=dol_now();
+	/**
+	 * Public note
+	 * @var string
+	 */
+	var $note_public;
 
-        $this->db->begin();
+	//! code statut prospect
+	var $stcomm_id;
+	var $statut_commercial;
 
-        // For automatic creation during create action (not used by Dolibarr GUI, can be used by scripts)
-        if ($this->code_client == -1)      $this->get_codeclient($this,0);
-        if ($this->code_fournisseur == -1) $this->get_codefournisseur($this,1);
+	/**
+	 * Assigned price level
+	 * @var int
+	 */
+	var $price_level;
+	var $outstanding_limit;
 
-        // Check more parameters (including mandatory setup
-        // If error, this->errors[] is filled
-        $result = $this->verify();
+	/**
+	 * Id of sales representative to link (used for thirdparty creation). Not filled by a fetch, because we can have several sales representatives.
+	 * @var int
+	 */
+	var $commercial_id;
+	/**
+	 * Id of parent thirdparty (if one)
+	 * @var int
+	 */
+	var $parent;
+	/**
+	 * Default language code of thirdparty (en_US, ...)
+	 * @var string
+	 */
+	var $default_lang;
 
-        if ($result >= 0)
-        {
-            $sql = "INSERT INTO ".MAIN_DB_PREFIX."societe (nom, name_alias, entity, datec, fk_user_creat, canvas, status, ref_int, ref_ext, fk_stcomm, fk_incoterms, location_incoterms ,import_key, fk_multicurrency, multicurrency_code)";
-            $sql.= " VALUES ('".$this->db->escape($this->name)."', '".$this->db->escape($this->name_alias)."', ".$conf->entity.", '".$this->db->idate($now)."'";
-            $sql.= ", ".(! empty($user->id) ? "'".$user->id."'":"null");
-            $sql.= ", ".(! empty($this->canvas) ? "'".$this->db->escape($this->canvas)."'":"null");
-            $sql.= ", ".$this->status;
-            $sql.= ", ".(! empty($this->ref_int) ? "'".$this->db->escape($this->ref_int)."'":"null");
-            $sql.= ", ".(! empty($this->ref_ext) ? "'".$this->db->escape($this->ref_ext)."'":"null");
-            $sql.= ", 0";
-			$sql.= ", ".(int) $this->fk_incoterms;
-			$sql.= ", '".$this->db->escape($this->location_incoterms)."'";
-            $sql.= ", ".(! empty($this->import_key) ? "'".$this->db->escape($this->import_key)."'":"null");
-            $sql.= ", ".(int) $this->fk_multicurrency;
-            $sql.= ", '".$this->db->escape($this->multicurrency_code)."')";
-
-            dol_syslog(get_class($this)."::create", LOG_DEBUG);
-            $result=$this->db->query($sql);
-            if ($result)
-            {
-                $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."societe");
-
-                $ret = $this->update($this->id,$user,0,1,1,'add');
-
-                // Ajout du commercial affecte
-                if ($this->commercial_id != '' && $this->commercial_id != -1)
-                {
-                    $this->add_commercial($user, $this->commercial_id);
-                }
-                // si un commercial cree un client il lui est affecte automatiquement
-                else if (empty($user->rights->societe->client->voir))
-                {
-                    $this->add_commercial($user, $user->id);
-                }
-
-                if ($ret >= 0)
-                {
-                    // Call trigger
-                    $result=$this->call_trigger('COMPANY_CREATE',$user);
-                    if ($result < 0) $error++;
-                    // End call triggers
-                }
-                else $error++;
-
-                if (! $error)
-                {
-                    dol_syslog(get_class($this)."::Create success id=".$this->id);
-                    $this->db->commit();
-                    return $this->id;
-                }
-                else
-                {
-                    dol_syslog(get_class($this)."::Create echec update ".$this->error." ".join(',',$this->errors), LOG_ERR);
-                    $this->db->rollback();
-                    return -4;
-                }
-            }
-            else
-            {
-                if ($this->db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
-                {
-                    $this->error=$langs->trans("ErrorCompanyNameAlreadyExists",$this->name);    // duplicate on a field (code or profid or ...)
-                    $result=-1;
-                }
-                else
-                {
-                    $this->error=$this->db->lasterror();
-                    $result=-2;
-                }
-                $this->db->rollback();
-                return $result;
-            }
+	var $ref;
+	var $ref_int;
+	/**
+	 * External user reference.
+	 * This is to allow external systems to store their id and make self-developed synchronizing functions easier to
+	 * build.
+	 * @var string
+	 */
+	var $ref_ext;
 
-        }
-        else
-        {
-            $this->db->rollback();
-            dol_syslog(get_class($this)."::Create fails verify ".join(',',$this->errors), LOG_WARNING);
-            return -3;
-        }
-    }
-
-
-    /**
-     * Create a contact/address from thirdparty
-     *
-     * @param 	User	$user		Object user
-     * @return 	int					<0 if KO, >0 if OK
-     */
-    function create_individual(User $user)
-    {
-        require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
-        $contact=new Contact($this->db);
-
-        $contact->name              = $this->name_bis;
-        $contact->firstname         = $this->firstname;
-        $contact->civility_id       = $this->civility_id;
-        $contact->socid             = $this->id;	// fk_soc
-        $contact->statut            = 1;
-        $contact->priv              = 0;
-        $contact->country_id        = $this->country_id;
-        $contact->state_id          = $this->state_id;
-        $contact->address           = $this->address;
-        $contact->email             = $this->email;
-        $contact->zip               = $this->zip;
-        $contact->town              = $this->town;
-        $contact->phone_pro         = $this->phone;
-
-        $result = $contact->create($user);
-        if ($result < 0)
-        {
-            $this->error = $contact->error;
-            $this->errors = $contact->errors;
-            dol_syslog(get_class($this)."::create_individual ERROR:" . $this->error, LOG_ERR);
-        }
+	/**
+	 * Import key.
+	 * Set when the thirdparty has been created through an import process. This is to relate those created thirdparties
+	 * to an import process
+	 * @var string
+	 */
+	var $import_key;
 
-        return $result;
-    }
-
-    /**
-     *    Check properties of third party are ok (like name, third party codes, ...)
-     *    Used before an add or update.
-     *
-     *    @return     int		0 if OK, <0 if KO
-     */
-    function verify()
-    {
-    	global $conf, $langs, $mysoc;
-
-    	$error = 0;
-        $this->errors=array();
-
-        $result = 0;
-        $this->name	= trim($this->name);
-        $this->nom=$this->name; // For backward compatibility
-
-        if (! $this->name)
-        {
-            $this->errors[] = 'ErrorBadThirdPartyName';
-            $result = -2;
-        }
+	/**
+	 * Supplier WebServices URL
+	 * @var string
+	 */
+	var $webservices_url;
 
-        if ($this->client)
-        {
-            $rescode = $this->check_codeclient();
-            if ($rescode <> 0)
-            {
-                if ($rescode == -1)
-                {
-                    $this->errors[] = 'ErrorBadCustomerCodeSyntax';
-                }
-                if ($rescode == -2)
-                {
-                    $this->errors[] = 'ErrorCustomerCodeRequired';
-                }
-                if ($rescode == -3)
-                {
-                    $this->errors[] = 'ErrorCustomerCodeAlreadyUsed';
-                }
-                if ($rescode == -4)
-                {
-                    $this->errors[] = 'ErrorPrefixRequired';
-                }
-                $result = -3;
-            }
-        }
+	/**
+	 * Supplier WebServices Key
+	 * @var string
+	 */
+	var $webservices_key;
 
-        if ($this->fournisseur)
-        {
-            $rescode = $this->check_codefournisseur();
-            if ($rescode <> 0)
-            {
-                if ($rescode == -1)
-                {
-                    $this->errors[] = 'ErrorBadSupplierCodeSyntax';
-                }
-                if ($rescode == -2)
-                {
-                    $this->errors[] = 'ErrorSupplierCodeRequired';
-                }
-                if ($rescode == -3)
-                {
-                    $this->errors[] = 'ErrorSupplierCodeAlreadyUsed';
-                }
-                if ($rescode == -5)
-                {
-                    $this->errors[] = 'ErrorprefixRequired';
-                }
-                $result = -3;
-            }
-        }
+	var $logo;
+	var $logo_small;
+	var $logo_mini;
+
+	var $array_options;
+
+	// Incoterms
+	var $fk_incoterms;
+	var $location_incoterms;
+	var $libelle_incoterms;  //Used into tooltip
+
+	// Multicurrency
+	var $fk_multicurrency;
+	var $multicurrency_code;
+
+	/**
+	 * To contains a clone of this when we need to save old properties of object
+	 *  @var Societe
+	 */
+	var $oldcopy;
+
+	/**
+	 *    Constructor
+	 *
+	 *    @param	DoliDB		$db		Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+
+		$this->client = 0;
+		$this->prospect = 0;
+		$this->fournisseur = 0;
+		$this->typent_id  = 0;
+		$this->effectif_id  = 0;
+		$this->forme_juridique_code  = 0;
+		$this->tva_assuj = 1;
+		$this->status = 1;
+	}
 
-        // Check for duplicate or mandatory fields defined into setup
-        $array_to_check=array('IDPROF1','IDPROF2','IDPROF3','IDPROF4','IDPROF5','IDPROF6','EMAIL');
-        foreach($array_to_check as $key)
-        {
-        	$keymin=strtolower($key);
-        	$i=(int) preg_replace('/[^0-9]/','',$key);
-        	$vallabel=$this->$keymin;
-
-        	if ($i > 0)
-        	{
-        		if ($this->isACompany())
-        		{
-        			// Check for unicity
-        			if ($vallabel && $this->id_prof_verifiable($i))
-        			{
-        				if ($this->id_prof_exists($keymin, $vallabel, ($this->id > 0 ? $this->id : 0)))
-        				{
-        					$langs->load("errors");
-        					$error++; $this->errors[] = $langs->transcountry('ProfId'.$i, $this->country_code)." ".$langs->trans("ErrorProdIdAlreadyExist", $vallabel).' ('.$langs->trans("ForbiddenBySetupRules").')';
-        				}
-        			}
-
-        			// Check for mandatory prof id (but only if country is other than ours)
-        			if ($mysoc->country_id > 0 && $this->country_id == $mysoc->country_id)
-        			{
-        				$idprof_mandatory ='SOCIETE_'.$key.'_MANDATORY';
-        				if (! $vallabel && ! empty($conf->global->$idprof_mandatory))
-        				{
-        					$langs->load("errors");
-        					$error++;
-        					$this->errors[] = $langs->trans("ErrorProdIdIsMandatory", $langs->transcountry('ProfId'.$i, $this->country_code)).' ('.$langs->trans("ForbiddenBySetupRules").')';
-        				}
-        			}
-        		}
-        	}
-        	else
-        	{
-        		//var_dump($conf->global->SOCIETE_EMAIL_MANDATORY);
-        		if ($key == 'EMAIL')
-        		{
-        			// Check for unicity
-        			if ($vallabel)
-        			{
-        				if ($this->id_prof_exists($keymin, $vallabel, ($this->id > 0 ? $this->id : 0)))
-        				{
-        					$langs->load("errors");
-        					$error++; $this->errors[] = $langs->trans('Email')." ".$langs->trans("ErrorProdIdAlreadyExist", $vallabel).' ('.$langs->trans("ForbiddenBySetupRules").')';
-        				}
-        			}
-
-        			// Check for mandatory
-        			if (! empty($conf->global->SOCIETE_EMAIL_MANDATORY) && ! isValidEMail($this->email))
-        			{
-        				$langs->load("errors");
-        				$error++;
-        				$this->errors[] = $langs->trans("ErrorBadEMail", $this->email).' ('.$langs->trans("ForbiddenBySetupRules").')';
-        			}
-        		}
-        	}
-        }
 
-        if ($error) $result = -4;
-
-        return $result;
-    }
-
-    /**
-     *      Update parameters of third party
-     *
-     *      @param	int		$id              			id societe
-     *      @param  User	$user            			Utilisateur qui demande la mise a jour
-     *      @param  int		$call_trigger    			0=non, 1=oui
-     *		@param	int		$allowmodcodeclient			Inclut modif code client et code compta
-     *		@param	int		$allowmodcodefournisseur	Inclut modif code fournisseur et code compta fournisseur
-     *		@param	string	$action						'add' or 'update'
-     *		@param	int		$nosyncmember				Do not synchronize info of linked member
-     *      @return int  			           			<0 if KO, >=0 if OK
-     */
-    function update($id, $user='', $call_trigger=1, $allowmodcodeclient=0, $allowmodcodefournisseur=0, $action='update', $nosyncmember=1)
-    {
-        global $langs,$conf,$hookmanager;
-        require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+	/**
+	 *    Create third party in database.
+	 *    $this->code_client = -1 and $this->code_fournisseur = -1 means automatic assignement.
+	 *
+	 *    @param	User	$user       Object of user that ask creation
+	 *    @return   int         		>= 0 if OK, < 0 if KO
+	 */
+	function create($user)
+	{
+		global $langs,$conf,$mysoc;
 
 		$error=0;
 
-        dol_syslog(get_class($this)."::Update id=".$id." call_trigger=".$call_trigger." allowmodcodeclient=".$allowmodcodeclient." allowmodcodefournisseur=".$allowmodcodefournisseur);
-
-        $now=dol_now();
-
-        // Clean parameters
-        $this->id			= $id;
-        $this->name			= $this->name?trim($this->name):trim($this->nom);
-        $this->nom			= $this->name;	// For backward compatibility
-	    $this->name_alias = trim($this->name_alias);
-        $this->ref_ext		= trim($this->ref_ext);
-        $this->address		= $this->address?trim($this->address):trim($this->address);
-        $this->zip			= $this->zip?trim($this->zip):trim($this->zip);
-        $this->town			= $this->town?trim($this->town):trim($this->town);
-        $this->state_id		= trim($this->state_id);
-        $this->country_id	= ($this->country_id > 0)?$this->country_id:0;
-        $this->phone		= trim($this->phone);
-        $this->phone		= preg_replace("/\s/","",$this->phone);
-        $this->phone		= preg_replace("/\./","",$this->phone);
-        $this->fax			= trim($this->fax);
-        $this->fax			= preg_replace("/\s/","",$this->fax);
-        $this->fax			= preg_replace("/\./","",$this->fax);
-        $this->email		= trim($this->email);
-        $this->skype		= trim($this->skype);
-        $this->url			= $this->url?clean_url($this->url,0):'';
-        $this->idprof1		= trim($this->idprof1);
-        $this->idprof2		= trim($this->idprof2);
-        $this->idprof3		= trim($this->idprof3);
-        $this->idprof4		= trim($this->idprof4);
-        $this->idprof5		= (! empty($this->idprof5)?trim($this->idprof5):'');
-        $this->idprof6		= (! empty($this->idprof6)?trim($this->idprof6):'');
-        $this->prefix_comm	= trim($this->prefix_comm);
-        $this->outstanding_limit = price2num($this->outstanding_limit);
-
-        $this->tva_assuj	= trim($this->tva_assuj);
-        $this->tva_intra	= dol_sanitizeFileName($this->tva_intra,'');
-        if (empty($this->status)) $this->status = 0;
+		// Clean parameters
+		if (empty($this->status)) $this->status=0;
+		$this->name=$this->name?trim($this->name):trim($this->nom);
+		if (! empty($conf->global->MAIN_FIRST_TO_UPPER)) $this->name=ucwords($this->name);
+		$this->nom=$this->name; // For backward compatibility
+		if (empty($this->client))      $this->client=0;
+		if (empty($this->fournisseur)) $this->fournisseur=0;
+		$this->import_key = trim($this->import_key);
 
 		if (!empty($this->multicurrency_code)) $this->fk_multicurrency = MultiCurrency::getIdFromCode($this->db, $this->multicurrency_code);
 		if (empty($this->fk_multicurrency))
@@ -758,2308 +423,2643 @@ 
 			$this->fk_multicurrency = 0;
 		}
 
-        // Local taxes
-        $this->localtax1_assuj=trim($this->localtax1_assuj);
-        $this->localtax2_assuj=trim($this->localtax2_assuj);
+		dol_syslog(get_class($this)."::create ".$this->name);
 
-        $this->localtax1_value=trim($this->localtax1_value);
-        $this->localtax2_value=trim($this->localtax2_value);
+		$now=dol_now();
 
-        if ($this->capital != '') $this->capital=price2num(trim($this->capital));
-        if (! is_numeric($this->capital)) $this->capital = '';     // '' = undef
+		$this->db->begin();
 
-        $this->effectif_id=trim($this->effectif_id);
-        $this->forme_juridique_code=trim($this->forme_juridique_code);
+		// For automatic creation during create action (not used by Dolibarr GUI, can be used by scripts)
+		if ($this->code_client == -1)      $this->get_codeclient($this,0);
+		if ($this->code_fournisseur == -1) $this->get_codefournisseur($this,1);
 
-        //Gencod
-        $this->barcode=trim($this->barcode);
-
-        // For automatic creation
-        if ($this->code_client == -1) $this->get_codeclient($this,0);
-        if ($this->code_fournisseur == -1) $this->get_codefournisseur($this,1);
-
-        $this->code_compta=trim($this->code_compta);
-        $this->code_compta_fournisseur=trim($this->code_compta_fournisseur);
-
-        // Check parameters. More tests are done later in the ->verify()
-        if (! is_numeric($this->client) && ! is_numeric($this->fournisseur))
-        {
-            $langs->load("errors");
-            $this->error = $langs->trans("BadValueForParameterClientOrSupplier");
-            return -1;
-        }
-
-        $customer=false;
-        if (! empty($allowmodcodeclient) && ! empty($this->client))
-        {
-        	// Attention get_codecompta peut modifier le code suivant le module utilise
-        	if (empty($this->code_compta))
-        	{
-        		$ret=$this->get_codecompta('customer');
-        		if ($ret < 0) return -1;
-        	}
-
-        	$customer=true;
-        }
-
-        $supplier=false;
-        if (! empty($allowmodcodefournisseur) && ! empty($this->fournisseur))
-        {
-        	// Attention get_codecompta peut modifier le code suivant le module utilise
-        	if (empty($this->code_compta_fournisseur))
-        	{
-        		$ret=$this->get_codecompta('supplier');
-        		if ($ret < 0) return -1;
-        	}
-
-        	$supplier=true;
-        }
+		// Check more parameters (including mandatory setup
+		// If error, this->errors[] is filled
+		$result = $this->verify();
 
-        //Web services
-        $this->webservices_url = $this->webservices_url?clean_url($this->webservices_url,0):'';
-        $this->webservices_key = trim($this->webservices_key);
+		if ($result >= 0)
+		{
+			$sql = "INSERT INTO ".MAIN_DB_PREFIX."societe (nom, name_alias, entity, datec, fk_user_creat, canvas, status, ref_int, ref_ext, fk_stcomm, fk_incoterms, location_incoterms ,import_key, fk_multicurrency, multicurrency_code)";
+			$sql.= " VALUES ('".$this->db->escape($this->name)."', '".$this->db->escape($this->name_alias)."', ".$conf->entity.", '".$this->db->idate($now)."'";
+			$sql.= ", ".(! empty($user->id) ? "'".$user->id."'":"null");
+			$sql.= ", ".(! empty($this->canvas) ? "'".$this->db->escape($this->canvas)."'":"null");
+			$sql.= ", ".$this->status;
+			$sql.= ", ".(! empty($this->ref_int) ? "'".$this->db->escape($this->ref_int)."'":"null");
+			$sql.= ", ".(! empty($this->ref_ext) ? "'".$this->db->escape($this->ref_ext)."'":"null");
+			$sql.= ", 0";
+			$sql.= ", ".(int) $this->fk_incoterms;
+			$sql.= ", '".$this->db->escape($this->location_incoterms)."'";
+			$sql.= ", ".(! empty($this->import_key) ? "'".$this->db->escape($this->import_key)."'":"null");
+			$sql.= ", ".(int) $this->fk_multicurrency;
+			$sql.= ", '".$this->db->escape($this->multicurrency_code)."')";
 
-        //Incoterms
-        $this->fk_incoterms = (int) $this->fk_incoterms;
-		$this->location_incoterms = trim($this->location_incoterms);
+			dol_syslog(get_class($this)."::create", LOG_DEBUG);
+			$result=$this->db->query($sql);
+			if ($result)
+			{
+				$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."societe");
 
-        $this->db->begin();
-
-        // Check name is required and codes are ok or unique.
-        // If error, this->errors[] is filled
-        $result = 0;
-        if ($action != 'add') $result = $this->verify();	// We don't check when update called during a create because verify was already done
-
-        if ($result >= 0)
-        {
-            dol_syslog(get_class($this)."::update verify ok or not done");
-
-            $sql  = "UPDATE ".MAIN_DB_PREFIX."societe SET ";
-            $sql .= "nom = '" . $this->db->escape($this->name) ."'"; // Required
-            $sql .= ",name_alias = '" . $this->db->escape($this->name_alias) ."'";
-            $sql .= ",ref_ext = " .(! empty($this->ref_ext)?"'".$this->db->escape($this->ref_ext) ."'":"null");
-            $sql .= ",address = '" . $this->db->escape($this->address) ."'";
-
-            $sql .= ",zip = ".(! empty($this->zip)?"'".$this->db->escape($this->zip)."'":"null");
-            $sql .= ",town = ".(! empty($this->town)?"'".$this->db->escape($this->town)."'":"null");
-
-            $sql .= ",fk_departement = '" . (! empty($this->state_id)?$this->state_id:'0') ."'";
-            $sql .= ",fk_pays = '" . (! empty($this->country_id)?$this->country_id:'0') ."'";
-
-            $sql .= ",phone = ".(! empty($this->phone)?"'".$this->db->escape($this->phone)."'":"null");
-            $sql .= ",fax = ".(! empty($this->fax)?"'".$this->db->escape($this->fax)."'":"null");
-            $sql .= ",email = ".(! empty($this->email)?"'".$this->db->escape($this->email)."'":"null");
-            $sql .= ",skype = ".(! empty($this->skype)?"'".$this->db->escape($this->skype)."'":"null");
-            $sql .= ",url = ".(! empty($this->url)?"'".$this->db->escape($this->url)."'":"null");
-
-            $sql .= ",siren   = '". $this->db->escape($this->idprof1) ."'";
-            $sql .= ",siret   = '". $this->db->escape($this->idprof2) ."'";
-            $sql .= ",ape     = '". $this->db->escape($this->idprof3) ."'";
-            $sql .= ",idprof4 = '". $this->db->escape($this->idprof4) ."'";
-            $sql .= ",idprof5 = '". $this->db->escape($this->idprof5) ."'";
-            $sql .= ",idprof6 = '". $this->db->escape($this->idprof6) ."'";
-
-            $sql .= ",tva_assuj = ".($this->tva_assuj!=''?"'".$this->db->escape($this->tva_assuj)."'":"null");
-            $sql .= ",tva_intra = '" . $this->db->escape($this->tva_intra) ."'";
-            $sql .= ",status = " .$this->status;
-
-            // Local taxes
-            $sql .= ",localtax1_assuj = ".($this->localtax1_assuj!=''?"'".$this->db->escape($this->localtax1_assuj)."'":"null");
-            $sql .= ",localtax2_assuj = ".($this->localtax2_assuj!=''?"'".$this->db->escape($this->localtax2_assuj)."'":"null");
-            if($this->localtax1_assuj==1)
-            {
-            	if($this->localtax1_value!='')
-            	{
-            		$sql .=",localtax1_value =".$this->localtax1_value;
-            	}
-            	else $sql .=",localtax1_value =0.000";
-
-            }
-            else $sql .=",localtax1_value =0.000";
-
-            if($this->localtax2_assuj==1)
-            {
-            	if($this->localtax2_value!='')
-            	{
-            		$sql .=",localtax2_value =".$this->localtax2_value;
-            	}
-            	else $sql .=",localtax2_value =0.000";
-
-            }
-            else $sql .=",localtax2_value =0.000";
-
-            $sql .= ",capital = ".($this->capital == '' ? "null" : $this->capital);
-
-            $sql .= ",prefix_comm = ".(! empty($this->prefix_comm)?"'".$this->db->escape($this->prefix_comm)."'":"null");
-
-            $sql .= ",fk_effectif = ".(! empty($this->effectif_id)?"'".$this->db->escape($this->effectif_id)."'":"null");
-            if (isset($this->stcomm_id))
-            {
-                $sql .= ",fk_stcomm=".($this->stcomm_id > 0 ? $this->stcomm_id : "0");
-            }
-            $sql .= ",fk_typent = ".(! empty($this->typent_id)?"'".$this->db->escape($this->typent_id)."'":"0");
-
-            $sql .= ",fk_forme_juridique = ".(! empty($this->forme_juridique_code)?"'".$this->db->escape($this->forme_juridique_code)."'":"null");
-
-            $sql .= ",mode_reglement = ".(! empty($this->mode_reglement_id)?"'".$this->db->escape($this->mode_reglement_id)."'":"null");
-            $sql .= ",cond_reglement = ".(! empty($this->cond_reglement_id)?"'".$this->db->escape($this->cond_reglement_id)."'":"null");
-            $sql .= ",mode_reglement_supplier = ".(! empty($this->mode_reglement_supplier_id)?"'".$this->db->escape($this->mode_reglement_supplier_id)."'":"null");
-            $sql .= ",cond_reglement_supplier = ".(! empty($this->cond_reglement_supplier_id)?"'".$this->db->escape($this->cond_reglement_supplier_id)."'":"null");
-            $sql .= ",fk_shipping_method = ".(! empty($this->shipping_method_id)?"'".$this->db->escape($this->shipping_method_id)."'":"null");
-
-            $sql .= ",client = " . (! empty($this->client)?$this->client:0);
-            $sql .= ",fournisseur = " . (! empty($this->fournisseur)?$this->fournisseur:0);
-            $sql .= ",barcode = ".(! empty($this->barcode)?"'".$this->db->escape($this->barcode)."'":"null");
-            $sql .= ",default_lang = ".(! empty($this->default_lang)?"'".$this->db->escape($this->default_lang)."'":"null");
-            $sql .= ",logo = ".(! empty($this->logo)?"'".$this->db->escape($this->logo)."'":"null");
-            $sql .= ",outstanding_limit= ".($this->outstanding_limit!=''?$this->outstanding_limit:'null');
-            $sql .= ",fk_prospectlevel='".$this->db->escape($this->fk_prospectlevel)."'";
-
-            $sql .= ",webservices_url = ".(! empty($this->webservices_url)?"'".$this->db->escape($this->webservices_url)."'":"null");
-            $sql .= ",webservices_key = ".(! empty($this->webservices_key)?"'".$this->db->escape($this->webservices_key)."'":"null");
+				$ret = $this->update($this->id,$user,0,1,1,'add');
 
-			//Incoterms
-			$sql.= ", fk_incoterms = ".$this->fk_incoterms;
-			$sql.= ", location_incoterms = ".(! empty($this->location_incoterms)?"'".$this->db->escape($this->location_incoterms)."'":"null");
+				// Ajout du commercial affecte
+				if ($this->commercial_id != '' && $this->commercial_id != -1)
+				{
+					$this->add_commercial($user, $this->commercial_id);
+				}
+				// si un commercial cree un client il lui est affecte automatiquement
+				else if (empty($user->rights->societe->client->voir))
+				{
+					$this->add_commercial($user, $user->id);
+				}
 
-            if ($customer)
-            {
-                $sql .= ", code_client = ".(! empty($this->code_client)?"'".$this->db->escape($this->code_client)."'":"null");
-                $sql .= ", code_compta = ".(! empty($this->code_compta)?"'".$this->db->escape($this->code_compta)."'":"null");
-            }
-
-            if ($supplier)
-            {
-                $sql .= ", code_fournisseur = ".(! empty($this->code_fournisseur)?"'".$this->db->escape($this->code_fournisseur)."'":"null");
-                $sql .= ", code_compta_fournisseur = ".(! empty($this->code_compta_fournisseur)?"'".$this->db->escape($this->code_compta_fournisseur)."'":"null");
-            }
-            $sql .= ", fk_user_modif = ".(! empty($user->id)?"'".$user->id."'":"null");
-			$sql .= ", fk_multicurrency = ".(int) $this->fk_multicurrency;
-			$sql .= ', multicurrency_code = \''.$this->db->escape($this->multicurrency_code)."'";
-            $sql .= " WHERE rowid = '" . $id ."'";
-
-            $resql=$this->db->query($sql);
-            if ($resql)
-            {
-            	unset($this->country_code);		// We clean this because it may have been changed after an update of country_id
-            	unset($this->country);
-            	unset($this->state_code);
-            	unset($this->state);
-
-            	$nbrowsaffected = $this->db->affected_rows($resql);
-
-            	if (! $error && $nbrowsaffected)
-            	{
-            		// Update information on linked member if it is an update
-	            	if (! $nosyncmember && ! empty($conf->adherent->enabled))
-	            	{
-		            	require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
-
-		            	dol_syslog(get_class($this)."::update update linked member");
-
-		            	$lmember=new Adherent($this->db);
-		            	$result=$lmember->fetch(0, 0, $this->id);
-
-		            	if ($result > 0)
-		            	{
-		            		$lmember->societe=$this->name;
-		            		//$lmember->firstname=$this->firstname?$this->firstname:$lmember->firstname;	// We keep firstname and lastname of member unchanged
-		            		//$lmember->lastname=$this->lastname?$this->lastname:$lmember->lastname;		// We keep firstname and lastname of member unchanged
-		            		$lmember->address=$this->address;
-		            		$lmember->email=$this->email;
-                    		$lmember->skype=$this->skype;
-		            		$lmember->phone=$this->phone;
-
-		            		$result=$lmember->update($user,0,1,1,1);	// Use nosync to 1 to avoid cyclic updates
-		            		if ($result < 0)
-		            		{
-		            			$this->error=$lmember->error;
-		            			dol_syslog(get_class($this)."::update ".$this->error,LOG_ERR);
-		            			$error++;
-		            		}
-		            	}
-		            	else if ($result < 0)
-		            	{
-		            		$this->error=$lmember->error;
-		            		$error++;
-		            	}
-	            	}
-            	}
-
-            	$action='update';
-
-                // Actions on extra fields (by external module or standard code)
-                // TODO le hook fait double emploi avec le trigger !!
-                $hookmanager->initHooks(array('thirdpartydao'));
-                $parameters=array('socid'=>$this->id);
-                $reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
-                if (empty($reshook))
-                {
-                	if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
-                	{
-                		$result=$this->insertExtraFields();
-                		if ($result < 0)
-                		{
-                			$error++;
-                		}
-                	}
-                }
-                else if ($reshook < 0) $error++;
-
-                if (! $error && $call_trigger)
-                {
-                    // Call trigger
-                    $result=$this->call_trigger('COMPANY_MODIFY',$user);
-                    if ($result < 0) $error++;
-                    // End call triggers
-                }
-
-                if (! $error)
-                {
-                    dol_syslog(get_class($this)."::Update success");
-                    $this->db->commit();
-                    return 1;
-                }
-                else
+				if ($ret >= 0)
 				{
-                    $this->db->rollback();
-                    return -1;
-                }
-            }
-            else
-			{
-                if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
-                {
-                    // Doublon
-                    $this->error = $langs->trans("ErrorDuplicateField");
-                    $result = -1;
-                }
-                else
-                {
-                    $this->error = $this->db->lasterror();
-                    $result = -2;
-                }
-                $this->db->rollback();
-                return $result;
-            }
-        }
-        else
-       {
-            $this->db->rollback();
-            dol_syslog(get_class($this)."::Update fails verify ".join(',',$this->errors), LOG_WARNING);
-            return -3;
-        }
-    }
-
-    /**
-     *    Load a third party from database into memory
-     *
-     *    @param	int		$rowid			Id of third party to load
-     *    @param    string	$ref			Reference of third party, name (Warning, this can return several records)
-     *    @param    string	$ref_ext       	External reference of third party (Warning, this information is a free field not provided by Dolibarr)
-     *    @param    string	$ref_int       	Internal reference of third party (not used by dolibarr)
-     *    @param    string	$idprof1		Prof id 1 of third party (Warning, this can return several records)
-     *    @param    string	$idprof2		Prof id 2 of third party (Warning, this can return several records)
-     *    @param    string	$idprof3		Prof id 3 of third party (Warning, this can return several records)
-     *    @param    string	$idprof4		Prof id 4 of third party (Warning, this can return several records)
-     *    @param    string	$idprof5		Prof id 5 of third party (Warning, this can return several records)
-     *    @param    string	$idprof6		Prof id 6 of third party (Warning, this can return several records)
-     *    @param    string	$email   		Email (Warning, this can return several records)
-     *    @return   int						>0 if OK, <0 if KO or if two records found for same ref or idprof, 0 if not found.
-     */
-    function fetch($rowid, $ref='', $ref_ext='', $ref_int='', $idprof1='',$idprof2='',$idprof3='',$idprof4='',$idprof5='',$idprof6='', $email='')
-    {
-        global $langs;
-        global $conf;
-
-        if (empty($rowid) && empty($ref) && empty($ref_ext) && empty($ref_int) && empty($idprof1) && empty($idprof2) && empty($idprof3) && empty($idprof4) && empty($idprof5) && empty($idprof6) && empty($email)) return -1;
-
-        $sql = 'SELECT s.rowid, s.nom as name, s.name_alias, s.entity, s.ref_ext, s.ref_int, s.address, s.datec as date_creation, s.prefix_comm';
-        $sql .= ', s.status';
-        $sql .= ', s.price_level';
-        $sql .= ', s.tms as date_modification, s.fk_user_creat, s.fk_user_modif';
-        $sql .= ', s.phone, s.fax, s.email, s.skype, s.url, s.zip, s.town, s.note_private, s.note_public, s.model_pdf, s.client, s.fournisseur';
-        $sql .= ', s.siren as idprof1, s.siret as idprof2, s.ape as idprof3, s.idprof4, s.idprof5, s.idprof6';
-        $sql .= ', s.capital, s.tva_intra';
-        $sql .= ', s.fk_typent as typent_id';
-        $sql .= ', s.fk_effectif as effectif_id';
-        $sql .= ', s.fk_forme_juridique as forme_juridique_code';
-        $sql .= ', s.webservices_url, s.webservices_key';
-        $sql .= ', s.code_client, s.code_fournisseur, s.code_compta, s.code_compta_fournisseur, s.parent, s.barcode';
-        $sql .= ', s.fk_departement, s.fk_pays as country_id, s.fk_stcomm, s.remise_client, s.mode_reglement, s.cond_reglement, s.fk_account, s.tva_assuj';
-        $sql .= ', s.mode_reglement_supplier, s.cond_reglement_supplier, s.localtax1_assuj, s.localtax1_value, s.localtax2_assuj, s.localtax2_value, s.fk_prospectlevel, s.default_lang, s.logo';
-        $sql .= ', s.fk_shipping_method';
-        $sql .= ', s.outstanding_limit, s.import_key, s.canvas, s.fk_incoterms, s.location_incoterms';
-		$sql .= ', s.fk_multicurrency, s.multicurrency_code';
-        $sql .= ', fj.libelle as forme_juridique';
-        $sql .= ', e.libelle as effectif';
-        $sql .= ', c.code as country_code, c.label as country';
-        $sql .= ', d.code_departement as state_code, d.nom as state';
-        $sql .= ', st.libelle as stcomm';
-        $sql .= ', te.code as typent_code';
-		$sql .= ', i.libelle as libelle_incoterms';
-        $sql .= ' FROM '.MAIN_DB_PREFIX.'societe as s';
-        $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_effectif as e ON s.fk_effectif = e.id';
-        $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as c ON s.fk_pays = c.rowid';
-        $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_stcomm as st ON s.fk_stcomm = st.id';
-        $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_forme_juridique as fj ON s.fk_forme_juridique = fj.code';
-        $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_departements as d ON s.fk_departement = d.rowid';
-        $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_typent as te ON s.fk_typent = te.id';
-		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON s.fk_incoterms = i.rowid';
-		$sql .= ' WHERE s.entity IN ('.getEntity($this->element, 1).')';
-        if ($rowid)   $sql .= ' AND s.rowid = '.$rowid;
-        if ($ref)     $sql .= " AND s.nom = '".$this->db->escape($ref)."'";
-        if ($ref_ext) $sql .= " AND s.ref_ext = '".$this->db->escape($ref_ext)."'";
-        if ($ref_int) $sql .= " AND s.ref_int = '".$this->db->escape($ref_int)."'";
-        if ($idprof1) $sql .= " AND s.siren = '".$this->db->escape($idprof1)."'";
-        if ($idprof2) $sql .= " AND s.siret = '".$this->db->escape($idprof2)."'";
-        if ($idprof3) $sql .= " AND s.ape = '".$this->db->escape($idprof3)."'";
-        if ($idprof4) $sql .= " AND s.idprof4 = '".$this->db->escape($idprof4)."'";
-        if ($idprof5) $sql .= " AND s.idprof5 = '".$this->db->escape($idprof5)."'";
-        if ($idprof6) $sql .= " AND s.idprof6 = '".$this->db->escape($idprof6)."'";
-        if ($email)   $sql .= " AND email = '".$this->db->escape($email)."'";
-
-        $resql=$this->db->query($sql);
-        if ($resql)
-        {
-            $num=$this->db->num_rows($resql);
-            if ($num > 1)
-            {
-                $this->error='Fetch found several records. Rename one of tirdparties to avoid duplicate.';
-                dol_syslog($this->error, LOG_ERR);
-                $result = -2;
-            }
-            elseif ($num)   // $num = 1
-            {
-                $obj = $this->db->fetch_object($resql);
-
-                $this->id           = $obj->rowid;
-                $this->entity       = $obj->entity;
-                $this->canvas		= $obj->canvas;
-
-                $this->ref          = $obj->rowid;
-                $this->name 		= $obj->name;
-                $this->nom          = $obj->name;		// deprecated
-	            $this->name_alias = $obj->name_alias;
-                $this->ref_ext      = $obj->ref_ext;
-                $this->ref_int      = $obj->ref_int;
-
-                $this->date_creation     = $this->db->jdate($obj->date_creation);
-                $this->date_modification = $this->db->jdate($obj->date_modification);
-                $this->user_creation     = $obj->fk_user_creat;
-                $this->user_modification = $obj->fk_user_modif;
-
-                $this->address 		= $obj->address;
-                $this->zip 			= $obj->zip;
-                $this->town 		= $obj->town;
-
-                $this->country_id   = $obj->country_id;
-                $this->country_code = $obj->country_id?$obj->country_code:'';
-                $this->country 		= $obj->country_id?($langs->trans('Country'.$obj->country_code)!='Country'.$obj->country_code?$langs->transnoentities('Country'.$obj->country_code):$obj->country):'';
-
-                $this->state_id     = $obj->fk_departement;
-                $this->state_code   = $obj->state_code;
-                $this->state        = ($obj->state!='-'?$obj->state:'');
-
-                $transcode=$langs->trans('StatusProspect'.$obj->fk_stcomm);
-                $libelle=($transcode!='StatusProspect'.$obj->fk_stcomm?$transcode:$obj->stcomm);
-                $this->stcomm_id = $obj->fk_stcomm;     // id statut commercial
-                $this->statut_commercial = $libelle;    // libelle statut commercial
-
-                $this->email = $obj->email;
-                $this->skype = $obj->skype;
-                $this->url = $obj->url;
-                $this->phone = $obj->phone;
-                $this->fax = $obj->fax;
-
-                $this->parent    = $obj->parent;
-
-                $this->idprof1		= $obj->idprof1;
-                $this->idprof2		= $obj->idprof2;
-                $this->idprof3		= $obj->idprof3;
-                $this->idprof4		= $obj->idprof4;
-                $this->idprof5		= $obj->idprof5;
-                $this->idprof6		= $obj->idprof6;
-
-                $this->capital   = $obj->capital;
-
-                $this->code_client = $obj->code_client;
-                $this->code_fournisseur = $obj->code_fournisseur;
-
-                $this->code_compta = $obj->code_compta;
-                $this->code_compta_fournisseur = $obj->code_compta_fournisseur;
-
-                $this->barcode = $obj->barcode;
-
-                $this->tva_assuj      = $obj->tva_assuj;
-                $this->tva_intra      = $obj->tva_intra;
-                $this->status = $obj->status;
-
-                // Local Taxes
-                $this->localtax1_assuj      = $obj->localtax1_assuj;
-                $this->localtax2_assuj      = $obj->localtax2_assuj;
-
-                $this->localtax1_value		= $obj->localtax1_value;
-                $this->localtax2_value		= $obj->localtax2_value;
-
-                $this->typent_id      = $obj->typent_id;
-                $this->typent_code    = $obj->typent_code;
-
-                $this->effectif_id    = $obj->effectif_id;
-                $this->effectif       = $obj->effectif_id?$obj->effectif:'';
-
-                $this->forme_juridique_code= $obj->forme_juridique_code;
-                $this->forme_juridique     = $obj->forme_juridique_code?$obj->forme_juridique:'';
-
-                $this->fk_prospectlevel = $obj->fk_prospectlevel;
-
-                $this->prefix_comm = $obj->prefix_comm;
-
-                $this->remise_percent		= $obj->remise_client;
-                $this->mode_reglement_id 	= $obj->mode_reglement;
-                $this->cond_reglement_id 	= $obj->cond_reglement;
-                $this->mode_reglement_supplier_id 	= $obj->mode_reglement_supplier;
-                $this->cond_reglement_supplier_id 	= $obj->cond_reglement_supplier;
-                $this->shipping_method_id   = ($obj->fk_shipping_method>0)?$obj->fk_shipping_method:null;
-				$this->fk_account			= $obj->fk_account;
+					// Call trigger
+					$result=$this->call_trigger('COMPANY_CREATE',$user);
+					if ($result < 0) $error++;
+					// End call triggers
+				}
+				else $error++;
 
-                $this->client      = $obj->client;
-                $this->fournisseur = $obj->fournisseur;
+				if (! $error)
+				{
+					dol_syslog(get_class($this)."::Create success id=".$this->id);
+					$this->db->commit();
+					return $this->id;
+				}
+				else
+				{
+					dol_syslog(get_class($this)."::Create echec update ".$this->error." ".join(',',$this->errors), LOG_ERR);
+					$this->db->rollback();
+					return -4;
+				}
+			}
+			else
+			{
+				if ($this->db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
+				{
+					$this->error=$langs->trans("ErrorCompanyNameAlreadyExists",$this->name);    // duplicate on a field (code or profid or ...)
+					$result=-1;
+				}
+				else
+				{
+					$this->error=$this->db->lasterror();
+					$result=-2;
+				}
+				$this->db->rollback();
+				return $result;
+			}
 
-                $this->note = $obj->note_private; // TODO Deprecated for backward comtability
-                $this->note_private = $obj->note_private;
-                $this->note_public = $obj->note_public;
-                $this->modelpdf = $obj->model_pdf;
-                $this->default_lang = $obj->default_lang;
-                $this->logo = $obj->logo;
+		}
+		else
+		{
+			$this->db->rollback();
+			dol_syslog(get_class($this)."::Create fails verify ".join(',',$this->errors), LOG_WARNING);
+			return -3;
+		}
+	}
 
-                $this->webservices_url = $obj->webservices_url;
-                $this->webservices_key = $obj->webservices_key;
 
-                $this->outstanding_limit		= $obj->outstanding_limit;
+	/**
+	 * Create a contact/address from thirdparty
+	 *
+	 * @param 	User	$user		Object user
+	 * @return 	int					<0 if KO, >0 if OK
+	 */
+	function create_individual(User $user)
+	{
+		require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
+		$contact=new Contact($this->db);
+
+		$contact->name              = $this->name_bis;
+		$contact->firstname         = $this->firstname;
+		$contact->civility_id       = $this->civility_id;
+		$contact->socid             = $this->id;	// fk_soc
+		$contact->statut            = 1;
+		$contact->priv              = 0;
+		$contact->country_id        = $this->country_id;
+		$contact->state_id          = $this->state_id;
+		$contact->address           = $this->address;
+		$contact->email             = $this->email;
+		$contact->zip               = $this->zip;
+		$contact->town              = $this->town;
+		$contact->phone_pro         = $this->phone;
+
+		$result = $contact->create($user);
+		if ($result < 0)
+		{
+			$this->error = $contact->error;
+			$this->errors = $contact->errors;
+			dol_syslog(get_class($this)."::create_individual ERROR:" . $this->error, LOG_ERR);
+		}
 
-                // multiprix
-                $this->price_level = $obj->price_level;
+		return $result;
+	}
 
-                $this->import_key = $obj->import_key;
+	/**
+	 *    Check properties of third party are ok (like name, third party codes, ...)
+	 *    Used before an add or update.
+	 *
+	 *    @return     int		0 if OK, <0 if KO
+	 */
+	function verify()
+	{
+		global $conf, $langs, $mysoc;
 
-				//Incoterms
-				$this->fk_incoterms = $obj->fk_incoterms;
-				$this->location_incoterms = $obj->location_incoterms;
-				$this->libelle_incoterms = $obj->libelle_incoterms;
+		$error = 0;
+		$this->errors=array();
 
-				// multicurrency
-				$this->fk_multicurrency = $obj->fk_multicurrency;
-				$this->multicurrency_code = $obj->multicurrency_code;
+		$result = 0;
+		$this->name	= trim($this->name);
+		$this->nom=$this->name; // For backward compatibility
 
-                $result = 1;
+		if (! $this->name)
+		{
+			$this->errors[] = 'ErrorBadThirdPartyName';
+			$result = -2;
+		}
 
-                // Retreive all extrafield for thirdparty
-               	$this->fetch_optionals();
-            }
-            else
+		if ($this->client)
+		{
+			$rescode = $this->check_codeclient();
+			if ($rescode <> 0)
 			{
-                $result = 0;
-            }
+				if ($rescode == -1)
+				{
+					$this->errors[] = 'ErrorBadCustomerCodeSyntax';
+				}
+				if ($rescode == -2)
+				{
+					$this->errors[] = 'ErrorCustomerCodeRequired';
+				}
+				if ($rescode == -3)
+				{
+					$this->errors[] = 'ErrorCustomerCodeAlreadyUsed';
+				}
+				if ($rescode == -4)
+				{
+					$this->errors[] = 'ErrorPrefixRequired';
+				}
+				$result = -3;
+			}
+		}
 
-            $this->db->free($resql);
-        }
-        else
+		if ($this->fournisseur)
 		{
-            $this->error=$this->db->lasterror();
-            $result = -3;
-        }
+			$rescode = $this->check_codefournisseur();
+			if ($rescode <> 0)
+			{
+				if ($rescode == -1)
+				{
+					$this->errors[] = 'ErrorBadSupplierCodeSyntax';
+				}
+				if ($rescode == -2)
+				{
+					$this->errors[] = 'ErrorSupplierCodeRequired';
+				}
+				if ($rescode == -3)
+				{
+					$this->errors[] = 'ErrorSupplierCodeAlreadyUsed';
+				}
+				if ($rescode == -5)
+				{
+					$this->errors[] = 'ErrorprefixRequired';
+				}
+				$result = -3;
+			}
+		}
 
-        // Use first price level if level not defined for third party
-        if (! empty($conf->global->PRODUIT_MULTIPRICES) && empty($this->price_level)) $this->price_level=1;
-
-        return $result;
-    }
-
-    /**
-     * 	Search and fetch thirparties by name
-     *
-     * 	@param		string		$name		Name
-     * 	@param		int			$type		Type of thirdparties (0=any, 1=customer, 2=prospect, 3=supplier)
-     * 	@param		array		$filters	Array of couple field name/value to filter the companies with the same name
-     * 	@param		boolean		$exact		Exact string search (true/false)
-     * 	@param		boolean		$case		Case sensitive (true/false)
-     * 	@param		boolean		$similar	Add test if string inside name into database, or name into database inside string. Do not use this: Not compatible with other database.
-     * 	@param		string		$clause		Clause for filters
-     * 	@return		array|int				<0 if KO, array of thirdparties object if OK
-     */
-    function searchByName($name, $type='0', $filters = array(), $exact = false, $case = false, $similar = false, $clause = 'AND')
-    {
-    	$thirdparties = array();
-
-    	dol_syslog("searchByName name=".$name." type=".$type." exact=".$exact);
-
-    	// Check parameter
-    	if (empty($name))
-    	{
-    		$this->errors[]='ErrorBadValueForParameter';
-    		return -1;
-    	}
-
-    	// Generation requete recherche
-    	$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe";
-    	$sql.= " WHERE entity IN (".getEntity('category').")";
-    	if (! empty($type))
-    	{
-    		if ($type == 1 || $type == 2)
-    			$sql.= " AND client = ".$type;
-    		elseif ($type == 3)
-    			$sql.= " AND fournisseur = 1";
-    	}
-    	if (! empty($name))
-    	{
-    		if (! $exact)
-    		{
-    			if (preg_match('/^([\*])?[^*]+([\*])?$/', $name, $regs) && count($regs) > 1)
-    			{
-    				$name = str_replace('*', '%', $name);
-    			}
-    			else
-    			{
-    				$name = '%'.$name.'%';
-    			}
-    		}
-    		$sql.= " AND ";
-    		if (is_array($filters) && ! empty($filters))
-    			$sql.= "(";
-    		if ($similar)
-    		{
-    			// For test similitude (string inside name into database, or name into database inside string)
-    			// Do not use this. Not compatible with other database.
-    			$sql.= "(LOCATE('".$this->db->escape($name)."', nom) > 0 OR LOCATE(nom, '".$this->db->escape($name)."') > 0)";
-    		}
-    		else
-    		{
-    			if (! $case)
-    				$sql.= "nom LIKE '".$this->db->escape($name)."'";
-    			else
-    				$sql.= "nom LIKE BINARY '".$this->db->escape($name)."'";
-    		}
-    	}
-    	if (is_array($filters) && ! empty($filters))
-    	{
-    		foreach($filters as $field => $value)
-    		{
-    			if (! $exact)
-    			{
-    				if (preg_match('/^([\*])?[^*]+([\*])?$/', $value, $regs) && count($regs) > 1)
-    				{
-    					$value = str_replace('*', '%', $value);
-    				}
-    				else
-    				{
-    					$value = '%'.$value.'%';
-    				}
-    			}
-    			if (! $case)
-    				$sql.= " ".$clause." ".$field." LIKE '".$this->db->escape($value)."'";
-    			else
-    				$sql.= " ".$clause." ".$field." LIKE BINARY '".$this->db->escape($value)."'";
-    		}
-    		if (! empty($name))
-    			$sql.= ")";
-    	}
-
-    	$res  = $this->db->query($sql);
-    	if ($res)
-    	{
-    		while ($rec = $this->db->fetch_array($res))
-    		{
-    			$soc = new Societe($this->db);
-    			$soc->fetch($rec['rowid']);
-    			$thirdparties[] = $soc;
-    		}
-
-    		return $thirdparties;
-    	}
-    	else
-    	{
-    		$this->error=$this->db->lasterror();
-    		return -1;
-    	}
-    }
-
-    /**
-     *    Delete a third party from database and all its dependencies (contacts, rib...)
-     *
-     *    @param	int		$id             Id of third party to delete
-     *    @param    User    $fuser          User who ask to delete thirparty
-     *    @param    int		$call_trigger   0=No, 1=yes
-     *    @return	int						<0 if KO, 0 if nothing done, >0 if OK
-     */
-    function delete($id, User $fuser=null, $call_trigger=1)
-    {
-        global $langs, $conf, $user;
-
-        if (empty($fuser)) $fuser=$user;
-
-        require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-
-        $entity=isset($this->entity)?$this->entity:$conf->entity;
-
-        dol_syslog(get_class($this)."::delete", LOG_DEBUG);
-        $error = 0;
-
-        // Test if child exists
-        $objectisused = $this->isObjectUsed($id);
-		if (empty($objectisused))
+		// Check for duplicate or mandatory fields defined into setup
+		$array_to_check=array('IDPROF1','IDPROF2','IDPROF3','IDPROF4','IDPROF5','IDPROF6','EMAIL');
+		foreach($array_to_check as $key)
 		{
-            $this->db->begin();
+			$keymin=strtolower($key);
+			$i=(int) preg_replace('/[^0-9]/','',$key);
+			$vallabel=$this->$keymin;
+
+			if ($i > 0)
+			{
+				if ($this->isACompany())
+				{
+					// Check for unicity
+					if ($vallabel && $this->id_prof_verifiable($i))
+					{
+						if ($this->id_prof_exists($keymin, $vallabel, ($this->id > 0 ? $this->id : 0)))
+						{
+							$langs->load("errors");
+							$error++; $this->errors[] = $langs->transcountry('ProfId'.$i, $this->country_code)." ".$langs->trans("ErrorProdIdAlreadyExist", $vallabel).' ('.$langs->trans("ForbiddenBySetupRules").')';
+						}
+					}
+
+					// Check for mandatory prof id (but only if country is other than ours)
+					if ($mysoc->country_id > 0 && $this->country_id == $mysoc->country_id)
+					{
+						$idprof_mandatory ='SOCIETE_'.$key.'_MANDATORY';
+						if (! $vallabel && ! empty($conf->global->$idprof_mandatory))
+						{
+							$langs->load("errors");
+							$error++;
+							$this->errors[] = $langs->trans("ErrorProdIdIsMandatory", $langs->transcountry('ProfId'.$i, $this->country_code)).' ('.$langs->trans("ForbiddenBySetupRules").')';
+						}
+					}
+				}
+			}
+			else
+			{
+				//var_dump($conf->global->SOCIETE_EMAIL_MANDATORY);
+				if ($key == 'EMAIL')
+				{
+					// Check for unicity
+					if ($vallabel)
+					{
+						if ($this->id_prof_exists($keymin, $vallabel, ($this->id > 0 ? $this->id : 0)))
+						{
+							$langs->load("errors");
+							$error++; $this->errors[] = $langs->trans('Email')." ".$langs->trans("ErrorProdIdAlreadyExist", $vallabel).' ('.$langs->trans("ForbiddenBySetupRules").')';
+						}
+					}
+
+					// Check for mandatory
+					if (! empty($conf->global->SOCIETE_EMAIL_MANDATORY) && ! isValidEMail($this->email))
+					{
+						$langs->load("errors");
+						$error++;
+						$this->errors[] = $langs->trans("ErrorBadEMail", $this->email).' ('.$langs->trans("ForbiddenBySetupRules").')';
+					}
+				}
+			}
+		}
+
+		if ($error) $result = -4;
+
+		return $result;
+	}
+
+	/**
+	 *      Update parameters of third party
+	 *
+	 *      @param	int		$id              			id societe
+	 *      @param  User	$user            			Utilisateur qui demande la mise a jour
+	 *      @param  int		$call_trigger    			0=non, 1=oui
+	 *		@param	int		$allowmodcodeclient			Inclut modif code client et code compta
+	 *		@param	int		$allowmodcodefournisseur	Inclut modif code fournisseur et code compta fournisseur
+	 *		@param	string	$action						'add' or 'update'
+	 *		@param	int		$nosyncmember				Do not synchronize info of linked member
+	 *      @return int  			           			<0 if KO, >=0 if OK
+	 */
+	function update($id, $user='', $call_trigger=1, $allowmodcodeclient=0, $allowmodcodefournisseur=0, $action='update', $nosyncmember=1)
+	{
+		global $langs,$conf,$hookmanager;
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+
+		$error=0;
+
+		dol_syslog(get_class($this)."::Update id=".$id." call_trigger=".$call_trigger." allowmodcodeclient=".$allowmodcodeclient." allowmodcodefournisseur=".$allowmodcodefournisseur);
+
+		$now=dol_now();
+
+		// Clean parameters
+		$this->id			= $id;
+		$this->name			= $this->name?trim($this->name):trim($this->nom);
+		$this->nom			= $this->name;	// For backward compatibility
+		$this->name_alias = trim($this->name_alias);
+		$this->ref_ext		= trim($this->ref_ext);
+		$this->address		= $this->address?trim($this->address):trim($this->address);
+		$this->zip			= $this->zip?trim($this->zip):trim($this->zip);
+		$this->town			= $this->town?trim($this->town):trim($this->town);
+		$this->state_id		= trim($this->state_id);
+		$this->country_id	= ($this->country_id > 0)?$this->country_id:0;
+		$this->phone		= trim($this->phone);
+		$this->phone		= preg_replace("/\s/","",$this->phone);
+		$this->phone		= preg_replace("/\./","",$this->phone);
+		$this->fax			= trim($this->fax);
+		$this->fax			= preg_replace("/\s/","",$this->fax);
+		$this->fax			= preg_replace("/\./","",$this->fax);
+		$this->email		= trim($this->email);
+		$this->skype		= trim($this->skype);
+		$this->url			= $this->url?clean_url($this->url,0):'';
+		$this->idprof1		= trim($this->idprof1);
+		$this->idprof2		= trim($this->idprof2);
+		$this->idprof3		= trim($this->idprof3);
+		$this->idprof4		= trim($this->idprof4);
+		$this->idprof5		= (! empty($this->idprof5)?trim($this->idprof5):'');
+		$this->idprof6		= (! empty($this->idprof6)?trim($this->idprof6):'');
+		$this->prefix_comm	= trim($this->prefix_comm);
+		$this->outstanding_limit = price2num($this->outstanding_limit);
+
+		$this->tva_assuj	= trim($this->tva_assuj);
+		$this->tva_intra	= dol_sanitizeFileName($this->tva_intra,'');
+		if (empty($this->status)) $this->status = 0;
+
+		if (!empty($this->multicurrency_code)) $this->fk_multicurrency = MultiCurrency::getIdFromCode($this->db, $this->multicurrency_code);
+		if (empty($this->fk_multicurrency))
+		{
+			$this->multicurrency_code = '';
+			$this->fk_multicurrency = 0;
+		}
+
+		// Local taxes
+		$this->localtax1_assuj=trim($this->localtax1_assuj);
+		$this->localtax2_assuj=trim($this->localtax2_assuj);
+
+		$this->localtax1_value=trim($this->localtax1_value);
+		$this->localtax2_value=trim($this->localtax2_value);
+
+		if ($this->capital != '') $this->capital=price2num(trim($this->capital));
+		if (! is_numeric($this->capital)) $this->capital = '';     // '' = undef
+
+		$this->effectif_id=trim($this->effectif_id);
+		$this->forme_juridique_code=trim($this->forme_juridique_code);
+
+		//Gencod
+		$this->barcode=trim($this->barcode);
+
+		// For automatic creation
+		if ($this->code_client == -1) $this->get_codeclient($this,0);
+		if ($this->code_fournisseur == -1) $this->get_codefournisseur($this,1);
+
+		$this->code_compta=trim($this->code_compta);
+		$this->code_compta_fournisseur=trim($this->code_compta_fournisseur);
+
+		// Check parameters. More tests are done later in the ->verify()
+		if (! is_numeric($this->client) && ! is_numeric($this->fournisseur))
+		{
+			$langs->load("errors");
+			$this->error = $langs->trans("BadValueForParameterClientOrSupplier");
+			return -1;
+		}
+
+		$customer=false;
+		if (! empty($allowmodcodeclient) && ! empty($this->client))
+		{
+			// Attention get_codecompta peut modifier le code suivant le module utilise
+			if (empty($this->code_compta))
+			{
+				$ret=$this->get_codecompta('customer');
+				if ($ret < 0) return -1;
+			}
+
+			$customer=true;
+		}
+
+		$supplier=false;
+		if (! empty($allowmodcodefournisseur) && ! empty($this->fournisseur))
+		{
+			// Attention get_codecompta peut modifier le code suivant le module utilise
+			if (empty($this->code_compta_fournisseur))
+			{
+				$ret=$this->get_codecompta('supplier');
+				if ($ret < 0) return -1;
+			}
+
+			$supplier=true;
+		}
+
+		//Web services
+		$this->webservices_url = $this->webservices_url?clean_url($this->webservices_url,0):'';
+		$this->webservices_key = trim($this->webservices_key);
+
+		//Incoterms
+		$this->fk_incoterms = (int) $this->fk_incoterms;
+		$this->location_incoterms = trim($this->location_incoterms);
+
+		$this->db->begin();
+
+		// Check name is required and codes are ok or unique.
+		// If error, this->errors[] is filled
+		$result = 0;
+		if ($action != 'add') $result = $this->verify();	// We don't check when update called during a create because verify was already done
+
+		if ($result >= 0)
+		{
+			dol_syslog(get_class($this)."::update verify ok or not done");
+
+			$sql  = "UPDATE ".MAIN_DB_PREFIX."societe SET ";
+			$sql .= "nom = '" . $this->db->escape($this->name) ."'"; // Required
+			$sql .= ",name_alias = '" . $this->db->escape($this->name_alias) ."'";
+			$sql .= ",ref_ext = " .(! empty($this->ref_ext)?"'".$this->db->escape($this->ref_ext) ."'":"null");
+			$sql .= ",address = '" . $this->db->escape($this->address) ."'";
+
+			$sql .= ",zip = ".(! empty($this->zip)?"'".$this->db->escape($this->zip)."'":"null");
+			$sql .= ",town = ".(! empty($this->town)?"'".$this->db->escape($this->town)."'":"null");
+
+			$sql .= ",fk_departement = '" . (! empty($this->state_id)?$this->state_id:'0') ."'";
+			$sql .= ",fk_pays = '" . (! empty($this->country_id)?$this->country_id:'0') ."'";
+
+			$sql .= ",phone = ".(! empty($this->phone)?"'".$this->db->escape($this->phone)."'":"null");
+			$sql .= ",fax = ".(! empty($this->fax)?"'".$this->db->escape($this->fax)."'":"null");
+			$sql .= ",email = ".(! empty($this->email)?"'".$this->db->escape($this->email)."'":"null");
+			$sql .= ",skype = ".(! empty($this->skype)?"'".$this->db->escape($this->skype)."'":"null");
+			$sql .= ",url = ".(! empty($this->url)?"'".$this->db->escape($this->url)."'":"null");
+
+			$sql .= ",siren   = '". $this->db->escape($this->idprof1) ."'";
+			$sql .= ",siret   = '". $this->db->escape($this->idprof2) ."'";
+			$sql .= ",ape     = '". $this->db->escape($this->idprof3) ."'";
+			$sql .= ",idprof4 = '". $this->db->escape($this->idprof4) ."'";
+			$sql .= ",idprof5 = '". $this->db->escape($this->idprof5) ."'";
+			$sql .= ",idprof6 = '". $this->db->escape($this->idprof6) ."'";
+
+			$sql .= ",tva_assuj = ".($this->tva_assuj!=''?"'".$this->db->escape($this->tva_assuj)."'":"null");
+			$sql .= ",tva_intra = '" . $this->db->escape($this->tva_intra) ."'";
+			$sql .= ",status = " .$this->status;
+
+			// Local taxes
+			$sql .= ",localtax1_assuj = ".($this->localtax1_assuj!=''?"'".$this->db->escape($this->localtax1_assuj)."'":"null");
+			$sql .= ",localtax2_assuj = ".($this->localtax2_assuj!=''?"'".$this->db->escape($this->localtax2_assuj)."'":"null");
+			if($this->localtax1_assuj==1)
+			{
+				if($this->localtax1_value!='')
+				{
+					$sql .=",localtax1_value =".$this->localtax1_value;
+				}
+				else $sql .=",localtax1_value =0.000";
+
+			}
+			else $sql .=",localtax1_value =0.000";
+
+			if($this->localtax2_assuj==1)
+			{
+				if($this->localtax2_value!='')
+				{
+					$sql .=",localtax2_value =".$this->localtax2_value;
+				}
+				else $sql .=",localtax2_value =0.000";
+
+			}
+			else $sql .=",localtax2_value =0.000";
+
+			$sql .= ",capital = ".($this->capital == '' ? "null" : $this->capital);
+
+			$sql .= ",prefix_comm = ".(! empty($this->prefix_comm)?"'".$this->db->escape($this->prefix_comm)."'":"null");
+
+			$sql .= ",fk_effectif = ".(! empty($this->effectif_id)?"'".$this->db->escape($this->effectif_id)."'":"null");
+			if (isset($this->stcomm_id))
+			{
+				$sql .= ",fk_stcomm=".($this->stcomm_id > 0 ? $this->stcomm_id : "0");
+			}
+			$sql .= ",fk_typent = ".(! empty($this->typent_id)?"'".$this->db->escape($this->typent_id)."'":"0");
+
+			$sql .= ",fk_forme_juridique = ".(! empty($this->forme_juridique_code)?"'".$this->db->escape($this->forme_juridique_code)."'":"null");
+
+			$sql .= ",mode_reglement = ".(! empty($this->mode_reglement_id)?"'".$this->db->escape($this->mode_reglement_id)."'":"null");
+			$sql .= ",cond_reglement = ".(! empty($this->cond_reglement_id)?"'".$this->db->escape($this->cond_reglement_id)."'":"null");
+			$sql .= ",mode_reglement_supplier = ".(! empty($this->mode_reglement_supplier_id)?"'".$this->db->escape($this->mode_reglement_supplier_id)."'":"null");
+			$sql .= ",cond_reglement_supplier = ".(! empty($this->cond_reglement_supplier_id)?"'".$this->db->escape($this->cond_reglement_supplier_id)."'":"null");
+			$sql .= ",fk_shipping_method = ".(! empty($this->shipping_method_id)?"'".$this->db->escape($this->shipping_method_id)."'":"null");
+
+			$sql .= ",client = " . (! empty($this->client)?$this->client:0);
+			$sql .= ",fournisseur = " . (! empty($this->fournisseur)?$this->fournisseur:0);
+			$sql .= ",barcode = ".(! empty($this->barcode)?"'".$this->db->escape($this->barcode)."'":"null");
+			$sql .= ",default_lang = ".(! empty($this->default_lang)?"'".$this->db->escape($this->default_lang)."'":"null");
+			$sql .= ",logo = ".(! empty($this->logo)?"'".$this->db->escape($this->logo)."'":"null");
+			$sql .= ",outstanding_limit= ".($this->outstanding_limit!=''?$this->outstanding_limit:'null');
+			$sql .= ",fk_prospectlevel='".$this->db->escape($this->fk_prospectlevel)."'";
+
+			$sql .= ",webservices_url = ".(! empty($this->webservices_url)?"'".$this->db->escape($this->webservices_url)."'":"null");
+			$sql .= ",webservices_key = ".(! empty($this->webservices_key)?"'".$this->db->escape($this->webservices_key)."'":"null");
+
+			//Incoterms
+			$sql.= ", fk_incoterms = ".$this->fk_incoterms;
+			$sql.= ", location_incoterms = ".(! empty($this->location_incoterms)?"'".$this->db->escape($this->location_incoterms)."'":"null");
+
+			if ($customer)
+			{
+				$sql .= ", code_client = ".(! empty($this->code_client)?"'".$this->db->escape($this->code_client)."'":"null");
+				$sql .= ", code_compta = ".(! empty($this->code_compta)?"'".$this->db->escape($this->code_compta)."'":"null");
+			}
+
+			if ($supplier)
+			{
+				$sql .= ", code_fournisseur = ".(! empty($this->code_fournisseur)?"'".$this->db->escape($this->code_fournisseur)."'":"null");
+				$sql .= ", code_compta_fournisseur = ".(! empty($this->code_compta_fournisseur)?"'".$this->db->escape($this->code_compta_fournisseur)."'":"null");
+			}
+			$sql .= ", fk_user_modif = ".(! empty($user->id)?"'".$user->id."'":"null");
+			$sql .= ", fk_multicurrency = ".(int) $this->fk_multicurrency;
+			$sql .= ', multicurrency_code = \''.$this->db->escape($this->multicurrency_code)."'";
+			$sql .= " WHERE rowid = '" . $id ."'";
+
+			$resql=$this->db->query($sql);
+			if ($resql)
+			{
+				unset($this->country_code);		// We clean this because it may have been changed after an update of country_id
+				unset($this->country);
+				unset($this->state_code);
+				unset($this->state);
+
+				$nbrowsaffected = $this->db->affected_rows($resql);
+
+				if (! $error && $nbrowsaffected)
+				{
+					// Update information on linked member if it is an update
+					if (! $nosyncmember && ! empty($conf->adherent->enabled))
+					{
+						require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
+
+						dol_syslog(get_class($this)."::update update linked member");
+
+						$lmember=new Adherent($this->db);
+						$result=$lmember->fetch(0, 0, $this->id);
+
+						if ($result > 0)
+						{
+							$lmember->societe=$this->name;
+							//$lmember->firstname=$this->firstname?$this->firstname:$lmember->firstname;	// We keep firstname and lastname of member unchanged
+							//$lmember->lastname=$this->lastname?$this->lastname:$lmember->lastname;		// We keep firstname and lastname of member unchanged
+							$lmember->address=$this->address;
+							$lmember->email=$this->email;
+							$lmember->skype=$this->skype;
+							$lmember->phone=$this->phone;
+
+							$result=$lmember->update($user,0,1,1,1);	// Use nosync to 1 to avoid cyclic updates
+							if ($result < 0)
+							{
+								$this->error=$lmember->error;
+								dol_syslog(get_class($this)."::update ".$this->error,LOG_ERR);
+								$error++;
+							}
+						}
+						else if ($result < 0)
+						{
+							$this->error=$lmember->error;
+							$error++;
+						}
+					}
+				}
+
+				$action='update';
+
+				// Actions on extra fields (by external module or standard code)
+				// TODO le hook fait double emploi avec le trigger !!
+				$hookmanager->initHooks(array('thirdpartydao'));
+				$parameters=array('socid'=>$this->id);
+				$reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+				if (empty($reshook))
+				{
+					if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
+					{
+						$result=$this->insertExtraFields();
+						if ($result < 0)
+						{
+							$error++;
+						}
+					}
+				}
+				else if ($reshook < 0) $error++;
+
+				if (! $error && $call_trigger)
+				{
+					// Call trigger
+					$result=$this->call_trigger('COMPANY_MODIFY',$user);
+					if ($result < 0) $error++;
+					// End call triggers
+				}
+
+				if (! $error)
+				{
+					dol_syslog(get_class($this)."::Update success");
+					$this->db->commit();
+					return 1;
+				}
+				else
+				{
+					$this->db->rollback();
+					return -1;
+				}
+			}
+			else
+			{
+				if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
+				{
+					// Doublon
+					$this->error = $langs->trans("ErrorDuplicateField");
+					$result = -1;
+				}
+				else
+				{
+					$this->error = $this->db->lasterror();
+					$result = -2;
+				}
+				$this->db->rollback();
+				return $result;
+			}
+		}
+		else
+	   {
+			$this->db->rollback();
+			dol_syslog(get_class($this)."::Update fails verify ".join(',',$this->errors), LOG_WARNING);
+			return -3;
+		}
+	}
+
+	/**
+	 *    Load a third party from database into memory
+	 *
+	 *    @param	int		$rowid			Id of third party to load
+	 *    @param    string	$ref			Reference of third party, name (Warning, this can return several records)
+	 *    @param    string	$ref_ext       	External reference of third party (Warning, this information is a free field not provided by Dolibarr)
+	 *    @param    string	$ref_int       	Internal reference of third party (not used by dolibarr)
+	 *    @param    string	$idprof1		Prof id 1 of third party (Warning, this can return several records)
+	 *    @param    string	$idprof2		Prof id 2 of third party (Warning, this can return several records)
+	 *    @param    string	$idprof3		Prof id 3 of third party (Warning, this can return several records)
+	 *    @param    string	$idprof4		Prof id 4 of third party (Warning, this can return several records)
+	 *    @param    string	$idprof5		Prof id 5 of third party (Warning, this can return several records)
+	 *    @param    string	$idprof6		Prof id 6 of third party (Warning, this can return several records)
+	 *    @param    string	$email   		Email (Warning, this can return several records)
+	 *    @return   int						>0 if OK, <0 if KO or if two records found for same ref or idprof, 0 if not found.
+	 */
+	function fetch($rowid, $ref='', $ref_ext='', $ref_int='', $idprof1='',$idprof2='',$idprof3='',$idprof4='',$idprof5='',$idprof6='', $email='')
+	{
+		global $langs;
+		global $conf;
+
+		if (empty($rowid) && empty($ref) && empty($ref_ext) && empty($ref_int) && empty($idprof1) && empty($idprof2) && empty($idprof3) && empty($idprof4) && empty($idprof5) && empty($idprof6) && empty($email)) return -1;
+
+		$sql = 'SELECT s.rowid, s.nom as name, s.name_alias, s.entity, s.ref_ext, s.ref_int, s.address, s.datec as date_creation, s.prefix_comm';
+		$sql .= ', s.status';
+		$sql .= ', s.price_level';
+		$sql .= ', s.tms as date_modification, s.fk_user_creat, s.fk_user_modif';
+		$sql .= ', s.phone, s.fax, s.email, s.skype, s.url, s.zip, s.town, s.note_private, s.note_public, s.model_pdf, s.client, s.fournisseur';
+		$sql .= ', s.siren as idprof1, s.siret as idprof2, s.ape as idprof3, s.idprof4, s.idprof5, s.idprof6';
+		$sql .= ', s.capital, s.tva_intra';
+		$sql .= ', s.fk_typent as typent_id';
+		$sql .= ', s.fk_effectif as effectif_id';
+		$sql .= ', s.fk_forme_juridique as forme_juridique_code';
+		$sql .= ', s.webservices_url, s.webservices_key';
+		$sql .= ', s.code_client, s.code_fournisseur, s.code_compta, s.code_compta_fournisseur, s.parent, s.barcode';
+		$sql .= ', s.fk_departement, s.fk_pays as country_id, s.fk_stcomm, s.remise_client, s.mode_reglement, s.cond_reglement, s.fk_account, s.tva_assuj';
+		$sql .= ', s.mode_reglement_supplier, s.cond_reglement_supplier, s.localtax1_assuj, s.localtax1_value, s.localtax2_assuj, s.localtax2_value, s.fk_prospectlevel, s.default_lang, s.logo';
+		$sql .= ', s.fk_shipping_method';
+		$sql .= ', s.outstanding_limit, s.import_key, s.canvas, s.fk_incoterms, s.location_incoterms';
+		$sql .= ', s.fk_multicurrency, s.multicurrency_code';
+		$sql .= ', fj.libelle as forme_juridique';
+		$sql .= ', e.libelle as effectif';
+		$sql .= ', c.code as country_code, c.label as country';
+		$sql .= ', d.code_departement as state_code, d.nom as state';
+		$sql .= ', st.libelle as stcomm';
+		$sql .= ', te.code as typent_code';
+		$sql .= ', i.libelle as libelle_incoterms';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.'societe as s';
+		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_effectif as e ON s.fk_effectif = e.id';
+		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as c ON s.fk_pays = c.rowid';
+		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_stcomm as st ON s.fk_stcomm = st.id';
+		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_forme_juridique as fj ON s.fk_forme_juridique = fj.code';
+		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_departements as d ON s.fk_departement = d.rowid';
+		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_typent as te ON s.fk_typent = te.id';
+		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON s.fk_incoterms = i.rowid';
+		$sql .= ' WHERE s.entity IN ('.getEntity($this->element, 1).')';
+		if ($rowid)   $sql .= ' AND s.rowid = '.$rowid;
+		if ($ref)     $sql .= " AND s.nom = '".$this->db->escape($ref)."'";
+		if ($ref_ext) $sql .= " AND s.ref_ext = '".$this->db->escape($ref_ext)."'";
+		if ($ref_int) $sql .= " AND s.ref_int = '".$this->db->escape($ref_int)."'";
+		if ($idprof1) $sql .= " AND s.siren = '".$this->db->escape($idprof1)."'";
+		if ($idprof2) $sql .= " AND s.siret = '".$this->db->escape($idprof2)."'";
+		if ($idprof3) $sql .= " AND s.ape = '".$this->db->escape($idprof3)."'";
+		if ($idprof4) $sql .= " AND s.idprof4 = '".$this->db->escape($idprof4)."'";
+		if ($idprof5) $sql .= " AND s.idprof5 = '".$this->db->escape($idprof5)."'";
+		if ($idprof6) $sql .= " AND s.idprof6 = '".$this->db->escape($idprof6)."'";
+		if ($email)   $sql .= " AND email = '".$this->db->escape($email)."'";
+
+		$resql=$this->db->query($sql);
+		if ($resql)
+		{
+			$num=$this->db->num_rows($resql);
+			if ($num > 1)
+			{
+				$this->error='Fetch found several records. Rename one of tirdparties to avoid duplicate.';
+				dol_syslog($this->error, LOG_ERR);
+				$result = -2;
+			}
+			elseif ($num)   // $num = 1
+			{
+				$obj = $this->db->fetch_object($resql);
+
+				$this->id           = $obj->rowid;
+				$this->entity       = $obj->entity;
+				$this->canvas		= $obj->canvas;
+
+				$this->ref          = $obj->rowid;
+				$this->name 		= $obj->name;
+				$this->nom          = $obj->name;		// deprecated
+				$this->name_alias = $obj->name_alias;
+				$this->ref_ext      = $obj->ref_ext;
+				$this->ref_int      = $obj->ref_int;
+
+				$this->date_creation     = $this->db->jdate($obj->date_creation);
+				$this->date_modification = $this->db->jdate($obj->date_modification);
+				$this->user_creation     = $obj->fk_user_creat;
+				$this->user_modification = $obj->fk_user_modif;
+
+				$this->address 		= $obj->address;
+				$this->zip 			= $obj->zip;
+				$this->town 		= $obj->town;
+
+				$this->country_id   = $obj->country_id;
+				$this->country_code = $obj->country_id?$obj->country_code:'';
+				$this->country 		= $obj->country_id?($langs->trans('Country'.$obj->country_code)!='Country'.$obj->country_code?$langs->transnoentities('Country'.$obj->country_code):$obj->country):'';
+
+				$this->state_id     = $obj->fk_departement;
+				$this->state_code   = $obj->state_code;
+				$this->state        = ($obj->state!='-'?$obj->state:'');
+
+				$transcode=$langs->trans('StatusProspect'.$obj->fk_stcomm);
+				$libelle=($transcode!='StatusProspect'.$obj->fk_stcomm?$transcode:$obj->stcomm);
+				$this->stcomm_id = $obj->fk_stcomm;     // id statut commercial
+				$this->statut_commercial = $libelle;    // libelle statut commercial
+
+				$this->email = $obj->email;
+				$this->skype = $obj->skype;
+				$this->url = $obj->url;
+				$this->phone = $obj->phone;
+				$this->fax = $obj->fax;
+
+				$this->parent    = $obj->parent;
+
+				$this->idprof1		= $obj->idprof1;
+				$this->idprof2		= $obj->idprof2;
+				$this->idprof3		= $obj->idprof3;
+				$this->idprof4		= $obj->idprof4;
+				$this->idprof5		= $obj->idprof5;
+				$this->idprof6		= $obj->idprof6;
+
+				$this->capital   = $obj->capital;
+
+				$this->code_client = $obj->code_client;
+				$this->code_fournisseur = $obj->code_fournisseur;
+
+				$this->code_compta = $obj->code_compta;
+				$this->code_compta_fournisseur = $obj->code_compta_fournisseur;
+
+				$this->barcode = $obj->barcode;
+
+				$this->tva_assuj      = $obj->tva_assuj;
+				$this->tva_intra      = $obj->tva_intra;
+				$this->status = $obj->status;
+
+				// Local Taxes
+				$this->localtax1_assuj      = $obj->localtax1_assuj;
+				$this->localtax2_assuj      = $obj->localtax2_assuj;
+
+				$this->localtax1_value		= $obj->localtax1_value;
+				$this->localtax2_value		= $obj->localtax2_value;
+
+				$this->typent_id      = $obj->typent_id;
+				$this->typent_code    = $obj->typent_code;
+
+				$this->effectif_id    = $obj->effectif_id;
+				$this->effectif       = $obj->effectif_id?$obj->effectif:'';
+
+				$this->forme_juridique_code= $obj->forme_juridique_code;
+				$this->forme_juridique     = $obj->forme_juridique_code?$obj->forme_juridique:'';
+
+				$this->fk_prospectlevel = $obj->fk_prospectlevel;
+
+				$this->prefix_comm = $obj->prefix_comm;
+
+				$this->remise_percent		= $obj->remise_client;
+				$this->mode_reglement_id 	= $obj->mode_reglement;
+				$this->cond_reglement_id 	= $obj->cond_reglement;
+				$this->mode_reglement_supplier_id 	= $obj->mode_reglement_supplier;
+				$this->cond_reglement_supplier_id 	= $obj->cond_reglement_supplier;
+				$this->shipping_method_id   = ($obj->fk_shipping_method>0)?$obj->fk_shipping_method:null;
+				$this->fk_account			= $obj->fk_account;
+
+				$this->client      = $obj->client;
+				$this->fournisseur = $obj->fournisseur;
+
+				$this->note = $obj->note_private; // TODO Deprecated for backward comtability
+				$this->note_private = $obj->note_private;
+				$this->note_public = $obj->note_public;
+				$this->modelpdf = $obj->model_pdf;
+				$this->default_lang = $obj->default_lang;
+				$this->logo = $obj->logo;
+
+				$this->webservices_url = $obj->webservices_url;
+				$this->webservices_key = $obj->webservices_key;
+
+				$this->outstanding_limit		= $obj->outstanding_limit;
+
+				// multiprix
+				$this->price_level = $obj->price_level;
+
+				$this->import_key = $obj->import_key;
+
+				//Incoterms
+				$this->fk_incoterms = $obj->fk_incoterms;
+				$this->location_incoterms = $obj->location_incoterms;
+				$this->libelle_incoterms = $obj->libelle_incoterms;
+
+				// multicurrency
+				$this->fk_multicurrency = $obj->fk_multicurrency;
+				$this->multicurrency_code = $obj->multicurrency_code;
+
+				$result = 1;
+
+				// Retreive all extrafield for thirdparty
+			   	$this->fetch_optionals();
+			}
+			else
+			{
+				$result = 0;
+			}
+
+			$this->db->free($resql);
+		}
+		else
+		{
+			$this->error=$this->db->lasterror();
+			$result = -3;
+		}
+
+		// Use first price level if level not defined for third party
+		if (! empty($conf->global->PRODUIT_MULTIPRICES) && empty($this->price_level)) $this->price_level=1;
+
+		return $result;
+	}
+
+	/**
+	 * 	Search and fetch thirparties by name
+	 *
+	 * 	@param		string		$name		Name
+	 * 	@param		int			$type		Type of thirdparties (0=any, 1=customer, 2=prospect, 3=supplier)
+	 * 	@param		array		$filters	Array of couple field name/value to filter the companies with the same name
+	 * 	@param		boolean		$exact		Exact string search (true/false)
+	 * 	@param		boolean		$case		Case sensitive (true/false)
+	 * 	@param		boolean		$similar	Add test if string inside name into database, or name into database inside string. Do not use this: Not compatible with other database.
+	 * 	@param		string		$clause		Clause for filters
+	 * 	@return		array|int				<0 if KO, array of thirdparties object if OK
+	 */
+	function searchByName($name, $type='0', $filters = array(), $exact = false, $case = false, $similar = false, $clause = 'AND')
+	{
+		$thirdparties = array();
+
+		dol_syslog("searchByName name=".$name." type=".$type." exact=".$exact);
+
+		// Check parameter
+		if (empty($name))
+		{
+			$this->errors[]='ErrorBadValueForParameter';
+			return -1;
+		}
+
+		// Generation requete recherche
+		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe";
+		$sql.= " WHERE entity IN (".getEntity('category').")";
+		if (! empty($type))
+		{
+			if ($type == 1 || $type == 2)
+				$sql.= " AND client = ".$type;
+			elseif ($type == 3)
+				$sql.= " AND fournisseur = 1";
+		}
+		if (! empty($name))
+		{
+			if (! $exact)
+			{
+				if (preg_match('/^([\*])?[^*]+([\*])?$/', $name, $regs) && count($regs) > 1)
+				{
+					$name = str_replace('*', '%', $name);
+				}
+				else
+				{
+					$name = '%'.$name.'%';
+				}
+			}
+			$sql.= " AND ";
+			if (is_array($filters) && ! empty($filters))
+				$sql.= "(";
+			if ($similar)
+			{
+				// For test similitude (string inside name into database, or name into database inside string)
+				// Do not use this. Not compatible with other database.
+				$sql.= "(LOCATE('".$this->db->escape($name)."', nom) > 0 OR LOCATE(nom, '".$this->db->escape($name)."') > 0)";
+			}
+			else
+			{
+				if (! $case)
+					$sql.= "nom LIKE '".$this->db->escape($name)."'";
+				else
+					$sql.= "nom LIKE BINARY '".$this->db->escape($name)."'";
+			}
+		}
+		if (is_array($filters) && ! empty($filters))
+		{
+			foreach($filters as $field => $value)
+			{
+				if (! $exact)
+				{
+					if (preg_match('/^([\*])?[^*]+([\*])?$/', $value, $regs) && count($regs) > 1)
+					{
+						$value = str_replace('*', '%', $value);
+					}
+					else
+					{
+						$value = '%'.$value.'%';
+					}
+				}
+				if (! $case)
+					$sql.= " ".$clause." ".$field." LIKE '".$this->db->escape($value)."'";
+				else
+					$sql.= " ".$clause." ".$field." LIKE BINARY '".$this->db->escape($value)."'";
+			}
+			if (! empty($name))
+				$sql.= ")";
+		}
+
+		$res  = $this->db->query($sql);
+		if ($res)
+		{
+			while ($rec = $this->db->fetch_array($res))
+			{
+				$soc = new Societe($this->db);
+				$soc->fetch($rec['rowid']);
+				$thirdparties[] = $soc;
+			}
+
+			return $thirdparties;
+		}
+		else
+		{
+			$this->error=$this->db->lasterror();
+			return -1;
+		}
+	}
+
+	/**
+	 *    Delete a third party from database and all its dependencies (contacts, rib...)
+	 *
+	 *    @param	int		$id             Id of third party to delete
+	 *    @param    User    $fuser          User who ask to delete thirparty
+	 *    @param    int		$call_trigger   0=No, 1=yes
+	 *    @return	int						<0 if KO, 0 if nothing done, >0 if OK
+	 */
+	function delete($id, User $fuser=null, $call_trigger=1)
+	{
+		global $langs, $conf, $user;
+
+		if (empty($fuser)) $fuser=$user;
+
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+
+		$entity=isset($this->entity)?$this->entity:$conf->entity;
+
+		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
+		$error = 0;
+
+		// Test if child exists
+		$objectisused = $this->isObjectUsed($id);
+		if (empty($objectisused))
+		{
+			$this->db->begin();
+
+			// User is mandatory for trigger call
+			if (! $error && $call_trigger)
+			{
+				// Call trigger
+				$result=$this->call_trigger('COMPANY_DELETE',$fuser);
+				if ($result < 0) $error++;
+				// End call triggers
+			}
+
+			if (! $error)
+			{
+				require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+				$static_cat = new Categorie($this->db);
+				$toute_categs = array();
+
+				// Fill $toute_categs array with an array of (type => array of ("Categorie" instance))
+				if ($this->client || $this->prospect)
+				{
+					$toute_categs['societe'] = $static_cat->containing($this->id,Categorie::TYPE_CUSTOMER);
+				}
+				if ($this->fournisseur)
+				{
+					$toute_categs['fournisseur'] = $static_cat->containing($this->id,Categorie::TYPE_SUPPLIER);
+				}
+
+				// Remove each "Categorie"
+				foreach ($toute_categs as $type => $categs_type)
+				{
+					foreach ($categs_type as $cat)
+					{
+						$cat->del_type($this, $type);
+					}
+				}
+			}
+
+			foreach ($this->childtablesoncascade as $tabletodelete)
+			{
+				if (! $error)
+				{
+					$sql = "DELETE FROM ".MAIN_DB_PREFIX.$tabletodelete;
+					$sql.= " WHERE fk_soc = " . $id;
+					if (! $this->db->query($sql))
+					{
+						$error++;
+						$this->errors[] = $this->db->lasterror();
+					}
+				}
+			}
+
+			// Removed extrafields
+			if ((! $error) && (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))) // For avoid conflicts if trigger used
+			{
+				$result=$this->deleteExtraFields();
+				if ($result < 0)
+				{
+					$error++;
+					dol_syslog(get_class($this)."::delete error -3 ".$this->error, LOG_ERR);
+				}
+			}
+
+			// Remove third party
+			if (! $error)
+			{
+				$sql = "DELETE FROM ".MAIN_DB_PREFIX."societe";
+				$sql.= " WHERE rowid = " . $id;
+				if (! $this->db->query($sql))
+				{
+					$error++;
+					$this->errors[] = $this->db->lasterror();
+				}
+			}
+
+			if (! $error)
+			{
+				$this->db->commit();
+
+				// Delete directory
+				if (! empty($conf->societe->multidir_output[$entity]))
+				{
+					$docdir = $conf->societe->multidir_output[$entity] . "/" . $id;
+					if (dol_is_dir($docdir))
+					{
+						dol_delete_dir_recursive($docdir);
+					}
+				}
+
+				return 1;
+			}
+			else
+			{
+				dol_syslog($this->error, LOG_ERR);
+				$this->db->rollback();
+				return -1;
+			}
+		}
+		else dol_syslog("Can't remove thirdparty with id ".$id.". There is ".$objectisused." childs", LOG_WARNING);
+		return 0;
+	}
+
+	/**
+	 *  Define third party as a customer
+	 *
+	 *	@return		int		<0 if KO, >0 if OK
+	 */
+	function set_as_client()
+	{
+		if ($this->id)
+		{
+			$newclient=1;
+			if ($this->client == 2 || $this->client == 3) $newclient=3;	//If prospect, we keep prospect tag
+			$sql = "UPDATE ".MAIN_DB_PREFIX."societe";
+			$sql.= " SET client = ".$newclient;
+			$sql.= " WHERE rowid = " . $this->id;
+
+			$resql=$this->db->query($sql);
+			if ($resql)
+			{
+				$this->client = $newclient;
+				return 1;
+			}
+			else return -1;
+		}
+		return 0;
+	}
+
+	/**
+	 *  Definit la societe comme un client
+	 *
+	 *  @param	float	$remise		Valeur en % de la remise
+	 *  @param  string	$note		Note/Motif de modification de la remise
+	 *  @param  User	$user		Utilisateur qui definie la remise
+	 *	@return	int					<0 if KO, >0 if OK
+	 */
+	function set_remise_client($remise, $note, User $user)
+	{
+		global $conf, $langs;
+
+		// Nettoyage parametres
+		$note=trim($note);
+		if (! $note)
+		{
+			$this->error=$langs->trans("ErrorFieldRequired",$langs->trans("NoteReason"));
+			return -2;
+		}
+
+		dol_syslog(get_class($this)."::set_remise_client ".$remise.", ".$note.", ".$user->id);
+
+		if ($this->id)
+		{
+			$this->db->begin();
+
+			$now=dol_now();
+
+			// Positionne remise courante
+			$sql = "UPDATE ".MAIN_DB_PREFIX."societe ";
+			$sql.= " SET remise_client = '".$this->db->escape($remise)."'";
+			$sql.= " WHERE rowid = " . $this->id;
+			$resql=$this->db->query($sql);
+			if (! $resql)
+			{
+				$this->db->rollback();
+				$this->error=$this->db->error();
+				return -1;
+			}
+
+			// Ecrit trace dans historique des remises
+			$sql = "INSERT INTO ".MAIN_DB_PREFIX."societe_remise";
+			$sql.= " (entity, datec, fk_soc, remise_client, note, fk_user_author)";
+			$sql.= " VALUES (".$conf->entity.", '".$this->db->idate($now)."', ".$this->id.", '".$this->db->escape($remise)."',";
+			$sql.= " '".$this->db->escape($note)."',";
+			$sql.= " ".$user->id;
+			$sql.= ")";
+
+			$resql=$this->db->query($sql);
+			if (! $resql)
+			{
+				$this->db->rollback();
+				$this->error=$this->db->lasterror();
+				return -1;
+			}
+
+			$this->db->commit();
+			return 1;
+		}
+	}
+
+	/**
+	 *    	Add a discount for third party
+	 *
+	 *    	@param	float	$remise     Amount of discount
+	 *    	@param  User	$user       User adding discount
+	 *    	@param  string	$desc		Reason of discount
+	 *      @param  float	$tva_tx     VAT rate
+	 *		@return	int					<0 if KO, id of discount record if OK
+	 */
+	function set_remise_except($remise, User $user, $desc, $tva_tx=0)
+	{
+		global $langs;
+
+		// Clean parameters
+		$remise = price2num($remise);
+		$desc = trim($desc);
+
+		// Check parameters
+		if (! $remise > 0)
+		{
+			$this->error=$langs->trans("ErrorWrongValueForParameter","1");
+			return -1;
+		}
+		if (! $desc)
+		{
+			$this->error=$langs->trans("ErrorWrongValueForParameter","3");
+			return -2;
+		}
+
+		if ($this->id)
+		{
+			require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
+
+			$discount = new DiscountAbsolute($this->db);
+			$discount->fk_soc=$this->id;
+			$discount->amount_ht=price2num($remise,'MT');
+			$discount->amount_tva=price2num($remise*$tva_tx/100,'MT');
+			$discount->amount_ttc=price2num($discount->amount_ht+$discount->amount_tva,'MT');
+			$discount->tva_tx=price2num($tva_tx,'MT');
+			$discount->description=$desc;
+			$result=$discount->create($user);
+			if ($result > 0)
+			{
+				return $result;
+			}
+			else
+			{
+				$this->error=$discount->error;
+				return -3;
+			}
+		}
+		else return 0;
+	}
+
+	/**
+	 *  Renvoie montant TTC des reductions/avoirs en cours disponibles de la societe
+	 *
+	 *	@param	User	$user		Filtre sur un user auteur des remises
+	 * 	@param	string	$filter		Filtre autre
+	 * 	@param	integer	$maxvalue	Filter on max value for discount
+	 *	@return	int					<0 if KO, Credit note amount otherwise
+	 */
+	function getAvailableDiscounts($user='',$filter='',$maxvalue=0)
+	{
+		require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
+
+		$discountstatic=new DiscountAbsolute($this->db);
+		$result=$discountstatic->getAvailableDiscounts($this,$user,$filter,$maxvalue);
+		if ($result >= 0)
+		{
+			return $result;
+		}
+		else
+		{
+			$this->error=$discountstatic->error;
+			return -1;
+		}
+	}
+
+	/**
+	 *  Return array of sales representatives
+	 *
+	 *  @param	User	$user		Object user
+	 *  @return array       		Array of sales representatives of third party
+	 */
+	function getSalesRepresentatives(User $user)
+	{
+		global $conf;
+
+		$reparray=array();
+
+		$sql = "SELECT DISTINCT u.rowid, u.login, u.lastname, u.firstname, u.email, u.statut, u.entity, u.photo";
+		$sql.= " FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc, ".MAIN_DB_PREFIX."user as u";
+		if (! empty($conf->multicompany->enabled) && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
+		{
+			$sql.= ", ".MAIN_DB_PREFIX."usergroup_user as ug";
+			$sql.= " WHERE ((ug.fk_user = sc.fk_user";
+			$sql.= " AND ug.entity = ".$conf->entity.")";
+			$sql.= " OR u.admin = 1)";
+		}
+		else
+			$sql.= " WHERE entity in (0, ".$conf->entity.")";
+
+		$sql.= " AND u.rowid = sc.fk_user AND sc.fk_soc = ".$this->id;
+
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$num = $this->db->num_rows($resql);
+			$i=0;
+			while ($i < $num)
+			{
+				$obj = $this->db->fetch_object($resql);
+				$reparray[$i]['id']=$obj->rowid;
+				$reparray[$i]['lastname']=$obj->lastname;
+				$reparray[$i]['firstname']=$obj->firstname;
+				$reparray[$i]['email']=$obj->email;
+				$reparray[$i]['statut']=$obj->statut;
+				$reparray[$i]['entity']=$obj->entity;
+				$reparray[$i]['login']=$obj->login;
+				$reparray[$i]['photo']=$obj->photo;
+				$i++;
+			}
+			return $reparray;
+		}
+		else {
+			dol_print_error($this->db);
+			return -1;
+		}
+	}
+
+	/**
+	 * Set the price level
+	 *
+	 * @param 	int		$price_level	Level of price
+	 * @param 	User	$user			Use making change
+	 * @return	int						<0 if KO, >0 if OK
+	 */
+	function set_price_level($price_level, User $user)
+	{
+		if ($this->id)
+		{
+			$now=dol_now();
+
+			$sql  = "UPDATE ".MAIN_DB_PREFIX."societe";
+			$sql .= " SET price_level = '".$this->db->escape($price_level)."'";
+			$sql .= " WHERE rowid = " . $this->id;
+
+			if (! $this->db->query($sql))
+			{
+				dol_print_error($this->db);
+				return -1;
+			}
+
+			$sql  = "INSERT INTO ".MAIN_DB_PREFIX."societe_prices";
+			$sql .= " (datec, fk_soc, price_level, fk_user_author)";
+			$sql .= " VALUES ('".$this->db->idate($now)."', ".$this->id.", '".$this->db->escape($price_level)."', ".$user->id.")";
+
+			if (! $this->db->query($sql))
+			{
+				dol_print_error($this->db);
+				return -1;
+			}
+			return 1;
+		}
+		return -1;
+	}
+
+	/**
+	 *	Add link to sales representative
+	 *
+	 *	@param	User	$user		Object user
+	 *	@param	int		$commid		Id of user
+	 *	@return	void
+	 */
+	function add_commercial(User $user, $commid)
+	{
+		if ($this->id > 0 && $commid > 0)
+		{
+			$sql = "DELETE FROM  ".MAIN_DB_PREFIX."societe_commerciaux";
+			$sql.= " WHERE fk_soc = ".$this->id." AND fk_user =".$commid;
+
+			$this->db->query($sql);
+
+			$sql = "INSERT INTO ".MAIN_DB_PREFIX."societe_commerciaux";
+			$sql.= " ( fk_soc, fk_user )";
+			$sql.= " VALUES (".$this->id.",".$commid.")";
+
+			if (! $this->db->query($sql) )
+			{
+				dol_syslog(get_class($this)."::add_commercial Erreur");
+			}
+		}
+	}
+
+	/**
+	 *	Add link to sales representative
+	 *
+	 *	@param	User	$user		Object user
+	 *	@param	int		$commid		Id of user
+	 *	@return	void
+	 */
+	function del_commercial(User $user, $commid)
+	{
+		if ($this->id > 0 && $commid > 0)
+		{
+			$sql  = "DELETE FROM  ".MAIN_DB_PREFIX."societe_commerciaux ";
+			$sql .= " WHERE fk_soc = ".$this->id." AND fk_user =".$commid;
+
+			if (! $this->db->query($sql) )
+			{
+				dol_syslog(get_class($this)."::del_commercial Erreur");
+			}
+		}
+	}
+
+
+	/**
+	 *    	Return a link on thirdparty (with picto)
+	 *
+	 *		@param	int		$withpicto		          Add picto into link (0=No picto, 1=Include picto with link, 2=Picto only)
+	 *		@param	string	$option			          Target of link ('', 'customer', 'prospect', 'supplier', 'project')
+	 *		@param	int		$maxlen			          Max length of name
+	 *      @param	int  	$notooltip		          1=Disable tooltip
+	 *      @param  int     $save_lastsearch_value    -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+	 *		@return	string					          String with URL
+	 */
+	function getNomUrl($withpicto=0, $option='', $maxlen=0, $notooltip=0, $save_lastsearch_value=-1)
+	{
+		global $conf, $langs, $hookmanager;
+
+		if (! empty($conf->dol_no_mouse_hover)) $notooltip=1;   // Force disable tooltips
+
+		$name=$this->name?$this->name:$this->nom;
+
+		if (! empty($conf->global->SOCIETE_ADD_REF_IN_LIST) && (!empty($withpicto)))
+		{
+			if (($this->client) && (! empty ( $this->code_client ))
+				&& ($conf->global->SOCIETE_ADD_REF_IN_LIST == 1
+				|| $conf->global->SOCIETE_ADD_REF_IN_LIST == 2
+				)
+			)
+			$code = $this->code_client . ' - ';
+
+			if (($this->fournisseur) && (! empty ( $this->code_fournisseur ))
+				&& ($conf->global->SOCIETE_ADD_REF_IN_LIST == 1
+				|| $conf->global->SOCIETE_ADD_REF_IN_LIST == 3
+				)
+			)
+			$code .= $this->code_fournisseur . ' - ';
+
+			if ($conf->global->SOCIETE_ADD_REF_IN_LIST == 1)
+				$name =$code.' '.$name;
+			else
+				$name =$code;
+		}
+
+		if (!empty($this->name_alias)) $name .= ' ('.$this->name_alias.')';
+
+		$result=''; $label='';
+		$linkstart=''; $linkend='';
+
+		if (! empty($this->logo) && class_exists('Form'))
+		{
+			$label.= '<div class="photointooltip">';
+			$label.= Form::showphoto('societe', $this, 80, 0, 0, 'photowithmargin', 'mini');
+			$label.= '</div><div style="clear: both;"></div>';
+		}
+
+		$label.= '<div class="centpercent">';
+
+		if ($option == 'customer' || $option == 'compta' || $option == 'category' || $option == 'category_supplier')
+		{
+		   $label.= '<u>' . $langs->trans("ShowCustomer") . '</u>';
+		   $linkstart = '<a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$this->id;
+		}
+		else if ($option == 'prospect' && empty($conf->global->SOCIETE_DISABLE_PROSPECTS))
+		{
+			$label.= '<u>' . $langs->trans("ShowProspect") . '</u>';
+			$linkstart = '<a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$this->id;
+		}
+		else if ($option == 'supplier')
+		{
+			$label.= '<u>' . $langs->trans("ShowSupplier") . '</u>';
+			$linkstart = '<a href="'.DOL_URL_ROOT.'/fourn/card.php?socid='.$this->id;
+		}
+		else if ($option == 'agenda')
+		{
+			$label.= '<u>' . $langs->trans("ShowAgenda") . '</u>';
+			$linkstart = '<a href="'.DOL_URL_ROOT.'/societe/agenda.php?socid='.$this->id;
+		}
+		else if ($option == 'project')
+		{
+			$label.= '<u>' . $langs->trans("ShowProject") . '</u>';
+			$linkstart = '<a href="'.DOL_URL_ROOT.'/societe/project.php?socid='.$this->id;
+		}
+		else if ($option == 'margin')
+		{
+			$label.= '<u>' . $langs->trans("ShowMargin") . '</u>';
+			$linkstart = '<a href="'.DOL_URL_ROOT.'/margin/tabs/thirdpartyMargins.php?socid='.$this->id.'&type=1';
+		}
+		else if ($option == 'contact')
+		{
+			$label.= '<u>' . $langs->trans("ShowContacts") . '</u>';
+			$linkstart = '<a href="'.DOL_URL_ROOT.'/societe/contact.php?socid='.$this->id;
+		}
+
+		// By default
+		if (empty($linkstart))
+		{
+			$label.= '<u>' . $langs->trans("ShowCompany") . '</u>';
+			$linkstart = '<a href="'.DOL_URL_ROOT.'/societe/card.php?socid='.$this->id;
+		}
+
+		if (! empty($this->name))
+		{
+			$label.= '<br><b>' . $langs->trans('Name') . ':</b> '. $this->name;
+			if (! empty($this->name_alias)) $label.=' ('.$this->name_alias.')';
+			$label.= '<br><b>' . $langs->trans('Email') . ':</b> '. $this->email;
+		}
+		if (! empty($this->country_code))
+			$label.= '<br><b>' . $langs->trans('Country') . ':</b> '. $this->country_code;
+		if (! empty($this->tva_intra))
+			$label.= '<br><b>' . $langs->trans('VATNumber') . ':</b> '. $this->tva_intra;
+			if (! empty($this->code_client) && $this->client)
+			$label.= '<br><b>' . $langs->trans('CustomerCode') . ':</b> '. $this->code_client;
+		if (! empty($this->code_fournisseur) && $this->fournisseur)
+			$label.= '<br><b>' . $langs->trans('SupplierCode') . ':</b> '. $this->code_fournisseur;
+		if (! empty($conf->accounting->enabled) && $this->client)
+			$label.= '<br><b>' . $langs->trans('CustomerAccountancyCode') . ':</b> '. $this->code_compta_client;
+		if (! empty($conf->accounting->enabled) && $this->fournisseur)
+			$label.= '<br><b>' . $langs->trans('SupplierAccountancyCode') . ':</b> '. $this->code_compta_fournisseur;
+
+		$label.= '</div>';
+
+		// Add type of canvas
+		$linkstart.=(!empty($this->canvas)?'&canvas='.$this->canvas:'');
+		// Add param to save lastsearch_values or not
+		$add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0);
+		if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
+		if ($add_save_lastsearch_values) $linkstart.='&save_lastsearch_values=1';
+		$linkstart.='"';
+
+		$linkclose='';
+		if (empty($notooltip))
+		{
+			if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+			{
+				$label=$langs->trans("ShowCompany");
+				$linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
+			}
+			$linkclose.= ' title="'.dol_escape_htmltag($label, 1).'"';
+			$linkclose.=' class="classfortooltip"';
+
+		 	if (! is_object($hookmanager))
+			{
+				include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+				$hookmanager=new HookManager($this->db);
+			}
+			$hookmanager->initHooks(array('societedao'));
+			$parameters=array('id'=>$this->id);
+			$reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+			if ($reshook > 0) $linkclose = $hookmanager->resPrint;
+		}
+		$linkstart.=$linkclose.'>';
+		$linkend='</a>';
+
+		global $user;
+		if (! $user->rights->societe->client->voir && $user->societe_id > 0 && $this->id != $user->societe_id)
+		{
+			$linkstart='';
+			$linkend='';
+		}
+
+		if ($withpicto) $result.=($linkstart.img_object(($notooltip?'':$label), 'company', ($notooltip?'':'class="classfortooltip valigntextbottom"'), 0, 0, $notooltip?0:1).$linkend);
+		if ($withpicto && $withpicto != 2) $result.=' ';
+		if ($withpicto != 2) $result.=$linkstart.($maxlen?dol_trunc($name,$maxlen):$name).$linkend;
+
+		return $result;
+	}
+
+	/**
+	 *    Return label of status (activity, closed)
+	 *
+	 *    @param	int		$mode       0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long
+	 *    @return   string        		Libelle
+	 */
+	function getLibStatut($mode=0)
+	{
+		return $this->LibStatut($this->status,$mode);
+	}
+
+	/**
+	 *  Renvoi le libelle d'un statut donne
+	 *
+	 *  @param	int		$statut         Id statut
+	 *  @param	int		$mode           0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
+	 *  @return	string          		Libelle du statut
+	 */
+	function LibStatut($statut,$mode=0)
+	{
+		global $langs;
+		$langs->load('companies');
+
+		if ($mode == 0)
+		{
+			if ($statut==0) return $langs->trans("ActivityCeased");
+			if ($statut==1) return $langs->trans("InActivity");
+		}
+		if ($mode == 1)
+		{
+			if ($statut==0) return $langs->trans("ActivityCeased");
+			if ($statut==1) return $langs->trans("InActivity");
+		}
+		if ($mode == 2)
+		{
+			if ($statut==0) return img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"').' '.$langs->trans("ActivityCeased");
+			if ($statut==1) return img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"').' '.$langs->trans("InActivity");
+		}
+		if ($mode == 3)
+		{
+			if ($statut==0) return img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"');
+			if ($statut==1) return img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"');
+		}
+		if ($mode == 4)
+		{
+			if ($statut==0) return img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"').' '.$langs->trans("ActivityCeased");
+			if ($statut==1) return img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"').' '.$langs->trans("InActivity");
+		}
+		if ($mode == 5)
+		{
+			if ($statut==0) return $langs->trans("ActivityCeased").' '.img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"');
+			if ($statut==1) return $langs->trans("InActivity").' '.img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"');
+		}
+	}
+
+	/**
+	 *    Return list of contacts emails existing for third party
+	 *
+	 *	  @param	  int		$addthirdparty		1=Add also a record for thirdparty email
+	 *    @return     array       					Array of contacts emails
+	 */
+	function thirdparty_and_contact_email_array($addthirdparty=0)
+	{
+		global $langs;
+
+		$contact_emails = $this->contact_property_array('email',1);
+		if ($this->email && $addthirdparty)
+		{
+			if (empty($this->name)) $this->name=$this->nom;
+			$contact_emails['thirdparty']=$langs->trans("ThirdParty").': '.dol_trunc($this->name,16)." &lt;".$this->email."&gt;";
+		}
+		//var_dump($contact_emails)
+		return $contact_emails;
+	}
+
+	/**
+	 *    Return list of contacts mobile phone existing for third party
+	 *
+	 *    @return     array       Array of contacts emails
+	 */
+	function thirdparty_and_contact_phone_array()
+	{
+		global $langs;
+
+		$contact_phone = $this->contact_property_array('mobile');
+
+		if (! empty($this->phone))	// If a phone of thirdparty is defined, we add it ot mobile of contacts
+		{
+			if (empty($this->name)) $this->name=$this->nom;
+			// TODO: Tester si tel non deja present dans tableau contact
+			$contact_phone['thirdparty']=$langs->trans("ThirdParty").': '.dol_trunc($this->name,16)." &lt;".$this->phone."&gt;";
+		}
+		return $contact_phone;
+	}
+
+	/**
+	 *  Return list of contacts emails or mobile existing for third party
+	 *
+	 *  @param	string	$mode       		'email' or 'mobile'
+	 * 	@param	int		$hidedisabled		1=Hide contact if disabled
+	 *  @return array       				Array of contacts emails or mobile array(id=>'Name <email>')
+	 */
+	function contact_property_array($mode='email', $hidedisabled=0)
+	{
+		global $langs;
+
+		$contact_property = array();
+
+
+		$sql = "SELECT rowid, email, statut, phone_mobile, lastname, poste, firstname";
+		$sql.= " FROM ".MAIN_DB_PREFIX."socpeople";
+		$sql.= " WHERE fk_soc = ".$this->id;
+
+		$resql=$this->db->query($sql);
+		if ($resql)
+		{
+			$nump = $this->db->num_rows($resql);
+			if ($nump)
+			{
+				$sepa="("; $sepb=")";
+				if ($mode == 'email')
+				{
+					$sepa="&lt;"; $sepb="&gt;";
+				}
+				$i = 0;
+				while ($i < $nump)
+				{
+					$obj = $this->db->fetch_object($resql);
+					if ($mode == 'email') $property=$obj->email;
+					else if ($mode == 'mobile') $property=$obj->phone_mobile;
+					else $property=$obj->$mode;
+
+					// Show all contact. If hidedisabled is 1, showonly contacts with status = 1
+					if ($obj->statut == 1 || empty($hidedisabled))
+					{
+						if (empty($property))
+						{
+							if ($mode == 'email') $property=$langs->trans("NoEMail");
+							else if ($mode == 'mobile') $property=$langs->trans("NoMobilePhone");
+						}
+
+						if (!empty($obj->poste))
+						{
+							$contact_property[$obj->rowid] = trim(dolGetFirstLastname($obj->firstname,$obj->lastname)).($obj->poste?" - ".$obj->poste:"").(($mode != 'poste' && $property)?" ".$sepa.$property.$sepb:'');
+						}
+						else
+						{
+							$contact_property[$obj->rowid] = trim(dolGetFirstLastname($obj->firstname,$obj->lastname)).(($mode != 'poste' && $property)?" ".$sepa.$property.$sepb:'');
+						}
+					}
+					$i++;
+				}
+			}
+		}
+		else
+		{
+			dol_print_error($this->db);
+		}
+		return $contact_property;
+	}
+
+
+	/**
+	 *    Renvoie la liste des contacts de cette societe
+	 *
+	 *    @return     array      tableau des contacts
+	 */
+	function contact_array()
+	{
+		$contacts = array();
+
+		$sql = "SELECT rowid, lastname, firstname FROM ".MAIN_DB_PREFIX."socpeople WHERE fk_soc = ".$this->id;
+		$resql=$this->db->query($sql);
+		if ($resql)
+		{
+			$nump = $this->db->num_rows($resql);
+			if ($nump)
+			{
+				$i = 0;
+				while ($i < $nump)
+				{
+					$obj = $this->db->fetch_object($resql);
+					$contacts[$obj->rowid] = dolGetFirstLastname($obj->firstname,$obj->lastname);
+					$i++;
+				}
+			}
+		}
+		else
+		{
+			dol_print_error($this->db);
+		}
+		return $contacts;
+	}
+
+	/**
+	 *    Renvoie la liste des contacts de cette societe
+	 *
+	 *    @return    array    $contacts    tableau des contacts
+	 */
+	function contact_array_objects()
+	{
+		require_once DOL_DOCUMENT_ROOT . '/contact/class/contact.class.php';
+		$contacts = array();
+
+		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."socpeople WHERE fk_soc = ".$this->id;
+		$resql=$this->db->query($sql);
+		if ($resql)
+		{
+			$nump = $this->db->num_rows($resql);
+			if ($nump)
+			{
+				$i = 0;
+				while ($i < $nump)
+				{
+					$obj = $this->db->fetch_object($resql);
+					$contact = new Contact($this->db);
+					$contact->fetch($obj->rowid);
+					$contacts[] = $contact;
+					$i++;
+				}
+			}
+		}
+		else
+		{
+			dol_print_error($this->db);
+		}
+		return $contacts;
+	}
+
+	/**
+	 *  Return property of contact from its id
+	 *
+	 *  @param	int		$rowid      id of contact
+	 *  @param  string	$mode       'email' or 'mobile'
+	 *  @return string  			Email of contact with format: "Full name <email>"
+	 */
+	function contact_get_property($rowid,$mode)
+	{
+		$contact_property='';
+
+		if (empty($rowid)) return '';
+
+		$sql = "SELECT rowid, email, phone_mobile, lastname, firstname";
+		$sql.= " FROM ".MAIN_DB_PREFIX."socpeople";
+		$sql.= " WHERE rowid = '".$rowid."'";
+
+		$resql=$this->db->query($sql);
+		if ($resql)
+		{
+			$nump = $this->db->num_rows($resql);
+
+			if ($nump)
+			{
+				$obj = $this->db->fetch_object($resql);
+
+				if ($mode == 'email') $contact_property = dolGetFirstLastname($obj->firstname, $obj->lastname)." <".$obj->email.">";
+				else if ($mode == 'mobile') $contact_property = $obj->phone_mobile;
+			}
+			return $contact_property;
+		}
+		else
+		{
+			dol_print_error($this->db);
+		}
+
+	}
+
+
+	/**
+	 *  Return bank number property of thirdparty (label or rum)
+	 *
+	 *	@param	string	$mode	'label' or 'rum'
+	 *  @return	string			Bank number
+	 */
+	function display_rib($mode='label')
+	{
+		require_once DOL_DOCUMENT_ROOT . '/societe/class/companybankaccount.class.php';
+
+		$bac = new CompanyBankAccount($this->db);
+		$bac->fetch(0,$this->id);
+
+		if ($mode == 'label')
+		{
+			return $bac->getRibLabel(true);
+		}
+		elseif ($mode == 'rum')
+		{
+			if (empty($bac->rum))
+			{
+				require_once DOL_DOCUMENT_ROOT . '/compta/prelevement/class/bonprelevement.class.php';
+				$prelevement = new BonPrelevement($this->db);
+				$bac->fetch_thirdparty();
+				$bac->rum = $prelevement->buildRumNumber($bac->thirdparty->code_client, $bac->datec, $bac->id);
+			}
+			return $bac->rum;
+		}
+
+		return 'BadParameterToFunctionDisplayRib';
+	}
+
+	/**
+	 * Return Array of RIB
+	 *
+	 * @return     array|int        0 if KO, Array of CompanyBanckAccount if OK
+	 */
+	function get_all_rib()
+	{
+		require_once DOL_DOCUMENT_ROOT . '/societe/class/companybankaccount.class.php';
+		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_rib WHERE fk_soc = ".$this->id;
+		$result = $this->db->query($sql);
+		if (!$result) {
+			$this->error++;
+			$this->errors[] = $this->db->lasterror;
+			return 0;
+		} else {
+			$num_rows = $this->db->num_rows($result);
+			$rib_array = array();
+			if ($num_rows) {
+				while ($obj = $this->db->fetch_object($result)) {
+					$rib = new CompanyBankAccount($this->db);
+					$rib->fetch($obj->rowid);
+					$rib_array[] = $rib;
+				}
+			}
+			return $rib_array;
+		}
+	}
+
+	/**
+	 *  Attribut un code client a partir du module de controle des codes.
+	 *  Return value is stored into this->code_client
+	 *
+	 *	@param	Societe		$objsoc		Object thirdparty
+	 *	@param	int			$type		Should be 0 to say customer
+	 *  @return void
+	 */
+	function get_codeclient($objsoc=0,$type=0)
+	{
+		global $conf;
+		if (! empty($conf->global->SOCIETE_CODECLIENT_ADDON))
+		{
+			$module=$conf->global->SOCIETE_CODECLIENT_ADDON;
+
+			$dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']);
+			foreach ($dirsociete as $dirroot)
+			{
+				$res=dol_include_once($dirroot.$module.'.php');
+				if ($res) break;
+			}
+			$mod = new $module();
+
+			$this->code_client = $mod->getNextValue($objsoc,$type);
+			$this->prefixCustomerIsRequired = $mod->prefixIsRequired;
+
+			dol_syslog(get_class($this)."::get_codeclient code_client=".$this->code_client." module=".$module);
+		}
+	}
+
+	/**
+	 *  Attribut un code fournisseur a partir du module de controle des codes.
+	 *  Return value is stored into this->code_fournisseur
+	 *
+	 *	@param	Societe		$objsoc		Object thirdparty
+	 *	@param	int			$type		Should be 1 to say supplier
+	 *  @return void
+	 */
+	function get_codefournisseur($objsoc=0,$type=1)
+	{
+		global $conf;
+		if (! empty($conf->global->SOCIETE_CODECLIENT_ADDON))
+		{
+			$module=$conf->global->SOCIETE_CODECLIENT_ADDON;
+
+			$dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']);
+			foreach ($dirsociete as $dirroot)
+			{
+				$res=dol_include_once($dirroot.$module.'.php');
+				if ($res) break;
+			}
+			$mod = new $module();
+
+			$this->code_fournisseur = $mod->getNextValue($objsoc,$type);
+
+			dol_syslog(get_class($this)."::get_codefournisseur code_fournisseur=".$this->code_fournisseur." module=".$module);
+		}
+	}
+
+	/**
+	 *    Verifie si un code client est modifiable en fonction des parametres
+	 *    du module de controle des codes.
+	 *
+	 *    @return     int		0=No, 1=Yes
+	 */
+	function codeclient_modifiable()
+	{
+		global $conf;
+		if (! empty($conf->global->SOCIETE_CODECLIENT_ADDON))
+		{
+			$module=$conf->global->SOCIETE_CODECLIENT_ADDON;
+
+			$dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']);
+			foreach ($dirsociete as $dirroot)
+			{
+				$res=dol_include_once($dirroot.$module.'.php');
+				if ($res) break;
+			}
+
+			$mod = new $module();
+
+			dol_syslog(get_class($this)."::codeclient_modifiable code_client=".$this->code_client." module=".$module);
+			if ($mod->code_modifiable_null && ! $this->code_client) return 1;
+			if ($mod->code_modifiable_invalide && $this->check_codeclient() < 0) return 1;
+			if ($mod->code_modifiable) return 1;	// A mettre en dernier
+			return 0;
+		}
+		else
+		{
+			return 0;
+		}
+	}
+
+
+	/**
+	 *    Verifie si un code fournisseur est modifiable dans configuration du module de controle des codes
+	 *
+	 *    @return     int		0=No, 1=Yes
+	 */
+	function codefournisseur_modifiable()
+	{
+		global $conf;
+		if (! empty($conf->global->SOCIETE_CODECLIENT_ADDON))
+		{
+			$module=$conf->global->SOCIETE_CODECLIENT_ADDON;
+
+			$dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']);
+			foreach ($dirsociete as $dirroot)
+			{
+				$res=dol_include_once($dirroot.$module.'.php');
+				if ($res) break;
+			}
+
+			$mod = new $module();
+
+			dol_syslog(get_class($this)."::codefournisseur_modifiable code_founisseur=".$this->code_fournisseur." module=".$module);
+			if ($mod->code_modifiable_null && ! $this->code_fournisseur) return 1;
+			if ($mod->code_modifiable_invalide && $this->check_codefournisseur() < 0) return 1;
+			if ($mod->code_modifiable) return 1;	// A mettre en dernier
+			return 0;
+		}
+		else
+		{
+			return 0;
+		}
+	}
+
+
+	/**
+	 *  Check customer code
+	 *
+	 *  @return     int				0 if OK
+	 * 								-1 ErrorBadCustomerCodeSyntax
+	 * 								-2 ErrorCustomerCodeRequired
+	 * 								-3 ErrorCustomerCodeAlreadyUsed
+	 * 								-4 ErrorPrefixRequired
+	 */
+	function check_codeclient()
+	{
+		global $conf;
+		if (! empty($conf->global->SOCIETE_CODECLIENT_ADDON))
+		{
+			$module=$conf->global->SOCIETE_CODECLIENT_ADDON;
+
+			$dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']);
+			foreach ($dirsociete as $dirroot)
+			{
+				$res=dol_include_once($dirroot.$module.'.php');
+				if ($res) break;
+			}
+
+			$mod = new $module();
+
+		   	dol_syslog(get_class($this)."::check_codeclient code_client=".$this->code_client." module=".$module);
+		   	$result = $mod->verif($this->db, $this->code_client, $this, 0);
+			return $result;
+		}
+		else
+		{
+			return 0;
+		}
+	}
+
+	/**
+	 *    Check supplier code
+	 *
+	 *    @return     int		0 if OK
+	 * 							-1 ErrorBadCustomerCodeSyntax
+	 * 							-2 ErrorCustomerCodeRequired
+	 * 							-3 ErrorCustomerCodeAlreadyUsed
+	 * 							-4 ErrorPrefixRequired
+	 */
+	function check_codefournisseur()
+	{
+		global $conf;
+		if (! empty($conf->global->SOCIETE_CODECLIENT_ADDON))
+		{
+			$module=$conf->global->SOCIETE_CODECLIENT_ADDON;
+
+			$dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']);
+			foreach ($dirsociete as $dirroot)
+			{
+				$res=dol_include_once($dirroot.$module.'.php');
+				if ($res) break;
+			}
+
+			$mod = new $module();
+
+			dol_syslog(get_class($this)."::check_codefournisseur code_fournisseur=".$this->code_fournisseur." module=".$module);
+			$result = $mod->verif($this->db, $this->code_fournisseur, $this, 1);
+			return $result;
+		}
+		else
+		{
+			return 0;
+		}
+	}
+
+	/**
+	 *    	Renvoie un code compta, suivant le module de code compta.
+	 *      Peut etre identique a celui saisit ou genere automatiquement.
+	 *      A ce jour seule la generation automatique est implementee
+	 *
+	 *    	@param	string	$type		Type of thirdparty ('customer' or 'supplier')
+	 *		@return	string				Code compta si ok, 0 si aucun, <0 si ko
+	 */
+	function get_codecompta($type)
+	{
+		global $conf;
+
+		if (! empty($conf->global->SOCIETE_CODECOMPTA_ADDON))
+		{
+			$file='';
+			$dirsociete=array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
+			foreach ($dirsociete as $dirroot)
+			{
+				if (file_exists(DOL_DOCUMENT_ROOT.'/'.$dirroot.$conf->global->SOCIETE_CODECOMPTA_ADDON.".php"))
+				{
+					$file=$dirroot.$conf->global->SOCIETE_CODECOMPTA_ADDON.".php";
+					break;
+				}
+			}
+
+			if (! empty($file))
+			{
+				dol_include_once($file);
+
+				$classname = $conf->global->SOCIETE_CODECOMPTA_ADDON;
+				$mod = new $classname;
+
+				// Defini code compta dans $mod->code
+				$result = $mod->get_code($this->db, $this, $type);
+
+				if ($type == 'customer') $this->code_compta = $mod->code;
+				else if ($type == 'supplier') $this->code_compta_fournisseur = $mod->code;
+
+				return $result;
+			}
+			else
+			{
+				$this->error = 'ErrorAccountancyCodeNotDefined';
+				return -1;
+			}
+		}
+		else
+		{
+			if ($type == 'customer') $this->code_compta = '';
+			else if ($type == 'supplier') $this->code_compta_fournisseur = '';
+
+			return 0;
+		}
+	}
+
+	/**
+	 *    Define parent commany of current company
+	 *
+	 *    @param	int		$id     Id of thirdparty to set or '' to remove
+	 *    @return	int     		<0 if KO, >0 if OK
+	 */
+	function set_parent($id)
+	{
+		if ($this->id)
+		{
+			$sql = "UPDATE ".MAIN_DB_PREFIX."societe";
+			$sql.= " SET parent = ".($id > 0 ? $id : "null");
+			$sql.= " WHERE rowid = " . $this->id;
+			dol_syslog(get_class($this).'::set_parent', LOG_DEBUG);
+			$resql=$this->db->query($sql);
+			if ($resql)
+			{
+				$this->parent = $id;
+				return 1;
+			}
+			else
+			{
+				return -1;
+			}
+		}
+		else return -1;
+	}
+
+	/**
+	 *  Returns if a profid sould be verified
+	 *
+	 *  @param	int		$idprof		1,2,3,4,5,6 (Exemple: 1=siren,2=siret,3=naf,4=rcs/rm,5=idprof5,6=idprof6)
+	 *  @return boolean         	true , false
+	 */
+	function id_prof_verifiable($idprof)
+	{
+		global $conf;
+
+	 	switch($idprof)
+		{
+			case 1:
+				$ret=(!$conf->global->SOCIETE_IDPROF1_UNIQUE?false:true);
+				break;
+			case 2:
+				$ret=(!$conf->global->SOCIETE_IDPROF2_UNIQUE?false:true);
+				break;
+			case 3:
+				$ret=(!$conf->global->SOCIETE_IDPROF3_UNIQUE?false:true);
+				break;
+			case 4:
+				$ret=(!$conf->global->SOCIETE_IDPROF4_UNIQUE?false:true);
+				break;
+			case 5:
+				$ret=(!$conf->global->SOCIETE_IDPROF5_UNIQUE?false:true);
+				break;
+			case 6:
+				$ret=(!$conf->global->SOCIETE_IDPROF6_UNIQUE?false:true);
+				break;
+			default:
+				$ret=false;
+		}
+
+		return $ret;
+	}
+
+	/**
+	 *    Verify if a profid exists into database for others thirds
+	 *
+	 *    @param	string	$idprof		'idprof1','idprof2','idprof3','idprof4','idprof5','idprof6','email' (Example: idprof1=siren, idprof2=siret, idprof3=naf, idprof4=rcs/rm)
+	 *    @param	string	$value		Value of profid
+	 *    @param	int		$socid		Id of thirdparty to exclude (if update)
+	 *    @return   boolean				True if exists, False if not
+	 */
+	function id_prof_exists($idprof, $value, $socid=0)
+	{
+		$field = $idprof;
+
+	 	switch($idprof)	// For backward compatibility
+		{
+			case '1':
+			case 'idprof1':
+				$field="siren";
+				break;
+			case '2':
+			case 'idprof2':
+				$field="siret";
+				break;
+			case '3':
+			case 'idprof3':
+				$field="ape";
+				break;
+			case '4':
+			case 'idprof4':
+				$field="idprof4";
+				break;
+			case '5':
+				$field="idprof5";
+				break;
+			case '6':
+				$field="idprof6";
+				break;
+	 	}
+
+		 //Verify duplicate entries
+		$sql  = "SELECT COUNT(*) as idprof FROM ".MAIN_DB_PREFIX."societe WHERE ".$field." = '".$value."' AND entity IN (".getEntity('societe').")";
+		if($socid) $sql .= " AND rowid <> ".$socid;
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$obj = $this->db->fetch_object($resql);
+			$count = $obj->idprof;
+		}
+		else
+		{
+			$count = 0;
+			print $this->db->error();
+		}
+		$this->db->free($resql);
+
+		if ($count > 0) return true;
+		else return false;
+	}
+
+	/**
+	 *  Verifie la validite d'un identifiant professionnel en fonction du pays de la societe (siren, siret, ...)
+	 *
+	 *  @param	int			$idprof         1,2,3,4 (Exemple: 1=siren,2=siret,3=naf,4=rcs/rm)
+	 *  @param  Societe		$soc            Objet societe
+	 *  @return int             			<=0 if KO, >0 if OK
+	 *  TODO better to have this in a lib than into a business class
+	 */
+	function id_prof_check($idprof,$soc)
+	{
+		global $conf;
+
+		$ok=1;
+
+		if (! empty($conf->global->MAIN_DISABLEPROFIDRULES)) return 1;
+
+		// Verifie SIREN si pays FR
+		if ($idprof == 1 && $soc->country_code == 'FR')
+		{
+			$chaine=trim($this->idprof1);
+			$chaine=preg_replace('/(\s)/','',$chaine);
+
+			if (dol_strlen($chaine) != 9) return -1;
+
+			$sum = 0;
+
+			for ($i = 0 ; $i < 10 ; $i = $i+2)
+			{
+				$sum = $sum + substr($this->idprof1, (8 - $i), 1);
+			}
+
+			for ($i = 1 ; $i < 9 ; $i = $i+2)
+			{
+				$ps = 2 * substr($this->idprof1, (8 - $i), 1);
+
+				if ($ps > 9)
+				{
+					$ps = substr($ps, 0,1) + substr($ps, 1, 1);
+				}
+				$sum = $sum + $ps;
+			}
+
+			if (substr($sum, -1) != 0) return -1;
+		}
+
+		// Verifie SIRET si pays FR
+		if ($idprof == 2 && $soc->country_code == 'FR')
+		{
+			$chaine=trim($this->idprof2);
+			$chaine=preg_replace('/(\s)/','',$chaine);
+
+			if (dol_strlen($chaine) != 14) return -1;
+		}
+
+		//Verify CIF/NIF/NIE if pays ES
+		//Returns: 1 if NIF ok, 2 if CIF ok, 3 if NIE ok, -1 if NIF bad, -2 if CIF bad, -3 if NIE bad, 0 if unexpected bad
+		if ($idprof == 1 && $soc->country_code == 'ES')
+		{
+			$string=trim($this->idprof1);
+			$string=preg_replace('/(\s)/','',$string);
+			$string = strtoupper($string);
+
+			for ($i = 0; $i < 9; $i ++)
+			$num[$i] = substr($string, $i, 1);
+
+			//Check format
+			if (!preg_match('/((^[A-Z]{1}[0-9]{7}[A-Z0-9]{1}$|^[T]{1}[A-Z0-9]{8}$)|^[0-9]{8}[A-Z]{1}$)/', $string))
+			return 0;
+
+			//Check NIF
+			if (preg_match('/(^[0-9]{8}[A-Z]{1}$)/', $string))
+			if ($num[8] == substr('TRWAGMYFPDXBNJZSQVHLCKE', substr($string, 0, 8) % 23, 1))
+			return 1;
+			else
+			return -1;
+
+			//algorithm checking type code CIF
+			$sum = $num[2] + $num[4] + $num[6];
+			for ($i = 1; $i < 8; $i += 2)
+			$sum += substr((2 * $num[$i]),0,1) + substr((2 * $num[$i]),1,1);
+			$n = 10 - substr($sum, strlen($sum) - 1, 1);
+
+			//Chek special NIF
+			if (preg_match('/^[KLM]{1}/', $string))
+			if ($num[8] == chr(64 + $n) || $num[8] == substr('TRWAGMYFPDXBNJZSQVHLCKE', substr($string, 1, 8) % 23, 1))
+			return 1;
+			else
+			return -1;
+
+			//Check CIF
+			if (preg_match('/^[ABCDEFGHJNPQRSUVW]{1}/', $string))
+			if ($num[8] == chr(64 + $n) || $num[8] == substr($n, strlen($n) - 1, 1))
+			return 2;
+			else
+			return -2;
+
+			//Check NIE T
+			if (preg_match('/^[T]{1}/', $string))
+			if ($num[8] == preg_match('/^[T]{1}[A-Z0-9]{8}$/', $string))
+			return 3;
+			else
+			return -3;
+
+			//Check NIE XYZ
+			if (preg_match('/^[XYZ]{1}/', $string))
+			if ($num[8] == substr('TRWAGMYFPDXBNJZSQVHLCKE', substr(str_replace(array('X','Y','Z'), array('0','1','2'), $string), 0, 8) % 23, 1))
+			return 3;
+			else
+			return -3;
 
-            // User is mandatory for trigger call
-            if (! $error && $call_trigger)
-            {
-                // Call trigger
-                $result=$this->call_trigger('COMPANY_DELETE',$fuser);
-                if ($result < 0) $error++;
-                // End call triggers
-            }
+			//Can not be verified
+			return -4;
+		}
 
-			if (! $error)
-			{
-	            require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
-	            $static_cat = new Categorie($this->db);
-	            $toute_categs = array();
-
-	            // Fill $toute_categs array with an array of (type => array of ("Categorie" instance))
-	            if ($this->client || $this->prospect)
-	            {
-	                $toute_categs['societe'] = $static_cat->containing($this->id,Categorie::TYPE_CUSTOMER);
-	            }
-	            if ($this->fournisseur)
-	            {
-	                $toute_categs['fournisseur'] = $static_cat->containing($this->id,Categorie::TYPE_SUPPLIER);
-	            }
-
-	            // Remove each "Categorie"
-	            foreach ($toute_categs as $type => $categs_type)
-	            {
-	                foreach ($categs_type as $cat)
-	                {
-	                    $cat->del_type($this, $type);
-	                }
-	            }
-			}
+		return $ok;
+	}
 
-			foreach ($this->childtablesoncascade as $tabletodelete)
-			{
-				if (! $error)
-				{
-					$sql = "DELETE FROM ".MAIN_DB_PREFIX.$tabletodelete;
-					$sql.= " WHERE fk_soc = " . $id;
-					if (! $this->db->query($sql))
-					{
-						$error++;
-						$this->errors[] = $this->db->lasterror();
-					}
-				}
-			}
+	/**
+	 *   Return an url to check online a professional id or empty string
+	 *
+	 *   @param		int		$idprof         1,2,3,4 (Example: 1=siren,2=siret,3=naf,4=rcs/rm)
+	 *   @param 	Societe	$thirdparty     Object thirdparty
+	 *   @return	string          		Url or empty string if no URL known
+	 *   TODO better in a lib than into business class
+	 */
+	function id_prof_url($idprof,$thirdparty)
+	{
+		global $conf,$langs,$hookmanager;
 
-            // Removed extrafields
-            if ((! $error) && (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))) // For avoid conflicts if trigger used
-            {
-            	$result=$this->deleteExtraFields();
-            	if ($result < 0)
-            	{
-            		$error++;
-            		dol_syslog(get_class($this)."::delete error -3 ".$this->error, LOG_ERR);
-            	}
-            }
-
-            // Remove third party
-            if (! $error)
-            {
-                $sql = "DELETE FROM ".MAIN_DB_PREFIX."societe";
-                $sql.= " WHERE rowid = " . $id;
-                if (! $this->db->query($sql))
-                {
-                    $error++;
-                    $this->errors[] = $this->db->lasterror();
-                }
-            }
-
-            if (! $error)
-            {
-                $this->db->commit();
-
-                // Delete directory
-                if (! empty($conf->societe->multidir_output[$entity]))
-                {
-                	$docdir = $conf->societe->multidir_output[$entity] . "/" . $id;
-                	if (dol_is_dir($docdir))
-                	{
-                    	dol_delete_dir_recursive($docdir);
-                	}
-                }
-
-                return 1;
-            }
-            else
-			{
-				dol_syslog($this->error, LOG_ERR);
-                $this->db->rollback();
-                return -1;
-            }
-        }
-		else dol_syslog("Can't remove thirdparty with id ".$id.". There is ".$objectisused." childs", LOG_WARNING);
-        return 0;
-    }
-
-    /**
-     *  Define third party as a customer
-     *
-     *	@return		int		<0 if KO, >0 if OK
-     */
-    function set_as_client()
-    {
-        if ($this->id)
-        {
-            $newclient=1;
-            if ($this->client == 2 || $this->client == 3) $newclient=3;	//If prospect, we keep prospect tag
-            $sql = "UPDATE ".MAIN_DB_PREFIX."societe";
-            $sql.= " SET client = ".$newclient;
-            $sql.= " WHERE rowid = " . $this->id;
-
-            $resql=$this->db->query($sql);
-            if ($resql)
-            {
-                $this->client = $newclient;
-                return 1;
-            }
-            else return -1;
-        }
-        return 0;
-    }
-
-    /**
-     *  Definit la societe comme un client
-     *
-     *  @param	float	$remise		Valeur en % de la remise
-     *  @param  string	$note		Note/Motif de modification de la remise
-     *  @param  User	$user		Utilisateur qui definie la remise
-     *	@return	int					<0 if KO, >0 if OK
-     */
-    function set_remise_client($remise, $note, User $user)
-    {
-        global $conf, $langs;
-
-        // Nettoyage parametres
-        $note=trim($note);
-        if (! $note)
-        {
-            $this->error=$langs->trans("ErrorFieldRequired",$langs->trans("NoteReason"));
-            return -2;
-        }
+		$url='';
+		$action = '';
 
-        dol_syslog(get_class($this)."::set_remise_client ".$remise.", ".$note.", ".$user->id);
-
-        if ($this->id)
-        {
-            $this->db->begin();
-
-            $now=dol_now();
-
-            // Positionne remise courante
-            $sql = "UPDATE ".MAIN_DB_PREFIX."societe ";
-            $sql.= " SET remise_client = '".$this->db->escape($remise)."'";
-            $sql.= " WHERE rowid = " . $this->id;
-            $resql=$this->db->query($sql);
-            if (! $resql)
-            {
-                $this->db->rollback();
-                $this->error=$this->db->error();
-                return -1;
-            }
-
-            // Ecrit trace dans historique des remises
-            $sql = "INSERT INTO ".MAIN_DB_PREFIX."societe_remise";
-            $sql.= " (entity, datec, fk_soc, remise_client, note, fk_user_author)";
-            $sql.= " VALUES (".$conf->entity.", '".$this->db->idate($now)."', ".$this->id.", '".$this->db->escape($remise)."',";
-            $sql.= " '".$this->db->escape($note)."',";
-            $sql.= " ".$user->id;
-            $sql.= ")";
-
-            $resql=$this->db->query($sql);
-            if (! $resql)
-            {
-                $this->db->rollback();
-                $this->error=$this->db->lasterror();
-                return -1;
-            }
-
-            $this->db->commit();
-            return 1;
-        }
-    }
-
-    /**
-     *    	Add a discount for third party
-     *
-     *    	@param	float	$remise     Amount of discount
-     *    	@param  User	$user       User adding discount
-     *    	@param  string	$desc		Reason of discount
-     *      @param  float	$tva_tx     VAT rate
-     *		@return	int					<0 if KO, id of discount record if OK
-     */
-    function set_remise_except($remise, User $user, $desc, $tva_tx=0)
-    {
-        global $langs;
-
-        // Clean parameters
-        $remise = price2num($remise);
-        $desc = trim($desc);
-
-        // Check parameters
-        if (! $remise > 0)
-        {
-            $this->error=$langs->trans("ErrorWrongValueForParameter","1");
-            return -1;
-        }
-        if (! $desc)
-        {
-            $this->error=$langs->trans("ErrorWrongValueForParameter","3");
-            return -2;
-        }
+		$hookmanager->initHooks(array('idprofurl'));
+		$parameters=array('idprof'=>$idprof, 'company'=>$thirdparty);
+		$reshook=$hookmanager->executeHooks('getIdProfUrl',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+		if (empty($reshook))
+		{
+			if (! empty($conf->global->MAIN_DISABLEPROFIDRULES)) return '';
 
-        if ($this->id)
-        {
-            require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
-
-            $discount = new DiscountAbsolute($this->db);
-            $discount->fk_soc=$this->id;
-            $discount->amount_ht=price2num($remise,'MT');
-            $discount->amount_tva=price2num($remise*$tva_tx/100,'MT');
-            $discount->amount_ttc=price2num($discount->amount_ht+$discount->amount_tva,'MT');
-            $discount->tva_tx=price2num($tva_tx,'MT');
-            $discount->description=$desc;
-            $result=$discount->create($user);
-            if ($result > 0)
-            {
-                return $result;
-            }
-            else
-            {
-                $this->error=$discount->error;
-                return -3;
-            }
-        }
-        else return 0;
-    }
-
-    /**
-     *  Renvoie montant TTC des reductions/avoirs en cours disponibles de la societe
-     *
-     *	@param	User	$user		Filtre sur un user auteur des remises
-     * 	@param	string	$filter		Filtre autre
-     * 	@param	integer	$maxvalue	Filter on max value for discount
-     *	@return	int					<0 if KO, Credit note amount otherwise
-     */
-    function getAvailableDiscounts($user='',$filter='',$maxvalue=0)
-    {
-        require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
-
-        $discountstatic=new DiscountAbsolute($this->db);
-        $result=$discountstatic->getAvailableDiscounts($this,$user,$filter,$maxvalue);
-        if ($result >= 0)
-        {
-            return $result;
-        }
-        else
-        {
-            $this->error=$discountstatic->error;
-            return -1;
-        }
-    }
-
-    /**
-     *  Return array of sales representatives
-     *
-     *  @param	User	$user		Object user
-     *  @return array       		Array of sales representatives of third party
-     */
-    function getSalesRepresentatives(User $user)
-    {
-        global $conf;
-
-        $reparray=array();
-
-        $sql = "SELECT DISTINCT u.rowid, u.login, u.lastname, u.firstname, u.email, u.statut, u.entity, u.photo";
-        $sql.= " FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc, ".MAIN_DB_PREFIX."user as u";
-        if (! empty($conf->multicompany->enabled) && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
-        {
-        	$sql.= ", ".MAIN_DB_PREFIX."usergroup_user as ug";
-        	$sql.= " WHERE ((ug.fk_user = sc.fk_user";
-        	$sql.= " AND ug.entity = ".$conf->entity.")";
-        	$sql.= " OR u.admin = 1)";
-        }
-        else
-        	$sql.= " WHERE entity in (0, ".$conf->entity.")";
-
-        $sql.= " AND u.rowid = sc.fk_user AND sc.fk_soc = ".$this->id;
-
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            $num = $this->db->num_rows($resql);
-            $i=0;
-            while ($i < $num)
-            {
-                $obj = $this->db->fetch_object($resql);
-                $reparray[$i]['id']=$obj->rowid;
-                $reparray[$i]['lastname']=$obj->lastname;
-                $reparray[$i]['firstname']=$obj->firstname;
-                $reparray[$i]['email']=$obj->email;
-                $reparray[$i]['statut']=$obj->statut;
-                $reparray[$i]['entity']=$obj->entity;
-                $reparray[$i]['login']=$obj->login;
-                $reparray[$i]['photo']=$obj->photo;
-                $i++;
-            }
-            return $reparray;
-        }
-        else {
-            dol_print_error($this->db);
-            return -1;
-        }
-    }
-
-    /**
-     * Set the price level
-     *
-     * @param 	int		$price_level	Level of price
-     * @param 	User	$user			Use making change
-     * @return	int						<0 if KO, >0 if OK
-     */
-    function set_price_level($price_level, User $user)
-    {
-        if ($this->id)
-        {
-        	$now=dol_now();
-
-            $sql  = "UPDATE ".MAIN_DB_PREFIX."societe";
-            $sql .= " SET price_level = '".$this->db->escape($price_level)."'";
-            $sql .= " WHERE rowid = " . $this->id;
-
-            if (! $this->db->query($sql))
-            {
-                dol_print_error($this->db);
-                return -1;
-            }
-
-            $sql  = "INSERT INTO ".MAIN_DB_PREFIX."societe_prices";
-            $sql .= " (datec, fk_soc, price_level, fk_user_author)";
-            $sql .= " VALUES ('".$this->db->idate($now)."', ".$this->id.", '".$this->db->escape($price_level)."', ".$user->id.")";
-
-            if (! $this->db->query($sql))
-            {
-                dol_print_error($this->db);
-                return -1;
-            }
-            return 1;
-        }
-        return -1;
-    }
-
-    /**
-     *	Add link to sales representative
-     *
-     *	@param	User	$user		Object user
-     *	@param	int		$commid		Id of user
-     *	@return	void
-     */
-    function add_commercial(User $user, $commid)
-    {
-        if ($this->id > 0 && $commid > 0)
-        {
-            $sql = "DELETE FROM  ".MAIN_DB_PREFIX."societe_commerciaux";
-            $sql.= " WHERE fk_soc = ".$this->id." AND fk_user =".$commid;
-
-            $this->db->query($sql);
-
-            $sql = "INSERT INTO ".MAIN_DB_PREFIX."societe_commerciaux";
-            $sql.= " ( fk_soc, fk_user )";
-            $sql.= " VALUES (".$this->id.",".$commid.")";
-
-            if (! $this->db->query($sql) )
-            {
-                dol_syslog(get_class($this)."::add_commercial Erreur");
-            }
-        }
-    }
-
-    /**
-     *	Add link to sales representative
-     *
-     *	@param	User	$user		Object user
-     *	@param	int		$commid		Id of user
-     *	@return	void
-     */
-    function del_commercial(User $user, $commid)
-    {
-        if ($this->id > 0 && $commid > 0)
-        {
-            $sql  = "DELETE FROM  ".MAIN_DB_PREFIX."societe_commerciaux ";
-            $sql .= " WHERE fk_soc = ".$this->id." AND fk_user =".$commid;
-
-            if (! $this->db->query($sql) )
-            {
-                dol_syslog(get_class($this)."::del_commercial Erreur");
-            }
-        }
-    }
-
-
-    /**
-     *    	Return a link on thirdparty (with picto)
-     *
-     *		@param	int		$withpicto		          Add picto into link (0=No picto, 1=Include picto with link, 2=Picto only)
-     *		@param	string	$option			          Target of link ('', 'customer', 'prospect', 'supplier', 'project')
-     *		@param	int		$maxlen			          Max length of name
-     *      @param	int  	$notooltip		          1=Disable tooltip
-     *      @param  int     $save_lastsearch_value    -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
-     *		@return	string					          String with URL
-     */
-    function getNomUrl($withpicto=0, $option='', $maxlen=0, $notooltip=0, $save_lastsearch_value=-1)
-    {
-        global $conf, $langs, $hookmanager;
-
-        if (! empty($conf->dol_no_mouse_hover)) $notooltip=1;   // Force disable tooltips
-
-        $name=$this->name?$this->name:$this->nom;
-
-    	if (! empty($conf->global->SOCIETE_ADD_REF_IN_LIST) && (!empty($withpicto)))
-    	{
-    		if (($this->client) && (! empty ( $this->code_client ))
-    			&& ($conf->global->SOCIETE_ADD_REF_IN_LIST == 1
-    			|| $conf->global->SOCIETE_ADD_REF_IN_LIST == 2
-    			)
-    		)
-    		$code = $this->code_client . ' - ';
-
-    		if (($this->fournisseur) && (! empty ( $this->code_fournisseur ))
-    			&& ($conf->global->SOCIETE_ADD_REF_IN_LIST == 1
-    			|| $conf->global->SOCIETE_ADD_REF_IN_LIST == 3
-    			)
-    		)
-    		$code .= $this->code_fournisseur . ' - ';
-
-    		if ($conf->global->SOCIETE_ADD_REF_IN_LIST == 1)
-    			$name =$code.' '.$name;
-    		else
-    			$name =$code;
-    	}
-
-    	if (!empty($this->name_alias)) $name .= ' ('.$this->name_alias.')';
-
-        $result=''; $label='';
-        $linkstart=''; $linkend='';
-
-        if (! empty($this->logo) && class_exists('Form'))
-        {
-            $label.= '<div class="photointooltip">';
-            $label.= Form::showphoto('societe', $this, 80, 0, 0, 'photowithmargin', 'mini');
-            $label.= '</div><div style="clear: both;"></div>';
-        }
+			// TODO Move links to validate professional ID into a dictionary table "country" + "link"
+			if ($idprof == 1 && $thirdparty->country_code == 'FR') $url='http://www.societe.com/cgi-bin/search?champs='.$thirdparty->idprof1;    // See also http://avis-situation-sirene.insee.fr/
+			//if ($idprof == 1 && ($thirdparty->country_code == 'GB' || $thirdparty->country_code == 'UK')) $url='http://www.companieshouse.gov.uk/WebCHeck/findinfolink/';     // Link no more valid
+			if ($idprof == 1 && $thirdparty->country_code == 'ES') $url='http://www.e-informa.es/servlet/app/portal/ENTP/screen/SProducto/prod/ETIQUETA_EMPRESA/nif/'.$thirdparty->idprof1;
+			if ($idprof == 1 && $thirdparty->country_code == 'IN') $url='http://www.tinxsys.com/TinxsysInternetWeb/dealerControllerServlet?tinNumber='.$thirdparty->idprof1.';&searchBy=TIN&backPage=searchByTin_Inter.jsp';
 
-        $label.= '<div class="centpercent">';
+			if ($url) return '<a target="_blank" href="'.$url.'">'.$langs->trans("Check").'</a>';
+		}
+		else
+		{
+			return $hookmanager->resPrint;
+		}
 
-        if ($option == 'customer' || $option == 'compta' || $option == 'category' || $option == 'category_supplier')
-        {
-           $label.= '<u>' . $langs->trans("ShowCustomer") . '</u>';
-           $linkstart = '<a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$this->id;
-        }
-        else if ($option == 'prospect' && empty($conf->global->SOCIETE_DISABLE_PROSPECTS))
-        {
-            $label.= '<u>' . $langs->trans("ShowProspect") . '</u>';
-            $linkstart = '<a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$this->id;
-        }
-        else if ($option == 'supplier')
-        {
-            $label.= '<u>' . $langs->trans("ShowSupplier") . '</u>';
-            $linkstart = '<a href="'.DOL_URL_ROOT.'/fourn/card.php?socid='.$this->id;
-        }
-        else if ($option == 'agenda')
-        {
-            $label.= '<u>' . $langs->trans("ShowAgenda") . '</u>';
-            $linkstart = '<a href="'.DOL_URL_ROOT.'/societe/agenda.php?socid='.$this->id;
-        }
-        else if ($option == 'project')
-        {
-            $label.= '<u>' . $langs->trans("ShowProject") . '</u>';
-            $linkstart = '<a href="'.DOL_URL_ROOT.'/societe/project.php?socid='.$this->id;
-        }
-        else if ($option == 'margin')
-        {
-            $label.= '<u>' . $langs->trans("ShowMargin") . '</u>';
-            $linkstart = '<a href="'.DOL_URL_ROOT.'/margin/tabs/thirdpartyMargins.php?socid='.$this->id.'&type=1';
-        }
-        else if ($option == 'contact')
-        {
-        	$label.= '<u>' . $langs->trans("ShowContacts") . '</u>';
-        	$linkstart = '<a href="'.DOL_URL_ROOT.'/societe/contact.php?socid='.$this->id;
-        }
+		return '';
+	}
 
-        // By default
-        if (empty($linkstart))
-        {
-            $label.= '<u>' . $langs->trans("ShowCompany") . '</u>';
-            $linkstart = '<a href="'.DOL_URL_ROOT.'/societe/card.php?socid='.$this->id;
-        }
+	/**
+	 *   Indique si la societe a des projets
+	 *
+	 *   @return     bool	   true si la societe a des projets, false sinon
+	 */
+	function has_projects()
+	{
+		$sql = 'SELECT COUNT(*) as numproj FROM '.MAIN_DB_PREFIX.'projet WHERE fk_soc = ' . $this->id;
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$obj = $this->db->fetch_object($resql);
+			$count = $obj->numproj;
+		}
+		else
+		{
+			$count = 0;
+			print $this->db->error();
+		}
+		$this->db->free($resql);
+		return ($count > 0);
+	}
 
-        if (! empty($this->name))
-        {
-            $label.= '<br><b>' . $langs->trans('Name') . ':</b> '. $this->name;
-            if (! empty($this->name_alias)) $label.=' ('.$this->name_alias.')';
-            $label.= '<br><b>' . $langs->trans('Email') . ':</b> '. $this->email;
-        }
-        if (! empty($this->country_code))
-            $label.= '<br><b>' . $langs->trans('Country') . ':</b> '. $this->country_code;
-        if (! empty($this->tva_intra))
-            $label.= '<br><b>' . $langs->trans('VATNumber') . ':</b> '. $this->tva_intra;
-            if (! empty($this->code_client) && $this->client)
-            $label.= '<br><b>' . $langs->trans('CustomerCode') . ':</b> '. $this->code_client;
-        if (! empty($this->code_fournisseur) && $this->fournisseur)
-            $label.= '<br><b>' . $langs->trans('SupplierCode') . ':</b> '. $this->code_fournisseur;
-        if (! empty($conf->accounting->enabled) && $this->client)
-            $label.= '<br><b>' . $langs->trans('CustomerAccountancyCode') . ':</b> '. $this->code_compta_client;
-        if (! empty($conf->accounting->enabled) && $this->fournisseur)
-            $label.= '<br><b>' . $langs->trans('SupplierAccountancyCode') . ':</b> '. $this->code_compta_fournisseur;
-
-        $label.= '</div>';
-
-        // Add type of canvas
-        $linkstart.=(!empty($this->canvas)?'&canvas='.$this->canvas:'');
-        // Add param to save lastsearch_values or not
-        $add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0);
-        if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
-        if ($add_save_lastsearch_values) $linkstart.='&save_lastsearch_values=1';
-        $linkstart.='"';
-
-        $linkclose='';
-        if (empty($notooltip))
-        {
-            if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-            {
-                $label=$langs->trans("ShowCompany");
-                $linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
-            }
-            $linkclose.= ' title="'.dol_escape_htmltag($label, 1).'"';
-            $linkclose.=' class="classfortooltip"';
-
-         	if (! is_object($hookmanager))
-    		{
-    			include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-    			$hookmanager=new HookManager($this->db);
-    		}
-    		$hookmanager->initHooks(array('societedao'));
-    		$parameters=array('id'=>$this->id);
-    		$reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
-    		if ($reshook > 0) $linkclose = $hookmanager->resPrint;
-        }
-        $linkstart.=$linkclose.'>';
-        $linkend='</a>';
-
-        global $user;
-        if (! $user->rights->societe->client->voir && $user->societe_id > 0 && $this->id != $user->societe_id)
-        {
-            $linkstart='';
-            $linkend='';
-        }
 
-        if ($withpicto) $result.=($linkstart.img_object(($notooltip?'':$label), 'company', ($notooltip?'':'class="classfortooltip valigntextbottom"'), 0, 0, $notooltip?0:1).$linkend);
-        if ($withpicto && $withpicto != 2) $result.=' ';
-        if ($withpicto != 2) $result.=$linkstart.($maxlen?dol_trunc($name,$maxlen):$name).$linkend;
-
-        return $result;
-    }
-
-    /**
-     *    Return label of status (activity, closed)
-     *
-     *    @param	int		$mode       0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long
-     *    @return   string        		Libelle
-     */
-    function getLibStatut($mode=0)
-    {
-        return $this->LibStatut($this->status,$mode);
-    }
-
-    /**
-     *  Renvoi le libelle d'un statut donne
-     *
-     *  @param	int		$statut         Id statut
-     *  @param	int		$mode           0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
-     *  @return	string          		Libelle du statut
-     */
-    function LibStatut($statut,$mode=0)
-    {
-        global $langs;
-        $langs->load('companies');
-
-        if ($mode == 0)
-        {
-            if ($statut==0) return $langs->trans("ActivityCeased");
-            if ($statut==1) return $langs->trans("InActivity");
-        }
-        if ($mode == 1)
-        {
-            if ($statut==0) return $langs->trans("ActivityCeased");
-            if ($statut==1) return $langs->trans("InActivity");
-        }
-        if ($mode == 2)
-        {
-            if ($statut==0) return img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"').' '.$langs->trans("ActivityCeased");
-            if ($statut==1) return img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"').' '.$langs->trans("InActivity");
-        }
-        if ($mode == 3)
-        {
-            if ($statut==0) return img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"');
-            if ($statut==1) return img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"');
-        }
-        if ($mode == 4)
-        {
-            if ($statut==0) return img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"').' '.$langs->trans("ActivityCeased");
-            if ($statut==1) return img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"').' '.$langs->trans("InActivity");
-        }
-        if ($mode == 5)
-        {
-            if ($statut==0) return $langs->trans("ActivityCeased").' '.img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"');
-            if ($statut==1) return $langs->trans("InActivity").' '.img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"');
-        }
-    }
-
-    /**
-     *    Return list of contacts emails existing for third party
-     *
-     *	  @param	  int		$addthirdparty		1=Add also a record for thirdparty email
-     *    @return     array       					Array of contacts emails
-     */
-    function thirdparty_and_contact_email_array($addthirdparty=0)
-    {
-        global $langs;
-
-        $contact_emails = $this->contact_property_array('email',1);
-        if ($this->email && $addthirdparty)
-        {
-            if (empty($this->name)) $this->name=$this->nom;
-            $contact_emails['thirdparty']=$langs->trans("ThirdParty").': '.dol_trunc($this->name,16)." &lt;".$this->email."&gt;";
-        }
-        //var_dump($contact_emails)
-        return $contact_emails;
-    }
-
-    /**
-     *    Return list of contacts mobile phone existing for third party
-     *
-     *    @return     array       Array of contacts emails
-     */
-    function thirdparty_and_contact_phone_array()
-    {
-        global $langs;
-
-        $contact_phone = $this->contact_property_array('mobile');
-
-        if (! empty($this->phone))	// If a phone of thirdparty is defined, we add it ot mobile of contacts
-        {
-            if (empty($this->name)) $this->name=$this->nom;
-            // TODO: Tester si tel non deja present dans tableau contact
-            $contact_phone['thirdparty']=$langs->trans("ThirdParty").': '.dol_trunc($this->name,16)." &lt;".$this->phone."&gt;";
-        }
-        return $contact_phone;
-    }
+	/**
+	 *  Load information for tab info
+	 *
+	 *  @param  int		$id     Id of thirdparty to load
+	 *  @return	void
+	 */
+	function info($id)
+	{
+		$sql = "SELECT s.rowid, s.nom as name, s.datec as date_creation, tms as date_modification,";
+		$sql.= " fk_user_creat, fk_user_modif";
+		$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
+		$sql.= " WHERE s.rowid = ".$id;
 
-    /**
-     *  Return list of contacts emails or mobile existing for third party
-     *
-     *  @param	string	$mode       		'email' or 'mobile'
-	 * 	@param	int		$hidedisabled		1=Hide contact if disabled
-     *  @return array       				Array of contacts emails or mobile array(id=>'Name <email>')
-     */
-    function contact_property_array($mode='email', $hidedisabled=0)
-    {
-    	global $langs;
-
-        $contact_property = array();
-
-
-        $sql = "SELECT rowid, email, statut, phone_mobile, lastname, poste, firstname";
-        $sql.= " FROM ".MAIN_DB_PREFIX."socpeople";
-        $sql.= " WHERE fk_soc = ".$this->id;
-
-        $resql=$this->db->query($sql);
-        if ($resql)
-        {
-            $nump = $this->db->num_rows($resql);
-            if ($nump)
-            {
-            	$sepa="("; $sepb=")";
-            	if ($mode == 'email')
-            	{
-            		$sepa="&lt;"; $sepb="&gt;";
-            	}
-                $i = 0;
-                while ($i < $nump)
-                {
-                    $obj = $this->db->fetch_object($resql);
-                    if ($mode == 'email') $property=$obj->email;
-                    else if ($mode == 'mobile') $property=$obj->phone_mobile;
-                    else $property=$obj->$mode;
+		$result=$this->db->query($sql);
+		if ($result)
+		{
+			if ($this->db->num_rows($result))
+			{
+				$obj = $this->db->fetch_object($result);
 
-					// Show all contact. If hidedisabled is 1, showonly contacts with status = 1
-                    if ($obj->statut == 1 || empty($hidedisabled))
-                    {
-                    	if (empty($property))
-                    	{
-                    		if ($mode == 'email') $property=$langs->trans("NoEMail");
-                    		else if ($mode == 'mobile') $property=$langs->trans("NoMobilePhone");
-                    	}
-
-	                    if (!empty($obj->poste))
-    	                {
-							$contact_property[$obj->rowid] = trim(dolGetFirstLastname($obj->firstname,$obj->lastname)).($obj->poste?" - ".$obj->poste:"").(($mode != 'poste' && $property)?" ".$sepa.$property.$sepb:'');
-						}
-						else
-						{
-							$contact_property[$obj->rowid] = trim(dolGetFirstLastname($obj->firstname,$obj->lastname)).(($mode != 'poste' && $property)?" ".$sepa.$property.$sepb:'');
-						}
-                    }
-                    $i++;
-                }
-            }
-        }
-        else
-        {
-            dol_print_error($this->db);
-        }
-        return $contact_property;
-    }
-
-
-    /**
-     *    Renvoie la liste des contacts de cette societe
-     *
-     *    @return     array      tableau des contacts
-     */
-    function contact_array()
-    {
-        $contacts = array();
-
-        $sql = "SELECT rowid, lastname, firstname FROM ".MAIN_DB_PREFIX."socpeople WHERE fk_soc = ".$this->id;
-        $resql=$this->db->query($sql);
-        if ($resql)
-        {
-            $nump = $this->db->num_rows($resql);
-            if ($nump)
-            {
-                $i = 0;
-                while ($i < $nump)
-                {
-                    $obj = $this->db->fetch_object($resql);
-                    $contacts[$obj->rowid] = dolGetFirstLastname($obj->firstname,$obj->lastname);
-                    $i++;
-                }
-            }
-        }
-        else
-        {
-            dol_print_error($this->db);
-        }
-        return $contacts;
-    }
-
-    /**
-     *    Renvoie la liste des contacts de cette societe
-     *
-     *    @return    array    $contacts    tableau des contacts
-     */
-    function contact_array_objects()
-    {
-        require_once DOL_DOCUMENT_ROOT . '/contact/class/contact.class.php';
-        $contacts = array();
-
-        $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."socpeople WHERE fk_soc = ".$this->id;
-        $resql=$this->db->query($sql);
-        if ($resql)
-        {
-            $nump = $this->db->num_rows($resql);
-            if ($nump)
-            {
-                $i = 0;
-                while ($i < $nump)
-                {
-                    $obj = $this->db->fetch_object($resql);
-                    $contact = new Contact($this->db);
-                    $contact->fetch($obj->rowid);
-                    $contacts[] = $contact;
-                    $i++;
-                }
-            }
-        }
-        else
-        {
-            dol_print_error($this->db);
-        }
-        return $contacts;
-    }
-
-    /**
-     *  Return property of contact from its id
-     *
-     *  @param	int		$rowid      id of contact
-     *  @param  string	$mode       'email' or 'mobile'
-     *  @return string  			Email of contact with format: "Full name <email>"
-     */
-    function contact_get_property($rowid,$mode)
-    {
-        $contact_property='';
-
-        if (empty($rowid)) return '';
-
-        $sql = "SELECT rowid, email, phone_mobile, lastname, firstname";
-        $sql.= " FROM ".MAIN_DB_PREFIX."socpeople";
-        $sql.= " WHERE rowid = '".$rowid."'";
-
-        $resql=$this->db->query($sql);
-        if ($resql)
-        {
-            $nump = $this->db->num_rows($resql);
-
-            if ($nump)
-            {
-                $obj = $this->db->fetch_object($resql);
-
-                if ($mode == 'email') $contact_property = dolGetFirstLastname($obj->firstname, $obj->lastname)." <".$obj->email.">";
-                else if ($mode == 'mobile') $contact_property = $obj->phone_mobile;
-            }
-            return $contact_property;
-        }
-        else
-        {
-            dol_print_error($this->db);
-        }
+				$this->id = $obj->rowid;
 
-    }
+				if ($obj->fk_user_creat) {
+					$cuser = new User($this->db);
+					$cuser->fetch($obj->fk_user_creat);
+					$this->user_creation     = $cuser;
+				}
 
+				if ($obj->fk_user_modif) {
+					$muser = new User($this->db);
+					$muser->fetch($obj->fk_user_modif);
+					$this->user_modification = $muser;
+				}
 
-    /**
-     *  Return bank number property of thirdparty (label or rum)
-     *
-     *	@param	string	$mode	'label' or 'rum'
-     *  @return	string			Bank number
-     */
-    function display_rib($mode='label')
-    {
-        require_once DOL_DOCUMENT_ROOT . '/societe/class/companybankaccount.class.php';
+				$this->ref			     = $obj->name;
+				$this->date_creation     = $this->db->jdate($obj->date_creation);
+				$this->date_modification = $this->db->jdate($obj->date_modification);
+			}
 
-        $bac = new CompanyBankAccount($this->db);
-        $bac->fetch(0,$this->id);
+			$this->db->free($result);
 
-        if ($mode == 'label')
-        {
-        	return $bac->getRibLabel(true);
-        }
-        elseif ($mode == 'rum')
-        {
-        	if (empty($bac->rum))
-        	{
-        		require_once DOL_DOCUMENT_ROOT . '/compta/prelevement/class/bonprelevement.class.php';
-        		$prelevement = new BonPrelevement($this->db);
-        		$bac->fetch_thirdparty();
-        		$bac->rum = $prelevement->buildRumNumber($bac->thirdparty->code_client, $bac->datec, $bac->id);
-        	}
-        	return $bac->rum;
-        }
+		}
+		else
+		{
+			dol_print_error($this->db);
+		}
+	}
 
-        return 'BadParameterToFunctionDisplayRib';
-    }
-
-    /**
-     * Return Array of RIB
-     *
-     * @return     array|int        0 if KO, Array of CompanyBanckAccount if OK
-     */
-    function get_all_rib()
-    {
-        require_once DOL_DOCUMENT_ROOT . '/societe/class/companybankaccount.class.php';
-        $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_rib WHERE fk_soc = ".$this->id;
-        $result = $this->db->query($sql);
-        if (!$result) {
-            $this->error++;
-            $this->errors[] = $this->db->lasterror;
-            return 0;
-        } else {
-            $num_rows = $this->db->num_rows($result);
-            $rib_array = array();
-            if ($num_rows) {
-                while ($obj = $this->db->fetch_object($result)) {
-                    $rib = new CompanyBankAccount($this->db);
-                    $rib->fetch($obj->rowid);
-                    $rib_array[] = $rib;
-                }
-            }
-            return $rib_array;
-        }
-    }
-
-    /**
-     *  Attribut un code client a partir du module de controle des codes.
-     *  Return value is stored into this->code_client
-     *
-     *	@param	Societe		$objsoc		Object thirdparty
-     *	@param	int			$type		Should be 0 to say customer
-     *  @return void
-     */
-    function get_codeclient($objsoc=0,$type=0)
-    {
-        global $conf;
-        if (! empty($conf->global->SOCIETE_CODECLIENT_ADDON))
-        {
-        	$module=$conf->global->SOCIETE_CODECLIENT_ADDON;
-
-            $dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']);
-            foreach ($dirsociete as $dirroot)
-            {
-                $res=dol_include_once($dirroot.$module.'.php');
-                if ($res) break;
-            }
-            $mod = new $module();
-
-            $this->code_client = $mod->getNextValue($objsoc,$type);
-            $this->prefixCustomerIsRequired = $mod->prefixIsRequired;
-
-            dol_syslog(get_class($this)."::get_codeclient code_client=".$this->code_client." module=".$module);
-        }
-    }
-
-    /**
-     *  Attribut un code fournisseur a partir du module de controle des codes.
-     *  Return value is stored into this->code_fournisseur
-     *
-     *	@param	Societe		$objsoc		Object thirdparty
-     *	@param	int			$type		Should be 1 to say supplier
-     *  @return void
-     */
-    function get_codefournisseur($objsoc=0,$type=1)
-    {
-        global $conf;
-        if (! empty($conf->global->SOCIETE_CODECLIENT_ADDON))
-        {
-			$module=$conf->global->SOCIETE_CODECLIENT_ADDON;
+	/**
+	 *  Return if third party is a company (Business) or an end user (Consumer)
+	 *
+	 *  @return    boolean     true=is a company, false=a and user
+	 */
+	function isACompany()
+	{
+		global $conf;
 
-            $dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']);
-            foreach ($dirsociete as $dirroot)
-            {
-                $res=dol_include_once($dirroot.$module.'.php');
-                if ($res) break;
-            }
-            $mod = new $module();
+		// Define if third party is treated as company (or not) when nature is unknown
+		$isacompany=empty($conf->global->MAIN_UNKNOWN_CUSTOMERS_ARE_COMPANIES)?0:1; // 0 by default
+		if (! empty($this->tva_intra)) $isacompany=1;
+		else if (! empty($this->typent_code) && in_array($this->typent_code,array('TE_PRIVATE'))) $isacompany=0;
+		else if (! empty($this->typent_code) && in_array($this->typent_code,array('TE_SMALL','TE_MEDIUM','TE_LARGE','TE_GROUP'))) $isacompany=1;
 
-            $this->code_fournisseur = $mod->getNextValue($objsoc,$type);
+		return $isacompany;
+	}
 
-            dol_syslog(get_class($this)."::get_codefournisseur code_fournisseur=".$this->code_fournisseur." module=".$module);
-        }
-    }
-
-    /**
-     *    Verifie si un code client est modifiable en fonction des parametres
-     *    du module de controle des codes.
-     *
-     *    @return     int		0=No, 1=Yes
-     */
-    function codeclient_modifiable()
-    {
-        global $conf;
-        if (! empty($conf->global->SOCIETE_CODECLIENT_ADDON))
-        {
-        	$module=$conf->global->SOCIETE_CODECLIENT_ADDON;
-
-            $dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']);
-            foreach ($dirsociete as $dirroot)
-            {
-                $res=dol_include_once($dirroot.$module.'.php');
-                if ($res) break;
-            }
-
-            $mod = new $module();
-
-            dol_syslog(get_class($this)."::codeclient_modifiable code_client=".$this->code_client." module=".$module);
-            if ($mod->code_modifiable_null && ! $this->code_client) return 1;
-            if ($mod->code_modifiable_invalide && $this->check_codeclient() < 0) return 1;
-            if ($mod->code_modifiable) return 1;	// A mettre en dernier
-            return 0;
-        }
-        else
-        {
-            return 0;
-        }
-    }
-
-
-    /**
-     *    Verifie si un code fournisseur est modifiable dans configuration du module de controle des codes
-     *
-     *    @return     int		0=No, 1=Yes
-     */
-    function codefournisseur_modifiable()
-    {
-        global $conf;
-        if (! empty($conf->global->SOCIETE_CODECLIENT_ADDON))
-        {
-        	$module=$conf->global->SOCIETE_CODECLIENT_ADDON;
-
-            $dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']);
-            foreach ($dirsociete as $dirroot)
-            {
-                $res=dol_include_once($dirroot.$module.'.php');
-                if ($res) break;
-            }
-
-            $mod = new $module();
-
-            dol_syslog(get_class($this)."::codefournisseur_modifiable code_founisseur=".$this->code_fournisseur." module=".$module);
-            if ($mod->code_modifiable_null && ! $this->code_fournisseur) return 1;
-            if ($mod->code_modifiable_invalide && $this->check_codefournisseur() < 0) return 1;
-            if ($mod->code_modifiable) return 1;	// A mettre en dernier
-            return 0;
-        }
-        else
-        {
-            return 0;
-        }
-    }
-
-
-    /**
-     *  Check customer code
-     *
-     *  @return     int				0 if OK
-     * 								-1 ErrorBadCustomerCodeSyntax
-     * 								-2 ErrorCustomerCodeRequired
-     * 								-3 ErrorCustomerCodeAlreadyUsed
-     * 								-4 ErrorPrefixRequired
-     */
-    function check_codeclient()
-    {
-        global $conf;
-        if (! empty($conf->global->SOCIETE_CODECLIENT_ADDON))
-        {
-        	$module=$conf->global->SOCIETE_CODECLIENT_ADDON;
-
-        	$dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']);
-            foreach ($dirsociete as $dirroot)
-            {
-                $res=dol_include_once($dirroot.$module.'.php');
-                if ($res) break;
-            }
-
-            $mod = new $module();
-
-           	dol_syslog(get_class($this)."::check_codeclient code_client=".$this->code_client." module=".$module);
-           	$result = $mod->verif($this->db, $this->code_client, $this, 0);
-            return $result;
-        }
-        else
+	/**
+	 *  Charge la liste des categories fournisseurs
+	 *
+	 *  @return    int      0 if success, <> 0 if error
+	 */
+	function LoadSupplierCateg()
+	{
+		$this->SupplierCategories = array();
+		$sql = "SELECT rowid, label";
+		$sql.= " FROM ".MAIN_DB_PREFIX."categorie";
+		$sql.= " WHERE type = ".Categorie::TYPE_SUPPLIER;
+
+		$resql=$this->db->query($sql);
+		if ($resql)
 		{
-            return 0;
-        }
-    }
-
-    /**
-     *    Check supplier code
-     *
-     *    @return     int		0 if OK
-     * 							-1 ErrorBadCustomerCodeSyntax
-     * 							-2 ErrorCustomerCodeRequired
-     * 							-3 ErrorCustomerCodeAlreadyUsed
-     * 							-4 ErrorPrefixRequired
-     */
-    function check_codefournisseur()
-    {
-        global $conf;
-        if (! empty($conf->global->SOCIETE_CODECLIENT_ADDON))
-        {
-        	$module=$conf->global->SOCIETE_CODECLIENT_ADDON;
-
-        	$dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']);
-            foreach ($dirsociete as $dirroot)
-            {
-                $res=dol_include_once($dirroot.$module.'.php');
-                if ($res) break;
-            }
-
-            $mod = new $module();
-
-            dol_syslog(get_class($this)."::check_codefournisseur code_fournisseur=".$this->code_fournisseur." module=".$module);
-            $result = $mod->verif($this->db, $this->code_fournisseur, $this, 1);
-            return $result;
-        }
-        else
+			while ($obj = $this->db->fetch_object($resql) )
+			{
+				$this->SupplierCategories[$obj->rowid] = $obj->label;
+			}
+			return 0;
+		}
+		else
 		{
-            return 0;
-        }
-    }
-
-    /**
-     *    	Renvoie un code compta, suivant le module de code compta.
-     *      Peut etre identique a celui saisit ou genere automatiquement.
-     *      A ce jour seule la generation automatique est implementee
-     *
-     *    	@param	string	$type		Type of thirdparty ('customer' or 'supplier')
-     *		@return	string				Code compta si ok, 0 si aucun, <0 si ko
-     */
-    function get_codecompta($type)
-    {
-        global $conf;
-
-        if (! empty($conf->global->SOCIETE_CODECOMPTA_ADDON))
-        {
-        	$file='';
-            $dirsociete=array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
-            foreach ($dirsociete as $dirroot)
-            {
-            	if (file_exists(DOL_DOCUMENT_ROOT.'/'.$dirroot.$conf->global->SOCIETE_CODECOMPTA_ADDON.".php"))
-            	{
-            		$file=$dirroot.$conf->global->SOCIETE_CODECOMPTA_ADDON.".php";
-            		break;
-            	}
-            }
-
-            if (! empty($file))
-            {
-            	dol_include_once($file);
-
-            	$classname = $conf->global->SOCIETE_CODECOMPTA_ADDON;
-            	$mod = new $classname;
-
-            	// Defini code compta dans $mod->code
-            	$result = $mod->get_code($this->db, $this, $type);
-
-            	if ($type == 'customer') $this->code_compta = $mod->code;
-            	else if ($type == 'supplier') $this->code_compta_fournisseur = $mod->code;
-
-            	return $result;
-            }
-            else
-            {
-            	$this->error = 'ErrorAccountancyCodeNotDefined';
-            	return -1;
-            }
-        }
-        else
-        {
-            if ($type == 'customer') $this->code_compta = '';
-            else if ($type == 'supplier') $this->code_compta_fournisseur = '';
-
-            return 0;
-        }
-    }
-
-    /**
-     *    Define parent commany of current company
-     *
-     *    @param	int		$id     Id of thirdparty to set or '' to remove
-     *    @return	int     		<0 if KO, >0 if OK
-     */
-    function set_parent($id)
-    {
-        if ($this->id)
-        {
-            $sql = "UPDATE ".MAIN_DB_PREFIX."societe";
-            $sql.= " SET parent = ".($id > 0 ? $id : "null");
-            $sql.= " WHERE rowid = " . $this->id;
-			dol_syslog(get_class($this).'::set_parent', LOG_DEBUG);
-            $resql=$this->db->query($sql);
-            if ($resql)
-            {
-            	$this->parent = $id;
-                return 1;
-            }
-            else
-			{
-                return -1;
-            }
-        }
-        else return -1;
-    }
-
-	/**
-     *  Returns if a profid sould be verified
-     *
-     *  @param	int		$idprof		1,2,3,4,5,6 (Exemple: 1=siren,2=siret,3=naf,4=rcs/rm,5=idprof5,6=idprof6)
-     *  @return boolean         	true , false
-     */
-    function id_prof_verifiable($idprof)
-    {
-	    global $conf;
-
-     	switch($idprof)
-        {
-        	case 1:
-        		$ret=(!$conf->global->SOCIETE_IDPROF1_UNIQUE?false:true);
-        		break;
-        	case 2:
-        		$ret=(!$conf->global->SOCIETE_IDPROF2_UNIQUE?false:true);
-        		break;
-        	case 3:
-        		$ret=(!$conf->global->SOCIETE_IDPROF3_UNIQUE?false:true);
-        		break;
-        	case 4:
-        		$ret=(!$conf->global->SOCIETE_IDPROF4_UNIQUE?false:true);
-        		break;
-        	case 5:
-        		$ret=(!$conf->global->SOCIETE_IDPROF5_UNIQUE?false:true);
-        		break;
-        	case 6:
-        		$ret=(!$conf->global->SOCIETE_IDPROF6_UNIQUE?false:true);
-        		break;
-        	default:
-        		$ret=false;
-        }
+			return -1;
+		}
+	}
 
-        return $ret;
-    }
-
-	/**
-     *    Verify if a profid exists into database for others thirds
-     *
-     *    @param	string	$idprof		'idprof1','idprof2','idprof3','idprof4','idprof5','idprof6','email' (Example: idprof1=siren, idprof2=siret, idprof3=naf, idprof4=rcs/rm)
-     *    @param	string	$value		Value of profid
-     *    @param	int		$socid		Id of thirdparty to exclude (if update)
-     *    @return   boolean				True if exists, False if not
-     */
-    function id_prof_exists($idprof, $value, $socid=0)
-    {
-    	$field = $idprof;
-
-     	switch($idprof)	// For backward compatibility
-        {
-        	case '1':
-        	case 'idprof1':
-        		$field="siren";
-        		break;
-        	case '2':
-        	case 'idprof2':
-        		$field="siret";
-        		break;
-        	case '3':
-        	case 'idprof3':
-        		$field="ape";
-        		break;
-        	case '4':
-        	case 'idprof4':
-        		$field="idprof4";
-        		break;
-        	case '5':
-        		$field="idprof5";
-        		break;
-        	case '6':
-        		$field="idprof6";
-        		break;
-     	}
-
-         //Verify duplicate entries
-        $sql  = "SELECT COUNT(*) as idprof FROM ".MAIN_DB_PREFIX."societe WHERE ".$field." = '".$value."' AND entity IN (".getEntity('societe').")";
-        if($socid) $sql .= " AND rowid <> ".$socid;
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            $obj = $this->db->fetch_object($resql);
-            $count = $obj->idprof;
-        }
-        else
-        {
-            $count = 0;
-            print $this->db->error();
-        }
-        $this->db->free($resql);
+	/**
+	 *  Insert link supplier - category
+	 *
+	 *	@param	int		$categorie_id		Id of category
+	 *  @return int      					0 if success, <> 0 if error
+	 */
+	function AddFournisseurInCategory($categorie_id)
+	{
+		if ($categorie_id > 0 && $this->id > 0)
+		{
+			$sql = "INSERT INTO ".MAIN_DB_PREFIX."categorie_fournisseur (fk_categorie, fk_soc) ";
+			$sql.= " VALUES (".$categorie_id.", ".$this->id.")";
 
-		if ($count > 0) return true;
-		else return false;
-    }
-
-    /**
-     *  Verifie la validite d'un identifiant professionnel en fonction du pays de la societe (siren, siret, ...)
-     *
-     *  @param	int			$idprof         1,2,3,4 (Exemple: 1=siren,2=siret,3=naf,4=rcs/rm)
-     *  @param  Societe		$soc            Objet societe
-     *  @return int             			<=0 if KO, >0 if OK
-     *  TODO better to have this in a lib than into a business class
-     */
-    function id_prof_check($idprof,$soc)
-    {
-        global $conf;
-
-        $ok=1;
-
-        if (! empty($conf->global->MAIN_DISABLEPROFIDRULES)) return 1;
-
-        // Verifie SIREN si pays FR
-        if ($idprof == 1 && $soc->country_code == 'FR')
-        {
-            $chaine=trim($this->idprof1);
-            $chaine=preg_replace('/(\s)/','',$chaine);
-
-            if (dol_strlen($chaine) != 9) return -1;
-
-            $sum = 0;
-
-            for ($i = 0 ; $i < 10 ; $i = $i+2)
-            {
-                $sum = $sum + substr($this->idprof1, (8 - $i), 1);
-            }
-
-            for ($i = 1 ; $i < 9 ; $i = $i+2)
-            {
-                $ps = 2 * substr($this->idprof1, (8 - $i), 1);
-
-                if ($ps > 9)
-                {
-                    $ps = substr($ps, 0,1) + substr($ps, 1, 1);
-                }
-                $sum = $sum + $ps;
-            }
-
-            if (substr($sum, -1) != 0) return -1;
-        }
+			if ($resql=$this->db->query($sql)) return 0;
+		}
+		else
+		{
+			return 0;
+		}
+		return -1;
+	}
 
-        // Verifie SIRET si pays FR
-        if ($idprof == 2 && $soc->country_code == 'FR')
-        {
-            $chaine=trim($this->idprof2);
-            $chaine=preg_replace('/(\s)/','',$chaine);
 
-            if (dol_strlen($chaine) != 14) return -1;
-        }
+	/**
+	 *  Create a third party into database from a member object
+	 *
+	 *  @param	Adherent	$member		Object member
+	 * 	@param	string	$socname	Name of third party to force
+	 *  @return int					<0 if KO, id of created account if OK
+	 */
+	function create_from_member(Adherent $member,$socname='')
+	{
+		global $user,$langs;
+
+		$name = $socname?$socname:$member->societe;
+		if (empty($name)) $name=$member->getFullName($langs);
+
+		// Positionne parametres
+		$this->nom=$name;				// TODO deprecated
+		$this->name=$name;
+		$this->address=$member->address;
+		$this->zip=$member->zip;
+		$this->town=$member->town;
+		$this->country_code=$member->country_code;
+		$this->country_id=$member->country_id;
+		$this->phone=$member->phone;       // Prof phone
+		$this->email=$member->email;
+		$this->skype=$member->skype;
+
+		$this->client = 1;				// A member is a customer by default
+		$this->code_client = -1;
+		$this->code_fournisseur = -1;
+
+		$this->db->begin();
+
+		// Cree et positionne $this->id
+		$result=$this->create($user);
+		if ($result >= 0)
+		{
+			$sql = "UPDATE ".MAIN_DB_PREFIX."adherent";
+			$sql.= " SET fk_soc=".$this->id;
+			$sql.= " WHERE rowid=".$member->id;
 
-        //Verify CIF/NIF/NIE if pays ES
-        //Returns: 1 if NIF ok, 2 if CIF ok, 3 if NIE ok, -1 if NIF bad, -2 if CIF bad, -3 if NIE bad, 0 if unexpected bad
-        if ($idprof == 1 && $soc->country_code == 'ES')
-        {
-            $string=trim($this->idprof1);
-            $string=preg_replace('/(\s)/','',$string);
-            $string = strtoupper($string);
-
-            for ($i = 0; $i < 9; $i ++)
-            $num[$i] = substr($string, $i, 1);
-
-            //Check format
-            if (!preg_match('/((^[A-Z]{1}[0-9]{7}[A-Z0-9]{1}$|^[T]{1}[A-Z0-9]{8}$)|^[0-9]{8}[A-Z]{1}$)/', $string))
-            return 0;
-
-            //Check NIF
-            if (preg_match('/(^[0-9]{8}[A-Z]{1}$)/', $string))
-            if ($num[8] == substr('TRWAGMYFPDXBNJZSQVHLCKE', substr($string, 0, 8) % 23, 1))
-            return 1;
-            else
-            return -1;
-
-            //algorithm checking type code CIF
-            $sum = $num[2] + $num[4] + $num[6];
-            for ($i = 1; $i < 8; $i += 2)
-            $sum += substr((2 * $num[$i]),0,1) + substr((2 * $num[$i]),1,1);
-            $n = 10 - substr($sum, strlen($sum) - 1, 1);
-
-            //Chek special NIF
-            if (preg_match('/^[KLM]{1}/', $string))
-            if ($num[8] == chr(64 + $n) || $num[8] == substr('TRWAGMYFPDXBNJZSQVHLCKE', substr($string, 1, 8) % 23, 1))
-            return 1;
-            else
-            return -1;
-
-            //Check CIF
-            if (preg_match('/^[ABCDEFGHJNPQRSUVW]{1}/', $string))
-            if ($num[8] == chr(64 + $n) || $num[8] == substr($n, strlen($n) - 1, 1))
-            return 2;
-            else
-            return -2;
-
-            //Check NIE T
-            if (preg_match('/^[T]{1}/', $string))
-            if ($num[8] == preg_match('/^[T]{1}[A-Z0-9]{8}$/', $string))
-            return 3;
-            else
-            return -3;
-
-            //Check NIE XYZ
-            if (preg_match('/^[XYZ]{1}/', $string))
-            if ($num[8] == substr('TRWAGMYFPDXBNJZSQVHLCKE', substr(str_replace(array('X','Y','Z'), array('0','1','2'), $string), 0, 8) % 23, 1))
-            return 3;
-            else
-            return -3;
-
-            //Can not be verified
-            return -4;
-        }
+			dol_syslog(get_class($this)."::create_from_member", LOG_DEBUG);
+			$resql=$this->db->query($sql);
+			if ($resql)
+			{
+				$this->db->commit();
+				return $this->id;
+			}
+			else
+			{
+				$this->error=$this->db->error();
 
-        return $ok;
-    }
-
-    /**
-     *   Return an url to check online a professional id or empty string
-     *
-     *   @param		int		$idprof         1,2,3,4 (Example: 1=siren,2=siret,3=naf,4=rcs/rm)
-     *   @param 	Societe	$thirdparty     Object thirdparty
-     *   @return	string          		Url or empty string if no URL known
-     *   TODO better in a lib than into business class
-     */
-    function id_prof_url($idprof,$thirdparty)
-    {
-        global $conf,$langs,$hookmanager;
-
-        $url='';
-        $action = '';
-
-        $hookmanager->initHooks(array('idprofurl'));
-        $parameters=array('idprof'=>$idprof, 'company'=>$thirdparty);
-        $reshook=$hookmanager->executeHooks('getIdProfUrl',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
-        if (empty($reshook))
-        {
-            if (! empty($conf->global->MAIN_DISABLEPROFIDRULES)) return '';
-
-            // TODO Move links to validate professional ID into a dictionary table "country" + "link"
-            if ($idprof == 1 && $thirdparty->country_code == 'FR') $url='http://www.societe.com/cgi-bin/search?champs='.$thirdparty->idprof1;    // See also http://avis-situation-sirene.insee.fr/
-            //if ($idprof == 1 && ($thirdparty->country_code == 'GB' || $thirdparty->country_code == 'UK')) $url='http://www.companieshouse.gov.uk/WebCHeck/findinfolink/';     // Link no more valid
-            if ($idprof == 1 && $thirdparty->country_code == 'ES') $url='http://www.e-informa.es/servlet/app/portal/ENTP/screen/SProducto/prod/ETIQUETA_EMPRESA/nif/'.$thirdparty->idprof1;
-            if ($idprof == 1 && $thirdparty->country_code == 'IN') $url='http://www.tinxsys.com/TinxsysInternetWeb/dealerControllerServlet?tinNumber='.$thirdparty->idprof1.';&searchBy=TIN&backPage=searchByTin_Inter.jsp';
-
-            if ($url) return '<a target="_blank" href="'.$url.'">'.$langs->trans("Check").'</a>';
-        }
-        else
-        {
-            return $hookmanager->resPrint;
-        }
+				$this->db->rollback();
+				return -1;
+			}
+		}
+		else
+		{
+			// $this->error deja positionne
+			dol_syslog(get_class($this)."::create_from_member - 2 - ".$this->error." - ".join(',',$this->errors), LOG_ERR);
 
-        return '';
-    }
-
-    /**
-     *   Indique si la societe a des projets
-     *
-     *   @return     bool	   true si la societe a des projets, false sinon
-     */
-    function has_projects()
-    {
-        $sql = 'SELECT COUNT(*) as numproj FROM '.MAIN_DB_PREFIX.'projet WHERE fk_soc = ' . $this->id;
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            $obj = $this->db->fetch_object($resql);
-            $count = $obj->numproj;
-        }
-        else
-        {
-            $count = 0;
-            print $this->db->error();
-        }
-        $this->db->free($resql);
-        return ($count > 0);
-    }
-
-
-    /**
-     *  Load information for tab info
-     *
-     *  @param  int		$id     Id of thirdparty to load
-     *  @return	void
-     */
-    function info($id)
-    {
-        $sql = "SELECT s.rowid, s.nom as name, s.datec as date_creation, tms as date_modification,";
-        $sql.= " fk_user_creat, fk_user_modif";
-        $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
-        $sql.= " WHERE s.rowid = ".$id;
-
-        $result=$this->db->query($sql);
-        if ($result)
-        {
-            if ($this->db->num_rows($result))
-            {
-                $obj = $this->db->fetch_object($result);
-
-                $this->id = $obj->rowid;
-
-                if ($obj->fk_user_creat) {
-                    $cuser = new User($this->db);
-                    $cuser->fetch($obj->fk_user_creat);
-                    $this->user_creation     = $cuser;
-                }
-
-                if ($obj->fk_user_modif) {
-                    $muser = new User($this->db);
-                    $muser->fetch($obj->fk_user_modif);
-                    $this->user_modification = $muser;
-                }
-
-                $this->ref			     = $obj->name;
-                $this->date_creation     = $this->db->jdate($obj->date_creation);
-                $this->date_modification = $this->db->jdate($obj->date_modification);
-            }
-
-            $this->db->free($result);
+			$this->db->rollback();
+			return $result;
+		}
+	}
 
-        }
-        else
-		{
-            dol_print_error($this->db);
-        }
-    }
-
-    /**
-     *  Return if third party is a company (Business) or an end user (Consumer)
-     *
-     *  @return    boolean     true=is a company, false=a and user
-     */
-    function isACompany()
-    {
-        global $conf;
-
-        // Define if third party is treated as company (or not) when nature is unknown
-        $isacompany=empty($conf->global->MAIN_UNKNOWN_CUSTOMERS_ARE_COMPANIES)?0:1; // 0 by default
-        if (! empty($this->tva_intra)) $isacompany=1;
-        else if (! empty($this->typent_code) && in_array($this->typent_code,array('TE_PRIVATE'))) $isacompany=0;
-        else if (! empty($this->typent_code) && in_array($this->typent_code,array('TE_SMALL','TE_MEDIUM','TE_LARGE','TE_GROUP'))) $isacompany=1;
-
-        return $isacompany;
-    }
-
-    /**
-     *  Charge la liste des categories fournisseurs
-     *
-     *  @return    int      0 if success, <> 0 if error
-     */
-    function LoadSupplierCateg()
-    {
-        $this->SupplierCategories = array();
-        $sql = "SELECT rowid, label";
-        $sql.= " FROM ".MAIN_DB_PREFIX."categorie";
-        $sql.= " WHERE type = ".Categorie::TYPE_SUPPLIER;
-
-        $resql=$this->db->query($sql);
-        if ($resql)
-        {
-            while ($obj = $this->db->fetch_object($resql) )
-            {
-                $this->SupplierCategories[$obj->rowid] = $obj->label;
-            }
-            return 0;
-        }
-        else
-        {
-            return -1;
-        }
-    }
-
-    /**
-     *  Insert link supplier - category
-     *
-     *	@param	int		$categorie_id		Id of category
-     *  @return int      					0 if success, <> 0 if error
-     */
-    function AddFournisseurInCategory($categorie_id)
-    {
-        if ($categorie_id > 0 && $this->id > 0)
-        {
-            $sql = "INSERT INTO ".MAIN_DB_PREFIX."categorie_fournisseur (fk_categorie, fk_soc) ";
-            $sql.= " VALUES (".$categorie_id.", ".$this->id.")";
-
-            if ($resql=$this->db->query($sql)) return 0;
-        }
-        else
-        {
-            return 0;
-        }
-        return -1;
-    }
-
-
-    /**
-     *  Create a third party into database from a member object
-     *
-     *  @param	Adherent	$member		Object member
-     * 	@param	string	$socname	Name of third party to force
-     *  @return int					<0 if KO, id of created account if OK
-     */
-    function create_from_member(Adherent $member,$socname='')
-    {
-        global $user,$langs;
-
-        $name = $socname?$socname:$member->societe;
-        if (empty($name)) $name=$member->getFullName($langs);
-
-        // Positionne parametres
-        $this->nom=$name;				// TODO deprecated
-        $this->name=$name;
-        $this->address=$member->address;
-        $this->zip=$member->zip;
-        $this->town=$member->town;
-        $this->country_code=$member->country_code;
-        $this->country_id=$member->country_id;
-        $this->phone=$member->phone;       // Prof phone
-        $this->email=$member->email;
-        $this->skype=$member->skype;
-
-        $this->client = 1;				// A member is a customer by default
-        $this->code_client = -1;
-        $this->code_fournisseur = -1;
-
-        $this->db->begin();
-
-        // Cree et positionne $this->id
-        $result=$this->create($user);
-        if ($result >= 0)
-        {
-            $sql = "UPDATE ".MAIN_DB_PREFIX."adherent";
-            $sql.= " SET fk_soc=".$this->id;
-            $sql.= " WHERE rowid=".$member->id;
-
-            dol_syslog(get_class($this)."::create_from_member", LOG_DEBUG);
-            $resql=$this->db->query($sql);
-            if ($resql)
-            {
-                $this->db->commit();
-                return $this->id;
-            }
-            else
-            {
-                $this->error=$this->db->error();
-
-                $this->db->rollback();
-                return -1;
-            }
-        }
-        else
-        {
-            // $this->error deja positionne
-            dol_syslog(get_class($this)."::create_from_member - 2 - ".$this->error." - ".join(',',$this->errors), LOG_ERR);
+	/**
+	 * 	Set properties with value into $conf
+	 *
+	 * 	@param	Conf	$conf		Conf object (possibility to use another entity)
+	 * 	@return	void
+	 */
+	function setMysoc(Conf $conf)
+	{
+		global $langs;
 
-            $this->db->rollback();
-            return $result;
-        }
-    }
-
-    /**
-     * 	Set properties with value into $conf
-     *
-     * 	@param	Conf	$conf		Conf object (possibility to use another entity)
-     * 	@return	void
-     */
-    function setMysoc(Conf $conf)
-    {
-    	global $langs;
-
-    	$this->id=0;
-    	$this->name=empty($conf->global->MAIN_INFO_SOCIETE_NOM)?'':$conf->global->MAIN_INFO_SOCIETE_NOM;
-    	$this->address=empty($conf->global->MAIN_INFO_SOCIETE_ADDRESS)?'':$conf->global->MAIN_INFO_SOCIETE_ADDRESS;
-    	$this->zip=empty($conf->global->MAIN_INFO_SOCIETE_ZIP)?'':$conf->global->MAIN_INFO_SOCIETE_ZIP;
-    	$this->town=empty($conf->global->MAIN_INFO_SOCIETE_TOWN)?'':$conf->global->MAIN_INFO_SOCIETE_TOWN;
+		$this->id=0;
+		$this->name=empty($conf->global->MAIN_INFO_SOCIETE_NOM)?'':$conf->global->MAIN_INFO_SOCIETE_NOM;
+		$this->address=empty($conf->global->MAIN_INFO_SOCIETE_ADDRESS)?'':$conf->global->MAIN_INFO_SOCIETE_ADDRESS;
+		$this->zip=empty($conf->global->MAIN_INFO_SOCIETE_ZIP)?'':$conf->global->MAIN_INFO_SOCIETE_ZIP;
+		$this->town=empty($conf->global->MAIN_INFO_SOCIETE_TOWN)?'':$conf->global->MAIN_INFO_SOCIETE_TOWN;
 		$this->state_id=empty($conf->global->MAIN_INFO_SOCIETE_STATE)?'':$conf->global->MAIN_INFO_SOCIETE_STATE;
 
-        /* Disabled: we don't want any SQL request into method setMySoc. This method set object from env only.
+		/* Disabled: we don't want any SQL request into method setMySoc. This method set object from env only.
         If we need label, label must be loaded by output that need it from id (label depends on output language)
         require_once DOL_DOCUMENT_ROOT .'/core/lib/company.lib.php';
         if (!empty($conf->global->MAIN_INFO_SOCIETE_STATE)) {
@@ -3068,165 +3068,165 @@ 
         }
 		*/
 
-    	$this->note_private=empty($conf->global->MAIN_INFO_SOCIETE_NOTE)?'':$conf->global->MAIN_INFO_SOCIETE_NOTE;
-
-    	$this->nom=$this->name; 									// deprecated
-
-    	// We define country_id, country_code and country
-    	$country_id=$country_code=$country_label='';
-    	if (! empty($conf->global->MAIN_INFO_SOCIETE_COUNTRY))
-    	{
-    		$tmp=explode(':',$conf->global->MAIN_INFO_SOCIETE_COUNTRY);
-    		$country_id=$tmp[0];
-    		if (! empty($tmp[1]))   // If $conf->global->MAIN_INFO_SOCIETE_COUNTRY is "id:code:label"
-    		{
-    			$country_code=$tmp[1];
-    			$country_label=$tmp[2];
-    		}
-    		else                    // For backward compatibility
-    		{
-    			dol_syslog("Your country setup use an old syntax. Reedit it using setup area.", LOG_ERR);
-    			include_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
-    			$country_code=getCountry($country_id,2,$this->db);  // This need a SQL request, but it's the old feature that should not be used anymore
-    			$country_label=getCountry($country_id,0,$this->db);  // This need a SQL request, but it's the old feature that should not be used anymore
-    		}
-    	}
-    	$this->country_id=$country_id;
-    	$this->country_code=$country_code;
-    	$this->country=$country_label;
-    	if (is_object($langs)) $this->country=($langs->trans('Country'.$country_code)!='Country'.$country_code)?$langs->trans('Country'.$country_code):$country_label;
-
-    	$this->phone=empty($conf->global->MAIN_INFO_SOCIETE_TEL)?'':$conf->global->MAIN_INFO_SOCIETE_TEL;
-    	$this->fax=empty($conf->global->MAIN_INFO_SOCIETE_FAX)?'':$conf->global->MAIN_INFO_SOCIETE_FAX;
-    	$this->url=empty($conf->global->MAIN_INFO_SOCIETE_WEB)?'':$conf->global->MAIN_INFO_SOCIETE_WEB;
-    	// Id prof generiques
-    	$this->idprof1=empty($conf->global->MAIN_INFO_SIREN)?'':$conf->global->MAIN_INFO_SIREN;
-    	$this->idprof2=empty($conf->global->MAIN_INFO_SIRET)?'':$conf->global->MAIN_INFO_SIRET;
-    	$this->idprof3=empty($conf->global->MAIN_INFO_APE)?'':$conf->global->MAIN_INFO_APE;
-    	$this->idprof4=empty($conf->global->MAIN_INFO_RCS)?'':$conf->global->MAIN_INFO_RCS;
-    	$this->idprof5=empty($conf->global->MAIN_INFO_PROFID5)?'':$conf->global->MAIN_INFO_PROFID5;
-    	$this->idprof6=empty($conf->global->MAIN_INFO_PROFID6)?'':$conf->global->MAIN_INFO_PROFID6;
-    	$this->tva_intra=empty($conf->global->MAIN_INFO_TVAINTRA)?'':$conf->global->MAIN_INFO_TVAINTRA;	// VAT number, not necessarly INTRA.
-    	$this->managers=empty($conf->global->MAIN_INFO_SOCIETE_MANAGERS)?'':$conf->global->MAIN_INFO_SOCIETE_MANAGERS;
-    	$this->capital=empty($conf->global->MAIN_INFO_CAPITAL)?'':$conf->global->MAIN_INFO_CAPITAL;
-    	$this->forme_juridique_code=empty($conf->global->MAIN_INFO_SOCIETE_FORME_JURIDIQUE)?'':$conf->global->MAIN_INFO_SOCIETE_FORME_JURIDIQUE;
-    	$this->email=empty($conf->global->MAIN_INFO_SOCIETE_MAIL)?'':$conf->global->MAIN_INFO_SOCIETE_MAIL;
-    	$this->logo=empty($conf->global->MAIN_INFO_SOCIETE_LOGO)?'':$conf->global->MAIN_INFO_SOCIETE_LOGO;
-    	$this->logo_small=empty($conf->global->MAIN_INFO_SOCIETE_LOGO_SMALL)?'':$conf->global->MAIN_INFO_SOCIETE_LOGO_SMALL;
-    	$this->logo_mini=empty($conf->global->MAIN_INFO_SOCIETE_LOGO_MINI)?'':$conf->global->MAIN_INFO_SOCIETE_LOGO_MINI;
-
-    	// Define if company use vat or not
-    	$this->tva_assuj=$conf->global->FACTURE_TVAOPTION;
-
-    	// Define if company use local taxes
-    	$this->localtax1_assuj=((isset($conf->global->FACTURE_LOCAL_TAX1_OPTION) && ($conf->global->FACTURE_LOCAL_TAX1_OPTION=='1' || $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on'))?1:0);
-    	$this->localtax2_assuj=((isset($conf->global->FACTURE_LOCAL_TAX2_OPTION) && ($conf->global->FACTURE_LOCAL_TAX2_OPTION=='1' || $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on'))?1:0);
-    }
-
-    /**
-     *  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()
-    {
-        $now=dol_now();
-
-        // Initialize parameters
-        $this->id=0;
-        $this->name = 'THIRDPARTY SPECIMEN '.dol_print_date($now,'dayhourlog');
-        $this->nom = $this->name;   // For backward compatibility
-        $this->ref_ext = 'Ref ext';
-        $this->specimen=1;
-        $this->address='21 jump street';
-        $this->zip='99999';
-        $this->town='MyTown';
-        $this->state_id=1;
-        $this->state_code='AA';
-        $this->state='MyState';
-        $this->country_id=1;
-        $this->country_code='FR';
-        $this->email='specimen@specimen.com';
-        $this->skype='tom.hanson';
-        $this->url='http://www.specimen.com';
-
-        $this->phone='0909090901';
-        $this->fax='0909090909';
-
-        $this->code_client='CC-'.dol_print_date($now,'dayhourlog');
-        $this->code_fournisseur='SC-'.dol_print_date($now,'dayhourlog');
-        $this->capital=10000;
-        $this->client=1;
-        $this->prospect=1;
-        $this->fournisseur=1;
-        $this->tva_assuj=1;
-        $this->tva_intra='EU1234567';
-        $this->note_public='This is a comment (public)';
-        $this->note_private='This is a comment (private)';
-
-        $this->idprof1='idprof1';
-        $this->idprof2='idprof2';
-        $this->idprof3='idprof3';
-        $this->idprof4='idprof4';
-        $this->idprof5='idprof5';
-        $this->idprof6='idprof6';
-    }
-
-    /**
-     *  Check if we must use localtax feature or not according to country (country of $mysoc in most cases).
-     *
-     *	@param		int		$localTaxNum	To get info for only localtax1 or localtax2
-     *  @return		boolean					true or false
-     */
-    function useLocalTax($localTaxNum=0)
-    {
-    	$sql  = "SELECT t.localtax1, t.localtax2";
-    	$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
-    	$sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$this->db->escape($this->country_code)."'";
-    	$sql .= " AND t.active = 1";
-    	if (empty($localTaxNum))   $sql .= " AND (t.localtax1_type <> '0' OR t.localtax2_type <> '0')";
-    	elseif ($localTaxNum == 1) $sql .= " AND t.localtax1_type <> '0'";
-    	elseif ($localTaxNum == 2) $sql .= " AND t.localtax2_type <> '0'";
-
-    	dol_syslog("useLocalTax", LOG_DEBUG);
-    	$resql=$this->db->query($sql);
-    	if ($resql)
-    	{
+		$this->note_private=empty($conf->global->MAIN_INFO_SOCIETE_NOTE)?'':$conf->global->MAIN_INFO_SOCIETE_NOTE;
+
+		$this->nom=$this->name; 									// deprecated
+
+		// We define country_id, country_code and country
+		$country_id=$country_code=$country_label='';
+		if (! empty($conf->global->MAIN_INFO_SOCIETE_COUNTRY))
+		{
+			$tmp=explode(':',$conf->global->MAIN_INFO_SOCIETE_COUNTRY);
+			$country_id=$tmp[0];
+			if (! empty($tmp[1]))   // If $conf->global->MAIN_INFO_SOCIETE_COUNTRY is "id:code:label"
+			{
+				$country_code=$tmp[1];
+				$country_label=$tmp[2];
+			}
+			else                    // For backward compatibility
+			{
+				dol_syslog("Your country setup use an old syntax. Reedit it using setup area.", LOG_ERR);
+				include_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+				$country_code=getCountry($country_id,2,$this->db);  // This need a SQL request, but it's the old feature that should not be used anymore
+				$country_label=getCountry($country_id,0,$this->db);  // This need a SQL request, but it's the old feature that should not be used anymore
+			}
+		}
+		$this->country_id=$country_id;
+		$this->country_code=$country_code;
+		$this->country=$country_label;
+		if (is_object($langs)) $this->country=($langs->trans('Country'.$country_code)!='Country'.$country_code)?$langs->trans('Country'.$country_code):$country_label;
+
+		$this->phone=empty($conf->global->MAIN_INFO_SOCIETE_TEL)?'':$conf->global->MAIN_INFO_SOCIETE_TEL;
+		$this->fax=empty($conf->global->MAIN_INFO_SOCIETE_FAX)?'':$conf->global->MAIN_INFO_SOCIETE_FAX;
+		$this->url=empty($conf->global->MAIN_INFO_SOCIETE_WEB)?'':$conf->global->MAIN_INFO_SOCIETE_WEB;
+		// Id prof generiques
+		$this->idprof1=empty($conf->global->MAIN_INFO_SIREN)?'':$conf->global->MAIN_INFO_SIREN;
+		$this->idprof2=empty($conf->global->MAIN_INFO_SIRET)?'':$conf->global->MAIN_INFO_SIRET;
+		$this->idprof3=empty($conf->global->MAIN_INFO_APE)?'':$conf->global->MAIN_INFO_APE;
+		$this->idprof4=empty($conf->global->MAIN_INFO_RCS)?'':$conf->global->MAIN_INFO_RCS;
+		$this->idprof5=empty($conf->global->MAIN_INFO_PROFID5)?'':$conf->global->MAIN_INFO_PROFID5;
+		$this->idprof6=empty($conf->global->MAIN_INFO_PROFID6)?'':$conf->global->MAIN_INFO_PROFID6;
+		$this->tva_intra=empty($conf->global->MAIN_INFO_TVAINTRA)?'':$conf->global->MAIN_INFO_TVAINTRA;	// VAT number, not necessarly INTRA.
+		$this->managers=empty($conf->global->MAIN_INFO_SOCIETE_MANAGERS)?'':$conf->global->MAIN_INFO_SOCIETE_MANAGERS;
+		$this->capital=empty($conf->global->MAIN_INFO_CAPITAL)?'':$conf->global->MAIN_INFO_CAPITAL;
+		$this->forme_juridique_code=empty($conf->global->MAIN_INFO_SOCIETE_FORME_JURIDIQUE)?'':$conf->global->MAIN_INFO_SOCIETE_FORME_JURIDIQUE;
+		$this->email=empty($conf->global->MAIN_INFO_SOCIETE_MAIL)?'':$conf->global->MAIN_INFO_SOCIETE_MAIL;
+		$this->logo=empty($conf->global->MAIN_INFO_SOCIETE_LOGO)?'':$conf->global->MAIN_INFO_SOCIETE_LOGO;
+		$this->logo_small=empty($conf->global->MAIN_INFO_SOCIETE_LOGO_SMALL)?'':$conf->global->MAIN_INFO_SOCIETE_LOGO_SMALL;
+		$this->logo_mini=empty($conf->global->MAIN_INFO_SOCIETE_LOGO_MINI)?'':$conf->global->MAIN_INFO_SOCIETE_LOGO_MINI;
+
+		// Define if company use vat or not
+		$this->tva_assuj=$conf->global->FACTURE_TVAOPTION;
+
+		// Define if company use local taxes
+		$this->localtax1_assuj=((isset($conf->global->FACTURE_LOCAL_TAX1_OPTION) && ($conf->global->FACTURE_LOCAL_TAX1_OPTION=='1' || $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on'))?1:0);
+		$this->localtax2_assuj=((isset($conf->global->FACTURE_LOCAL_TAX2_OPTION) && ($conf->global->FACTURE_LOCAL_TAX2_OPTION=='1' || $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on'))?1:0);
+	}
+
+	/**
+	 *  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()
+	{
+		$now=dol_now();
+
+		// Initialize parameters
+		$this->id=0;
+		$this->name = 'THIRDPARTY SPECIMEN '.dol_print_date($now,'dayhourlog');
+		$this->nom = $this->name;   // For backward compatibility
+		$this->ref_ext = 'Ref ext';
+		$this->specimen=1;
+		$this->address='21 jump street';
+		$this->zip='99999';
+		$this->town='MyTown';
+		$this->state_id=1;
+		$this->state_code='AA';
+		$this->state='MyState';
+		$this->country_id=1;
+		$this->country_code='FR';
+		$this->email='specimen@specimen.com';
+		$this->skype='tom.hanson';
+		$this->url='http://www.specimen.com';
+
+		$this->phone='0909090901';
+		$this->fax='0909090909';
+
+		$this->code_client='CC-'.dol_print_date($now,'dayhourlog');
+		$this->code_fournisseur='SC-'.dol_print_date($now,'dayhourlog');
+		$this->capital=10000;
+		$this->client=1;
+		$this->prospect=1;
+		$this->fournisseur=1;
+		$this->tva_assuj=1;
+		$this->tva_intra='EU1234567';
+		$this->note_public='This is a comment (public)';
+		$this->note_private='This is a comment (private)';
+
+		$this->idprof1='idprof1';
+		$this->idprof2='idprof2';
+		$this->idprof3='idprof3';
+		$this->idprof4='idprof4';
+		$this->idprof5='idprof5';
+		$this->idprof6='idprof6';
+	}
+
+	/**
+	 *  Check if we must use localtax feature or not according to country (country of $mysoc in most cases).
+	 *
+	 *	@param		int		$localTaxNum	To get info for only localtax1 or localtax2
+	 *  @return		boolean					true or false
+	 */
+	function useLocalTax($localTaxNum=0)
+	{
+		$sql  = "SELECT t.localtax1, t.localtax2";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
+		$sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$this->db->escape($this->country_code)."'";
+		$sql .= " AND t.active = 1";
+		if (empty($localTaxNum))   $sql .= " AND (t.localtax1_type <> '0' OR t.localtax2_type <> '0')";
+		elseif ($localTaxNum == 1) $sql .= " AND t.localtax1_type <> '0'";
+		elseif ($localTaxNum == 2) $sql .= " AND t.localtax2_type <> '0'";
+
+		dol_syslog("useLocalTax", LOG_DEBUG);
+		$resql=$this->db->query($sql);
+		if ($resql)
+		{
    			return ($this->db->num_rows($resql) > 0);
-    	}
-    	else return false;
-    }
-
-    /**
-     *  Check if we must use NPR Vat (french stupid rule) or not according to country (country of $mysoc in most cases).
-     *
-     *  @return		boolean					true or false
-     */
-    function useNPR()
-    {
-        $sql  = "SELECT t.rowid";
-        $sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
-        $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$this->db->escape($this->country_code)."'";
-        $sql .= " AND t.active = 1 AND t.recuperableonly = 1";
-
-        dol_syslog("useNPR", LOG_DEBUG);
-        $resql=$this->db->query($sql);
-        if ($resql)
-        {
-            return ($this->db->num_rows($resql) > 0);
-        }
-        else return false;
-    }
-
-    /**
-     *  Check if we must use revenue stamps feature or not according to country (country of $mysocin most cases).
-     *
-     *  @return		boolean			true or false
-     */
-    function useRevenueStamp()
-    {
+		}
+		else return false;
+	}
+
+	/**
+	 *  Check if we must use NPR Vat (french stupid rule) or not according to country (country of $mysoc in most cases).
+	 *
+	 *  @return		boolean					true or false
+	 */
+	function useNPR()
+	{
+		$sql  = "SELECT t.rowid";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
+		$sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$this->db->escape($this->country_code)."'";
+		$sql .= " AND t.active = 1 AND t.recuperableonly = 1";
+
+		dol_syslog("useNPR", LOG_DEBUG);
+		$resql=$this->db->query($sql);
+		if ($resql)
+		{
+			return ($this->db->num_rows($resql) > 0);
+		}
+		else return false;
+	}
+
+	/**
+	 *  Check if we must use revenue stamps feature or not according to country (country of $mysocin most cases).
+	 *
+	 *  @return		boolean			true or false
+	 */
+	function useRevenueStamp()
+	{
 		$sql  = "SELECT COUNT(*) as nb";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_revenuestamp as r, ".MAIN_DB_PREFIX."c_country as c";
 		$sql .= " WHERE r.fk_pays = c.rowid AND c.code = '".$this->db->escape($this->country_code)."'";
@@ -3281,11 +3281,11 @@ 
 	 *
 	 *  @param  User	$user		Utilisateur qui definie la remise
 	 *	@return	int					<0 if KO, >0 if OK
-     * @deprecated Use update function instead
+	 * @deprecated Use update function instead
 	 */
 	function set_prospect_level(User $user)
 	{
-        return $this->update($this->id, $user);
+		return $this->update($this->id, $user);
 	}
 
 	/**
@@ -3358,11 +3358,11 @@ 
 	 *
 	 *  @param  User	$user		User making change
 	 *	@return	int					<0 if KO, >0 if OK
-     * @deprecated Use update function instead
+	 * @deprecated Use update function instead
 	 */
 	function set_OutstandingBill(User $user)
 	{
-        return $this->update($this->id, $user);
+		return $this->update($this->id, $user);
 	}
 
 	/**
@@ -3526,39 +3526,39 @@ 
 	 */
 	function get_OutstandingBill()
 	{
-	    /* Accurate value of remain to pay is to sum remaintopay for each invoice
+		/* Accurate value of remain to pay is to sum remaintopay for each invoice
 	     $paiement = $invoice->getSommePaiement();
 	     $creditnotes=$invoice->getSumCreditNotesUsed();
 	     $deposits=$invoice->getSumDepositsUsed();
 	     $alreadypayed=price2num($paiement + $creditnotes + $deposits,'MT');
 	     $remaintopay=price2num($invoice->total_ttc - $paiement - $creditnotes - $deposits,'MT');
 	     */
-	    $sql  = "SELECT rowid, total_ttc FROM ".MAIN_DB_PREFIX."facture as f";
-	    $sql .= " WHERE fk_soc = ". $this->id;
-	    $sql .= " AND paye = 0";
-	    $sql .= " AND fk_statut <> 0";	// Not a draft
-	    //$sql .= " AND (fk_statut <> 3 OR close_code <> 'abandon')";		// Not abandonned for undefined reason
-	    $sql .= " AND fk_statut <> 3";		// Not abandonned
-	    $sql .= " AND fk_statut <> 2";		// Not clasified as paid
-
-	    dol_syslog("get_OutstandingBill", LOG_DEBUG);
-	    $resql=$this->db->query($sql);
-	    if ($resql)
-	    {
-	        $outstandingAmount = 0;
-	        require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-	        $tmpobject=new Facture($this->db);
-	        while($obj=$this->db->fetch_object($resql)) {
-	            $tmpobject->id=$obj->rowid;
-	            $paiement = $tmpobject->getSommePaiement();
-	            $creditnotes = $tmpobject->getSumCreditNotesUsed();
-	            $deposits = $tmpobject->getSumDepositsUsed();
-	            $outstandingAmount+= $obj->total_ttc - $paiement - $creditnotes - $deposits;
-	        }
-	        return $outstandingAmount;
-	    }
-	    else
-	        return 0;
+		$sql  = "SELECT rowid, total_ttc FROM ".MAIN_DB_PREFIX."facture as f";
+		$sql .= " WHERE fk_soc = ". $this->id;
+		$sql .= " AND paye = 0";
+		$sql .= " AND fk_statut <> 0";	// Not a draft
+		//$sql .= " AND (fk_statut <> 3 OR close_code <> 'abandon')";		// Not abandonned for undefined reason
+		$sql .= " AND fk_statut <> 3";		// Not abandonned
+		$sql .= " AND fk_statut <> 2";		// Not clasified as paid
+
+		dol_syslog("get_OutstandingBill", LOG_DEBUG);
+		$resql=$this->db->query($sql);
+		if ($resql)
+		{
+			$outstandingAmount = 0;
+			require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+			$tmpobject=new Facture($this->db);
+			while($obj=$this->db->fetch_object($resql)) {
+				$tmpobject->id=$obj->rowid;
+				$paiement = $tmpobject->getSommePaiement();
+				$creditnotes = $tmpobject->getSumCreditNotesUsed();
+				$deposits = $tmpobject->getSumDepositsUsed();
+				$outstandingAmount+= $obj->total_ttc - $paiement - $creditnotes - $deposits;
+			}
+			return $outstandingAmount;
+		}
+		else
+			return 0;
 	}
 
 	/**
@@ -3607,33 +3607,33 @@ 
 
 		if (! empty($moreparams) && ! empty($moreparams['use_companybankid']))
 		{
-		    $modelpath = "core/modules/bank/doc/";
+			$modelpath = "core/modules/bank/doc/";
 
-		    include_once DOL_DOCUMENT_ROOT.'/societe/class/companybankaccount.class.php';
-		    $companybankaccount = new CompanyBankAccount($this->db);
-		    $result = $companybankaccount->fetch($moreparams['use_companybankid']);
-		    if (! $result) dol_print_error($this->db, $companybankaccount->error, $companybankaccount->errors);
-		    $result=$companybankaccount->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
+			include_once DOL_DOCUMENT_ROOT.'/societe/class/companybankaccount.class.php';
+			$companybankaccount = new CompanyBankAccount($this->db);
+			$result = $companybankaccount->fetch($moreparams['use_companybankid']);
+			if (! $result) dol_print_error($this->db, $companybankaccount->error, $companybankaccount->errors);
+			$result=$companybankaccount->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
 		}
 		else
 		{
-    		// Positionne le modele sur le nom du modele a utiliser
-    		if (! dol_strlen($modele))
-    		{
-    			if (! empty($conf->global->COMPANY_ADDON_PDF))
-    			{
-    				$modele = $conf->global->COMPANY_ADDON_PDF;
-    			}
-    			else
-    			{
-    				print $langs->trans("Error")." ".$langs->trans("Error_COMPANY_ADDON_PDF_NotDefined");
-                    return 0;
-    			}
-    		}
+			// Positionne le modele sur le nom du modele a utiliser
+			if (! dol_strlen($modele))
+			{
+				if (! empty($conf->global->COMPANY_ADDON_PDF))
+				{
+					$modele = $conf->global->COMPANY_ADDON_PDF;
+				}
+				else
+				{
+					print $langs->trans("Error")." ".$langs->trans("Error_COMPANY_ADDON_PDF_NotDefined");
+					return 0;
+				}
+			}
 
-    		$modelpath = "core/modules/societe/doc/";
+			$modelpath = "core/modules/societe/doc/";
 
-    		$result=$this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
+			$result=$this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
 		}
 
 		return $result;
@@ -3654,7 +3654,7 @@ 
 	{
 		require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
 
-	    // Decode type
+		// Decode type
 		if ($type == 'customer') {
 			$type_id = Categorie::TYPE_CUSTOMER;
 			$type_text = 'customer';

Spacing +721 added lines, -721 removed lines

@@ -40,11 +40,11 @@ 
  */
 class Societe extends CommonObject
 {
-    public $element='societe';
+    public $element = 'societe';
     public $table_element = 'societe';
-	public $fk_element='fk_soc';
-    protected $childtables=array("supplier_proposal"=>'SupplierProposal',"propal"=>'Proposal',"commande"=>'Order',"facture"=>'Invoice',"facture_rec"=>'RecurringInvoiceTemplate',"contrat"=>'Contract',"fichinter"=>'Fichinter',"facture_fourn"=>'SupplierInvoice',"commande_fournisseur"=>'SupplierOrder',"projet"=>'Project',"expedition"=>'Shipment',"prelevement_lignes"=>'DirectDebitRecord');    // To test if we can delete object
-	protected $childtablesoncascade=array("societe_prices", "societe_log", "societe_address", "product_fournisseur_price", "product_customer_price_log", "product_customer_price", "socpeople", "adherent", "societe_rib", "societe_remise", "societe_remise_except", "societe_commerciaux", "categorie", "notify", "notify_def", "actioncomm");
+	public $fk_element = 'fk_soc';
+    protected $childtables = array("supplier_proposal"=>'SupplierProposal', "propal"=>'Proposal', "commande"=>'Order', "facture"=>'Invoice', "facture_rec"=>'RecurringInvoiceTemplate', "contrat"=>'Contract', "fichinter"=>'Fichinter', "facture_fourn"=>'SupplierInvoice', "commande_fournisseur"=>'SupplierOrder', "projet"=>'Project', "expedition"=>'Shipment', "prelevement_lignes"=>'DirectDebitRecord'); // To test if we can delete object
+	protected $childtablesoncascade = array("societe_prices", "societe_log", "societe_address", "product_fournisseur_price", "product_customer_price_log", "product_customer_price", "socpeople", "adherent", "societe_rib", "societe_remise", "societe_remise_except", "societe_commerciaux", "categorie", "notify", "notify_def", "actioncomm");
 
 
 	/**
@@ -362,7 +362,7 @@ 
 	// Incoterms
 	var $fk_incoterms;
 	var $location_incoterms;
-	var $libelle_incoterms;  //Used into tooltip
+	var $libelle_incoterms; //Used into tooltip
 
 	// Multicurrency
 	var $fk_multicurrency;
@@ -386,9 +386,9 @@ 
         $this->client = 0;
         $this->prospect = 0;
         $this->fournisseur = 0;
-        $this->typent_id  = 0;
-        $this->effectif_id  = 0;
-        $this->forme_juridique_code  = 0;
+        $this->typent_id = 0;
+        $this->effectif_id = 0;
+        $this->forme_juridique_code = 0;
         $this->tva_assuj = 1;
         $this->status = 1;
     }
@@ -403,17 +403,17 @@ 
      */
     function create($user)
     {
-        global $langs,$conf,$mysoc;
+        global $langs, $conf, $mysoc;
 
-		$error=0;
+		$error = 0;
 
         // Clean parameters
-        if (empty($this->status)) $this->status=0;
-        $this->name=$this->name?trim($this->name):trim($this->nom);
-        if (! empty($conf->global->MAIN_FIRST_TO_UPPER)) $this->name=ucwords($this->name);
-        $this->nom=$this->name; // For backward compatibility
-        if (empty($this->client))      $this->client=0;
-        if (empty($this->fournisseur)) $this->fournisseur=0;
+        if (empty($this->status)) $this->status = 0;
+        $this->name = $this->name ?trim($this->name) : trim($this->nom);
+        if (!empty($conf->global->MAIN_FIRST_TO_UPPER)) $this->name = ucwords($this->name);
+        $this->nom = $this->name; // For backward compatibility
+        if (empty($this->client))      $this->client = 0;
+        if (empty($this->fournisseur)) $this->fournisseur = 0;
         $this->import_key = trim($this->import_key);
 
 		if (!empty($this->multicurrency_code)) $this->fk_multicurrency = MultiCurrency::getIdFromCode($this->db, $this->multicurrency_code);
@@ -425,13 +425,13 @@ 
 
         dol_syslog(get_class($this)."::create ".$this->name);
 
-        $now=dol_now();
+        $now = dol_now();
 
         $this->db->begin();
 
         // For automatic creation during create action (not used by Dolibarr GUI, can be used by scripts)
-        if ($this->code_client == -1)      $this->get_codeclient($this,0);
-        if ($this->code_fournisseur == -1) $this->get_codefournisseur($this,1);
+        if ($this->code_client == -1)      $this->get_codeclient($this, 0);
+        if ($this->code_fournisseur == -1) $this->get_codefournisseur($this, 1);
 
         // Check more parameters (including mandatory setup
         // If error, this->errors[] is filled
@@ -440,26 +440,26 @@ 
         if ($result >= 0)
         {
             $sql = "INSERT INTO ".MAIN_DB_PREFIX."societe (nom, name_alias, entity, datec, fk_user_creat, canvas, status, ref_int, ref_ext, fk_stcomm, fk_incoterms, location_incoterms ,import_key, fk_multicurrency, multicurrency_code)";
-            $sql.= " VALUES ('".$this->db->escape($this->name)."', '".$this->db->escape($this->name_alias)."', ".$conf->entity.", '".$this->db->idate($now)."'";
-            $sql.= ", ".(! empty($user->id) ? "'".$user->id."'":"null");
-            $sql.= ", ".(! empty($this->canvas) ? "'".$this->db->escape($this->canvas)."'":"null");
-            $sql.= ", ".$this->status;
-            $sql.= ", ".(! empty($this->ref_int) ? "'".$this->db->escape($this->ref_int)."'":"null");
-            $sql.= ", ".(! empty($this->ref_ext) ? "'".$this->db->escape($this->ref_ext)."'":"null");
-            $sql.= ", 0";
-			$sql.= ", ".(int) $this->fk_incoterms;
-			$sql.= ", '".$this->db->escape($this->location_incoterms)."'";
-            $sql.= ", ".(! empty($this->import_key) ? "'".$this->db->escape($this->import_key)."'":"null");
-            $sql.= ", ".(int) $this->fk_multicurrency;
-            $sql.= ", '".$this->db->escape($this->multicurrency_code)."')";
+            $sql .= " VALUES ('".$this->db->escape($this->name)."', '".$this->db->escape($this->name_alias)."', ".$conf->entity.", '".$this->db->idate($now)."'";
+            $sql .= ", ".(!empty($user->id) ? "'".$user->id."'" : "null");
+            $sql .= ", ".(!empty($this->canvas) ? "'".$this->db->escape($this->canvas)."'" : "null");
+            $sql .= ", ".$this->status;
+            $sql .= ", ".(!empty($this->ref_int) ? "'".$this->db->escape($this->ref_int)."'" : "null");
+            $sql .= ", ".(!empty($this->ref_ext) ? "'".$this->db->escape($this->ref_ext)."'" : "null");
+            $sql .= ", 0";
+			$sql .= ", ".(int) $this->fk_incoterms;
+			$sql .= ", '".$this->db->escape($this->location_incoterms)."'";
+            $sql .= ", ".(!empty($this->import_key) ? "'".$this->db->escape($this->import_key)."'" : "null");
+            $sql .= ", ".(int) $this->fk_multicurrency;
+            $sql .= ", '".$this->db->escape($this->multicurrency_code)."')";
 
             dol_syslog(get_class($this)."::create", LOG_DEBUG);
-            $result=$this->db->query($sql);
+            $result = $this->db->query($sql);
             if ($result)
             {
                 $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."societe");
 
-                $ret = $this->update($this->id,$user,0,1,1,'add');
+                $ret = $this->update($this->id, $user, 0, 1, 1, 'add');
 
                 // Ajout du commercial affecte
                 if ($this->commercial_id != '' && $this->commercial_id != -1)
@@ -475,13 +475,13 @@ 
                 if ($ret >= 0)
                 {
                     // Call trigger
-                    $result=$this->call_trigger('COMPANY_CREATE',$user);
+                    $result = $this->call_trigger('COMPANY_CREATE', $user);
                     if ($result < 0) $error++;
                     // End call triggers
                 }
                 else $error++;
 
-                if (! $error)
+                if (!$error)
                 {
                     dol_syslog(get_class($this)."::Create success id=".$this->id);
                     $this->db->commit();
@@ -489,7 +489,7 @@ 
                 }
                 else
                 {
-                    dol_syslog(get_class($this)."::Create echec update ".$this->error." ".join(',',$this->errors), LOG_ERR);
+                    dol_syslog(get_class($this)."::Create echec update ".$this->error." ".join(',', $this->errors), LOG_ERR);
                     $this->db->rollback();
                     return -4;
                 }
@@ -498,13 +498,13 @@ 
             {
                 if ($this->db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
                 {
-                    $this->error=$langs->trans("ErrorCompanyNameAlreadyExists",$this->name);    // duplicate on a field (code or profid or ...)
-                    $result=-1;
+                    $this->error = $langs->trans("ErrorCompanyNameAlreadyExists", $this->name); // duplicate on a field (code or profid or ...)
+                    $result = -1;
                 }
                 else
                 {
-                    $this->error=$this->db->lasterror();
-                    $result=-2;
+                    $this->error = $this->db->lasterror();
+                    $result = -2;
                 }
                 $this->db->rollback();
                 return $result;
@@ -514,7 +514,7 @@ 
         else
         {
             $this->db->rollback();
-            dol_syslog(get_class($this)."::Create fails verify ".join(',',$this->errors), LOG_WARNING);
+            dol_syslog(get_class($this)."::Create fails verify ".join(',', $this->errors), LOG_WARNING);
             return -3;
         }
     }
@@ -529,12 +529,12 @@ 
     function create_individual(User $user)
     {
         require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
-        $contact=new Contact($this->db);
+        $contact = new Contact($this->db);
 
         $contact->name              = $this->name_bis;
         $contact->firstname         = $this->firstname;
         $contact->civility_id       = $this->civility_id;
-        $contact->socid             = $this->id;	// fk_soc
+        $contact->socid             = $this->id; // fk_soc
         $contact->statut            = 1;
         $contact->priv              = 0;
         $contact->country_id        = $this->country_id;
@@ -550,7 +550,7 @@ 
         {
             $this->error = $contact->error;
             $this->errors = $contact->errors;
-            dol_syslog(get_class($this)."::create_individual ERROR:" . $this->error, LOG_ERR);
+            dol_syslog(get_class($this)."::create_individual ERROR:".$this->error, LOG_ERR);
         }
 
         return $result;
@@ -567,13 +567,13 @@ 
     	global $conf, $langs, $mysoc;
 
     	$error = 0;
-        $this->errors=array();
+        $this->errors = array();
 
         $result = 0;
-        $this->name	= trim($this->name);
-        $this->nom=$this->name; // For backward compatibility
+        $this->name = trim($this->name);
+        $this->nom = $this->name; // For backward compatibility
 
-        if (! $this->name)
+        if (!$this->name)
         {
             $this->errors[] = 'ErrorBadThirdPartyName';
             $result = -2;
@@ -630,12 +630,12 @@ 
         }
 
         // Check for duplicate or mandatory fields defined into setup
-        $array_to_check=array('IDPROF1','IDPROF2','IDPROF3','IDPROF4','IDPROF5','IDPROF6','EMAIL');
-        foreach($array_to_check as $key)
+        $array_to_check = array('IDPROF1', 'IDPROF2', 'IDPROF3', 'IDPROF4', 'IDPROF5', 'IDPROF6', 'EMAIL');
+        foreach ($array_to_check as $key)
         {
-        	$keymin=strtolower($key);
-        	$i=(int) preg_replace('/[^0-9]/','',$key);
-        	$vallabel=$this->$keymin;
+        	$keymin = strtolower($key);
+        	$i = (int) preg_replace('/[^0-9]/', '', $key);
+        	$vallabel = $this->$keymin;
 
         	if ($i > 0)
         	{
@@ -654,8 +654,8 @@ 
         			// Check for mandatory prof id (but only if country is other than ours)
         			if ($mysoc->country_id > 0 && $this->country_id == $mysoc->country_id)
         			{
-        				$idprof_mandatory ='SOCIETE_'.$key.'_MANDATORY';
-        				if (! $vallabel && ! empty($conf->global->$idprof_mandatory))
+        				$idprof_mandatory = 'SOCIETE_'.$key.'_MANDATORY';
+        				if (!$vallabel && !empty($conf->global->$idprof_mandatory))
         				{
         					$langs->load("errors");
         					$error++;
@@ -680,7 +680,7 @@ 
         			}
 
         			// Check for mandatory
-        			if (! empty($conf->global->SOCIETE_EMAIL_MANDATORY) && ! isValidEMail($this->email))
+        			if (!empty($conf->global->SOCIETE_EMAIL_MANDATORY) && !isValidEMail($this->email))
         			{
         				$langs->load("errors");
         				$error++;
@@ -707,48 +707,48 @@ 
      *		@param	int		$nosyncmember				Do not synchronize info of linked member
      *      @return int  			           			<0 if KO, >=0 if OK
      */
-    function update($id, $user='', $call_trigger=1, $allowmodcodeclient=0, $allowmodcodefournisseur=0, $action='update', $nosyncmember=1)
+    function update($id, $user = '', $call_trigger = 1, $allowmodcodeclient = 0, $allowmodcodefournisseur = 0, $action = 'update', $nosyncmember = 1)
     {
-        global $langs,$conf,$hookmanager;
+        global $langs, $conf, $hookmanager;
         require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
-		$error=0;
+		$error = 0;
 
         dol_syslog(get_class($this)."::Update id=".$id." call_trigger=".$call_trigger." allowmodcodeclient=".$allowmodcodeclient." allowmodcodefournisseur=".$allowmodcodefournisseur);
 
-        $now=dol_now();
+        $now = dol_now();
 
         // Clean parameters
-        $this->id			= $id;
-        $this->name			= $this->name?trim($this->name):trim($this->nom);
-        $this->nom			= $this->name;	// For backward compatibility
+        $this->id = $id;
+        $this->name = $this->name ?trim($this->name) : trim($this->nom);
+        $this->nom = $this->name; // For backward compatibility
 	    $this->name_alias = trim($this->name_alias);
         $this->ref_ext		= trim($this->ref_ext);
-        $this->address		= $this->address?trim($this->address):trim($this->address);
-        $this->zip			= $this->zip?trim($this->zip):trim($this->zip);
-        $this->town			= $this->town?trim($this->town):trim($this->town);
-        $this->state_id		= trim($this->state_id);
-        $this->country_id	= ($this->country_id > 0)?$this->country_id:0;
+        $this->address		= $this->address ?trim($this->address) : trim($this->address);
+        $this->zip = $this->zip ?trim($this->zip) : trim($this->zip);
+        $this->town			= $this->town ?trim($this->town) : trim($this->town);
+        $this->state_id = trim($this->state_id);
+        $this->country_id = ($this->country_id > 0) ? $this->country_id : 0;
         $this->phone		= trim($this->phone);
-        $this->phone		= preg_replace("/\s/","",$this->phone);
-        $this->phone		= preg_replace("/\./","",$this->phone);
+        $this->phone		= preg_replace("/\s/", "", $this->phone);
+        $this->phone		= preg_replace("/\./", "", $this->phone);
         $this->fax			= trim($this->fax);
-        $this->fax			= preg_replace("/\s/","",$this->fax);
-        $this->fax			= preg_replace("/\./","",$this->fax);
+        $this->fax			= preg_replace("/\s/", "", $this->fax);
+        $this->fax			= preg_replace("/\./", "", $this->fax);
         $this->email		= trim($this->email);
         $this->skype		= trim($this->skype);
-        $this->url			= $this->url?clean_url($this->url,0):'';
+        $this->url			= $this->url ?clean_url($this->url, 0) : '';
         $this->idprof1		= trim($this->idprof1);
         $this->idprof2		= trim($this->idprof2);
         $this->idprof3		= trim($this->idprof3);
         $this->idprof4		= trim($this->idprof4);
-        $this->idprof5		= (! empty($this->idprof5)?trim($this->idprof5):'');
-        $this->idprof6		= (! empty($this->idprof6)?trim($this->idprof6):'');
-        $this->prefix_comm	= trim($this->prefix_comm);
+        $this->idprof5		= (!empty($this->idprof5) ?trim($this->idprof5) : '');
+        $this->idprof6		= (!empty($this->idprof6) ?trim($this->idprof6) : '');
+        $this->prefix_comm = trim($this->prefix_comm);
         $this->outstanding_limit = price2num($this->outstanding_limit);
 
         $this->tva_assuj	= trim($this->tva_assuj);
-        $this->tva_intra	= dol_sanitizeFileName($this->tva_intra,'');
+        $this->tva_intra	= dol_sanitizeFileName($this->tva_intra, '');
         if (empty($this->status)) $this->status = 0;
 
 		if (!empty($this->multicurrency_code)) $this->fk_multicurrency = MultiCurrency::getIdFromCode($this->db, $this->multicurrency_code);
@@ -759,64 +759,64 @@ 
 		}
 
         // Local taxes
-        $this->localtax1_assuj=trim($this->localtax1_assuj);
-        $this->localtax2_assuj=trim($this->localtax2_assuj);
+        $this->localtax1_assuj = trim($this->localtax1_assuj);
+        $this->localtax2_assuj = trim($this->localtax2_assuj);
 
-        $this->localtax1_value=trim($this->localtax1_value);
-        $this->localtax2_value=trim($this->localtax2_value);
+        $this->localtax1_value = trim($this->localtax1_value);
+        $this->localtax2_value = trim($this->localtax2_value);
 
-        if ($this->capital != '') $this->capital=price2num(trim($this->capital));
-        if (! is_numeric($this->capital)) $this->capital = '';     // '' = undef
+        if ($this->capital != '') $this->capital = price2num(trim($this->capital));
+        if (!is_numeric($this->capital)) $this->capital = ''; // '' = undef
 
-        $this->effectif_id=trim($this->effectif_id);
-        $this->forme_juridique_code=trim($this->forme_juridique_code);
+        $this->effectif_id = trim($this->effectif_id);
+        $this->forme_juridique_code = trim($this->forme_juridique_code);
 
         //Gencod
-        $this->barcode=trim($this->barcode);
+        $this->barcode = trim($this->barcode);
 
         // For automatic creation
-        if ($this->code_client == -1) $this->get_codeclient($this,0);
-        if ($this->code_fournisseur == -1) $this->get_codefournisseur($this,1);
+        if ($this->code_client == -1) $this->get_codeclient($this, 0);
+        if ($this->code_fournisseur == -1) $this->get_codefournisseur($this, 1);
 
-        $this->code_compta=trim($this->code_compta);
-        $this->code_compta_fournisseur=trim($this->code_compta_fournisseur);
+        $this->code_compta = trim($this->code_compta);
+        $this->code_compta_fournisseur = trim($this->code_compta_fournisseur);
 
         // Check parameters. More tests are done later in the ->verify()
-        if (! is_numeric($this->client) && ! is_numeric($this->fournisseur))
+        if (!is_numeric($this->client) && !is_numeric($this->fournisseur))
         {
             $langs->load("errors");
             $this->error = $langs->trans("BadValueForParameterClientOrSupplier");
             return -1;
         }
 
-        $customer=false;
-        if (! empty($allowmodcodeclient) && ! empty($this->client))
+        $customer = false;
+        if (!empty($allowmodcodeclient) && !empty($this->client))
         {
         	// Attention get_codecompta peut modifier le code suivant le module utilise
         	if (empty($this->code_compta))
         	{
-        		$ret=$this->get_codecompta('customer');
+        		$ret = $this->get_codecompta('customer');
         		if ($ret < 0) return -1;
         	}
 
-        	$customer=true;
+        	$customer = true;
         }
 
-        $supplier=false;
-        if (! empty($allowmodcodefournisseur) && ! empty($this->fournisseur))
+        $supplier = false;
+        if (!empty($allowmodcodefournisseur) && !empty($this->fournisseur))
         {
         	// Attention get_codecompta peut modifier le code suivant le module utilise
         	if (empty($this->code_compta_fournisseur))
         	{
-        		$ret=$this->get_codecompta('supplier');
+        		$ret = $this->get_codecompta('supplier');
         		if ($ret < 0) return -1;
         	}
 
-        	$supplier=true;
+        	$supplier = true;
         }
 
         //Web services
-        $this->webservices_url = $this->webservices_url?clean_url($this->webservices_url,0):'';
+        $this->webservices_url = $this->webservices_url ?clean_url($this->webservices_url, 0) : '';
         $this->webservices_key = trim($this->webservices_key);
 
         //Incoterms
@@ -828,176 +828,176 @@ 
         // Check name is required and codes are ok or unique.
         // If error, this->errors[] is filled
         $result = 0;
-        if ($action != 'add') $result = $this->verify();	// We don't check when update called during a create because verify was already done
+        if ($action != 'add') $result = $this->verify(); // We don't check when update called during a create because verify was already done
 
         if ($result >= 0)
         {
             dol_syslog(get_class($this)."::update verify ok or not done");
 
             $sql  = "UPDATE ".MAIN_DB_PREFIX."societe SET ";
-            $sql .= "nom = '" . $this->db->escape($this->name) ."'"; // Required
-            $sql .= ",name_alias = '" . $this->db->escape($this->name_alias) ."'";
-            $sql .= ",ref_ext = " .(! empty($this->ref_ext)?"'".$this->db->escape($this->ref_ext) ."'":"null");
-            $sql .= ",address = '" . $this->db->escape($this->address) ."'";
-
-            $sql .= ",zip = ".(! empty($this->zip)?"'".$this->db->escape($this->zip)."'":"null");
-            $sql .= ",town = ".(! empty($this->town)?"'".$this->db->escape($this->town)."'":"null");
-
-            $sql .= ",fk_departement = '" . (! empty($this->state_id)?$this->state_id:'0') ."'";
-            $sql .= ",fk_pays = '" . (! empty($this->country_id)?$this->country_id:'0') ."'";
-
-            $sql .= ",phone = ".(! empty($this->phone)?"'".$this->db->escape($this->phone)."'":"null");
-            $sql .= ",fax = ".(! empty($this->fax)?"'".$this->db->escape($this->fax)."'":"null");
-            $sql .= ",email = ".(! empty($this->email)?"'".$this->db->escape($this->email)."'":"null");
-            $sql .= ",skype = ".(! empty($this->skype)?"'".$this->db->escape($this->skype)."'":"null");
-            $sql .= ",url = ".(! empty($this->url)?"'".$this->db->escape($this->url)."'":"null");
-
-            $sql .= ",siren   = '". $this->db->escape($this->idprof1) ."'";
-            $sql .= ",siret   = '". $this->db->escape($this->idprof2) ."'";
-            $sql .= ",ape     = '". $this->db->escape($this->idprof3) ."'";
-            $sql .= ",idprof4 = '". $this->db->escape($this->idprof4) ."'";
-            $sql .= ",idprof5 = '". $this->db->escape($this->idprof5) ."'";
-            $sql .= ",idprof6 = '". $this->db->escape($this->idprof6) ."'";
-
-            $sql .= ",tva_assuj = ".($this->tva_assuj!=''?"'".$this->db->escape($this->tva_assuj)."'":"null");
-            $sql .= ",tva_intra = '" . $this->db->escape($this->tva_intra) ."'";
-            $sql .= ",status = " .$this->status;
+            $sql .= "nom = '".$this->db->escape($this->name)."'"; // Required
+            $sql .= ",name_alias = '".$this->db->escape($this->name_alias)."'";
+            $sql .= ",ref_ext = ".(!empty($this->ref_ext) ? "'".$this->db->escape($this->ref_ext)."'" : "null");
+            $sql .= ",address = '".$this->db->escape($this->address)."'";
+
+            $sql .= ",zip = ".(!empty($this->zip) ? "'".$this->db->escape($this->zip)."'" : "null");
+            $sql .= ",town = ".(!empty($this->town) ? "'".$this->db->escape($this->town)."'" : "null");
+
+            $sql .= ",fk_departement = '".(!empty($this->state_id) ? $this->state_id : '0')."'";
+            $sql .= ",fk_pays = '".(!empty($this->country_id) ? $this->country_id : '0')."'";
+
+            $sql .= ",phone = ".(!empty($this->phone) ? "'".$this->db->escape($this->phone)."'" : "null");
+            $sql .= ",fax = ".(!empty($this->fax) ? "'".$this->db->escape($this->fax)."'" : "null");
+            $sql .= ",email = ".(!empty($this->email) ? "'".$this->db->escape($this->email)."'" : "null");
+            $sql .= ",skype = ".(!empty($this->skype) ? "'".$this->db->escape($this->skype)."'" : "null");
+            $sql .= ",url = ".(!empty($this->url) ? "'".$this->db->escape($this->url)."'" : "null");
+
+            $sql .= ",siren   = '".$this->db->escape($this->idprof1)."'";
+            $sql .= ",siret   = '".$this->db->escape($this->idprof2)."'";
+            $sql .= ",ape     = '".$this->db->escape($this->idprof3)."'";
+            $sql .= ",idprof4 = '".$this->db->escape($this->idprof4)."'";
+            $sql .= ",idprof5 = '".$this->db->escape($this->idprof5)."'";
+            $sql .= ",idprof6 = '".$this->db->escape($this->idprof6)."'";
+
+            $sql .= ",tva_assuj = ".($this->tva_assuj != '' ? "'".$this->db->escape($this->tva_assuj)."'" : "null");
+            $sql .= ",tva_intra = '".$this->db->escape($this->tva_intra)."'";
+            $sql .= ",status = ".$this->status;
 
             // Local taxes
-            $sql .= ",localtax1_assuj = ".($this->localtax1_assuj!=''?"'".$this->db->escape($this->localtax1_assuj)."'":"null");
-            $sql .= ",localtax2_assuj = ".($this->localtax2_assuj!=''?"'".$this->db->escape($this->localtax2_assuj)."'":"null");
-            if($this->localtax1_assuj==1)
+            $sql .= ",localtax1_assuj = ".($this->localtax1_assuj != '' ? "'".$this->db->escape($this->localtax1_assuj)."'" : "null");
+            $sql .= ",localtax2_assuj = ".($this->localtax2_assuj != '' ? "'".$this->db->escape($this->localtax2_assuj)."'" : "null");
+            if ($this->localtax1_assuj == 1)
             {
-            	if($this->localtax1_value!='')
+            	if ($this->localtax1_value != '')
             	{
-            		$sql .=",localtax1_value =".$this->localtax1_value;
+            		$sql .= ",localtax1_value =".$this->localtax1_value;
             	}
-            	else $sql .=",localtax1_value =0.000";
+            	else $sql .= ",localtax1_value =0.000";
 
             }
-            else $sql .=",localtax1_value =0.000";
+            else $sql .= ",localtax1_value =0.000";
 
-            if($this->localtax2_assuj==1)
+            if ($this->localtax2_assuj == 1)
             {
-            	if($this->localtax2_value!='')
+            	if ($this->localtax2_value != '')
             	{
-            		$sql .=",localtax2_value =".$this->localtax2_value;
+            		$sql .= ",localtax2_value =".$this->localtax2_value;
             	}
-            	else $sql .=",localtax2_value =0.000";
+            	else $sql .= ",localtax2_value =0.000";
 
             }
-            else $sql .=",localtax2_value =0.000";
+            else $sql .= ",localtax2_value =0.000";
 
             $sql .= ",capital = ".($this->capital == '' ? "null" : $this->capital);
 
-            $sql .= ",prefix_comm = ".(! empty($this->prefix_comm)?"'".$this->db->escape($this->prefix_comm)."'":"null");
+            $sql .= ",prefix_comm = ".(!empty($this->prefix_comm) ? "'".$this->db->escape($this->prefix_comm)."'" : "null");
 
-            $sql .= ",fk_effectif = ".(! empty($this->effectif_id)?"'".$this->db->escape($this->effectif_id)."'":"null");
+            $sql .= ",fk_effectif = ".(!empty($this->effectif_id) ? "'".$this->db->escape($this->effectif_id)."'" : "null");
             if (isset($this->stcomm_id))
             {
                 $sql .= ",fk_stcomm=".($this->stcomm_id > 0 ? $this->stcomm_id : "0");
             }
-            $sql .= ",fk_typent = ".(! empty($this->typent_id)?"'".$this->db->escape($this->typent_id)."'":"0");
-
-            $sql .= ",fk_forme_juridique = ".(! empty($this->forme_juridique_code)?"'".$this->db->escape($this->forme_juridique_code)."'":"null");
-
-            $sql .= ",mode_reglement = ".(! empty($this->mode_reglement_id)?"'".$this->db->escape($this->mode_reglement_id)."'":"null");
-            $sql .= ",cond_reglement = ".(! empty($this->cond_reglement_id)?"'".$this->db->escape($this->cond_reglement_id)."'":"null");
-            $sql .= ",mode_reglement_supplier = ".(! empty($this->mode_reglement_supplier_id)?"'".$this->db->escape($this->mode_reglement_supplier_id)."'":"null");
-            $sql .= ",cond_reglement_supplier = ".(! empty($this->cond_reglement_supplier_id)?"'".$this->db->escape($this->cond_reglement_supplier_id)."'":"null");
-            $sql .= ",fk_shipping_method = ".(! empty($this->shipping_method_id)?"'".$this->db->escape($this->shipping_method_id)."'":"null");
-
-            $sql .= ",client = " . (! empty($this->client)?$this->client:0);
-            $sql .= ",fournisseur = " . (! empty($this->fournisseur)?$this->fournisseur:0);
-            $sql .= ",barcode = ".(! empty($this->barcode)?"'".$this->db->escape($this->barcode)."'":"null");
-            $sql .= ",default_lang = ".(! empty($this->default_lang)?"'".$this->db->escape($this->default_lang)."'":"null");
-            $sql .= ",logo = ".(! empty($this->logo)?"'".$this->db->escape($this->logo)."'":"null");
-            $sql .= ",outstanding_limit= ".($this->outstanding_limit!=''?$this->outstanding_limit:'null');
+            $sql .= ",fk_typent = ".(!empty($this->typent_id) ? "'".$this->db->escape($this->typent_id)."'" : "0");
+
+            $sql .= ",fk_forme_juridique = ".(!empty($this->forme_juridique_code) ? "'".$this->db->escape($this->forme_juridique_code)."'" : "null");
+
+            $sql .= ",mode_reglement = ".(!empty($this->mode_reglement_id) ? "'".$this->db->escape($this->mode_reglement_id)."'" : "null");
+            $sql .= ",cond_reglement = ".(!empty($this->cond_reglement_id) ? "'".$this->db->escape($this->cond_reglement_id)."'" : "null");
+            $sql .= ",mode_reglement_supplier = ".(!empty($this->mode_reglement_supplier_id) ? "'".$this->db->escape($this->mode_reglement_supplier_id)."'" : "null");
+            $sql .= ",cond_reglement_supplier = ".(!empty($this->cond_reglement_supplier_id) ? "'".$this->db->escape($this->cond_reglement_supplier_id)."'" : "null");
+            $sql .= ",fk_shipping_method = ".(!empty($this->shipping_method_id) ? "'".$this->db->escape($this->shipping_method_id)."'" : "null");
+
+            $sql .= ",client = ".(!empty($this->client) ? $this->client : 0);
+            $sql .= ",fournisseur = ".(!empty($this->fournisseur) ? $this->fournisseur : 0);
+            $sql .= ",barcode = ".(!empty($this->barcode) ? "'".$this->db->escape($this->barcode)."'" : "null");
+            $sql .= ",default_lang = ".(!empty($this->default_lang) ? "'".$this->db->escape($this->default_lang)."'" : "null");
+            $sql .= ",logo = ".(!empty($this->logo) ? "'".$this->db->escape($this->logo)."'" : "null");
+            $sql .= ",outstanding_limit= ".($this->outstanding_limit != '' ? $this->outstanding_limit : 'null');
             $sql .= ",fk_prospectlevel='".$this->db->escape($this->fk_prospectlevel)."'";
 
-            $sql .= ",webservices_url = ".(! empty($this->webservices_url)?"'".$this->db->escape($this->webservices_url)."'":"null");
-            $sql .= ",webservices_key = ".(! empty($this->webservices_key)?"'".$this->db->escape($this->webservices_key)."'":"null");
+            $sql .= ",webservices_url = ".(!empty($this->webservices_url) ? "'".$this->db->escape($this->webservices_url)."'" : "null");
+            $sql .= ",webservices_key = ".(!empty($this->webservices_key) ? "'".$this->db->escape($this->webservices_key)."'" : "null");
 
 			//Incoterms
-			$sql.= ", fk_incoterms = ".$this->fk_incoterms;
-			$sql.= ", location_incoterms = ".(! empty($this->location_incoterms)?"'".$this->db->escape($this->location_incoterms)."'":"null");
+			$sql .= ", fk_incoterms = ".$this->fk_incoterms;
+			$sql .= ", location_incoterms = ".(!empty($this->location_incoterms) ? "'".$this->db->escape($this->location_incoterms)."'" : "null");
 
             if ($customer)
             {
-                $sql .= ", code_client = ".(! empty($this->code_client)?"'".$this->db->escape($this->code_client)."'":"null");
-                $sql .= ", code_compta = ".(! empty($this->code_compta)?"'".$this->db->escape($this->code_compta)."'":"null");
+                $sql .= ", code_client = ".(!empty($this->code_client) ? "'".$this->db->escape($this->code_client)."'" : "null");
+                $sql .= ", code_compta = ".(!empty($this->code_compta) ? "'".$this->db->escape($this->code_compta)."'" : "null");
             }
 
             if ($supplier)
             {
-                $sql .= ", code_fournisseur = ".(! empty($this->code_fournisseur)?"'".$this->db->escape($this->code_fournisseur)."'":"null");
-                $sql .= ", code_compta_fournisseur = ".(! empty($this->code_compta_fournisseur)?"'".$this->db->escape($this->code_compta_fournisseur)."'":"null");
+                $sql .= ", code_fournisseur = ".(!empty($this->code_fournisseur) ? "'".$this->db->escape($this->code_fournisseur)."'" : "null");
+                $sql .= ", code_compta_fournisseur = ".(!empty($this->code_compta_fournisseur) ? "'".$this->db->escape($this->code_compta_fournisseur)."'" : "null");
             }
-            $sql .= ", fk_user_modif = ".(! empty($user->id)?"'".$user->id."'":"null");
+            $sql .= ", fk_user_modif = ".(!empty($user->id) ? "'".$user->id."'" : "null");
 			$sql .= ", fk_multicurrency = ".(int) $this->fk_multicurrency;
 			$sql .= ', multicurrency_code = \''.$this->db->escape($this->multicurrency_code)."'";
-            $sql .= " WHERE rowid = '" . $id ."'";
+            $sql .= " WHERE rowid = '".$id."'";
 
-            $resql=$this->db->query($sql);
+            $resql = $this->db->query($sql);
             if ($resql)
             {
-            	unset($this->country_code);		// We clean this because it may have been changed after an update of country_id
+            	unset($this->country_code); // We clean this because it may have been changed after an update of country_id
             	unset($this->country);
             	unset($this->state_code);
             	unset($this->state);
 
             	$nbrowsaffected = $this->db->affected_rows($resql);
 
-            	if (! $error && $nbrowsaffected)
+            	if (!$error && $nbrowsaffected)
             	{
             		// Update information on linked member if it is an update
-	            	if (! $nosyncmember && ! empty($conf->adherent->enabled))
+	            	if (!$nosyncmember && !empty($conf->adherent->enabled))
 	            	{
 		            	require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 
 		            	dol_syslog(get_class($this)."::update update linked member");
 
-		            	$lmember=new Adherent($this->db);
-		            	$result=$lmember->fetch(0, 0, $this->id);
+		            	$lmember = new Adherent($this->db);
+		            	$result = $lmember->fetch(0, 0, $this->id);
 
 		            	if ($result > 0)
 		            	{
-		            		$lmember->societe=$this->name;
+		            		$lmember->societe = $this->name;
 		            		//$lmember->firstname=$this->firstname?$this->firstname:$lmember->firstname;	// We keep firstname and lastname of member unchanged
 		            		//$lmember->lastname=$this->lastname?$this->lastname:$lmember->lastname;		// We keep firstname and lastname of member unchanged
-		            		$lmember->address=$this->address;
-		            		$lmember->email=$this->email;
-                    		$lmember->skype=$this->skype;
-		            		$lmember->phone=$this->phone;
+		            		$lmember->address = $this->address;
+		            		$lmember->email = $this->email;
+                    		$lmember->skype = $this->skype;
+		            		$lmember->phone = $this->phone;
 
-		            		$result=$lmember->update($user,0,1,1,1);	// Use nosync to 1 to avoid cyclic updates
+		            		$result = $lmember->update($user, 0, 1, 1, 1); // Use nosync to 1 to avoid cyclic updates
 		            		if ($result < 0)
 		            		{
-		            			$this->error=$lmember->error;
-		            			dol_syslog(get_class($this)."::update ".$this->error,LOG_ERR);
+		            			$this->error = $lmember->error;
+		            			dol_syslog(get_class($this)."::update ".$this->error, LOG_ERR);
 		            			$error++;
 		            		}
 		            	}
 		            	else if ($result < 0)
 		            	{
-		            		$this->error=$lmember->error;
+		            		$this->error = $lmember->error;
 		            		$error++;
 		            	}
 	            	}
             	}
 
-            	$action='update';
+            	$action = 'update';
 
                 // Actions on extra fields (by external module or standard code)
                 // TODO le hook fait double emploi avec le trigger !!
                 $hookmanager->initHooks(array('thirdpartydao'));
-                $parameters=array('socid'=>$this->id);
-                $reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+                $parameters = array('socid'=>$this->id);
+                $reshook = $hookmanager->executeHooks('insertExtraFields', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
                 if (empty($reshook))
                 {
                 	if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
                 	{
-                		$result=$this->insertExtraFields();
+                		$result = $this->insertExtraFields();
                 		if ($result < 0)
                 		{
                 			$error++;
@@ -1006,15 +1006,15 @@ 
                 }
                 else if ($reshook < 0) $error++;
 
-                if (! $error && $call_trigger)
+                if (!$error && $call_trigger)
                 {
                     // Call trigger
-                    $result=$this->call_trigger('COMPANY_MODIFY',$user);
+                    $result = $this->call_trigger('COMPANY_MODIFY', $user);
                     if ($result < 0) $error++;
                     // End call triggers
                 }
 
-                if (! $error)
+                if (!$error)
                 {
                     dol_syslog(get_class($this)."::Update success");
                     $this->db->commit();
@@ -1046,7 +1046,7 @@ 
         else
        {
             $this->db->rollback();
-            dol_syslog(get_class($this)."::Update fails verify ".join(',',$this->errors), LOG_WARNING);
+            dol_syslog(get_class($this)."::Update fails verify ".join(',', $this->errors), LOG_WARNING);
             return -3;
         }
     }
@@ -1067,7 +1067,7 @@ 
      *    @param    string	$email   		Email (Warning, this can return several records)
      *    @return   int						>0 if OK, <0 if KO or if two records found for same ref or idprof, 0 if not found.
      */
-    function fetch($rowid, $ref='', $ref_ext='', $ref_int='', $idprof1='',$idprof2='',$idprof3='',$idprof4='',$idprof5='',$idprof6='', $email='')
+    function fetch($rowid, $ref = '', $ref_ext = '', $ref_int = '', $idprof1 = '', $idprof2 = '', $idprof3 = '', $idprof4 = '', $idprof5 = '', $idprof6 = '', $email = '')
     {
         global $langs;
         global $conf;
@@ -1119,13 +1119,13 @@ 
         if ($idprof6) $sql .= " AND s.idprof6 = '".$this->db->escape($idprof6)."'";
         if ($email)   $sql .= " AND email = '".$this->db->escape($email)."'";
 
-        $resql=$this->db->query($sql);
+        $resql = $this->db->query($sql);
         if ($resql)
         {
-            $num=$this->db->num_rows($resql);
+            $num = $this->db->num_rows($resql);
             if ($num > 1)
             {
-                $this->error='Fetch found several records. Rename one of tirdparties to avoid duplicate.';
+                $this->error = 'Fetch found several records. Rename one of tirdparties to avoid duplicate.';
                 dol_syslog($this->error, LOG_ERR);
                 $result = -2;
             }
@@ -1135,11 +1135,11 @@ 
 
                 $this->id           = $obj->rowid;
                 $this->entity       = $obj->entity;
-                $this->canvas		= $obj->canvas;
+                $this->canvas = $obj->canvas;
 
                 $this->ref          = $obj->rowid;
-                $this->name 		= $obj->name;
-                $this->nom          = $obj->name;		// deprecated
+                $this->name = $obj->name;
+                $this->nom          = $obj->name; // deprecated
 	            $this->name_alias = $obj->name_alias;
                 $this->ref_ext      = $obj->ref_ext;
                 $this->ref_int      = $obj->ref_int;
@@ -1149,22 +1149,22 @@ 
                 $this->user_creation     = $obj->fk_user_creat;
                 $this->user_modification = $obj->fk_user_modif;
 
-                $this->address 		= $obj->address;
+                $this->address = $obj->address;
                 $this->zip 			= $obj->zip;
                 $this->town 		= $obj->town;
 
                 $this->country_id   = $obj->country_id;
-                $this->country_code = $obj->country_id?$obj->country_code:'';
-                $this->country 		= $obj->country_id?($langs->trans('Country'.$obj->country_code)!='Country'.$obj->country_code?$langs->transnoentities('Country'.$obj->country_code):$obj->country):'';
+                $this->country_code = $obj->country_id ? $obj->country_code : '';
+                $this->country = $obj->country_id ? ($langs->trans('Country'.$obj->country_code) != 'Country'.$obj->country_code ? $langs->transnoentities('Country'.$obj->country_code) : $obj->country) : '';
 
                 $this->state_id     = $obj->fk_departement;
                 $this->state_code   = $obj->state_code;
-                $this->state        = ($obj->state!='-'?$obj->state:'');
+                $this->state        = ($obj->state != '-' ? $obj->state : '');
 
-                $transcode=$langs->trans('StatusProspect'.$obj->fk_stcomm);
-                $libelle=($transcode!='StatusProspect'.$obj->fk_stcomm?$transcode:$obj->stcomm);
-                $this->stcomm_id = $obj->fk_stcomm;     // id statut commercial
-                $this->statut_commercial = $libelle;    // libelle statut commercial
+                $transcode = $langs->trans('StatusProspect'.$obj->fk_stcomm);
+                $libelle = ($transcode != 'StatusProspect'.$obj->fk_stcomm ? $transcode : $obj->stcomm);
+                $this->stcomm_id = $obj->fk_stcomm; // id statut commercial
+                $this->statut_commercial = $libelle; // libelle statut commercial
 
                 $this->email = $obj->email;
                 $this->skype = $obj->skype;
@@ -1172,7 +1172,7 @@ 
                 $this->phone = $obj->phone;
                 $this->fax = $obj->fax;
 
-                $this->parent    = $obj->parent;
+                $this->parent = $obj->parent;
 
                 $this->idprof1		= $obj->idprof1;
                 $this->idprof2		= $obj->idprof2;
@@ -1181,7 +1181,7 @@ 
                 $this->idprof5		= $obj->idprof5;
                 $this->idprof6		= $obj->idprof6;
 
-                $this->capital   = $obj->capital;
+                $this->capital = $obj->capital;
 
                 $this->code_client = $obj->code_client;
                 $this->code_fournisseur = $obj->code_fournisseur;
@@ -1206,22 +1206,22 @@ 
                 $this->typent_code    = $obj->typent_code;
 
                 $this->effectif_id    = $obj->effectif_id;
-                $this->effectif       = $obj->effectif_id?$obj->effectif:'';
+                $this->effectif       = $obj->effectif_id ? $obj->effectif : '';
 
-                $this->forme_juridique_code= $obj->forme_juridique_code;
-                $this->forme_juridique     = $obj->forme_juridique_code?$obj->forme_juridique:'';
+                $this->forme_juridique_code = $obj->forme_juridique_code;
+                $this->forme_juridique     = $obj->forme_juridique_code ? $obj->forme_juridique : '';
 
                 $this->fk_prospectlevel = $obj->fk_prospectlevel;
 
                 $this->prefix_comm = $obj->prefix_comm;
 
-                $this->remise_percent		= $obj->remise_client;
+                $this->remise_percent = $obj->remise_client;
                 $this->mode_reglement_id 	= $obj->mode_reglement;
                 $this->cond_reglement_id 	= $obj->cond_reglement;
                 $this->mode_reglement_supplier_id 	= $obj->mode_reglement_supplier;
                 $this->cond_reglement_supplier_id 	= $obj->cond_reglement_supplier;
-                $this->shipping_method_id   = ($obj->fk_shipping_method>0)?$obj->fk_shipping_method:null;
-				$this->fk_account			= $obj->fk_account;
+                $this->shipping_method_id = ($obj->fk_shipping_method > 0) ? $obj->fk_shipping_method : null;
+				$this->fk_account = $obj->fk_account;
 
                 $this->client      = $obj->client;
                 $this->fournisseur = $obj->fournisseur;
@@ -1236,7 +1236,7 @@ 
                 $this->webservices_url = $obj->webservices_url;
                 $this->webservices_key = $obj->webservices_key;
 
-                $this->outstanding_limit		= $obj->outstanding_limit;
+                $this->outstanding_limit = $obj->outstanding_limit;
 
                 // multiprix
                 $this->price_level = $obj->price_level;
@@ -1266,12 +1266,12 @@ 
         }
         else
 		{
-            $this->error=$this->db->lasterror();
+            $this->error = $this->db->lasterror();
             $result = -3;
         }
 
         // Use first price level if level not defined for third party
-        if (! empty($conf->global->PRODUIT_MULTIPRICES) && empty($this->price_level)) $this->price_level=1;
+        if (!empty($conf->global->PRODUIT_MULTIPRICES) && empty($this->price_level)) $this->price_level = 1;
 
         return $result;
     }
@@ -1288,7 +1288,7 @@ 
      * 	@param		string		$clause		Clause for filters
      * 	@return		array|int				<0 if KO, array of thirdparties object if OK
      */
-    function searchByName($name, $type='0', $filters = array(), $exact = false, $case = false, $similar = false, $clause = 'AND')
+    function searchByName($name, $type = '0', $filters = array(), $exact = false, $case = false, $similar = false, $clause = 'AND')
     {
     	$thirdparties = array();
 
@@ -1297,23 +1297,23 @@ 
     	// Check parameter
     	if (empty($name))
     	{
-    		$this->errors[]='ErrorBadValueForParameter';
+    		$this->errors[] = 'ErrorBadValueForParameter';
     		return -1;
     	}
 
     	// Generation requete recherche
     	$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe";
-    	$sql.= " WHERE entity IN (".getEntity('category').")";
-    	if (! empty($type))
+    	$sql .= " WHERE entity IN (".getEntity('category').")";
+    	if (!empty($type))
     	{
     		if ($type == 1 || $type == 2)
-    			$sql.= " AND client = ".$type;
+    			$sql .= " AND client = ".$type;
     		elseif ($type == 3)
-    			$sql.= " AND fournisseur = 1";
+    			$sql .= " AND fournisseur = 1";
     	}
-    	if (! empty($name))
+    	if (!empty($name))
     	{
-    		if (! $exact)
+    		if (!$exact)
     		{
     			if (preg_match('/^([\*])?[^*]+([\*])?$/', $name, $regs) && count($regs) > 1)
     			{
@@ -1324,28 +1324,28 @@ 
     				$name = '%'.$name.'%';
     			}
     		}
-    		$sql.= " AND ";
-    		if (is_array($filters) && ! empty($filters))
-    			$sql.= "(";
+    		$sql .= " AND ";
+    		if (is_array($filters) && !empty($filters))
+    			$sql .= "(";
     		if ($similar)
     		{
     			// For test similitude (string inside name into database, or name into database inside string)
     			// Do not use this. Not compatible with other database.
-    			$sql.= "(LOCATE('".$this->db->escape($name)."', nom) > 0 OR LOCATE(nom, '".$this->db->escape($name)."') > 0)";
+    			$sql .= "(LOCATE('".$this->db->escape($name)."', nom) > 0 OR LOCATE(nom, '".$this->db->escape($name)."') > 0)";
     		}
     		else
     		{
-    			if (! $case)
-    				$sql.= "nom LIKE '".$this->db->escape($name)."'";
+    			if (!$case)
+    				$sql .= "nom LIKE '".$this->db->escape($name)."'";
     			else
-    				$sql.= "nom LIKE BINARY '".$this->db->escape($name)."'";
+    				$sql .= "nom LIKE BINARY '".$this->db->escape($name)."'";
     		}
     	}
-    	if (is_array($filters) && ! empty($filters))
+    	if (is_array($filters) && !empty($filters))
     	{
-    		foreach($filters as $field => $value)
+    		foreach ($filters as $field => $value)
     		{
-    			if (! $exact)
+    			if (!$exact)
     			{
     				if (preg_match('/^([\*])?[^*]+([\*])?$/', $value, $regs) && count($regs) > 1)
     				{
@@ -1356,16 +1356,16 @@ 
     					$value = '%'.$value.'%';
     				}
     			}
-    			if (! $case)
-    				$sql.= " ".$clause." ".$field." LIKE '".$this->db->escape($value)."'";
+    			if (!$case)
+    				$sql .= " ".$clause." ".$field." LIKE '".$this->db->escape($value)."'";
     			else
-    				$sql.= " ".$clause." ".$field." LIKE BINARY '".$this->db->escape($value)."'";
+    				$sql .= " ".$clause." ".$field." LIKE BINARY '".$this->db->escape($value)."'";
     		}
-    		if (! empty($name))
-    			$sql.= ")";
+    		if (!empty($name))
+    			$sql .= ")";
     	}
 
-    	$res  = $this->db->query($sql);
+    	$res = $this->db->query($sql);
     	if ($res)
     	{
     		while ($rec = $this->db->fetch_array($res))
@@ -1379,7 +1379,7 @@ 
     	}
     	else
     	{
-    		$this->error=$this->db->lasterror();
+    		$this->error = $this->db->lasterror();
     		return -1;
     	}
     }
@@ -1392,15 +1392,15 @@ 
      *    @param    int		$call_trigger   0=No, 1=yes
      *    @return	int						<0 if KO, 0 if nothing done, >0 if OK
      */
-    function delete($id, User $fuser=null, $call_trigger=1)
+    function delete($id, User $fuser = null, $call_trigger = 1)
     {
         global $langs, $conf, $user;
 
-        if (empty($fuser)) $fuser=$user;
+        if (empty($fuser)) $fuser = $user;
 
         require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-        $entity=isset($this->entity)?$this->entity:$conf->entity;
+        $entity = isset($this->entity) ? $this->entity : $conf->entity;
 
         dol_syslog(get_class($this)."::delete", LOG_DEBUG);
         $error = 0;
@@ -1412,15 +1412,15 @@ 
             $this->db->begin();
 
             // User is mandatory for trigger call
-            if (! $error && $call_trigger)
+            if (!$error && $call_trigger)
             {
                 // Call trigger
-                $result=$this->call_trigger('COMPANY_DELETE',$fuser);
+                $result = $this->call_trigger('COMPANY_DELETE', $fuser);
                 if ($result < 0) $error++;
                 // End call triggers
             }
 
-			if (! $error)
+			if (!$error)
 			{
 	            require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 	            $static_cat = new Categorie($this->db);
@@ -1429,11 +1429,11 @@ 
 	            // Fill $toute_categs array with an array of (type => array of ("Categorie" instance))
 	            if ($this->client || $this->prospect)
 	            {
-	                $toute_categs['societe'] = $static_cat->containing($this->id,Categorie::TYPE_CUSTOMER);
+	                $toute_categs['societe'] = $static_cat->containing($this->id, Categorie::TYPE_CUSTOMER);
 	            }
 	            if ($this->fournisseur)
 	            {
-	                $toute_categs['fournisseur'] = $static_cat->containing($this->id,Categorie::TYPE_SUPPLIER);
+	                $toute_categs['fournisseur'] = $static_cat->containing($this->id, Categorie::TYPE_SUPPLIER);
 	            }
 
 	            // Remove each "Categorie"
@@ -1448,11 +1448,11 @@ 
 
 			foreach ($this->childtablesoncascade as $tabletodelete)
 			{
-				if (! $error)
+				if (!$error)
 				{
 					$sql = "DELETE FROM ".MAIN_DB_PREFIX.$tabletodelete;
-					$sql.= " WHERE fk_soc = " . $id;
-					if (! $this->db->query($sql))
+					$sql .= " WHERE fk_soc = ".$id;
+					if (!$this->db->query($sql))
 					{
 						$error++;
 						$this->errors[] = $this->db->lasterror();
@@ -1461,9 +1461,9 @@ 
 			}
 
             // Removed extrafields
-            if ((! $error) && (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))) // For avoid conflicts if trigger used
+            if ((!$error) && (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))) // For avoid conflicts if trigger used
             {
-            	$result=$this->deleteExtraFields();
+            	$result = $this->deleteExtraFields();
             	if ($result < 0)
             	{
             		$error++;
@@ -1472,25 +1472,25 @@ 
             }
 
             // Remove third party
-            if (! $error)
+            if (!$error)
             {
                 $sql = "DELETE FROM ".MAIN_DB_PREFIX."societe";
-                $sql.= " WHERE rowid = " . $id;
-                if (! $this->db->query($sql))
+                $sql .= " WHERE rowid = ".$id;
+                if (!$this->db->query($sql))
                 {
                     $error++;
                     $this->errors[] = $this->db->lasterror();
                 }
             }
 
-            if (! $error)
+            if (!$error)
             {
                 $this->db->commit();
 
                 // Delete directory
-                if (! empty($conf->societe->multidir_output[$entity]))
+                if (!empty($conf->societe->multidir_output[$entity]))
                 {
-                	$docdir = $conf->societe->multidir_output[$entity] . "/" . $id;
+                	$docdir = $conf->societe->multidir_output[$entity]."/".$id;
                 	if (dol_is_dir($docdir))
                 	{
                     	dol_delete_dir_recursive($docdir);
@@ -1519,13 +1519,13 @@ 
     {
         if ($this->id)
         {
-            $newclient=1;
-            if ($this->client == 2 || $this->client == 3) $newclient=3;	//If prospect, we keep prospect tag
+            $newclient = 1;
+            if ($this->client == 2 || $this->client == 3) $newclient = 3; //If prospect, we keep prospect tag
             $sql = "UPDATE ".MAIN_DB_PREFIX."societe";
-            $sql.= " SET client = ".$newclient;
-            $sql.= " WHERE rowid = " . $this->id;
+            $sql .= " SET client = ".$newclient;
+            $sql .= " WHERE rowid = ".$this->id;
 
-            $resql=$this->db->query($sql);
+            $resql = $this->db->query($sql);
             if ($resql)
             {
                 $this->client = $newclient;
@@ -1549,10 +1549,10 @@ 
         global $conf, $langs;
 
         // Nettoyage parametres
-        $note=trim($note);
-        if (! $note)
+        $note = trim($note);
+        if (!$note)
         {
-            $this->error=$langs->trans("ErrorFieldRequired",$langs->trans("NoteReason"));
+            $this->error = $langs->trans("ErrorFieldRequired", $langs->trans("NoteReason"));
             return -2;
         }
 
@@ -1562,33 +1562,33 @@ 
         {
             $this->db->begin();
 
-            $now=dol_now();
+            $now = dol_now();
 
             // Positionne remise courante
             $sql = "UPDATE ".MAIN_DB_PREFIX."societe ";
-            $sql.= " SET remise_client = '".$this->db->escape($remise)."'";
-            $sql.= " WHERE rowid = " . $this->id;
-            $resql=$this->db->query($sql);
-            if (! $resql)
+            $sql .= " SET remise_client = '".$this->db->escape($remise)."'";
+            $sql .= " WHERE rowid = ".$this->id;
+            $resql = $this->db->query($sql);
+            if (!$resql)
             {
                 $this->db->rollback();
-                $this->error=$this->db->error();
+                $this->error = $this->db->error();
                 return -1;
             }
 
             // Ecrit trace dans historique des remises
             $sql = "INSERT INTO ".MAIN_DB_PREFIX."societe_remise";
-            $sql.= " (entity, datec, fk_soc, remise_client, note, fk_user_author)";
-            $sql.= " VALUES (".$conf->entity.", '".$this->db->idate($now)."', ".$this->id.", '".$this->db->escape($remise)."',";
-            $sql.= " '".$this->db->escape($note)."',";
-            $sql.= " ".$user->id;
-            $sql.= ")";
-
-            $resql=$this->db->query($sql);
-            if (! $resql)
+            $sql .= " (entity, datec, fk_soc, remise_client, note, fk_user_author)";
+            $sql .= " VALUES (".$conf->entity.", '".$this->db->idate($now)."', ".$this->id.", '".$this->db->escape($remise)."',";
+            $sql .= " '".$this->db->escape($note)."',";
+            $sql .= " ".$user->id;
+            $sql .= ")";
+
+            $resql = $this->db->query($sql);
+            if (!$resql)
             {
                 $this->db->rollback();
-                $this->error=$this->db->lasterror();
+                $this->error = $this->db->lasterror();
                 return -1;
             }
 
@@ -1606,7 +1606,7 @@ 
      *      @param  float	$tva_tx     VAT rate
      *		@return	int					<0 if KO, id of discount record if OK
      */
-    function set_remise_except($remise, User $user, $desc, $tva_tx=0)
+    function set_remise_except($remise, User $user, $desc, $tva_tx = 0)
     {
         global $langs;
 
@@ -1615,14 +1615,14 @@ 
         $desc = trim($desc);
 
         // Check parameters
-        if (! $remise > 0)
+        if (!$remise > 0)
         {
-            $this->error=$langs->trans("ErrorWrongValueForParameter","1");
+            $this->error = $langs->trans("ErrorWrongValueForParameter", "1");
             return -1;
         }
-        if (! $desc)
+        if (!$desc)
         {
-            $this->error=$langs->trans("ErrorWrongValueForParameter","3");
+            $this->error = $langs->trans("ErrorWrongValueForParameter", "3");
             return -2;
         }
 
@@ -1631,20 +1631,20 @@ 
             require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
 
             $discount = new DiscountAbsolute($this->db);
-            $discount->fk_soc=$this->id;
-            $discount->amount_ht=price2num($remise,'MT');
-            $discount->amount_tva=price2num($remise*$tva_tx/100,'MT');
-            $discount->amount_ttc=price2num($discount->amount_ht+$discount->amount_tva,'MT');
-            $discount->tva_tx=price2num($tva_tx,'MT');
-            $discount->description=$desc;
-            $result=$discount->create($user);
+            $discount->fk_soc = $this->id;
+            $discount->amount_ht = price2num($remise, 'MT');
+            $discount->amount_tva = price2num($remise * $tva_tx / 100, 'MT');
+            $discount->amount_ttc = price2num($discount->amount_ht + $discount->amount_tva, 'MT');
+            $discount->tva_tx = price2num($tva_tx, 'MT');
+            $discount->description = $desc;
+            $result = $discount->create($user);
             if ($result > 0)
             {
                 return $result;
             }
             else
             {
-                $this->error=$discount->error;
+                $this->error = $discount->error;
                 return -3;
             }
         }
@@ -1659,19 +1659,19 @@ 
      * 	@param	integer	$maxvalue	Filter on max value for discount
      *	@return	int					<0 if KO, Credit note amount otherwise
      */
-    function getAvailableDiscounts($user='',$filter='',$maxvalue=0)
+    function getAvailableDiscounts($user = '', $filter = '', $maxvalue = 0)
     {
         require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
 
-        $discountstatic=new DiscountAbsolute($this->db);
-        $result=$discountstatic->getAvailableDiscounts($this,$user,$filter,$maxvalue);
+        $discountstatic = new DiscountAbsolute($this->db);
+        $result = $discountstatic->getAvailableDiscounts($this, $user, $filter, $maxvalue);
         if ($result >= 0)
         {
             return $result;
         }
         else
         {
-            $this->error=$discountstatic->error;
+            $this->error = $discountstatic->error;
             return -1;
         }
     }
@@ -1686,38 +1686,38 @@ 
     {
         global $conf;
 
-        $reparray=array();
+        $reparray = array();
 
         $sql = "SELECT DISTINCT u.rowid, u.login, u.lastname, u.firstname, u.email, u.statut, u.entity, u.photo";
-        $sql.= " FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc, ".MAIN_DB_PREFIX."user as u";
-        if (! empty($conf->multicompany->enabled) && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
+        $sql .= " FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc, ".MAIN_DB_PREFIX."user as u";
+        if (!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
         {
-        	$sql.= ", ".MAIN_DB_PREFIX."usergroup_user as ug";
-        	$sql.= " WHERE ((ug.fk_user = sc.fk_user";
-        	$sql.= " AND ug.entity = ".$conf->entity.")";
-        	$sql.= " OR u.admin = 1)";
+        	$sql .= ", ".MAIN_DB_PREFIX."usergroup_user as ug";
+        	$sql .= " WHERE ((ug.fk_user = sc.fk_user";
+        	$sql .= " AND ug.entity = ".$conf->entity.")";
+        	$sql .= " OR u.admin = 1)";
         }
         else
-        	$sql.= " WHERE entity in (0, ".$conf->entity.")";
+        	$sql .= " WHERE entity in (0, ".$conf->entity.")";
 
-        $sql.= " AND u.rowid = sc.fk_user AND sc.fk_soc = ".$this->id;
+        $sql .= " AND u.rowid = sc.fk_user AND sc.fk_soc = ".$this->id;
 
         $resql = $this->db->query($sql);
         if ($resql)
         {
             $num = $this->db->num_rows($resql);
-            $i=0;
+            $i = 0;
             while ($i < $num)
             {
                 $obj = $this->db->fetch_object($resql);
-                $reparray[$i]['id']=$obj->rowid;
-                $reparray[$i]['lastname']=$obj->lastname;
-                $reparray[$i]['firstname']=$obj->firstname;
-                $reparray[$i]['email']=$obj->email;
-                $reparray[$i]['statut']=$obj->statut;
-                $reparray[$i]['entity']=$obj->entity;
-                $reparray[$i]['login']=$obj->login;
-                $reparray[$i]['photo']=$obj->photo;
+                $reparray[$i]['id'] = $obj->rowid;
+                $reparray[$i]['lastname'] = $obj->lastname;
+                $reparray[$i]['firstname'] = $obj->firstname;
+                $reparray[$i]['email'] = $obj->email;
+                $reparray[$i]['statut'] = $obj->statut;
+                $reparray[$i]['entity'] = $obj->entity;
+                $reparray[$i]['login'] = $obj->login;
+                $reparray[$i]['photo'] = $obj->photo;
                 $i++;
             }
             return $reparray;
@@ -1739,13 +1739,13 @@ 
     {
         if ($this->id)
         {
-        	$now=dol_now();
+        	$now = dol_now();
 
             $sql  = "UPDATE ".MAIN_DB_PREFIX."societe";
             $sql .= " SET price_level = '".$this->db->escape($price_level)."'";
-            $sql .= " WHERE rowid = " . $this->id;
+            $sql .= " WHERE rowid = ".$this->id;
 
-            if (! $this->db->query($sql))
+            if (!$this->db->query($sql))
             {
                 dol_print_error($this->db);
                 return -1;
@@ -1755,7 +1755,7 @@ 
             $sql .= " (datec, fk_soc, price_level, fk_user_author)";
             $sql .= " VALUES ('".$this->db->idate($now)."', ".$this->id.", '".$this->db->escape($price_level)."', ".$user->id.")";
 
-            if (! $this->db->query($sql))
+            if (!$this->db->query($sql))
             {
                 dol_print_error($this->db);
                 return -1;
@@ -1777,15 +1777,15 @@ 
         if ($this->id > 0 && $commid > 0)
         {
             $sql = "DELETE FROM  ".MAIN_DB_PREFIX."societe_commerciaux";
-            $sql.= " WHERE fk_soc = ".$this->id." AND fk_user =".$commid;
+            $sql .= " WHERE fk_soc = ".$this->id." AND fk_user =".$commid;
 
             $this->db->query($sql);
 
             $sql = "INSERT INTO ".MAIN_DB_PREFIX."societe_commerciaux";
-            $sql.= " ( fk_soc, fk_user )";
-            $sql.= " VALUES (".$this->id.",".$commid.")";
+            $sql .= " ( fk_soc, fk_user )";
+            $sql .= " VALUES (".$this->id.",".$commid.")";
 
-            if (! $this->db->query($sql) )
+            if (!$this->db->query($sql))
             {
                 dol_syslog(get_class($this)."::add_commercial Erreur");
             }
@@ -1806,7 +1806,7 @@ 
             $sql  = "DELETE FROM  ".MAIN_DB_PREFIX."societe_commerciaux ";
             $sql .= " WHERE fk_soc = ".$this->id." AND fk_user =".$commid;
 
-            if (! $this->db->query($sql) )
+            if (!$this->db->query($sql))
             {
                 dol_syslog(get_class($this)."::del_commercial Erreur");
             }
@@ -1824,156 +1824,156 @@ 
      *      @param  int     $save_lastsearch_value    -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
      *		@return	string					          String with URL
      */
-    function getNomUrl($withpicto=0, $option='', $maxlen=0, $notooltip=0, $save_lastsearch_value=-1)
+    function getNomUrl($withpicto = 0, $option = '', $maxlen = 0, $notooltip = 0, $save_lastsearch_value = -1)
     {
         global $conf, $langs, $hookmanager;
 
-        if (! empty($conf->dol_no_mouse_hover)) $notooltip=1;   // Force disable tooltips
+        if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
 
-        $name=$this->name?$this->name:$this->nom;
+        $name = $this->name ? $this->name : $this->nom;
 
-    	if (! empty($conf->global->SOCIETE_ADD_REF_IN_LIST) && (!empty($withpicto)))
+    	if (!empty($conf->global->SOCIETE_ADD_REF_IN_LIST) && (!empty($withpicto)))
     	{
-    		if (($this->client) && (! empty ( $this->code_client ))
+    		if (($this->client) && (!empty ($this->code_client))
     			&& ($conf->global->SOCIETE_ADD_REF_IN_LIST == 1
     			|| $conf->global->SOCIETE_ADD_REF_IN_LIST == 2
     			)
     		)
-    		$code = $this->code_client . ' - ';
+    		$code = $this->code_client.' - ';
 
-    		if (($this->fournisseur) && (! empty ( $this->code_fournisseur ))
+    		if (($this->fournisseur) && (!empty ($this->code_fournisseur))
     			&& ($conf->global->SOCIETE_ADD_REF_IN_LIST == 1
     			|| $conf->global->SOCIETE_ADD_REF_IN_LIST == 3
     			)
     		)
-    		$code .= $this->code_fournisseur . ' - ';
+    		$code .= $this->code_fournisseur.' - ';
 
     		if ($conf->global->SOCIETE_ADD_REF_IN_LIST == 1)
-    			$name =$code.' '.$name;
+    			$name = $code.' '.$name;
     		else
-    			$name =$code;
+    			$name = $code;
     	}
 
     	if (!empty($this->name_alias)) $name .= ' ('.$this->name_alias.')';
 
-        $result=''; $label='';
-        $linkstart=''; $linkend='';
+        $result = ''; $label = '';
+        $linkstart = ''; $linkend = '';
 
-        if (! empty($this->logo) && class_exists('Form'))
+        if (!empty($this->logo) && class_exists('Form'))
         {
-            $label.= '<div class="photointooltip">';
-            $label.= Form::showphoto('societe', $this, 80, 0, 0, 'photowithmargin', 'mini');
-            $label.= '</div><div style="clear: both;"></div>';
+            $label .= '<div class="photointooltip">';
+            $label .= Form::showphoto('societe', $this, 80, 0, 0, 'photowithmargin', 'mini');
+            $label .= '</div><div style="clear: both;"></div>';
         }
 
-        $label.= '<div class="centpercent">';
+        $label .= '<div class="centpercent">';
 
         if ($option == 'customer' || $option == 'compta' || $option == 'category' || $option == 'category_supplier')
         {
-           $label.= '<u>' . $langs->trans("ShowCustomer") . '</u>';
+           $label .= '<u>'.$langs->trans("ShowCustomer").'</u>';
            $linkstart = '<a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$this->id;
         }
         else if ($option == 'prospect' && empty($conf->global->SOCIETE_DISABLE_PROSPECTS))
         {
-            $label.= '<u>' . $langs->trans("ShowProspect") . '</u>';
+            $label .= '<u>'.$langs->trans("ShowProspect").'</u>';
             $linkstart = '<a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$this->id;
         }
         else if ($option == 'supplier')
         {
-            $label.= '<u>' . $langs->trans("ShowSupplier") . '</u>';
+            $label .= '<u>'.$langs->trans("ShowSupplier").'</u>';
             $linkstart = '<a href="'.DOL_URL_ROOT.'/fourn/card.php?socid='.$this->id;
         }
         else if ($option == 'agenda')
         {
-            $label.= '<u>' . $langs->trans("ShowAgenda") . '</u>';
+            $label .= '<u>'.$langs->trans("ShowAgenda").'</u>';
             $linkstart = '<a href="'.DOL_URL_ROOT.'/societe/agenda.php?socid='.$this->id;
         }
         else if ($option == 'project')
         {
-            $label.= '<u>' . $langs->trans("ShowProject") . '</u>';
+            $label .= '<u>'.$langs->trans("ShowProject").'</u>';
             $linkstart = '<a href="'.DOL_URL_ROOT.'/societe/project.php?socid='.$this->id;
         }
         else if ($option == 'margin')
         {
-            $label.= '<u>' . $langs->trans("ShowMargin") . '</u>';
+            $label .= '<u>'.$langs->trans("ShowMargin").'</u>';
             $linkstart = '<a href="'.DOL_URL_ROOT.'/margin/tabs/thirdpartyMargins.php?socid='.$this->id.'&type=1';
         }
         else if ($option == 'contact')
         {
-        	$label.= '<u>' . $langs->trans("ShowContacts") . '</u>';
+        	$label .= '<u>'.$langs->trans("ShowContacts").'</u>';
         	$linkstart = '<a href="'.DOL_URL_ROOT.'/societe/contact.php?socid='.$this->id;
         }
 
         // By default
         if (empty($linkstart))
         {
-            $label.= '<u>' . $langs->trans("ShowCompany") . '</u>';
+            $label .= '<u>'.$langs->trans("ShowCompany").'</u>';
             $linkstart = '<a href="'.DOL_URL_ROOT.'/societe/card.php?socid='.$this->id;
         }
 
-        if (! empty($this->name))
+        if (!empty($this->name))
         {
-            $label.= '<br><b>' . $langs->trans('Name') . ':</b> '. $this->name;
-            if (! empty($this->name_alias)) $label.=' ('.$this->name_alias.')';
-            $label.= '<br><b>' . $langs->trans('Email') . ':</b> '. $this->email;
+            $label .= '<br><b>'.$langs->trans('Name').':</b> '.$this->name;
+            if (!empty($this->name_alias)) $label .= ' ('.$this->name_alias.')';
+            $label .= '<br><b>'.$langs->trans('Email').':</b> '.$this->email;
         }
-        if (! empty($this->country_code))
-            $label.= '<br><b>' . $langs->trans('Country') . ':</b> '. $this->country_code;
-        if (! empty($this->tva_intra))
-            $label.= '<br><b>' . $langs->trans('VATNumber') . ':</b> '. $this->tva_intra;
-            if (! empty($this->code_client) && $this->client)
-            $label.= '<br><b>' . $langs->trans('CustomerCode') . ':</b> '. $this->code_client;
-        if (! empty($this->code_fournisseur) && $this->fournisseur)
-            $label.= '<br><b>' . $langs->trans('SupplierCode') . ':</b> '. $this->code_fournisseur;
-        if (! empty($conf->accounting->enabled) && $this->client)
-            $label.= '<br><b>' . $langs->trans('CustomerAccountancyCode') . ':</b> '. $this->code_compta_client;
-        if (! empty($conf->accounting->enabled) && $this->fournisseur)
-            $label.= '<br><b>' . $langs->trans('SupplierAccountancyCode') . ':</b> '. $this->code_compta_fournisseur;
+        if (!empty($this->country_code))
+            $label .= '<br><b>'.$langs->trans('Country').':</b> '.$this->country_code;
+        if (!empty($this->tva_intra))
+            $label .= '<br><b>'.$langs->trans('VATNumber').':</b> '.$this->tva_intra;
+            if (!empty($this->code_client) && $this->client)
+            $label .= '<br><b>'.$langs->trans('CustomerCode').':</b> '.$this->code_client;
+        if (!empty($this->code_fournisseur) && $this->fournisseur)
+            $label .= '<br><b>'.$langs->trans('SupplierCode').':</b> '.$this->code_fournisseur;
+        if (!empty($conf->accounting->enabled) && $this->client)
+            $label .= '<br><b>'.$langs->trans('CustomerAccountancyCode').':</b> '.$this->code_compta_client;
+        if (!empty($conf->accounting->enabled) && $this->fournisseur)
+            $label .= '<br><b>'.$langs->trans('SupplierAccountancyCode').':</b> '.$this->code_compta_fournisseur;
 
-        $label.= '</div>';
+        $label .= '</div>';
 
         // Add type of canvas
-        $linkstart.=(!empty($this->canvas)?'&canvas='.$this->canvas:'');
+        $linkstart .= (!empty($this->canvas) ? '&canvas='.$this->canvas : '');
         // Add param to save lastsearch_values or not
-        $add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0);
-        if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
-        if ($add_save_lastsearch_values) $linkstart.='&save_lastsearch_values=1';
-        $linkstart.='"';
+        $add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
+        if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
+        if ($add_save_lastsearch_values) $linkstart .= '&save_lastsearch_values=1';
+        $linkstart .= '"';
 
-        $linkclose='';
+        $linkclose = '';
         if (empty($notooltip))
         {
-            if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+            if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
             {
-                $label=$langs->trans("ShowCompany");
-                $linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
+                $label = $langs->trans("ShowCompany");
+                $linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
             }
-            $linkclose.= ' title="'.dol_escape_htmltag($label, 1).'"';
-            $linkclose.=' class="classfortooltip"';
+            $linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
+            $linkclose .= ' class="classfortooltip"';
 
-         	if (! is_object($hookmanager))
+         	if (!is_object($hookmanager))
     		{
     			include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-    			$hookmanager=new HookManager($this->db);
+    			$hookmanager = new HookManager($this->db);
     		}
     		$hookmanager->initHooks(array('societedao'));
-    		$parameters=array('id'=>$this->id);
-    		$reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+    		$parameters = array('id'=>$this->id);
+    		$reshook = $hookmanager->executeHooks('getnomurltooltip', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
     		if ($reshook > 0) $linkclose = $hookmanager->resPrint;
         }
-        $linkstart.=$linkclose.'>';
-        $linkend='</a>';
+        $linkstart .= $linkclose.'>';
+        $linkend = '</a>';
 
         global $user;
-        if (! $user->rights->societe->client->voir && $user->societe_id > 0 && $this->id != $user->societe_id)
+        if (!$user->rights->societe->client->voir && $user->societe_id > 0 && $this->id != $user->societe_id)
         {
-            $linkstart='';
-            $linkend='';
+            $linkstart = '';
+            $linkend = '';
         }
 
-        if ($withpicto) $result.=($linkstart.img_object(($notooltip?'':$label), 'company', ($notooltip?'':'class="classfortooltip valigntextbottom"'), 0, 0, $notooltip?0:1).$linkend);
-        if ($withpicto && $withpicto != 2) $result.=' ';
-        if ($withpicto != 2) $result.=$linkstart.($maxlen?dol_trunc($name,$maxlen):$name).$linkend;
+        if ($withpicto) $result .= ($linkstart.img_object(($notooltip ? '' : $label), 'company', ($notooltip ? '' : 'class="classfortooltip valigntextbottom"'), 0, 0, $notooltip ? 0 : 1).$linkend);
+        if ($withpicto && $withpicto != 2) $result .= ' ';
+        if ($withpicto != 2) $result .= $linkstart.($maxlen ?dol_trunc($name, $maxlen) : $name).$linkend;
 
         return $result;
     }
@@ -1984,9 +1984,9 @@ 
      *    @param	int		$mode       0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long
      *    @return   string        		Libelle
      */
-    function getLibStatut($mode=0)
+    function getLibStatut($mode = 0)
     {
-        return $this->LibStatut($this->status,$mode);
+        return $this->LibStatut($this->status, $mode);
     }
 
     /**
@@ -1996,40 +1996,40 @@ 
      *  @param	int		$mode           0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
      *  @return	string          		Libelle du statut
      */
-    function LibStatut($statut,$mode=0)
+    function LibStatut($statut, $mode = 0)
     {
         global $langs;
         $langs->load('companies');
 
         if ($mode == 0)
         {
-            if ($statut==0) return $langs->trans("ActivityCeased");
-            if ($statut==1) return $langs->trans("InActivity");
+            if ($statut == 0) return $langs->trans("ActivityCeased");
+            if ($statut == 1) return $langs->trans("InActivity");
         }
         if ($mode == 1)
         {
-            if ($statut==0) return $langs->trans("ActivityCeased");
-            if ($statut==1) return $langs->trans("InActivity");
+            if ($statut == 0) return $langs->trans("ActivityCeased");
+            if ($statut == 1) return $langs->trans("InActivity");
         }
         if ($mode == 2)
         {
-            if ($statut==0) return img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"').' '.$langs->trans("ActivityCeased");
-            if ($statut==1) return img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"').' '.$langs->trans("InActivity");
+            if ($statut == 0) return img_picto($langs->trans("ActivityCeased"), 'statut5', 'class="pictostatus"').' '.$langs->trans("ActivityCeased");
+            if ($statut == 1) return img_picto($langs->trans("InActivity"), 'statut4', 'class="pictostatus"').' '.$langs->trans("InActivity");
         }
         if ($mode == 3)
         {
-            if ($statut==0) return img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"');
-            if ($statut==1) return img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"');
+            if ($statut == 0) return img_picto($langs->trans("ActivityCeased"), 'statut5', 'class="pictostatus"');
+            if ($statut == 1) return img_picto($langs->trans("InActivity"), 'statut4', 'class="pictostatus"');
         }
         if ($mode == 4)
         {
-            if ($statut==0) return img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"').' '.$langs->trans("ActivityCeased");
-            if ($statut==1) return img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"').' '.$langs->trans("InActivity");
+            if ($statut == 0) return img_picto($langs->trans("ActivityCeased"), 'statut5', 'class="pictostatus"').' '.$langs->trans("ActivityCeased");
+            if ($statut == 1) return img_picto($langs->trans("InActivity"), 'statut4', 'class="pictostatus"').' '.$langs->trans("InActivity");
         }
         if ($mode == 5)
         {
-            if ($statut==0) return $langs->trans("ActivityCeased").' '.img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"');
-            if ($statut==1) return $langs->trans("InActivity").' '.img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"');
+            if ($statut == 0) return $langs->trans("ActivityCeased").' '.img_picto($langs->trans("ActivityCeased"), 'statut5', 'class="pictostatus"');
+            if ($statut == 1) return $langs->trans("InActivity").' '.img_picto($langs->trans("InActivity"), 'statut4', 'class="pictostatus"');
         }
     }
 
@@ -2039,15 +2039,15 @@ 
      *	  @param	  int		$addthirdparty		1=Add also a record for thirdparty email
      *    @return     array       					Array of contacts emails
      */
-    function thirdparty_and_contact_email_array($addthirdparty=0)
+    function thirdparty_and_contact_email_array($addthirdparty = 0)
     {
         global $langs;
 
-        $contact_emails = $this->contact_property_array('email',1);
+        $contact_emails = $this->contact_property_array('email', 1);
         if ($this->email && $addthirdparty)
         {
-            if (empty($this->name)) $this->name=$this->nom;
-            $contact_emails['thirdparty']=$langs->trans("ThirdParty").': '.dol_trunc($this->name,16)." &lt;".$this->email."&gt;";
+            if (empty($this->name)) $this->name = $this->nom;
+            $contact_emails['thirdparty'] = $langs->trans("ThirdParty").': '.dol_trunc($this->name, 16)." &lt;".$this->email."&gt;";
         }
         //var_dump($contact_emails)
         return $contact_emails;
@@ -2064,11 +2064,11 @@ 
 
         $contact_phone = $this->contact_property_array('mobile');
 
-        if (! empty($this->phone))	// If a phone of thirdparty is defined, we add it ot mobile of contacts
+        if (!empty($this->phone))	// If a phone of thirdparty is defined, we add it ot mobile of contacts
         {
-            if (empty($this->name)) $this->name=$this->nom;
+            if (empty($this->name)) $this->name = $this->nom;
             // TODO: Tester si tel non deja present dans tableau contact
-            $contact_phone['thirdparty']=$langs->trans("ThirdParty").': '.dol_trunc($this->name,16)." &lt;".$this->phone."&gt;";
+            $contact_phone['thirdparty'] = $langs->trans("ThirdParty").': '.dol_trunc($this->name, 16)." &lt;".$this->phone."&gt;";
         }
         return $contact_phone;
     }
@@ -2080,7 +2080,7 @@ 
 	 * 	@param	int		$hidedisabled		1=Hide contact if disabled
      *  @return array       				Array of contacts emails or mobile array(id=>'Name <email>')
      */
-    function contact_property_array($mode='email', $hidedisabled=0)
+    function contact_property_array($mode = 'email', $hidedisabled = 0)
     {
     	global $langs;
 
@@ -2088,44 +2088,44 @@ 
 
 
         $sql = "SELECT rowid, email, statut, phone_mobile, lastname, poste, firstname";
-        $sql.= " FROM ".MAIN_DB_PREFIX."socpeople";
-        $sql.= " WHERE fk_soc = ".$this->id;
+        $sql .= " FROM ".MAIN_DB_PREFIX."socpeople";
+        $sql .= " WHERE fk_soc = ".$this->id;
 
-        $resql=$this->db->query($sql);
+        $resql = $this->db->query($sql);
         if ($resql)
         {
             $nump = $this->db->num_rows($resql);
             if ($nump)
             {
-            	$sepa="("; $sepb=")";
+            	$sepa = "("; $sepb = ")";
             	if ($mode == 'email')
             	{
-            		$sepa="&lt;"; $sepb="&gt;";
+            		$sepa = "&lt;"; $sepb = "&gt;";
             	}
                 $i = 0;
                 while ($i < $nump)
                 {
                     $obj = $this->db->fetch_object($resql);
-                    if ($mode == 'email') $property=$obj->email;
-                    else if ($mode == 'mobile') $property=$obj->phone_mobile;
-                    else $property=$obj->$mode;
+                    if ($mode == 'email') $property = $obj->email;
+                    else if ($mode == 'mobile') $property = $obj->phone_mobile;
+                    else $property = $obj->$mode;
 
 					// Show all contact. If hidedisabled is 1, showonly contacts with status = 1
                     if ($obj->statut == 1 || empty($hidedisabled))
                     {
                     	if (empty($property))
                     	{
-                    		if ($mode == 'email') $property=$langs->trans("NoEMail");
-                    		else if ($mode == 'mobile') $property=$langs->trans("NoMobilePhone");
+                    		if ($mode == 'email') $property = $langs->trans("NoEMail");
+                    		else if ($mode == 'mobile') $property = $langs->trans("NoMobilePhone");
                     	}
 
 	                    if (!empty($obj->poste))
     	                {
-							$contact_property[$obj->rowid] = trim(dolGetFirstLastname($obj->firstname,$obj->lastname)).($obj->poste?" - ".$obj->poste:"").(($mode != 'poste' && $property)?" ".$sepa.$property.$sepb:'');
+							$contact_property[$obj->rowid] = trim(dolGetFirstLastname($obj->firstname, $obj->lastname)).($obj->poste ? " - ".$obj->poste : "").(($mode != 'poste' && $property) ? " ".$sepa.$property.$sepb : '');
 						}
 						else
 						{
-							$contact_property[$obj->rowid] = trim(dolGetFirstLastname($obj->firstname,$obj->lastname)).(($mode != 'poste' && $property)?" ".$sepa.$property.$sepb:'');
+							$contact_property[$obj->rowid] = trim(dolGetFirstLastname($obj->firstname, $obj->lastname)).(($mode != 'poste' && $property) ? " ".$sepa.$property.$sepb : '');
 						}
                     }
                     $i++;
@@ -2150,7 +2150,7 @@ 
         $contacts = array();
 
         $sql = "SELECT rowid, lastname, firstname FROM ".MAIN_DB_PREFIX."socpeople WHERE fk_soc = ".$this->id;
-        $resql=$this->db->query($sql);
+        $resql = $this->db->query($sql);
         if ($resql)
         {
             $nump = $this->db->num_rows($resql);
@@ -2160,7 +2160,7 @@ 
                 while ($i < $nump)
                 {
                     $obj = $this->db->fetch_object($resql);
-                    $contacts[$obj->rowid] = dolGetFirstLastname($obj->firstname,$obj->lastname);
+                    $contacts[$obj->rowid] = dolGetFirstLastname($obj->firstname, $obj->lastname);
                     $i++;
                 }
             }
@@ -2179,11 +2179,11 @@ 
      */
     function contact_array_objects()
     {
-        require_once DOL_DOCUMENT_ROOT . '/contact/class/contact.class.php';
+        require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
         $contacts = array();
 
         $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."socpeople WHERE fk_soc = ".$this->id;
-        $resql=$this->db->query($sql);
+        $resql = $this->db->query($sql);
         if ($resql)
         {
             $nump = $this->db->num_rows($resql);
@@ -2214,17 +2214,17 @@ 
      *  @param  string	$mode       'email' or 'mobile'
      *  @return string  			Email of contact with format: "Full name <email>"
      */
-    function contact_get_property($rowid,$mode)
+    function contact_get_property($rowid, $mode)
     {
-        $contact_property='';
+        $contact_property = '';
 
         if (empty($rowid)) return '';
 
         $sql = "SELECT rowid, email, phone_mobile, lastname, firstname";
-        $sql.= " FROM ".MAIN_DB_PREFIX."socpeople";
-        $sql.= " WHERE rowid = '".$rowid."'";
+        $sql .= " FROM ".MAIN_DB_PREFIX."socpeople";
+        $sql .= " WHERE rowid = '".$rowid."'";
 
-        $resql=$this->db->query($sql);
+        $resql = $this->db->query($sql);
         if ($resql)
         {
             $nump = $this->db->num_rows($resql);
@@ -2252,12 +2252,12 @@ 
      *	@param	string	$mode	'label' or 'rum'
      *  @return	string			Bank number
      */
-    function display_rib($mode='label')
+    function display_rib($mode = 'label')
     {
-        require_once DOL_DOCUMENT_ROOT . '/societe/class/companybankaccount.class.php';
+        require_once DOL_DOCUMENT_ROOT.'/societe/class/companybankaccount.class.php';
 
         $bac = new CompanyBankAccount($this->db);
-        $bac->fetch(0,$this->id);
+        $bac->fetch(0, $this->id);
 
         if ($mode == 'label')
         {
@@ -2267,7 +2267,7 @@ 
         {
         	if (empty($bac->rum))
         	{
-        		require_once DOL_DOCUMENT_ROOT . '/compta/prelevement/class/bonprelevement.class.php';
+        		require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.php';
         		$prelevement = new BonPrelevement($this->db);
         		$bac->fetch_thirdparty();
         		$bac->rum = $prelevement->buildRumNumber($bac->thirdparty->code_client, $bac->datec, $bac->id);
@@ -2285,7 +2285,7 @@ 
      */
     function get_all_rib()
     {
-        require_once DOL_DOCUMENT_ROOT . '/societe/class/companybankaccount.class.php';
+        require_once DOL_DOCUMENT_ROOT.'/societe/class/companybankaccount.class.php';
         $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_rib WHERE fk_soc = ".$this->id;
         $result = $this->db->query($sql);
         if (!$result) {
@@ -2314,22 +2314,22 @@ 
      *	@param	int			$type		Should be 0 to say customer
      *  @return void
      */
-    function get_codeclient($objsoc=0,$type=0)
+    function get_codeclient($objsoc = 0, $type = 0)
     {
         global $conf;
-        if (! empty($conf->global->SOCIETE_CODECLIENT_ADDON))
+        if (!empty($conf->global->SOCIETE_CODECLIENT_ADDON))
         {
-        	$module=$conf->global->SOCIETE_CODECLIENT_ADDON;
+        	$module = $conf->global->SOCIETE_CODECLIENT_ADDON;
 
-            $dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']);
+            $dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
             foreach ($dirsociete as $dirroot)
             {
-                $res=dol_include_once($dirroot.$module.'.php');
+                $res = dol_include_once($dirroot.$module.'.php');
                 if ($res) break;
             }
             $mod = new $module();
 
-            $this->code_client = $mod->getNextValue($objsoc,$type);
+            $this->code_client = $mod->getNextValue($objsoc, $type);
             $this->prefixCustomerIsRequired = $mod->prefixIsRequired;
 
             dol_syslog(get_class($this)."::get_codeclient code_client=".$this->code_client." module=".$module);
@@ -2344,22 +2344,22 @@ 
      *	@param	int			$type		Should be 1 to say supplier
      *  @return void
      */
-    function get_codefournisseur($objsoc=0,$type=1)
+    function get_codefournisseur($objsoc = 0, $type = 1)
     {
         global $conf;
-        if (! empty($conf->global->SOCIETE_CODECLIENT_ADDON))
+        if (!empty($conf->global->SOCIETE_CODECLIENT_ADDON))
         {
-			$module=$conf->global->SOCIETE_CODECLIENT_ADDON;
+			$module = $conf->global->SOCIETE_CODECLIENT_ADDON;
 
-            $dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']);
+            $dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
             foreach ($dirsociete as $dirroot)
             {
-                $res=dol_include_once($dirroot.$module.'.php');
+                $res = dol_include_once($dirroot.$module.'.php');
                 if ($res) break;
             }
             $mod = new $module();
 
-            $this->code_fournisseur = $mod->getNextValue($objsoc,$type);
+            $this->code_fournisseur = $mod->getNextValue($objsoc, $type);
 
             dol_syslog(get_class($this)."::get_codefournisseur code_fournisseur=".$this->code_fournisseur." module=".$module);
         }
@@ -2374,23 +2374,23 @@ 
     function codeclient_modifiable()
     {
         global $conf;
-        if (! empty($conf->global->SOCIETE_CODECLIENT_ADDON))
+        if (!empty($conf->global->SOCIETE_CODECLIENT_ADDON))
         {
-        	$module=$conf->global->SOCIETE_CODECLIENT_ADDON;
+        	$module = $conf->global->SOCIETE_CODECLIENT_ADDON;
 
-            $dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']);
+            $dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
             foreach ($dirsociete as $dirroot)
             {
-                $res=dol_include_once($dirroot.$module.'.php');
+                $res = dol_include_once($dirroot.$module.'.php');
                 if ($res) break;
             }
 
             $mod = new $module();
 
             dol_syslog(get_class($this)."::codeclient_modifiable code_client=".$this->code_client." module=".$module);
-            if ($mod->code_modifiable_null && ! $this->code_client) return 1;
+            if ($mod->code_modifiable_null && !$this->code_client) return 1;
             if ($mod->code_modifiable_invalide && $this->check_codeclient() < 0) return 1;
-            if ($mod->code_modifiable) return 1;	// A mettre en dernier
+            if ($mod->code_modifiable) return 1; // A mettre en dernier
             return 0;
         }
         else
@@ -2408,23 +2408,23 @@ 
     function codefournisseur_modifiable()
     {
         global $conf;
-        if (! empty($conf->global->SOCIETE_CODECLIENT_ADDON))
+        if (!empty($conf->global->SOCIETE_CODECLIENT_ADDON))
         {
-        	$module=$conf->global->SOCIETE_CODECLIENT_ADDON;
+        	$module = $conf->global->SOCIETE_CODECLIENT_ADDON;
 
-            $dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']);
+            $dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
             foreach ($dirsociete as $dirroot)
             {
-                $res=dol_include_once($dirroot.$module.'.php');
+                $res = dol_include_once($dirroot.$module.'.php');
                 if ($res) break;
             }
 
             $mod = new $module();
 
             dol_syslog(get_class($this)."::codefournisseur_modifiable code_founisseur=".$this->code_fournisseur." module=".$module);
-            if ($mod->code_modifiable_null && ! $this->code_fournisseur) return 1;
+            if ($mod->code_modifiable_null && !$this->code_fournisseur) return 1;
             if ($mod->code_modifiable_invalide && $this->check_codefournisseur() < 0) return 1;
-            if ($mod->code_modifiable) return 1;	// A mettre en dernier
+            if ($mod->code_modifiable) return 1; // A mettre en dernier
             return 0;
         }
         else
@@ -2446,14 +2446,14 @@ 
     function check_codeclient()
     {
         global $conf;
-        if (! empty($conf->global->SOCIETE_CODECLIENT_ADDON))
+        if (!empty($conf->global->SOCIETE_CODECLIENT_ADDON))
         {
-        	$module=$conf->global->SOCIETE_CODECLIENT_ADDON;
+        	$module = $conf->global->SOCIETE_CODECLIENT_ADDON;
 
-        	$dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']);
+        	$dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
             foreach ($dirsociete as $dirroot)
             {
-                $res=dol_include_once($dirroot.$module.'.php');
+                $res = dol_include_once($dirroot.$module.'.php');
                 if ($res) break;
             }
 
@@ -2481,14 +2481,14 @@ 
     function check_codefournisseur()
     {
         global $conf;
-        if (! empty($conf->global->SOCIETE_CODECLIENT_ADDON))
+        if (!empty($conf->global->SOCIETE_CODECLIENT_ADDON))
         {
-        	$module=$conf->global->SOCIETE_CODECLIENT_ADDON;
+        	$module = $conf->global->SOCIETE_CODECLIENT_ADDON;
 
-        	$dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']);
+        	$dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
             foreach ($dirsociete as $dirroot)
             {
-                $res=dol_include_once($dirroot.$module.'.php');
+                $res = dol_include_once($dirroot.$module.'.php');
                 if ($res) break;
             }
 
@@ -2516,20 +2516,20 @@ 
     {
         global $conf;
 
-        if (! empty($conf->global->SOCIETE_CODECOMPTA_ADDON))
+        if (!empty($conf->global->SOCIETE_CODECOMPTA_ADDON))
         {
-        	$file='';
-            $dirsociete=array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
+        	$file = '';
+            $dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
             foreach ($dirsociete as $dirroot)
             {
             	if (file_exists(DOL_DOCUMENT_ROOT.'/'.$dirroot.$conf->global->SOCIETE_CODECOMPTA_ADDON.".php"))
             	{
-            		$file=$dirroot.$conf->global->SOCIETE_CODECOMPTA_ADDON.".php";
+            		$file = $dirroot.$conf->global->SOCIETE_CODECOMPTA_ADDON.".php";
             		break;
             	}
             }
 
-            if (! empty($file))
+            if (!empty($file))
             {
             	dol_include_once($file);
 
@@ -2570,10 +2570,10 @@ 
         if ($this->id)
         {
             $sql = "UPDATE ".MAIN_DB_PREFIX."societe";
-            $sql.= " SET parent = ".($id > 0 ? $id : "null");
-            $sql.= " WHERE rowid = " . $this->id;
+            $sql .= " SET parent = ".($id > 0 ? $id : "null");
+            $sql .= " WHERE rowid = ".$this->id;
 			dol_syslog(get_class($this).'::set_parent', LOG_DEBUG);
-            $resql=$this->db->query($sql);
+            $resql = $this->db->query($sql);
             if ($resql)
             {
             	$this->parent = $id;
@@ -2597,28 +2597,28 @@ 
     {
 	    global $conf;
 
-     	switch($idprof)
+     	switch ($idprof)
         {
         	case 1:
-        		$ret=(!$conf->global->SOCIETE_IDPROF1_UNIQUE?false:true);
+        		$ret = (!$conf->global->SOCIETE_IDPROF1_UNIQUE ?false:true);
         		break;
         	case 2:
-        		$ret=(!$conf->global->SOCIETE_IDPROF2_UNIQUE?false:true);
+        		$ret = (!$conf->global->SOCIETE_IDPROF2_UNIQUE ?false:true);
         		break;
         	case 3:
-        		$ret=(!$conf->global->SOCIETE_IDPROF3_UNIQUE?false:true);
+        		$ret = (!$conf->global->SOCIETE_IDPROF3_UNIQUE ?false:true);
         		break;
         	case 4:
-        		$ret=(!$conf->global->SOCIETE_IDPROF4_UNIQUE?false:true);
+        		$ret = (!$conf->global->SOCIETE_IDPROF4_UNIQUE ?false:true);
         		break;
         	case 5:
-        		$ret=(!$conf->global->SOCIETE_IDPROF5_UNIQUE?false:true);
+        		$ret = (!$conf->global->SOCIETE_IDPROF5_UNIQUE ?false:true);
         		break;
         	case 6:
-        		$ret=(!$conf->global->SOCIETE_IDPROF6_UNIQUE?false:true);
+        		$ret = (!$conf->global->SOCIETE_IDPROF6_UNIQUE ?false:true);
         		break;
         	default:
-        		$ret=false;
+        		$ret = false;
         }
 
         return $ret;
@@ -2632,39 +2632,39 @@ 
      *    @param	int		$socid		Id of thirdparty to exclude (if update)
      *    @return   boolean				True if exists, False if not
      */
-    function id_prof_exists($idprof, $value, $socid=0)
+    function id_prof_exists($idprof, $value, $socid = 0)
     {
     	$field = $idprof;
 
-     	switch($idprof)	// For backward compatibility
+     	switch ($idprof)	// For backward compatibility
         {
         	case '1':
         	case 'idprof1':
-        		$field="siren";
+        		$field = "siren";
         		break;
         	case '2':
         	case 'idprof2':
-        		$field="siret";
+        		$field = "siret";
         		break;
         	case '3':
         	case 'idprof3':
-        		$field="ape";
+        		$field = "ape";
         		break;
         	case '4':
         	case 'idprof4':
-        		$field="idprof4";
+        		$field = "idprof4";
         		break;
         	case '5':
-        		$field="idprof5";
+        		$field = "idprof5";
         		break;
         	case '6':
-        		$field="idprof6";
+        		$field = "idprof6";
         		break;
      	}
 
          //Verify duplicate entries
-        $sql  = "SELECT COUNT(*) as idprof FROM ".MAIN_DB_PREFIX."societe WHERE ".$field." = '".$value."' AND entity IN (".getEntity('societe').")";
-        if($socid) $sql .= " AND rowid <> ".$socid;
+        $sql = "SELECT COUNT(*) as idprof FROM ".MAIN_DB_PREFIX."societe WHERE ".$field." = '".$value."' AND entity IN (".getEntity('societe').")";
+        if ($socid) $sql .= " AND rowid <> ".$socid;
         $resql = $this->db->query($sql);
         if ($resql)
         {
@@ -2690,36 +2690,36 @@ 
      *  @return int             			<=0 if KO, >0 if OK
      *  TODO better to have this in a lib than into a business class
      */
-    function id_prof_check($idprof,$soc)
+    function id_prof_check($idprof, $soc)
     {
         global $conf;
 
-        $ok=1;
+        $ok = 1;
 
-        if (! empty($conf->global->MAIN_DISABLEPROFIDRULES)) return 1;
+        if (!empty($conf->global->MAIN_DISABLEPROFIDRULES)) return 1;
 
         // Verifie SIREN si pays FR
         if ($idprof == 1 && $soc->country_code == 'FR')
         {
-            $chaine=trim($this->idprof1);
-            $chaine=preg_replace('/(\s)/','',$chaine);
+            $chaine = trim($this->idprof1);
+            $chaine = preg_replace('/(\s)/', '', $chaine);
 
             if (dol_strlen($chaine) != 9) return -1;
 
             $sum = 0;
 
-            for ($i = 0 ; $i < 10 ; $i = $i+2)
+            for ($i = 0; $i < 10; $i = $i + 2)
             {
                 $sum = $sum + substr($this->idprof1, (8 - $i), 1);
             }
 
-            for ($i = 1 ; $i < 9 ; $i = $i+2)
+            for ($i = 1; $i < 9; $i = $i + 2)
             {
                 $ps = 2 * substr($this->idprof1, (8 - $i), 1);
 
                 if ($ps > 9)
                 {
-                    $ps = substr($ps, 0,1) + substr($ps, 1, 1);
+                    $ps = substr($ps, 0, 1) + substr($ps, 1, 1);
                 }
                 $sum = $sum + $ps;
             }
@@ -2730,8 +2730,8 @@ 
         // Verifie SIRET si pays FR
         if ($idprof == 2 && $soc->country_code == 'FR')
         {
-            $chaine=trim($this->idprof2);
-            $chaine=preg_replace('/(\s)/','',$chaine);
+            $chaine = trim($this->idprof2);
+            $chaine = preg_replace('/(\s)/', '', $chaine);
 
             if (dol_strlen($chaine) != 14) return -1;
         }
@@ -2740,11 +2740,11 @@ 
         //Returns: 1 if NIF ok, 2 if CIF ok, 3 if NIE ok, -1 if NIF bad, -2 if CIF bad, -3 if NIE bad, 0 if unexpected bad
         if ($idprof == 1 && $soc->country_code == 'ES')
         {
-            $string=trim($this->idprof1);
-            $string=preg_replace('/(\s)/','',$string);
+            $string = trim($this->idprof1);
+            $string = preg_replace('/(\s)/', '', $string);
             $string = strtoupper($string);
 
-            for ($i = 0; $i < 9; $i ++)
+            for ($i = 0; $i < 9; $i++)
             $num[$i] = substr($string, $i, 1);
 
             //Check format
@@ -2761,7 +2761,7 @@ 
             //algorithm checking type code CIF
             $sum = $num[2] + $num[4] + $num[6];
             for ($i = 1; $i < 8; $i += 2)
-            $sum += substr((2 * $num[$i]),0,1) + substr((2 * $num[$i]),1,1);
+            $sum += substr((2 * $num[$i]), 0, 1) + substr((2 * $num[$i]), 1, 1);
             $n = 10 - substr($sum, strlen($sum) - 1, 1);
 
             //Chek special NIF
@@ -2787,7 +2787,7 @@ 
 
             //Check NIE XYZ
             if (preg_match('/^[XYZ]{1}/', $string))
-            if ($num[8] == substr('TRWAGMYFPDXBNJZSQVHLCKE', substr(str_replace(array('X','Y','Z'), array('0','1','2'), $string), 0, 8) % 23, 1))
+            if ($num[8] == substr('TRWAGMYFPDXBNJZSQVHLCKE', substr(str_replace(array('X', 'Y', 'Z'), array('0', '1', '2'), $string), 0, 8) % 23, 1))
             return 3;
             else
             return -3;
@@ -2807,25 +2807,25 @@ 
      *   @return	string          		Url or empty string if no URL known
      *   TODO better in a lib than into business class
      */
-    function id_prof_url($idprof,$thirdparty)
+    function id_prof_url($idprof, $thirdparty)
     {
-        global $conf,$langs,$hookmanager;
+        global $conf, $langs, $hookmanager;
 
-        $url='';
+        $url = '';
         $action = '';
 
         $hookmanager->initHooks(array('idprofurl'));
-        $parameters=array('idprof'=>$idprof, 'company'=>$thirdparty);
-        $reshook=$hookmanager->executeHooks('getIdProfUrl',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+        $parameters = array('idprof'=>$idprof, 'company'=>$thirdparty);
+        $reshook = $hookmanager->executeHooks('getIdProfUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
         if (empty($reshook))
         {
-            if (! empty($conf->global->MAIN_DISABLEPROFIDRULES)) return '';
+            if (!empty($conf->global->MAIN_DISABLEPROFIDRULES)) return '';
 
             // TODO Move links to validate professional ID into a dictionary table "country" + "link"
-            if ($idprof == 1 && $thirdparty->country_code == 'FR') $url='http://www.societe.com/cgi-bin/search?champs='.$thirdparty->idprof1;    // See also http://avis-situation-sirene.insee.fr/
+            if ($idprof == 1 && $thirdparty->country_code == 'FR') $url = 'http://www.societe.com/cgi-bin/search?champs='.$thirdparty->idprof1; // See also http://avis-situation-sirene.insee.fr/
             //if ($idprof == 1 && ($thirdparty->country_code == 'GB' || $thirdparty->country_code == 'UK')) $url='http://www.companieshouse.gov.uk/WebCHeck/findinfolink/';     // Link no more valid
-            if ($idprof == 1 && $thirdparty->country_code == 'ES') $url='http://www.e-informa.es/servlet/app/portal/ENTP/screen/SProducto/prod/ETIQUETA_EMPRESA/nif/'.$thirdparty->idprof1;
-            if ($idprof == 1 && $thirdparty->country_code == 'IN') $url='http://www.tinxsys.com/TinxsysInternetWeb/dealerControllerServlet?tinNumber='.$thirdparty->idprof1.';&searchBy=TIN&backPage=searchByTin_Inter.jsp';
+            if ($idprof == 1 && $thirdparty->country_code == 'ES') $url = 'http://www.e-informa.es/servlet/app/portal/ENTP/screen/SProducto/prod/ETIQUETA_EMPRESA/nif/'.$thirdparty->idprof1;
+            if ($idprof == 1 && $thirdparty->country_code == 'IN') $url = 'http://www.tinxsys.com/TinxsysInternetWeb/dealerControllerServlet?tinNumber='.$thirdparty->idprof1.';&searchBy=TIN&backPage=searchByTin_Inter.jsp';
 
             if ($url) return '<a target="_blank" href="'.$url.'">'.$langs->trans("Check").'</a>';
         }
@@ -2844,7 +2844,7 @@ 
      */
     function has_projects()
     {
-        $sql = 'SELECT COUNT(*) as numproj FROM '.MAIN_DB_PREFIX.'projet WHERE fk_soc = ' . $this->id;
+        $sql = 'SELECT COUNT(*) as numproj FROM '.MAIN_DB_PREFIX.'projet WHERE fk_soc = '.$this->id;
         $resql = $this->db->query($sql);
         if ($resql)
         {
@@ -2870,11 +2870,11 @@ 
     function info($id)
     {
         $sql = "SELECT s.rowid, s.nom as name, s.datec as date_creation, tms as date_modification,";
-        $sql.= " fk_user_creat, fk_user_modif";
-        $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
-        $sql.= " WHERE s.rowid = ".$id;
+        $sql .= " fk_user_creat, fk_user_modif";
+        $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+        $sql .= " WHERE s.rowid = ".$id;
 
-        $result=$this->db->query($sql);
+        $result = $this->db->query($sql);
         if ($result)
         {
             if ($this->db->num_rows($result))
@@ -2886,7 +2886,7 @@ 
                 if ($obj->fk_user_creat) {
                     $cuser = new User($this->db);
                     $cuser->fetch($obj->fk_user_creat);
-                    $this->user_creation     = $cuser;
+                    $this->user_creation = $cuser;
                 }
 
                 if ($obj->fk_user_modif) {
@@ -2895,7 +2895,7 @@ 
                     $this->user_modification = $muser;
                 }
 
-                $this->ref			     = $obj->name;
+                $this->ref = $obj->name;
                 $this->date_creation     = $this->db->jdate($obj->date_creation);
                 $this->date_modification = $this->db->jdate($obj->date_modification);
             }
@@ -2919,10 +2919,10 @@ 
         global $conf;
 
         // Define if third party is treated as company (or not) when nature is unknown
-        $isacompany=empty($conf->global->MAIN_UNKNOWN_CUSTOMERS_ARE_COMPANIES)?0:1; // 0 by default
-        if (! empty($this->tva_intra)) $isacompany=1;
-        else if (! empty($this->typent_code) && in_array($this->typent_code,array('TE_PRIVATE'))) $isacompany=0;
-        else if (! empty($this->typent_code) && in_array($this->typent_code,array('TE_SMALL','TE_MEDIUM','TE_LARGE','TE_GROUP'))) $isacompany=1;
+        $isacompany = empty($conf->global->MAIN_UNKNOWN_CUSTOMERS_ARE_COMPANIES) ? 0 : 1; // 0 by default
+        if (!empty($this->tva_intra)) $isacompany = 1;
+        else if (!empty($this->typent_code) && in_array($this->typent_code, array('TE_PRIVATE'))) $isacompany = 0;
+        else if (!empty($this->typent_code) && in_array($this->typent_code, array('TE_SMALL', 'TE_MEDIUM', 'TE_LARGE', 'TE_GROUP'))) $isacompany = 1;
 
         return $isacompany;
     }
@@ -2936,13 +2936,13 @@ 
     {
         $this->SupplierCategories = array();
         $sql = "SELECT rowid, label";
-        $sql.= " FROM ".MAIN_DB_PREFIX."categorie";
-        $sql.= " WHERE type = ".Categorie::TYPE_SUPPLIER;
+        $sql .= " FROM ".MAIN_DB_PREFIX."categorie";
+        $sql .= " WHERE type = ".Categorie::TYPE_SUPPLIER;
 
-        $resql=$this->db->query($sql);
+        $resql = $this->db->query($sql);
         if ($resql)
         {
-            while ($obj = $this->db->fetch_object($resql) )
+            while ($obj = $this->db->fetch_object($resql))
             {
                 $this->SupplierCategories[$obj->rowid] = $obj->label;
             }
@@ -2965,9 +2965,9 @@ 
         if ($categorie_id > 0 && $this->id > 0)
         {
             $sql = "INSERT INTO ".MAIN_DB_PREFIX."categorie_fournisseur (fk_categorie, fk_soc) ";
-            $sql.= " VALUES (".$categorie_id.", ".$this->id.")";
+            $sql .= " VALUES (".$categorie_id.", ".$this->id.")";
 
-            if ($resql=$this->db->query($sql)) return 0;
+            if ($resql = $this->db->query($sql)) return 0;
         }
         else
         {
@@ -2984,41 +2984,41 @@ 
      * 	@param	string	$socname	Name of third party to force
      *  @return int					<0 if KO, id of created account if OK
      */
-    function create_from_member(Adherent $member,$socname='')
+    function create_from_member(Adherent $member, $socname = '')
     {
-        global $user,$langs;
+        global $user, $langs;
 
-        $name = $socname?$socname:$member->societe;
-        if (empty($name)) $name=$member->getFullName($langs);
+        $name = $socname ? $socname : $member->societe;
+        if (empty($name)) $name = $member->getFullName($langs);
 
         // Positionne parametres
-        $this->nom=$name;				// TODO deprecated
-        $this->name=$name;
-        $this->address=$member->address;
-        $this->zip=$member->zip;
-        $this->town=$member->town;
-        $this->country_code=$member->country_code;
-        $this->country_id=$member->country_id;
-        $this->phone=$member->phone;       // Prof phone
-        $this->email=$member->email;
-        $this->skype=$member->skype;
-
-        $this->client = 1;				// A member is a customer by default
+        $this->nom = $name; // TODO deprecated
+        $this->name = $name;
+        $this->address = $member->address;
+        $this->zip = $member->zip;
+        $this->town = $member->town;
+        $this->country_code = $member->country_code;
+        $this->country_id = $member->country_id;
+        $this->phone = $member->phone; // Prof phone
+        $this->email = $member->email;
+        $this->skype = $member->skype;
+
+        $this->client = 1; // A member is a customer by default
         $this->code_client = -1;
         $this->code_fournisseur = -1;
 
         $this->db->begin();
 
         // Cree et positionne $this->id
-        $result=$this->create($user);
+        $result = $this->create($user);
         if ($result >= 0)
         {
             $sql = "UPDATE ".MAIN_DB_PREFIX."adherent";
-            $sql.= " SET fk_soc=".$this->id;
-            $sql.= " WHERE rowid=".$member->id;
+            $sql .= " SET fk_soc=".$this->id;
+            $sql .= " WHERE rowid=".$member->id;
 
             dol_syslog(get_class($this)."::create_from_member", LOG_DEBUG);
-            $resql=$this->db->query($sql);
+            $resql = $this->db->query($sql);
             if ($resql)
             {
                 $this->db->commit();
@@ -3026,7 +3026,7 @@ 
             }
             else
             {
-                $this->error=$this->db->error();
+                $this->error = $this->db->error();
 
                 $this->db->rollback();
                 return -1;
@@ -3035,7 +3035,7 @@ 
         else
         {
             // $this->error deja positionne
-            dol_syslog(get_class($this)."::create_from_member - 2 - ".$this->error." - ".join(',',$this->errors), LOG_ERR);
+            dol_syslog(get_class($this)."::create_from_member - 2 - ".$this->error." - ".join(',', $this->errors), LOG_ERR);
 
             $this->db->rollback();
             return $result;
@@ -3052,12 +3052,12 @@ 
     {
     	global $langs;
 
-    	$this->id=0;
-    	$this->name=empty($conf->global->MAIN_INFO_SOCIETE_NOM)?'':$conf->global->MAIN_INFO_SOCIETE_NOM;
-    	$this->address=empty($conf->global->MAIN_INFO_SOCIETE_ADDRESS)?'':$conf->global->MAIN_INFO_SOCIETE_ADDRESS;
-    	$this->zip=empty($conf->global->MAIN_INFO_SOCIETE_ZIP)?'':$conf->global->MAIN_INFO_SOCIETE_ZIP;
-    	$this->town=empty($conf->global->MAIN_INFO_SOCIETE_TOWN)?'':$conf->global->MAIN_INFO_SOCIETE_TOWN;
-		$this->state_id=empty($conf->global->MAIN_INFO_SOCIETE_STATE)?'':$conf->global->MAIN_INFO_SOCIETE_STATE;
+    	$this->id = 0;
+    	$this->name = empty($conf->global->MAIN_INFO_SOCIETE_NOM) ? '' : $conf->global->MAIN_INFO_SOCIETE_NOM;
+    	$this->address = empty($conf->global->MAIN_INFO_SOCIETE_ADDRESS) ? '' : $conf->global->MAIN_INFO_SOCIETE_ADDRESS;
+    	$this->zip = empty($conf->global->MAIN_INFO_SOCIETE_ZIP) ? '' : $conf->global->MAIN_INFO_SOCIETE_ZIP;
+    	$this->town = empty($conf->global->MAIN_INFO_SOCIETE_TOWN) ? '' : $conf->global->MAIN_INFO_SOCIETE_TOWN;
+		$this->state_id = empty($conf->global->MAIN_INFO_SOCIETE_STATE) ? '' : $conf->global->MAIN_INFO_SOCIETE_STATE;
 
         /* Disabled: we don't want any SQL request into method setMySoc. This method set object from env only.
         If we need label, label must be loaded by output that need it from id (label depends on output language)
@@ -3068,59 +3068,59 @@ 
         }
 		*/
 
-    	$this->note_private=empty($conf->global->MAIN_INFO_SOCIETE_NOTE)?'':$conf->global->MAIN_INFO_SOCIETE_NOTE;
+    	$this->note_private = empty($conf->global->MAIN_INFO_SOCIETE_NOTE) ? '' : $conf->global->MAIN_INFO_SOCIETE_NOTE;
 
-    	$this->nom=$this->name; 									// deprecated
+    	$this->nom = $this->name; // deprecated
 
     	// We define country_id, country_code and country
-    	$country_id=$country_code=$country_label='';
-    	if (! empty($conf->global->MAIN_INFO_SOCIETE_COUNTRY))
+    	$country_id = $country_code = $country_label = '';
+    	if (!empty($conf->global->MAIN_INFO_SOCIETE_COUNTRY))
     	{
-    		$tmp=explode(':',$conf->global->MAIN_INFO_SOCIETE_COUNTRY);
-    		$country_id=$tmp[0];
-    		if (! empty($tmp[1]))   // If $conf->global->MAIN_INFO_SOCIETE_COUNTRY is "id:code:label"
+    		$tmp = explode(':', $conf->global->MAIN_INFO_SOCIETE_COUNTRY);
+    		$country_id = $tmp[0];
+    		if (!empty($tmp[1]))   // If $conf->global->MAIN_INFO_SOCIETE_COUNTRY is "id:code:label"
     		{
-    			$country_code=$tmp[1];
-    			$country_label=$tmp[2];
+    			$country_code = $tmp[1];
+    			$country_label = $tmp[2];
     		}
     		else                    // For backward compatibility
     		{
     			dol_syslog("Your country setup use an old syntax. Reedit it using setup area.", LOG_ERR);
     			include_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
-    			$country_code=getCountry($country_id,2,$this->db);  // This need a SQL request, but it's the old feature that should not be used anymore
-    			$country_label=getCountry($country_id,0,$this->db);  // This need a SQL request, but it's the old feature that should not be used anymore
+    			$country_code = getCountry($country_id, 2, $this->db); // This need a SQL request, but it's the old feature that should not be used anymore
+    			$country_label = getCountry($country_id, 0, $this->db); // This need a SQL request, but it's the old feature that should not be used anymore
     		}
     	}
-    	$this->country_id=$country_id;
-    	$this->country_code=$country_code;
-    	$this->country=$country_label;
-    	if (is_object($langs)) $this->country=($langs->trans('Country'.$country_code)!='Country'.$country_code)?$langs->trans('Country'.$country_code):$country_label;
-
-    	$this->phone=empty($conf->global->MAIN_INFO_SOCIETE_TEL)?'':$conf->global->MAIN_INFO_SOCIETE_TEL;
-    	$this->fax=empty($conf->global->MAIN_INFO_SOCIETE_FAX)?'':$conf->global->MAIN_INFO_SOCIETE_FAX;
-    	$this->url=empty($conf->global->MAIN_INFO_SOCIETE_WEB)?'':$conf->global->MAIN_INFO_SOCIETE_WEB;
+    	$this->country_id = $country_id;
+    	$this->country_code = $country_code;
+    	$this->country = $country_label;
+    	if (is_object($langs)) $this->country = ($langs->trans('Country'.$country_code) != 'Country'.$country_code) ? $langs->trans('Country'.$country_code) : $country_label;
+
+    	$this->phone = empty($conf->global->MAIN_INFO_SOCIETE_TEL) ? '' : $conf->global->MAIN_INFO_SOCIETE_TEL;
+    	$this->fax = empty($conf->global->MAIN_INFO_SOCIETE_FAX) ? '' : $conf->global->MAIN_INFO_SOCIETE_FAX;
+    	$this->url = empty($conf->global->MAIN_INFO_SOCIETE_WEB) ? '' : $conf->global->MAIN_INFO_SOCIETE_WEB;
     	// Id prof generiques
-    	$this->idprof1=empty($conf->global->MAIN_INFO_SIREN)?'':$conf->global->MAIN_INFO_SIREN;
-    	$this->idprof2=empty($conf->global->MAIN_INFO_SIRET)?'':$conf->global->MAIN_INFO_SIRET;
-    	$this->idprof3=empty($conf->global->MAIN_INFO_APE)?'':$conf->global->MAIN_INFO_APE;
-    	$this->idprof4=empty($conf->global->MAIN_INFO_RCS)?'':$conf->global->MAIN_INFO_RCS;
-    	$this->idprof5=empty($conf->global->MAIN_INFO_PROFID5)?'':$conf->global->MAIN_INFO_PROFID5;
-    	$this->idprof6=empty($conf->global->MAIN_INFO_PROFID6)?'':$conf->global->MAIN_INFO_PROFID6;
-    	$this->tva_intra=empty($conf->global->MAIN_INFO_TVAINTRA)?'':$conf->global->MAIN_INFO_TVAINTRA;	// VAT number, not necessarly INTRA.
-    	$this->managers=empty($conf->global->MAIN_INFO_SOCIETE_MANAGERS)?'':$conf->global->MAIN_INFO_SOCIETE_MANAGERS;
-    	$this->capital=empty($conf->global->MAIN_INFO_CAPITAL)?'':$conf->global->MAIN_INFO_CAPITAL;
-    	$this->forme_juridique_code=empty($conf->global->MAIN_INFO_SOCIETE_FORME_JURIDIQUE)?'':$conf->global->MAIN_INFO_SOCIETE_FORME_JURIDIQUE;
-    	$this->email=empty($conf->global->MAIN_INFO_SOCIETE_MAIL)?'':$conf->global->MAIN_INFO_SOCIETE_MAIL;
-    	$this->logo=empty($conf->global->MAIN_INFO_SOCIETE_LOGO)?'':$conf->global->MAIN_INFO_SOCIETE_LOGO;
-    	$this->logo_small=empty($conf->global->MAIN_INFO_SOCIETE_LOGO_SMALL)?'':$conf->global->MAIN_INFO_SOCIETE_LOGO_SMALL;
-    	$this->logo_mini=empty($conf->global->MAIN_INFO_SOCIETE_LOGO_MINI)?'':$conf->global->MAIN_INFO_SOCIETE_LOGO_MINI;
+    	$this->idprof1 = empty($conf->global->MAIN_INFO_SIREN) ? '' : $conf->global->MAIN_INFO_SIREN;
+    	$this->idprof2 = empty($conf->global->MAIN_INFO_SIRET) ? '' : $conf->global->MAIN_INFO_SIRET;
+    	$this->idprof3 = empty($conf->global->MAIN_INFO_APE) ? '' : $conf->global->MAIN_INFO_APE;
+    	$this->idprof4 = empty($conf->global->MAIN_INFO_RCS) ? '' : $conf->global->MAIN_INFO_RCS;
+    	$this->idprof5 = empty($conf->global->MAIN_INFO_PROFID5) ? '' : $conf->global->MAIN_INFO_PROFID5;
+    	$this->idprof6 = empty($conf->global->MAIN_INFO_PROFID6) ? '' : $conf->global->MAIN_INFO_PROFID6;
+    	$this->tva_intra = empty($conf->global->MAIN_INFO_TVAINTRA) ? '' : $conf->global->MAIN_INFO_TVAINTRA; // VAT number, not necessarly INTRA.
+    	$this->managers = empty($conf->global->MAIN_INFO_SOCIETE_MANAGERS) ? '' : $conf->global->MAIN_INFO_SOCIETE_MANAGERS;
+    	$this->capital = empty($conf->global->MAIN_INFO_CAPITAL) ? '' : $conf->global->MAIN_INFO_CAPITAL;
+    	$this->forme_juridique_code = empty($conf->global->MAIN_INFO_SOCIETE_FORME_JURIDIQUE) ? '' : $conf->global->MAIN_INFO_SOCIETE_FORME_JURIDIQUE;
+    	$this->email = empty($conf->global->MAIN_INFO_SOCIETE_MAIL) ? '' : $conf->global->MAIN_INFO_SOCIETE_MAIL;
+    	$this->logo = empty($conf->global->MAIN_INFO_SOCIETE_LOGO) ? '' : $conf->global->MAIN_INFO_SOCIETE_LOGO;
+    	$this->logo_small = empty($conf->global->MAIN_INFO_SOCIETE_LOGO_SMALL) ? '' : $conf->global->MAIN_INFO_SOCIETE_LOGO_SMALL;
+    	$this->logo_mini = empty($conf->global->MAIN_INFO_SOCIETE_LOGO_MINI) ? '' : $conf->global->MAIN_INFO_SOCIETE_LOGO_MINI;
 
     	// Define if company use vat or not
-    	$this->tva_assuj=$conf->global->FACTURE_TVAOPTION;
+    	$this->tva_assuj = $conf->global->FACTURE_TVAOPTION;
 
     	// Define if company use local taxes
-    	$this->localtax1_assuj=((isset($conf->global->FACTURE_LOCAL_TAX1_OPTION) && ($conf->global->FACTURE_LOCAL_TAX1_OPTION=='1' || $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on'))?1:0);
-    	$this->localtax2_assuj=((isset($conf->global->FACTURE_LOCAL_TAX2_OPTION) && ($conf->global->FACTURE_LOCAL_TAX2_OPTION=='1' || $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on'))?1:0);
+    	$this->localtax1_assuj = ((isset($conf->global->FACTURE_LOCAL_TAX1_OPTION) && ($conf->global->FACTURE_LOCAL_TAX1_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX1_OPTION == 'localtax1on')) ? 1 : 0);
+    	$this->localtax2_assuj = ((isset($conf->global->FACTURE_LOCAL_TAX2_OPTION) && ($conf->global->FACTURE_LOCAL_TAX2_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX2_OPTION == 'localtax2on')) ? 1 : 0);
     }
 
     /**
@@ -3132,46 +3132,46 @@ 
      */
     function initAsSpecimen()
     {
-        $now=dol_now();
+        $now = dol_now();
 
         // Initialize parameters
-        $this->id=0;
-        $this->name = 'THIRDPARTY SPECIMEN '.dol_print_date($now,'dayhourlog');
-        $this->nom = $this->name;   // For backward compatibility
+        $this->id = 0;
+        $this->name = 'THIRDPARTY SPECIMEN '.dol_print_date($now, 'dayhourlog');
+        $this->nom = $this->name; // For backward compatibility
         $this->ref_ext = 'Ref ext';
-        $this->specimen=1;
-        $this->address='21 jump street';
-        $this->zip='99999';
-        $this->town='MyTown';
-        $this->state_id=1;
-        $this->state_code='AA';
-        $this->state='MyState';
-        $this->country_id=1;
-        $this->country_code='FR';
-        $this->email='specimen@specimen.com';
-        $this->skype='tom.hanson';
-        $this->url='http://www.specimen.com';
-
-        $this->phone='0909090901';
-        $this->fax='0909090909';
-
-        $this->code_client='CC-'.dol_print_date($now,'dayhourlog');
-        $this->code_fournisseur='SC-'.dol_print_date($now,'dayhourlog');
-        $this->capital=10000;
-        $this->client=1;
-        $this->prospect=1;
-        $this->fournisseur=1;
-        $this->tva_assuj=1;
-        $this->tva_intra='EU1234567';
-        $this->note_public='This is a comment (public)';
-        $this->note_private='This is a comment (private)';
-
-        $this->idprof1='idprof1';
-        $this->idprof2='idprof2';
-        $this->idprof3='idprof3';
-        $this->idprof4='idprof4';
-        $this->idprof5='idprof5';
-        $this->idprof6='idprof6';
+        $this->specimen = 1;
+        $this->address = '21 jump street';
+        $this->zip = '99999';
+        $this->town = 'MyTown';
+        $this->state_id = 1;
+        $this->state_code = 'AA';
+        $this->state = 'MyState';
+        $this->country_id = 1;
+        $this->country_code = 'FR';
+        $this->email = 'specimen@specimen.com';
+        $this->skype = 'tom.hanson';
+        $this->url = 'http://www.specimen.com';
+
+        $this->phone = '0909090901';
+        $this->fax = '0909090909';
+
+        $this->code_client = 'CC-'.dol_print_date($now, 'dayhourlog');
+        $this->code_fournisseur = 'SC-'.dol_print_date($now, 'dayhourlog');
+        $this->capital = 10000;
+        $this->client = 1;
+        $this->prospect = 1;
+        $this->fournisseur = 1;
+        $this->tva_assuj = 1;
+        $this->tva_intra = 'EU1234567';
+        $this->note_public = 'This is a comment (public)';
+        $this->note_private = 'This is a comment (private)';
+
+        $this->idprof1 = 'idprof1';
+        $this->idprof2 = 'idprof2';
+        $this->idprof3 = 'idprof3';
+        $this->idprof4 = 'idprof4';
+        $this->idprof5 = 'idprof5';
+        $this->idprof6 = 'idprof6';
     }
 
     /**
@@ -3180,7 +3180,7 @@ 
      *	@param		int		$localTaxNum	To get info for only localtax1 or localtax2
      *  @return		boolean					true or false
      */
-    function useLocalTax($localTaxNum=0)
+    function useLocalTax($localTaxNum = 0)
     {
     	$sql  = "SELECT t.localtax1, t.localtax2";
     	$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
@@ -3191,7 +3191,7 @@ 
     	elseif ($localTaxNum == 2) $sql .= " AND t.localtax2_type <> '0'";
 
     	dol_syslog("useLocalTax", LOG_DEBUG);
-    	$resql=$this->db->query($sql);
+    	$resql = $this->db->query($sql);
     	if ($resql)
     	{
    			return ($this->db->num_rows($resql) > 0);
@@ -3212,7 +3212,7 @@ 
         $sql .= " AND t.active = 1 AND t.recuperableonly = 1";
 
         dol_syslog("useNPR", LOG_DEBUG);
-        $resql=$this->db->query($sql);
+        $resql = $this->db->query($sql);
         if ($resql)
         {
             return ($this->db->num_rows($resql) > 0);
@@ -3233,15 +3233,15 @@ 
 		$sql .= " AND r.active = 1";
 
 		dol_syslog("useRevenueStamp", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
-			$obj=$this->db->fetch_object($resql);
-   			return (($obj->nb > 0)?true:false);
+			$obj = $this->db->fetch_object($resql);
+   			return (($obj->nb > 0) ?true:false);
 		}
 		else
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			return false;
 		}
 	}
@@ -3266,11 +3266,11 @@ 
 	{
 		global $langs;
 
-		$lib=$langs->trans("ProspectLevel".$fk_prospectlevel);
+		$lib = $langs->trans("ProspectLevel".$fk_prospectlevel);
 		// If lib not found in language file, we get label from cache/databse
 		if ($lib == $langs->trans("ProspectLevel".$fk_prospectlevel))
 		{
-			$lib=$langs->getLabelFromKey($this->db,$fk_prospectlevel,'c_prospectlevel','code','label');
+			$lib = $langs->getLabelFromKey($this->db, $fk_prospectlevel, 'c_prospectlevel', 'code', 'label');
 		}
 		return $lib;
 	}
@@ -3295,7 +3295,7 @@ 
 	 *  @param	string	$label		Label to use for status for added status
 	 *  @return string        		Libelle
 	 */
-	function getLibProspCommStatut($mode=0, $label='')
+	function getLibProspCommStatut($mode = 0, $label = '')
 	{
 		return $this->LibProspCommStatut($this->stcomm_id, $mode, $label);
 	}
@@ -3308,18 +3308,18 @@ 
 	 *  @param	string		$label			Label to use for status for added status
 	 *  @return string       	 			Libelle du statut
 	 */
-	function LibProspCommStatut($statut, $mode=0, $label='')
+	function LibProspCommStatut($statut, $mode = 0, $label = '')
 	{
 		global $langs;
 		$langs->load('customers');
 
 		if ($mode == 2)
 		{
-			if ($statut == '-1' || $statut == 'ST_NO')         return img_action($langs->trans("StatusProspect-1"),-1).' '.$langs->trans("StatusProspect-1");
-			elseif ($statut ==  '0' || $statut == 'ST_NEVER') return img_action($langs->trans("StatusProspect0"), 0).' '.$langs->trans("StatusProspect0");
-			elseif ($statut ==  '1' || $statut == 'ST_TODO')  return img_action($langs->trans("StatusProspect1"), 1).' '.$langs->trans("StatusProspect1");
-			elseif ($statut ==  '2' || $statut == 'ST_PEND')  return img_action($langs->trans("StatusProspect2"), 2).' '.$langs->trans("StatusProspect2");
-			elseif ($statut ==  '3' || $statut == 'ST_DONE')  return img_action($langs->trans("StatusProspect3"), 3).' '.$langs->trans("StatusProspect3");
+			if ($statut == '-1' || $statut == 'ST_NO')         return img_action($langs->trans("StatusProspect-1"), -1).' '.$langs->trans("StatusProspect-1");
+			elseif ($statut == '0' || $statut == 'ST_NEVER') return img_action($langs->trans("StatusProspect0"), 0).' '.$langs->trans("StatusProspect0");
+			elseif ($statut == '1' || $statut == 'ST_TODO')  return img_action($langs->trans("StatusProspect1"), 1).' '.$langs->trans("StatusProspect1");
+			elseif ($statut == '2' || $statut == 'ST_PEND')  return img_action($langs->trans("StatusProspect2"), 2).' '.$langs->trans("StatusProspect2");
+			elseif ($statut == '3' || $statut == 'ST_DONE')  return img_action($langs->trans("StatusProspect3"), 3).' '.$langs->trans("StatusProspect3");
 			else
 			{
 				return img_action(($langs->trans("StatusProspect".$statut) != "StatusProspect".$statut) ? $langs->trans("StatusProspect".$statut) : $label, 0).' '.(($langs->trans("StatusProspect".$statut) != "StatusProspect".$statut) ? $langs->trans("StatusProspect".$statut) : $label);
@@ -3327,11 +3327,11 @@ 
 		}
 		if ($mode == 3)
 		{
-			if ($statut == '-1' || $statut == 'ST_NO')         return img_action($langs->trans("StatusProspect-1"),-1);
-			elseif ($statut ==  '0' || $statut == 'ST_NEVER') return img_action($langs->trans("StatusProspect0"), 0);
-			elseif ($statut ==  '1' || $statut == 'ST_TODO')  return img_action($langs->trans("StatusProspect1"), 1);
-			elseif ($statut ==  '2' || $statut == 'ST_PEND')  return img_action($langs->trans("StatusProspect2"), 2);
-			elseif ($statut ==  '3' || $statut == 'ST_DONE')  return img_action($langs->trans("StatusProspect3"), 3);
+			if ($statut == '-1' || $statut == 'ST_NO')         return img_action($langs->trans("StatusProspect-1"), -1);
+			elseif ($statut == '0' || $statut == 'ST_NEVER') return img_action($langs->trans("StatusProspect0"), 0);
+			elseif ($statut == '1' || $statut == 'ST_TODO')  return img_action($langs->trans("StatusProspect1"), 1);
+			elseif ($statut == '2' || $statut == 'ST_PEND')  return img_action($langs->trans("StatusProspect2"), 2);
+			elseif ($statut == '3' || $statut == 'ST_DONE')  return img_action($langs->trans("StatusProspect3"), 3);
 			else
 			{
 				return img_action(($langs->trans("StatusProspect".$statut) != "StatusProspect".$statut) ? $langs->trans("StatusProspect".$statut) : $label, 0);
@@ -3339,11 +3339,11 @@ 
 		}
 		if ($mode == 4)
 		{
-			if ($statut == '-1' || $statut == 'ST_NO')         return img_action($langs->trans("StatusProspect-1"),-1).' '.$langs->trans("StatusProspect-1");
-			elseif ($statut ==  '0' || $statut == 'ST_NEVER') return img_action($langs->trans("StatusProspect0"), 0).' '.$langs->trans("StatusProspect0");
-			elseif ($statut ==  '1' || $statut == 'ST_TODO')  return img_action($langs->trans("StatusProspect1"), 1).' '.$langs->trans("StatusProspect1");
-			elseif ($statut ==  '2' || $statut == 'ST_PEND')  return img_action($langs->trans("StatusProspect2"), 2).' '.$langs->trans("StatusProspect2");
-			elseif ($statut ==  '3' || $statut == 'ST_DONE')  return img_action($langs->trans("StatusProspect3"), 3).' '.$langs->trans("StatusProspect3");
+			if ($statut == '-1' || $statut == 'ST_NO')         return img_action($langs->trans("StatusProspect-1"), -1).' '.$langs->trans("StatusProspect-1");
+			elseif ($statut == '0' || $statut == 'ST_NEVER') return img_action($langs->trans("StatusProspect0"), 0).' '.$langs->trans("StatusProspect0");
+			elseif ($statut == '1' || $statut == 'ST_TODO')  return img_action($langs->trans("StatusProspect1"), 1).' '.$langs->trans("StatusProspect1");
+			elseif ($statut == '2' || $statut == 'ST_PEND')  return img_action($langs->trans("StatusProspect2"), 2).' '.$langs->trans("StatusProspect2");
+			elseif ($statut == '3' || $statut == 'ST_DONE')  return img_action($langs->trans("StatusProspect3"), 3).' '.$langs->trans("StatusProspect3");
 			else
 			{
 				return img_action(($langs->trans("StatusProspect".$statut) != "StatusProspect".$statut) ? $langs->trans("StatusProspect".$statut) : $label, 0).' '.(($langs->trans("StatusProspect".$statut) != "StatusProspect".$statut) ? $langs->trans("StatusProspect".$statut) : $label);
@@ -3371,13 +3371,13 @@ 
 	 *  @param     string      $mode    'customer' or 'supplier'
 	 *  @return    array				array('opened'=>Amount, 'total'=>Total amount)
 	 */
-	function getOutstandingProposals($mode='customer')
+	function getOutstandingProposals($mode = 'customer')
 	{
-		$table='propal';
+		$table = 'propal';
 		if ($mode == 'supplier') $table = 'supplier_proposal';
 
 		$sql  = "SELECT rowid, total_ht, total as total_ttc, fk_statut FROM ".MAIN_DB_PREFIX.$table." as f";
-		$sql .= " WHERE fk_soc = ". $this->id;
+		$sql .= " WHERE fk_soc = ".$this->id;
 		if ($mode == 'supplier') {
 			$sql .= " AND entity IN (".getEntity('supplier_proposal').")";
 		} else {
@@ -3385,18 +3385,18 @@ 
 		}
 
 		dol_syslog("getOutstandingProposals", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$outstandingOpened = 0;
 			$outstandingTotal = 0;
 			$outstandingTotalIncTax = 0;
-			while($obj=$this->db->fetch_object($resql)) {
-				$outstandingTotal+= $obj->total_ht;
-				$outstandingTotalIncTax+= $obj->total_ttc;
+			while ($obj = $this->db->fetch_object($resql)) {
+				$outstandingTotal += $obj->total_ht;
+				$outstandingTotalIncTax += $obj->total_ttc;
 				if ($obj->fk_statut != 0)    // Not a draft
 				{
-					$outstandingOpened+=$obj->total_ttc;
+					$outstandingOpened += $obj->total_ttc;
 				}
 			}
 			return array('opened'=>$outstandingOpened, 'total_ht'=>$outstandingTotal, 'total_ttc'=>$outstandingTotalIncTax);
@@ -3411,13 +3411,13 @@ 
 	 *  @param     string      $mode    'customer' or 'supplier'
 	 *  @return		array				array('opened'=>Amount, 'total'=>Total amount)
 	 */
-	function getOutstandingOrders($mode='customer')
+	function getOutstandingOrders($mode = 'customer')
 	{
-		$table='commande';
+		$table = 'commande';
 		if ($mode == 'supplier') $table = 'commande_fournisseur';
 
 		$sql  = "SELECT rowid, total_ht, total_ttc, fk_statut FROM ".MAIN_DB_PREFIX.$table." as f";
-		$sql .= " WHERE fk_soc = ". $this->id;
+		$sql .= " WHERE fk_soc = ".$this->id;
 		if ($mode == 'supplier') {
 			$sql .= " AND entity IN (".getEntity('supplier_order').")";
 		} else {
@@ -3425,18 +3425,18 @@ 
 		}
 
 		dol_syslog("getOutstandingOrders", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$outstandingOpened = 0;
 			$outstandingTotal = 0;
 			$outstandingTotalIncTax = 0;
-			while($obj=$this->db->fetch_object($resql)) {
-				$outstandingTotal+= $obj->total_ht;
-				$outstandingTotalIncTax+= $obj->total_ttc;
+			while ($obj = $this->db->fetch_object($resql)) {
+				$outstandingTotal += $obj->total_ht;
+				$outstandingTotalIncTax += $obj->total_ttc;
 				if ($obj->fk_statut != 0)    // Not a draft
 				{
-					$outstandingOpened+=$obj->total_ttc;
+					$outstandingOpened += $obj->total_ttc;
 				}
 			}
 			return array('opened'=>$outstandingOpened, 'total_ht'=>$outstandingTotal, 'total_ttc'=>$outstandingTotalIncTax);
@@ -3451,9 +3451,9 @@ 
 	 *  @param     string      $mode    'customer' or 'supplier'
 	 *  @return		array				array('opened'=>Amount, 'total'=>Total amount)
 	 */
-	function getOutstandingBills($mode='customer')
+	function getOutstandingBills($mode = 'customer')
 	{
-		$table='facture';
+		$table = 'facture';
 		if ($mode == 'supplier') $table = 'facture_fourn';
 
 		/* Accurate value of remain to pay is to sum remaintopay for each invoice
@@ -3463,9 +3463,9 @@ 
 		 $alreadypayed=price2num($paiement + $creditnotes + $deposits,'MT');
 		 $remaintopay=price2num($invoice->total_ttc - $paiement - $creditnotes - $deposits,'MT');
 		 */
-		if ($mode == 'supplier') $sql  = "SELECT rowid, total_ht as total_ht, total_ttc, paye, fk_statut, close_code FROM ".MAIN_DB_PREFIX.$table." as f";
-		else $sql  = "SELECT rowid, total as total_ht, total_ttc, paye, fk_statut, close_code FROM ".MAIN_DB_PREFIX.$table." as f";
-		$sql .= " WHERE fk_soc = ". $this->id;
+		if ($mode == 'supplier') $sql = "SELECT rowid, total_ht as total_ht, total_ttc, paye, fk_statut, close_code FROM ".MAIN_DB_PREFIX.$table." as f";
+		else $sql = "SELECT rowid, total as total_ht, total_ttc, paye, fk_statut, close_code FROM ".MAIN_DB_PREFIX.$table." as f";
+		$sql .= " WHERE fk_soc = ".$this->id;
 		if ($mode == 'supplier') {
 			$sql .= " AND entity IN (".getEntity('facture_fourn').")";
 		} else {
@@ -3473,7 +3473,7 @@ 
 		}
 
 		dol_syslog("getOutstandingBills", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$outstandingOpened = 0;
@@ -3482,21 +3482,21 @@ 
 			if ($mode == 'supplier')
 			{
 				require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
-				$tmpobject=new FactureFournisseur($this->db);
+				$tmpobject = new FactureFournisseur($this->db);
 			}
 			else
 			{
 				require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-				$tmpobject=new Facture($this->db);
+				$tmpobject = new Facture($this->db);
 			}
-			while($obj=$this->db->fetch_object($resql)) {
-				$tmpobject->id=$obj->rowid;
+			while ($obj = $this->db->fetch_object($resql)) {
+				$tmpobject->id = $obj->rowid;
 				if ($obj->fk_statut != 0                                           // Not a draft
-					&& ! ($obj->fk_statut == 3 && $obj->close_code == 'replaced')  // Not a replaced invoice
+					&& !($obj->fk_statut == 3 && $obj->close_code == 'replaced')  // Not a replaced invoice
 					)
 				{
-					$outstandingTotal+= $obj->total_ht;
-					$outstandingTotalIncTax+= $obj->total_ttc;
+					$outstandingTotal += $obj->total_ht;
+					$outstandingTotalIncTax += $obj->total_ttc;
 				}
 				if ($obj->paye == 0
 					&& $obj->fk_statut != 0    // Not a draft
@@ -3507,7 +3507,7 @@ 
 					$paiement = $tmpobject->getSommePaiement();
 					$creditnotes = $tmpobject->getSumCreditNotesUsed();
 					$deposits = $tmpobject->getSumDepositsUsed();
-					$outstandingOpened+=$obj->total_ttc - $paiement - $creditnotes - $deposits;
+					$outstandingOpened += $obj->total_ttc - $paiement - $creditnotes - $deposits;
 				}
 			}
 			return array('opened'=>$outstandingOpened, 'total_ht'=>$outstandingTotal, 'total_ttc'=>$outstandingTotalIncTax);
@@ -3534,26 +3534,26 @@ 
 	     $remaintopay=price2num($invoice->total_ttc - $paiement - $creditnotes - $deposits,'MT');
 	     */
 	    $sql  = "SELECT rowid, total_ttc FROM ".MAIN_DB_PREFIX."facture as f";
-	    $sql .= " WHERE fk_soc = ". $this->id;
+	    $sql .= " WHERE fk_soc = ".$this->id;
 	    $sql .= " AND paye = 0";
-	    $sql .= " AND fk_statut <> 0";	// Not a draft
+	    $sql .= " AND fk_statut <> 0"; // Not a draft
 	    //$sql .= " AND (fk_statut <> 3 OR close_code <> 'abandon')";		// Not abandonned for undefined reason
-	    $sql .= " AND fk_statut <> 3";		// Not abandonned
-	    $sql .= " AND fk_statut <> 2";		// Not clasified as paid
+	    $sql .= " AND fk_statut <> 3"; // Not abandonned
+	    $sql .= " AND fk_statut <> 2"; // Not clasified as paid
 
 	    dol_syslog("get_OutstandingBill", LOG_DEBUG);
-	    $resql=$this->db->query($sql);
+	    $resql = $this->db->query($sql);
 	    if ($resql)
 	    {
 	        $outstandingAmount = 0;
 	        require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-	        $tmpobject=new Facture($this->db);
-	        while($obj=$this->db->fetch_object($resql)) {
-	            $tmpobject->id=$obj->rowid;
+	        $tmpobject = new Facture($this->db);
+	        while ($obj = $this->db->fetch_object($resql)) {
+	            $tmpobject->id = $obj->rowid;
 	            $paiement = $tmpobject->getSommePaiement();
 	            $creditnotes = $tmpobject->getSumCreditNotesUsed();
 	            $deposits = $tmpobject->getSumDepositsUsed();
-	            $outstandingAmount+= $obj->total_ttc - $paiement - $creditnotes - $deposits;
+	            $outstandingAmount += $obj->total_ttc - $paiement - $creditnotes - $deposits;
 	        }
 	        return $outstandingAmount;
 	    }
@@ -3582,10 +3582,10 @@ 
 		global $langs;
 		$langs->load('companies');
 
-		if ($statut==0) return $langs->trans("NorProspectNorCustomer");
-		if ($statut==1) return $langs->trans("Customer");
-		if ($statut==2) return $langs->trans("Prospect");
-		if ($statut==3) return $langs->trans("ProspectCustomer");
+		if ($statut == 0) return $langs->trans("NorProspectNorCustomer");
+		if ($statut == 1) return $langs->trans("Customer");
+		if ($statut == 2) return $langs->trans("Prospect");
+		if ($statut == 3) return $langs->trans("ProspectCustomer");
 
 	}
 
@@ -3601,26 +3601,26 @@ 
 	 *  @param  null|array  $moreparams     Array to provide more information
 	 *	@return int        					<0 if KO, >0 if OK
 	 */
-	public function generateDocument($modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0, $moreparams=null)
+	public function generateDocument($modele, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0, $moreparams = null)
 	{
-		global $conf,$user,$langs;
+		global $conf, $user, $langs;
 
-		if (! empty($moreparams) && ! empty($moreparams['use_companybankid']))
+		if (!empty($moreparams) && !empty($moreparams['use_companybankid']))
 		{
 		    $modelpath = "core/modules/bank/doc/";
 
 		    include_once DOL_DOCUMENT_ROOT.'/societe/class/companybankaccount.class.php';
 		    $companybankaccount = new CompanyBankAccount($this->db);
 		    $result = $companybankaccount->fetch($moreparams['use_companybankid']);
-		    if (! $result) dol_print_error($this->db, $companybankaccount->error, $companybankaccount->errors);
-		    $result=$companybankaccount->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
+		    if (!$result) dol_print_error($this->db, $companybankaccount->error, $companybankaccount->errors);
+		    $result = $companybankaccount->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
 		}
 		else
 		{
     		// Positionne le modele sur le nom du modele a utiliser
-    		if (! dol_strlen($modele))
+    		if (!dol_strlen($modele))
     		{
-    			if (! empty($conf->global->COMPANY_ADDON_PDF))
+    			if (!empty($conf->global->COMPANY_ADDON_PDF))
     			{
     				$modele = $conf->global->COMPANY_ADDON_PDF;
     			}
@@ -3633,7 +3633,7 @@ 
 
     		$modelpath = "core/modules/societe/doc/";
 
-    		$result=$this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
+    		$result = $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
 		}
 
 		return $result;
@@ -3652,7 +3652,7 @@ 
 	 */
 	public function setCategories($categories, $type)
 	{
-		require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 
 	    // Decode type
 		if ($type == 'customer') {
@@ -3662,7 +3662,7 @@ 
 			$type_id = Categorie::TYPE_SUPPLIER;
 			$type_text = 'supplier';
 		} else {
-			dol_syslog(__METHOD__ . ': Type ' . $type .  'is an unknown company category type. Done nothing.', LOG_ERR);
+			dol_syslog(__METHOD__.': Type '.$type.'is an unknown company category type. Done nothing.', LOG_ERR);
 			return;
 		}
 

Braces +558 added lines, -328 removed lines

@@ -408,15 +408,25 @@ 
 		$error=0;
 
         // Clean parameters
-        if (empty($this->status)) $this->status=0;
+        if (empty($this->status)) {
+        	$this->status=0;
+        }
         $this->name=$this->name?trim($this->name):trim($this->nom);
-        if (! empty($conf->global->MAIN_FIRST_TO_UPPER)) $this->name=ucwords($this->name);
+        if (! empty($conf->global->MAIN_FIRST_TO_UPPER)) {
+        	$this->name=ucwords($this->name);
+        }
         $this->nom=$this->name; // For backward compatibility
-        if (empty($this->client))      $this->client=0;
-        if (empty($this->fournisseur)) $this->fournisseur=0;
+        if (empty($this->client)) {
+        	$this->client=0;
+        }
+        if (empty($this->fournisseur)) {
+        	$this->fournisseur=0;
+        }
         $this->import_key = trim($this->import_key);
 
-		if (!empty($this->multicurrency_code)) $this->fk_multicurrency = MultiCurrency::getIdFromCode($this->db, $this->multicurrency_code);
+		if (!empty($this->multicurrency_code)) {
+			$this->fk_multicurrency = MultiCurrency::getIdFromCode($this->db, $this->multicurrency_code);
+		}
 		if (empty($this->fk_multicurrency))
 		{
 			$this->multicurrency_code = '';
@@ -430,8 +440,12 @@ 
         $this->db->begin();
 
         // For automatic creation during create action (not used by Dolibarr GUI, can be used by scripts)
-        if ($this->code_client == -1)      $this->get_codeclient($this,0);
-        if ($this->code_fournisseur == -1) $this->get_codefournisseur($this,1);
+        if ($this->code_client == -1) {
+        	$this->get_codeclient($this,0);
+        }
+        if ($this->code_fournisseur == -1) {
+        	$this->get_codefournisseur($this,1);
+        }
 
         // Check more parameters (including mandatory setup
         // If error, this->errors[] is filled
@@ -476,32 +490,32 @@ 
                 {
                     // Call trigger
                     $result=$this->call_trigger('COMPANY_CREATE',$user);
-                    if ($result < 0) $error++;
+                    if ($result < 0) {
+                    	$error++;
+                    }
                     // End call triggers
+                } else {
+                	$error++;
                 }
-                else $error++;
 
                 if (! $error)
                 {
                     dol_syslog(get_class($this)."::Create success id=".$this->id);
                     $this->db->commit();
                     return $this->id;
-                }
-                else
+                } else
                 {
                     dol_syslog(get_class($this)."::Create echec update ".$this->error." ".join(',',$this->errors), LOG_ERR);
                     $this->db->rollback();
                     return -4;
                 }
-            }
-            else
+            } else
             {
                 if ($this->db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
                 {
                     $this->error=$langs->trans("ErrorCompanyNameAlreadyExists",$this->name);    // duplicate on a field (code or profid or ...)
                     $result=-1;
-                }
-                else
+                } else
                 {
                     $this->error=$this->db->lasterror();
                     $result=-2;
@@ -510,8 +524,7 @@ 
                 return $result;
             }
 
-        }
-        else
+        } else
         {
             $this->db->rollback();
             dol_syslog(get_class($this)."::Create fails verify ".join(',',$this->errors), LOG_WARNING);
@@ -663,8 +676,7 @@ 
         				}
         			}
         		}
-        	}
-        	else
+        	} else
         	{
         		//var_dump($conf->global->SOCIETE_EMAIL_MANDATORY);
         		if ($key == 'EMAIL')
@@ -690,7 +702,9 @@ 
         	}
         }
 
-        if ($error) $result = -4;
+        if ($error) {
+        	$result = -4;
+        }
 
         return $result;
     }
@@ -749,9 +763,13 @@ 
 
         $this->tva_assuj	= trim($this->tva_assuj);
         $this->tva_intra	= dol_sanitizeFileName($this->tva_intra,'');
-        if (empty($this->status)) $this->status = 0;
+        if (empty($this->status)) {
+        	$this->status = 0;
+        }
 
-		if (!empty($this->multicurrency_code)) $this->fk_multicurrency = MultiCurrency::getIdFromCode($this->db, $this->multicurrency_code);
+		if (!empty($this->multicurrency_code)) {
+			$this->fk_multicurrency = MultiCurrency::getIdFromCode($this->db, $this->multicurrency_code);
+		}
 		if (empty($this->fk_multicurrency))
 		{
 			$this->multicurrency_code = '';
@@ -765,8 +783,13 @@ 
         $this->localtax1_value=trim($this->localtax1_value);
         $this->localtax2_value=trim($this->localtax2_value);
 
-        if ($this->capital != '') $this->capital=price2num(trim($this->capital));
-        if (! is_numeric($this->capital)) $this->capital = '';     // '' = undef
+        if ($this->capital != '') {
+        	$this->capital=price2num(trim($this->capital));
+        }
+        if (! is_numeric($this->capital)) {
+        	$this->capital = '';
+        }
+        // '' = undef
 
         $this->effectif_id=trim($this->effectif_id);
         $this->forme_juridique_code=trim($this->forme_juridique_code);
@@ -775,8 +798,12 @@ 
         $this->barcode=trim($this->barcode);
 
         // For automatic creation
-        if ($this->code_client == -1) $this->get_codeclient($this,0);
-        if ($this->code_fournisseur == -1) $this->get_codefournisseur($this,1);
+        if ($this->code_client == -1) {
+        	$this->get_codeclient($this,0);
+        }
+        if ($this->code_fournisseur == -1) {
+        	$this->get_codefournisseur($this,1);
+        }
 
         $this->code_compta=trim($this->code_compta);
         $this->code_compta_fournisseur=trim($this->code_compta_fournisseur);
@@ -796,7 +823,9 @@ 
         	if (empty($this->code_compta))
         	{
         		$ret=$this->get_codecompta('customer');
-        		if ($ret < 0) return -1;
+        		if ($ret < 0) {
+        			return -1;
+        		}
         	}
 
         	$customer=true;
@@ -809,7 +838,9 @@ 
         	if (empty($this->code_compta_fournisseur))
         	{
         		$ret=$this->get_codecompta('supplier');
-        		if ($ret < 0) return -1;
+        		if ($ret < 0) {
+        			return -1;
+        		}
         	}
 
         	$supplier=true;
@@ -828,7 +859,10 @@ 
         // Check name is required and codes are ok or unique.
         // If error, this->errors[] is filled
         $result = 0;
-        if ($action != 'add') $result = $this->verify();	// We don't check when update called during a create because verify was already done
+        if ($action != 'add') {
+        	$result = $this->verify();
+        }
+        // We don't check when update called during a create because verify was already done
 
         if ($result >= 0)
         {
@@ -871,22 +905,26 @@ 
             	if($this->localtax1_value!='')
             	{
             		$sql .=",localtax1_value =".$this->localtax1_value;
+            	} else {
+            		$sql .=",localtax1_value =0.000";
             	}
-            	else $sql .=",localtax1_value =0.000";
 
+            } else {
+            	$sql .=",localtax1_value =0.000";
             }
-            else $sql .=",localtax1_value =0.000";
 
             if($this->localtax2_assuj==1)
             {
             	if($this->localtax2_value!='')
             	{
             		$sql .=",localtax2_value =".$this->localtax2_value;
+            	} else {
+            		$sql .=",localtax2_value =0.000";
             	}
-            	else $sql .=",localtax2_value =0.000";
 
+            } else {
+            	$sql .=",localtax2_value =0.000";
             }
-            else $sql .=",localtax2_value =0.000";
 
             $sql .= ",capital = ".($this->capital == '' ? "null" : $this->capital);
 
@@ -977,8 +1015,7 @@ 
 		            			dol_syslog(get_class($this)."::update ".$this->error,LOG_ERR);
 		            			$error++;
 		            		}
-		            	}
-		            	else if ($result < 0)
+		            	} else if ($result < 0)
 		            	{
 		            		$this->error=$lmember->error;
 		            		$error++;
@@ -995,22 +1032,27 @@ 
                 $reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
                 if (empty($reshook))
                 {
-                	if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
+                	if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) {
+                		// For avoid conflicts if trigger used
                 	{
                 		$result=$this->insertExtraFields();
+                	}
                 		if ($result < 0)
                 		{
                 			$error++;
                 		}
                 	}
+                } else if ($reshook < 0) {
+                	$error++;
                 }
-                else if ($reshook < 0) $error++;
 
                 if (! $error && $call_trigger)
                 {
                     // Call trigger
                     $result=$this->call_trigger('COMPANY_MODIFY',$user);
-                    if ($result < 0) $error++;
+                    if ($result < 0) {
+                    	$error++;
+                    }
                     // End call triggers
                 }
 
@@ -1019,22 +1061,19 @@ 
                     dol_syslog(get_class($this)."::Update success");
                     $this->db->commit();
                     return 1;
-                }
-                else
+                } else
 				{
                     $this->db->rollback();
                     return -1;
                 }
-            }
-            else
+            } else
 			{
                 if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
                 {
                     // Doublon
                     $this->error = $langs->trans("ErrorDuplicateField");
                     $result = -1;
-                }
-                else
+                } else
                 {
                     $this->error = $this->db->lasterror();
                     $result = -2;
@@ -1042,8 +1081,7 @@ 
                 $this->db->rollback();
                 return $result;
             }
-        }
-        else
+        } else
        {
             $this->db->rollback();
             dol_syslog(get_class($this)."::Update fails verify ".join(',',$this->errors), LOG_WARNING);
@@ -1072,7 +1110,9 @@ 
         global $langs;
         global $conf;
 
-        if (empty($rowid) && empty($ref) && empty($ref_ext) && empty($ref_int) && empty($idprof1) && empty($idprof2) && empty($idprof3) && empty($idprof4) && empty($idprof5) && empty($idprof6) && empty($email)) return -1;
+        if (empty($rowid) && empty($ref) && empty($ref_ext) && empty($ref_int) && empty($idprof1) && empty($idprof2) && empty($idprof3) && empty($idprof4) && empty($idprof5) && empty($idprof6) && empty($email)) {
+        	return -1;
+        }
 
         $sql = 'SELECT s.rowid, s.nom as name, s.name_alias, s.entity, s.ref_ext, s.ref_int, s.address, s.datec as date_creation, s.prefix_comm';
         $sql .= ', s.status';
@@ -1107,17 +1147,39 @@ 
         $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_typent as te ON s.fk_typent = te.id';
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON s.fk_incoterms = i.rowid';
 		$sql .= ' WHERE s.entity IN ('.getEntity($this->element, 1).')';
-        if ($rowid)   $sql .= ' AND s.rowid = '.$rowid;
-        if ($ref)     $sql .= " AND s.nom = '".$this->db->escape($ref)."'";
-        if ($ref_ext) $sql .= " AND s.ref_ext = '".$this->db->escape($ref_ext)."'";
-        if ($ref_int) $sql .= " AND s.ref_int = '".$this->db->escape($ref_int)."'";
-        if ($idprof1) $sql .= " AND s.siren = '".$this->db->escape($idprof1)."'";
-        if ($idprof2) $sql .= " AND s.siret = '".$this->db->escape($idprof2)."'";
-        if ($idprof3) $sql .= " AND s.ape = '".$this->db->escape($idprof3)."'";
-        if ($idprof4) $sql .= " AND s.idprof4 = '".$this->db->escape($idprof4)."'";
-        if ($idprof5) $sql .= " AND s.idprof5 = '".$this->db->escape($idprof5)."'";
-        if ($idprof6) $sql .= " AND s.idprof6 = '".$this->db->escape($idprof6)."'";
-        if ($email)   $sql .= " AND email = '".$this->db->escape($email)."'";
+        if ($rowid) {
+        	$sql .= ' AND s.rowid = '.$rowid;
+        }
+        if ($ref) {
+        	$sql .= " AND s.nom = '".$this->db->escape($ref)."'";
+        }
+        if ($ref_ext) {
+        	$sql .= " AND s.ref_ext = '".$this->db->escape($ref_ext)."'";
+        }
+        if ($ref_int) {
+        	$sql .= " AND s.ref_int = '".$this->db->escape($ref_int)."'";
+        }
+        if ($idprof1) {
+        	$sql .= " AND s.siren = '".$this->db->escape($idprof1)."'";
+        }
+        if ($idprof2) {
+        	$sql .= " AND s.siret = '".$this->db->escape($idprof2)."'";
+        }
+        if ($idprof3) {
+        	$sql .= " AND s.ape = '".$this->db->escape($idprof3)."'";
+        }
+        if ($idprof4) {
+        	$sql .= " AND s.idprof4 = '".$this->db->escape($idprof4)."'";
+        }
+        if ($idprof5) {
+        	$sql .= " AND s.idprof5 = '".$this->db->escape($idprof5)."'";
+        }
+        if ($idprof6) {
+        	$sql .= " AND s.idprof6 = '".$this->db->escape($idprof6)."'";
+        }
+        if ($email) {
+        	$sql .= " AND email = '".$this->db->escape($email)."'";
+        }
 
         $resql=$this->db->query($sql);
         if ($resql)
@@ -1128,10 +1190,11 @@ 
                 $this->error='Fetch found several records. Rename one of tirdparties to avoid duplicate.';
                 dol_syslog($this->error, LOG_ERR);
                 $result = -2;
-            }
-            elseif ($num)   // $num = 1
+            } elseif ($num) {
+            	// $num = 1
             {
                 $obj = $this->db->fetch_object($resql);
+            }
 
                 $this->id           = $obj->rowid;
                 $this->entity       = $obj->entity;
@@ -1256,22 +1319,22 @@ 
 
                 // Retreive all extrafield for thirdparty
                	$this->fetch_optionals();
-            }
-            else
+            } else
 			{
                 $result = 0;
             }
 
             $this->db->free($resql);
-        }
-        else
+        } else
 		{
             $this->error=$this->db->lasterror();
             $result = -3;
         }
 
         // Use first price level if level not defined for third party
-        if (! empty($conf->global->PRODUIT_MULTIPRICES) && empty($this->price_level)) $this->price_level=1;
+        if (! empty($conf->global->PRODUIT_MULTIPRICES) && empty($this->price_level)) {
+        	$this->price_level=1;
+        }
 
         return $result;
     }
@@ -1306,10 +1369,11 @@ 
     	$sql.= " WHERE entity IN (".getEntity('category').")";
     	if (! empty($type))
     	{
-    		if ($type == 1 || $type == 2)
-    			$sql.= " AND client = ".$type;
-    		elseif ($type == 3)
-    			$sql.= " AND fournisseur = 1";
+    		if ($type == 1 || $type == 2) {
+    		    			$sql.= " AND client = ".$type;
+    		} elseif ($type == 3) {
+    		    			$sql.= " AND fournisseur = 1";
+    		}
     	}
     	if (! empty($name))
     	{
@@ -1318,27 +1382,27 @@ 
     			if (preg_match('/^([\*])?[^*]+([\*])?$/', $name, $regs) && count($regs) > 1)
     			{
     				$name = str_replace('*', '%', $name);
-    			}
-    			else
+    			} else
     			{
     				$name = '%'.$name.'%';
     			}
     		}
     		$sql.= " AND ";
-    		if (is_array($filters) && ! empty($filters))
-    			$sql.= "(";
+    		if (is_array($filters) && ! empty($filters)) {
+    		    			$sql.= "(";
+    		}
     		if ($similar)
     		{
     			// For test similitude (string inside name into database, or name into database inside string)
     			// Do not use this. Not compatible with other database.
     			$sql.= "(LOCATE('".$this->db->escape($name)."', nom) > 0 OR LOCATE(nom, '".$this->db->escape($name)."') > 0)";
-    		}
-    		else
+    		} else
     		{
-    			if (! $case)
-    				$sql.= "nom LIKE '".$this->db->escape($name)."'";
-    			else
-    				$sql.= "nom LIKE BINARY '".$this->db->escape($name)."'";
+    			if (! $case) {
+    			    				$sql.= "nom LIKE '".$this->db->escape($name)."'";
+    			} else {
+    			    				$sql.= "nom LIKE BINARY '".$this->db->escape($name)."'";
+    			}
     		}
     	}
     	if (is_array($filters) && ! empty($filters))
@@ -1350,19 +1414,20 @@ 
     				if (preg_match('/^([\*])?[^*]+([\*])?$/', $value, $regs) && count($regs) > 1)
     				{
     					$value = str_replace('*', '%', $value);
-    				}
-    				else
+    				} else
     				{
     					$value = '%'.$value.'%';
     				}
     			}
-    			if (! $case)
-    				$sql.= " ".$clause." ".$field." LIKE '".$this->db->escape($value)."'";
-    			else
-    				$sql.= " ".$clause." ".$field." LIKE BINARY '".$this->db->escape($value)."'";
+    			if (! $case) {
+    			    				$sql.= " ".$clause." ".$field." LIKE '".$this->db->escape($value)."'";
+    			} else {
+    			    				$sql.= " ".$clause." ".$field." LIKE BINARY '".$this->db->escape($value)."'";
+    			}
+    		}
+    		if (! empty($name)) {
+    		    			$sql.= ")";
     		}
-    		if (! empty($name))
-    			$sql.= ")";
     	}
 
     	$res  = $this->db->query($sql);
@@ -1376,8 +1441,7 @@ 
     		}
 
     		return $thirdparties;
-    	}
-    	else
+    	} else
     	{
     		$this->error=$this->db->lasterror();
     		return -1;
@@ -1396,7 +1460,9 @@ 
     {
         global $langs, $conf, $user;
 
-        if (empty($fuser)) $fuser=$user;
+        if (empty($fuser)) {
+        	$fuser=$user;
+        }
 
         require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
@@ -1416,7 +1482,9 @@ 
             {
                 // Call trigger
                 $result=$this->call_trigger('COMPANY_DELETE',$fuser);
-                if ($result < 0) $error++;
+                if ($result < 0) {
+                	$error++;
+                }
                 // End call triggers
             }
 
@@ -1461,9 +1529,11 @@ 
 			}
 
             // Removed extrafields
-            if ((! $error) && (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))) // For avoid conflicts if trigger used
+            if ((! $error) && (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))) {
+            	// For avoid conflicts if trigger used
             {
             	$result=$this->deleteExtraFields();
+            }
             	if ($result < 0)
             	{
             		$error++;
@@ -1498,15 +1568,15 @@ 
                 }
 
                 return 1;
-            }
-            else
+            } else
 			{
 				dol_syslog($this->error, LOG_ERR);
                 $this->db->rollback();
                 return -1;
             }
-        }
-		else dol_syslog("Can't remove thirdparty with id ".$id.". There is ".$objectisused." childs", LOG_WARNING);
+        } else {
+			dol_syslog("Can't remove thirdparty with id ".$id.". There is ".$objectisused." childs", LOG_WARNING);
+		}
         return 0;
     }
 
@@ -1520,7 +1590,10 @@ 
         if ($this->id)
         {
             $newclient=1;
-            if ($this->client == 2 || $this->client == 3) $newclient=3;	//If prospect, we keep prospect tag
+            if ($this->client == 2 || $this->client == 3) {
+            	$newclient=3;
+            }
+            //If prospect, we keep prospect tag
             $sql = "UPDATE ".MAIN_DB_PREFIX."societe";
             $sql.= " SET client = ".$newclient;
             $sql.= " WHERE rowid = " . $this->id;
@@ -1530,8 +1603,9 @@ 
             {
                 $this->client = $newclient;
                 return 1;
+            } else {
+            	return -1;
             }
-            else return -1;
         }
         return 0;
     }
@@ -1641,14 +1715,14 @@ 
             if ($result > 0)
             {
                 return $result;
-            }
-            else
+            } else
             {
                 $this->error=$discount->error;
                 return -3;
             }
+        } else {
+        	return 0;
         }
-        else return 0;
     }
 
     /**
@@ -1668,8 +1742,7 @@ 
         if ($result >= 0)
         {
             return $result;
-        }
-        else
+        } else
         {
             $this->error=$discountstatic->error;
             return -1;
@@ -1696,9 +1769,9 @@ 
         	$sql.= " WHERE ((ug.fk_user = sc.fk_user";
         	$sql.= " AND ug.entity = ".$conf->entity.")";
         	$sql.= " OR u.admin = 1)";
+        } else {
+                	$sql.= " WHERE entity in (0, ".$conf->entity.")";
         }
-        else
-        	$sql.= " WHERE entity in (0, ".$conf->entity.")";
 
         $sql.= " AND u.rowid = sc.fk_user AND sc.fk_soc = ".$this->id;
 
@@ -1721,8 +1794,7 @@ 
                 $i++;
             }
             return $reparray;
-        }
-        else {
+        } else {
             dol_print_error($this->db);
             return -1;
         }
@@ -1828,7 +1900,10 @@ 
     {
         global $conf, $langs, $hookmanager;
 
-        if (! empty($conf->dol_no_mouse_hover)) $notooltip=1;   // Force disable tooltips
+        if (! empty($conf->dol_no_mouse_hover)) {
+        	$notooltip=1;
+        }
+        // Force disable tooltips
 
         $name=$this->name?$this->name:$this->nom;
 
@@ -1838,23 +1913,28 @@ 
     			&& ($conf->global->SOCIETE_ADD_REF_IN_LIST == 1
     			|| $conf->global->SOCIETE_ADD_REF_IN_LIST == 2
     			)
-    		)
-    		$code = $this->code_client . ' - ';
+    		) {
+    		    		$code = $this->code_client . ' - ';
+    		}
 
     		if (($this->fournisseur) && (! empty ( $this->code_fournisseur ))
     			&& ($conf->global->SOCIETE_ADD_REF_IN_LIST == 1
     			|| $conf->global->SOCIETE_ADD_REF_IN_LIST == 3
     			)
-    		)
-    		$code .= $this->code_fournisseur . ' - ';
+    		) {
+    		    		$code .= $this->code_fournisseur . ' - ';
+    		}
 
-    		if ($conf->global->SOCIETE_ADD_REF_IN_LIST == 1)
-    			$name =$code.' '.$name;
-    		else
-    			$name =$code;
+    		if ($conf->global->SOCIETE_ADD_REF_IN_LIST == 1) {
+    		    			$name =$code.' '.$name;
+    		} else {
+    		    			$name =$code;
+    		}
     	}
 
-    	if (!empty($this->name_alias)) $name .= ' ('.$this->name_alias.')';
+    	if (!empty($this->name_alias)) {
+    		$name .= ' ('.$this->name_alias.')';
+    	}
 
         $result=''; $label='';
         $linkstart=''; $linkend='';
@@ -1872,33 +1952,27 @@ 
         {
            $label.= '<u>' . $langs->trans("ShowCustomer") . '</u>';
            $linkstart = '<a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$this->id;
-        }
-        else if ($option == 'prospect' && empty($conf->global->SOCIETE_DISABLE_PROSPECTS))
+        } else if ($option == 'prospect' && empty($conf->global->SOCIETE_DISABLE_PROSPECTS))
         {
             $label.= '<u>' . $langs->trans("ShowProspect") . '</u>';
             $linkstart = '<a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$this->id;
-        }
-        else if ($option == 'supplier')
+        } else if ($option == 'supplier')
         {
             $label.= '<u>' . $langs->trans("ShowSupplier") . '</u>';
             $linkstart = '<a href="'.DOL_URL_ROOT.'/fourn/card.php?socid='.$this->id;
-        }
-        else if ($option == 'agenda')
+        } else if ($option == 'agenda')
         {
             $label.= '<u>' . $langs->trans("ShowAgenda") . '</u>';
             $linkstart = '<a href="'.DOL_URL_ROOT.'/societe/agenda.php?socid='.$this->id;
-        }
-        else if ($option == 'project')
+        } else if ($option == 'project')
         {
             $label.= '<u>' . $langs->trans("ShowProject") . '</u>';
             $linkstart = '<a href="'.DOL_URL_ROOT.'/societe/project.php?socid='.$this->id;
-        }
-        else if ($option == 'margin')
+        } else if ($option == 'margin')
         {
             $label.= '<u>' . $langs->trans("ShowMargin") . '</u>';
             $linkstart = '<a href="'.DOL_URL_ROOT.'/margin/tabs/thirdpartyMargins.php?socid='.$this->id.'&type=1';
-        }
-        else if ($option == 'contact')
+        } else if ($option == 'contact')
         {
         	$label.= '<u>' . $langs->trans("ShowContacts") . '</u>';
         	$linkstart = '<a href="'.DOL_URL_ROOT.'/societe/contact.php?socid='.$this->id;
@@ -1914,21 +1988,29 @@ 
         if (! empty($this->name))
         {
             $label.= '<br><b>' . $langs->trans('Name') . ':</b> '. $this->name;
-            if (! empty($this->name_alias)) $label.=' ('.$this->name_alias.')';
+            if (! empty($this->name_alias)) {
+            	$label.=' ('.$this->name_alias.')';
+            }
             $label.= '<br><b>' . $langs->trans('Email') . ':</b> '. $this->email;
         }
-        if (! empty($this->country_code))
-            $label.= '<br><b>' . $langs->trans('Country') . ':</b> '. $this->country_code;
-        if (! empty($this->tva_intra))
-            $label.= '<br><b>' . $langs->trans('VATNumber') . ':</b> '. $this->tva_intra;
-            if (! empty($this->code_client) && $this->client)
-            $label.= '<br><b>' . $langs->trans('CustomerCode') . ':</b> '. $this->code_client;
-        if (! empty($this->code_fournisseur) && $this->fournisseur)
-            $label.= '<br><b>' . $langs->trans('SupplierCode') . ':</b> '. $this->code_fournisseur;
-        if (! empty($conf->accounting->enabled) && $this->client)
-            $label.= '<br><b>' . $langs->trans('CustomerAccountancyCode') . ':</b> '. $this->code_compta_client;
-        if (! empty($conf->accounting->enabled) && $this->fournisseur)
-            $label.= '<br><b>' . $langs->trans('SupplierAccountancyCode') . ':</b> '. $this->code_compta_fournisseur;
+        if (! empty($this->country_code)) {
+                    $label.= '<br><b>' . $langs->trans('Country') . ':</b> '. $this->country_code;
+        }
+        if (! empty($this->tva_intra)) {
+                    $label.= '<br><b>' . $langs->trans('VATNumber') . ':</b> '. $this->tva_intra;
+        }
+            if (! empty($this->code_client) && $this->client) {
+                        $label.= '<br><b>' . $langs->trans('CustomerCode') . ':</b> '. $this->code_client;
+            }
+        if (! empty($this->code_fournisseur) && $this->fournisseur) {
+                    $label.= '<br><b>' . $langs->trans('SupplierCode') . ':</b> '. $this->code_fournisseur;
+        }
+        if (! empty($conf->accounting->enabled) && $this->client) {
+                    $label.= '<br><b>' . $langs->trans('CustomerAccountancyCode') . ':</b> '. $this->code_compta_client;
+        }
+        if (! empty($conf->accounting->enabled) && $this->fournisseur) {
+                    $label.= '<br><b>' . $langs->trans('SupplierAccountancyCode') . ':</b> '. $this->code_compta_fournisseur;
+        }
 
         $label.= '</div>';
 
@@ -1936,8 +2018,12 @@ 
         $linkstart.=(!empty($this->canvas)?'&canvas='.$this->canvas:'');
         // Add param to save lastsearch_values or not
         $add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0);
-        if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
-        if ($add_save_lastsearch_values) $linkstart.='&save_lastsearch_values=1';
+        if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) {
+        	$add_save_lastsearch_values=1;
+        }
+        if ($add_save_lastsearch_values) {
+        	$linkstart.='&save_lastsearch_values=1';
+        }
         $linkstart.='"';
 
         $linkclose='';
@@ -1959,7 +2045,9 @@ 
     		$hookmanager->initHooks(array('societedao'));
     		$parameters=array('id'=>$this->id);
     		$reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
-    		if ($reshook > 0) $linkclose = $hookmanager->resPrint;
+    		if ($reshook > 0) {
+    			$linkclose = $hookmanager->resPrint;
+    		}
         }
         $linkstart.=$linkclose.'>';
         $linkend='</a>';
@@ -1971,9 +2059,15 @@ 
             $linkend='';
         }
 
-        if ($withpicto) $result.=($linkstart.img_object(($notooltip?'':$label), 'company', ($notooltip?'':'class="classfortooltip valigntextbottom"'), 0, 0, $notooltip?0:1).$linkend);
-        if ($withpicto && $withpicto != 2) $result.=' ';
-        if ($withpicto != 2) $result.=$linkstart.($maxlen?dol_trunc($name,$maxlen):$name).$linkend;
+        if ($withpicto) {
+        	$result.=($linkstart.img_object(($notooltip?'':$label), 'company', ($notooltip?'':'class="classfortooltip valigntextbottom"'), 0, 0, $notooltip?0:1).$linkend);
+        }
+        if ($withpicto && $withpicto != 2) {
+        	$result.=' ';
+        }
+        if ($withpicto != 2) {
+        	$result.=$linkstart.($maxlen?dol_trunc($name,$maxlen):$name).$linkend;
+        }
 
         return $result;
     }
@@ -2003,33 +2097,57 @@ 
 
         if ($mode == 0)
         {
-            if ($statut==0) return $langs->trans("ActivityCeased");
-            if ($statut==1) return $langs->trans("InActivity");
+            if ($statut==0) {
+            	return $langs->trans("ActivityCeased");
+            }
+            if ($statut==1) {
+            	return $langs->trans("InActivity");
+            }
         }
         if ($mode == 1)
         {
-            if ($statut==0) return $langs->trans("ActivityCeased");
-            if ($statut==1) return $langs->trans("InActivity");
+            if ($statut==0) {
+            	return $langs->trans("ActivityCeased");
+            }
+            if ($statut==1) {
+            	return $langs->trans("InActivity");
+            }
         }
         if ($mode == 2)
         {
-            if ($statut==0) return img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"').' '.$langs->trans("ActivityCeased");
-            if ($statut==1) return img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"').' '.$langs->trans("InActivity");
+            if ($statut==0) {
+            	return img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"').' '.$langs->trans("ActivityCeased");
+            }
+            if ($statut==1) {
+            	return img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"').' '.$langs->trans("InActivity");
+            }
         }
         if ($mode == 3)
         {
-            if ($statut==0) return img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"');
-            if ($statut==1) return img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"');
+            if ($statut==0) {
+            	return img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"');
+            }
+            if ($statut==1) {
+            	return img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"');
+            }
         }
         if ($mode == 4)
         {
-            if ($statut==0) return img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"').' '.$langs->trans("ActivityCeased");
-            if ($statut==1) return img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"').' '.$langs->trans("InActivity");
+            if ($statut==0) {
+            	return img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"').' '.$langs->trans("ActivityCeased");
+            }
+            if ($statut==1) {
+            	return img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"').' '.$langs->trans("InActivity");
+            }
         }
         if ($mode == 5)
         {
-            if ($statut==0) return $langs->trans("ActivityCeased").' '.img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"');
-            if ($statut==1) return $langs->trans("InActivity").' '.img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"');
+            if ($statut==0) {
+            	return $langs->trans("ActivityCeased").' '.img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"');
+            }
+            if ($statut==1) {
+            	return $langs->trans("InActivity").' '.img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"');
+            }
         }
     }
 
@@ -2046,7 +2164,9 @@ 
         $contact_emails = $this->contact_property_array('email',1);
         if ($this->email && $addthirdparty)
         {
-            if (empty($this->name)) $this->name=$this->nom;
+            if (empty($this->name)) {
+            	$this->name=$this->nom;
+            }
             $contact_emails['thirdparty']=$langs->trans("ThirdParty").': '.dol_trunc($this->name,16)." &lt;".$this->email."&gt;";
         }
         //var_dump($contact_emails)
@@ -2064,9 +2184,11 @@ 
 
         $contact_phone = $this->contact_property_array('mobile');
 
-        if (! empty($this->phone))	// If a phone of thirdparty is defined, we add it ot mobile of contacts
+        if (! empty($this->phone)) {
+        	// If a phone of thirdparty is defined, we add it ot mobile of contacts
         {
             if (empty($this->name)) $this->name=$this->nom;
+        }
             // TODO: Tester si tel non deja present dans tableau contact
             $contact_phone['thirdparty']=$langs->trans("ThirdParty").': '.dol_trunc($this->name,16)." &lt;".$this->phone."&gt;";
         }
@@ -2106,24 +2228,30 @@ 
                 while ($i < $nump)
                 {
                     $obj = $this->db->fetch_object($resql);
-                    if ($mode == 'email') $property=$obj->email;
-                    else if ($mode == 'mobile') $property=$obj->phone_mobile;
-                    else $property=$obj->$mode;
+                    if ($mode == 'email') {
+                    	$property=$obj->email;
+                    } else if ($mode == 'mobile') {
+                    	$property=$obj->phone_mobile;
+                    } else {
+                    	$property=$obj->$mode;
+                    }
 
 					// Show all contact. If hidedisabled is 1, showonly contacts with status = 1
                     if ($obj->statut == 1 || empty($hidedisabled))
                     {
                     	if (empty($property))
                     	{
-                    		if ($mode == 'email') $property=$langs->trans("NoEMail");
-                    		else if ($mode == 'mobile') $property=$langs->trans("NoMobilePhone");
+                    		if ($mode == 'email') {
+                    			$property=$langs->trans("NoEMail");
+                    		} else if ($mode == 'mobile') {
+                    			$property=$langs->trans("NoMobilePhone");
+                    		}
                     	}
 
 	                    if (!empty($obj->poste))
     	                {
 							$contact_property[$obj->rowid] = trim(dolGetFirstLastname($obj->firstname,$obj->lastname)).($obj->poste?" - ".$obj->poste:"").(($mode != 'poste' && $property)?" ".$sepa.$property.$sepb:'');
-						}
-						else
+						} else
 						{
 							$contact_property[$obj->rowid] = trim(dolGetFirstLastname($obj->firstname,$obj->lastname)).(($mode != 'poste' && $property)?" ".$sepa.$property.$sepb:'');
 						}
@@ -2131,8 +2259,7 @@ 
                     $i++;
                 }
             }
-        }
-        else
+        } else
         {
             dol_print_error($this->db);
         }
@@ -2164,8 +2291,7 @@ 
                     $i++;
                 }
             }
-        }
-        else
+        } else
         {
             dol_print_error($this->db);
         }
@@ -2199,8 +2325,7 @@ 
                     $i++;
                 }
             }
-        }
-        else
+        } else
         {
             dol_print_error($this->db);
         }
@@ -2218,7 +2343,9 @@ 
     {
         $contact_property='';
 
-        if (empty($rowid)) return '';
+        if (empty($rowid)) {
+        	return '';
+        }
 
         $sql = "SELECT rowid, email, phone_mobile, lastname, firstname";
         $sql.= " FROM ".MAIN_DB_PREFIX."socpeople";
@@ -2233,12 +2360,14 @@ 
             {
                 $obj = $this->db->fetch_object($resql);
 
-                if ($mode == 'email') $contact_property = dolGetFirstLastname($obj->firstname, $obj->lastname)." <".$obj->email.">";
-                else if ($mode == 'mobile') $contact_property = $obj->phone_mobile;
+                if ($mode == 'email') {
+                	$contact_property = dolGetFirstLastname($obj->firstname, $obj->lastname)." <".$obj->email.">";
+                } else if ($mode == 'mobile') {
+                	$contact_property = $obj->phone_mobile;
+                }
             }
             return $contact_property;
-        }
-        else
+        } else
         {
             dol_print_error($this->db);
         }
@@ -2262,8 +2391,7 @@ 
         if ($mode == 'label')
         {
         	return $bac->getRibLabel(true);
-        }
-        elseif ($mode == 'rum')
+        } elseif ($mode == 'rum')
         {
         	if (empty($bac->rum))
         	{
@@ -2325,7 +2453,9 @@ 
             foreach ($dirsociete as $dirroot)
             {
                 $res=dol_include_once($dirroot.$module.'.php');
-                if ($res) break;
+                if ($res) {
+                	break;
+                }
             }
             $mod = new $module();
 
@@ -2355,7 +2485,9 @@ 
             foreach ($dirsociete as $dirroot)
             {
                 $res=dol_include_once($dirroot.$module.'.php');
-                if ($res) break;
+                if ($res) {
+                	break;
+                }
             }
             $mod = new $module();
 
@@ -2382,18 +2514,26 @@ 
             foreach ($dirsociete as $dirroot)
             {
                 $res=dol_include_once($dirroot.$module.'.php');
-                if ($res) break;
+                if ($res) {
+                	break;
+                }
             }
 
             $mod = new $module();
 
             dol_syslog(get_class($this)."::codeclient_modifiable code_client=".$this->code_client." module=".$module);
-            if ($mod->code_modifiable_null && ! $this->code_client) return 1;
-            if ($mod->code_modifiable_invalide && $this->check_codeclient() < 0) return 1;
-            if ($mod->code_modifiable) return 1;	// A mettre en dernier
+            if ($mod->code_modifiable_null && ! $this->code_client) {
+            	return 1;
+            }
+            if ($mod->code_modifiable_invalide && $this->check_codeclient() < 0) {
+            	return 1;
+            }
+            if ($mod->code_modifiable) {
+            	return 1;
+            }
+            // A mettre en dernier
             return 0;
-        }
-        else
+        } else
         {
             return 0;
         }
@@ -2416,18 +2556,26 @@ 
             foreach ($dirsociete as $dirroot)
             {
                 $res=dol_include_once($dirroot.$module.'.php');
-                if ($res) break;
+                if ($res) {
+                	break;
+                }
             }
 
             $mod = new $module();
 
             dol_syslog(get_class($this)."::codefournisseur_modifiable code_founisseur=".$this->code_fournisseur." module=".$module);
-            if ($mod->code_modifiable_null && ! $this->code_fournisseur) return 1;
-            if ($mod->code_modifiable_invalide && $this->check_codefournisseur() < 0) return 1;
-            if ($mod->code_modifiable) return 1;	// A mettre en dernier
+            if ($mod->code_modifiable_null && ! $this->code_fournisseur) {
+            	return 1;
+            }
+            if ($mod->code_modifiable_invalide && $this->check_codefournisseur() < 0) {
+            	return 1;
+            }
+            if ($mod->code_modifiable) {
+            	return 1;
+            }
+            // A mettre en dernier
             return 0;
-        }
-        else
+        } else
         {
             return 0;
         }
@@ -2454,7 +2602,9 @@ 
             foreach ($dirsociete as $dirroot)
             {
                 $res=dol_include_once($dirroot.$module.'.php');
-                if ($res) break;
+                if ($res) {
+                	break;
+                }
             }
 
             $mod = new $module();
@@ -2462,8 +2612,7 @@ 
            	dol_syslog(get_class($this)."::check_codeclient code_client=".$this->code_client." module=".$module);
            	$result = $mod->verif($this->db, $this->code_client, $this, 0);
             return $result;
-        }
-        else
+        } else
 		{
             return 0;
         }
@@ -2489,7 +2638,9 @@ 
             foreach ($dirsociete as $dirroot)
             {
                 $res=dol_include_once($dirroot.$module.'.php');
-                if ($res) break;
+                if ($res) {
+                	break;
+                }
             }
 
             $mod = new $module();
@@ -2497,8 +2648,7 @@ 
             dol_syslog(get_class($this)."::check_codefournisseur code_fournisseur=".$this->code_fournisseur." module=".$module);
             $result = $mod->verif($this->db, $this->code_fournisseur, $this, 1);
             return $result;
-        }
-        else
+        } else
 		{
             return 0;
         }
@@ -2539,21 +2689,25 @@ 
             	// Defini code compta dans $mod->code
             	$result = $mod->get_code($this->db, $this, $type);
 
-            	if ($type == 'customer') $this->code_compta = $mod->code;
-            	else if ($type == 'supplier') $this->code_compta_fournisseur = $mod->code;
+            	if ($type == 'customer') {
+            		$this->code_compta = $mod->code;
+            	} else if ($type == 'supplier') {
+            		$this->code_compta_fournisseur = $mod->code;
+            	}
 
             	return $result;
-            }
-            else
+            } else
             {
             	$this->error = 'ErrorAccountancyCodeNotDefined';
             	return -1;
             }
-        }
-        else
+        } else
         {
-            if ($type == 'customer') $this->code_compta = '';
-            else if ($type == 'supplier') $this->code_compta_fournisseur = '';
+            if ($type == 'customer') {
+            	$this->code_compta = '';
+            } else if ($type == 'supplier') {
+            	$this->code_compta_fournisseur = '';
+            }
 
             return 0;
         }
@@ -2578,13 +2732,13 @@ 
             {
             	$this->parent = $id;
                 return 1;
-            }
-            else
+            } else
 			{
                 return -1;
             }
+        } else {
+        	return -1;
         }
-        else return -1;
     }
 
 	/**
@@ -2664,22 +2818,26 @@ 
 
          //Verify duplicate entries
         $sql  = "SELECT COUNT(*) as idprof FROM ".MAIN_DB_PREFIX."societe WHERE ".$field." = '".$value."' AND entity IN (".getEntity('societe').")";
-        if($socid) $sql .= " AND rowid <> ".$socid;
+        if($socid) {
+        	$sql .= " AND rowid <> ".$socid;
+        }
         $resql = $this->db->query($sql);
         if ($resql)
         {
             $obj = $this->db->fetch_object($resql);
             $count = $obj->idprof;
-        }
-        else
+        } else
         {
             $count = 0;
             print $this->db->error();
         }
         $this->db->free($resql);
 
-		if ($count > 0) return true;
-		else return false;
+		if ($count > 0) {
+			return true;
+		} else {
+			return false;
+		}
     }
 
     /**
@@ -2696,7 +2854,9 @@ 
 
         $ok=1;
 
-        if (! empty($conf->global->MAIN_DISABLEPROFIDRULES)) return 1;
+        if (! empty($conf->global->MAIN_DISABLEPROFIDRULES)) {
+        	return 1;
+        }
 
         // Verifie SIREN si pays FR
         if ($idprof == 1 && $soc->country_code == 'FR')
@@ -2704,7 +2864,9 @@ 
             $chaine=trim($this->idprof1);
             $chaine=preg_replace('/(\s)/','',$chaine);
 
-            if (dol_strlen($chaine) != 9) return -1;
+            if (dol_strlen($chaine) != 9) {
+            	return -1;
+            }
 
             $sum = 0;
 
@@ -2724,7 +2886,9 @@ 
                 $sum = $sum + $ps;
             }
 
-            if (substr($sum, -1) != 0) return -1;
+            if (substr($sum, -1) != 0) {
+            	return -1;
+            }
         }
 
         // Verifie SIRET si pays FR
@@ -2733,7 +2897,9 @@ 
             $chaine=trim($this->idprof2);
             $chaine=preg_replace('/(\s)/','',$chaine);
 
-            if (dol_strlen($chaine) != 14) return -1;
+            if (dol_strlen($chaine) != 14) {
+            	return -1;
+            }
         }
 
         //Verify CIF/NIF/NIE if pays ES
@@ -2744,53 +2910,61 @@ 
             $string=preg_replace('/(\s)/','',$string);
             $string = strtoupper($string);
 
-            for ($i = 0; $i < 9; $i ++)
-            $num[$i] = substr($string, $i, 1);
+            for ($i = 0; $i < 9; $i ++) {
+                        $num[$i] = substr($string, $i, 1);
+            }
 
             //Check format
-            if (!preg_match('/((^[A-Z]{1}[0-9]{7}[A-Z0-9]{1}$|^[T]{1}[A-Z0-9]{8}$)|^[0-9]{8}[A-Z]{1}$)/', $string))
-            return 0;
+            if (!preg_match('/((^[A-Z]{1}[0-9]{7}[A-Z0-9]{1}$|^[T]{1}[A-Z0-9]{8}$)|^[0-9]{8}[A-Z]{1}$)/', $string)) {
+                        return 0;
+            }
 
             //Check NIF
-            if (preg_match('/(^[0-9]{8}[A-Z]{1}$)/', $string))
-            if ($num[8] == substr('TRWAGMYFPDXBNJZSQVHLCKE', substr($string, 0, 8) % 23, 1))
+            if (preg_match('/(^[0-9]{8}[A-Z]{1}$)/', $string)) {
+                        if ($num[8] == substr('TRWAGMYFPDXBNJZSQVHLCKE', substr($string, 0, 8) % 23, 1))
             return 1;
-            else
-            return -1;
+            } else {
+                        return -1;
+            }
 
             //algorithm checking type code CIF
             $sum = $num[2] + $num[4] + $num[6];
-            for ($i = 1; $i < 8; $i += 2)
-            $sum += substr((2 * $num[$i]),0,1) + substr((2 * $num[$i]),1,1);
+            for ($i = 1; $i < 8; $i += 2) {
+                        $sum += substr((2 * $num[$i]),0,1) + substr((2 * $num[$i]),1,1);
+            }
             $n = 10 - substr($sum, strlen($sum) - 1, 1);
 
             //Chek special NIF
-            if (preg_match('/^[KLM]{1}/', $string))
-            if ($num[8] == chr(64 + $n) || $num[8] == substr('TRWAGMYFPDXBNJZSQVHLCKE', substr($string, 1, 8) % 23, 1))
+            if (preg_match('/^[KLM]{1}/', $string)) {
+                        if ($num[8] == chr(64 + $n) || $num[8] == substr('TRWAGMYFPDXBNJZSQVHLCKE', substr($string, 1, 8) % 23, 1))
             return 1;
-            else
-            return -1;
+            } else {
+                        return -1;
+            }
 
             //Check CIF
-            if (preg_match('/^[ABCDEFGHJNPQRSUVW]{1}/', $string))
-            if ($num[8] == chr(64 + $n) || $num[8] == substr($n, strlen($n) - 1, 1))
+            if (preg_match('/^[ABCDEFGHJNPQRSUVW]{1}/', $string)) {
+                        if ($num[8] == chr(64 + $n) || $num[8] == substr($n, strlen($n) - 1, 1))
             return 2;
-            else
-            return -2;
+            } else {
+                        return -2;
+            }
 
             //Check NIE T
-            if (preg_match('/^[T]{1}/', $string))
-            if ($num[8] == preg_match('/^[T]{1}[A-Z0-9]{8}$/', $string))
+            if (preg_match('/^[T]{1}/', $string)) {
+                        if ($num[8] == preg_match('/^[T]{1}[A-Z0-9]{8}$/', $string))
             return 3;
-            else
-            return -3;
+            } else {
+                        return -3;
+            }
 
             //Check NIE XYZ
-            if (preg_match('/^[XYZ]{1}/', $string))
-            if ($num[8] == substr('TRWAGMYFPDXBNJZSQVHLCKE', substr(str_replace(array('X','Y','Z'), array('0','1','2'), $string), 0, 8) % 23, 1))
+            if (preg_match('/^[XYZ]{1}/', $string)) {
+                        if ($num[8] == substr('TRWAGMYFPDXBNJZSQVHLCKE', substr(str_replace(array('X','Y','Z'), array('0','1','2'), $string), 0, 8) % 23, 1))
             return 3;
-            else
-            return -3;
+            } else {
+                        return -3;
+            }
 
             //Can not be verified
             return -4;
@@ -2819,17 +2993,27 @@ 
         $reshook=$hookmanager->executeHooks('getIdProfUrl',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
         if (empty($reshook))
         {
-            if (! empty($conf->global->MAIN_DISABLEPROFIDRULES)) return '';
+            if (! empty($conf->global->MAIN_DISABLEPROFIDRULES)) {
+            	return '';
+            }
 
             // TODO Move links to validate professional ID into a dictionary table "country" + "link"
-            if ($idprof == 1 && $thirdparty->country_code == 'FR') $url='http://www.societe.com/cgi-bin/search?champs='.$thirdparty->idprof1;    // See also http://avis-situation-sirene.insee.fr/
+            if ($idprof == 1 && $thirdparty->country_code == 'FR') {
+            	$url='http://www.societe.com/cgi-bin/search?champs='.$thirdparty->idprof1;
+            }
+            // See also http://avis-situation-sirene.insee.fr/
             //if ($idprof == 1 && ($thirdparty->country_code == 'GB' || $thirdparty->country_code == 'UK')) $url='http://www.companieshouse.gov.uk/WebCHeck/findinfolink/';     // Link no more valid
-            if ($idprof == 1 && $thirdparty->country_code == 'ES') $url='http://www.e-informa.es/servlet/app/portal/ENTP/screen/SProducto/prod/ETIQUETA_EMPRESA/nif/'.$thirdparty->idprof1;
-            if ($idprof == 1 && $thirdparty->country_code == 'IN') $url='http://www.tinxsys.com/TinxsysInternetWeb/dealerControllerServlet?tinNumber='.$thirdparty->idprof1.';&searchBy=TIN&backPage=searchByTin_Inter.jsp';
+            if ($idprof == 1 && $thirdparty->country_code == 'ES') {
+            	$url='http://www.e-informa.es/servlet/app/portal/ENTP/screen/SProducto/prod/ETIQUETA_EMPRESA/nif/'.$thirdparty->idprof1;
+            }
+            if ($idprof == 1 && $thirdparty->country_code == 'IN') {
+            	$url='http://www.tinxsys.com/TinxsysInternetWeb/dealerControllerServlet?tinNumber='.$thirdparty->idprof1.';&searchBy=TIN&backPage=searchByTin_Inter.jsp';
+            }
 
-            if ($url) return '<a target="_blank" href="'.$url.'">'.$langs->trans("Check").'</a>';
-        }
-        else
+            if ($url) {
+            	return '<a target="_blank" href="'.$url.'">'.$langs->trans("Check").'</a>';
+            }
+        } else
         {
             return $hookmanager->resPrint;
         }
@@ -2850,8 +3034,7 @@ 
         {
             $obj = $this->db->fetch_object($resql);
             $count = $obj->numproj;
-        }
-        else
+        } else
         {
             $count = 0;
             print $this->db->error();
@@ -2902,8 +3085,7 @@ 
 
             $this->db->free($result);
 
-        }
-        else
+        } else
 		{
             dol_print_error($this->db);
         }
@@ -2920,9 +3102,13 @@ 
 
         // Define if third party is treated as company (or not) when nature is unknown
         $isacompany=empty($conf->global->MAIN_UNKNOWN_CUSTOMERS_ARE_COMPANIES)?0:1; // 0 by default
-        if (! empty($this->tva_intra)) $isacompany=1;
-        else if (! empty($this->typent_code) && in_array($this->typent_code,array('TE_PRIVATE'))) $isacompany=0;
-        else if (! empty($this->typent_code) && in_array($this->typent_code,array('TE_SMALL','TE_MEDIUM','TE_LARGE','TE_GROUP'))) $isacompany=1;
+        if (! empty($this->tva_intra)) {
+        	$isacompany=1;
+        } else if (! empty($this->typent_code) && in_array($this->typent_code,array('TE_PRIVATE'))) {
+        	$isacompany=0;
+        } else if (! empty($this->typent_code) && in_array($this->typent_code,array('TE_SMALL','TE_MEDIUM','TE_LARGE','TE_GROUP'))) {
+        	$isacompany=1;
+        }
 
         return $isacompany;
     }
@@ -2947,8 +3133,7 @@ 
                 $this->SupplierCategories[$obj->rowid] = $obj->label;
             }
             return 0;
-        }
-        else
+        } else
         {
             return -1;
         }
@@ -2967,9 +3152,10 @@ 
             $sql = "INSERT INTO ".MAIN_DB_PREFIX."categorie_fournisseur (fk_categorie, fk_soc) ";
             $sql.= " VALUES (".$categorie_id.", ".$this->id.")";
 
-            if ($resql=$this->db->query($sql)) return 0;
-        }
-        else
+            if ($resql=$this->db->query($sql)) {
+            	return 0;
+            }
+        } else
         {
             return 0;
         }
@@ -2989,7 +3175,9 @@ 
         global $user,$langs;
 
         $name = $socname?$socname:$member->societe;
-        if (empty($name)) $name=$member->getFullName($langs);
+        if (empty($name)) {
+        	$name=$member->getFullName($langs);
+        }
 
         // Positionne parametres
         $this->nom=$name;				// TODO deprecated
@@ -3023,16 +3211,14 @@ 
             {
                 $this->db->commit();
                 return $this->id;
-            }
-            else
+            } else
             {
                 $this->error=$this->db->error();
 
                 $this->db->rollback();
                 return -1;
             }
-        }
-        else
+        } else
         {
             // $this->error deja positionne
             dol_syslog(get_class($this)."::create_from_member - 2 - ".$this->error." - ".join(',',$this->errors), LOG_ERR);
@@ -3078,12 +3264,13 @@ 
     	{
     		$tmp=explode(':',$conf->global->MAIN_INFO_SOCIETE_COUNTRY);
     		$country_id=$tmp[0];
-    		if (! empty($tmp[1]))   // If $conf->global->MAIN_INFO_SOCIETE_COUNTRY is "id:code:label"
+    		if (! empty($tmp[1])) {
+    			// If $conf->global->MAIN_INFO_SOCIETE_COUNTRY is "id:code:label"
     		{
     			$country_code=$tmp[1];
-    			$country_label=$tmp[2];
     		}
-    		else                    // For backward compatibility
+    			$country_label=$tmp[2];
+    		} else                    // For backward compatibility
     		{
     			dol_syslog("Your country setup use an old syntax. Reedit it using setup area.", LOG_ERR);
     			include_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
@@ -3094,7 +3281,9 @@ 
     	$this->country_id=$country_id;
     	$this->country_code=$country_code;
     	$this->country=$country_label;
-    	if (is_object($langs)) $this->country=($langs->trans('Country'.$country_code)!='Country'.$country_code)?$langs->trans('Country'.$country_code):$country_label;
+    	if (is_object($langs)) {
+    		$this->country=($langs->trans('Country'.$country_code)!='Country'.$country_code)?$langs->trans('Country'.$country_code):$country_label;
+    	}
 
     	$this->phone=empty($conf->global->MAIN_INFO_SOCIETE_TEL)?'':$conf->global->MAIN_INFO_SOCIETE_TEL;
     	$this->fax=empty($conf->global->MAIN_INFO_SOCIETE_FAX)?'':$conf->global->MAIN_INFO_SOCIETE_FAX;
@@ -3186,17 +3375,22 @@ 
     	$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
     	$sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$this->db->escape($this->country_code)."'";
     	$sql .= " AND t.active = 1";
-    	if (empty($localTaxNum))   $sql .= " AND (t.localtax1_type <> '0' OR t.localtax2_type <> '0')";
-    	elseif ($localTaxNum == 1) $sql .= " AND t.localtax1_type <> '0'";
-    	elseif ($localTaxNum == 2) $sql .= " AND t.localtax2_type <> '0'";
+    	if (empty($localTaxNum)) {
+    		$sql .= " AND (t.localtax1_type <> '0' OR t.localtax2_type <> '0')";
+    	} elseif ($localTaxNum == 1) {
+    		$sql .= " AND t.localtax1_type <> '0'";
+    	} elseif ($localTaxNum == 2) {
+    		$sql .= " AND t.localtax2_type <> '0'";
+    	}
 
     	dol_syslog("useLocalTax", LOG_DEBUG);
     	$resql=$this->db->query($sql);
     	if ($resql)
     	{
    			return ($this->db->num_rows($resql) > 0);
+    	} else {
+    		return false;
     	}
-    	else return false;
     }
 
     /**
@@ -3216,8 +3410,9 @@ 
         if ($resql)
         {
             return ($this->db->num_rows($resql) > 0);
+        } else {
+        	return false;
         }
-        else return false;
     }
 
     /**
@@ -3238,8 +3433,7 @@ 
 		{
 			$obj=$this->db->fetch_object($resql);
    			return (($obj->nb > 0)?true:false);
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->lasterror();
 			return false;
@@ -3315,36 +3509,51 @@ 
 
 		if ($mode == 2)
 		{
-			if ($statut == '-1' || $statut == 'ST_NO')         return img_action($langs->trans("StatusProspect-1"),-1).' '.$langs->trans("StatusProspect-1");
-			elseif ($statut ==  '0' || $statut == 'ST_NEVER') return img_action($langs->trans("StatusProspect0"), 0).' '.$langs->trans("StatusProspect0");
-			elseif ($statut ==  '1' || $statut == 'ST_TODO')  return img_action($langs->trans("StatusProspect1"), 1).' '.$langs->trans("StatusProspect1");
-			elseif ($statut ==  '2' || $statut == 'ST_PEND')  return img_action($langs->trans("StatusProspect2"), 2).' '.$langs->trans("StatusProspect2");
-			elseif ($statut ==  '3' || $statut == 'ST_DONE')  return img_action($langs->trans("StatusProspect3"), 3).' '.$langs->trans("StatusProspect3");
-			else
+			if ($statut == '-1' || $statut == 'ST_NO') {
+				return img_action($langs->trans("StatusProspect-1"),-1).' '.$langs->trans("StatusProspect-1");
+			} elseif ($statut ==  '0' || $statut == 'ST_NEVER') {
+				return img_action($langs->trans("StatusProspect0"), 0).' '.$langs->trans("StatusProspect0");
+			} elseif ($statut ==  '1' || $statut == 'ST_TODO') {
+				return img_action($langs->trans("StatusProspect1"), 1).' '.$langs->trans("StatusProspect1");
+			} elseif ($statut ==  '2' || $statut == 'ST_PEND') {
+				return img_action($langs->trans("StatusProspect2"), 2).' '.$langs->trans("StatusProspect2");
+			} elseif ($statut ==  '3' || $statut == 'ST_DONE') {
+				return img_action($langs->trans("StatusProspect3"), 3).' '.$langs->trans("StatusProspect3");
+			} else
 			{
 				return img_action(($langs->trans("StatusProspect".$statut) != "StatusProspect".$statut) ? $langs->trans("StatusProspect".$statut) : $label, 0).' '.(($langs->trans("StatusProspect".$statut) != "StatusProspect".$statut) ? $langs->trans("StatusProspect".$statut) : $label);
 			}
 		}
 		if ($mode == 3)
 		{
-			if ($statut == '-1' || $statut == 'ST_NO')         return img_action($langs->trans("StatusProspect-1"),-1);
-			elseif ($statut ==  '0' || $statut == 'ST_NEVER') return img_action($langs->trans("StatusProspect0"), 0);
-			elseif ($statut ==  '1' || $statut == 'ST_TODO')  return img_action($langs->trans("StatusProspect1"), 1);
-			elseif ($statut ==  '2' || $statut == 'ST_PEND')  return img_action($langs->trans("StatusProspect2"), 2);
-			elseif ($statut ==  '3' || $statut == 'ST_DONE')  return img_action($langs->trans("StatusProspect3"), 3);
-			else
+			if ($statut == '-1' || $statut == 'ST_NO') {
+				return img_action($langs->trans("StatusProspect-1"),-1);
+			} elseif ($statut ==  '0' || $statut == 'ST_NEVER') {
+				return img_action($langs->trans("StatusProspect0"), 0);
+			} elseif ($statut ==  '1' || $statut == 'ST_TODO') {
+				return img_action($langs->trans("StatusProspect1"), 1);
+			} elseif ($statut ==  '2' || $statut == 'ST_PEND') {
+				return img_action($langs->trans("StatusProspect2"), 2);
+			} elseif ($statut ==  '3' || $statut == 'ST_DONE') {
+				return img_action($langs->trans("StatusProspect3"), 3);
+			} else
 			{
 				return img_action(($langs->trans("StatusProspect".$statut) != "StatusProspect".$statut) ? $langs->trans("StatusProspect".$statut) : $label, 0);
 			}
 		}
 		if ($mode == 4)
 		{
-			if ($statut == '-1' || $statut == 'ST_NO')         return img_action($langs->trans("StatusProspect-1"),-1).' '.$langs->trans("StatusProspect-1");
-			elseif ($statut ==  '0' || $statut == 'ST_NEVER') return img_action($langs->trans("StatusProspect0"), 0).' '.$langs->trans("StatusProspect0");
-			elseif ($statut ==  '1' || $statut == 'ST_TODO')  return img_action($langs->trans("StatusProspect1"), 1).' '.$langs->trans("StatusProspect1");
-			elseif ($statut ==  '2' || $statut == 'ST_PEND')  return img_action($langs->trans("StatusProspect2"), 2).' '.$langs->trans("StatusProspect2");
-			elseif ($statut ==  '3' || $statut == 'ST_DONE')  return img_action($langs->trans("StatusProspect3"), 3).' '.$langs->trans("StatusProspect3");
-			else
+			if ($statut == '-1' || $statut == 'ST_NO') {
+				return img_action($langs->trans("StatusProspect-1"),-1).' '.$langs->trans("StatusProspect-1");
+			} elseif ($statut ==  '0' || $statut == 'ST_NEVER') {
+				return img_action($langs->trans("StatusProspect0"), 0).' '.$langs->trans("StatusProspect0");
+			} elseif ($statut ==  '1' || $statut == 'ST_TODO') {
+				return img_action($langs->trans("StatusProspect1"), 1).' '.$langs->trans("StatusProspect1");
+			} elseif ($statut ==  '2' || $statut == 'ST_PEND') {
+				return img_action($langs->trans("StatusProspect2"), 2).' '.$langs->trans("StatusProspect2");
+			} elseif ($statut ==  '3' || $statut == 'ST_DONE') {
+				return img_action($langs->trans("StatusProspect3"), 3).' '.$langs->trans("StatusProspect3");
+			} else
 			{
 				return img_action(($langs->trans("StatusProspect".$statut) != "StatusProspect".$statut) ? $langs->trans("StatusProspect".$statut) : $label, 0).' '.(($langs->trans("StatusProspect".$statut) != "StatusProspect".$statut) ? $langs->trans("StatusProspect".$statut) : $label);
 			}
@@ -3374,7 +3583,9 @@ 
 	function getOutstandingProposals($mode='customer')
 	{
 		$table='propal';
-		if ($mode == 'supplier') $table = 'supplier_proposal';
+		if ($mode == 'supplier') {
+			$table = 'supplier_proposal';
+		}
 
 		$sql  = "SELECT rowid, total_ht, total as total_ttc, fk_statut FROM ".MAIN_DB_PREFIX.$table." as f";
 		$sql .= " WHERE fk_soc = ". $this->id;
@@ -3394,15 +3605,17 @@ 
 			while($obj=$this->db->fetch_object($resql)) {
 				$outstandingTotal+= $obj->total_ht;
 				$outstandingTotalIncTax+= $obj->total_ttc;
-				if ($obj->fk_statut != 0)    // Not a draft
+				if ($obj->fk_statut != 0) {
+					// Not a draft
 				{
 					$outstandingOpened+=$obj->total_ttc;
 				}
+				}
 			}
 			return array('opened'=>$outstandingOpened, 'total_ht'=>$outstandingTotal, 'total_ttc'=>$outstandingTotalIncTax);
+		} else {
+					return array();
 		}
-		else
-			return array();
 	}
 
 	/**
@@ -3414,7 +3627,9 @@ 
 	function getOutstandingOrders($mode='customer')
 	{
 		$table='commande';
-		if ($mode == 'supplier') $table = 'commande_fournisseur';
+		if ($mode == 'supplier') {
+			$table = 'commande_fournisseur';
+		}
 
 		$sql  = "SELECT rowid, total_ht, total_ttc, fk_statut FROM ".MAIN_DB_PREFIX.$table." as f";
 		$sql .= " WHERE fk_soc = ". $this->id;
@@ -3434,15 +3649,17 @@ 
 			while($obj=$this->db->fetch_object($resql)) {
 				$outstandingTotal+= $obj->total_ht;
 				$outstandingTotalIncTax+= $obj->total_ttc;
-				if ($obj->fk_statut != 0)    // Not a draft
+				if ($obj->fk_statut != 0) {
+					// Not a draft
 				{
 					$outstandingOpened+=$obj->total_ttc;
 				}
+				}
 			}
 			return array('opened'=>$outstandingOpened, 'total_ht'=>$outstandingTotal, 'total_ttc'=>$outstandingTotalIncTax);
+		} else {
+					return array();
 		}
-		else
-			return array();
 	}
 
 	/**
@@ -3454,7 +3671,9 @@ 
 	function getOutstandingBills($mode='customer')
 	{
 		$table='facture';
-		if ($mode == 'supplier') $table = 'facture_fourn';
+		if ($mode == 'supplier') {
+			$table = 'facture_fourn';
+		}
 
 		/* Accurate value of remain to pay is to sum remaintopay for each invoice
 		 $paiement = $invoice->getSommePaiement();
@@ -3463,8 +3682,11 @@ 
 		 $alreadypayed=price2num($paiement + $creditnotes + $deposits,'MT');
 		 $remaintopay=price2num($invoice->total_ttc - $paiement - $creditnotes - $deposits,'MT');
 		 */
-		if ($mode == 'supplier') $sql  = "SELECT rowid, total_ht as total_ht, total_ttc, paye, fk_statut, close_code FROM ".MAIN_DB_PREFIX.$table." as f";
-		else $sql  = "SELECT rowid, total as total_ht, total_ttc, paye, fk_statut, close_code FROM ".MAIN_DB_PREFIX.$table." as f";
+		if ($mode == 'supplier') {
+			$sql  = "SELECT rowid, total_ht as total_ht, total_ttc, paye, fk_statut, close_code FROM ".MAIN_DB_PREFIX.$table." as f";
+		} else {
+			$sql  = "SELECT rowid, total as total_ht, total_ttc, paye, fk_statut, close_code FROM ".MAIN_DB_PREFIX.$table." as f";
+		}
 		$sql .= " WHERE fk_soc = ". $this->id;
 		if ($mode == 'supplier') {
 			$sql .= " AND entity IN (".getEntity('facture_fourn').")";
@@ -3483,8 +3705,7 @@ 
 			{
 				require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
 				$tmpobject=new FactureFournisseur($this->db);
-			}
-			else
+			} else
 			{
 				require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 				$tmpobject=new Facture($this->db);
@@ -3501,18 +3722,19 @@ 
 				if ($obj->paye == 0
 					&& $obj->fk_statut != 0    // Not a draft
 					&& $obj->fk_statut != 3	   // Not abandonned
-					&& $obj->fk_statut != 2)   // Not classified as paid
+					&& $obj->fk_statut != 2) {
+					// Not classified as paid
 				//$sql .= " AND (fk_statut <> 3 OR close_code <> 'abandon')";		// Not abandonned for undefined reason
 				{
 					$paiement = $tmpobject->getSommePaiement();
+				}
 					$creditnotes = $tmpobject->getSumCreditNotesUsed();
 					$deposits = $tmpobject->getSumDepositsUsed();
 					$outstandingOpened+=$obj->total_ttc - $paiement - $creditnotes - $deposits;
 				}
 			}
 			return array('opened'=>$outstandingOpened, 'total_ht'=>$outstandingTotal, 'total_ttc'=>$outstandingTotalIncTax);
-		}
-		else
+		} else
 		{
 			return array();
 		}
@@ -3556,9 +3778,9 @@ 
 	            $outstandingAmount+= $obj->total_ttc - $paiement - $creditnotes - $deposits;
 	        }
 	        return $outstandingAmount;
+	    } else {
+	    	        return 0;
 	    }
-	    else
-	        return 0;
 	}
 
 	/**
@@ -3582,10 +3804,18 @@ 
 		global $langs;
 		$langs->load('companies');
 
-		if ($statut==0) return $langs->trans("NorProspectNorCustomer");
-		if ($statut==1) return $langs->trans("Customer");
-		if ($statut==2) return $langs->trans("Prospect");
-		if ($statut==3) return $langs->trans("ProspectCustomer");
+		if ($statut==0) {
+			return $langs->trans("NorProspectNorCustomer");
+		}
+		if ($statut==1) {
+			return $langs->trans("Customer");
+		}
+		if ($statut==2) {
+			return $langs->trans("Prospect");
+		}
+		if ($statut==3) {
+			return $langs->trans("ProspectCustomer");
+		}
 
 	}
 
@@ -3612,10 +3842,11 @@ 
 		    include_once DOL_DOCUMENT_ROOT.'/societe/class/companybankaccount.class.php';
 		    $companybankaccount = new CompanyBankAccount($this->db);
 		    $result = $companybankaccount->fetch($moreparams['use_companybankid']);
-		    if (! $result) dol_print_error($this->db, $companybankaccount->error, $companybankaccount->errors);
+		    if (! $result) {
+		    	dol_print_error($this->db, $companybankaccount->error, $companybankaccount->errors);
+		    }
 		    $result=$companybankaccount->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
-		}
-		else
+		} else
 		{
     		// Positionne le modele sur le nom du modele a utiliser
     		if (! dol_strlen($modele))
@@ -3623,8 +3854,7 @@ 
     			if (! empty($conf->global->COMPANY_ADDON_PDF))
     			{
     				$modele = $conf->global->COMPANY_ADDON_PDF;
-    			}
-    			else
+    			} else
     			{
     				print $langs->trans("Error")." ".$langs->trans("Error_COMPANY_ADDON_PDF_NotDefined");
                     return 0;