Dolibarr / dolibarr

htdocs/core/modules/modProduct.class.php

Spacing +1 added lines, -1 removed lines

@@ -655,7 +655,7 @@
 			}
 
 			if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING)) {
-				$this->import_fields_array[$r]=array_merge($this->import_fields_array[$r], array('sp.packaging' => 'PackagingForThisProduct'));
+				$this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('sp.packaging' => 'PackagingForThisProduct'));
 			}
 
 			$this->import_convertvalue_array[$r] = array(

htdocs/core/modules/modIntracommreport.class.php

Indentation +49 added lines, -49 removed lines

@@ -38,28 +38,28 @@ 
 	 */
 	public function __construct($db)
 	{
-        global $conf, $langs;
+		global $conf, $langs;
 
-        $this->db = $db;
-        $this->numero = 68000;
+		$this->db = $db;
+		$this->numero = 68000;
 
-        $this->family = "financial";
-        $this->module_position = '100';
-        // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
-        $this->name = preg_replace('/^mod/i', '', get_class($this));
-        $this->description = "Intracomm report management (Support for French DEB/DES format)";
+		$this->family = "financial";
+		$this->module_position = '100';
+		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+		$this->name = preg_replace('/^mod/i', '', get_class($this));
+		$this->description = "Intracomm report management (Support for French DEB/DES format)";
 
-        // Possible values for version are: 'development', 'experimental', 'dolibarr' or 'dolibarr_deprecated' or version
-        $this->version = 'development';
+		// Possible values for version are: 'development', 'experimental', 'dolibarr' or 'dolibarr_deprecated' or version
+		$this->version = 'development';
 
-        $this->const_name = 'MAIN_MODULE_' . strtoupper($this->name);
-        $this->picto = 'intracommreport';
+		$this->const_name = 'MAIN_MODULE_' . strtoupper($this->name);
+		$this->picto = 'intracommreport';
 
-        // Data directories to create when module is enabled
-        $this->dirs = array('/intracommreport/temp');
+		// Data directories to create when module is enabled
+		$this->dirs = array('/intracommreport/temp');
 
-        // Config pages
-        $this->config_page_url = array("intracommreport.php@intracommreport");
+		// Config pages
+		$this->config_page_url = array("intracommreport.php@intracommreport");
 
 		// Dependencies
 		$this->depends = array("modFacture","modTax");  // List of modules id that must be enabled if this module is enabled
@@ -76,48 +76,48 @@ 
 		// );
 		$this->const = array();
 
-        // Tabs
-        $this->tabs = array();
+		// Tabs
+		$this->tabs = array();
 
-        // Css
-        $this->module_parts = array();
+		// Css
+		$this->module_parts = array();
 
-        // Boxes
-        $this->boxes = array();
+		// Boxes
+		$this->boxes = array();
 
-        // Dictionaries
-	    if (! isset($conf->intracommreport->enabled))
-        {
-        	$conf->intracommreport=new stdClass();
-        	$conf->intracommreport->enabled=0;
-        }
+		// Dictionaries
+		if (! isset($conf->intracommreport->enabled))
+		{
+			$conf->intracommreport=new stdClass();
+			$conf->intracommreport->enabled=0;
+		}
 		$this->dictionaries=array();
 
-        // Permissions
+		// Permissions
 		$this->rights = array();
 		$this->rights_class = 'intracommreport';
-        $r = 0;
-
-        $r++;
-        $this->rights[$r][0] = 68001;
-        $this->rights[$r][1] = 'Read intracomm report';
-        $this->rights[$r][2] = 'r';
-        $this->rights[$r][3] = 0;
-        $this->rights[$r][4] = 'read';
-
-        $r++;
-        $this->rights[$r][0] = 68002;
-        $this->rights[$r][1] = 'Create/modify intracomm report';
-        $this->rights[$r][2] = 'w';
-        $this->rights[$r][3] = 0;
-        $this->rights[$r][4] = 'write';
+		$r = 0;
 
 		$r++;
-        $this->rights[$r][0] = 68004;
-        $this->rights[$r][1] = 'Delete intracomm report';
-        $this->rights[$r][2] = 'd';
-        $this->rights[$r][3] = 0;
-        $this->rights[$r][4] = 'delete';
+		$this->rights[$r][0] = 68001;
+		$this->rights[$r][1] = 'Read intracomm report';
+		$this->rights[$r][2] = 'r';
+		$this->rights[$r][3] = 0;
+		$this->rights[$r][4] = 'read';
+
+		$r++;
+		$this->rights[$r][0] = 68002;
+		$this->rights[$r][1] = 'Create/modify intracomm report';
+		$this->rights[$r][2] = 'w';
+		$this->rights[$r][3] = 0;
+		$this->rights[$r][4] = 'write';
+
+		$r++;
+		$this->rights[$r][0] = 68004;
+		$this->rights[$r][1] = 'Delete intracomm report';
+		$this->rights[$r][2] = 'd';
+		$this->rights[$r][3] = 0;
+		$this->rights[$r][4] = 'delete';
 
 		// Main menu entries
 		$this->menu = array();			// List of menus to add

Spacing +14 added lines, -14 removed lines

@@ -23,7 +23,7 @@ 
  * 	\ingroup    Intracomm report
  *	\brief      Module to activate intracomm report module
  */
-include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
+include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
 
 
 /**
@@ -52,7 +52,7 @@ 
         // Possible values for version are: 'development', 'experimental', 'dolibarr' or 'dolibarr_deprecated' or version
         $this->version = 'development';
 
-        $this->const_name = 'MAIN_MODULE_' . strtoupper($this->name);
+        $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
         $this->picto = 'intracommreport';
 
         // Data directories to create when module is enabled
@@ -62,11 +62,11 @@ 
         $this->config_page_url = array("intracommreport.php@intracommreport");
 
 		// Dependencies
-		$this->depends = array("modFacture","modTax");  // List of modules id that must be enabled if this module is enabled
-		$this->requiredby = array();                    // List of modules id to disable if this one is disabled
-		$this->conflictwith = array();                  // List of modules id this module is in conflict with
-		$this->phpmin = array(5,5);                     // Minimum version of PHP required by module
-		$this->need_dolibarr_version = array(13, 0, -5);     // Minimum version of Dolibarr required by module
+		$this->depends = array("modFacture", "modTax"); // List of modules id that must be enabled if this module is enabled
+		$this->requiredby = array(); // List of modules id to disable if this one is disabled
+		$this->conflictwith = array(); // List of modules id this module is in conflict with
+		$this->phpmin = array(5, 5); // Minimum version of PHP required by module
+		$this->need_dolibarr_version = array(13, 0, -5); // Minimum version of Dolibarr required by module
 		$this->langfiles = array("intracommreport");
 
 		// Constants
@@ -86,12 +86,12 @@ 
         $this->boxes = array();
 
         // Dictionaries
-	    if (! isset($conf->intracommreport->enabled))
+	    if (!isset($conf->intracommreport->enabled))
         {
-        	$conf->intracommreport=new stdClass();
-        	$conf->intracommreport->enabled=0;
+        	$conf->intracommreport = new stdClass();
+        	$conf->intracommreport->enabled = 0;
         }
-		$this->dictionaries=array();
+		$this->dictionaries = array();
 
         // Permissions
 		$this->rights = array();
@@ -120,10 +120,10 @@ 
         $this->rights[$r][4] = 'delete';
 
 		// Main menu entries
-		$this->menu = array();			// List of menus to add
-		$r=0;
+		$this->menu = array(); // List of menus to add
+		$r = 0;
 
 		// Exports
-		$r=1;
+		$r = 1;
 	}
 }

htdocs/core/boxes/intracommreport_box.php

Indentation +47 added lines, -47 removed lines

@@ -30,59 +30,59 @@
 class intracommreportbox extends ModeleBoxes
 {
 
-    public $boxcode = "mybox";
-    public $boximg = "intracommreport";
-    public $boxlabel;
-    public $depends = array("intracommreport");
-    public $db;
-    public $param;
-    public $info_box_head = array();
-    public $info_box_contents = array();
+	public $boxcode = "mybox";
+	public $boximg = "intracommreport";
+	public $boxlabel;
+	public $depends = array("intracommreport");
+	public $db;
+	public $param;
+	public $info_box_head = array();
+	public $info_box_contents = array();
 
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        global $langs;
-        $langs->load("boxes");
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		global $langs;
+		$langs->load("boxes");
 
-        $this->boxlabel = $langs->transnoentitiesnoconv("MyBox");
-    }
+		$this->boxlabel = $langs->transnoentitiesnoconv("MyBox");
+	}
 
-    /**
-     * Load data into info_box_contents array to show array later.
-     *
-     * 	@param		int		$max		Maximum number of records to load
-     * 	@return		void
-     */
-    public function loadBox($max = 5)
-    {
-        global $conf, $user, $langs, $db;
+	/**
+	 * Load data into info_box_contents array to show array later.
+	 *
+	 * 	@param		int		$max		Maximum number of records to load
+	 * 	@return		void
+	 */
+	public function loadBox($max = 5)
+	{
+		global $conf, $user, $langs, $db;
 
-        $this->max = $max;
+		$this->max = $max;
 
-        //include_once DOL_DOCUMENT_ROOT . "/intracommreport/class/intracommreport.class.php";
+		//include_once DOL_DOCUMENT_ROOT . "/intracommreport/class/intracommreport.class.php";
 
-        $text = $langs->trans("MyBoxDescription", $max);
-        $this->info_box_head = array(
-            'text' => $text,
-            'limit' => dol_strlen($text)
-        );
+		$text = $langs->trans("MyBoxDescription", $max);
+		$this->info_box_head = array(
+			'text' => $text,
+			'limit' => dol_strlen($text)
+		);
 
-        $this->info_box_contents[0][0] = array('td' => 'align="left"',
-            'text' => $langs->trans("MyBoxContent"));
-    }
+		$this->info_box_contents[0][0] = array('td' => 'align="left"',
+			'text' => $langs->trans("MyBoxContent"));
+	}
 
-    /**
-     * 	Method to show box
-     *
-     * 	@param	array	$head       Array with properties of box title
-     * 	@param  array	$contents   Array with properties of box lines
-     * 	@return	void
-     */
-    public function showBox($head = null, $contents = null)
-    {
-        parent::showBox($this->info_box_head, $this->info_box_contents);
-    }
+	/**
+	 * 	Method to show box
+	 *
+	 * 	@param	array	$head       Array with properties of box title
+	 * 	@param  array	$contents   Array with properties of box lines
+	 * 	@return	void
+	 */
+	public function showBox($head = null, $contents = null)
+	{
+		parent::showBox($this->info_box_head, $this->info_box_contents);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
  * 	\brief		This file is a sample box definition file
  * 				Put some comments here
  */
-include_once DOL_DOCUMENT_ROOT . "/core/boxes/modules_boxes.php";
+include_once DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php";
 
 /**
  * Class to manage the box

htdocs/core/menus/standard/eldy.lib.php

Indentation +10 added lines, -10 removed lines

@@ -1439,16 +1439,16 @@
 				//if ($leftmenu=="ca") $newmenu->add("/compta/journaux/index.php?leftmenu=ca",$langs->trans("Journals"),1,$user->rights->compta->resultat->lire||$user->rights->accounting->comptarapport->lire);
 			}
 
-            // Intracomm report
-            if (! empty($conf->intracommreport->enabled))
-            {
-                $newmenu->add("/intracommreport/list.php?leftmenu=intracommreport", $langs->trans("MenuIntracommReport"), 0, $user->rights->intracommreport->read, '', $mainmenu, 'intracommreport', 1);
-                if ($usemenuhider || empty($leftmenu) || preg_match('/intracommreport/', $leftmenu)) {
-                    // DEB / DES
-                    $newmenu->add("/intracommreport/card.php?action=create&leftmenu=intracommreport", $langs->trans("MenuIntracommReportNew"), 1, $user->rights->intracommreport->write, '', $mainmenu, 'intracommreport', 1);
-                    $newmenu->add("/intracommreport/list.php?leftmenu=intracommreport", $langs->trans("MenuIntracommReportList"), 1, $user->rights->intracommreport->read, '', $mainmenu, 'intracommreport', 1);
-                }
-            }
+			// Intracomm report
+			if (! empty($conf->intracommreport->enabled))
+			{
+				$newmenu->add("/intracommreport/list.php?leftmenu=intracommreport", $langs->trans("MenuIntracommReport"), 0, $user->rights->intracommreport->read, '', $mainmenu, 'intracommreport', 1);
+				if ($usemenuhider || empty($leftmenu) || preg_match('/intracommreport/', $leftmenu)) {
+					// DEB / DES
+					$newmenu->add("/intracommreport/card.php?action=create&leftmenu=intracommreport", $langs->trans("MenuIntracommReportNew"), 1, $user->rights->intracommreport->write, '', $mainmenu, 'intracommreport', 1);
+					$newmenu->add("/intracommreport/list.php?leftmenu=intracommreport", $langs->trans("MenuIntracommReportList"), 1, $user->rights->intracommreport->read, '', $mainmenu, 'intracommreport', 1);
+				}
+			}
 
 			// Assets
 			if (!empty($conf->asset->enabled))

Spacing +2 added lines, -2 removed lines

@@ -353,7 +353,7 @@ 
 
 		'session' => (($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "accountancy") ? 0 : 1),
 
-		'loadLangs' => array("compta", "accountancy", "assets","intracommreport"),
+		'loadLangs' => array("compta", "accountancy", "assets", "intracommreport"),
 		'submenus' => array(),
 	);
 
@@ -1440,7 +1440,7 @@ 
 			}
 
             // Intracomm report
-            if (! empty($conf->intracommreport->enabled))
+            if (!empty($conf->intracommreport->enabled))
             {
                 $newmenu->add("/intracommreport/list.php?leftmenu=intracommreport", $langs->trans("MenuIntracommReport"), 0, $user->rights->intracommreport->read, '', $mainmenu, 'intracommreport', 1);
                 if ($usemenuhider || empty($leftmenu) || preg_match('/intracommreport/', $leftmenu)) {

htdocs/core/class/commonobject.class.php

Indentation +41 added lines, -41 removed lines

@@ -296,11 +296,11 @@ 
 	 */
 	public $cond_reglement_id;
 
-    /**
-     * @var int Transport mode ID (For module intracomm report)
-     * @see setTransportMode()
-     */
-    public $transport_mode_id;
+	/**
+	 * @var int Transport mode ID (For module intracomm report)
+	 * @see setTransportMode()
+	 */
+	public $transport_mode_id;
 
 	/**
 	 * @var int Payment terms ID
@@ -2196,42 +2196,42 @@ 
 		}
 	}
 
-    /**
-     *  Change the transport mode methods
-     *
-     *  @param		int		$id		Id of new payment method
-     *  @return		int				>0 if OK, <0 if KO
-     */
-    public function setTransportMode($id)
-    {
-        dol_syslog(get_class($this).'::setTransportMode('.$id.')');
-        if ($this->statut >= 0 || $this->element == 'societe')
-        {
-            $fieldname = 'fk_transport_mode';
-            if ($this->element == 'societe') $fieldname = 'transport_mode';
-            if (get_class($this) == 'Fournisseur') $fieldname = 'transport_mode_supplier';
-
-            $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
-            $sql .= ' SET '.$fieldname.' = '.(($id > 0 || $id == '0') ? $id : 'NULL');
-            $sql .= ' WHERE rowid='.$this->id;
-
-            if ($this->db->query($sql))
-            {
-                $this->transport_mode_id = $id;
-                // for supplier
-                if (get_class($this) == 'Fournisseur') $this->transport_mode_supplier_id = $id;
-                return 1;
-            } else {
-                dol_syslog(get_class($this).'::setTransportMode Error '.$sql.' - '.$this->db->error());
-                $this->error=$this->db->error();
-                return -1;
-            }
-        } else {
-            dol_syslog(get_class($this).'::setTransportMode, status of the object is incompatible');
-            $this->error='Status of the object is incompatible '.$this->statut;
-            return -2;
-        }
-    }
+	/**
+	 *  Change the transport mode methods
+	 *
+	 *  @param		int		$id		Id of new payment method
+	 *  @return		int				>0 if OK, <0 if KO
+	 */
+	public function setTransportMode($id)
+	{
+		dol_syslog(get_class($this).'::setTransportMode('.$id.')');
+		if ($this->statut >= 0 || $this->element == 'societe')
+		{
+			$fieldname = 'fk_transport_mode';
+			if ($this->element == 'societe') $fieldname = 'transport_mode';
+			if (get_class($this) == 'Fournisseur') $fieldname = 'transport_mode_supplier';
+
+			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
+			$sql .= ' SET '.$fieldname.' = '.(($id > 0 || $id == '0') ? $id : 'NULL');
+			$sql .= ' WHERE rowid='.$this->id;
+
+			if ($this->db->query($sql))
+			{
+				$this->transport_mode_id = $id;
+				// for supplier
+				if (get_class($this) == 'Fournisseur') $this->transport_mode_supplier_id = $id;
+				return 1;
+			} else {
+				dol_syslog(get_class($this).'::setTransportMode Error '.$sql.' - '.$this->db->error());
+				$this->error=$this->db->error();
+				return -1;
+			}
+		} else {
+			dol_syslog(get_class($this).'::setTransportMode, status of the object is incompatible');
+			$this->error='Status of the object is incompatible '.$this->statut;
+			return -2;
+		}
+	}
 
 	/**
 	 *  Change the retained warranty payments terms

Spacing +8 added lines, -8 removed lines

@@ -2223,12 +2223,12 @@ 
                 return 1;
             } else {
                 dol_syslog(get_class($this).'::setTransportMode Error '.$sql.' - '.$this->db->error());
-                $this->error=$this->db->error();
+                $this->error = $this->db->error();
                 return -1;
             }
         } else {
             dol_syslog(get_class($this).'::setTransportMode, status of the object is incompatible');
-            $this->error='Status of the object is incompatible '.$this->statut;
+            $this->error = 'Status of the object is incompatible '.$this->statut;
             return -2;
         }
     }
@@ -6726,7 +6726,7 @@ 
 
 					switch ($mode) {
 						case "view":
-							$value = $this->array_options["options_".$key.$keysuffix];	// Value may be clean or formated later
+							$value = $this->array_options["options_".$key.$keysuffix]; // Value may be clean or formated later
 							break;
 						case "create":
 						case "edit":
@@ -8365,7 +8365,7 @@ 
 
 		$this->db->begin();
 
-		switch ($this->element){
+		switch ($this->element) {
 			case 'propal':
 				$element = 'propale';
 				break;
@@ -8373,10 +8373,10 @@ 
 				$element = 'produit';
 				break;
 			case 'order_supplier':
-				$element ='fournisseur/commande';
+				$element = 'fournisseur/commande';
 				break;
 			case 'invoice_supplier':
-				$element = 'fournisseur/facture/' . get_exdir($this->id, 2, 0, 1, $this, 'invoice_supplier');
+				$element = 'fournisseur/facture/'.get_exdir($this->id, 2, 0, 1, $this, 'invoice_supplier');
 				break;
 			case 'shipping':
 				$element = 'expedition/sending';
@@ -8386,8 +8386,8 @@ 
 		}
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."ecm_files";
-		$sql.= " WHERE filename LIKE '".$this->db->escape($this->ref)."%'";
-		$sql.= " AND filepath = '".$this->db->escape($element)."/".$this->db->escape($this->ref)."' AND entity = ".$conf->entity;
+		$sql .= " WHERE filename LIKE '".$this->db->escape($this->ref)."%'";
+		$sql .= " AND filepath = '".$this->db->escape($element)."/".$this->db->escape($this->ref)."' AND entity = ".$conf->entity;
 
 		if (!$this->db->query($sql)) {
 			$this->error = $this->db->lasterror();

Braces +1308 added lines, -459 removed lines

@@ -469,23 +469,31 @@ 
 		$sql .= " FROM ".MAIN_DB_PREFIX.$element;
 		$sql .= " WHERE entity IN (".getEntity($element).")";
 
-		if ($id > 0) $sql .= " AND rowid = ".$db->escape($id);
-		elseif ($ref) $sql .= " AND ref = '".$db->escape($ref)."'";
-		elseif ($ref_ext) $sql .= " AND ref_ext = '".$db->escape($ref_ext)."'";
-		else {
+		if ($id > 0) {
+			$sql .= " AND rowid = ".$db->escape($id);
+		} elseif ($ref) {
+			$sql .= " AND ref = '".$db->escape($ref)."'";
+		} elseif ($ref_ext) {
+			$sql .= " AND ref_ext = '".$db->escape($ref_ext)."'";
+		} else {
 			$error = 'ErrorWrongParameters';
 			dol_print_error(get_class()."::isExistingObject ".$error, LOG_ERR);
 			return -1;
 		}
-		if ($ref || $ref_ext) $sql .= " AND entity = ".$conf->entity;
+		if ($ref || $ref_ext) {
+			$sql .= " AND entity = ".$conf->entity;
+		}
 
 		dol_syslog(get_class()."::isExistingObject", LOG_DEBUG);
 		$resql = $db->query($sql);
 		if ($resql)
 		{
 			$num = $db->num_rows($resql);
-			if ($num > 0) return 1;
-			else return 0;
+			if ($num > 0) {
+				return 1;
+			} else {
+				return 0;
+			}
 		}
 		return -1;
 	}
@@ -555,13 +563,18 @@ 
 		//print "lastname=".$this->lastname." name=".$this->name." nom=".$this->nom."<br>\n";
 		$lastname = $this->lastname;
 		$firstname = $this->firstname;
-		if (empty($lastname))  $lastname = (isset($this->lastname) ? $this->lastname : (isset($this->name) ? $this->name : (isset($this->nom) ? $this->nom : (isset($this->societe) ? $this->societe : (isset($this->company) ? $this->company : '')))));
+		if (empty($lastname)) {
+			$lastname = (isset($this->lastname) ? $this->lastname : (isset($this->name) ? $this->name : (isset($this->nom) ? $this->nom : (isset($this->societe) ? $this->societe : (isset($this->company) ? $this->company : '')))));
+		}
 
 		$ret = '';
 		if ($option && $this->civility_code)
 		{
-			if ($langs->transnoentitiesnoconv("Civility".$this->civility_code) != "Civility".$this->civility_code) $ret .= $langs->transnoentitiesnoconv("Civility".$this->civility_code).' ';
-			else $ret .= $this->civility_code.' ';
+			if ($langs->transnoentitiesnoconv("Civility".$this->civility_code) != "Civility".$this->civility_code) {
+				$ret .= $langs->transnoentitiesnoconv("Civility".$this->civility_code).' ';
+			} else {
+				$ret .= $this->civility_code.' ';
+			}
 		}
 
 		$ret .= dolGetFirstLastname($firstname, $lastname, $nameorder);
@@ -680,7 +693,9 @@ 
 
 			// List of extra languages
 			$arrayoflangcode = array();
-			if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE)) $arrayoflangcode[] = $conf->global->PDF_USE_ALSO_LANGUAGE_CODE;
+			if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE)) {
+				$arrayoflangcode[] = $conf->global->PDF_USE_ALSO_LANGUAGE_CODE;
+			}
 
 			if (is_array($arrayoflangcode) && count($arrayoflangcode)) {
 				if (!is_object($extralanguages)) {
@@ -693,7 +708,9 @@ 
 				{
 					$out .= "<!-- alternatelanguage for '".$elementforaltlanguage."' set to fields '".join(',', $extralanguages->attributes[$elementforaltlanguage])."' -->\n";
 					$this->fetchValuesForExtraLanguages();
-					if (!is_object($form)) $form = new Form($this->db);
+					if (!is_object($form)) {
+						$form = new Form($this->db);
+					}
 					$htmltext = '';
 					// If there is extra languages
 					foreach ($arrayoflangcode as $extralangcode) {
@@ -717,7 +734,9 @@ 
 			$outdone++;
 		}
 
-		if (!empty($this->phone) || !empty($this->phone_pro) || !empty($this->phone_mobile) || !empty($this->phone_perso) || !empty($this->fax) || !empty($this->office_phone) || !empty($this->user_mobile) || !empty($this->office_fax)) $out .= ($outdone ? '<br>' : '');
+		if (!empty($this->phone) || !empty($this->phone_pro) || !empty($this->phone_mobile) || !empty($this->phone_perso) || !empty($this->fax) || !empty($this->office_phone) || !empty($this->user_mobile) || !empty($this->office_fax)) {
+			$out .= ($outdone ? '<br>' : '');
+		}
 		if (!empty($this->phone) && empty($this->phone_pro)) {		// For objects that store pro phone into ->phone
 			$out .= dol_print_phone($this->phone, $this->country_code, $contactid, $thirdpartyid, 'AC_TEL', '&nbsp;', 'phone', $langs->trans("PhonePro")); $outdone++;
 		}
@@ -743,7 +762,9 @@ 
 			$out .= dol_print_phone($this->office_fax, $this->country_code, $contactid, $thirdpartyid, 'AC_FAX', '&nbsp;', 'fax', $langs->trans("Fax")); $outdone++;
 		}
 
-		if ($out) $out .= '<div style="clear: both;"></div>';
+		if ($out) {
+			$out .= '<div style="clear: both;"></div>';
+		}
 		$outdone = 0;
 		if (!empty($this->email))
 		{
@@ -767,15 +788,25 @@ 
 					$outdone++;
 				}
 			} else {
-				if ($this->skype) $outsocialnetwork .= dol_print_socialnetworks($this->skype, $this->id, $object->id, 'skype');
+				if ($this->skype) {
+					$outsocialnetwork .= dol_print_socialnetworks($this->skype, $this->id, $object->id, 'skype');
+				}
 				$outdone++;
-				if ($this->jabberid) $outsocialnetwork .= dol_print_socialnetworks($this->jabberid, $this->id, $object->id, 'jabber');
+				if ($this->jabberid) {
+					$outsocialnetwork .= dol_print_socialnetworks($this->jabberid, $this->id, $object->id, 'jabber');
+				}
 				$outdone++;
-				if ($this->twitter) $outsocialnetwork .= dol_print_socialnetworks($this->twitter, $this->id, $object->id, 'twitter');
+				if ($this->twitter) {
+					$outsocialnetwork .= dol_print_socialnetworks($this->twitter, $this->id, $object->id, 'twitter');
+				}
 				$outdone++;
-				if ($this->facebook) $outsocialnetwork .= dol_print_socialnetworks($this->facebook, $this->id, $object->id, 'facebook');
+				if ($this->facebook) {
+					$outsocialnetwork .= dol_print_socialnetworks($this->facebook, $this->id, $object->id, 'facebook');
+				}
 				$outdone++;
-				if ($this->linkedin) $outsocialnetwork .= dol_print_socialnetworks($this->linkedin, $this->id, $object->id, 'linkedin');
+				if ($this->linkedin) {
+					$outsocialnetwork .= dol_print_socialnetworks($this->linkedin, $this->id, $object->id, 'linkedin');
+				}
 				$outdone++;
 			}
 
@@ -784,8 +815,11 @@ 
 			}
 		}
 
-		if ($out) return '<!-- BEGIN part to show address block -->'."\n".$out.'<!-- END Part to show address block -->'."\n";
-		else return '';
+		if ($out) {
+			return '<!-- BEGIN part to show address block -->'."\n".$out.'<!-- END Part to show address block -->'."\n";
+		} else {
+			return '';
+		}
 	}
 
 	/**
@@ -838,7 +872,9 @@ 
 					$this->errors = $ecmfile->errors;
 				}
 				*/
-			} else return '';
+			} else {
+				return '';
+			}
 		} elseif (empty($ecmfile->share))
 		{
 			// Add entry into index
@@ -847,7 +883,9 @@ 
 				require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
 				$ecmfile->share = getRandomPassword(true);
 				$ecmfile->update($user);
-			} else return '';
+			} else {
+				return '';
+			}
 		}
 		// Define $urlwithroot
 		$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
@@ -863,8 +901,13 @@ 
 		//if (! empty($modulepart)) $paramlink.=($paramlink?'&':'').'modulepart='.$modulepart;		// For sharing with hash (so public files), modulepart is not required.
 		//if (! empty($ecmfile->entity)) $paramlink.='&entity='.$ecmfile->entity; 					// For sharing with hash (so public files), entity is not required.
 		//$paramlink.=($paramlink?'&':'').'file='.urlencode($filepath);								// No need of name of file for public link, we will use the hash
-		if (!empty($ecmfile->share)) $paramlink .= ($paramlink ? '&' : '').'hashp='.$ecmfile->share; // Hash for public share
-		if ($forcedownload) $paramlink .= ($paramlink ? '&' : '').'attachment=1';
+		if (!empty($ecmfile->share)) {
+			$paramlink .= ($paramlink ? '&' : '').'hashp='.$ecmfile->share;
+		}
+		// Hash for public share
+		if ($forcedownload) {
+			$paramlink .= ($paramlink ? '&' : '').'attachment=1';
+		}
 
 		if ($relativelink)
 		{
@@ -928,7 +971,9 @@ 
 			if ($resql)
 			{
 				$obj = $this->db->fetch_object($resql);
-				if ($obj) $id_type_contact = $obj->rowid;
+				if ($obj) {
+					$id_type_contact = $obj->rowid;
+				}
 			}
 		}
 
@@ -992,7 +1037,9 @@ 
 					return -1;
 				}
 			}
-		} else return 0;
+		} else {
+			return 0;
+		}
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -1034,8 +1081,12 @@ 
 		// Insert into database
 		$sql = "UPDATE ".MAIN_DB_PREFIX."element_contact set";
 		$sql .= " statut = ".$statut;
-		if ($type_contact_id) $sql .= ", fk_c_type_contact = ".((int) $type_contact_id);
-		if ($fk_socpeople) $sql .= ", fk_socpeople = ".((int) $fk_socpeople);
+		if ($type_contact_id) {
+			$sql .= ", fk_c_type_contact = ".((int) $type_contact_id);
+		}
+		if ($fk_socpeople) {
+			$sql .= ", fk_socpeople = ".((int) $fk_socpeople);
+		}
 		$sql .= " where rowid = ".$rowid;
 		$resql = $this->db->query($sql);
 		if ($resql)
@@ -1106,8 +1157,9 @@ 
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."element_contact";
 		$sql .= " WHERE element_id = ".$this->id;
-		if ($listId)
-			$sql .= " AND fk_c_type_contact IN (".$listId.")";
+		if ($listId) {
+					$sql .= " AND fk_c_type_contact IN (".$listId.")";
+		}
 
 		dol_syslog(get_class($this)."::delete_linked_contact", LOG_DEBUG);
 		if ($this->db->query($sql))
@@ -1137,22 +1189,38 @@ 
 		$tab = array();
 
 		$sql = "SELECT ec.rowid, ec.statut as statuslink, ec.fk_socpeople as id, ec.fk_c_type_contact"; // This field contains id of llx_socpeople or id of llx_user
-		if ($source == 'internal') $sql .= ", '-1' as socid, t.statut as statuscontact, t.login, t.photo";
-		if ($source == 'external' || $source == 'thirdparty') $sql .= ", t.fk_soc as socid, t.statut as statuscontact";
+		if ($source == 'internal') {
+			$sql .= ", '-1' as socid, t.statut as statuscontact, t.login, t.photo";
+		}
+		if ($source == 'external' || $source == 'thirdparty') {
+			$sql .= ", t.fk_soc as socid, t.statut as statuscontact";
+		}
 		$sql .= ", t.civility as civility, t.lastname as lastname, t.firstname, t.email";
 		$sql .= ", tc.source, tc.element, tc.code, tc.libelle";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_type_contact tc";
 		$sql .= ", ".MAIN_DB_PREFIX."element_contact ec";
-		if ($source == 'internal') $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user t on ec.fk_socpeople = t.rowid";
-		if ($source == 'external' || $source == 'thirdparty') $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople t on ec.fk_socpeople = t.rowid";
+		if ($source == 'internal') {
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user t on ec.fk_socpeople = t.rowid";
+		}
+		if ($source == 'external' || $source == 'thirdparty') {
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople t on ec.fk_socpeople = t.rowid";
+		}
 		$sql .= " WHERE ec.element_id =".$this->id;
 		$sql .= " AND ec.fk_c_type_contact=tc.rowid";
 		$sql .= " AND tc.element='".$this->db->escape($this->element)."'";
-		if ($code) $sql .= " AND tc.code = '".$this->db->escape($code)."'";
-		if ($source == 'internal') $sql .= " AND tc.source = 'internal'";
-		if ($source == 'external' || $source == 'thirdparty') $sql .= " AND tc.source = 'external'";
+		if ($code) {
+			$sql .= " AND tc.code = '".$this->db->escape($code)."'";
+		}
+		if ($source == 'internal') {
+			$sql .= " AND tc.source = 'internal'";
+		}
+		if ($source == 'external' || $source == 'thirdparty') {
+			$sql .= " AND tc.source = 'external'";
+		}
 		$sql .= " AND tc.active=1";
-		if ($status >= 0) $sql .= " AND ec.statut = ".$status;
+		if ($status >= 0) {
+			$sql .= " AND ec.statut = ".$status;
+		}
 		$sql .= " ORDER BY t.lastname ASC";
 
 		dol_syslog(get_class($this)."::liste_contact", LOG_DEBUG);
@@ -1238,16 +1306,27 @@ 
 		// phpcs:enable
 		global $langs;
 
-		if (empty($order)) $order = 'position';
-		if ($order == 'position') $order .= ',code';
+		if (empty($order)) {
+			$order = 'position';
+		}
+		if ($order == 'position') {
+			$order .= ',code';
+		}
 
 		$tab = array();
 		$sql = "SELECT DISTINCT tc.rowid, tc.code, tc.libelle, tc.position";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_type_contact as tc";
 		$sql .= " WHERE tc.element='".$this->db->escape($this->element)."'";
-		if ($activeonly == 1) $sql .= " AND tc.active=1"; // only the active types
-		if (!empty($source) && $source != 'all') $sql .= " AND tc.source='".$this->db->escape($source)."'";
-		if (!empty($code)) $sql .= " AND tc.code='".$this->db->escape($code)."'";
+		if ($activeonly == 1) {
+			$sql .= " AND tc.active=1";
+		}
+		// only the active types
+		if (!empty($source) && $source != 'all') {
+			$sql .= " AND tc.source='".$this->db->escape($source)."'";
+		}
+		if (!empty($code)) {
+			$sql .= " AND tc.code='".$this->db->escape($code)."'";
+		}
 		$sql .= $this->db->order($order, 'ASC');
 
 		//print "sql=".$sql;
@@ -1262,8 +1341,11 @@ 
 
 				$transkey = "TypeContact_".$this->element."_".$source."_".$obj->code;
 				$libelle_type = ($langs->trans($transkey) != $transkey ? $langs->trans($transkey) : $obj->libelle);
-				if (empty($option)) $tab[$obj->rowid] = $libelle_type;
-				else $tab[$obj->code] = $libelle_type;
+				if (empty($option)) {
+					$tab[$obj->rowid] = $libelle_type;
+				} else {
+					$tab[$obj->code] = $libelle_type;
+				}
 				$i++;
 			}
 			return $tab;
@@ -1306,14 +1388,18 @@ 
 			$sqlWhere[] = " tc.element <> '".$this->db->escape($excludeelement)."'";
 		}
 
-		if ($activeonly == 1)
-			$sqlWhere[] = " tc.active=1"; // only the active types
+		if ($activeonly == 1) {
+					$sqlWhere[] = " tc.active=1";
+		}
+		// only the active types
 
-		if (!empty($source) && $source != 'all')
-			$sqlWhere[] = " tc.source='".$this->db->escape($source)."'";
+		if (!empty($source) && $source != 'all') {
+					$sqlWhere[] = " tc.source='".$this->db->escape($source)."'";
+		}
 
-		if (!empty($code))
-			$sqlWhere[] = " tc.code='".$this->db->escape($code)."'";
+		if (!empty($code)) {
+					$sqlWhere[] = " tc.code='".$this->db->escape($code)."'";
+		}
 
 		if (count($sqlWhere) > 0) {
 			$sql .= " WHERE ".implode(' AND ', $sqlWhere);
@@ -1343,9 +1429,11 @@ 
 						$libelle_element = $langs->trans('ContactDefault_'.$obj->element);
 						$transkey = "TypeContact_".$obj->element."_".$source."_".$obj->code;
 						$libelle_type = ($langs->trans($transkey) != $transkey ? $langs->trans($transkey) : $obj->libelle);
-						if (empty($option))
+						if (empty($option)) {
+													$tab[$obj->rowid] = $libelle_element.' - '.$libelle_type;
+						} else {
 							$tab[$obj->rowid] = $libelle_element.' - '.$libelle_type;
-						else $tab[$obj->rowid] = $libelle_element.' - '.$libelle_type;
+						}
 					}
 				}
 			}
@@ -1387,19 +1475,31 @@ 
 
 		$sql = "SELECT ec.fk_socpeople";
 		$sql .= " FROM ".MAIN_DB_PREFIX."element_contact as ec,";
-		if ($source == 'internal') $sql .= " ".MAIN_DB_PREFIX."user as c,";
-		if ($source == 'external') $sql .= " ".MAIN_DB_PREFIX."socpeople as c,";
+		if ($source == 'internal') {
+			$sql .= " ".MAIN_DB_PREFIX."user as c,";
+		}
+		if ($source == 'external') {
+			$sql .= " ".MAIN_DB_PREFIX."socpeople as c,";
+		}
 		$sql .= " ".MAIN_DB_PREFIX."c_type_contact as tc";
 		$sql .= " WHERE ec.element_id = ".$id;
 		$sql .= " AND ec.fk_socpeople = c.rowid";
-		if ($source == 'internal') $sql .= " AND c.entity IN (".getEntity('user').")";
-		if ($source == 'external') $sql .= " AND c.entity IN (".getEntity('societe').")";
+		if ($source == 'internal') {
+			$sql .= " AND c.entity IN (".getEntity('user').")";
+		}
+		if ($source == 'external') {
+			$sql .= " AND c.entity IN (".getEntity('societe').")";
+		}
 		$sql .= " AND ec.fk_c_type_contact = tc.rowid";
 		$sql .= " AND tc.element = '".$this->db->escape($element)."'";
 		$sql .= " AND tc.source = '".$this->db->escape($source)."'";
-		if ($code) $sql .= " AND tc.code = '".$this->db->escape($code)."'";
+		if ($code) {
+			$sql .= " AND tc.code = '".$this->db->escape($code)."'";
+		}
 		$sql .= " AND tc.active = 1";
-		if ($status) $sql .= " AND ec.statut = ".$status;
+		if ($status) {
+			$sql .= " AND ec.statut = ".$status;
+		}
 
 		dol_syslog(get_class($this)."::getIdContact", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -1428,9 +1528,13 @@ 
 	public function fetch_contact($contactid = null)
 	{
 		// phpcs:enable
-		if (empty($contactid)) $contactid = $this->contact_id;
+		if (empty($contactid)) {
+			$contactid = $this->contact_id;
+		}
 
-		if (empty($contactid)) return 0;
+		if (empty($contactid)) {
+			return 0;
+		}
 
 		require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 		$contact = new Contact($this->db);
@@ -1451,14 +1555,16 @@ 
 		// phpcs:enable
 		global $conf;
 
-		if (empty($this->socid) && empty($this->fk_soc) && empty($this->fk_thirdparty) && empty($force_thirdparty_id))
-			return 0;
+		if (empty($this->socid) && empty($this->fk_soc) && empty($this->fk_thirdparty) && empty($force_thirdparty_id)) {
+					return 0;
+		}
 
 		require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 
 		$idtofetch = isset($this->socid) ? $this->socid : (isset($this->fk_soc) ? $this->fk_soc : $this->fk_thirdparty);
-		if ($force_thirdparty_id)
-			$idtofetch = $force_thirdparty_id;
+		if ($force_thirdparty_id) {
+					$idtofetch = $force_thirdparty_id;
+		}
 
 		if ($idtofetch) {
 			$thirdparty = new Societe($this->db);
@@ -1471,7 +1577,9 @@ 
 			}
 
 			return $result;
-		} else return -1;
+		} else {
+			return -1;
+		}
 	}
 
 
@@ -1517,18 +1625,24 @@ 
 		dol_syslog(get_class($this).'::fetch_barcode this->element='.$this->element.' this->barcode_type='.$this->barcode_type);
 
 		$idtype = $this->barcode_type;
-		if (empty($idtype) && $idtype != '0')	// If type of barcode no set, we try to guess. If set to '0' it means we forced to have type remain not defined
+		if (empty($idtype) && $idtype != '0') {
+			// If type of barcode no set, we try to guess. If set to '0' it means we forced to have type remain not defined
 		{
 			if ($this->element == 'product')      $idtype = $conf->global->PRODUIT_DEFAULT_BARCODE_TYPE;
-			elseif ($this->element == 'societe') $idtype = $conf->global->GENBARCODE_BARCODETYPE_THIRDPARTY;
-			else dol_syslog('Call fetch_barcode with barcode_type not defined and cant be guessed', LOG_WARNING);
+		} elseif ($this->element == 'societe') {
+				$idtype = $conf->global->GENBARCODE_BARCODETYPE_THIRDPARTY;
+			} else {
+				dol_syslog('Call fetch_barcode with barcode_type not defined and cant be guessed', LOG_WARNING);
+			}
 		}
 
 		if ($idtype > 0)
 		{
-			if (empty($this->barcode_type) || empty($this->barcode_type_code) || empty($this->barcode_type_label) || empty($this->barcode_type_coder))    // If data not already loaded
+			if (empty($this->barcode_type) || empty($this->barcode_type_code) || empty($this->barcode_type_label) || empty($this->barcode_type_coder)) {
+				// If data not already loaded
 			{
 				$sql = "SELECT rowid, code, libelle as label, coder";
+			}
 				$sql .= " FROM ".MAIN_DB_PREFIX."c_barcode_type";
 				$sql .= " WHERE rowid = ".$idtype;
 				dol_syslog(get_class($this).'::fetch_barcode', LOG_DEBUG);
@@ -1561,8 +1675,13 @@ 
 		// phpcs:enable
 		include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 
-		if (empty($this->fk_project) && !empty($this->fk_projet)) $this->fk_project = $this->fk_projet; // For backward compatibility
-		if (empty($this->fk_project)) return 0;
+		if (empty($this->fk_project) && !empty($this->fk_projet)) {
+			$this->fk_project = $this->fk_projet;
+		}
+		// For backward compatibility
+		if (empty($this->fk_project)) {
+			return 0;
+		}
 
 		$project = new Project($this->db);
 		$result = $project->fetch($this->fk_project);
@@ -1583,7 +1702,9 @@ 
 		// phpcs:enable
 		include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 
-		if (empty($this->fk_product)) return 0;
+		if (empty($this->fk_product)) {
+			return 0;
+		}
 
 		$product = new Product($this->db);
 		$result = $product->fetch($this->fk_product);
@@ -1617,9 +1738,15 @@ 
 	public function fetch_origin()
 	{
 		// phpcs:enable
-		if ($this->origin == 'shipping') $this->origin = 'expedition';
-		if ($this->origin == 'delivery') $this->origin = 'livraison';
-		if ($this->origin == 'order_supplier') $this->origin = 'commandeFournisseur';
+		if ($this->origin == 'shipping') {
+			$this->origin = 'expedition';
+		}
+		if ($this->origin == 'delivery') {
+			$this->origin = 'livraison';
+		}
+		if ($this->origin == 'order_supplier') {
+			$this->origin = 'commandeFournisseur';
+		}
 
 		$origin = $this->origin;
 
@@ -1711,29 +1838,48 @@ 
 	{
 		global $user, $langs, $conf;
 
-		if (empty($table)) 	  $table = $this->table_element;
-		if (empty($id))    	  $id = $this->id;
-		if (empty($format))   $format = 'text';
-		if (empty($id_field)) $id_field = 'rowid';
+		if (empty($table)) {
+			$table = $this->table_element;
+		}
+		if (empty($id)) {
+			$id = $this->id;
+		}
+		if (empty($format)) {
+			$format = 'text';
+		}
+		if (empty($id_field)) {
+			$id_field = 'rowid';
+		}
 
 		$error = 0;
 
 		$this->db->begin();
 
 		// Special case
-		if ($table == 'product' && $field == 'note_private') $field = 'note';
-		if (in_array($table, array('actioncomm', 'adherent', 'advtargetemailing', 'cronjob', 'establishment'))) $fk_user_field = 'fk_user_mod';
+		if ($table == 'product' && $field == 'note_private') {
+			$field = 'note';
+		}
+		if (in_array($table, array('actioncomm', 'adherent', 'advtargetemailing', 'cronjob', 'establishment'))) {
+			$fk_user_field = 'fk_user_mod';
+		}
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$table." SET ";
 
-		if ($format == 'text') $sql .= $field." = '".$this->db->escape($value)."'";
-		elseif ($format == 'int') $sql .= $field." = ".$this->db->escape($value);
-		elseif ($format == 'date') $sql .= $field." = ".($value ? "'".$this->db->idate($value)."'" : "null");
+		if ($format == 'text') {
+			$sql .= $field." = '".$this->db->escape($value)."'";
+		} elseif ($format == 'int') {
+			$sql .= $field." = ".$this->db->escape($value);
+		} elseif ($format == 'date') {
+			$sql .= $field." = ".($value ? "'".$this->db->idate($value)."'" : "null");
+		}
 
 		if ($fk_user_field)
 		{
-			if (!empty($fuser) && is_object($fuser)) $sql .= ", ".$fk_user_field." = ".$fuser->id;
-			elseif (empty($fuser) || $fuser != 'none') $sql .= ", ".$fk_user_field." = ".$user->id;
+			if (!empty($fuser) && is_object($fuser)) {
+				$sql .= ", ".$fk_user_field." = ".$fuser->id;
+			} elseif (empty($fuser) || $fuser != 'none') {
+				$sql .= ", ".$fk_user_field." = ".$user->id;
+			}
 		}
 
 		$sql .= " WHERE ".$id_field." = ".$id;
@@ -1751,13 +1897,20 @@ 
 				} else {
 					$result = $this->fetchCommon($id);
 				}
-				if ($result >= 0) $result = $this->call_trigger($trigkey, (!empty($fuser) && is_object($fuser)) ? $fuser : $user); // This may set this->errors
-				if ($result < 0) $error++;
+				if ($result >= 0) {
+					$result = $this->call_trigger($trigkey, (!empty($fuser) && is_object($fuser)) ? $fuser : $user);
+				}
+				// This may set this->errors
+				if ($result < 0) {
+					$error++;
+				}
 			}
 
 			if (!$error)
 			{
-				if (property_exists($this, $field)) $this->$field = $value;
+				if (property_exists($this, $field)) {
+					$this->$field = $value;
+				}
 				$this->db->commit();
 				return 1;
 			} else {
@@ -1790,16 +1943,23 @@ 
 			dol_print_error('', get_class($this)."::load_previous_next_ref was called on objet with property table_element not defined");
 			return -1;
 		}
-		if ($fieldid == 'none') return 1;
+		if ($fieldid == 'none') {
+			return 1;
+		}
 
 		// Security on socid
 		$socid = 0;
-		if ($user->socid > 0) $socid = $user->socid;
+		if ($user->socid > 0) {
+			$socid = $user->socid;
+		}
 
 		// this->ismultientitymanaged contains
 		// 0=No test on entity, 1=Test with field entity, 'field@table'=Test with link by field@table
 		$aliastablesociete = 's';
-		if ($this->element == 'societe') $aliastablesociete = 'te'; // te as table_element
+		if ($this->element == 'societe') {
+			$aliastablesociete = 'te';
+		}
+		// te as table_element
 
 		$sql = "SELECT MAX(te.".$fieldid.")";
 		$sql .= " FROM ".(empty($nodbprefix) ?MAIN_DB_PREFIX:'').$this->table_element." as te";
@@ -1809,21 +1969,39 @@ 
 		if (isset($this->ismultientitymanaged) && !is_numeric($this->ismultientitymanaged)) {
 			$tmparray = explode('@', $this->ismultientitymanaged);
 			$sql .= ", ".MAIN_DB_PREFIX.$tmparray[1]." as ".($tmparray[1] == 'societe' ? 's' : 'parenttable'); // If we need to link to this table to limit select to entity
-		} elseif ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe as s"; // If we need to link to societe to limit select to socid
-		elseif ($this->restrictiononfksoc == 2 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON te.fk_soc = s.rowid"; // If we need to link to societe to limit select to socid
-		if ($this->restrictiononfksoc && !$user->rights->societe->client->voir && !$socid)  $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON ".$aliastablesociete.".rowid = sc.fk_soc";
+		} elseif ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) {
+			$sql .= ", ".MAIN_DB_PREFIX."societe as s";
+		}
+		// If we need to link to societe to limit select to socid
+		elseif ($this->restrictiononfksoc == 2 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) {
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON te.fk_soc = s.rowid";
+		}
+		// If we need to link to societe to limit select to socid
+		if ($this->restrictiononfksoc && !$user->rights->societe->client->voir && !$socid) {
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON ".$aliastablesociete.".rowid = sc.fk_soc";
+		}
 		$sql .= " WHERE te.".$fieldid." < '".$this->db->escape($fieldid == 'rowid' ? $this->id : $this->ref)."'"; // ->ref must always be defined (set to id if field does not exists)
-		if ($this->restrictiononfksoc == 1 && !$user->rights->societe->client->voir && !$socid) $sql .= " AND sc.fk_user = ".$user->id;
-		if ($this->restrictiononfksoc == 2 && !$user->rights->societe->client->voir && !$socid) $sql .= " AND (sc.fk_user = ".$user->id.' OR te.fk_soc IS NULL)';
+		if ($this->restrictiononfksoc == 1 && !$user->rights->societe->client->voir && !$socid) {
+			$sql .= " AND sc.fk_user = ".$user->id;
+		}
+		if ($this->restrictiononfksoc == 2 && !$user->rights->societe->client->voir && !$socid) {
+			$sql .= " AND (sc.fk_user = ".$user->id.' OR te.fk_soc IS NULL)';
+		}
 		if (!empty($filter))
 		{
-			if (!preg_match('/^\s*AND/i', $filter)) $sql .= " AND "; // For backward compatibility
+			if (!preg_match('/^\s*AND/i', $filter)) {
+				$sql .= " AND ";
+			}
+			// For backward compatibility
 			$sql .= $filter;
 		}
 		if (isset($this->ismultientitymanaged) && !is_numeric($this->ismultientitymanaged)) {
 			$tmparray = explode('@', $this->ismultientitymanaged);
 			$sql .= ' AND te.'.$tmparray[0].' = '.($tmparray[1] == 'societe' ? 's' : 'parenttable').'.rowid'; // If we need to link to this table to limit select to entity
-		} elseif ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql .= ' AND te.fk_soc = s.rowid'; // If we need to link to societe to limit select to socid
+		} elseif ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) {
+			$sql .= ' AND te.fk_soc = s.rowid';
+		}
+		// If we need to link to societe to limit select to socid
 		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) {
 			if ($this->element == 'user' && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
 				if (!empty($user->admin) && empty($user->entity) && $conf->entity == 1) {
@@ -1840,9 +2018,15 @@ 
 			$tmparray = explode('@', $this->ismultientitymanaged);
 			$sql .= ' AND parenttable.entity IN ('.getEntity($tmparray[1]).')';
 		}
-		if ($this->restrictiononfksoc == 1 && $socid && $this->element != 'societe') $sql .= ' AND te.fk_soc = '.$socid;
-		if ($this->restrictiononfksoc == 2 && $socid && $this->element != 'societe') $sql .= ' AND (te.fk_soc = '.$socid.' OR te.fk_soc IS NULL)';
-		if ($this->restrictiononfksoc && $socid && $this->element == 'societe') $sql .= ' AND te.rowid = '.$socid;
+		if ($this->restrictiononfksoc == 1 && $socid && $this->element != 'societe') {
+			$sql .= ' AND te.fk_soc = '.$socid;
+		}
+		if ($this->restrictiononfksoc == 2 && $socid && $this->element != 'societe') {
+			$sql .= ' AND (te.fk_soc = '.$socid.' OR te.fk_soc IS NULL)';
+		}
+		if ($this->restrictiononfksoc && $socid && $this->element == 'societe') {
+			$sql .= ' AND te.rowid = '.$socid;
+		}
 		//print 'socid='.$socid.' restrictiononfksoc='.$this->restrictiononfksoc.' ismultientitymanaged = '.$this->ismultientitymanaged.' filter = '.$filter.' -> '.$sql."<br>";
 
 		$result = $this->db->query($sql);
@@ -1862,21 +2046,39 @@ 
 		if (isset($this->ismultientitymanaged) && !is_numeric($this->ismultientitymanaged)) {
 			$tmparray = explode('@', $this->ismultientitymanaged);
 			$sql .= ", ".MAIN_DB_PREFIX.$tmparray[1]." as ".($tmparray[1] == 'societe' ? 's' : 'parenttable'); // If we need to link to this table to limit select to entity
-		} elseif ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe as s"; // If we need to link to societe to limit select to socid
-		elseif ($this->restrictiononfksoc == 2 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON te.fk_soc = s.rowid"; // If we need to link to societe to limit select to socid
-		if ($this->restrictiononfksoc && !$user->rights->societe->client->voir && !$socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON ".$aliastablesociete.".rowid = sc.fk_soc";
+		} elseif ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) {
+			$sql .= ", ".MAIN_DB_PREFIX."societe as s";
+		}
+		// If we need to link to societe to limit select to socid
+		elseif ($this->restrictiononfksoc == 2 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) {
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON te.fk_soc = s.rowid";
+		}
+		// If we need to link to societe to limit select to socid
+		if ($this->restrictiononfksoc && !$user->rights->societe->client->voir && !$socid) {
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON ".$aliastablesociete.".rowid = sc.fk_soc";
+		}
 		$sql .= " WHERE te.".$fieldid." > '".$this->db->escape($fieldid == 'rowid' ? $this->id : $this->ref)."'"; // ->ref must always be defined (set to id if field does not exists)
-		if ($this->restrictiononfksoc == 1 && !$user->rights->societe->client->voir && !$socid) $sql .= " AND sc.fk_user = ".$user->id;
-		if ($this->restrictiononfksoc == 2 && !$user->rights->societe->client->voir && !$socid) $sql .= " AND (sc.fk_user = ".$user->id.' OR te.fk_soc IS NULL)';
+		if ($this->restrictiononfksoc == 1 && !$user->rights->societe->client->voir && !$socid) {
+			$sql .= " AND sc.fk_user = ".$user->id;
+		}
+		if ($this->restrictiononfksoc == 2 && !$user->rights->societe->client->voir && !$socid) {
+			$sql .= " AND (sc.fk_user = ".$user->id.' OR te.fk_soc IS NULL)';
+		}
 		if (!empty($filter))
 		{
-			if (!preg_match('/^\s*AND/i', $filter)) $sql .= " AND "; // For backward compatibility
+			if (!preg_match('/^\s*AND/i', $filter)) {
+				$sql .= " AND ";
+			}
+			// For backward compatibility
 			$sql .= $filter;
 		}
 		if (isset($this->ismultientitymanaged) && !is_numeric($this->ismultientitymanaged)) {
 			$tmparray = explode('@', $this->ismultientitymanaged);
 			$sql .= ' AND te.'.$tmparray[0].' = '.($tmparray[1] == 'societe' ? 's' : 'parenttable').'.rowid'; // If we need to link to this table to limit select to entity
-		} elseif ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql .= ' AND te.fk_soc = s.rowid'; // If we need to link to societe to limit select to socid
+		} elseif ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) {
+			$sql .= ' AND te.fk_soc = s.rowid';
+		}
+		// If we need to link to societe to limit select to socid
 		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) {
 			if ($this->element == 'user' && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
 				if (!empty($user->admin) && empty($user->entity) && $conf->entity == 1) {
@@ -1893,9 +2095,15 @@ 
 			$tmparray = explode('@', $this->ismultientitymanaged);
 			$sql .= ' AND parenttable.entity IN ('.getEntity($tmparray[1]).')';
 		}
-		if ($this->restrictiononfksoc == 1 && $socid && $this->element != 'societe') $sql .= ' AND te.fk_soc = '.$socid;
-		if ($this->restrictiononfksoc == 2 && $socid && $this->element != 'societe') $sql .= ' AND (te.fk_soc = '.$socid.' OR te.fk_soc IS NULL)';
-		if ($this->restrictiononfksoc && $socid && $this->element == 'societe') $sql .= ' AND te.rowid = '.$socid;
+		if ($this->restrictiononfksoc == 1 && $socid && $this->element != 'societe') {
+			$sql .= ' AND te.fk_soc = '.$socid;
+		}
+		if ($this->restrictiononfksoc == 2 && $socid && $this->element != 'societe') {
+			$sql .= ' AND (te.fk_soc = '.$socid.' OR te.fk_soc IS NULL)';
+		}
+		if ($this->restrictiononfksoc && $socid && $this->element == 'societe') {
+			$sql .= ' AND te.rowid = '.$socid;
+		}
 		//print 'socid='.$socid.' restrictiononfksoc='.$this->restrictiononfksoc.' ismultientitymanaged = '.$this->ismultientitymanaged.' filter = '.$filter.' -> '.$sql."<br>";
 		// Rem: Bug in some mysql version: SELECT MIN(rowid) FROM llx_socpeople WHERE rowid > 1 when one row in database with rowid=1, returns 1 instead of null
 
@@ -1927,8 +2135,11 @@ 
 		$i = 0;
 		while ($i < $num)
 		{
-			if ($source == 'thirdparty') $contactAlreadySelected[$i] = $tab[$i]['socid'];
-			else $contactAlreadySelected[$i] = $tab[$i]['id'];
+			if ($source == 'thirdparty') {
+				$contactAlreadySelected[$i] = $tab[$i]['socid'];
+			} else {
+				$contactAlreadySelected[$i] = $tab[$i]['id'];
+			}
 			$i++;
 		}
 		return $contactAlreadySelected;
@@ -1950,20 +2161,29 @@ 
 		}
 
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
-		if (!empty($this->fields['fk_project']))		// Common case
+		if (!empty($this->fields['fk_project'])) {
+			// Common case
 		{
 			if ($projectid) $sql .= ' SET fk_project = '.$projectid;
-			else $sql .= ' SET fk_project = NULL';
+		} else {
+				$sql .= ' SET fk_project = NULL';
+			}
 			$sql .= ' WHERE rowid = '.$this->id;
-		} elseif ($this->table_element == 'actioncomm')	// Special case for actioncomm
+		} elseif ($this->table_element == 'actioncomm') {
+			// Special case for actioncomm
 		{
 			if ($projectid) $sql .= ' SET fk_project = '.$projectid;
-			else $sql .= ' SET fk_project = NULL';
+		} else {
+				$sql .= ' SET fk_project = NULL';
+			}
 			$sql .= ' WHERE id = '.$this->id;
 		} else // Special case for old architecture objects
 		{
-			if ($projectid) $sql .= ' SET fk_projet = '.$projectid;
-			else $sql .= ' SET fk_projet = NULL';
+			if ($projectid) {
+				$sql .= ' SET fk_projet = '.$projectid;
+			} else {
+				$sql .= ' SET fk_projet = NULL';
+			}
 			$sql .= ' WHERE rowid = '.$this->id;
 		}
 
@@ -1991,8 +2211,12 @@ 
 		{
 			// TODO uniformize field name
 			$fieldname = 'fk_mode_reglement';
-			if ($this->element == 'societe') $fieldname = 'mode_reglement';
-			if (get_class($this) == 'Fournisseur') $fieldname = 'mode_reglement_supplier';
+			if ($this->element == 'societe') {
+				$fieldname = 'mode_reglement';
+			}
+			if (get_class($this) == 'Fournisseur') {
+				$fieldname = 'mode_reglement_supplier';
+			}
 
 			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
 			$sql .= ' SET '.$fieldname.' = '.(($id > 0 || $id == '0') ? $id : 'NULL');
@@ -2002,7 +2226,9 @@ 
 			{
 				$this->mode_reglement_id = $id;
 				// for supplier
-				if (get_class($this) == 'Fournisseur') $this->mode_reglement_supplier_id = $id;
+				if (get_class($this) == 'Fournisseur') {
+					$this->mode_reglement_supplier_id = $id;
+				}
 				return 1;
 			} else {
 				dol_syslog(get_class($this).'::setPaymentMethods Error '.$sql.' - '.$this->db->error());
@@ -2038,7 +2264,9 @@ 
 				$this->multicurrency_code = $code;
 
 				list($fk_multicurrency, $rate) = MultiCurrency::getIdAndTxFromCode($this->db, $code);
-				if ($rate) $this->setMulticurrencyRate($rate, 2);
+				if ($rate) {
+					$this->setMulticurrencyRate($rate, 2);
+				}
 
 				return 1;
 			} else {
@@ -2170,8 +2398,12 @@ 
 		{
 			// TODO uniformize field name
 			$fieldname = 'fk_cond_reglement';
-			if ($this->element == 'societe') $fieldname = 'cond_reglement';
-			if (get_class($this) == 'Fournisseur') $fieldname = 'cond_reglement_supplier';
+			if ($this->element == 'societe') {
+				$fieldname = 'cond_reglement';
+			}
+			if (get_class($this) == 'Fournisseur') {
+				$fieldname = 'cond_reglement_supplier';
+			}
 
 			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
 			$sql .= ' SET '.$fieldname.' = '.(($id > 0 || $id == '0') ? $id : 'NULL');
@@ -2181,7 +2413,9 @@ 
 			{
 				$this->cond_reglement_id = $id;
 				// for supplier
-				if (get_class($this) == 'Fournisseur') $this->cond_reglement_supplier_id = $id;
+				if (get_class($this) == 'Fournisseur') {
+					$this->cond_reglement_supplier_id = $id;
+				}
 				$this->cond_reglement = $id; // for compatibility
 				return 1;
 			} else {
@@ -2208,8 +2442,12 @@ 
         if ($this->statut >= 0 || $this->element == 'societe')
         {
             $fieldname = 'fk_transport_mode';
-            if ($this->element == 'societe') $fieldname = 'transport_mode';
-            if (get_class($this) == 'Fournisseur') $fieldname = 'transport_mode_supplier';
+            if ($this->element == 'societe') {
+            	$fieldname = 'transport_mode';
+            }
+            if (get_class($this) == 'Fournisseur') {
+            	$fieldname = 'transport_mode_supplier';
+            }
 
             $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
             $sql .= ' SET '.$fieldname.' = '.(($id > 0 || $id == '0') ? $id : 'NULL');
@@ -2219,7 +2457,9 @@ 
             {
                 $this->transport_mode_id = $id;
                 // for supplier
-                if (get_class($this) == 'Fournisseur') $this->transport_mode_supplier_id = $id;
+                if (get_class($this) == 'Fournisseur') {
+                	$this->transport_mode_supplier_id = $id;
+                }
                 return 1;
             } else {
                 dol_syslog(get_class($this).'::setTransportMode Error '.$sql.' - '.$this->db->error());
@@ -2276,7 +2516,9 @@ 
 	public function setDeliveryAddress($id)
 	{
 		$fieldname = 'fk_delivery_address';
-		if ($this->element == 'delivery' || $this->element == 'shipping') $fieldname = 'fk_address';
+		if ($this->element == 'delivery' || $this->element == 'shipping') {
+			$fieldname = 'fk_address';
+		}
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET ".$fieldname." = ".$id;
 		$sql .= " WHERE rowid = ".$this->id." AND fk_statut = 0";
@@ -2306,7 +2548,9 @@ 
 	{
 		global $user;
 
-		if (empty($userused)) $userused = $user;
+		if (empty($userused)) {
+			$userused = $user;
+		}
 
 		$error = 0;
 
@@ -2317,7 +2561,9 @@ 
 
 		$this->db->begin();
 
-		if ($shipping_method_id < 0) $shipping_method_id = 'NULL';
+		if ($shipping_method_id < 0) {
+			$shipping_method_id = 'NULL';
+		}
 		dol_syslog(get_class($this).'::setShippingMethod('.$shipping_method_id.')');
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
@@ -2334,7 +2580,9 @@ 
 				// Call trigger
 				$this->context = array('shippingmethodupdate'=>1);
 				$result = $this->call_trigger(strtoupper(get_class($this)).'_MODIFY', $userused);
-				if ($result < 0) $error++;
+				if ($result < 0) {
+					$error++;
+				}
 				// End call trigger
 			}
 		}
@@ -2362,7 +2610,9 @@ 
 			dol_syslog(get_class($this)."::setWarehouse was called on objet with property table_element not defined", LOG_ERR);
 			return -1;
 		}
-		if ($warehouse_id < 0) $warehouse_id = 'NULL';
+		if ($warehouse_id < 0) {
+			$warehouse_id = 'NULL';
+		}
 		dol_syslog(get_class($this).'::setWarehouse('.$warehouse_id.')');
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
@@ -2429,7 +2679,9 @@ 
 	{
 		global $user;
 
-		if (empty($userused)) $userused = $user;
+		if (empty($userused)) {
+			$userused = $user;
+		}
 
 		$error = 0;
 
@@ -2439,7 +2691,9 @@ 
 		}
 		$this->db->begin();
 
-		if ($fk_account < 0) $fk_account = 'NULL';
+		if ($fk_account < 0) {
+			$fk_account = 'NULL';
+		}
 		dol_syslog(get_class($this).'::setBankAccount('.$fk_account.')');
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
@@ -2458,7 +2712,9 @@ 
 				// Call trigger
 				$this->context = array('bankaccountupdate'=>1);
 				$result = $this->call_trigger(strtoupper(get_class($this)).'_MODIFY', $userused);
-				if ($result < 0) $error++;
+				if ($result < 0) {
+					$error++;
+				}
 				// End call trigger
 			}
 		}
@@ -2504,8 +2760,12 @@ 
 		$nl = 0;
 		$sql = 'SELECT count(rowid) FROM '.MAIN_DB_PREFIX.$this->table_element_line;
 		$sql .= ' WHERE '.$this->fk_element.'='.$this->id;
-		if (!$renum) $sql .= ' AND rang = 0';
-		if ($renum) $sql .= ' AND rang <> 0';
+		if (!$renum) {
+			$sql .= ' AND rang = 0';
+		}
+		if ($renum) {
+			$sql .= ' AND rang <> 0';
+		}
 
 		dol_syslog(get_class($this)."::line_order", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -2513,7 +2773,9 @@ 
 		{
 			$row = $this->db->fetch_row($resql);
 			$nl = $row[0];
-		} else dol_print_error($this->db);
+		} else {
+			dol_print_error($this->db);
+		}
 		if ($nl > 0)
 		{
 			// The goal of this part is to reorder all lines, with all children lines sharing the same
@@ -2523,7 +2785,9 @@ 
 			// We first search all lines that are parent lines (for multilevel details lines)
 			$sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.$this->table_element_line;
 			$sql .= ' WHERE '.$this->fk_element.' = '.$this->id;
-			if ($fk_parent_line) $sql .= ' AND fk_parent_line IS NULL';
+			if ($fk_parent_line) {
+				$sql .= ' AND fk_parent_line IS NULL';
+			}
 			$sql .= ' ORDER BY rang ASC, rowid '.$rowidorder;
 
 			dol_syslog(get_class($this)."::line_order search all parent lines", LOG_DEBUG);
@@ -2585,7 +2849,9 @@ 
 			if ($this->db->num_rows($resql) > 0) {
 				while ($row = $this->db->fetch_row($resql)) {
 					$rows[] = $row[0];
-					if (!empty($includealltree)) $rows = array_merge($rows, $this->getChildrenOfLine($row[0]), $includealltree);
+					if (!empty($includealltree)) {
+						$rows = array_merge($rows, $this->getChildrenOfLine($row[0]), $includealltree);
+					}
 				}
 			}
 		}
@@ -2645,7 +2911,9 @@ 
 	public function updateRangOfLine($rowid, $rang)
 	{
 		$fieldposition = 'rang'; // @todo Rename 'rang' into 'position'
-		if (in_array($this->table_element_line, array('bom_bomline', 'ecm_files', 'emailcollector_emailcollectoraction'))) $fieldposition = 'position';
+		if (in_array($this->table_element_line, array('bom_bomline', 'ecm_files', 'emailcollector_emailcollectoraction'))) {
+			$fieldposition = 'position';
+		}
 
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element_line.' SET '.$fieldposition.' = '.$rang;
 		$sql .= ' WHERE rowid = '.$rowid;
@@ -2686,7 +2954,9 @@ 
 		if ($rang > 1)
 		{
 			$fieldposition = 'rang';
-			if (in_array($this->table_element_line, array('ecm_files', 'emailcollector_emailcollectoraction'))) $fieldposition = 'position';
+			if (in_array($this->table_element_line, array('ecm_files', 'emailcollector_emailcollectoraction'))) {
+				$fieldposition = 'position';
+			}
 
 			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element_line.' SET '.$fieldposition.' = '.$rang;
 			$sql .= ' WHERE '.$this->fk_element.' = '.$this->id;
@@ -2718,7 +2988,9 @@ 
 		if ($rang < $max)
 		{
 			$fieldposition = 'rang';
-			if (in_array($this->table_element_line, array('ecm_files', 'emailcollector_emailcollectoraction'))) $fieldposition = 'position';
+			if (in_array($this->table_element_line, array('ecm_files', 'emailcollector_emailcollectoraction'))) {
+				$fieldposition = 'position';
+			}
 
 			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element_line.' SET '.$fieldposition.' = '.$rang;
 			$sql .= ' WHERE '.$this->fk_element.' = '.$this->id;
@@ -2787,7 +3059,9 @@ 
 	{
 		// phpcs:enable
 		$positionfield = 'rang';
-		if ($this->table_element == 'bom') $positionfield = 'position';
+		if ($this->table_element == 'bom') {
+			$positionfield = 'position';
+		}
 
 		// Search the last rang with fk_parent_line
 		if ($fk_parent_line)
@@ -2884,7 +3158,9 @@ 
 		$newsuffix = $suffix;
 
 		// Special cas
-		if ($this->table_element == 'product' && $newsuffix == '_private') $newsuffix = '';
+		if ($this->table_element == 'product' && $newsuffix == '_private') {
+			$newsuffix = '';
+		}
 
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
 		$sql .= " SET note".$newsuffix." = ".(!empty($note) ? ("'".$this->db->escape($note)."'") : "NULL");
@@ -2894,9 +3170,11 @@ 
 		dol_syslog(get_class($this)."::update_note", LOG_DEBUG);
 		if ($this->db->query($sql))
 		{
-			if ($suffix == '_public') $this->note_public = $note;
-			elseif ($suffix == '_private') $this->note_private = $note;
-			else {
+			if ($suffix == '_public') {
+				$this->note_public = $note;
+			} elseif ($suffix == '_private') {
+				$this->note_private = $note;
+			} else {
 				$this->note = $note; // deprecated
 				$this->note_private = $note;
 			}
@@ -2948,36 +3226,45 @@ 
 
 		// Some external module want no update price after a trigger because they have another method to calculate the total (ex: with an extrafield)
 		$MODULE = "";
-		if ($this->element == 'propal')
-			$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_PROPOSAL";
-		elseif ($this->element == 'commande' || $this->element == 'order')
-			$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_ORDER";
-		elseif ($this->element == 'facture' || $this->element == 'invoice')
-			$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_INVOICE";
-		elseif ($this->element == 'facture_fourn' || $this->element == 'supplier_invoice' || $this->element == 'invoice_supplier')
-			$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_SUPPLIER_INVOICE";
-		elseif ($this->element == 'order_supplier' || $this->element == 'supplier_order')
-			$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_SUPPLIER_ORDER";
-		elseif ($this->element == 'supplier_proposal')
-			$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_SUPPLIER_PROPOSAL";
+		if ($this->element == 'propal') {
+					$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_PROPOSAL";
+		} elseif ($this->element == 'commande' || $this->element == 'order') {
+					$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_ORDER";
+		} elseif ($this->element == 'facture' || $this->element == 'invoice') {
+					$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_INVOICE";
+		} elseif ($this->element == 'facture_fourn' || $this->element == 'supplier_invoice' || $this->element == 'invoice_supplier') {
+					$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_SUPPLIER_INVOICE";
+		} elseif ($this->element == 'order_supplier' || $this->element == 'supplier_order') {
+					$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_SUPPLIER_ORDER";
+		} elseif ($this->element == 'supplier_proposal') {
+					$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_SUPPLIER_PROPOSAL";
+		}
 
 		if (!empty($MODULE)) {
 			if (!empty($conf->global->$MODULE)) {
 				$modsactivated = explode(',', $conf->global->$MODULE);
 				foreach ($modsactivated as $mod) {
-					if ($conf->$mod->enabled)
-						return 1; // update was disabled by specific setup
+					if ($conf->$mod->enabled) {
+											return 1;
+					}
+					// update was disabled by specific setup
 				}
 			}
 		}
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
 
-		if ($roundingadjust == '-1') $roundingadjust = 'auto'; // For backward compatibility
+		if ($roundingadjust == '-1') {
+			$roundingadjust = 'auto';
+		}
+		// For backward compatibility
 
 		$forcedroundingmode = $roundingadjust;
-		if ($forcedroundingmode == 'auto' && isset($conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND)) $forcedroundingmode = $conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND;
-		elseif ($forcedroundingmode == 'auto') $forcedroundingmode = '0';
+		if ($forcedroundingmode == 'auto' && isset($conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND)) {
+			$forcedroundingmode = $conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND;
+		} elseif ($forcedroundingmode == 'auto') {
+			$forcedroundingmode = '0';
+		}
 
 		$error = 0;
 
@@ -3000,15 +3287,22 @@ 
 
 		$sql = 'SELECT rowid, qty, '.$fieldup.' as up, remise_percent, total_ht, '.$fieldtva.' as total_tva, total_ttc, '.$fieldlocaltax1.' as total_localtax1, '.$fieldlocaltax2.' as total_localtax2,';
 		$sql .= ' tva_tx as vatrate, localtax1_tx, localtax2_tx, localtax1_type, localtax2_type, info_bits, product_type';
-		if ($this->table_element_line == 'facturedet') $sql .= ', situation_percent';
+		if ($this->table_element_line == 'facturedet') {
+			$sql .= ', situation_percent';
+		}
 		$sql .= ', multicurrency_total_ht, multicurrency_total_tva, multicurrency_total_ttc';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element_line;
 		$sql .= ' WHERE '.$this->fk_element.' = '.$this->id;
 		if ($exclspec)
 		{
 			$product_field = 'product_type';
-			if ($this->table_element_line == 'contratdet') $product_field = ''; // contratdet table has no product_type field
-			if ($product_field) $sql .= ' AND '.$product_field.' <> 9';
+			if ($this->table_element_line == 'contratdet') {
+				$product_field = '';
+			}
+			// contratdet table has no product_type field
+			if ($product_field) {
+				$sql .= ' AND '.$product_field.' <> 9';
+			}
 		}
 		$sql .= ' ORDER by rowid'; // We want to be sure to always use same order of line to not change lines differently when option MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND is used
 
@@ -3038,10 +3332,12 @@ 
 				$parameters = array('fk_element' => $obj->rowid);
 				$reshook = $hookmanager->executeHooks('changeRoundingMode', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 
-				if (empty($reshook) && $forcedroundingmode == '0')	// Check if data on line are consistent. This may solve lines that were not consistent because set with $forcedroundingmode='auto'
+				if (empty($reshook) && $forcedroundingmode == '0') {
+					// Check if data on line are consistent. This may solve lines that were not consistent because set with $forcedroundingmode='auto'
 				{
 					// This part of code is to fix data. We should not call it too often.
 					$localtax_array = array($obj->localtax1_type, $obj->localtax1_tx, $obj->localtax2_type, $obj->localtax2_tx);
+				}
 					$tmpcal = calcul_price_total($obj->qty, $obj->up, $obj->remise_percent, $obj->vatrate, $obj->localtax1_tx, $obj->localtax2_tx, 0, 'HT', $obj->info_bits, $obj->product_type, $seller, $localtax_array, (isset($obj->situation_percent) ? $obj->situation_percent : 100), $multicurrency_tx);
 
 					$diff_when_using_price_ht = price2num($tmpcal[1] - $obj->total_tva, 'MT', 1); // If price was set with tax price adn unit price HT has a low number of digits, then we may have a diff on recalculation from unit price HT.
@@ -3054,7 +3350,9 @@ 
 						$sqlfix = "UPDATE ".MAIN_DB_PREFIX.$this->table_element_line." SET ".$fieldtva." = ".$tmpcal[1].", total_ttc = ".$tmpcal[2]." WHERE rowid = ".$obj->rowid;
 						dol_syslog('We found unconsistent data into detailed line (diff_when_using_price_ht = '.$diff_when_using_price_ht.' and diff_on_current_total = '.$diff_on_current_total.') for line rowid = '.$obj->rowid." (total vat of line calculated=".$tmpcal[1].", database=".$obj->total_tva."). We fix the total_vat and total_ttc of line by running sqlfix = ".$sqlfix, LOG_WARNING);
 						$resqlfix = $this->db->query($sqlfix);
-						if (!$resqlfix) dol_print_error($this->db, 'Failed to update line');
+						if (!$resqlfix) {
+							dol_print_error($this->db, 'Failed to update line');
+						}
 						$obj->total_tva = $tmpcal[1];
 						$obj->total_ttc = $tmpcal[2];
 					}
@@ -3069,16 +3367,24 @@ 
 				$this->multicurrency_total_tva       += $obj->multicurrency_total_tva;
 				$this->multicurrency_total_ttc       += $obj->multicurrency_total_ttc;
 
-				if (!isset($total_ht_by_vats[$obj->vatrate]))  $total_ht_by_vats[$obj->vatrate] = 0;
-				if (!isset($total_tva_by_vats[$obj->vatrate])) $total_tva_by_vats[$obj->vatrate] = 0;
-				if (!isset($total_ttc_by_vats[$obj->vatrate])) $total_ttc_by_vats[$obj->vatrate] = 0;
+				if (!isset($total_ht_by_vats[$obj->vatrate])) {
+					$total_ht_by_vats[$obj->vatrate] = 0;
+				}
+				if (!isset($total_tva_by_vats[$obj->vatrate])) {
+					$total_tva_by_vats[$obj->vatrate] = 0;
+				}
+				if (!isset($total_ttc_by_vats[$obj->vatrate])) {
+					$total_ttc_by_vats[$obj->vatrate] = 0;
+				}
 				$total_ht_by_vats[$obj->vatrate]  += $obj->total_ht;
 				$total_tva_by_vats[$obj->vatrate] += $obj->total_tva;
 				$total_ttc_by_vats[$obj->vatrate] += $obj->total_ttc;
 
-				if ($forcedroundingmode == '1')	// Check if we need adjustement onto line for vat. TODO This works on the company currency but not on multicurrency
+				if ($forcedroundingmode == '1') {
+					// Check if we need adjustement onto line for vat. TODO This works on the company currency but not on multicurrency
 				{
 					$tmpvat = price2num($total_ht_by_vats[$obj->vatrate] * $obj->vatrate / 100, 'MT', 1);
+				}
 					$diff = price2num($total_tva_by_vats[$obj->vatrate] - $tmpvat, 'MT', 1);
 					//print 'Line '.$i.' rowid='.$obj->rowid.' vat_rate='.$obj->vatrate.' total_ht='.$obj->total_ht.' total_tva='.$obj->total_tva.' total_ttc='.$obj->total_ttc.' total_ht_by_vats='.$total_ht_by_vats[$obj->vatrate].' total_tva_by_vats='.$total_tva_by_vats[$obj->vatrate].' (new calculation = '.$tmpvat.') total_ttc_by_vats='.$total_ttc_by_vats[$obj->vatrate].($diff?" => DIFF":"")."<br>\n";
 					if ($diff)
@@ -3092,7 +3398,9 @@ 
 						$sqlfix = "UPDATE ".MAIN_DB_PREFIX.$this->table_element_line." SET ".$fieldtva." = ".($obj->total_tva - $diff).", total_ttc = ".($obj->total_ttc - $diff)." WHERE rowid = ".$obj->rowid;
 						dol_syslog('We found a difference of '.$diff.' for line rowid = '.$obj->rowid.". We fix the total_vat and total_ttc of line by running sqlfix = ".$sqlfix);
 								$resqlfix = $this->db->query($sqlfix);
-								if (!$resqlfix) dol_print_error($this->db, 'Failed to update line');
+								if (!$resqlfix) {
+									dol_print_error($this->db, 'Failed to update line');
+								}
 								$this->total_tva -= $diff;
 								$this->total_ttc -= $diff;
 								$total_tva_by_vats[$obj->vatrate] -= $diff;
@@ -3133,11 +3441,21 @@ 
 			$fieldlocaltax2 = 'localtax2';
 			$fieldttc = 'total_ttc';
 			// Specific code for backward compatibility with old field names
-			if ($this->element == 'facture' || $this->element == 'facturerec')             $fieldht = 'total';
-			if ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier') $fieldtva = 'total_tva';
-			if ($this->element == 'propal')                                                $fieldttc = 'total';
-			if ($this->element == 'expensereport')                                         $fieldtva = 'total_tva';
-			if ($this->element == 'supplier_proposal')                                     $fieldttc = 'total';
+			if ($this->element == 'facture' || $this->element == 'facturerec') {
+				$fieldht = 'total';
+			}
+			if ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier') {
+				$fieldtva = 'total_tva';
+			}
+			if ($this->element == 'propal') {
+				$fieldttc = 'total';
+			}
+			if ($this->element == 'expensereport') {
+				$fieldtva = 'total_tva';
+			}
+			if ($this->element == 'supplier_proposal') {
+				$fieldttc = 'total';
+			}
 
 			if (empty($nodatabaseupdate))
 			{
@@ -3191,10 +3509,18 @@ 
 		$origin_id = (!empty($origin_id) ? $origin_id : $this->origin_id);
 
 		// Special case
-		if ($origin == 'order') $origin = 'commande';
-		if ($origin == 'invoice') $origin = 'facture';
-		if ($origin == 'invoice_template') $origin = 'facturerec';
-		if ($origin == 'supplierorder') $origin = 'order_supplier';
+		if ($origin == 'order') {
+			$origin = 'commande';
+		}
+		if ($origin == 'invoice') {
+			$origin = 'facture';
+		}
+		if ($origin == 'invoice_template') {
+			$origin = 'facturerec';
+		}
+		if ($origin == 'supplierorder') {
+			$origin = 'order_supplier';
+		}
 		$this->db->begin();
 
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."element_element (";
@@ -3258,12 +3584,16 @@ 
 		if (!empty($sourceid) && !empty($sourcetype) && empty($targetid))
 		{
 			$justsource = true; // the source (id and type) is a search criteria
-			if (!empty($targettype)) $withtargettype = true;
+			if (!empty($targettype)) {
+				$withtargettype = true;
+			}
 		}
 		if (!empty($targetid) && !empty($targettype) && empty($sourceid))
 		{
 			$justtarget = true; // the target (id and type) is a search criteria
-			if (!empty($sourcetype)) $withsourcetype = true;
+			if (!empty($sourcetype)) {
+				$withsourcetype = true;
+			}
 		}
 
 		$sourceid = (!empty($sourceid) ? $sourceid : $this->id);
@@ -3286,11 +3616,15 @@ 
 			if ($justsource)
 			{
 				$sql .= "fk_source = ".$sourceid." AND sourcetype = '".$this->db->escape($sourcetype)."'";
-				if ($withtargettype) $sql .= " AND targettype = '".$this->db->escape($targettype)."'";
+				if ($withtargettype) {
+					$sql .= " AND targettype = '".$this->db->escape($targettype)."'";
+				}
 			} elseif ($justtarget)
 			{
 				$sql .= "fk_target = ".$targetid." AND targettype = '".$this->db->escape($targettype)."'";
-				if ($withsourcetype) $sql .= " AND sourcetype = '".$this->db->escape($sourcetype)."'";
+				if ($withsourcetype) {
+					$sql .= " AND sourcetype = '".$this->db->escape($sourcetype)."'";
+				}
 			}
 		} else {
 			$sql .= "(fk_source = ".$sourceid." AND sourcetype = '".$this->db->escape($sourcetype)."')";
@@ -3332,10 +3666,12 @@ 
 			if (!empty($this->linkedObjectsIds))
 			{
 				$tmparray = $this->linkedObjectsIds;
-				foreach ($tmparray as $objecttype => $objectids)       // $objecttype is a module name ('facture', 'mymodule', ...) or a module name with a suffix ('project_task', 'mymodule_myobj', ...)
+				foreach ($tmparray as $objecttype => $objectids) {
+					// $objecttype is a module name ('facture', 'mymodule', ...) or a module name with a suffix ('project_task', 'mymodule_myobj', ...)
 				{
 					// Parse element/subelement (ex: project_task, cabinetmed_consultation, ...)
 					$module = $element = $subelement = $objecttype;
+				}
 					if ($objecttype != 'supplier_proposal' && $objecttype != 'order_supplier' && $objecttype != 'invoice_supplier'
 						&& preg_match('/^([^_]+)_([^_]+)/i', $objecttype, $regs))
 					{
@@ -3395,9 +3731,11 @@ 
 							//print '/'.$classpath.'/'.$classfile.'.class.php '.class_exists($classname);
 							if (class_exists($classname))
 							{
-								foreach ($objectids as $i => $objectid)	// $i is rowid into llx_element_element
+								foreach ($objectids as $i => $objectid) {
+									// $i is rowid into llx_element_element
 								{
 									$object = new $classname($this->db);
+								}
 									$ret = $object->fetch($objectid);
 									if ($ret >= 0)
 									{
@@ -3433,8 +3771,11 @@ 
 		$updatesource = false;
 		$updatetarget = false;
 
-		if (!empty($sourceid) && !empty($sourcetype) && empty($targetid) && empty($targettype)) $updatesource = true;
-		elseif (empty($sourceid) && empty($sourcetype) && !empty($targetid) && !empty($targettype)) $updatetarget = true;
+		if (!empty($sourceid) && !empty($sourcetype) && empty($targetid) && empty($targettype)) {
+			$updatesource = true;
+		} elseif (empty($sourceid) && empty($sourcetype) && !empty($targetid) && !empty($targettype)) {
+			$updatetarget = true;
+		}
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."element_element SET ";
 		if ($updatesource)
@@ -3477,8 +3818,11 @@ 
 		$deletesource = false;
 		$deletetarget = false;
 
-		if (!empty($sourceid) && !empty($sourcetype) && empty($targetid) && empty($targettype)) $deletesource = true;
-		elseif (empty($sourceid) && empty($sourcetype) && !empty($targetid) && !empty($targettype)) $deletetarget = true;
+		if (!empty($sourceid) && !empty($sourcetype) && empty($targetid) && empty($targettype)) {
+			$deletesource = true;
+		} elseif (empty($sourceid) && empty($sourcetype) && !empty($targetid) && !empty($targettype)) {
+			$deletetarget = true;
+		}
 
 		$sourceid = (!empty($sourceid) ? $sourceid : $this->id);
 		$sourcetype = (!empty($sourcetype) ? $sourcetype : $this->element);
@@ -3538,18 +3882,34 @@ 
 		$this->db->begin();
 
 		$fieldstatus = "fk_statut";
-		if ($elementTable == 'facture_rec') $fieldstatus = "suspended";
-		if ($elementTable == 'mailing') $fieldstatus = "statut";
-		if ($elementTable == 'cronjob') $fieldstatus = "status";
-		if ($elementTable == 'user') $fieldstatus = "statut";
-		if ($elementTable == 'expensereport') $fieldstatus = "fk_statut";
-		if ($elementTable == 'commande_fournisseur_dispatch') $fieldstatus = "status";
-		if (is_array($this->fields) && array_key_exists('status', $this->fields)) $fieldstatus = 'status';
+		if ($elementTable == 'facture_rec') {
+			$fieldstatus = "suspended";
+		}
+		if ($elementTable == 'mailing') {
+			$fieldstatus = "statut";
+		}
+		if ($elementTable == 'cronjob') {
+			$fieldstatus = "status";
+		}
+		if ($elementTable == 'user') {
+			$fieldstatus = "statut";
+		}
+		if ($elementTable == 'expensereport') {
+			$fieldstatus = "fk_statut";
+		}
+		if ($elementTable == 'commande_fournisseur_dispatch') {
+			$fieldstatus = "status";
+		}
+		if (is_array($this->fields) && array_key_exists('status', $this->fields)) {
+			$fieldstatus = 'status';
+		}
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$elementTable;
 		$sql .= " SET ".$fieldstatus." = ".$status;
 		// If status = 1 = validated, update also fk_user_valid
-		if ($status == 1 && $elementTable == 'expensereport') $sql .= ", fk_user_valid = ".$user->id;
+		if ($status == 1 && $elementTable == 'expensereport') {
+			$sql .= ", fk_user_valid = ".$user->id;
+		}
 		$sql .= " WHERE rowid=".$elementId;
 
 		dol_syslog(get_class($this)."::setStatut", LOG_DEBUG);
@@ -3560,19 +3920,36 @@ 
 			// Try autoset of trigkey
 			if (empty($trigkey))
 			{
-				if ($this->element == 'supplier_proposal' && $status == 2) $trigkey = 'SUPPLIER_PROPOSAL_SIGN'; // 2 = SupplierProposal::STATUS_SIGNED. Can't use constant into this generic class
-				if ($this->element == 'supplier_proposal' && $status == 3) $trigkey = 'SUPPLIER_PROPOSAL_REFUSE'; // 3 = SupplierProposal::STATUS_REFUSED. Can't use constant into this generic class
-				if ($this->element == 'supplier_proposal' && $status == 4) $trigkey = 'SUPPLIER_PROPOSAL_CLOSE'; // 4 = SupplierProposal::STATUS_CLOSED. Can't use constant into this generic class
-				if ($this->element == 'fichinter' && $status == 3) $trigkey = 'FICHINTER_CLASSIFY_DONE';
-				if ($this->element == 'fichinter' && $status == 2) $trigkey = 'FICHINTER_CLASSIFY_BILLED';
-				if ($this->element == 'fichinter' && $status == 1) $trigkey = 'FICHINTER_CLASSIFY_UNBILLED';
+				if ($this->element == 'supplier_proposal' && $status == 2) {
+					$trigkey = 'SUPPLIER_PROPOSAL_SIGN';
+				}
+				// 2 = SupplierProposal::STATUS_SIGNED. Can't use constant into this generic class
+				if ($this->element == 'supplier_proposal' && $status == 3) {
+					$trigkey = 'SUPPLIER_PROPOSAL_REFUSE';
+				}
+				// 3 = SupplierProposal::STATUS_REFUSED. Can't use constant into this generic class
+				if ($this->element == 'supplier_proposal' && $status == 4) {
+					$trigkey = 'SUPPLIER_PROPOSAL_CLOSE';
+				}
+				// 4 = SupplierProposal::STATUS_CLOSED. Can't use constant into this generic class
+				if ($this->element == 'fichinter' && $status == 3) {
+					$trigkey = 'FICHINTER_CLASSIFY_DONE';
+				}
+				if ($this->element == 'fichinter' && $status == 2) {
+					$trigkey = 'FICHINTER_CLASSIFY_BILLED';
+				}
+				if ($this->element == 'fichinter' && $status == 1) {
+					$trigkey = 'FICHINTER_CLASSIFY_UNBILLED';
+				}
 			}
 
 			if ($trigkey)
 			{
 				// Call trigger
 				$result = $this->call_trigger($trigkey, $user);
-				if ($result < 0) $error++;
+				if ($result < 0) {
+					$error++;
+				}
 				// End call triggers
 			}
 
@@ -3580,9 +3957,11 @@ 
 			{
 				$this->db->commit();
 
-				if (empty($savElementId))    // If the element we update was $this (so $elementId is null)
+				if (empty($savElementId)) {
+					// If the element we update was $this (so $elementId is null)
 				{
 					$this->statut = $status;
+				}
 					$this->status = $status;
 				}
 
@@ -3611,8 +3990,13 @@ 
 	{
 		global $conf;
 
-		if (empty($id) && empty($ref)) return 0;
-		if (!empty($conf->global->MAIN_DISABLE_CANVAS)) return 0; // To increase speed. Not enabled by default.
+		if (empty($id) && empty($ref)) {
+			return 0;
+		}
+		if (!empty($conf->global->MAIN_DISABLE_CANVAS)) {
+			return 0;
+		}
+		// To increase speed. Not enabled by default.
 
 		// Clean parameters
 		$ref = trim($ref);
@@ -3620,8 +4004,12 @@ 
 		$sql = "SELECT rowid, canvas";
 		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element;
 		$sql .= " WHERE entity IN (".getEntity($this->element).")";
-		if (!empty($id))  $sql .= " AND rowid = ".$id;
-		if (!empty($ref)) $sql .= " AND ref = '".$this->db->escape($ref)."'";
+		if (!empty($id)) {
+			$sql .= " AND rowid = ".$id;
+		}
+		if (!empty($ref)) {
+			$sql .= " AND ref = '".$this->db->escape($ref)."'";
+		}
 
 		$resql = $this->db->query($sql);
 		if ($resql)
@@ -3631,7 +4019,9 @@ 
 			{
 				$this->canvas = $obj->canvas;
 				return 1;
-			} else return 0;
+			} else {
+				return 0;
+			}
 		} else {
 			dol_print_error($this->db);
 			return -1;
@@ -3668,7 +4058,9 @@ 
 	{
 		global $langs;
 
-		if (empty($id)) $id = $this->id;
+		if (empty($id)) {
+			$id = $this->id;
+		}
 
 		// Check parameters
 		if (!isset($this->childtables) || !is_array($this->childtables) || count($this->childtables) == 0)
@@ -3702,9 +4094,11 @@ 
 					$langs->load("errors");
 					//print 'Found into table '.$table.', type '.$langs->transnoentitiesnoconv($elementname).', haschild='.$haschild;
 					$haschild += $obj->nb;
-					if (is_numeric($elementname))	// old usage
+					if (is_numeric($elementname)) {
+						// old usage
 					{
 						$this->errors[] = $langs->trans("ErrorRecordHasAtLeastOneChildOfType", $table);
+					}
 					} else // new usage: $elementname=Translation key
 					{
 						$this->errors[] = $langs->trans("ErrorRecordHasAtLeastOneChildOfType", $langs->transnoentitiesnoconv($elementname));
@@ -3720,7 +4114,9 @@ 
 		{
 			$this->errors[] = "ErrorRecordHasChildren";
 			return $haschild;
-		} else return 0;
+		} else {
+			return 0;
+		}
 	}
 
 	/**
@@ -3736,12 +4132,24 @@ 
 		foreach ($this->lines as $key => $val)
 		{
 			$qualified = 0;
-			if ($predefined == -1) $qualified = 1;
-			if ($predefined == 1 && $val->fk_product > 0) $qualified = 1;
-			if ($predefined == 0 && $val->fk_product <= 0) $qualified = 1;
-			if ($predefined == 2 && $val->fk_product > 0 && $val->product_type == 0) $qualified = 1;
-			if ($predefined == 3 && $val->fk_product > 0 && $val->product_type == 1) $qualified = 1;
-			if ($qualified) $nb++;
+			if ($predefined == -1) {
+				$qualified = 1;
+			}
+			if ($predefined == 1 && $val->fk_product > 0) {
+				$qualified = 1;
+			}
+			if ($predefined == 0 && $val->fk_product <= 0) {
+				$qualified = 1;
+			}
+			if ($predefined == 2 && $val->fk_product > 0 && $val->product_type == 0) {
+				$qualified = 1;
+			}
+			if ($predefined == 3 && $val->fk_product > 0 && $val->product_type == 1) {
+				$qualified = 1;
+			}
+			if ($qualified) {
+				$nb++;
+			}
 		}
 		dol_syslog(get_class($this).'::hasProductsOrServices we found '.$nb.' qualified lines of products/servcies');
 		return $nb;
@@ -3805,16 +4213,24 @@ 
 		{
 			if (isset($line->qty_asked))
 			{
-				if (empty($totalOrdered)) $totalOrdered = 0; // Avoid warning because $totalOrdered is ''
+				if (empty($totalOrdered)) {
+					$totalOrdered = 0;
+				}
+				// Avoid warning because $totalOrdered is ''
 				$totalOrdered += $line->qty_asked; // defined for shipment only
 			}
 			if (isset($line->qty_shipped))
 			{
-				if (empty($totalToShip)) $totalToShip = 0; // Avoid warning because $totalToShip is ''
+				if (empty($totalToShip)) {
+					$totalToShip = 0;
+				}
+				// Avoid warning because $totalToShip is ''
 				$totalToShip += $line->qty_shipped; // defined for shipment only
 			} elseif ($line->element == 'commandefournisseurdispatch' && isset($line->qty))
 			{
-				if (empty($totalToShip)) $totalToShip = 0;
+				if (empty($totalToShip)) {
+					$totalToShip = 0;
+				}
 				$totalToShip += $line->qty; // defined for reception only
 			}
 
@@ -3838,16 +4254,28 @@ 
 
 			$weightUnit = 0;
 			$volumeUnit = 0;
-			if (!empty($weight_units)) $weightUnit = $weight_units;
-			if (!empty($volume_units)) $volumeUnit = $volume_units;
+			if (!empty($weight_units)) {
+				$weightUnit = $weight_units;
+			}
+			if (!empty($volume_units)) {
+				$volumeUnit = $volume_units;
+			}
 
-			if (empty($totalWeight)) $totalWeight = 0; // Avoid warning because $totalWeight is ''
-			if (empty($totalVolume)) $totalVolume = 0; // Avoid warning because $totalVolume is ''
+			if (empty($totalWeight)) {
+				$totalWeight = 0;
+			}
+			// Avoid warning because $totalWeight is ''
+			if (empty($totalVolume)) {
+				$totalVolume = 0;
+			}
+			// Avoid warning because $totalVolume is ''
 
 			//var_dump($line->volume_units);
-			if ($weight_units < 50)   // < 50 means a standard unit (power of 10 of official unit), > 50 means an exotic unit (like inch)
+			if ($weight_units < 50) {
+				// < 50 means a standard unit (power of 10 of official unit), > 50 means an exotic unit (like inch)
 			{
 				$trueWeightUnit = pow(10, $weightUnit);
+			}
 				$totalWeight += $weight * $qty * $trueWeightUnit;
 			} else {
 				if ($weight_units == 99) {
@@ -3862,10 +4290,12 @@ 
 					$totalWeight += $weight * $qty; // This may be wrong if we mix different units
 				}
 			}
-			if ($volume_units < 50)   // >50 means a standard unit (power of 10 of official unit), > 50 means an exotic unit (like inch)
+			if ($volume_units < 50) {
+				// >50 means a standard unit (power of 10 of official unit), > 50 means an exotic unit (like inch)
 			{
 				//print $line->volume."x".$line->volume_units."x".($line->volume_units < 50)."x".$volumeUnit;
 				$trueVolumeUnit = pow(10, $volumeUnit);
+			}
 				//print $line->volume;
 				$totalVolume += $volume * $qty * $trueVolumeUnit;
 			} else {
@@ -3952,7 +4382,9 @@ 
 			} else {
 				$res = include $tpl; // for debug
 			}
-			if ($res) break;
+			if ($res) {
+				break;
+			}
 		}
 	}
 
@@ -3983,7 +4415,9 @@ 
 
 		// Define usemargins
 		$usemargins = 0;
-		if (!empty($conf->margin->enabled) && !empty($this->element) && in_array($this->element, array('facture', 'facturerec', 'propal', 'commande'))) $usemargins = 1;
+		if (!empty($conf->margin->enabled) && !empty($this->element) && in_array($this->element, array('facture', 'facturerec', 'propal', 'commande'))) {
+			$usemargins = 1;
+		}
 
 		$num = count($this->lines);
 
@@ -4016,7 +4450,9 @@ 
 				} else {
 					$res = include $tpl; // for debug
 				}
-				if ($res) break;
+				if ($res) {
+					break;
+				}
 			}
 		}
 
@@ -4029,11 +4465,13 @@ 
 			$line->fetch_optionals();
 
 			//if (is_object($hookmanager) && (($line->product_type == 9 && ! empty($line->special_code)) || ! empty($line->fk_parent_line)))
-			if (is_object($hookmanager))   // Old code is commented on preceding line.
+			if (is_object($hookmanager)) {
+				// Old code is commented on preceding line.
 			{
 				if (empty($line->fk_parent_line))
 				{
 					$parameters = array('line'=>$line, 'num'=>$num, 'i'=>$i, 'dateSelector'=>$dateSelector, 'seller'=>$seller, 'buyer'=>$buyer, 'selected'=>$selected, 'table_element_line'=>$line->table_element);
+			}
 					$reshook = $hookmanager->executeHooks('printObjectLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 				} else {
 					$parameters = array('line'=>$line, 'num'=>$num, 'i'=>$i, 'dateSelector'=>$dateSelector, 'seller'=>$seller, 'buyer'=>$buyer, 'selected'=>$selected, 'table_element_line'=>$line->table_element, 'fk_parent_line'=>$line->fk_parent_line);
@@ -4107,8 +4545,13 @@ 
 
 					$outputlangs = $langs;
 					$newlang = '';
-					if (empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang = GETPOST('lang_id', 'aZ09');
-					if (!empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE) && empty($newlang) && is_object($this->thirdparty)) $newlang = $this->thirdparty->default_lang; // To use language of customer
+					if (empty($newlang) && GETPOST('lang_id', 'aZ09')) {
+						$newlang = GETPOST('lang_id', 'aZ09');
+					}
+					if (!empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE) && empty($newlang) && is_object($this->thirdparty)) {
+						$newlang = $this->thirdparty->default_lang;
+					}
+					// To use language of customer
 					if (!empty($newlang))
 					{
 						$outputlangs = new Translate("", $conf);
@@ -4144,7 +4587,9 @@ 
 				} else {
 					$res = include $tpl; // for debug
 				}
-				if ($res) break;
+				if ($res) {
+					break;
+				}
 			}
 		}
 
@@ -4173,7 +4618,9 @@ 
 				} else {
 					$res = include $tpl; // for debug
 				}
-				if ($res) break;
+				if ($res) {
+					break;
+				}
 			}
 		}
 	}
@@ -4201,7 +4648,9 @@ 
 		print '<td>'.$langs->trans('Description').'</td>';
 		print '<td class="right">'.$langs->trans('VATRate').'</td>';
 		print '<td class="right">'.$langs->trans('PriceUHT').'</td>';
-		if (!empty($conf->multicurrency->enabled)) print '<td class="right">'.$langs->trans('PriceUHTCurrency').'</td>';
+		if (!empty($conf->multicurrency->enabled)) {
+			print '<td class="right">'.$langs->trans('PriceUHTCurrency').'</td>';
+		}
 		print '<td class="right">'.$langs->trans('Qty').'</td>';
 		if ($conf->global->PRODUCT_USE_UNITS)
 		{
@@ -4256,24 +4705,32 @@ 
 			$date_start = $line->date_start;
 		} else {
 			$date_start = $line->date_debut_prevue;
-			if ($line->date_debut_reel) $date_start = $line->date_debut_reel;
+			if ($line->date_debut_reel) {
+				$date_start = $line->date_debut_reel;
+			}
 		}
 		if (!empty($line->date_end))
 		{
 			$date_end = $line->date_end;
 		} else {
 			$date_end = $line->date_fin_prevue;
-			if ($line->date_fin_reel) $date_end = $line->date_fin_reel;
+			if ($line->date_fin_reel) {
+				$date_end = $line->date_fin_reel;
+			}
 		}
 
 		$this->tpl['id'] = $line->id;
 
 		$this->tpl['label'] = '';
-		if (!empty($line->fk_parent_line)) $this->tpl['label'] .= img_picto('', 'rightarrow');
+		if (!empty($line->fk_parent_line)) {
+			$this->tpl['label'] .= img_picto('', 'rightarrow');
+		}
 
-		if (($line->info_bits & 2) == 2)  // TODO Not sure this is used for source object
+		if (($line->info_bits & 2) == 2) {
+			// TODO Not sure this is used for source object
 		{
 			$discount = new DiscountAbsolute($this->db);
+		}
 			$discount->fk_soc = $this->socid;
 			$this->tpl['label'] .= $discount->getNomUrl(0, 'discount');
 		} elseif (!empty($line->fk_product))
@@ -4311,14 +4768,18 @@ 
 
 		if (!empty($line->desc))
 		{
-			if ($line->desc == '(CREDIT_NOTE)')  // TODO Not sure this is used for source object
+			if ($line->desc == '(CREDIT_NOTE)') {
+				// TODO Not sure this is used for source object
 			{
 				$discount = new DiscountAbsolute($this->db);
+			}
 				$discount->fetch($line->fk_remise_except);
 				$this->tpl['description'] = $langs->transnoentities("DiscountFromCreditNote", $discount->getNomUrl(0));
-			} elseif ($line->desc == '(DEPOSIT)')  // TODO Not sure this is used for source object
+			} elseif ($line->desc == '(DEPOSIT)') {
+				// TODO Not sure this is used for source object
 			{
 				$discount = new DiscountAbsolute($this->db);
+			}
 				$discount->fetch($line->fk_remise_except);
 				$this->tpl['description'] = $langs->transnoentities("DiscountFromDeposit", $discount->getNomUrl(0));
 			} elseif ($line->desc == '(EXCESS RECEIVED)')
@@ -4341,17 +4802,23 @@ 
 		// VAT Rate
 		$this->tpl['vat_rate'] = vatrate($line->tva_tx, true);
 		$this->tpl['vat_rate'] .= (($line->info_bits & 1) == 1) ? '*' : '';
-		if (!empty($line->vat_src_code) && !preg_match('/\(/', $this->tpl['vat_rate'])) $this->tpl['vat_rate'] .= ' ('.$line->vat_src_code.')';
+		if (!empty($line->vat_src_code) && !preg_match('/\(/', $this->tpl['vat_rate'])) {
+			$this->tpl['vat_rate'] .= ' ('.$line->vat_src_code.')';
+		}
 
 		$this->tpl['price'] = price($line->subprice);
 		$this->tpl['multicurrency_price'] = price($line->multicurrency_subprice);
 		$this->tpl['qty'] = (($line->info_bits & 2) != 2) ? $line->qty : '&nbsp;';
-		if ($conf->global->PRODUCT_USE_UNITS) $this->tpl['unit'] = $langs->transnoentities($line->getLabelOfUnit('long'));
+		if ($conf->global->PRODUCT_USE_UNITS) {
+			$this->tpl['unit'] = $langs->transnoentities($line->getLabelOfUnit('long'));
+		}
 		$this->tpl['remise_percent'] = (($line->info_bits & 2) != 2) ? vatrate($line->remise_percent, true) : '&nbsp;';
 
 		// Is the line strike or not
 		$this->tpl['strike'] = 0;
-		if ($restrictlist == 'services' && $line->product_type != Product::TYPE_SERVICE) $this->tpl['strike'] = 1;
+		if ($restrictlist == 'services' && $line->product_type != Product::TYPE_SERVICE) {
+			$this->tpl['strike'] = 1;
+		}
 
 		// Output template part (modules that overwrite templates must declare this into descriptor)
 		// Use global variables + $dateSelector + $seller and $buyer
@@ -4370,7 +4837,9 @@ 
 			} else {
 				$res = include $tpl; // for debug
 			}
-			if ($res) break;
+			if ($res) {
+				break;
+			}
 		}
 	}
 
@@ -4521,13 +4990,20 @@ 
 			$classname = '';
 			$filefound = '';
 			$dirmodels = array('/');
-			if (is_array($conf->modules_parts['models'])) $dirmodels = array_merge($dirmodels, $conf->modules_parts['models']);
+			if (is_array($conf->modules_parts['models'])) {
+				$dirmodels = array_merge($dirmodels, $conf->modules_parts['models']);
+			}
 			foreach ($dirmodels as $reldir)
 			{
 				foreach (array('doc', 'pdf') as $prefix)
 				{
-					if (in_array(get_class($this), array('Adherent'))) $file = $prefix."_".$modele.".class.php"; // Member module use prefix_module.class.php
-					else $file = $prefix."_".$modele.".modules.php";
+					if (in_array(get_class($this), array('Adherent'))) {
+						$file = $prefix."_".$modele.".class.php";
+					}
+					// Member module use prefix_module.class.php
+					else {
+						$file = $prefix."_".$modele.".modules.php";
+					}
 
 					// On verifie l'emplacement du modele
 					$file = dol_buildpath($reldir.$modelspath.$file, 0);
@@ -4538,7 +5014,9 @@ 
 						break;
 					}
 				}
-				if ($filefound) break;
+				if ($filefound) {
+					break;
+				}
 			}
 
 			// If generator was found
@@ -4570,7 +5048,9 @@ 
 							if (is_dir($tmpdir))
 							{
 								$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '\.od(s|t)$', '', 'name', SORT_ASC, 0);
-								if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles);
+								if (count($tmpfiles)) {
+									$listoffiles = array_merge($listoffiles, $tmpfiles);
+								}
 							}
 						}
 
@@ -4630,9 +5110,11 @@ 
 						$destfile = basename($destfull);
 						$rel_dir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT, '/').'/', '', $upload_dir);
 
-						if (!preg_match('/[\\/]temp[\\/]|[\\/]thumbs|\.meta$/', $rel_dir))     // If not a tmp dir
+						if (!preg_match('/[\\/]temp[\\/]|[\\/]thumbs|\.meta$/', $rel_dir)) {
+							// If not a tmp dir
 						{
 							$filename = basename($destfile);
+						}
 							$rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
 							$rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
 
@@ -4645,8 +5127,12 @@ 
 							if ($this->element == 'propal')
 							{
 								$useonlinesignature = $conf->global->MAIN_FEATURES_LEVEL; // Replace this with 1 when feature to make online signature is ok
-								if ($useonlinesignature) $setsharekey = true;
-								if (!empty($conf->global->PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD)) $setsharekey = true;
+								if ($useonlinesignature) {
+									$setsharekey = true;
+								}
+								if (!empty($conf->global->PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD)) {
+									$setsharekey = true;
+								}
 							}
 							if ($this->element == 'commande' && !empty($conf->global->ORDER_ALLOW_EXTERNAL_DOWNLOAD)) {
 								$setsharekey = true;
@@ -4659,9 +5145,11 @@ 
 							}
 
 							if ($setsharekey) {
-								if (empty($ecmfile->share))	// Because object not found or share not set yet
+								if (empty($ecmfile->share)) {
+									// Because object not found or share not set yet
 								{
 									require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
+								}
 									$ecmfile->share = getRandomPassword(true);
 								}
 							}
@@ -4702,7 +5190,9 @@ 
 
 							// Update the last_main_doc field into main object (if documenent generator has property ->update_main_doc_field set)
 							$update_main_doc_field = 0;
-							if (!empty($obj->update_main_doc_field)) $update_main_doc_field = 1;
+							if (!empty($obj->update_main_doc_field)) {
+								$update_main_doc_field = 1;
+							}
 							if ($update_main_doc_field && !empty($this->table_element))
 							{
 								$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element." SET last_main_doc = '".$this->db->escape($ecmfile->filepath.'/'.$ecmfile->filename)."'";
@@ -4739,7 +5229,9 @@ 
 				}
 				return -1;
 			}
-		} else return $reshook;
+		} else {
+			return $reshook;
+		}
 	}
 
 	/**
@@ -4790,13 +5282,21 @@ 
 		global $conf, $_POST;
 
 		// If param here has been posted, we use this value first.
-		if (GETPOSTISSET($fieldname)) return GETPOST($fieldname, 'alphanohtml', 3);
+		if (GETPOSTISSET($fieldname)) {
+			return GETPOST($fieldname, 'alphanohtml', 3);
+		}
 
-		if (isset($alternatevalue)) return $alternatevalue;
+		if (isset($alternatevalue)) {
+			return $alternatevalue;
+		}
 
 		$newelement = $this->element;
-		if ($newelement == 'facture') $newelement = 'invoice';
-		if ($newelement == 'commande') $newelement = 'order';
+		if ($newelement == 'facture') {
+			$newelement = 'invoice';
+		}
+		if ($newelement == 'commande') {
+			$newelement = 'order';
+		}
 		if (empty($newelement))
 		{
 			dol_syslog("Ask a default value using common method getDefaultCreateValueForField on an object with no property ->element defined. Return empty string.", LOG_WARNING);
@@ -4805,7 +5305,9 @@ 
 
 		$keyforfieldname = strtoupper($newelement.'_DEFAULT_'.$fieldname);
 		//var_dump($keyforfieldname);
-		if (isset($conf->global->$keyforfieldname)) return $conf->global->$keyforfieldname;
+		if (isset($conf->global->$keyforfieldname)) {
+			return $conf->global->$keyforfieldname;
+		}
 
 		// TODO Ad here a scan into table llx_overwrite_default with a filter on $this->element and $fieldname
 	}
@@ -4878,7 +5380,10 @@ 
 		$this->array_languages = array();
 
 		$element = $this->element;
-		if ($element == 'categorie') $element = 'categories'; // For compatibility
+		if ($element == 'categorie') {
+			$element = 'categories';
+		}
+		// For compatibility
 
 		// Request to get translation values for object
 		$sql = "SELECT rowid, property, lang , value";
@@ -4915,8 +5420,11 @@ 
 
 			$this->db->free($resql);
 
-			if ($numrows) return $numrows;
-			else return 0;
+			if ($numrows) {
+				return $numrows;
+			} else {
+				return 0;
+			}
 		} else {
 			dol_print_error($this->db);
 			return -1;
@@ -4936,15 +5444,21 @@ 
 		// Get extra fields
 		foreach ($_POST as $postfieldkey => $postfieldvalue) {
 			$tmparray = explode('-', $postfieldkey);
-			if ($tmparray[0] != 'field') continue;
+			if ($tmparray[0] != 'field') {
+				continue;
+			}
 
 			$element = $tmparray[1];
 			$key = $tmparray[2];
 			$codelang = $tmparray[3];
 			//var_dump("postfieldkey=".$postfieldkey." element=".$element." key=".$key." codelang=".$codelang);
 
-			if (!empty($onlykey) && $key != $onlykey) continue;
-			if ($element != $this->element) continue;
+			if (!empty($onlykey) && $key != $onlykey) {
+				continue;
+			}
+			if ($element != $this->element) {
+				continue;
+			}
 
 			$key_type = $this->fields[$key]['type'];
 
@@ -4958,7 +5472,9 @@ 
 			{
 				$perms = dol_eval($this->fields[$key]['perms'], 1);
 			}*/
-			if (empty($enabled)) continue;
+			if (empty($enabled)) {
+				continue;
+			}
 			//if (empty($perms)) continue;
 
 			if (in_array($key_type, array('date')))
@@ -4985,7 +5501,9 @@ 
 				$value_key = price2num($value_arr);
 			} else {
 				$value_key = GETPOST($postfieldkey);
-				if (in_array($key_type, array('link')) && $value_key == '-1') $value_key = '';
+				if (in_array($key_type, array('link')) && $value_key == '-1') {
+					$value_key = '';
+				}
 			}
 
 			$this->array_languages[$key][$codelang] = $value_key;
@@ -5038,8 +5556,12 @@ 
 		// phpcs:enable
 		global $conf, $extrafields;
 
-		if (empty($rowid)) $rowid = $this->id;
-		if (empty($rowid)) $rowid = $this->rowid;
+		if (empty($rowid)) {
+			$rowid = $this->id;
+		}
+		if (empty($rowid)) {
+			$rowid = $this->rowid;
+		}
 
 		// To avoid SQL errors. Probably not the better solution though
 		if (!$this->table_element) {
@@ -5069,7 +5591,10 @@ 
 		}
 
 		$table_element = $this->table_element;
-		if ($table_element == 'categorie') $table_element = 'categories'; // For compatibility
+		if ($table_element == 'categorie') {
+			$table_element = 'categories';
+		}
+		// For compatibility
 
 		// Request to get complementary values
 		if (is_array($optionsArray) && count($optionsArray) > 0)
@@ -5126,8 +5651,11 @@ 
 
 				$this->db->free($resql);
 
-				if ($numrows) return $numrows;
-				else return 0;
+				if ($numrows) {
+					return $numrows;
+				} else {
+					return 0;
+				}
 			} else {
 				dol_print_error($this->db);
 				return -1;
@@ -5146,12 +5674,17 @@ 
 	{
 		global $conf;
 
-		if (!empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) return 0;
+		if (!empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) {
+			return 0;
+		}
 
 		$this->db->begin();
 
 		$table_element = $this->table_element;
-		if ($table_element == 'categorie') $table_element = 'categories'; // For compatibility
+		if ($table_element == 'categorie') {
+			$table_element = 'categories';
+		}
+		// For compatibility
 
 		$sql_del = "DELETE FROM ".MAIN_DB_PREFIX.$table_element."_extrafields WHERE fk_object = ".$this->id;
 		dol_syslog(get_class($this)."::deleteExtraFields delete", LOG_DEBUG);
@@ -5181,9 +5714,13 @@ 
 	{
 		global $conf, $langs, $user;
 
-		if (!empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) return 0;
+		if (!empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) {
+			return 0;
+		}
 
-		if (empty($userused)) $userused = $user;
+		if (empty($userused)) {
+			$userused = $user;
+		}
 
 		$error = 0;
 
@@ -5198,10 +5735,13 @@ 
 			//Eliminate copied source object extra_fields that do not exist in target object
 			$new_array_options = array();
 			foreach ($this->array_options as $key => $value) {
-				if (in_array(substr($key, 8), array_keys($target_extrafields)))	// We remove the 'options_' from $key for test
+				if (in_array(substr($key, 8), array_keys($target_extrafields))) {
+					// We remove the 'options_' from $key for test
 					$new_array_options[$key] = $value;
-				elseif (in_array($key, array_keys($target_extrafields)))		// We test on $key that does not contains the 'options_' prefix
+				} elseif (in_array($key, array_keys($target_extrafields))) {
+					// We test on $key that does not contains the 'options_' prefix
 					$new_array_options['options_'.$key] = $value;
+				}
 			}
 
 			foreach ($new_array_options as $key => $value)
@@ -5216,8 +5756,12 @@ 
 			   	if ($attributeRequired)
 			   	{
 			   		$mandatorypb = false;
-			   		if ($attributeType == 'link' && $this->array_options[$key] == '-1') $mandatorypb = true;
-			   		if ($this->array_options[$key] === '') $mandatorypb = true;
+			   		if ($attributeType == 'link' && $this->array_options[$key] == '-1') {
+			   			$mandatorypb = true;
+			   		}
+			   		if ($this->array_options[$key] === '') {
+			   			$mandatorypb = true;
+			   		}
 			   		if ($mandatorypb)
 			   		{
 			   			dol_syslog("Mandatory extra field ".$key." is empty");
@@ -5286,12 +5830,15 @@ 
 			   					//global $action;		// $action may be 'create', 'update', 'update_extras'...
 			   					//var_dump($action);
 			   					//var_dump($this->oldcopy);exit;
-			   					if (is_object($this->oldcopy))		// If this->oldcopy is not defined, we can't know if we change attribute or not, so we must keep value
+			   					if (is_object($this->oldcopy)) {
+			   						// If this->oldcopy is not defined, we can't know if we change attribute or not, so we must keep value
 			   					{
 			   						//var_dump($this->oldcopy->array_options[$key]); var_dump($this->array_options[$key]);
 				   					if ($this->array_options[$key] == $this->oldcopy->array_options[$key])	// If old value crypted in database is same than submited new value, it means we don't change it, so we don't update.
 				   					{
-				   						$new_array_options[$key] = $this->array_options[$key]; // Value is kept
+				   						$new_array_options[$key] = $this->array_options[$key];
+			   					}
+			   					// Value is kept
 				   					} else {
 										// var_dump($algo);
 										$newvalue = dol_hash($this->array_options[$key], $algo);
@@ -5322,17 +5869,23 @@ 
 						dol_include_once($InfoFieldList[1]);
 						if ($InfoFieldList[0] && class_exists($InfoFieldList[0]))
 						{
-							if ($value == '-1')	// -1 is key for no defined in combo list of objects
+							if ($value == '-1') {
+								// -1 is key for no defined in combo list of objects
 							{
 								$new_array_options[$key] = '';
+							}
 							} elseif ($value)
 							{
 								$object = new $InfoFieldList[0]($this->db);
-								if (is_numeric($value)) $res = $object->fetch($value);
-								else $res = $object->fetch('', $value);
+								if (is_numeric($value)) {
+									$res = $object->fetch($value);
+								} else {
+									$res = $object->fetch('', $value);
+								}
 
-								if ($res > 0) $new_array_options[$key] = $object->id;
-								else {
+								if ($res > 0) {
+									$new_array_options[$key] = $object->id;
+								} else {
 									$this->error = "Id/Ref '".$value."' for object '".$object->element."' not found";
 									$this->db->rollback();
 									return -1;
@@ -5348,7 +5901,10 @@ 
 			$this->db->begin();
 
 			$table_element = $this->table_element;
-			if ($table_element == 'categorie') $table_element = 'categories'; // For compatibility
+			if ($table_element == 'categorie') {
+				$table_element = 'categories';
+			}
+			// For compatibility
 
 			dol_syslog(get_class($this)."::insertExtraFields delete then insert", LOG_DEBUG);
 
@@ -5360,18 +5916,22 @@ 
 			{
 				$attributeKey = substr($key, 8); // Remove 'options_' prefix
 				// Add field of attribut
-				if ($extrafields->attributes[$this->table_element]['type'][$attributeKey] != 'separate') // Only for other type than separator
+				if ($extrafields->attributes[$this->table_element]['type'][$attributeKey] != 'separate') {
+					// Only for other type than separator
 					$sql .= ",".$attributeKey;
+				}
 			}
 			// We must insert a default value for fields for other entities that are mandatory to avoid not null error
 			if (is_array($extrafields->attributes[$this->table_element]['mandatoryfieldsofotherentities']))
 			{
 				foreach ($extrafields->attributes[$this->table_element]['mandatoryfieldsofotherentities'] as  $tmpkey => $tmpval)
 				{
-					if (!isset($extrafields->attributes[$this->table_element]['type'][$tmpkey]))    // If field not already added previously
+					if (!isset($extrafields->attributes[$this->table_element]['type'][$tmpkey])) {
+						// If field not already added previously
 					{
 						$sql .= ",".$tmpkey;
 					}
+					}
 				}
 			}
 			$sql .= ") VALUES (".$this->id;
@@ -5380,11 +5940,13 @@ 
 			{
 				$attributeKey = substr($key, 8); // Remove 'options_' prefix
 				// Add field of attribute
-				if ($extrafields->attributes[$this->table_element]['type'][$attributeKey] != 'separate') // Only for other type than separator)
+				if ($extrafields->attributes[$this->table_element]['type'][$attributeKey] != 'separate') {
+					// Only for other type than separator)
 				{
 					if ($new_array_options[$key] != '' || $new_array_options[$key] == '0')
 					{
 						$sql .= ",'".$this->db->escape($new_array_options[$key])."'";
+				}
 					} else {
 						$sql .= ",null";
 					}
@@ -5395,10 +5957,13 @@ 
 			{
 				foreach ($extrafields->attributes[$this->table_element]['mandatoryfieldsofotherentities'] as  $tmpkey => $tmpval)
 				{
-					if (!isset($extrafields->attributes[$this->table_element]['type'][$tmpkey]))    // If field not already added previously
+					if (!isset($extrafields->attributes[$this->table_element]['type'][$tmpkey])) {
+						// If field not already added previously
 					{
 						if (in_array($tmpval, array('int', 'double', 'price'))) $sql .= ", 0";
-						else $sql .= ", ''";
+					} else {
+							$sql .= ", ''";
+						}
 					}
 				}
 			}
@@ -5418,7 +5983,9 @@ 
 				// Call trigger
 				$this->context = array('extrafieldaddupdate'=>1);
 				$result = $this->call_trigger($trigger, $userused);
-				if ($result < 0) $error++;
+				if ($result < 0) {
+					$error++;
+				}
 				// End call trigger
 			}
 
@@ -5430,7 +5997,9 @@ 
 				$this->db->commit();
 				return 1;
 			}
-		} else return 0;
+		} else {
+			return 0;
+		}
 	}
 
 	/**
@@ -5447,11 +6016,16 @@ 
 	{
 		global $conf, $langs, $user;
 
-		if (empty($userused)) $userused = $user;
+		if (empty($userused)) {
+			$userused = $user;
+		}
 
 		$error = 0;
 
-		if (!empty($conf->global->MAIN_EXTRALANGUAGES_DISABLED)) return 0; // For avoid conflicts if trigger used
+		if (!empty($conf->global->MAIN_EXTRALANGUAGES_DISABLED)) {
+			return 0;
+		}
+		// For avoid conflicts if trigger used
 
 		if (is_array($this->array_languages))
 		{
@@ -5504,7 +6078,10 @@ 
 			$this->db->begin();
 
 			$table_element = $this->table_element;
-			if ($table_element == 'categorie') $table_element = 'categories'; // For compatibility
+			if ($table_element == 'categorie') {
+				$table_element = 'categories';
+			}
+			// For compatibility
 
 			dol_syslog(get_class($this)."::insertExtraLanguages delete then insert", LOG_DEBUG);
 
@@ -5536,7 +6113,9 @@ 
 				// Call trigger
 				$this->context = array('extralanguagesaddupdate'=>1);
 				$result = $this->call_trigger($trigger, $userused);
-				if ($result < 0) $error++;
+				if ($result < 0) {
+					$error++;
+				}
 				// End call trigger
 			}
 
@@ -5548,7 +6127,9 @@ 
 				$this->db->commit();
 				return 1;
 			}
-		} else return 0;
+		} else {
+			return 0;
+		}
 	}
 
 	/**
@@ -5565,9 +6146,13 @@ 
 	{
 		global $conf, $langs, $user;
 
-		if (!empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) return 0;
+		if (!empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) {
+			return 0;
+		}
 
-		if (empty($userused)) $userused = $user;
+		if (empty($userused)) {
+			$userused = $user;
+		}
 
 		$error = 0;
 
@@ -5660,7 +6245,9 @@ 
 				// Call trigger
 				$this->context = array('extrafieldupdate'=>1);
 				$result = $this->call_trigger($trigger, $userused);
-				if ($result < 0) $error++;
+				if ($result < 0) {
+					$error++;
+				}
 				// End call trigger
 			}
 
@@ -5673,7 +6260,9 @@ 
 				$this->db->commit();
 				return 1;
 			}
-		} else return 0;
+		} else {
+			return 0;
+		}
 	}
 
 	/**
@@ -5690,11 +6279,16 @@ 
 	{
 		global $conf, $langs, $user;
 
-		if (empty($userused)) $userused = $user;
+		if (empty($userused)) {
+			$userused = $user;
+		}
 
 		$error = 0;
 
-		if (!empty($conf->global->MAIN_EXTRALANGUAGES_DISABLED)) return 0; // For avoid conflicts if trigger used
+		if (!empty($conf->global->MAIN_EXTRALANGUAGES_DISABLED)) {
+			return 0;
+		}
+		// For avoid conflicts if trigger used
 
 		return 0;
 	}
@@ -5778,8 +6372,11 @@ 
 
 		if ($computed)
 		{
-			if (!preg_match('/^search_/', $keyprefix)) return '<span class="opacitymedium">'.$langs->trans("AutomaticallyCalculated").'</span>';
-			else return '';
+			if (!preg_match('/^search_/', $keyprefix)) {
+				return '<span class="opacitymedium">'.$langs->trans("AutomaticallyCalculated").'</span>';
+			} else {
+				return '';
+			}
 		}
 
 		// Set value of $morecss. For this, we use in priority showsize from parameters, then $val['css'] then autodefine
@@ -5789,9 +6386,11 @@ 
 			if ($type == 'date')
 			{
 				$morecss = 'minwidth100imp';
-			} elseif ($type == 'datetime' || $type == 'link')	// link means an foreign key to another primary id
+			} elseif ($type == 'datetime' || $type == 'link') {
+				// link means an foreign key to another primary id
 			{
 				$morecss = 'minwidth200imp';
+			}
 			} elseif (in_array($type, array('int', 'integer', 'price')) || preg_match('/^double(\([0-9],[0-9]\)){0,1}/', $type))
 			{
 				$morecss = 'maxwidth75';
@@ -5821,7 +6420,9 @@ 
 			$showtime = in_array($type, array('datetime')) ? 1 : 0;
 
 			// Do not show current date when field not required (see selectDate() method)
-			if (!$required && $value == '') $value = '-1';
+			if (!$required && $value == '') {
+				$value = '-1';
+			}
 
 			// TODO Must also support $moreparam
 			$out = $form->selectDate($value, $keyprefix.$key.$keysuffix, $showtime, $showtime, $required, '', 1, (($keyprefix != 'search_' && $keyprefix != 'search_options_') ? 1 : 0), 0, 1);
@@ -5844,9 +6445,11 @@ 
 			$out = '<input type="text" class="flat '.$morecss.'" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam ? $moreparam : '').($autofocusoncreate ? ' autofocus' : '').'>';
 		} elseif (preg_match('/^text/', $type))
 		{
-			if (!preg_match('/search_/', $keyprefix))		// If keyprefix is search_ or search_options_, we must just use a simple text field
+			if (!preg_match('/search_/', $keyprefix)) {
+				// If keyprefix is search_ or search_options_, we must just use a simple text field
 			{
 				require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+			}
 				$doleditor = new DolEditor($keyprefix.$key.$keysuffix, $value, '', 200, 'dolibarr_notes', 'In', false, false, false, ROWS_5, '90%');
 				$out = $doleditor->Create(1);
 			} else {
@@ -5854,9 +6457,11 @@ 
 			}
 		} elseif (preg_match('/^html/', $type))
 		{
-			if (!preg_match('/search_/', $keyprefix))		// If keyprefix is search_ or search_options_, we must just use a simple text field
+			if (!preg_match('/search_/', $keyprefix)) {
+				// If keyprefix is search_ or search_options_, we must just use a simple text field
 			{
 				require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+			}
 				$doleditor = new DolEditor($keyprefix.$key.$keysuffix, $value, '', 200, 'dolibarr_notes', 'In', false, false, !empty($conf->fckeditor->enabled) && $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_5, '90%');
 				$out = $doleditor->Create(1);
 			} else {
@@ -5893,10 +6498,14 @@ 
 			}
 
 			$out .= '<select class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam ? $moreparam : '').'>';
-				if ((!isset($this->fields[$key]['default'])) || ($this->fields[$key]['notnull'] != 1))$out .= '<option value="0">&nbsp;</option>';
+				if ((!isset($this->fields[$key]['default'])) || ($this->fields[$key]['notnull'] != 1)) {
+					$out .= '<option value="0">&nbsp;</option>';
+				}
 			foreach ($param['options'] as $key => $val)
 			{
-				if ((string) $key == '') continue;
+				if ((string) $key == '') {
+					continue;
+				}
 				list($val, $parent) = explode('|', $val);
 				$out .= '<option value="'.$key.'"';
 				$out .= (((string) $value == (string) $key) ? ' selected' : '');
@@ -6036,7 +6645,9 @@ 
 									$labeltoshow = dol_trunc($obj->{$InfoFieldList[1]}, 18);
 								}
 							}
-							if (empty($labeltoshow)) $labeltoshow = '(not defined)';
+							if (empty($labeltoshow)) {
+								$labeltoshow = '(not defined)';
+							}
 							if ($value == $obj->rowid)
 							{
 								$out .= '<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
@@ -6230,11 +6841,16 @@ 
 			$out = $form->selectForForms($param_list[0], $keyprefix.$key.$keysuffix, $value, $showempty, '', '', $morecss, $moreparam, 0, empty($val['disabled']) ? 0 : 1);
 
 			if (!empty($param_list_array[2])) {		// If the entry into $fields is set to add a create button
-				if (!GETPOSTISSET('backtopage') && empty($val['disabled']) && empty($nonewbutton))	// To avoid to open several times the 'Create Object' button and to avoid to have button if field is protected by a "disabled".
+				if (!GETPOSTISSET('backtopage') && empty($val['disabled']) && empty($nonewbutton)) {
+					// To avoid to open several times the 'Create Object' button and to avoid to have button if field is protected by a "disabled".
 				{
 		   			list($class, $classfile) = explode(':', $param_list[0]);
-		   			if (file_exists(dol_buildpath(dirname(dirname($classfile)).'/card.php'))) $url_path = dol_buildpath(dirname(dirname($classfile)).'/card.php', 1);
-		   			else $url_path = dol_buildpath(dirname(dirname($classfile)).'/'.strtolower($class).'_card.php', 1);
+				}
+		   			if (file_exists(dol_buildpath(dirname(dirname($classfile)).'/card.php'))) {
+		   				$url_path = dol_buildpath(dirname(dirname($classfile)).'/card.php', 1);
+		   			} else {
+		   				$url_path = dol_buildpath(dirname(dirname($classfile)).'/'.strtolower($class).'_card.php', 1);
+		   			}
 		   			$paramforthenewlink = '';
 		   			$paramforthenewlink .= (GETPOSTISSET('action') ? '&action='.GETPOST('action', 'aZ09') : '');
 		   			$paramforthenewlink .= (GETPOSTISSET('id') ? '&id='.GETPOST('id', 'int') : '');
@@ -6326,9 +6942,16 @@ 
 		{
 			$type = 'varchar'; // convert varchar(xx) int varchar
 			$size = $reg[1];
-		} elseif (preg_match('/varchar/', $type)) $type = 'varchar'; // convert varchar(xx) int varchar
-		if (is_array($val['arrayofkeyval'])) $type = 'select';
-		if (preg_match('/^integer:(.*):(.*)/i', $val['type'], $reg)) $type = 'link';
+		} elseif (preg_match('/varchar/', $type)) {
+			$type = 'varchar';
+		}
+		// convert varchar(xx) int varchar
+		if (is_array($val['arrayofkeyval'])) {
+			$type = 'select';
+		}
+		if (preg_match('/^integer:(.*):(.*)/i', $val['type'], $reg)) {
+			$type = 'link';
+		}
 
 		$default = $val['default'];
 		$computed = $val['computed'];
@@ -6337,7 +6960,9 @@ 
 		$param = array();
 		$param['options'] = array();
 
-		if (is_array($val['arrayofkeyval'])) $param['options'] = $val['arrayofkeyval'];
+		if (is_array($val['arrayofkeyval'])) {
+			$param['options'] = $val['arrayofkeyval'];
+		}
 		if (preg_match('/^integer:(.*):(.*)/i', $val['type'], $reg))
 		{
 			$type = 'link';
@@ -6352,7 +6977,9 @@ 
 		$help = $val['help'];
 		$hidden = (($val['visible'] == 0) ? 1 : 0); // If zero, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
 
-		if ($hidden) return '';
+		if ($hidden) {
+			return '';
+		}
 
 		// If field is a computed field, value must become result of compute
 		if ($computed)
@@ -6393,9 +7020,11 @@ 
 		}
 
 		// Format output value differently according to properties of field
-		if ($key == 'ref' && method_exists($this, 'getNomUrl')) $value = $this->getNomUrl(1, '', 0, '', 1);
-		elseif ($key == 'status' && method_exists($this, 'getLibStatut')) $value = $this->getLibStatut(3);
-		elseif ($type == 'date')
+		if ($key == 'ref' && method_exists($this, 'getNomUrl')) {
+			$value = $this->getNomUrl(1, '', 0, '', 1);
+		} elseif ($key == 'status' && method_exists($this, 'getLibStatut')) {
+			$value = $this->getLibStatut(3);
+		} elseif ($type == 'date')
 		{
 			if (!empty($value)) {
 				$value = dol_print_date($value, 'day');
@@ -6516,7 +7145,9 @@ 
 						$value = $obj->{$InfoFieldList[1]};
 					}
 				}
-			} else dol_syslog(get_class($this).'::showOutputField error '.$this->db->lasterror(), LOG_WARNING);
+			} else {
+				dol_syslog(get_class($this).'::showOutputField error '.$this->db->lasterror(), LOG_WARNING);
+			}
 		} elseif ($type == 'radio')
 		{
 			$value = $param['options'][$value];
@@ -6625,7 +7256,9 @@ 
 					dol_syslog('Error bad setup of extrafield', LOG_WARNING);
 					return 'Error bad setup of extrafield';
 				}
-			} else $value = '';
+			} else {
+				$value = '';
+			}
 		} elseif (preg_match('/^(text|html)/', $type))
 		{
 			$value = dol_htmlentitiesbr($value);
@@ -6660,7 +7293,9 @@ 
 	{
 		global $db, $conf, $langs, $action, $form, $hookmanager;
 
-		if (!is_object($form)) $form = new Form($db);
+		if (!is_object($form)) {
+			$form = new Form($db);
+		}
 
 		$out = '';
 
@@ -6679,7 +7314,9 @@ 
 				foreach ($extrafields->attributes[$this->table_element]['label'] as $key=>$label)
 				{
 					// Show only the key field in params
-					if (is_array($params) && array_key_exists('onlykey', $params) && $key != $params['onlykey']) continue;
+					if (is_array($params) && array_key_exists('onlykey', $params) && $key != $params['onlykey']) {
+						continue;
+					}
 
 					// Test on 'enabled' ('enabled' is different than 'list' = 'visibility')
 					$enabled = 1;
@@ -6687,7 +7324,9 @@ 
 					{
 						$enabled = dol_eval($extrafields->attributes[$this->table_element]['enabled'][$key], 1);
 					}
-					if (empty($enabled)) continue;
+					if (empty($enabled)) {
+						continue;
+					}
 
 					$visibility = 1;
 					if ($visibility && isset($extrafields->attributes[$this->table_element]['list'][$key]))
@@ -6701,10 +7340,20 @@ 
 						$perms = dol_eval($extrafields->attributes[$this->table_element]['perms'][$key], 1);
 					}
 
-					if (($mode == 'create') && abs($visibility) != 1 && abs($visibility) != 3) continue; // <> -1 and <> 1 and <> 3 = not visible on forms, only on list
-					elseif (($mode == 'edit') && abs($visibility) != 1 && abs($visibility) != 3 && abs($visibility) != 4) continue; // <> -1 and <> 1 and <> 3 = not visible on forms, only on list and <> 4 = not visible at the creation
-					elseif ($mode == 'view' && empty($visibility)) continue;
-					if (empty($perms)) continue;
+					if (($mode == 'create') && abs($visibility) != 1 && abs($visibility) != 3) {
+						continue;
+					}
+					// <> -1 and <> 1 and <> 3 = not visible on forms, only on list
+					elseif (($mode == 'edit') && abs($visibility) != 1 && abs($visibility) != 3 && abs($visibility) != 4) {
+						continue;
+					}
+					// <> -1 and <> 1 and <> 3 = not visible on forms, only on list and <> 4 = not visible at the creation
+					elseif ($mode == 'view' && empty($visibility)) {
+						continue;
+					}
+					if (empty($perms)) {
+						continue;
+					}
 					// Load language if required
 					if (!empty($extrafields->attributes[$this->table_element]['langfile'][$key])) {
 						$langs->load($extrafields->attributes[$this->table_element]['langfile'][$key]);
@@ -6797,10 +7446,12 @@ 
 						if (in_array($extrafields->attributes[$this->table_element]['type'][$key], array('date', 'datetime')))
 						{
 							$datenotinstring = $this->array_options['options_'.$key];
-							if (!is_numeric($this->array_options['options_'.$key]))	// For backward compatibility
+							if (!is_numeric($this->array_options['options_'.$key])) {
+								// For backward compatibility
 							{
 								$datenotinstring = $this->db->jdate($datenotinstring);
 							}
+							}
 							$value = (GETPOSTISSET($keyprefix.'options_'.$key.$keysuffix) || $value) ? dol_mktime(GETPOST($keyprefix.'options_'.$key.$keysuffix."hour", 'int', 3), GETPOST($keyprefix.'options_'.$key.$keysuffix."min", 'int', 3), 0, GETPOST($keyprefix.'options_'.$key.$keysuffix."month", 'int', 3), GETPOST($keyprefix.'options_'.$key.$keysuffix."day", 'int', 3), GETPOST($keyprefix.'options_'.$key.$keysuffix."year", 'int', 3)) : $datenotinstring;
 						}
 						// Convert float submited string into real php numeric (value in memory must be a php numeric)
@@ -6812,7 +7463,9 @@ 
 						// HTML, text, select, integer and varchar: take into account default value in database if in create mode
 						if (in_array($extrafields->attributes[$this->table_element]['type'][$key], array('html', 'text', 'varchar', 'select', 'int')))
 						{
-							if ($action == 'create') $value = (GETPOSTISSET($keyprefix.'options_'.$key.$keysuffix) || $value) ? $value : $extrafields->attributes[$this->table_element]['default'][$key];
+							if ($action == 'create') {
+								$value = (GETPOSTISSET($keyprefix.'options_'.$key.$keysuffix) || $value) ? $value : $extrafields->attributes[$this->table_element]['default'][$key];
+							}
 						}
 
 						$labeltoshow = $langs->trans($label);
@@ -6826,14 +7479,24 @@ 
 						$tpl_context = isset($params["tpl_context"]) ? $params["tpl_context"] : "none";
 						if ($tpl_context == "public") {	// Public page : red dot instead of fieldrequired characters
 							$out .= '">';
-							if (!empty($extrafields->attributes[$this->table_element]['help'][$key])) $out .= $form->textwithpicto($labeltoshow, $helptoshow);
-							else $out .= $labeltoshow;
-							if ($mode != 'view' && !empty($extrafields->attributes[$this->table_element]['required'][$key])) $out .= '&nbsp;<font color="red">*</font>';
+							if (!empty($extrafields->attributes[$this->table_element]['help'][$key])) {
+								$out .= $form->textwithpicto($labeltoshow, $helptoshow);
+							} else {
+								$out .= $labeltoshow;
+							}
+							if ($mode != 'view' && !empty($extrafields->attributes[$this->table_element]['required'][$key])) {
+								$out .= '&nbsp;<font color="red">*</font>';
+							}
 						} else {
-							if ($mode != 'view' && !empty($extrafields->attributes[$this->table_element]['required'][$key])) $out .= ' fieldrequired';
+							if ($mode != 'view' && !empty($extrafields->attributes[$this->table_element]['required'][$key])) {
+								$out .= ' fieldrequired';
+							}
 							$out .= '">';
-							if (!empty($extrafields->attributes[$this->table_element]['help'][$key])) $out .= $form->textwithpicto($labeltoshow, $helptoshow);
-							else $out .= $labeltoshow;
+							if (!empty($extrafields->attributes[$this->table_element]['help'][$key])) {
+								$out .= $form->textwithpicto($labeltoshow, $helptoshow);
+							} else {
+								$out .= $labeltoshow;
+							}
 						}
 						$out .= '</td>';
 
@@ -6860,8 +7523,11 @@ 
 							$out .='<td class="'.$this->element.'_extras_'.$key.'"></td>';
 						}*/
 
-						if (!empty($conf->global->MAIN_EXTRAFIELDS_USE_TWO_COLUMS) && (($e % 2) == 1)) $out .= '</tr>';
-						else $out .= '</tr>';
+						if (!empty($conf->global->MAIN_EXTRAFIELDS_USE_TWO_COLUMS) && (($e % 2) == 1)) {
+							$out .= '</tr>';
+						} else {
+							$out .= '</tr>';
+						}
 						$e++;
 					}
 				}
@@ -6918,7 +7584,9 @@ 
 		global $user;
 
 		$element = $this->element;
-		if ($element == 'facturerec') $element = 'facture';
+		if ($element == 'facturerec') {
+			$element = 'facture';
+		}
 
 		return $user->rights->{$element};
 	}
@@ -6943,7 +7611,10 @@ 
 
 			if (!$db->query($sql))
 			{
-				if ($ignoreerrors) return true; // TODO Not enough. If there is A-B on kept thirdarty and B-C on old one, we must get A-B-C after merge. Not A-B.
+				if ($ignoreerrors) {
+					return true;
+				}
+				// TODO Not enough. If there is A-B on kept thirdarty and B-C on old one, we must get A-B-C after merge. Not A-B.
 				//$this->errors = $db->lasterror();
 				return false;
 			}
@@ -6970,9 +7641,11 @@ 
 
 		$buyPrice = 0;
 
-		if (($unitPrice > 0) && (isset($conf->global->ForceBuyingPriceIfNull) && $conf->global->ForceBuyingPriceIfNull == 1)) // In most cases, test here is false
+		if (($unitPrice > 0) && (isset($conf->global->ForceBuyingPriceIfNull) && $conf->global->ForceBuyingPriceIfNull == 1)) {
+			// In most cases, test here is false
 		{
 			$buyPrice = $unitPrice * (1 - $discountPercent / 100);
+		}
 		} else {
 			// Get cost price for margin calculation
 			if (!empty($fk_product))
@@ -7119,18 +7792,26 @@ 
 					if ($size == 1 || $size == 'small') {   // Format vignette
 						// Find name of thumb file
 						$photo_vignette = basename(getImageFileNameForSize($dir.$file, '_small'));
-						if (!dol_is_file($dirthumb.$photo_vignette)) $photo_vignette = '';
+						if (!dol_is_file($dirthumb.$photo_vignette)) {
+							$photo_vignette = '';
+						}
 
 						// Get filesize of original file
 						$imgarray = dol_getImageSize($dir.$photo);
 
 						if ($nbbyrow > 0)
 						{
-							if ($nbphoto == 1) $return .= '<table class="valigntop center centpercent" style="border: 0; padding: 2px; border-spacing: 2px; border-collapse: separate;">';
+							if ($nbphoto == 1) {
+								$return .= '<table class="valigntop center centpercent" style="border: 0; padding: 2px; border-spacing: 2px; border-collapse: separate;">';
+							}
 
-							if ($nbphoto % $nbbyrow == 1) $return .= '<tr class="center valignmiddle" style="border: 1px">';
+							if ($nbphoto % $nbbyrow == 1) {
+								$return .= '<tr class="center valignmiddle" style="border: 1px">';
+							}
 							$return .= '<td style="width: '.ceil(100 / $nbbyrow).'%" class="photo">';
-						} elseif ($nbbyrow < 0) $return .= '<div class="inline-block">';
+						} elseif ($nbbyrow < 0) {
+							$return .= '<div class="inline-block">';
+						}
 
 						$return .= "\n";
 
@@ -7138,15 +7819,20 @@ 
 						if (empty($nolink))
 						{
 							$urladvanced = getAdvancedPreviewUrl($modulepart, $relativefile, 0, 'entity='.$this->entity);
-							if ($urladvanced) $return .= '<a href="'.$urladvanced.'">';
-							else $return .= '<a href="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdir.$photo).'" class="aphoto" target="_blank">';
+							if ($urladvanced) {
+								$return .= '<a href="'.$urladvanced.'">';
+							} else {
+								$return .= '<a href="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdir.$photo).'" class="aphoto" target="_blank">';
+							}
 						}
 
 						// Show image (width height=$maxHeight)
 						// Si fichier vignette disponible et image source trop grande, on utilise la vignette, sinon on utilise photo origine
 						$alt = $langs->transnoentitiesnoconv('File').': '.$relativefile;
 						$alt .= ' - '.$langs->transnoentitiesnoconv('Size').': '.$imgarray['width'].'x'.$imgarray['height'];
-						if ($notitle) $alt = '';
+						if ($notitle) {
+							$alt = '';
+						}
 
 						if ($usesharelink)
 						{
@@ -7175,10 +7861,14 @@ 
 							}
 						}
 
-						if (empty($nolink)) $return .= '</a>';
+						if (empty($nolink)) {
+							$return .= '</a>';
+						}
 						$return .= "\n";
 
-						if ($showfilename) $return .= '<br>'.$viewfilename;
+						if ($showfilename) {
+							$return .= '<br>'.$viewfilename;
+						}
 						if ($showaction)
 						{
 							$return .= '<br>';
@@ -7203,14 +7893,20 @@ 
 						if ($nbbyrow > 0)
 						{
 							$return .= '</td>';
-							if (($nbphoto % $nbbyrow) == 0) $return .= '</tr>';
-						} elseif ($nbbyrow < 0) $return .= '</div>';
+							if (($nbphoto % $nbbyrow) == 0) {
+								$return .= '</tr>';
+							}
+						} elseif ($nbbyrow < 0) {
+							$return .= '</div>';
+						}
 					}
 
 					if (empty($size)) {     // Format origine
 						$return .= '<img class="photo photowithmargin" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdir.$photo).'">';
 
-						if ($showfilename) $return .= '<br>'.$viewfilename;
+						if ($showfilename) {
+							$return .= '<br>'.$viewfilename;
+						}
 						if ($showaction)
 						{
 							// Special case for product
@@ -7227,7 +7923,9 @@ 
 					}
 
 					// On continue ou on arrete de boucler ?
-					if ($nbmax && $nbphoto >= $nbmax) break;
+					if ($nbmax && $nbphoto >= $nbmax) {
+						break;
+					}
 				}
 			}
 
@@ -7242,7 +7940,9 @@ 
 						$nbphoto++;
 					}
 
-					if ($nbphoto) $return .= '</table>';
+					if ($nbphoto) {
+						$return .= '</table>';
+					}
 				}
 			}
 		}
@@ -7263,8 +7963,11 @@ 
 	{
 		if (is_array($info))
 		{
-			if (isset($info['type']) && $info['type'] == 'array') return true;
-			else return false;
+			if (isset($info['type']) && $info['type'] == 'array') {
+				return true;
+			} else {
+				return false;
+			}
 		}
 		return false;
 	}
@@ -7277,7 +7980,9 @@ 
 	 */
 	public function isDate($info)
 	{
-		if (isset($info['type']) && ($info['type'] == 'date' || $info['type'] == 'datetime' || $info['type'] == 'timestamp')) return true;
+		if (isset($info['type']) && ($info['type'] == 'date' || $info['type'] == 'datetime' || $info['type'] == 'timestamp')) {
+			return true;
+		}
 		return false;
 	}
 
@@ -7291,9 +7996,14 @@ 
 	{
 		if (is_array($info))
 		{
-			if (isset($info['type']) && ($info['type'] == 'duration')) return true;
-			else return false;
-		} else return false;
+			if (isset($info['type']) && ($info['type'] == 'duration')) {
+				return true;
+			} else {
+				return false;
+			}
+		} else {
+			return false;
+		}
 	}
 
 	/**
@@ -7306,9 +8016,14 @@ 
 	{
 		if (is_array($info))
 		{
-			if (isset($info['type']) && ($info['type'] == 'int' || preg_match('/^integer/i', $info['type']))) return true;
-			else return false;
-		} else return false;
+			if (isset($info['type']) && ($info['type'] == 'int' || preg_match('/^integer/i', $info['type']))) {
+				return true;
+			} else {
+				return false;
+			}
+		} else {
+			return false;
+		}
 	}
 
 	/**
@@ -7321,8 +8036,11 @@ 
 	{
 		if (is_array($info))
 		{
-			if (isset($info['type']) && (preg_match('/^(double|real|price)/i', $info['type']))) return true;
-			else return false;
+			if (isset($info['type']) && (preg_match('/^(double|real|price)/i', $info['type']))) {
+				return true;
+			} else {
+				return false;
+			}
 		}
 		return false;
 	}
@@ -7337,8 +8055,11 @@ 
 	{
 		if (is_array($info))
 		{
-			if (isset($info['type']) && $info['type'] == 'text') return true;
-			else return false;
+			if (isset($info['type']) && $info['type'] == 'text') {
+				return true;
+			} else {
+				return false;
+			}
 		}
 		return false;
 	}
@@ -7353,8 +8074,11 @@ 
 	{
 		if (is_array($info))
 		{
-			if (isset($info['notnull']) && $info['notnull'] != '1') return true;
-			else return false;
+			if (isset($info['notnull']) && $info['notnull'] != '1') {
+				return true;
+			} else {
+				return false;
+			}
 		}
 		return true;
 	}
@@ -7369,8 +8093,11 @@ 
 	{
 		if (is_array($info))
 		{
-			if (isset($info['notnull']) && $info['notnull'] == '-1') return true;
-			else return false;
+			if (isset($info['notnull']) && $info['notnull'] == '-1') {
+				return true;
+			} else {
+				return false;
+			}
 		}
 		return false;
 	}
@@ -7385,8 +8112,11 @@ 
 	{
 		if (is_array($info))
 		{
-			if (isset($info['index']) && $info['index'] == true) return true;
-			else return false;
+			if (isset($info['index']) && $info['index'] == true) {
+				return true;
+			} else {
+				return false;
+			}
 		}
 		return false;
 	}
@@ -7404,7 +8134,8 @@ 
 		global $conf;
 
 		$queryarray = array();
-		foreach ($this->fields as $field => $info)	// Loop on definition of fields
+		foreach ($this->fields as $field => $info) {
+			// Loop on definition of fields
 		{
 			// Depending on field type ('datetime', ...)
 			if ($this->isDate($info))
@@ -7412,6 +8143,7 @@ 
 				if (empty($this->{$field}))
 				{
 					$queryarray[$field] = null;
+		}
 				} else {
 					$queryarray[$field] = $this->db->idate($this->{$field});
 				}
@@ -7428,24 +8160,43 @@ 
 			} elseif ($this->isDuration($info))
 			{
 				// $this->{$field} may be null, '', 0, '0', 123, '123'
-				if ($this->{$field} != '' || !empty($info['notnull'])) $queryarray[$field] = (int) $this->{$field};		// If '0', it may be set to null later if $info['notnull'] == -1
-				else $queryarray[$field] = null;
+				if ($this->{$field} != '' || !empty($info['notnull'])) {
+					$queryarray[$field] = (int) $this->{$field};
+				}
+				// If '0', it may be set to null later if $info['notnull'] == -1
+				else {
+					$queryarray[$field] = null;
+				}
 			} elseif ($this->isInt($info) || $this->isFloat($info))
 			{
-				if ($field == 'entity' && is_null($this->{$field})) $queryarray[$field] = $conf->entity;
-				else {
+				if ($field == 'entity' && is_null($this->{$field})) {
+					$queryarray[$field] = $conf->entity;
+				} else {
 					// $this->{$field} may be null, '', 0, '0', 123, '123'
 					if ($this->{$field} != '' || !empty($info['notnull'])) {
-						if ($this->isInt($info)) $queryarray[$field] = (int) $this->{$field};	// If '0', it may be set to null later if $info['notnull'] == -1
-						if ($this->isFloat($info)) $queryarray[$field] = (double) $this->{$field};	// If '0', it may be set to null later if $info['notnull'] == -1
-					} else $queryarray[$field] = null;
+						if ($this->isInt($info)) {
+							$queryarray[$field] = (int) $this->{$field};
+						}
+						// If '0', it may be set to null later if $info['notnull'] == -1
+						if ($this->isFloat($info)) {
+							$queryarray[$field] = (double) $this->{$field};
+						}
+						// If '0', it may be set to null later if $info['notnull'] == -1
+					} else {
+						$queryarray[$field] = null;
+					}
 				}
 			} else {
 				$queryarray[$field] = $this->{$field};
 			}
 
-			if ($info['type'] == 'timestamp' && empty($queryarray[$field])) unset($queryarray[$field]);
-			if (!empty($info['notnull']) && $info['notnull'] == -1 && empty($queryarray[$field])) $queryarray[$field] = null; // May force 0 to null
+			if ($info['type'] == 'timestamp' && empty($queryarray[$field])) {
+				unset($queryarray[$field]);
+			}
+			if (!empty($info['notnull']) && $info['notnull'] == -1 && empty($queryarray[$field])) {
+				$queryarray[$field] = null;
+			}
+			// May force 0 to null
 		}
 
 		return $queryarray;
@@ -7463,25 +8214,34 @@ 
 		{
 			if ($this->isDate($info))
 			{
-				if (empty($obj->{$field}) || $obj->{$field} === '0000-00-00 00:00:00' || $obj->{$field} === '1000-01-01 00:00:00') $this->{$field} = 0;
-				else $this->{$field} = strtotime($obj->{$field});
+				if (empty($obj->{$field}) || $obj->{$field} === '0000-00-00 00:00:00' || $obj->{$field} === '1000-01-01 00:00:00') {
+					$this->{$field} = 0;
+				} else {
+					$this->{$field} = strtotime($obj->{$field});
+				}
 			} elseif ($this->isArray($info))
 			{
 				if (!empty($obj->{$field})) {
 					$this->{$field} = @unserialize($obj->{$field});
 					// Hack for data not in UTF8
-					if ($this->{$field } === false) @unserialize(utf8_decode($obj->{$field}));
+					if ($this->{$field } === false) {
+						@unserialize(utf8_decode($obj->{$field}));
+					}
 				} else {
 					$this->{$field} = array();
 				}
 			} elseif ($this->isInt($info))
 			{
-				if ($field == 'rowid') $this->id = (int) $obj->{$field};
-				else {
+				if ($field == 'rowid') {
+					$this->id = (int) $obj->{$field};
+				} else {
 					if ($this->isForcedToNullIfZero($info))
 					{
-						if (empty($obj->{$field})) $this->{$field} = null;
-						else $this->{$field} = (double) $obj->{$field};
+						if (empty($obj->{$field})) {
+							$this->{$field} = null;
+						} else {
+							$this->{$field} = (double) $obj->{$field};
+						}
 					} else {
 						if (!is_null($obj->{$field}) || (isset($info['notnull']) && $info['notnull'] == 1)) {
 							$this->{$field} = (int) $obj->{$field};
@@ -7494,8 +8254,11 @@ 
 			{
 				if ($this->isForcedToNullIfZero($info))
 				{
-					if (empty($obj->{$field})) $this->{$field} = null;
-					else $this->{$field} = (double) $obj->{$field};
+					if (empty($obj->{$field})) {
+						$this->{$field} = null;
+					} else {
+						$this->{$field} = (double) $obj->{$field};
+					}
 				} else {
 					if (!is_null($obj->{$field}) || (isset($info['notnull']) && $info['notnull'] == 1)) {
 						$this->{$field} = (double) $obj->{$field};
@@ -7509,7 +8272,9 @@ 
 		}
 
 		// If there is no 'ref' field, we force property ->ref to ->id for a better compatibility with common functions.
-		if (!isset($this->fields['ref']) && isset($this->id)) $this->ref = $this->id;
+		if (!isset($this->fields['ref']) && isset($this->id)) {
+			$this->ref = $this->id;
+		}
 	}
 
 	/**
@@ -7532,13 +8297,19 @@ 
 	 */
 	protected function quote($value, $fieldsentry)
 	{
-		if (is_null($value)) return 'NULL';
-		elseif (preg_match('/^(int|double|real|price)/i', $fieldsentry['type'])) return $this->db->escape("$value");
-		elseif ($fieldsentry['type'] == 'boolean') {
-			if ($value) return 'true';
-			else return 'false';
+		if (is_null($value)) {
+			return 'NULL';
+		} elseif (preg_match('/^(int|double|real|price)/i', $fieldsentry['type'])) {
+			return $this->db->escape("$value");
+		} elseif ($fieldsentry['type'] == 'boolean') {
+			if ($value) {
+				return 'true';
+			} else {
+				return 'false';
+			}
+		} else {
+			return "'".$this->db->escape($value)."'";
 		}
-		else return "'".$this->db->escape($value)."'";
 	}
 
 
@@ -7560,10 +8331,17 @@ 
 
 		$fieldvalues = $this->setSaveQuery();
 
-		if (array_key_exists('date_creation', $fieldvalues) && empty($fieldvalues['date_creation'])) $fieldvalues['date_creation'] = $this->db->idate($now);
-		if (array_key_exists('fk_user_creat', $fieldvalues) && !($fieldvalues['fk_user_creat'] > 0)) $fieldvalues['fk_user_creat'] = $user->id;
+		if (array_key_exists('date_creation', $fieldvalues) && empty($fieldvalues['date_creation'])) {
+			$fieldvalues['date_creation'] = $this->db->idate($now);
+		}
+		if (array_key_exists('fk_user_creat', $fieldvalues) && !($fieldvalues['fk_user_creat'] > 0)) {
+			$fieldvalues['fk_user_creat'] = $user->id;
+		}
 		unset($fieldvalues['rowid']); // The field 'rowid' is reserved field name for autoincrement field so we don't need it into insert.
-		if (array_key_exists('ref', $fieldvalues)) $fieldvalues['ref'] = dol_string_nospecial($fieldvalues['ref']); // If field is a ref, we sanitize data
+		if (array_key_exists('ref', $fieldvalues)) {
+			$fieldvalues['ref'] = dol_string_nospecial($fieldvalues['ref']);
+		}
+		// If field is a ref, we sanitize data
 
 		$keys = array();
 		$values = array(); // Array to store string forged for SQL syntax
@@ -7577,8 +8355,12 @@ 
 		foreach ($keys as $key)
 		{
 			// If field is an implicit foreign key field
-			if (preg_match('/^integer:/i', $this->fields[$key]['type']) && $values[$key] == '-1') $values[$key] = '';
-			if (!empty($this->fields[$key]['foreignkey']) && $values[$key] == '-1') $values[$key] = '';
+			if (preg_match('/^integer:/i', $this->fields[$key]['type']) && $values[$key] == '-1') {
+				$values[$key] = '';
+			}
+			if (!empty($this->fields[$key]['foreignkey']) && $values[$key] == '-1') {
+				$values[$key] = '';
+			}
 
 			if (isset($this->fields[$key]['notnull']) && $this->fields[$key]['notnull'] == 1 && (!isset($values[$key]) || $values[$key] === 'NULL') && is_null($this->fields[$key]['default']))
 			{
@@ -7594,13 +8376,20 @@ 
 
 			// If field is an implicit foreign key field
 			if (preg_match('/^integer:/i', $this->fields[$key]['type']) && empty($values[$key])) {
-				if (isset($this->fields[$key]['default'])) $values[$key] = $this->fields[$key]['default'];
-				else $values[$key] = 'null';
+				if (isset($this->fields[$key]['default'])) {
+					$values[$key] = $this->fields[$key]['default'];
+				} else {
+					$values[$key] = 'null';
+				}
+			}
+			if (!empty($this->fields[$key]['foreignkey']) && empty($values[$key])) {
+				$values[$key] = 'null';
 			}
-			if (!empty($this->fields[$key]['foreignkey']) && empty($values[$key])) $values[$key] = 'null';
 		}
 
-		if ($error) return -1;
+		if ($error) {
+			return -1;
+		}
 
 		$this->db->begin();
 
@@ -7644,7 +8433,9 @@ 
 		if (!$error)
 		{
 			$result = $this->insertExtraFields();
-			if ($result < 0) $error++;
+			if ($result < 0) {
+				$error++;
+			}
 		}
 
 		// Create lines
@@ -7660,7 +8451,9 @@ 
 
 				// Test and convert into object this->lines[$i]. When coming from REST API, we may still have an array
 				//if (! is_object($line)) $line=json_decode(json_encode($line), false);  // convert recursively array into object.
-				if (!is_object($line)) $line = (object) $line;
+				if (!is_object($line)) {
+					$line = (object) $line;
+				}
 
 				$result = $line->create($user, 1);
 				if ($result < 0)
@@ -7702,19 +8495,32 @@ 
 	 */
 	public function fetchCommon($id, $ref = null, $morewhere = '')
 	{
-		if (empty($id) && empty($ref) && empty($morewhere)) return -1;
+		if (empty($id) && empty($ref) && empty($morewhere)) {
+			return -1;
+		}
 
 		$fieldlist = $this->getFieldList();
-		if (empty($fieldlist)) return 0;
+		if (empty($fieldlist)) {
+			return 0;
+		}
 
 		$sql = 'SELECT '.$fieldlist;
 		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element;
 
-		if (!empty($id)) $sql .= ' WHERE rowid = '.$id;
-		elseif (!empty($ref)) $sql .= " WHERE ref = ".$this->quote($ref, $this->fields['ref']);
-		else $sql .= ' WHERE 1 = 1'; // usage with empty id and empty ref is very rare
-		if (empty($id) && isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) $sql .= ' AND entity IN ('.getEntity($this->table_element).')';
-		if ($morewhere) $sql .= $morewhere;
+		if (!empty($id)) {
+			$sql .= ' WHERE rowid = '.$id;
+		} elseif (!empty($ref)) {
+			$sql .= " WHERE ref = ".$this->quote($ref, $this->fields['ref']);
+		} else {
+			$sql .= ' WHERE 1 = 1';
+		}
+		// usage with empty id and empty ref is very rare
+		if (empty($id) && isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) {
+			$sql .= ' AND entity IN ('.getEntity($this->table_element).')';
+		}
+		if ($morewhere) {
+			$sql .= $morewhere;
+		}
 		$sql .= ' LIMIT 1'; // This is a fetch, to be sure to get only one record
 
 		$res = $this->db->query($sql);
@@ -7760,7 +8566,9 @@ 
 		$sql = 'SELECT '.$objectline->getFieldList();
 		$sql .= ' FROM '.MAIN_DB_PREFIX.$objectline->table_element;
 		$sql .= ' WHERE fk_'.$this->element.' = '.$this->id;
-		if ($morewhere)   $sql .= $morewhere;
+		if ($morewhere) {
+			$sql .= $morewhere;
+		}
 		if (isset($objectline->fields['position'])) {
 			$sql .= $this->db->order('position', 'ASC');
 		}
@@ -7809,10 +8617,17 @@ 
 
 		$fieldvalues = $this->setSaveQuery();
 
-		if (array_key_exists('date_modification', $fieldvalues) && empty($fieldvalues['date_modification'])) $fieldvalues['date_modification'] = $this->db->idate($now);
-		if (array_key_exists('fk_user_modif', $fieldvalues) && !($fieldvalues['fk_user_modif'] > 0)) $fieldvalues['fk_user_modif'] = $user->id;
+		if (array_key_exists('date_modification', $fieldvalues) && empty($fieldvalues['date_modification'])) {
+			$fieldvalues['date_modification'] = $this->db->idate($now);
+		}
+		if (array_key_exists('fk_user_modif', $fieldvalues) && !($fieldvalues['fk_user_modif'] > 0)) {
+			$fieldvalues['fk_user_modif'] = $user->id;
+		}
 		unset($fieldvalues['rowid']); // The field 'rowid' is reserved field name for autoincrement field so we don't need it into update.
-		if (array_key_exists('ref', $fieldvalues)) $fieldvalues['ref'] = dol_string_nospecial($fieldvalues['ref']); // If field is a ref, we sanitize data
+		if (array_key_exists('ref', $fieldvalues)) {
+			$fieldvalues['ref'] = dol_string_nospecial($fieldvalues['ref']);
+		}
+		// If field is a ref, we sanitize data
 
 		$keys = array();
 		$values = array();
@@ -7827,8 +8642,14 @@ 
 		// Clean and check mandatory
 		foreach ($keys as $key)
 		{
-			if (preg_match('/^integer:/i', $this->fields[$key]['type']) && $values[$key] == '-1') $values[$key] = ''; // This is an implicit foreign key field
-			if (!empty($this->fields[$key]['foreignkey']) && $values[$key] == '-1') $values[$key] = ''; // This is an explicit foreign key field
+			if (preg_match('/^integer:/i', $this->fields[$key]['type']) && $values[$key] == '-1') {
+				$values[$key] = '';
+			}
+			// This is an implicit foreign key field
+			if (!empty($this->fields[$key]['foreignkey']) && $values[$key] == '-1') {
+				$values[$key] = '';
+			}
+			// This is an explicit foreign key field
 
 			//var_dump($key.'-'.$values[$key].'-'.($this->fields[$key]['notnull'] == 1));
 			/*
@@ -7897,11 +8718,13 @@ 
 
 		$this->db->begin();
 
-		if ($forcechilddeletion)	// Force also delete of childtables that should lock deletion in standard case when option force is off
+		if ($forcechilddeletion) {
+			// Force also delete of childtables that should lock deletion in standard case when option force is off
 		{
 			foreach ($this->childtables as $table)
 			{
 				$sql = 'DELETE FROM '.MAIN_DB_PREFIX.$table.' WHERE '.$this->fk_element.' = '.$this->id;
+		}
 				$resql = $this->db->query($sql);
 				if (!$resql)
 				{
@@ -7911,9 +8734,11 @@ 
 					return -1;
 				}
 			}
-		} elseif (!empty($this->fk_element) && !empty($this->childtables))	// If object has childs linked with a foreign key field, we check all child tables.
+		} elseif (!empty($this->fk_element) && !empty($this->childtables)) {
+			// If object has childs linked with a foreign key field, we check all child tables.
 		{
 			$objectisused = $this->isObjectUsed($this->id);
+		}
 			if (!empty($objectisused))
 			{
 				dol_syslog(get_class($this)."::deleteCommon Can't delete record as it has some child", LOG_WARNING);
@@ -8082,7 +8907,9 @@ 
 
 		// Call trigger
 		$result = $this->call_trigger('LINE'.strtoupper($tmpforobjectclass).'_DELETE', $user);
-		if ($result < 0) return -1;
+		if ($result < 0) {
+			return -1;
+		}
 		// End call triggers
 
 		$this->db->begin();
@@ -8152,7 +8979,9 @@ 
 			if (!$error && !$notrigger) {
 				// Call trigger
 				$result = $this->call_trigger($triggercode, $user);
-				if ($result < 0) $error++;
+				if ($result < 0) {
+					$error++;
+				}
 			}
 
 			if (!$error) {
@@ -8182,14 +9011,30 @@ 
 		global $user;
 
 		$this->id = 0;
-		if (array_key_exists('label', $this->fields)) $this->label = 'This is label';
-		if (array_key_exists('note_public', $this->fields)) $this->note_public = 'Public note';
-		if (array_key_exists('note_private', $this->fields)) $this->note_private = 'Private note';
-		if (array_key_exists('date_creation', $this->fields)) $this->date_creation = (dol_now() - 3600 * 24);
-		if (array_key_exists('date_modification', $this->fields)) $this->date_modification = (dol_now() - 3600 * 24);
-		if (array_key_exists('fk_user_creat', $this->fields)) $this->fk_user_creat = $user->id;
-		if (array_key_exists('fk_user_modif', $this->fields)) $this->fk_user_modif = $user->id;
-		if (array_key_exists('date', $this->fields)) $this->date = dol_now();
+		if (array_key_exists('label', $this->fields)) {
+			$this->label = 'This is label';
+		}
+		if (array_key_exists('note_public', $this->fields)) {
+			$this->note_public = 'Public note';
+		}
+		if (array_key_exists('note_private', $this->fields)) {
+			$this->note_private = 'Private note';
+		}
+		if (array_key_exists('date_creation', $this->fields)) {
+			$this->date_creation = (dol_now() - 3600 * 24);
+		}
+		if (array_key_exists('date_modification', $this->fields)) {
+			$this->date_modification = (dol_now() - 3600 * 24);
+		}
+		if (array_key_exists('fk_user_creat', $this->fields)) {
+			$this->fk_user_creat = $user->id;
+		}
+		if (array_key_exists('fk_user_modif', $this->fields)) {
+			$this->fk_user_modif = $user->id;
+		}
+		if (array_key_exists('date', $this->fields)) {
+			$this->date = dol_now();
+		}
 		// ...
 	}
 
@@ -8233,7 +9078,9 @@ 
 	 */
 	public function trimParameters($parameters)
 	{
-		if (!is_array($parameters)) return;
+		if (!is_array($parameters)) {
+			return;
+		}
 		foreach ($parameters as $parameter) {
 			if (isset($this->$parameter)) {
 				$this->$parameter = trim($this->$parameter);
@@ -8334,7 +9181,9 @@ 
 	{
 		$this->db->begin();
 
-		if (empty($type)) $type = $this->table_element;
+		if (empty($type)) {
+			$type = $this->table_element;
+		}
 
 		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		$categorystatic = new Categorie($this->db);

htdocs/core/class/html.form.class.php

Indentation +132 added lines, -132 removed lines

@@ -3549,106 +3549,106 @@ 
 		return $return;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *      Load in cache list of transport mode
-     *
-     *      @return     int                 Nb of lines loaded, <0 if KO
-     */
-    public function load_cache_transport_mode()
-    {
-        // phpcs:enable
-        global $langs;
-
-        $num=count($this->cache_transport_mode);
-        if ($num > 0) return $num;    // Cache already loaded
-
-        dol_syslog(__METHOD__, LOG_DEBUG);
-
-        $this->cache_transport_mode = array();
-
-        $sql = "SELECT rowid, code, label, active";
-        $sql.= " FROM ".MAIN_DB_PREFIX."c_transport_mode";
-        $sql.= " WHERE entity IN (".getEntity('c_transport_mode').")";
-        //if ($active >= 0) $sql.= " AND active = ".$active;
-
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            $num = $this->db->num_rows($resql);
-            $i = 0;
-            while ($i < $num)
-            {
-                $obj = $this->db->fetch_object($resql);
-
-                // If traduction exist, we use it else we take the default label
-                $label=($langs->transnoentitiesnoconv("PaymentTypeShort".$obj->code)!=("PaymentTypeShort".$obj->code)?$langs->transnoentitiesnoconv("PaymentTypeShort".$obj->code):($obj->label!='-'?$obj->label:''));
-                $this->cache_transport_mode[$obj->rowid]['rowid'] = $obj->rowid;
-                $this->cache_transport_mode[$obj->rowid]['code'] = $obj->code;
-                $this->cache_transport_mode[$obj->rowid]['label']= $label;
-                $this->cache_transport_mode[$obj->rowid]['active'] = $obj->active;
-                $i++;
-            }
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *      Load in cache list of transport mode
+	 *
+	 *      @return     int                 Nb of lines loaded, <0 if KO
+	 */
+	public function load_cache_transport_mode()
+	{
+		// phpcs:enable
+		global $langs;
+
+		$num=count($this->cache_transport_mode);
+		if ($num > 0) return $num;    // Cache already loaded
+
+		dol_syslog(__METHOD__, LOG_DEBUG);
+
+		$this->cache_transport_mode = array();
+
+		$sql = "SELECT rowid, code, label, active";
+		$sql.= " FROM ".MAIN_DB_PREFIX."c_transport_mode";
+		$sql.= " WHERE entity IN (".getEntity('c_transport_mode').")";
+		//if ($active >= 0) $sql.= " AND active = ".$active;
+
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$num = $this->db->num_rows($resql);
+			$i = 0;
+			while ($i < $num)
+			{
+				$obj = $this->db->fetch_object($resql);
+
+				// If traduction exist, we use it else we take the default label
+				$label=($langs->transnoentitiesnoconv("PaymentTypeShort".$obj->code)!=("PaymentTypeShort".$obj->code)?$langs->transnoentitiesnoconv("PaymentTypeShort".$obj->code):($obj->label!='-'?$obj->label:''));
+				$this->cache_transport_mode[$obj->rowid]['rowid'] = $obj->rowid;
+				$this->cache_transport_mode[$obj->rowid]['code'] = $obj->code;
+				$this->cache_transport_mode[$obj->rowid]['label']= $label;
+				$this->cache_transport_mode[$obj->rowid]['active'] = $obj->active;
+				$i++;
+			}
+
+			$this->cache_transport_mode = dol_sort_array($this->cache_transport_mode, 'label', 'asc', 0, 0, 1);
+
+			return $num;
+		}
+		else {
+			dol_print_error($this->db);
+			return -1;
+		}
+	}
+
+	/**
+	 *      Return list of transport mode for intracomm report
+	 *
+	 *      @param	string	$selected       Id of the transport mode pre-selected
+	 *      @param  string	$htmlname       Name of the select field
+	 *      @param  int		$format         0=id+label, 1=code+code, 2=code+label, 3=id+code
+	 *      @param  int		$empty			1=can be empty, 0 else
+	 *      @param	int		$noadmininfo	0=Add admin info, 1=Disable admin info
+	 *      @param  int		$maxlength      Max length of label
+	 *      @param  int     $active         Active or not, -1 = all
+	 *      @param  string  $morecss        Add more CSS on select tag
+	 * 		@return	void
+	 */
+	public function selectTransportMode($selected = '', $htmlname = 'transportmode', $format = 0, $empty = 1, $noadmininfo = 0, $maxlength = 0, $active = 1, $morecss = '')
+	{
+		global $langs,$user;
 
-            $this->cache_transport_mode = dol_sort_array($this->cache_transport_mode, 'label', 'asc', 0, 0, 1);
-
-            return $num;
-        }
-        else {
-            dol_print_error($this->db);
-            return -1;
-        }
-    }
-
-    /**
-     *      Return list of transport mode for intracomm report
-     *
-     *      @param	string	$selected       Id of the transport mode pre-selected
-     *      @param  string	$htmlname       Name of the select field
-     *      @param  int		$format         0=id+label, 1=code+code, 2=code+label, 3=id+code
-     *      @param  int		$empty			1=can be empty, 0 else
-     *      @param	int		$noadmininfo	0=Add admin info, 1=Disable admin info
-     *      @param  int		$maxlength      Max length of label
-     *      @param  int     $active         Active or not, -1 = all
-     *      @param  string  $morecss        Add more CSS on select tag
-     * 		@return	void
-     */
-    public function selectTransportMode($selected = '', $htmlname = 'transportmode', $format = 0, $empty = 1, $noadmininfo = 0, $maxlength = 0, $active = 1, $morecss = '')
-    {
-        global $langs,$user;
-
-        dol_syslog(__METHOD__." ".$selected.", ".$htmlname.", ".$format, LOG_DEBUG);
-
-        $this->load_cache_transport_mode();
-
-        print '<select id="select'.$htmlname.'" class="flat selectmodetransport'.($morecss?' '.$morecss:'').'" name="'.$htmlname.'">';
-        if ($empty) print '<option value="">&nbsp;</option>';
-        foreach ($this->cache_transport_mode as $id => $arraytypes)
-        {
-            // If not good status
-            if ($active >= 0 && $arraytypes['active'] != $active) continue;
-
-            // We discard empty line if showempty is on because an empty line has already been output.
-            if ($empty && empty($arraytypes['code'])) continue;
-
-            if ($format == 0) print '<option value="'.$id.'"';
-            elseif ($format == 1) print '<option value="'.$arraytypes['code'].'"';
-            elseif ($format == 2) print '<option value="'.$arraytypes['code'].'"';
-            elseif ($format == 3) print '<option value="'.$id.'"';
-            // If text is selected, we compare with code, else with id
-            if (preg_match('/[a-z]/i', $selected) && $selected == $arraytypes['code']) print ' selected';
-            elseif ($selected == $id) print ' selected';
-            print '>';
-            if ($format == 0) $value=($maxlength?dol_trunc($arraytypes['label'], $maxlength):$arraytypes['label']);
-            elseif ($format == 1) $value=$arraytypes['code'];
-            elseif ($format == 2) $value=($maxlength?dol_trunc($arraytypes['label'], $maxlength):$arraytypes['label']);
-            elseif ($format == 3) $value=$arraytypes['code'];
-            print $value?$value:'&nbsp;';
-            print '</option>';
-        }
-        print '</select>';
-        if ($user->admin && ! $noadmininfo) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
-    }
+		dol_syslog(__METHOD__." ".$selected.", ".$htmlname.", ".$format, LOG_DEBUG);
+
+		$this->load_cache_transport_mode();
+
+		print '<select id="select'.$htmlname.'" class="flat selectmodetransport'.($morecss?' '.$morecss:'').'" name="'.$htmlname.'">';
+		if ($empty) print '<option value="">&nbsp;</option>';
+		foreach ($this->cache_transport_mode as $id => $arraytypes)
+		{
+			// If not good status
+			if ($active >= 0 && $arraytypes['active'] != $active) continue;
+
+			// We discard empty line if showempty is on because an empty line has already been output.
+			if ($empty && empty($arraytypes['code'])) continue;
+
+			if ($format == 0) print '<option value="'.$id.'"';
+			elseif ($format == 1) print '<option value="'.$arraytypes['code'].'"';
+			elseif ($format == 2) print '<option value="'.$arraytypes['code'].'"';
+			elseif ($format == 3) print '<option value="'.$id.'"';
+			// If text is selected, we compare with code, else with id
+			if (preg_match('/[a-z]/i', $selected) && $selected == $arraytypes['code']) print ' selected';
+			elseif ($selected == $id) print ' selected';
+			print '>';
+			if ($format == 0) $value=($maxlength?dol_trunc($arraytypes['label'], $maxlength):$arraytypes['label']);
+			elseif ($format == 1) $value=$arraytypes['code'];
+			elseif ($format == 2) $value=($maxlength?dol_trunc($arraytypes['label'], $maxlength):$arraytypes['label']);
+			elseif ($format == 3) $value=$arraytypes['code'];
+			print $value?$value:'&nbsp;';
+			print '</option>';
+		}
+		print '</select>';
+		if ($user->admin && ! $noadmininfo) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+	}
 
 	/**
 	 *  Return a HTML select list of shipping mode
@@ -4683,40 +4683,40 @@ 
 		}
 	}
 
-    /**
-     *    Show form with transport mode
-     *
-     *    @param	string	$page        	Page
-     *    @param    int		$selected    	Id mode pre-select
-     *    @param    string	$htmlname    	Name of select html field
-     *    @param    int     $active         Active or not, -1 = all
-     *    @param    int     $addempty       1=Add empty entry
-     *    @return	void
-     */
-    public function formSelectTransportMode($page, $selected = '', $htmlname = 'transport_mode_id', $active = 1, $addempty = 0)
-    {
-        global $langs;
-        if ($htmlname != "none")
-        {
-            print '<form method="POST" action="'.$page.'">';
-            print '<input type="hidden" name="action" value="setmode">';
-            print '<input type="hidden" name="token" value="'.newToken().'">';
-            $this->selectTransportMode($selected, $htmlname, 2, $addempty, 0, 0, $active);
-            print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-            print '</form>';
-        }
-        else {
-            if ($selected)
-            {
-                $this->load_cache_transport_mode();
-                print $this->cache_transport_mode[$selected]['label'];
-            } else {
-                print "&nbsp;";
-            }
-        }
-    }
+	/**
+	 *    Show form with transport mode
+	 *
+	 *    @param	string	$page        	Page
+	 *    @param    int		$selected    	Id mode pre-select
+	 *    @param    string	$htmlname    	Name of select html field
+	 *    @param    int     $active         Active or not, -1 = all
+	 *    @param    int     $addempty       1=Add empty entry
+	 *    @return	void
+	 */
+	public function formSelectTransportMode($page, $selected = '', $htmlname = 'transport_mode_id', $active = 1, $addempty = 0)
+	{
+		global $langs;
+		if ($htmlname != "none")
+		{
+			print '<form method="POST" action="'.$page.'">';
+			print '<input type="hidden" name="action" value="setmode">';
+			print '<input type="hidden" name="token" value="'.newToken().'">';
+			$this->selectTransportMode($selected, $htmlname, 2, $addempty, 0, 0, $active);
+			print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+			print '</form>';
+		}
+		else {
+			if ($selected)
+			{
+				$this->load_cache_transport_mode();
+				print $this->cache_transport_mode[$selected]['label'];
+			} else {
+				print "&nbsp;";
+			}
+		}
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *    Show form with multicurrency code
 	 *

Spacing +15 added lines, -15 removed lines

@@ -3560,16 +3560,16 @@ 
         // phpcs:enable
         global $langs;
 
-        $num=count($this->cache_transport_mode);
-        if ($num > 0) return $num;    // Cache already loaded
+        $num = count($this->cache_transport_mode);
+        if ($num > 0) return $num; // Cache already loaded
 
         dol_syslog(__METHOD__, LOG_DEBUG);
 
         $this->cache_transport_mode = array();
 
         $sql = "SELECT rowid, code, label, active";
-        $sql.= " FROM ".MAIN_DB_PREFIX."c_transport_mode";
-        $sql.= " WHERE entity IN (".getEntity('c_transport_mode').")";
+        $sql .= " FROM ".MAIN_DB_PREFIX."c_transport_mode";
+        $sql .= " WHERE entity IN (".getEntity('c_transport_mode').")";
         //if ($active >= 0) $sql.= " AND active = ".$active;
 
         $resql = $this->db->query($sql);
@@ -3582,10 +3582,10 @@ 
                 $obj = $this->db->fetch_object($resql);
 
                 // If traduction exist, we use it else we take the default label
-                $label=($langs->transnoentitiesnoconv("PaymentTypeShort".$obj->code)!=("PaymentTypeShort".$obj->code)?$langs->transnoentitiesnoconv("PaymentTypeShort".$obj->code):($obj->label!='-'?$obj->label:''));
+                $label = ($langs->transnoentitiesnoconv("PaymentTypeShort".$obj->code) != ("PaymentTypeShort".$obj->code) ? $langs->transnoentitiesnoconv("PaymentTypeShort".$obj->code) : ($obj->label != '-' ? $obj->label : ''));
                 $this->cache_transport_mode[$obj->rowid]['rowid'] = $obj->rowid;
                 $this->cache_transport_mode[$obj->rowid]['code'] = $obj->code;
-                $this->cache_transport_mode[$obj->rowid]['label']= $label;
+                $this->cache_transport_mode[$obj->rowid]['label'] = $label;
                 $this->cache_transport_mode[$obj->rowid]['active'] = $obj->active;
                 $i++;
             }
@@ -3615,13 +3615,13 @@ 
      */
     public function selectTransportMode($selected = '', $htmlname = 'transportmode', $format = 0, $empty = 1, $noadmininfo = 0, $maxlength = 0, $active = 1, $morecss = '')
     {
-        global $langs,$user;
+        global $langs, $user;
 
         dol_syslog(__METHOD__." ".$selected.", ".$htmlname.", ".$format, LOG_DEBUG);
 
         $this->load_cache_transport_mode();
 
-        print '<select id="select'.$htmlname.'" class="flat selectmodetransport'.($morecss?' '.$morecss:'').'" name="'.$htmlname.'">';
+        print '<select id="select'.$htmlname.'" class="flat selectmodetransport'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'">';
         if ($empty) print '<option value="">&nbsp;</option>';
         foreach ($this->cache_transport_mode as $id => $arraytypes)
         {
@@ -3639,15 +3639,15 @@ 
             if (preg_match('/[a-z]/i', $selected) && $selected == $arraytypes['code']) print ' selected';
             elseif ($selected == $id) print ' selected';
             print '>';
-            if ($format == 0) $value=($maxlength?dol_trunc($arraytypes['label'], $maxlength):$arraytypes['label']);
-            elseif ($format == 1) $value=$arraytypes['code'];
-            elseif ($format == 2) $value=($maxlength?dol_trunc($arraytypes['label'], $maxlength):$arraytypes['label']);
-            elseif ($format == 3) $value=$arraytypes['code'];
-            print $value?$value:'&nbsp;';
+            if ($format == 0) $value = ($maxlength ?dol_trunc($arraytypes['label'], $maxlength) : $arraytypes['label']);
+            elseif ($format == 1) $value = $arraytypes['code'];
+            elseif ($format == 2) $value = ($maxlength ?dol_trunc($arraytypes['label'], $maxlength) : $arraytypes['label']);
+            elseif ($format == 3) $value = $arraytypes['code'];
+            print $value ? $value : '&nbsp;';
             print '</option>';
         }
         print '</select>';
-        if ($user->admin && ! $noadmininfo) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+        if ($user->admin && !$noadmininfo) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
     }
 
 	/**
@@ -6590,7 +6590,7 @@ 
 							 	templateSelection: formatSelection		/* For 4.0 */
 							});
 						});'."\n";
-			} elseif ($addjscombo == 2 && ! defined('DISABLE_MULTISELECT'))
+			} elseif ($addjscombo == 2 && !defined('DISABLE_MULTISELECT'))
 			{
 				// Add other js lib
 				// TODO external lib multiselect/jquery.multi-select.js must have been loaded to use this multiselect plugin

Braces +1515 added lines, -535 removed lines

@@ -117,40 +117,70 @@ 
 			{
 				$tmp = explode(':', $typeofdata);
 				$ret .= '<div class="editkey_'.$tmp[0].(!empty($tmp[1]) ? ' '.$tmp[1] : '').'" id="'.$htmlname.'">';
-				if ($fieldrequired) $ret .= '<span class="fieldrequired">';
+				if ($fieldrequired) {
+					$ret .= '<span class="fieldrequired">';
+				}
 				if ($help) {
 					$ret .= $this->textwithpicto($langs->trans($text), $help);
 				} else {
 					$ret .= $langs->trans($text);
 				}
-				if ($fieldrequired) $ret .= '</span>';
+				if ($fieldrequired) {
+					$ret .= '</span>';
+				}
 				$ret .= '</div>'."\n";
 			} else {
-				if ($fieldrequired) $ret .= '<span class="fieldrequired">';
+				if ($fieldrequired) {
+					$ret .= '<span class="fieldrequired">';
+				}
 				if ($help) {
 					$ret .= $this->textwithpicto($langs->trans($text), $help);
 				} else {
 					$ret .= $langs->trans($text);
 				}
-				if ($fieldrequired) $ret .= '</span>';
+				if ($fieldrequired) {
+					$ret .= '</span>';
+				}
 			}
 		} else {
-			if (empty($notabletag) && GETPOST('action', 'aZ09') != 'edit'.$htmlname && $perm) $ret .= '<table class="nobordernopadding centpercent"><tr><td class="nowrap">';
-			if ($fieldrequired) $ret .= '<span class="fieldrequired">';
+			if (empty($notabletag) && GETPOST('action', 'aZ09') != 'edit'.$htmlname && $perm) {
+				$ret .= '<table class="nobordernopadding centpercent"><tr><td class="nowrap">';
+			}
+			if ($fieldrequired) {
+				$ret .= '<span class="fieldrequired">';
+			}
 			if ($help) {
 				$ret .= $this->textwithpicto($langs->trans($text), $help);
 			} else {
 				$ret .= $langs->trans($text);
 			}
-			if ($fieldrequired) $ret .= '</span>';
-			if (!empty($notabletag)) $ret .= ' ';
-			if (empty($notabletag) && GETPOST('action', 'aZ09') != 'edit'.$htmlname && $perm) $ret .= '</td>';
-			if (empty($notabletag) && GETPOST('action', 'aZ09') != 'edit'.$htmlname && $perm) $ret .= '<td class="right">';
-			if ($htmlname && GETPOST('action', 'aZ09') != 'edit'.$htmlname && $perm) $ret .= '<a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=edit'.$htmlname.'&amp;'.$paramid.'='.$object->id.$moreparam.'">'.img_edit($langs->trans('Edit'), ($notabletag ? 0 : 1)).'</a>';
-			if (!empty($notabletag) && $notabletag == 1) $ret .= ' : ';
-			if (!empty($notabletag) && $notabletag == 3) $ret .= ' ';
-			if (empty($notabletag) && GETPOST('action', 'aZ09') != 'edit'.$htmlname && $perm) $ret .= '</td>';
-			if (empty($notabletag) && GETPOST('action', 'aZ09') != 'edit'.$htmlname && $perm) $ret .= '</tr></table>';
+			if ($fieldrequired) {
+				$ret .= '</span>';
+			}
+			if (!empty($notabletag)) {
+				$ret .= ' ';
+			}
+			if (empty($notabletag) && GETPOST('action', 'aZ09') != 'edit'.$htmlname && $perm) {
+				$ret .= '</td>';
+			}
+			if (empty($notabletag) && GETPOST('action', 'aZ09') != 'edit'.$htmlname && $perm) {
+				$ret .= '<td class="right">';
+			}
+			if ($htmlname && GETPOST('action', 'aZ09') != 'edit'.$htmlname && $perm) {
+				$ret .= '<a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=edit'.$htmlname.'&amp;'.$paramid.'='.$object->id.$moreparam.'">'.img_edit($langs->trans('Edit'), ($notabletag ? 0 : 1)).'</a>';
+			}
+			if (!empty($notabletag) && $notabletag == 1) {
+				$ret .= ' : ';
+			}
+			if (!empty($notabletag) && $notabletag == 3) {
+				$ret .= ' ';
+			}
+			if (empty($notabletag) && GETPOST('action', 'aZ09') != 'edit'.$htmlname && $perm) {
+				$ret .= '</td>';
+			}
+			if (empty($notabletag) && GETPOST('action', 'aZ09') != 'edit'.$htmlname && $perm) {
+				$ret .= '</tr></table>';
+			}
 		}
 
 		return $ret;
@@ -181,12 +211,16 @@ 
 		$ret = '';
 
 		// Check parameters
-		if (empty($typeofdata)) return 'ErrorBadParameter';
+		if (empty($typeofdata)) {
+			return 'ErrorBadParameter';
+		}
 
 		// When option to edit inline is activated
-		if (!empty($conf->global->MAIN_USE_JQUERY_JEDITABLE) && !preg_match('/^select;|datehourpicker/', $typeofdata)) // TODO add jquery timepicker and support select
+		if (!empty($conf->global->MAIN_USE_JQUERY_JEDITABLE) && !preg_match('/^select;|datehourpicker/', $typeofdata)) {
+			// TODO add jquery timepicker and support select
 		{
 			$ret .= $this->editInPlace($object, $value, $htmlname, $perm, $typeofdata, $editvalue, $extObject, $custommsg);
+		}
 		} else {
 			if (GETPOST('action', 'aZ09') == 'edit'.$htmlname)
 			{
@@ -195,8 +229,12 @@ 
 				$ret .= '<input type="hidden" name="action" value="set'.$htmlname.'">';
 				$ret .= '<input type="hidden" name="token" value="'.newToken().'">';
 				$ret .= '<input type="hidden" name="'.$paramid.'" value="'.$object->id.'">';
-				if (empty($notabletag)) $ret .= '<table class="nobordernopadding centpercent" cellpadding="0" cellspacing="0">';
-				if (empty($notabletag)) $ret .= '<tr><td>';
+				if (empty($notabletag)) {
+					$ret .= '<table class="nobordernopadding centpercent" cellpadding="0" cellspacing="0">';
+				}
+				if (empty($notabletag)) {
+					$ret .= '<tr><td>';
+				}
 				if (preg_match('/^(string|safehtmlstring|email)/', $typeofdata))
 				{
 					$tmp = explode(':', $typeofdata);
@@ -206,9 +244,11 @@ 
 					$tmp = explode(':', $typeofdata);
 					$valuetoshow = price2num($editvalue ? $editvalue : $value);
 					$ret .= '<input type="text" id="'.$htmlname.'" name="'.$htmlname.'" value="'.($valuetoshow != '' ?price($valuetoshow) : '').'"'.($tmp[1] ? ' size="'.$tmp[1].'"' : '').' autofocus>';
-				} elseif (preg_match('/^text/', $typeofdata) || preg_match('/^note/', $typeofdata))	// if wysiwyg is enabled $typeofdata = 'ckeditor'
+				} elseif (preg_match('/^text/', $typeofdata) || preg_match('/^note/', $typeofdata)) {
+					// if wysiwyg is enabled $typeofdata = 'ckeditor'
 				{
 					$tmp = explode(':', $typeofdata);
+				}
 					$cols = $tmp[2];
 					$morealt = '';
 					if (preg_match('/%/', $cols))
@@ -248,25 +288,41 @@ 
 					$doleditor = new DolEditor($htmlname, ($editvalue ? $editvalue : $value), ($tmp[2] ? $tmp[2] : ''), ($tmp[3] ? $tmp[3] : '100'), ($tmp[1] ? $tmp[1] : 'dolibarr_notes'), 'In', ($tmp[5] ? $tmp[5] : 0), (isset($tmp[8]) ? ($tmp[8] ?true:false) : true), true, ($tmp[6] ? $tmp[6] : '20'), ($tmp[7] ? $tmp[7] : '100'));
 					$ret .= $doleditor->Create(1);
 				}
-				if (empty($notabletag)) $ret .= '</td>';
+				if (empty($notabletag)) {
+					$ret .= '</td>';
+				}
 
-				if (empty($notabletag)) $ret .= '<td class="left">';
+				if (empty($notabletag)) {
+					$ret .= '<td class="left">';
+				}
 				//else $ret.='<div class="clearboth"></div>';
 				$ret .= '<input type="submit" class="button'.(empty($notabletag) ? '' : ' ').'" name="modify" value="'.$langs->trans("Modify").'">';
-				if (preg_match('/ckeditor|textarea/', $typeofdata) && empty($notabletag)) $ret .= '<br>'."\n";
+				if (preg_match('/ckeditor|textarea/', $typeofdata) && empty($notabletag)) {
+					$ret .= '<br>'."\n";
+				}
 				$ret .= '<input type="submit" class="button'.(empty($notabletag) ? '' : ' ').'" name="cancel" value="'.$langs->trans("Cancel").'">';
-				if (empty($notabletag)) $ret .= '</td>';
+				if (empty($notabletag)) {
+					$ret .= '</td>';
+				}
 
-				if (empty($notabletag)) $ret .= '</tr></table>'."\n";
+				if (empty($notabletag)) {
+					$ret .= '</tr></table>'."\n";
+				}
 				$ret .= '</form>'."\n";
 			} else {
-				if (preg_match('/^(email)/', $typeofdata))              $ret .= dol_print_email($value, 0, 0, 0, 0, 1);
-				elseif (preg_match('/^(amount|numeric)/', $typeofdata)) $ret .= ($value != '' ? price($value, '', $langs, 0, -1, -1, $conf->currency) : '');
-				elseif (preg_match('/^text/', $typeofdata) || preg_match('/^note/', $typeofdata))  $ret .= dol_htmlentitiesbr($value);
-				elseif (preg_match('/^safehtmlstring/', $typeofdata)) $ret .= dol_string_onlythesehtmltags($value);
-				elseif ($typeofdata == 'day' || $typeofdata == 'datepicker') $ret .= dol_print_date($value, 'day');
-				elseif ($typeofdata == 'dayhour' || $typeofdata == 'datehourpicker') $ret .= dol_print_date($value, 'dayhour');
-				elseif (preg_match('/^select;/', $typeofdata))
+				if (preg_match('/^(email)/', $typeofdata)) {
+					$ret .= dol_print_email($value, 0, 0, 0, 0, 1);
+				} elseif (preg_match('/^(amount|numeric)/', $typeofdata)) {
+					$ret .= ($value != '' ? price($value, '', $langs, 0, -1, -1, $conf->currency) : '');
+				} elseif (preg_match('/^text/', $typeofdata) || preg_match('/^note/', $typeofdata)) {
+					$ret .= dol_htmlentitiesbr($value);
+				} elseif (preg_match('/^safehtmlstring/', $typeofdata)) {
+					$ret .= dol_string_onlythesehtmltags($value);
+				} elseif ($typeofdata == 'day' || $typeofdata == 'datepicker') {
+					$ret .= dol_print_date($value, 'day');
+				} elseif ($typeofdata == 'dayhour' || $typeofdata == 'datehourpicker') {
+					$ret .= dol_print_date($value, 'dayhour');
+				} elseif (preg_match('/^select;/', $typeofdata))
 				{
 					$arraydata = explode(',', preg_replace('/^select;/', '', $typeofdata));
 					$arraylist = array();
@@ -320,7 +376,9 @@ 
 
 		// List of extra languages
 		$arrayoflangcode = array();
-		if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE)) $arrayoflangcode[] = $conf->global->PDF_USE_ALSO_LANGUAGE_CODE;
+		if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE)) {
+			$arrayoflangcode[] = $conf->global->PDF_USE_ALSO_LANGUAGE_CODE;
+		}
 
 		if (is_array($arrayoflangcode) && count($arrayoflangcode)) {
 			if (!is_object($extralanguages)) {
@@ -392,9 +450,13 @@ 
 		$out = '';
 
 		// Check parameters
-		if (preg_match('/^text/', $inputType)) $value = dol_nl2br($value);
-		elseif (preg_match('/^numeric/', $inputType)) $value = price($value);
-		elseif ($inputType == 'day' || $inputType == 'datepicker') $value = dol_print_date($value, 'day');
+		if (preg_match('/^text/', $inputType)) {
+			$value = dol_nl2br($value);
+		} elseif (preg_match('/^numeric/', $inputType)) {
+			$value = price($value);
+		} elseif ($inputType == 'day' || $inputType == 'datepicker') {
+			$value = dol_print_date($value, 'day');
+		}
 
 		if ($condition)
 		{
@@ -423,23 +485,35 @@ 
 			{
 				$tmp = explode(':', $inputType);
 				$inputType = $tmp[0];
-				if (!empty($tmp[1])) $inputOption = $tmp[1];
-				if (!empty($tmp[2])) $savemethod = $tmp[2];
+				if (!empty($tmp[1])) {
+					$inputOption = $tmp[1];
+				}
+				if (!empty($tmp[2])) {
+					$savemethod = $tmp[2];
+				}
 				$out .= '<input id="width_'.$htmlname.'" value="'.$inputOption.'" type="hidden"/>'."\n";
 			} elseif ((preg_match('/^day$/', $inputType)) || (preg_match('/^datepicker/', $inputType)) || (preg_match('/^datehourpicker/', $inputType)))
 			{
 				$tmp = explode(':', $inputType);
 				$inputType = $tmp[0];
-				if (!empty($tmp[1])) $inputOption = $tmp[1];
-				if (!empty($tmp[2])) $savemethod = $tmp[2];
+				if (!empty($tmp[1])) {
+					$inputOption = $tmp[1];
+				}
+				if (!empty($tmp[2])) {
+					$savemethod = $tmp[2];
+				}
 
 				$out .= '<input id="timestamp" type="hidden"/>'."\n"; // Use for timestamp format
 			} elseif (preg_match('/^(select|autocomplete)/', $inputType))
 			{
 				$tmp = explode(':', $inputType);
 				$inputType = $tmp[0]; $loadmethod = $tmp[1];
-				if (!empty($tmp[2])) $savemethod = $tmp[2];
-				if (!empty($tmp[3])) $button_only = true;
+				if (!empty($tmp[2])) {
+					$savemethod = $tmp[2];
+				}
+				if (!empty($tmp[3])) {
+					$button_only = true;
+				}
 			} elseif (preg_match('/^textarea/', $inputType))
 			{
 				$tmp = explode(':', $inputType);
@@ -450,9 +524,15 @@ 
 			{
 				$tmp = explode(':', $inputType);
 				$inputType = $tmp[0]; $toolbar = $tmp[1];
-				if (!empty($tmp[2])) $width = $tmp[2];
-				if (!empty($tmp[3])) $heigth = $tmp[3];
-				if (!empty($tmp[4])) $savemethod = $tmp[4];
+				if (!empty($tmp[2])) {
+					$width = $tmp[2];
+				}
+				if (!empty($tmp[3])) {
+					$heigth = $tmp[3];
+				}
+				if (!empty($tmp[4])) {
+					$savemethod = $tmp[4];
+				}
 
 				if (!empty($conf->fckeditor->enabled))
 				{
@@ -466,17 +546,25 @@ 
 			$out .= '<input id="table_element_'.$htmlname.'" value="'.$table_element.'" type="hidden"/>'."\n";
 			$out .= '<input id="fk_element_'.$htmlname.'" value="'.$fk_element.'" type="hidden"/>'."\n";
 			$out .= '<input id="loadmethod_'.$htmlname.'" value="'.$loadmethod.'" type="hidden"/>'."\n";
-			if (!empty($savemethod))	$out .= '<input id="savemethod_'.$htmlname.'" value="'.$savemethod.'" type="hidden"/>'."\n";
-			if (!empty($ext_element))	$out .= '<input id="ext_element_'.$htmlname.'" value="'.$ext_element.'" type="hidden"/>'."\n";
+			if (!empty($savemethod)) {
+				$out .= '<input id="savemethod_'.$htmlname.'" value="'.$savemethod.'" type="hidden"/>'."\n";
+			}
+			if (!empty($ext_element)) {
+				$out .= '<input id="ext_element_'.$htmlname.'" value="'.$ext_element.'" type="hidden"/>'."\n";
+			}
 			if (!empty($custommsg))
 			{
 				if (is_array($custommsg))
 				{
-					if (!empty($custommsg['success']))
-						$out .= '<input id="successmsg_'.$htmlname.'" value="'.$custommsg['success'].'" type="hidden"/>'."\n";
-						if (!empty($custommsg['error']))
-							$out .= '<input id="errormsg_'.$htmlname.'" value="'.$custommsg['error'].'" type="hidden"/>'."\n";
-				} else $out .= '<input id="successmsg_'.$htmlname.'" value="'.$custommsg.'" type="hidden"/>'."\n";
+					if (!empty($custommsg['success'])) {
+											$out .= '<input id="successmsg_'.$htmlname.'" value="'.$custommsg['success'].'" type="hidden"/>'."\n";
+					}
+						if (!empty($custommsg['error'])) {
+													$out .= '<input id="errormsg_'.$htmlname.'" value="'.$custommsg['error'].'" type="hidden"/>'."\n";
+						}
+				} else {
+					$out .= '<input id="successmsg_'.$htmlname.'" value="'.$custommsg.'" type="hidden"/>'."\n";
+				}
 			}
 			if ($inputType == 'textarea') {
 				$out .= '<input id="textarea_'.$htmlname.'_rows" value="'.$rows.'" type="hidden"/>'."\n";
@@ -512,12 +600,20 @@ 
 	 */
 	public function textwithtooltip($text, $htmltext, $tooltipon = 1, $direction = 0, $img = '', $extracss = '', $notabs = 3, $incbefore = '', $noencodehtmltext = 0, $tooltiptrigger = '', $forcenowrap = 0)
 	{
-		if ($incbefore) $text = $incbefore.$text;
-		if (!$htmltext) return $text;
+		if ($incbefore) {
+			$text = $incbefore.$text;
+		}
+		if (!$htmltext) {
+			return $text;
+		}
 
 		$tag = 'td';
-		if ($notabs == 2) $tag = 'div';
-		if ($notabs == 3) $tag = 'span';
+		if ($notabs == 2) {
+			$tag = 'div';
+		}
+		if ($notabs == 3) {
+			$tag = 'span';
+		}
 		// Sanitize tooltip
 		$htmltext = str_replace(array("\r", "\n"), '', $htmltext);
 
@@ -539,17 +635,36 @@ 
 		if ($tooltipon == 2 || $tooltipon == 3)
 		{
 			$paramfortooltipimg = ' class="'.$classfortooltip.($notabs != 3 ? ' inline-block' : '').($extracss ? ' '.$extracss : '').'" style="padding: 0px;'.($extrastyle ? ' '.$extrastyle : '').'"';
-			if ($tooltiptrigger == '') $paramfortooltipimg .= ' title="'.($noencodehtmltext ? $htmltext : dol_escape_htmltag($htmltext, 1)).'"'; // Attribut to put on img tag to store tooltip
-			else $paramfortooltipimg .= ' dolid="'.$tooltiptrigger.'"';
-		} else $paramfortooltipimg = ($extracss ? ' class="'.$extracss.'"' : '').($extrastyle ? ' style="'.$extrastyle.'"' : ''); // Attribut to put on td text tag
+			if ($tooltiptrigger == '') {
+				$paramfortooltipimg .= ' title="'.($noencodehtmltext ? $htmltext : dol_escape_htmltag($htmltext, 1)).'"';
+			}
+			// Attribut to put on img tag to store tooltip
+			else {
+				$paramfortooltipimg .= ' dolid="'.$tooltiptrigger.'"';
+			}
+		} else {
+			$paramfortooltipimg = ($extracss ? ' class="'.$extracss.'"' : '').($extrastyle ? ' style="'.$extrastyle.'"' : '');
+		}
+		// Attribut to put on td text tag
 		if ($tooltipon == 1 || $tooltipon == 3)
 		{
 			$paramfortooltiptd = ' class="'.($tooltipon == 3 ? 'cursorpointer ' : '').$classfortooltip.' inline-block'.($extracss ? ' '.$extracss : '').'" style="padding: 0px;'.($extrastyle ? ' '.$extrastyle : '').'" ';
-			if ($tooltiptrigger == '') $paramfortooltiptd .= ' title="'.($noencodehtmltext ? $htmltext : dol_escape_htmltag($htmltext, 1)).'"'; // Attribut to put on td tag to store tooltip
-			else $paramfortooltiptd .= ' dolid="'.$tooltiptrigger.'"';
-		} else $paramfortooltiptd = ($extracss ? ' class="'.$extracss.'"' : '').($extrastyle ? ' style="'.$extrastyle.'"' : ''); // Attribut to put on td text tag
-		if (empty($notabs)) $s .= '<table class="nobordernopadding"><tr style="height: auto;">';
-		elseif ($notabs == 2) $s .= '<div class="inline-block'.($forcenowrap ? ' nowrap' : '').'">';
+			if ($tooltiptrigger == '') {
+				$paramfortooltiptd .= ' title="'.($noencodehtmltext ? $htmltext : dol_escape_htmltag($htmltext, 1)).'"';
+			}
+			// Attribut to put on td tag to store tooltip
+			else {
+				$paramfortooltiptd .= ' dolid="'.$tooltiptrigger.'"';
+			}
+		} else {
+			$paramfortooltiptd = ($extracss ? ' class="'.$extracss.'"' : '').($extrastyle ? ' style="'.$extrastyle.'"' : '');
+		}
+		// Attribut to put on td text tag
+		if (empty($notabs)) {
+			$s .= '<table class="nobordernopadding"><tr style="height: auto;">';
+		} elseif ($notabs == 2) {
+			$s .= '<div class="inline-block'.($forcenowrap ? ' nowrap' : '').'">';
+		}
 		// Define value if value is before
 		if ($direction < 0) {
 			$s .= '<'.$tag.$paramfortooltipimg;
@@ -560,15 +675,22 @@ 
 		}
 		// Use another method to help avoid having a space in value in order to use this value with jquery
 		// Define label
-		if ((string) $text != '') $s .= '<'.$tag.$paramfortooltiptd.'>'.$text.'</'.$tag.'>';
+		if ((string) $text != '') {
+			$s .= '<'.$tag.$paramfortooltiptd.'>'.$text.'</'.$tag.'>';
+		}
 		// Define value if value is after
 		if ($direction > 0) {
 			$s .= '<'.$tag.$paramfortooltipimg;
-			if ($tag == 'td') $s .= ' class="valignmiddle" width="14"';
+			if ($tag == 'td') {
+				$s .= ' class="valignmiddle" width="14"';
+			}
 			$s .= '>'.$textfordialog.$img.'</'.$tag.'>';
 		}
-		if (empty($notabs)) $s .= '</tr></table>';
-		elseif ($notabs == 2) $s .= '</div>';
+		if (empty($notabs)) {
+			$s .= '</tr></table>';
+		} elseif ($notabs == 2) {
+			$s .= '</div>';
+		}
 
 		return $s;
 	}
@@ -592,17 +714,23 @@ 
 		global $conf, $langs;
 
 		$alt = '';
-		if ($tooltiptrigger) $alt = $langs->transnoentitiesnoconv("ClickToShowHelp");
+		if ($tooltiptrigger) {
+			$alt = $langs->transnoentitiesnoconv("ClickToShowHelp");
+		}
 
 		//For backwards compatibility
-		if ($type == '0') $type = 'info';
-		elseif ($type == '1') $type = 'help';
+		if ($type == '0') {
+			$type = 'info';
+		} elseif ($type == '1') {
+			$type = 'help';
+		}
 
 		// If info or help with no javascript, show only text
 		if (empty($conf->use_javascript_ajax))
 		{
-			if ($type == 'info' || $type == 'infoclickable' || $type == 'help' || $type == 'helpclickable')	return $text;
-			else {
+			if ($type == 'info' || $type == 'infoclickable' || $type == 'help' || $type == 'helpclickable') {
+				return $text;
+			} else {
 				$alt = $htmltext;
 				$htmltext = '';
 			}
@@ -611,7 +739,9 @@ 
 		// If info or help with smartphone, show only text (tooltip hover can't works)
 		if (!empty($conf->dol_no_mouse_hover) && empty($tooltiptrigger))
 		{
-			if ($type == 'info' || $type == 'infoclickable' || $type == 'help' || $type == 'helpclickable') return $text;
+			if ($type == 'info' || $type == 'infoclickable' || $type == 'help' || $type == 'helpclickable') {
+				return $text;
+			}
 		}
 		// If info or help with smartphone, show only text (tooltip on click does not works with dialog on smaprtphone)
 		//if (! empty($conf->dol_no_mouse_hover) && ! empty($tooltiptrigger))
@@ -620,13 +750,22 @@ 
 		//}
 
 		$img = '';
-		if ($type == 'info') $img = img_help(0, $alt);
-		elseif ($type == 'help') $img = img_help(($tooltiptrigger != '' ? 2 : 1), $alt);
-		elseif ($type == 'helpclickable') $img = img_help(($tooltiptrigger != '' ? 2 : 1), $alt);
-		elseif ($type == 'superadmin') $img = img_picto($alt, 'redstar');
-		elseif ($type == 'admin') $img = img_picto($alt, 'star');
-		elseif ($type == 'warning') $img = img_warning($alt);
-		elseif ($type != 'none') $img = img_picto($alt, $type); // $type can be an image path
+		if ($type == 'info') {
+			$img = img_help(0, $alt);
+		} elseif ($type == 'help') {
+			$img = img_help(($tooltiptrigger != '' ? 2 : 1), $alt);
+		} elseif ($type == 'helpclickable') {
+			$img = img_help(($tooltiptrigger != '' ? 2 : 1), $alt);
+		} elseif ($type == 'superadmin') {
+			$img = img_picto($alt, 'redstar');
+		} elseif ($type == 'admin') {
+			$img = img_picto($alt, 'star');
+		} elseif ($type == 'warning') {
+			$img = img_warning($alt);
+		} elseif ($type != 'none') {
+			$img = img_picto($alt, $type);
+		}
+		// $type can be an image path
 
 		return $this->textwithtooltip($text, $htmltext, ((($tooltiptrigger && !$img) || strpos($type, 'clickable')) ? 3 : 2), $direction, $img, $extracss, $notabs, '', $noencodehtmltext, $tooltiptrigger, $forcenowrap);
 	}
@@ -654,7 +793,9 @@ 
 		$parameters = array();
 		$reshook = $hookmanager->executeHooks('addMoreMassActions', $parameters); // Note that $action and $object may have been modified by hook
 		// check if there is a mass action
-		if (count($arrayofaction) == 0 && empty($hookmanager->resPrint)) return;
+		if (count($arrayofaction) == 0 && empty($hookmanager->resPrint)) {
+			return;
+		}
 		if (empty($reshook))
 		{
 			$ret .= '<option value="0"'.($disabled ? ' disabled="disabled"' : '').'>-- '.$langs->trans("SelectAction").' --</option>';
@@ -667,7 +808,9 @@ 
 
 		$ret .= '</select>';
 
-				if (empty($conf->dol_optimize_smallscreen)) $ret .= ajax_combobox('.'.$name.'select');
+				if (empty($conf->dol_optimize_smallscreen)) {
+					$ret .= ajax_combobox('.'.$name.'select');
+				}
 
 		// Warning: if you set submit button to disabled, post using 'Enter' will no more work if there is no another input submit. So we add a hidden button
 		$ret .= '<input type="submit" name="confirmmassactioninvisible" style="display: none" tabindex="-1">'; // Hidden button BEFORE so it is the one used when we submit with ENTER.
@@ -795,20 +938,27 @@ 
 					$i++;
 				}
 
-				if (empty($disablefavorites)) array_multisort($favorite, SORT_DESC, $label, SORT_ASC, $countryArray);
-				else $countryArray = dol_sort_array($countryArray, 'label');
+				if (empty($disablefavorites)) {
+					array_multisort($favorite, SORT_DESC, $label, SORT_ASC, $countryArray);
+				} else {
+					$countryArray = dol_sort_array($countryArray, 'label');
+				}
 
 				if ($showempty)
 				{
 					$out .= '<option value="">&nbsp;</option>'."\n";
 				}
 
-				if ($addspecialentries)	// Add dedicated entries for groups of countries
+				if ($addspecialentries) {
+					// Add dedicated entries for groups of countries
 				{
 					//if ($showempty) $out.= '<option value="" disabled class="selectoptiondisabledwhite">--------------</option>';
 					$out .= '<option value="special_allnotme"'.($selected == 'special_allnotme' ? ' selected' : '').'>'.$langs->trans("CountriesExceptMe", $langs->transnoentitiesnoconv("Country".$mysoc->country_code)).'</option>';
+				}
 					$out .= '<option value="special_eec"'.($selected == 'special_eec' ? ' selected' : '').'>'.$langs->trans("CountriesInEEC").'</option>';
-					if ($mysoc->isInEEC()) $out .= '<option value="special_eecnotme"'.($selected == 'special_eecnotme' ? ' selected' : '').'>'.$langs->trans("CountriesInEECExceptMe", $langs->transnoentitiesnoconv("Country".$mysoc->country_code)).'</option>';
+					if ($mysoc->isInEEC()) {
+						$out .= '<option value="special_eecnotme"'.($selected == 'special_eecnotme' ? ' selected' : '').'>'.$langs->trans("CountriesInEECExceptMe", $langs->transnoentitiesnoconv("Country".$mysoc->country_code)).'</option>';
+					}
 					$out .= '<option value="special_noteec"'.($selected == 'special_noteec' ? ' selected' : '').'>'.$langs->trans("CountriesNotInEEC").'</option>';
 					$out .= '<option value="" disabled class="selectoptiondisabledwhite">--------------</option>';
 				}
@@ -816,10 +966,17 @@ 
 				foreach ($countryArray as $row)
 				{
 					//if (empty($showempty) && empty($row['rowid'])) continue;
-					if (empty($row['rowid'])) continue;
-					if (is_array($exclude_country_code) && count($exclude_country_code) && in_array($row['code_iso'], $exclude_country_code)) continue; // exclude some countries
+					if (empty($row['rowid'])) {
+						continue;
+					}
+					if (is_array($exclude_country_code) && count($exclude_country_code) && in_array($row['code_iso'], $exclude_country_code)) {
+						continue;
+					}
+					// exclude some countries
 
-					if (empty($disablefavorites) && $row['favorite'] && $row['code_iso']) $atleastonefavorite++;
+					if (empty($disablefavorites) && $row['favorite'] && $row['code_iso']) {
+						$atleastonefavorite++;
+					}
 					if (empty($row['favorite']) && $atleastonefavorite)
 					{
 						$atleastonefavorite = 0;
@@ -832,9 +989,14 @@ 
 					} else {
 						$out .= '<option value="'.($usecodeaskey ? ($usecodeaskey == 'code2' ? $row['code_iso'] : $row['code_iso3']) : $row['rowid']).'">';
 					}
-					if ($row['label']) $out .= dol_trunc($row['label'], $maxlength, 'middle');
-					else $out .= '&nbsp;';
-					if ($row['code_iso']) $out .= ' ('.$row['code_iso'].')';
+					if ($row['label']) {
+						$out .= dol_trunc($row['label'], $maxlength, 'middle');
+					} else {
+						$out .= '&nbsp;';
+					}
+					if ($row['code_iso']) {
+						$out .= ' ('.$row['code_iso'].')';
+					}
 					$out .= '</option>';
 				}
 			}
@@ -920,7 +1082,9 @@ 
 						$out .= '<option value="'.$row['rowid'].'">';
 					}
 
-					if ($row['code']) $out .= $row['code'];
+					if ($row['code']) {
+						$out .= $row['code'];
+					}
 
 					$out .= '</option>';
 				}
@@ -961,21 +1125,29 @@ 
 		if ($forceall == 1 || (empty($forceall) && !empty($conf->product->enabled) && !empty($conf->service->enabled))
 			|| (empty($forceall) && empty($conf->product->enabled) && empty($conf->service->enabled)))
 		{
-			if (empty($hidetext)) print $langs->trans("Type").': ';
+			if (empty($hidetext)) {
+				print $langs->trans("Type").': ';
+			}
 			print '<select class="flat" id="select_'.$htmlname.'" name="'.$htmlname.'">';
 			if ($showempty)
 			{
 				print '<option value="-1"';
-				if ($selected == -1) print ' selected';
+				if ($selected == -1) {
+					print ' selected';
+				}
 				print '>&nbsp;</option>';
 			}
 
 			print '<option value="0"';
-			if (0 == $selected) print ' selected';
+			if (0 == $selected) {
+				print ' selected';
+			}
 			print '>'.$langs->trans("Product");
 
 			print '<option value="1"';
-			if (1 == $selected) print ' selected';
+			if (1 == $selected) {
+				print ' selected';
+			}
 			print '>'.$langs->trans("Service");
 
 			print '</select>';
@@ -991,9 +1163,12 @@ 
 			print $langs->trans("Product");
 			print '<input type="hidden" name="'.$htmlname.'" value="0">';
 		}
-		if ($forceall < 0)	// This should happened only for contracts when both predefined product and service are disabled.
+		if ($forceall < 0) {
+			// This should happened only for contracts when both predefined product and service are disabled.
 		{
-			print '<input type="hidden" name="'.$htmlname.'" value="1">'; // By default we set on service for contract. If CONTRACT_SUPPORT_PRODUCTS is set, forceall should be 1 not -1
+			print '<input type="hidden" name="'.$htmlname.'" value="1">';
+		}
+		// By default we set on service for contract. If CONTRACT_SUPPORT_PRODUCTS is set, forceall should be 1 not -1
 		}
 	}
 
@@ -1009,7 +1184,10 @@ 
 		global $langs;
 
 		$num = count($this->cache_types_fees);
-		if ($num > 0) return 0; // Cache already loaded
+		if ($num > 0) {
+			return 0;
+		}
+		// Cache already loaded
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
@@ -1066,21 +1244,27 @@ 
 		if ($showempty)
 		{
 			print '<option value="-1"';
-			if ($selected == -1) print ' selected';
+			if ($selected == -1) {
+				print ' selected';
+			}
 			print '>&nbsp;</option>';
 		}
 
 		foreach ($this->cache_types_fees as $key => $value)
 		{
 			print '<option value="'.$key.'"';
-			if ($key == $selected) print ' selected';
+			if ($key == $selected) {
+				print ' selected';
+			}
 			print '>';
 			print $value;
 			print '</option>';
 		}
 
 		print '</select>';
-		if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+		if ($user->admin) {
+			print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+		}
 	}
 
 
@@ -1127,8 +1311,9 @@ 
 			$urloption = 'htmlname='.urlencode($htmlname).'&outjson=1&filter='.urlencode($filter).($showtype ? '&showtype='.urlencode($showtype) : '');
 			$out .= ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT.'/societe/ajax/company.php', $urloption, $conf->global->COMPANY_USE_SEARCH_TO_SELECT, 0, $ajaxoptions);
 			$out .= '<style type="text/css">.ui-autocomplete { z-index: 250; }</style>';
-			if (empty($hidelabel)) print $langs->trans("RefOrLabel").' : ';
-			elseif ($hidelabel > 1) {
+			if (empty($hidelabel)) {
+				print $langs->trans("RefOrLabel").' : ';
+			} elseif ($hidelabel > 1) {
 				$placeholder = ' placeholder="'.$langs->trans("RefOrLabel").'"';
 				if ($hidelabel == 2) {
 					$out .= img_picto($langs->trans("Search"), 'search');
@@ -1175,8 +1360,11 @@ 
 		$num = 0;
 		$outarray = array();
 
-		if ($selected === '') $selected = array();
-		elseif (!is_array($selected)) $selected = array($selected);
+		if ($selected === '') {
+			$selected = array();
+		} elseif (!is_array($selected)) {
+			$selected = array($selected);
+		}
 
 		// Clean $filter that may contains sql conditions so sql code
 		if (function_exists('testSqlAndScriptInject')) {
@@ -1194,15 +1382,25 @@ 
 		}
 
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
-		if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		if (!$user->rights->societe->client->voir && !$user->socid) {
+			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		}
 		if ($conf->global->COMPANY_SHOW_ADDRESS_SELECTLIST) {
 			$sql .= " LEFT OUTER JOIN ".MAIN_DB_PREFIX."c_country as dictp ON dictp.rowid=s.fk_pays";
 		}
 		$sql .= " WHERE s.entity IN (".getEntity('societe').")";
-		if (!empty($user->socid)) $sql .= " AND s.rowid = ".$user->socid;
-		if ($filter) $sql .= " AND (".$filter.")";
-		if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-		if (!empty($conf->global->COMPANY_HIDE_INACTIVE_IN_COMBOBOX)) $sql .= " AND s.status <> 0";
+		if (!empty($user->socid)) {
+			$sql .= " AND s.rowid = ".$user->socid;
+		}
+		if ($filter) {
+			$sql .= " AND (".$filter.")";
+		}
+		if (!$user->rights->societe->client->voir && !$user->socid) {
+			$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+		}
+		if (!empty($conf->global->COMPANY_HIDE_INACTIVE_IN_COMBOBOX)) {
+			$sql .= " AND s.status <> 0";
+		}
 		// Add criteria
 		if ($filterkey && $filterkey != '')
 		{
@@ -1211,13 +1409,19 @@ 
 			// For natural search
 			$scrit = explode(' ', $filterkey);
 			$i = 0;
-			if (count($scrit) > 1) $sql .= "(";
+			if (count($scrit) > 1) {
+				$sql .= "(";
+			}
 			foreach ($scrit as $crit) {
-				if ($i > 0) $sql .= " AND ";
+				if ($i > 0) {
+					$sql .= " AND ";
+				}
 				$sql .= "(s.nom LIKE '".$this->db->escape($prefix.$crit)."%')";
 				$i++;
 			}
-			if (count($scrit) > 1) $sql .= ")";
+			if (count($scrit) > 1) {
+				$sql .= ")";
+			}
 			if (!empty($conf->barcode->enabled))
 			{
 				$sql .= " OR s.barcode LIKE '".$this->db->escape($prefix.$filterkey)."%'";
@@ -1247,10 +1451,15 @@ 
 			{
 				// Do not use textifempty = ' ' or '&nbsp;' here, or search on key will search on ' key'.
 				//if (! empty($conf->use_javascript_ajax) || $forcecombo) $textifempty='';
-				if ($showempty && !is_numeric($showempty)) $textifempty = $langs->trans($showempty);
-				else $textifempty .= $langs->trans("All");
+				if ($showempty && !is_numeric($showempty)) {
+					$textifempty = $langs->trans($showempty);
+				} else {
+					$textifempty .= $langs->trans("All");
+				}
+			}
+			if ($showempty) {
+				$out .= '<option value="-1">'.$textifempty.'</option>'."\n";
 			}
-			if ($showempty) $out .= '<option value="-1">'.$textifempty.'</option>'."\n";
 
 			$num = $this->db->num_rows($resql);
 			$i = 0;
@@ -1278,11 +1487,21 @@ 
 
 					if ($showtype)
 					{
-						if ($obj->client || $obj->fournisseur) $label .= ' (';
-						if ($obj->client == 1 || $obj->client == 3) $label .= $langs->trans("Customer");
-						if ($obj->client == 2 || $obj->client == 3) $label .= ($obj->client == 3 ? ', ' : '').$langs->trans("Prospect");
-						if ($obj->fournisseur) $label .= ($obj->client ? ', ' : '').$langs->trans("Supplier");
-						if ($obj->client || $obj->fournisseur) $label .= ')';
+						if ($obj->client || $obj->fournisseur) {
+							$label .= ' (';
+						}
+						if ($obj->client == 1 || $obj->client == 3) {
+							$label .= $langs->trans("Customer");
+						}
+						if ($obj->client == 2 || $obj->client == 3) {
+							$label .= ($obj->client == 3 ? ', ' : '').$langs->trans("Prospect");
+						}
+						if ($obj->fournisseur) {
+							$label .= ($obj->client ? ', ' : '').$langs->trans("Supplier");
+						}
+						if ($obj->client || $obj->fournisseur) {
+							$label .= ')';
+						}
 					}
 
 					if ($conf->global->COMPANY_SHOW_ADDRESS_SELECTLIST) {
@@ -1305,7 +1524,9 @@ 
 					}
 
 					$i++;
-					if (($i % 10) == 0) $out .= "\n";
+					if (($i % 10) == 0) {
+						$out .= "\n";
+					}
 				}
 			}
 			$out .= '</select>'."\n";
@@ -1315,7 +1536,9 @@ 
 
 		$this->result = array('nbofthirdparties'=>$num);
 
-		if ($outputmode) return $outarray;
+		if ($outputmode) {
+			return $outarray;
+		}
 		return $out;
 	}
 
@@ -1342,7 +1565,9 @@ 
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe_remise_except as re";
 		$sql .= " WHERE re.fk_soc = ".(int) $socid;
 		$sql .= " AND re.entity = ".$conf->entity;
-		if ($filter) $sql .= " AND ".$filter;
+		if ($filter) {
+			$sql .= " AND ".$filter;
+		}
 		$sql .= " ORDER BY re.description ASC";
 
 		dol_syslog(get_class($this)."::select_remises", LOG_DEBUG);
@@ -1362,13 +1587,23 @@ 
 				{
 					$obj = $this->db->fetch_object($resql);
 					$desc = dol_trunc($obj->description, 40);
-					if (preg_match('/\(CREDIT_NOTE\)/', $desc)) $desc = preg_replace('/\(CREDIT_NOTE\)/', $langs->trans("CreditNote"), $desc);
-					if (preg_match('/\(DEPOSIT\)/', $desc)) $desc = preg_replace('/\(DEPOSIT\)/', $langs->trans("Deposit"), $desc);
-					if (preg_match('/\(EXCESS RECEIVED\)/', $desc)) $desc = preg_replace('/\(EXCESS RECEIVED\)/', $langs->trans("ExcessReceived"), $desc);
-					if (preg_match('/\(EXCESS PAID\)/', $desc)) $desc = preg_replace('/\(EXCESS PAID\)/', $langs->trans("ExcessPaid"), $desc);
+					if (preg_match('/\(CREDIT_NOTE\)/', $desc)) {
+						$desc = preg_replace('/\(CREDIT_NOTE\)/', $langs->trans("CreditNote"), $desc);
+					}
+					if (preg_match('/\(DEPOSIT\)/', $desc)) {
+						$desc = preg_replace('/\(DEPOSIT\)/', $langs->trans("Deposit"), $desc);
+					}
+					if (preg_match('/\(EXCESS RECEIVED\)/', $desc)) {
+						$desc = preg_replace('/\(EXCESS RECEIVED\)/', $langs->trans("ExcessReceived"), $desc);
+					}
+					if (preg_match('/\(EXCESS PAID\)/', $desc)) {
+						$desc = preg_replace('/\(EXCESS PAID\)/', $langs->trans("ExcessPaid"), $desc);
+					}
 
 					$selectstring = '';
-					if ($selected > 0 && $selected == $obj->rowid) $selectstring = ' selected';
+					if ($selected > 0 && $selected == $obj->rowid) {
+						$selectstring = ' selected';
+					}
 
 					$disabled = '';
 					if ($maxvalue > 0 && $obj->amount_ttc > $maxvalue)
@@ -1380,7 +1615,9 @@ 
 					if (!empty($conf->global->MAIN_SHOW_FACNUMBER_IN_DISCOUNT_LIST) && !empty($obj->fk_facture_source))
 					{
 						$tmpfac = new Facture($this->db);
-						if ($tmpfac->fetch($obj->fk_facture_source) > 0) $desc = $desc.' - '.$tmpfac->ref;
+						if ($tmpfac->fetch($obj->fk_facture_source) > 0) {
+							$desc = $desc.' - '.$tmpfac->ref;
+						}
 					}
 
 					print '<option value="'.$obj->rowid.'"'.$selectstring.$disabled.'>'.$desc.' ('.price($obj->amount_ht).' '.$langs->trans("HT").' - '.price($obj->amount_ttc).' '.$langs->trans("TTC").')</option>';
@@ -1452,10 +1689,15 @@ 
 
 		$langs->load('companies');
 
-		if (empty($htmlid)) $htmlid = $htmlname;
+		if (empty($htmlid)) {
+			$htmlid = $htmlname;
+		}
 
-		if ($selected === '') $selected = array();
-		elseif (!is_array($selected)) $selected = array($selected);
+		if ($selected === '') {
+			$selected = array();
+		} elseif (!is_array($selected)) {
+			$selected = array($selected);
+		}
 		$out = '';
 
 		if (!is_object($hookmanager))
@@ -1466,12 +1708,20 @@ 
 
 		// We search third parties
 		$sql = "SELECT sp.rowid, sp.lastname, sp.statut, sp.firstname, sp.poste";
-		if ($showsoc > 0) $sql .= " , s.nom as company";
+		if ($showsoc > 0) {
+			$sql .= " , s.nom as company";
+		}
 		$sql .= " FROM ".MAIN_DB_PREFIX."socpeople as sp";
-		if ($showsoc > 0) $sql .= " LEFT OUTER JOIN  ".MAIN_DB_PREFIX."societe as s ON s.rowid=sp.fk_soc";
+		if ($showsoc > 0) {
+			$sql .= " LEFT OUTER JOIN  ".MAIN_DB_PREFIX."societe as s ON s.rowid=sp.fk_soc";
+		}
 		$sql .= " WHERE sp.entity IN (".getEntity('socpeople').")";
-		if ($socid > 0 || $socid == -1) $sql .= " AND sp.fk_soc=".$socid;
-		if (!empty($conf->global->CONTACT_HIDE_INACTIVE_IN_COMBOBOX)) $sql .= " AND sp.statut <> 0";
+		if ($socid > 0 || $socid == -1) {
+			$sql .= " AND sp.fk_soc=".$socid;
+		}
+		if (!empty($conf->global->CONTACT_HIDE_INACTIVE_IN_COMBOBOX)) {
+			$sql .= " AND sp.statut <> 0";
+		}
 		$sql .= " ORDER BY sp.lastname ASC";
 
 		dol_syslog(get_class($this)."::select_contacts", LOG_DEBUG);
@@ -1486,9 +1736,15 @@ 
 				$out .= ajax_combobox($htmlid, $events, $conf->global->CONTACT_USE_SEARCH_TO_SELECT);
 			}
 
-			if ($htmlname != 'none' && !$options_only) $out .= '<select class="flat'.($moreclass ? ' '.$moreclass : '').'" id="'.$htmlid.'" name="'.$htmlname.($multiple ? '[]' : '').'" '.($multiple ? 'multiple' : '').' '.(!empty($moreparam) ? $moreparam : '').'>';
-			if (($showempty == 1 || ($showempty == 3 && $num > 1)) && !$multiple) $out .= '<option value="0"'.(in_array(0, $selected) ? ' selected' : '').'>&nbsp;</option>';
-			if ($showempty == 2) $out .= '<option value="0"'.(in_array(0, $selected) ? ' selected' : '').'>-- '.$langs->trans("Internal").' --</option>';
+			if ($htmlname != 'none' && !$options_only) {
+				$out .= '<select class="flat'.($moreclass ? ' '.$moreclass : '').'" id="'.$htmlid.'" name="'.$htmlname.($multiple ? '[]' : '').'" '.($multiple ? 'multiple' : '').' '.(!empty($moreparam) ? $moreparam : '').'>';
+			}
+			if (($showempty == 1 || ($showempty == 3 && $num > 1)) && !$multiple) {
+				$out .= '<option value="0"'.(in_array(0, $selected) ? ' selected' : '').'>&nbsp;</option>';
+			}
+			if ($showempty == 2) {
+				$out .= '<option value="0"'.(in_array(0, $selected) ? ' selected' : '').'>-- '.$langs->trans("Internal").' --</option>';
+			}
 
 			$num = $this->db->num_rows($resql);
 			$i = 0;
@@ -1508,32 +1764,52 @@ 
 						if ($htmlname != 'none')
 						{
 							$disabled = 0;
-							if (is_array($exclude) && count($exclude) && in_array($obj->rowid, $exclude)) $disabled = 1;
-							if (is_array($limitto) && count($limitto) && !in_array($obj->rowid, $limitto)) $disabled = 1;
+							if (is_array($exclude) && count($exclude) && in_array($obj->rowid, $exclude)) {
+								$disabled = 1;
+							}
+							if (is_array($limitto) && count($limitto) && !in_array($obj->rowid, $limitto)) {
+								$disabled = 1;
+							}
 							if (!empty($selected) && in_array($obj->rowid, $selected))
 							{
 								$out .= '<option value="'.$obj->rowid.'"';
-								if ($disabled) $out .= ' disabled';
+								if ($disabled) {
+									$out .= ' disabled';
+								}
 								$out .= ' selected>';
 								$out .= $contactstatic->getFullName($langs);
-								if ($showfunction && $obj->poste) $out .= ' ('.$obj->poste.')';
-								if (($showsoc > 0) && $obj->company) $out .= ' - ('.$obj->company.')';
+								if ($showfunction && $obj->poste) {
+									$out .= ' ('.$obj->poste.')';
+								}
+								if (($showsoc > 0) && $obj->company) {
+									$out .= ' - ('.$obj->company.')';
+								}
 								$out .= '</option>';
 							} else {
 								$out .= '<option value="'.$obj->rowid.'"';
-								if ($disabled) $out .= ' disabled';
+								if ($disabled) {
+									$out .= ' disabled';
+								}
 								$out .= '>';
 								$out .= $contactstatic->getFullName($langs);
-								if ($showfunction && $obj->poste) $out .= ' ('.$obj->poste.')';
-								if (($showsoc > 0) && $obj->company) $out .= ' - ('.$obj->company.')';
+								if ($showfunction && $obj->poste) {
+									$out .= ' ('.$obj->poste.')';
+								}
+								if (($showsoc > 0) && $obj->company) {
+									$out .= ' - ('.$obj->company.')';
+								}
 								$out .= '</option>';
 							}
 						} else {
 							if (in_array($obj->rowid, $selected))
 							{
 								$out .= $contactstatic->getFullName($langs);
-								if ($showfunction && $obj->poste) $out .= ' ('.$obj->poste.')';
-								if (($showsoc > 0) && $obj->company) $out .= ' - ('.$obj->company.')';
+								if ($showfunction && $obj->poste) {
+									$out .= ' ('.$obj->poste.')';
+								}
+								if (($showsoc > 0) && $obj->company) {
+									$out .= ' - ('.$obj->company.')';
+								}
 							}
 						}
 					}
@@ -1621,19 +1897,27 @@ 
 		global $conf, $user, $langs, $hookmanager;
 
 		// If no preselected user defined, we take current user
-		if ((is_numeric($selected) && ($selected < -2 || empty($selected))) && empty($conf->global->SOCIETE_DISABLE_DEFAULT_SALESREPRESENTATIVE)) $selected = $user->id;
+		if ((is_numeric($selected) && ($selected < -2 || empty($selected))) && empty($conf->global->SOCIETE_DISABLE_DEFAULT_SALESREPRESENTATIVE)) {
+			$selected = $user->id;
+		}
 
-		if ($selected === '') $selected = array();
-		elseif (!is_array($selected)) $selected = array($selected);
+		if ($selected === '') {
+			$selected = array();
+		} elseif (!is_array($selected)) {
+			$selected = array($selected);
+		}
 
 		$excludeUsers = null;
 		$includeUsers = null;
 
 		// Permettre l'exclusion d'utilisateurs
-		if (is_array($exclude))	$excludeUsers = implode(",", $exclude);
+		if (is_array($exclude)) {
+			$excludeUsers = implode(",", $exclude);
+		}
 		// Permettre l'inclusion d'utilisateurs
-		if (is_array($include))	$includeUsers = implode(",", $include);
-		elseif ($include == 'hierarchy')
+		if (is_array($include)) {
+			$includeUsers = implode(",", $include);
+		} elseif ($include == 'hierarchy')
 		{
 			// Build list includeUsers to have only hierarchy
 			$includeUsers = implode(",", $user->getAllChildIds(0));
@@ -1656,8 +1940,11 @@ 
 		if (!empty($conf->multicompany->enabled) && $conf->entity == 1 && $user->admin && !$user->entity)
 		{
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."entity as e ON e.rowid=u.entity";
-			if ($force_entity) $sql .= " WHERE u.entity IN (0,".$force_entity.")";
-			else $sql .= " WHERE u.entity IS NOT NULL";
+			if ($force_entity) {
+				$sql .= " WHERE u.entity IN (0,".$force_entity.")";
+			} else {
+				$sql .= " WHERE u.entity IS NOT NULL";
+			}
 		} else {
 			if (!empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
 			{
@@ -1668,19 +1955,33 @@ 
 				$sql .= " WHERE u.entity IN (0,".$conf->entity.")";
 			}
 		}
-		if (!empty($user->socid)) $sql .= " AND u.fk_soc = ".$user->socid;
-		if (is_array($exclude) && $excludeUsers) $sql .= " AND u.rowid NOT IN (".$excludeUsers.")";
-		if ($includeUsers) $sql .= " AND u.rowid IN (".$includeUsers.")";
-		if (!empty($conf->global->USER_HIDE_INACTIVE_IN_COMBOBOX) || $noactive) $sql .= " AND u.statut <> 0";
-		if (!empty($morefilter)) $sql .= " ".$morefilter;
+		if (!empty($user->socid)) {
+			$sql .= " AND u.fk_soc = ".$user->socid;
+		}
+		if (is_array($exclude) && $excludeUsers) {
+			$sql .= " AND u.rowid NOT IN (".$excludeUsers.")";
+		}
+		if ($includeUsers) {
+			$sql .= " AND u.rowid IN (".$includeUsers.")";
+		}
+		if (!empty($conf->global->USER_HIDE_INACTIVE_IN_COMBOBOX) || $noactive) {
+			$sql .= " AND u.statut <> 0";
+		}
+		if (!empty($morefilter)) {
+			$sql .= " ".$morefilter;
+		}
 
 		//Add hook to filter on user (for exemple on usergroup define in custom modules)
 		$reshook = $hookmanager->executeHooks('addSQLWhereFilterOnSelectUsers', array(), $this, $action);
-		if (!empty($reshook)) $sql .= $hookmanager->resPrint;
+		if (!empty($reshook)) {
+			$sql .= $hookmanager->resPrint;
+		}
 
-		if (empty($conf->global->MAIN_FIRSTNAME_NAME_POSITION))	// MAIN_FIRSTNAME_NAME_POSITION is 0 means firstname+lastname
+		if (empty($conf->global->MAIN_FIRSTNAME_NAME_POSITION)) {
+			// MAIN_FIRSTNAME_NAME_POSITION is 0 means firstname+lastname
 		{
 			$sql .= " ORDER BY u.firstname ASC";
+		}
 		} else {
 			$sql .= " ORDER BY u.lastname ASC";
 		}
@@ -1699,8 +2000,12 @@ 
 
 				// do not use maxwidthonsmartphone by default. Set it by caller so auto size to 100% will work when not defined
 				$out .= '<select class="flat'.($morecss ? ' minwidth100imp '.$morecss : ' minwidth200').'" id="'.$htmlname.'" name="'.$htmlname.($multiple ? '[]' : '').'" '.($multiple ? 'multiple' : '').' '.($disabled ? ' disabled' : '').'>';
-				if ($show_empty && !$multiple) $out .= '<option value="-1"'.((empty($selected) || in_array(-1, $selected)) ? ' selected' : '').'>&nbsp;</option>'."\n";
-				if ($show_every) $out .= '<option value="-2"'.((in_array(-2, $selected)) ? ' selected' : '').'>-- '.$langs->trans("Everybody").' --</option>'."\n";
+				if ($show_empty && !$multiple) {
+					$out .= '<option value="-1"'.((empty($selected) || in_array(-1, $selected)) ? ' selected' : '').'>&nbsp;</option>'."\n";
+				}
+				if ($show_every) {
+					$out .= '<option value="-2"'.((in_array(-2, $selected)) ? ' selected' : '').'>-- '.$langs->trans("Everybody").' --</option>'."\n";
+				}
 
 				$userstatic = new User($this->db);
 
@@ -1713,7 +2018,9 @@ 
 					$userstatic->firstname = $obj->firstname;
 
 					$disableline = '';
-					if (is_array($enableonly) && count($enableonly) && !in_array($obj->rowid, $enableonly)) $disableline = ($enableonlytext ? $enableonlytext : '1');
+					if (is_array($enableonly) && count($enableonly) && !in_array($obj->rowid, $enableonly)) {
+						$disableline = ($enableonlytext ? $enableonlytext : '1');
+					}
 
 					$labeltoshow = '';
 
@@ -1759,7 +2066,9 @@ 
 					$labeltoshow .= $moreinfo;
 
 					$out .= '<option value="'.$obj->rowid.'"';
-					if ($disableline) $out .= ' disabled';
+					if ($disableline) {
+						$out .= ' disabled';
+					}
 					if ((is_object($selected) && $selected->id == $obj->rowid) || (!is_object($selected) && in_array($obj->rowid, $selected))) {
 						$out .= ' selected';
 					}
@@ -1783,7 +2092,9 @@ 
 			dol_print_error($this->db);
 		}
 
-		if ($outputmode) return $outarray;
+		if ($outputmode) {
+			return $outarray;
+		}
 		return $out;
 	}
 
@@ -1828,11 +2139,15 @@ 
 		$nbassignetouser = count($assignedtouser);
 
 		//if ($nbassignetouser && $action != 'view') $out .= '<br>';
-		if ($nbassignetouser) $out .= '<ul class="attendees">';
+		if ($nbassignetouser) {
+			$out .= '<ul class="attendees">';
+		}
 		$i = 0; $ownerid = 0;
 		foreach ($assignedtouser as $key => $value)
 		{
-			if ($value['id'] == $ownerid) continue;
+			if ($value['id'] == $ownerid) {
+				continue;
+			}
 
 			$out .= '<li>';
 			$userstatic->fetch($value['id']);
@@ -1858,7 +2173,9 @@ 
 			$out .= '</li>';
 			$i++;
 		}
-		if ($nbassignetouser) $out .= '</ul>';
+		if ($nbassignetouser) {
+			$out .= '</ul>';
+		}
 
 		// Method with no ajax
 		if ($action != 'view')
@@ -1910,7 +2227,9 @@ 
 
 		// check parameters
 		$price_level = (!empty($price_level) ? $price_level : 0);
-		if (is_null($ajaxoptions)) $ajaxoptions = array();
+		if (is_null($ajaxoptions)) {
+			$ajaxoptions = array();
+		}
 
 		if (strval($filtertype) === '' && (!empty($conf->product->enabled) || !empty($conf->service->enabled))) {
 			if (!empty($conf->product->enabled) && empty($conf->service->enabled)) {
@@ -2021,8 +2340,9 @@ 
                 ';
 			}
 
-			if (empty($hidelabel)) $out .= $langs->trans("RefOrLabel").' : ';
-			elseif ($hidelabel > 1) {
+			if (empty($hidelabel)) {
+				$out .= $langs->trans("RefOrLabel").' : ';
+			} elseif ($hidelabel > 1) {
 				$placeholder = ' placeholder="'.$langs->trans("RefOrLabel").'"';
 				if ($hidelabel == 2) {
 					$out .= img_picto($langs->trans("Search"), 'search');
@@ -2036,8 +2356,11 @@ 
 			$out .= $this->select_produits_list($selected, $htmlname, $filtertype, $limit, $price_level, '', $status, $finished, 0, $socid, $showempty, $forcecombo, $morecss, $hidepriceinlabel, $warehouseStatus);
 		}
 
-		if (empty($nooutput)) print $out;
-		else return $out;
+		if (empty($nooutput)) {
+			print $out;
+		} else {
+			return $out;
+		}
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -2140,11 +2463,15 @@ 
 		if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES))
 		{
 			$sql .= ", (SELECT pp.rowid FROM ".MAIN_DB_PREFIX."product_price as pp WHERE pp.fk_product = p.rowid";
-			if ($price_level >= 1 && !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) $sql .= " AND price_level=".$price_level;
+			if ($price_level >= 1 && !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) {
+				$sql .= " AND price_level=".$price_level;
+			}
 			$sql .= " ORDER BY date_price";
 			$sql .= " DESC LIMIT 1) as price_rowid";
 			$sql .= ", (SELECT pp.price_by_qty FROM ".MAIN_DB_PREFIX."product_price as pp WHERE pp.fk_product = p.rowid"; // price_by_qty is 1 if some prices by qty exists in subtable
-			if ($price_level >= 1 && !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) $sql .= " AND price_level=".$price_level;
+			if ($price_level >= 1 && !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) {
+				$sql .= " AND price_level=".$price_level;
+			}
 			$sql .= " ORDER BY date_price";
 			$sql .= " DESC LIMIT 1) as price_by_qty";
 			$selectFields .= ", price_rowid, price_by_qty";
@@ -2193,14 +2520,17 @@ 
 		} elseif ($finished == 1)
 		{
 			$sql .= " AND p.finished = ".$finished;
-			if ($status >= 0)  $sql .= " AND p.tosell = ".$status;
+			if ($status >= 0) {
+				$sql .= " AND p.tosell = ".$status;
+			}
 		} elseif ($status >= 0)
 		{
 			$sql .= " AND p.tosell = ".$status;
 		}
 		// Filter by product type
-		if (strval($filtertype) != '') $sql .= " AND p.fk_product_type = ".$filtertype;
-		elseif (empty($conf->product->enabled)) { // when product module is disabled, show services only
+		if (strval($filtertype) != '') {
+			$sql .= " AND p.fk_product_type = ".$filtertype;
+		} elseif (empty($conf->product->enabled)) { // when product module is disabled, show services only
 			$sql .= " AND p.fk_product_type = 1";
 		} elseif (empty($conf->service->enabled)) { // when service module is disabled, show products only
 			$sql .= " AND p.fk_product_type = 0";
@@ -2213,23 +2543,37 @@ 
 			// For natural search
 			$scrit = explode(' ', $filterkey);
 			$i = 0;
-			if (count($scrit) > 1) $sql .= "(";
+			if (count($scrit) > 1) {
+				$sql .= "(";
+			}
 			foreach ($scrit as $crit)
 			{
-				if ($i > 0) $sql .= " AND ";
+				if ($i > 0) {
+					$sql .= " AND ";
+				}
 				$sql .= "(p.ref LIKE '".$this->db->escape($prefix.$crit)."%' OR p.label LIKE '".$this->db->escape($prefix.$crit)."%'";
-				if (!empty($conf->global->MAIN_MULTILANGS)) $sql .= " OR pl.label LIKE '".$this->db->escape($prefix.$crit)."%'";
+				if (!empty($conf->global->MAIN_MULTILANGS)) {
+					$sql .= " OR pl.label LIKE '".$this->db->escape($prefix.$crit)."%'";
+				}
 				if (!empty($conf->global->PRODUCT_AJAX_SEARCH_ON_DESCRIPTION))
 				{
 					$sql .= " OR p.description LIKE '".$this->db->escape($prefix.$crit)."%'";
-					if (!empty($conf->global->MAIN_MULTILANGS)) $sql .= " OR pl.description LIKE '".$this->db->escape($prefix.$crit)."%'";
+					if (!empty($conf->global->MAIN_MULTILANGS)) {
+						$sql .= " OR pl.description LIKE '".$this->db->escape($prefix.$crit)."%'";
+					}
+				}
+				if (!empty($conf->global->MAIN_SEARCH_PRODUCT_BY_FOURN_REF)) {
+					$sql .= " OR pfp.ref_fourn LIKE '".$this->db->escape($prefix.$crit)."%'";
 				}
-				if (!empty($conf->global->MAIN_SEARCH_PRODUCT_BY_FOURN_REF)) $sql .= " OR pfp.ref_fourn LIKE '".$this->db->escape($prefix.$crit)."%'";
 				$sql .= ")";
 				$i++;
 			}
-			if (count($scrit) > 1) $sql .= ")";
-			if (!empty($conf->barcode->enabled)) $sql .= " OR p.barcode LIKE '".$this->db->escape($prefix.$filterkey)."%'";
+			if (count($scrit) > 1) {
+				$sql .= ")";
+			}
+			if (!empty($conf->barcode->enabled)) {
+				$sql .= " OR p.barcode LIKE '".$this->db->escape($prefix.$filterkey)."%'";
+			}
 			$sql .= ')';
 		}
 		if (count($warehouseStatusArray))
@@ -2275,12 +2619,19 @@ 
 			//if (! empty($conf->use_javascript_ajax) || $forcecombo) $textifempty='';
 			if (!empty($conf->global->PRODUIT_USE_SEARCH_TO_SELECT))
 			{
-				if ($showempty && !is_numeric($showempty)) $textifempty = $langs->trans($showempty);
-				else $textifempty .= $langs->trans("All");
+				if ($showempty && !is_numeric($showempty)) {
+					$textifempty = $langs->trans($showempty);
+				} else {
+					$textifempty .= $langs->trans("All");
+				}
 			} else {
-				if ($showempty && !is_numeric($showempty)) $textifempty = $langs->trans($showempty);
+				if ($showempty && !is_numeric($showempty)) {
+					$textifempty = $langs->trans($showempty);
+				}
+			}
+			if ($showempty) {
+				$out .= '<option value="0" selected>'.$textifempty.'</option>';
 			}
-			if ($showempty) $out .= '<option value="0" selected>'.$textifempty.'</option>';
 
 			$i = 0;
 			while ($num && $i < $num)
@@ -2358,7 +2709,9 @@ 
 
 			$this->db->free($result);
 
-			if (empty($outputmode)) return $out;
+			if (empty($outputmode)) {
+				return $out;
+			}
 			return $outarray;
 		} else {
 			dol_print_error($db);
@@ -2401,8 +2754,12 @@ 
 		$maxlengtharticle = (empty($conf->global->PRODUCT_MAX_LENGTH_COMBO) ? 48 : $conf->global->PRODUCT_MAX_LENGTH_COMBO);
 
 		$label = $objp->label;
-		if (!empty($objp->label_translated)) $label = $objp->label_translated;
-		if (!empty($filterkey) && $filterkey != '') $label = preg_replace('/('.preg_quote($filterkey, '/').')/i', '<strong>$1</strong>', $label, 1);
+		if (!empty($objp->label_translated)) {
+			$label = $objp->label_translated;
+		}
+		if (!empty($filterkey) && $filterkey != '') {
+			$label = preg_replace('/('.preg_quote($filterkey, '/').')/i', '<strong>$1</strong>', $label, 1);
+		}
 
 		$outkey = $objp->rowid;
 		$outref = $objp->ref;
@@ -2416,7 +2773,9 @@ 
 		$outdurationvalue = $outtype == Product::TYPE_SERVICE ?substr($objp->duration, 0, dol_strlen($objp->duration) - 1) : '';
 		$outdurationunit = $outtype == Product::TYPE_SERVICE ?substr($objp->duration, -1) : '';
 
-		if ($outorigin && !empty($conf->global->PRODUCT_SHOW_ORIGIN_IN_COMBO))  require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+		if ($outorigin && !empty($conf->global->PRODUCT_SHOW_ORIGIN_IN_COMBO)) {
+			require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+		}
 
 		// Units
 		$outvalUnits = '';
@@ -2465,22 +2824,35 @@ 
 		if (!empty($conf->stock->enabled) && isset($objp->stock) && ($objp->fk_product_type == Product::TYPE_PRODUCT || !empty($conf->global->STOCK_SUPPORTS_SERVICES)))
 		{
 			if (!empty($user->rights->stock->lire)) {
-				if ($objp->stock > 0) $opt .= ' class="product_line_stock_ok"';
-		   		elseif ($objp->stock <= 0) $opt .= ' class="product_line_stock_too_low"';
+				if ($objp->stock > 0) {
+					$opt .= ' class="product_line_stock_ok"';
+				} elseif ($objp->stock <= 0) {
+		   			$opt .= ' class="product_line_stock_too_low"';
+		   		}
 			}
 		}
 		$opt .= '>';
 		$opt .= $objp->ref;
-		if ($outbarcode) $opt .= ' ('.$outbarcode.')';
+		if ($outbarcode) {
+			$opt .= ' ('.$outbarcode.')';
+		}
 		$opt .= ' - '.dol_trunc($label, $maxlengtharticle);
-		if ($outorigin && !empty($conf->global->PRODUCT_SHOW_ORIGIN_IN_COMBO)) $opt .= ' ('.getCountry($outorigin, 1).')';
+		if ($outorigin && !empty($conf->global->PRODUCT_SHOW_ORIGIN_IN_COMBO)) {
+			$opt .= ' ('.getCountry($outorigin, 1).')';
+		}
 
 		$objRef = $objp->ref;
-		if (!empty($filterkey) && $filterkey != '') $objRef = preg_replace('/('.preg_quote($filterkey, '/').')/i', '<strong>$1</strong>', $objRef, 1);
+		if (!empty($filterkey) && $filterkey != '') {
+			$objRef = preg_replace('/('.preg_quote($filterkey, '/').')/i', '<strong>$1</strong>', $objRef, 1);
+		}
 		$outval .= $objRef;
-		if ($outbarcode) $outval .= ' ('.$outbarcode.')';
+		if ($outbarcode) {
+			$outval .= ' ('.$outbarcode.')';
+		}
 		$outval .= ' - '.dol_trunc($label, $maxlengtharticle);
-		if ($outorigin && !empty($conf->global->PRODUCT_SHOW_ORIGIN_IN_COMBO)) $outval .= ' ('.getCountry($outorigin, 1).')';
+		if ($outorigin && !empty($conf->global->PRODUCT_SHOW_ORIGIN_IN_COMBO)) {
+			$outval .= ' ('.getCountry($outorigin, 1).')';
+		}
 
 		// Units
 		$opt .= $outvalUnits;
@@ -2613,9 +2985,11 @@ 
 				}
 				$outval .= $langs->transnoentities("Stock").':'.$objp->stock;
 				$outval .= '</span>';
-				if (empty($novirtualstock) && !empty($conf->global->STOCK_SHOW_VIRTUAL_STOCK_IN_PRODUCTS_COMBO))  // Warning, this option may slow down combo list generation
+				if (empty($novirtualstock) && !empty($conf->global->STOCK_SHOW_VIRTUAL_STOCK_IN_PRODUCTS_COMBO)) {
+					// Warning, this option may slow down combo list generation
 				{
 					$langs->load("stocks");
+				}
 
 					$tmpproduct = new Product($this->db);
 					$tmpproduct->fetch($objp->rowid, '', '', '', 1, 1, 1); // Load product without lang and prices arrays (we just need to make ->virtual_stock() after)
@@ -2725,10 +3099,14 @@ 
 		if ($conf->global->PRODUCT_USE_UNITS) {
 			$sql .= ", u.label as unit_long, u.short_label as unit_short, p.weight, p.weight_units, p.length, p.length_units, p.width, p.width_units, p.height, p.height_units, p.surface, p.surface_units, p.volume, p.volume_units";
 		}
-		if (!empty($conf->barcode->enabled)) $sql .= ", pfp.barcode";
+		if (!empty($conf->barcode->enabled)) {
+			$sql .= ", pfp.barcode";
+		}
 		$sql .= " FROM ".MAIN_DB_PREFIX."product as p";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_fournisseur_price as pfp ON ( p.rowid = pfp.fk_product AND pfp.entity IN (".getEntity('product').") )";
-		if ($socid) $sql .= " AND pfp.fk_soc = ".$socid;
+		if ($socid) {
+			$sql .= " AND pfp.fk_soc = ".$socid;
+		}
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON pfp.fk_soc = s.rowid";
 		// Units
 		if ($conf->global->PRODUCT_USE_UNITS) {
@@ -2736,8 +3114,12 @@ 
 		}
 		$sql .= " WHERE p.entity IN (".getEntity('product').")";
 		$sql .= " AND p.tobuy = 1";
-		if (strval($filtertype) != '') $sql .= " AND p.fk_product_type=".$this->db->escape($filtertype);
-		if (!empty($filtre)) $sql .= " ".$filtre;
+		if (strval($filtertype) != '') {
+			$sql .= " AND p.fk_product_type=".$this->db->escape($filtertype);
+		}
+		if (!empty($filtre)) {
+			$sql .= " ".$filtre;
+		}
 		// Add criteria on ref/label
 		if ($filterkey != '')
 		{
@@ -2746,14 +3128,20 @@ 
 			// For natural search
 			$scrit = explode(' ', $filterkey);
 			$i = 0;
-			if (count($scrit) > 1) $sql .= "(";
+			if (count($scrit) > 1) {
+				$sql .= "(";
+			}
 			foreach ($scrit as $crit)
 			{
-				if ($i > 0) $sql .= " AND ";
+				if ($i > 0) {
+					$sql .= " AND ";
+				}
 				$sql .= "(pfp.ref_fourn LIKE '".$this->db->escape($prefix.$crit)."%' OR p.ref LIKE '".$this->db->escape($prefix.$crit)."%' OR p.label LIKE '".$this->db->escape($prefix.$crit)."%')";
 				$i++;
 			}
-			if (count($scrit) > 1) $sql .= ")";
+			if (count($scrit) > 1) {
+				$sql .= ")";
+			}
 			if (!empty($conf->barcode->enabled)) {
 				$sql .= " OR p.barcode LIKE '".$this->db->escape($prefix.$filterkey)."%'";
 				$sql .= " OR pfp.barcode LIKE '".$this->db->escape($prefix.$filterkey)."%'";
@@ -2776,8 +3164,11 @@ 
 
 			//$out.='<select class="flat" id="select'.$htmlname.'" name="'.$htmlname.'">';	// remove select to have id same with combo and ajax
 			$out .= '<select class="flat maxwidthonsmartphone'.($morecss ? ' '.$morecss : '').'" id="'.$htmlname.'" name="'.$htmlname.'">';
-			if (!$selected) $out .= '<option value="0" selected>&nbsp;</option>';
-			else $out .= '<option value="0">&nbsp;</option>';
+			if (!$selected) {
+				$out .= '<option value="0" selected>&nbsp;</option>';
+			} else {
+				$out .= '<option value="0">&nbsp;</option>';
+			}
 
 			$i = 0;
 			while ($i < $num)
@@ -2785,7 +3176,10 @@ 
 				$objp = $this->db->fetch_object($result);
 
 				$outkey = $objp->idprodfournprice; // id in table of price
-				if (!$outkey && $alsoproductwithnosupplierprice) $outkey = 'idprod_'.$objp->rowid; // id of product
+				if (!$outkey && $alsoproductwithnosupplierprice) {
+					$outkey = 'idprod_'.$objp->rowid;
+				}
+				// id of product
 
 				$outref = $objp->ref;
 				$outval = '';
@@ -2833,11 +3227,17 @@ 
 				}
 
 				$objRef = $objp->ref;
-				if ($filterkey && $filterkey != '') $objRef = preg_replace('/('.preg_quote($filterkey, '/').')/i', '<strong>$1</strong>', $objRef, 1);
+				if ($filterkey && $filterkey != '') {
+					$objRef = preg_replace('/('.preg_quote($filterkey, '/').')/i', '<strong>$1</strong>', $objRef, 1);
+				}
 				$objRefFourn = $objp->ref_fourn;
-				if ($filterkey && $filterkey != '') $objRefFourn = preg_replace('/('.preg_quote($filterkey, '/').')/i', '<strong>$1</strong>', $objRefFourn, 1);
+				if ($filterkey && $filterkey != '') {
+					$objRefFourn = preg_replace('/('.preg_quote($filterkey, '/').')/i', '<strong>$1</strong>', $objRefFourn, 1);
+				}
 				$label = $objp->label;
-				if ($filterkey && $filterkey != '') $label = preg_replace('/('.preg_quote($filterkey, '/').')/i', '<strong>$1</strong>', $label, 1);
+				if ($filterkey && $filterkey != '') {
+					$label = preg_replace('/('.preg_quote($filterkey, '/').')/i', '<strong>$1</strong>', $label, 1);
+				}
 
 				$optlabel = $objp->ref;
 				if (!empty($objp->idprodfournprice) && ($objp->ref != $objp->ref_fourn)) {
@@ -2924,9 +3324,11 @@ 
 						$outvallabel .= " - ".$reputations[$objp->supplier_reputation];
 					}
 				} else {
-					if (empty($alsoproductwithnosupplierprice))     // No supplier price defined for couple product/supplier
+					if (empty($alsoproductwithnosupplierprice)) {
+						// No supplier price defined for couple product/supplier
 					{
 						$optlabel .= " - <span class='opacitymedium'>".$langs->trans("NoPriceDefinedForThisSupplier").'</span>';
+					}
 						$outvallabel .= ' - '.$langs->transnoentities("NoPriceDefinedForThisSupplier");
 					} else // No supplier price defined for product, even on other suppliers
 					{
@@ -2936,8 +3338,12 @@ 
 				}
 
 				$opt = '<option value="'.$outkey.'"';
-				if ($selected && $selected == $objp->idprodfournprice) $opt .= ' selected';
-				if (empty($objp->idprodfournprice) && empty($alsoproductwithnosupplierprice)) $opt .= ' disabled';
+				if ($selected && $selected == $objp->idprodfournprice) {
+					$opt .= ' selected';
+				}
+				if (empty($objp->idprodfournprice) && empty($alsoproductwithnosupplierprice)) {
+					$opt .= ' disabled';
+				}
 				if (!empty($objp->idprodfournprice) && $objp->idprodfournprice > 0)
 				{
 					$opt .= ' pbq="'.$objp->idprodfournprice.'" data-pbq="'.$objp->idprodfournprice.'" data-pbqqty="'.$objp->quantity.'" data-pbqup="'.$objp->unitprice.'" data-pbqpercent="'.$objp->remise_percent.'"';
@@ -2974,7 +3380,9 @@ 
 			include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
 			$out .= ajax_combobox($htmlname);
 
-			if (empty($outputmode)) return $out;
+			if (empty($outputmode)) {
+				return $out;
+			}
 			return $outarray;
 		} else {
 			dol_print_error($this->db);
@@ -3072,7 +3480,9 @@ 
 						$opt .= " - ";
 						$opt .= price($objp->unitprice * (!empty($conf->global->DISPLAY_DISCOUNTED_SUPPLIER_PRICE) ? (1 - $objp->remise_percent / 100) : 1), 1, $langs, 0, 0, -1, $conf->currency)."/".$langs->trans("Unit");
 					}
-					if ($objp->duration) $opt .= " - ".$objp->duration;
+					if ($objp->duration) {
+						$opt .= " - ".$objp->duration;
+					}
 					$opt .= "</option>\n";
 
 					$form .= $opt;
@@ -3112,7 +3522,9 @@ 
 		if ($resql)
 		{
 			print '<select class="flat" id="select_'.$htmlname.'" name="'.$htmlname.'">';
-			if ($showempty) print '<option value="0">&nbsp;</option>';
+			if ($showempty) {
+				print '<option value="0">&nbsp;</option>';
+			}
 			$num = $this->db->num_rows($resql);
 			$i = 0;
 			if ($num)
@@ -3150,7 +3562,10 @@ 
 		global $langs;
 
 		$num = count($this->cache_conditions_paiements);
-		if ($num > 0) return 0; // Cache already loaded
+		if ($num > 0) {
+			return 0;
+		}
+		// Cache already loaded
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
@@ -3197,7 +3612,10 @@ 
 		global $langs;
 
 		$num = count($this->cache_availability);
-		if ($num > 0) return 0; // Cache already loaded
+		if ($num > 0) {
+			return 0;
+		}
+		// Cache already loaded
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
@@ -3250,7 +3668,9 @@ 
 		dol_syslog(__METHOD__." selected=".$selected.", htmlname=".$htmlname, LOG_DEBUG);
 
 		print '<select id="'.$htmlname.'" class="flat" name="'.$htmlname.'">';
-		if ($addempty) print '<option value="0">&nbsp;</option>';
+		if ($addempty) {
+			print '<option value="0">&nbsp;</option>';
+		}
 		foreach ($this->cache_availability as $id => $arrayavailability)
 		{
 			if ($selected == $id)
@@ -3263,7 +3683,9 @@ 
 			print '</option>';
 		}
 		print '</select>';
-		if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+		if ($user->admin) {
+			print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+		}
 	}
 
 	/**
@@ -3276,7 +3698,10 @@ 
 		global $langs;
 
 		$num = count($this->cache_demand_reason);
-		if ($num > 0) return 0; // Cache already loaded
+		if ($num > 0) {
+			return 0;
+		}
+		// Cache already loaded
 
 		$sql = "SELECT rowid, code, label";
 		$sql .= " FROM ".MAIN_DB_PREFIX.'c_input_reason';
@@ -3294,8 +3719,14 @@ 
 
 				// Si traduction existe, on l'utilise, sinon on prend le libelle par defaut
 				$label = ($obj->label != '-' ? $obj->label : '');
-				if ($langs->trans("DemandReasonType".$obj->code) != ("DemandReasonType".$obj->code)) $label = $langs->trans("DemandReasonType".$obj->code); // So translation key DemandReasonTypeSRC_XXX will work
-				if ($langs->trans($obj->code) != $obj->code) $label = $langs->trans($obj->code); // So translation key SRC_XXX will work
+				if ($langs->trans("DemandReasonType".$obj->code) != ("DemandReasonType".$obj->code)) {
+					$label = $langs->trans("DemandReasonType".$obj->code);
+				}
+				// So translation key DemandReasonTypeSRC_XXX will work
+				if ($langs->trans($obj->code) != $obj->code) {
+					$label = $langs->trans($obj->code);
+				}
+				// So translation key SRC_XXX will work
 
 				$tmparray[$obj->rowid]['id']   = $obj->rowid;
 				$tmparray[$obj->rowid]['code'] = $obj->code;
@@ -3330,10 +3761,14 @@ 
 		$this->loadCacheInputReason();
 
 		print '<select class="flat" id="select_'.$htmlname.'" name="'.$htmlname.'">';
-		if ($addempty) print '<option value="0"'.(empty($selected) ? ' selected' : '').'>&nbsp;</option>';
+		if ($addempty) {
+			print '<option value="0"'.(empty($selected) ? ' selected' : '').'>&nbsp;</option>';
+		}
 		foreach ($this->cache_demand_reason as $id => $arraydemandreason)
 		{
-			if ($arraydemandreason['code'] == $exclude) continue;
+			if ($arraydemandreason['code'] == $exclude) {
+				continue;
+			}
 
 			if ($selected && ($selected == $arraydemandreason['id'] || $selected == $arraydemandreason['code']))
 			{
@@ -3346,7 +3781,9 @@ 
 			print '</option>';
 		}
 		print '</select>';
-		if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+		if ($user->admin) {
+			print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+		}
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -3361,7 +3798,10 @@ 
 		global $langs;
 
 		$num = count($this->cache_types_paiements);
-		if ($num > 0) return $num; // Cache already loaded
+		if ($num > 0) {
+			return $num;
+		}
+		// Cache already loaded
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
@@ -3425,10 +3865,14 @@ 
 		$this->load_cache_conditions_paiements();
 
 		// Set default value if not already set by caller
-		if (empty($selected) && !empty($conf->global->MAIN_DEFAULT_PAYMENT_TERM_ID)) $selected = $conf->global->MAIN_DEFAULT_PAYMENT_TERM_ID;
+		if (empty($selected) && !empty($conf->global->MAIN_DEFAULT_PAYMENT_TERM_ID)) {
+			$selected = $conf->global->MAIN_DEFAULT_PAYMENT_TERM_ID;
+		}
 
 		print '<select id="'.$htmlname.'" class="flat selectpaymentterms'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'">';
-		if ($addempty) print '<option value="0">&nbsp;</option>';
+		if ($addempty) {
+			print '<option value="0">&nbsp;</option>';
+		}
 		foreach ($this->cache_conditions_paiements as $id => $arrayconditions)
 		{
 			if ($selected == $id)
@@ -3441,7 +3885,9 @@ 
 			print '</option>';
 		}
 		print '</select>';
-		if ($user->admin && empty($noinfoadmin)) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+		if ($user->admin && empty($noinfoadmin)) {
+			print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+		}
 		print ajax_combobox($htmlname);
 	}
 
@@ -3470,48 +3916,78 @@ 
 		dol_syslog(__METHOD__." ".$selected.", ".$htmlname.", ".$filtertype.", ".$format, LOG_DEBUG);
 
 		$filterarray = array();
-		if ($filtertype == 'CRDT')  	$filterarray = array(0, 2, 3);
-		elseif ($filtertype == 'DBIT') 	$filterarray = array(1, 2, 3);
-		elseif ($filtertype != '' && $filtertype != '-1') $filterarray = explode(',', $filtertype);
+		if ($filtertype == 'CRDT') {
+			$filterarray = array(0, 2, 3);
+		} elseif ($filtertype == 'DBIT') {
+			$filterarray = array(1, 2, 3);
+		} elseif ($filtertype != '' && $filtertype != '-1') {
+			$filterarray = explode(',', $filtertype);
+		}
 
 		$this->load_cache_types_paiements();
 
 		// Set default value if not already set by caller
-		if (empty($selected) && !empty($conf->global->MAIN_DEFAULT_PAYMENT_TYPE_ID)) $selected = $conf->global->MAIN_DEFAULT_PAYMENT_TYPE_ID;
+		if (empty($selected) && !empty($conf->global->MAIN_DEFAULT_PAYMENT_TYPE_ID)) {
+			$selected = $conf->global->MAIN_DEFAULT_PAYMENT_TYPE_ID;
+		}
 
 		print '<select id="select'.$htmlname.'" class="flat selectpaymenttypes'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'">';
-		if ($empty) print '<option value="">&nbsp;</option>';
+		if ($empty) {
+			print '<option value="">&nbsp;</option>';
+		}
 		foreach ($this->cache_types_paiements as $id => $arraytypes)
 		{
 			// If not good status
-			if ($active >= 0 && $arraytypes['active'] != $active) continue;
+			if ($active >= 0 && $arraytypes['active'] != $active) {
+				continue;
+			}
 
 			// On passe si on a demande de filtrer sur des modes de paiments particuliers
-			if (count($filterarray) && !in_array($arraytypes['type'], $filterarray)) continue;
+			if (count($filterarray) && !in_array($arraytypes['type'], $filterarray)) {
+				continue;
+			}
 
 			// We discard empty line if showempty is on because an empty line has already been output.
-			if ($empty && empty($arraytypes['code'])) continue;
+			if ($empty && empty($arraytypes['code'])) {
+				continue;
+			}
 
-			if ($format == 0) print '<option value="'.$id.'"';
-			elseif ($format == 1) print '<option value="'.$arraytypes['code'].'"';
-			elseif ($format == 2) print '<option value="'.$arraytypes['code'].'"';
-			elseif ($format == 3) print '<option value="'.$id.'"';
+			if ($format == 0) {
+				print '<option value="'.$id.'"';
+			} elseif ($format == 1) {
+				print '<option value="'.$arraytypes['code'].'"';
+			} elseif ($format == 2) {
+				print '<option value="'.$arraytypes['code'].'"';
+			} elseif ($format == 3) {
+				print '<option value="'.$id.'"';
+			}
 			// Print attribute selected or not
 			if ($format == 1 || $format == 2) {
-				if ($selected == $arraytypes['code']) print ' selected';
+				if ($selected == $arraytypes['code']) {
+					print ' selected';
+				}
 			} else {
-				if ($selected == $id) print ' selected';
+				if ($selected == $id) {
+					print ' selected';
+				}
 			}
 			print '>';
-			if ($format == 0) $value = ($maxlength ?dol_trunc($arraytypes['label'], $maxlength) : $arraytypes['label']);
-			elseif ($format == 1) $value = $arraytypes['code'];
-			elseif ($format == 2) $value = ($maxlength ?dol_trunc($arraytypes['label'], $maxlength) : $arraytypes['label']);
-			elseif ($format == 3) $value = $arraytypes['code'];
+			if ($format == 0) {
+				$value = ($maxlength ?dol_trunc($arraytypes['label'], $maxlength) : $arraytypes['label']);
+			} elseif ($format == 1) {
+				$value = $arraytypes['code'];
+			} elseif ($format == 2) {
+				$value = ($maxlength ?dol_trunc($arraytypes['label'], $maxlength) : $arraytypes['label']);
+			} elseif ($format == 3) {
+				$value = $arraytypes['code'];
+			}
 			print $value ? $value : '&nbsp;';
 			print '</option>';
 		}
 		print '</select>';
-		if ($user->admin && !$noadmininfo) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+		if ($user->admin && !$noadmininfo) {
+			print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+		}
 		print ajax_combobox('select'.$htmlname);
 	}
 
@@ -3561,7 +4037,10 @@ 
         global $langs;
 
         $num=count($this->cache_transport_mode);
-        if ($num > 0) return $num;    // Cache already loaded
+        if ($num > 0) {
+        	return $num;
+        }
+        // Cache already loaded
 
         dol_syslog(__METHOD__, LOG_DEBUG);
 
@@ -3593,8 +4072,7 @@ 
             $this->cache_transport_mode = dol_sort_array($this->cache_transport_mode, 'label', 'asc', 0, 0, 1);
 
             return $num;
-        }
-        else {
+        } else {
             dol_print_error($this->db);
             return -1;
         }
@@ -3622,32 +4100,53 @@ 
         $this->load_cache_transport_mode();
 
         print '<select id="select'.$htmlname.'" class="flat selectmodetransport'.($morecss?' '.$morecss:'').'" name="'.$htmlname.'">';
-        if ($empty) print '<option value="">&nbsp;</option>';
+        if ($empty) {
+        	print '<option value="">&nbsp;</option>';
+        }
         foreach ($this->cache_transport_mode as $id => $arraytypes)
         {
             // If not good status
-            if ($active >= 0 && $arraytypes['active'] != $active) continue;
+            if ($active >= 0 && $arraytypes['active'] != $active) {
+            	continue;
+            }
 
             // We discard empty line if showempty is on because an empty line has already been output.
-            if ($empty && empty($arraytypes['code'])) continue;
+            if ($empty && empty($arraytypes['code'])) {
+            	continue;
+            }
 
-            if ($format == 0) print '<option value="'.$id.'"';
-            elseif ($format == 1) print '<option value="'.$arraytypes['code'].'"';
-            elseif ($format == 2) print '<option value="'.$arraytypes['code'].'"';
-            elseif ($format == 3) print '<option value="'.$id.'"';
+            if ($format == 0) {
+            	print '<option value="'.$id.'"';
+            } elseif ($format == 1) {
+            	print '<option value="'.$arraytypes['code'].'"';
+            } elseif ($format == 2) {
+            	print '<option value="'.$arraytypes['code'].'"';
+            } elseif ($format == 3) {
+            	print '<option value="'.$id.'"';
+            }
             // If text is selected, we compare with code, else with id
-            if (preg_match('/[a-z]/i', $selected) && $selected == $arraytypes['code']) print ' selected';
-            elseif ($selected == $id) print ' selected';
+            if (preg_match('/[a-z]/i', $selected) && $selected == $arraytypes['code']) {
+            	print ' selected';
+            } elseif ($selected == $id) {
+            	print ' selected';
+            }
             print '>';
-            if ($format == 0) $value=($maxlength?dol_trunc($arraytypes['label'], $maxlength):$arraytypes['label']);
-            elseif ($format == 1) $value=$arraytypes['code'];
-            elseif ($format == 2) $value=($maxlength?dol_trunc($arraytypes['label'], $maxlength):$arraytypes['label']);
-            elseif ($format == 3) $value=$arraytypes['code'];
+            if ($format == 0) {
+            	$value=($maxlength?dol_trunc($arraytypes['label'], $maxlength):$arraytypes['label']);
+            } elseif ($format == 1) {
+            	$value=$arraytypes['code'];
+            } elseif ($format == 2) {
+            	$value=($maxlength?dol_trunc($arraytypes['label'], $maxlength):$arraytypes['label']);
+            } elseif ($format == 3) {
+            	$value=$arraytypes['code'];
+            }
             print $value?$value:'&nbsp;';
             print '</option>';
         }
         print '</select>';
-        if ($user->admin && ! $noadmininfo) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+        if ($user->admin && ! $noadmininfo) {
+        	print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+        }
     }
 
 	/**
@@ -3670,7 +4169,9 @@ 
 		$sql = "SELECT rowid, code, libelle as label";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_shipment_mode";
 		$sql .= " WHERE active > 0";
-		if ($filtre) $sql .= " AND ".$filtre;
+		if ($filtre) {
+			$sql .= " AND ".$filtre;
+		}
 		$sql .= " ORDER BY libelle ASC";
 
 		dol_syslog(get_class($this)."::selectShippingMode", LOG_DEBUG);
@@ -3695,7 +4196,9 @@ 
 					$i++;
 				}
 				print "</select>";
-				if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+				if ($user->admin) {
+					print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+				}
 			} else {
 				print $langs->trans("NoShippingMethodDefined");
 			}
@@ -3813,15 +4316,19 @@ 
 		$resql = $this->db->query($sql);
 		if ($resql && $this->db->num_rows($resql) > 0)
 		{
-			if ($showempty) $return .= '<option value="none"></option>';
+			if ($showempty) {
+				$return .= '<option value="none"></option>';
+			}
 
 			while ($res = $this->db->fetch_object($resql))
 			{
 				$unitLabel = $res->label;
-				if (!empty($langs->tab_translate['unit'.$res->code]))	// check if Translation is available before
+				if (!empty($langs->tab_translate['unit'.$res->code])) {
+					// check if Translation is available before
 				{
 					$unitLabel = $langs->trans('unit'.$res->code) != $res->label ? $langs->trans('unit'.$res->code) : $res->label;
 				}
+				}
 
 				if ($selected == $res->rowid)
 				{
@@ -3860,8 +4367,12 @@ 
 		$sql = "SELECT rowid, label, bank, clos as status, currency_code";
 		$sql .= " FROM ".MAIN_DB_PREFIX."bank_account";
 		$sql .= " WHERE entity IN (".getEntity('bank_account').")";
-		if ($status != 2) $sql .= " AND clos = ".(int) $status;
-		if ($filtre) $sql .= " AND ".$filtre;
+		if ($status != 2) {
+			$sql .= " AND clos = ".(int) $status;
+		}
+		if ($filtre) {
+			$sql .= " AND ".$filtre;
+		}
 		$sql .= " ORDER BY label";
 
 		dol_syslog(get_class($this)."::select_comptes", LOG_DEBUG);
@@ -3888,15 +4399,22 @@ 
 						print '<option value="'.$obj->rowid.'">';
 					}
 					print trim($obj->label);
-					if ($showcurrency) print ' ('.$obj->currency_code.')';
-					if ($status == 2 && $obj->status == 1) print ' ('.$langs->trans("Closed").')';
+					if ($showcurrency) {
+						print ' ('.$obj->currency_code.')';
+					}
+					if ($status == 2 && $obj->status == 1) {
+						print ' ('.$langs->trans("Closed").')';
+					}
 					print '</option>';
 					$i++;
 				}
 				print "</select>";
 			} else {
-				if ($status == 0) print '<span class="opacitymedium">'.$langs->trans("NoActiveBankAccountDefined").'</span>';
-				else print '<span class="opacitymedium">'.$langs->trans("NoBankAccountFound").'</span>';
+				if ($status == 0) {
+					print '<span class="opacitymedium">'.$langs->trans("NoActiveBankAccountDefined").'</span>';
+				} else {
+					print '<span class="opacitymedium">'.$langs->trans("NoBankAccountFound").'</span>';
+				}
 			}
 		} else {
 			dol_print_error($this->db);
@@ -3927,8 +4445,12 @@ 
 		$sql = "SELECT rowid, name, fk_country, status, entity";
 		$sql .= " FROM ".MAIN_DB_PREFIX."establishment";
 		$sql .= " WHERE 1=1";
-		if ($status != 2) $sql .= " AND status = ".(int) $status;
-		if ($filtre) $sql .= " AND ".$filtre;
+		if ($status != 2) {
+			$sql .= " AND status = ".(int) $status;
+		}
+		if ($filtre) {
+			$sql .= " AND ".$filtre;
+		}
 		$sql .= " ORDER BY name";
 
 		dol_syslog(get_class($this)."::select_establishment", LOG_DEBUG);
@@ -3955,14 +4477,19 @@ 
 						print '<option value="'.$obj->rowid.'">';
 					}
 					print trim($obj->name);
-					if ($status == 2 && $obj->status == 1) print ' ('.$langs->trans("Closed").')';
+					if ($status == 2 && $obj->status == 1) {
+						print ' ('.$langs->trans("Closed").')';
+					}
 					print '</option>';
 					$i++;
 				}
 				print "</select>";
 			} else {
-				if ($status == 0) print '<span class="opacitymedium">'.$langs->trans("NoActiveEstablishmentDefined").'</span>';
-				else print '<span class="opacitymedium">'.$langs->trans("NoEstablishmentFound").'</span>';
+				if ($status == 0) {
+					print '<span class="opacitymedium">'.$langs->trans("NoActiveEstablishmentDefined").'</span>';
+				} else {
+					print '<span class="opacitymedium">'.$langs->trans("NoEstablishmentFound").'</span>';
+				}
 			}
 		} else {
 			dol_print_error($this->db);
@@ -3986,7 +4513,9 @@ 
 			print '<input type="hidden" name="action" value="setbankaccount">';
 			print '<input type="hidden" name="token" value="'.newToken().'">';
 			$nbaccountfound = $this->select_comptes($selected, $htmlname, 0, '', $addempty);
-			if ($nbaccountfound > 0) print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+			if ($nbaccountfound > 0) {
+				print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+			}
 			print '</form>';
 		} else {
 			$langs->load('banks');
@@ -3995,7 +4524,9 @@ 
 				require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 				$bankstatic = new Account($this->db);
 				$result = $bankstatic->fetch($selected);
-				if ($result) print $bankstatic->getNomUrl(1);
+				if ($result) {
+					print $bankstatic->getNomUrl(1);
+				}
 			} else {
 				print "&nbsp;";
 			}
@@ -4051,11 +4582,15 @@ 
 				while ($i < $num)
 				{
 					$objp = $this->db->fetch_object($result);
-					if ($objp) $cate_arbo[$objp->rowid] = array('id'=>$objp->rowid, 'fulllabel'=>$objp->label);
+					if ($objp) {
+						$cate_arbo[$objp->rowid] = array('id'=>$objp->rowid, 'fulllabel'=>$objp->label);
+					}
 					$i++;
 				}
 				$this->db->free($result);
-			} else dol_print_error($this->db);
+			} else {
+				dol_print_error($this->db);
+			}
 		} else {
 			$cat = new Categorie($this->db);
 			$cate_arbo = $cat->get_full_arbo($type, $markafterid, $include);
@@ -4065,8 +4600,9 @@ 
 		$outarray = array();
 		if (is_array($cate_arbo))
 		{
-			if (!count($cate_arbo)) $output .= '<option value="-1" disabled>'.$langs->trans("NoCategoriesDefined").'</option>';
-			else {
+			if (!count($cate_arbo)) {
+				$output .= '<option value="-1" disabled>'.$langs->trans("NoCategoriesDefined").'</option>';
+			} else {
 				$output .= '<option value="-1">&nbsp;</option>';
 				foreach ($cate_arbo as $key => $value)
 				{
@@ -4085,7 +4621,9 @@ 
 		$output .= '</select>';
 		$output .= "\n";
 
-		if ($outputmode) return $outarray;
+		if ($outputmode) {
+			return $outarray;
+		}
 		return $output;
 	}
 
@@ -4148,7 +4686,9 @@ 
 
 		// Clean parameters
 		$newselectedchoice = empty($selectedchoice) ? "no" : $selectedchoice;
-		if ($conf->browser->layout == 'phone') $width = '95%';
+		if ($conf->browser->layout == 'phone') {
+			$width = '95%';
+		}
 
 		// Set height automatically if not defined
 		if (empty($height)) {
@@ -4192,7 +4732,9 @@ 
 					} elseif ($input['type'] == 'select')
 					{
 						$more .= '<div class="tagtr"><div class="tagtd'.(empty($input['tdclass']) ? '' : (' '.$input['tdclass'])).'">';
-						if (!empty($input['label'])) $more .= $input['label'].'</div><div class="tagtd left">';
+						if (!empty($input['label'])) {
+							$more .= $input['label'].'</div><div class="tagtd left">';
+						}
 						$more .= $this->selectarray($input['name'], $input['values'], $input['default'], 1, 0, 0, $moreattr, 0, 0, 0, '', $morecss);
 						$more .= '</div></div>'."\n";
 					} elseif ($input['type'] == 'checkbox')
@@ -4200,9 +4742,15 @@ 
 						$more .= '<div class="tagtr">';
 						$more .= '<div class="tagtd'.(empty($input['tdclass']) ? '' : (' '.$input['tdclass'])).'">'.$input['label'].' </div><div class="tagtd">';
 						$more .= '<input type="checkbox" class="flat'.$morecss.'" id="'.$input['name'].'" name="'.$input['name'].'"'.$moreattr;
-						if (!is_bool($input['value']) && $input['value'] != 'false' && $input['value'] != '0') $more .= ' checked';
-						if (is_bool($input['value']) && $input['value']) $more .= ' checked';
-						if (isset($input['disabled'])) $more .= ' disabled';
+						if (!is_bool($input['value']) && $input['value'] != 'false' && $input['value'] != '0') {
+							$more .= ' checked';
+						}
+						if (is_bool($input['value']) && $input['value']) {
+							$more .= ' checked';
+						}
+						if (isset($input['disabled'])) {
+							$more .= ' disabled';
+						}
 						$more .= ' /></div>';
 						$more .= '</div>'."\n";
 					} elseif ($input['type'] == 'radio')
@@ -4211,10 +4759,15 @@ 
 						foreach ($input['values'] as $selkey => $selval)
 						{
 							$more .= '<div class="tagtr">';
-							if ($i == 0) $more .= '<div class="tagtd'.(empty($input['tdclass']) ? ' tdtop' : (' tdtop '.$input['tdclass'])).'">'.$input['label'].'</div>';
-							else $more .= '<div clas="tagtd'.(empty($input['tdclass']) ? '' : (' "'.$input['tdclass'])).'">&nbsp;</div>';
+							if ($i == 0) {
+								$more .= '<div class="tagtd'.(empty($input['tdclass']) ? ' tdtop' : (' tdtop '.$input['tdclass'])).'">'.$input['label'].'</div>';
+							} else {
+								$more .= '<div clas="tagtd'.(empty($input['tdclass']) ? '' : (' "'.$input['tdclass'])).'">&nbsp;</div>';
+							}
 							$more .= '<div class="tagtd"><input type="radio" class="flat'.$morecss.'" id="'.$input['name'].'" name="'.$input['name'].'" value="'.$selkey.'"'.$moreattr;
-							if ($input['disabled']) $more .= ' disabled';
+							if ($input['disabled']) {
+								$more .= ' disabled';
+							}
 							$more .= ' /> ';
 							$more .= $selval;
 							$more .= '</div></div>'."\n";
@@ -4234,7 +4787,9 @@ 
 					} elseif ($input['type'] == 'other')
 					{
 						$more .= '<div class="tagtr"><div class="tagtd'.(empty($input['tdclass']) ? '' : (' '.$input['tdclass'])).'">';
-						if (!empty($input['label'])) $more .= $input['label'].'</div><div class="tagtd">';
+						if (!empty($input['label'])) {
+							$more .= $input['label'].'</div><div class="tagtd">';
+						}
 						$more .= $input['value'];
 						$more .= '</div></div>'."\n";
 					} elseif ($input['type'] == 'onecolumn')
@@ -4252,8 +4807,12 @@ 
 		// JQUI method dialog is broken with jmobile, we use standard HTML.
 		// Note: When using dol_use_jmobile or no js, you must also check code for button use a GET url with action=xxx and check that you also output the confirm code when action=xxx
 		// See page product/card.php for example
-		if (!empty($conf->dol_use_jmobile)) $useajax = 0;
-		if (empty($conf->use_javascript_ajax)) $useajax = 0;
+		if (!empty($conf->dol_use_jmobile)) {
+			$useajax = 0;
+		}
+		if (empty($conf->use_javascript_ajax)) {
+			$useajax = 0;
+		}
 
 		if ($useajax)
 		{
@@ -4275,8 +4834,12 @@ 
 				foreach ($formquestion as $key => $input)
 				{
 					//print "xx ".$key." rr ".is_array($input)."<br>\n";
-					if (is_array($input) && isset($input['name'])) array_push($inputok, $input['name']);
-					if (isset($input['inputko']) && $input['inputko'] == 1) array_push($inputko, $input['name']);
+					if (is_array($input) && isset($input['name'])) {
+						array_push($inputok, $input['name']);
+					}
+					if (isset($input['inputko']) && $input['inputko'] == 1) {
+						array_push($inputko, $input['name']);
+					}
 				}
 			}
 			// Show JQuery confirm box.
@@ -4364,7 +4927,9 @@ 
 		} else {
 			$formconfirm .= "\n<!-- begin formconfirm page=".$page." -->\n";
 
-			if (empty($disableformtag)) $formconfirm .= '<form method="POST" action="'.$page.'" class="notoptoleftroright">'."\n";
+			if (empty($disableformtag)) {
+				$formconfirm .= '<form method="POST" action="'.$page.'" class="notoptoleftroright">'."\n";
+			}
 
 			$formconfirm .= '<input type="hidden" name="action" value="'.$action.'">'."\n";
 			$formconfirm .= '<input type="hidden" name="token" value="'.newToken().'">'."\n";
@@ -4398,7 +4963,9 @@ 
 
 			$formconfirm .= '</table>'."\n";
 
-			if (empty($disableformtag)) $formconfirm .= "</form>\n";
+			if (empty($disableformtag)) {
+				$formconfirm .= "</form>\n";
+			}
 			$formconfirm .= '<br>';
 
 			$formconfirm .= "<!-- end formconfirm -->\n";
@@ -4601,11 +5168,16 @@ 
 			$ret .= '<td class="left"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
 			$ret .= '</tr></table></form>';
 		} else {
-			if ($displayhour) $ret .= dol_print_date($selected, 'dayhour');
-			else $ret .= dol_print_date($selected, 'day');
+			if ($displayhour) {
+				$ret .= dol_print_date($selected, 'dayhour');
+			} else {
+				$ret .= dol_print_date($selected, 'day');
+			}
 		}
 
-		if (empty($nooutput)) print $ret;
+		if (empty($nooutput)) {
+			print $ret;
+		}
 		return $ret;
 	}
 
@@ -4704,8 +5276,7 @@ 
             $this->selectTransportMode($selected, $htmlname, 2, $addempty, 0, 0, $active);
             print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
             print '</form>';
-        }
-        else {
+        } else {
             if ($selected)
             {
                 $this->load_cache_transport_mode();
@@ -4774,7 +5345,9 @@ 
 			if (!empty($rate))
 			{
 				print price($rate, 1, $langs, 1, 0);
-				if ($currency && $rate != 1) print ' &nbsp; ('.price($rate, 1, $langs, 1, 0).' '.$currency.' = 1 '.$conf->currency.')';
+				if ($currency && $rate != 1) {
+					print ' &nbsp; ('.price($rate, 1, $langs, 1, 0).' '.$currency.' = 1 '.$conf->currency.')';
+				}
 			} else {
 				print 1;
 			}
@@ -4811,24 +5384,42 @@ 
 			if (!empty($discount_type)) {
 				if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS))
 				{
-					if (!$filter || $filter == "fk_invoice_supplier_source IS NULL") $translationKey = 'HasAbsoluteDiscountFromSupplier'; // If we want deposit to be substracted to payments only and not to total of final invoice
-					else $translationKey = 'HasCreditNoteFromSupplier';
+					if (!$filter || $filter == "fk_invoice_supplier_source IS NULL") {
+						$translationKey = 'HasAbsoluteDiscountFromSupplier';
+					}
+					// If we want deposit to be substracted to payments only and not to total of final invoice
+					else {
+						$translationKey = 'HasCreditNoteFromSupplier';
+					}
 				} else {
-					if (!$filter || $filter == "fk_invoice_supplier_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS PAID)%')") $translationKey = 'HasAbsoluteDiscountFromSupplier';
-					else $translationKey = 'HasCreditNoteFromSupplier';
+					if (!$filter || $filter == "fk_invoice_supplier_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS PAID)%')") {
+						$translationKey = 'HasAbsoluteDiscountFromSupplier';
+					} else {
+						$translationKey = 'HasCreditNoteFromSupplier';
+					}
 				}
 			} else {
 				if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS))
 				{
-					if (!$filter || $filter == "fk_facture_source IS NULL") $translationKey = 'CompanyHasAbsoluteDiscount'; // If we want deposit to be substracted to payments only and not to total of final invoice
-					else $translationKey = 'CompanyHasCreditNote';
+					if (!$filter || $filter == "fk_facture_source IS NULL") {
+						$translationKey = 'CompanyHasAbsoluteDiscount';
+					}
+					// If we want deposit to be substracted to payments only and not to total of final invoice
+					else {
+						$translationKey = 'CompanyHasCreditNote';
+					}
 				} else {
-					if (!$filter || $filter == "fk_facture_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS RECEIVED)%')") $translationKey = 'CompanyHasAbsoluteDiscount';
-					else $translationKey = 'CompanyHasCreditNote';
+					if (!$filter || $filter == "fk_facture_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS RECEIVED)%')") {
+						$translationKey = 'CompanyHasAbsoluteDiscount';
+					} else {
+						$translationKey = 'CompanyHasCreditNote';
+					}
 				}
 			}
 			print $langs->trans($translationKey, price($amount, 0, $langs, 0, 0, -1, $conf->currency));
-			if (empty($hidelist)) print ': ';
+			if (empty($hidelist)) {
+				print ': ';
+			}
 			print '</div>';
 			if (empty($hidelist))
 			{
@@ -4839,15 +5430,19 @@ 
 				} else {
 					$newfilter .= ' AND fk_facture IS NULL AND fk_facture_line IS NULL'; // Customer discounts available
 				}
-				if ($filter) $newfilter .= ' AND ('.$filter.')';
+				if ($filter) {
+					$newfilter .= ' AND ('.$filter.')';
+				}
 				$nbqualifiedlines = $this->select_remises($selected, $htmlname, $newfilter, $socid, $maxvalue);
 				if ($nbqualifiedlines > 0)
 				{
 					print ' &nbsp; <input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("UseLine")).'"';
-					if (!empty($discount_type) && $filter && $filter != "fk_invoice_supplier_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS PAID)%')")
-						print ' title="'.$langs->trans("UseCreditNoteInInvoicePayment").'"';
-					if (empty($discount_type) && $filter && $filter != "fk_facture_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS RECEIVED)%')")
-						print ' title="'.$langs->trans("UseCreditNoteInInvoicePayment").'"';
+					if (!empty($discount_type) && $filter && $filter != "fk_invoice_supplier_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS PAID)%')") {
+											print ' title="'.$langs->trans("UseCreditNoteInInvoicePayment").'"';
+					}
+					if (empty($discount_type) && $filter && $filter != "fk_facture_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS RECEIVED)%')") {
+											print ' title="'.$langs->trans("UseCreditNoteInInvoicePayment").'"';
+					}
 
 					print '>';
 				}
@@ -4956,8 +5551,11 @@ 
 			}
 		}
 
-		if ($nooutput) return $out;
-		else print $out;
+		if ($nooutput) {
+			return $out;
+		} else {
+			print $out;
+		}
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -4991,7 +5589,10 @@ 
 
 		$out = '';
 
-		if ($selected == 'euro' || $selected == 'euros') $selected = 'EUR'; // Pour compatibilite
+		if ($selected == 'euro' || $selected == 'euros') {
+			$selected = 'EUR';
+		}
+		// Pour compatibilite
 
 		$out .= '<select class="flat maxwidth200onsmartphone minwidth300" name="'.$htmlname.'" id="'.$htmlname.'">';
 		foreach ($langs->cache_currencies as $code_iso => $currency)
@@ -5012,7 +5613,9 @@ 
 			$out .= '</option>';
 		}
 		$out .= '</select>';
-		if ($user->admin) $out .= info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+		if ($user->admin) {
+			$out .= info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+		}
 
 		// Make select dynamic
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
@@ -5042,12 +5645,16 @@ 
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
-			while ($obj = $this->db->fetch_object($resql)) $TCurrency[$obj->code] = $obj->code;
+			while ($obj = $this->db->fetch_object($resql)) {
+				$TCurrency[$obj->code] = $obj->code;
+			}
 		}
 
 		$out = '';
 		$out .= '<select class="flat" name="'.$htmlname.'" id="'.$htmlname.'">';
-		if ($useempty) $out .= '<option value="">&nbsp;</option>';
+		if ($useempty) {
+			$out .= '<option value="">&nbsp;</option>';
+		}
 		// If company current currency not in table, we add it into list. Should always be available.
 		if (!in_array($conf->currency, $TCurrency))
 		{
@@ -5059,8 +5666,11 @@ 
 			{
 				if (isset($TCurrency[$code_iso]))
 				{
-					if (!empty($selected) && $selected == $code_iso) $out .= '<option value="'.$code_iso.'" selected="selected">';
-					else $out .= '<option value="'.$code_iso.'">';
+					if (!empty($selected) && $selected == $code_iso) {
+						$out .= '<option value="'.$code_iso.'" selected="selected">';
+					} else {
+						$out .= '<option value="'.$code_iso.'">';
+					}
 
 					$out .= $currency['label'];
 					$out .= ' ('.$langs->getCurrencySymbol($code_iso).')';
@@ -5090,7 +5700,10 @@ 
 		global $langs;
 
 		$num = count($this->cache_vatrates);
-		if ($num > 0) return $num; // Cache already loaded
+		if ($num > 0) {
+			return $num;
+		}
+		// Cache already loaded
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
@@ -5122,10 +5735,18 @@ 
 					$this->cache_vatrates[$i]['label'] = $obj->taux.'%'.($obj->code ? ' ('.$obj->code.')' : ''); // Label must contains only 0-9 , . % or *
 					$this->cache_vatrates[$i]['labelallrates'] = $obj->taux.'/'.($obj->localtax1 ? $obj->localtax1 : '0').'/'.($obj->localtax2 ? $obj->localtax2 : '0').($obj->code ? ' ('.$obj->code.')' : ''); // Must never be used as key, only label
 					$positiverates = '';
-					if ($obj->taux) $positiverates .= ($positiverates ? '/' : '').$obj->taux;
-					if ($obj->localtax1) $positiverates .= ($positiverates ? '/' : '').$obj->localtax1;
-					if ($obj->localtax2) $positiverates .= ($positiverates ? '/' : '').$obj->localtax2;
-					if (empty($positiverates)) $positiverates = '0';
+					if ($obj->taux) {
+						$positiverates .= ($positiverates ? '/' : '').$obj->taux;
+					}
+					if ($obj->localtax1) {
+						$positiverates .= ($positiverates ? '/' : '').$obj->localtax1;
+					}
+					if ($obj->localtax2) {
+						$positiverates .= ($positiverates ? '/' : '').$obj->localtax2;
+					}
+					if (empty($positiverates)) {
+						$positiverates = '0';
+					}
 					$this->cache_vatrates[$i]['labelpositiverates'] = $positiverates.($obj->code ? ' ('.$obj->code.')' : ''); // Must never be used as key, only label
 				}
 
@@ -5207,28 +5828,36 @@ 
 		} else {
 			$code_country = "'".$mysoc->country_code."'"; // Pour compatibilite ascendente
 		}
-		if (!empty($conf->global->SERVICE_ARE_ECOMMERCE_200238EC))    // If option to have vat for end customer for services is on
+		if (!empty($conf->global->SERVICE_ARE_ECOMMERCE_200238EC)) {
+			// If option to have vat for end customer for services is on
 		{
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+		}
 			if (!isInEEC($societe_vendeuse) && (!is_object($societe_acheteuse) || (isInEEC($societe_acheteuse) && !$societe_acheteuse->isACompany())))
 			{
 				// We also add the buyer
 				if (is_numeric($type))
 				{
-					if ($type == 1) // We know product is a service
+					if ($type == 1) {
+						// We know product is a service
 					{
 						$code_country .= ",'".$societe_acheteuse->country_code."'";
 					}
-				} elseif (!$idprod)  // We don't know type of product
+					}
+				} elseif (!$idprod) {
+					// We don't know type of product
 				{
 					$code_country .= ",'".$societe_acheteuse->country_code."'";
+				}
 				} else {
 					$prodstatic = new Product($this->db);
 					$prodstatic->fetch($idprod);
-					if ($prodstatic->type == Product::TYPE_SERVICE)   // We know product is a service
+					if ($prodstatic->type == Product::TYPE_SERVICE) {
+						// We know product is a service
 					{
 						$code_country .= ",'".$societe_acheteuse->country_code."'";
 					}
+					}
 				}
 			}
 		}
@@ -5248,15 +5877,20 @@ 
 					$defaultcode = $reg[1];
 					$defaulttx = preg_replace('/\s*\(.*\)/', '', $defaulttx);
 				}
-				if (empty($defaulttx)) $defaultnpr = 0;
+				if (empty($defaulttx)) {
+					$defaultnpr = 0;
+				}
 			}
 
 			// Si taux par defaut n'a pu etre determine, on prend dernier de la liste.
 			// Comme ils sont tries par ordre croissant, dernier = plus eleve = taux courant
 			if ($defaulttx < 0 || dol_strlen($defaulttx) == 0)
 			{
-				if (empty($conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS)) $defaulttx = $this->cache_vatrates[$num - 1]['txtva'];
-				else $defaulttx = ($conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS == 'none' ? '' : $conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS);
+				if (empty($conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS)) {
+					$defaulttx = $this->cache_vatrates[$num - 1]['txtva'];
+				} else {
+					$defaulttx = ($conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS == 'none' ? '' : $conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS);
+				}
 			}
 
 			// Disabled if seller is not subject to VAT
@@ -5272,28 +5906,38 @@ 
 				}
 			}
 
-			if (!$options_only) $return .= '<select class="flat minwidth75imp" id="'.$htmlname.'" name="'.$htmlname.'"'.($disabled ? ' disabled' : '').$title.'>';
+			if (!$options_only) {
+				$return .= '<select class="flat minwidth75imp" id="'.$htmlname.'" name="'.$htmlname.'"'.($disabled ? ' disabled' : '').$title.'>';
+			}
 
 			$selectedfound = false;
 			foreach ($this->cache_vatrates as $rate)
 			{
 				// Keep only 0 if seller is not subject to VAT
-				if ($disabled && $rate['txtva'] != 0) continue;
+				if ($disabled && $rate['txtva'] != 0) {
+					continue;
+				}
 
 				// Define key to use into select list
 				$key = $rate['txtva'];
 				$key .= $rate['nprtva'] ? '*' : '';
-				if ($mode > 0 && $rate['code']) $key .= ' ('.$rate['code'].')';
-				if ($mode < 0) $key = $rate['rowid'];
+				if ($mode > 0 && $rate['code']) {
+					$key .= ' ('.$rate['code'].')';
+				}
+				if ($mode < 0) {
+					$key = $rate['rowid'];
+				}
 
 				$return .= '<option value="'.$key.'"';
 				if (!$selectedfound)
 				{
-					if ($defaultcode) // If defaultcode is defined, we used it in priority to select combo option instead of using rate+npr flag
+					if ($defaultcode) {
+						// If defaultcode is defined, we used it in priority to select combo option instead of using rate+npr flag
 					{
 						if ($defaultcode == $rate['code'])
 						{
 							$return .= ' selected';
+					}
 							$selectedfound = true;
 						}
 					} elseif ($rate['txtva'] == $defaulttx && $rate['nprtva'] == $defaultnpr)
@@ -5316,7 +5960,9 @@ 
 				$return .= '</option>';
 			}
 
-			if (!$options_only) $return .= '</select>';
+			if (!$options_only) {
+				$return .= '</select>';
+			}
 		} else {
 			$return .= $this->error;
 		}
@@ -5416,12 +6062,20 @@ 
 
 		$retstring = '';
 
-		if ($prefix == '') $prefix = 're';
-		if ($h == '') $h = 0;
-		if ($m == '') $m = 0;
+		if ($prefix == '') {
+			$prefix = 're';
+		}
+		if ($h == '') {
+			$h = 0;
+		}
+		if ($m == '') {
+			$m = 0;
+		}
 		$emptydate = 0;
 		$emptyhours = 0;
-		if ($stepminutes <= 0 || $stepminutes > 30) $stepminutes = 1;
+		if ($stepminutes <= 0 || $stepminutes > 30) {
+			$stepminutes = 1;
+		}
 		if ($empty == 1) { $emptydate = 1; $emptyhours = 1; }
 		if ($empty == 2) { $emptydate = 0; $emptyhours = 1; }
 		$orig_set_time = $set_time;
@@ -5434,10 +6088,12 @@ 
 
 		// Analysis of the pre-selection date
 		$reg = array();
-		if (preg_match('/^([0-9]+)\-([0-9]+)\-([0-9]+)\s?([0-9]+)?:?([0-9]+)?/', $set_time, $reg))	// deprecated usage
+		if (preg_match('/^([0-9]+)\-([0-9]+)\-([0-9]+)\s?([0-9]+)?:?([0-9]+)?/', $set_time, $reg)) {
+			// deprecated usage
 		{
 			// Date format 'YYYY-MM-DD' or 'YYYY-MM-DD HH:MM:SS'
 			$syear	= (!empty($reg[1]) ? $reg[1] : '');
+		}
 			$smonth = (!empty($reg[2]) ? $reg[2] : '');
 			$sday	= (!empty($reg[3]) ? $reg[3] : '');
 			$shour	= (!empty($reg[4]) ? $reg[4] : '');
@@ -5467,8 +6123,12 @@ 
 			$smin = !isset($conf->global->MAIN_DEFAULT_DATE_MIN) ? ($h == -1 ? '59' : '') : $conf->global->MAIN_DEFAULT_DATE_MIN;
 			$ssec = !isset($conf->global->MAIN_DEFAULT_DATE_SEC) ? ($h == -1 ? '59' : '') : $conf->global->MAIN_DEFAULT_DATE_SEC;
 		}
-		if ($h == 3) $shour = '';
-		if ($m == 3) $smin = '';
+		if ($h == 3) {
+			$shour = '';
+		}
+		if ($m == 3) {
+			$smin = '';
+		}
 
 		// You can set MAIN_POPUP_CALENDAR to 'eldy' or 'jquery'
 		$usecalendar = 'combo';
@@ -5505,7 +6165,9 @@ 
 						$base = DOL_URL_ROOT.'/core/';
 						$retstring .= ' onClick="showDP(\''.$base.'\',\''.$prefix.'\',\''.$langs->trans("FormatDateShortJavaInput").'\',\''.$langs->defaultlang.'\');"';
 						$retstring .= '>'.img_object($langs->trans("SelectDate"), 'calendarday', 'class="datecallink"').'</button>';
-					} else $retstring .= '<button id="'.$prefix.'Button" type="button" class="dpInvisibleButtons">'.img_object($langs->trans("Disabled"), 'calendarday', 'class="datecallink"').'</button>';
+					} else {
+						$retstring .= '<button id="'.$prefix.'Button" type="button" class="dpInvisibleButtons">'.img_object($langs->trans("Disabled"), 'calendarday', 'class="datecallink"').'</button>';
+					}
 
 					$retstring .= '<input type="hidden" id="'.$prefix.'day"   name="'.$prefix.'day"   value="'.$sday.'">'."\n";
 					$retstring .= '<input type="hidden" id="'.$prefix.'month" name="'.$prefix.'month" value="'.$smonth.'">'."\n";
@@ -5626,7 +6288,9 @@ 
 			}
 		}
 
-		if ($d && $h) $retstring .= ($h == 2 ? '<br>' : ' ');
+		if ($d && $h) {
+			$retstring .= ($h == 2 ? '<br>' : ' ');
+		}
 
 		if ($h)
 		{
@@ -5636,28 +6300,40 @@ 
 				$openinghours = explode(',', $openinghours);
 				$hourstart = $openinghours[0];
 				$hourend = $openinghours[1];
-				if ($hourend < $hourstart) $hourend = $hourstart;
+				if ($hourend < $hourstart) {
+					$hourend = $hourstart;
+				}
 			}
 			// Show hour
 			$retstring .= '<select'.($disabled ? ' disabled' : '').' class="flat valignmiddle maxwidth50 '.($fullday ? $fullday.'hour' : '').'" id="'.$prefix.'hour" name="'.$prefix.'hour">';
-			if ($emptyhours) $retstring .= '<option value="-1">&nbsp;</option>';
+			if ($emptyhours) {
+				$retstring .= '<option value="-1">&nbsp;</option>';
+			}
 			for ($hour = $hourstart; $hour < $hourend; $hour++)
 			{
-				if (strlen($hour) < 2) $hour = "0".$hour;
+				if (strlen($hour) < 2) {
+					$hour = "0".$hour;
+				}
 				$retstring .= '<option value="'.$hour.'"'.(($hour == $shour) ? ' selected' : '').'>'.$hour.(empty($conf->dol_optimize_smallscreen) ? '' : 'H').'</option>';
 			}
 			$retstring .= '</select>';
-			if ($m && empty($conf->dol_optimize_smallscreen)) $retstring .= ":";
+			if ($m && empty($conf->dol_optimize_smallscreen)) {
+				$retstring .= ":";
+			}
 		}
 
 		if ($m)
 		{
 			// Show minutes
 			$retstring .= '<select'.($disabled ? ' disabled' : '').' class="flat valignmiddle maxwidth50 '.($fullday ? $fullday.'min' : '').'" id="'.$prefix.'min" name="'.$prefix.'min">';
-			if ($emptyhours) $retstring .= '<option value="-1">&nbsp;</option>';
+			if ($emptyhours) {
+				$retstring .= '<option value="-1">&nbsp;</option>';
+			}
 			for ($min = 0; $min < 60; $min += $stepminutes)
 			{
-				if (strlen($min) < 2) $min = "0".$min;
+				if (strlen($min) < 2) {
+					$min = "0".$min;
+				}
 				$retstring .= '<option value="'.$min.'"'.(($min == $smin) ? ' selected' : '').'>'.$min.(empty($conf->dol_optimize_smallscreen) ? '' : '').'</option>';
 			}
 			$retstring .= '</select>';
@@ -5670,7 +6346,8 @@ 
 		{
 			// Script which will be inserted in the onClick of the "Now" link
 			$reset_scripts = "";
-			if ($addnowlink == 2) // local computer time
+			if ($addnowlink == 2) {
+				// local computer time
 			{
 				// pad add leading 0 on numbers
 				$reset_scripts .= "Number.prototype.pad = function(size) {
@@ -5680,11 +6357,14 @@ 
                     };
                     var d = new Date();";
 			}
+			}
 
 			// Generate the date part, depending on the use or not of the javascript calendar
-			if ($addnowlink == 1) // server time expressed in user time setup
+			if ($addnowlink == 1) {
+				// server time expressed in user time setup
 			{
 				$reset_scripts .= 'jQuery(\'#'.$prefix.'\').val(\''.dol_print_date(dol_now(), 'day', 'tzuser').'\');';
+			}
 				$reset_scripts .= 'jQuery(\'#'.$prefix.'day\').val(\''.dol_print_date(dol_now(), '%d', 'tzuser').'\');';
 				$reset_scripts .= 'jQuery(\'#'.$prefix.'month\').val(\''.dol_print_date(dol_now(), '%m', 'tzuser').'\');';
 				$reset_scripts .= 'jQuery(\'#'.$prefix.'year\').val(\''.dol_print_date(dol_now(), '%Y', 'tzuser').'\');';
@@ -5716,7 +6396,9 @@ 
 			// Update the hour part
 			if ($h)
 			{
-				if ($fullday) $reset_scripts .= " if (jQuery('#fullday:checked').val() == null) {";
+				if ($fullday) {
+					$reset_scripts .= " if (jQuery('#fullday:checked').val() == null) {";
+				}
 				//$reset_scripts .= 'this.form.elements[\''.$prefix.'hour\'].value=formatDate(new Date(), \'HH\'); ';
 				if ($addnowlink == 1)
 				{
@@ -5728,12 +6410,16 @@ 
 					$reset_scripts .= 'jQuery(\'#'.$prefix.'hour\').change();';
 				}
 
-				if ($fullday) $reset_scripts .= ' } ';
+				if ($fullday) {
+					$reset_scripts .= ' } ';
+				}
 			}
 			// Update the minute part
 			if ($m)
 			{
-				if ($fullday) $reset_scripts .= " if (jQuery('#fullday:checked').val() == null) {";
+				if ($fullday) {
+					$reset_scripts .= " if (jQuery('#fullday:checked').val() == null) {";
+				}
 				//$reset_scripts .= 'this.form.elements[\''.$prefix.'min\'].value=formatDate(new Date(), \'mm\'); ';
 				if ($addnowlink == 1)
 				{
@@ -5744,7 +6430,9 @@ 
 					$reset_scripts .= 'jQuery(\'#'.$prefix.'min\').val(d.getMinutes().pad());';
 					$reset_scripts .= 'jQuery(\'#'.$prefix.'min\').change();';
 				}
-				if ($fullday) $reset_scripts .= ' } ';
+				if ($fullday) {
+					$reset_scripts .= ' } ';
+				}
 			}
 			// If reset_scripts is not empty, print the link with the reset_scripts in the onClick
 			if ($reset_scripts && empty($conf->dol_optimize_smallscreen))
@@ -5769,16 +6457,24 @@ 
 			// Update the hour part
 			if ($h)
 			{
-				if ($fullday) $reset_scripts .= " if (jQuery('#fullday:checked').val() == null) {";
+				if ($fullday) {
+					$reset_scripts .= " if (jQuery('#fullday:checked').val() == null) {";
+				}
 				$reset_scripts .= 'jQuery(\'#'.$prefix.'hour\').val(\''.dol_print_date(dol_now(), '%H').'\');';
-				if ($fullday) $reset_scripts .= ' } ';
+				if ($fullday) {
+					$reset_scripts .= ' } ';
+				}
 			}
 			// Update the minute part
 			if ($m)
 			{
-				if ($fullday) $reset_scripts .= " if (jQuery('#fullday:checked').val() == null) {";
+				if ($fullday) {
+					$reset_scripts .= " if (jQuery('#fullday:checked').val() == null) {";
+				}
 				$reset_scripts .= 'jQuery(\'#'.$prefix.'min\').val(\''.dol_print_date(dol_now(), '%M').'\');';
-				if ($fullday) $reset_scripts .= ' } ';
+				if ($fullday) {
+					$reset_scripts .= ' } ';
+				}
 			}
 			// If reset_scripts is not empty, print the link with the reset_scripts in the onClick
 			if ($reset_scripts && empty($conf->dol_optimize_smallscreen))
@@ -5793,7 +6489,9 @@ 
 		if ($conf->use_javascript_ajax && $adddateof)
 		{
 			$tmparray = dol_getdate($adddateof);
-			if (empty($labeladddateof)) $labeladddateof = $langs->trans("DateInvoice");
+			if (empty($labeladddateof)) {
+				$labeladddateof = $langs->trans("DateInvoice");
+			}
 			$retstring .= ' - <button class="dpInvisibleButtons datenowlink" id="dateofinvoice" type="button" name="_dateofinvoice" value="now" onclick="jQuery(\'#re\').val(\''.dol_print_date($adddateof, 'day').'\');jQuery(\'#reday\').val(\''.$tmparray['mday'].'\');jQuery(\'#remonth\').val(\''.$tmparray['mon'].'\');jQuery(\'#reyear\').val(\''.$tmparray['year'].'\');">'.$labeladddateof.'</a>';
 		}
 
@@ -5860,9 +6558,11 @@ 
 
 		if ($typehour == 'select') {
 			$retstring .= '<select class="flat" id="select_'.$prefix.'hour" name="'.$prefix.'hour"'.($disabled ? ' disabled' : '').'>';
-			for ($hour = 0; $hour < 25; $hour++)	// For a duration, we allow 24 hours
+			for ($hour = 0; $hour < 25; $hour++) {
+				// For a duration, we allow 24 hours
 			{
 				$retstring .= '<option value="'.$hour.'"';
+			}
 				if ($hourSelected == $hour)
 				{
 					$retstring .= " selected";
@@ -5876,12 +6576,18 @@ 
 			return 'BadValueForParameterTypeHour';
 		}
 
-		if ($typehour != 'text') $retstring .= ' '.$langs->trans('HourShort');
-		else $retstring .= '<span class="hideonsmartphone">:</span>';
+		if ($typehour != 'text') {
+			$retstring .= ' '.$langs->trans('HourShort');
+		} else {
+			$retstring .= '<span class="hideonsmartphone">:</span>';
+		}
 
 		// Minutes
-		if ($minunderhours) $retstring .= '<br>';
-		else $retstring .= '<span class="hideonsmartphone">&nbsp;</span>';
+		if ($minunderhours) {
+			$retstring .= '<br>';
+		} else {
+			$retstring .= '<span class="hideonsmartphone">&nbsp;</span>';
+		}
 
 		if ($typehour == 'select' || $typehour == 'textselect')
 		{
@@ -5889,7 +6595,9 @@ 
 			for ($min = 0; $min <= 55; $min = $min + 5)
 			{
 				$retstring .= '<option value="'.$min.'"';
-				if ($minSelected == $min) $retstring .= ' selected';
+				if ($minSelected == $min) {
+					$retstring .= ' selected';
+				}
 				$retstring .= '>'.$min.'</option>';
 			}
 			$retstring .= "</select>";
@@ -5898,11 +6606,15 @@ 
 			$retstring .= '<input placeholder="'.$langs->trans('MinuteShort').'" type="number" min="0" name="'.$prefix.'min"'.($disabled ? ' disabled' : '').' class="flat maxwidth50 inputminute" value="'.(($minSelected != '') ? ((int) $minSelected) : '').'">';
 		}
 
-		if ($typehour != 'text') $retstring .= ' '.$langs->trans('MinuteShort');
+		if ($typehour != 'text') {
+			$retstring .= ' '.$langs->trans('MinuteShort');
+		}
 
 		//$retstring.="&nbsp;";
 
-		if (!empty($nooutput)) return $retstring;
+		if (!empty($nooutput)) {
+			return $retstring;
+		}
 
 		print $retstring;
 		return;
@@ -5963,8 +6675,12 @@ 
 
 		//var_dump($objecttmp->filter);
 		$prefixforautocompletemode = $objecttmp->element;
-		if ($prefixforautocompletemode == 'societe') $prefixforautocompletemode = 'company';
-		if ($prefixforautocompletemode == 'product') $prefixforautocompletemode = 'produit';
+		if ($prefixforautocompletemode == 'societe') {
+			$prefixforautocompletemode = 'company';
+		}
+		if ($prefixforautocompletemode == 'product') {
+			$prefixforautocompletemode = 'produit';
+		}
 		$confkeyforautocompletemode = strtoupper($prefixforautocompletemode).'_USE_SEARCH_TO_SELECT'; // For example COMPANY_USE_SEARCH_TO_SELECT
 
 		dol_syslog(get_class($this)."::selectForForms object->filter=".$objecttmp->filter, LOG_DEBUG);
@@ -5988,7 +6704,9 @@ 
 			// Activate the auto complete using ajax call.
 			$out .= ajax_autocompleter($preselectedvalue, $htmlname, $urlforajaxcall, $urloption, $conf->global->$confkeyforautocompletemode, 0, array());
 			$out .= '<style type="text/css">.ui-autocomplete { z-index: 250; }</style>';
-			if ($placeholder) $placeholder = ' placeholder="'.$placeholder.'"';
+			if ($placeholder) {
+				$placeholder = ' placeholder="'.$placeholder.'"';
+			}
 			$out .= '<input type="text" class="'.$morecss.'"'.($disabled ? ' disabled="disabled"' : '').' name="search_'.$htmlname.'" id="search_'.$htmlname.'" value="'.$selected_input_value.'"'.$placeholder.' />';
 		} else {
 			// Immediate load of table record. Note: filter is inside $objecttmp->filter
@@ -6009,9 +6727,13 @@ 
 		global $db;
 
 		//dol_syslog("Convert matches ".$matches[1]);
-		if (empty($matches[1])) return '';
+		if (empty($matches[1])) {
+			return '';
+		}
 		$tmp = explode(':', $matches[1]);
-		if (count($tmp) < 3) return '';
+		if (count($tmp) < 3) {
+			return '';
+		}
 
 		$tmpescaped = $tmp[2];
 		$regbis = array();
@@ -6049,17 +6771,25 @@ 
 		//print "$objecttmp->filter, $htmlname, $preselectedvalue, $showempty = '', $searchkey = '', $placeholder = '', $morecss = '', $moreparams = '', $forcecombo = 0, $outputmode = 0, $disabled";
 
 		$prefixforautocompletemode = $objecttmp->element;
-		if ($prefixforautocompletemode == 'societe') $prefixforautocompletemode = 'company';
+		if ($prefixforautocompletemode == 'societe') {
+			$prefixforautocompletemode = 'company';
+		}
 		$confkeyforautocompletemode = strtoupper($prefixforautocompletemode).'_USE_SEARCH_TO_SELECT'; // For example COMPANY_USE_SEARCH_TO_SELECT
 
-		if (!empty($objecttmp->fields))	// For object that declare it, it is better to use declared fields (like societe, contact, ...)
+		if (!empty($objecttmp->fields)) {
+			// For object that declare it, it is better to use declared fields (like societe, contact, ...)
 		{
 			$tmpfieldstoshow = '';
+		}
 			foreach ($objecttmp->fields as $key => $val)
 			{
-				if ($val['showoncombobox']) $tmpfieldstoshow .= ($tmpfieldstoshow ? ',' : '').'t.'.$key;
+				if ($val['showoncombobox']) {
+					$tmpfieldstoshow .= ($tmpfieldstoshow ? ',' : '').'t.'.$key;
+				}
+			}
+			if ($tmpfieldstoshow) {
+				$fieldstoshow = $tmpfieldstoshow;
 			}
-			if ($tmpfieldstoshow) $fieldstoshow = $tmpfieldstoshow;
 		} else {
 			// For backward compatibility
 			$objecttmp->fields['ref'] = array('type'=>'varchar(30)', 'label'=>'Ref', 'showoncombobox'=>1);
@@ -6087,20 +6817,30 @@ 
 			$tmparray = explode('@', $objecttmp->ismultientitymanaged);
 			$sql .= ' INNER JOIN '.MAIN_DB_PREFIX.$tmparray[1].' as parenttable ON parenttable.rowid = t.'.$tmparray[0];
 		}
-		if ($objecttmp->ismultientitymanaged == 'fk_soc@societe')
-			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		if ($objecttmp->ismultientitymanaged == 'fk_soc@societe') {
+					if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		}
 		$sql .= " WHERE 1=1";
-		if (isset($objecttmp->ismultientitymanaged) && $objecttmp->ismultientitymanaged == 1) $sql .= " AND t.entity IN (".getEntity($objecttmp->table_element).")";
+		if (isset($objecttmp->ismultientitymanaged) && $objecttmp->ismultientitymanaged == 1) {
+			$sql .= " AND t.entity IN (".getEntity($objecttmp->table_element).")";
+		}
 		if (isset($objecttmp->ismultientitymanaged) && !is_numeric($objecttmp->ismultientitymanaged)) {
 			$sql .= ' AND parenttable.entity = t.'.$tmparray[0];
 		}
 		if ($objecttmp->ismultientitymanaged == 1 && !empty($user->socid)) {
-			if ($objecttmp->element == 'societe') $sql .= " AND t.rowid = ".$user->socid;
-			else $sql .= " AND t.fk_soc = ".$user->socid;
+			if ($objecttmp->element == 'societe') {
+				$sql .= " AND t.rowid = ".$user->socid;
+			} else {
+				$sql .= " AND t.fk_soc = ".$user->socid;
+			}
+		}
+		if ($searchkey != '') {
+			$sql .= natural_search(explode(',', $fieldstoshow), $searchkey);
 		}
-		if ($searchkey != '') $sql .= natural_search(explode(',', $fieldstoshow), $searchkey);
 		if ($objecttmp->ismultientitymanaged == 'fk_soc@societe') {
-			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND t.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+			if (!$user->rights->societe->client->voir && !$user->socid) {
+				$sql .= " AND t.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+			}
 		}
 		if ($objecttmp->filter) {	 // Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
 			/*if (! DolibarrApi::_checkFilters($objecttmp->filter))
@@ -6133,10 +6873,15 @@ 
 			//if (! empty($conf->use_javascript_ajax) || $forcecombo) $textifempty='';
 			if (!empty($conf->global->$confkeyforautocompletemode))
 			{
-				if ($showempty && !is_numeric($showempty)) $textifempty = $langs->trans($showempty);
-				else $textifempty .= $langs->trans("All");
+				if ($showempty && !is_numeric($showempty)) {
+					$textifempty = $langs->trans($showempty);
+				} else {
+					$textifempty .= $langs->trans("All");
+				}
+			}
+			if ($showempty) {
+				$out .= '<option value="-1">'.$textifempty.'</option>'."\n";
 			}
-			if ($showempty) $out .= '<option value="-1">'.$textifempty.'</option>'."\n";
 
 			$num = $this->db->num_rows($resql);
 			$i = 0;
@@ -6165,7 +6910,9 @@ 
 					}
 
 					$i++;
-					if (($i % 10) == 0) $out .= "\n";
+					if (($i % 10) == 0) {
+						$out .= "\n";
+					}
 				}
 			}
 
@@ -6176,7 +6923,9 @@ 
 
 		$this->result = array('nbofelement'=>$num);
 
-		if ($outputmode) return $outarray;
+		if ($outputmode) {
+			return $outarray;
+		}
 		return $out;
 	}
 
@@ -6213,7 +6962,9 @@ 
 		//if (preg_match('/^multi/',$htmlname)) $jsbeautify = 1;
 		$jsbeautify = 1;
 
-		if ($value_as_key) $array = array_combine($array, $array);
+		if ($value_as_key) {
+			$array = array_combine($array, $array);
+		}
 
 		$out = '';
 
@@ -6235,8 +6986,13 @@ 
 		if ($show_empty)
 		{
 			$textforempty = ' ';
-			if (!empty($conf->use_javascript_ajax)) $textforempty = '&nbsp;'; // If we use ajaxcombo, we need &nbsp; here to avoid to have an empty element that is too small.
-			if (!is_numeric($show_empty)) $textforempty = $show_empty;
+			if (!empty($conf->use_javascript_ajax)) {
+				$textforempty = '&nbsp;';
+			}
+			// If we use ajaxcombo, we need &nbsp; here to avoid to have an empty element that is too small.
+			if (!is_numeric($show_empty)) {
+				$textforempty = $show_empty;
+			}
 			$out .= '<option class="optiongrey" '.($moreparamonempty ? $moreparamonempty.' ' : '').'value="'.($show_empty < 0 ? $show_empty : -1).'"'.($id == $show_empty ? ' selected' : '').'>'.$textforempty.'</option>'."\n";
 		}
 
@@ -6247,19 +7003,28 @@ 
 			{
 				foreach ($array as $key => $value)
 				{
-					if (!is_array($value)) $array[$key] = $langs->trans($value);
-					else $array[$key]['label'] = $langs->trans($value['label']);
+					if (!is_array($value)) {
+						$array[$key] = $langs->trans($value);
+					} else {
+						$array[$key]['label'] = $langs->trans($value['label']);
+					}
 				}
 			}
 
 			// Sort
-			if ($sort == 'ASC') asort($array);
-			elseif ($sort == 'DESC') arsort($array);
+			if ($sort == 'ASC') {
+				asort($array);
+			} elseif ($sort == 'DESC') {
+				arsort($array);
+			}
 
 			foreach ($array as $key => $tmpvalue)
 			{
-				if (is_array($tmpvalue)) $value = $tmpvalue['label'];
-				else $value = $tmpvalue;
+				if (is_array($tmpvalue)) {
+					$value = $tmpvalue['label'];
+				} else {
+					$value = $tmpvalue;
+				}
 
 				$disabled = ''; $style = '';
 				if (!empty($disablebademail))
@@ -6274,28 +7039,46 @@ 
 
 				if ($key_in_label)
 				{
-					if (empty($nohtmlescape)) $selectOptionValue = dol_escape_htmltag($key.' - '.($maxlen ?dol_trunc($value, $maxlen) : $value));
-					else $selectOptionValue = $key.' - '.($maxlen ?dol_trunc($value, $maxlen) : $value);
+					if (empty($nohtmlescape)) {
+						$selectOptionValue = dol_escape_htmltag($key.' - '.($maxlen ?dol_trunc($value, $maxlen) : $value));
+					} else {
+						$selectOptionValue = $key.' - '.($maxlen ?dol_trunc($value, $maxlen) : $value);
+					}
 				} else {
-					if (empty($nohtmlescape)) $selectOptionValue = dol_escape_htmltag($maxlen ?dol_trunc($value, $maxlen) : $value);
-					else $selectOptionValue = $maxlen ?dol_trunc($value, $maxlen) : $value;
-					if ($value == '' || $value == '-') $selectOptionValue = '&nbsp;';
+					if (empty($nohtmlescape)) {
+						$selectOptionValue = dol_escape_htmltag($maxlen ?dol_trunc($value, $maxlen) : $value);
+					} else {
+						$selectOptionValue = $maxlen ?dol_trunc($value, $maxlen) : $value;
+					}
+					if ($value == '' || $value == '-') {
+						$selectOptionValue = '&nbsp;';
+					}
 				}
 
 				$out .= '<option value="'.$key.'"';
 				$out .= $style.$disabled;
 				if (is_array($id)) {
-					if (in_array($key, $id) && !$disabled) $out .= ' selected'; // To preselect a value
+					if (in_array($key, $id) && !$disabled) {
+						$out .= ' selected';
+					}
+					// To preselect a value
 				} else {
 					$id = (string) $id; // if $id = 0, then $id = '0'
-					if ($id != '' && $id == $key && !$disabled) $out .= ' selected'; // To preselect a value
+					if ($id != '' && $id == $key && !$disabled) {
+						$out .= ' selected';
+					}
+					// To preselect a value
+				}
+				if ($nohtmlescape) {
+					$out .= ' data-html="'.dol_escape_htmltag($selectOptionValue).'"';
 				}
-				if ($nohtmlescape) $out .= ' data-html="'.dol_escape_htmltag($selectOptionValue).'"';
 				if (is_array($tmpvalue))
 				{
 					foreach ($tmpvalue as $keyforvalue => $valueforvalue)
 					{
-						if (preg_match('/^data-/', $keyforvalue)) $out .= ' '.$keyforvalue.'="'.$valueforvalue.'"';
+						if (preg_match('/^data-/', $keyforvalue)) {
+							$out .= ' '.$keyforvalue.'="'.$valueforvalue.'"';
+						}
 					}
 				}
 				$out .= '>';
@@ -6334,7 +7117,9 @@ 
 		global $delayedhtmlcontent;
 
 		// TODO Use an internal dolibarr component instead of select2
-		if (empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) && !defined('REQUIRE_JQUERY_MULTISELECT')) return '';
+		if (empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) && !defined('REQUIRE_JQUERY_MULTISELECT')) {
+			return '';
+		}
 
 		$out = '<select type="text" class="'.$htmlname.($morecss ? ' '.$morecss : '').'" '.($moreparam ? $moreparam.' ' : '').'name="'.$htmlname.'"></select>';
 
@@ -6434,7 +7219,9 @@ 
 		global $delayedhtmlcontent;
 
 		// TODO Use an internal dolibarr component instead of select2
-		if (empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) && !defined('REQUIRE_JQUERY_MULTISELECT')) return '';
+		if (empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) && !defined('REQUIRE_JQUERY_MULTISELECT')) {
+			return '';
+		}
 
 		$out = '<select type="text" class="'.$htmlname.($morecss ? ' '.$morecss : '').'" '.($moreparam ? $moreparam.' ' : '').'name="'.$htmlname.'"><option></option></select>';
 
@@ -6551,8 +7338,11 @@ 
 		$out = '';
 
 		if ($addjscombo < 0) {
-			if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) $addjscombo = 1;
-			else $addjscombo = 0;
+			if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+				$addjscombo = 1;
+			} else {
+				$addjscombo = 0;
+			}
 		}
 
 		// Add code for jquery to use multiselect
@@ -6614,7 +7404,9 @@ 
 		$out .= '<select id="'.$htmlname.'" class="multiselect'.($morecss ? ' '.$morecss : '').'" multiple name="'.$htmlname.'[]"'.($moreattrib ? ' '.$moreattrib : '').($width ? ' style="width: '.(preg_match('/%/', $width) ? $width : $width.'px').'"' : '').'>'."\n";
 		if (is_array($array) && !empty($array))
 		{
-			if ($value_as_key) $array = array_combine($array, $array);
+			if ($value_as_key) {
+				$array = array_combine($array, $array);
+			}
 
 			if (!empty($array))
 			{
@@ -6654,7 +7446,9 @@ 
 	{
 		global $conf, $langs, $user, $extrafields;
 
-		if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) return '';
+		if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+			return '';
+		}
 
 		$tmpvar = "MAIN_SELECTEDFIELDS_".$varpage; // To get list of saved seleteced properties
 		if (!empty($user->conf->$tmpvar))
@@ -6664,8 +7458,11 @@ 
 			{
 				//var_dump($key);
 				//var_dump($tmparray);
-				if (in_array($key, $tmparray)) $array[$key]['checked'] = 1;
-				else $array[$key]['checked'] = 0;
+				if (in_array($key, $tmparray)) {
+					$array[$key]['checked'] = 1;
+				} else {
+					$array[$key]['checked'] = 0;
+				}
 			}
 		}
 
@@ -6851,25 +7648,46 @@ 
 				// To work with non standard path
 				if ($objecttype == 'facture') {
 					$tplpath = 'compta/'.$element;
-					if (empty($conf->facture->enabled)) continue; // Do not show if module disabled
+					if (empty($conf->facture->enabled)) {
+						continue;
+					}
+					// Do not show if module disabled
 				} elseif ($objecttype == 'facturerec') {
 					$tplpath = 'compta/facture';
 					$tplname = 'linkedobjectblockForRec';
-					if (empty($conf->facture->enabled)) continue; // Do not show if module disabled
+					if (empty($conf->facture->enabled)) {
+						continue;
+					}
+					// Do not show if module disabled
 				} elseif ($objecttype == 'propal') {
 					$tplpath = 'comm/'.$element;
-					if (empty($conf->propal->enabled)) continue; // Do not show if module disabled
+					if (empty($conf->propal->enabled)) {
+						continue;
+					}
+					// Do not show if module disabled
 				} elseif ($objecttype == 'supplier_proposal') {
-					if (empty($conf->supplier_proposal->enabled)) continue; // Do not show if module disabled
+					if (empty($conf->supplier_proposal->enabled)) {
+						continue;
+					}
+					// Do not show if module disabled
 				} elseif ($objecttype == 'shipping' || $objecttype == 'shipment') {
 					$tplpath = 'expedition';
-					if (empty($conf->expedition->enabled)) continue; // Do not show if module disabled
+					if (empty($conf->expedition->enabled)) {
+						continue;
+					}
+					// Do not show if module disabled
 				} elseif ($objecttype == 'reception') {
 					$tplpath = 'reception';
-					if (empty($conf->reception->enabled)) continue; // Do not show if module disabled
+					if (empty($conf->reception->enabled)) {
+						continue;
+					}
+					// Do not show if module disabled
 				} elseif ($objecttype == 'delivery') {
 					$tplpath = 'livraison';
-					if (empty($conf->expedition->enabled)) continue; // Do not show if module disabled
+					if (empty($conf->expedition->enabled)) {
+						continue;
+					}
+					// Do not show if module disabled
 				} elseif ($objecttype == 'invoice_supplier') {
 					$tplpath = 'fourn/facture';
 				} elseif ($objecttype == 'order_supplier') {
@@ -6888,9 +7706,11 @@ 
 				$dirtpls = array_merge($conf->modules_parts['tpl'], array('/'.$tplpath.'/tpl'));
 				foreach ($dirtpls as $reldir)
 				{
-					if ($nboftypesoutput == ($nbofdifferenttypes - 1))    // No more type to show after
+					if ($nboftypesoutput == ($nbofdifferenttypes - 1)) {
+						// No more type to show after
 					{
 						global $noMoreLinkedObjectBlockAfter;
+					}
 						$noMoreLinkedObjectBlockAfter = 1;
 					}
 
@@ -6939,19 +7759,25 @@ 
 		$linktoelemlist = '';
 		$listofidcompanytoscan = '';
 
-		if (!is_object($object->thirdparty)) $object->fetch_thirdparty();
+		if (!is_object($object->thirdparty)) {
+			$object->fetch_thirdparty();
+		}
 
 		$possiblelinks = array();
 		if (is_object($object->thirdparty) && !empty($object->thirdparty->id) && $object->thirdparty->id > 0)
 		{
 			$listofidcompanytoscan = $object->thirdparty->id;
-			if (($object->thirdparty->parent > 0) && !empty($conf->global->THIRDPARTY_INCLUDE_PARENT_IN_LINKTO)) $listofidcompanytoscan .= ','.$object->thirdparty->parent;
+			if (($object->thirdparty->parent > 0) && !empty($conf->global->THIRDPARTY_INCLUDE_PARENT_IN_LINKTO)) {
+				$listofidcompanytoscan .= ','.$object->thirdparty->parent;
+			}
 			if (($object->fk_project > 0) && !empty($conf->global->THIRDPARTY_INCLUDE_PROJECT_THIRDPARY_IN_LINKTO))
 			{
 				include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 				$tmpproject = new Project($this->db);
 				$tmpproject->fetch($object->fk_project);
-				if ($tmpproject->socid > 0 && ($tmpproject->socid != $object->thirdparty->id)) $listofidcompanytoscan .= ','.$tmpproject->socid;
+				if ($tmpproject->socid > 0 && ($tmpproject->socid != $object->thirdparty->id)) {
+					$listofidcompanytoscan .= ','.$tmpproject->socid;
+				}
 				unset($tmpproject);
 			}
 
@@ -6974,9 +7800,12 @@ 
 		$hookmanager->initHooks(array('commonobject'));
 		$parameters = array('listofidcompanytoscan' => $listofidcompanytoscan);
 
-		if (!empty($listofidcompanytoscan))  // If empty, we don't have criteria to scan the object we can link to
+		if (!empty($listofidcompanytoscan)) {
+			// If empty, we don't have criteria to scan the object we can link to
 		{
-			$reshook = $hookmanager->executeHooks('showLinkToObjectBlock', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+			$reshook = $hookmanager->executeHooks('showLinkToObjectBlock', $parameters, $object, $action);
+		}
+		// Note that $action and $object may have been modified by hook
 		}
 
 		if (empty($reshook))
@@ -6997,7 +7826,9 @@ 
 		{
 			$num = 0;
 
-			if (empty($possiblelink['enabled'])) continue;
+			if (empty($possiblelink['enabled'])) {
+				continue;
+			}
 
 			if (!empty($possiblelink['perms']) && (empty($restrictlinksto) || in_array($key, $restrictlinksto)) && (empty($excludelinksto) || !in_array($key, $excludelinksto)))
 			{
@@ -7053,9 +7884,13 @@ 
 				}
 
 				//$linktoelem.=($linktoelem?' &nbsp; ':'');
-				if ($num > 0) $linktoelemlist .= '<li><a href="#linkto'.$key.'" class="linkto dropdowncloseonclick" rel="'.$key.'">'.$langs->trans($possiblelink['label']).' ('.$num.')</a></li>';
+				if ($num > 0) {
+					$linktoelemlist .= '<li><a href="#linkto'.$key.'" class="linkto dropdowncloseonclick" rel="'.$key.'">'.$langs->trans($possiblelink['label']).' ('.$num.')</a></li>';
+				}
 				//else $linktoelem.=$langs->trans($possiblelink['label']);
-				else $linktoelemlist .= '<li><span class="linktodisabled">'.$langs->trans($possiblelink['label']).' (0)</span></li>';
+				else {
+					$linktoelemlist .= '<li><span class="linktodisabled">'.$langs->trans($possiblelink['label']).' (0)</span></li>';
+				}
 			}
 		}
 
@@ -7064,7 +7899,9 @@ 
 			$linktoelem = '
     		<dl class="dropdown" id="linktoobjectname">
     		';
-			if (!empty($conf->use_javascript_ajax)) $linktoelem .= '<dt><a href="#linktoobjectname">'.$langs->trans("LinkTo").'...</a></dt>';
+			if (!empty($conf->use_javascript_ajax)) {
+				$linktoelem .= '<dt><a href="#linktoobjectname">'.$langs->trans("LinkTo").'...</a></dt>';
+			}
 			$linktoelem .= '<dd>
     		<div class="multiselectlinkto">
     		<ul class="ulselectedfields">'.$linktoelemlist.'
@@ -7117,7 +7954,9 @@ 
 		$disabled = ($disabled ? ' disabled' : '');
 
 		$resultyesno = '<select class="flat width75" id="'.$htmlname.'" name="'.$htmlname.'"'.$disabled.'>'."\n";
-		if ($useempty) $resultyesno .= '<option value="-1"'.(($value < 0) ? ' selected' : '').'>&nbsp;</option>'."\n";
+		if ($useempty) {
+			$resultyesno .= '<option value="-1"'.(($value < 0) ? ' selected' : '').'>&nbsp;</option>'."\n";
+		}
 		if (("$value" == 'yes') || ($value == 1))
 		{
 			$resultyesno .= '<option value="'.$yes.'" selected>'.$langs->trans("Yes").'</option>'."\n";
@@ -7201,8 +8040,12 @@ 
 		global $langs, $conf, $hookmanager, $extralanguages;
 
 		$ret = '';
-		if (empty($fieldid))  $fieldid = 'rowid';
-		if (empty($fieldref)) $fieldref = 'ref';
+		if (empty($fieldid)) {
+			$fieldid = 'rowid';
+		}
+		if (empty($fieldref)) {
+			$fieldref = 'ref';
+		}
 
 		// Add where from hooks
 		if (is_object($hookmanager))
@@ -7221,9 +8064,11 @@ 
 			// Special case for project/task page
 			if ($paramid == 'project_ref')
 			{
-				if (preg_match('/\/tasks\/(task|contact|note|document)\.php/', $navurl))     // TODO Remove this when nav with project_ref on task pages are ok
+				if (preg_match('/\/tasks\/(task|contact|note|document)\.php/', $navurl)) {
+					// TODO Remove this when nav with project_ref on task pages are ok
 				{
 					$navurl = preg_replace('/\/tasks\/(task|contact|time|note|document)\.php/', '/tasks.php', $navurl);
+				}
 					$paramid = 'ref';
 				}
 			}
@@ -7249,7 +8094,9 @@ 
 		$ret .= '<!-- Start banner content --><div style="vertical-align: middle">';
 
 		// Right part of banner
-		if ($morehtmlright) $ret .= '<div class="inline-block floatleft">'.$morehtmlright.'</div>';
+		if ($morehtmlright) {
+			$ret .= '<div class="inline-block floatleft">'.$morehtmlright.'</div>';
+		}
 
 		if ($previous_ref || $next_ref || $morehtml)
 		{
@@ -7271,20 +8118,33 @@ 
 
 		$parameters = array();
 		$reshook = $hookmanager->executeHooks('moreHtmlStatus', $parameters, $object); // Note that $action and $object may have been modified by hook
-		if (empty($reshook)) $morehtmlstatus .= $hookmanager->resPrint;
-		else $morehtmlstatus = $hookmanager->resPrint;
-		if ($morehtmlstatus) $ret .= '<div class="statusref">'.$morehtmlstatus.'</div>';
+		if (empty($reshook)) {
+			$morehtmlstatus .= $hookmanager->resPrint;
+		} else {
+			$morehtmlstatus = $hookmanager->resPrint;
+		}
+		if ($morehtmlstatus) {
+			$ret .= '<div class="statusref">'.$morehtmlstatus.'</div>';
+		}
 
 		$parameters = array();
 		$reshook = $hookmanager->executeHooks('moreHtmlRef', $parameters, $object); // Note that $action and $object may have been modified by hook
-		if (empty($reshook)) $morehtmlref .= $hookmanager->resPrint;
-		elseif ($reshook > 0) $morehtmlref = $hookmanager->resPrint;
+		if (empty($reshook)) {
+			$morehtmlref .= $hookmanager->resPrint;
+		} elseif ($reshook > 0) {
+			$morehtmlref = $hookmanager->resPrint;
+		}
 
 		// Left part of banner
 		if ($morehtmlleft)
 		{
-			if ($conf->browser->layout == 'phone') $ret .= '<!-- morehtmlleft --><div class="floatleft">'.$morehtmlleft.'</div>'; // class="center" to have photo in middle
-			else $ret .= '<!-- morehtmlleft --><div class="inline-block floatleft">'.$morehtmlleft.'</div>';
+			if ($conf->browser->layout == 'phone') {
+				$ret .= '<!-- morehtmlleft --><div class="floatleft">'.$morehtmlleft.'</div>';
+			}
+			// class="center" to have photo in middle
+			else {
+				$ret .= '<!-- morehtmlleft --><div class="inline-block floatleft">'.$morehtmlleft.'</div>';
+			}
 		}
 
 		//if ($conf->browser->layout == 'phone') $ret.='<div class="clearboth"></div>';
@@ -7297,7 +8157,9 @@ 
 
 			// List of extra languages
 			$arrayoflangcode = array();
-			if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE)) $arrayoflangcode[] = $conf->global->PDF_USE_ALSO_LANGUAGE_CODE;
+			if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE)) {
+				$arrayoflangcode[] = $conf->global->PDF_USE_ALSO_LANGUAGE_CODE;
+			}
 
 			if (is_array($arrayoflangcode) && count($arrayoflangcode)) {
 				if (!is_object($extralanguages)) {
@@ -7381,14 +8243,18 @@ 
 		global $conf;
 
 		//Check if barcode is filled in the card
-		if (empty($object->barcode)) return '';
+		if (empty($object->barcode)) {
+			return '';
+		}
 
 		// Complete object if not complete
 		if (empty($object->barcode_type_code) || empty($object->barcode_type_coder))
 		{
 			$result = $object->fetch_barcode();
 			//Check if fetch_barcode() failed
-			if ($result < 1) return '<!-- ErrorFetchBarcode -->';
+			if ($result < 1) {
+				return '<!-- ErrorFetchBarcode -->';
+			}
 		}
 
 		// Barcode image
@@ -7426,9 +8292,15 @@ 
 			$dir = $conf->societe->multidir_output[$entity];
 			if (!empty($object->logo))
 			{
-				if ((string) $imagesize == 'mini') $file = get_exdir(0, 0, 0, 0, $object, 'thirdparty').'/logos/'.getImageFileNameForSize($object->logo, '_mini'); // getImageFileNameForSize include the thumbs
-				elseif ((string) $imagesize == 'small') $file = get_exdir(0, 0, 0, 0, $object, 'thirdparty').'/logos/'.getImageFileNameForSize($object->logo, '_small');
-				else $file = get_exdir(0, 0, 0, 0, $object, 'thirdparty').'/logos/'.$object->logo;
+				if ((string) $imagesize == 'mini') {
+					$file = get_exdir(0, 0, 0, 0, $object, 'thirdparty').'/logos/'.getImageFileNameForSize($object->logo, '_mini');
+				}
+				// getImageFileNameForSize include the thumbs
+				elseif ((string) $imagesize == 'small') {
+					$file = get_exdir(0, 0, 0, 0, $object, 'thirdparty').'/logos/'.getImageFileNameForSize($object->logo, '_small');
+				} else {
+					$file = get_exdir(0, 0, 0, 0, $object, 'thirdparty').'/logos/'.$object->logo;
+				}
 				$originalfile = get_exdir(0, 0, 0, 0, $object, 'thirdparty').'/logos/'.$object->logo;
 			}
 			$email = $object->email;
@@ -7437,9 +8309,13 @@ 
 			$dir = $conf->societe->multidir_output[$entity].'/contact';
 			if (!empty($object->photo))
 			{
-				if ((string) $imagesize == 'mini') $file = get_exdir(0, 0, 0, 0, $object, 'contact').'/photos/'.getImageFileNameForSize($object->photo, '_mini');
-				elseif ((string) $imagesize == 'small') $file = get_exdir(0, 0, 0, 0, $object, 'contact').'/photos/'.getImageFileNameForSize($object->photo, '_small');
-				else $file = get_exdir(0, 0, 0, 0, $object, 'contact').'/photos/'.$object->photo;
+				if ((string) $imagesize == 'mini') {
+					$file = get_exdir(0, 0, 0, 0, $object, 'contact').'/photos/'.getImageFileNameForSize($object->photo, '_mini');
+				} elseif ((string) $imagesize == 'small') {
+					$file = get_exdir(0, 0, 0, 0, $object, 'contact').'/photos/'.getImageFileNameForSize($object->photo, '_small');
+				} else {
+					$file = get_exdir(0, 0, 0, 0, $object, 'contact').'/photos/'.$object->photo;
+				}
 				$originalfile = get_exdir(0, 0, 0, 0, $object, 'contact').'/photos/'.$object->photo;
 			}
 			$email = $object->email;
@@ -7449,12 +8325,19 @@ 
 			$dir = $conf->user->dir_output;
 			if (!empty($object->photo))
 			{
-				if ((string) $imagesize == 'mini') $file = get_exdir(0, 0, 0, 0, $object, 'user').$object->id.'/'.getImageFileNameForSize($object->photo, '_mini');
-				elseif ((string) $imagesize == 'small') $file = get_exdir(0, 0, 0, 0, $object, 'user').$object->id.'/'.getImageFileNameForSize($object->photo, '_small');
-				else $file = get_exdir(0, 0, 0, 0, $object, 'user').'/'.$object->id.'/'.$object->photo;
+				if ((string) $imagesize == 'mini') {
+					$file = get_exdir(0, 0, 0, 0, $object, 'user').$object->id.'/'.getImageFileNameForSize($object->photo, '_mini');
+				} elseif ((string) $imagesize == 'small') {
+					$file = get_exdir(0, 0, 0, 0, $object, 'user').$object->id.'/'.getImageFileNameForSize($object->photo, '_small');
+				} else {
+					$file = get_exdir(0, 0, 0, 0, $object, 'user').'/'.$object->id.'/'.$object->photo;
+				}
 				$originalfile = get_exdir(0, 0, 0, 0, $object, 'user').'/'.$object->id.'/'.$object->photo;
 			}
-			if (!empty($conf->global->MAIN_OLD_IMAGE_LINKS)) $altfile = $object->id.".jpg"; // For backward compatibility
+			if (!empty($conf->global->MAIN_OLD_IMAGE_LINKS)) {
+				$altfile = $object->id.".jpg";
+			}
+			// For backward compatibility
 			$email = $object->email;
 			$capture = 'user';
 		} elseif ($modulepart == 'memberphoto')
@@ -7462,12 +8345,19 @@ 
 			$dir = $conf->adherent->dir_output;
 			if (!empty($object->photo))
 			{
-				if ((string) $imagesize == 'mini') $file = get_exdir(0, 0, 0, 0, $object, 'member').'photos/'.getImageFileNameForSize($object->photo, '_mini');
-				elseif ((string) $imagesize == 'small') $file = get_exdir(0, 0, 0, 0, $object, 'member').'photos/'.getImageFileNameForSize($object->photo, '_small');
-				else $file = get_exdir(0, 0, 0, 0, $object, 'member').'photos/'.$object->photo;
+				if ((string) $imagesize == 'mini') {
+					$file = get_exdir(0, 0, 0, 0, $object, 'member').'photos/'.getImageFileNameForSize($object->photo, '_mini');
+				} elseif ((string) $imagesize == 'small') {
+					$file = get_exdir(0, 0, 0, 0, $object, 'member').'photos/'.getImageFileNameForSize($object->photo, '_small');
+				} else {
+					$file = get_exdir(0, 0, 0, 0, $object, 'member').'photos/'.$object->photo;
+				}
 				$originalfile = get_exdir(0, 0, 0, 0, $object, 'member').'photos/'.$object->photo;
 			}
-			if (!empty($conf->global->MAIN_OLD_IMAGE_LINKS)) $altfile = $object->id.".jpg"; // For backward compatibility
+			if (!empty($conf->global->MAIN_OLD_IMAGE_LINKS)) {
+				$altfile = $object->id.".jpg";
+			}
+			// For backward compatibility
 			$email = $object->email;
 			$capture = 'user';
 		} else {
@@ -7475,16 +8365,25 @@ 
 			$dir = $conf->$modulepart->dir_output;
 			if (!empty($object->photo))
 			{
-				if ((string) $imagesize == 'mini') $file = get_exdir($id, 2, 0, 0, $object, $modulepart).'photos/'.getImageFileNameForSize($object->photo, '_mini');
-				elseif ((string) $imagesize == 'small') $file = get_exdir($id, 2, 0, 0, $object, $modulepart).'photos/'.getImageFileNameForSize($object->photo, '_small');
-				else $file = get_exdir($id, 2, 0, 0, $object, $modulepart).'photos/'.$object->photo;
+				if ((string) $imagesize == 'mini') {
+					$file = get_exdir($id, 2, 0, 0, $object, $modulepart).'photos/'.getImageFileNameForSize($object->photo, '_mini');
+				} elseif ((string) $imagesize == 'small') {
+					$file = get_exdir($id, 2, 0, 0, $object, $modulepart).'photos/'.getImageFileNameForSize($object->photo, '_small');
+				} else {
+					$file = get_exdir($id, 2, 0, 0, $object, $modulepart).'photos/'.$object->photo;
+				}
 				$originalfile = get_exdir($id, 2, 0, 0, $object, $modulepart).'photos/'.$object->photo;
 			}
-			if (!empty($conf->global->MAIN_OLD_IMAGE_LINKS)) $altfile = $object->id.".jpg"; // For backward compatibility
+			if (!empty($conf->global->MAIN_OLD_IMAGE_LINKS)) {
+				$altfile = $object->id.".jpg";
+			}
+			// For backward compatibility
 			$email = $object->email;
 		}
 
-		if ($forcecapture) $capture = $forcecapture;
+		if ($forcecapture) {
+			$capture = $forcecapture;
+		}
 
 		if ($dir)
 		{
@@ -7493,31 +8392,47 @@ 
 				if ($addlinktofullsize)
 				{
 					$urladvanced = getAdvancedPreviewUrl($modulepart, $originalfile, 0, '&entity='.$entity);
-					if ($urladvanced) $ret .= '<a href="'.$urladvanced.'">';
-					else $ret .= '<a href="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$entity.'&file='.urlencode($originalfile).'&cache='.$cache.'">';
+					if ($urladvanced) {
+						$ret .= '<a href="'.$urladvanced.'">';
+					} else {
+						$ret .= '<a href="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$entity.'&file='.urlencode($originalfile).'&cache='.$cache.'">';
+					}
 				}
 				$ret .= '<img alt="Photo" class="photo'.$modulepart.($cssclass ? ' '.$cssclass : '').' photologo'.(preg_replace('/[^a-z]/i', '_', $file)).'" '.($width ? ' width="'.$width.'"' : '').($height ? ' height="'.$height.'"' : '').' src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$entity.'&file='.urlencode($file).'&cache='.$cache.'">';
-				if ($addlinktofullsize) $ret .= '</a>';
+				if ($addlinktofullsize) {
+					$ret .= '</a>';
+				}
 			} elseif ($altfile && file_exists($dir."/".$altfile))
 			{
 				if ($addlinktofullsize)
 				{
 					$urladvanced = getAdvancedPreviewUrl($modulepart, $originalfile, 0, '&entity='.$entity);
-					if ($urladvanced) $ret .= '<a href="'.$urladvanced.'">';
-					else $ret .= '<a href="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$entity.'&file='.urlencode($originalfile).'&cache='.$cache.'">';
+					if ($urladvanced) {
+						$ret .= '<a href="'.$urladvanced.'">';
+					} else {
+						$ret .= '<a href="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$entity.'&file='.urlencode($originalfile).'&cache='.$cache.'">';
+					}
 				}
 				$ret .= '<img class="photo'.$modulepart.($cssclass ? ' '.$cssclass : '').'" alt="Photo alt" id="photologo'.(preg_replace('/[^a-z]/i', '_', $file)).'" class="'.$cssclass.'" '.($width ? ' width="'.$width.'"' : '').($height ? ' height="'.$height.'"' : '').' src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$entity.'&file='.urlencode($altfile).'&cache='.$cache.'">';
-				if ($addlinktofullsize) $ret .= '</a>';
+				if ($addlinktofullsize) {
+					$ret .= '</a>';
+				}
 			} else {
 				$nophoto = '/public/theme/common/nophoto.png';
-				if (in_array($modulepart, array('userphoto', 'contact', 'memberphoto')))	// For module that are "physical" users
+				if (in_array($modulepart, array('userphoto', 'contact', 'memberphoto'))) {
+					// For module that are "physical" users
 				{
 					if ($modulepart == 'memberphoto' && strpos($object->morphy, 'mor') !== false) {
 						$nophoto = '/public/theme/common/company.png';
+				}
 					} else {
 						$nophoto = '/public/theme/common/user_anonymous.png';
-						if ($object->gender == 'man') $nophoto = '/public/theme/common/user_man.png';
-						if ($object->gender == 'woman') $nophoto = '/public/theme/common/user_woman.png';
+						if ($object->gender == 'man') {
+							$nophoto = '/public/theme/common/user_man.png';
+						}
+						if ($object->gender == 'woman') {
+							$nophoto = '/public/theme/common/user_woman.png';
+						}
 					}
 				}
 
@@ -7538,13 +8453,19 @@ 
 
 			if ($caneditfield)
 			{
-				if ($object->photo) $ret .= "<br>\n";
+				if ($object->photo) {
+					$ret .= "<br>\n";
+				}
 				$ret .= '<table class="nobordernopadding centpercent">';
-				if ($object->photo) $ret .= '<tr><td><input type="checkbox" class="flat photodelete" name="deletephoto" id="photodelete"> '.$langs->trans("Delete").'<br><br></td></tr>';
+				if ($object->photo) {
+					$ret .= '<tr><td><input type="checkbox" class="flat photodelete" name="deletephoto" id="photodelete"> '.$langs->trans("Delete").'<br><br></td></tr>';
+				}
 				$ret .= '<tr><td class="tdoverflow"><input type="file" class="flat maxwidth200onsmartphone" name="photo" id="photoinput" accept="image/*"'.($capture ? ' capture="'.$capture.'"' : '').'></td></tr>';
 				$ret .= '</table>';
 			}
-		} else dol_print_error('', 'Call of showphoto with wrong parameters modulepart='.$modulepart);
+		} else {
+			dol_print_error('', 'Call of showphoto with wrong parameters modulepart='.$modulepart);
+		}
 
 		return $ret;
 	}
@@ -7572,11 +8493,17 @@ 
 		global $conf, $user, $langs;
 
 		// Permettre l'exclusion de groupes
-		if (is_array($exclude))	$excludeGroups = implode("','", $exclude);
+		if (is_array($exclude)) {
+			$excludeGroups = implode("','", $exclude);
+		}
 		// Permettre l'inclusion de groupes
-		if (is_array($include))	$includeGroups = implode("','", $include);
+		if (is_array($include)) {
+			$includeGroups = implode("','", $include);
+		}
 
-		if (!is_array($selected)) $selected = array($selected);
+		if (!is_array($selected)) {
+			$selected = array($selected);
+		}
 
 		$out = '';
 
@@ -7590,13 +8517,20 @@ 
 		if (!empty($conf->multicompany->enabled) && $conf->entity == 1 && $user->admin && !$user->entity)
 		{
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."entity as e ON e.rowid=ug.entity";
-			if ($force_entity) $sql .= " WHERE ug.entity IN (0, ".$force_entity.")";
-			else $sql .= " WHERE ug.entity IS NOT NULL";
+			if ($force_entity) {
+				$sql .= " WHERE ug.entity IN (0, ".$force_entity.")";
+			} else {
+				$sql .= " WHERE ug.entity IS NOT NULL";
+			}
 		} else {
 			$sql .= " WHERE ug.entity IN (0, ".$conf->entity.")";
 		}
-		if (is_array($exclude) && $excludeGroups) $sql .= " AND ug.rowid NOT IN ('".$excludeGroups."')";
-		if (is_array($include) && $includeGroups) $sql .= " AND ug.rowid IN ('".$includeGroups."')";
+		if (is_array($exclude) && $excludeGroups) {
+			$sql .= " AND ug.rowid NOT IN ('".$excludeGroups."')";
+		}
+		if (is_array($include) && $includeGroups) {
+			$sql .= " AND ug.rowid IN ('".$includeGroups."')";
+		}
 		$sql .= " ORDER BY ug.nom ASC";
 
 		dol_syslog(get_class($this)."::select_dolgroups", LOG_DEBUG);
@@ -7613,16 +8547,22 @@ 
 			$i = 0;
 			if ($num)
 			{
-				if ($show_empty && !$multiple) $out .= '<option value="-1"'.(in_array(-1, $selected) ? ' selected' : '').'>&nbsp;</option>'."\n";
+				if ($show_empty && !$multiple) {
+					$out .= '<option value="-1"'.(in_array(-1, $selected) ? ' selected' : '').'>&nbsp;</option>'."\n";
+				}
 
 				while ($i < $num)
 				{
 					$obj = $this->db->fetch_object($resql);
 					$disableline = 0;
-					if (is_array($enableonly) && count($enableonly) && !in_array($obj->rowid, $enableonly)) $disableline = 1;
+					if (is_array($enableonly) && count($enableonly) && !in_array($obj->rowid, $enableonly)) {
+						$disableline = 1;
+					}
 
 					$out .= '<option value="'.$obj->rowid.'"';
-					if ($disableline) $out .= ' disabled';
+					if ($disableline) {
+						$out .= ' disabled';
+					}
 					if ((is_object($selected[0]) && $selected[0]->id == $obj->rowid) || (!is_object($selected[0]) && in_array($obj->rowid, $selected)))
 					{
 						$out .= ' selected';
@@ -7639,7 +8579,9 @@ 
 					$i++;
 				}
 			} else {
-				if ($show_empty) $out .= '<option value="-1"'.(in_array(-1, $selected) ? ' selected' : '').'></option>'."\n";
+				if ($show_empty) {
+					$out .= '<option value="-1"'.(in_array(-1, $selected) ? ' selected' : '').'></option>'."\n";
+				}
 				$out .= '<option value="" disabled>'.$langs->trans("NoUserGroupDefined").'</option>';
 			}
 			$out .= '</select>';
@@ -7680,7 +8622,9 @@ 
 
 		$out = '';
 
-		if (!empty($conf->use_javascript_ajax)) $out .= '<div class="inline-block checkallactions"><input type="checkbox" id="'.$cssclass.'s" name="'.$cssclass.'s" class="checkallactions"></div>';
+		if (!empty($conf->use_javascript_ajax)) {
+			$out .= '<div class="inline-block checkallactions"><input type="checkbox" id="'.$cssclass.'s" name="'.$cssclass.'s" class="checkallactions"></div>';
+		}
 		$out .= '<script>
             $(document).ready(function() {
                 $("#' . $cssclass.'s").click(function() {
@@ -7693,7 +8637,9 @@ 
                         console.log("We uncheck all");
                 		$(".'.$cssclass.'").prop(\'checked\', false).trigger(\'change\');
                     }'."\n";
-				if ($calljsfunction) $out .= 'if (typeof initCheckForSelect == \'function\') { initCheckForSelect(0, "'.$massactionname.'", "'.$cssclass.'"); } else { console.log("No function initCheckForSelect found. Call won\'t be done."); }';
+				if ($calljsfunction) {
+					$out .= 'if (typeof initCheckForSelect == \'function\') { initCheckForSelect(0, "'.$massactionname.'", "'.$cssclass.'"); } else { console.log("No function initCheckForSelect found. Call won\'t be done."); }';
+				}
 		$out .= '         });
         	        $(".' . $cssclass.'").change(function() {
 					$(this).closest("tr").toggleClass("highlight", this.checked);
@@ -7743,14 +8689,18 @@ 
 		$out = '';
 		$sql = 'SELECT rowid, label FROM '.MAIN_DB_PREFIX.'c_exp_tax_cat WHERE active = 1';
 		$sql .= ' AND entity IN (0,'.getEntity('exp_tax_cat').')';
-		if (!empty($excludeid)) $sql .= ' AND rowid NOT IN ('.implode(',', $excludeid).')';
+		if (!empty($excludeid)) {
+			$sql .= ' AND rowid NOT IN ('.implode(',', $excludeid).')';
+		}
 		$sql .= ' ORDER BY label';
 
 		$resql = $db->query($sql);
 		if ($resql)
 		{
 			$out = '<select id="select_'.$htmlname.'" name="'.$htmlname.'" class="'.$htmlname.' flat minwidth75imp maxwidth200">';
-			if ($useempty) $out .= '<option value="0">&nbsp;</option>';
+			if ($useempty) {
+				$out .= '<option value="0">&nbsp;</option>';
+			}
 
 			while ($obj = $db->fetch_object($resql))
 			{
@@ -7759,7 +8709,9 @@ 
 			$out .= '</select>';
 			$out .= ajax_combobox('select_'.$htmlname);
 
-			if (!empty($htmlname) && $user->admin && $info_admin) $out .= ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+			if (!empty($htmlname) && $user->admin && $info_admin) {
+				$out .= ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+			}
 
 			if (!empty($target))
 			{
@@ -7775,7 +8727,9 @@ 
 								$("select[name='.$target.']").on("change", function() {
 									var current_val = $(this).val();
 									if (current_val == '.$obj->id.') {';
-						if (!empty($default_selected) || !empty($selected)) $out .= '$("select[name='.$htmlname.']").val("'.($default_selected > 0 ? $default_selected : $selected).'");';
+						if (!empty($default_selected) || !empty($selected)) {
+							$out .= '$("select[name='.$htmlname.']").val("'.($default_selected > 0 ? $default_selected : $selected).'");';
+						}
 
 						$out .= '
 										$("select[name='.$htmlname.']").change();
@@ -7838,7 +8792,9 @@ 
 		if ($resql)
 		{
 			$out = '<select id="select_'.$htmlname.'" name="'.$htmlname.'" class="'.$htmlname.' flat minwidth75imp">';
-			if ($useempty) $out .= '<option value="0"></option>';
+			if ($useempty) {
+				$out .= '<option value="0"></option>';
+			}
 
 			while ($obj = $db->fetch_object($resql))
 			{
@@ -7874,11 +8830,17 @@ 
 		if ($resql)
 		{
 			$out = '<select id="select_'.$htmlname.'" name="'.$htmlname.'" class="'.$htmlname.' flat minwidth75imp">';
-			if ($useempty) $out .= '<option value="0"></option>';
-			if ($allchoice) $out .= '<option value="-1">'.$langs->trans('AllExpenseReport').'</option>';
+			if ($useempty) {
+				$out .= '<option value="0"></option>';
+			}
+			if ($allchoice) {
+				$out .= '<option value="-1">'.$langs->trans('AllExpenseReport').'</option>';
+			}
 
 			$field = 'code';
-			if ($useid) $field = 'id';
+			if ($useid) {
+				$field = 'id';
+			}
 
 			while ($obj = $db->fetch_object($resql))
 			{
@@ -7925,7 +8887,9 @@ 
 		$out = '';
 
 		$hideunselectables = false;
-		if (!empty($conf->global->PROJECT_HIDE_UNSELECTABLES)) $hideunselectables = true;
+		if (!empty($conf->global->PROJECT_HIDE_UNSELECTABLES)) {
+			$hideunselectables = true;
+		}
 
 		if (empty($projectsListId))
 		{
@@ -7967,8 +8931,11 @@ 
 			}
 			if (!empty($show_empty)) {
 				$out .= '<option value="0" class="optiongrey">';
-				if (!is_numeric($show_empty)) $out .= $show_empty;
-				else $out .= '&nbsp;';
+				if (!is_numeric($show_empty)) {
+					$out .= $show_empty;
+				} else {
+					$out .= '&nbsp;';
+				}
 				$out .= '</option>';
 			}
 			$num = $this->db->num_rows($resql);
@@ -7994,7 +8961,10 @@ 
 						if ($showproject == 'all')
 						{
 							$labeltoshow .= dol_trunc($obj->ref, 18); // Invoice ref
-							if ($obj->name) $labeltoshow .= ' - '.$obj->name; // Soc name
+							if ($obj->name) {
+								$labeltoshow .= ' - '.$obj->name;
+							}
+							// Soc name
 
 							$disabled = 0;
 							if ($obj->fk_statut == Project::STATUS_DRAFT)
@@ -8003,7 +8973,9 @@ 
 								$labeltoshow .= ' - '.$langs->trans("Draft");
 							} elseif ($obj->fk_statut == Project::STATUS_CLOSED)
 							{
-								if ($discard_closed == 2) $disabled = 1;
+								if ($discard_closed == 2) {
+									$disabled = 1;
+								}
 								$labeltoshow .= ' - '.$langs->trans("Closed");
 							} elseif ($socid > 0 && (!empty($obj->fk_soc) && $obj->fk_soc != $socid))
 							{
@@ -8023,7 +8995,9 @@ 
 								$resultat = '';
 							} else {
 								$resultat = '<option value="'.$obj->rowid.'"';
-								if ($disabled) $resultat .= ' disabled';
+								if ($disabled) {
+									$resultat .= ' disabled';
+								}
 								//if ($obj->public) $labeltoshow.=' ('.$langs->trans("Public").')';
 								//else $labeltoshow.=' ('.$langs->trans("Private").')';
 								$resultat .= '>';
@@ -8080,8 +9054,12 @@ 
 		// For compatibility with forms that show themself the search criteria in addition of this component, we output the fields
 		foreach ($arrayofcriterias as $criterias) {
 			foreach ($criterias as $criteriafamilykey => $criteriafamilyval) {
-				if (in_array('search_'.$criteriafamilykey, $arrayofinputfieldsalreadyoutput)) continue;
-				if (in_array($criteriafamilykey, array('rowid', 'ref_ext', 'entity', 'extraparams'))) continue;
+				if (in_array('search_'.$criteriafamilykey, $arrayofinputfieldsalreadyoutput)) {
+					continue;
+				}
+				if (in_array($criteriafamilykey, array('rowid', 'ref_ext', 'entity', 'extraparams'))) {
+					continue;
+				}
 				if (in_array($criteriafamilyval['type'], array('date', 'datetime', 'timestamp'))) {
 					$ret .= '<input type="hidden" name="search_'.$criteriafamilykey.'_start">';
 					$ret .= '<input type="hidden" name="search_'.$criteriafamilykey.'_startyear">';
@@ -8122,7 +9100,9 @@ 
 		$formmail = new FormMail($db);
 		$result = $formmail->fetchAllEMailTemplate($modelType, $user, $langs);
 
-		if ($default) $TModels[0] = $langs->trans('DefaultMailModel');
+		if ($default) {
+			$TModels[0] = $langs->trans('DefaultMailModel');
+		}
 		if ($result > 0) {
 			foreach ($formmail->lines_model as $model) {
 				$TModels[$model->id] = $model->label;

htdocs/core/lib/intracommreport.lib.php

Indentation +30 added lines, -30 removed lines

@@ -29,26 +29,26 @@ 
  */
 function intracommReportAdminPrepareHead()
 {
-    global $langs, $conf;
+	global $langs, $conf;
 
-    $langs->load("intracommreport");
+	$langs->load("intracommreport");
 
-    $h = 0;
-    $head = array();
+	$h = 0;
+	$head = array();
 
-    $head[$h][0] = DOL_URL_ROOT.'/intracommreport/admin/intracommreport.php';
-    $head[$h][1] = $langs->trans("Parameters");
-    $head[$h][2] = 'general';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT.'/intracommreport/admin/intracommreport.php';
+	$head[$h][1] = $langs->trans("Parameters");
+	$head[$h][2] = 'general';
+	$h++;
 
-    // Show more tabs from modules
-    // Entries must be declared in modules descriptor with line
-    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab
-    // $this->tabs = array('entity:-tabname); to remove a tab
-    complete_head_from_modules($conf, $langs, null, $head, $h, 'intracommreport_admin');
+	// Show more tabs from modules
+	// Entries must be declared in modules descriptor with line
+	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab
+	// $this->tabs = array('entity:-tabname); to remove a tab
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'intracommreport_admin');
 
-    complete_head_from_modules($conf, $langs, null, $head, $h, 'intracommreport_admin', 'remove');
-    return $head;
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'intracommreport_admin', 'remove');
+	return $head;
 }
 
 /**
@@ -58,24 +58,24 @@ 
  */
 function intracommReportPrepareHead()
 {
-    global $langs, $conf;
+	global $langs, $conf;
 
-    $langs->load("intracommreport");
+	$langs->load("intracommreport");
 
-    $h = 0;
-    $head = array();
+	$h = 0;
+	$head = array();
 
-    $head[$h][0] = DOL_URL_ROOT.'/intracommreport/card.php?rowid='.$object->id;
-    $head[$h][1] = $langs->trans("Card");
-    $head[$h][2] = 'card';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT.'/intracommreport/card.php?rowid='.$object->id;
+	$head[$h][1] = $langs->trans("Card");
+	$head[$h][2] = 'card';
+	$h++;
 
-    // Show more tabs from modules
-    // Entries must be declared in modules descriptor with line
-    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab
-    // $this->tabs = array('entity:-tabname); to remove a tab
-    complete_head_from_modules($conf, $langs, null, $head, $h, 'intracommreport');
+	// Show more tabs from modules
+	// Entries must be declared in modules descriptor with line
+	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab
+	// $this->tabs = array('entity:-tabname); to remove a tab
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'intracommreport');
 
-    complete_head_from_modules($conf, $langs, null, $head, $h, 'intracommreport', 'remove');
-    return $head;
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'intracommreport', 'remove');
+	return $head;
 }

htdocs/comm/card.php

Indentation +20 added lines, -20 removed lines

@@ -487,26 +487,26 @@
 		print '</tr>';
 	}
 
-    if (! empty($conf->intracommreport->enabled))
-    {
-        // Transport mode by default
-        print '<tr><td class="nowrap">';
-        print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
-        print $langs->trans('IntracommReportTransportMode');
-        print '<td>';
-        if (($action != 'edittransportmode') && $user->rights->societe->creer) print '<td class="right"><a href="'.$_SERVER["PHP_SELF"].'?action=edittransportmode&amp;socid='.$object->id.'">'.img_edit($langs->trans('SetMode'), 1).'</a></td>';
-        print '</tr></table>';
-        print '</td><td>';
-        if ($action == 'edittransportmode')
-        {
-            $form->formSelectTransportMode($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->fk_transport_mode, 'fk_transport_mode', 1);
-        }
-        else {
-            $form->formSelectTransportMode($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->fk_transport_mode, 'none');
-        }
-        print "</td>";
-        print '</tr>';
-    }
+	if (! empty($conf->intracommreport->enabled))
+	{
+		// Transport mode by default
+		print '<tr><td class="nowrap">';
+		print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
+		print $langs->trans('IntracommReportTransportMode');
+		print '<td>';
+		if (($action != 'edittransportmode') && $user->rights->societe->creer) print '<td class="right"><a href="'.$_SERVER["PHP_SELF"].'?action=edittransportmode&amp;socid='.$object->id.'">'.img_edit($langs->trans('SetMode'), 1).'</a></td>';
+		print '</tr></table>';
+		print '</td><td>';
+		if ($action == 'edittransportmode')
+		{
+			$form->formSelectTransportMode($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->fk_transport_mode, 'fk_transport_mode', 1);
+		}
+		else {
+			$form->formSelectTransportMode($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->fk_transport_mode, 'none');
+		}
+		print "</td>";
+		print '</tr>';
+	}
 
 	// Categories
 	if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire)) {

Spacing +2 added lines, -2 removed lines

@@ -487,7 +487,7 @@ 
 		print '</tr>';
 	}
 
-    if (! empty($conf->intracommreport->enabled))
+    if (!empty($conf->intracommreport->enabled))
     {
         // Transport mode by default
         print '<tr><td class="nowrap">';
@@ -954,7 +954,7 @@ 
 				$late = '';
 				foreach ($contrat->lines as $line) {
 					if ($contrat->statut == Contrat::STATUS_VALIDATED && $line->statut == ContratLigne::STATUS_OPEN) {
-						if (((!empty($line->date_fin_validite)?$line->date_fin_validite:0) + $conf->contrat->services->expires->warning_delay) < $now) $late = img_warning($langs->trans("Late"));
+						if (((!empty($line->date_fin_validite) ? $line->date_fin_validite : 0) + $conf->contrat->services->expires->warning_delay) < $now) $late = img_warning($langs->trans("Late"));
 					}
 				}
 

Braces +180 added lines, -63 removed lines

@@ -38,29 +38,61 @@ 
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
-if (!empty($conf->facture->enabled)) require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-if (!empty($conf->facture->enabled)) require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture-rec.class.php';
-if (!empty($conf->propal->enabled)) require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
-if (!empty($conf->commande->enabled)) require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
-if (!empty($conf->expedition->enabled)) require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
-if (!empty($conf->contrat->enabled)) require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
-if (!empty($conf->adherent->enabled)) require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
-if (!empty($conf->ficheinter->enabled)) require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
+if (!empty($conf->facture->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+}
+if (!empty($conf->facture->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture-rec.class.php';
+}
+if (!empty($conf->propal->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
+}
+if (!empty($conf->commande->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
+}
+if (!empty($conf->expedition->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
+}
+if (!empty($conf->contrat->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
+}
+if (!empty($conf->adherent->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
+}
+if (!empty($conf->ficheinter->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
+}
 
 // Load translation files required by the page
 $langs->loadLangs(array('companies', 'banks'));
 
-if (!empty($conf->contrat->enabled))  $langs->load("contracts");
-if (!empty($conf->commande->enabled)) $langs->load("orders");
-if (!empty($conf->expedition->enabled)) $langs->load("sendings");
-if (!empty($conf->facture->enabled)) $langs->load("bills");
-if (!empty($conf->projet->enabled))  $langs->load("projects");
-if (!empty($conf->ficheinter->enabled)) $langs->load("interventions");
-if (!empty($conf->notification->enabled)) $langs->load("mails");
+if (!empty($conf->contrat->enabled)) {
+	$langs->load("contracts");
+}
+if (!empty($conf->commande->enabled)) {
+	$langs->load("orders");
+}
+if (!empty($conf->expedition->enabled)) {
+	$langs->load("sendings");
+}
+if (!empty($conf->facture->enabled)) {
+	$langs->load("bills");
+}
+if (!empty($conf->projet->enabled)) {
+	$langs->load("projects");
+}
+if (!empty($conf->ficheinter->enabled)) {
+	$langs->load("interventions");
+}
+if (!empty($conf->notification->enabled)) {
+	$langs->load("mails");
+}
 
 // Security check
 $id = (GETPOST('socid', 'int') ? GETPOST('socid', 'int') : GETPOST('id', 'int'));
-if ($user->socid > 0) $id = $user->socid;
+if ($user->socid > 0) {
+	$id = $user->socid;
+}
 $result = restrictedArea($user, 'societe', $id, '&societe');
 
 $action = GETPOST('action', 'aZ09');
@@ -73,8 +105,12 @@ 
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortorder) $sortorder = "ASC";
-if (!$sortfield) $sortfield = "nom";
+if (!$sortorder) {
+	$sortorder = "ASC";
+}
+if (!$sortfield) {
+	$sortfield = "nom";
+}
 $cancelbutton = GETPOST('cancel', 'alpha');
 
 $object = new Client($db);
@@ -95,7 +131,9 @@ 
 
 $parameters = array('id' => $id, 'socid' => $id);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 
 if (empty($reshook))
 {
@@ -110,7 +148,9 @@ 
 		$result = $object->fetch($id);
 		$object->code_compta = $_POST["customeraccountancycode"];
 		$result = $object->update($object->id, $user, 1, 1, 0);
-		if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
+		if ($result < 0) {
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
 	}
 
 	// terms of the settlement
@@ -118,7 +158,9 @@ 
 	{
 		$object->fetch($id);
 		$result = $object->setPaymentTerms(GETPOST('cond_reglement_id', 'int'));
-		if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
+		if ($result < 0) {
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
 	}
 
 	// mode de reglement
@@ -126,7 +168,9 @@ 
 	{
 		$object->fetch($id);
 		$result = $object->setPaymentMethods(GETPOST('mode_reglement_id', 'int'));
-		if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
+		if ($result < 0) {
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
 	}
 
 	// Bank account
@@ -134,7 +178,9 @@ 
 	{
 		$object->fetch($id);
 		$result = $object->setBankAccount(GETPOST('fk_account', 'int'));
-		if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
+		if ($result < 0) {
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
 	}
 
 	// customer preferred shipping method
@@ -142,7 +188,9 @@ 
 	{
 		$object->fetch($id);
 		$result = $object->setShippingMethod(GETPOST('shipping_method_id', 'int'));
-		if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
+		if ($result < 0) {
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
 	}
 
 	// assujetissement a la TVA
@@ -151,7 +199,9 @@ 
 		$object->fetch($id);
 		$object->tva_assuj = $_POST['assujtva_value'];
 		$result = $object->update($object->id);
-		if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
+		if ($result < 0) {
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
 	}
 
 	// set prospect level
@@ -160,7 +210,9 @@ 
 		$object->fetch($id);
 		$object->fk_prospectlevel = GETPOST('prospect_level_id', 'alpha');
 		$result = $object->update($object->id, $user);
-		if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
+		if ($result < 0) {
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
 	}
 
 	// set communication status
@@ -169,7 +221,9 @@ 
 		$object->fetch($id);
 		$object->stcomm_id = dol_getIdFromCode($db, GETPOST('stcomm', 'alpha'), 'c_stcomm');
 		$result = $object->update($object->id, $user);
-		if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
+		if ($result < 0) {
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
 	}
 
 	// update outstandng limit
@@ -178,7 +232,9 @@ 
 		$object->fetch($id);
 		$object->outstanding_limit = GETPOST('outstanding_limit');
 		$result = $object->update($object->id, $user);
-		if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
+		if ($result < 0) {
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
 	}
 
 	// update order min amount
@@ -187,7 +243,9 @@ 
 		$object->fetch($id);
 		$object->order_min_amount = price2num(GETPOST('order_min_amount', 'alpha'));
 		$result = $object->update($object->id, $user);
-		if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
+		if ($result < 0) {
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
 	}
 
 	// Set sales representatives
@@ -204,7 +262,9 @@ 
 
 		// Fill array 'array_options' with data from update form
 		$ret = $extrafields->setOptionalsFromPost(null, $object, GETPOST('attribute', 'restricthtml'));
-		if ($ret < 0) $error++;
+		if ($ret < 0) {
+			$error++;
+		}
 		if (!$error)
 		{
 			$result = $object->insertExtraFields('COMPANY_MODIFY');
@@ -214,7 +274,9 @@ 
 				$error++;
 			}
 		}
-		if ($error) $action = 'edit_extras';
+		if ($error) {
+			$action = 'edit_extras';
+		}
 	}
 }
 
@@ -232,11 +294,15 @@ 
 {
 	// Load data of third party
 	$res = $object->fetch($id);
-	if ($object->id < 0) dol_print_error($db, $object->error, $object->errors);
-}
+	if ($object->id < 0) {
+		dol_print_error($db, $object->error, $object->errors);
+	}
+	}
 
 $title = $langs->trans("CustomerCard");
-if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) $title = $object->name;
+if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
+	$title = $object->name;
+}
 $help_url = 'EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
 llxHeader('', $title, $help_url);
 
@@ -262,9 +328,11 @@ 
 	print '</td></tr>';
 
 	// Prefix
-	if (!empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
+	if (!empty($conf->global->SOCIETE_USEPREFIX)) {
+		// Old not used prefix field
 	{
 		print '<tr><td>'.$langs->trans("Prefix").'</td><td>';
+	}
 		print ($object->prefix_comm ? $object->prefix_comm : '&nbsp;');
 		print '</td></tr>';
 	}
@@ -276,7 +344,9 @@ 
 		print '<tr><td>';
 		print $langs->trans('CustomerCode').'</td><td>';
 		print $object->code_client;
-		if ($object->check_codeclient() <> 0) print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
+		if ($object->check_codeclient() <> 0) {
+			print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
+		}
 		print '</td></tr>';
 
 		print '<tr>';
@@ -332,7 +402,9 @@ 
 	print '<table width="100%" class="nobordernopadding"><tr><td>';
 	print $langs->trans('PaymentConditions');
 	print '<td>';
-	if (($action != 'editconditions') && $user->rights->societe->creer) print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editconditions&amp;socid='.$object->id.'">'.img_edit($langs->trans('SetConditions'), 1).'</a></td>';
+	if (($action != 'editconditions') && $user->rights->societe->creer) {
+		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editconditions&amp;socid='.$object->id.'">'.img_edit($langs->trans('SetConditions'), 1).'</a></td>';
+	}
 	print '</tr></table>';
 	print '</td><td>';
 	if ($action == 'editconditions')
@@ -349,7 +421,9 @@ 
 	print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
 	print $langs->trans('PaymentMode');
 	print '<td>';
-	if (($action != 'editmode') && $user->rights->societe->creer) print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editmode&amp;socid='.$object->id.'">'.img_edit($langs->trans('SetMode'), 1).'</a></td>';
+	if (($action != 'editmode') && $user->rights->societe->creer) {
+		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editmode&amp;socid='.$object->id.'">'.img_edit($langs->trans('SetMode'), 1).'</a></td>';
+	}
 	print '</tr></table>';
 	print '</td><td>';
 	if ($action == 'editmode')
@@ -368,7 +442,9 @@ 
 		print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
 		print $langs->trans('PaymentBankAccount');
 		print '<td>';
-		if (($action != 'editbankaccount') && $user->rights->societe->creer) print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editbankaccount&amp;socid='.$object->id.'">'.img_edit($langs->trans('SetBankAccount'), 1).'</a></td>';
+		if (($action != 'editbankaccount') && $user->rights->societe->creer) {
+			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editbankaccount&amp;socid='.$object->id.'">'.img_edit($langs->trans('SetBankAccount'), 1).'</a></td>';
+		}
 		print '</tr></table>';
 		print '</td><td>';
 		if ($action == 'editbankaccount')
@@ -412,8 +488,12 @@ 
 		print '</td>';
 		print '<td>';
 		$amount_discount = $object->getAvailableDiscounts();
-		if ($amount_discount < 0) dol_print_error($db, $object->error);
-		if ($amount_discount > 0) print '<a href="'.DOL_URL_ROOT.'/comm/remx.php?id='.$object->id.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?socid='.$object->id).'">'.price($amount_discount, 1, $langs, 1, -1, -1, $conf->currency).'</a>';
+		if ($amount_discount < 0) {
+			dol_print_error($db, $object->error);
+		}
+		if ($amount_discount > 0) {
+			print '<a href="'.DOL_URL_ROOT.'/comm/remx.php?id='.$object->id.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?socid='.$object->id).'">'.price($amount_discount, 1, $langs, 1, -1, -1, $conf->currency).'</a>';
+		}
 		//else print $langs->trans("DiscountNone");
 		print '</td>';
 		print '</tr>';
@@ -463,7 +543,9 @@ 
 		print '</td><td>';
 		print $object->price_level;
 		$keyforlabel = 'PRODUIT_MULTIPRICES_LABEL'.$object->price_level;
-		if (!empty($conf->global->$keyforlabel)) print ' - '.$langs->trans($conf->global->$keyforlabel);
+		if (!empty($conf->global->$keyforlabel)) {
+			print ' - '.$langs->trans($conf->global->$keyforlabel);
+		}
 		print "</td>";
 		print '</tr>';
 	}
@@ -474,7 +556,9 @@ 
 		print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
 		print $langs->trans('SendingMethod');
 		print '<td>';
-		if (($action != 'editshipping') && $user->rights->societe->creer) print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editshipping&amp;socid='.$object->id.'">'.img_edit($langs->trans('SetMode'), 1).'</a></td>';
+		if (($action != 'editshipping') && $user->rights->societe->creer) {
+			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editshipping&amp;socid='.$object->id.'">'.img_edit($langs->trans('SetMode'), 1).'</a></td>';
+		}
 		print '</tr></table>';
 		print '</td><td>';
 		if ($action == 'editshipping')
@@ -494,14 +578,15 @@ 
         print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
         print $langs->trans('IntracommReportTransportMode');
         print '<td>';
-        if (($action != 'edittransportmode') && $user->rights->societe->creer) print '<td class="right"><a href="'.$_SERVER["PHP_SELF"].'?action=edittransportmode&amp;socid='.$object->id.'">'.img_edit($langs->trans('SetMode'), 1).'</a></td>';
+        if (($action != 'edittransportmode') && $user->rights->societe->creer) {
+        	print '<td class="right"><a href="'.$_SERVER["PHP_SELF"].'?action=edittransportmode&amp;socid='.$object->id.'">'.img_edit($langs->trans('SetMode'), 1).'</a></td>';
+        }
         print '</tr></table>';
         print '</td><td>';
         if ($action == 'edittransportmode')
         {
             $form->formSelectTransportMode($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->fk_transport_mode, 'fk_transport_mode', 1);
-        }
-        else {
+        } else {
             $form->formSelectTransportMode($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->fk_transport_mode, 'none');
         }
         print "</td>";
@@ -560,7 +645,9 @@ 
 		print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
 		print $langs->trans('ProspectLevel');
 		print '<td>';
-		if ($action != 'editlevel' && $user->rights->societe->creer) print '<td class="right"><a class="editfielda reposition" href="'.$_SERVER["PHP_SELF"].'?action=editlevel&amp;socid='.$object->id.'">'.img_edit($langs->trans('Modify'), 1).'</a></td>';
+		if ($action != 'editlevel' && $user->rights->societe->creer) {
+			print '<td class="right"><a class="editfielda reposition" href="'.$_SERVER["PHP_SELF"].'?action=editlevel&amp;socid='.$object->id.'">'.img_edit($langs->trans('Modify'), 1).'</a></td>';
+		}
 		print '</tr></table>';
 		print '</td><td>';
 		if ($action == 'editlevel')
@@ -580,8 +667,12 @@ 
 		foreach ($object->cacheprospectstatus as $key => $val)
 		{
 			$titlealt = 'default';
-			if (!empty($val['code']) && !in_array($val['code'], array('ST_NO', 'ST_NEVER', 'ST_TODO', 'ST_PEND', 'ST_DONE'))) $titlealt = $val['label'];
-			if ($object->stcomm_id != $val['id']) print '<a class="pictosubstatus reposition" href="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'&stcomm='.$val['code'].'&action=setstcomm&token='.newToken().'">'.img_action($titlealt, $val['code'], $val['picto']).'</a>';
+			if (!empty($val['code']) && !in_array($val['code'], array('ST_NO', 'ST_NEVER', 'ST_TODO', 'ST_PEND', 'ST_DONE'))) {
+				$titlealt = $val['label'];
+			}
+			if ($object->stcomm_id != $val['id']) {
+				print '<a class="pictosubstatus reposition" href="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'&stcomm='.$val['code'].'&action=setstcomm&token='.newToken().'">'.img_action($titlealt, $val['code'], $val['picto']).'</a>';
+			}
 		}
 		print '</div></td></tr>';
 		print "</table>";
@@ -610,12 +701,16 @@ 
 		$text = $langs->trans("OverAllProposals");
 		$link = DOL_URL_ROOT.'/comm/propal/list.php?socid='.$object->id;
 		$icon = 'bill';
-		if ($link) $boxstat .= '<a href="'.$link.'" class="boxstatsindicator thumbstat nobold nounderline">';
+		if ($link) {
+			$boxstat .= '<a href="'.$link.'" class="boxstatsindicator thumbstat nobold nounderline">';
+		}
 		$boxstat .= '<div class="boxstats" title="'.dol_escape_htmltag($text).'">';
 		$boxstat .= '<span class="boxstatstext">'.img_object("", $icon).' <span>'.$text.'</span></span><br>';
 		$boxstat .= '<span class="boxstatsindicator">'.price($outstandingTotal, 1, $langs, 1, -1, -1, $conf->currency).'</span>';
 		$boxstat .= '</div>';
-		if ($link) $boxstat .= '</a>';
+		if ($link) {
+			$boxstat .= '</a>';
+		}
 	}
 
 	if (!empty($conf->commande->enabled) && $user->rights->commande->lire)
@@ -628,12 +723,16 @@ 
 		$text = $langs->trans("OverAllOrders");
 		$link = DOL_URL_ROOT.'/commande/list.php?socid='.$object->id;
 		$icon = 'bill';
-		if ($link) $boxstat .= '<a href="'.$link.'" class="boxstatsindicator thumbstat nobold nounderline">';
+		if ($link) {
+			$boxstat .= '<a href="'.$link.'" class="boxstatsindicator thumbstat nobold nounderline">';
+		}
 		$boxstat .= '<div class="boxstats" title="'.dol_escape_htmltag($text).'">';
 		$boxstat .= '<span class="boxstatstext">'.img_object("", $icon).' <span>'.$text.'</span></span><br>';
 		$boxstat .= '<span class="boxstatsindicator">'.price($outstandingTotal, 1, $langs, 1, -1, -1, $conf->currency).'</span>';
 		$boxstat .= '</div>';
-		if ($link) $boxstat .= '</a>';
+		if ($link) {
+			$boxstat .= '</a>';
+		}
 	}
 
 	if (!empty($conf->facture->enabled) && $user->rights->facture->lire)
@@ -646,12 +745,16 @@ 
 		$text = $langs->trans("OverAllInvoices");
 		$link = DOL_URL_ROOT.'/compta/facture/list.php?socid='.$object->id;
 		$icon = 'bill';
-		if ($link) $boxstat .= '<a href="'.$link.'" class="boxstatsindicator thumbstat nobold nounderline">';
+		if ($link) {
+			$boxstat .= '<a href="'.$link.'" class="boxstatsindicator thumbstat nobold nounderline">';
+		}
 		$boxstat .= '<div class="boxstats" title="'.dol_escape_htmltag($text).'">';
 		$boxstat .= '<span class="boxstatstext">'.img_object("", $icon).' <span>'.$text.'</span></span><br>';
 		$boxstat .= '<span class="boxstatsindicator">'.price($outstandingTotal, 1, $langs, 1, -1, -1, $conf->currency).'</span>';
 		$boxstat .= '</div>';
-		if ($link) $boxstat .= '</a>';
+		if ($link) {
+			$boxstat .= '</a>';
+		}
 
 		// Box outstanding bill
 		$warn = '';
@@ -662,12 +765,16 @@ 
 		$text = $langs->trans("CurrentOutstandingBill");
 		$link = DOL_URL_ROOT.'/compta/recap-compta.php?socid='.$object->id;
 		$icon = 'bill';
-		if ($link) $boxstat .= '<a href="'.$link.'" class="boxstatsindicator thumbstat nobold nounderline">';
+		if ($link) {
+			$boxstat .= '<a href="'.$link.'" class="boxstatsindicator thumbstat nobold nounderline">';
+		}
 		$boxstat .= '<div class="boxstats" title="'.dol_escape_htmltag($text).'">';
 		$boxstat .= '<span class="boxstatstext">'.img_object("", $icon).' <span>'.$text.'</span></span><br>';
 		$boxstat .= '<span class="boxstatsindicator'.($outstandingOpened > 0 ? ' amountremaintopay' : '').'">'.price($outstandingOpened, 1, $langs, 1, -1, -1, $conf->currency).$warn.'</span>';
 		$boxstat .= '</div>';
-		if ($link) $boxstat .= '</a>';
+		if ($link) {
+			$boxstat .= '</a>';
+		}
 	}
 
 	$parameters = array();
@@ -954,7 +1061,9 @@ 
 				$late = '';
 				foreach ($contrat->lines as $line) {
 					if ($contrat->statut == Contrat::STATUS_VALIDATED && $line->statut == ContratLigne::STATUS_OPEN) {
-						if (((!empty($line->date_fin_validite)?$line->date_fin_validite:0) + $conf->contrat->services->expires->warning_delay) < $now) $late = img_warning($langs->trans("Late"));
+						if (((!empty($line->date_fin_validite)?$line->date_fin_validite:0) + $conf->contrat->services->expires->warning_delay) < $now) {
+							$late = img_warning($langs->trans("Late"));
+						}
 					}
 				}
 
@@ -1300,13 +1409,21 @@ 
 					if (!empty($conf->commande->enabled))
 					{
 						if ($object->client != 0 && $object->client != 2) {
-							if (!empty($orders2invoice) && $orders2invoice > 0) print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/commande/list.php?socid='.$object->id.'&search_billed=0&autoselectall=1">'.$langs->trans("CreateInvoiceForThisCustomer").'</a></div>';
-							else print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" title="'.dol_escape_js($langs->trans("NoOrdersToInvoice")).'" href="#">'.$langs->trans("CreateInvoiceForThisCustomer").'</a></div>';
-						} else print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" title="'.dol_escape_js($langs->trans("ThirdPartyMustBeEditAsCustomer")).'" href="#">'.$langs->trans("AddBill").'</a></div>';
+							if (!empty($orders2invoice) && $orders2invoice > 0) {
+								print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/commande/list.php?socid='.$object->id.'&search_billed=0&autoselectall=1">'.$langs->trans("CreateInvoiceForThisCustomer").'</a></div>';
+							} else {
+								print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" title="'.dol_escape_js($langs->trans("NoOrdersToInvoice")).'" href="#">'.$langs->trans("CreateInvoiceForThisCustomer").'</a></div>';
+							}
+						} else {
+							print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" title="'.dol_escape_js($langs->trans("ThirdPartyMustBeEditAsCustomer")).'" href="#">'.$langs->trans("AddBill").'</a></div>';
+						}
 					}
 
-					if ($object->client != 0 && $object->client != 2) print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture/card.php?action=create&socid='.$object->id.'">'.$langs->trans("AddBill").'</a></div>';
-					else print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" title="'.dol_escape_js($langs->trans("ThirdPartyMustBeEditAsCustomer")).'" href="#">'.$langs->trans("AddBill").'</a></div>';
+					if ($object->client != 0 && $object->client != 2) {
+						print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture/card.php?action=create&socid='.$object->id.'">'.$langs->trans("AddBill").'</a></div>';
+					} else {
+						print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" title="'.dol_escape_js($langs->trans("ThirdPartyMustBeEditAsCustomer")).'" href="#">'.$langs->trans("AddBill").'</a></div>';
+					}
 				}
 			}
 		}

htdocs/admin/modules.php

Braces +226 added lines, -77 removed lines

@@ -39,7 +39,9 @@ 
 $langs->loadLangs(array("errors", "admin", "modulebuilder"));
 
 $mode = GETPOSTISSET('mode') ? GETPOST('mode', 'alpha') : (empty($conf->global->MAIN_MODULE_SETUP_ON_LIST_BY_DEFAULT) ? 'commonkanban' : 'common');
-if (empty($mode)) $mode = 'common';
+if (empty($mode)) {
+	$mode = 'common';
+}
 $action = GETPOST('action', 'aZ09');
 //var_dump($_POST);exit;
 $value = GETPOST('value', 'alpha');
@@ -60,8 +62,9 @@ 
 $dolistore            = new Dolistore(false);
 
 
-if (!$user->admin)
+if (!$user->admin) {
 	accessforbidden();
+}
 
 $familyinfo = array(
 	'hr'=>array('position'=>'001', 'label'=>$langs->trans("ModuleFamilyHr")),
@@ -81,11 +84,19 @@ 
 $param = '';
 if (!GETPOST('buttonreset', 'alpha'))
 {
-	if ($search_keyword) $param .= '&search_keyword='.urlencode($search_keyword);
-	if ($search_status && $search_status != '-1')  $param .= '&search_status='.urlencode($search_status);
-	if ($search_nature && $search_nature != '-1')  $param .= '&search_nature='.urlencode($search_nature);
-	if ($search_version && $search_version != '-1') $param .= '&search_version='.urlencode($search_version);
-}
+	if ($search_keyword) {
+		$param .= '&search_keyword='.urlencode($search_keyword);
+	}
+	if ($search_status && $search_status != '-1') {
+		$param .= '&search_status='.urlencode($search_status);
+	}
+	if ($search_nature && $search_nature != '-1') {
+		$param .= '&search_nature='.urlencode($search_nature);
+	}
+	if ($search_version && $search_version != '-1') {
+		$param .= '&search_version='.urlencode($search_version);
+	}
+	}
 
 $dirins = DOL_DOCUMENT_ROOT.'/custom';
 $urldolibarrmodules = 'https://www.dolistore.com/';
@@ -102,7 +113,9 @@ 
 
 $parameters = array();
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 
 if (GETPOST('buttonreset', 'alpha'))
 {
@@ -207,9 +220,17 @@ 
 				//var_dump($modulenamearrays);exit;
 
 				foreach ($modulenamearrays as $modulenameval) {
-					if (strpos($modulenameval, '#') === 0) continue; // Discard comments
-					if (strpos($modulenameval, '//') === 0) continue; // Discard comments
-					if (!trim($modulenameval)) continue;
+					if (strpos($modulenameval, '#') === 0) {
+						continue;
+					}
+					// Discard comments
+					if (strpos($modulenameval, '//') === 0) {
+						continue;
+					}
+					// Discard comments
+					if (!trim($modulenameval)) {
+						continue;
+					}
 
 					// Now we install the module
 					if (!$error)
@@ -242,8 +263,9 @@ 
 if ($action == 'set' && $user->admin)
 {
 	$resarray = activateModule($value);
-	if (!empty($resarray['errors'])) setEventMessages('', $resarray['errors'], 'errors');
-	else {
+	if (!empty($resarray['errors'])) {
+		setEventMessages('', $resarray['errors'], 'errors');
+	} else {
 		//var_dump($resarray);exit;
 		if ($resarray['nbperms'] > 0)
 		{
@@ -258,7 +280,9 @@ 
 					$msg = $langs->trans('ModuleEnabledAdminMustCheckRights');
 					setEventMessages($msg, null, 'warnings');
 				}
-			} else dol_print_error($db);
+			} else {
+				dol_print_error($db);
+			}
 		}
 	}
 	header("Location: ".$_SERVER["PHP_SELF"]."?mode=".$mode.$param.($page_y ? '&page_y='.$page_y : ''));
@@ -266,7 +290,9 @@ 
 } elseif ($action == 'reset' && $user->admin && GETPOST('confirm') == 'yes')
 {
 	$result = unActivateModule($value);
-	if ($result) setEventMessages($result, null, 'errors');
+	if ($result) {
+		setEventMessages($result, null, 'errors');
+	}
 	header("Location: ".$_SERVER["PHP_SELF"]."?mode=".$mode.$param.($page_y ? '&page_y='.$page_y : ''));
 	exit;
 }
@@ -325,9 +351,11 @@ 
 
 				if ($modName)
 				{
-					if (!empty($modNameLoaded[$modName]))   // In cache of already loaded modules ?
+					if (!empty($modNameLoaded[$modName])) {
+						// In cache of already loaded modules ?
 					{
 						$mesg = "Error: Module ".$modName." was found twice: Into ".$modNameLoaded[$modName]." and ".$dir.". You probably have an old file on your disk.<br>";
+					}
 						setEventMessages($mesg, null, 'warnings');
 						dol_syslog($mesg, LOG_ERR);
 						continue;
@@ -350,12 +378,20 @@ 
 
 								// We discard modules according to features level (PS: if module is activated we always show it)
 								$const_name = 'MAIN_MODULE_'.strtoupper(preg_replace('/^mod/i', '', get_class($objMod)));
-								if ($objMod->version == 'development' && (empty($conf->global->$const_name) && ($conf->global->MAIN_FEATURES_LEVEL < 2))) $modulequalified = 0;
-								if ($objMod->version == 'experimental' && (empty($conf->global->$const_name) && ($conf->global->MAIN_FEATURES_LEVEL < 1))) $modulequalified = 0;
-								if (preg_match('/deprecated/', $objMod->version) && (empty($conf->global->$const_name) && ($conf->global->MAIN_FEATURES_LEVEL >= 0))) $modulequalified = 0;
+								if ($objMod->version == 'development' && (empty($conf->global->$const_name) && ($conf->global->MAIN_FEATURES_LEVEL < 2))) {
+									$modulequalified = 0;
+								}
+								if ($objMod->version == 'experimental' && (empty($conf->global->$const_name) && ($conf->global->MAIN_FEATURES_LEVEL < 1))) {
+									$modulequalified = 0;
+								}
+								if (preg_match('/deprecated/', $objMod->version) && (empty($conf->global->$const_name) && ($conf->global->MAIN_FEATURES_LEVEL >= 0))) {
+									$modulequalified = 0;
+								}
 
 								// We discard modules according to property ->hidden
-								if (!empty($objMod->hidden)) $modulequalified = 0;
+								if (!empty($objMod->hidden)) {
+									$modulequalified = 0;
+								}
 
 								if ($modulequalified > 0)
 								{
@@ -414,12 +450,21 @@ 
 
 									// Set categ[$i]
 									$specialstring = 'unknown';
-									if ($objMod->version == 'development' || $objMod->version == 'experimental') $specialstring = 'expdev';
-									if (isset($categ[$specialstring])) $categ[$specialstring]++; // Array of all different modules categories
-									else $categ[$specialstring] = 1;
+									if ($objMod->version == 'development' || $objMod->version == 'experimental') {
+										$specialstring = 'expdev';
+									}
+									if (isset($categ[$specialstring])) {
+										$categ[$specialstring]++;
+									}
+									// Array of all different modules categories
+									else {
+										$categ[$specialstring] = 1;
+									}
 									$j++;
 									$i++;
-								} else dol_syslog("Module ".get_class($objMod)." not qualified");
+								} else {
+									dol_syslog("Module ".get_class($objMod)." not qualified");
+								}
 							} catch (Exception $e)
 							{
 								 dol_syslog("Failed to load ".$dir.$file." ".$e->getMessage(), LOG_ERR);
@@ -445,7 +490,9 @@ 
 	if (!empty($modules[$value])) {
 		$objMod = $modules[$value];
 
-		if (!empty($objMod->langfiles)) $langs->loadLangs($objMod->langfiles);
+		if (!empty($objMod->langfiles)) {
+			$langs->loadLangs($objMod->langfiles);
+		}
 
 		$form = new Form($db);
 		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?value='.$value.'&mode='.$mode.$param, $langs->trans('ConfirmUnactivation'), $langs->trans(GETPOST('confirm_message_code')), 'reset', '', 'no', 1);
@@ -462,16 +509,28 @@ 
 $nbofactivatedmodules = count($conf->modules);
 $moreinfo = $langs->trans("TitleNumberOfActivatedModules");
 $moreinfo2 = ($nbofactivatedmodules - 1)." / ".count($modules);
-if ($nbofactivatedmodules <= 1) $moreinfo2 .= ' '.img_warning($langs->trans("YouMustEnableOneModule"));
+if ($nbofactivatedmodules <= 1) {
+	$moreinfo2 .= ' '.img_warning($langs->trans("YouMustEnableOneModule"));
+}
 
 print load_fiche_titre($langs->trans("ModulesSetup"), '', 'title_setup');
 
 // Start to show page
-if ($mode == 'common')       print '<span class="opacitymedium hideonsmartphone">'.$langs->trans("ModulesDesc", img_picto('', 'switch_off'))."<br></span>\n";
-if ($mode == 'commonkanban') print '<span class="opacitymedium hideonsmartphone">'.$langs->trans("ModulesDesc", img_picto('', 'switch_off'))."<br></span>\n";
-if ($mode == 'marketplace')  print '<span class="opacitymedium hideonsmartphone">'.$langs->trans("ModulesMarketPlaceDesc")."<br></span>\n";
-if ($mode == 'deploy')       print '<span class="opacitymedium hideonsmartphone">'.$langs->trans("ModulesDeployDesc", $langs->transnoentitiesnoconv("AvailableModules"))."<br></span>\n";
-if ($mode == 'develop')      print '<span class="opacitymedium hideonsmartphone">'.$langs->trans("ModulesDevelopDesc")."<br></span>\n";
+if ($mode == 'common') {
+	print '<span class="opacitymedium hideonsmartphone">'.$langs->trans("ModulesDesc", img_picto('', 'switch_off'))."<br></span>\n";
+}
+if ($mode == 'commonkanban') {
+	print '<span class="opacitymedium hideonsmartphone">'.$langs->trans("ModulesDesc", img_picto('', 'switch_off'))."<br></span>\n";
+}
+if ($mode == 'marketplace') {
+	print '<span class="opacitymedium hideonsmartphone">'.$langs->trans("ModulesMarketPlaceDesc")."<br></span>\n";
+}
+if ($mode == 'deploy') {
+	print '<span class="opacitymedium hideonsmartphone">'.$langs->trans("ModulesDeployDesc", $langs->transnoentitiesnoconv("AvailableModules"))."<br></span>\n";
+}
+if ($mode == 'develop') {
+	print '<span class="opacitymedium hideonsmartphone">'.$langs->trans("ModulesDevelopDesc")."<br></span>\n";
+}
 
 $head = modules_prepare_head();
 
@@ -484,7 +543,9 @@ 
 	dol_set_focus('#search_keyword');
 
 	print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
-	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+	if ($optioncss != '') {
+		print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+	}
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
@@ -492,7 +553,9 @@ 
 	print '<input type="hidden" name="mode" value="'.$mode.'">';
 
 	$newmode = $mode;
-	if ($newmode == 'common') $newmode = 'commonkanban';
+	if ($newmode == 'common') {
+		$newmode = 'commonkanban';
+	}
 
 	dol_fiche_head($head, $newmode, '', -1);
 
@@ -515,9 +578,15 @@ 
 	if (!empty($conf->global->MAIN_FEATURES_LEVEL))
 	{
 		$array_version = array('stable'=>$langs->transnoentitiesnoconv("Stable"));
-		if ($conf->global->MAIN_FEATURES_LEVEL < 0) $array_version['deprecated'] = $langs->trans("Deprecated");
-		if ($conf->global->MAIN_FEATURES_LEVEL > 0) $array_version['experimental'] = $langs->trans("Experimental");
-		if ($conf->global->MAIN_FEATURES_LEVEL > 1) $array_version['development'] = $langs->trans("Development");
+		if ($conf->global->MAIN_FEATURES_LEVEL < 0) {
+			$array_version['deprecated'] = $langs->trans("Deprecated");
+		}
+		if ($conf->global->MAIN_FEATURES_LEVEL > 0) {
+			$array_version['experimental'] = $langs->trans("Experimental");
+		}
+		if ($conf->global->MAIN_FEATURES_LEVEL > 1) {
+			$array_version['development'] = $langs->trans("Development");
+		}
 		$moreforfilter .= '<div class="divsearchfield paddingtop">';
 		$moreforfilter .= $langs->trans('Version').': '.$form->selectarray('search_version', $array_version, $search_version, 1, 0, 0, '', 0, 0, 0, '', 'maxwidth100');
 		$moreforfilter .= '</div>';
@@ -550,7 +619,9 @@ 
 	$object = new stdClass();
 	$parameters = array();
 	$reshook = $hookmanager->executeHooks('insertExtraHeader', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
-	if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+	if ($reshook < 0) {
+		setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+	}
 
 	// Show list of modules
 	$oldfamily = '';
@@ -567,7 +638,10 @@ 
 		$objMod = $modules[$modName];
 
 		//print $objMod->name." - ".$key." - ".$objMod->version."<br>";
-		if ($mode == 'expdev' && $objMod->version != 'development' && $objMod->version != 'experimental') continue; // Discard if not for current tab
+		if ($mode == 'expdev' && $objMod->version != 'development' && $objMod->version != 'experimental') {
+			continue;
+		}
+		// Discard if not for current tab
 
 		if (!$objMod->getName())
 		{
@@ -593,33 +667,57 @@ 
 				|| preg_match('/'.preg_quote($search_keyword).'/i', $moduledesc)
 				|| preg_match('/'.preg_quote($search_keyword).'/i', $moduledesclong)
 				|| preg_match('/'.preg_quote($search_keyword).'/i', $moduleauthor)
-				) $qualified = 1;
-			if (!$qualified) continue;
+				) {
+				$qualified = 1;
+			}
+			if (!$qualified) {
+				continue;
+			}
 		}
 		if ($search_status)
 		{
-			if ($search_status == 'active' && empty($conf->global->$const_name)) continue;
-			if ($search_status == 'disabled' && !empty($conf->global->$const_name)) continue;
+			if ($search_status == 'active' && empty($conf->global->$const_name)) {
+				continue;
+			}
+			if ($search_status == 'disabled' && !empty($conf->global->$const_name)) {
+				continue;
+			}
 		}
 		if ($search_nature)
 		{
-			if (preg_match('/^external/', $search_nature) && $objMod->isCoreOrExternalModule() != 'external') continue;
+			if (preg_match('/^external/', $search_nature) && $objMod->isCoreOrExternalModule() != 'external') {
+				continue;
+			}
 			$reg = array();
 			if (preg_match('/^external_(.*)$/', $search_nature, $reg))
 			{
 				//print $reg[1].'-'.dol_escape_htmltag($objMod->getPublisher());
 				$publisher = dol_escape_htmltag($objMod->getPublisher());
-				if ($reg[1] && dol_escape_htmltag($reg[1]) != $publisher) continue;
-				if (!$reg[1] && !empty($publisher)) continue;
+				if ($reg[1] && dol_escape_htmltag($reg[1]) != $publisher) {
+					continue;
+				}
+				if (!$reg[1] && !empty($publisher)) {
+					continue;
+				}
+			}
+			if ($search_nature == 'core' && $objMod->isCoreOrExternalModule() == 'external') {
+				continue;
 			}
-			if ($search_nature == 'core' && $objMod->isCoreOrExternalModule() == 'external') continue;
 		}
 		if ($search_version)
 		{
-			if (($objMod->version == 'development' || $objMod->version == 'experimental' || preg_match('/deprecated/', $objMod->version)) && $search_version == 'stable') continue;
-			if ($objMod->version != 'development' && ($search_version == 'development')) continue;
-			if ($objMod->version != 'experimental' && ($search_version == 'experimental')) continue;
-			if (!preg_match('/deprecated/', $objMod->version) && ($search_version == 'deprecated')) continue;
+			if (($objMod->version == 'development' || $objMod->version == 'experimental' || preg_match('/deprecated/', $objMod->version)) && $search_version == 'stable') {
+				continue;
+			}
+			if ($objMod->version != 'development' && ($search_version == 'development')) {
+				continue;
+			}
+			if ($objMod->version != 'experimental' && ($search_version == 'experimental')) {
+				continue;
+			}
+			if (!preg_match('/deprecated/', $objMod->version) && ($search_version == 'deprecated')) {
+				continue;
+			}
 		}
 
 		// Load all lang files of module
@@ -662,9 +760,15 @@ 
 		// Version (with picto warning or not)
 		$version = $objMod->getVersion(0);
 		$versiontrans = '';
-		if (preg_match('/development/i', $version))  $versiontrans .= img_warning($langs->trans("Development"), '', 'floatleft paddingright');
-		if (preg_match('/experimental/i', $version)) $versiontrans .= img_warning($langs->trans("Experimental"), '', 'floatleft paddingright');
-		if (preg_match('/deprecated/i', $version))   $versiontrans .= img_warning($langs->trans("Deprecated"), '', 'floatleft paddingright');
+		if (preg_match('/development/i', $version)) {
+			$versiontrans .= img_warning($langs->trans("Development"), '', 'floatleft paddingright');
+		}
+		if (preg_match('/experimental/i', $version)) {
+			$versiontrans .= img_warning($langs->trans("Experimental"), '', 'floatleft paddingright');
+		}
+		if (preg_match('/deprecated/i', $version)) {
+			$versiontrans .= img_warning($langs->trans("Deprecated"), '', 'floatleft paddingright');
+		}
 		if ($objMod->isCoreOrExternalModule() == 'external' || preg_match('/development|experimental|deprecated/i', $version)) {
 			$versiontrans .= $objMod->getVersion(1);
 		}
@@ -680,10 +784,12 @@ 
 		$codetoconfig = '';
 
 		// Activate/Disable and Setup (2 columns)
-		if (!empty($conf->global->$const_name))	// If module is already activated
+		if (!empty($conf->global->$const_name)) {
+			// If module is already activated
 		{
 			// Set $codeenabledisable
 			$disableSetup = 0;
+		}
 			if (!empty($arrayofwarnings[$modName]))
 			{
 				$codeenabledisable .= '<!-- This module has a warning to show when we activate it (note: your country is '.$mysoc->country_code.') -->'."\n";
@@ -693,12 +799,15 @@ 
 				$codeenabledisable .= $langs->trans("Disabled");
 			} elseif (!empty($objMod->always_enabled) || ((!empty($conf->multicompany->enabled) && $objMod->core_enabled) && ($user->entity || $conf->entity != 1)))
 			{
-				if (method_exists($objMod, 'alreadyUsed') && $objMod->alreadyUsed()) $codeenabledisable .= $langs->trans("Used");
-				else {
+				if (method_exists($objMod, 'alreadyUsed') && $objMod->alreadyUsed()) {
+					$codeenabledisable .= $langs->trans("Used");
+				} else {
 					$codeenabledisable .= img_picto($langs->trans("Required"), 'switch_on', '', false, 0, 0, '', 'opacitymedium valignmiddle');
 					//print $langs->trans("Required");
 				}
-				if (!empty($conf->multicompany->enabled) && $user->entity) $disableSetup++;
+				if (!empty($conf->multicompany->enabled) && $user->entity) {
+					$disableSetup++;
+				}
 			} else {
 				if (!empty($objMod->warnings_unactivation[$mysoc->country_code]) && method_exists($objMod, 'alreadyUsed') && $objMod->alreadyUsed()) {
 					$codeenabledisable .= '<a class="reposition valignmiddle" href="'.$_SERVER["PHP_SELF"].'?id='.$objMod->numero.'&amp;module_position='.$module_position.'&amp;action=reset_confirm&amp;confirm_message_code='.$objMod->warnings_unactivation[$mysoc->country_code].'&amp;value='.$modName.'&amp;mode='.$mode.$param.'">';
@@ -715,10 +824,19 @@ 
 			if (!empty($objMod->config_page_url) && !$disableSetup)
 			{
 				$backtourlparam = '';
-				if ($search_keyword != '') $backtourlparam .= ($backtourlparam ? '&' : '?').'search_keyword='.$search_keyword; // No urlencode here, done later
-				if ($search_nature > -1)   $backtourlparam .= ($backtourlparam ? '&' : '?').'search_nature='.$search_nature;
-				if ($search_version > -1)  $backtourlparam .= ($backtourlparam ? '&' : '?').'search_version='.$search_version;
-				if ($search_status > -1)   $backtourlparam .= ($backtourlparam ? '&' : '?').'search_status='.$search_status;
+				if ($search_keyword != '') {
+					$backtourlparam .= ($backtourlparam ? '&' : '?').'search_keyword='.$search_keyword;
+				}
+				// No urlencode here, done later
+				if ($search_nature > -1) {
+					$backtourlparam .= ($backtourlparam ? '&' : '?').'search_nature='.$search_nature;
+				}
+				if ($search_version > -1) {
+					$backtourlparam .= ($backtourlparam ? '&' : '?').'search_version='.$search_version;
+				}
+				if ($search_status > -1) {
+					$backtourlparam .= ($backtourlparam ? '&' : '?').'search_status='.$search_status;
+				}
 				$backtourl = $_SERVER["PHP_SELF"].$backtourlparam;
 
 				$regs = array();
@@ -781,16 +899,22 @@ 
 					foreach ($arrayofwarningsext as $keymodule => $arrayofwarningsextbycountry)
 					{
 						$keymodulelowercase = strtolower(preg_replace('/^mod/', '', $keymodule));
-						if (in_array($keymodulelowercase, $conf->modules))    // If module that request warning is on
+						if (in_array($keymodulelowercase, $conf->modules)) {
+							// If module that request warning is on
 						{
 							foreach ($arrayofwarningsextbycountry as $keycountry => $cursorwarningmessage)
 							{
 								if (preg_match('/^always/', $keycountry) || ($mysoc->country_code && preg_match('/^'.$mysoc->country_code.'/', $keycountry)))
 								{
 									$warningmessage .= ($warningmessage ? "\n" : "").$langs->trans($cursorwarningmessage, $objMod->getName(), $mysoc->country_code, $modules[$keymodule]->getName());
+						}
 									$warningmessage .= ($warningmessage ? "\n" : "").($warningmessage ? "\n" : "").$langs->trans("Module").' : '.$objMod->getName();
-									if (!empty($objMod->editor_name)) $warningmessage .= ($warningmessage ? "\n" : "").$langs->trans("Publisher").' : '.$objMod->editor_name;
-									if (!empty($objMod->editor_name)) $warningmessage .= ($warningmessage ? "\n" : "").$langs->trans("ModuleTriggeringThisWarning").' : '.$modules[$keymodule]->getName();
+									if (!empty($objMod->editor_name)) {
+										$warningmessage .= ($warningmessage ? "\n" : "").$langs->trans("Publisher").' : '.$objMod->editor_name;
+									}
+									if (!empty($objMod->editor_name)) {
+										$warningmessage .= ($warningmessage ? "\n" : "").$langs->trans("ModuleTriggeringThisWarning").' : '.$modules[$keymodule]->getName();
+									}
 								}
 							}
 						}
@@ -798,7 +922,9 @@ 
 				}
 				$codeenabledisable .= '<!-- Message to show: '.$warningmessage.' -->'."\n";
 				$codeenabledisable .= '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$objMod->numero.'&amp;token='.newToken().'&amp;module_position='.$module_position.'&amp;action=set&amp;value='.$modName.'&amp;mode='.$mode.$param.'"';
-				if ($warningmessage) $codeenabledisable .= ' onclick="return confirm(\''.dol_escape_js($warningmessage).'\');"';
+				if ($warningmessage) {
+					$codeenabledisable .= ' onclick="return confirm(\''.dol_escape_js($warningmessage).'\');"';
+				}
 				$codeenabledisable .= '>';
 				$codeenabledisable .= img_picto($langs->trans("Disabled"), 'switch_off');
 				$codeenabledisable .= "</a>\n";
@@ -813,7 +939,9 @@ 
 			print $objMod->getKanbanView($codeenabledisable, $codetoconfig);
 		} else {
 			print '<tr class="oddeven">'."\n";
-			if (!empty($conf->global->MAIN_MODULES_SHOW_LINENUMBERS)) print '<td width="20px">'.$linenum.'</td>';
+			if (!empty($conf->global->MAIN_MODULES_SHOW_LINENUMBERS)) {
+				print '<td width="20px">'.$linenum.'</td>';
+			}
 
 			// Picto + Name of module
 			print '  <td width="200px">';
@@ -822,8 +950,11 @@ 
 			//if (is_array($objMod->phpmin)) $alttext.=($alttext?' - ':'').'PHP >= '.join('.',$objMod->phpmin);
 			if (!empty($objMod->picto))
 			{
-				if (preg_match('/^\//i', $objMod->picto)) print img_picto($alttext, $objMod->picto, 'class="valignmiddle pictomodule paddingrightonly"', 1);
-				else print img_object($alttext, $objMod->picto, 'class="valignmiddle pictomodule paddingrightonly"');
+				if (preg_match('/^\//i', $objMod->picto)) {
+					print img_picto($alttext, $objMod->picto, 'class="valignmiddle pictomodule paddingrightonly"', 1);
+				} else {
+					print img_object($alttext, $objMod->picto, 'class="valignmiddle pictomodule paddingrightonly"');
+				}
 			} else {
 				print img_object($alttext, 'generic', 'class="valignmiddle paddingrightonly"');
 			}
@@ -983,7 +1114,9 @@ 
 	$dolibarrdataroot = preg_replace('/([\\/]+)$/i', '', DOL_DATA_ROOT);
 	$allowonlineinstall = true;
 	$allowfromweb = 1;
-	if (dol_is_file($dolibarrdataroot.'/installmodules.lock')) $allowonlineinstall = false;
+	if (dol_is_file($dolibarrdataroot.'/installmodules.lock')) {
+		$allowonlineinstall = false;
+	}
 
 	$fullurl = '<a href="'.$urldolibarrmodules.'" target="_blank">'.$urldolibarrmodules.'</a>';
 	$message = '';
@@ -1051,15 +1184,31 @@ 
 
 			$max = $conf->global->MAIN_UPLOAD_DOC; // In Kb
 			$maxphp = @ini_get('upload_max_filesize'); // In unknown
-			if (preg_match('/k$/i', $maxphp)) $maxphp = $maxphp * 1;
-			if (preg_match('/m$/i', $maxphp)) $maxphp = $maxphp * 1024;
-			if (preg_match('/g$/i', $maxphp)) $maxphp = $maxphp * 1024 * 1024;
-			if (preg_match('/t$/i', $maxphp)) $maxphp = $maxphp * 1024 * 1024 * 1024;
+			if (preg_match('/k$/i', $maxphp)) {
+				$maxphp = $maxphp * 1;
+			}
+			if (preg_match('/m$/i', $maxphp)) {
+				$maxphp = $maxphp * 1024;
+			}
+			if (preg_match('/g$/i', $maxphp)) {
+				$maxphp = $maxphp * 1024 * 1024;
+			}
+			if (preg_match('/t$/i', $maxphp)) {
+				$maxphp = $maxphp * 1024 * 1024 * 1024;
+			}
 			$maxphp2 = @ini_get('post_max_size'); // In unknown
-			if (preg_match('/k$/i', $maxphp2)) $maxphp2 = $maxphp2 * 1;
-			if (preg_match('/m$/i', $maxphp2)) $maxphp2 = $maxphp2 * 1024;
-			if (preg_match('/g$/i', $maxphp2)) $maxphp2 = $maxphp2 * 1024 * 1024;
-			if (preg_match('/t$/i', $maxphp2)) $maxphp2 = $maxphp2 * 1024 * 1024 * 1024;
+			if (preg_match('/k$/i', $maxphp2)) {
+				$maxphp2 = $maxphp2 * 1;
+			}
+			if (preg_match('/m$/i', $maxphp2)) {
+				$maxphp2 = $maxphp2 * 1024;
+			}
+			if (preg_match('/g$/i', $maxphp2)) {
+				$maxphp2 = $maxphp2 * 1024 * 1024;
+			}
+			if (preg_match('/t$/i', $maxphp2)) {
+				$maxphp2 = $maxphp2 * 1024 * 1024 * 1024;
+			}
 			// Now $max and $maxphp and $maxphp2 are in Kb
 			$maxmin = $max;
 			$maxphptoshow = $maxphptoshowparam = '';