alxarafe / alixar

Base/AlixarModel.php

Spacing +719 added lines, -719 removed lines

@@ -314,12 +314,12 @@ 
     public $date_creation;
 
     // Dates
-    public $date_validation;            // Date creation
-    public $date_modification;        // Date validation
+    public $date_validation; // Date creation
+    public $date_modification; // Date validation
     /**
      * @var string        Column name of the ref field.
      */
-    protected $table_ref_field = '';        // Date last change (tms field)
+    protected $table_ref_field = ''; // Date last change (tms field)
 
 
     // No constructor as it is an abstract class
@@ -339,20 +339,20 @@ 
         global $db, $conf;
 
         $sql = "SELECT rowid, ref, ref_ext";
-        $sql .= " FROM " . MAIN_DB_PREFIX . $element;
-        $sql .= " WHERE entity IN (" . getEntity($element) . ")";
+        $sql .= " FROM ".MAIN_DB_PREFIX.$element;
+        $sql .= " WHERE entity IN (".getEntity($element).")";
 
-        if ($id > 0) $sql .= " AND rowid = " . $db->escape($id);
-        else if ($ref) $sql .= " AND ref = '" . $db->escape($ref) . "'";
-        else if ($ref_ext) $sql .= " AND ref_ext = '" . $db->escape($ref_ext) . "'";
+        if ($id > 0) $sql .= " AND rowid = ".$db->escape($id);
+        else if ($ref) $sql .= " AND ref = '".$db->escape($ref)."'";
+        else if ($ref_ext) $sql .= " AND ref_ext = '".$db->escape($ref_ext)."'";
         else {
             $error = 'ErrorWrongParameters';
-            dol_print_error(get_class() . "::isExistingObject " . $error, LOG_ERR);
+            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);
+        dol_syslog(get_class()."::isExistingObject", LOG_DEBUG);
         $resql = $db->query($sql);
         if ($resql) {
             $num = $db->num_rows($resql);
@@ -377,10 +377,10 @@ 
     public static function commonReplaceThirdparty(DoliDB $db, $origin_id, $dest_id, array $tables, $ignoreerrors = 0)
     {
         foreach ($tables as $table) {
-            $sql = 'UPDATE ' . MAIN_DB_PREFIX . $table . ' SET fk_soc = ' . $dest_id . ' WHERE fk_soc = ' . $origin_id;
+            $sql = 'UPDATE '.MAIN_DB_PREFIX.$table.' SET fk_soc = '.$dest_id.' WHERE fk_soc = '.$origin_id;
 
             if (!$db->query($sql)) {
-                if ($ignoreerrors) return true;        // TODO Not enough. If there is A-B on kept thirdarty and B-C on old one, we must get A-B-C after merge. Not A-B.
+                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;
             }
@@ -396,7 +396,7 @@ 
      */
     function errorsToString()
     {
-        return $this->error . (is_array($this->errors) ? (($this->error != '' ? ', ' : '') . join(', ', $this->errors)) : '');
+        return $this->error.(is_array($this->errors) ? (($this->error != '' ? ', ' : '').join(', ', $this->errors)) : '');
     }
 
     /**
@@ -410,7 +410,7 @@ 
     {
         global $conf, $langs;
 
-        $countriesusingstate = array('AU', 'US', 'IN', 'GB', 'ES', 'UK', 'TR');    // See also option MAIN_FORCE_STATE_INTO_ADDRESS
+        $countriesusingstate = array('AU', 'US', 'IN', 'GB', 'ES', 'UK', 'TR'); // See also option MAIN_FORCE_STATE_INTO_ADDRESS
 
         $contactid = 0;
         $thirdpartyid = 0;
@@ -432,13 +432,13 @@ 
         $coords = $this->getFullAddress(1, ', ', $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT);
         if ($coords) {
             if (!empty($conf->use_javascript_ajax)) {
-                $namecoords = $this->getFullName($langs, 1) . '<br>' . $coords;
+                $namecoords = $this->getFullName($langs, 1).'<br>'.$coords;
                 // hideonsmatphone because copyToClipboard call jquery dialog that does not work with jmobile
-                $out .= '<a href="#" class="hideonsmartphone" onclick="return copyToClipboard(\'' . dol_escape_js($namecoords) . '\',\'' . dol_escape_js($langs->trans("HelpCopyToClipboard")) . '\');">';
+                $out .= '<a href="#" class="hideonsmartphone" onclick="return copyToClipboard(\''.dol_escape_js($namecoords).'\',\''.dol_escape_js($langs->trans("HelpCopyToClipboard")).'\');">';
                 $out .= img_picto($langs->trans("Address"), 'object_address.png');
                 $out .= '</a> ';
             }
-            $out .= dol_print_address($coords, 'address_' . $htmlkey . '_' . $this->id, $this->element, $this->id, 1, ', ');
+            $out .= dol_print_address($coords, 'address_'.$htmlkey.'_'.$this->id, $this->element, $this->id, 1, ', ');
             $outdone++;
             $outdone++;
         }
@@ -446,9 +446,9 @@ 
         if (!in_array($this->country_code, $countriesusingstate) && empty($conf->global->MAIN_FORCE_STATE_INTO_ADDRESS)   // If MAIN_FORCE_STATE_INTO_ADDRESS is on, state is already returned previously with getFullAddress
             && empty($conf->global->SOCIETE_DISABLE_STATE) && $this->state) {
             if (!empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) && $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 1 && $this->region) {
-                $out .= ($outdone ? ' - ' : '') . $this->region . ' - ' . $this->state;
+                $out .= ($outdone ? ' - ' : '').$this->region.' - '.$this->state;
             } else {
-                $out .= ($outdone ? ' - ' : '') . $this->state;
+                $out .= ($outdone ? ' - ' : '').$this->state;
             }
             $outdone++;
         }
@@ -526,14 +526,14 @@ 
     function getFullAddress($withcountry = 0, $sep = "\n", $withregion = 0)
     {
         if ($withcountry && $this->country_id && (empty($this->country_code) || empty($this->country))) {
-            require_once DOL_DOCUMENT_ROOT . '/core/lib/company.lib.php';
+            require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
             $tmparray = getCountry($this->country_id, 'all');
             $this->country_code = $tmparray['code'];
             $this->country = $tmparray['label'];
         }
 
         if ($withregion && $this->state_id && (empty($this->state_code) || empty($this->state) || empty($this->region) || empty($this->region_cpde))) {
-            require_once DOL_DOCUMENT_ROOT . '/core/lib/company.lib.php';
+            require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
             $tmparray = getState($this->state_id, 'all', 0, 1);
             $this->state_code = $tmparray['code'];
             $this->state = $tmparray['label'];
@@ -562,8 +562,8 @@ 
 
         $ret = '';
         if ($option && $this->civility_id) {
-            if ($langs->transnoentitiesnoconv("Civility" . $this->civility_id) != "Civility" . $this->civility_id) $ret .= $langs->transnoentitiesnoconv("Civility" . $this->civility_id) . ' ';
-            else $ret .= $this->civility_id . ' ';
+            if ($langs->transnoentitiesnoconv("Civility".$this->civility_id) != "Civility".$this->civility_id) $ret .= $langs->transnoentitiesnoconv("Civility".$this->civility_id).' ';
+            else $ret .= $this->civility_id.' ';
         }
 
         $ret .= dolGetFirstLastname($firstname, $lastname, $nameorder);
@@ -587,10 +587,10 @@ 
         global $user, $dolibarr_main_url_root;
 
         if (empty($this->last_main_doc)) {
-            return '';        // No way to known which document name to use
+            return ''; // No way to known which document name to use
         }
 
-        include_once DOL_DOCUMENT_ROOT . '/ecm/class/ecmfiles.class.php';
+        include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
         $ecmfile = new EcmFiles($this->db);
         $result = $ecmfile->fetch(0, '', $this->last_main_doc);
         if ($result < 0) {
@@ -602,7 +602,7 @@ 
         if (empty($ecmfile->id)) {
             // Add entry into index
             if ($initsharekey) {
-                require_once DOL_DOCUMENT_ROOT . '/core/lib/security2.lib.php';
+                require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
                 // TODO We can't, we dont' have full path of file, only last_main_doc adn ->element, so we must rebuild full path first
                 /*
 				$ecmfile->filepath = $rel_dir;
@@ -624,15 +624,15 @@ 
         } elseif (empty($ecmfile->share)) {
             // Add entry into index
             if ($initsharekey) {
-                require_once DOL_DOCUMENT_ROOT . '/core/lib/security2.lib.php';
+                require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
                 $ecmfile->share = getRandomPassword(true);
                 $ecmfile->update($user);
             } else return '';
         }
 
         // Define $urlwithroot
-        $urlwithouturlroot = preg_replace('/' . preg_quote(DOL_URL_ROOT, '/') . '$/i', '', trim($dolibarr_main_url_root));
-        $urlwithroot = $urlwithouturlroot . DOL_URL_ROOT;        // This is to use external domain name found into config file
+        $urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
+        $urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file
         //$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
 
         $forcedownload = 0;
@@ -641,13 +641,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) {
-            $linktoreturn = 'document.php' . ($paramlink ? '?' . $paramlink : '');
+            $linktoreturn = 'document.php'.($paramlink ? '?'.$paramlink : '');
         } else {
-            $linktoreturn = $urlwithroot . '/document.php' . ($paramlink ? '?' . $paramlink : '');
+            $linktoreturn = $urlwithroot.'/document.php'.($paramlink ? '?'.$paramlink : '');
         }
 
         // Here $ecmfile->share is defined
@@ -693,19 +693,19 @@ 
         global $user, $langs;
 
 
-        dol_syslog(get_class($this) . "::add_contact $fk_socpeople, $type_contact, $source, $notrigger");
+        dol_syslog(get_class($this)."::add_contact $fk_socpeople, $type_contact, $source, $notrigger");
 
         // Check parameters
         if ($fk_socpeople <= 0) {
             $langs->load("errors");
             $this->error = $langs->trans("ErrorWrongValueForParameterX", "1");
-            dol_syslog(get_class($this) . "::add_contact " . $this->error, LOG_ERR);
+            dol_syslog(get_class($this)."::add_contact ".$this->error, LOG_ERR);
             return -1;
         }
         if (!$type_contact) {
             $langs->load("errors");
             $this->error = $langs->trans("ErrorWrongValueForParameterX", "2");
-            dol_syslog(get_class($this) . "::add_contact " . $this->error, LOG_ERR);
+            dol_syslog(get_class($this)."::add_contact ".$this->error, LOG_ERR);
             return -2;
         }
 
@@ -715,10 +715,10 @@ 
         } else {
             // We look for id type_contact
             $sql = "SELECT tc.rowid";
-            $sql .= " FROM " . MAIN_DB_PREFIX . "c_type_contact as tc";
-            $sql .= " WHERE tc.element='" . $this->db->escape($this->element) . "'";
-            $sql .= " AND tc.source='" . $this->db->escape($source) . "'";
-            $sql .= " AND tc.code='" . $this->db->escape($type_contact) . "' AND tc.active=1";
+            $sql .= " FROM ".MAIN_DB_PREFIX."c_type_contact as tc";
+            $sql .= " WHERE tc.element='".$this->db->escape($this->element)."'";
+            $sql .= " AND tc.source='".$this->db->escape($source)."'";
+            $sql .= " AND tc.code='".$this->db->escape($type_contact)."' AND tc.active=1";
             //print $sql;
             $resql = $this->db->query($sql);
             if ($resql) {
@@ -729,7 +729,7 @@ 
 
         if ($id_type_contact == 0) {
             $this->error = 'CODE_NOT_VALID_FOR_THIS_ELEMENT';
-            dol_syslog("CODE_NOT_VALID_FOR_THIS_ELEMENT: Code type of contact '" . $type_contact . "' does not exists or is not active for element " . $this->element . ", we can ignore it");
+            dol_syslog("CODE_NOT_VALID_FOR_THIS_ELEMENT: Code type of contact '".$type_contact."' does not exists or is not active for element ".$this->element.", we can ignore it");
             return -3;
         }
 
@@ -752,17 +752,17 @@ 
             $this->db->begin();
 
             // Insert into database
-            $sql = "INSERT INTO " . MAIN_DB_PREFIX . "element_contact";
+            $sql = "INSERT INTO ".MAIN_DB_PREFIX."element_contact";
             $sql .= " (element_id, fk_socpeople, datecreate, statut, fk_c_type_contact) ";
-            $sql .= " VALUES (" . $this->id . ", " . $fk_socpeople . " , ";
-            $sql .= "'" . $this->db->idate($datecreate) . "'";
-            $sql .= ", 4, " . $id_type_contact;
+            $sql .= " VALUES (".$this->id.", ".$fk_socpeople." , ";
+            $sql .= "'".$this->db->idate($datecreate)."'";
+            $sql .= ", 4, ".$id_type_contact;
             $sql .= ")";
 
             $resql = $this->db->query($sql);
             if ($resql) {
                 if (!$notrigger) {
-                    $result = $this->call_trigger(strtoupper($this->element) . '_ADD_CONTACT', $user);
+                    $result = $this->call_trigger(strtoupper($this->element).'_ADD_CONTACT', $user);
                     if ($result < 0) {
                         $this->db->rollback();
                         return -1;
@@ -804,26 +804,26 @@ 
 
         $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
+        $sql = "SELECT ec.rowid, ec.statut as statuslink, ec.fk_socpeople as id, ec.fk_c_type_contact"; // This field contains id of llx_socpeople or id of llx_user
         if ($source == 'internal') $sql .= ", '-1' as socid, t.statut as statuscontact, t.login, t.photo";
         if ($source == 'external' || $source == 'thirdparty') $sql .= ", t.fk_soc as socid, t.statut as statuscontact";
         $sql .= ", t.civility as civility, t.lastname as lastname, t.firstname, t.email";
         $sql .= ", tc.source, tc.element, tc.code, tc.libelle";
-        $sql .= " FROM " . MAIN_DB_PREFIX . "c_type_contact tc";
-        $sql .= ", " . MAIN_DB_PREFIX . "element_contact ec";
-        if ($source == 'internal') $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "user t on ec.fk_socpeople = t.rowid";
-        if ($source == 'external' || $source == 'thirdparty') $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "socpeople t on ec.fk_socpeople = t.rowid";
-        $sql .= " WHERE ec.element_id =" . $this->id;
+        $sql .= " FROM ".MAIN_DB_PREFIX."c_type_contact tc";
+        $sql .= ", ".MAIN_DB_PREFIX."element_contact ec";
+        if ($source == 'internal') $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user t on ec.fk_socpeople = t.rowid";
+        if ($source == 'external' || $source == 'thirdparty') $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople t on ec.fk_socpeople = t.rowid";
+        $sql .= " WHERE ec.element_id =".$this->id;
         $sql .= " AND ec.fk_c_type_contact=tc.rowid";
-        $sql .= " AND tc.element='" . $this->db->escape($this->element) . "'";
-        if ($code) $sql .= " AND tc.code = '" . $this->db->escape($code) . "'";
+        $sql .= " AND tc.element='".$this->db->escape($this->element)."'";
+        if ($code) $sql .= " AND tc.code = '".$this->db->escape($code)."'";
         if ($source == 'internal') $sql .= " AND tc.source = 'internal'";
         if ($source == 'external' || $source == 'thirdparty') $sql .= " AND tc.source = 'external'";
         $sql .= " AND tc.active=1";
-        if ($statut >= 0) $sql .= " AND ec.statut = '" . $statut . "'";
+        if ($statut >= 0) $sql .= " AND ec.statut = '".$statut."'";
         $sql .= " ORDER BY t.lastname ASC";
 
-        dol_syslog(get_class($this) . "::liste_contact", LOG_DEBUG);
+        dol_syslog(get_class($this)."::liste_contact", LOG_DEBUG);
         $resql = $this->db->query($sql);
         if ($resql) {
             $num = $this->db->num_rows($resql);
@@ -832,10 +832,10 @@ 
                 $obj = $this->db->fetch_object($resql);
 
                 if (!$list) {
-                    $transkey = "TypeContact_" . $obj->element . "_" . $obj->source . "_" . $obj->code;
+                    $transkey = "TypeContact_".$obj->element."_".$obj->source."_".$obj->code;
                     $libelle_type = ($langs->trans($transkey) != $transkey ? $langs->trans($transkey) : $obj->libelle);
                     $tab[$i] = array('source' => $obj->source, 'socid' => $obj->socid, 'id' => $obj->id,
-                        'nom' => $obj->lastname,      // For backward compatibility
+                        'nom' => $obj->lastname, // For backward compatibility
                         'civility' => $obj->civility, 'lastname' => $obj->lastname, 'firstname' => $obj->firstname, 'email' => $obj->email, 'login' => $obj->login, 'photo' => $obj->photo, 'statuscontact' => $obj->statuscontact,
                         'rowid' => $obj->rowid, 'code' => $obj->code, 'libelle' => $libelle_type, 'status' => $obj->statuslink, 'fk_c_type_contact' => $obj->fk_c_type_contact);
                 } else {
@@ -870,13 +870,13 @@ 
         // phpcs:enable
         global $langs, $conf;
 
-        include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+        include_once DOL_DOCUMENT_ROOT.'/core/class/interfaces.class.php';
         $interface = new Interfaces($this->db);
         $result = $interface->run_triggers($trigger_name, $this, $user, $langs, $conf);
 
         if ($result < 0) {
             if (!empty($this->errors)) {
-                $this->errors = array_unique(array_merge($this->errors, $interface->errors));   // We use array_unique because when a trigger call another trigger on same object, this->errors is added twice.
+                $this->errors = array_unique(array_merge($this->errors, $interface->errors)); // We use array_unique because when a trigger call another trigger on same object, this->errors is added twice.
             } else {
                 $this->errors = $interface->errors;
             }
@@ -901,13 +901,13 @@ 
 
         $this->db->begin();
 
-        $sql = "DELETE FROM " . MAIN_DB_PREFIX . "element_contact";
-        $sql .= " WHERE rowid =" . $rowid;
+        $sql = "DELETE FROM ".MAIN_DB_PREFIX."element_contact";
+        $sql .= " WHERE rowid =".$rowid;
 
-        dol_syslog(get_class($this) . "::delete_contact", LOG_DEBUG);
+        dol_syslog(get_class($this)."::delete_contact", LOG_DEBUG);
         if ($this->db->query($sql)) {
             if (!$notrigger) {
-                $result = $this->call_trigger(strtoupper($this->element) . '_DELETE_CONTACT', $user);
+                $result = $this->call_trigger(strtoupper($this->element).'_DELETE_CONTACT', $user);
                 if ($result < 0) {
                     $this->db->rollback();
                     return -1;
@@ -941,12 +941,12 @@ 
         }
         $listId = implode(",", $temp);
 
-        $sql = "DELETE FROM " . MAIN_DB_PREFIX . "element_contact";
-        $sql .= " WHERE element_id = " . $this->id;
+        $sql = "DELETE FROM ".MAIN_DB_PREFIX."element_contact";
+        $sql .= " WHERE element_id = ".$this->id;
         if ($listId)
-            $sql .= " AND fk_c_type_contact IN (" . $listId . ")";
+            $sql .= " AND fk_c_type_contact IN (".$listId.")";
 
-        dol_syslog(get_class($this) . "::delete_linked_contact", LOG_DEBUG);
+        dol_syslog(get_class($this)."::delete_linked_contact", LOG_DEBUG);
         if ($this->db->query($sql)) {
             return 1;
         } else {
@@ -977,11 +977,11 @@ 
 
         $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) . "'";
+        $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 (!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;
@@ -992,7 +992,7 @@ 
             while ($i < $num) {
                 $obj = $this->db->fetch_object($resql);
 
-                $transkey = "TypeContact_" . $this->element . "_" . $source . "_" . $obj->code;
+                $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;
@@ -1017,13 +1017,13 @@ 
         $sql = "SELECT ec.datecreate, ec.statut, ec.fk_socpeople, ec.fk_c_type_contact,";
         $sql .= " tc.code, tc.libelle";
         //$sql.= ", s.fk_soc";
-        $sql .= " FROM (" . MAIN_DB_PREFIX . "element_contact as ec, " . MAIN_DB_PREFIX . "c_type_contact as tc)";
+        $sql .= " FROM (".MAIN_DB_PREFIX."element_contact as ec, ".MAIN_DB_PREFIX."c_type_contact as tc)";
         //$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople as s ON ec.fk_socpeople=s.rowid";	// Si contact de type external, alors il est lie a une societe
-        $sql .= " WHERE ec.rowid =" . $rowid;
+        $sql .= " WHERE ec.rowid =".$rowid;
         $sql .= " AND ec.fk_c_type_contact=tc.rowid";
-        $sql .= " AND tc.element = '" . $this->db->escape($this->element) . "'";
+        $sql .= " AND tc.element = '".$this->db->escape($this->element)."'";
 
-        dol_syslog(get_class($this) . "::swapContactStatus", LOG_DEBUG);
+        dol_syslog(get_class($this)."::swapContactStatus", LOG_DEBUG);
         $resql = $this->db->query($sql);
         if ($resql) {
             $obj = $this->db->fetch_object($resql);
@@ -1053,11 +1053,11 @@ 
     {
         // phpcs:enable
         // Insert into database
-        $sql = "UPDATE " . MAIN_DB_PREFIX . "element_contact set";
-        $sql .= " statut = " . $statut;
-        if ($type_contact_id) $sql .= ", fk_c_type_contact = '" . $type_contact_id . "'";
-        if ($fk_socpeople) $sql .= ", fk_socpeople = '" . $fk_socpeople . "'";
-        $sql .= " where rowid = " . $rowid;
+        $sql = "UPDATE ".MAIN_DB_PREFIX."element_contact set";
+        $sql .= " statut = ".$statut;
+        if ($type_contact_id) $sql .= ", fk_c_type_contact = '".$type_contact_id."'";
+        if ($fk_socpeople) $sql .= ", fk_socpeople = '".$fk_socpeople."'";
+        $sql .= " where rowid = ".$rowid;
         $resql = $this->db->query($sql);
         if ($resql) {
             return 0;
@@ -1099,22 +1099,22 @@ 
         }
 
         $sql = "SELECT ec.fk_socpeople";
-        $sql .= " FROM " . MAIN_DB_PREFIX . "element_contact as ec,";
-        if ($source == 'internal') $sql .= " " . MAIN_DB_PREFIX . "user as c,";
-        if ($source == 'external') $sql .= " " . MAIN_DB_PREFIX . "socpeople as c,";
-        $sql .= " " . MAIN_DB_PREFIX . "c_type_contact as tc";
-        $sql .= " WHERE ec.element_id = " . $id;
+        $sql .= " FROM ".MAIN_DB_PREFIX."element_contact as ec,";
+        if ($source == 'internal') $sql .= " ".MAIN_DB_PREFIX."user as c,";
+        if ($source == 'external') $sql .= " ".MAIN_DB_PREFIX."socpeople as c,";
+        $sql .= " ".MAIN_DB_PREFIX."c_type_contact as tc";
+        $sql .= " WHERE ec.element_id = ".$id;
         $sql .= " AND ec.fk_socpeople = c.rowid";
-        if ($source == 'internal') $sql .= " AND c.entity IN (" . getEntity('user') . ")";
-        if ($source == 'external') $sql .= " AND c.entity IN (" . getEntity('societe') . ")";
+        if ($source == 'internal') $sql .= " AND c.entity IN (".getEntity('user').")";
+        if ($source == 'external') $sql .= " AND c.entity IN (".getEntity('societe').")";
         $sql .= " AND ec.fk_c_type_contact = tc.rowid";
-        $sql .= " AND tc.element = '" . $element . "'";
-        $sql .= " AND tc.source = '" . $source . "'";
-        $sql .= " AND tc.code = '" . $code . "'";
+        $sql .= " AND tc.element = '".$element."'";
+        $sql .= " AND tc.source = '".$source."'";
+        $sql .= " AND tc.code = '".$code."'";
         $sql .= " AND tc.active = 1";
-        if ($status) $sql .= " AND ec.statut = " . $status;
+        if ($status) $sql .= " AND ec.statut = ".$status;
 
-        dol_syslog(get_class($this) . "::getIdContact", LOG_DEBUG);
+        dol_syslog(get_class($this)."::getIdContact", LOG_DEBUG);
         $resql = $this->db->query($sql);
         if ($resql) {
             while ($obj = $this->db->fetch_object($resql)) {
@@ -1142,7 +1142,7 @@ 
 
         if (empty($contactid)) return 0;
 
-        require_once DOL_DOCUMENT_ROOT . '/contact/class/contact.class.php';
+        require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
         $contact = new Contact($this->db);
         $result = $contact->fetch($contactid);
         $this->contact = $contact;
@@ -1165,7 +1165,7 @@ 
         if (empty($this->socid) && empty($this->fk_soc) && empty($this->fk_thirdparty) && empty($force_thirdparty_id))
             return 0;
 
-        require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
+        require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 
         $idtofetch = isset($this->socid) ? $this->socid : (isset($this->fk_soc) ? $this->fk_soc : $this->fk_thirdparty);
         if ($force_thirdparty_id)
@@ -1201,7 +1201,7 @@ 
             return 0;
         }
 
-        $sql = 'SELECT rowid FROM ' . MAIN_DB_PREFIX . $this->table_element . ' WHERE ' . $this->table_ref_field . ' LIKE "' . $this->db->escape($ref) . '" LIMIT 1';
+        $sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.$this->table_element.' WHERE '.$this->table_ref_field.' LIKE "'.$this->db->escape($ref).'" LIMIT 1';
 
         $query = $this->db->query($sql);
 
@@ -1228,7 +1228,7 @@ 
         // phpcs:enable
         global $conf;
 
-        dol_syslog(get_class($this) . '::fetch_barcode this->element=' . $this->element . ' this->barcode_type=' . $this->barcode_type);
+        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
@@ -1242,9 +1242,9 @@ 
             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);
+                $sql .= " FROM ".MAIN_DB_PREFIX."c_barcode_type";
+                $sql .= " WHERE rowid = ".$idtype;
+                dol_syslog(get_class($this).'::fetch_barcode', LOG_DEBUG);
                 $resql = $this->db->query($sql);
                 if ($resql) {
                     $obj = $this->db->fetch_object($resql);
@@ -1272,15 +1272,15 @@ 
     function fetch_projet()
     {
         // phpcs:enable
-        include_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
+        include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 
-        if (empty($this->fk_project) && !empty($this->fk_projet)) $this->fk_project = $this->fk_projet;    // For backward compatibility
+        if (empty($this->fk_project) && !empty($this->fk_projet)) $this->fk_project = $this->fk_projet; // For backward compatibility
         if (empty($this->fk_project)) return 0;
 
         $project = new Project($this->db);
         $result = $project->fetch($this->fk_project);
 
-        $this->projet = $project;    // deprecated
+        $this->projet = $project; // deprecated
         $this->project = $project;
         return $result;
     }
@@ -1295,7 +1295,7 @@ 
     function fetch_product()
     {
         // phpcs:enable
-        include_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
+        include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 
         if (empty($this->fk_product)) return 0;
 
@@ -1355,15 +1355,15 @@ 
 
         $result = false;
 
-        $sql = "SELECT rowid FROM " . MAIN_DB_PREFIX . $table;
-        $sql .= " WHERE " . $field . " = '" . $key . "'";
+        $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX.$table;
+        $sql .= " WHERE ".$field." = '".$key."'";
         if (!empty($element)) {
-            $sql .= " AND entity IN (" . getEntity($element) . ")";
+            $sql .= " AND entity IN (".getEntity($element).")";
         } else {
-            $sql .= " AND entity = " . $conf->entity;
+            $sql .= " AND entity = ".$conf->entity;
         }
 
-        dol_syslog(get_class($this) . '::fetchObjectFrom', LOG_DEBUG);
+        dol_syslog(get_class($this).'::fetchObjectFrom', LOG_DEBUG);
         $resql = $this->db->query($sql);
         if ($resql) {
             $row = $this->db->fetch_row($resql);
@@ -1390,10 +1390,10 @@ 
     {
         $result = false;
         if (!empty($id) && !empty($field) && !empty($table)) {
-            $sql = "SELECT " . $field . " FROM " . MAIN_DB_PREFIX . $table;
-            $sql .= " WHERE rowid = " . $id;
+            $sql = "SELECT ".$field." FROM ".MAIN_DB_PREFIX.$table;
+            $sql .= " WHERE rowid = ".$id;
 
-            dol_syslog(get_class($this) . '::getValueFrom', LOG_DEBUG);
+            dol_syslog(get_class($this).'::getValueFrom', LOG_DEBUG);
             $resql = $this->db->query($sql);
             if ($resql) {
                 $row = $this->db->fetch_row($resql);
@@ -1436,20 +1436,20 @@ 
         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 ";
+        $sql = "UPDATE ".MAIN_DB_PREFIX.$table." SET ";
 
-        if ($format == 'text') $sql .= $field . " = '" . $this->db->escape($value) . "'";
-        else if ($format == 'int') $sql .= $field . " = " . $this->db->escape($value);
-        else if ($format == 'date') $sql .= $field . " = " . ($value ? "'" . $this->db->idate($value) . "'" : "null");
+        if ($format == 'text') $sql .= $field." = '".$this->db->escape($value)."'";
+        else if ($format == 'int') $sql .= $field." = ".$this->db->escape($value);
+        else if ($format == 'date') $sql .= $field." = ".($value ? "'".$this->db->idate($value)."'" : "null");
 
         if ($fk_user_field) {
-            if (!empty($fuser) && is_object($fuser)) $sql .= ", " . $fk_user_field . " = " . $fuser->id;
-            elseif (empty($fuser) || $fuser != 'none') $sql .= ", " . $fk_user_field . " = " . $user->id;
+            if (!empty($fuser) && is_object($fuser)) $sql .= ", ".$fk_user_field." = ".$fuser->id;
+            elseif (empty($fuser) || $fuser != 'none') $sql .= ", ".$fk_user_field." = ".$user->id;
         }
 
-        $sql .= " WHERE " . $id_field . " = " . $id;
+        $sql .= " WHERE ".$id_field." = ".$id;
 
-        dol_syslog(get_class($this) . "::" . __FUNCTION__ . "", LOG_DEBUG);
+        dol_syslog(get_class($this)."::".__FUNCTION__."", LOG_DEBUG);
         $resql = $this->db->query($sql);
         if ($resql) {
             if ($trigkey) {
@@ -1459,7 +1459,7 @@ 
                 } 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) $result = $this->call_trigger($trigkey, (!empty($fuser) && is_object($fuser)) ? $fuser : $user); // This may set this->errors
                 if ($result < 0) $error++;
             }
 
@@ -1490,14 +1490,14 @@ 
     {
         if (empty($id) && empty($ref) && empty($morewhere)) return -1;
 
-        $sql = 'SELECT ' . $this->getFieldList();
-        $sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element;
+        $sql = 'SELECT '.$this->getFieldList();
+        $sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element;
 
-        if (!empty($id)) $sql .= ' WHERE rowid = ' . $id;
-        elseif (!empty($ref)) $sql .= " WHERE ref = " . $this->quote($ref, $this->fields['ref']);
-        else $sql .= ' WHERE 1 = 1';    // usage with empty id and empty ref is very rare
+        if (!empty($id)) $sql .= ' WHERE rowid = '.$id;
+        elseif (!empty($ref)) $sql .= " WHERE ref = ".$this->quote($ref, $this->fields['ref']);
+        else $sql .= ' WHERE 1 = 1'; // usage with empty id and empty ref is very rare
         if ($morewhere) $sql .= $morewhere;
-        $sql .= ' LIMIT 1';    // This is a fetch, to be sure to get only one record
+        $sql .= ' LIMIT 1'; // This is a fetch, to be sure to get only one record
 
         $res = $this->db->query($sql);
         if ($res) {
@@ -1537,7 +1537,7 @@ 
     {
         if (is_null($value)) return 'NULL';
         else if (preg_match('/^(int|double|real)/i', $fieldsentry['type'])) return $this->db->escape("$value");
-        else return "'" . $this->db->escape($value) . "'";
+        else return "'".$this->db->escape($value)."'";
     }
 
     /**
@@ -1561,10 +1561,10 @@ 
                     $this->{$field} = array();
                 }
             } elseif ($this->isInt($info)) {
-                if ($field == 'rowid') $this->id = (int)$obj->{$field};
-                else $this->{$field} = (int)$obj->{$field};
+                if ($field == 'rowid') $this->id = (int) $obj->{$field};
+                else $this->{$field} = (int) $obj->{$field};
             } elseif ($this->isFloat($info)) {
-                $this->{$field} = (double)$obj->{$field};
+                $this->{$field} = (double) $obj->{$field};
             } elseif ($this->isNull($info)) {
                 $val = $obj->{$field};
                 // zero is not null
@@ -1660,7 +1660,7 @@ 
         global $conf, $user;
 
         if (!$this->table_element) {
-            dol_print_error('', get_class($this) . "::load_previous_next_ref was called on objet with property table_element not defined");
+            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;
@@ -1674,39 +1674,39 @@ 
         $alias = 's';
         if ($this->element == 'societe') $alias = 'te';
 
-        $sql = "SELECT MAX(te." . $fieldid . ")";
-        $sql .= " FROM " . (empty($nodbprefix) ? MAIN_DB_PREFIX : '') . $this->table_element . " as te";
+        $sql = "SELECT MAX(te.".$fieldid.")";
+        $sql .= " FROM ".(empty($nodbprefix) ? MAIN_DB_PREFIX : '').$this->table_element." as te";
         if ($this->element == 'user' && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
-            $sql .= "," . MAIN_DB_PREFIX . "usergroup_user as ug";
-        }
-        if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) $sql .= ", " . MAIN_DB_PREFIX . "societe as s";    // If we need to link to societe to limit select to entity
-        else if ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql .= ", " . MAIN_DB_PREFIX . "societe as s";    // If we need to link to societe to limit select to socid
-        else if ($this->restrictiononfksoc == 2 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe as s ON te.fk_soc = s.rowid";    // If we need to link to societe to limit select to socid
-        if ($this->restrictiononfksoc && !$user->rights->societe->client->voir && !$socid) $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe_commerciaux as sc ON " . $alias . ".rowid = sc.fk_soc";
-        $sql .= " WHERE te." . $fieldid . " < '" . $this->db->escape($this->ref) . "'";  // ->ref must always be defined (set to id if field does not exists)
-        if ($this->restrictiononfksoc == 1 && !$user->rights->societe->client->voir && !$socid) $sql .= " AND sc.fk_user = " . $user->id;
-        if ($this->restrictiononfksoc == 2 && !$user->rights->societe->client->voir && !$socid) $sql .= " AND (sc.fk_user = " . $user->id . ' OR te.fk_soc IS NULL)';
+            $sql .= ",".MAIN_DB_PREFIX."usergroup_user as ug";
+        }
+        if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) $sql .= ", ".MAIN_DB_PREFIX."societe as s"; // If we need to link to societe to limit select to entity
+        else if ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe as s"; // If we need to link to societe to limit select to socid
+        else if ($this->restrictiononfksoc == 2 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON te.fk_soc = s.rowid"; // If we need to link to societe to limit select to socid
+        if ($this->restrictiononfksoc && !$user->rights->societe->client->voir && !$socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON ".$alias.".rowid = sc.fk_soc";
+        $sql .= " WHERE te.".$fieldid." < '".$this->db->escape($this->ref)."'"; // ->ref must always be defined (set to id if field does not exists)
+        if ($this->restrictiononfksoc == 1 && !$user->rights->societe->client->voir && !$socid) $sql .= " AND sc.fk_user = ".$user->id;
+        if ($this->restrictiononfksoc == 2 && !$user->rights->societe->client->voir && !$socid) $sql .= " AND (sc.fk_user = ".$user->id.' OR te.fk_soc IS NULL)';
         if (!empty($filter)) {
-            if (!preg_match('/^\s*AND/i', $filter)) $sql .= " AND ";   // For backward compatibility
+            if (!preg_match('/^\s*AND/i', $filter)) $sql .= " AND "; // For backward compatibility
             $sql .= $filter;
         }
-        if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) $sql .= ' AND te.fk_soc = s.rowid';            // If we need to link to societe to limit select to entity
-        else if ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql .= ' AND te.fk_soc = s.rowid';            // If we need to link to societe to limit select to socid
+        if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) $sql .= ' AND te.fk_soc = s.rowid'; // If we need to link to societe to limit select to entity
+        else if ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql .= ' AND te.fk_soc = s.rowid'; // If we need to link to societe to limit select to socid
         if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) {
             if ($this->element == 'user' && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
                 if (!empty($user->admin) && empty($user->entity) && $conf->entity == 1) {
                     $sql .= " AND te.entity IS NOT NULL"; // Show all users
                 } else {
                     $sql .= " AND ug.fk_user = te.rowid";
-                    $sql .= " AND ug.entity IN (" . getEntity($this->element) . ")";
+                    $sql .= " AND ug.entity IN (".getEntity($this->element).")";
                 }
             } else {
-                $sql .= ' AND te.entity IN (' . getEntity($this->element) . ')';
+                $sql .= ' AND te.entity IN ('.getEntity($this->element).')';
             }
         }
-        if ($this->restrictiononfksoc == 1 && $socid && $this->element != 'societe') $sql .= ' AND te.fk_soc = ' . $socid;
-        if ($this->restrictiononfksoc == 2 && $socid && $this->element != 'societe') $sql .= ' AND (te.fk_soc = ' . $socid . ' OR te.fk_soc IS NULL)';
-        if ($this->restrictiononfksoc && $socid && $this->element == 'societe') $sql .= ' AND te.rowid = ' . $socid;
+        if ($this->restrictiononfksoc == 1 && $socid && $this->element != 'societe') $sql .= ' AND te.fk_soc = '.$socid;
+        if ($this->restrictiononfksoc == 2 && $socid && $this->element != 'societe') $sql .= ' AND (te.fk_soc = '.$socid.' OR te.fk_soc IS NULL)';
+        if ($this->restrictiononfksoc && $socid && $this->element == 'societe') $sql .= ' AND te.rowid = '.$socid;
         //print 'socid='.$socid.' restrictiononfksoc='.$this->restrictiononfksoc.' ismultientitymanaged = '.$this->ismultientitymanaged.' filter = '.$filter.' -> '.$sql."<br>";
 
         $result = $this->db->query($sql);
@@ -1718,39 +1718,39 @@ 
         $this->ref_previous = $row[0];
 
 
-        $sql = "SELECT MIN(te." . $fieldid . ")";
-        $sql .= " FROM " . (empty($nodbprefix) ? MAIN_DB_PREFIX : '') . $this->table_element . " as te";
+        $sql = "SELECT MIN(te.".$fieldid.")";
+        $sql .= " FROM ".(empty($nodbprefix) ? MAIN_DB_PREFIX : '').$this->table_element." as te";
         if ($this->element == 'user' && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
-            $sql .= "," . MAIN_DB_PREFIX . "usergroup_user as ug";
-        }
-        if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) $sql .= ", " . MAIN_DB_PREFIX . "societe as s";    // If we need to link to societe to limit select to entity
-        else if ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql .= ", " . MAIN_DB_PREFIX . "societe as s";    // If we need to link to societe to limit select to socid
-        else if ($this->restrictiononfksoc == 2 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe as s ON te.fk_soc = s.rowid";    // If we need to link to societe to limit select to socid
-        if ($this->restrictiononfksoc && !$user->rights->societe->client->voir && !$socid) $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe_commerciaux as sc ON " . $alias . ".rowid = sc.fk_soc";
-        $sql .= " WHERE te." . $fieldid . " > '" . $this->db->escape($this->ref) . "'";  // ->ref must always be defined (set to id if field does not exists)
-        if ($this->restrictiononfksoc == 1 && !$user->rights->societe->client->voir && !$socid) $sql .= " AND sc.fk_user = " . $user->id;
-        if ($this->restrictiononfksoc == 2 && !$user->rights->societe->client->voir && !$socid) $sql .= " AND (sc.fk_user = " . $user->id . ' OR te.fk_soc IS NULL)';
+            $sql .= ",".MAIN_DB_PREFIX."usergroup_user as ug";
+        }
+        if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) $sql .= ", ".MAIN_DB_PREFIX."societe as s"; // If we need to link to societe to limit select to entity
+        else if ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe as s"; // If we need to link to societe to limit select to socid
+        else if ($this->restrictiononfksoc == 2 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON te.fk_soc = s.rowid"; // If we need to link to societe to limit select to socid
+        if ($this->restrictiononfksoc && !$user->rights->societe->client->voir && !$socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON ".$alias.".rowid = sc.fk_soc";
+        $sql .= " WHERE te.".$fieldid." > '".$this->db->escape($this->ref)."'"; // ->ref must always be defined (set to id if field does not exists)
+        if ($this->restrictiononfksoc == 1 && !$user->rights->societe->client->voir && !$socid) $sql .= " AND sc.fk_user = ".$user->id;
+        if ($this->restrictiononfksoc == 2 && !$user->rights->societe->client->voir && !$socid) $sql .= " AND (sc.fk_user = ".$user->id.' OR te.fk_soc IS NULL)';
         if (!empty($filter)) {
-            if (!preg_match('/^\s*AND/i', $filter)) $sql .= " AND ";   // For backward compatibility
+            if (!preg_match('/^\s*AND/i', $filter)) $sql .= " AND "; // For backward compatibility
             $sql .= $filter;
         }
-        if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) $sql .= ' AND te.fk_soc = s.rowid';            // If we need to link to societe to limit select to entity
-        else if ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql .= ' AND te.fk_soc = s.rowid';            // If we need to link to societe to limit select to socid
+        if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) $sql .= ' AND te.fk_soc = s.rowid'; // If we need to link to societe to limit select to entity
+        else if ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql .= ' AND te.fk_soc = s.rowid'; // If we need to link to societe to limit select to socid
         if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) {
             if ($this->element == 'user' && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
                 if (!empty($user->admin) && empty($user->entity) && $conf->entity == 1) {
                     $sql .= " AND te.entity IS NOT NULL"; // Show all users
                 } else {
                     $sql .= " AND ug.fk_user = te.rowid";
-                    $sql .= " AND ug.entity IN (" . getEntity($this->element) . ")";
+                    $sql .= " AND ug.entity IN (".getEntity($this->element).")";
                 }
             } else {
-                $sql .= ' AND te.entity IN (' . getEntity($this->element) . ')';
+                $sql .= ' AND te.entity IN ('.getEntity($this->element).')';
             }
         }
-        if ($this->restrictiononfksoc == 1 && $socid && $this->element != 'societe') $sql .= ' AND te.fk_soc = ' . $socid;
-        if ($this->restrictiononfksoc == 2 && $socid && $this->element != 'societe') $sql .= ' AND (te.fk_soc = ' . $socid . ' OR te.fk_soc IS NULL)';
-        if ($this->restrictiononfksoc && $socid && $this->element == 'societe') $sql .= ' AND te.rowid = ' . $socid;
+        if ($this->restrictiononfksoc == 1 && $socid && $this->element != 'societe') $sql .= ' AND te.fk_soc = '.$socid;
+        if ($this->restrictiononfksoc == 2 && $socid && $this->element != 'societe') $sql .= ' AND (te.fk_soc = '.$socid.' OR te.fk_soc IS NULL)';
+        if ($this->restrictiononfksoc && $socid && $this->element == 'societe') $sql .= ' AND te.rowid = '.$socid;
         //print 'socid='.$socid.' restrictiononfksoc='.$this->restrictiononfksoc.' ismultientitymanaged = '.$this->ismultientitymanaged.' filter = '.$filter.' -> '.$sql."<br>";
         // Rem: Bug in some mysql version: SELECT MIN(rowid) FROM llx_socpeople WHERE rowid > 1 when one row in database with rowid=1, returns 1 instead of null
 
@@ -1800,22 +1800,22 @@ 
     function setProject($projectid)
     {
         if (!$this->table_element) {
-            dol_syslog(get_class($this) . "::setProject was called on objet with property table_element not defined", LOG_ERR);
+            dol_syslog(get_class($this)."::setProject was called on objet with property table_element not defined", LOG_ERR);
             return -1;
         }
 
-        $sql = 'UPDATE ' . MAIN_DB_PREFIX . $this->table_element;
+        $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
         if ($this->table_element == 'actioncomm') {
-            if ($projectid) $sql .= ' SET fk_project = ' . $projectid;
+            if ($projectid) $sql .= ' SET fk_project = '.$projectid;
             else $sql .= ' SET fk_project = NULL';
-            $sql .= ' WHERE id = ' . $this->id;
+            $sql .= ' WHERE id = '.$this->id;
         } else {
-            if ($projectid) $sql .= ' SET fk_projet = ' . $projectid;
+            if ($projectid) $sql .= ' SET fk_projet = '.$projectid;
             else $sql .= ' SET fk_projet = NULL';
-            $sql .= ' WHERE rowid = ' . $this->id;
+            $sql .= ' WHERE rowid = '.$this->id;
         }
 
-        dol_syslog(get_class($this) . "::setProject", LOG_DEBUG);
+        dol_syslog(get_class($this)."::setProject", LOG_DEBUG);
         if ($this->db->query($sql)) {
             $this->fk_project = $projectid;
             return 1;
@@ -1835,16 +1835,16 @@ 
      */
     function setPaymentMethods($id)
     {
-        dol_syslog(get_class($this) . '::setPaymentMethods(' . $id . ')');
+        dol_syslog(get_class($this).'::setPaymentMethods('.$id.')');
         if ($this->statut >= 0 || $this->element == 'societe') {
             // TODO uniformize field name
             $fieldname = 'fk_mode_reglement';
             if ($this->element == 'societe') $fieldname = 'mode_reglement';
             if (get_class($this) == 'Fournisseur') $fieldname = 'mode_reglement_supplier';
 
-            $sql = 'UPDATE ' . MAIN_DB_PREFIX . $this->table_element;
-            $sql .= ' SET ' . $fieldname . ' = ' . $id;
-            $sql .= ' WHERE rowid=' . $this->id;
+            $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
+            $sql .= ' SET '.$fieldname.' = '.$id;
+            $sql .= ' WHERE rowid='.$this->id;
 
             if ($this->db->query($sql)) {
                 $this->mode_reglement_id = $id;
@@ -1852,13 +1852,13 @@ 
                 if (get_class($this) == 'Fournisseur') $this->mode_reglement_supplier_id = $id;
                 return 1;
             } else {
-                dol_syslog(get_class($this) . '::setPaymentMethods Erreur ' . $sql . ' - ' . $this->db->error());
+                dol_syslog(get_class($this).'::setPaymentMethods Erreur '.$sql.' - '.$this->db->error());
                 $this->error = $this->db->error();
                 return -1;
             }
         } else {
-            dol_syslog(get_class($this) . '::setPaymentMethods, status of the object is incompatible');
-            $this->error = 'Status of the object is incompatible ' . $this->statut;
+            dol_syslog(get_class($this).'::setPaymentMethods, status of the object is incompatible');
+            $this->error = 'Status of the object is incompatible '.$this->statut;
             return -2;
         }
     }
@@ -1873,13 +1873,13 @@ 
      */
     function setMulticurrencyCode($code)
     {
-        dol_syslog(get_class($this) . '::setMulticurrencyCode(' . $id . ')');
+        dol_syslog(get_class($this).'::setMulticurrencyCode('.$id.')');
         if ($this->statut >= 0 || $this->element == 'societe') {
             $fieldname = 'multicurrency_code';
 
-            $sql = 'UPDATE ' . MAIN_DB_PREFIX . $this->table_element;
-            $sql .= ' SET ' . $fieldname . " = '" . $this->db->escape($code) . "'";
-            $sql .= ' WHERE rowid=' . $this->id;
+            $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
+            $sql .= ' SET '.$fieldname." = '".$this->db->escape($code)."'";
+            $sql .= ' WHERE rowid='.$this->id;
 
             if ($this->db->query($sql)) {
                 $this->multicurrency_code = $code;
@@ -1889,13 +1889,13 @@ 
 
                 return 1;
             } else {
-                dol_syslog(get_class($this) . '::setMulticurrencyCode Erreur ' . $sql . ' - ' . $this->db->error());
+                dol_syslog(get_class($this).'::setMulticurrencyCode Erreur '.$sql.' - '.$this->db->error());
                 $this->error = $this->db->error();
                 return -1;
             }
         } else {
-            dol_syslog(get_class($this) . '::setMulticurrencyCode, status of the object is incompatible');
-            $this->error = 'Status of the object is incompatible ' . $this->statut;
+            dol_syslog(get_class($this).'::setMulticurrencyCode, status of the object is incompatible');
+            $this->error = 'Status of the object is incompatible '.$this->statut;
             return -2;
         }
     }
@@ -1909,13 +1909,13 @@ 
      */
     function setMulticurrencyRate($rate, $mode = 1)
     {
-        dol_syslog(get_class($this) . '::setMulticurrencyRate(' . $id . ')');
+        dol_syslog(get_class($this).'::setMulticurrencyRate('.$id.')');
         if ($this->statut >= 0 || $this->element == 'societe') {
             $fieldname = 'multicurrency_tx';
 
-            $sql = 'UPDATE ' . MAIN_DB_PREFIX . $this->table_element;
-            $sql .= ' SET ' . $fieldname . ' = ' . $rate;
-            $sql .= ' WHERE rowid=' . $this->id;
+            $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
+            $sql .= ' SET '.$fieldname.' = '.$rate;
+            $sql .= ' WHERE rowid='.$this->id;
 
             if ($this->db->query($sql)) {
                 $this->multicurrency_tx = $rate;
@@ -1975,7 +1975,7 @@ 
                                 );
                                 break;
                             default:
-                                dol_syslog(get_class($this) . '::setMulticurrencyRate no updateline defined', LOG_DEBUG);
+                                dol_syslog(get_class($this).'::setMulticurrencyRate no updateline defined', LOG_DEBUG);
                                 break;
                         }
                     }
@@ -1983,13 +1983,13 @@ 
 
                 return 1;
             } else {
-                dol_syslog(get_class($this) . '::setMulticurrencyRate Erreur ' . $sql . ' - ' . $this->db->error());
+                dol_syslog(get_class($this).'::setMulticurrencyRate Erreur '.$sql.' - '.$this->db->error());
                 $this->error = $this->db->error();
                 return -1;
             }
         } else {
-            dol_syslog(get_class($this) . '::setMulticurrencyRate, status of the object is incompatible');
-            $this->error = 'Status of the object is incompatible ' . $this->statut;
+            dol_syslog(get_class($this).'::setMulticurrencyRate, status of the object is incompatible');
+            $this->error = 'Status of the object is incompatible '.$this->statut;
             return -2;
         }
     }
@@ -2004,31 +2004,31 @@ 
      */
     function setPaymentTerms($id)
     {
-        dol_syslog(get_class($this) . '::setPaymentTerms(' . $id . ')');
+        dol_syslog(get_class($this).'::setPaymentTerms('.$id.')');
         if ($this->statut >= 0 || $this->element == 'societe') {
             // TODO uniformize field name
             $fieldname = 'fk_cond_reglement';
             if ($this->element == 'societe') $fieldname = 'cond_reglement';
             if (get_class($this) == 'Fournisseur') $fieldname = 'cond_reglement_supplier';
 
-            $sql = 'UPDATE ' . MAIN_DB_PREFIX . $this->table_element;
-            $sql .= ' SET ' . $fieldname . ' = ' . $id;
-            $sql .= ' WHERE rowid=' . $this->id;
+            $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
+            $sql .= ' SET '.$fieldname.' = '.$id;
+            $sql .= ' WHERE rowid='.$this->id;
 
             if ($this->db->query($sql)) {
                 $this->cond_reglement_id = $id;
                 // for supplier
                 if (get_class($this) == 'Fournisseur') $this->cond_reglement_supplier_id = $id;
-                $this->cond_reglement = $id;    // for compatibility
+                $this->cond_reglement = $id; // for compatibility
                 return 1;
             } else {
-                dol_syslog(get_class($this) . '::setPaymentTerms Erreur ' . $sql . ' - ' . $this->db->error());
+                dol_syslog(get_class($this).'::setPaymentTerms Erreur '.$sql.' - '.$this->db->error());
                 $this->error = $this->db->error();
                 return -1;
             }
         } else {
-            dol_syslog(get_class($this) . '::setPaymentTerms, status of the object is incompatible');
-            $this->error = 'Status of the object is incompatible ' . $this->statut;
+            dol_syslog(get_class($this).'::setPaymentTerms, status of the object is incompatible');
+            $this->error = 'Status of the object is incompatible '.$this->statut;
             return -2;
         }
     }
@@ -2045,15 +2045,15 @@ 
         $fieldname = 'fk_delivery_address';
         if ($this->element == 'delivery' || $this->element == 'shipping') $fieldname = 'fk_address';
 
-        $sql = "UPDATE " . MAIN_DB_PREFIX . $this->table_element . " SET " . $fieldname . " = " . $id;
-        $sql .= " WHERE rowid = " . $this->id . " AND fk_statut = 0";
+        $sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET ".$fieldname." = ".$id;
+        $sql .= " WHERE rowid = ".$this->id." AND fk_statut = 0";
 
         if ($this->db->query($sql)) {
             $this->fk_delivery_address = $id;
             return 1;
         } else {
             $this->error = $this->db->error();
-            dol_syslog(get_class($this) . '::setDeliveryAddress Erreur ' . $sql . ' - ' . $this->error);
+            dol_syslog(get_class($this).'::setDeliveryAddress Erreur '.$sql.' - '.$this->error);
             return -1;
         }
     }
@@ -2076,28 +2076,28 @@ 
         $error = 0;
 
         if (!$this->table_element) {
-            dol_syslog(get_class($this) . "::setShippingMethod was called on objet with property table_element not defined", LOG_ERR);
+            dol_syslog(get_class($this)."::setShippingMethod was called on objet with property table_element not defined", LOG_ERR);
             return -1;
         }
 
         $this->db->begin();
 
         if ($shipping_method_id < 0) $shipping_method_id = 'NULL';
-        dol_syslog(get_class($this) . '::setShippingMethod(' . $shipping_method_id . ')');
+        dol_syslog(get_class($this).'::setShippingMethod('.$shipping_method_id.')');
 
-        $sql = "UPDATE " . MAIN_DB_PREFIX . $this->table_element;
-        $sql .= " SET fk_shipping_method = " . $shipping_method_id;
-        $sql .= " WHERE rowid=" . $this->id;
+        $sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
+        $sql .= " SET fk_shipping_method = ".$shipping_method_id;
+        $sql .= " WHERE rowid=".$this->id;
         $resql = $this->db->query($sql);
         if (!$resql) {
-            dol_syslog(get_class($this) . '::setShippingMethod Error ', LOG_DEBUG);
+            dol_syslog(get_class($this).'::setShippingMethod Error ', LOG_DEBUG);
             $this->error = $this->db->lasterror();
             $error++;
         } else {
             if (!$notrigger) {
                 // Call trigger
                 $this->context = array('shippingmethodupdate' => 1);
-                $result = $this->call_trigger(strtoupper(get_class($this)) . '_MODIFY', $userused);
+                $result = $this->call_trigger(strtoupper(get_class($this)).'_MODIFY', $userused);
                 if ($result < 0) $error++;
                 // End call trigger
             }
@@ -2121,21 +2121,21 @@ 
     function setWarehouse($warehouse_id)
     {
         if (!$this->table_element) {
-            dol_syslog(get_class($this) . "::setWarehouse was called on objet with property table_element not defined", LOG_ERR);
+            dol_syslog(get_class($this)."::setWarehouse was called on objet with property table_element not defined", LOG_ERR);
             return -1;
         }
         if ($warehouse_id < 0) $warehouse_id = 'NULL';
-        dol_syslog(get_class($this) . '::setWarehouse(' . $warehouse_id . ')');
+        dol_syslog(get_class($this).'::setWarehouse('.$warehouse_id.')');
 
-        $sql = "UPDATE " . MAIN_DB_PREFIX . $this->table_element;
-        $sql .= " SET fk_warehouse = " . $warehouse_id;
-        $sql .= " WHERE rowid=" . $this->id;
+        $sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
+        $sql .= " SET fk_warehouse = ".$warehouse_id;
+        $sql .= " WHERE rowid=".$this->id;
 
         if ($this->db->query($sql)) {
             $this->warehouse_id = ($warehouse_id == 'NULL') ? null : $warehouse_id;
             return 1;
         } else {
-            dol_syslog(get_class($this) . '::setWarehouse Error ', LOG_DEBUG);
+            dol_syslog(get_class($this).'::setWarehouse Error ', LOG_DEBUG);
             $this->error = $this->db->error();
             return 0;
         }
@@ -2151,19 +2151,19 @@ 
     function setDocModel($user, $modelpdf)
     {
         if (!$this->table_element) {
-            dol_syslog(get_class($this) . "::setDocModel was called on objet with property table_element not defined", LOG_ERR);
+            dol_syslog(get_class($this)."::setDocModel was called on objet with property table_element not defined", LOG_ERR);
             return -1;
         }
 
         $newmodelpdf = dol_trunc($modelpdf, 255);
 
-        $sql = "UPDATE " . MAIN_DB_PREFIX . $this->table_element;
-        $sql .= " SET model_pdf = '" . $this->db->escape($newmodelpdf) . "'";
-        $sql .= " WHERE rowid = " . $this->id;
+        $sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
+        $sql .= " SET model_pdf = '".$this->db->escape($newmodelpdf)."'";
+        $sql .= " WHERE rowid = ".$this->id;
         // if ($this->element == 'facture') $sql.= " AND fk_statut < 2";
         // if ($this->element == 'propal')  $sql.= " AND fk_statut = 0";
 
-        dol_syslog(get_class($this) . "::setDocModel", LOG_DEBUG);
+        dol_syslog(get_class($this)."::setDocModel", LOG_DEBUG);
         $resql = $this->db->query($sql);
         if ($resql) {
             $this->modelpdf = $modelpdf;
@@ -2193,28 +2193,28 @@ 
         $error = 0;
 
         if (!$this->table_element) {
-            dol_syslog(get_class($this) . "::setBankAccount was called on objet with property table_element not defined", LOG_ERR);
+            dol_syslog(get_class($this)."::setBankAccount was called on objet with property table_element not defined", LOG_ERR);
             return -1;
         }
         $this->db->begin();
 
         if ($fk_account < 0) $fk_account = 'NULL';
-        dol_syslog(get_class($this) . '::setBankAccount(' . $fk_account . ')');
+        dol_syslog(get_class($this).'::setBankAccount('.$fk_account.')');
 
-        $sql = "UPDATE " . MAIN_DB_PREFIX . $this->table_element;
-        $sql .= " SET fk_account = " . $fk_account;
-        $sql .= " WHERE rowid=" . $this->id;
+        $sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
+        $sql .= " SET fk_account = ".$fk_account;
+        $sql .= " WHERE rowid=".$this->id;
 
         $resql = $this->db->query($sql);
         if (!$resql) {
-            dol_syslog(get_class($this) . '::setBankAccount Error ' . $sql . ' - ' . $this->db->error());
+            dol_syslog(get_class($this).'::setBankAccount Error '.$sql.' - '.$this->db->error());
             $this->error = $this->db->lasterror();
             $error++;
         } else {
             if (!$notrigger) {
                 // Call trigger
                 $this->context = array('bankaccountupdate' => 1);
-                $result = $this->call_trigger(strtoupper(get_class($this)) . '_MODIFY', $userused);
+                $result = $this->call_trigger(strtoupper(get_class($this)).'_MODIFY', $userused);
                 if ($result < 0) $error++;
                 // End call trigger
             }
@@ -2265,22 +2265,22 @@ 
     {
         // phpcs:enable
         if (!$this->table_element_line) {
-            dol_syslog(get_class($this) . "::line_order was called on objet with property table_element_line not defined", LOG_ERR);
+            dol_syslog(get_class($this)."::line_order was called on objet with property table_element_line not defined", LOG_ERR);
             return -1;
         }
         if (!$this->fk_element) {
-            dol_syslog(get_class($this) . "::line_order was called on objet with property fk_element not defined", LOG_ERR);
+            dol_syslog(get_class($this)."::line_order was called on objet with property fk_element not defined", LOG_ERR);
             return -1;
         }
 
         // Count number of lines to reorder (according to choice $renum)
         $nl = 0;
-        $sql = 'SELECT count(rowid) FROM ' . MAIN_DB_PREFIX . $this->table_element_line;
-        $sql .= ' WHERE ' . $this->fk_element . '=' . $this->id;
+        $sql = 'SELECT count(rowid) FROM '.MAIN_DB_PREFIX.$this->table_element_line;
+        $sql .= ' WHERE '.$this->fk_element.'='.$this->id;
         if (!$renum) $sql .= ' AND rang = 0';
         if ($renum) $sql .= ' AND rang <> 0';
 
-        dol_syslog(get_class($this) . "::line_order", LOG_DEBUG);
+        dol_syslog(get_class($this)."::line_order", LOG_DEBUG);
         $resql = $this->db->query($sql);
         if ($resql) {
             $row = $this->db->fetch_row($resql);
@@ -2292,19 +2292,19 @@ 
             $rows = array();
 
             // We first search all lines that are parent lines (for multilevel details lines)
-            $sql = 'SELECT rowid FROM ' . MAIN_DB_PREFIX . $this->table_element_line;
-            $sql .= ' WHERE ' . $this->fk_element . ' = ' . $this->id;
+            $sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.$this->table_element_line;
+            $sql .= ' WHERE '.$this->fk_element.' = '.$this->id;
             if ($fk_parent_line) $sql .= ' AND fk_parent_line IS NULL';
-            $sql .= ' ORDER BY rang ASC, rowid ' . $rowidorder;
+            $sql .= ' ORDER BY rang ASC, rowid '.$rowidorder;
 
-            dol_syslog(get_class($this) . "::line_order search all parent lines", LOG_DEBUG);
+            dol_syslog(get_class($this)."::line_order search all parent lines", LOG_DEBUG);
             $resql = $this->db->query($sql);
             if ($resql) {
                 $i = 0;
                 $num = $this->db->num_rows($resql);
                 while ($i < $num) {
                     $row = $this->db->fetch_row($resql);
-                    $rows[] = $row[0];    // Add parent line into array rows
+                    $rows[] = $row[0]; // Add parent line into array rows
                     $childrens = $this->getChildrenOfLine($row[0]);
                     if (!empty($childrens)) {
                         foreach ($childrens as $child) {
@@ -2339,12 +2339,12 @@ 
     {
         $rows = array();
 
-        $sql = 'SELECT rowid FROM ' . MAIN_DB_PREFIX . $this->table_element_line;
-        $sql .= ' WHERE ' . $this->fk_element . ' = ' . $this->id;
-        $sql .= ' AND fk_parent_line = ' . $id;
+        $sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.$this->table_element_line;
+        $sql .= ' WHERE '.$this->fk_element.' = '.$this->id;
+        $sql .= ' AND fk_parent_line = '.$id;
         $sql .= ' ORDER BY rang ASC';
 
-        dol_syslog(get_class($this) . "::getChildrenOfLine search children lines for line " . $id . "", LOG_DEBUG);
+        dol_syslog(get_class($this)."::getChildrenOfLine search children lines for line ".$id."", LOG_DEBUG);
         $resql = $this->db->query($sql);
         if ($resql) {
             $i = 0;
@@ -2373,10 +2373,10 @@ 
         $fieldposition = 'rang';
         if (in_array($this->table_element_line, array('ecm_files', 'emailcollector_emailcollectoraction'))) $fieldposition = 'position';
 
-        $sql = 'UPDATE ' . MAIN_DB_PREFIX . $this->table_element_line . ' SET ' . $fieldposition . ' = ' . $rang;
-        $sql .= ' WHERE rowid = ' . $rowid;
+        $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element_line.' SET '.$fieldposition.' = '.$rang;
+        $sql .= ' WHERE rowid = '.$rowid;
 
-        dol_syslog(get_class($this) . "::updateRangOfLine", LOG_DEBUG);
+        dol_syslog(get_class($this)."::updateRangOfLine", LOG_DEBUG);
         if (!$this->db->query($sql)) {
             dol_print_error($this->db);
         }
@@ -2392,10 +2392,10 @@ 
      */
     function getRangOfLine($rowid)
     {
-        $sql = 'SELECT rang FROM ' . MAIN_DB_PREFIX . $this->table_element_line;
-        $sql .= ' WHERE rowid =' . $rowid;
+        $sql = 'SELECT rang FROM '.MAIN_DB_PREFIX.$this->table_element_line;
+        $sql .= ' WHERE rowid ='.$rowid;
 
-        dol_syslog(get_class($this) . "::getRangOfLine", LOG_DEBUG);
+        dol_syslog(get_class($this)."::getRangOfLine", LOG_DEBUG);
         $resql = $this->db->query($sql);
         if ($resql) {
             $row = $this->db->fetch_row($resql);
@@ -2416,12 +2416,12 @@ 
             $fieldposition = 'rang';
             if (in_array($this->table_element_line, array('ecm_files', 'emailcollector_emailcollectoraction'))) $fieldposition = 'position';
 
-            $sql = 'UPDATE ' . MAIN_DB_PREFIX . $this->table_element_line . ' SET ' . $fieldposition . ' = ' . $rang;
-            $sql .= ' WHERE ' . $this->fk_element . ' = ' . $this->id;
-            $sql .= ' AND rang = ' . ($rang - 1);
+            $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element_line.' SET '.$fieldposition.' = '.$rang;
+            $sql .= ' WHERE '.$this->fk_element.' = '.$this->id;
+            $sql .= ' AND rang = '.($rang - 1);
             if ($this->db->query($sql)) {
-                $sql = 'UPDATE ' . MAIN_DB_PREFIX . $this->table_element_line . ' SET ' . $fieldposition . ' = ' . ($rang - 1);
-                $sql .= ' WHERE rowid = ' . $rowid;
+                $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element_line.' SET '.$fieldposition.' = '.($rang - 1);
+                $sql .= ' WHERE rowid = '.$rowid;
                 if (!$this->db->query($sql)) {
                     dol_print_error($this->db);
                 }
@@ -2464,11 +2464,11 @@ 
         // phpcs:enable
         // Search the last rang with fk_parent_line
         if ($fk_parent_line) {
-            $sql = 'SELECT max(rang) FROM ' . MAIN_DB_PREFIX . $this->table_element_line;
-            $sql .= ' WHERE ' . $this->fk_element . ' = ' . $this->id;
-            $sql .= ' AND fk_parent_line = ' . $fk_parent_line;
+            $sql = 'SELECT max(rang) FROM '.MAIN_DB_PREFIX.$this->table_element_line;
+            $sql .= ' WHERE '.$this->fk_element.' = '.$this->id;
+            $sql .= ' AND fk_parent_line = '.$fk_parent_line;
 
-            dol_syslog(get_class($this) . "::line_max", LOG_DEBUG);
+            dol_syslog(get_class($this)."::line_max", LOG_DEBUG);
             $resql = $this->db->query($sql);
             if ($resql) {
                 $row = $this->db->fetch_row($resql);
@@ -2480,10 +2480,10 @@ 
             }
         } // If not, search the last rang of element
         else {
-            $sql = 'SELECT max(rang) FROM ' . MAIN_DB_PREFIX . $this->table_element_line;
-            $sql .= ' WHERE ' . $this->fk_element . ' = ' . $this->id;
+            $sql = 'SELECT max(rang) FROM '.MAIN_DB_PREFIX.$this->table_element_line;
+            $sql .= ' WHERE '.$this->fk_element.' = '.$this->id;
 
-            dol_syslog(get_class($this) . "::line_max", LOG_DEBUG);
+            dol_syslog(get_class($this)."::line_max", LOG_DEBUG);
             $resql = $this->db->query($sql);
             if ($resql) {
                 $row = $this->db->fetch_row($resql);
@@ -2506,12 +2506,12 @@ 
             $fieldposition = 'rang';
             if (in_array($this->table_element_line, array('ecm_files', 'emailcollector_emailcollectoraction'))) $fieldposition = 'position';
 
-            $sql = 'UPDATE ' . MAIN_DB_PREFIX . $this->table_element_line . ' SET ' . $fieldposition . ' = ' . $rang;
-            $sql .= ' WHERE ' . $this->fk_element . ' = ' . $this->id;
-            $sql .= ' AND rang = ' . ($rang + 1);
+            $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element_line.' SET '.$fieldposition.' = '.$rang;
+            $sql .= ' WHERE '.$this->fk_element.' = '.$this->id;
+            $sql .= ' AND rang = '.($rang + 1);
             if ($this->db->query($sql)) {
-                $sql = 'UPDATE ' . MAIN_DB_PREFIX . $this->table_element_line . ' SET ' . $fieldposition . ' = ' . ($rang + 1);
-                $sql .= ' WHERE rowid = ' . $rowid;
+                $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element_line.' SET '.$fieldposition.' = '.($rang + 1);
+                $sql .= ' WHERE rowid = '.$rowid;
                 if (!$this->db->query($sql)) {
                     dol_print_error($this->db);
                 }
@@ -2544,9 +2544,9 @@ 
      */
     function getIdOfLine($rang)
     {
-        $sql = 'SELECT rowid FROM ' . MAIN_DB_PREFIX . $this->table_element_line;
-        $sql .= ' WHERE ' . $this->fk_element . ' = ' . $this->id;
-        $sql .= ' AND rang = ' . $rang;
+        $sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.$this->table_element_line;
+        $sql .= ' WHERE '.$this->fk_element.' = '.$this->id;
+        $sql .= ' AND rang = '.$rang;
         $resql = $this->db->query($sql);
         if ($resql) {
             $row = $this->db->fetch_row($resql);
@@ -2564,15 +2564,15 @@ 
     {
         // phpcs:enable
         if (!$this->table_element) {
-            dol_syslog(get_class($this) . "::update_ref_ext was called on objet with property table_element not defined", LOG_ERR);
+            dol_syslog(get_class($this)."::update_ref_ext was called on objet with property table_element not defined", LOG_ERR);
             return -1;
         }
 
-        $sql = 'UPDATE ' . MAIN_DB_PREFIX . $this->table_element;
-        $sql .= " SET ref_ext = '" . $this->db->escape($ref_ext) . "'";
-        $sql .= " WHERE " . (isset($this->table_rowid) ? $this->table_rowid : 'rowid') . " = " . $this->id;
+        $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
+        $sql .= " SET ref_ext = '".$this->db->escape($ref_ext)."'";
+        $sql .= " WHERE ".(isset($this->table_rowid) ? $this->table_rowid : 'rowid')." = ".$this->id;
 
-        dol_syslog(get_class($this) . "::update_ref_ext", LOG_DEBUG);
+        dol_syslog(get_class($this)."::update_ref_ext", LOG_DEBUG);
         if ($this->db->query($sql)) {
             $this->ref_ext = $ref_ext;
             return 1;
@@ -2610,29 +2610,29 @@ 
 
         if (!$this->table_element) {
             $this->error = 'update_note was called on objet with property table_element not defined';
-            dol_syslog(get_class($this) . "::update_note was called on objet with property table_element not defined", LOG_ERR);
+            dol_syslog(get_class($this)."::update_note was called on objet with property table_element not defined", LOG_ERR);
             return -1;
         }
         if (!in_array($suffix, array('', '_public', '_private'))) {
             $this->error = 'update_note Parameter suffix must be empty, \'_private\' or \'_public\'';
-            dol_syslog(get_class($this) . "::update_note Parameter suffix must be empty, '_private' or '_public'", LOG_ERR);
+            dol_syslog(get_class($this)."::update_note Parameter suffix must be empty, '_private' or '_public'", LOG_ERR);
             return -2;
         }
         // Special cas
         //var_dump($this->table_element);exit;
         if ($this->table_element == 'product') $suffix = '';
 
-        $sql = 'UPDATE ' . MAIN_DB_PREFIX . $this->table_element;
-        $sql .= " SET note" . $suffix . " = " . (!empty($note) ? ("'" . $this->db->escape($note) . "'") : "NULL");
-        $sql .= " ," . (in_array($this->table_element, array('actioncomm', 'adherent', 'advtargetemailing', 'cronjob', 'establishment')) ? "fk_user_mod" : "fk_user_modif") . " = " . $user->id;
-        $sql .= " WHERE rowid =" . $this->id;
+        $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
+        $sql .= " SET note".$suffix." = ".(!empty($note) ? ("'".$this->db->escape($note)."'") : "NULL");
+        $sql .= " ,".(in_array($this->table_element, array('actioncomm', 'adherent', 'advtargetemailing', 'cronjob', 'establishment')) ? "fk_user_mod" : "fk_user_modif")." = ".$user->id;
+        $sql .= " WHERE rowid =".$this->id;
 
-        dol_syslog(get_class($this) . "::update_note", LOG_DEBUG);
+        dol_syslog(get_class($this)."::update_note", LOG_DEBUG);
         if ($this->db->query($sql)) {
             if ($suffix == '_public') $this->note_public = $note;
             else if ($suffix == '_private') $this->note_private = $note;
             else {
-                $this->note = $note;      // deprecated
+                $this->note = $note; // deprecated
                 $this->note_private = $note;
             }
             return 1;
@@ -2682,9 +2682,9 @@ 
             }
         }
 
-        include_once DOL_DOCUMENT_ROOT . '/core/lib/price.lib.php';
+        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;
@@ -2707,20 +2707,20 @@ 
             $fieldup = 'value_unit';
         }
 
-        $sql = 'SELECT rowid, qty, ' . $fieldup . ' as up, remise_percent, total_ht, ' . $fieldtva . ' as total_tva, total_ttc, ' . $fieldlocaltax1 . ' as total_localtax1, ' . $fieldlocaltax2 . ' as total_localtax2,';
+        $sql = 'SELECT rowid, qty, '.$fieldup.' as up, remise_percent, total_ht, '.$fieldtva.' as total_tva, total_ttc, '.$fieldlocaltax1.' as total_localtax1, '.$fieldlocaltax2.' as total_localtax2,';
         $sql .= ' tva_tx as vatrate, localtax1_tx, localtax2_tx, localtax1_type, localtax2_type, info_bits, product_type';
         if ($this->table_element_line == 'facturedet') $sql .= ', situation_percent';
         $sql .= ', multicurrency_total_ht, multicurrency_total_tva, multicurrency_total_ttc';
-        $sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element_line;
-        $sql .= ' WHERE ' . $this->fk_element . ' = ' . $this->id;
+        $sql .= ' 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
+        $sql .= ' ORDER by rowid'; // We want to be sure to always use same order of line to not change lines differently when option MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND is used
 
-        dol_syslog(get_class($this) . "::update_price", LOG_DEBUG);
+        dol_syslog(get_class($this)."::update_price", LOG_DEBUG);
         $resql = $this->db->query($sql);
         if ($resql) {
             $this->total_ht = 0;
@@ -2750,8 +2750,8 @@ 
                     $tmpcal = calcul_price_total($obj->qty, $obj->up, $obj->remise_percent, $obj->vatrate, $obj->localtax1_tx, $obj->localtax2_tx, 0, 'HT', $obj->info_bits, $obj->product_type, $seller, $localtax_array, (isset($obj->situation_percent) ? $obj->situation_percent : 100), $multicurrency_tx);
                     $diff = price2num($tmpcal[1] - $obj->total_tva, 'MT', 1);
                     if ($diff) {
-                        $sqlfix = "UPDATE " . MAIN_DB_PREFIX . $this->table_element_line . " SET " . $fieldtva . " = " . $tmpcal[1] . ", total_ttc = " . $tmpcal[2] . " WHERE rowid = " . $obj->rowid;
-                        dol_syslog('We found unconsistent data into detailed line (difference of ' . $diff . ') for line rowid = ' . $obj->rowid . " (total vat of line calculated=" . $tmpcal[1] . ", database=" . $obj->total_tva . "). We fix the total_vat and total_ttc of line by running sqlfix = " . $sqlfix);
+                        $sqlfix = "UPDATE ".MAIN_DB_PREFIX.$this->table_element_line." SET ".$fieldtva." = ".$tmpcal[1].", total_ttc = ".$tmpcal[2]." WHERE rowid = ".$obj->rowid;
+                        dol_syslog('We found unconsistent data into detailed line (difference of '.$diff.') for line rowid = '.$obj->rowid." (total vat of line calculated=".$tmpcal[1].", database=".$obj->total_tva."). We fix the total_vat and total_ttc of line by running sqlfix = ".$sqlfix);
                         $resqlfix = $this->db->query($sqlfix);
                         if (!$resqlfix) dol_print_error($this->db, 'Failed to update line');
                         $obj->total_tva = $tmpcal[1];
@@ -2760,12 +2760,12 @@ 
                     }
                 }
 
-                $this->total_ht += $obj->total_ht;        // The field visible at end of line detail
+                $this->total_ht += $obj->total_ht; // The field visible at end of line detail
                 $this->total_tva += $obj->total_tva;
                 $this->total_localtax1 += $obj->total_localtax1;
                 $this->total_localtax2 += $obj->total_localtax2;
                 $this->total_ttc += $obj->total_ttc;
-                $this->multicurrency_total_ht += $obj->multicurrency_total_ht;        // The field visible at end of line detail
+                $this->multicurrency_total_ht += $obj->multicurrency_total_ht; // The field visible at end of line detail
                 $this->multicurrency_total_tva += $obj->multicurrency_total_tva;
                 $this->multicurrency_total_ttc += $obj->multicurrency_total_ttc;
 
@@ -2786,8 +2786,8 @@ 
                             dol_syslog('A rounding difference was detected into TOTAL but is too high to be corrected', LOG_WARNING);
                             exit;
                         }
-                        $sqlfix = "UPDATE " . MAIN_DB_PREFIX . $this->table_element_line . " SET " . $fieldtva . " = " . ($obj->total_tva - $diff) . ", total_ttc = " . ($obj->total_ttc - $diff) . " WHERE rowid = " . $obj->rowid;
-                        dol_syslog('We found a difference of ' . $diff . ' for line rowid = ' . $obj->rowid . ". We fix the total_vat and total_ttc of line by running sqlfix = " . $sqlfix);
+                        $sqlfix = "UPDATE ".MAIN_DB_PREFIX.$this->table_element_line." SET ".$fieldtva." = ".($obj->total_tva - $diff).", total_ttc = ".($obj->total_ttc - $diff)." WHERE rowid = ".$obj->rowid;
+                        dol_syslog('We found a difference of '.$diff.' for line rowid = '.$obj->rowid.". We fix the total_vat and total_ttc of line by running sqlfix = ".$sqlfix);
                         $resqlfix = $this->db->query($sqlfix);
                         if (!$resqlfix) dol_print_error($this->db, 'Failed to update line');
                         $this->total_tva -= $diff;
@@ -2836,19 +2836,19 @@ 
             if ($this->element == 'supplier_proposal') $fieldttc = 'total';
 
             if (empty($nodatabaseupdate)) {
-                $sql = 'UPDATE ' . MAIN_DB_PREFIX . $this->table_element . ' SET';
-                $sql .= " " . $fieldht . "='" . price2num($this->total_ht) . "',";
-                $sql .= " " . $fieldtva . "='" . price2num($this->total_tva) . "',";
-                $sql .= " " . $fieldlocaltax1 . "='" . price2num($this->total_localtax1) . "',";
-                $sql .= " " . $fieldlocaltax2 . "='" . price2num($this->total_localtax2) . "',";
-                $sql .= " " . $fieldttc . "='" . price2num($this->total_ttc) . "'";
-                $sql .= ", multicurrency_total_ht='" . price2num($this->multicurrency_total_ht, 'MT', 1) . "'";
-                $sql .= ", multicurrency_total_tva='" . price2num($this->multicurrency_total_tva, 'MT', 1) . "'";
-                $sql .= ", multicurrency_total_ttc='" . price2num($this->multicurrency_total_ttc, 'MT', 1) . "'";
-                $sql .= ' WHERE rowid = ' . $this->id;
-
-
-                dol_syslog(get_class($this) . "::update_price", LOG_DEBUG);
+                $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element.' SET';
+                $sql .= " ".$fieldht."='".price2num($this->total_ht)."',";
+                $sql .= " ".$fieldtva."='".price2num($this->total_tva)."',";
+                $sql .= " ".$fieldlocaltax1."='".price2num($this->total_localtax1)."',";
+                $sql .= " ".$fieldlocaltax2."='".price2num($this->total_localtax2)."',";
+                $sql .= " ".$fieldttc."='".price2num($this->total_ttc)."'";
+                $sql .= ", multicurrency_total_ht='".price2num($this->multicurrency_total_ht, 'MT', 1)."'";
+                $sql .= ", multicurrency_total_tva='".price2num($this->multicurrency_total_tva, 'MT', 1)."'";
+                $sql .= ", multicurrency_total_ttc='".price2num($this->multicurrency_total_ttc, 'MT', 1)."'";
+                $sql .= ' WHERE rowid = '.$this->id;
+
+
+                dol_syslog(get_class($this)."::update_price", LOG_DEBUG);
                 $resql = $this->db->query($sql);
                 if (!$resql) {
                     $error++;
@@ -2889,19 +2889,19 @@ 
         if ($origin == 'supplierorder') $origin = 'order_supplier';
         $this->db->begin();
 
-        $sql = "INSERT INTO " . MAIN_DB_PREFIX . "element_element (";
+        $sql = "INSERT INTO ".MAIN_DB_PREFIX."element_element (";
         $sql .= "fk_source";
         $sql .= ", sourcetype";
         $sql .= ", fk_target";
         $sql .= ", targettype";
         $sql .= ") VALUES (";
         $sql .= $origin_id;
-        $sql .= ", '" . $this->db->escape($origin) . "'";
-        $sql .= ", " . $this->id;
-        $sql .= ", '" . $this->db->escape($this->element) . "'";
+        $sql .= ", '".$this->db->escape($origin)."'";
+        $sql .= ", ".$this->id;
+        $sql .= ", '".$this->db->escape($this->element)."'";
         $sql .= ")";
 
-        dol_syslog(get_class($this) . "::add_object_linked", LOG_DEBUG);
+        dol_syslog(get_class($this)."::add_object_linked", LOG_DEBUG);
         if ($this->db->query($sql)) {
             $this->db->commit();
             return 1;
@@ -2950,11 +2950,11 @@ 
         $withsourcetype = false;
 
         if (!empty($sourceid) && !empty($sourcetype) && empty($targetid)) {
-            $justsource = true;  // the source (id and type) is a search criteria
+            $justsource = true; // the source (id and type) is a search criteria
             if (!empty($targettype)) $withtargettype = true;
         }
         if (!empty($targetid) && !empty($targettype) && empty($sourceid)) {
-            $justtarget = true;  // the target (id and type) is a search criteria
+            $justtarget = true; // the target (id and type) is a search criteria
             if (!empty($sourcetype)) $withsourcetype = true;
         }
 
@@ -2971,23 +2971,23 @@ 
 
         // Links between objects are stored in table element_element
         $sql = 'SELECT rowid, fk_source, sourcetype, fk_target, targettype';
-        $sql .= ' FROM ' . MAIN_DB_PREFIX . 'element_element';
+        $sql .= ' FROM '.MAIN_DB_PREFIX.'element_element';
         $sql .= " WHERE ";
         if ($justsource || $justtarget) {
             if ($justsource) {
-                $sql .= "fk_source = " . $sourceid . " AND sourcetype = '" . $sourcetype . "'";
-                if ($withtargettype) $sql .= " AND targettype = '" . $targettype . "'";
+                $sql .= "fk_source = ".$sourceid." AND sourcetype = '".$sourcetype."'";
+                if ($withtargettype) $sql .= " AND targettype = '".$targettype."'";
             } else if ($justtarget) {
-                $sql .= "fk_target = " . $targetid . " AND targettype = '" . $targettype . "'";
-                if ($withsourcetype) $sql .= " AND sourcetype = '" . $sourcetype . "'";
+                $sql .= "fk_target = ".$targetid." AND targettype = '".$targettype."'";
+                if ($withsourcetype) $sql .= " AND sourcetype = '".$sourcetype."'";
             }
         } else {
-            $sql .= "(fk_source = " . $sourceid . " AND sourcetype = '" . $sourcetype . "')";
-            $sql .= " " . $clause . " (fk_target = " . $targetid . " AND targettype = '" . $targettype . "')";
+            $sql .= "(fk_source = ".$sourceid." AND sourcetype = '".$sourcetype."')";
+            $sql .= " ".$clause." (fk_target = ".$targetid." AND targettype = '".$targettype."')";
         }
-        $sql .= ' ORDER BY ' . $orderby;
+        $sql .= ' ORDER BY '.$orderby;
 
-        dol_syslog(get_class($this) . "::fetchObjectLink", LOG_DEBUG);
+        dol_syslog(get_class($this)."::fetchObjectLink", LOG_DEBUG);
         $resql = $this->db->query($sql);
         if ($resql) {
             $num = $this->db->num_rows($resql);
@@ -3023,7 +3023,7 @@ 
                         $subelement = $regs[2];
                     }
 
-                    $classpath = $element . '/class';
+                    $classpath = $element.'/class';
                     // To work with non standard classpath or module name
                     if ($objecttype == 'facture') {
                         $classpath = 'compta/facture/class';
@@ -3081,7 +3081,7 @@ 
                     // Here $module, $classfile and $classname are set
                     if ($conf->$module->enabled && (($element != $this->element) || $alsosametype)) {
                         if ($loadalsoobjects) {
-                            dol_include_once('/' . $classpath . '/' . $classfile . '.class.php');
+                            dol_include_once('/'.$classpath.'/'.$classfile.'.class.php');
                             //print '/'.$classpath.'/'.$classfile.'.class.php '.class_exists($classname);
                             if (class_exists($classname)) {
                                 foreach ($objectids as $i => $objectid)    // $i is rowid into llx_element_element
@@ -3124,20 +3124,20 @@ 
         if (!empty($sourceid) && !empty($sourcetype) && empty($targetid) && empty($targettype)) $updatesource = true;
         else if (empty($sourceid) && empty($sourcetype) && !empty($targetid) && !empty($targettype)) $updatetarget = true;
 
-        $sql = "UPDATE " . MAIN_DB_PREFIX . "element_element SET ";
+        $sql = "UPDATE ".MAIN_DB_PREFIX."element_element SET ";
         if ($updatesource) {
-            $sql .= "fk_source = " . $sourceid;
-            $sql .= ", sourcetype = '" . $this->db->escape($sourcetype) . "'";
-            $sql .= " WHERE fk_target = " . $this->id;
-            $sql .= " AND targettype = '" . $this->db->escape($this->element) . "'";
+            $sql .= "fk_source = ".$sourceid;
+            $sql .= ", sourcetype = '".$this->db->escape($sourcetype)."'";
+            $sql .= " WHERE fk_target = ".$this->id;
+            $sql .= " AND targettype = '".$this->db->escape($this->element)."'";
         } else if ($updatetarget) {
-            $sql .= "fk_target = " . $targetid;
-            $sql .= ", targettype = '" . $this->db->escape($targettype) . "'";
-            $sql .= " WHERE fk_source = " . $this->id;
-            $sql .= " AND sourcetype = '" . $this->db->escape($this->element) . "'";
+            $sql .= "fk_target = ".$targetid;
+            $sql .= ", targettype = '".$this->db->escape($targettype)."'";
+            $sql .= " WHERE fk_source = ".$this->id;
+            $sql .= " AND sourcetype = '".$this->db->escape($this->element)."'";
         }
 
-        dol_syslog(get_class($this) . "::updateObjectLinked", LOG_DEBUG);
+        dol_syslog(get_class($this)."::updateObjectLinked", LOG_DEBUG);
         if ($this->db->query($sql)) {
             return 1;
         } else {
@@ -3170,25 +3170,25 @@ 
         $targetid = (!empty($targetid) ? $targetid : $this->id);
         $targettype = (!empty($targettype) ? $targettype : $this->element);
 
-        $sql = "DELETE FROM " . MAIN_DB_PREFIX . "element_element";
+        $sql = "DELETE FROM ".MAIN_DB_PREFIX."element_element";
         $sql .= " WHERE";
         if ($rowid > 0) {
-            $sql .= " rowid = " . $rowid;
+            $sql .= " rowid = ".$rowid;
         } else {
             if ($deletesource) {
-                $sql .= " fk_source = " . $sourceid . " AND sourcetype = '" . $this->db->escape($sourcetype) . "'";
-                $sql .= " AND fk_target = " . $this->id . " AND targettype = '" . $this->db->escape($this->element) . "'";
+                $sql .= " fk_source = ".$sourceid." AND sourcetype = '".$this->db->escape($sourcetype)."'";
+                $sql .= " AND fk_target = ".$this->id." AND targettype = '".$this->db->escape($this->element)."'";
             } else if ($deletetarget) {
-                $sql .= " fk_target = " . $targetid . " AND targettype = '" . $this->db->escape($targettype) . "'";
-                $sql .= " AND fk_source = " . $this->id . " AND sourcetype = '" . $this->db->escape($this->element) . "'";
+                $sql .= " fk_target = ".$targetid." AND targettype = '".$this->db->escape($targettype)."'";
+                $sql .= " AND fk_source = ".$this->id." AND sourcetype = '".$this->db->escape($this->element)."'";
             } else {
-                $sql .= " (fk_source = " . $this->id . " AND sourcetype = '" . $this->db->escape($this->element) . "')";
+                $sql .= " (fk_source = ".$this->id." AND sourcetype = '".$this->db->escape($this->element)."')";
                 $sql .= " OR";
-                $sql .= " (fk_target = " . $this->id . " AND targettype = '" . $this->db->escape($this->element) . "')";
+                $sql .= " (fk_target = ".$this->id." AND targettype = '".$this->db->escape($this->element)."')";
             }
         }
 
-        dol_syslog(get_class($this) . "::deleteObjectLinked", LOG_DEBUG);
+        dol_syslog(get_class($this)."::deleteObjectLinked", LOG_DEBUG);
         if ($this->db->query($sql)) {
             return 1;
         } else {
@@ -3218,7 +3218,7 @@ 
     {
         global $user, $langs, $conf;
 
-        $savElementId = $elementId;  // To be used later to know if we were using the method using the id of this or not.
+        $savElementId = $elementId; // To be used later to know if we were using the method using the id of this or not.
 
         $elementId = (!empty($elementId) ? $elementId : $this->id);
         $elementTable = (!empty($elementType) ? $elementType : $this->table_element);
@@ -3233,21 +3233,21 @@ 
         if ($elementTable == 'expensereport') $fieldstatus = "fk_statut";
         if ($elementTable == 'commande_fournisseur_dispatch') $fieldstatus = "status";
 
-        $sql = "UPDATE " . MAIN_DB_PREFIX . $elementTable;
-        $sql .= " SET " . $fieldstatus . " = " . $status;
+        $sql = "UPDATE ".MAIN_DB_PREFIX.$elementTable;
+        $sql .= " SET ".$fieldstatus." = ".$status;
         // If status = 1 = validated, update also fk_user_valid
-        if ($status == 1 && $elementTable == 'expensereport') $sql .= ", fk_user_valid = " . $user->id;
-        $sql .= " WHERE rowid=" . $elementId;
+        if ($status == 1 && $elementTable == 'expensereport') $sql .= ", fk_user_valid = ".$user->id;
+        $sql .= " WHERE rowid=".$elementId;
 
-        dol_syslog(get_class($this) . "::setStatut", LOG_DEBUG);
+        dol_syslog(get_class($this)."::setStatut", LOG_DEBUG);
         if ($this->db->query($sql)) {
             $error = 0;
 
             // Try autoset of trigkey
             if (empty($trigkey)) {
-                if ($this->element == 'supplier_proposal' && $status == 2) $trigkey = 'SUPPLIER_PROPOSAL_SIGN';   // 2 = SupplierProposal::STATUS_SIGNED. Can't use constant into this generic class
+                if ($this->element == 'supplier_proposal' && $status == 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 == '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';
@@ -3255,7 +3255,7 @@ 
 
             if ($trigkey) {
                 // Appel des triggers
-                include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+                include_once DOL_DOCUMENT_ROOT.'/core/class/interfaces.class.php';
                 $interface = new Interfaces($this->db);
                 $result = $interface->run_triggers($trigkey, $this, $user, $langs, $conf);
                 if ($result < 0) {
@@ -3277,7 +3277,7 @@ 
                 return 1;
             } else {
                 $this->db->rollback();
-                dol_syslog(get_class($this) . "::setStatus " . $this->error, LOG_ERR);
+                dol_syslog(get_class($this)."::setStatus ".$this->error, LOG_ERR);
                 return -1;
             }
         } else {
@@ -3303,16 +3303,16 @@ 
         global $conf;
 
         if (empty($id) && empty($ref)) return 0;
-        if (!empty($conf->global->MAIN_DISABLE_CANVAS)) return 0;    // To increase speed. Not enabled by default.
+        if (!empty($conf->global->MAIN_DISABLE_CANVAS)) return 0; // To increase speed. Not enabled by default.
 
         // Clean parameters
         $ref = trim($ref);
 
         $sql = "SELECT rowid, canvas";
-        $sql .= " FROM " . MAIN_DB_PREFIX . $this->table_element;
-        $sql .= " WHERE entity IN (" . getEntity($this->element) . ")";
-        if (!empty($id)) $sql .= " AND rowid = " . $id;
-        if (!empty($ref)) $sql .= " AND ref = '" . $this->db->escape($ref) . "'";
+        $sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element;
+        $sql .= " WHERE entity IN (".getEntity($this->element).")";
+        if (!empty($id)) $sql .= " AND rowid = ".$id;
+        if (!empty($ref)) $sql .= " AND ref = '".$this->db->escape($ref)."'";
 
         $resql = $this->db->query($sql);
         if ($resql) {
@@ -3335,8 +3335,8 @@ 
      */
     function getSpecialCode($lineid)
     {
-        $sql = 'SELECT special_code FROM ' . MAIN_DB_PREFIX . $this->table_element_line;
-        $sql .= ' WHERE rowid = ' . $lineid;
+        $sql = 'SELECT special_code FROM '.MAIN_DB_PREFIX.$this->table_element_line;
+        $sql .= ' WHERE rowid = '.$lineid;
         $resql = $this->db->query($sql);
         if ($resql) {
             $row = $this->db->fetch_row($resql);
@@ -3366,7 +3366,7 @@ 
             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');
+        dol_syslog(get_class($this).'::hasProductsOrServices we found '.$nb.' qualified lines of products/servcies');
         return $nb;
     }
 
@@ -3380,10 +3380,10 @@ 
         $total_discount = 0.00;
 
         $sql = "SELECT subprice as pu_ht, qty, remise_percent, total_ht";
-        $sql .= " FROM " . MAIN_DB_PREFIX . $this->table_element . "det";
-        $sql .= " WHERE " . $this->fk_element . " = " . $this->id;
+        $sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element."det";
+        $sql .= " WHERE ".$this->fk_element." = ".$this->id;
 
-        dol_syslog(get_class($this) . '::getTotalDiscount', LOG_DEBUG);
+        dol_syslog(get_class($this).'::getTotalDiscount', LOG_DEBUG);
         $resql = $this->db->query($sql);
         if ($resql) {
             $num = $this->db->num_rows($resql);
@@ -3426,15 +3426,15 @@ 
 
         foreach ($this->lines as $line) {
             if (isset($line->qty_asked)) {
-                if (empty($totalOrdered)) $totalOrdered = 0;  // Avoid warning because $totalOrdered is ''
-                $totalOrdered += $line->qty_asked;    // defined for shipment only
+                if (empty($totalOrdered)) $totalOrdered = 0; // Avoid warning because $totalOrdered is ''
+                $totalOrdered += $line->qty_asked; // defined for shipment only
             }
             if (isset($line->qty_shipped)) {
-                if (empty($totalToShip)) $totalToShip = 0;    // Avoid warning because $totalToShip is ''
-                $totalToShip += $line->qty_shipped;   // defined for shipment only
+                if (empty($totalToShip)) $totalToShip = 0; // Avoid warning because $totalToShip is ''
+                $totalToShip += $line->qty_shipped; // defined for shipment only
             } else if ($line->element == 'commandefournisseurdispatch' && isset($line->qty)) {
                 if (empty($totalToShip)) $totalToShip = 0;
-                $totalToShip += $line->qty;   // defined for reception only
+                $totalToShip += $line->qty; // defined for reception only
             }
 
             // Define qty, weight, volume, weight_units, volume_units
@@ -3460,8 +3460,8 @@ 
             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)
@@ -3478,7 +3478,7 @@ 
                     $trueWeightUnit = 0.0283495;
                     $totalWeight += $weight * $qty * $trueWeightUnit;
                 } else
-                    $totalWeight += $weight * $qty;   // This may be wrong if we mix different units
+                    $totalWeight += $weight * $qty; // This may be wrong if we mix different units
             }
             if ($volume_units < 50)   // >50 means a standard unit (power of 10 of official unit), > 50 means an exotic unit (like inch)
             {
@@ -3487,7 +3487,7 @@ 
                 //print $line->volume;
                 $totalVolume += $volume * $qty * $trueVolumeUnit;
             } else {
-                $totalVolume += $volume * $qty;   // This may be wrong if we mix different units
+                $totalVolume += $volume * $qty; // This may be wrong if we mix different units
             }
         }
 
@@ -3507,11 +3507,11 @@ 
 
         $extraparams = (!empty($this->extraparams) ? json_encode($this->extraparams) : null);
 
-        $sql = "UPDATE " . MAIN_DB_PREFIX . $this->table_element;
-        $sql .= " SET extraparams = " . (!empty($extraparams) ? "'" . $this->db->escape($extraparams) . "'" : "null");
-        $sql .= " WHERE rowid = " . $this->id;
+        $sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
+        $sql .= " SET extraparams = ".(!empty($extraparams) ? "'".$this->db->escape($extraparams)."'" : "null");
+        $sql .= " WHERE rowid = ".$this->id;
 
-        dol_syslog(get_class($this) . "::setExtraParameters", LOG_DEBUG);
+        dol_syslog(get_class($this)."::setExtraParameters", LOG_DEBUG);
         $resql = $this->db->query($sql);
         if (!$resql) {
             $this->error = $this->db->lasterror();
@@ -3535,7 +3535,7 @@ 
         $out = '';
         $this->libelle_incoterms = '';
         if (!empty($this->fk_incoterms)) {
-            $sql = 'SELECT code FROM ' . MAIN_DB_PREFIX . 'c_incoterms WHERE rowid = ' . (int)$this->fk_incoterms;
+            $sql = 'SELECT code FROM '.MAIN_DB_PREFIX.'c_incoterms WHERE rowid = '.(int) $this->fk_incoterms;
             $result = $this->db->query($sql);
             if ($result) {
                 $res = $this->db->fetch_object($result);
@@ -3543,7 +3543,7 @@ 
             }
         }
 
-        $out .= (($res->code && $this->location_incoterms) ? ' - ' : '') . $this->location_incoterms;
+        $out .= (($res->code && $this->location_incoterms) ? ' - ' : '').$this->location_incoterms;
 
         return $out;
     }
@@ -3555,13 +3555,13 @@ 
      */
     function getIncotermsForPDF()
     {
-        $sql = 'SELECT code FROM ' . MAIN_DB_PREFIX . 'c_incoterms WHERE rowid = ' . (int)$this->fk_incoterms;
+        $sql = 'SELECT code FROM '.MAIN_DB_PREFIX.'c_incoterms WHERE rowid = '.(int) $this->fk_incoterms;
         $resql = $this->db->query($sql);
         if ($resql) {
             $num = $this->db->num_rows($resql);
             if ($num > 0) {
                 $res = $this->db->fetch_object($resql);
-                return 'Incoterm : ' . $res->code . ' - ' . $this->location_incoterms;
+                return 'Incoterm : '.$res->code.' - '.$this->location_incoterms;
             } else {
                 return '';
             }
@@ -3581,17 +3581,17 @@ 
     function setIncoterms($id_incoterm, $location)
     {
         if ($this->id && $this->table_element) {
-            $sql = "UPDATE " . MAIN_DB_PREFIX . $this->table_element;
-            $sql .= " SET fk_incoterms = " . ($id_incoterm > 0 ? $id_incoterm : "null");
-            $sql .= ", location_incoterms = " . ($id_incoterm > 0 ? "'" . $this->db->escape($location) . "'" : "null");
-            $sql .= " WHERE rowid = " . $this->id;
-            dol_syslog(get_class($this) . '::setIncoterms', LOG_DEBUG);
+            $sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
+            $sql .= " SET fk_incoterms = ".($id_incoterm > 0 ? $id_incoterm : "null");
+            $sql .= ", location_incoterms = ".($id_incoterm > 0 ? "'".$this->db->escape($location)."'" : "null");
+            $sql .= " WHERE rowid = ".$this->id;
+            dol_syslog(get_class($this).'::setIncoterms', LOG_DEBUG);
             $resql = $this->db->query($sql);
             if ($resql) {
                 $this->fk_incoterms = $id_incoterm;
                 $this->location_incoterms = $location;
 
-                $sql = 'SELECT libelle FROM ' . MAIN_DB_PREFIX . 'c_incoterms WHERE rowid = ' . (int)$this->fk_incoterms;
+                $sql = 'SELECT libelle FROM '.MAIN_DB_PREFIX.'c_incoterms WHERE rowid = '.(int) $this->fk_incoterms;
                 $res = $this->db->query($sql);
                 if ($res) {
                     $obj = $this->db->fetch_object($res);
@@ -3624,7 +3624,7 @@ 
         global $form, $bcnd, $var;
 
         // Line extrafield
-        require_once DOL_DOCUMENT_ROOT . '/core/class/extrafields.class.php';
+        require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
         $extrafieldsline = new ExtraFields($this->db);
         $extralabelslines = $extrafieldsline->fetch_name_optionals_label($this->table_element_line);
 
@@ -3632,7 +3632,7 @@ 
         // Use global variables + $dateSelector + $seller and $buyer
         $dirtpls = array_merge($conf->modules_parts['tpl'], array('/core/tpl'));
         foreach ($dirtpls as $reldir) {
-            $tpl = dol_buildpath($reldir . '/objectline_create.tpl.php');
+            $tpl = dol_buildpath($reldir.'/objectline_create.tpl.php');
             if (empty($conf->file->strict_mode)) {
                 $res = @include $tpl;
             } else {
@@ -3674,7 +3674,7 @@ 
         $num = count($this->lines);
 
         // Line extrafield
-        require_once DOL_DOCUMENT_ROOT . '/core/class/extrafields.class.php';
+        require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
         $extrafieldsline = new ExtraFields($this->db);
         $extralabelslines = $extrafieldsline->fetch_name_optionals_label($this->table_element_line);
 
@@ -3690,60 +3690,60 @@ 
             if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) print '<td class="linecolnum" align="center" width="5">&nbsp;</td>';
 
             // Description
-            print '<td class="linecoldescription">' . $langs->trans('Description') . '</td>';
+            print '<td class="linecoldescription">'.$langs->trans('Description').'</td>';
 
             if ($this->element == 'supplier_proposal' || $this->element == 'order_supplier' || $this->element == 'invoice_supplier') {
-                print '<td class="linerefsupplier"><span id="title_fourn_ref">' . $langs->trans("SupplierRef") . '</span></td>';
+                print '<td class="linerefsupplier"><span id="title_fourn_ref">'.$langs->trans("SupplierRef").'</span></td>';
             }
 
             // VAT
-            print '<td class="linecolvat" align="right" width="80">' . $langs->trans('VAT') . '</td>';
+            print '<td class="linecolvat" align="right" width="80">'.$langs->trans('VAT').'</td>';
 
             // Price HT
-            print '<td class="linecoluht" align="right" width="80">' . $langs->trans('PriceUHT') . '</td>';
+            print '<td class="linecoluht" align="right" width="80">'.$langs->trans('PriceUHT').'</td>';
 
             // Multicurrency
-            if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) print '<td class="linecoluht_currency" align="right" width="80">' . $langs->trans('PriceUHTCurrency', $this->multicurrency_code) . '</td>';
+            if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) print '<td class="linecoluht_currency" align="right" width="80">'.$langs->trans('PriceUHTCurrency', $this->multicurrency_code).'</td>';
 
-            if ($inputalsopricewithtax) print '<td align="right" width="80">' . $langs->trans('PriceUTTC') . '</td>';
+            if ($inputalsopricewithtax) print '<td align="right" width="80">'.$langs->trans('PriceUTTC').'</td>';
 
             // Qty
-            print '<td class="linecolqty" align="right">' . $langs->trans('Qty') . '</td>';
+            print '<td class="linecolqty" align="right">'.$langs->trans('Qty').'</td>';
 
             if ($conf->global->PRODUCT_USE_UNITS) {
-                print '<td class="linecoluseunit" align="left">' . $langs->trans('Unit') . '</td>';
+                print '<td class="linecoluseunit" align="left">'.$langs->trans('Unit').'</td>';
             }
 
             // Reduction short
-            print '<td class="linecoldiscount" align="right">' . $langs->trans('ReductionShort') . '</td>';
+            print '<td class="linecoldiscount" align="right">'.$langs->trans('ReductionShort').'</td>';
 
             if ($this->situation_cycle_ref) {
-                print '<td class="linecolcycleref" align="right">' . $langs->trans('Progress') . '</td>';
+                print '<td class="linecolcycleref" align="right">'.$langs->trans('Progress').'</td>';
             }
 
             if ($usemargins && !empty($conf->margin->enabled) && empty($user->societe_id)) {
                 if (!empty($user->rights->margins->creer)) {
                     if ($conf->global->MARGIN_TYPE == "1")
-                        print '<td class="linecolmargin1 margininfos" align="right" width="80">' . $langs->trans('BuyingPrice') . '</td>';
+                        print '<td class="linecolmargin1 margininfos" align="right" width="80">'.$langs->trans('BuyingPrice').'</td>';
                     else
-                        print '<td class="linecolmargin1 margininfos" align="right" width="80">' . $langs->trans('CostPrice') . '</td>';
+                        print '<td class="linecolmargin1 margininfos" align="right" width="80">'.$langs->trans('CostPrice').'</td>';
                 }
 
                 if (!empty($conf->global->DISPLAY_MARGIN_RATES) && $user->rights->margins->liretous)
-                    print '<td class="linecolmargin2 margininfos" align="right" width="50">' . $langs->trans('MarginRate') . '</td>';
+                    print '<td class="linecolmargin2 margininfos" align="right" width="50">'.$langs->trans('MarginRate').'</td>';
                 if (!empty($conf->global->DISPLAY_MARK_RATES) && $user->rights->margins->liretous)
-                    print '<td class="linecolmargin2 margininfos" align="right" width="50">' . $langs->trans('MarkRate') . '</td>';
+                    print '<td class="linecolmargin2 margininfos" align="right" width="50">'.$langs->trans('MarkRate').'</td>';
             }
 
             // Total HT
-            print '<td class="linecolht" align="right">' . $langs->trans('TotalHTShort') . '</td>';
+            print '<td class="linecolht" align="right">'.$langs->trans('TotalHTShort').'</td>';
 
             // Multicurrency
-            if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) print '<td class="linecoltotalht_currency" align="right">' . $langs->trans('TotalHTShortCurrency', $this->multicurrency_code) . '</td>';
+            if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) print '<td class="linecoltotalht_currency" align="right">'.$langs->trans('TotalHTShortCurrency', $this->multicurrency_code).'</td>';
 
-            if ($outputalsopricetotalwithtax) print '<td align="right" width="80">' . $langs->trans('TotalTTCShort') . '</td>';
+            if ($outputalsopricetotalwithtax) print '<td align="right" width="80">'.$langs->trans('TotalTTCShort').'</td>';
 
-            print '<td class="linecoledit"></td>';  // No width to allow autodim
+            print '<td class="linecoledit"></td>'; // No width to allow autodim
 
             print '<td class="linecoldelete" width="10"></td>';
 
@@ -3773,10 +3773,10 @@ 
             {
                 if (empty($line->fk_parent_line)) {
                     $parameters = array('line' => $line, 'var' => $var, 'num' => $num, 'i' => $i, 'dateSelector' => $dateSelector, 'seller' => $seller, 'buyer' => $buyer, 'selected' => $selected, 'extrafieldsline' => $extrafieldsline);
-                    $reshook = $hookmanager->executeHooks('printObjectLine', $parameters, $this, $action);    // Note that $action and $object may have been modified by some hooks
+                    $reshook = $hookmanager->executeHooks('printObjectLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
                 } else {
                     $parameters = array('line' => $line, 'var' => $var, 'num' => $num, 'i' => $i, 'dateSelector' => $dateSelector, 'seller' => $seller, 'buyer' => $buyer, 'selected' => $selected, 'extrafieldsline' => $extrafieldsline, 'fk_parent_line' => $line->fk_parent_line);
-                    $reshook = $hookmanager->executeHooks('printObjectSubLine', $parameters, $this, $action);    // Note that $action and $object may have been modified by some hooks
+                    $reshook = $hookmanager->executeHooks('printObjectSubLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
                 }
             }
             if (empty($reshook)) {
@@ -3814,7 +3814,7 @@ 
     {
         global $conf, $langs, $user, $object, $hookmanager;
         global $form, $bc, $bcdd;
-        global $object_rights, $disableedit, $disablemove, $disableremove;   // TODO We should not use global var for this !
+        global $object_rights, $disableedit, $disablemove, $disableremove; // TODO We should not use global var for this !
 
         $object_rights = $this->getRights();
 
@@ -3854,7 +3854,7 @@ 
                     $outputlangs = $langs;
                     $newlang = '';
                     if (empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang = GETPOST('lang_id', 'aZ09');
-                    if (!empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE) && empty($newlang)) $newlang = $this->thirdparty->default_lang;        // For language to language of customer
+                    if (!empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE) && empty($newlang)) $newlang = $this->thirdparty->default_lang; // For language to language of customer
                     if (!empty($newlang)) {
                         $outputlangs = new Translate("", $conf);
                         $outputlangs->setDefaultLang($newlang);
@@ -3865,8 +3865,8 @@ 
                     $label = $line->product_label;
                 }
 
-                $text .= ' - ' . (!empty($line->label) ? $line->label : $label);
-                $description .= (!empty($conf->global->PRODUIT_DESC_IN_FORM) ? '' : dol_htmlentitiesbr($line->description));    // Description is what to show on popup. We shown nothing if already into desc.
+                $text .= ' - '.(!empty($line->label) ? $line->label : $label);
+                $description .= (!empty($conf->global->PRODUIT_DESC_IN_FORM) ? '' : dol_htmlentitiesbr($line->description)); // Description is what to show on popup. We shown nothing if already into desc.
             }
 
             $line->pu_ttc = price2num($line->subprice * (1 + ($line->tva_tx / 100)), 'MU');
@@ -3875,7 +3875,7 @@ 
             // Use global variables + $dateSelector + $seller and $buyer
             $dirtpls = array_merge($conf->modules_parts['tpl'], array('/core/tpl'));
             foreach ($dirtpls as $reldir) {
-                $tpl = dol_buildpath($reldir . '/objectline_view.tpl.php');
+                $tpl = dol_buildpath($reldir.'/objectline_view.tpl.php');
                 if (empty($conf->file->strict_mode)) {
                     $res = @include $tpl;
                 } else {
@@ -3888,7 +3888,7 @@ 
         // Ligne en mode update
         if ($this->statut == 0 && $action == 'editline' && $selected == $line->id) {
             $label = (!empty($line->label) ? $line->label : (($line->fk_product > 0) ? $line->product_label : ''));
-            $placeholder = ' placeholder="' . $langs->trans("Label") . '"';
+            $placeholder = ' placeholder="'.$langs->trans("Label").'"';
 
             $line->pu_ttc = price2num($line->subprice * (1 + ($line->tva_tx / 100)), 'MU');
 
@@ -3896,7 +3896,7 @@ 
             // Use global variables + $dateSelector + $seller and $buyer
             $dirtpls = array_merge($conf->modules_parts['tpl'], array('/core/tpl'));
             foreach ($dirtpls as $reldir) {
-                $tpl = dol_buildpath($reldir . '/objectline_edit.tpl.php');
+                $tpl = dol_buildpath($reldir.'/objectline_edit.tpl.php');
                 if (empty($conf->file->strict_mode)) {
                     $res = @include $tpl;
                 } else {
@@ -3935,16 +3935,16 @@ 
         global $langs, $hookmanager, $conf;
 
         print '<tr class="liste_titre">';
-        print '<td>' . $langs->trans('Ref') . '</td>';
-        print '<td>' . $langs->trans('Description') . '</td>';
-        print '<td align="right">' . $langs->trans('VATRate') . '</td>';
-        print '<td align="right">' . $langs->trans('PriceUHT') . '</td>';
-        if (!empty($conf->multicurrency->enabled)) print '<td align="right">' . $langs->trans('PriceUHTCurrency') . '</td>';
-        print '<td align="right">' . $langs->trans('Qty') . '</td>';
+        print '<td>'.$langs->trans('Ref').'</td>';
+        print '<td>'.$langs->trans('Description').'</td>';
+        print '<td align="right">'.$langs->trans('VATRate').'</td>';
+        print '<td align="right">'.$langs->trans('PriceUHT').'</td>';
+        if (!empty($conf->multicurrency->enabled)) print '<td align="right">'.$langs->trans('PriceUHTCurrency').'</td>';
+        print '<td align="right">'.$langs->trans('Qty').'</td>';
         if ($conf->global->PRODUCT_USE_UNITS) {
-            print '<td align="left">' . $langs->trans('Unit') . '</td>';
+            print '<td align="left">'.$langs->trans('Unit').'</td>';
         }
-        print '<td align="right">' . $langs->trans('ReductionShort') . '</td></tr>';
+        print '<td align="right">'.$langs->trans('ReductionShort').'</td></tr>';
 
         $var = true;
         $i = 0;
@@ -3955,7 +3955,7 @@ 
                     if (empty($line->fk_parent_line)) {
                         $parameters = array('line' => $line, 'var' => $var, 'i' => $i);
                         $action = '';
-                        $hookmanager->executeHooks('printOriginObjectLine', $parameters, $this, $action);    // Note that $action and $object may have been modified by some hooks
+                        $hookmanager->executeHooks('printOriginObjectLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
                     }
                 } else {
                     $this->printOriginLine($line, $var, $restrictlist);
@@ -4014,7 +4014,7 @@ 
             }
 
             $this->tpl['label'] .= $productstatic->getNomUrl(1);
-            $this->tpl['label'] .= ' - ' . (!empty($line->label) ? $line->label : $line->product_label);
+            $this->tpl['label'] .= ' - '.(!empty($line->label) ? $line->label : $line->product_label);
             // Dates
             if ($line->product_type == 1 && ($date_start || $date_end)) {
                 $this->tpl['label'] .= get_date_range($date_start, $date_end);
@@ -4024,7 +4024,7 @@ 
             if (!empty($line->desc)) {
                 $this->tpl['label'] .= $line->desc;
             } else {
-                $this->tpl['label'] .= ($line->label ? '&nbsp;' . $line->label : '');
+                $this->tpl['label'] .= ($line->label ? '&nbsp;'.$line->label : '');
             }
 
             // Dates
@@ -4062,7 +4062,7 @@ 
         // VAT Rate
         $this->tpl['vat_rate'] = vatrate($line->tva_tx, true);
         $this->tpl['vat_rate'] .= (($line->info_bits & 1) == 1) ? '*' : '';
-        if (!empty($line->vat_src_code) && !preg_match('/\(/', $this->tpl['vat_rate'])) $this->tpl['vat_rate'] .= ' (' . $line->vat_src_code . ')';
+        if (!empty($line->vat_src_code) && !preg_match('/\(/', $this->tpl['vat_rate'])) $this->tpl['vat_rate'] .= ' ('.$line->vat_src_code.')';
 
         $this->tpl['price'] = price($line->subprice);
         $this->tpl['multicurrency_price'] = price($line->multicurrency_subprice);
@@ -4078,7 +4078,7 @@ 
         // Use global variables + $dateSelector + $seller and $buyer
         $dirtpls = array_merge($conf->modules_parts['tpl'], array('/core/tpl'));
         foreach ($dirtpls as $reldir) {
-            $tpl = dol_buildpath($reldir . '/originproductline.tpl.php');
+            $tpl = dol_buildpath($reldir.'/originproductline.tpl.php');
             if (empty($conf->file->strict_mode)) {
                 $res = @include $tpl;
             } else {
@@ -4103,7 +4103,7 @@ 
         // phpcs:enable
         $this->db->begin();
 
-        $sql = "INSERT INTO " . MAIN_DB_PREFIX . "element_resources (";
+        $sql = "INSERT INTO ".MAIN_DB_PREFIX."element_resources (";
         $sql .= "resource_id";
         $sql .= ", resource_type";
         $sql .= ", element_id";
@@ -4112,14 +4112,14 @@ 
         $sql .= ", mandatory";
         $sql .= ") VALUES (";
         $sql .= $resource_id;
-        $sql .= ", '" . $this->db->escape($resource_type) . "'";
-        $sql .= ", '" . $this->db->escape($this->id) . "'";
-        $sql .= ", '" . $this->db->escape($this->element) . "'";
-        $sql .= ", '" . $this->db->escape($busy) . "'";
-        $sql .= ", '" . $this->db->escape($mandatory) . "'";
+        $sql .= ", '".$this->db->escape($resource_type)."'";
+        $sql .= ", '".$this->db->escape($this->id)."'";
+        $sql .= ", '".$this->db->escape($this->element)."'";
+        $sql .= ", '".$this->db->escape($busy)."'";
+        $sql .= ", '".$this->db->escape($mandatory)."'";
         $sql .= ")";
 
-        dol_syslog(get_class($this) . "::add_element_resource", LOG_DEBUG);
+        dol_syslog(get_class($this)."::add_element_resource", LOG_DEBUG);
         if ($this->db->query($sql)) {
             $this->db->commit();
             return 1;
@@ -4145,10 +4145,10 @@ 
 
         $this->db->begin();
 
-        $sql = "DELETE FROM " . MAIN_DB_PREFIX . "element_resources";
-        $sql .= " WHERE rowid=" . $rowid;
+        $sql = "DELETE FROM ".MAIN_DB_PREFIX."element_resources";
+        $sql .= " WHERE rowid=".$rowid;
 
-        dol_syslog(get_class($this) . "::delete_resource", LOG_DEBUG);
+        dol_syslog(get_class($this)."::delete_resource", LOG_DEBUG);
 
         $resql = $this->db->query($sql);
         if (!$resql) {
@@ -4157,7 +4157,7 @@ 
             return -1;
         } else {
             if (!$notrigger) {
-                $result = $this->call_trigger(strtoupper($element) . '_DELETE_RESOURCE', $user);
+                $result = $this->call_trigger(strtoupper($element).'_DELETE_RESOURCE', $user);
                 if ($result < 0) {
                     $this->db->rollback();
                     return -1;
@@ -4195,7 +4195,7 @@ 
     {
         global $maxwidthsmall, $maxheightsmall, $maxwidthmini, $maxheightmini, $quality;
 
-        require_once DOL_DOCUMENT_ROOT . '/core/lib/images.lib.php';        // This define also $maxwidthsmall, $quality, ...
+        require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php'; // This define also $maxwidthsmall, $quality, ...
 
         $file_osencoded = dol_osencode($file);
         if (file_exists($file_osencoded)) {
@@ -4238,7 +4238,7 @@ 
             return '';
         }
 
-        $keyforfieldname = strtoupper($newelement . '_DEFAULT_' . $fieldname);
+        $keyforfieldname = strtoupper($newelement.'_DEFAULT_'.$fieldname);
         //var_dump($keyforfieldname);
         if (isset($conf->global->$keyforfieldname)) return $conf->global->$keyforfieldname;
 
@@ -4271,7 +4271,7 @@ 
             // global $extrafields;
             //if (! is_object($extrafields))
             //{
-            require_once DOL_DOCUMENT_ROOT . '/core/class/extrafields.class.php';
+            require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
             $extrafields = new ExtraFields($this->db);
             //}
 
@@ -4293,11 +4293,11 @@ 
             $sql = "SELECT rowid";
             foreach ($optionsArray as $name => $label) {
                 if (empty($extrafields->attributes[$this->table_element]['type'][$name]) || $extrafields->attributes[$this->table_element]['type'][$name] != 'separate') {
-                    $sql .= ", " . $name;
+                    $sql .= ", ".$name;
                 }
             }
-            $sql .= " FROM " . MAIN_DB_PREFIX . $table_element . "_extrafields";
-            $sql .= " WHERE fk_object = " . $rowid;
+            $sql .= " FROM ".MAIN_DB_PREFIX.$table_element."_extrafields";
+            $sql .= " WHERE fk_object = ".$rowid;
 
             //dol_syslog(get_class($this)."::fetch_optionals get extrafields data for ".$this->table_element, LOG_DEBUG);		// Too verbose
             $resql = $this->db->query($sql);
@@ -4313,9 +4313,9 @@ 
                             // we can add this attribute to object
                             if (!empty($extrafields) && in_array($extrafields->attributes[$this->table_element]['type'][$key], array('date', 'datetime'))) {
                                 //var_dump($extrafields->attributes[$this->table_element]['type'][$key]);
-                                $this->array_options["options_" . $key] = $this->db->jdate($value);
+                                $this->array_options["options_".$key] = $this->db->jdate($value);
                             } else {
-                                $this->array_options["options_" . $key] = $value;
+                                $this->array_options["options_".$key] = $value;
                             }
 
                             //var_dump('key '.$key.' '.$value.' type='.$extrafields->attributes[$this->table_element]['type'][$key].' '.$this->array_options["options_".$key]);
@@ -4349,8 +4349,8 @@ 
         $table_element = $this->table_element;
         if ($table_element == 'categorie') $table_element = 'categories'; // For compatibility
 
-        $sql_del = "DELETE FROM " . MAIN_DB_PREFIX . $table_element . "_extrafields WHERE fk_object = " . $this->id;
-        dol_syslog(get_class($this) . "::deleteExtraFields delete", LOG_DEBUG);
+        $sql_del = "DELETE FROM ".MAIN_DB_PREFIX.$table_element."_extrafields WHERE fk_object = ".$this->id;
+        dol_syslog(get_class($this)."::deleteExtraFields delete", LOG_DEBUG);
         $resql = $this->db->query($sql_del);
         if (!$resql) {
             $this->error = $this->db->lasterror();
@@ -4380,16 +4380,16 @@ 
 
         $error = 0;
 
-        if (!empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) return 0;    // For avoid conflicts if trigger used
+        if (!empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) return 0; // For avoid conflicts if trigger used
 
-        if (!empty($this->array_options) && isset($this->array_options["options_" . $key])) {
+        if (!empty($this->array_options) && isset($this->array_options["options_".$key])) {
             // Check parameters
             $langs->load('admin');
-            require_once DOL_DOCUMENT_ROOT . '/core/class/extrafields.class.php';
+            require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
             $extrafields = new ExtraFields($this->db);
             $target_extrafields = $extrafields->fetch_name_optionals_label($this->table_element);
 
-            $value = $this->array_options["options_" . $key];
+            $value = $this->array_options["options_".$key];
 
             $attributeType = $extrafields->attributes[$this->table_element]['type'][$key];
             $attributeLabel = $extrafields->attributes[$this->table_element]['label'][$key];
@@ -4405,20 +4405,20 @@ 
                         $this->errors[] = $langs->trans("ExtraFieldHasWrongValue", $attributeLabel);
                         return -1;
                     } elseif ($value == '') {
-                        $this->array_options["options_" . $key] = null;
+                        $this->array_options["options_".$key] = null;
                     }
                     break;
                 case 'double':
                     $value = price2num($value);
                     if (!is_numeric($value) && $value != '') {
-                        dol_syslog($langs->trans("ExtraFieldHasWrongValue") . " sur " . $attributeLabel . "(" . $value . "is not '" . $attributeType . "')", LOG_DEBUG);
+                        dol_syslog($langs->trans("ExtraFieldHasWrongValue")." sur ".$attributeLabel."(".$value."is not '".$attributeType."')", LOG_DEBUG);
                         $this->errors[] = $langs->trans("ExtraFieldHasWrongValue", $attributeLabel);
                         return -1;
                     } elseif ($value == '') {
-                        $this->array_options["options_" . $key] = null;
+                        $this->array_options["options_".$key] = null;
                     }
                     //dol_syslog("double value"." sur ".$attributeLabel."(".$value." is '".$attributeType."')", LOG_DEBUG);
-                    $this->array_options["options_" . $key] = $value;
+                    $this->array_options["options_".$key] = $value;
                     break;
                 /*case 'select':	// Not required, we chosed value='0' for undefined values
              		if ($value=='-1')
@@ -4427,13 +4427,13 @@ 
              		}
              		break;*/
                 case 'price':
-                    $this->array_options["options_" . $key] = price2num($this->array_options["options_" . $key]);
+                    $this->array_options["options_".$key] = price2num($this->array_options["options_".$key]);
                     break;
                 case 'date':
-                    $this->array_options["options_" . $key] = $this->db->idate($this->array_options["options_" . $key]);
+                    $this->array_options["options_".$key] = $this->db->idate($this->array_options["options_".$key]);
                     break;
                 case 'datetime':
-                    $this->array_options["options_" . $key] = $this->db->idate($this->array_options["options_" . $key]);
+                    $this->array_options["options_".$key] = $this->db->idate($this->array_options["options_".$key]);
                     break;
                 case 'link':
                     $param_list = array_keys($attributeParam['options']);
@@ -4444,14 +4444,14 @@ 
                     if ($value) {
                         $object = new $InfoFieldList[0]($this->db);
                         $object->fetch(0, $value);
-                        $this->array_options["options_" . $key] = $object->id;
+                        $this->array_options["options_".$key] = $object->id;
                     }
                     break;
             }
 
             $this->db->begin();
-            $sql = "UPDATE " . MAIN_DB_PREFIX . $this->table_element . "_extrafields SET " . $key . "='" . $this->db->escape($this->array_options["options_" . $key]) . "'";
-            $sql .= " WHERE fk_object = " . $this->id;
+            $sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element."_extrafields SET ".$key."='".$this->db->escape($this->array_options["options_".$key])."'";
+            $sql .= " WHERE fk_object = ".$this->id;
             $resql = $this->db->query($sql);
             if (!$resql) {
                 $error++;
@@ -4467,7 +4467,7 @@ 
             }
 
             if ($error) {
-                dol_syslog(get_class($this) . "::" . __METHOD__ . $this->error, LOG_ERR);
+                dol_syslog(get_class($this)."::".__METHOD__.$this->error, LOG_ERR);
                 $this->db->rollback();
                 return -1;
             } else {
@@ -4495,7 +4495,7 @@ 
         global $conf, $langs, $form;
 
         if (!is_object($form)) {
-            require_once DOL_DOCUMENT_ROOT . '/core/class/html.form.class.php';
+            require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
             $form = new Form($this->db);
         }
 
@@ -4508,13 +4508,13 @@ 
         $size = $this->fields[$key]['size'];
         // Because we work on extrafields
         if (preg_match('/^integer:(.*):(.*)/i', $val['type'], $reg)) {
-            $param['options'] = array($reg[1] . ':' . $reg[2] => 'N');
+            $param['options'] = array($reg[1].':'.$reg[2] => 'N');
             $type = 'link';
         } elseif (preg_match('/^link:(.*):(.*)/i', $val['type'], $reg)) {
-            $param['options'] = array($reg[1] . ':' . $reg[2] => 'N');
+            $param['options'] = array($reg[1].':'.$reg[2] => 'N');
             $type = 'link';
         } elseif (preg_match('/^sellist:(.*):(.*):(.*):(.*)/i', $val['type'], $reg)) {
-            $param['options'] = array($reg[1] . ':' . $reg[2] . ':' . $reg[3] . ':' . $reg[4] => 'N');
+            $param['options'] = array($reg[1].':'.$reg[2].':'.$reg[3].':'.$reg[4] => 'N');
             $type = 'sellist';
         } elseif (preg_match('/varchar\((\d+)\)/', $val['type'], $reg)) {
             $param['options'] = array();
@@ -4546,7 +4546,7 @@ 
 
 
         if ($computed) {
-            if (!preg_match('/^search_/', $keyprefix)) return '<span class="opacitymedium">' . $langs->trans("AutomaticallyCalculated") . '</span>';
+            if (!preg_match('/^search_/', $keyprefix)) return '<span class="opacitymedium">'.$langs->trans("AutomaticallyCalculated").'</span>';
             else return '';
         }
 
@@ -4587,32 +4587,32 @@ 
             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);
+            $out = $form->selectDate($value, $keyprefix.$key.$keysuffix, $showtime, $showtime, $required, '', 1, (($keyprefix != 'search_' && $keyprefix != 'search_options_') ? 1 : 0), 0, 1);
         } elseif (in_array($type, array('int', 'integer'))) {
             $tmp = explode(',', $size);
             $newsize = $tmp[0];
-            $out = '<input type="text" class="flat ' . $morecss . ' maxwidthonsmartphone" name="' . $keyprefix . $key . $keysuffix . '" id="' . $keyprefix . $key . $keysuffix . '" maxlength="' . $newsize . '" value="' . dol_escape_htmltag($value) . '"' . ($moreparam ? $moreparam : '') . '>';
+            $out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$newsize.'" value="'.dol_escape_htmltag($value).'"'.($moreparam ? $moreparam : '').'>';
         } elseif (preg_match('/varchar/', $type)) {
-            $out = '<input type="text" class="flat ' . $morecss . ' maxwidthonsmartphone" name="' . $keyprefix . $key . $keysuffix . '" id="' . $keyprefix . $key . $keysuffix . '" maxlength="' . $size . '" value="' . dol_escape_htmltag($value) . '"' . ($moreparam ? $moreparam : '') . '>';
+            $out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$size.'" value="'.dol_escape_htmltag($value).'"'.($moreparam ? $moreparam : '').'>';
         } elseif (in_array($type, array('mail', 'phone', 'url'))) {
-            $out = '<input type="text" class="flat ' . $morecss . ' maxwidthonsmartphone" name="' . $keyprefix . $key . $keysuffix . '" id="' . $keyprefix . $key . $keysuffix . '" value="' . dol_escape_htmltag($value) . '" ' . ($moreparam ? $moreparam : '') . '>';
+            $out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam ? $moreparam : '').'>';
         } elseif ($type == 'text') {
             if (!preg_match('/search_/', $keyprefix))        // If keyprefix is search_ or search_options_, we must just use a simple text field
             {
-                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%');
+                require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+                $doleditor = new DolEditor($keyprefix.$key.$keysuffix, $value, '', 200, 'dolibarr_notes', 'In', false, false, false, ROWS_5, '90%');
                 $out = $doleditor->Create(1);
             } else {
-                $out = '<input type="text" class="flat ' . $morecss . ' maxwidthonsmartphone" name="' . $keyprefix . $key . $keysuffix . '" id="' . $keyprefix . $key . $keysuffix . '" value="' . dol_escape_htmltag($value) . '" ' . ($moreparam ? $moreparam : '') . '>';
+                $out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam ? $moreparam : '').'>';
             }
         } elseif ($type == 'html') {
             if (!preg_match('/search_/', $keyprefix))        // If keyprefix is search_ or search_options_, we must just use a simple text field
             {
-                require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';
-                $doleditor = new DolEditor($keyprefix . $key . $keysuffix, $value, '', 200, 'dolibarr_notes', 'In', false, false, !empty($conf->fckeditor->enabled) && $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_5, '90%');
+                require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+                $doleditor = new DolEditor($keyprefix.$key.$keysuffix, $value, '', 200, 'dolibarr_notes', 'In', false, false, !empty($conf->fckeditor->enabled) && $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_5, '90%');
                 $out = $doleditor->Create(1);
             } else {
-                $out = '<input type="text" class="flat ' . $morecss . ' maxwidthonsmartphone" name="' . $keyprefix . $key . $keysuffix . '" id="' . $keyprefix . $key . $keysuffix . '" value="' . dol_escape_htmltag($value) . '" ' . ($moreparam ? $moreparam : '') . '>';
+                $out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam ? $moreparam : '').'>';
             }
         } elseif ($type == 'boolean') {
             $checked = '';
@@ -4621,43 +4621,43 @@ 
             } else {
                 $checked = ' value="1" ';
             }
-            $out = '<input type="checkbox" class="flat ' . $morecss . ' maxwidthonsmartphone" name="' . $keyprefix . $key . $keysuffix . '" id="' . $keyprefix . $key . $keysuffix . '" ' . $checked . ' ' . ($moreparam ? $moreparam : '') . '>';
+            $out = '<input type="checkbox" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.$checked.' '.($moreparam ? $moreparam : '').'>';
         } elseif ($type == 'price') {
             if (!empty($value)) {        // $value in memory is a php numeric, we format it into user number format.
                 $value = price($value);
             }
-            $out = '<input type="text" class="flat ' . $morecss . ' maxwidthonsmartphone" name="' . $keyprefix . $key . $keysuffix . '" id="' . $keyprefix . $key . $keysuffix . '" value="' . $value . '" ' . ($moreparam ? $moreparam : '') . '> ' . $langs->getCurrencySymbol($conf->currency);
+            $out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam ? $moreparam : '').'> '.$langs->getCurrencySymbol($conf->currency);
         } elseif (preg_match('/^double(\([0-9],[0-9]\)){0,1}/', $type)) {
             if (!empty($value)) {        // $value in memory is a php numeric, we format it into user number format.
                 $value = price($value);
             }
-            $out = '<input type="text" class="flat ' . $morecss . ' maxwidthonsmartphone" name="' . $keyprefix . $key . $keysuffix . '" id="' . $keyprefix . $key . $keysuffix . '" value="' . $value . '" ' . ($moreparam ? $moreparam : '') . '> ';
+            $out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam ? $moreparam : '').'> ';
         } elseif ($type == 'select') {
             $out = '';
             if (!empty($conf->use_javascript_ajax) && !empty($conf->global->MAIN_EXTRAFIELDS_USE_SELECT2)) {
-                include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
-                $out .= ajax_combobox($keyprefix . $key . $keysuffix, array(), 0);
+                include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
+                $out .= ajax_combobox($keyprefix.$key.$keysuffix, array(), 0);
             }
 
-            $out .= '<select class="flat ' . $morecss . ' maxwidthonsmartphone" name="' . $keyprefix . $key . $keysuffix . '" id="' . $keyprefix . $key . $keysuffix . '" ' . ($moreparam ? $moreparam : '') . '>';
+            $out .= '<select class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam ? $moreparam : '').'>';
             if ((!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' : '');
-                $out .= (!empty($parent) ? ' parent="' . $parent . '"' : '');
-                $out .= '>' . $val . '</option>';
+                $out .= '<option value="'.$key.'"';
+                $out .= (((string) $value == (string) $key) ? ' selected' : '');
+                $out .= (!empty($parent) ? ' parent="'.$parent.'"' : '');
+                $out .= '>'.$val.'</option>';
             }
             $out .= '</select>';
         } elseif ($type == 'sellist') {
             $out = '';
             if (!empty($conf->use_javascript_ajax) && !empty($conf->global->MAIN_EXTRAFIELDS_USE_SELECT2)) {
-                include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
-                $out .= ajax_combobox($keyprefix . $key . $keysuffix, array(), 0);
+                include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
+                $out .= ajax_combobox($keyprefix.$key.$keysuffix, array(), 0);
             }
 
-            $out .= '<select class="flat ' . $morecss . ' maxwidthonsmartphone" name="' . $keyprefix . $key . $keysuffix . '" id="' . $keyprefix . $key . $keysuffix . '" ' . ($moreparam ? $moreparam : '') . '>';
+            $out .= '<select class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam ? $moreparam : '').'>';
             if (is_array($param['options'])) {
                 $param_list = array_keys($param['options']);
                 $InfoFieldList = explode(":", $param_list[0]);
@@ -4668,19 +4668,19 @@ 
                 // 2 : key fields name (if differ of rowid)
                 // 3 : key field parent (for dependent lists)
                 // 4 : where clause filter on column or table extrafield, syntax field='value' or extra.field=value
-                $keyList = (empty($InfoFieldList[2]) ? 'rowid' : $InfoFieldList[2] . ' as rowid');
+                $keyList = (empty($InfoFieldList[2]) ? 'rowid' : $InfoFieldList[2].' as rowid');
 
 
                 if (count($InfoFieldList) > 4 && !empty($InfoFieldList[4])) {
                     if (strpos($InfoFieldList[4], 'extra.') !== false) {
-                        $keyList = 'main.' . $InfoFieldList[2] . ' as rowid';
+                        $keyList = 'main.'.$InfoFieldList[2].' as rowid';
                     } else {
-                        $keyList = $InfoFieldList[2] . ' as rowid';
+                        $keyList = $InfoFieldList[2].' as rowid';
                     }
                 }
                 if (count($InfoFieldList) > 3 && !empty($InfoFieldList[3])) {
                     list($parentName, $parentField) = explode('|', $InfoFieldList[3]);
-                    $keyList .= ', ' . $parentField;
+                    $keyList .= ', '.$parentField;
                 }
 
                 $fields_label = explode('|', $InfoFieldList[1]);
@@ -4690,8 +4690,8 @@ 
                 }
 
                 $sqlwhere = '';
-                $sql = 'SELECT ' . $keyList;
-                $sql .= ' FROM ' . MAIN_DB_PREFIX . $InfoFieldList[0];
+                $sql = 'SELECT '.$keyList;
+                $sql .= ' FROM '.MAIN_DB_PREFIX.$InfoFieldList[0];
                 if (!empty($InfoFieldList[4])) {
                     // can use SELECT request
                     if (strpos($InfoFieldList[4], '$SEL$') !== false) {
@@ -4706,24 +4706,24 @@ 
                     }
                     //We have to join on extrafield table
                     if (strpos($InfoFieldList[4], 'extra') !== false) {
-                        $sql .= ' as main, ' . MAIN_DB_PREFIX . $InfoFieldList[0] . '_extrafields as extra';
-                        $sqlwhere .= ' WHERE extra.fk_object=main.' . $InfoFieldList[2] . ' AND ' . $InfoFieldList[4];
+                        $sql .= ' as main, '.MAIN_DB_PREFIX.$InfoFieldList[0].'_extrafields as extra';
+                        $sqlwhere .= ' WHERE extra.fk_object=main.'.$InfoFieldList[2].' AND '.$InfoFieldList[4];
                     } else {
-                        $sqlwhere .= ' WHERE ' . $InfoFieldList[4];
+                        $sqlwhere .= ' WHERE '.$InfoFieldList[4];
                     }
                 } else {
                     $sqlwhere .= ' WHERE 1=1';
                 }
                 // Some tables may have field, some other not. For the moment we disable it.
                 if (in_array($InfoFieldList[0], array('tablewithentity'))) {
-                    $sqlwhere .= ' AND entity = ' . $conf->entity;
+                    $sqlwhere .= ' AND entity = '.$conf->entity;
                 }
                 $sql .= $sqlwhere;
                 //print $sql;
 
-                $sql .= ' ORDER BY ' . implode(', ', $fields_label);
+                $sql .= ' ORDER BY '.implode(', ', $fields_label);
 
-                dol_syslog(get_class($this) . '::showInputField type=sellist', LOG_DEBUG);
+                dol_syslog(get_class($this).'::showInputField type=sellist', LOG_DEBUG);
                 $resql = $this->db->query($sql);
                 if ($resql) {
                     $out .= '<option value="0">&nbsp;</option>';
@@ -4739,7 +4739,7 @@ 
                         if (is_array($fields_label)) {
                             $notrans = true;
                             foreach ($fields_label as $field_toshow) {
-                                $labeltoshow .= $obj->$field_toshow . ' ';
+                                $labeltoshow .= $obj->$field_toshow.' ';
                             }
                         } else {
                             $labeltoshow = $obj->{$InfoFieldList[1]};
@@ -4750,12 +4750,12 @@ 
                             foreach ($fields_label as $field_toshow) {
                                 $translabel = $langs->trans($obj->$field_toshow);
                                 if ($translabel != $obj->$field_toshow) {
-                                    $labeltoshow = dol_trunc($translabel, 18) . ' ';
+                                    $labeltoshow = dol_trunc($translabel, 18).' ';
                                 } else {
-                                    $labeltoshow = dol_trunc($obj->$field_toshow, 18) . ' ';
+                                    $labeltoshow = dol_trunc($obj->$field_toshow, 18).' ';
                                 }
                             }
-                            $out .= '<option value="' . $obj->rowid . '" selected>' . $labeltoshow . '</option>';
+                            $out .= '<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
                         } else {
                             if (!$notrans) {
                                 $translabel = $langs->trans($obj->{$InfoFieldList[1]});
@@ -4767,38 +4767,38 @@ 
                             }
                             if (empty($labeltoshow)) $labeltoshow = '(not defined)';
                             if ($value == $obj->rowid) {
-                                $out .= '<option value="' . $obj->rowid . '" selected>' . $labeltoshow . '</option>';
+                                $out .= '<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
                             }
 
                             if (!empty($InfoFieldList[3]) && $parentField) {
-                                $parent = $parentName . ':' . $obj->{$parentField};
+                                $parent = $parentName.':'.$obj->{$parentField};
                             }
 
-                            $out .= '<option value="' . $obj->rowid . '"';
+                            $out .= '<option value="'.$obj->rowid.'"';
                             $out .= ($value == $obj->rowid ? ' selected' : '');
-                            $out .= (!empty($parent) ? ' parent="' . $parent . '"' : '');
-                            $out .= '>' . $labeltoshow . '</option>';
+                            $out .= (!empty($parent) ? ' parent="'.$parent.'"' : '');
+                            $out .= '>'.$labeltoshow.'</option>';
                         }
 
                         $i++;
                     }
                     $this->db->free($resql);
                 } else {
-                    print 'Error in request ' . $sql . ' ' . $this->db->lasterror() . '. Check setup of extra parameters.<br>';
+                    print 'Error in request '.$sql.' '.$this->db->lasterror().'. Check setup of extra parameters.<br>';
                 }
             }
             $out .= '</select>';
         } elseif ($type == 'checkbox') {
             $value_arr = explode(',', $value);
-            $out = $form->multiselectarray($keyprefix . $key . $keysuffix, (empty($param['options']) ? null : $param['options']), $value_arr, '', 0, '', 0, '100%');
+            $out = $form->multiselectarray($keyprefix.$key.$keysuffix, (empty($param['options']) ? null : $param['options']), $value_arr, '', 0, '', 0, '100%');
         } elseif ($type == 'radio') {
             $out = '';
             foreach ($param['options'] as $keyopt => $val) {
-                $out .= '<input class="flat ' . $morecss . '" type="radio" name="' . $keyprefix . $key . $keysuffix . '" id="' . $keyprefix . $key . $keysuffix . '" ' . ($moreparam ? $moreparam : '');
-                $out .= ' value="' . $keyopt . '"';
-                $out .= ' id="' . $keyprefix . $key . $keysuffix . '_' . $keyopt . '"';
+                $out .= '<input class="flat '.$morecss.'" type="radio" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam ? $moreparam : '');
+                $out .= ' value="'.$keyopt.'"';
+                $out .= ' id="'.$keyprefix.$key.$keysuffix.'_'.$keyopt.'"';
                 $out .= ($value == $keyopt ? 'checked' : '');
-                $out .= '/><label for="' . $keyprefix . $key . $keysuffix . '_' . $keyopt . '">' . $val . '</label><br>';
+                $out .= '/><label for="'.$keyprefix.$key.$keysuffix.'_'.$keyopt.'">'.$val.'</label><br>';
             }
         } elseif ($type == 'chkbxlst') {
             if (is_array($value)) {
@@ -4817,17 +4817,17 @@ 
                 // 2 : key fields name (if differ of rowid)
                 // 3 : key field parent (for dependent lists)
                 // 4 : where clause filter on column or table extrafield, syntax field='value' or extra.field=value
-                $keyList = (empty($InfoFieldList[2]) ? 'rowid' : $InfoFieldList[2] . ' as rowid');
+                $keyList = (empty($InfoFieldList[2]) ? 'rowid' : $InfoFieldList[2].' as rowid');
 
                 if (count($InfoFieldList) > 3 && !empty($InfoFieldList[3])) {
                     list ($parentName, $parentField) = explode('|', $InfoFieldList[3]);
-                    $keyList .= ', ' . $parentField;
+                    $keyList .= ', '.$parentField;
                 }
                 if (count($InfoFieldList) > 4 && !empty($InfoFieldList[4])) {
                     if (strpos($InfoFieldList[4], 'extra.') !== false) {
-                        $keyList = 'main.' . $InfoFieldList[2] . ' as rowid';
+                        $keyList = 'main.'.$InfoFieldList[2].' as rowid';
                     } else {
-                        $keyList = $InfoFieldList[2] . ' as rowid';
+                        $keyList = $InfoFieldList[2].' as rowid';
                     }
                 }
 
@@ -4838,8 +4838,8 @@ 
                 }
 
                 $sqlwhere = '';
-                $sql = 'SELECT ' . $keyList;
-                $sql .= ' FROM ' . MAIN_DB_PREFIX . $InfoFieldList[0];
+                $sql = 'SELECT '.$keyList;
+                $sql .= ' FROM '.MAIN_DB_PREFIX.$InfoFieldList[0];
                 if (!empty($InfoFieldList[4])) {
 
                     // can use SELECT request
@@ -4856,23 +4856,23 @@ 
 
                     // We have to join on extrafield table
                     if (strpos($InfoFieldList[4], 'extra') !== false) {
-                        $sql .= ' as main, ' . MAIN_DB_PREFIX . $InfoFieldList[0] . '_extrafields as extra';
-                        $sqlwhere .= ' WHERE extra.fk_object=main.' . $InfoFieldList[2] . ' AND ' . $InfoFieldList[4];
+                        $sql .= ' as main, '.MAIN_DB_PREFIX.$InfoFieldList[0].'_extrafields as extra';
+                        $sqlwhere .= ' WHERE extra.fk_object=main.'.$InfoFieldList[2].' AND '.$InfoFieldList[4];
                     } else {
-                        $sqlwhere .= ' WHERE ' . $InfoFieldList[4];
+                        $sqlwhere .= ' WHERE '.$InfoFieldList[4];
                     }
                 } else {
                     $sqlwhere .= ' WHERE 1=1';
                 }
                 // Some tables may have field, some other not. For the moment we disable it.
                 if (in_array($InfoFieldList[0], array('tablewithentity'))) {
-                    $sqlwhere .= ' AND entity = ' . $conf->entity;
+                    $sqlwhere .= ' AND entity = '.$conf->entity;
                 }
                 // $sql.=preg_replace('/^ AND /','',$sqlwhere);
                 // print $sql;
 
                 $sql .= $sqlwhere;
-                dol_syslog(get_class($this) . '::showInputField type=chkbxlst', LOG_DEBUG);
+                dol_syslog(get_class($this).'::showInputField type=chkbxlst', LOG_DEBUG);
                 $resql = $this->db->query($sql);
                 if ($resql) {
                     $num = $this->db->num_rows($resql);
@@ -4890,7 +4890,7 @@ 
                         if (is_array($fields_label)) {
                             $notrans = true;
                             foreach ($fields_label as $field_toshow) {
-                                $labeltoshow .= $obj->$field_toshow . ' ';
+                                $labeltoshow .= $obj->$field_toshow.' ';
                             }
                         } else {
                             $labeltoshow = $obj->{$InfoFieldList[1]};
@@ -4901,9 +4901,9 @@ 
                             foreach ($fields_label as $field_toshow) {
                                 $translabel = $langs->trans($obj->$field_toshow);
                                 if ($translabel != $obj->$field_toshow) {
-                                    $labeltoshow = dol_trunc($translabel, 18) . ' ';
+                                    $labeltoshow = dol_trunc($translabel, 18).' ';
                                 } else {
-                                    $labeltoshow = dol_trunc($obj->$field_toshow, 18) . ' ';
+                                    $labeltoshow = dol_trunc($obj->$field_toshow, 18).' ';
                                 }
                             }
 
@@ -4925,7 +4925,7 @@ 
                             }
 
                             if (!empty($InfoFieldList[3]) && $parentField) {
-                                $parent = $parentName . ':' . $obj->{$parentField};
+                                $parent = $parentName.':'.$obj->{$parentField};
                             }
 
                             $data[$obj->rowid] = $labeltoshow;
@@ -4935,25 +4935,25 @@ 
                     }
                     $this->db->free($resql);
 
-                    $out = $form->multiselectarray($keyprefix . $key . $keysuffix, $data, $value_arr, '', 0, '', 0, '100%');
+                    $out = $form->multiselectarray($keyprefix.$key.$keysuffix, $data, $value_arr, '', 0, '', 0, '100%');
                 } else {
-                    print 'Error in request ' . $sql . ' ' . $this->db->lasterror() . '. Check setup of extra parameters.<br>';
+                    print 'Error in request '.$sql.' '.$this->db->lasterror().'. Check setup of extra parameters.<br>';
                 }
             }
         } elseif ($type == 'link') {
-            $param_list = array_keys($param['options']);                // $param_list='ObjectName:classPath'
+            $param_list = array_keys($param['options']); // $param_list='ObjectName:classPath'
             $showempty = (($required && $default != '') ? 0 : 1);
-            $out = $form->selectForForms($param_list[0], $keyprefix . $key . $keysuffix, $value, $showempty);
+            $out = $form->selectForForms($param_list[0], $keyprefix.$key.$keysuffix, $value, $showempty);
             if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {
                 list($class, $classfile) = explode(':', $param_list[0]);
-                if (file_exists(dol_buildpath(dirname(dirname($classfile)) . '/card.php'))) $url_path = dol_buildpath(dirname(dirname($classfile)) . '/card.php', 1);
-                else $url_path = dol_buildpath(dirname(dirname($classfile)) . '/' . $class . '_card.php', 1);
-                $out .= '<a class="butActionNew" href="' . $url_path . '?action=create&backtopage=' . $_SERVER['PHP_SELF'] . '"><span class="fa fa-plus-circle valignmiddle"></span></a>';
+                if (file_exists(dol_buildpath(dirname(dirname($classfile)).'/card.php'))) $url_path = dol_buildpath(dirname(dirname($classfile)).'/card.php', 1);
+                else $url_path = dol_buildpath(dirname(dirname($classfile)).'/'.$class.'_card.php', 1);
+                $out .= '<a class="butActionNew" href="'.$url_path.'?action=create&backtopage='.$_SERVER['PHP_SELF'].'"><span class="fa fa-plus-circle valignmiddle"></span></a>';
                 // TODO Add Javascript code to add input fields contents to new elements urls
             }
         } elseif ($type == 'password') {
             // If prefix is 'search_', field is used as a filter, we use a common text field.
-            $out = '<input type="' . ($keyprefix == 'search_' ? 'text' : 'password') . '" class="flat ' . $morecss . '" name="' . $keyprefix . $key . $keysuffix . '" id="' . $keyprefix . $key . $keysuffix . '" value="' . $value . '" ' . ($moreparam ? $moreparam : '') . '>';
+            $out = '<input type="'.($keyprefix == 'search_' ? 'text' : 'password').'" class="flat '.$morecss.'" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam ? $moreparam : '').'>';
         } elseif ($type == 'array') {
             $newval = $val;
             $newval['type'] = 'varchar(256)';
@@ -4963,25 +4963,25 @@ 
             $inputs = array();
             if (!empty($value)) {
                 foreach ($value as $option) {
-                    $out .= '<span><a class="' . dol_escape_htmltag($keyprefix . $key . $keysuffix) . '_del" href="javascript:;"><span class="fa fa-minus-circle valignmiddle"></span></a> ';
-                    $out .= $this->showInputField($newval, $keyprefix . $key . $keysuffix . '[]', $option, $moreparam, '', '', $showsize) . '<br></span>';
+                    $out .= '<span><a class="'.dol_escape_htmltag($keyprefix.$key.$keysuffix).'_del" href="javascript:;"><span class="fa fa-minus-circle valignmiddle"></span></a> ';
+                    $out .= $this->showInputField($newval, $keyprefix.$key.$keysuffix.'[]', $option, $moreparam, '', '', $showsize).'<br></span>';
                 }
             }
 
-            $out .= '<a id="' . dol_escape_htmltag($keyprefix . $key . $keysuffix) . '_add" href="javascript:;"><span class="fa fa-plus-circle valignmiddle"></span></a>';
+            $out .= '<a id="'.dol_escape_htmltag($keyprefix.$key.$keysuffix).'_add" href="javascript:;"><span class="fa fa-plus-circle valignmiddle"></span></a>';
 
-            $newInput = '<span><a class="' . dol_escape_htmltag($keyprefix . $key . $keysuffix) . '_del" href="javascript:;"><span class="fa fa-minus-circle valignmiddle"></span></a> ';
-            $newInput .= $this->showInputField($newval, $keyprefix . $key . $keysuffix . '[]', '', $moreparam, '', '', $showsize) . '<br></span>';
+            $newInput = '<span><a class="'.dol_escape_htmltag($keyprefix.$key.$keysuffix).'_del" href="javascript:;"><span class="fa fa-minus-circle valignmiddle"></span></a> ';
+            $newInput .= $this->showInputField($newval, $keyprefix.$key.$keysuffix.'[]', '', $moreparam, '', '', $showsize).'<br></span>';
 
             if (!empty($conf->use_javascript_ajax)) {
                 $out .= '
 					<script type="text/javascript">
 					$(document).ready(function() {
-						$("a#' . dol_escape_js($keyprefix . $key . $keysuffix) . '_add").click(function() {
-							$("' . dol_escape_js($newInput) . '").insertBefore(this);
+						$("a#' . dol_escape_js($keyprefix.$key.$keysuffix).'_add").click(function() {
+							$("' . dol_escape_js($newInput).'").insertBefore(this);
 						});
 
-						$(document).on("click", "a.' . dol_escape_js($keyprefix . $key . $keysuffix) . '_del", function() {
+						$(document).on("click", "a.' . dol_escape_js($keyprefix.$key.$keysuffix).'_del", function() {
 							$(this).parent().remove();
 						});
 					});
@@ -4989,7 +4989,7 @@ 
             }
         }
         if (!empty($hidden)) {
-            $out = '<input type="hidden" value="' . $value . '" name="' . $keyprefix . $key . $keysuffix . '" id="' . $keyprefix . $key . $keysuffix . '"/>';
+            $out = '<input type="hidden" value="'.$value.'" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'"/>';
         }
         /* Add comments
 		 if ($type == 'date') $out.=' (YYYY-MM-DD)';
@@ -5016,7 +5016,7 @@ 
         global $conf, $langs, $form;
 
         if (!is_object($form)) {
-            require_once DOL_DOCUMENT_ROOT . '/core/class/html.form.class.php';
+            require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
             $form = new Form($this->db);
         }
 
@@ -5027,9 +5027,9 @@ 
 
         // Convert var to be able to share same code than showOutputField of extrafields
         if (preg_match('/varchar\((\d+)\)/', $type, $reg)) {
-            $type = 'varchar';        // convert varchar(xx) int varchar
+            $type = 'varchar'; // convert varchar(xx) int varchar
             $size = $reg[1];
-        } elseif (preg_match('/varchar/', $type)) $type = 'varchar';        // convert varchar(xx) int varchar
+        } 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';
 
@@ -5041,12 +5041,12 @@ 
         if (is_array($val['arrayofkeyval'])) $param['options'] = $val['arrayofkeyval'];
         if (preg_match('/^integer:(.*):(.*)/i', $val['type'], $reg)) {
             $type = 'link';
-            $param['options'] = array($reg[1] . ':' . $reg[2] => $reg[1] . ':' . $reg[2]);
+            $param['options'] = array($reg[1].':'.$reg[2] => $reg[1].':'.$reg[2]);
         }
         $langfile = $val['langfile'];
         $list = $val['list'];
         $help = $val['help'];
-        $hidden = (($val['visible'] == 0) ? 1 : 0);            // If zero, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
+        $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 '';
 
@@ -5107,7 +5107,7 @@ 
             if (!empty($value)) {
                 $checked = ' checked ';
             }
-            $value = '<input type="checkbox" ' . $checked . ' ' . ($moreparam ? $moreparam : '') . ' readonly disabled>';
+            $value = '<input type="checkbox" '.$checked.' '.($moreparam ? $moreparam : '').' readonly disabled>';
         } elseif ($type == 'mail') {
             $value = dol_print_email($value, 0, 0, 0, 64, 1, 1);
         } elseif ($type == 'url') {
@@ -5127,7 +5127,7 @@ 
 
             if (count($InfoFieldList) >= 3) {
                 $selectkey = $InfoFieldList[2];
-                $keyList = $InfoFieldList[2] . ' as rowid';
+                $keyList = $InfoFieldList[2].' as rowid';
             }
 
             $fields_label = explode('|', $InfoFieldList[1]);
@@ -5136,25 +5136,25 @@ 
                 $keyList .= implode(', ', $fields_label);
             }
 
-            $sql = 'SELECT ' . $keyList;
-            $sql .= ' FROM ' . MAIN_DB_PREFIX . $InfoFieldList[0];
+            $sql = 'SELECT '.$keyList;
+            $sql .= ' FROM '.MAIN_DB_PREFIX.$InfoFieldList[0];
             if (strpos($InfoFieldList[4], 'extra') !== false) {
                 $sql .= ' as main';
             }
             if ($selectkey == 'rowid' && empty($value)) {
-                $sql .= " WHERE " . $selectkey . "=0";
+                $sql .= " WHERE ".$selectkey."=0";
             } elseif ($selectkey == 'rowid') {
-                $sql .= " WHERE " . $selectkey . "=" . $this->db->escape($value);
+                $sql .= " WHERE ".$selectkey."=".$this->db->escape($value);
             } else {
-                $sql .= " WHERE " . $selectkey . "='" . $this->db->escape($value) . "'";
+                $sql .= " WHERE ".$selectkey."='".$this->db->escape($value)."'";
             }
 
             //$sql.= ' AND entity = '.$conf->entity;
 
-            dol_syslog(get_class($this) . ':showOutputField:$type=sellist', LOG_DEBUG);
+            dol_syslog(get_class($this).':showOutputField:$type=sellist', LOG_DEBUG);
             $resql = $this->db->query($sql);
             if ($resql) {
-                $value = '';    // value was used, so now we reste it to use it to build final output
+                $value = ''; // value was used, so now we reste it to use it to build final output
 
                 $obj = $this->db->fetch_object($resql);
 
@@ -5168,9 +5168,9 @@ 
                             $translabel = $langs->trans($obj->$field_toshow);
                         }
                         if ($translabel != $field_toshow) {
-                            $value .= dol_trunc($translabel, 18) . ' ';
+                            $value .= dol_trunc($translabel, 18).' ';
                         } else {
-                            $value .= $obj->$field_toshow . ' ';
+                            $value .= $obj->$field_toshow.' ';
                         }
                     }
                 } else {
@@ -5184,7 +5184,7 @@ 
                         $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];
         } elseif ($type == 'checkbox') {
@@ -5192,9 +5192,9 @@ 
             $value = '';
             if (is_array($value_arr) && count($value_arr) > 0) {
                 foreach ($value_arr as $keyval => $valueval) {
-                    $toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">' . $param['options'][$valueval] . '</li>';
+                    $toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$param['options'][$valueval].'</li>';
                 }
-                $value = '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">' . implode(' ', $toprint) . '</ul></div>';
+                $value = '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';
             }
         } elseif ($type == 'chkbxlst') {
             $value_arr = explode(',', $value);
@@ -5207,7 +5207,7 @@ 
 
             if (count($InfoFieldList) >= 3) {
                 $selectkey = $InfoFieldList[2];
-                $keyList = $InfoFieldList[2] . ' as rowid';
+                $keyList = $InfoFieldList[2].' as rowid';
             }
 
             $fields_label = explode('|', $InfoFieldList[1]);
@@ -5216,15 +5216,15 @@ 
                 $keyList .= implode(', ', $fields_label);
             }
 
-            $sql = 'SELECT ' . $keyList;
-            $sql .= ' FROM ' . MAIN_DB_PREFIX . $InfoFieldList[0];
+            $sql = 'SELECT '.$keyList;
+            $sql .= ' FROM '.MAIN_DB_PREFIX.$InfoFieldList[0];
             if (strpos($InfoFieldList[4], 'extra') !== false) {
                 $sql .= ' as main';
             }
             // $sql.= " WHERE ".$selectkey."='".$this->db->escape($value)."'";
             // $sql.= ' AND entity = '.$conf->entity;
 
-            dol_syslog(get_class($this) . ':showOutputField:$type=chkbxlst', LOG_DEBUG);
+            dol_syslog(get_class($this).':showOutputField:$type=chkbxlst', LOG_DEBUG);
             $resql = $this->db->query($sql);
             if ($resql) {
                 $value = ''; // value was used, so now we reste it to use it to build final output
@@ -5241,9 +5241,9 @@ 
                                     $translabel = $langs->trans($obj->$field_toshow);
                                 }
                                 if ($translabel != $field_toshow) {
-                                    $toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">' . dol_trunc($translabel, 18) . '</li>';
+                                    $toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.dol_trunc($translabel, 18).'</li>';
                                 } else {
-                                    $toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">' . $obj->$field_toshow . '</li>';
+                                    $toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$obj->$field_toshow.'</li>';
                                 }
                             }
                         } else {
@@ -5252,23 +5252,23 @@ 
                                 $translabel = $langs->trans($obj->{$InfoFieldList[1]});
                             }
                             if ($translabel != $obj->{$InfoFieldList[1]}) {
-                                $toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">' . dol_trunc($translabel, 18) . '</li>';
+                                $toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.dol_trunc($translabel, 18).'</li>';
                             } else {
-                                $toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">' . $obj->{$InfoFieldList[1]} . '</li>';
+                                $toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$obj->{$InfoFieldList[1]}.'</li>';
                             }
                         }
                     }
                 }
-                $value = '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">' . implode(' ', $toprint) . '</ul></div>';
+                $value = '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';
             } else {
-                dol_syslog(get_class($this) . '::showOutputField error ' . $this->db->lasterror(), LOG_WARNING);
+                dol_syslog(get_class($this).'::showOutputField error '.$this->db->lasterror(), LOG_WARNING);
             }
         } elseif ($type == 'link') {
             $out = '';
 
             // only if something to display (perf)
             if ($value) {
-                $param_list = array_keys($param['options']);                // $param_list='ObjectName:classPath'
+                $param_list = array_keys($param['options']); // $param_list='ObjectName:classPath'
 
                 $InfoFieldList = explode(":", $param_list[0]);
                 $classname = $InfoFieldList[0];
@@ -5339,7 +5339,7 @@ 
                     $perms = dol_eval($extrafields->attributes[$this->table_element]['perms'][$key], 1);
                 }
 
-                if (($mode == 'create' || $mode == 'edit') && abs($enabled) != 1 && abs($enabled) != 3) continue;    // <> -1 and <> 1 and <> 3 = not visible on forms, only on list
+                if (($mode == 'create' || $mode == 'edit') && abs($enabled) != 1 && abs($enabled) != 3) continue; // <> -1 and <> 1 and <> 3 = not visible on forms, only on list
                 if (empty($perms)) continue;
 
                 // Load language if required
@@ -5354,12 +5354,12 @@ 
 
                 switch ($mode) {
                     case "view":
-                        $value = $this->array_options["options_" . $key . $keysuffix];
+                        $value = $this->array_options["options_".$key.$keysuffix];
                         break;
                     case "edit":
-                        $getposttemp = GETPOST($keyprefix . 'options_' . $key . $keysuffix, 'none');                // GETPOST can get value from GET, POST or setup of default values.
+                        $getposttemp = GETPOST($keyprefix.'options_'.$key.$keysuffix, 'none'); // GETPOST can get value from GET, POST or setup of default values.
                         // GETPOST("options_" . $key) can be 'abc' or array(0=>'abc')
-                        if (is_array($getposttemp) || $getposttemp != '' || GETPOSTISSET($keyprefix . 'options_' . $key . $keysuffix)) {
+                        if (is_array($getposttemp) || $getposttemp != '' || GETPOSTISSET($keyprefix.'options_'.$key.$keysuffix)) {
                             if (is_array($getposttemp)) {
                                 // $getposttemp is an array but following code expects a comma separated string
                                 $value = implode(",", $getposttemp);
@@ -5367,7 +5367,7 @@ 
                                 $value = $getposttemp;
                             }
                         } else {
-                            $value = $this->array_options["options_" . $key];            // No GET, no POST, no default value, so we take value of object.
+                            $value = $this->array_options["options_".$key]; // No GET, no POST, no default value, so we take value of object.
                         }
                         //var_dump($keyprefix.' - '.$key.' - '.$keysuffix.' - '.$keyprefix.'options_'.$key.$keysuffix.' - '.$this->array_options["options_".$key.$keysuffix].' - '.$getposttemp.' - '.$value);
                         break;
@@ -5386,12 +5386,12 @@ 
 
                     // add html5 elements
                     $domData = ' data-element="extrafield"';
-                    $domData .= ' data-targetelement="' . $this->element . '"';
-                    $domData .= ' data-targetid="' . $this->id . '"';
+                    $domData .= ' data-targetelement="'.$this->element.'"';
+                    $domData .= ' data-targetid="'.$this->id.'"';
 
-                    $html_id = !empty($this->id) ? 'extrarow-' . $this->element . '_' . $key . '_' . $this->id : '';
+                    $html_id = !empty($this->id) ? 'extrarow-'.$this->element.'_'.$key.'_'.$this->id : '';
 
-                    $out .= '<tr id="' . $html_id . '" ' . $csstyle . ' class="' . $class . $this->element . '_extras_' . $key . '" ' . $domData . ' >';
+                    $out .= '<tr id="'.$html_id.'" '.$csstyle.' class="'.$class.$this->element.'_extras_'.$key.'" '.$domData.' >';
 
                     if (!empty($conf->global->MAIN_EXTRAFIELDS_USE_TWO_COLUMS) && ($e % 2) == 0) {
                         if (!empty($conf->global->MAIN_EXTRAFIELDS_USE_TWO_COLUMS) && ($e % 2) == 0) {
@@ -5405,16 +5405,16 @@ 
 
                     // Convert date into timestamp format (value in memory must be a timestamp)
                     if (in_array($extrafields->attributes[$this->table_element]['type'][$key], array('date', 'datetime'))) {
-                        $datenotinstring = $this->array_options['options_' . $key];
-                        if (!is_numeric($this->array_options['options_' . $key]))    // For backward compatibility
+                        $datenotinstring = $this->array_options['options_'.$key];
+                        if (!is_numeric($this->array_options['options_'.$key]))    // For backward compatibility
                         {
                             $datenotinstring = $this->db->jdate($datenotinstring);
                         }
-                        $value = GETPOSTISSET($keyprefix . 'options_' . $key . $keysuffix) ? dol_mktime(GETPOST($keyprefix . 'options_' . $key . $keysuffix . "hour", 'int', 3), GETPOST($keyprefix . 'options_' . $key . $keysuffix . "min", 'int', 3), 0, GETPOST($keyprefix . 'options_' . $key . $keysuffix . "month", 'int', 3), GETPOST($keyprefix . 'options_' . $key . $keysuffix . "day", 'int', 3), GETPOST($keyprefix . 'options_' . $key . $keysuffix . "year", 'int', 3)) : $datenotinstring;
+                        $value = GETPOSTISSET($keyprefix.'options_'.$key.$keysuffix) ? dol_mktime(GETPOST($keyprefix.'options_'.$key.$keysuffix."hour", 'int', 3), GETPOST($keyprefix.'options_'.$key.$keysuffix."min", 'int', 3), 0, GETPOST($keyprefix.'options_'.$key.$keysuffix."month", 'int', 3), GETPOST($keyprefix.'options_'.$key.$keysuffix."day", 'int', 3), GETPOST($keyprefix.'options_'.$key.$keysuffix."year", 'int', 3)) : $datenotinstring;
                     }
                     // Convert float submited string into real php numeric (value in memory must be a php numeric)
                     if (in_array($extrafields->attributes[$this->table_element]['type'][$key], array('price', 'double'))) {
-                        $value = GETPOSTISSET($keyprefix . 'options_' . $key . $keysuffix) ? price2num(GETPOST($keyprefix . 'options_' . $key . $keysuffix, 'alpha', 3)) : $this->array_options['options_' . $key];
+                        $value = GETPOSTISSET($keyprefix.'options_'.$key.$keysuffix) ? price2num(GETPOST($keyprefix.'options_'.$key.$keysuffix, 'alpha', 3)) : $this->array_options['options_'.$key];
                     }
 
                     $labeltoshow = $langs->trans($label);
@@ -5427,8 +5427,8 @@ 
                     else $out .= $labeltoshow;
                     $out .= '</td>';
 
-                    $html_id = !empty($this->id) ? $this->element . '_extras_' . $key . '_' . $this->id : '';
-                    $out .= '<td id="' . $html_id . '" class="' . $this->element . '_extras_' . $key . '" ' . ($colspan ? ' colspan="' . $colspan . '"' : '') . '>';
+                    $html_id = !empty($this->id) ? $this->element.'_extras_'.$key.'_'.$this->id : '';
+                    $out .= '<td id="'.$html_id.'" class="'.$this->element.'_extras_'.$key.'" '.($colspan ? ' colspan="'.$colspan.'"' : '').'>';
 
                     switch ($mode) {
                         case "view":
@@ -5478,7 +5478,7 @@ 
 						setListDependencies();
 				    });
 				</script>' . "\n";
-                $out .= '<!-- /showOptionalsInput --> ' . "\n";
+                $out .= '<!-- /showOptionalsInput --> '."\n";
             }
         }
         return $out;
@@ -5509,7 +5509,7 @@ 
             // Get cost price for margin calculation
             if (!empty($fk_product)) {
                 if (isset($conf->global->MARGIN_TYPE) && $conf->global->MARGIN_TYPE == 'costprice') {
-                    require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
+                    require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
                     $product = new Product($this->db);
                     $result = $product->fetch($fk_product);
                     if ($result <= 0) {
@@ -5522,7 +5522,7 @@ 
                         $buyPrice = $product->pmp;
                     }
                 } else if (isset($conf->global->MARGIN_TYPE) && $conf->global->MARGIN_TYPE == 'pmp') {
-                    require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
+                    require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
                     $product = new Product($this->db);
                     $result = $product->fetch($fk_product);
                     if ($result <= 0) {
@@ -5535,7 +5535,7 @@ 
                 }
 
                 if (empty($buyPrice) && isset($conf->global->MARGIN_TYPE) && in_array($conf->global->MARGIN_TYPE, array('1', 'pmp', 'costprice'))) {
-                    require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.product.class.php';
+                    require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
                     $productFournisseur = new ProductFournisseur($this->db);
                     if (($result = $productFournisseur->find_min_price_product_fournisseur($fk_product)) > 0) {
                         $buyPrice = $productFournisseur->fourn_unitprice;
@@ -5571,40 +5571,40 @@ 
         // phpcs:enable
         global $conf, $user, $langs;
 
-        include_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
-        include_once DOL_DOCUMENT_ROOT . '/core/lib/images.lib.php';
+        include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+        include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
 
         $sortfield = 'position_name';
         $sortorder = 'asc';
 
-        $dir = $sdir . '/';
+        $dir = $sdir.'/';
         $pdir = '/';
         if ($modulepart == 'ticket') {
-            $dir .= get_exdir(0, 0, 0, 0, $this, $modulepart) . $this->track_id . '/';
-            $pdir .= get_exdir(0, 0, 0, 0, $this, $modulepart) . $this->track_id . '/';
+            $dir .= get_exdir(0, 0, 0, 0, $this, $modulepart).$this->track_id.'/';
+            $pdir .= get_exdir(0, 0, 0, 0, $this, $modulepart).$this->track_id.'/';
         } else {
-            $dir .= get_exdir(0, 0, 0, 0, $this, $modulepart) . $this->ref . '/';
-            $pdir .= get_exdir(0, 0, 0, 0, $this, $modulepart) . $this->ref . '/';
+            $dir .= get_exdir(0, 0, 0, 0, $this, $modulepart).$this->ref.'/';
+            $pdir .= get_exdir(0, 0, 0, 0, $this, $modulepart).$this->ref.'/';
         }
 
         // For backward compatibility
         if ($modulepart == 'product' && !empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) {
-            $dir = $sdir . '/' . get_exdir($this->id, 2, 0, 0, $this, $modulepart) . $this->id . "/photos/";
-            $pdir = '/' . get_exdir($this->id, 2, 0, 0, $this, $modulepart) . $this->id . "/photos/";
+            $dir = $sdir.'/'.get_exdir($this->id, 2, 0, 0, $this, $modulepart).$this->id."/photos/";
+            $pdir = '/'.get_exdir($this->id, 2, 0, 0, $this, $modulepart).$this->id."/photos/";
         }
 
         // Defined relative dir to DOL_DATA_ROOT
         $relativedir = '';
         if ($dir) {
-            $relativedir = preg_replace('/^' . preg_quote(DOL_DATA_ROOT, '/') . '/', '', $dir);
+            $relativedir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT, '/').'/', '', $dir);
             $relativedir = preg_replace('/^[\\/]/', '', $relativedir);
             $relativedir = preg_replace('/[\\/]$/', '', $relativedir);
         }
 
-        $dirthumb = $dir . 'thumbs/';
-        $pdirthumb = $pdir . 'thumbs/';
+        $dirthumb = $dir.'thumbs/';
+        $pdirthumb = $pdir.'thumbs/';
 
-        $return = '<!-- Photo -->' . "\n";
+        $return = '<!-- Photo -->'."\n";
         $nbphoto = 0;
 
         $filearray = dol_dir_list($dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ? SORT_DESC : SORT_ASC), 1);
@@ -5637,75 +5637,75 @@ 
                     if ($size == 1 || $size == 'small') {   // Format vignette
 
                         // Find name of thumb file
-                        $photo_vignette = basename(getImageFileNameForSize($dir . $file, '_small'));
-                        if (!dol_is_file($dirthumb . $photo_vignette)) $photo_vignette = '';
+                        $photo_vignette = basename(getImageFileNameForSize($dir.$file, '_small'));
+                        if (!dol_is_file($dirthumb.$photo_vignette)) $photo_vignette = '';
 
                         // Get filesize of original file
-                        $imgarray = dol_getImageSize($dir . $photo);
+                        $imgarray = dol_getImageSize($dir.$photo);
 
                         if ($nbbyrow > 0) {
                             if ($nbphoto == 1) $return .= '<table width="100%" valign="top" align="center" border="0" cellpadding="2" cellspacing="2">';
 
                             if ($nbphoto % $nbbyrow == 1) $return .= '<tr align=center valign=middle border=1>';
-                            $return .= '<td width="' . ceil(100 / $nbbyrow) . '%" class="photo">';
+                            $return .= '<td width="'.ceil(100 / $nbbyrow).'%" class="photo">';
                         } else if ($nbbyrow < 0) $return .= '<div class="inline-block">';
 
                         $return .= "\n";
 
-                        $relativefile = preg_replace('/^\//', '', $pdir . $photo);
+                        $relativefile = preg_replace('/^\//', '', $pdir.$photo);
                         if (empty($nolink)) {
-                            $urladvanced = getAdvancedPreviewUrl($modulepart, $relativefile, 0, 'entity=' . $this->entity);
-                            if ($urladvanced) $return .= '<a href="' . $urladvanced . '">';
-                            else $return .= '<a href="' . DOL_URL_ROOT . '/viewimage.php?modulepart=' . $modulepart . '&entity=' . $this->entity . '&file=' . urlencode($pdir . $photo) . '" class="aphoto" target="_blank">';
+                            $urladvanced = getAdvancedPreviewUrl($modulepart, $relativefile, 0, 'entity='.$this->entity);
+                            if ($urladvanced) $return .= '<a href="'.$urladvanced.'">';
+                            else $return .= '<a href="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdir.$photo).'" class="aphoto" target="_blank">';
                         }
 
                         // Show image (width height=$maxHeight)
                         // Si fichier vignette disponible et image source trop grande, on utilise la vignette, sinon on utilise photo origine
-                        $alt = $langs->transnoentitiesnoconv('File') . ': ' . $relativefile;
-                        $alt .= ' - ' . $langs->transnoentitiesnoconv('Size') . ': ' . $imgarray['width'] . 'x' . $imgarray['height'];
+                        $alt = $langs->transnoentitiesnoconv('File').': '.$relativefile;
+                        $alt .= ' - '.$langs->transnoentitiesnoconv('Size').': '.$imgarray['width'].'x'.$imgarray['height'];
                         if ($notitle) $alt = '';
 
                         if ($usesharelink) {
                             if ($val['share']) {
                                 if (empty($maxHeight) || $photo_vignette && $imgarray['height'] > $maxHeight) {
                                     $return .= '<!-- Show original file (thumb not yet available with shared links) -->';
-                                    $return .= '<img class="photo photowithmargin" border="0" height="' . $maxHeight . '" src="' . DOL_URL_ROOT . '/viewimage.php?hashp=' . urlencode($val['share']) . '" title="' . dol_escape_htmltag($alt) . '">';
+                                    $return .= '<img class="photo photowithmargin" border="0" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?hashp='.urlencode($val['share']).'" title="'.dol_escape_htmltag($alt).'">';
                                 } else {
                                     $return .= '<!-- Show original file -->';
-                                    $return .= '<img class="photo photowithmargin" border="0" height="' . $maxHeight . '" src="' . DOL_URL_ROOT . '/viewimage.php?hashp=' . urlencode($val['share']) . '" title="' . dol_escape_htmltag($alt) . '">';
+                                    $return .= '<img class="photo photowithmargin" border="0" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?hashp='.urlencode($val['share']).'" title="'.dol_escape_htmltag($alt).'">';
                                 }
                             } else {
                                 $return .= '<!-- Show nophoto file (because file is not shared) -->';
-                                $return .= '<img class="photo photowithmargin" border="0" height="' . $maxHeight . '" src="' . DOL_URL_ROOT . '/public/theme/common/nophoto.png" title="' . dol_escape_htmltag($alt) . '">';
+                                $return .= '<img class="photo photowithmargin" border="0" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/public/theme/common/nophoto.png" title="'.dol_escape_htmltag($alt).'">';
                             }
                         } else {
                             if (empty($maxHeight) || $photo_vignette && $imgarray['height'] > $maxHeight) {
                                 $return .= '<!-- Show thumb -->';
-                                $return .= '<img class="photo photowithmargin" border="0" height="' . $maxHeight . '" src="' . DOL_URL_ROOT . '/viewimage.php?modulepart=' . $modulepart . '&entity=' . $this->entity . '&file=' . urlencode($pdirthumb . $photo_vignette) . '" title="' . dol_escape_htmltag($alt) . '">';
+                                $return .= '<img class="photo photowithmargin" border="0" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdirthumb.$photo_vignette).'" title="'.dol_escape_htmltag($alt).'">';
                             } else {
                                 $return .= '<!-- Show original file -->';
-                                $return .= '<img class="photo photowithmargin" border="0" height="' . $maxHeight . '" src="' . DOL_URL_ROOT . '/viewimage.php?modulepart=' . $modulepart . '&entity=' . $this->entity . '&file=' . urlencode($pdir . $photo) . '" title="' . dol_escape_htmltag($alt) . '">';
+                                $return .= '<img class="photo photowithmargin" border="0" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdir.$photo).'" title="'.dol_escape_htmltag($alt).'">';
                             }
                         }
 
                         if (empty($nolink)) $return .= '</a>';
                         $return .= "\n";
 
-                        if ($showfilename) $return .= '<br>' . $viewfilename;
+                        if ($showfilename) $return .= '<br>'.$viewfilename;
                         if ($showaction) {
                             $return .= '<br>';
                             // On propose la generation de la vignette si elle n'existe pas et si la taille est superieure aux limites
                             if ($photo_vignette && (image_format_supported($photo) > 0) && ($this->imgWidth > $maxWidth || $this->imgHeight > $maxHeight)) {
-                                $return .= '<a href="' . $_SERVER["PHP_SELF"] . '?id=' . $this->id . '&amp;action=addthumb&amp;file=' . urlencode($pdir . $viewfilename) . '">' . img_picto($langs->trans('GenerateThumb'), 'refresh') . '&nbsp;&nbsp;</a>';
+                                $return .= '<a href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=addthumb&amp;file='.urlencode($pdir.$viewfilename).'">'.img_picto($langs->trans('GenerateThumb'), 'refresh').'&nbsp;&nbsp;</a>';
                             }
                             // Special cas for product
                             if ($modulepart == 'product' && ($user->rights->produit->creer || $user->rights->service->creer)) {
                                 // Link to resize
-                                $return .= '<a href="' . DOL_URL_ROOT . '/core/photos_resize.php?modulepart=' . urlencode('produit|service') . '&id=' . $this->id . '&amp;file=' . urlencode($pdir . $viewfilename) . '" title="' . dol_escape_htmltag($langs->trans("Resize")) . '">' . img_picto($langs->trans("Resize"), 'resize', '') . '</a> &nbsp; ';
+                                $return .= '<a href="'.DOL_URL_ROOT.'/core/photos_resize.php?modulepart='.urlencode('produit|service').'&id='.$this->id.'&amp;file='.urlencode($pdir.$viewfilename).'" title="'.dol_escape_htmltag($langs->trans("Resize")).'">'.img_picto($langs->trans("Resize"), 'resize', '').'</a> &nbsp; ';
 
                                 // Link to delete
-                                $return .= '<a href="' . $_SERVER["PHP_SELF"] . '?id=' . $this->id . '&amp;action=delete&amp;file=' . urlencode($pdir . $viewfilename) . '">';
-                                $return .= img_delete() . '</a>';
+                                $return .= '<a href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=delete&amp;file='.urlencode($pdir.$viewfilename).'">';
+                                $return .= img_delete().'</a>';
                             }
                         }
                         $return .= "\n";
@@ -5717,18 +5717,18 @@ 
                     }
 
                     if (empty($size)) {     // Format origine
-                        $return .= '<img class="photo photowithmargin" border="0" src="' . DOL_URL_ROOT . '/viewimage.php?modulepart=' . $modulepart . '&entity=' . $this->entity . '&file=' . urlencode($pdir . $photo) . '">';
+                        $return .= '<img class="photo photowithmargin" border="0" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdir.$photo).'">';
 
-                        if ($showfilename) $return .= '<br>' . $viewfilename;
+                        if ($showfilename) $return .= '<br>'.$viewfilename;
                         if ($showaction) {
                             // Special case for product
                             if ($modulepart == 'product' && ($user->rights->produit->creer || $user->rights->service->creer)) {
                                 // Link to resize
-                                $return .= '<a href="' . DOL_URL_ROOT . '/core/photos_resize.php?modulepart=' . urlencode('produit|service') . '&id=' . $this->id . '&amp;file=' . urlencode($pdir . $viewfilename) . '" title="' . dol_escape_htmltag($langs->trans("Resize")) . '">' . img_picto($langs->trans("Resize"), 'resize', '') . '</a> &nbsp; ';
+                                $return .= '<a href="'.DOL_URL_ROOT.'/core/photos_resize.php?modulepart='.urlencode('produit|service').'&id='.$this->id.'&amp;file='.urlencode($pdir.$viewfilename).'" title="'.dol_escape_htmltag($langs->trans("Resize")).'">'.img_picto($langs->trans("Resize"), 'resize', '').'</a> &nbsp; ';
 
                                 // Link to delete
-                                $return .= '<a href="' . $_SERVER["PHP_SELF"] . '?id=' . $this->id . '&amp;action=delete&amp;file=' . urlencode($pdir . $viewfilename) . '">';
-                                $return .= img_delete() . '</a>';
+                                $return .= '<a href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=delete&amp;file='.urlencode($pdir.$viewfilename).'">';
+                                $return .= img_delete().'</a>';
                             }
                         }
                     }
@@ -5742,7 +5742,7 @@ 
                 if ($nbbyrow > 0) {
                     // Ferme tableau
                     while ($nbphoto % $nbbyrow) {
-                        $return .= '<td width="' . ceil(100 / $nbbyrow) . '%">&nbsp;</td>';
+                        $return .= '<td width="'.ceil(100 / $nbbyrow).'%">&nbsp;</td>';
                         $nbphoto++;
                     }
 
@@ -5788,7 +5788,7 @@ 
         $fieldvalues = $this->setSaveQuery();
         if (array_key_exists('date_creation', $fieldvalues) && empty($fieldvalues['date_creation'])) $fieldvalues['date_creation'] = $this->db->idate($now);
         if (array_key_exists('fk_user_creat', $fieldvalues) && !($fieldvalues['fk_user_creat'] > 0)) $fieldvalues['fk_user_creat'] = $user->id;
-        unset($fieldvalues['rowid']);    // The field 'rowid' is reserved field name for autoincrement field so we don't need it into insert.
+        unset($fieldvalues['rowid']); // The field 'rowid' is reserved field name for autoincrement field so we don't need it into insert.
 
         $keys = array();
         $values = array();
@@ -5820,9 +5820,9 @@ 
         $this->db->begin();
 
         if (!$error) {
-            $sql = 'INSERT INTO ' . MAIN_DB_PREFIX . $this->table_element;
-            $sql .= ' (' . implode(", ", $keys) . ')';
-            $sql .= ' VALUES (' . implode(", ", $values) . ')';
+            $sql = 'INSERT INTO '.MAIN_DB_PREFIX.$this->table_element;
+            $sql .= ' ('.implode(", ", $keys).')';
+            $sql .= ' VALUES ('.implode(", ", $values).')';
 
             $res = $this->db->query($sql);
             if ($res === false) {
@@ -5832,7 +5832,7 @@ 
         }
 
         if (!$error) {
-            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . $this->table_element);
+            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
         }
 
         // Create extrafields
@@ -5844,7 +5844,7 @@ 
         // Triggers
         if (!$error && !$notrigger) {
             // Call triggers
-            $result = $this->call_trigger(strtoupper(get_class($this)) . '_CREATE', $user);
+            $result = $this->call_trigger(strtoupper(get_class($this)).'_CREATE', $user);
             if ($result < 0) {
                 $error++;
             }
@@ -5893,11 +5893,11 @@ 
             } else if ($this->isInt($info)) {
                 if ($field == 'entity' && is_null($this->{$field})) $queryarray[$field] = $conf->entity;
                 else {
-                    $queryarray[$field] = (int)price2num($this->{$field});
-                    if (empty($queryarray[$field])) $queryarray[$field] = 0;        // May be reset to null later if property 'notnull' is -1 for this field.
+                    $queryarray[$field] = (int) price2num($this->{$field});
+                    if (empty($queryarray[$field])) $queryarray[$field] = 0; // May be reset to null later if property 'notnull' is -1 for this field.
                 }
             } else if ($this->isFloat($info)) {
-                $queryarray[$field] = (double)price2num($this->{$field});
+                $queryarray[$field] = (double) price2num($this->{$field});
                 if (empty($queryarray[$field])) $queryarray[$field] = 0;
             } else {
                 $queryarray[$field] = $this->{$field};
@@ -5928,12 +5928,12 @@ 
 
         $error = 0;
 
-        if (!empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) return 0;    // For avoid conflicts if trigger used
+        if (!empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) return 0; // For avoid conflicts if trigger used
 
         if (!empty($this->array_options)) {
             // Check parameters
             $langs->load('admin');
-            require_once DOL_DOCUMENT_ROOT . '/core/class/extrafields.class.php';
+            require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
             $extrafields = new ExtraFields($this->db);
             $target_extrafields = $extrafields->fetch_name_optionals_label($this->table_element);
 
@@ -5943,11 +5943,11 @@ 
                 if (in_array(substr($key, 8), array_keys($target_extrafields)))    // We remove the 'options_' from $key for test
                     $new_array_options[$key] = $value;
                 elseif (in_array($key, array_keys($target_extrafields)))        // We test on $key that does not contains the 'options_' prefix
-                    $new_array_options['options_' . $key] = $value;
+                    $new_array_options['options_'.$key] = $value;
             }
 
             foreach ($new_array_options as $key => $value) {
-                $attributeKey = substr($key, 8);   // Remove 'options_' prefix
+                $attributeKey = substr($key, 8); // Remove 'options_' prefix
                 $attributeType = $extrafields->attributes[$this->table_element]['type'][$attributeKey];
                 $attributeLabel = $extrafields->attributes[$this->table_element]['label'][$attributeKey];
                 $attributeParam = $extrafields->attributes[$this->table_element]['param'][$attributeKey];
@@ -5979,7 +5979,7 @@ 
                     case 'double':
                         $value = price2num($value);
                         if (!is_numeric($value) && $value != '') {
-                            dol_syslog($langs->trans("ExtraFieldHasWrongValue") . " sur " . $attributeLabel . "(" . $value . "is not '" . $attributeType . "')", LOG_DEBUG);
+                            dol_syslog($langs->trans("ExtraFieldHasWrongValue")." sur ".$attributeLabel."(".$value."is not '".$attributeType."')", LOG_DEBUG);
                             $this->errors[] = $langs->trans("ExtraFieldHasWrongValue", $attributeLabel);
                             return -1;
                         } elseif ($value == '') {
@@ -6009,14 +6009,14 @@ 
                                     //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);
                                         $new_array_options[$key] = $newvalue;
                                     }
                                 } else {
-                                    $new_array_options[$key] = $this->array_options[$key];    // Value is kept
+                                    $new_array_options[$key] = $this->array_options[$key]; // Value is kept
                                 }
                             }
                         } else    // Common usage
@@ -6054,7 +6054,7 @@ 
 
                                 if ($res > 0) $new_array_options[$key] = $object->id;
                                 else {
-                                    $this->error = "Id/Ref '" . $value . "' for object '" . $object->element . "' not found";
+                                    $this->error = "Id/Ref '".$value."' for object '".$object->element."' not found";
                                     $this->db->rollback();
                                     return -1;
                                 }
@@ -6071,26 +6071,26 @@ 
             $table_element = $this->table_element;
             if ($table_element == 'categorie') $table_element = 'categories'; // For compatibility
 
-            $sql_del = "DELETE FROM " . MAIN_DB_PREFIX . $table_element . "_extrafields WHERE fk_object = " . $this->id;
-            dol_syslog(get_class($this) . "::insertExtraFields delete", LOG_DEBUG);
+            $sql_del = "DELETE FROM ".MAIN_DB_PREFIX.$table_element."_extrafields WHERE fk_object = ".$this->id;
+            dol_syslog(get_class($this)."::insertExtraFields delete", LOG_DEBUG);
             $this->db->query($sql_del);
 
-            $sql = "INSERT INTO " . MAIN_DB_PREFIX . $table_element . "_extrafields (fk_object";
+            $sql = "INSERT INTO ".MAIN_DB_PREFIX.$table_element."_extrafields (fk_object";
             foreach ($new_array_options as $key => $value) {
-                $attributeKey = substr($key, 8);   // Remove 'options_' prefix
+                $attributeKey = substr($key, 8); // Remove 'options_' prefix
                 // Add field of attribut
                 if ($extrafields->attributes[$this->table_element]['type'][$attributeKey] != 'separate') // Only for other type than separator
-                    $sql .= "," . $attributeKey;
+                    $sql .= ",".$attributeKey;
             }
-            $sql .= ") VALUES (" . $this->id;
+            $sql .= ") VALUES (".$this->id;
 
             foreach ($new_array_options as $key => $value) {
-                $attributeKey = substr($key, 8);   // Remove 'options_' prefix
+                $attributeKey = substr($key, 8); // Remove 'options_' prefix
                 // Add field of attribute
                 if ($extrafields->attributes[$this->table_element]['type'][$attributeKey] != 'separate') // Only for other type than separator)
                 {
                     if ($new_array_options[$key] != '') {
-                        $sql .= ",'" . $this->db->escape($new_array_options[$key]) . "'";
+                        $sql .= ",'".$this->db->escape($new_array_options[$key])."'";
                     } else {
                         $sql .= ",null";
                     }
@@ -6098,7 +6098,7 @@ 
             }
             $sql .= ")";
 
-            dol_syslog(get_class($this) . "::insertExtraFields insert", LOG_DEBUG);
+            dol_syslog(get_class($this)."::insertExtraFields insert", LOG_DEBUG);
             $resql = $this->db->query($sql);
             if (!$resql) {
                 $this->error = $this->db->lasterror();
@@ -6141,7 +6141,7 @@ 
         $fieldvalues = $this->setSaveQuery();
         if (array_key_exists('date_modification', $fieldvalues) && empty($fieldvalues['date_modification'])) $fieldvalues['date_modification'] = $this->db->idate($now);
         if (array_key_exists('fk_user_modif', $fieldvalues) && !($fieldvalues['fk_user_modif'] > 0)) $fieldvalues['fk_user_modif'] = $user->id;
-        unset($fieldvalues['rowid']);    // The field 'rowid' is reserved field name for autoincrement field so we don't need it into update.
+        unset($fieldvalues['rowid']); // The field 'rowid' is reserved field name for autoincrement field so we don't need it into update.
 
         $keys = array();
         $values = array();
@@ -6149,13 +6149,13 @@ 
             $keys[$k] = $k;
             $value = $this->fields[$k];
             $values[$k] = $this->quote($v, $value);
-            $tmp[] = $k . '=' . $this->quote($v, $this->fields[$k]);
+            $tmp[] = $k.'='.$this->quote($v, $this->fields[$k]);
         }
 
         // Clean and check mandatory
         foreach ($keys as $key) {
-            if (preg_match('/^integer:/i', $this->fields[$key]['type']) && $values[$key] == '-1') $values[$key] = '';        // This is an implicit foreign key field
-            if (!empty($this->fields[$key]['foreignkey']) && $values[$key] == '-1') $values[$key] = '';                    // This is an explicit foreign key field
+            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));
             /*
@@ -6166,7 +6166,7 @@ 
 			}*/
         }
 
-        $sql = 'UPDATE ' . MAIN_DB_PREFIX . $this->table_element . ' SET ' . implode(',', $tmp) . ' WHERE rowid=' . $this->id;
+        $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element.' SET '.implode(',', $tmp).' WHERE rowid='.$this->id;
 
         $this->db->begin();
         if (!$error) {
@@ -6188,7 +6188,7 @@ 
         // Triggers
         if (!$error && !$notrigger) {
             // Call triggers
-            $result = $this->call_trigger(strtoupper(get_class($this)) . '_MODIFY', $user);
+            $result = $this->call_trigger(strtoupper(get_class($this)).'_MODIFY', $user);
             if ($result < 0) {
                 $error++;
             } //Do also here what you must do to rollback action if trigger fail
@@ -6221,7 +6221,7 @@ 
 
         if ($forcechilddeletion) {
             foreach ($this->childtables as $table) {
-                $sql = 'DELETE FROM ' . MAIN_DB_PREFIX . $table . ' WHERE ' . $this->fk_element . ' = ' . $this->id;
+                $sql = 'DELETE FROM '.MAIN_DB_PREFIX.$table.' WHERE '.$this->fk_element.' = '.$this->id;
                 $resql = $this->db->query($sql);
                 if (!$resql) {
                     $this->error = $this->db->lasterror();
@@ -6234,7 +6234,7 @@ 
         {
             $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);
+                dol_syslog(get_class($this)."::deleteCommon Can't delete record as it has some child", LOG_WARNING);
                 $this->error = 'ErrorRecordHasChildren';
                 $this->errors[] = $this->error;
                 $this->db->rollback();
@@ -6245,7 +6245,7 @@ 
         if (!$error) {
             if (!$notrigger) {
                 // Call triggers
-                $result = $this->call_trigger(strtoupper(get_class($this)) . '_DELETE', $user);
+                $result = $this->call_trigger(strtoupper(get_class($this)).'_DELETE', $user);
                 if ($result < 0) {
                     $error++;
                 } // Do also here what you must do to rollback action if trigger fail
@@ -6254,8 +6254,8 @@ 
         }
 
         if (!$error && !empty($this->isextrafieldmanaged)) {
-            $sql = "DELETE FROM " . MAIN_DB_PREFIX . $this->table_element . "_extrafields";
-            $sql .= " WHERE fk_object=" . $this->id;
+            $sql = "DELETE FROM ".MAIN_DB_PREFIX.$this->table_element."_extrafields";
+            $sql .= " WHERE fk_object=".$this->id;
 
             $resql = $this->db->query($sql);
             if (!$resql) {
@@ -6265,7 +6265,7 @@ 
         }
 
         if (!$error) {
-            $sql = 'DELETE FROM ' . MAIN_DB_PREFIX . $this->table_element . ' WHERE rowid=' . $this->id;
+            $sql = 'DELETE FROM '.MAIN_DB_PREFIX.$this->table_element.' WHERE rowid='.$this->id;
 
             $res = $this->db->query($sql);
             if ($res === false) {
@@ -6315,8 +6315,8 @@ 
         foreach ($arraytoscan as $table => $elementname) {
             //print $id.'-'.$table.'-'.$elementname.'<br>';
             // Check if third party can be deleted
-            $sql = "SELECT COUNT(*) as nb from " . MAIN_DB_PREFIX . $table;
-            $sql .= " WHERE " . $this->fk_element . " = " . $id;
+            $sql = "SELECT COUNT(*) as nb from ".MAIN_DB_PREFIX.$table;
+            $sql .= " WHERE ".$this->fk_element." = ".$id;
             $resql = $this->db->query($sql);
             if ($resql) {
                 $obj = $this->db->fetch_object($resql);
@@ -6331,7 +6331,7 @@ 
                     {
                         $this->errors[] = $langs->trans("ErrorRecordHasAtLeastOneChildOfType", $langs->transnoentitiesnoconv($elementname));
                     }
-                    break;    // We found at least one, we stop here
+                    break; // We found at least one, we stop here
                 }
             } else {
                 $this->errors[] = $this->db->lasterror();
@@ -6363,7 +6363,7 @@ 
      */
     public function fetchComments()
     {
-        require_once DOL_DOCUMENT_ROOT . '/core/class/comment.class.php';
+        require_once DOL_DOCUMENT_ROOT.'/core/class/comment.class.php';
 
         $comment = new Comment($this->db);
         $result = $comment->fetchAllFor($this->element, $this->id);
@@ -6445,14 +6445,14 @@ 
         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);
+                $file = dol_buildpath($reldir.$modelspath.$file, 0);
                 if (file_exists($file)) {
                     $filefound = 1;
-                    $classname = $prefix . '_' . $modele;
+                    $classname = $prefix.'_'.$modele;
                     break;
                 }
             }
@@ -6461,7 +6461,7 @@ 
 
         // If generator was found
         if ($filefound) {
-            global $db;  // Required to solve a conception default in commonstickergenerator.class.php making an include of code using $db
+            global $db; // Required to solve a conception default in commonstickergenerator.class.php making an include of code using $db
 
             require_once $file;
 
@@ -6516,7 +6516,7 @@ 
             $sav_charset_output = $outputlangs->charset_output;
 
             if (in_array(get_class($this), array('Adherent'))) {
-                $arrayofrecords = array();   // The write_file of templates of adherent class need this var
+                $arrayofrecords = array(); // The write_file of templates of adherent class need this var
                 $resultwritefile = $obj->write_file($this, $outputlangs, $srctemplatepath, 'member', 1, $moreparams);
             } else {
                 $resultwritefile = $obj->write_file($this, $outputlangs, $srctemplatepath, $hidedetails, $hidedesc, $hideref, $moreparams);
@@ -6527,7 +6527,7 @@ 
                 $outputlangs->charset_output = $sav_charset_output;
 
                 // We delete old preview
-                require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
+                require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
                 dol_delete_preview($this);
 
                 // Index file in database
@@ -6535,7 +6535,7 @@ 
                     $destfull = $obj->result['fullpath'];
                     $upload_dir = dirname($destfull);
                     $destfile = basename($destfull);
-                    $rel_dir = preg_replace('/^' . preg_quote(DOL_DATA_ROOT, '/') . '/', '', $upload_dir);
+                    $rel_dir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT, '/').'/', '', $upload_dir);
 
                     if (!preg_match('/[\\/]temp[\\/]|[\\/]thumbs|\.meta$/', $rel_dir))     // If not a tmp dir
                     {
@@ -6543,14 +6543,14 @@ 
                         $rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
                         $rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
 
-                        include_once DOL_DOCUMENT_ROOT . '/ecm/class/ecmfiles.class.php';
+                        include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
                         $ecmfile = new EcmFiles($this->db);
-                        $result = $ecmfile->fetch(0, '', ($rel_dir ? $rel_dir . '/' : '') . $filename);
+                        $result = $ecmfile->fetch(0, '', ($rel_dir ? $rel_dir.'/' : '').$filename);
 
                         // Set the public "share" key
                         $setsharekey = false;
                         if ($this->element == 'propal') {
-                            $useonlinesignature = $conf->global->MAIN_FEATURES_LEVEL;    // Replace this with 1 when feature to make online signature is ok
+                            $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;
                         }
@@ -6561,17 +6561,17 @@ 
                         if ($setsharekey) {
                             if (empty($ecmfile->share))    // Because object not found or share not set yet
                             {
-                                require_once DOL_DOCUMENT_ROOT . '/core/lib/security2.lib.php';
+                                require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
                                 $ecmfile->share = getRandomPassword(true);
                             }
                         }
 
                         if ($result > 0) {
-                            $ecmfile->label = md5_file(dol_osencode($destfull));    // hash of file content
+                            $ecmfile->label = md5_file(dol_osencode($destfull)); // hash of file content
                             $ecmfile->fullpath_orig = '';
                             $ecmfile->gen_or_uploaded = 'generated';
-                            $ecmfile->description = '';    // indexed content
-                            $ecmfile->keyword = '';        // keyword content
+                            $ecmfile->description = ''; // indexed content
+                            $ecmfile->keyword = ''; // keyword content
                             $result = $ecmfile->update($user);
                             if ($result < 0) {
                                 setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
@@ -6580,11 +6580,11 @@ 
                             $ecmfile->entity = $conf->entity;
                             $ecmfile->filepath = $rel_dir;
                             $ecmfile->filename = $filename;
-                            $ecmfile->label = md5_file(dol_osencode($destfull));    // hash of file content
+                            $ecmfile->label = md5_file(dol_osencode($destfull)); // hash of file content
                             $ecmfile->fullpath_orig = '';
                             $ecmfile->gen_or_uploaded = 'generated';
-                            $ecmfile->description = '';    // indexed content
-                            $ecmfile->keyword = '';        // keyword content
+                            $ecmfile->description = ''; // indexed content
+                            $ecmfile->keyword = ''; // keyword content
                             $ecmfile->src_object_type = $this->table_element;
                             $ecmfile->src_object_id = $this->id;
 
@@ -6603,14 +6603,14 @@ 
                         $update_main_doc_field = 0;
                         if (!empty($obj->update_main_doc_field)) $update_main_doc_field = 1;
                         if ($update_main_doc_field && !empty($this->table_element)) {
-                            $sql = 'UPDATE ' . MAIN_DB_PREFIX . $this->table_element . " SET last_main_doc = '" . ($ecmfile->filepath . '/' . $ecmfile->filename) . "'";
-                            $sql .= ' WHERE rowid = ' . $this->id;
+                            $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element." SET last_main_doc = '".($ecmfile->filepath.'/'.$ecmfile->filename)."'";
+                            $sql .= ' WHERE rowid = '.$this->id;
                             $resql = $this->db->query($sql);
                             if (!$resql) dol_print_error($this->db);
                         }
                     }
                 } else {
-                    dol_syslog('Method ->write_file was called on object ' . get_class($obj) . ' and return a success but the return array ->result["fullpath"] was not set.', LOG_WARNING);
+                    dol_syslog('Method ->write_file was called on object '.get_class($obj).' and return a success but the return array ->result["fullpath"] was not set.', LOG_WARNING);
                 }
 
                 // Success in building document. We build meta file.
@@ -6619,11 +6619,11 @@ 
                 return 1;
             } else {
                 $outputlangs->charset_output = $sav_charset_output;
-                dol_print_error($this->db, "Error generating document for " . __CLASS__ . ". Error: " . $obj->error, $obj->errors);
+                dol_print_error($this->db, "Error generating document for ".__CLASS__.". Error: ".$obj->error, $obj->errors);
                 return -1;
             }
         } else {
-            $this->error = $langs->trans("Error") . " " . $langs->trans("ErrorFileDoesNotExists", $file);
+            $this->error = $langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists", $file);
             dol_print_error('', $this->error);
             return -1;
         }

Base/Translate.php

Spacing +67 added lines, -67 removed lines

@@ -11,13 +11,13 @@ 
 class Translate
 {
 
-    public $dir;                          // Directories that contains /langs subdirectory
-    public $defaultlang;                  // Current language for current user
-    public $charset_output = 'UTF-8';       // Codage used by "trans" method outputs
-    public $tab_translate = array();        // Array of all translations key=>value
-    public $cache_labels = array();         // Array to store result after loading each language file
-    public $cache_currencies = array();         // Cache for labels return by getLabelFromKey method
-    private $_tab_loaded = array();     // Cache to store currency symbols
+    public $dir; // Directories that contains /langs subdirectory
+    public $defaultlang; // Current language for current user
+    public $charset_output = 'UTF-8'; // Codage used by "trans" method outputs
+    public $tab_translate = array(); // Array of all translations key=>value
+    public $cache_labels = array(); // Array to store result after loading each language file
+    public $cache_currencies = array(); // Cache for labels return by getLabelFromKey method
+    private $_tab_loaded = array(); // Cache to store currency symbols
     private $cache_currencies_all_loaded = false;
 
     /**
@@ -69,13 +69,13 @@ 
             $more = array();
             $i = 0;
             foreach ($conf->file->dol_document_root as $dir) {
-                $newdir = $dir . $conf->global->MAIN_FORCELANGDIR;    // For example $conf->global->MAIN_FORCELANGDIR is '/mymodule' meaning we search files into '/mymodule/langs/xx_XX'
+                $newdir = $dir.$conf->global->MAIN_FORCELANGDIR; // For example $conf->global->MAIN_FORCELANGDIR is '/mymodule' meaning we search files into '/mymodule/langs/xx_XX'
                 if (!in_array($newdir, $this->dir)) {
-                    $more['module_' . $i] = $newdir;
-                    $i++;   // We add the forced dir into the array $more. Just after, we add entries into $more to list of lang dir $this->dir.
+                    $more['module_'.$i] = $newdir;
+                    $i++; // We add the forced dir into the array $more. Just after, we add entries into $more to list of lang dir $this->dir.
                 }
             }
-            $this->dir = array_merge($more, $this->dir);    // Forced dir ($more) are before standard dirs ($this->dir)
+            $this->dir = array_merge($more, $this->dir); // Forced dir ($more) are before standard dirs ($this->dir)
         }
 
         $this->origlang = $srclang;
@@ -99,19 +99,19 @@ 
             if (isset($longforshort[strtolower($langpart[0])]) && !in_array($codetouse, $longforshortexcep))
                 $srclang = $longforshort[strtolower($langpart[0])];
             else if (!is_numeric($langpart[1])) {  // Second part YY may be a numeric with some Chrome browser
-                $srclang = strtolower($langpart[0]) . "_" . strtoupper($langpart[1]);
+                $srclang = strtolower($langpart[0])."_".strtoupper($langpart[1]);
                 $longforlong = array('no_nb' => 'nb_NO');
                 if (isset($longforlong[strtolower($srclang)]))
                     $srclang = $longforlong[strtolower($srclang)];
             } else
-                $srclang = strtolower($langpart[0]) . "_" . strtoupper($langpart[0]);
+                $srclang = strtolower($langpart[0])."_".strtoupper($langpart[0]);
         } else {      // If it's for a codetouse that is a short code xx
             // Array to convert short lang code into long code.
             $longforshort = array('ar' => 'ar_SA', 'el' => 'el_GR', 'ca' => 'ca_ES', 'en' => 'en_US', 'nb' => 'nb_NO', 'no' => 'nb_NO');
             if (isset($longforshort[strtolower($langpart[0])]))
                 $srclang = $longforshort[strtolower($langpart[0])];
             else if (!empty($langpart[0]))
-                $srclang = strtolower($langpart[0]) . "_" . strtoupper($langpart[0]);
+                $srclang = strtolower($langpart[0])."_".strtoupper($langpart[0]);
             else
                 $srclang = 'en_US';
         }
@@ -160,16 +160,16 @@ 
         //dol_syslog("Translate::Load Start domain=".$domain." alt=".$alt." forcelangdir=".$forcelangdir." this->defaultlang=".$this->defaultlang);
         // Check parameters
         if (empty($domain)) {
-            dol_print_error('', get_class($this) . "::Load ErrorWrongParameters");
+            dol_print_error('', get_class($this)."::Load ErrorWrongParameters");
             return -1;
         }
         if ($this->defaultlang == 'none_NONE')
-            return 0;    // Special language code to not translate keys
+            return 0; // Special language code to not translate keys
 
 
 // Load $this->tab_translate[] from database
         if (empty($loadfromfileonly) && count($this->tab_translate) == 0)
-            $this->loadFromDatabase($db);      // No translation was never loaded yet, so we load database.
+            $this->loadFromDatabase($db); // No translation was never loaded yet, so we load database.
 
 
         $newdomain = $domain;
@@ -198,13 +198,13 @@ 
             $alt = 2;
 
         if (empty($langofdir)) { // This may occurs when load is called without setting the language and without providing a value for forcelangdir
-            dol_syslog("Error: " . get_class($this) . "::Load was called but language was not set yet with langs->setDefaultLang(). Nothing will be loaded.", LOG_WARNING);
+            dol_syslog("Error: ".get_class($this)."::Load was called but language was not set yet with langs->setDefaultLang(). Nothing will be loaded.", LOG_WARNING);
             return -1;
         }
 
         foreach ($this->dir as $keydir => $searchdir) {
             // Directory of translation files
-            $file_lang = $searchdir . ($modulename ? '/' . $modulename : '') . "/langs/" . $langofdir . "/" . $newdomain . ".lang";
+            $file_lang = $searchdir.($modulename ? '/'.$modulename : '')."/langs/".$langofdir."/".$newdomain.".lang";
             $file_lang_osencoded = AlDolUtils::dol_osencode($file_lang);
 
             $filelangexists = is_file($file_lang_osencoded);
@@ -220,7 +220,7 @@ 
                 $usecachekey = '';
                 // Using a memcached server
                 if (!empty($conf->memcached->enabled) && !empty($conf->global->MEMCACHED_SERVER)) {
-                    $usecachekey = $newdomain . '_' . $langofdir . '_' . md5($file_lang);    // Should not contains special chars
+                    $usecachekey = $newdomain.'_'.$langofdir.'_'.md5($file_lang); // Should not contains special chars
                 } // Using cache with shmop. Speed gain: 40ms - Memory overusage: 200ko (Size of session cache file)
                 else if (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_SPEED & 0x02)) {
                     $usecachekey = $newdomain;
@@ -230,7 +230,7 @@ 
                     //dol_syslog('Translate::Load we will cache result into usecachekey '.$usecachekey);
                     //global $aaa; $aaa+=1;
                     //print $aaa." ".$usecachekey."\n";
-                    require_once DOL_BASE_PATH . '/core/lib/memory.lib.php';
+                    require_once DOL_BASE_PATH.'/core/lib/memory.lib.php';
                     $tmparray = dol_getcache($usecachekey);
                     if (is_array($tmparray) && count($tmparray)) {
                         $this->tab_translate += $tmparray; // Faster than array_merge($tmparray,$this->tab_translate). Note: If a value already exists into tab_translate, value into tmparaay is not added.
@@ -238,7 +238,7 @@ 
                         //var_dump($this->tab_translate);
                         if ($alt == 2)
                             $fileread = 1;
-                        $found = true;      // Found in dolibarr PHP cache
+                        $found = true; // Found in dolibarr PHP cache
                     }
                 }
 
@@ -288,13 +288,13 @@ 
                         if ($usecachekey && count($tabtranslatedomain)) {
                             $ressetcache = dol_setcache($usecachekey, $tabtranslatedomain);
                             if ($ressetcache < 0) {
-                                $error = 'Failed to set cache for usecachekey=' . $usecachekey . ' result=' . $ressetcache;
+                                $error = 'Failed to set cache for usecachekey='.$usecachekey.' result='.$ressetcache;
                                 dol_syslog($error, LOG_ERR);
                             }
                         }
 
                         if (empty($conf->global->MAIN_FORCELANGDIR))
-                            break;  // Break loop on each root dir. If a module has forced dir, we do not stop loop.
+                            break; // Break loop on each root dir. If a module has forced dir, we do not stop loop.
                     }
                 }
             }
@@ -304,11 +304,11 @@ 
         if ($alt == 0) {
             // This function MUST NOT contains call to syslog
             //dol_syslog("Translate::Load loading alternate translation file (to complete ".$this->defaultlang."/".$newdomain.".lang file)", LOG_DEBUG);
-            $langofdir = strtolower($langarray[0]) . '_' . strtoupper($langarray[0]);
+            $langofdir = strtolower($langarray[0]).'_'.strtoupper($langarray[0]);
             if ($langofdir == 'el_EL')
-                $langofdir = 'el_GR';                     // main parent for el_CY is not 'el_EL' but 'el_GR'
+                $langofdir = 'el_GR'; // main parent for el_CY is not 'el_EL' but 'el_GR'
             if ($langofdir == 'ar_AR')
-                $langofdir = 'ar_SA';                     // main parent for ar_EG is not 'ar_AR' but 'ar_SA'
+                $langofdir = 'ar_SA'; // main parent for ar_EG is not 'ar_AR' but 'ar_SA'
             $this->load($domain, $alt + 1, $stopafterdirection, $langofdir);
         }
 
@@ -323,7 +323,7 @@ 
         // We are in the pass of the reference file. No more files to scan to complete.
         if ($alt == 2) {
             if ($fileread)
-                $this->_tab_loaded[$newdomain] = 1;        // Set domain file as found so loaded
+                $this->_tab_loaded[$newdomain] = 1; // Set domain file as found so loaded
 
             if (empty($this->_tab_loaded[$newdomain]))
                 $this->_tab_loaded[$newdomain] = 2; // Set this file as not found
@@ -332,7 +332,7 @@ 
         // This part is deprecated and replaced with table llx_overwrite_trans
         // Kept for backward compatibility.
         if (empty($loadfromfileonly)) {
-            $overwritekey = 'MAIN_OVERWRITE_TRANS_' . $this->defaultlang;
+            $overwritekey = 'MAIN_OVERWRITE_TRANS_'.$this->defaultlang;
             if (!empty($conf->global->$overwritekey)) {    // Overwrite translation with key1:newstring1,key2:newstring2
                 // Overwrite translation with param MAIN_OVERWRITE_TRANS_xx_XX
                 $tmparray = explode(',', $conf->global->$overwritekey);
@@ -371,7 +371,7 @@ 
 
         // Check parameters
         if (empty($db))
-            return 0;    // Database handler can't be used
+            return 0; // Database handler can't be used
 
 
 //dol_syslog("Translate::Load Start domain=".$domain." alt=".$alt." forcelangdir=".$forcelangdir." this->defaultlang=".$this->defaultlang);
@@ -384,13 +384,13 @@ 
             return 0;
         }
 
-        $this->_tab_loaded[$newdomain] = 1;   // We want to be sure this function is called once only for domain 'database'
+        $this->_tab_loaded[$newdomain] = 1; // We want to be sure this function is called once only for domain 'database'
 
         $fileread = 0;
         $langofdir = $this->defaultlang;
 
         if (empty($langofdir)) { // This may occurs when load is called without setting the language and without providing a value for forcelangdir
-            dol_syslog("Error: " . get_class($this) . "::Load was called but language was not set yet with langs->setDefaultLang(). Nothing will be loaded.", LOG_WARNING);
+            dol_syslog("Error: ".get_class($this)."::Load was called but language was not set yet with langs->setDefaultLang(). Nothing will be loaded.", LOG_WARNING);
             return -1;
         }
 
@@ -401,7 +401,7 @@ 
         $usecachekey = '';
         // Using a memcached server
         if (!empty($conf->memcached->enabled) && !empty($conf->global->MEMCACHED_SERVER)) {
-            $usecachekey = $newdomain . '_' . $langofdir;    // Should not contains special chars
+            $usecachekey = $newdomain.'_'.$langofdir; // Should not contains special chars
         } // Using cache with shmop. Speed gain: 40ms - Memory overusage: 200ko (Size of session cache file)
         else if (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_SPEED & 0x02)) {
             $usecachekey = $newdomain;
@@ -411,20 +411,20 @@ 
             //dol_syslog('Translate::Load we will cache result into usecachekey '.$usecachekey);
             //global $aaa; $aaa+=1;
             //print $aaa." ".$usecachekey."\n";
-            require_once DOL_BASE_PATH . '/core/lib/memory.lib.php';
+            require_once DOL_BASE_PATH.'/core/lib/memory.lib.php';
             $tmparray = dol_getcache($usecachekey);
             if (is_array($tmparray) && count($tmparray)) {
                 $this->tab_translate += $tmparray; // Faster than array_merge($tmparray,$this->tab_translate). Note: If a valuer already exists into tab_translate, value into tmparaay is not added.
                 //print $newdomain."\n";
                 //var_dump($this->tab_translate);
                 $fileread = 1;
-                $found = true;      // Found in dolibarr PHP cache
+                $found = true; // Found in dolibarr PHP cache
             }
         }
 
         if (!$found && !empty($conf->global->MAIN_ENABLE_OVERWRITE_TRANSLATION)) {
             // Overwrite translation with database read
-            $sql = "SELECT transkey, transvalue FROM " . MAIN_DB_PREFIX . "overwrite_trans where lang='" . $db->escape($this->defaultlang) . "'";
+            $sql = "SELECT transkey, transvalue FROM ".MAIN_DB_PREFIX."overwrite_trans where lang='".$db->escape($this->defaultlang)."'";
             $resql = $db->query($sql);
 
             if ($resql) {
@@ -459,7 +459,7 @@ 
                     if ($usecachekey && count($tabtranslatedomain)) {
                         $ressetcache = dol_setcache($usecachekey, $tabtranslatedomain);
                         if ($ressetcache < 0) {
-                            $error = 'Failed to set cache for usecachekey=' . $usecachekey . ' result=' . $ressetcache;
+                            $error = 'Failed to set cache for usecachekey='.$usecachekey.' result='.$ressetcache;
                             dol_syslog($error, LOG_ERR);
                         }
                     }
@@ -473,7 +473,7 @@ 
             $this->_tab_loaded[$newdomain] = 1; // Set domain file as loaded
 
         if (empty($this->_tab_loaded[$newdomain]))
-            $this->_tab_loaded[$newdomain] = 2;           // Marque ce cas comme non trouve (no lines found for language)
+            $this->_tab_loaded[$newdomain] = 2; // Marque ce cas comme non trouve (no lines found for language)
 
         return 1;
     }
@@ -515,12 +515,12 @@ 
             $str = $this->tab_translate[$key];
 
             // Make some string replacement after translation
-            $replacekey = 'MAIN_REPLACE_TRANS_' . $this->defaultlang;
+            $replacekey = 'MAIN_REPLACE_TRANS_'.$this->defaultlang;
             if (!empty($conf->global->$replacekey)) {    // Replacement translation variable with string1:newstring1;string2:newstring2
                 $tmparray = explode(';', $conf->global->$replacekey);
                 foreach ($tmparray as $tmp) {
                     $tmparray2 = explode(':', $tmp);
-                    $str = preg_replace('/' . preg_quote($tmparray2[0]) . '/', $tmparray2[1], $str);
+                    $str = preg_replace('/'.preg_quote($tmparray2[0]).'/', $tmparray2[1], $str);
                 }
             }
 
@@ -615,20 +615,20 @@ 
         // Check if a translation is available (this can call getTradFromKey)
         $tmp = $this->transnoentitiesnoconv($key);
         if ($tmp != $key && $tmp != 'ErrorBadValueForParamNotAString') {
-            return $tmp;    // Found in language array
+            return $tmp; // Found in language array
         }
 
         // Check in cache
         if (isset($this->cache_labels[$tablename][$key])) { // Can be defined to 0 or ''
-            return $this->cache_labels[$tablename][$key];   // Found in cache
+            return $this->cache_labels[$tablename][$key]; // Found in cache
         }
 
-        $sql = "SELECT " . $fieldlabel . " as label";
-        $sql .= " FROM " . MAIN_DB_PREFIX . $tablename;
-        $sql .= " WHERE " . $fieldkey . " = '" . $db->escape($keyforselect ? $keyforselect : $key) . "'";
+        $sql = "SELECT ".$fieldlabel." as label";
+        $sql .= " FROM ".MAIN_DB_PREFIX.$tablename;
+        $sql .= " WHERE ".$fieldkey." = '".$db->escape($keyforselect ? $keyforselect : $key)."'";
         if ($filteronentity)
-            $sql .= " AND entity IN (" . getEntity($tablename) . ')';
-        dol_syslog(get_class($this) . '::getLabelFromKey', LOG_DEBUG);
+            $sql .= " AND entity IN (".getEntity($tablename).')';
+        dol_syslog(get_class($this).'::getLabelFromKey', LOG_DEBUG);
         $resql = $db->query($sql);
         if ($resql) {
             $obj = $db->fetch_object($resql);
@@ -668,12 +668,12 @@ 
             $str = $this->tab_translate[$key];
 
             // Make some string replacement after translation
-            $replacekey = 'MAIN_REPLACE_TRANS_' . $this->defaultlang;
+            $replacekey = 'MAIN_REPLACE_TRANS_'.$this->defaultlang;
             if (!empty($conf->global->$replacekey)) {    // Replacement translation variable with string1:newstring1;string2:newstring2
                 $tmparray = explode(';', $conf->global->$replacekey);
                 foreach ($tmparray as $tmp) {
                     $tmparray2 = explode(':', $tmp);
-                    $str = preg_replace('/' . preg_quote($tmparray2[0]) . '/', $tmparray2[1], $str);
+                    $str = preg_replace('/'.preg_quote($tmparray2[0]).'/', $tmparray2[1], $str);
                 }
             }
 
@@ -763,7 +763,7 @@ 
         }
 
         // We scan directory langs to detect available languages
-        $handle = opendir($langdir . "/langs");
+        $handle = opendir($langdir."/langs");
         $langs_available = array();
         while ($dir = trim(readdir($handle))) {
             if (preg_match('/^[a-z]+_[A-Z]+/i', $dir)) {
@@ -773,9 +773,9 @@ 
                     $langs_available[$dir] = $dir;
                 }
                 if ($usecode == 1 || !empty($conf->global->MAIN_SHOW_LANGUAGE_CODE)) {
-                    $langs_available[$dir] = $dir . ': ' . dol_trunc($this->trans('Language_' . $dir), $maxlength);
+                    $langs_available[$dir] = $dir.': '.dol_trunc($this->trans('Language_'.$dir), $maxlength);
                 } else {
-                    $langs_available[$dir] = $this->trans('Language_' . $dir);
+                    $langs_available[$dir] = $this->trans('Language_'.$dir);
                 }
             }
         }
@@ -794,13 +794,13 @@ 
         // phpcs:enable
         // Test si fichier dans repertoire de la langue
         foreach ($this->dir as $searchdir) {
-            if (is_readable(dol_osencode($searchdir . "/langs/" . $this->defaultlang . "/" . $filename)))
+            if (is_readable(dol_osencode($searchdir."/langs/".$this->defaultlang."/".$filename)))
                 return true;
 
             if ($searchalt) {
                 // Test si fichier dans repertoire de la langue alternative
                 if ($this->defaultlang != "en_US")
-                    $filenamealt = $searchdir . "/langs/en_US/" . $filename;
+                    $filenamealt = $searchdir."/langs/en_US/".$filename;
                 //else $filenamealt = $searchdir."/langs/fr_FR/".$filename;
                 if (is_readable(dol_osencode($filenamealt)))
                     return true;
@@ -837,8 +837,8 @@ 
                 continue; // We must not use dol_is_dir here, function may not be loaded
 
             $fonc = 'numberwords';
-            if (file_exists($newdir . '/functions_' . $fonc . '.lib.php')) {
-                include_once $newdir . '/functions_' . $fonc . '.lib.php';
+            if (file_exists($newdir.'/functions_'.$fonc.'.lib.php')) {
+                include_once $newdir.'/functions_'.$fonc.'.lib.php';
                 $newnumber = numberwords_getLabelFromNumber($this, $number, $isamount);
                 break;
             }
@@ -861,9 +861,9 @@ 
         $symbol = $this->getCurrencySymbol($currency_code);
 
         if (in_array($currency_code, array('USD')))
-            return $symbol . $amount;
+            return $symbol.$amount;
         else
-            return $amount . $symbol;
+            return $amount.$symbol;
     }
 
     /**
@@ -902,18 +902,18 @@ 
         global $db;
 
         if ($this->cache_currencies_all_loaded)
-            return 0;                                           // Cache already loaded for all
+            return 0; // Cache already loaded for all
         if (!empty($currency_code) && isset($this->cache_currencies[$currency_code]))
-            return 0;    // Cache already loaded for the currency
+            return 0; // Cache already loaded for the currency
 
         $sql = "SELECT code_iso, label, unicode";
-        $sql .= " FROM " . MAIN_DB_PREFIX . "c_currencies";
+        $sql .= " FROM ".MAIN_DB_PREFIX."c_currencies";
         $sql .= " WHERE active = 1";
         if (!empty($currency_code))
-            $sql .= " AND code_iso = '" . $db->escape($currency_code) . "'";
+            $sql .= " AND code_iso = '".$db->escape($currency_code)."'";
         //$sql.= " ORDER BY code_iso ASC"; // Not required, a sort is done later
 
-        dol_syslog(get_class($this) . '::loadCacheCurrencies', LOG_DEBUG);
+        dol_syslog(get_class($this).'::loadCacheCurrencies', LOG_DEBUG);
         $resql = $db->query($sql);
         if ($resql) {
             $this->load("dict");
@@ -928,8 +928,8 @@ 
                 $obj = $db->fetch_object($resql);
 
                 // Si traduction existe, on l'utilise, sinon on prend le libelle par defaut
-                $this->cache_currencies[$obj->code_iso]['label'] = ($obj->code_iso && $this->trans("Currency" . $obj->code_iso) != "Currency" . $obj->code_iso ? $this->trans("Currency" . $obj->code_iso) : ($obj->label != '-' ? $obj->label : ''));
-                $this->cache_currencies[$obj->code_iso]['unicode'] = (array)json_decode($obj->unicode, true);
+                $this->cache_currencies[$obj->code_iso]['label'] = ($obj->code_iso && $this->trans("Currency".$obj->code_iso) != "Currency".$obj->code_iso ? $this->trans("Currency".$obj->code_iso) : ($obj->label != '-' ? $obj->label : ''));
+                $this->cache_currencies[$obj->code_iso]['unicode'] = (array) json_decode($obj->unicode, true);
                 $label[$obj->code_iso] = $this->cache_currencies[$obj->code_iso]['label'];
                 $i++;
             }
@@ -960,8 +960,8 @@ 
         $substitutionarray = array();
 
         foreach ($this->tab_translate as $code => $label) {
-            $substitutionarray['lang_' . $code] = $label;
-            $substitutionarray['__(' . $code . ')__'] = $label;
+            $substitutionarray['lang_'.$code] = $label;
+            $substitutionarray['__('.$code.')__'] = $label;
         }
 
         return $substitutionarray;

Views/CategoriesView.php

Spacing +15 added lines, -15 removed lines

@@ -71,19 +71,19 @@ 
             if ($action == 'create' || filter_input(INPUT_POST, "addcat") == 'addcat') {
                 AlDolUtils::dol_set_focus('#label');
 
-                print '<form action="' . $_SERVER['PHP_SELF'] . '?type=' . $type . '" method="POST">';
-                print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
-                print '<input type="hidden" name="urlfrom" value="' . $urlfrom . '">';
+                print '<form action="'.$_SERVER['PHP_SELF'].'?type='.$type.'" method="POST">';
+                print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+                print '<input type="hidden" name="urlfrom" value="'.$urlfrom.'">';
                 print '<input type="hidden" name="action" value="add">';
                 print '<input type="hidden" name="addcat" value="addcat">';
-                print '<input type="hidden" name="id" value="' . AlDolUtils::GETPOST('origin', 'alpha') . '">';
-                print '<input type="hidden" name="type" value="' . $type . '">';
-                print '<input type="hidden" name="backtopage" value="' . $backtopage . '">';
+                print '<input type="hidden" name="id" value="'.AlDolUtils::GETPOST('origin', 'alpha').'">';
+                print '<input type="hidden" name="type" value="'.$type.'">';
+                print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
                 if ($origin) {
-                    print '<input type="hidden" name="origin" value="' . $origin . '">';
+                    print '<input type="hidden" name="origin" value="'.$origin.'">';
                 }
                 if ($catorigin) {
-                    print '<input type="hidden" name="catorigin" value="' . $catorigin . '">';
+                    print '<input type="hidden" name="catorigin" value="'.$catorigin.'">';
                 }
 
                 print load_fiche_titre($langs->trans("CreateCat"));
@@ -94,29 +94,29 @@ 
 
                 // Ref
                 print '<tr>';
-                print '<td class="titlefieldcreate fieldrequired">' . $langs->trans("Ref") . '</td><td><input id="label" class="minwidth100" name="label" value="' . $label . '">';
+                print '<td class="titlefieldcreate fieldrequired">'.$langs->trans("Ref").'</td><td><input id="label" class="minwidth100" name="label" value="'.$label.'">';
                 print'</td></tr>';
 
                 // Description
-                print '<tr><td class="tdtop">' . $langs->trans("Description") . '</td><td>';
+                print '<tr><td class="tdtop">'.$langs->trans("Description").'</td><td>';
                 //require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';
                 $doleditor = new DolEditor('description', $description, '', 200, 'dolibarr_notes', '', false, true, Globals::$conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, ROWS_6, '90%');
                 $doleditor->Create();
                 print '</td></tr>';
 
                 // Color
-                print '<tr><td>' . $langs->trans("Color") . '</td><td>';
+                print '<tr><td>'.$langs->trans("Color").'</td><td>';
                 print $formother->selectColor($color, 'color');
                 print '</td></tr>';
 
                 // Parent category
-                print '<tr><td>' . $langs->trans("AddIn") . '</td><td>';
+                print '<tr><td>'.$langs->trans("AddIn").'</td><td>';
                 print $form->select_all_categories($type, $catorigin, 'parent');
                 print ajax_combobox('parent');
                 print '</td></tr>';
 
                 $parameters = array();
-                $reshook = Globals::$hookManager->executeHooks('formObjectOptions', $parameters, $object, $action);    // Note that $action and $object may have been modified by hook
+                $reshook = Globals::$hookManager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
                 print Globals::$hookManager->resPrint;
                 if (empty($reshook)) {
                     print $object->showOptionals($extrafields, 'edit');
@@ -127,9 +127,9 @@ 
                 AlDolUtils::dol_fiche_end('');
 
                 print '<div class="center">';
-                print '<input type="submit" class="button" value="' . $langs->trans("CreateThisCat") . '" name="creation" />';
+                print '<input type="submit" class="button" value="'.$langs->trans("CreateThisCat").'" name="creation" />';
                 print '&nbsp; &nbsp; &nbsp;';
-                print '<input type="submit" class="button" value="' . $langs->trans("Cancel") . '" name="cancel" />';
+                print '<input type="submit" class="button" value="'.$langs->trans("Cancel").'" name="cancel" />';
                 print '</div>';
 
                 print '</form>';

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

Spacing +1522 added lines, -1522 removed lines

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

dolibarr/htdocs/filefunc.inc.php

Spacing +42 added lines, -42 removed lines

@@ -37,7 +37,7 @@ 
 }
 
 if (!defined('DOL_VERSION')) {
-    define('DOL_VERSION', '10.0.0-alpha');  // a.b.c-alpha, a.b.c-beta, a.b.c-rcX or a.b.c
+    define('DOL_VERSION', '10.0.0-alpha'); // a.b.c-alpha, a.b.c-beta, a.b.c-rcX or a.b.c
 }
 
 if (!defined('EURO')) {
@@ -77,19 +77,19 @@ 
 // --- End of part replaced by Dolibarr packager makepack-dolibarr
 // Include configuration
 
-$conffile = DOL_BASE_PATH . '/conf/conf.php';
+$conffile = DOL_BASE_PATH.'/conf/conf.php';
 if (!file_exists($conffile)) {
-    die('Configuración no encontrada: ' . $conffile);
+    die('Configuración no encontrada: '.$conffile);
 }
 
 $result = @include_once $conffile; // Keep @ because with some error reporting this break the redirect done when file not found
 
 if (!$result && !empty($_SERVER["GATEWAY_INTERFACE"])) {    // If install not done and we are in a web session
-    header('Location: ' . BASE_URI . '?controller=install&method=index'); // Changed for Alixar
+    header('Location: '.BASE_URI.'?controller=install&method=index'); // Changed for Alixar
     exit;
 
     if (!empty($_SERVER["CONTEXT_PREFIX"])) {    // CONTEXT_PREFIX and CONTEXT_DOCUMENT_ROOT are not defined on all apache versions
-        $path = $_SERVER["CONTEXT_PREFIX"];       // example '/dolibarr/' when using an apache alias.
+        $path = $_SERVER["CONTEXT_PREFIX"]; // example '/dolibarr/' when using an apache alias.
         if (!preg_match('/\/$/', $path))
             $path .= '/';
     }
@@ -118,7 +118,7 @@ 
         }
     }
 
-    header("Location: " . $path . "install/index.php");
+    header("Location: ".$path."install/index.php");
     exit;
 }
 
@@ -142,7 +142,7 @@ 
 $dolibarr_main_document_root_alt = (empty($dolibarr_main_document_root_alt) ? '' : trim($dolibarr_main_document_root_alt));
 
 if (empty($dolibarr_main_db_port)) {
-    $dolibarr_main_db_port = 3306;  // For compatibility with old configs, if not defined, we take 'mysql' type
+    $dolibarr_main_db_port = 3306; // For compatibility with old configs, if not defined, we take 'mysql' type
 }
 
 if (empty($dolibarr_main_db_type)) {
@@ -157,7 +157,7 @@ 
     $dolibarr_main_db_prefix = 'llx_';
 }
 if (empty($dolibarr_main_db_character_set)) {
-    $dolibarr_main_db_character_set = ($dolibarr_main_db_type == 'mysqli' ? 'utf8' : '');  // Old installation
+    $dolibarr_main_db_character_set = ($dolibarr_main_db_type == 'mysqli' ? 'utf8' : ''); // Old installation
 }
 if (empty($dolibarr_main_db_collation)) {
     $dolibarr_main_db_collation = ($dolibarr_main_db_type == 'mysqli' ? 'utf8_unicode_ci' : ''); // Old installation
@@ -207,13 +207,13 @@ 
 }
 
 if (empty($dolibarr_main_db_host)) {
-    print '<div align="center">Dolibarr setup is not yet complete.<br><br>' . "\n";
-    print '<a href="?controller=install&method=index">Click here to finish Dolibarr install process</a> ...</div>' . "\n";
+    print '<div align="center">Dolibarr setup is not yet complete.<br><br>'."\n";
+    print '<a href="?controller=install&method=index">Click here to finish Dolibarr install process</a> ...</div>'."\n";
     die;
 }
 if (empty($dolibarr_main_url_root)) {
-    print 'Value for parameter \'dolibarr_main_url_root\' is not defined in your \'htdocs\conf\conf.php\' file.<br>' . "\n";
-    print 'You must add this parameter with your full Dolibarr root Url (Example: http://myvirtualdomain/ or http://mydomain/mydolibarrurl/)' . "\n";
+    print 'Value for parameter \'dolibarr_main_url_root\' is not defined in your \'htdocs\conf\conf.php\' file.<br>'."\n";
+    print 'You must add this parameter with your full Dolibarr root Url (Example: http://myvirtualdomain/ or http://mydomain/mydolibarrurl/)'."\n";
     die;
 }
 if (empty($dolibarr_main_data_root)) {
@@ -223,30 +223,30 @@ 
 }
 
 // Define some constants
-define('DOL_CLASS_PATH', 'class/');         // Filesystem path to class dir (defined only for some code that want to be compatible with old versions without this parameter)
-define('DOL_DATA_ROOT', $dolibarr_main_data_root);     // Filesystem data (documents)
-define('DOL_DOCUMENT_ROOT', $dolibarr_main_document_root);   // Filesystem core php (htdocs)
+define('DOL_CLASS_PATH', 'class/'); // Filesystem path to class dir (defined only for some code that want to be compatible with old versions without this parameter)
+define('DOL_DATA_ROOT', $dolibarr_main_data_root); // Filesystem data (documents)
+define('DOL_DOCUMENT_ROOT', $dolibarr_main_document_root); // Filesystem core php (htdocs)
 // Try to autodetect DOL_MAIN_URL_ROOT and DOL_URL_ROOT.
 // Note: autodetect works only in case 1, 2, 3 and 4 of phpunit test CoreTest.php. For case 5, 6, only setting value into conf.php will works.
 $tmp = '';
 $found = 0;
 $real_dolibarr_main_document_root = str_replace('\\', '/', realpath($dolibarr_main_document_root)); // A) Value found into config file, to say where are store htdocs files. Ex: C:/xxx/dolibarr, C:/xxx/dolibarr/htdocs
 if (!empty($_SERVER["DOCUMENT_ROOT"])) {
-    $pathroot = $_SERVER["DOCUMENT_ROOT"];                                                      // B) Value reported by web server setup (not defined on CLI mode), to say where is root of web server instance. Ex: C:/xxx/dolibarr, C:/xxx/dolibarr/htdocs
+    $pathroot = $_SERVER["DOCUMENT_ROOT"]; // B) Value reported by web server setup (not defined on CLI mode), to say where is root of web server instance. Ex: C:/xxx/dolibarr, C:/xxx/dolibarr/htdocs
 } else {
     $pathroot = 'NOTDEFINED';
 }
-$paths = explode('/', str_replace('\\', '/', $_SERVER["SCRIPT_NAME"]));        // C) Value reported by web server, to say full path on filesystem of a file. Ex: /dolibarr/htdocs/admin/system/phpinfo.php
+$paths = explode('/', str_replace('\\', '/', $_SERVER["SCRIPT_NAME"])); // C) Value reported by web server, to say full path on filesystem of a file. Ex: /dolibarr/htdocs/admin/system/phpinfo.php
 // Try to detect if $_SERVER["DOCUMENT_ROOT"]+start of $_SERVER["SCRIPT_NAME"] is $dolibarr_main_document_root. If yes, relative url to add before dol files is this start part.
 $concatpath = '';
 foreach ($paths as $tmppath) { // We check to find (B+start of C)=A
     if (empty($tmppath)) {
         continue;
     }
-    $concatpath .= '/' . $tmppath;
+    $concatpath .= '/'.$tmppath;
     //if ($tmppath) $concatpath.='/'.$tmppath;
     //print $_SERVER["SCRIPT_NAME"].'-'.$pathroot.'-'.$concatpath.'-'.$real_dolibarr_main_document_root.'-'.realpath($pathroot.$concatpath).'<br>';
-    if ($real_dolibarr_main_document_root == @realpath($pathroot . $concatpath)) {    // @ avoid warning when safe_mode is on.
+    if ($real_dolibarr_main_document_root == @realpath($pathroot.$concatpath)) {    // @ avoid warning when safe_mode is on.
         //print "Found relative url = ".$concatpath;
         $tmp3 = $concatpath;
         $found = 1;
@@ -258,19 +258,19 @@ 
 if (!$found) {
     $tmp = $dolibarr_main_url_root; // If autodetect fails (Ie: when using apache alias that point outside default DOCUMENT_ROOT).
 } else {
-    $tmp = 'http' . (((empty($_SERVER["HTTPS"]) || $_SERVER["HTTPS"] != 'on') && (empty($_SERVER["SERVER_PORT"]) || $_SERVER["SERVER_PORT"] != 443)) ? '' : 's') . '://' . $_SERVER["SERVER_NAME"] . ((empty($_SERVER["SERVER_PORT"]) || $_SERVER["SERVER_PORT"] == 80 || $_SERVER["SERVER_PORT"] == 443) ? '' : ':' . $_SERVER["SERVER_PORT"]) . ($tmp3 ? (preg_match('/^\//', $tmp3) ? '' : '/') . $tmp3 : '');
+    $tmp = 'http'.(((empty($_SERVER["HTTPS"]) || $_SERVER["HTTPS"] != 'on') && (empty($_SERVER["SERVER_PORT"]) || $_SERVER["SERVER_PORT"] != 443)) ? '' : 's').'://'.$_SERVER["SERVER_NAME"].((empty($_SERVER["SERVER_PORT"]) || $_SERVER["SERVER_PORT"] == 80 || $_SERVER["SERVER_PORT"] == 443) ? '' : ':'.$_SERVER["SERVER_PORT"]).($tmp3 ? (preg_match('/^\//', $tmp3) ? '' : '/').$tmp3 : '');
 }
 //print "tmp1=".$tmp1." tmp2=".$tmp2." tmp3=".$tmp3." tmp=".$tmp."\n";
 if (!empty($dolibarr_main_force_https)) {
     $tmp = preg_replace('/^http:/i', 'https:', $tmp);
 }
-define('DOL_MAIN_URL_ROOT', $tmp);           // URL absolute root (https://sss/dolibarr, ...)
+define('DOL_MAIN_URL_ROOT', $tmp); // URL absolute root (https://sss/dolibarr, ...)
 $uri = preg_replace('/^http(s?):\/\//i', '', constant('DOL_MAIN_URL_ROOT')); // $uri contains url without http*
-$suburi = strstr($uri, '/');            // $suburi contains url without domain:port
+$suburi = strstr($uri, '/'); // $suburi contains url without domain:port
 if ($suburi == '/') {
-    $suburi = '';           // If $suburi is /, it is now ''
+    $suburi = ''; // If $suburi is /, it is now ''
 }
-define('DOL_URL_ROOT', $suburi);           // URL relative root ('', '/dolibarr', ...)
+define('DOL_URL_ROOT', $suburi); // URL relative root ('', '/dolibarr', ...)
 //print DOL_MAIN_URL_ROOT.'-'.DOL_URL_ROOT."\n";
 // Define prefix MAIN_DB_PREFIX
 define('MAIN_DB_PREFIX', $dolibarr_main_db_prefix);
@@ -294,50 +294,50 @@ 
 
  */
 if (!defined('ADODB_PATH')) {
-    define('ADODB_PATH', BASE_PATH . '/vendor/adodb/adodb-php');
+    define('ADODB_PATH', BASE_PATH.'/vendor/adodb/adodb-php');
 }
 if (!defined('ADODB_DATE_VERSION')) {
-    include_once ADODB_PATH . '/adodb-time.inc.php';
+    include_once ADODB_PATH.'/adodb-time.inc.php';
 }
 
 if (!defined('FPDF_PATH')) {
-    define('FPDF_PATH', (empty($dolibarr_lib_FPDF_PATH)) ? DOL_BASE_PATH . '/includes/fpdf/' : $dolibarr_lib_FPDF_PATH . '/');
+    define('FPDF_PATH', (empty($dolibarr_lib_FPDF_PATH)) ? DOL_BASE_PATH . '/includes/fpdf/' : $dolibarr_lib_FPDF_PATH.'/');
 } // Used only for package that can't include tcpdf
 if (!defined('TCPDF_PATH')) {
-    define('TCPDF_PATH', (empty($dolibarr_lib_TCPDF_PATH)) ? DOL_BASE_PATH . '/includes/tecnickcom/tcpdf/' : $dolibarr_lib_TCPDF_PATH . '/');
+    define('TCPDF_PATH', (empty($dolibarr_lib_TCPDF_PATH)) ? DOL_BASE_PATH . '/includes/tecnickcom/tcpdf/' : $dolibarr_lib_TCPDF_PATH.'/');
 }
 if (!defined('FPDI_PATH')) {
-    define('FPDI_PATH', (empty($dolibarr_lib_FPDI_PATH)) ? DOL_BASE_PATH . '/includes/fpdfi/' : $dolibarr_lib_FPDI_PATH . '/');
+    define('FPDI_PATH', (empty($dolibarr_lib_FPDI_PATH)) ? DOL_BASE_PATH . '/includes/fpdfi/' : $dolibarr_lib_FPDI_PATH.'/');
 }
 if (!defined('TCPDI_PATH')) {
-    define('TCPDI_PATH', (empty($dolibarr_lib_TCPDI_PATH)) ? DOL_BASE_PATH . '/includes/tcpdi/' : $dolibarr_lib_TCPDI_PATH . '/');
+    define('TCPDI_PATH', (empty($dolibarr_lib_TCPDI_PATH)) ? DOL_BASE_PATH . '/includes/tcpdi/' : $dolibarr_lib_TCPDI_PATH.'/');
 }
 if (!defined('NUSOAP_PATH')) {
-    define('NUSOAP_PATH', (!isset($dolibarr_lib_NUSOAP_PATH)) ? DOL_BASE_PATH . '/includes/nusoap/lib/' : (empty($dolibarr_lib_NUSOAP_PATH) ? '' : $dolibarr_lib_NUSOAP_PATH . '/'));
+    define('NUSOAP_PATH', (!isset($dolibarr_lib_NUSOAP_PATH)) ? DOL_BASE_PATH . '/includes/nusoap/lib/' : (empty($dolibarr_lib_NUSOAP_PATH) ? '' : $dolibarr_lib_NUSOAP_PATH.'/'));
 }
 if (!defined('PHPEXCEL_PATH')) {
-    define('PHPEXCEL_PATH', (!isset($dolibarr_lib_PHPEXCEL_PATH)) ? DOL_BASE_PATH . '/includes/phpoffice/phpexcel/Classes/' : (empty($dolibarr_lib_PHPEXCEL_PATH) ? '' : $dolibarr_lib_PHPEXCEL_PATH . '/'));
+    define('PHPEXCEL_PATH', (!isset($dolibarr_lib_PHPEXCEL_PATH)) ? DOL_BASE_PATH . '/includes/phpoffice/phpexcel/Classes/' : (empty($dolibarr_lib_PHPEXCEL_PATH) ? '' : $dolibarr_lib_PHPEXCEL_PATH.'/'));
 }
 if (!defined('GEOIP_PATH')) {
-    define('GEOIP_PATH', (!isset($dolibarr_lib_GEOIP_PATH)) ? DOL_BASE_PATH . '/includes/geoip/' : (empty($dolibarr_lib_GEOIP_PATH) ? '' : $dolibarr_lib_GEOIP_PATH . '/'));
+    define('GEOIP_PATH', (!isset($dolibarr_lib_GEOIP_PATH)) ? DOL_BASE_PATH . '/includes/geoip/' : (empty($dolibarr_lib_GEOIP_PATH) ? '' : $dolibarr_lib_GEOIP_PATH.'/'));
 }
 if (!defined('ODTPHP_PATH')) {
-    define('ODTPHP_PATH', (!isset($dolibarr_lib_ODTPHP_PATH)) ? DOL_BASE_PATH . '/includes/odtphp/' : (empty($dolibarr_lib_ODTPHP_PATH) ? '' : $dolibarr_lib_ODTPHP_PATH . '/'));
+    define('ODTPHP_PATH', (!isset($dolibarr_lib_ODTPHP_PATH)) ? DOL_BASE_PATH . '/includes/odtphp/' : (empty($dolibarr_lib_ODTPHP_PATH) ? '' : $dolibarr_lib_ODTPHP_PATH.'/'));
 }
 if (!defined('ODTPHP_PATHTOPCLZIP')) {
-    define('ODTPHP_PATHTOPCLZIP', (!isset($dolibarr_lib_ODTPHP_PATHTOPCLZIP)) ? DOL_BASE_PATH . '/includes/odtphp/zip/pclzip/' : (empty($dolibarr_lib_ODTPHP_PATHTOPCLZIP) ? '' : $dolibarr_lib_ODTPHP_PATHTOPCLZIP . '/'));
+    define('ODTPHP_PATHTOPCLZIP', (!isset($dolibarr_lib_ODTPHP_PATHTOPCLZIP)) ? DOL_BASE_PATH . '/includes/odtphp/zip/pclzip/' : (empty($dolibarr_lib_ODTPHP_PATHTOPCLZIP) ? '' : $dolibarr_lib_ODTPHP_PATHTOPCLZIP.'/'));
 }
 if (!defined('JS_CKEDITOR')) {
-    define('JS_CKEDITOR', (!isset($dolibarr_js_CKEDITOR)) ? '' : (empty($dolibarr_js_CKEDITOR) ? '' : $dolibarr_js_CKEDITOR . '/'));
+    define('JS_CKEDITOR', (!isset($dolibarr_js_CKEDITOR)) ? '' : (empty($dolibarr_js_CKEDITOR) ? '' : $dolibarr_js_CKEDITOR.'/'));
 }
 if (!defined('JS_JQUERY')) {
-    define('JS_JQUERY', (!isset($dolibarr_js_JQUERY)) ? '' : (empty($dolibarr_js_JQUERY) ? '' : $dolibarr_js_JQUERY . '/'));
+    define('JS_JQUERY', (!isset($dolibarr_js_JQUERY)) ? '' : (empty($dolibarr_js_JQUERY) ? '' : $dolibarr_js_JQUERY.'/'));
 }
 if (!defined('JS_JQUERY_UI')) {
-    define('JS_JQUERY_UI', (!isset($dolibarr_js_JQUERY_UI)) ? '' : (empty($dolibarr_js_JQUERY_UI) ? '' : $dolibarr_js_JQUERY_UI . '/'));
+    define('JS_JQUERY_UI', (!isset($dolibarr_js_JQUERY_UI)) ? '' : (empty($dolibarr_js_JQUERY_UI) ? '' : $dolibarr_js_JQUERY_UI.'/'));
 }
 if (!defined('JS_JQUERY_FLOT')) {
-    define('JS_JQUERY_FLOT', (!isset($dolibarr_js_JQUERY_FLOT)) ? '' : (empty($dolibarr_js_JQUERY_FLOT) ? '' : $dolibarr_js_JQUERY_FLOT . '/'));
+    define('JS_JQUERY_FLOT', (!isset($dolibarr_js_JQUERY_FLOT)) ? '' : (empty($dolibarr_js_JQUERY_FLOT) ? '' : $dolibarr_js_JQUERY_FLOT.'/'));
 }
 // Other required path
 if (!defined('DOL_DEFAULT_TTF')) {
@@ -351,15 +351,15 @@ 
  * Include functions
  */
 
-if (!file_exists(DOL_BASE_PATH . "/core/lib/functions.lib.php")) {
+if (!file_exists(DOL_BASE_PATH."/core/lib/functions.lib.php")) {
     print "Error: Dolibarr config file content seems to be not correctly defined.<br>\n";
     print "Please run dolibarr setup by calling page <b>/install</b>.<br>\n";
     exit;
 }
 
 // Included by default
-include_once DOL_BASE_PATH . '/core/lib/functions.lib.php';
-include_once DOL_BASE_PATH . '/core/lib/security.lib.php';
+include_once DOL_BASE_PATH.'/core/lib/functions.lib.php';
+include_once DOL_BASE_PATH.'/core/lib/security.lib.php';
 
 //print memory_get_usage();
 // If password is encoded, we decode it

Models/Company.php

Spacing +354 added lines, -354 removed lines

@@ -23,7 +23,7 @@ 
      */
     public $fk_element = 'fk_soc';
     public $fieldsforcombobox = 'nom,name_alias';
-    public $picto = 'company';    // To test if we can delete object
+    public $picto = 'company'; // To test if we can delete object
     /**
      * 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
      * @var int
@@ -353,7 +353,7 @@ 
      * @var int ID
      */
     public $fk_multicurrency;
-    public $multicurrency_code;  //Used into tooltip
+    public $multicurrency_code; //Used into tooltip
     // Multicurrency
     protected $childtables = array("supplier_proposal" => 'SupplierProposal', "propal" => 'Proposal', "commande" => 'Order', "facture" => 'Invoice', "facture_rec" => 'RecurringInvoiceTemplate', "contrat" => 'Contract', "fichinter" => 'Fichinter', "facture_fourn" => 'SupplierInvoice', "commande_fournisseur" => 'SupplierOrder', "projet" => 'Project', "expedition" => 'Shipment', "prelevement_lignes" => 'DirectDebitRecord');
     protected $childtablesoncascade = array("societe_prices", "societe_log", "societe_address", "product_fournisseur_price", "product_customer_price_log", "product_customer_price", "socpeople", "adherent", "societe_rib", "societe_remise", "societe_remise_except", "societe_commerciaux", "categorie", "notify", "notify_def", "actioncomm");
@@ -399,16 +399,16 @@ 
          * Thirdparty commercials cannot be the same in both thirdparties so we look for them and remove some to avoid duplicate.
          * Because this function is meant to be executed within a transaction, we won't take care of begin/commit.
          */
-        $sql = 'SELECT rowid FROM ' . MAIN_DB_PREFIX . 'societe_commerciaux ';
-        $sql .= ' WHERE fk_soc = ' . (int)$dest_id . ' AND fk_user IN ( ';
+        $sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.'societe_commerciaux ';
+        $sql .= ' WHERE fk_soc = '.(int) $dest_id.' AND fk_user IN ( ';
         $sql .= ' SELECT fk_user ';
-        $sql .= ' FROM ' . MAIN_DB_PREFIX . 'societe_commerciaux ';
-        $sql .= ' WHERE fk_soc = ' . (int)$origin_id . ') ';
+        $sql .= ' FROM '.MAIN_DB_PREFIX.'societe_commerciaux ';
+        $sql .= ' WHERE fk_soc = '.(int) $origin_id.') ';
 
         $query = $db->query($sql);
 
         while ($result = $db->fetch_object($query)) {
-            $db->query('DELETE FROM ' . MAIN_DB_PREFIX . 'societe_commerciaux WHERE rowid = ' . $result->rowid);
+            $db->query('DELETE FROM '.MAIN_DB_PREFIX.'societe_commerciaux WHERE rowid = '.$result->rowid);
         }
 
         /**
@@ -439,7 +439,7 @@ 
     function create_individual(User $user)
     {
         // phpcs:enable
-        require_once DOL_DOCUMENT_ROOT . '/contact/class/contact.class.php';
+        require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
         $contact = new Contact($this->db);
 
         $contact->name = $this->name_bis;
@@ -460,7 +460,7 @@ 
         if ($result < 0) {
             $this->error = $contact->error;
             $this->errors = $contact->errors;
-            dol_syslog(get_class($this) . "::create_individual ERROR:" . $this->error, LOG_ERR);
+            dol_syslog(get_class($this)."::create_individual ERROR:".$this->error, LOG_ERR);
         }
 
         return $result;
@@ -516,40 +516,40 @@ 
         $sql .= ', st.libelle as stcomm';
         $sql .= ', te.code as typent_code';
         $sql .= ', i.libelle as libelle_incoterms';
-        $sql .= ' FROM ' . MAIN_DB_PREFIX . 'societe as s';
-        $sql .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'c_effectif as e ON s.fk_effectif = e.id';
-        $sql .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'c_country as c ON s.fk_pays = c.rowid';
-        $sql .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'c_stcomm as st ON s.fk_stcomm = st.id';
-        $sql .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'c_forme_juridique as fj ON s.fk_forme_juridique = fj.code';
-        $sql .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'c_departements as d ON s.fk_departement = d.rowid';
-        $sql .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'c_typent as te ON s.fk_typent = te.id';
-        $sql .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'c_incoterms as i ON s.fk_incoterms = i.rowid';
-
-        $sql .= ' WHERE s.entity IN (' . getEntity($this->element) . ')';
+        $sql .= ' FROM '.MAIN_DB_PREFIX.'societe as s';
+        $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_effectif as e ON s.fk_effectif = e.id';
+        $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as c ON s.fk_pays = c.rowid';
+        $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_stcomm as st ON s.fk_stcomm = st.id';
+        $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_forme_juridique as fj ON s.fk_forme_juridique = fj.code';
+        $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_departements as d ON s.fk_departement = d.rowid';
+        $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_typent as te ON s.fk_typent = te.id';
+        $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON s.fk_incoterms = i.rowid';
+
+        $sql .= ' WHERE s.entity IN ('.getEntity($this->element).')';
         if ($rowid)
-            $sql .= ' AND s.rowid = ' . $rowid;
+            $sql .= ' AND s.rowid = '.$rowid;
         if ($ref)
-            $sql .= " AND s.nom = '" . $this->db->escape($ref) . "'";
+            $sql .= " AND s.nom = '".$this->db->escape($ref)."'";
         if ($ref_alias)
-            $sql .= " AND s.nom_alias = '" . $this->db->escape($ref_alias) . "'";
+            $sql .= " AND s.nom_alias = '".$this->db->escape($ref_alias)."'";
         if ($ref_ext)
-            $sql .= " AND s.ref_ext = '" . $this->db->escape($ref_ext) . "'";
+            $sql .= " AND s.ref_ext = '".$this->db->escape($ref_ext)."'";
         if ($ref_int)
-            $sql .= " AND s.ref_int = '" . $this->db->escape($ref_int) . "'";
+            $sql .= " AND s.ref_int = '".$this->db->escape($ref_int)."'";
         if ($idprof1)
-            $sql .= " AND s.siren = '" . $this->db->escape($idprof1) . "'";
+            $sql .= " AND s.siren = '".$this->db->escape($idprof1)."'";
         if ($idprof2)
-            $sql .= " AND s.siret = '" . $this->db->escape($idprof2) . "'";
+            $sql .= " AND s.siret = '".$this->db->escape($idprof2)."'";
         if ($idprof3)
-            $sql .= " AND s.ape = '" . $this->db->escape($idprof3) . "'";
+            $sql .= " AND s.ape = '".$this->db->escape($idprof3)."'";
         if ($idprof4)
-            $sql .= " AND s.idprof4 = '" . $this->db->escape($idprof4) . "'";
+            $sql .= " AND s.idprof4 = '".$this->db->escape($idprof4)."'";
         if ($idprof5)
-            $sql .= " AND s.idprof5 = '" . $this->db->escape($idprof5) . "'";
+            $sql .= " AND s.idprof5 = '".$this->db->escape($idprof5)."'";
         if ($idprof6)
-            $sql .= " AND s.idprof6 = '" . $this->db->escape($idprof6) . "'";
+            $sql .= " AND s.idprof6 = '".$this->db->escape($idprof6)."'";
         if ($email)
-            $sql .= " AND s.email = '" . $this->db->escape($email) . "'";
+            $sql .= " AND s.email = '".$this->db->escape($email)."'";
 
         $resql = $this->db->query($sql);
         if ($resql) {
@@ -567,7 +567,7 @@ 
 
                 $this->ref = $obj->rowid;
                 $this->name = $obj->name;
-                $this->nom = $obj->name;  // deprecated
+                $this->nom = $obj->name; // deprecated
                 $this->name_alias = $obj->name_alias;
                 $this->ref_ext = $obj->ref_ext;
                 $this->ref_int = $obj->ref_int;
@@ -583,16 +583,16 @@ 
 
                 $this->country_id = $obj->country_id;
                 $this->country_code = $obj->country_id ? $obj->country_code : '';
-                $this->country = $obj->country_id ? ($langs->trans('Country' . $obj->country_code) != 'Country' . $obj->country_code ? $langs->transnoentities('Country' . $obj->country_code) : $obj->country) : '';
+                $this->country = $obj->country_id ? ($langs->trans('Country'.$obj->country_code) != 'Country'.$obj->country_code ? $langs->transnoentities('Country'.$obj->country_code) : $obj->country) : '';
 
                 $this->state_id = $obj->fk_departement;
                 $this->state_code = $obj->state_code;
                 $this->state = ($obj->state != '-' ? $obj->state : '');
 
-                $transcode = $langs->trans('StatusProspect' . $obj->fk_stcomm);
-                $libelle = ($transcode != 'StatusProspect' . $obj->fk_stcomm ? $transcode : $obj->stcomm);
-                $this->stcomm_id = $obj->fk_stcomm;     // id statut commercial
-                $this->statut_commercial = $libelle;    // libelle statut commercial
+                $transcode = $langs->trans('StatusProspect'.$obj->fk_stcomm);
+                $libelle = ($transcode != 'StatusProspect'.$obj->fk_stcomm ? $transcode : $obj->stcomm);
+                $this->stcomm_id = $obj->fk_stcomm; // id statut commercial
+                $this->statut_commercial = $libelle; // libelle statut commercial
 
                 $this->email = $obj->email;
                 $this->skype = $obj->skype;
@@ -721,11 +721,11 @@ 
         if (empty($fuser))
             $fuser = $user;
 
-        require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
+        require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
         $entity = isset($this->entity) ? $this->entity : $conf->entity;
 
-        dol_syslog(get_class($this) . "::delete", LOG_DEBUG);
+        dol_syslog(get_class($this)."::delete", LOG_DEBUG);
         $error = 0;
 
         // Test if child exists
@@ -743,7 +743,7 @@ 
             }
 
             if (!$error) {
-                require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
+                require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
                 $static_cat = new Categorie($this->db);
                 $toute_categs = array();
 
@@ -765,8 +765,8 @@ 
 
             foreach ($this->childtablesoncascade as $tabletodelete) {
                 if (!$error) {
-                    $sql = "DELETE FROM " . MAIN_DB_PREFIX . $tabletodelete;
-                    $sql .= " WHERE fk_soc = " . $id;
+                    $sql = "DELETE FROM ".MAIN_DB_PREFIX.$tabletodelete;
+                    $sql .= " WHERE fk_soc = ".$id;
                     if (!$this->db->query($sql)) {
                         $error++;
                         $this->errors[] = $this->db->lasterror();
@@ -779,15 +779,15 @@ 
                 $result = $this->deleteExtraFields();
                 if ($result < 0) {
                     $error++;
-                    dol_syslog(get_class($this) . "::delete error -3 " . $this->error, LOG_ERR);
+                    dol_syslog(get_class($this)."::delete error -3 ".$this->error, LOG_ERR);
                 }
             }
 
             // Remove links to subsidiaries companies
             if (!$error) {
-                $sql = "UPDATE " . MAIN_DB_PREFIX . "societe";
+                $sql = "UPDATE ".MAIN_DB_PREFIX."societe";
                 $sql .= " SET parent = NULL";
-                $sql .= " WHERE parent = " . $id;
+                $sql .= " WHERE parent = ".$id;
                 if (!$this->db->query($sql)) {
                     $error++;
                     $this->errors[] = $this->db->lasterror();
@@ -796,8 +796,8 @@ 
 
             // Remove third party
             if (!$error) {
-                $sql = "DELETE FROM " . MAIN_DB_PREFIX . "societe";
-                $sql .= " WHERE rowid = " . $id;
+                $sql = "DELETE FROM ".MAIN_DB_PREFIX."societe";
+                $sql .= " WHERE rowid = ".$id;
                 if (!$this->db->query($sql)) {
                     $error++;
                     $this->errors[] = $this->db->lasterror();
@@ -809,7 +809,7 @@ 
 
                 // Delete directory
                 if (!empty($conf->societe->multidir_output[$entity])) {
-                    $docdir = $conf->societe->multidir_output[$entity] . "/" . $id;
+                    $docdir = $conf->societe->multidir_output[$entity]."/".$id;
                     if (dol_is_dir($docdir)) {
                         dol_delete_dir_recursive($docdir);
                     }
@@ -822,7 +822,7 @@ 
                 return -1;
             }
         } else
-            dol_syslog("Can't remove thirdparty with id " . $id . ". There is " . $objectisused . " childs", LOG_WARNING);
+            dol_syslog("Can't remove thirdparty with id ".$id.". There is ".$objectisused." childs", LOG_WARNING);
         return 0;
     }
 
@@ -838,9 +838,9 @@ 
             $newclient = 1;
             if ($this->client == 2 || $this->client == 3)
                 $newclient = 3; //If prospect, we keep prospect tag
-            $sql = "UPDATE " . MAIN_DB_PREFIX . "societe";
-            $sql .= " SET client = " . $newclient;
-            $sql .= " WHERE rowid = " . $this->id;
+            $sql = "UPDATE ".MAIN_DB_PREFIX."societe";
+            $sql .= " SET client = ".$newclient;
+            $sql .= " WHERE rowid = ".$this->id;
 
             $resql = $this->db->query($sql);
             if ($resql) {
@@ -872,7 +872,7 @@ 
             return -2;
         }
 
-        dol_syslog(get_class($this) . "::set_remise_client " . $remise . ", " . $note . ", " . $user->id);
+        dol_syslog(get_class($this)."::set_remise_client ".$remise.", ".$note.", ".$user->id);
 
         if ($this->id) {
             $this->db->begin();
@@ -880,9 +880,9 @@ 
             $now = dol_now();
 
             // Positionne remise courante
-            $sql = "UPDATE " . MAIN_DB_PREFIX . "societe ";
-            $sql .= " SET remise_client = '" . $this->db->escape($remise) . "'";
-            $sql .= " WHERE rowid = " . $this->id;
+            $sql = "UPDATE ".MAIN_DB_PREFIX."societe ";
+            $sql .= " SET remise_client = '".$this->db->escape($remise)."'";
+            $sql .= " WHERE rowid = ".$this->id;
             $resql = $this->db->query($sql);
             if (!$resql) {
                 $this->db->rollback();
@@ -891,11 +891,11 @@ 
             }
 
             // Ecrit trace dans historique des remises
-            $sql = "INSERT INTO " . MAIN_DB_PREFIX . "societe_remise";
+            $sql = "INSERT INTO ".MAIN_DB_PREFIX."societe_remise";
             $sql .= " (entity, datec, fk_soc, remise_client, note, fk_user_author)";
-            $sql .= " VALUES (" . $conf->entity . ", '" . $this->db->idate($now) . "', " . $this->id . ", '" . $this->db->escape($remise) . "',";
-            $sql .= " '" . $this->db->escape($note) . "',";
-            $sql .= " " . $user->id;
+            $sql .= " VALUES (".$conf->entity.", '".$this->db->idate($now)."', ".$this->id.", '".$this->db->escape($remise)."',";
+            $sql .= " '".$this->db->escape($note)."',";
+            $sql .= " ".$user->id;
             $sql .= ")";
 
             $resql = $this->db->query($sql);
@@ -932,7 +932,7 @@ 
             return -2;
         }
 
-        dol_syslog(get_class($this) . "::set_remise_supplier " . $remise . ", " . $note . ", " . $user->id);
+        dol_syslog(get_class($this)."::set_remise_supplier ".$remise.", ".$note.", ".$user->id);
 
         if ($this->id) {
             $this->db->begin();
@@ -940,9 +940,9 @@ 
             $now = dol_now();
 
             // Positionne remise courante
-            $sql = "UPDATE " . MAIN_DB_PREFIX . "societe ";
-            $sql .= " SET remise_supplier = '" . $this->db->escape($remise) . "'";
-            $sql .= " WHERE rowid = " . $this->id;
+            $sql = "UPDATE ".MAIN_DB_PREFIX."societe ";
+            $sql .= " SET remise_supplier = '".$this->db->escape($remise)."'";
+            $sql .= " WHERE rowid = ".$this->id;
             $resql = $this->db->query($sql);
             if (!$resql) {
                 $this->db->rollback();
@@ -951,11 +951,11 @@ 
             }
 
             // Ecrit trace dans historique des remises
-            $sql = "INSERT INTO " . MAIN_DB_PREFIX . "societe_remise_supplier";
+            $sql = "INSERT INTO ".MAIN_DB_PREFIX."societe_remise_supplier";
             $sql .= " (entity, datec, fk_soc, remise_supplier, note, fk_user_author)";
-            $sql .= " VALUES (" . $conf->entity . ", '" . $this->db->idate($now) . "', " . $this->id . ", '" . $this->db->escape($remise) . "',";
-            $sql .= " '" . $this->db->escape($note) . "',";
-            $sql .= " " . $user->id;
+            $sql .= " VALUES (".$conf->entity.", '".$this->db->idate($now)."', ".$this->id.", '".$this->db->escape($remise)."',";
+            $sql .= " '".$this->db->escape($note)."',";
+            $sql .= " ".$user->id;
             $sql .= ")";
 
             $resql = $this->db->query($sql);
@@ -1002,7 +1002,7 @@ 
         }
 
         if ($this->id) {
-            require_once DOL_DOCUMENT_ROOT . '/core/class/discount.class.php';
+            require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
 
             $discount = new DiscountAbsolute($this->db);
             $discount->fk_soc = $this->id;
@@ -1040,7 +1040,7 @@ 
      */
     function getAvailableDiscounts($user = '', $filter = '', $maxvalue = 0, $discount_type = 0)
     {
-        require_once DOL_DOCUMENT_ROOT . '/core/class/discount.class.php';
+        require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
 
         $discountstatic = new DiscountAbsolute($this->db);
         $result = $discountstatic->getAvailableDiscounts($this, $user, $filter, $maxvalue, $discount_type);
@@ -1067,18 +1067,18 @@ 
         if ($this->id) {
             $now = dol_now();
 
-            $sql = "UPDATE " . MAIN_DB_PREFIX . "societe";
-            $sql .= " SET price_level = '" . $this->db->escape($price_level) . "'";
-            $sql .= " WHERE rowid = " . $this->id;
+            $sql = "UPDATE ".MAIN_DB_PREFIX."societe";
+            $sql .= " SET price_level = '".$this->db->escape($price_level)."'";
+            $sql .= " WHERE rowid = ".$this->id;
 
             if (!$this->db->query($sql)) {
                 dol_print_error($this->db);
                 return -1;
             }
 
-            $sql = "INSERT INTO " . MAIN_DB_PREFIX . "societe_prices";
+            $sql = "INSERT INTO ".MAIN_DB_PREFIX."societe_prices";
             $sql .= " (datec, fk_soc, price_level, fk_user_author)";
-            $sql .= " VALUES ('" . $this->db->idate($now) . "', " . $this->id . ", '" . $this->db->escape($price_level) . "', " . $user->id . ")";
+            $sql .= " VALUES ('".$this->db->idate($now)."', ".$this->id.", '".$this->db->escape($price_level)."', ".$user->id.")";
 
             if (!$this->db->query($sql)) {
                 dol_print_error($this->db);
@@ -1104,7 +1104,7 @@ 
         global $conf, $langs, $hookmanager;
 
         if (!empty($conf->dol_no_mouse_hover))
-            $notooltip = 1;   // Force disable tooltips
+            $notooltip = 1; // Force disable tooltips
 
         $name = $this->name ? $this->name : $this->nom;
 
@@ -1122,24 +1122,24 @@ 
             if (($this->client) && (!empty($this->code_client)) && ($conf->global->SOCIETE_ADD_REF_IN_LIST == 1 || $conf->global->SOCIETE_ADD_REF_IN_LIST == 2
                 )
             ) {
-                $code = $this->code_client . ' - ';
+                $code = $this->code_client.' - ';
             }
 
             if (($this->fournisseur) && (!empty($this->code_fournisseur)) && ($conf->global->SOCIETE_ADD_REF_IN_LIST == 1 || $conf->global->SOCIETE_ADD_REF_IN_LIST == 3
                 )
             ) {
-                $code .= $this->code_fournisseur . ' - ';
+                $code .= $this->code_fournisseur.' - ';
             }
 
             if ($conf->global->SOCIETE_ADD_REF_IN_LIST == 1) {
-                $name = $code . ' ' . $name;
+                $name = $code.' '.$name;
             } else {
                 $name = $code;
             }
         }
 
         if (!empty($this->name_alias))
-            $name .= ' (' . $this->name_alias . ')';
+            $name .= ' ('.$this->name_alias.')';
 
         $result = '';
         $label = '';
@@ -1155,83 +1155,83 @@ 
         $label .= '<div class="centpercent">';
 
         if ($option == 'customer' || $option == 'compta' || $option == 'category' || $option == 'category_supplier') {
-            $label .= '<u>' . $langs->trans("ShowCustomer") . '</u>';
+            $label .= '<u>'.$langs->trans("ShowCustomer").'</u>';
             // $linkstart = '<a href="' . DOL_URL_ROOT . '/comm/card.php?socid=' . $this->id;
-            $linkstart = '<a href="' . BASE_URI . '?controller=comm&method=card&socid=' . $this->id;
+            $linkstart = '<a href="'.BASE_URI.'?controller=comm&method=card&socid='.$this->id;
         } elseif ($option == 'prospect' && empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) {
-            $label .= '<u>' . $langs->trans("ShowProspect") . '</u>';
+            $label .= '<u>'.$langs->trans("ShowProspect").'</u>';
             // $linkstart = '<a href="' . DOL_URL_ROOT . '/comm/card.php?socid=' . $this->id;
-            $linkstart = '<a href="' . BASE_URI . '?controller=comm&method=card&socid=' . $this->id;
+            $linkstart = '<a href="'.BASE_URI.'?controller=comm&method=card&socid='.$this->id;
         } elseif ($option == 'supplier') {
-            $label .= '<u>' . $langs->trans("ShowSupplier") . '</u>';
+            $label .= '<u>'.$langs->trans("ShowSupplier").'</u>';
             // $linkstart = '<a href="' . DOL_URL_ROOT . '/fourn/card.php?socid=' . $this->id;
-            $linkstart = '<a href="' . BASE_URI . '?controller=fourn&method=card&socid=' . $this->id;
+            $linkstart = '<a href="'.BASE_URI.'?controller=fourn&method=card&socid='.$this->id;
         } elseif ($option == 'agenda') {
-            $label .= '<u>' . $langs->trans("ShowAgenda") . '</u>';
+            $label .= '<u>'.$langs->trans("ShowAgenda").'</u>';
             // $linkstart = '<a href="' . DOL_URL_ROOT . '/societe/agenda.php?socid=' . $this->id;
-            $linkstart = '<a href="' . BASE_URI . '?controller=societe&method=agenda&socid=' . $this->id;
+            $linkstart = '<a href="'.BASE_URI.'?controller=societe&method=agenda&socid='.$this->id;
         } elseif ($option == 'project') {
-            $label .= '<u>' . $langs->trans("ShowProject") . '</u>';
+            $label .= '<u>'.$langs->trans("ShowProject").'</u>';
             // $linkstart = '<a href="' . DOL_URL_ROOT . '/societe/project.php?socid=' . $this->id;
-            $linkstart = '<a href="' . BASE_URI . '?controller=societe&method=project&socid=' . $this->id;
+            $linkstart = '<a href="'.BASE_URI.'?controller=societe&method=project&socid='.$this->id;
         } elseif ($option == 'margin') {
-            $label .= '<u>' . $langs->trans("ShowMargin") . '</u>';
+            $label .= '<u>'.$langs->trans("ShowMargin").'</u>';
             // $linkstart = '<a href="' . DOL_URL_ROOT . '/margin/tabs/thirdpartyMargins.php?socid=' . $this->id . '&type=1';
-            $linkstart = '<a href="' . BASE_URI . '?controller=margin/tabs&method=thirdpartyMargins&socid=' . $this->id . '&type=1';
+            $linkstart = '<a href="'.BASE_URI.'?controller=margin/tabs&method=thirdpartyMargins&socid='.$this->id.'&type=1';
         } elseif ($option == 'contact') {
-            $label .= '<u>' . $langs->trans("ShowContacts") . '</u>';
+            $label .= '<u>'.$langs->trans("ShowContacts").'</u>';
             // $linkstart = '<a href="' . DOL_URL_ROOT . '/societe/contact.php?socid=' . $this->id;
-            $linkstart = '<a href="' . BASE_URI . '?controller=societe&method=contact&socid=' . $this->id;
+            $linkstart = '<a href="'.BASE_URI.'?controller=societe&method=contact&socid='.$this->id;
         } elseif ($option == 'ban') {
-            $label .= '<u>' . $langs->trans("ShowBan") . '</u>';
+            $label .= '<u>'.$langs->trans("ShowBan").'</u>';
             // $linkstart = '<a href="' . DOL_URL_ROOT . '/societe/paymentmodes.php?socid=' . $this->id;
-            $linkstart = '<a href="' . BASE_URI . '?controller=societe&method=paymentmodes&socid=' . $this->id;
+            $linkstart = '<a href="'.BASE_URI.'?controller=societe&method=paymentmodes&socid='.$this->id;
         }
 
         // By default
         if (empty($linkstart)) {
-            $label .= '<u>' . $langs->trans("ShowCompany") . '</u>';
+            $label .= '<u>'.$langs->trans("ShowCompany").'</u>';
             // $linkstart = '<a href="' . DOL_URL_ROOT . '/societe/card.php?socid=' . $this->id;
-            $linkstart = '<a href="' . BASE_URI . '?controller=societe&method=card&socid=' . $this->id;
+            $linkstart = '<a href="'.BASE_URI.'?controller=societe&method=card&socid='.$this->id;
         }
 
         if (!empty($this->name)) {
-            $label .= '<br><b>' . $langs->trans('Name') . ':</b> ' . $this->name;
+            $label .= '<br><b>'.$langs->trans('Name').':</b> '.$this->name;
             if (!empty($this->name_alias))
-                $label .= ' (' . $this->name_alias . ')';
-            $label .= '<br><b>' . $langs->trans('Email') . ':</b> ' . $this->email;
+                $label .= ' ('.$this->name_alias.')';
+            $label .= '<br><b>'.$langs->trans('Email').':</b> '.$this->email;
         }
         if (!empty($this->country_code))
-            $label .= '<br><b>' . $langs->trans('Country') . ':</b> ' . $this->country_code;
+            $label .= '<br><b>'.$langs->trans('Country').':</b> '.$this->country_code;
         if (!empty($this->tva_intra) || (!empty($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP) && strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'vatnumber') !== false))
-            $label .= '<br><b>' . $langs->trans('VATIntra') . ':</b> ' . $this->tva_intra;
+            $label .= '<br><b>'.$langs->trans('VATIntra').':</b> '.$this->tva_intra;
         if (!empty($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP)) {
             if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid1') !== false)
-                $label .= '<br><b>' . $langs->trans('ProfId1' . $this->country_code) . ':</b> ' . $this->idprof1;
+                $label .= '<br><b>'.$langs->trans('ProfId1'.$this->country_code).':</b> '.$this->idprof1;
             if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid2') !== false)
-                $label .= '<br><b>' . $langs->trans('ProfId2' . $this->country_code) . ':</b> ' . $this->idprof2;
+                $label .= '<br><b>'.$langs->trans('ProfId2'.$this->country_code).':</b> '.$this->idprof2;
             if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid3') !== false)
-                $label .= '<br><b>' . $langs->trans('ProfId3' . $this->country_code) . ':</b> ' . $this->idprof3;
+                $label .= '<br><b>'.$langs->trans('ProfId3'.$this->country_code).':</b> '.$this->idprof3;
             if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid4') !== false)
-                $label .= '<br><b>' . $langs->trans('ProfId4' . $this->country_code) . ':</b> ' . $this->idprof4;
+                $label .= '<br><b>'.$langs->trans('ProfId4'.$this->country_code).':</b> '.$this->idprof4;
             if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid5') !== false)
-                $label .= '<br><b>' . $langs->trans('ProfId5' . $this->country_code) . ':</b> ' . $this->idprof5;
+                $label .= '<br><b>'.$langs->trans('ProfId5'.$this->country_code).':</b> '.$this->idprof5;
             if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid6') !== false)
-                $label .= '<br><b>' . $langs->trans('ProfId6' . $this->country_code) . ':</b> ' . $this->idprof6;
+                $label .= '<br><b>'.$langs->trans('ProfId6'.$this->country_code).':</b> '.$this->idprof6;
         }
         if (!empty($this->code_client) && ($this->client == 1 || $this->client == 3))
-            $label .= '<br><b>' . $langs->trans('CustomerCode') . ':</b> ' . $this->code_client;
+            $label .= '<br><b>'.$langs->trans('CustomerCode').':</b> '.$this->code_client;
         if (!empty($this->code_fournisseur) && $this->fournisseur)
-            $label .= '<br><b>' . $langs->trans('SupplierCode') . ':</b> ' . $this->code_fournisseur;
+            $label .= '<br><b>'.$langs->trans('SupplierCode').':</b> '.$this->code_fournisseur;
         if (!empty($conf->accounting->enabled) && ($this->client == 1 || $this->client == 3))
-            $label .= '<br><b>' . $langs->trans('CustomerAccountancyCode') . ':</b> ' . ($this->code_compta ? $this->code_compta : $this->code_compta_client);
+            $label .= '<br><b>'.$langs->trans('CustomerAccountancyCode').':</b> '.($this->code_compta ? $this->code_compta : $this->code_compta_client);
         if (!empty($conf->accounting->enabled) && $this->fournisseur)
-            $label .= '<br><b>' . $langs->trans('SupplierAccountancyCode') . ':</b> ' . $this->code_compta_fournisseur;
+            $label .= '<br><b>'.$langs->trans('SupplierAccountancyCode').':</b> '.$this->code_compta_fournisseur;
 
         $label .= '</div>';
 
         // Add type of canvas
-        $linkstart .= (!empty($this->canvas) ? '&canvas=' . $this->canvas : '');
+        $linkstart .= (!empty($this->canvas) ? '&canvas='.$this->canvas : '');
         // Add param to save lastsearch_values or not
         $add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
         if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"]))
@@ -1244,9 +1244,9 @@ 
         if (empty($notooltip)) {
             if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
                 $label = $langs->trans("ShowCompany");
-                $linkclose .= ' alt="' . dol_escape_htmltag($label, 1) . '"';
+                $linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
             }
-            $linkclose .= ' title="' . dol_escape_htmltag($label, 1) . '"';
+            $linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
             $linkclose .= ' class="classfortooltip refurl"';
 
             /*
@@ -1256,7 +1256,7 @@ 
               if ($reshook > 0) $linkclose = $hookmanager->resPrint;
              */
         }
-        $linkstart .= $linkclose . '>';
+        $linkstart .= $linkclose.'>';
         $linkend = '</a>';
 
         global $user;
@@ -1267,7 +1267,7 @@ 
 
         $result .= $linkstart;
         if ($withpicto)
-            $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="' . (($withpicto != 2) ? 'paddingright ' : '') . 'classfortooltip valigntextbottom"'), 0, 0, $notooltip ? 0 : 1);
+            $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip valigntextbottom"'), 0, 0, $notooltip ? 0 : 1);
         if ($withpicto != 2)
             $result .= ($maxlen ? dol_trunc($name, $maxlen) : $name);
         $result .= $linkend;
@@ -1275,7 +1275,7 @@ 
         global $action;
         $hookmanager->initHooks(array('thirdpartydao'));
         $parameters = array('id' => $this->id, 'getnomurl' => $result);
-        $reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action);    // Note that $action and $object may have been modified by some hooks
+        $reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
         if ($reshook > 0)
             $result = $hookmanager->resPrint;
         else
@@ -1322,9 +1322,9 @@ 
                 return $langs->trans("InActivity");
         } elseif ($mode == 2) {
             if ($statut == 0)
-                return img_picto($langs->trans("ActivityCeased"), 'statut5', 'class="pictostatus"') . ' ' . $langs->trans("ActivityCeased");
+                return img_picto($langs->trans("ActivityCeased"), 'statut5', 'class="pictostatus"').' '.$langs->trans("ActivityCeased");
             elseif ($statut == 1)
-                return img_picto($langs->trans("InActivity"), 'statut4', 'class="pictostatus"') . ' ' . $langs->trans("InActivity");
+                return img_picto($langs->trans("InActivity"), 'statut4', 'class="pictostatus"').' '.$langs->trans("InActivity");
         } elseif ($mode == 3) {
             if ($statut == 0)
                 return img_picto($langs->trans("ActivityCeased"), 'statut5', 'class="pictostatus"');
@@ -1332,19 +1332,19 @@ 
                 return img_picto($langs->trans("InActivity"), 'statut4', 'class="pictostatus"');
         } elseif ($mode == 4) {
             if ($statut == 0)
-                return img_picto($langs->trans("ActivityCeased"), 'statut5', 'class="pictostatus"') . ' ' . $langs->trans("ActivityCeased");
+                return img_picto($langs->trans("ActivityCeased"), 'statut5', 'class="pictostatus"').' '.$langs->trans("ActivityCeased");
             elseif ($statut == 1)
-                return img_picto($langs->trans("InActivity"), 'statut4', 'class="pictostatus"') . ' ' . $langs->trans("InActivity");
+                return img_picto($langs->trans("InActivity"), 'statut4', 'class="pictostatus"').' '.$langs->trans("InActivity");
         } elseif ($mode == 5) {
             if ($statut == 0)
-                return '<span class="hideonsmartphone">' . $langs->trans("ActivityCeased") . '</span> ' . img_picto($langs->trans("ActivityCeased"), 'statut5', 'class="pictostatus"');
+                return '<span class="hideonsmartphone">'.$langs->trans("ActivityCeased").'</span> '.img_picto($langs->trans("ActivityCeased"), 'statut5', 'class="pictostatus"');
             elseif ($statut == 1)
-                return '<span class="hideonsmartphone">' . $langs->trans("InActivity") . '</span> ' . img_picto($langs->trans("InActivity"), 'statut4', 'class="pictostatus"');
+                return '<span class="hideonsmartphone">'.$langs->trans("InActivity").'</span> '.img_picto($langs->trans("InActivity"), 'statut4', 'class="pictostatus"');
         } elseif ($mode == 6) {
             if ($statut == 0)
-                return '<span class="hideonsmartphone">' . $langs->trans("ActivityCeased") . '</span> ' . img_picto($langs->trans("ActivityCeased"), 'statut5', 'class="pictostatus"');
+                return '<span class="hideonsmartphone">'.$langs->trans("ActivityCeased").'</span> '.img_picto($langs->trans("ActivityCeased"), 'statut5', 'class="pictostatus"');
             elseif ($statut == 1)
-                return '<span class="hideonsmartphone">' . $langs->trans("InActivity") . '</span> ' . img_picto($langs->trans("InActivity"), 'statut4', 'class="pictostatus"');
+                return '<span class="hideonsmartphone">'.$langs->trans("InActivity").'</span> '.img_picto($langs->trans("InActivity"), 'statut4', 'class="pictostatus"');
         }
     }
 
@@ -1365,7 +1365,7 @@ 
         if ($this->email && $addthirdparty) {
             if (empty($this->name))
                 $this->name = $this->nom;
-            $contact_emails['thirdparty'] = $langs->transnoentitiesnoconv("ThirdParty") . ': ' . dol_trunc($this->name, 16) . " <" . $this->email . ">";
+            $contact_emails['thirdparty'] = $langs->transnoentitiesnoconv("ThirdParty").': '.dol_trunc($this->name, 16)." <".$this->email.">";
         }
         //var_dump($contact_emails)
         return $contact_emails;
@@ -1389,8 +1389,8 @@ 
 
 
         $sql = "SELECT rowid, email, statut, phone_mobile, lastname, poste, firstname";
-        $sql .= " FROM " . MAIN_DB_PREFIX . "socpeople";
-        $sql .= " WHERE fk_soc = " . $this->id;
+        $sql .= " FROM ".MAIN_DB_PREFIX."socpeople";
+        $sql .= " WHERE fk_soc = ".$this->id;
 
         $resql = $this->db->query($sql);
         if ($resql) {
@@ -1423,9 +1423,9 @@ 
                         }
 
                         if (!empty($obj->poste)) {
-                            $contact_property[$obj->rowid] = trim(dolGetFirstLastname($obj->firstname, $obj->lastname)) . ($obj->poste ? " - " . $obj->poste : "") . (($mode != 'poste' && $property) ? " " . $sepa . $property . $sepb : '');
+                            $contact_property[$obj->rowid] = trim(dolGetFirstLastname($obj->firstname, $obj->lastname)).($obj->poste ? " - ".$obj->poste : "").(($mode != 'poste' && $property) ? " ".$sepa.$property.$sepb : '');
                         } else {
-                            $contact_property[$obj->rowid] = trim(dolGetFirstLastname($obj->firstname, $obj->lastname)) . (($mode != 'poste' && $property) ? " " . $sepa . $property . $sepb : '');
+                            $contact_property[$obj->rowid] = trim(dolGetFirstLastname($obj->firstname, $obj->lastname)).(($mode != 'poste' && $property) ? " ".$sepa.$property.$sepb : '');
                         }
                     }
                     $i++;
@@ -1453,7 +1453,7 @@ 
             if (empty($this->name))
                 $this->name = $this->nom;
             // TODO: Tester si tel non deja present dans tableau contact
-            $contact_phone['thirdparty'] = $langs->transnoentitiesnoconv("ThirdParty") . ': ' . dol_trunc($this->name, 16) . " <" . $this->phone . ">";
+            $contact_phone['thirdparty'] = $langs->transnoentitiesnoconv("ThirdParty").': '.dol_trunc($this->name, 16)." <".$this->phone.">";
         }
         return $contact_phone;
     }
@@ -1468,7 +1468,7 @@ 
         // phpcs:enable
         $contacts = array();
 
-        $sql = "SELECT rowid, lastname, firstname FROM " . MAIN_DB_PREFIX . "socpeople WHERE fk_soc = " . $this->id;
+        $sql = "SELECT rowid, lastname, firstname FROM ".MAIN_DB_PREFIX."socpeople WHERE fk_soc = ".$this->id;
         $resql = $this->db->query($sql);
         if ($resql) {
             $nump = $this->db->num_rows($resql);
@@ -1496,10 +1496,10 @@ 
     function contact_array_objects()
     {
         // phpcs:enable
-        require_once DOL_DOCUMENT_ROOT . '/contact/class/contact.class.php';
+        require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
         $contacts = array();
 
-        $sql = "SELECT rowid FROM " . MAIN_DB_PREFIX . "socpeople WHERE fk_soc = " . $this->id;
+        $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."socpeople WHERE fk_soc = ".$this->id;
         $resql = $this->db->query($sql);
         if ($resql) {
             $nump = $this->db->num_rows($resql);
@@ -1537,8 +1537,8 @@ 
             return '';
 
         $sql = "SELECT rowid, email, phone_mobile, lastname, firstname";
-        $sql .= " FROM " . MAIN_DB_PREFIX . "socpeople";
-        $sql .= " WHERE rowid = '" . $rowid . "'";
+        $sql .= " FROM ".MAIN_DB_PREFIX."socpeople";
+        $sql .= " WHERE rowid = '".$rowid."'";
 
         $resql = $this->db->query($sql);
         if ($resql) {
@@ -1548,7 +1548,7 @@ 
                 $obj = $this->db->fetch_object($resql);
 
                 if ($mode == 'email')
-                    $contact_property = dol_string_nospecial(dolGetFirstLastname($obj->firstname, $obj->lastname), ' ', array(",")) . " <" . $obj->email . ">";
+                    $contact_property = dol_string_nospecial(dolGetFirstLastname($obj->firstname, $obj->lastname), ' ', array(","))." <".$obj->email.">";
                 else if ($mode == 'mobile')
                     $contact_property = $obj->phone_mobile;
             }
@@ -1569,7 +1569,7 @@ 
     function display_rib($mode = 'label')
     {
         // phpcs:enable
-        require_once DOL_DOCUMENT_ROOT . '/societe/class/companybankaccount.class.php';
+        require_once DOL_DOCUMENT_ROOT.'/societe/class/companybankaccount.class.php';
 
         $bac = new CompanyBankAccount($this->db);
         $bac->fetch(0, $this->id);
@@ -1578,7 +1578,7 @@ 
             return $bac->getRibLabel(true);
         } elseif ($mode == 'rum') {
             if (empty($bac->rum)) {
-                require_once DOL_DOCUMENT_ROOT . '/compta/prelevement/class/bonprelevement.class.php';
+                require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.php';
                 $prelevement = new BonPrelevement($this->db);
                 $bac->fetch_thirdparty();
                 $bac->rum = $prelevement->buildRumNumber($bac->thirdparty->code_client, $bac->datec, $bac->id);
@@ -1601,8 +1601,8 @@ 
     function get_all_rib()
     {
         // phpcs:enable
-        require_once DOL_DOCUMENT_ROOT . '/societe/class/companybankaccount.class.php';
-        $sql = "SELECT rowid FROM " . MAIN_DB_PREFIX . "societe_rib WHERE type='ban' AND fk_soc = " . $this->id;
+        require_once DOL_DOCUMENT_ROOT.'/societe/class/companybankaccount.class.php';
+        $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_rib WHERE type='ban' AND fk_soc = ".$this->id;
         $result = $this->db->query($sql);
         if (!$result) {
             $this->error++;
@@ -1639,14 +1639,14 @@ 
 
             $dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
             foreach ($dirsociete as $dirroot) {
-                $res = dol_include_once($dirroot . $module . '.php');
+                $res = dol_include_once($dirroot.$module.'.php');
                 if ($res)
                     break;
             }
 
             $mod = new $module();
 
-            dol_syslog(get_class($this) . "::codeclient_modifiable code_client=" . $this->code_client . " module=" . $module);
+            dol_syslog(get_class($this)."::codeclient_modifiable code_client=".$this->code_client." module=".$module);
             if ($mod->code_modifiable_null && !$this->code_client)
                 return 1;
             if ($mod->code_modifiable_invalide && $this->check_codeclient() < 0)
@@ -1679,14 +1679,14 @@ 
 
             $dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
             foreach ($dirsociete as $dirroot) {
-                $res = dol_include_once($dirroot . $module . '.php');
+                $res = dol_include_once($dirroot.$module.'.php');
                 if ($res)
                     break;
             }
 
             $mod = new $module();
 
-            dol_syslog(get_class($this) . "::check_codeclient code_client=" . $this->code_client . " module=" . $module);
+            dol_syslog(get_class($this)."::check_codeclient code_client=".$this->code_client." module=".$module);
             $result = $mod->verif($this->db, $this->code_client, $this, 0);
             return $result;
         } else {
@@ -1710,14 +1710,14 @@ 
 
             $dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
             foreach ($dirsociete as $dirroot) {
-                $res = dol_include_once($dirroot . $module . '.php');
+                $res = dol_include_once($dirroot.$module.'.php');
                 if ($res)
                     break;
             }
 
             $mod = new $module();
 
-            dol_syslog(get_class($this) . "::codefournisseur_modifiable code_founisseur=" . $this->code_fournisseur . " module=" . $module);
+            dol_syslog(get_class($this)."::codefournisseur_modifiable code_founisseur=".$this->code_fournisseur." module=".$module);
             if ($mod->code_modifiable_null && !$this->code_fournisseur)
                 return 1;
             if ($mod->code_modifiable_invalide && $this->check_codefournisseur() < 0)
@@ -1750,14 +1750,14 @@ 
 
             $dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
             foreach ($dirsociete as $dirroot) {
-                $res = dol_include_once($dirroot . $module . '.php');
+                $res = dol_include_once($dirroot.$module.'.php');
                 if ($res)
                     break;
             }
 
             $mod = new $module();
 
-            dol_syslog(get_class($this) . "::check_codefournisseur code_fournisseur=" . $this->code_fournisseur . " module=" . $module);
+            dol_syslog(get_class($this)."::check_codefournisseur code_fournisseur=".$this->code_fournisseur." module=".$module);
             $result = $mod->verif($this->db, $this->code_fournisseur, $this, 1);
             return $result;
         } else {
@@ -1777,10 +1777,10 @@ 
     {
         // phpcs:enable
         if ($this->id) {
-            $sql = "UPDATE " . MAIN_DB_PREFIX . "societe";
-            $sql .= " SET parent = " . ($id > 0 ? $id : "null");
-            $sql .= " WHERE rowid = " . $this->id;
-            dol_syslog(get_class($this) . '::set_parent', LOG_DEBUG);
+            $sql = "UPDATE ".MAIN_DB_PREFIX."societe";
+            $sql .= " SET parent = ".($id > 0 ? $id : "null");
+            $sql .= " WHERE rowid = ".$this->id;
+            dol_syslog(get_class($this).'::set_parent', LOG_DEBUG);
             $resql = $this->db->query($sql);
             if ($resql) {
                 $this->parent = $id;
@@ -1828,7 +1828,7 @@ 
             // on ajoute cette valeur à la somme totale
 
             for ($index = 0; $index < 9; $index++) {
-                $number = (int)$siren[$index];
+                $number = (int) $siren[$index];
                 if (($index % 2) != 0) {
                     if (($number *= 2) > 9)
                         $number -= 9;
@@ -1857,7 +1857,7 @@ 
             // on ajoute cette valeur à la somme totale
 
             for ($index = 0; $index < 14; $index++) {
-                $number = (int)$chaine[$index];
+                $number = (int) $chaine[$index];
                 if (($index % 2) == 0) {
                     if (($number *= 2) > 9)
                         $number -= 9;
@@ -1970,7 +1970,7 @@ 
 
         $hookmanager->initHooks(array('idprofurl'));
         $parameters = array('idprof' => $idprof, 'company' => $thirdparty);
-        $reshook = $hookmanager->executeHooks('getIdProfUrl', $parameters, $this, $action);    // Note that $action and $object may have been modified by some hooks
+        $reshook = $hookmanager->executeHooks('getIdProfUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
         if (empty($reshook)) {
             if (!empty($conf->global->MAIN_DISABLEPROFIDRULES)) {
                 return '';
@@ -1979,23 +1979,23 @@ 
             // TODO Move links to validate professional ID into a dictionary table "country" + "link"
             $strippedIdProf1 = str_replace(' ', '', $thirdparty->idprof1);
             if ($idprof == 1 && $thirdparty->country_code == 'FR') {
-                $url = 'http://www.societe.com/cgi-bin/search?champs=' . $strippedIdProf1;    // See also http://avis-situation-sirene.insee.fr/
+                $url = 'http://www.societe.com/cgi-bin/search?champs='.$strippedIdProf1; // See also http://avis-situation-sirene.insee.fr/
             }
             if ($idprof == 1 && ($thirdparty->country_code == 'GB' || $thirdparty->country_code == 'UK')) {
-                $url = 'https://beta.companieshouse.gov.uk/company/' . $strippedIdProf1;
+                $url = 'https://beta.companieshouse.gov.uk/company/'.$strippedIdProf1;
             }
             if ($idprof == 1 && $thirdparty->country_code == 'ES') {
-                $url = 'http://www.e-informa.es/servlet/app/portal/ENTP/screen/SProducto/prod/ETIQUETA_EMPRESA/nif/' . $strippedIdProf1;
+                $url = 'http://www.e-informa.es/servlet/app/portal/ENTP/screen/SProducto/prod/ETIQUETA_EMPRESA/nif/'.$strippedIdProf1;
             }
             if ($idprof == 1 && $thirdparty->country_code == 'IN') {
-                $url = 'http://www.tinxsys.com/TinxsysInternetWeb/dealerControllerServlet?tinNumber=' . $strippedIdProf1 . ';&searchBy=TIN&backPage=searchByTin_Inter.jsp';
+                $url = 'http://www.tinxsys.com/TinxsysInternetWeb/dealerControllerServlet?tinNumber='.$strippedIdProf1.';&searchBy=TIN&backPage=searchByTin_Inter.jsp';
             }
             if ($idprof == 1 && $thirdparty->country_code == 'PT') {
-                $url = 'http://www.nif.pt/' . $strippedIdProf1;
+                $url = 'http://www.nif.pt/'.$strippedIdProf1;
             }
 
             if ($url) {
-                return '<a target="_blank" href="' . $url . '">' . $langs->trans("Check") . '</a>';
+                return '<a target="_blank" href="'.$url.'">'.$langs->trans("Check").'</a>';
             }
         } else {
             return $hookmanager->resPrint;
@@ -2014,7 +2014,7 @@ 
     function has_projects()
     {
         // phpcs:enable
-        $sql = 'SELECT COUNT(*) as numproj FROM ' . MAIN_DB_PREFIX . 'projet WHERE fk_soc = ' . $this->id;
+        $sql = 'SELECT COUNT(*) as numproj FROM '.MAIN_DB_PREFIX.'projet WHERE fk_soc = '.$this->id;
         $resql = $this->db->query($sql);
         if ($resql) {
             $obj = $this->db->fetch_object($resql);
@@ -2039,8 +2039,8 @@ 
     {
         $sql = "SELECT s.rowid, s.nom as name, s.datec as date_creation, tms as date_modification,";
         $sql .= " fk_user_creat, fk_user_modif";
-        $sql .= " FROM " . MAIN_DB_PREFIX . "societe as s";
-        $sql .= " WHERE s.rowid = " . $id;
+        $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+        $sql .= " WHERE s.rowid = ".$id;
 
         $result = $this->db->query($sql);
         if ($result) {
@@ -2081,7 +2081,7 @@ 
      */
     function isInEEC()
     {
-        require_once DOL_DOCUMENT_ROOT . '/core/lib/company.lib.php';
+        require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
         return isInEEC($this);
     }
 
@@ -2097,8 +2097,8 @@ 
         // phpcs:enable
         $this->SupplierCategories = array();
         $sql = "SELECT rowid, label";
-        $sql .= " FROM " . MAIN_DB_PREFIX . "categorie";
-        $sql .= " WHERE type = " . Categorie::TYPE_SUPPLIER;
+        $sql .= " FROM ".MAIN_DB_PREFIX."categorie";
+        $sql .= " WHERE type = ".Categorie::TYPE_SUPPLIER;
 
         $resql = $this->db->query($sql);
         if ($resql) {
@@ -2123,8 +2123,8 @@ 
     {
         // phpcs:enable
         if ($categorie_id > 0 && $this->id > 0) {
-            $sql = "INSERT INTO " . MAIN_DB_PREFIX . "categorie_fournisseur (fk_categorie, fk_soc) ";
-            $sql .= " VALUES (" . $categorie_id . ", " . $this->id . ")";
+            $sql = "INSERT INTO ".MAIN_DB_PREFIX."categorie_fournisseur (fk_categorie, fk_soc) ";
+            $sql .= " VALUES (".$categorie_id.", ".$this->id.")";
 
             if ($resql = $this->db->query($sql))
                 return 0;
@@ -2150,7 +2150,7 @@ 
         // phpcs:enable
         global $user, $langs;
 
-        dol_syslog(get_class($this) . "::create_from_member", LOG_DEBUG);
+        dol_syslog(get_class($this)."::create_from_member", LOG_DEBUG);
 
         $name = $socname ? $socname : $member->societe;
         if (empty($name))
@@ -2159,7 +2159,7 @@ 
         $alias = $socalias ? $socalias : '';
 
         // Positionne parametres
-        $this->nom = $name;    // TODO deprecated
+        $this->nom = $name; // TODO deprecated
         $this->name = $name;
         $this->name_alias = $alias;
         $this->address = $member->address;
@@ -2167,13 +2167,13 @@ 
         $this->town = $member->town;
         $this->country_code = $member->country_code;
         $this->country_id = $member->country_id;
-        $this->phone = $member->phone;       // Prof phone
+        $this->phone = $member->phone; // Prof phone
         $this->email = $member->email;
         $this->skype = $member->skype;
         $this->twitter = $member->twitter;
         $this->facebook = $member->facebook;
 
-        $this->client = 1;    // A member is a customer by default
+        $this->client = 1; // A member is a customer by default
         $this->code_client = ($customercode ? $customercode : -1);
         $this->code_fournisseur = -1;
 
@@ -2182,9 +2182,9 @@ 
         // Cree et positionne $this->id
         $result = $this->create($user);
         if ($result >= 0) {
-            $sql = "UPDATE " . MAIN_DB_PREFIX . "adherent";
-            $sql .= " SET fk_soc=" . $this->id;
-            $sql .= " WHERE rowid=" . $member->id;
+            $sql = "UPDATE ".MAIN_DB_PREFIX."adherent";
+            $sql .= " SET fk_soc=".$this->id;
+            $sql .= " WHERE rowid=".$member->id;
 
             $resql = $this->db->query($sql);
             if ($resql) {
@@ -2198,7 +2198,7 @@ 
             }
         } else {
             // $this->error deja positionne
-            dol_syslog(get_class($this) . "::create_from_member - 2 - " . $this->error . " - " . join(',', $this->errors), LOG_ERR);
+            dol_syslog(get_class($this)."::create_from_member - 2 - ".$this->error." - ".join(',', $this->errors), LOG_ERR);
 
             $this->db->rollback();
             return $result;
@@ -2245,7 +2245,7 @@ 
             $this->fk_multicurrency = 0;
         }
 
-        dol_syslog(get_class($this) . "::create " . $this->name);
+        dol_syslog(get_class($this)."::create ".$this->name);
 
         $now = dol_now();
 
@@ -2268,24 +2268,24 @@ 
                 $this->entity = ((isset($this->entity) && is_numeric($this->entity)) ? $this->entity : $conf->entity);
             }
 
-            $sql = "INSERT INTO " . MAIN_DB_PREFIX . "societe (nom, name_alias, entity, datec, fk_user_creat, canvas, status, ref_int, ref_ext, fk_stcomm, fk_incoterms, location_incoterms ,import_key, fk_multicurrency, multicurrency_code)";
-            $sql .= " VALUES ('" . $this->db->escape($this->name) . "', '" . $this->db->escape($this->name_alias) . "', " . $this->db->escape($this->entity) . ", '" . $this->db->idate($now) . "'";
-            $sql .= ", " . (!empty($user->id) ? "'" . $user->id . "'" : "null");
-            $sql .= ", " . (!empty($this->canvas) ? "'" . $this->db->escape($this->canvas) . "'" : "null");
-            $sql .= ", " . $this->status;
-            $sql .= ", " . (!empty($this->ref_int) ? "'" . $this->db->escape($this->ref_int) . "'" : "null");
-            $sql .= ", " . (!empty($this->ref_ext) ? "'" . $this->db->escape($this->ref_ext) . "'" : "null");
+            $sql = "INSERT INTO ".MAIN_DB_PREFIX."societe (nom, name_alias, entity, datec, fk_user_creat, canvas, status, ref_int, ref_ext, fk_stcomm, fk_incoterms, location_incoterms ,import_key, fk_multicurrency, multicurrency_code)";
+            $sql .= " VALUES ('".$this->db->escape($this->name)."', '".$this->db->escape($this->name_alias)."', ".$this->db->escape($this->entity).", '".$this->db->idate($now)."'";
+            $sql .= ", ".(!empty($user->id) ? "'".$user->id."'" : "null");
+            $sql .= ", ".(!empty($this->canvas) ? "'".$this->db->escape($this->canvas)."'" : "null");
+            $sql .= ", ".$this->status;
+            $sql .= ", ".(!empty($this->ref_int) ? "'".$this->db->escape($this->ref_int)."'" : "null");
+            $sql .= ", ".(!empty($this->ref_ext) ? "'".$this->db->escape($this->ref_ext)."'" : "null");
             $sql .= ", 0";
-            $sql .= ", " . (int)$this->fk_incoterms;
-            $sql .= ", '" . $this->db->escape($this->location_incoterms) . "'";
-            $sql .= ", " . (!empty($this->import_key) ? "'" . $this->db->escape($this->import_key) . "'" : "null");
-            $sql .= ", " . (int)$this->fk_multicurrency;
-            $sql .= ", '" . $this->db->escape($this->multicurrency_code) . "')";
+            $sql .= ", ".(int) $this->fk_incoterms;
+            $sql .= ", '".$this->db->escape($this->location_incoterms)."'";
+            $sql .= ", ".(!empty($this->import_key) ? "'".$this->db->escape($this->import_key)."'" : "null");
+            $sql .= ", ".(int) $this->fk_multicurrency;
+            $sql .= ", '".$this->db->escape($this->multicurrency_code)."')";
 
-            dol_syslog(get_class($this) . "::create", LOG_DEBUG);
+            dol_syslog(get_class($this)."::create", LOG_DEBUG);
             $result = $this->db->query($sql);
             if ($result) {
-                $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . "societe");
+                $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."societe");
 
                 $ret = $this->update($this->id, $user, 0, 1, 1, 'add');
 
@@ -2307,17 +2307,17 @@ 
                     $error++;
 
                 if (!$error) {
-                    dol_syslog(get_class($this) . "::Create success id=" . $this->id);
+                    dol_syslog(get_class($this)."::Create success id=".$this->id);
                     $this->db->commit();
                     return $this->id;
                 } else {
-                    dol_syslog(get_class($this) . "::Create echec update " . $this->error . " " . join(',', $this->errors), LOG_ERR);
+                    dol_syslog(get_class($this)."::Create echec update ".$this->error." ".join(',', $this->errors), LOG_ERR);
                     $this->db->rollback();
                     return -4;
                 }
             } else {
                 if ($this->db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
-                    $this->error = $langs->trans("ErrorCompanyNameAlreadyExists", $this->name);    // duplicate on a field (code or profid or ...)
+                    $this->error = $langs->trans("ErrorCompanyNameAlreadyExists", $this->name); // duplicate on a field (code or profid or ...)
                     $result = -1;
                 } else {
                     $this->error = $this->db->lasterror();
@@ -2328,7 +2328,7 @@ 
             }
         } else {
             $this->db->rollback();
-            dol_syslog(get_class($this) . "::Create fails verify " . join(',', $this->errors), LOG_WARNING);
+            dol_syslog(get_class($this)."::Create fails verify ".join(',', $this->errors), LOG_WARNING);
             return -3;
         }
     }
@@ -2352,7 +2352,7 @@ 
 
             $dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
             foreach ($dirsociete as $dirroot) {
-                $res = dol_include_once($dirroot . $module . '.php');
+                $res = dol_include_once($dirroot.$module.'.php');
                 if ($res)
                     break;
             }
@@ -2361,7 +2361,7 @@ 
             $this->code_client = $mod->getNextValue($objsoc, $type);
             $this->prefixCustomerIsRequired = $mod->prefixIsRequired;
 
-            dol_syslog(get_class($this) . "::get_codeclient code_client=" . $this->code_client . " module=" . $module);
+            dol_syslog(get_class($this)."::get_codeclient code_client=".$this->code_client." module=".$module);
         }
     }
 
@@ -2384,7 +2384,7 @@ 
 
             $dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
             foreach ($dirsociete as $dirroot) {
-                $res = dol_include_once($dirroot . $module . '.php');
+                $res = dol_include_once($dirroot.$module.'.php');
                 if ($res)
                     break;
             }
@@ -2392,7 +2392,7 @@ 
 
             $this->code_fournisseur = $mod->getNextValue($objsoc, $type);
 
-            dol_syslog(get_class($this) . "::get_codefournisseur code_fournisseur=" . $this->code_fournisseur . " module=" . $module);
+            dol_syslog(get_class($this)."::get_codefournisseur code_fournisseur=".$this->code_fournisseur." module=".$module);
         }
     }
 
@@ -2456,7 +2456,7 @@ 
         $array_to_check = array('IDPROF1', 'IDPROF2', 'IDPROF3', 'IDPROF4', 'IDPROF5', 'IDPROF6', 'EMAIL');
         foreach ($array_to_check as $key) {
             $keymin = strtolower($key);
-            $i = (int)preg_replace('/[^0-9]/', '', $key);
+            $i = (int) preg_replace('/[^0-9]/', '', $key);
             $vallabel = $this->$keymin;
 
             if ($i > 0) {
@@ -2466,17 +2466,17 @@ 
                         if ($this->id_prof_exists($keymin, $vallabel, ($this->id > 0 ? $this->id : 0))) {
                             $langs->load("errors");
                             $error++;
-                            $this->errors[] = $langs->transcountry('ProfId' . $i, $this->country_code) . " " . $langs->trans("ErrorProdIdAlreadyExist", $vallabel) . ' (' . $langs->trans("ForbiddenBySetupRules") . ')';
+                            $this->errors[] = $langs->transcountry('ProfId'.$i, $this->country_code)." ".$langs->trans("ErrorProdIdAlreadyExist", $vallabel).' ('.$langs->trans("ForbiddenBySetupRules").')';
                         }
                     }
 
                     // Check for mandatory prof id (but only if country is other than ours)
                     if ($mysoc->country_id > 0 && $this->country_id == $mysoc->country_id) {
-                        $idprof_mandatory = 'SOCIETE_' . $key . '_MANDATORY';
+                        $idprof_mandatory = 'SOCIETE_'.$key.'_MANDATORY';
                         if (!$vallabel && !empty($conf->global->$idprof_mandatory)) {
                             $langs->load("errors");
                             $error++;
-                            $this->errors[] = $langs->trans("ErrorProdIdIsMandatory", $langs->transcountry('ProfId' . $i, $this->country_code)) . ' (' . $langs->trans("ForbiddenBySetupRules") . ')';
+                            $this->errors[] = $langs->trans("ErrorProdIdIsMandatory", $langs->transcountry('ProfId'.$i, $this->country_code)).' ('.$langs->trans("ForbiddenBySetupRules").')';
                         }
                     }
                 }
@@ -2489,7 +2489,7 @@ 
                         if ($this->id_prof_exists($keymin, $vallabel, ($this->id > 0 ? $this->id : 0))) {
                             $langs->load("errors");
                             $error++;
-                            $this->errors[] = $langs->trans('Email') . " " . $langs->trans("ErrorProdIdAlreadyExist", $vallabel) . ' (' . $langs->trans("ForbiddenBySetupRules") . ')';
+                            $this->errors[] = $langs->trans('Email')." ".$langs->trans("ErrorProdIdAlreadyExist", $vallabel).' ('.$langs->trans("ForbiddenBySetupRules").')';
                         }
                     }
 
@@ -2497,7 +2497,7 @@ 
                     if (!empty($conf->global->SOCIETE_EMAIL_MANDATORY) && !isValidEMail($this->email)) {
                         $langs->load("errors");
                         $error++;
-                        $this->errors[] = $langs->trans("ErrorBadEMail", $this->email) . ' (' . $langs->trans("ForbiddenBySetupRules") . ')';
+                        $this->errors[] = $langs->trans("ErrorBadEMail", $this->email).' ('.$langs->trans("ForbiddenBySetupRules").')';
                     }
                 }
             }
@@ -2611,9 +2611,9 @@ 
         }
 
         //Verify duplicate entries
-        $sql = "SELECT COUNT(*) as idprof FROM " . MAIN_DB_PREFIX . "societe WHERE " . $field . " = '" . $value . "' AND entity IN (" . getEntity('societe') . ")";
+        $sql = "SELECT COUNT(*) as idprof FROM ".MAIN_DB_PREFIX."societe WHERE ".$field." = '".$value."' AND entity IN (".getEntity('societe').")";
         if ($socid)
-            $sql .= " AND rowid <> " . $socid;
+            $sql .= " AND rowid <> ".$socid;
         $resql = $this->db->query($sql);
         if ($resql) {
             $obj = $this->db->fetch_object($resql);
@@ -2646,14 +2646,14 @@ 
     {
         global $langs, $conf, $hookmanager;
 
-        require_once DOL_DOCUMENT_ROOT . '/core/lib/functions2.lib.php';
+        require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
         if (empty($id))
             $id = $this->id;
 
         $error = 0;
 
-        dol_syslog(get_class($this) . "::Update id=" . $id . " call_trigger=" . $call_trigger . " allowmodcodeclient=" . $allowmodcodeclient . " allowmodcodefournisseur=" . $allowmodcodefournisseur);
+        dol_syslog(get_class($this)."::Update id=".$id." call_trigger=".$call_trigger." allowmodcodeclient=".$allowmodcodeclient." allowmodcodefournisseur=".$allowmodcodefournisseur);
 
         $now = dol_now();
 
@@ -2715,7 +2715,7 @@ 
         if ($this->capital != '')
             $this->capital = price2num(trim($this->capital));
         if (!is_numeric($this->capital))
-            $this->capital = '';     // '' = undef
+            $this->capital = ''; // '' = undef
 
         $this->effectif_id = trim($this->effectif_id);
         $this->forme_juridique_code = trim($this->forme_juridique_code);
@@ -2768,7 +2768,7 @@ 
         $this->webservices_key = trim($this->webservices_key);
 
         //Incoterms
-        $this->fk_incoterms = (int)$this->fk_incoterms;
+        $this->fk_incoterms = (int) $this->fk_incoterms;
         $this->location_incoterms = trim($this->location_incoterms);
 
         $this->db->begin();
@@ -2799,51 +2799,51 @@ 
         }
 
         if ($result >= 0) {
-            dol_syslog(get_class($this) . "::update verify ok or not done");
+            dol_syslog(get_class($this)."::update verify ok or not done");
 
-            $sql = "UPDATE " . MAIN_DB_PREFIX . "societe SET ";
-            $sql .= "entity = " . $this->db->escape($this->entity);
-            $sql .= ",nom = '" . $this->db->escape($this->name) . "'"; // Required
-            $sql .= ",name_alias = '" . $this->db->escape($this->name_alias) . "'";
-            $sql .= ",ref_ext = " . (!empty($this->ref_ext) ? "'" . $this->db->escape($this->ref_ext) . "'" : "null");
-            $sql .= ",address = '" . $this->db->escape($this->address) . "'";
+            $sql = "UPDATE ".MAIN_DB_PREFIX."societe SET ";
+            $sql .= "entity = ".$this->db->escape($this->entity);
+            $sql .= ",nom = '".$this->db->escape($this->name)."'"; // Required
+            $sql .= ",name_alias = '".$this->db->escape($this->name_alias)."'";
+            $sql .= ",ref_ext = ".(!empty($this->ref_ext) ? "'".$this->db->escape($this->ref_ext)."'" : "null");
+            $sql .= ",address = '".$this->db->escape($this->address)."'";
 
-            $sql .= ",zip = " . (!empty($this->zip) ? "'" . $this->db->escape($this->zip) . "'" : "null");
-            $sql .= ",town = " . (!empty($this->town) ? "'" . $this->db->escape($this->town) . "'" : "null");
+            $sql .= ",zip = ".(!empty($this->zip) ? "'".$this->db->escape($this->zip)."'" : "null");
+            $sql .= ",town = ".(!empty($this->town) ? "'".$this->db->escape($this->town)."'" : "null");
 
-            $sql .= ",fk_departement = '" . (!empty($this->state_id) ? $this->state_id : '0') . "'";
-            $sql .= ",fk_pays = '" . (!empty($this->country_id) ? $this->country_id : '0') . "'";
+            $sql .= ",fk_departement = '".(!empty($this->state_id) ? $this->state_id : '0')."'";
+            $sql .= ",fk_pays = '".(!empty($this->country_id) ? $this->country_id : '0')."'";
 
-            $sql .= ",phone = " . (!empty($this->phone) ? "'" . $this->db->escape($this->phone) . "'" : "null");
-            $sql .= ",fax = " . (!empty($this->fax) ? "'" . $this->db->escape($this->fax) . "'" : "null");
-            $sql .= ",email = " . (!empty($this->email) ? "'" . $this->db->escape($this->email) . "'" : "null");
-            $sql .= ",skype = " . (!empty($this->skype) ? "'" . $this->db->escape($this->skype) . "'" : "null");
-            $sql .= ",twitter = " . (!empty($this->twitter) ? "'" . $this->db->escape($this->twitter) . "'" : "null");
-            $sql .= ",facebook = " . (!empty($this->facebook) ? "'" . $this->db->escape($this->facebook) . "'" : "null");
-            $sql .= ",url = " . (!empty($this->url) ? "'" . $this->db->escape($this->url) . "'" : "null");
+            $sql .= ",phone = ".(!empty($this->phone) ? "'".$this->db->escape($this->phone)."'" : "null");
+            $sql .= ",fax = ".(!empty($this->fax) ? "'".$this->db->escape($this->fax)."'" : "null");
+            $sql .= ",email = ".(!empty($this->email) ? "'".$this->db->escape($this->email)."'" : "null");
+            $sql .= ",skype = ".(!empty($this->skype) ? "'".$this->db->escape($this->skype)."'" : "null");
+            $sql .= ",twitter = ".(!empty($this->twitter) ? "'".$this->db->escape($this->twitter)."'" : "null");
+            $sql .= ",facebook = ".(!empty($this->facebook) ? "'".$this->db->escape($this->facebook)."'" : "null");
+            $sql .= ",url = ".(!empty($this->url) ? "'".$this->db->escape($this->url)."'" : "null");
 
-            $sql .= ",parent = " . ($this->parent > 0 ? $this->parent : "null");
+            $sql .= ",parent = ".($this->parent > 0 ? $this->parent : "null");
 
-            $sql .= ",note_private = " . (!empty($this->note_private) ? "'" . $this->db->escape($this->note_private) . "'" : "null");
-            $sql .= ",note_public = " . (!empty($this->note_public) ? "'" . $this->db->escape($this->note_public) . "'" : "null");
+            $sql .= ",note_private = ".(!empty($this->note_private) ? "'".$this->db->escape($this->note_private)."'" : "null");
+            $sql .= ",note_public = ".(!empty($this->note_public) ? "'".$this->db->escape($this->note_public)."'" : "null");
 
-            $sql .= ",siren   = '" . $this->db->escape($this->idprof1) . "'";
-            $sql .= ",siret   = '" . $this->db->escape($this->idprof2) . "'";
-            $sql .= ",ape     = '" . $this->db->escape($this->idprof3) . "'";
-            $sql .= ",idprof4 = '" . $this->db->escape($this->idprof4) . "'";
-            $sql .= ",idprof5 = '" . $this->db->escape($this->idprof5) . "'";
-            $sql .= ",idprof6 = '" . $this->db->escape($this->idprof6) . "'";
+            $sql .= ",siren   = '".$this->db->escape($this->idprof1)."'";
+            $sql .= ",siret   = '".$this->db->escape($this->idprof2)."'";
+            $sql .= ",ape     = '".$this->db->escape($this->idprof3)."'";
+            $sql .= ",idprof4 = '".$this->db->escape($this->idprof4)."'";
+            $sql .= ",idprof5 = '".$this->db->escape($this->idprof5)."'";
+            $sql .= ",idprof6 = '".$this->db->escape($this->idprof6)."'";
 
-            $sql .= ",tva_assuj = " . ($this->tva_assuj != '' ? "'" . $this->db->escape($this->tva_assuj) . "'" : "null");
-            $sql .= ",tva_intra = '" . $this->db->escape($this->tva_intra) . "'";
-            $sql .= ",status = " . $this->status;
+            $sql .= ",tva_assuj = ".($this->tva_assuj != '' ? "'".$this->db->escape($this->tva_assuj)."'" : "null");
+            $sql .= ",tva_intra = '".$this->db->escape($this->tva_intra)."'";
+            $sql .= ",status = ".$this->status;
 
             // Local taxes
-            $sql .= ",localtax1_assuj = " . ($this->localtax1_assuj != '' ? "'" . $this->db->escape($this->localtax1_assuj) . "'" : "null");
-            $sql .= ",localtax2_assuj = " . ($this->localtax2_assuj != '' ? "'" . $this->db->escape($this->localtax2_assuj) . "'" : "null");
+            $sql .= ",localtax1_assuj = ".($this->localtax1_assuj != '' ? "'".$this->db->escape($this->localtax1_assuj)."'" : "null");
+            $sql .= ",localtax2_assuj = ".($this->localtax2_assuj != '' ? "'".$this->db->escape($this->localtax2_assuj)."'" : "null");
             if ($this->localtax1_assuj == 1) {
                 if ($this->localtax1_value != '') {
-                    $sql .= ",localtax1_value =" . $this->localtax1_value;
+                    $sql .= ",localtax1_value =".$this->localtax1_value;
                 } else
                     $sql .= ",localtax1_value =0.000";
             } else
@@ -2851,60 +2851,60 @@ 
 
             if ($this->localtax2_assuj == 1) {
                 if ($this->localtax2_value != '') {
-                    $sql .= ",localtax2_value =" . $this->localtax2_value;
+                    $sql .= ",localtax2_value =".$this->localtax2_value;
                 } else
                     $sql .= ",localtax2_value =0.000";
             } else
                 $sql .= ",localtax2_value =0.000";
 
-            $sql .= ",capital = " . ($this->capital == '' ? "null" : $this->capital);
+            $sql .= ",capital = ".($this->capital == '' ? "null" : $this->capital);
 
-            $sql .= ",prefix_comm = " . (!empty($this->prefix_comm) ? "'" . $this->db->escape($this->prefix_comm) . "'" : "null");
+            $sql .= ",prefix_comm = ".(!empty($this->prefix_comm) ? "'".$this->db->escape($this->prefix_comm)."'" : "null");
 
-            $sql .= ",fk_effectif = " . (!empty($this->effectif_id) ? "'" . $this->db->escape($this->effectif_id) . "'" : "null");
+            $sql .= ",fk_effectif = ".(!empty($this->effectif_id) ? "'".$this->db->escape($this->effectif_id)."'" : "null");
             if (isset($this->stcomm_id)) {
-                $sql .= ",fk_stcomm=" . (!empty($this->stcomm_id) ? $this->stcomm_id : "0");
+                $sql .= ",fk_stcomm=".(!empty($this->stcomm_id) ? $this->stcomm_id : "0");
             }
-            $sql .= ",fk_typent = " . (!empty($this->typent_id) ? "'" . $this->db->escape($this->typent_id) . "'" : "0");
+            $sql .= ",fk_typent = ".(!empty($this->typent_id) ? "'".$this->db->escape($this->typent_id)."'" : "0");
 
-            $sql .= ",fk_forme_juridique = " . (!empty($this->forme_juridique_code) ? "'" . $this->db->escape($this->forme_juridique_code) . "'" : "null");
+            $sql .= ",fk_forme_juridique = ".(!empty($this->forme_juridique_code) ? "'".$this->db->escape($this->forme_juridique_code)."'" : "null");
 
-            $sql .= ",mode_reglement = " . (!empty($this->mode_reglement_id) ? "'" . $this->db->escape($this->mode_reglement_id) . "'" : "null");
-            $sql .= ",cond_reglement = " . (!empty($this->cond_reglement_id) ? "'" . $this->db->escape($this->cond_reglement_id) . "'" : "null");
-            $sql .= ",mode_reglement_supplier = " . (!empty($this->mode_reglement_supplier_id) ? "'" . $this->db->escape($this->mode_reglement_supplier_id) . "'" : "null");
-            $sql .= ",cond_reglement_supplier = " . (!empty($this->cond_reglement_supplier_id) ? "'" . $this->db->escape($this->cond_reglement_supplier_id) . "'" : "null");
-            $sql .= ",fk_shipping_method = " . (!empty($this->shipping_method_id) ? "'" . $this->db->escape($this->shipping_method_id) . "'" : "null");
+            $sql .= ",mode_reglement = ".(!empty($this->mode_reglement_id) ? "'".$this->db->escape($this->mode_reglement_id)."'" : "null");
+            $sql .= ",cond_reglement = ".(!empty($this->cond_reglement_id) ? "'".$this->db->escape($this->cond_reglement_id)."'" : "null");
+            $sql .= ",mode_reglement_supplier = ".(!empty($this->mode_reglement_supplier_id) ? "'".$this->db->escape($this->mode_reglement_supplier_id)."'" : "null");
+            $sql .= ",cond_reglement_supplier = ".(!empty($this->cond_reglement_supplier_id) ? "'".$this->db->escape($this->cond_reglement_supplier_id)."'" : "null");
+            $sql .= ",fk_shipping_method = ".(!empty($this->shipping_method_id) ? "'".$this->db->escape($this->shipping_method_id)."'" : "null");
 
-            $sql .= ",client = " . (!empty($this->client) ? $this->client : 0);
-            $sql .= ",fournisseur = " . (!empty($this->fournisseur) ? $this->fournisseur : 0);
-            $sql .= ",barcode = " . (!empty($this->barcode) ? "'" . $this->db->escape($this->barcode) . "'" : "null");
-            $sql .= ",default_lang = " . (!empty($this->default_lang) ? "'" . $this->db->escape($this->default_lang) . "'" : "null");
-            $sql .= ",logo = " . (!empty($this->logo) ? "'" . $this->db->escape($this->logo) . "'" : "null");
-            $sql .= ",outstanding_limit= " . ($this->outstanding_limit != '' ? $this->outstanding_limit : 'null');
-            $sql .= ",order_min_amount= " . ($this->order_min_amount != '' ? $this->order_min_amount : 'null');
-            $sql .= ",supplier_order_min_amount= " . ($this->supplier_order_min_amount != '' ? $this->supplier_order_min_amount : 'null');
-            $sql .= ",fk_prospectlevel='" . $this->db->escape($this->fk_prospectlevel) . "'";
+            $sql .= ",client = ".(!empty($this->client) ? $this->client : 0);
+            $sql .= ",fournisseur = ".(!empty($this->fournisseur) ? $this->fournisseur : 0);
+            $sql .= ",barcode = ".(!empty($this->barcode) ? "'".$this->db->escape($this->barcode)."'" : "null");
+            $sql .= ",default_lang = ".(!empty($this->default_lang) ? "'".$this->db->escape($this->default_lang)."'" : "null");
+            $sql .= ",logo = ".(!empty($this->logo) ? "'".$this->db->escape($this->logo)."'" : "null");
+            $sql .= ",outstanding_limit= ".($this->outstanding_limit != '' ? $this->outstanding_limit : 'null');
+            $sql .= ",order_min_amount= ".($this->order_min_amount != '' ? $this->order_min_amount : 'null');
+            $sql .= ",supplier_order_min_amount= ".($this->supplier_order_min_amount != '' ? $this->supplier_order_min_amount : 'null');
+            $sql .= ",fk_prospectlevel='".$this->db->escape($this->fk_prospectlevel)."'";
 
-            $sql .= ",webservices_url = " . (!empty($this->webservices_url) ? "'" . $this->db->escape($this->webservices_url) . "'" : "null");
-            $sql .= ",webservices_key = " . (!empty($this->webservices_key) ? "'" . $this->db->escape($this->webservices_key) . "'" : "null");
+            $sql .= ",webservices_url = ".(!empty($this->webservices_url) ? "'".$this->db->escape($this->webservices_url)."'" : "null");
+            $sql .= ",webservices_key = ".(!empty($this->webservices_key) ? "'".$this->db->escape($this->webservices_key)."'" : "null");
 
             //Incoterms
-            $sql .= ", fk_incoterms = " . $this->fk_incoterms;
-            $sql .= ", location_incoterms = " . (!empty($this->location_incoterms) ? "'" . $this->db->escape($this->location_incoterms) . "'" : "null");
+            $sql .= ", fk_incoterms = ".$this->fk_incoterms;
+            $sql .= ", location_incoterms = ".(!empty($this->location_incoterms) ? "'".$this->db->escape($this->location_incoterms)."'" : "null");
 
             if ($customer) {
-                $sql .= ", code_client = " . (!empty($this->code_client) ? "'" . $this->db->escape($this->code_client) . "'" : "null");
-                $sql .= ", code_compta = " . (!empty($this->code_compta) ? "'" . $this->db->escape($this->code_compta) . "'" : "null");
+                $sql .= ", code_client = ".(!empty($this->code_client) ? "'".$this->db->escape($this->code_client)."'" : "null");
+                $sql .= ", code_compta = ".(!empty($this->code_compta) ? "'".$this->db->escape($this->code_compta)."'" : "null");
             }
 
             if ($supplier) {
-                $sql .= ", code_fournisseur = " . (!empty($this->code_fournisseur) ? "'" . $this->db->escape($this->code_fournisseur) . "'" : "null");
-                $sql .= ", code_compta_fournisseur = " . (!empty($this->code_compta_fournisseur) ? "'" . $this->db->escape($this->code_compta_fournisseur) . "'" : "null");
+                $sql .= ", code_fournisseur = ".(!empty($this->code_fournisseur) ? "'".$this->db->escape($this->code_fournisseur)."'" : "null");
+                $sql .= ", code_compta_fournisseur = ".(!empty($this->code_compta_fournisseur) ? "'".$this->db->escape($this->code_compta_fournisseur)."'" : "null");
             }
-            $sql .= ", fk_user_modif = " . ($user->id > 0 ? $user->id : "null");
-            $sql .= ", fk_multicurrency = " . (int)$this->fk_multicurrency;
-            $sql .= ", multicurrency_code = '" . $this->db->escape($this->multicurrency_code) . "'";
-            $sql .= " WHERE rowid = " . (int)$id;
+            $sql .= ", fk_user_modif = ".($user->id > 0 ? $user->id : "null");
+            $sql .= ", fk_multicurrency = ".(int) $this->fk_multicurrency;
+            $sql .= ", multicurrency_code = '".$this->db->escape($this->multicurrency_code)."'";
+            $sql .= " WHERE rowid = ".(int) $id;
 
             $resql = $this->db->query($sql);
             if ($resql) {
@@ -2929,9 +2929,9 @@ 
                 if (!$error && $nbrowsaffected) {
                     // Update information on linked member if it is an update
                     if (!$nosyncmember && !empty($conf->adherent->enabled)) {
-                        require_once DOL_DOCUMENT_ROOT . '/adherents/class/adherent.class.php';
+                        require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 
-                        dol_syslog(get_class($this) . "::update update linked member");
+                        dol_syslog(get_class($this)."::update update linked member");
 
                         $lmember = new Adherent($this->db);
                         $result = $lmember->fetch(0, 0, $this->id);
@@ -2950,7 +2950,7 @@ 
                             $result = $lmember->update($user, 0, 1, 1, 1); // Use nosync to 1 to avoid cyclic updates
                             if ($result < 0) {
                                 $this->error = $lmember->error;
-                                dol_syslog(get_class($this) . "::update " . $this->error, LOG_ERR);
+                                dol_syslog(get_class($this)."::update ".$this->error, LOG_ERR);
                                 $error++;
                             }
                         } elseif ($result < 0) {
@@ -2979,7 +2979,7 @@ 
                 }
 
                 if (!$error) {
-                    dol_syslog(get_class($this) . "::Update success");
+                    dol_syslog(get_class($this)."::Update success");
                     $this->db->commit();
                     return 1;
                 } else {
@@ -3000,7 +3000,7 @@ 
             }
         } else {
             $this->db->rollback();
-            dol_syslog(get_class($this) . "::Update fails verify " . join(',', $this->errors), LOG_WARNING);
+            dol_syslog(get_class($this)."::Update fails verify ".join(',', $this->errors), LOG_WARNING);
             return -3;
         }
     }
@@ -3024,7 +3024,7 @@ 
             $res = false;
             $dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
             foreach ($dirsociete as $dirroot) {
-                $res = dol_include_once($dirroot . $conf->global->SOCIETE_CODECOMPTA_ADDON . '.php');
+                $res = dol_include_once($dirroot.$conf->global->SOCIETE_CODECOMPTA_ADDON.'.php');
                 if ($res)
                     break;
             }
@@ -3072,17 +3072,17 @@ 
 
 
         if ($this->id > 0 && $commid > 0) {
-            $sql = "DELETE FROM  " . MAIN_DB_PREFIX . "societe_commerciaux";
-            $sql .= " WHERE fk_soc = " . $this->id . " AND fk_user =" . $commid;
+            $sql = "DELETE FROM  ".MAIN_DB_PREFIX."societe_commerciaux";
+            $sql .= " WHERE fk_soc = ".$this->id." AND fk_user =".$commid;
 
             $this->db->query($sql);
 
-            $sql = "INSERT INTO " . MAIN_DB_PREFIX . "societe_commerciaux";
+            $sql = "INSERT INTO ".MAIN_DB_PREFIX."societe_commerciaux";
             $sql .= " ( fk_soc, fk_user )";
-            $sql .= " VALUES (" . $this->id . "," . $commid . ")";
+            $sql .= " VALUES (".$this->id.",".$commid.")";
 
             if (!$this->db->query($sql)) {
-                dol_syslog(get_class($this) . "::add_commercial Erreur");
+                dol_syslog(get_class($this)."::add_commercial Erreur");
             } else {
                 $this->context = array('commercial_modified' => $commid);
 
@@ -3116,7 +3116,7 @@ 
 
         $this->note_private = empty($conf->global->MAIN_INFO_SOCIETE_NOTE) ? '' : $conf->global->MAIN_INFO_SOCIETE_NOTE;
 
-        $this->nom = $this->name;          // deprecated
+        $this->nom = $this->name; // deprecated
         // We define country_id, country_code and country
         $country_id = $country_code = $country_label = '';
         if (!empty($conf->global->MAIN_INFO_SOCIETE_COUNTRY)) {
@@ -3127,16 +3127,16 @@ 
                 $country_label = $tmp[2];
             } else {                    // For backward compatibility
                 dol_syslog("Your country setup use an old syntax. Reedit it using setup area.", LOG_ERR);
-                include_once DOL_DOCUMENT_ROOT . '/core/lib/company.lib.php';
-                $country_code = getCountry($country_id, 2, $this->db);  // This need a SQL request, but it's the old feature that should not be used anymore
-                $country_label = getCountry($country_id, 0, $this->db);  // This need a SQL request, but it's the old feature that should not be used anymore
+                include_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+                $country_code = getCountry($country_id, 2, $this->db); // This need a SQL request, but it's the old feature that should not be used anymore
+                $country_label = getCountry($country_id, 0, $this->db); // This need a SQL request, but it's the old feature that should not be used anymore
             }
         }
         $this->country_id = $country_id;
         $this->country_code = $country_code;
         $this->country = $country_label;
         if (is_object($langs))
-            $this->country = ($langs->trans('Country' . $country_code) != 'Country' . $country_code) ? $langs->trans('Country' . $country_code) : $country_label;
+            $this->country = ($langs->trans('Country'.$country_code) != 'Country'.$country_code) ? $langs->trans('Country'.$country_code) : $country_label;
 
         $this->phone = empty($conf->global->MAIN_INFO_SOCIETE_TEL) ? '' : $conf->global->MAIN_INFO_SOCIETE_TEL;
         $this->fax = empty($conf->global->MAIN_INFO_SOCIETE_FAX) ? '' : $conf->global->MAIN_INFO_SOCIETE_FAX;
@@ -3178,8 +3178,8 @@ 
 
         // Initialize parameters
         $this->id = 0;
-        $this->name = 'THIRDPARTY SPECIMEN ' . dol_print_date($now, 'dayhourlog');
-        $this->nom = $this->name;   // For backward compatibility
+        $this->name = 'THIRDPARTY SPECIMEN '.dol_print_date($now, 'dayhourlog');
+        $this->nom = $this->name; // For backward compatibility
         $this->ref_ext = 'Ref ext';
         $this->specimen = 1;
         $this->address = '21 jump street';
@@ -3199,8 +3199,8 @@ 
         $this->phone = '0909090901';
         $this->fax = '0909090909';
 
-        $this->code_client = 'CC-' . dol_print_date($now, 'dayhourlog');
-        $this->code_fournisseur = 'SC-' . dol_print_date($now, 'dayhourlog');
+        $this->code_client = 'CC-'.dol_print_date($now, 'dayhourlog');
+        $this->code_fournisseur = 'SC-'.dol_print_date($now, 'dayhourlog');
         $this->capital = 10000;
         $this->client = 1;
         $this->prospect = 1;
@@ -3227,8 +3227,8 @@ 
     function useLocalTax($localTaxNum = 0)
     {
         $sql = "SELECT t.localtax1, t.localtax2";
-        $sql .= " FROM " . MAIN_DB_PREFIX . "c_tva as t, " . MAIN_DB_PREFIX . "c_country as c";
-        $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '" . $this->db->escape($this->country_code) . "'";
+        $sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
+        $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$this->db->escape($this->country_code)."'";
         $sql .= " AND t.active = 1";
         if (empty($localTaxNum))
             $sql .= " AND (t.localtax1_type <> '0' OR t.localtax2_type <> '0')";
@@ -3253,8 +3253,8 @@ 
     function useNPR()
     {
         $sql = "SELECT t.rowid";
-        $sql .= " FROM " . MAIN_DB_PREFIX . "c_tva as t, " . MAIN_DB_PREFIX . "c_country as c";
-        $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '" . $this->db->escape($this->country_code) . "'";
+        $sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
+        $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$this->db->escape($this->country_code)."'";
         $sql .= " AND t.active = 1 AND t.recuperableonly = 1";
 
         dol_syslog("useNPR", LOG_DEBUG);
@@ -3273,8 +3273,8 @@ 
     function useRevenueStamp()
     {
         $sql = "SELECT COUNT(*) as nb";
-        $sql .= " FROM " . MAIN_DB_PREFIX . "c_revenuestamp as r, " . MAIN_DB_PREFIX . "c_country as c";
-        $sql .= " WHERE r.fk_pays = c.rowid AND c.code = '" . $this->db->escape($this->country_code) . "'";
+        $sql .= " FROM ".MAIN_DB_PREFIX."c_revenuestamp as r, ".MAIN_DB_PREFIX."c_country as c";
+        $sql .= " WHERE r.fk_pays = c.rowid AND c.code = '".$this->db->escape($this->country_code)."'";
         $sql .= " AND r.active = 1";
 
         dol_syslog("useRevenueStamp", LOG_DEBUG);
@@ -3309,9 +3309,9 @@ 
         // phpcs:enable
         global $langs;
 
-        $lib = $langs->trans("ProspectLevel" . $fk_prospectlevel);
+        $lib = $langs->trans("ProspectLevel".$fk_prospectlevel);
         // If lib not found in language file, we get label from cache/databse
-        if ($lib == $langs->trans("ProspectLevel" . $fk_prospectlevel)) {
+        if ($lib == $langs->trans("ProspectLevel".$fk_prospectlevel)) {
             $lib = $langs->getLabelFromKey($this->db, $fk_prospectlevel, 'c_prospectlevel', 'code', 'label');
         }
         return $lib;
@@ -3362,17 +3362,17 @@ 
 
         if ($mode == 2) {
             if ($statut == '-1' || $statut == 'ST_NO')
-                return img_action($langs->trans("StatusProspect-1"), -1) . ' ' . $langs->trans("StatusProspect-1");
+                return img_action($langs->trans("StatusProspect-1"), -1).' '.$langs->trans("StatusProspect-1");
             elseif ($statut == '0' || $statut == 'ST_NEVER')
-                return img_action($langs->trans("StatusProspect0"), 0) . ' ' . $langs->trans("StatusProspect0");
+                return img_action($langs->trans("StatusProspect0"), 0).' '.$langs->trans("StatusProspect0");
             elseif ($statut == '1' || $statut == 'ST_TODO')
-                return img_action($langs->trans("StatusProspect1"), 1) . ' ' . $langs->trans("StatusProspect1");
+                return img_action($langs->trans("StatusProspect1"), 1).' '.$langs->trans("StatusProspect1");
             elseif ($statut == '2' || $statut == 'ST_PEND')
-                return img_action($langs->trans("StatusProspect2"), 2) . ' ' . $langs->trans("StatusProspect2");
+                return img_action($langs->trans("StatusProspect2"), 2).' '.$langs->trans("StatusProspect2");
             elseif ($statut == '3' || $statut == 'ST_DONE')
-                return img_action($langs->trans("StatusProspect3"), 3) . ' ' . $langs->trans("StatusProspect3");
+                return img_action($langs->trans("StatusProspect3"), 3).' '.$langs->trans("StatusProspect3");
             else {
-                return img_action(($langs->trans("StatusProspect" . $statut) != "StatusProspect" . $statut) ? $langs->trans("StatusProspect" . $statut) : $label, 0) . ' ' . (($langs->trans("StatusProspect" . $statut) != "StatusProspect" . $statut) ? $langs->trans("StatusProspect" . $statut) : $label);
+                return img_action(($langs->trans("StatusProspect".$statut) != "StatusProspect".$statut) ? $langs->trans("StatusProspect".$statut) : $label, 0).' '.(($langs->trans("StatusProspect".$statut) != "StatusProspect".$statut) ? $langs->trans("StatusProspect".$statut) : $label);
             }
         }
         if ($mode == 3) {
@@ -3387,22 +3387,22 @@ 
             elseif ($statut == '3' || $statut == 'ST_DONE')
                 return img_action($langs->trans("StatusProspect3"), 3);
             else {
-                return img_action(($langs->trans("StatusProspect" . $statut) != "StatusProspect" . $statut) ? $langs->trans("StatusProspect" . $statut) : $label, 0);
+                return img_action(($langs->trans("StatusProspect".$statut) != "StatusProspect".$statut) ? $langs->trans("StatusProspect".$statut) : $label, 0);
             }
         }
         if ($mode == 4) {
             if ($statut == '-1' || $statut == 'ST_NO')
-                return img_action($langs->trans("StatusProspect-1"), -1) . ' ' . $langs->trans("StatusProspect-1");
+                return img_action($langs->trans("StatusProspect-1"), -1).' '.$langs->trans("StatusProspect-1");
             elseif ($statut == '0' || $statut == 'ST_NEVER')
-                return img_action($langs->trans("StatusProspect0"), 0) . ' ' . $langs->trans("StatusProspect0");
+                return img_action($langs->trans("StatusProspect0"), 0).' '.$langs->trans("StatusProspect0");
             elseif ($statut == '1' || $statut == 'ST_TODO')
-                return img_action($langs->trans("StatusProspect1"), 1) . ' ' . $langs->trans("StatusProspect1");
+                return img_action($langs->trans("StatusProspect1"), 1).' '.$langs->trans("StatusProspect1");
             elseif ($statut == '2' || $statut == 'ST_PEND')
-                return img_action($langs->trans("StatusProspect2"), 2) . ' ' . $langs->trans("StatusProspect2");
+                return img_action($langs->trans("StatusProspect2"), 2).' '.$langs->trans("StatusProspect2");
             elseif ($statut == '3' || $statut == 'ST_DONE')
-                return img_action($langs->trans("StatusProspect3"), 3) . ' ' . $langs->trans("StatusProspect3");
+                return img_action($langs->trans("StatusProspect3"), 3).' '.$langs->trans("StatusProspect3");
             else {
-                return img_action(($langs->trans("StatusProspect" . $statut) != "StatusProspect" . $statut) ? $langs->trans("StatusProspect" . $statut) : $label, 0) . ' ' . (($langs->trans("StatusProspect" . $statut) != "StatusProspect" . $statut) ? $langs->trans("StatusProspect" . $statut) : $label);
+                return img_action(($langs->trans("StatusProspect".$statut) != "StatusProspect".$statut) ? $langs->trans("StatusProspect".$statut) : $label, 0).' '.(($langs->trans("StatusProspect".$statut) != "StatusProspect".$statut) ? $langs->trans("StatusProspect".$statut) : $label);
             }
         }
 
@@ -3438,12 +3438,12 @@ 
         if ($mode == 'supplier')
             $table = 'supplier_proposal';
 
-        $sql = "SELECT rowid, total_ht, total as total_ttc, fk_statut FROM " . MAIN_DB_PREFIX . $table . " as f";
-        $sql .= " WHERE fk_soc = " . $this->id;
+        $sql = "SELECT rowid, total_ht, total as total_ttc, fk_statut FROM ".MAIN_DB_PREFIX.$table." as f";
+        $sql .= " WHERE fk_soc = ".$this->id;
         if ($mode == 'supplier') {
-            $sql .= " AND entity IN (" . getEntity('supplier_proposal') . ")";
+            $sql .= " AND entity IN (".getEntity('supplier_proposal').")";
         } else {
-            $sql .= " AND entity IN (" . getEntity('propal') . ")";
+            $sql .= " AND entity IN (".getEntity('propal').")";
         }
 
         dol_syslog("getOutstandingProposals", LOG_DEBUG);
@@ -3476,12 +3476,12 @@ 
         if ($mode == 'supplier')
             $table = 'commande_fournisseur';
 
-        $sql = "SELECT rowid, total_ht, total_ttc, fk_statut FROM " . MAIN_DB_PREFIX . $table . " as f";
-        $sql .= " WHERE fk_soc = " . $this->id;
+        $sql = "SELECT rowid, total_ht, total_ttc, fk_statut FROM ".MAIN_DB_PREFIX.$table." as f";
+        $sql .= " WHERE fk_soc = ".$this->id;
         if ($mode == 'supplier') {
-            $sql .= " AND entity IN (" . getEntity('supplier_order') . ")";
+            $sql .= " AND entity IN (".getEntity('supplier_order').")";
         } else {
-            $sql .= " AND entity IN (" . getEntity('commande') . ")";
+            $sql .= " AND entity IN (".getEntity('commande').")";
         }
 
         dol_syslog("getOutstandingOrders", LOG_DEBUG);
@@ -3522,14 +3522,14 @@ 
           $remaintopay=price2num($invoice->total_ttc - $paiement - $creditnotes - $deposits,'MT');
          */
         if ($mode == 'supplier')
-            $sql = "SELECT rowid, total_ht as total_ht, total_ttc, paye, fk_statut, close_code FROM " . MAIN_DB_PREFIX . $table . " as f";
+            $sql = "SELECT rowid, total_ht as total_ht, total_ttc, paye, fk_statut, close_code FROM ".MAIN_DB_PREFIX.$table." as f";
         else
-            $sql = "SELECT rowid, total as total_ht, total_ttc, paye, fk_statut, close_code FROM " . MAIN_DB_PREFIX . $table . " as f";
-        $sql .= " WHERE fk_soc = " . $this->id;
+            $sql = "SELECT rowid, total as total_ht, total_ttc, paye, fk_statut, close_code FROM ".MAIN_DB_PREFIX.$table." as f";
+        $sql .= " WHERE fk_soc = ".$this->id;
         if ($mode == 'supplier') {
-            $sql .= " AND entity IN (" . getEntity('facture_fourn') . ")";
+            $sql .= " AND entity IN (".getEntity('facture_fourn').")";
         } else {
-            $sql .= " AND entity IN (" . getEntity('invoice') . ")";
+            $sql .= " AND entity IN (".getEntity('invoice').")";
         }
 
         dol_syslog("getOutstandingBills", LOG_DEBUG);
@@ -3539,10 +3539,10 @@ 
             $outstandingTotal = 0;
             $outstandingTotalIncTax = 0;
             if ($mode == 'supplier') {
-                require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.facture.class.php';
+                require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
                 $tmpobject = new FactureFournisseur($this->db);
             } else {
-                require_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
+                require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
                 $tmpobject = new Facture($this->db);
             }
             while ($obj = $this->db->fetch_object($resql)) {
@@ -3586,19 +3586,19 @@ 
           $alreadypayed=price2num($paiement + $creditnotes + $deposits,'MT');
           $remaintopay=price2num($invoice->total_ttc - $paiement - $creditnotes - $deposits,'MT');
          */
-        $sql = "SELECT rowid, total_ttc FROM " . MAIN_DB_PREFIX . "facture as f";
-        $sql .= " WHERE fk_soc = " . $this->id;
+        $sql = "SELECT rowid, total_ttc FROM ".MAIN_DB_PREFIX."facture as f";
+        $sql .= " WHERE fk_soc = ".$this->id;
         $sql .= " AND paye = 0";
         $sql .= " AND fk_statut <> 0"; // Not a draft
         //$sql .= " AND (fk_statut <> 3 OR close_code <> 'abandon')";		// Not abandonned for undefined reason
-        $sql .= " AND fk_statut <> 3";  // Not abandonned
-        $sql .= " AND fk_statut <> 2";  // Not clasified as paid
+        $sql .= " AND fk_statut <> 3"; // Not abandonned
+        $sql .= " AND fk_statut <> 2"; // Not clasified as paid
 
         dol_syslog("get_OutstandingBill", LOG_DEBUG);
         $resql = $this->db->query($sql);
         if ($resql) {
             $outstandingAmount = 0;
-            require_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
+            require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
             $tmpobject = new Facture($this->db);
             while ($obj = $this->db->fetch_object($resql)) {
                 $tmpobject->id = $obj->rowid;
@@ -3666,7 +3666,7 @@ 
         if (!empty($moreparams) && !empty($moreparams['use_companybankid'])) {
             $modelpath = "core/modules/bank/doc/";
 
-            include_once DOL_DOCUMENT_ROOT . '/societe/class/companybankaccount.class.php';
+            include_once DOL_DOCUMENT_ROOT.'/societe/class/companybankaccount.class.php';
             $companybankaccount = new CompanyBankAccount($this->db);
             $result = $companybankaccount->fetch($moreparams['use_companybankid']);
             if (!$result)
@@ -3678,7 +3678,7 @@ 
                 if (!empty($conf->global->COMPANY_ADDON_PDF)) {
                     $modele = $conf->global->COMPANY_ADDON_PDF;
                 } else {
-                    print $langs->trans("Error") . " " . $langs->trans("Error_COMPANY_ADDON_PDF_NotDefined");
+                    print $langs->trans("Error")." ".$langs->trans("Error_COMPANY_ADDON_PDF_NotDefined");
                     return 0;
                 }
             }
@@ -3704,7 +3704,7 @@ 
      */
     public function setCategories($categories, $type)
     {
-        require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
+        require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 
         // Decode type
         if ($type == 'customer') {
@@ -3714,7 +3714,7 @@ 
             $type_id = Categorie::TYPE_SUPPLIER;
             $type_text = 'supplier';
         } else {
-            dol_syslog(__METHOD__ . ': Type ' . $type . 'is an unknown company category type. Done nothing.', LOG_ERR);
+            dol_syslog(__METHOD__.': Type '.$type.'is an unknown company category type. Done nothing.', LOG_ERR);
             return -1;
         }
 
@@ -3819,16 +3819,16 @@ 
         $reparray = array();
 
         $sql = "SELECT DISTINCT u.rowid, u.login, u.lastname, u.firstname, u.email, u.statut, u.entity, u.photo";
-        $sql .= " FROM " . MAIN_DB_PREFIX . "societe_commerciaux as sc, " . MAIN_DB_PREFIX . "user as u";
+        $sql .= " FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc, ".MAIN_DB_PREFIX."user as u";
         if (!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
-            $sql .= ", " . MAIN_DB_PREFIX . "usergroup_user as ug";
+            $sql .= ", ".MAIN_DB_PREFIX."usergroup_user as ug";
             $sql .= " WHERE ((ug.fk_user = sc.fk_user";
-            $sql .= " AND ug.entity = " . $conf->entity . ")";
+            $sql .= " AND ug.entity = ".$conf->entity.")";
             $sql .= " OR u.admin = 1)";
         } else
-            $sql .= " WHERE entity in (0, " . $conf->entity . ")";
+            $sql .= " WHERE entity in (0, ".$conf->entity.")";
 
-        $sql .= " AND u.rowid = sc.fk_user AND sc.fk_soc = " . $this->id;
+        $sql .= " AND u.rowid = sc.fk_user AND sc.fk_soc = ".$this->id;
 
         $resql = $this->db->query($sql);
         if ($resql) {
@@ -3876,11 +3876,11 @@ 
             $error++;
 
         if ($this->id > 0 && $commid > 0) {
-            $sql = "DELETE FROM  " . MAIN_DB_PREFIX . "societe_commerciaux ";
-            $sql .= " WHERE fk_soc = " . $this->id . " AND fk_user =" . $commid;
+            $sql = "DELETE FROM  ".MAIN_DB_PREFIX."societe_commerciaux ";
+            $sql .= " WHERE fk_soc = ".$this->id." AND fk_user =".$commid;
 
             if (!$this->db->query($sql)) {
-                dol_syslog(get_class($this) . "::del_commercial Erreur");
+                dol_syslog(get_class($this)."::del_commercial Erreur");
             }
         }
     }

index.php

Spacing +5 added lines, -5 removed lines

@@ -9,8 +9,8 @@ 
 define('BASE_PATH', __DIR__);
 define('DEBUG', true);
 
-require_once BASE_PATH . '/vendor/autoload.php';
-require_once BASE_PATH . '/alxarafe/vendor/autoload.php';
+require_once BASE_PATH.'/vendor/autoload.php';
+require_once BASE_PATH.'/alxarafe/vendor/autoload.php';
 
 use Alixar\Helpers\AlixarDispatcher;
 
@@ -27,8 +27,8 @@ 
     $className = $controller;
     $method = filter_input(INPUT_GET, 'method') ?: 'main';
     foreach ($dispatcher->searchDir as $nameSpace => $path) {
-        $className = $nameSpace . '\\Controllers\\' . $controller;
-        $controllerPath = $path . '/Controllers/' . $controller . '.php';
+        $className = $nameSpace.'\\Controllers\\'.$controller;
+        $controllerPath = $path.'/Controllers/'.$controller.'.php';
         if (file_exists($controllerPath)) {
             //require_once $controllerPath;
             $class = new $className;
@@ -48,7 +48,7 @@ 
 $controller = filter_input(INPUT_GET, 'controller') ?: 'home';
 $method = filter_input(INPUT_GET, 'next') ?: filter_input(INPUT_GET, 'method') ?: 'home';
 
-$path = BASE_PATH . "/dolibarr/htdocs/$controller/$method.php";
+$path = BASE_PATH."/dolibarr/htdocs/$controller/$method.php";
 include($path);
 die('End');
 

Controllers/AlCategories.php

Spacing +17 added lines, -17 removed lines

@@ -118,34 +118,34 @@ 
             // Action ajout d'une categorie
             if ($this->cancel) {
                 if ($this->urlfrom) {
-                    header("Location: " . $urlfrom);
+                    header("Location: ".$urlfrom);
                     exit;
                 }
                 if ($idProdOrigin) {
-                    header("Location: " . DOL_URL_ROOT . '/categories/viewcat.php?id=' . $idProdOrigin . '&type=' . $this->type);
+                    header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idProdOrigin.'&type='.$this->type);
                     exit;
                 }
                 if ($idCompanyOrigin) {
-                    header("Location: " . DOL_URL_ROOT . '/categories/viewcat.php?id=' . $idCompanyOrigin . '&type=' . $this->type);
+                    header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idCompanyOrigin.'&type='.$this->type);
                     exit;
                 }
                 if ($idSupplierOrigin) {
-                    header("Location: " . DOL_URL_ROOT . '/categories/viewcat.php?id=' . $idSupplierOrigin . '&type=' . $this->type);
+                    header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idSupplierOrigin.'&type='.$this->type);
                     exit;
                 }
                 if ($idMemberOrigin) {
-                    header("Location: " . DOL_URL_ROOT . '/categories/viewcat.php?id=' . $idMemberOrigin . '&type=' . $this->type);
+                    header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idMemberOrigin.'&type='.$this->type);
                     exit;
                 }
                 if ($idContactOrigin) {
-                    header("Location: " . DOL_URL_ROOT . '/categories/viewcat.php?id=' . $idContactOrigin . '&type=' . $this->type);
+                    header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idContactOrigin.'&type='.$this->type);
                     exit;
                 }
                 if ($idProjectOrigin) {
-                    header("Location: " . DOL_URL_ROOT . '/categories/viewcat.php?id=' . $idProjectOrigin . '&type=' . $this->type);
+                    header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idProjectOrigin.'&type='.$this->type);
                     exit;
                 }
-                header("Location: " . DOL_URL_ROOT . '/categories/index.php?leftmenu=cat&type=' . $this->type);
+                header("Location: ".DOL_URL_ROOT.'/categories/index.php?leftmenu=cat&type='.$this->type);
                 exit;
             }
 
@@ -188,39 +188,39 @@ 
             // Action confirmation de creation categorie
             if ($this->action == 'confirmed') {
                 if ($urlfrom) {
-                    header("Location: " . $urlfrom);
+                    header("Location: ".$urlfrom);
                     exit;
                 }
                 if ($backtopage) {
-                    header("Location: " . $backtopage);
+                    header("Location: ".$backtopage);
                     exit;
                 }
                 if ($idProdOrigin) {
-                    header("Location: " . DOL_URL_ROOT . '/categories/viewcat.php?id=' . $idProdOrigin . '&type=' . $this->type . '&mesg=' . urlencode(Globals::$langs->trans("CatCreated")));
+                    header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idProdOrigin.'&type='.$this->type.'&mesg='.urlencode(Globals::$langs->trans("CatCreated")));
                     exit;
                 }
                 if ($idCompanyOrigin) {
-                    header("Location: " . DOL_URL_ROOT . '/categories/viewcat.php?id=' . $idCompanyOrigin . '&type=' . $this->type . '&mesg=' . urlencode(Globals::$langs->trans("CatCreated")));
+                    header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idCompanyOrigin.'&type='.$this->type.'&mesg='.urlencode(Globals::$langs->trans("CatCreated")));
                     exit;
                 }
                 if ($idSupplierOrigin) {
-                    header("Location: " . DOL_URL_ROOT . '/categories/viewcat.php?id=' . $idSupplierOrigin . '&type=' . $this->type . '&mesg=' . urlencode(Globals::$langs->trans("CatCreated")));
+                    header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idSupplierOrigin.'&type='.$this->type.'&mesg='.urlencode(Globals::$langs->trans("CatCreated")));
                     exit;
                 }
                 if ($idMemberOrigin) {
-                    header("Location: " . DOL_URL_ROOT . '/categories/viewcat.php?id=' . $idMemberOrigin . '&type=' . $this->type . '&mesg=' . urlencode(Globals::$langs->trans("CatCreated")));
+                    header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idMemberOrigin.'&type='.$this->type.'&mesg='.urlencode(Globals::$langs->trans("CatCreated")));
                     exit;
                 }
                 if ($idContactOrigin) {
-                    header("Location: " . DOL_URL_ROOT . '/categories/viewcat.php?id=' . $idContactOrigin . '&type=' . $this->type . '&mesg=' . urlencode(Globals::$langs->trans("CatCreated")));
+                    header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idContactOrigin.'&type='.$this->type.'&mesg='.urlencode(Globals::$langs->trans("CatCreated")));
                     exit;
                 }
                 if ($idProjectOrigin) {
-                    header("Location: " . DOL_URL_ROOT . '/categories/viewcat.php?id=' . $idProjectOrigin . '&type=' . $this->type . '&mesg=' . urlencode(Globals::$langs->trans("CatCreated")));
+                    header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idProjectOrigin.'&type='.$this->type.'&mesg='.urlencode(Globals::$langs->trans("CatCreated")));
                     exit;
                 }
 
-                header("Location: " . DOL_URL_ROOT . '/categories/viewcat.php?id=' . $result . '&type=' . $this->type);
+                header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$result.'&type='.$this->type);
                 exit;
             }
         }

Controllers/ThirdParty.php

Spacing +38 added lines, -38 removed lines

@@ -58,15 +58,15 @@ 
 
             if (count($listofsearchfields)) {
                 // print '<form method="post" action="'.DOL_URL_ROOT.'/core/search.php">';
-                print '<form method="post" action="' . BASE_URI . '?controller=core&method=search">';
-                print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
+                print '<form method="post" action="'.BASE_URI.'?controller=core&method=search">';
+                print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
                 print '<table class="noborder nohover centpercent">';
                 $i = 0;
                 foreach ($listofsearchfields as $key => $value) {
-                    if ($i == 0) print '<tr class="liste_titre"><th colspan="3">' . $langs->trans("Search") . '</th></tr>';
-                    print '<tr ' . $bc[false] . '>';
-                    print '<td class="nowrap"><label for="' . $key . '">' . $langs->trans($value["text"]) . '</label></td><td><input type="text" class="flat inputsearch" name="' . $key . '" id="' . $key . '" size="18"></td>';
-                    if ($i == 0) print '<td rowspan="' . count($listofsearchfields) . '"><input type="submit" value="' . $langs->trans("Search") . '" class="button"></td>';
+                    if ($i == 0) print '<tr class="liste_titre"><th colspan="3">'.$langs->trans("Search").'</th></tr>';
+                    print '<tr '.$bc[false].'>';
+                    print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label></td><td><input type="text" class="flat inputsearch" name="'.$key.'" id="'.$key.'" size="18"></td>';
+                    if ($i == 0) print '<td rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
                     print '</tr>';
                     $i++;
                 }
@@ -90,12 +90,12 @@ 
         $total = 0;
 
         $sql = "SELECT s.rowid, s.client, s.fournisseur";
-        $sql .= " FROM " . MAIN_DB_PREFIX . "societe as s";
-        if (!$user->rights->societe->client->voir && !$socid) $sql .= ", " . MAIN_DB_PREFIX . "societe_commerciaux as sc";
-        $sql .= ' WHERE s.entity IN (' . getEntity('societe') . ')';
-        if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " . $user->id;
-        if ($socid) $sql .= " AND s.rowid = " . $socid;
-        if (!$user->rights->fournisseur->lire) $sql .= " AND (s.fournisseur <> 1 OR s.client <> 0)";    // client=0, fournisseur=0 must be visible
+        $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+        if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+        $sql .= ' WHERE s.entity IN ('.getEntity('societe').')';
+        if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+        if ($socid) $sql .= " AND s.rowid = ".$socid;
+        if (!$user->rights->fournisseur->lire) $sql .= " AND (s.fournisseur <> 1 OR s.client <> 0)"; // client=0, fournisseur=0 must be visible
 //print $sql;
         $result = $db->query($sql);
         if ($result) {
@@ -122,8 +122,8 @@ 
         } else dol_print_error($db);
 
         print '<div class="div-table-responsive-no-min">';
-        print '<table class="noborder nohover" width="100%">' . "\n";
-        print '<tr class="liste_titre"><th colspan="2">' . $langs->trans("Statistics") . '</th></tr>';
+        print '<table class="noborder nohover" width="100%">'."\n";
+        print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").'</th></tr>';
         if (!empty($conf->use_javascript_ajax) && ((round($third['prospect']) ? 1 : 0) + (round($third['customer']) ? 1 : 0) + (round($third['supplier']) ? 1 : 0) + (round($third['other']) ? 1 : 0) >= 2)) {
             print '<tr><td align="center" colspan="2">';
             $dataseries = array();
@@ -131,7 +131,7 @@ 
             if (!empty($conf->societe->enabled) && $user->rights->societe->lire && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS_STATS)) $dataseries[] = array($langs->trans("Customers"), round($third['customer']));
             if (!empty($conf->fournisseur->enabled) && $user->rights->fournisseur->lire && empty($conf->global->SOCIETE_DISABLE_SUPPLIERS_STATS)) $dataseries[] = array($langs->trans("Suppliers"), round($third['supplier']));
             if (!empty($conf->societe->enabled)) $dataseries[] = array($langs->trans("Others"), round($third['other']));
-            include_once DOL_DOCUMENT_ROOT . '/core/class/dolgraph.class.php';
+            include_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
             $dolgraph = new DolGraph();
             $dolgraph->SetData($dataseries);
             $dolgraph->setShowLegend(1);
@@ -140,51 +140,51 @@ 
             $dolgraph->setWidth('100%');
             $dolgraph->draw('idgraphthirdparties');
             print $dolgraph->show();
-            print '</td></tr>' . "\n";
+            print '</td></tr>'."\n";
         } else {
             if (!empty($conf->societe->enabled) && $user->rights->societe->lire && empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS_STATS)) {
                 $statstring = "<tr>";
                 //$statstring.= '<td><a href="'.DOL_URL_ROOT.'/societe/list.php?type=p">'.$langs->trans("Prospects").'</a></td><td align="right">'.round($third['prospect']).'</td>';
-                $statstring .= '<td><a href="' . BASE_URI . '?controller=societe&method=list&type=p">' . $langs->trans("Prospects") . '</a></td><td align="right">' . round($third['prospect']) . '</td>';
+                $statstring .= '<td><a href="'.BASE_URI.'?controller=societe&method=list&type=p">'.$langs->trans("Prospects").'</a></td><td align="right">'.round($third['prospect']).'</td>';
                 $statstring .= "</tr>";
             }
             if (!empty($conf->societe->enabled) && $user->rights->societe->lire && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS_STATS)) {
                 $statstring .= "<tr>";
                 //$statstring.= '<td><a href="'.DOL_URL_ROOT.'/societe/list.php?type=c">'.$langs->trans("Customers").'</a></td><td align="right">'.round($third['customer']).'</td>';
-                $statstring .= '<td><a href="' . BASE_URI . '?controller=societe&method=list&type=c">' . $langs->trans("Customers") . '</a></td><td align="right">' . round($third['customer']) . '</td>';
+                $statstring .= '<td><a href="'.BASE_URI.'?controller=societe&method=list&type=c">'.$langs->trans("Customers").'</a></td><td align="right">'.round($third['customer']).'</td>';
                 $statstring .= "</tr>";
             }
             if (!empty($conf->fournisseur->enabled) && empty($conf->global->SOCIETE_DISABLE_SUPPLIERS_STATS) && $user->rights->fournisseur->lire) {
                 $statstring2 = "<tr>";
                 //$statstring2.= '<td><a href="'.DOL_URL_ROOT.'/societe/list.php?type=f">'.$langs->trans("Suppliers").'</a></td><td align="right">'.round($third['supplier']).'</td>';
-                $statstring2 .= '<td><a href="' . BASE_URI . '?controller=societe&method=list&typef">' . $langs->trans("Suppliers") . '</a></td><td align="right">' . round($third['supplier']) . '</td>';
+                $statstring2 .= '<td><a href="'.BASE_URI.'?controller=societe&method=list&typef">'.$langs->trans("Suppliers").'</a></td><td align="right">'.round($third['supplier']).'</td>';
                 $statstring2 .= "</tr>";
             }
             print $statstring;
             print $statstring2;
         }
-        print '<tr class="liste_total"><td>' . $langs->trans("UniqueThirdParties") . '</td><td align="right">';
+        print '<tr class="liste_total"><td>'.$langs->trans("UniqueThirdParties").'</td><td align="right">';
         print $total;
         print '</td></tr>';
         print '</table>';
         print '</div>';
 
         if (!empty($conf->categorie->enabled) && !empty($conf->global->CATEGORY_GRAPHSTATS_ON_THIRDPARTIES)) {
-            require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
+            require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
             $elementtype = 'societe';
 
             print '<br>';
 
             print '<div class="div-table-responsive-no-min">';
             print '<table class="noborder nohover" width="100%">';
-            print '<tr class="liste_titre"><th colspan="2">' . $langs->trans("Categories") . '</th></tr>';
-            print '<tr ' . $bc[0] . '><td align="center" colspan="2">';
+            print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Categories").'</th></tr>';
+            print '<tr '.$bc[0].'><td align="center" colspan="2">';
             $sql = "SELECT c.label, count(*) as nb";
-            $sql .= " FROM " . MAIN_DB_PREFIX . "categorie_societe as cs";
-            $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "categorie as c ON cs.fk_categorie = c.rowid";
+            $sql .= " FROM ".MAIN_DB_PREFIX."categorie_societe as cs";
+            $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."categorie as c ON cs.fk_categorie = c.rowid";
             $sql .= " WHERE c.type = 2";
-            if (!is_numeric($conf->global->CATEGORY_GRAPHSTATS_ON_THIRDPARTIES)) $sql .= " AND c.label like '" . $db->escape($conf->global->CATEGORY_GRAPHSTATS_ON_THIRDPARTIES) . "'";
-            $sql .= " AND c.entity IN (" . getEntity('category') . ")";
+            if (!is_numeric($conf->global->CATEGORY_GRAPHSTATS_ON_THIRDPARTIES)) $sql .= " AND c.label like '".$db->escape($conf->global->CATEGORY_GRAPHSTATS_ON_THIRDPARTIES)."'";
+            $sql .= " AND c.entity IN (".getEntity('category').")";
             $sql .= " GROUP BY c.label";
             $total = 0;
             $result = $db->query($sql);
@@ -209,7 +209,7 @@ 
                     if ($i > $nbmax) {
                         $dataseries[] = array($langs->trans("Other"), round($rest));
                     }
-                    include_once DOL_DOCUMENT_ROOT . '/core/class/dolgraph.class.php';
+                    include_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
                     $dolgraph = new DolGraph();
                     $dolgraph->SetData($dataseries);
                     $dolgraph->setShowLegend(1);
@@ -222,14 +222,14 @@ 
                     while ($i < $num) {
                         $obj = $db->fetch_object($result);
 
-                        print '<tr class="oddeven"><td>' . $obj->label . '</td><td>' . $obj->nb . '</td></tr>';
+                        print '<tr class="oddeven"><td>'.$obj->label.'</td><td>'.$obj->nb.'</td></tr>';
                         $total += $obj->nb;
                         $i++;
                     }
                 }
             }
             print '</td></tr>';
-            print '<tr class="liste_total"><td>' . $langs->trans("Total") . '</td><td align="right">';
+            print '<tr class="liste_total"><td>'.$langs->trans("Total").'</td><td align="right">';
             print $total;
             print '</td></tr>';
             print '</table>';
@@ -249,11 +249,11 @@ 
         $sql .= ", s.code_fournisseur";
         $sql .= ", s.logo";
         $sql .= ", s.canvas, s.tms as datem, s.status as status";
-        $sql .= " FROM " . MAIN_DB_PREFIX . "societe as s";
-        if (!$user->rights->societe->client->voir && !$socid) $sql .= ", " . MAIN_DB_PREFIX . "societe_commerciaux as sc";
-        $sql .= ' WHERE s.entity IN (' . getEntity('societe') . ')';
-        if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " . $user->id;
-        if ($socid) $sql .= " AND s.rowid = " . $socid;
+        $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+        if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+        $sql .= ' WHERE s.entity IN ('.getEntity('societe').')';
+        if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+        if ($socid) $sql .= " AND s.rowid = ".$socid;
         if (!$user->rights->fournisseur->lire) $sql .= " AND (s.fournisseur != 1 OR s.client != 0)";
         $sql .= $db->order("s.tms", "DESC");
         $sql .= $db->plimit($max, 0);
@@ -272,11 +272,11 @@ 
                 print '<div class="div-table-responsive-no-min">';
                 print '<table class="noborder" width="100%">';
 
-                print '<tr class="liste_titre"><th colspan="2">' . $transRecordedType . '</th>';
+                print '<tr class="liste_titre"><th colspan="2">'.$transRecordedType.'</th>';
                 print '<th>&nbsp;</th>';
                 //print '<th class="right"><a href="'.DOL_URL_ROOT.'/societe/list.php?sortfield=s.tms&sortorder=DESC">'.$langs->trans("FullList").'</th>';
-                print '<th class="right"><a href="' . BASE_URI . '?controller=societe&method=list&sortfield=s.tms&sortorder=DESC">' . $langs->trans("FullList") . '</th>';
-                print '</tr>' . "\n";
+                print '<th class="right"><a href="'.BASE_URI.'?controller=societe&method=list&sortfield=s.tms&sortorder=DESC">'.$langs->trans("FullList").'</th>';
+                print '</tr>'."\n";
 
                 while ($i < $num) {
                     $objp = $db->fetch_object($result);