alxarafe / alixar

Base/AlixarModel.php

Braces +1153 added lines, -407 removed lines

@@ -342,22 +342,30 @@ 
         $sql .= " FROM " . MAIN_DB_PREFIX . $element;
         $sql .= " WHERE entity IN (" . getEntity($element) . ")";
 
-        if ($id > 0) $sql .= " AND rowid = " . $db->escape($id);
-        else if ($ref) $sql .= " AND ref = '" . $db->escape($ref) . "'";
-        else if ($ref_ext) $sql .= " AND ref_ext = '" . $db->escape($ref_ext) . "'";
-        else {
+        if ($id > 0) {
+            $sql .= " AND rowid = " . $db->escape($id);
+        } else if ($ref) {
+            $sql .= " AND ref = '" . $db->escape($ref) . "'";
+        } else if ($ref_ext) {
+            $sql .= " AND ref_ext = '" . $db->escape($ref_ext) . "'";
+        } else {
             $error = 'ErrorWrongParameters';
             dol_print_error(get_class() . "::isExistingObject " . $error, LOG_ERR);
             return -1;
         }
-        if ($ref || $ref_ext) $sql .= " AND entity = " . $conf->entity;
+        if ($ref || $ref_ext) {
+            $sql .= " AND entity = " . $conf->entity;
+        }
 
         dol_syslog(get_class() . "::isExistingObject", LOG_DEBUG);
         $resql = $db->query($sql);
         if ($resql) {
             $num = $db->num_rows($resql);
-            if ($num > 0) return 1;
-            else return 0;
+            if ($num > 0) {
+                return 1;
+            } else {
+                return 0;
+            }
         }
         return -1;
     }
@@ -380,7 +388,10 @@ 
             $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;
             }
@@ -453,7 +464,9 @@ 
             $outdone++;
         }
 
-        if (!empty($this->phone) || !empty($this->phone_pro) || !empty($this->phone_mobile) || !empty($this->phone_perso) || !empty($this->fax) || !empty($this->office_phone) || !empty($this->user_mobile) || !empty($this->office_fax)) $out .= ($outdone ? '<br>' : '');
+        if (!empty($this->phone) || !empty($this->phone_pro) || !empty($this->phone_mobile) || !empty($this->phone_perso) || !empty($this->fax) || !empty($this->office_phone) || !empty($this->user_mobile) || !empty($this->office_fax)) {
+            $out .= ($outdone ? '<br>' : '');
+        }
         if (!empty($this->phone) && empty($this->phone_pro)) {        // For objects that store pro phone into ->phone
             $out .= dol_print_phone($this->phone, $this->country_code, $contactid, $thirdpartyid, 'AC_TEL', '&nbsp;', 'phone', $langs->trans("PhonePro"));
             $outdone++;
@@ -499,13 +512,21 @@ 
         }
         $out .= '<div style="clear: both;">';
         if (!empty($conf->socialnetworks->enabled)) {
-            if ($this->skype) $out .= dol_print_socialnetworks($this->skype, $this->id, $object->id, 'skype');
+            if ($this->skype) {
+                $out .= dol_print_socialnetworks($this->skype, $this->id, $object->id, 'skype');
+            }
             $outdone++;
-            if ($this->jabberid) $out .= dol_print_socialnetworks($this->jabberid, $this->id, $object->id, 'jabber');
+            if ($this->jabberid) {
+                $out .= dol_print_socialnetworks($this->jabberid, $this->id, $object->id, 'jabber');
+            }
             $outdone++;
-            if ($this->twitter) $out .= dol_print_socialnetworks($this->twitter, $this->id, $object->id, 'twitter');
+            if ($this->twitter) {
+                $out .= dol_print_socialnetworks($this->twitter, $this->id, $object->id, 'twitter');
+            }
             $outdone++;
-            if ($this->facebook) $out .= dol_print_socialnetworks($this->facebook, $this->id, $object->id, 'facebook');
+            if ($this->facebook) {
+                $out .= dol_print_socialnetworks($this->facebook, $this->id, $object->id, 'facebook');
+            }
             $outdone++;
         }
         $out .= '</div>';
@@ -558,12 +579,17 @@ 
         //print "lastname=".$this->lastname." name=".$this->name." nom=".$this->nom."<br>\n";
         $lastname = $this->lastname;
         $firstname = $this->firstname;
-        if (empty($lastname)) $lastname = (isset($this->lastname) ? $this->lastname : (isset($this->name) ? $this->name : (isset($this->nom) ? $this->nom : (isset($this->societe) ? $this->societe : (isset($this->company) ? $this->company : '')))));
+        if (empty($lastname)) {
+            $lastname = (isset($this->lastname) ? $this->lastname : (isset($this->name) ? $this->name : (isset($this->nom) ? $this->nom : (isset($this->societe) ? $this->societe : (isset($this->company) ? $this->company : '')))));
+        }
 
         $ret = '';
         if ($option && $this->civility_id) {
-            if ($langs->transnoentitiesnoconv("Civility" . $this->civility_id) != "Civility" . $this->civility_id) $ret .= $langs->transnoentitiesnoconv("Civility" . $this->civility_id) . ' ';
-            else $ret .= $this->civility_id . ' ';
+            if ($langs->transnoentitiesnoconv("Civility" . $this->civility_id) != "Civility" . $this->civility_id) {
+                $ret .= $langs->transnoentitiesnoconv("Civility" . $this->civility_id) . ' ';
+            } else {
+                $ret .= $this->civility_id . ' ';
+            }
         }
 
         $ret .= dolGetFirstLastname($firstname, $lastname, $nameorder);
@@ -620,14 +646,18 @@ 
 					$this->errors = $ecmfile->errors;
 				}
 				*/
-            } else return '';
+            } else {
+                return '';
+            }
         } elseif (empty($ecmfile->share)) {
             // Add entry into index
             if ($initsharekey) {
                 require_once DOL_DOCUMENT_ROOT . '/core/lib/security2.lib.php';
                 $ecmfile->share = getRandomPassword(true);
                 $ecmfile->update($user);
-            } else return '';
+            } else {
+                return '';
+            }
         }
 
         // Define $urlwithroot
@@ -641,8 +671,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 : '');
@@ -723,7 +758,9 @@ 
             $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;
+                }
             }
         }
 
@@ -783,7 +820,9 @@ 
                     return -1;
                 }
             }
-        } else return 0;
+        } else {
+            return 0;
+        }
     }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -805,22 +844,38 @@ 
         $tab = array();
 
         $sql = "SELECT ec.rowid, ec.statut as statuslink, ec.fk_socpeople as id, ec.fk_c_type_contact";    // This field contains id of llx_socpeople or id of llx_user
-        if ($source == 'internal') $sql .= ", '-1' as socid, t.statut as statuscontact, t.login, t.photo";
-        if ($source == 'external' || $source == 'thirdparty') $sql .= ", t.fk_soc as socid, t.statut as statuscontact";
+        if ($source == 'internal') {
+            $sql .= ", '-1' as socid, t.statut as statuscontact, t.login, t.photo";
+        }
+        if ($source == 'external' || $source == 'thirdparty') {
+            $sql .= ", t.fk_soc as socid, t.statut as statuscontact";
+        }
         $sql .= ", t.civility as civility, t.lastname as lastname, t.firstname, t.email";
         $sql .= ", tc.source, tc.element, tc.code, tc.libelle";
         $sql .= " FROM " . MAIN_DB_PREFIX . "c_type_contact tc";
         $sql .= ", " . MAIN_DB_PREFIX . "element_contact ec";
-        if ($source == 'internal') $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "user t on ec.fk_socpeople = t.rowid";
-        if ($source == 'external' || $source == 'thirdparty') $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "socpeople t on ec.fk_socpeople = t.rowid";
+        if ($source == 'internal') {
+            $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "user t on ec.fk_socpeople = t.rowid";
+        }
+        if ($source == 'external' || $source == 'thirdparty') {
+            $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "socpeople t on ec.fk_socpeople = t.rowid";
+        }
         $sql .= " WHERE ec.element_id =" . $this->id;
         $sql .= " AND ec.fk_c_type_contact=tc.rowid";
         $sql .= " AND tc.element='" . $this->db->escape($this->element) . "'";
-        if ($code) $sql .= " AND tc.code = '" . $this->db->escape($code) . "'";
-        if ($source == 'internal') $sql .= " AND tc.source = 'internal'";
-        if ($source == 'external' || $source == 'thirdparty') $sql .= " AND tc.source = 'external'";
+        if ($code) {
+            $sql .= " AND tc.code = '" . $this->db->escape($code) . "'";
+        }
+        if ($source == 'internal') {
+            $sql .= " AND tc.source = 'internal'";
+        }
+        if ($source == 'external' || $source == 'thirdparty') {
+            $sql .= " AND tc.source = 'external'";
+        }
         $sql .= " AND tc.active=1";
-        if ($statut >= 0) $sql .= " AND ec.statut = '" . $statut . "'";
+        if ($statut >= 0) {
+            $sql .= " AND ec.statut = '" . $statut . "'";
+        }
         $sql .= " ORDER BY t.lastname ASC";
 
         dol_syslog(get_class($this) . "::liste_contact", LOG_DEBUG);
@@ -943,8 +998,9 @@ 
 
         $sql = "DELETE FROM " . MAIN_DB_PREFIX . "element_contact";
         $sql .= " WHERE element_id = " . $this->id;
-        if ($listId)
-            $sql .= " AND fk_c_type_contact IN (" . $listId . ")";
+        if ($listId) {
+                    $sql .= " AND fk_c_type_contact IN (" . $listId . ")";
+        }
 
         dol_syslog(get_class($this) . "::delete_linked_contact", LOG_DEBUG);
         if ($this->db->query($sql)) {
@@ -972,16 +1028,27 @@ 
         // phpcs:enable
         global $langs;
 
-        if (empty($order)) $order = 'position';
-        if ($order == 'position') $order .= ',code';
+        if (empty($order)) {
+            $order = 'position';
+        }
+        if ($order == 'position') {
+            $order .= ',code';
+        }
 
         $tab = array();
         $sql = "SELECT DISTINCT tc.rowid, tc.code, tc.libelle, tc.position";
         $sql .= " FROM " . MAIN_DB_PREFIX . "c_type_contact as tc";
         $sql .= " WHERE tc.element='" . $this->db->escape($this->element) . "'";
-        if ($activeonly == 1) $sql .= " AND tc.active=1"; // only the active types
-        if (!empty($source) && $source != 'all') $sql .= " AND tc.source='" . $this->db->escape($source) . "'";
-        if (!empty($code)) $sql .= " AND tc.code='" . $this->db->escape($code) . "'";
+        if ($activeonly == 1) {
+            $sql .= " AND tc.active=1";
+        }
+        // only the active types
+        if (!empty($source) && $source != 'all') {
+            $sql .= " AND tc.source='" . $this->db->escape($source) . "'";
+        }
+        if (!empty($code)) {
+            $sql .= " AND tc.code='" . $this->db->escape($code) . "'";
+        }
         $sql .= $this->db->order($order, 'ASC');
 
         //print "sql=".$sql;
@@ -994,8 +1061,11 @@ 
 
                 $transkey = "TypeContact_" . $this->element . "_" . $source . "_" . $obj->code;
                 $libelle_type = ($langs->trans($transkey) != $transkey ? $langs->trans($transkey) : $obj->libelle);
-                if (empty($option)) $tab[$obj->rowid] = $libelle_type;
-                else $tab[$obj->code] = $libelle_type;
+                if (empty($option)) {
+                    $tab[$obj->rowid] = $libelle_type;
+                } else {
+                    $tab[$obj->code] = $libelle_type;
+                }
                 $i++;
             }
             return $tab;
@@ -1055,8 +1125,12 @@ 
         // Insert into database
         $sql = "UPDATE " . MAIN_DB_PREFIX . "element_contact set";
         $sql .= " statut = " . $statut;
-        if ($type_contact_id) $sql .= ", fk_c_type_contact = '" . $type_contact_id . "'";
-        if ($fk_socpeople) $sql .= ", fk_socpeople = '" . $fk_socpeople . "'";
+        if ($type_contact_id) {
+            $sql .= ", fk_c_type_contact = '" . $type_contact_id . "'";
+        }
+        if ($fk_socpeople) {
+            $sql .= ", fk_socpeople = '" . $fk_socpeople . "'";
+        }
         $sql .= " where rowid = " . $rowid;
         $resql = $this->db->query($sql);
         if ($resql) {
@@ -1100,19 +1174,29 @@ 
 
         $sql = "SELECT ec.fk_socpeople";
         $sql .= " FROM " . MAIN_DB_PREFIX . "element_contact as ec,";
-        if ($source == 'internal') $sql .= " " . MAIN_DB_PREFIX . "user as c,";
-        if ($source == 'external') $sql .= " " . MAIN_DB_PREFIX . "socpeople as c,";
+        if ($source == 'internal') {
+            $sql .= " " . MAIN_DB_PREFIX . "user as c,";
+        }
+        if ($source == 'external') {
+            $sql .= " " . MAIN_DB_PREFIX . "socpeople as c,";
+        }
         $sql .= " " . MAIN_DB_PREFIX . "c_type_contact as tc";
         $sql .= " WHERE ec.element_id = " . $id;
         $sql .= " AND ec.fk_socpeople = c.rowid";
-        if ($source == 'internal') $sql .= " AND c.entity IN (" . getEntity('user') . ")";
-        if ($source == 'external') $sql .= " AND c.entity IN (" . getEntity('societe') . ")";
+        if ($source == 'internal') {
+            $sql .= " AND c.entity IN (" . getEntity('user') . ")";
+        }
+        if ($source == 'external') {
+            $sql .= " AND c.entity IN (" . getEntity('societe') . ")";
+        }
         $sql .= " AND ec.fk_c_type_contact = tc.rowid";
         $sql .= " AND tc.element = '" . $element . "'";
         $sql .= " AND tc.source = '" . $source . "'";
         $sql .= " AND tc.code = '" . $code . "'";
         $sql .= " AND tc.active = 1";
-        if ($status) $sql .= " AND ec.statut = " . $status;
+        if ($status) {
+            $sql .= " AND ec.statut = " . $status;
+        }
 
         dol_syslog(get_class($this) . "::getIdContact", LOG_DEBUG);
         $resql = $this->db->query($sql);
@@ -1138,9 +1222,13 @@ 
     function fetch_contact($contactid = null)
     {
         // phpcs:enable
-        if (empty($contactid)) $contactid = $this->contactid;
+        if (empty($contactid)) {
+            $contactid = $this->contactid;
+        }
 
-        if (empty($contactid)) return 0;
+        if (empty($contactid)) {
+            return 0;
+        }
 
         require_once DOL_DOCUMENT_ROOT . '/contact/class/contact.class.php';
         $contact = new Contact($this->db);
@@ -1162,14 +1250,16 @@ 
         // phpcs:enable
         global $conf;
 
-        if (empty($this->socid) && empty($this->fk_soc) && empty($this->fk_thirdparty) && empty($force_thirdparty_id))
-            return 0;
+        if (empty($this->socid) && empty($this->fk_soc) && empty($this->fk_thirdparty) && empty($force_thirdparty_id)) {
+                    return 0;
+        }
 
         require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
 
         $idtofetch = isset($this->socid) ? $this->socid : (isset($this->fk_soc) ? $this->fk_soc : $this->fk_thirdparty);
-        if ($force_thirdparty_id)
-            $idtofetch = $force_thirdparty_id;
+        if ($force_thirdparty_id) {
+                    $idtofetch = $force_thirdparty_id;
+        }
 
         if ($idtofetch) {
             $thirdparty = new Societe($this->db);
@@ -1182,8 +1272,9 @@ 
             }
 
             return $result;
-        } else
-            return -1;
+        } else {
+                    return -1;
+        }
     }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -1231,17 +1322,23 @@ 
         dol_syslog(get_class($this) . '::fetch_barcode this->element=' . $this->element . ' this->barcode_type=' . $this->barcode_type);
 
         $idtype = $this->barcode_type;
-        if (empty($idtype) && $idtype != '0')    // If type of barcode no set, we try to guess. If set to '0' it means we forced to have type remain not defined
+        if (empty($idtype) && $idtype != '0') {
+            // If type of barcode no set, we try to guess. If set to '0' it means we forced to have type remain not defined
         {
             if ($this->element == 'product') $idtype = $conf->global->PRODUIT_DEFAULT_BARCODE_TYPE;
-            else if ($this->element == 'societe') $idtype = $conf->global->GENBARCODE_BARCODETYPE_THIRDPARTY;
-            else dol_syslog('Call fetch_barcode with barcode_type not defined and cant be guessed', LOG_WARNING);
+        } else if ($this->element == 'societe') {
+                $idtype = $conf->global->GENBARCODE_BARCODETYPE_THIRDPARTY;
+            } else {
+                dol_syslog('Call fetch_barcode with barcode_type not defined and cant be guessed', LOG_WARNING);
+            }
         }
 
         if ($idtype > 0) {
-            if (empty($this->barcode_type) || empty($this->barcode_type_code) || empty($this->barcode_type_label) || empty($this->barcode_type_coder))    // If data not already loaded
+            if (empty($this->barcode_type) || empty($this->barcode_type_code) || empty($this->barcode_type_label) || empty($this->barcode_type_coder)) {
+                // If data not already loaded
             {
                 $sql = "SELECT rowid, code, libelle as label, coder";
+            }
                 $sql .= " FROM " . MAIN_DB_PREFIX . "c_barcode_type";
                 $sql .= " WHERE rowid = " . $idtype;
                 dol_syslog(get_class($this) . '::fetch_barcode', LOG_DEBUG);
@@ -1274,8 +1371,13 @@ 
         // phpcs:enable
         include_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
 
-        if (empty($this->fk_project) && !empty($this->fk_projet)) $this->fk_project = $this->fk_projet;    // For backward compatibility
-        if (empty($this->fk_project)) return 0;
+        if (empty($this->fk_project) && !empty($this->fk_projet)) {
+            $this->fk_project = $this->fk_projet;
+        }
+        // For backward compatibility
+        if (empty($this->fk_project)) {
+            return 0;
+        }
 
         $project = new Project($this->db);
         $result = $project->fetch($this->fk_project);
@@ -1297,7 +1399,9 @@ 
         // phpcs:enable
         include_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
 
-        if (empty($this->fk_product)) return 0;
+        if (empty($this->fk_product)) {
+            return 0;
+        }
 
         $product = new Product($this->db);
         $result = $product->fetch($this->fk_product);
@@ -1329,9 +1433,15 @@ 
     function fetch_origin()
     {
         // phpcs:enable
-        if ($this->origin == 'shipping') $this->origin = 'expedition';
-        if ($this->origin == 'delivery') $this->origin = 'livraison';
-        if ($this->origin == 'order_supplier') $this->origin = 'commandeFournisseur';
+        if ($this->origin == 'shipping') {
+            $this->origin = 'expedition';
+        }
+        if ($this->origin == 'delivery') {
+            $this->origin = 'livraison';
+        }
+        if ($this->origin == 'order_supplier') {
+            $this->origin = 'commandeFournisseur';
+        }
 
         $origin = $this->origin;
 
@@ -1423,28 +1533,47 @@ 
     {
         global $user, $langs, $conf;
 
-        if (empty($table)) $table = $this->table_element;
-        if (empty($id)) $id = $this->id;
-        if (empty($format)) $format = 'text';
-        if (empty($id_field)) $id_field = 'rowid';
+        if (empty($table)) {
+            $table = $this->table_element;
+        }
+        if (empty($id)) {
+            $id = $this->id;
+        }
+        if (empty($format)) {
+            $format = 'text';
+        }
+        if (empty($id_field)) {
+            $id_field = 'rowid';
+        }
 
         $error = 0;
 
         $this->db->begin();
 
         // Special case
-        if ($table == 'product' && $field == 'note_private') $field = 'note';
-        if (in_array($table, array('actioncomm', 'adherent', 'advtargetemailing', 'cronjob', 'establishment'))) $fk_user_field = 'fk_user_mod';
+        if ($table == 'product' && $field == 'note_private') {
+            $field = 'note';
+        }
+        if (in_array($table, array('actioncomm', 'adherent', 'advtargetemailing', 'cronjob', 'establishment'))) {
+            $fk_user_field = 'fk_user_mod';
+        }
 
         $sql = "UPDATE " . MAIN_DB_PREFIX . $table . " SET ";
 
-        if ($format == 'text') $sql .= $field . " = '" . $this->db->escape($value) . "'";
-        else if ($format == 'int') $sql .= $field . " = " . $this->db->escape($value);
-        else if ($format == 'date') $sql .= $field . " = " . ($value ? "'" . $this->db->idate($value) . "'" : "null");
+        if ($format == 'text') {
+            $sql .= $field . " = '" . $this->db->escape($value) . "'";
+        } else if ($format == 'int') {
+            $sql .= $field . " = " . $this->db->escape($value);
+        } else if ($format == 'date') {
+            $sql .= $field . " = " . ($value ? "'" . $this->db->idate($value) . "'" : "null");
+        }
 
         if ($fk_user_field) {
-            if (!empty($fuser) && is_object($fuser)) $sql .= ", " . $fk_user_field . " = " . $fuser->id;
-            elseif (empty($fuser) || $fuser != 'none') $sql .= ", " . $fk_user_field . " = " . $user->id;
+            if (!empty($fuser) && is_object($fuser)) {
+                $sql .= ", " . $fk_user_field . " = " . $fuser->id;
+            } elseif (empty($fuser) || $fuser != 'none') {
+                $sql .= ", " . $fk_user_field . " = " . $user->id;
+            }
         }
 
         $sql .= " WHERE " . $id_field . " = " . $id;
@@ -1459,12 +1588,19 @@ 
                 } else {
                     $result = $this->fetchCommon($id);
                 }
-                if ($result >= 0) $result = $this->call_trigger($trigkey, (!empty($fuser) && is_object($fuser)) ? $fuser : $user);   // This may set this->errors
-                if ($result < 0) $error++;
+                if ($result >= 0) {
+                    $result = $this->call_trigger($trigkey, (!empty($fuser) && is_object($fuser)) ? $fuser : $user);
+                }
+                // This may set this->errors
+                if ($result < 0) {
+                    $error++;
+                }
             }
 
             if (!$error) {
-                if (property_exists($this, $field)) $this->$field = $value;
+                if (property_exists($this, $field)) {
+                    $this->$field = $value;
+                }
                 $this->db->commit();
                 return 1;
             } else {
@@ -1488,15 +1624,24 @@ 
      */
     public function fetchCommon($id, $ref = null, $morewhere = '')
     {
-        if (empty($id) && empty($ref) && empty($morewhere)) return -1;
+        if (empty($id) && empty($ref) && empty($morewhere)) {
+            return -1;
+        }
 
         $sql = 'SELECT ' . $this->getFieldList();
         $sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element;
 
-        if (!empty($id)) $sql .= ' WHERE rowid = ' . $id;
-        elseif (!empty($ref)) $sql .= " WHERE ref = " . $this->quote($ref, $this->fields['ref']);
-        else $sql .= ' WHERE 1 = 1';    // usage with empty id and empty ref is very rare
-        if ($morewhere) $sql .= $morewhere;
+        if (!empty($id)) {
+            $sql .= ' WHERE rowid = ' . $id;
+        } elseif (!empty($ref)) {
+            $sql .= " WHERE ref = " . $this->quote($ref, $this->fields['ref']);
+        } else {
+            $sql .= ' WHERE 1 = 1';
+        }
+        // usage with empty id and empty ref is very rare
+        if ($morewhere) {
+            $sql .= $morewhere;
+        }
         $sql .= ' LIMIT 1';    // This is a fetch, to be sure to get only one record
 
         $res = $this->db->query($sql);
@@ -1535,9 +1680,13 @@ 
      */
     protected function quote($value, $fieldsentry)
     {
-        if (is_null($value)) return 'NULL';
-        else if (preg_match('/^(int|double|real)/i', $fieldsentry['type'])) return $this->db->escape("$value");
-        else return "'" . $this->db->escape($value) . "'";
+        if (is_null($value)) {
+            return 'NULL';
+        } else if (preg_match('/^(int|double|real)/i', $fieldsentry['type'])) {
+            return $this->db->escape("$value");
+        } else {
+            return "'" . $this->db->escape($value) . "'";
+        }
     }
 
     /**
@@ -1550,19 +1699,27 @@ 
     {
         foreach ($this->fields as $field => $info) {
             if ($this->isDate($info)) {
-                if (empty($obj->{$field}) || $obj->{$field} === '0000-00-00 00:00:00' || $obj->{$field} === '1000-01-01 00:00:00') $this->{$field} = 0;
-                else $this->{$field} = strtotime($obj->{$field});
+                if (empty($obj->{$field}) || $obj->{$field} === '0000-00-00 00:00:00' || $obj->{$field} === '1000-01-01 00:00:00') {
+                    $this->{$field} = 0;
+                } else {
+                    $this->{$field} = strtotime($obj->{$field});
+                }
             } elseif ($this->isArray($info)) {
                 if (!empty($obj->{$field})) {
                     $this->{$field} = @unserialize($obj->{$field});
                     // Hack for data not in UTF8
-                    if ($this->{$field} === false) @unserialize(utf8_decode($obj->{$field}));
+                    if ($this->{$field} === false) {
+                        @unserialize(utf8_decode($obj->{$field}));
+                    }
                 } else {
                     $this->{$field} = array();
                 }
             } elseif ($this->isInt($info)) {
-                if ($field == 'rowid') $this->id = (int)$obj->{$field};
-                else $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};
             } elseif ($this->isNull($info)) {
@@ -1575,7 +1732,9 @@ 
         }
 
         // If there is no 'ref' field, we force property ->ref to ->id for a better compatibility with common functions.
-        if (!isset($this->fields['ref']) && isset($this->id)) $this->ref = $this->id;
+        if (!isset($this->fields['ref']) && isset($this->id)) {
+            $this->ref = $this->id;
+        }
     }
 
     /**
@@ -1586,8 +1745,11 @@ 
      */
     public function isDate($info)
     {
-        if (isset($info['type']) && ($info['type'] == 'date' || $info['type'] == 'datetime' || $info['type'] == 'timestamp')) return true;
-        else return false;
+        if (isset($info['type']) && ($info['type'] == 'date' || $info['type'] == 'datetime' || $info['type'] == 'timestamp')) {
+            return true;
+        } else {
+            return false;
+        }
     }
 
     /**
@@ -1599,9 +1761,14 @@ 
     protected function isArray($info)
     {
         if (is_array($info)) {
-            if (isset($info['type']) && $info['type'] == 'array') return true;
-            else return false;
-        } else return false;
+            if (isset($info['type']) && $info['type'] == 'array') {
+                return true;
+            } else {
+                return false;
+            }
+        } else {
+            return false;
+        }
     }
 
     /**
@@ -1613,9 +1780,14 @@ 
     public function isInt($info)
     {
         if (is_array($info)) {
-            if (isset($info['type']) && ($info['type'] == 'int' || preg_match('/^integer/i', $info['type']))) return true;
-            else return false;
-        } else return false;
+            if (isset($info['type']) && ($info['type'] == 'int' || preg_match('/^integer/i', $info['type']))) {
+                return true;
+            } else {
+                return false;
+            }
+        } else {
+            return false;
+        }
     }
 
     /**
@@ -1627,9 +1799,14 @@ 
     public function isFloat($info)
     {
         if (is_array($info)) {
-            if (isset($info['type']) && (preg_match('/^(double|real)/i', $info['type']))) return true;
-            else return false;
-        } else return false;
+            if (isset($info['type']) && (preg_match('/^(double|real)/i', $info['type']))) {
+                return true;
+            } else {
+                return false;
+            }
+        } else {
+            return false;
+        }
     }
 
     /**
@@ -1641,9 +1818,14 @@ 
     protected function isNull($info)
     {
         if (is_array($info)) {
-            if (isset($info['type']) && $info['type'] == 'null') return true;
-            else return false;
-        } else return false;
+            if (isset($info['type']) && $info['type'] == 'null') {
+                return true;
+            } else {
+                return false;
+            }
+        } else {
+            return false;
+        }
     }
 
     /**
@@ -1663,35 +1845,65 @@ 
             dol_print_error('', get_class($this) . "::load_previous_next_ref was called on objet with property table_element not defined");
             return -1;
         }
-        if ($fieldid == 'none') return 1;
+        if ($fieldid == 'none') {
+            return 1;
+        }
 
         // Security on socid
         $socid = 0;
-        if ($user->societe_id > 0) $socid = $user->societe_id;
+        if ($user->societe_id > 0) {
+            $socid = $user->societe_id;
+        }
 
         // this->ismultientitymanaged contains
         // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
         $alias = 's';
-        if ($this->element == 'societe') $alias = 'te';
+        if ($this->element == 'societe') {
+            $alias = 'te';
+        }
 
         $sql = "SELECT MAX(te." . $fieldid . ")";
         $sql .= " FROM " . (empty($nodbprefix) ? MAIN_DB_PREFIX : '') . $this->table_element . " as te";
         if ($this->element == 'user' && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
             $sql .= "," . MAIN_DB_PREFIX . "usergroup_user as ug";
         }
-        if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) $sql .= ", " . MAIN_DB_PREFIX . "societe as s";    // If we need to link to societe to limit select to entity
-        else if ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql .= ", " . MAIN_DB_PREFIX . "societe as s";    // If we need to link to societe to limit select to socid
-        else if ($this->restrictiononfksoc == 2 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe as s ON te.fk_soc = s.rowid";    // If we need to link to societe to limit select to socid
-        if ($this->restrictiononfksoc && !$user->rights->societe->client->voir && !$socid) $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe_commerciaux as sc ON " . $alias . ".rowid = sc.fk_soc";
+        if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) {
+            $sql .= ", " . MAIN_DB_PREFIX . "societe as s";
+        }
+        // If we need to link to societe to limit select to entity
+        else if ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) {
+            $sql .= ", " . MAIN_DB_PREFIX . "societe as s";
+        }
+        // If we need to link to societe to limit select to socid
+        else if ($this->restrictiononfksoc == 2 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) {
+            $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe as s ON te.fk_soc = s.rowid";
+        }
+        // If we need to link to societe to limit select to socid
+        if ($this->restrictiononfksoc && !$user->rights->societe->client->voir && !$socid) {
+            $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe_commerciaux as sc ON " . $alias . ".rowid = sc.fk_soc";
+        }
         $sql .= " WHERE te." . $fieldid . " < '" . $this->db->escape($this->ref) . "'";  // ->ref must always be defined (set to id if field does not exists)
-        if ($this->restrictiononfksoc == 1 && !$user->rights->societe->client->voir && !$socid) $sql .= " AND sc.fk_user = " . $user->id;
-        if ($this->restrictiononfksoc == 2 && !$user->rights->societe->client->voir && !$socid) $sql .= " AND (sc.fk_user = " . $user->id . ' OR te.fk_soc IS NULL)';
+        if ($this->restrictiononfksoc == 1 && !$user->rights->societe->client->voir && !$socid) {
+            $sql .= " AND sc.fk_user = " . $user->id;
+        }
+        if ($this->restrictiononfksoc == 2 && !$user->rights->societe->client->voir && !$socid) {
+            $sql .= " AND (sc.fk_user = " . $user->id . ' OR te.fk_soc IS NULL)';
+        }
         if (!empty($filter)) {
-            if (!preg_match('/^\s*AND/i', $filter)) $sql .= " AND ";   // For backward compatibility
+            if (!preg_match('/^\s*AND/i', $filter)) {
+                $sql .= " AND ";
+            }
+            // For backward compatibility
             $sql .= $filter;
         }
-        if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) $sql .= ' AND te.fk_soc = s.rowid';            // If we need to link to societe to limit select to entity
-        else if ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql .= ' AND te.fk_soc = s.rowid';            // If we need to link to societe to limit select to socid
+        if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) {
+            $sql .= ' AND te.fk_soc = s.rowid';
+        }
+        // If we need to link to societe to limit select to entity
+        else if ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) {
+            $sql .= ' AND te.fk_soc = s.rowid';
+        }
+        // If we need to link to societe to limit select to socid
         if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) {
             if ($this->element == 'user' && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
                 if (!empty($user->admin) && empty($user->entity) && $conf->entity == 1) {
@@ -1704,9 +1916,15 @@ 
                 $sql .= ' AND te.entity IN (' . getEntity($this->element) . ')';
             }
         }
-        if ($this->restrictiononfksoc == 1 && $socid && $this->element != 'societe') $sql .= ' AND te.fk_soc = ' . $socid;
-        if ($this->restrictiononfksoc == 2 && $socid && $this->element != 'societe') $sql .= ' AND (te.fk_soc = ' . $socid . ' OR te.fk_soc IS NULL)';
-        if ($this->restrictiononfksoc && $socid && $this->element == 'societe') $sql .= ' AND te.rowid = ' . $socid;
+        if ($this->restrictiononfksoc == 1 && $socid && $this->element != 'societe') {
+            $sql .= ' AND te.fk_soc = ' . $socid;
+        }
+        if ($this->restrictiononfksoc == 2 && $socid && $this->element != 'societe') {
+            $sql .= ' AND (te.fk_soc = ' . $socid . ' OR te.fk_soc IS NULL)';
+        }
+        if ($this->restrictiononfksoc && $socid && $this->element == 'societe') {
+            $sql .= ' AND te.rowid = ' . $socid;
+        }
         //print 'socid='.$socid.' restrictiononfksoc='.$this->restrictiononfksoc.' ismultientitymanaged = '.$this->ismultientitymanaged.' filter = '.$filter.' -> '.$sql."<br>";
 
         $result = $this->db->query($sql);
@@ -1723,19 +1941,43 @@ 
         if ($this->element == 'user' && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
             $sql .= "," . MAIN_DB_PREFIX . "usergroup_user as ug";
         }
-        if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) $sql .= ", " . MAIN_DB_PREFIX . "societe as s";    // If we need to link to societe to limit select to entity
-        else if ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql .= ", " . MAIN_DB_PREFIX . "societe as s";    // If we need to link to societe to limit select to socid
-        else if ($this->restrictiononfksoc == 2 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe as s ON te.fk_soc = s.rowid";    // If we need to link to societe to limit select to socid
-        if ($this->restrictiononfksoc && !$user->rights->societe->client->voir && !$socid) $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe_commerciaux as sc ON " . $alias . ".rowid = sc.fk_soc";
+        if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) {
+            $sql .= ", " . MAIN_DB_PREFIX . "societe as s";
+        }
+        // If we need to link to societe to limit select to entity
+        else if ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) {
+            $sql .= ", " . MAIN_DB_PREFIX . "societe as s";
+        }
+        // If we need to link to societe to limit select to socid
+        else if ($this->restrictiononfksoc == 2 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) {
+            $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe as s ON te.fk_soc = s.rowid";
+        }
+        // If we need to link to societe to limit select to socid
+        if ($this->restrictiononfksoc && !$user->rights->societe->client->voir && !$socid) {
+            $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe_commerciaux as sc ON " . $alias . ".rowid = sc.fk_soc";
+        }
         $sql .= " WHERE te." . $fieldid . " > '" . $this->db->escape($this->ref) . "'";  // ->ref must always be defined (set to id if field does not exists)
-        if ($this->restrictiononfksoc == 1 && !$user->rights->societe->client->voir && !$socid) $sql .= " AND sc.fk_user = " . $user->id;
-        if ($this->restrictiononfksoc == 2 && !$user->rights->societe->client->voir && !$socid) $sql .= " AND (sc.fk_user = " . $user->id . ' OR te.fk_soc IS NULL)';
+        if ($this->restrictiononfksoc == 1 && !$user->rights->societe->client->voir && !$socid) {
+            $sql .= " AND sc.fk_user = " . $user->id;
+        }
+        if ($this->restrictiononfksoc == 2 && !$user->rights->societe->client->voir && !$socid) {
+            $sql .= " AND (sc.fk_user = " . $user->id . ' OR te.fk_soc IS NULL)';
+        }
         if (!empty($filter)) {
-            if (!preg_match('/^\s*AND/i', $filter)) $sql .= " AND ";   // For backward compatibility
+            if (!preg_match('/^\s*AND/i', $filter)) {
+                $sql .= " AND ";
+            }
+            // For backward compatibility
             $sql .= $filter;
         }
-        if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) $sql .= ' AND te.fk_soc = s.rowid';            // If we need to link to societe to limit select to entity
-        else if ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql .= ' AND te.fk_soc = s.rowid';            // If we need to link to societe to limit select to socid
+        if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) {
+            $sql .= ' AND te.fk_soc = s.rowid';
+        }
+        // If we need to link to societe to limit select to entity
+        else if ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) {
+            $sql .= ' AND te.fk_soc = s.rowid';
+        }
+        // If we need to link to societe to limit select to socid
         if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) {
             if ($this->element == 'user' && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
                 if (!empty($user->admin) && empty($user->entity) && $conf->entity == 1) {
@@ -1748,9 +1990,15 @@ 
                 $sql .= ' AND te.entity IN (' . getEntity($this->element) . ')';
             }
         }
-        if ($this->restrictiononfksoc == 1 && $socid && $this->element != 'societe') $sql .= ' AND te.fk_soc = ' . $socid;
-        if ($this->restrictiononfksoc == 2 && $socid && $this->element != 'societe') $sql .= ' AND (te.fk_soc = ' . $socid . ' OR te.fk_soc IS NULL)';
-        if ($this->restrictiononfksoc && $socid && $this->element == 'societe') $sql .= ' AND te.rowid = ' . $socid;
+        if ($this->restrictiononfksoc == 1 && $socid && $this->element != 'societe') {
+            $sql .= ' AND te.fk_soc = ' . $socid;
+        }
+        if ($this->restrictiononfksoc == 2 && $socid && $this->element != 'societe') {
+            $sql .= ' AND (te.fk_soc = ' . $socid . ' OR te.fk_soc IS NULL)';
+        }
+        if ($this->restrictiononfksoc && $socid && $this->element == 'societe') {
+            $sql .= ' AND te.rowid = ' . $socid;
+        }
         //print 'socid='.$socid.' restrictiononfksoc='.$this->restrictiononfksoc.' ismultientitymanaged = '.$this->ismultientitymanaged.' filter = '.$filter.' -> '.$sql."<br>";
         // Rem: Bug in some mysql version: SELECT MIN(rowid) FROM llx_socpeople WHERE rowid > 1 when one row in database with rowid=1, returns 1 instead of null
 
@@ -1784,8 +2032,11 @@ 
         $num = count($tab);
         $i = 0;
         while ($i < $num) {
-            if ($source == 'thirdparty') $contactAlreadySelected[$i] = $tab[$i]['socid'];
-            else  $contactAlreadySelected[$i] = $tab[$i]['id'];
+            if ($source == 'thirdparty') {
+                $contactAlreadySelected[$i] = $tab[$i]['socid'];
+            } else {
+                $contactAlreadySelected[$i] = $tab[$i]['id'];
+            }
             $i++;
         }
         return $contactAlreadySelected;
@@ -1806,12 +2057,18 @@ 
 
         $sql = 'UPDATE ' . MAIN_DB_PREFIX . $this->table_element;
         if ($this->table_element == 'actioncomm') {
-            if ($projectid) $sql .= ' SET fk_project = ' . $projectid;
-            else $sql .= ' SET fk_project = NULL';
+            if ($projectid) {
+                $sql .= ' SET fk_project = ' . $projectid;
+            } else {
+                $sql .= ' SET fk_project = NULL';
+            }
             $sql .= ' WHERE id = ' . $this->id;
         } else {
-            if ($projectid) $sql .= ' SET fk_projet = ' . $projectid;
-            else $sql .= ' SET fk_projet = NULL';
+            if ($projectid) {
+                $sql .= ' SET fk_projet = ' . $projectid;
+            } else {
+                $sql .= ' SET fk_projet = NULL';
+            }
             $sql .= ' WHERE rowid = ' . $this->id;
         }
 
@@ -1839,8 +2096,12 @@ 
         if ($this->statut >= 0 || $this->element == 'societe') {
             // TODO uniformize field name
             $fieldname = 'fk_mode_reglement';
-            if ($this->element == 'societe') $fieldname = 'mode_reglement';
-            if (get_class($this) == 'Fournisseur') $fieldname = 'mode_reglement_supplier';
+            if ($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;
@@ -1849,7 +2110,9 @@ 
             if ($this->db->query($sql)) {
                 $this->mode_reglement_id = $id;
                 // for supplier
-                if (get_class($this) == 'Fournisseur') $this->mode_reglement_supplier_id = $id;
+                if (get_class($this) == 'Fournisseur') {
+                    $this->mode_reglement_supplier_id = $id;
+                }
                 return 1;
             } else {
                 dol_syslog(get_class($this) . '::setPaymentMethods Erreur ' . $sql . ' - ' . $this->db->error());
@@ -1885,7 +2148,9 @@ 
                 $this->multicurrency_code = $code;
 
                 list($fk_multicurrency, $rate) = MultiCurrency::getIdAndTxFromCode($this->db, $code);
-                if ($rate) $this->setMulticurrencyRate($rate, 2);
+                if ($rate) {
+                    $this->setMulticurrencyRate($rate, 2);
+                }
 
                 return 1;
             } else {
@@ -2008,8 +2273,12 @@ 
         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';
+            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;
@@ -2018,7 +2287,9 @@ 
             if ($this->db->query($sql)) {
                 $this->cond_reglement_id = $id;
                 // for supplier
-                if (get_class($this) == 'Fournisseur') $this->cond_reglement_supplier_id = $id;
+                if (get_class($this) == 'Fournisseur') {
+                    $this->cond_reglement_supplier_id = $id;
+                }
                 $this->cond_reglement = $id;    // for compatibility
                 return 1;
             } else {
@@ -2043,7 +2314,9 @@ 
     function setDeliveryAddress($id)
     {
         $fieldname = 'fk_delivery_address';
-        if ($this->element == 'delivery' || $this->element == 'shipping') $fieldname = 'fk_address';
+        if ($this->element == 'delivery' || $this->element == 'shipping') {
+            $fieldname = 'fk_address';
+        }
 
         $sql = "UPDATE " . MAIN_DB_PREFIX . $this->table_element . " SET " . $fieldname . " = " . $id;
         $sql .= " WHERE rowid = " . $this->id . " AND fk_statut = 0";
@@ -2071,7 +2344,9 @@ 
     {
         global $user;
 
-        if (empty($userused)) $userused = $user;
+        if (empty($userused)) {
+            $userused = $user;
+        }
 
         $error = 0;
 
@@ -2082,7 +2357,9 @@ 
 
         $this->db->begin();
 
-        if ($shipping_method_id < 0) $shipping_method_id = 'NULL';
+        if ($shipping_method_id < 0) {
+            $shipping_method_id = 'NULL';
+        }
         dol_syslog(get_class($this) . '::setShippingMethod(' . $shipping_method_id . ')');
 
         $sql = "UPDATE " . MAIN_DB_PREFIX . $this->table_element;
@@ -2098,7 +2375,9 @@ 
                 // Call trigger
                 $this->context = array('shippingmethodupdate' => 1);
                 $result = $this->call_trigger(strtoupper(get_class($this)) . '_MODIFY', $userused);
-                if ($result < 0) $error++;
+                if ($result < 0) {
+                    $error++;
+                }
                 // End call trigger
             }
         }
@@ -2124,7 +2403,9 @@ 
             dol_syslog(get_class($this) . "::setWarehouse was called on objet with property table_element not defined", LOG_ERR);
             return -1;
         }
-        if ($warehouse_id < 0) $warehouse_id = 'NULL';
+        if ($warehouse_id < 0) {
+            $warehouse_id = 'NULL';
+        }
         dol_syslog(get_class($this) . '::setWarehouse(' . $warehouse_id . ')');
 
         $sql = "UPDATE " . MAIN_DB_PREFIX . $this->table_element;
@@ -2188,7 +2469,9 @@ 
     {
         global $user;
 
-        if (empty($userused)) $userused = $user;
+        if (empty($userused)) {
+            $userused = $user;
+        }
 
         $error = 0;
 
@@ -2198,7 +2481,9 @@ 
         }
         $this->db->begin();
 
-        if ($fk_account < 0) $fk_account = 'NULL';
+        if ($fk_account < 0) {
+            $fk_account = 'NULL';
+        }
         dol_syslog(get_class($this) . '::setBankAccount(' . $fk_account . ')');
 
         $sql = "UPDATE " . MAIN_DB_PREFIX . $this->table_element;
@@ -2215,7 +2500,9 @@ 
                 // Call trigger
                 $this->context = array('bankaccountupdate' => 1);
                 $result = $this->call_trigger(strtoupper(get_class($this)) . '_MODIFY', $userused);
-                if ($result < 0) $error++;
+                if ($result < 0) {
+                    $error++;
+                }
                 // End call trigger
             }
         }
@@ -2277,15 +2564,21 @@ 
         $nl = 0;
         $sql = 'SELECT count(rowid) FROM ' . MAIN_DB_PREFIX . $this->table_element_line;
         $sql .= ' WHERE ' . $this->fk_element . '=' . $this->id;
-        if (!$renum) $sql .= ' AND rang = 0';
-        if ($renum) $sql .= ' AND rang <> 0';
+        if (!$renum) {
+            $sql .= ' AND rang = 0';
+        }
+        if ($renum) {
+            $sql .= ' AND rang <> 0';
+        }
 
         dol_syslog(get_class($this) . "::line_order", LOG_DEBUG);
         $resql = $this->db->query($sql);
         if ($resql) {
             $row = $this->db->fetch_row($resql);
             $nl = $row[0];
-        } else dol_print_error($this->db);
+        } else {
+            dol_print_error($this->db);
+        }
         if ($nl > 0) {
             // The goal of this part is to reorder all lines, with all children lines sharing the same
             // counter that parents.
@@ -2294,7 +2587,9 @@ 
             // We first search all lines that are parent lines (for multilevel details lines)
             $sql = 'SELECT rowid FROM ' . MAIN_DB_PREFIX . $this->table_element_line;
             $sql .= ' WHERE ' . $this->fk_element . ' = ' . $this->id;
-            if ($fk_parent_line) $sql .= ' AND fk_parent_line IS NULL';
+            if ($fk_parent_line) {
+                $sql .= ' AND fk_parent_line IS NULL';
+            }
             $sql .= ' ORDER BY rang ASC, rowid ' . $rowidorder;
 
             dol_syslog(get_class($this) . "::line_order search all parent lines", LOG_DEBUG);
@@ -2371,7 +2666,9 @@ 
     function updateRangOfLine($rowid, $rang)
     {
         $fieldposition = 'rang';
-        if (in_array($this->table_element_line, array('ecm_files', 'emailcollector_emailcollectoraction'))) $fieldposition = 'position';
+        if (in_array($this->table_element_line, array('ecm_files', 'emailcollector_emailcollectoraction'))) {
+            $fieldposition = 'position';
+        }
 
         $sql = 'UPDATE ' . MAIN_DB_PREFIX . $this->table_element_line . ' SET ' . $fieldposition . ' = ' . $rang;
         $sql .= ' WHERE rowid = ' . $rowid;
@@ -2414,7 +2711,9 @@ 
     {
         if ($rang > 1) {
             $fieldposition = 'rang';
-            if (in_array($this->table_element_line, array('ecm_files', 'emailcollector_emailcollectoraction'))) $fieldposition = 'position';
+            if (in_array($this->table_element_line, array('ecm_files', 'emailcollector_emailcollectoraction'))) {
+                $fieldposition = 'position';
+            }
 
             $sql = 'UPDATE ' . MAIN_DB_PREFIX . $this->table_element_line . ' SET ' . $fieldposition . ' = ' . $rang;
             $sql .= ' WHERE ' . $this->fk_element . ' = ' . $this->id;
@@ -2504,7 +2803,9 @@ 
     {
         if ($rang < $max) {
             $fieldposition = 'rang';
-            if (in_array($this->table_element_line, array('ecm_files', 'emailcollector_emailcollectoraction'))) $fieldposition = 'position';
+            if (in_array($this->table_element_line, array('ecm_files', 'emailcollector_emailcollectoraction'))) {
+                $fieldposition = 'position';
+            }
 
             $sql = 'UPDATE ' . MAIN_DB_PREFIX . $this->table_element_line . ' SET ' . $fieldposition . ' = ' . $rang;
             $sql .= ' WHERE ' . $this->fk_element . ' = ' . $this->id;
@@ -2620,7 +2921,9 @@ 
         }
         // Special cas
         //var_dump($this->table_element);exit;
-        if ($this->table_element == 'product') $suffix = '';
+        if ($this->table_element == 'product') {
+            $suffix = '';
+        }
 
         $sql = 'UPDATE ' . MAIN_DB_PREFIX . $this->table_element;
         $sql .= " SET note" . $suffix . " = " . (!empty($note) ? ("'" . $this->db->escape($note) . "'") : "NULL");
@@ -2629,9 +2932,11 @@ 
 
         dol_syslog(get_class($this) . "::update_note", LOG_DEBUG);
         if ($this->db->query($sql)) {
-            if ($suffix == '_public') $this->note_public = $note;
-            else if ($suffix == '_private') $this->note_private = $note;
-            else {
+            if ($suffix == '_public') {
+                $this->note_public = $note;
+            } else if ($suffix == '_private') {
+                $this->note_private = $note;
+            } else {
                 $this->note = $note;      // deprecated
                 $this->note_private = $note;
             }
@@ -2659,36 +2964,45 @@ 
 
         // Some external module want no update price after a trigger because they have another method to calculate the total (ex: with an extrafield)
         $MODULE = "";
-        if ($this->element == 'propal')
-            $MODULE = "MODULE_DISALLOW_UPDATE_PRICE_PROPOSAL";
-        elseif ($this->element == 'order')
-            $MODULE = "MODULE_DISALLOW_UPDATE_PRICE_ORDER";
-        elseif ($this->element == 'facture')
-            $MODULE = "MODULE_DISALLOW_UPDATE_PRICE_INVOICE";
-        elseif ($this->element == 'facture_fourn')
-            $MODULE = "MODULE_DISALLOW_UPDATE_PRICE_SUPPLIER_INVOICE";
-        elseif ($this->element == 'order_supplier')
-            $MODULE = "MODULE_DISALLOW_UPDATE_PRICE_SUPPLIER_ORDER";
-        elseif ($this->element == 'supplier_proposal')
-            $MODULE = "MODULE_DISALLOW_UPDATE_PRICE_SUPPLIER_PROPOSAL";
+        if ($this->element == 'propal') {
+                    $MODULE = "MODULE_DISALLOW_UPDATE_PRICE_PROPOSAL";
+        } elseif ($this->element == 'order') {
+                    $MODULE = "MODULE_DISALLOW_UPDATE_PRICE_ORDER";
+        } elseif ($this->element == 'facture') {
+                    $MODULE = "MODULE_DISALLOW_UPDATE_PRICE_INVOICE";
+        } elseif ($this->element == 'facture_fourn') {
+                    $MODULE = "MODULE_DISALLOW_UPDATE_PRICE_SUPPLIER_INVOICE";
+        } elseif ($this->element == 'order_supplier') {
+                    $MODULE = "MODULE_DISALLOW_UPDATE_PRICE_SUPPLIER_ORDER";
+        } elseif ($this->element == 'supplier_proposal') {
+                    $MODULE = "MODULE_DISALLOW_UPDATE_PRICE_SUPPLIER_PROPOSAL";
+        }
 
         if (!empty($MODULE)) {
             if (!empty($conf->global->$MODULE)) {
                 $modsactivated = explode(',', $conf->global->$MODULE);
                 foreach ($modsactivated as $mod) {
-                    if ($conf->$mod->enabled)
-                        return 1; // update was disabled by specific setup
+                    if ($conf->$mod->enabled) {
+                                            return 1;
+                    }
+                    // update was disabled by specific setup
                 }
             }
         }
 
         include_once DOL_DOCUMENT_ROOT . '/core/lib/price.lib.php';
 
-        if ($roundingadjust == '-1') $roundingadjust = 'auto';    // For backward compatibility
+        if ($roundingadjust == '-1') {
+            $roundingadjust = 'auto';
+        }
+        // For backward compatibility
 
         $forcedroundingmode = $roundingadjust;
-        if ($forcedroundingmode == 'auto' && isset($conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND)) $forcedroundingmode = $conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND;
-        elseif ($forcedroundingmode == 'auto') $forcedroundingmode = '0';
+        if ($forcedroundingmode == 'auto' && isset($conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND)) {
+            $forcedroundingmode = $conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND;
+        } elseif ($forcedroundingmode == 'auto') {
+            $forcedroundingmode = '0';
+        }
 
         $error = 0;
 
@@ -2709,14 +3023,21 @@ 
 
         $sql = 'SELECT rowid, qty, ' . $fieldup . ' as up, remise_percent, total_ht, ' . $fieldtva . ' as total_tva, total_ttc, ' . $fieldlocaltax1 . ' as total_localtax1, ' . $fieldlocaltax2 . ' as total_localtax2,';
         $sql .= ' tva_tx as vatrate, localtax1_tx, localtax2_tx, localtax1_type, localtax2_type, info_bits, product_type';
-        if ($this->table_element_line == 'facturedet') $sql .= ', situation_percent';
+        if ($this->table_element_line == 'facturedet') {
+            $sql .= ', situation_percent';
+        }
         $sql .= ', multicurrency_total_ht, multicurrency_total_tva, multicurrency_total_ttc';
         $sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element_line;
         $sql .= ' WHERE ' . $this->fk_element . ' = ' . $this->id;
         if ($exclspec) {
             $product_field = 'product_type';
-            if ($this->table_element_line == 'contratdet') $product_field = '';    // contratdet table has no product_type field
-            if ($product_field) $sql .= ' AND ' . $product_field . ' <> 9';
+            if ($this->table_element_line == 'contratdet') {
+                $product_field = '';
+            }
+            // contratdet table has no product_type field
+            if ($product_field) {
+                $sql .= ' AND ' . $product_field . ' <> 9';
+            }
         }
         $sql .= ' ORDER by rowid';    // We want to be sure to always use same order of line to not change lines differently when option MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND is used
 
@@ -2744,16 +3065,20 @@ 
                 $parameters = array('fk_element' => $obj->rowid);
                 $reshook = $hookmanager->executeHooks('changeRoundingMode', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 
-                if (empty($reshook) && $forcedroundingmode == '0')    // Check if data on line are consistent. This may solve lines that were not consistent because set with $forcedroundingmode='auto'
+                if (empty($reshook) && $forcedroundingmode == '0') {
+                    // Check if data on line are consistent. This may solve lines that were not consistent because set with $forcedroundingmode='auto'
                 {
                     $localtax_array = array($obj->localtax1_type, $obj->localtax1_tx, $obj->localtax2_type, $obj->localtax2_tx);
+                }
                     $tmpcal = calcul_price_total($obj->qty, $obj->up, $obj->remise_percent, $obj->vatrate, $obj->localtax1_tx, $obj->localtax2_tx, 0, 'HT', $obj->info_bits, $obj->product_type, $seller, $localtax_array, (isset($obj->situation_percent) ? $obj->situation_percent : 100), $multicurrency_tx);
                     $diff = price2num($tmpcal[1] - $obj->total_tva, 'MT', 1);
                     if ($diff) {
                         $sqlfix = "UPDATE " . MAIN_DB_PREFIX . $this->table_element_line . " SET " . $fieldtva . " = " . $tmpcal[1] . ", total_ttc = " . $tmpcal[2] . " WHERE rowid = " . $obj->rowid;
                         dol_syslog('We found unconsistent data into detailed line (difference of ' . $diff . ') for line rowid = ' . $obj->rowid . " (total vat of line calculated=" . $tmpcal[1] . ", database=" . $obj->total_tva . "). We fix the total_vat and total_ttc of line by running sqlfix = " . $sqlfix);
                         $resqlfix = $this->db->query($sqlfix);
-                        if (!$resqlfix) dol_print_error($this->db, 'Failed to update line');
+                        if (!$resqlfix) {
+                            dol_print_error($this->db, 'Failed to update line');
+                        }
                         $obj->total_tva = $tmpcal[1];
                         $obj->total_ttc = $tmpcal[2];
                         //
@@ -2769,16 +3094,24 @@ 
                 $this->multicurrency_total_tva += $obj->multicurrency_total_tva;
                 $this->multicurrency_total_ttc += $obj->multicurrency_total_ttc;
 
-                if (!isset($total_ht_by_vats[$obj->vatrate])) $total_ht_by_vats[$obj->vatrate] = 0;
-                if (!isset($total_tva_by_vats[$obj->vatrate])) $total_tva_by_vats[$obj->vatrate] = 0;
-                if (!isset($total_ttc_by_vats[$obj->vatrate])) $total_ttc_by_vats[$obj->vatrate] = 0;
+                if (!isset($total_ht_by_vats[$obj->vatrate])) {
+                    $total_ht_by_vats[$obj->vatrate] = 0;
+                }
+                if (!isset($total_tva_by_vats[$obj->vatrate])) {
+                    $total_tva_by_vats[$obj->vatrate] = 0;
+                }
+                if (!isset($total_ttc_by_vats[$obj->vatrate])) {
+                    $total_ttc_by_vats[$obj->vatrate] = 0;
+                }
                 $total_ht_by_vats[$obj->vatrate] += $obj->total_ht;
                 $total_tva_by_vats[$obj->vatrate] += $obj->total_tva;
                 $total_ttc_by_vats[$obj->vatrate] += $obj->total_ttc;
 
-                if ($forcedroundingmode == '1')    // Check if we need adjustement onto line for vat. TODO This works on the company currency but not on multicurrency
+                if ($forcedroundingmode == '1') {
+                    // Check if we need adjustement onto line for vat. TODO This works on the company currency but not on multicurrency
                 {
                     $tmpvat = price2num($total_ht_by_vats[$obj->vatrate] * $obj->vatrate / 100, 'MT', 1);
+                }
                     $diff = price2num($total_tva_by_vats[$obj->vatrate] - $tmpvat, 'MT', 1);
                     //print 'Line '.$i.' rowid='.$obj->rowid.' vat_rate='.$obj->vatrate.' total_ht='.$obj->total_ht.' total_tva='.$obj->total_tva.' total_ttc='.$obj->total_ttc.' total_ht_by_vats='.$total_ht_by_vats[$obj->vatrate].' total_tva_by_vats='.$total_tva_by_vats[$obj->vatrate].' (new calculation = '.$tmpvat.') total_ttc_by_vats='.$total_ttc_by_vats[$obj->vatrate].($diff?" => DIFF":"")."<br>\n";
                     if ($diff) {
@@ -2789,7 +3122,9 @@ 
                         $sqlfix = "UPDATE " . MAIN_DB_PREFIX . $this->table_element_line . " SET " . $fieldtva . " = " . ($obj->total_tva - $diff) . ", total_ttc = " . ($obj->total_ttc - $diff) . " WHERE rowid = " . $obj->rowid;
                         dol_syslog('We found a difference of ' . $diff . ' for line rowid = ' . $obj->rowid . ". We fix the total_vat and total_ttc of line by running sqlfix = " . $sqlfix);
                         $resqlfix = $this->db->query($sqlfix);
-                        if (!$resqlfix) dol_print_error($this->db, 'Failed to update line');
+                        if (!$resqlfix) {
+                            dol_print_error($this->db, 'Failed to update line');
+                        }
                         $this->total_tva -= $diff;
                         $this->total_ttc -= $diff;
                         $total_tva_by_vats[$obj->vatrate] -= $diff;
@@ -2829,11 +3164,21 @@ 
             $fieldlocaltax2 = 'localtax2';
             $fieldttc = 'total_ttc';
             // Specific code for backward compatibility with old field names
-            if ($this->element == 'facture' || $this->element == 'facturerec') $fieldht = 'total';
-            if ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier') $fieldtva = 'total_tva';
-            if ($this->element == 'propal') $fieldttc = 'total';
-            if ($this->element == 'expensereport') $fieldtva = 'total_tva';
-            if ($this->element == 'supplier_proposal') $fieldttc = 'total';
+            if ($this->element == 'facture' || $this->element == 'facturerec') {
+                $fieldht = 'total';
+            }
+            if ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier') {
+                $fieldtva = 'total_tva';
+            }
+            if ($this->element == 'propal') {
+                $fieldttc = 'total';
+            }
+            if ($this->element == 'expensereport') {
+                $fieldtva = 'total_tva';
+            }
+            if ($this->element == 'supplier_proposal') {
+                $fieldttc = 'total';
+            }
 
             if (empty($nodatabaseupdate)) {
                 $sql = 'UPDATE ' . MAIN_DB_PREFIX . $this->table_element . ' SET';
@@ -2883,10 +3228,18 @@ 
         $origin_id = (!empty($origin_id) ? $origin_id : $this->origin_id);
 
         // Special case
-        if ($origin == 'order') $origin = 'commande';
-        if ($origin == 'invoice') $origin = 'facture';
-        if ($origin == 'invoice_template') $origin = 'facturerec';
-        if ($origin == 'supplierorder') $origin = 'order_supplier';
+        if ($origin == 'order') {
+            $origin = 'commande';
+        }
+        if ($origin == 'invoice') {
+            $origin = 'facture';
+        }
+        if ($origin == 'invoice_template') {
+            $origin = 'facturerec';
+        }
+        if ($origin == 'supplierorder') {
+            $origin = 'order_supplier';
+        }
         $this->db->begin();
 
         $sql = "INSERT INTO " . MAIN_DB_PREFIX . "element_element (";
@@ -2951,11 +3304,15 @@ 
 
         if (!empty($sourceid) && !empty($sourcetype) && empty($targetid)) {
             $justsource = true;  // the source (id and type) is a search criteria
-            if (!empty($targettype)) $withtargettype = true;
+            if (!empty($targettype)) {
+                $withtargettype = true;
+            }
         }
         if (!empty($targetid) && !empty($targettype) && empty($sourceid)) {
             $justtarget = true;  // the target (id and type) is a search criteria
-            if (!empty($sourcetype)) $withsourcetype = true;
+            if (!empty($sourcetype)) {
+                $withsourcetype = true;
+            }
         }
 
         $sourceid = (!empty($sourceid) ? $sourceid : $this->id);
@@ -2976,10 +3333,14 @@ 
         if ($justsource || $justtarget) {
             if ($justsource) {
                 $sql .= "fk_source = " . $sourceid . " AND sourcetype = '" . $sourcetype . "'";
-                if ($withtargettype) $sql .= " AND targettype = '" . $targettype . "'";
+                if ($withtargettype) {
+                    $sql .= " AND targettype = '" . $targettype . "'";
+                }
             } else if ($justtarget) {
                 $sql .= "fk_target = " . $targetid . " AND targettype = '" . $targettype . "'";
-                if ($withsourcetype) $sql .= " AND sourcetype = '" . $sourcetype . "'";
+                if ($withsourcetype) {
+                    $sql .= " AND sourcetype = '" . $sourcetype . "'";
+                }
             }
         } else {
             $sql .= "(fk_source = " . $sourceid . " AND sourcetype = '" . $sourcetype . "')";
@@ -3013,10 +3374,12 @@ 
 
             if (!empty($this->linkedObjectsIds)) {
                 $tmparray = $this->linkedObjectsIds;
-                foreach ($tmparray as $objecttype => $objectids)       // $objecttype is a module name ('facture', 'mymodule', ...) or a module name with a suffix ('project_task', 'mymodule_myobj', ...)
+                foreach ($tmparray as $objecttype => $objectids) {
+                    // $objecttype is a module name ('facture', 'mymodule', ...) or a module name with a suffix ('project_task', 'mymodule_myobj', ...)
                 {
                     // Parse element/subelement (ex: project_task, cabinetmed_consultation, ...)
                     $module = $element = $subelement = $objecttype;
+                }
                     if ($objecttype != 'supplier_proposal' && $objecttype != 'order_supplier' && $objecttype != 'invoice_supplier'
                         && preg_match('/^([^_]+)_([^_]+)/i', $objecttype, $regs)) {
                         $module = $element = $regs[1];
@@ -3084,9 +3447,11 @@ 
                             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
+                                foreach ($objectids as $i => $objectid) {
+                                    // $i is rowid into llx_element_element
                                 {
                                     $object = new $classname($this->db);
+                                }
                                     $ret = $object->fetch($objectid);
                                     if ($ret >= 0) {
                                         $this->linkedObjects[$objecttype][$i] = $object;
@@ -3121,8 +3486,11 @@ 
         $updatesource = false;
         $updatetarget = false;
 
-        if (!empty($sourceid) && !empty($sourcetype) && empty($targetid) && empty($targettype)) $updatesource = true;
-        else if (empty($sourceid) && empty($sourcetype) && !empty($targetid) && !empty($targettype)) $updatetarget = true;
+        if (!empty($sourceid) && !empty($sourcetype) && empty($targetid) && empty($targettype)) {
+            $updatesource = true;
+        } else if (empty($sourceid) && empty($sourcetype) && !empty($targetid) && !empty($targettype)) {
+            $updatetarget = true;
+        }
 
         $sql = "UPDATE " . MAIN_DB_PREFIX . "element_element SET ";
         if ($updatesource) {
@@ -3162,8 +3530,11 @@ 
         $deletesource = false;
         $deletetarget = false;
 
-        if (!empty($sourceid) && !empty($sourcetype) && empty($targetid) && empty($targettype)) $deletesource = true;
-        else if (empty($sourceid) && empty($sourcetype) && !empty($targetid) && !empty($targettype)) $deletetarget = true;
+        if (!empty($sourceid) && !empty($sourcetype) && empty($targetid) && empty($targettype)) {
+            $deletesource = true;
+        } else if (empty($sourceid) && empty($sourcetype) && !empty($targetid) && !empty($targettype)) {
+            $deletetarget = true;
+        }
 
         $sourceid = (!empty($sourceid) ? $sourceid : $this->id);
         $sourcetype = (!empty($sourcetype) ? $sourcetype : $this->element);
@@ -3226,17 +3597,31 @@ 
         $this->db->begin();
 
         $fieldstatus = "fk_statut";
-        if ($elementTable == 'facture_rec') $fieldstatus = "suspended";
-        if ($elementTable == 'mailing') $fieldstatus = "statut";
-        if ($elementTable == 'cronjob') $fieldstatus = "status";
-        if ($elementTable == 'user') $fieldstatus = "statut";
-        if ($elementTable == 'expensereport') $fieldstatus = "fk_statut";
-        if ($elementTable == 'commande_fournisseur_dispatch') $fieldstatus = "status";
+        if ($elementTable == 'facture_rec') {
+            $fieldstatus = "suspended";
+        }
+        if ($elementTable == 'mailing') {
+            $fieldstatus = "statut";
+        }
+        if ($elementTable == 'cronjob') {
+            $fieldstatus = "status";
+        }
+        if ($elementTable == 'user') {
+            $fieldstatus = "statut";
+        }
+        if ($elementTable == 'expensereport') {
+            $fieldstatus = "fk_statut";
+        }
+        if ($elementTable == 'commande_fournisseur_dispatch') {
+            $fieldstatus = "status";
+        }
 
         $sql = "UPDATE " . MAIN_DB_PREFIX . $elementTable;
         $sql .= " SET " . $fieldstatus . " = " . $status;
         // If status = 1 = validated, update also fk_user_valid
-        if ($status == 1 && $elementTable == 'expensereport') $sql .= ", fk_user_valid = " . $user->id;
+        if ($status == 1 && $elementTable == 'expensereport') {
+            $sql .= ", fk_user_valid = " . $user->id;
+        }
         $sql .= " WHERE rowid=" . $elementId;
 
         dol_syslog(get_class($this) . "::setStatut", LOG_DEBUG);
@@ -3245,12 +3630,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) {
@@ -3268,9 +3668,11 @@ 
             if (!$error) {
                 $this->db->commit();
 
-                if (empty($savElementId))    // If the element we update was $this (so $elementId is null)
+                if (empty($savElementId)) {
+                    // If the element we update was $this (so $elementId is null)
                 {
                     $this->statut = $status;
+                }
                     $this->status = $status;
                 }
 
@@ -3302,8 +3704,13 @@ 
     {
         global $conf;
 
-        if (empty($id) && empty($ref)) return 0;
-        if (!empty($conf->global->MAIN_DISABLE_CANVAS)) return 0;    // To increase speed. Not enabled by default.
+        if (empty($id) && empty($ref)) {
+            return 0;
+        }
+        if (!empty($conf->global->MAIN_DISABLE_CANVAS)) {
+            return 0;
+        }
+        // To increase speed. Not enabled by default.
 
         // Clean parameters
         $ref = trim($ref);
@@ -3311,8 +3718,12 @@ 
         $sql = "SELECT rowid, canvas";
         $sql .= " FROM " . MAIN_DB_PREFIX . $this->table_element;
         $sql .= " WHERE entity IN (" . getEntity($this->element) . ")";
-        if (!empty($id)) $sql .= " AND rowid = " . $id;
-        if (!empty($ref)) $sql .= " AND ref = '" . $this->db->escape($ref) . "'";
+        if (!empty($id)) {
+            $sql .= " AND rowid = " . $id;
+        }
+        if (!empty($ref)) {
+            $sql .= " AND ref = '" . $this->db->escape($ref) . "'";
+        }
 
         $resql = $this->db->query($sql);
         if ($resql) {
@@ -3320,7 +3731,9 @@ 
             if ($obj) {
                 $this->canvas = $obj->canvas;
                 return 1;
-            } else return 0;
+            } else {
+                return 0;
+            }
         } else {
             dol_print_error($this->db);
             return -1;
@@ -3359,12 +3772,24 @@ 
 
         foreach ($this->lines as $key => $val) {
             $qualified = 0;
-            if ($predefined == -1) $qualified = 1;
-            if ($predefined == 1 && $val->fk_product > 0) $qualified = 1;
-            if ($predefined == 0 && $val->fk_product <= 0) $qualified = 1;
-            if ($predefined == 2 && $val->fk_product > 0 && $val->product_type == 0) $qualified = 1;
-            if ($predefined == 3 && $val->fk_product > 0 && $val->product_type == 1) $qualified = 1;
-            if ($qualified) $nb++;
+            if ($predefined == -1) {
+                $qualified = 1;
+            }
+            if ($predefined == 1 && $val->fk_product > 0) {
+                $qualified = 1;
+            }
+            if ($predefined == 0 && $val->fk_product <= 0) {
+                $qualified = 1;
+            }
+            if ($predefined == 2 && $val->fk_product > 0 && $val->product_type == 0) {
+                $qualified = 1;
+            }
+            if ($predefined == 3 && $val->fk_product > 0 && $val->product_type == 1) {
+                $qualified = 1;
+            }
+            if ($qualified) {
+                $nb++;
+            }
         }
         dol_syslog(get_class($this) . '::hasProductsOrServices we found ' . $nb . ' qualified lines of products/servcies');
         return $nb;
@@ -3426,14 +3851,22 @@ 
 
         foreach ($this->lines as $line) {
             if (isset($line->qty_asked)) {
-                if (empty($totalOrdered)) $totalOrdered = 0;  // Avoid warning because $totalOrdered is ''
+                if (empty($totalOrdered)) {
+                    $totalOrdered = 0;
+                }
+                // Avoid warning because $totalOrdered is ''
                 $totalOrdered += $line->qty_asked;    // defined for shipment only
             }
             if (isset($line->qty_shipped)) {
-                if (empty($totalToShip)) $totalToShip = 0;    // Avoid warning because $totalToShip is ''
+                if (empty($totalToShip)) {
+                    $totalToShip = 0;
+                }
+                // Avoid warning because $totalToShip is ''
                 $totalToShip += $line->qty_shipped;   // defined for shipment only
             } else if ($line->element == 'commandefournisseurdispatch' && isset($line->qty)) {
-                if (empty($totalToShip)) $totalToShip = 0;
+                if (empty($totalToShip)) {
+                    $totalToShip = 0;
+                }
                 $totalToShip += $line->qty;   // defined for reception only
             }
 
@@ -3457,16 +3890,28 @@ 
 
             $weightUnit = 0;
             $volumeUnit = 0;
-            if (!empty($weight_units)) $weightUnit = $weight_units;
-            if (!empty($volume_units)) $volumeUnit = $volume_units;
+            if (!empty($weight_units)) {
+                $weightUnit = $weight_units;
+            }
+            if (!empty($volume_units)) {
+                $volumeUnit = $volume_units;
+            }
 
-            if (empty($totalWeight)) $totalWeight = 0;  // Avoid warning because $totalWeight is ''
-            if (empty($totalVolume)) $totalVolume = 0;  // Avoid warning because $totalVolume is ''
+            if (empty($totalWeight)) {
+                $totalWeight = 0;
+            }
+            // Avoid warning because $totalWeight is ''
+            if (empty($totalVolume)) {
+                $totalVolume = 0;
+            }
+            // Avoid warning because $totalVolume is ''
 
             //var_dump($line->volume_units);
-            if ($weight_units < 50)   // >50 means a standard unit (power of 10 of official unit), > 50 means an exotic unit (like inch)
+            if ($weight_units < 50) {
+                // >50 means a standard unit (power of 10 of official unit), > 50 means an exotic unit (like inch)
             {
                 $trueWeightUnit = pow(10, $weightUnit);
+            }
                 $totalWeight += $weight * $qty * $trueWeightUnit;
             } else {
                 if ($weight_units == 99) {
@@ -3477,13 +3922,17 @@ 
                     // conversion 1 Ounce = 0.0283495 KG
                     $trueWeightUnit = 0.0283495;
                     $totalWeight += $weight * $qty * $trueWeightUnit;
-                } else
-                    $totalWeight += $weight * $qty;   // This may be wrong if we mix different units
+                } else {
+                                    $totalWeight += $weight * $qty;
+                }
+                // This may be wrong if we mix different units
             }
-            if ($volume_units < 50)   // >50 means a standard unit (power of 10 of official unit), > 50 means an exotic unit (like inch)
+            if ($volume_units < 50) {
+                // >50 means a standard unit (power of 10 of official unit), > 50 means an exotic unit (like inch)
             {
                 //print $line->volume."x".$line->volume_units."x".($line->volume_units < 50)."x".$volumeUnit;
                 $trueVolumeUnit = pow(10, $volumeUnit);
+            }
                 //print $line->volume;
                 $totalVolume += $volume * $qty * $trueVolumeUnit;
             } else {
@@ -3602,7 +4051,9 @@ 
                 $this->errors[] = $this->db->lasterror();
                 return -1;
             }
-        } else return -1;
+        } else {
+            return -1;
+        }
     }
 
 
@@ -3638,7 +4089,9 @@ 
             } else {
                 $res = include $tpl; // for debug
             }
-            if ($res) break;
+            if ($res) {
+                break;
+            }
         }
     }
 
@@ -3669,7 +4122,9 @@ 
 
         // Define usemargins
         $usemargins = 0;
-        if (!empty($conf->margin->enabled) && !empty($this->element) && in_array($this->element, array('facture', 'propal', 'commande'))) $usemargins = 1;
+        if (!empty($conf->margin->enabled) && !empty($this->element) && in_array($this->element, array('facture', 'propal', 'commande'))) {
+            $usemargins = 1;
+        }
 
         $num = count($this->lines);
 
@@ -3687,7 +4142,9 @@ 
             print '<tr class="liste_titre nodrag nodrop">';
 
             // Adds a line numbering column
-            if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) print '<td class="linecolnum" align="center" width="5">&nbsp;</td>';
+            if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) {
+                print '<td class="linecolnum" align="center" width="5">&nbsp;</td>';
+            }
 
             // Description
             print '<td class="linecoldescription">' . $langs->trans('Description') . '</td>';
@@ -3703,9 +4160,13 @@ 
             print '<td class="linecoluht" align="right" width="80">' . $langs->trans('PriceUHT') . '</td>';
 
             // Multicurrency
-            if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) print '<td class="linecoluht_currency" align="right" width="80">' . $langs->trans('PriceUHTCurrency', $this->multicurrency_code) . '</td>';
+            if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) {
+                print '<td class="linecoluht_currency" align="right" width="80">' . $langs->trans('PriceUHTCurrency', $this->multicurrency_code) . '</td>';
+            }
 
-            if ($inputalsopricewithtax) print '<td align="right" width="80">' . $langs->trans('PriceUTTC') . '</td>';
+            if ($inputalsopricewithtax) {
+                print '<td align="right" width="80">' . $langs->trans('PriceUTTC') . '</td>';
+            }
 
             // Qty
             print '<td class="linecolqty" align="right">' . $langs->trans('Qty') . '</td>';
@@ -3723,25 +4184,32 @@ 
 
             if ($usemargins && !empty($conf->margin->enabled) && empty($user->societe_id)) {
                 if (!empty($user->rights->margins->creer)) {
-                    if ($conf->global->MARGIN_TYPE == "1")
-                        print '<td class="linecolmargin1 margininfos" align="right" width="80">' . $langs->trans('BuyingPrice') . '</td>';
-                    else
-                        print '<td class="linecolmargin1 margininfos" align="right" width="80">' . $langs->trans('CostPrice') . '</td>';
+                    if ($conf->global->MARGIN_TYPE == "1") {
+                                            print '<td class="linecolmargin1 margininfos" align="right" width="80">' . $langs->trans('BuyingPrice') . '</td>';
+                    } else {
+                                            print '<td class="linecolmargin1 margininfos" align="right" width="80">' . $langs->trans('CostPrice') . '</td>';
+                    }
                 }
 
-                if (!empty($conf->global->DISPLAY_MARGIN_RATES) && $user->rights->margins->liretous)
-                    print '<td class="linecolmargin2 margininfos" align="right" width="50">' . $langs->trans('MarginRate') . '</td>';
-                if (!empty($conf->global->DISPLAY_MARK_RATES) && $user->rights->margins->liretous)
-                    print '<td class="linecolmargin2 margininfos" align="right" width="50">' . $langs->trans('MarkRate') . '</td>';
+                if (!empty($conf->global->DISPLAY_MARGIN_RATES) && $user->rights->margins->liretous) {
+                                    print '<td class="linecolmargin2 margininfos" align="right" width="50">' . $langs->trans('MarginRate') . '</td>';
+                }
+                if (!empty($conf->global->DISPLAY_MARK_RATES) && $user->rights->margins->liretous) {
+                                    print '<td class="linecolmargin2 margininfos" align="right" width="50">' . $langs->trans('MarkRate') . '</td>';
+                }
             }
 
             // Total HT
             print '<td class="linecolht" align="right">' . $langs->trans('TotalHTShort') . '</td>';
 
             // Multicurrency
-            if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) print '<td class="linecoltotalht_currency" align="right">' . $langs->trans('TotalHTShortCurrency', $this->multicurrency_code) . '</td>';
+            if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) {
+                print '<td class="linecoltotalht_currency" align="right">' . $langs->trans('TotalHTShortCurrency', $this->multicurrency_code) . '</td>';
+            }
 
-            if ($outputalsopricetotalwithtax) print '<td align="right" width="80">' . $langs->trans('TotalTTCShort') . '</td>';
+            if ($outputalsopricetotalwithtax) {
+                print '<td align="right" width="80">' . $langs->trans('TotalTTCShort') . '</td>';
+            }
 
             print '<td class="linecoledit"></td>';  // No width to allow autodim
 
@@ -3769,10 +4237,12 @@ 
             $line->fetch_optionals();
 
             //if (is_object($hookmanager) && (($line->product_type == 9 && ! empty($line->special_code)) || ! empty($line->fk_parent_line)))
-            if (is_object($hookmanager))   // Old code is commented on preceding line.
+            if (is_object($hookmanager)) {
+                // Old code is commented on preceding line.
             {
                 if (empty($line->fk_parent_line)) {
                     $parameters = array('line' => $line, 'var' => $var, 'num' => $num, 'i' => $i, 'dateSelector' => $dateSelector, 'seller' => $seller, 'buyer' => $buyer, 'selected' => $selected, 'extrafieldsline' => $extrafieldsline);
+            }
                     $reshook = $hookmanager->executeHooks('printObjectLine', $parameters, $this, $action);    // Note that $action and $object may have been modified by some hooks
                 } else {
                     $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);
@@ -3827,8 +4297,14 @@ 
         // Show product and description
         $type = (!empty($line->product_type) ? $line->product_type : $line->fk_product_type);
         // Try to enhance type detection using date_start and date_end for free lines where type was not saved.
-        if (!empty($line->date_start)) $type = 1; // deprecated
-        if (!empty($line->date_end)) $type = 1; // deprecated
+        if (!empty($line->date_start)) {
+            $type = 1;
+        }
+        // deprecated
+        if (!empty($line->date_end)) {
+            $type = 1;
+        }
+        // deprecated
 
         // Ligne en mode visu
         if ($action != 'editline' || $selected != $line->id) {
@@ -3853,8 +4329,13 @@ 
 
                     $outputlangs = $langs;
                     $newlang = '';
-                    if (empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang = GETPOST('lang_id', 'aZ09');
-                    if (!empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE) && empty($newlang)) $newlang = $this->thirdparty->default_lang;        // For language to language of customer
+                    if (empty($newlang) && GETPOST('lang_id', 'aZ09')) {
+                        $newlang = GETPOST('lang_id', 'aZ09');
+                    }
+                    if (!empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE) && empty($newlang)) {
+                        $newlang = $this->thirdparty->default_lang;
+                    }
+                    // For language to language of customer
                     if (!empty($newlang)) {
                         $outputlangs = new Translate("", $conf);
                         $outputlangs->setDefaultLang($newlang);
@@ -3881,7 +4362,9 @@ 
                 } else {
                     $res = include $tpl; // for debug
                 }
-                if ($res) break;
+                if ($res) {
+                    break;
+                }
             }
         }
 
@@ -3902,7 +4385,9 @@ 
                 } else {
                     $res = include $tpl; // for debug
                 }
-                if ($res) break;
+                if ($res) {
+                    break;
+                }
             }
         }
     }
@@ -3916,7 +4401,9 @@ 
         global $user;
 
         $element = $this->element;
-        if ($element == 'facturerec') $element = 'facture';
+        if ($element == 'facturerec') {
+            $element = 'facture';
+        }
 
         return $user->rights->{$element};
     }
@@ -3939,7 +4426,9 @@ 
         print '<td>' . $langs->trans('Description') . '</td>';
         print '<td align="right">' . $langs->trans('VATRate') . '</td>';
         print '<td align="right">' . $langs->trans('PriceUHT') . '</td>';
-        if (!empty($conf->multicurrency->enabled)) print '<td align="right">' . $langs->trans('PriceUHTCurrency') . '</td>';
+        if (!empty($conf->multicurrency->enabled)) {
+            print '<td align="right">' . $langs->trans('PriceUHTCurrency') . '</td>';
+        }
         print '<td align="right">' . $langs->trans('Qty') . '</td>';
         if ($conf->global->PRODUCT_USE_UNITS) {
             print '<td align="left">' . $langs->trans('Unit') . '</td>';
@@ -3986,21 +4475,29 @@ 
             $date_start = $line->date_start;
         } else {
             $date_start = $line->date_debut_prevue;
-            if ($line->date_debut_reel) $date_start = $line->date_debut_reel;
+            if ($line->date_debut_reel) {
+                $date_start = $line->date_debut_reel;
+            }
         }
         if (!empty($line->date_end)) {
             $date_end = $line->date_end;
         } else {
             $date_end = $line->date_fin_prevue;
-            if ($line->date_fin_reel) $date_end = $line->date_fin_reel;
+            if ($line->date_fin_reel) {
+                $date_end = $line->date_fin_reel;
+            }
         }
 
         $this->tpl['label'] = '';
-        if (!empty($line->fk_parent_line)) $this->tpl['label'] .= img_picto('', 'rightarrow');
+        if (!empty($line->fk_parent_line)) {
+            $this->tpl['label'] .= img_picto('', 'rightarrow');
+        }
 
-        if (($line->info_bits & 2) == 2)  // TODO Not sure this is used for source object
+        if (($line->info_bits & 2) == 2) {
+            // TODO Not sure this is used for source object
         {
             $discount = new DiscountAbsolute($this->db);
+        }
             $discount->fk_soc = $this->socid;
             $this->tpl['label'] .= $discount->getNomUrl(0, 'discount');
         } else if (!empty($line->fk_product)) {
@@ -4034,14 +4531,18 @@ 
         }
 
         if (!empty($line->desc)) {
-            if ($line->desc == '(CREDIT_NOTE)')  // TODO Not sure this is used for source object
+            if ($line->desc == '(CREDIT_NOTE)') {
+                // TODO Not sure this is used for source object
             {
                 $discount = new DiscountAbsolute($this->db);
+            }
                 $discount->fetch($line->fk_remise_except);
                 $this->tpl['description'] = $langs->transnoentities("DiscountFromCreditNote", $discount->getNomUrl(0));
-            } elseif ($line->desc == '(DEPOSIT)')  // TODO Not sure this is used for source object
+            } elseif ($line->desc == '(DEPOSIT)') {
+                // TODO Not sure this is used for source object
             {
                 $discount = new DiscountAbsolute($this->db);
+            }
                 $discount->fetch($line->fk_remise_except);
                 $this->tpl['description'] = $langs->transnoentities("DiscountFromDeposit", $discount->getNomUrl(0));
             } elseif ($line->desc == '(EXCESS RECEIVED)') {
@@ -4062,17 +4563,23 @@ 
         // VAT Rate
         $this->tpl['vat_rate'] = vatrate($line->tva_tx, true);
         $this->tpl['vat_rate'] .= (($line->info_bits & 1) == 1) ? '*' : '';
-        if (!empty($line->vat_src_code) && !preg_match('/\(/', $this->tpl['vat_rate'])) $this->tpl['vat_rate'] .= ' (' . $line->vat_src_code . ')';
+        if (!empty($line->vat_src_code) && !preg_match('/\(/', $this->tpl['vat_rate'])) {
+            $this->tpl['vat_rate'] .= ' (' . $line->vat_src_code . ')';
+        }
 
         $this->tpl['price'] = price($line->subprice);
         $this->tpl['multicurrency_price'] = price($line->multicurrency_subprice);
         $this->tpl['qty'] = (($line->info_bits & 2) != 2) ? $line->qty : '&nbsp;';
-        if ($conf->global->PRODUCT_USE_UNITS) $this->tpl['unit'] = $langs->transnoentities($line->getLabelOfUnit('long'));
+        if ($conf->global->PRODUCT_USE_UNITS) {
+            $this->tpl['unit'] = $langs->transnoentities($line->getLabelOfUnit('long'));
+        }
         $this->tpl['remise_percent'] = (($line->info_bits & 2) != 2) ? vatrate($line->remise_percent, true) : '&nbsp;';
 
         // Is the line strike or not
         $this->tpl['strike'] = 0;
-        if ($restrictlist == 'services' && $line->product_type != Product::TYPE_SERVICE) $this->tpl['strike'] = 1;
+        if ($restrictlist == 'services' && $line->product_type != Product::TYPE_SERVICE) {
+            $this->tpl['strike'] = 1;
+        }
 
         // Output template part (modules that overwrite templates must declare this into descriptor)
         // Use global variables + $dateSelector + $seller and $buyer
@@ -4084,7 +4591,9 @@ 
             } else {
                 $res = include $tpl; // for debug
             }
-            if ($res) break;
+            if ($res) {
+                break;
+            }
         }
     }
 
@@ -4226,13 +4735,21 @@ 
         global $conf, $_POST;
 
         // If param here has been posted, we use this value first.
-        if (isset($_POST[$fieldname])) return GETPOST($fieldname, 2);
+        if (isset($_POST[$fieldname])) {
+            return GETPOST($fieldname, 2);
+        }
 
-        if (isset($alternatevalue)) return $alternatevalue;
+        if (isset($alternatevalue)) {
+            return $alternatevalue;
+        }
 
         $newelement = $this->element;
-        if ($newelement == 'facture') $newelement = 'invoice';
-        if ($newelement == 'commande') $newelement = 'order';
+        if ($newelement == 'facture') {
+            $newelement = 'invoice';
+        }
+        if ($newelement == 'commande') {
+            $newelement = 'order';
+        }
         if (empty($newelement)) {
             dol_syslog("Ask a default value using common method getDefaultCreateValueForField on an object with no property ->element defined. Return empty string.", LOG_WARNING);
             return '';
@@ -4240,7 +4757,9 @@ 
 
         $keyforfieldname = strtoupper($newelement . '_DEFAULT_' . $fieldname);
         //var_dump($keyforfieldname);
-        if (isset($conf->global->$keyforfieldname)) return $conf->global->$keyforfieldname;
+        if (isset($conf->global->$keyforfieldname)) {
+            return $conf->global->$keyforfieldname;
+        }
 
         // TODO Ad here a scan into table llx_overwrite_default with a filter on $this->element and $fieldname
     }
@@ -4256,7 +4775,9 @@ 
     function fetch_optionals($rowid = null, $optionsArray = null)
     {
         // phpcs:enable
-        if (empty($rowid)) $rowid = $this->id;
+        if (empty($rowid)) {
+            $rowid = $this->id;
+        }
 
         // To avoid SQL errors. Probably not the better solution though
         if (!$this->table_element) {
@@ -4286,7 +4807,10 @@ 
         }
 
         $table_element = $this->table_element;
-        if ($table_element == 'categorie') $table_element = 'categories'; // For compatibility
+        if ($table_element == 'categorie') {
+            $table_element = 'categories';
+        }
+        // For compatibility
 
         // Request to get complementary values
         if (is_array($optionsArray) && count($optionsArray) > 0) {
@@ -4325,8 +4849,11 @@ 
 
                 $this->db->free($resql);
 
-                if ($numrows) return $numrows;
-                else return 0;
+                if ($numrows) {
+                    return $numrows;
+                } else {
+                    return 0;
+                }
             } else {
                 dol_print_error($this->db);
                 return -1;
@@ -4347,7 +4874,10 @@ 
         $this->db->begin();
 
         $table_element = $this->table_element;
-        if ($table_element == 'categorie') $table_element = 'categories'; // For compatibility
+        if ($table_element == 'categorie') {
+            $table_element = 'categories';
+        }
+        // For compatibility
 
         $sql_del = "DELETE FROM " . MAIN_DB_PREFIX . $table_element . "_extrafields WHERE fk_object = " . $this->id;
         dol_syslog(get_class($this) . "::deleteExtraFields delete", LOG_DEBUG);
@@ -4376,11 +4906,16 @@ 
     {
         global $conf, $langs, $user;
 
-        if (empty($userused)) $userused = $user;
+        if (empty($userused)) {
+            $userused = $user;
+        }
 
         $error = 0;
 
-        if (!empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) return 0;    // For avoid conflicts if trigger used
+        if (!empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) {
+            return 0;
+        }
+        // For avoid conflicts if trigger used
 
         if (!empty($this->array_options) && isset($this->array_options["options_" . $key])) {
             // Check parameters
@@ -4462,7 +4997,9 @@ 
                 // Call trigger
                 $this->context = array('extrafieldupdate' => 1);
                 $result = $this->call_trigger($trigger, $userused);
-                if ($result < 0) $error++;
+                if ($result < 0) {
+                    $error++;
+                }
                 // End call trigger
             }
 
@@ -4474,7 +5011,9 @@ 
                 $this->db->commit();
                 return 1;
             }
-        } else return 0;
+        } else {
+            return 0;
+        }
     }
 
     /**
@@ -4546,8 +5085,11 @@ 
 
 
         if ($computed) {
-            if (!preg_match('/^search_/', $keyprefix)) return '<span class="opacitymedium">' . $langs->trans("AutomaticallyCalculated") . '</span>';
-            else return '';
+            if (!preg_match('/^search_/', $keyprefix)) {
+                return '<span class="opacitymedium">' . $langs->trans("AutomaticallyCalculated") . '</span>';
+            } else {
+                return '';
+            }
         }
 
 
@@ -4584,7 +5126,9 @@ 
             $showtime = in_array($type, array('datetime')) ? 1 : 0;
 
             // Do not show current date when field not required (see selectDate() method)
-            if (!$required && $value == '') $value = '-1';
+            if (!$required && $value == '') {
+                $value = '-1';
+            }
 
             // TODO Must also support $moreparam
             $out = $form->selectDate($value, $keyprefix . $key . $keysuffix, $showtime, $showtime, $required, '', 1, (($keyprefix != 'search_' && $keyprefix != 'search_options_') ? 1 : 0), 0, 1);
@@ -4597,18 +5141,22 @@ 
         } elseif (in_array($type, array('mail', 'phone', 'url'))) {
             $out = '<input type="text" class="flat ' . $morecss . ' maxwidthonsmartphone" name="' . $keyprefix . $key . $keysuffix . '" id="' . $keyprefix . $key . $keysuffix . '" value="' . dol_escape_htmltag($value) . '" ' . ($moreparam ? $moreparam : '') . '>';
         } elseif ($type == 'text') {
-            if (!preg_match('/search_/', $keyprefix))        // If keyprefix is search_ or search_options_, we must just use a simple text field
+            if (!preg_match('/search_/', $keyprefix)) {
+                // If keyprefix is search_ or search_options_, we must just use a simple text field
             {
                 require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';
+            }
                 $doleditor = new DolEditor($keyprefix . $key . $keysuffix, $value, '', 200, 'dolibarr_notes', 'In', false, false, false, ROWS_5, '90%');
                 $out = $doleditor->Create(1);
             } else {
                 $out = '<input type="text" class="flat ' . $morecss . ' maxwidthonsmartphone" name="' . $keyprefix . $key . $keysuffix . '" id="' . $keyprefix . $key . $keysuffix . '" value="' . dol_escape_htmltag($value) . '" ' . ($moreparam ? $moreparam : '') . '>';
             }
         } elseif ($type == 'html') {
-            if (!preg_match('/search_/', $keyprefix))        // If keyprefix is search_ or search_options_, we must just use a simple text field
+            if (!preg_match('/search_/', $keyprefix)) {
+                // If keyprefix is search_ or search_options_, we must just use a simple text field
             {
                 require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';
+            }
                 $doleditor = new DolEditor($keyprefix . $key . $keysuffix, $value, '', 200, 'dolibarr_notes', 'In', false, false, !empty($conf->fckeditor->enabled) && $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_5, '90%');
                 $out = $doleditor->Create(1);
             } else {
@@ -4640,9 +5188,13 @@ 
             }
 
             $out .= '<select class="flat ' . $morecss . ' maxwidthonsmartphone" name="' . $keyprefix . $key . $keysuffix . '" id="' . $keyprefix . $key . $keysuffix . '" ' . ($moreparam ? $moreparam : '') . '>';
-            if ((!isset($this->fields[$key]['default'])) || ($this->fields[$key]['notnull'] != 1)) $out .= '<option value="0">&nbsp;</option>';
+            if ((!isset($this->fields[$key]['default'])) || ($this->fields[$key]['notnull'] != 1)) {
+                $out .= '<option value="0">&nbsp;</option>';
+            }
             foreach ($param['options'] as $key => $val) {
-                if ((string)$key == '') continue;
+                if ((string)$key == '') {
+                    continue;
+                }
                 list($val, $parent) = explode('|', $val);
                 $out .= '<option value="' . $key . '"';
                 $out .= (((string)$value == (string)$key) ? ' selected' : '');
@@ -4765,7 +5317,9 @@ 
                                     $labeltoshow = dol_trunc($obj->{$InfoFieldList[1]}, 18);
                                 }
                             }
-                            if (empty($labeltoshow)) $labeltoshow = '(not defined)';
+                            if (empty($labeltoshow)) {
+                                $labeltoshow = '(not defined)';
+                            }
                             if ($value == $obj->rowid) {
                                 $out .= '<option value="' . $obj->rowid . '" selected>' . $labeltoshow . '</option>';
                             }
@@ -4917,8 +5471,9 @@ 
                                     $labeltoshow = dol_trunc($obj->{$InfoFieldList[1]}, 18);
                                 }
                             }
-                            if (empty($labeltoshow))
-                                $labeltoshow = '(not defined)';
+                            if (empty($labeltoshow)) {
+                                                            $labeltoshow = '(not defined)';
+                            }
 
                             if (is_array($value_arr) && in_array($obj->rowid, $value_arr)) {
                                 $data[$obj->rowid] = $labeltoshow;
@@ -4946,8 +5501,11 @@ 
             $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);
+                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
             }
@@ -5029,16 +5587,25 @@ 
         if (preg_match('/varchar\((\d+)\)/', $type, $reg)) {
             $type = 'varchar';        // convert varchar(xx) int varchar
             $size = $reg[1];
-        } elseif (preg_match('/varchar/', $type)) $type = 'varchar';        // convert varchar(xx) int varchar
-        if (is_array($val['arrayofkeyval'])) $type = 'select';
-        if (preg_match('/^integer:(.*):(.*)/i', $val['type'], $reg)) $type = 'link';
+        } elseif (preg_match('/varchar/', $type)) {
+            $type = 'varchar';
+        }
+        // convert varchar(xx) int varchar
+        if (is_array($val['arrayofkeyval'])) {
+            $type = 'select';
+        }
+        if (preg_match('/^integer:(.*):(.*)/i', $val['type'], $reg)) {
+            $type = 'link';
+        }
 
         $default = $val['default'];
         $computed = $val['computed'];
         $unique = $val['unique'];
         $required = $val['required'];
         $param = $val['param'];
-        if (is_array($val['arrayofkeyval'])) $param['options'] = $val['arrayofkeyval'];
+        if (is_array($val['arrayofkeyval'])) {
+            $param['options'] = $val['arrayofkeyval'];
+        }
         if (preg_match('/^integer:(.*):(.*)/i', $val['type'], $reg)) {
             $type = 'link';
             $param['options'] = array($reg[1] . ':' . $reg[2] => $reg[1] . ':' . $reg[2]);
@@ -5048,7 +5615,9 @@ 
         $help = $val['help'];
         $hidden = (($val['visible'] == 0) ? 1 : 0);            // If zero, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
 
-        if ($hidden) return '';
+        if ($hidden) {
+            return '';
+        }
 
         // If field is a computed field, value must become result of compute
         if ($computed) {
@@ -5084,9 +5653,11 @@ 
         }
 
         // Format output value differently according to properties of field
-        if ($key == 'ref' && method_exists($this, 'getNomUrl')) $value = $this->getNomUrl(1, '', 0, '', 1);
-        elseif ($key == 'status' && method_exists($this, 'getLibStatut')) $value = $this->getLibStatut(3);
-        elseif ($type == 'date') {
+        if ($key == 'ref' && method_exists($this, 'getNomUrl')) {
+            $value = $this->getNomUrl(1, '', 0, '', 1);
+        } elseif ($key == 'status' && method_exists($this, 'getLibStatut')) {
+            $value = $this->getLibStatut(3);
+        } elseif ($type == 'date') {
             if (!empty($value)) {
                 $value = dol_print_date($value, 'day');
             } else {
@@ -5184,7 +5755,9 @@ 
                         $value = $obj->{$InfoFieldList[1]};
                     }
                 }
-            } else dol_syslog(get_class($this) . '::showOutputField error ' . $this->db->lasterror(), LOG_WARNING);
+            } else {
+                dol_syslog(get_class($this) . '::showOutputField error ' . $this->db->lasterror(), LOG_WARNING);
+            }
         } elseif ($type == 'radio') {
             $value = $param['options'][$value];
         } elseif ($type == 'checkbox') {
@@ -5285,7 +5858,9 @@ 
                     dol_syslog('Error bad setup of extrafield', LOG_WARNING);
                     return 'Error bad setup of extrafield';
                 }
-            } else $value = '';
+            } else {
+                $value = '';
+            }
         } elseif ($type == 'text' || $type == 'html') {
             $value = dol_htmlentitiesbr($value);
         } elseif ($type == 'password') {
@@ -5315,7 +5890,9 @@ 
     {
         global $db, $conf, $langs, $action, $form;
 
-        if (!is_object($form)) $form = new Form($db);
+        if (!is_object($form)) {
+            $form = new Form($db);
+        }
 
         $out = '';
 
@@ -5327,7 +5904,9 @@ 
             $e = 0;
             foreach ($extrafields->attributes[$this->table_element]['label'] as $key => $label) {
                 // Show only the key field in params
-                if (is_array($params) && array_key_exists('onlykey', $params) && $key != $params['onlykey']) continue;
+                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])) {
@@ -5339,11 +5918,18 @@ 
                     $perms = dol_eval($extrafields->attributes[$this->table_element]['perms'][$key], 1);
                 }
 
-                if (($mode == 'create' || $mode == 'edit') && abs($enabled) != 1 && abs($enabled) != 3) continue;    // <> -1 and <> 1 and <> 3 = not visible on forms, only on list
-                if (empty($perms)) continue;
+                if (($mode == 'create' || $mode == 'edit') && abs($enabled) != 1 && abs($enabled) != 3) {
+                    continue;
+                }
+                // <> -1 and <> 1 and <> 3 = not visible on forms, only on list
+                if (empty($perms)) {
+                    continue;
+                }
 
                 // Load language if required
-                if (!empty($extrafields->attributes[$this->table_element]['langfile'][$key])) $langs->load($extrafields->attributes[$this->table_element]['langfile'][$key]);
+                if (!empty($extrafields->attributes[$this->table_element]['langfile'][$key])) {
+                    $langs->load($extrafields->attributes[$this->table_element]['langfile'][$key]);
+                }
 
                 $colspan = '3';
                 if (is_array($params) && count($params) > 0) {
@@ -5406,10 +5992,12 @@ 
                     // 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
+                        if (!is_numeric($this->array_options['options_' . $key])) {
+                            // For backward compatibility
                         {
                             $datenotinstring = $this->db->jdate($datenotinstring);
                         }
+                        }
                         $value = GETPOSTISSET($keyprefix . 'options_' . $key . $keysuffix) ? dol_mktime(GETPOST($keyprefix . 'options_' . $key . $keysuffix . "hour", 'int', 3), GETPOST($keyprefix . 'options_' . $key . $keysuffix . "min", 'int', 3), 0, GETPOST($keyprefix . 'options_' . $key . $keysuffix . "month", 'int', 3), GETPOST($keyprefix . 'options_' . $key . $keysuffix . "day", 'int', 3), GETPOST($keyprefix . 'options_' . $key . $keysuffix . "year", 'int', 3)) : $datenotinstring;
                     }
                     // Convert float submited string into real php numeric (value in memory must be a php numeric)
@@ -5420,11 +6008,18 @@ 
                     $labeltoshow = $langs->trans($label);
 
                     $out .= '<td class="titlefield';
-                    if (GETPOST('action', 'none') == 'create') $out .= 'create';
-                    if ($mode != 'view' && !empty($extrafields->attributes[$this->table_element]['required'][$key])) $out .= ' fieldrequired';
+                    if (GETPOST('action', 'none') == 'create') {
+                        $out .= 'create';
+                    }
+                    if ($mode != 'view' && !empty($extrafields->attributes[$this->table_element]['required'][$key])) {
+                        $out .= ' fieldrequired';
+                    }
                     $out .= '">';
-                    if (!empty($extrafields->attributes[$object->table_element]['help'][$key])) $out .= $form->textwithpicto($labeltoshow, $extrafields->attributes[$object->table_element]['help'][$key]);
-                    else $out .= $labeltoshow;
+                    if (!empty($extrafields->attributes[$object->table_element]['help'][$key])) {
+                        $out .= $form->textwithpicto($labeltoshow, $extrafields->attributes[$object->table_element]['help'][$key]);
+                    } else {
+                        $out .= $labeltoshow;
+                    }
                     $out .= '</td>';
 
                     $html_id = !empty($this->id) ? $this->element . '_extras_' . $key . '_' . $this->id : '';
@@ -5441,8 +6036,11 @@ 
 
                     $out .= '</td>';
 
-                    if (!empty($conf->global->MAIN_EXTRAFIELDS_USE_TWO_COLUMS) && (($e % 2) == 1)) $out .= '</tr>';
-                    else $out .= '</tr>';
+                    if (!empty($conf->global->MAIN_EXTRAFIELDS_USE_TWO_COLUMS) && (($e % 2) == 1)) {
+                        $out .= '</tr>';
+                    } else {
+                        $out .= '</tr>';
+                    }
                     $e++;
                 }
             }
@@ -5502,9 +6100,11 @@ 
 
         $buyPrice = 0;
 
-        if (($unitPrice > 0) && (isset($conf->global->ForceBuyingPriceIfNull) && $conf->global->ForceBuyingPriceIfNull == 1)) // In most cases, test here is false
+        if (($unitPrice > 0) && (isset($conf->global->ForceBuyingPriceIfNull) && $conf->global->ForceBuyingPriceIfNull == 1)) {
+            // In most cases, test here is false
         {
             $buyPrice = $unitPrice * (1 - $discountPercent / 100);
+        }
         } else {
             // Get cost price for margin calculation
             if (!empty($fk_product)) {
@@ -5638,32 +6238,45 @@ 
 
                         // Find name of thumb file
                         $photo_vignette = basename(getImageFileNameForSize($dir . $file, '_small'));
-                        if (!dol_is_file($dirthumb . $photo_vignette)) $photo_vignette = '';
+                        if (!dol_is_file($dirthumb . $photo_vignette)) {
+                            $photo_vignette = '';
+                        }
 
                         // Get filesize of original file
                         $imgarray = dol_getImageSize($dir . $photo);
 
                         if ($nbbyrow > 0) {
-                            if ($nbphoto == 1) $return .= '<table width="100%" valign="top" align="center" border="0" cellpadding="2" cellspacing="2">';
+                            if ($nbphoto == 1) {
+                                $return .= '<table width="100%" valign="top" align="center" border="0" cellpadding="2" cellspacing="2">';
+                            }
 
-                            if ($nbphoto % $nbbyrow == 1) $return .= '<tr align=center valign=middle border=1>';
+                            if ($nbphoto % $nbbyrow == 1) {
+                                $return .= '<tr align=center valign=middle border=1>';
+                            }
                             $return .= '<td width="' . ceil(100 / $nbbyrow) . '%" class="photo">';
-                        } else if ($nbbyrow < 0) $return .= '<div class="inline-block">';
+                        } else if ($nbbyrow < 0) {
+                            $return .= '<div class="inline-block">';
+                        }
 
                         $return .= "\n";
 
                         $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">';
+                            if ($urladvanced) {
+                                $return .= '<a href="' . $urladvanced . '">';
+                            } else {
+                                $return .= '<a href="' . DOL_URL_ROOT . '/viewimage.php?modulepart=' . $modulepart . '&entity=' . $this->entity . '&file=' . urlencode($pdir . $photo) . '" class="aphoto" target="_blank">';
+                            }
                         }
 
                         // Show image (width height=$maxHeight)
                         // Si fichier vignette disponible et image source trop grande, on utilise la vignette, sinon on utilise photo origine
                         $alt = $langs->transnoentitiesnoconv('File') . ': ' . $relativefile;
                         $alt .= ' - ' . $langs->transnoentitiesnoconv('Size') . ': ' . $imgarray['width'] . 'x' . $imgarray['height'];
-                        if ($notitle) $alt = '';
+                        if ($notitle) {
+                            $alt = '';
+                        }
 
                         if ($usesharelink) {
                             if ($val['share']) {
@@ -5688,10 +6301,14 @@ 
                             }
                         }
 
-                        if (empty($nolink)) $return .= '</a>';
+                        if (empty($nolink)) {
+                            $return .= '</a>';
+                        }
                         $return .= "\n";
 
-                        if ($showfilename) $return .= '<br>' . $viewfilename;
+                        if ($showfilename) {
+                            $return .= '<br>' . $viewfilename;
+                        }
                         if ($showaction) {
                             $return .= '<br>';
                             // On propose la generation de la vignette si elle n'existe pas et si la taille est superieure aux limites
@@ -5712,14 +6329,20 @@ 
 
                         if ($nbbyrow > 0) {
                             $return .= '</td>';
-                            if (($nbphoto % $nbbyrow) == 0) $return .= '</tr>';
-                        } else if ($nbbyrow < 0) $return .= '</div>';
+                            if (($nbphoto % $nbbyrow) == 0) {
+                                $return .= '</tr>';
+                            }
+                        } else if ($nbbyrow < 0) {
+                            $return .= '</div>';
+                        }
                     }
 
                     if (empty($size)) {     // Format origine
                         $return .= '<img class="photo photowithmargin" border="0" src="' . DOL_URL_ROOT . '/viewimage.php?modulepart=' . $modulepart . '&entity=' . $this->entity . '&file=' . urlencode($pdir . $photo) . '">';
 
-                        if ($showfilename) $return .= '<br>' . $viewfilename;
+                        if ($showfilename) {
+                            $return .= '<br>' . $viewfilename;
+                        }
                         if ($showaction) {
                             // Special case for product
                             if ($modulepart == 'product' && ($user->rights->produit->creer || $user->rights->service->creer)) {
@@ -5734,7 +6357,9 @@ 
                     }
 
                     // On continue ou on arrete de boucler ?
-                    if ($nbmax && $nbphoto >= $nbmax) break;
+                    if ($nbmax && $nbphoto >= $nbmax) {
+                        break;
+                    }
                 }
             }
 
@@ -5746,7 +6371,9 @@ 
                         $nbphoto++;
                     }
 
-                    if ($nbphoto) $return .= '</table>';
+                    if ($nbphoto) {
+                        $return .= '</table>';
+                    }
                 }
             }
         }
@@ -5765,9 +6392,14 @@ 
     public function isText($info)
     {
         if (is_array($info)) {
-            if (isset($info['type']) && $info['type'] == 'text') return true;
-            else return false;
-        } else return false;
+            if (isset($info['type']) && $info['type'] == 'text') {
+                return true;
+            } else {
+                return false;
+            }
+        } else {
+            return false;
+        }
     }
 
     /**
@@ -5786,8 +6418,12 @@ 
         $now = dol_now();
 
         $fieldvalues = $this->setSaveQuery();
-        if (array_key_exists('date_creation', $fieldvalues) && empty($fieldvalues['date_creation'])) $fieldvalues['date_creation'] = $this->db->idate($now);
-        if (array_key_exists('fk_user_creat', $fieldvalues) && !($fieldvalues['fk_user_creat'] > 0)) $fieldvalues['fk_user_creat'] = $user->id;
+        if (array_key_exists('date_creation', $fieldvalues) && empty($fieldvalues['date_creation'])) {
+            $fieldvalues['date_creation'] = $this->db->idate($now);
+        }
+        if (array_key_exists('fk_user_creat', $fieldvalues) && !($fieldvalues['fk_user_creat'] > 0)) {
+            $fieldvalues['fk_user_creat'] = $user->id;
+        }
         unset($fieldvalues['rowid']);    // The field 'rowid' is reserved field name for autoincrement field so we don't need it into insert.
 
         $keys = array();
@@ -5801,8 +6437,12 @@ 
         // Clean and check mandatory
         foreach ($keys as $key) {
             // If field is an implicit foreign key field
-            if (preg_match('/^integer:/i', $this->fields[$key]['type']) && $values[$key] == '-1') $values[$key] = '';
-            if (!empty($this->fields[$key]['foreignkey']) && $values[$key] == '-1') $values[$key] = '';
+            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'])) {
@@ -5811,11 +6451,17 @@ 
             }
 
             // If field is an implicit foreign key field
-            if (preg_match('/^integer:/i', $this->fields[$key]['type']) && empty($values[$key])) $values[$key] = 'null';
-            if (!empty($this->fields[$key]['foreignkey']) && empty($values[$key])) $values[$key] = 'null';
+            if (preg_match('/^integer:/i', $this->fields[$key]['type']) && empty($values[$key])) {
+                $values[$key] = 'null';
+            }
+            if (!empty($this->fields[$key]['foreignkey']) && empty($values[$key])) {
+                $values[$key] = 'null';
+            }
         }
 
-        if ($error) return -1;
+        if ($error) {
+            return -1;
+        }
 
         $this->db->begin();
 
@@ -5838,7 +6484,9 @@ 
         // Create extrafields
         if (!$error) {
             $result = $this->insertExtraFields();
-            if ($result < 0) $error++;
+            if ($result < 0) {
+                $error++;
+            }
         }
 
         // Triggers
@@ -5872,12 +6520,14 @@ 
         global $conf;
 
         $queryarray = array();
-        foreach ($this->fields as $field => $info)    // Loop on definition of fields
+        foreach ($this->fields as $field => $info) {
+            // Loop on definition of fields
         {
             // Depending on field type ('datetime', ...)
             if ($this->isDate($info)) {
                 if (empty($this->{$field})) {
                     $queryarray[$field] = null;
+        }
                 } else {
                     $queryarray[$field] = $this->db->idate($this->{$field});
                 }
@@ -5891,20 +6541,30 @@ 
                     $queryarray[$field] = null;
                 }
             } else if ($this->isInt($info)) {
-                if ($field == 'entity' && is_null($this->{$field})) $queryarray[$field] = $conf->entity;
-                else {
+                if ($field == 'entity' && is_null($this->{$field})) {
+                    $queryarray[$field] = $conf->entity;
+                } else {
                     $queryarray[$field] = (int)price2num($this->{$field});
-                    if (empty($queryarray[$field])) $queryarray[$field] = 0;        // May be reset to null later if property 'notnull' is -1 for this field.
+                    if (empty($queryarray[$field])) {
+                        $queryarray[$field] = 0;
+                    }
+                    // May be reset to null later if property 'notnull' is -1 for this field.
                 }
             } else if ($this->isFloat($info)) {
                 $queryarray[$field] = (double)price2num($this->{$field});
-                if (empty($queryarray[$field])) $queryarray[$field] = 0;
+                if (empty($queryarray[$field])) {
+                    $queryarray[$field] = 0;
+                }
             } else {
                 $queryarray[$field] = $this->{$field};
             }
 
-            if ($info['type'] == 'timestamp' && empty($queryarray[$field])) unset($queryarray[$field]);
-            if (!empty($info['notnull']) && $info['notnull'] == -1 && empty($queryarray[$field])) $queryarray[$field] = null;
+            if ($info['type'] == 'timestamp' && empty($queryarray[$field])) {
+                unset($queryarray[$field]);
+            }
+            if (!empty($info['notnull']) && $info['notnull'] == -1 && empty($queryarray[$field])) {
+                $queryarray[$field] = null;
+            }
         }
 
         return $queryarray;
@@ -5924,11 +6584,16 @@ 
     {
         global $conf, $langs, $user;
 
-        if (empty($userused)) $userused = $user;
+        if (empty($userused)) {
+            $userused = $user;
+        }
 
         $error = 0;
 
-        if (!empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) return 0;    // For avoid conflicts if trigger used
+        if (!empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) {
+            return 0;
+        }
+        // For avoid conflicts if trigger used
 
         if (!empty($this->array_options)) {
             // Check parameters
@@ -5940,10 +6605,13 @@ 
             //Eliminate copied source object extra_fields that do not exist in target object
             $new_array_options = array();
             foreach ($this->array_options as $key => $value) {
-                if (in_array(substr($key, 8), array_keys($target_extrafields)))    // We remove the 'options_' from $key for test
+                if (in_array(substr($key, 8), array_keys($target_extrafields))) {
+                    // We remove the 'options_' from $key for test
                     $new_array_options[$key] = $value;
-                elseif (in_array($key, array_keys($target_extrafields)))        // We test on $key that does not contains the 'options_' prefix
+                } elseif (in_array($key, array_keys($target_extrafields))) {
+                    // We test on $key that does not contains the 'options_' prefix
                     $new_array_options['options_' . $key] = $value;
+                }
             }
 
             foreach ($new_array_options as $key => $value) {
@@ -5955,8 +6623,12 @@ 
 
                 if ($attributeRequired) {
                     $mandatorypb = false;
-                    if ($attributeType == 'link' && $this->array_options[$key] == '-1') $mandatorypb = true;
-                    if ($this->array_options[$key] === '') $mandatorypb = true;
+                    if ($attributeType == 'link' && $this->array_options[$key] == '-1') {
+                        $mandatorypb = true;
+                    }
+                    if ($this->array_options[$key] === '') {
+                        $mandatorypb = true;
+                    }
                     if ($mandatorypb) {
                         dol_syslog($this->error);
                         $this->errors[] = $langs->trans('ErrorFieldRequired', $attributeLabel);
@@ -6004,12 +6676,15 @@ 
                                 //global $action;		// $action may be 'create', 'update', 'update_extras'...
                                 //var_dump($action);
                                 //var_dump($this->oldcopy);exit;
-                                if (is_object($this->oldcopy))        // If this->oldcopy is not defined, we can't know if we change attribute or not, so we must keep value
+                                if (is_object($this->oldcopy)) {
+                                    // If this->oldcopy is not defined, we can't know if we change attribute or not, so we must keep value
                                 {
                                     //var_dump($this->oldcopy->array_options[$key]); var_dump($this->array_options[$key]);
                                     if ($this->array_options[$key] == $this->oldcopy->array_options[$key])    // If old value crypted in database is same than submited new value, it means we don't change it, so we don't update.
                                     {
-                                        $new_array_options[$key] = $this->array_options[$key];    // Value is kept
+                                        $new_array_options[$key] = $this->array_options[$key];
+                                }
+                                // Value is kept
                                     } else {
                                         // var_dump($algo);
                                         $newvalue = dol_hash($this->array_options[$key], $algo);
@@ -6044,16 +6719,22 @@ 
                         $InfoFieldList = explode(":", $param_list[0]);
                         dol_include_once($InfoFieldList[1]);
                         if ($InfoFieldList[0] && class_exists($InfoFieldList[0])) {
-                            if ($value == '-1')    // -1 is key for no defined in combo list of objects
+                            if ($value == '-1') {
+                                // -1 is key for no defined in combo list of objects
                             {
                                 $new_array_options[$key] = '';
+                            }
                             } elseif ($value) {
                                 $object = new $InfoFieldList[0]($this->db);
-                                if (is_numeric($value)) $res = $object->fetch($value);
-                                else $res = $object->fetch('', $value);
+                                if (is_numeric($value)) {
+                                    $res = $object->fetch($value);
+                                } else {
+                                    $res = $object->fetch('', $value);
+                                }
 
-                                if ($res > 0) $new_array_options[$key] = $object->id;
-                                else {
+                                if ($res > 0) {
+                                    $new_array_options[$key] = $object->id;
+                                } else {
                                     $this->error = "Id/Ref '" . $value . "' for object '" . $object->element . "' not found";
                                     $this->db->rollback();
                                     return -1;
@@ -6069,7 +6750,10 @@ 
             $this->db->begin();
 
             $table_element = $this->table_element;
-            if ($table_element == 'categorie') $table_element = 'categories'; // For compatibility
+            if ($table_element == 'categorie') {
+                $table_element = 'categories';
+            }
+            // For compatibility
 
             $sql_del = "DELETE FROM " . MAIN_DB_PREFIX . $table_element . "_extrafields WHERE fk_object = " . $this->id;
             dol_syslog(get_class($this) . "::insertExtraFields delete", LOG_DEBUG);
@@ -6079,18 +6763,22 @@ 
             foreach ($new_array_options as $key => $value) {
                 $attributeKey = substr($key, 8);   // Remove 'options_' prefix
                 // Add field of attribut
-                if ($extrafields->attributes[$this->table_element]['type'][$attributeKey] != 'separate') // Only for other type than separator
+                if ($extrafields->attributes[$this->table_element]['type'][$attributeKey] != 'separate') {
+                    // Only for other type than separator
                     $sql .= "," . $attributeKey;
+                }
             }
             $sql .= ") VALUES (" . $this->id;
 
             foreach ($new_array_options as $key => $value) {
                 $attributeKey = substr($key, 8);   // Remove 'options_' prefix
                 // Add field of attribute
-                if ($extrafields->attributes[$this->table_element]['type'][$attributeKey] != 'separate') // Only for other type than separator)
+                if ($extrafields->attributes[$this->table_element]['type'][$attributeKey] != 'separate') {
+                    // Only for other type than separator)
                 {
                     if ($new_array_options[$key] != '') {
                         $sql .= ",'" . $this->db->escape($new_array_options[$key]) . "'";
+                }
                     } else {
                         $sql .= ",null";
                     }
@@ -6109,7 +6797,9 @@ 
                 // Call trigger
                 $this->context = array('extrafieldaddupdate' => 1);
                 $result = $this->call_trigger($trigger, $userused);
-                if ($result < 0) $error++;
+                if ($result < 0) {
+                    $error++;
+                }
                 // End call trigger
             }
 
@@ -6120,7 +6810,9 @@ 
                 $this->db->commit();
                 return 1;
             }
-        } else return 0;
+        } else {
+            return 0;
+        }
     }
 
     /**
@@ -6139,8 +6831,12 @@ 
         $now = dol_now();
 
         $fieldvalues = $this->setSaveQuery();
-        if (array_key_exists('date_modification', $fieldvalues) && empty($fieldvalues['date_modification'])) $fieldvalues['date_modification'] = $this->db->idate($now);
-        if (array_key_exists('fk_user_modif', $fieldvalues) && !($fieldvalues['fk_user_modif'] > 0)) $fieldvalues['fk_user_modif'] = $user->id;
+        if (array_key_exists('date_modification', $fieldvalues) && empty($fieldvalues['date_modification'])) {
+            $fieldvalues['date_modification'] = $this->db->idate($now);
+        }
+        if (array_key_exists('fk_user_modif', $fieldvalues) && !($fieldvalues['fk_user_modif'] > 0)) {
+            $fieldvalues['fk_user_modif'] = $user->id;
+        }
         unset($fieldvalues['rowid']);    // The field 'rowid' is reserved field name for autoincrement field so we don't need it into update.
 
         $keys = array();
@@ -6154,8 +6850,14 @@ 
 
         // Clean and check mandatory
         foreach ($keys as $key) {
-            if (preg_match('/^integer:/i', $this->fields[$key]['type']) && $values[$key] == '-1') $values[$key] = '';        // This is an implicit foreign key field
-            if (!empty($this->fields[$key]['foreignkey']) && $values[$key] == '-1') $values[$key] = '';                    // This is an explicit foreign key field
+            if (preg_match('/^integer:/i', $this->fields[$key]['type']) && $values[$key] == '-1') {
+                $values[$key] = '';
+            }
+            // This is an implicit foreign key field
+            if (!empty($this->fields[$key]['foreignkey']) && $values[$key] == '-1') {
+                $values[$key] = '';
+            }
+            // This is an explicit foreign key field
 
             //var_dump($key.'-'.$values[$key].'-'.($this->fields[$key]['notnull'] == 1));
             /*
@@ -6230,9 +6932,11 @@ 
                     return -1;
                 }
             }
-        } elseif (!empty($this->fk_element) && !empty($this->childtables))    // If object has childs linked with a foreign key field, we check all child tables.
+        } elseif (!empty($this->fk_element) && !empty($this->childtables)) {
+            // If object has childs linked with a foreign key field, we check all child tables.
         {
             $objectisused = $this->isObjectUsed($this->id);
+        }
             if (!empty($objectisused)) {
                 dol_syslog(get_class($this) . "::deleteCommon Can't delete record as it has some child", LOG_WARNING);
                 $this->error = 'ErrorRecordHasChildren';
@@ -6295,7 +6999,9 @@ 
     {
         global $langs;
 
-        if (empty($id)) $id = $this->id;
+        if (empty($id)) {
+            $id = $this->id;
+        }
 
         // Check parameters
         if (!isset($this->childtables) || !is_array($this->childtables) || count($this->childtables) == 0) {
@@ -6324,9 +7030,11 @@ 
                     $langs->load("errors");
                     //print 'Found into table '.$table.', type '.$langs->transnoentitiesnoconv($elementname).', haschild='.$haschild;
                     $haschild += $obj->nb;
-                    if (is_numeric($elementname))    // old usage
+                    if (is_numeric($elementname)) {
+                        // old usage
                     {
                         $this->errors[] = $langs->trans("ErrorRecordHasAtLeastOneChildOfType", $table);
+                    }
                     } else    // new usage: $elementname=Translation key
                     {
                         $this->errors[] = $langs->trans("ErrorRecordHasAtLeastOneChildOfType", $langs->transnoentitiesnoconv($elementname));
@@ -6341,7 +7049,9 @@ 
         if ($haschild > 0) {
             $this->errors[] = "ErrorRecordHasChildren";
             return $haschild;
-        } else return 0;
+        } else {
+            return 0;
+        }
     }
 
     /**
@@ -6397,7 +7107,9 @@ 
      */
     public function trimParameters($parameters)
     {
-        if (!is_array($parameters)) return;
+        if (!is_array($parameters)) {
+            return;
+        }
         foreach ($parameters as $parameter) {
             if (isset($this->$parameter)) {
                 $this->$parameter = trim($this->$parameter);
@@ -6442,11 +7154,18 @@ 
         $classname = '';
         $filefound = 0;
         $dirmodels = array('/');
-        if (is_array($conf->modules_parts['models'])) $dirmodels = array_merge($dirmodels, $conf->modules_parts['models']);
+        if (is_array($conf->modules_parts['models'])) {
+            $dirmodels = array_merge($dirmodels, $conf->modules_parts['models']);
+        }
         foreach ($dirmodels as $reldir) {
             foreach (array('doc', 'pdf') as $prefix) {
-                if (in_array(get_class($this), array('Adherent'))) $file = $prefix . "_" . $modele . ".class.php";     // Member module use prefix_module.class.php
-                else $file = $prefix . "_" . $modele . ".modules.php";
+                if (in_array(get_class($this), array('Adherent'))) {
+                    $file = $prefix . "_" . $modele . ".class.php";
+                }
+                // Member module use prefix_module.class.php
+                else {
+                    $file = $prefix . "_" . $modele . ".modules.php";
+                }
 
                 // On verifie l'emplacement du modele
                 $file = dol_buildpath($reldir . $modelspath . $file, 0);
@@ -6456,7 +7175,9 @@ 
                     break;
                 }
             }
-            if ($filefound) break;
+            if ($filefound) {
+                break;
+            }
         }
 
         // If generator was found
@@ -6486,7 +7207,9 @@ 
                         }
                         if (is_dir($tmpdir)) {
                             $tmpfiles = dol_dir_list($tmpdir, 'files', 0, '\.od(s|t)$', '', 'name', SORT_ASC, 0);
-                            if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles);
+                            if (count($tmpfiles)) {
+                                $listoffiles = array_merge($listoffiles, $tmpfiles);
+                            }
                         }
                     }
 
@@ -6537,9 +7260,11 @@ 
                     $destfile = basename($destfull);
                     $rel_dir = preg_replace('/^' . preg_quote(DOL_DATA_ROOT, '/') . '/', '', $upload_dir);
 
-                    if (!preg_match('/[\\/]temp[\\/]|[\\/]thumbs|\.meta$/', $rel_dir))     // If not a tmp dir
+                    if (!preg_match('/[\\/]temp[\\/]|[\\/]thumbs|\.meta$/', $rel_dir)) {
+                        // If not a tmp dir
                     {
                         $filename = basename($destfile);
+                    }
                         $rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
                         $rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
 
@@ -6551,17 +7276,29 @@ 
                         $setsharekey = false;
                         if ($this->element == 'propal') {
                             $useonlinesignature = $conf->global->MAIN_FEATURES_LEVEL;    // Replace this with 1 when feature to make online signature is ok
-                            if ($useonlinesignature) $setsharekey = true;
-                            if (!empty($conf->global->PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD)) $setsharekey = true;
+                            if ($useonlinesignature) {
+                                $setsharekey = true;
+                            }
+                            if (!empty($conf->global->PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD)) {
+                                $setsharekey = true;
+                            }
+                        }
+                        if ($this->element == 'commande' && !empty($conf->global->ORDER_ALLOW_EXTERNAL_DOWNLOAD)) {
+                            $setsharekey = true;
+                        }
+                        if ($this->element == 'facture' && !empty($conf->global->INVOICE_ALLOW_EXTERNAL_DOWNLOAD)) {
+                            $setsharekey = true;
+                        }
+                        if ($this->element == 'bank_account' && !empty($conf->global->BANK_ACCOUNT_ALLOW_EXTERNAL_DOWNLOAD)) {
+                            $setsharekey = true;
                         }
-                        if ($this->element == 'commande' && !empty($conf->global->ORDER_ALLOW_EXTERNAL_DOWNLOAD)) $setsharekey = true;
-                        if ($this->element == 'facture' && !empty($conf->global->INVOICE_ALLOW_EXTERNAL_DOWNLOAD)) $setsharekey = true;
-                        if ($this->element == 'bank_account' && !empty($conf->global->BANK_ACCOUNT_ALLOW_EXTERNAL_DOWNLOAD)) $setsharekey = true;
 
                         if ($setsharekey) {
-                            if (empty($ecmfile->share))    // Because object not found or share not set yet
+                            if (empty($ecmfile->share)) {
+                                // Because object not found or share not set yet
                             {
                                 require_once DOL_DOCUMENT_ROOT . '/core/lib/security2.lib.php';
+                            }
                                 $ecmfile->share = getRandomPassword(true);
                             }
                         }
@@ -6601,12 +7338,16 @@ 
 
                         // Update the last_main_doc field into main object (if documenent generator has property ->update_main_doc_field set)
                         $update_main_doc_field = 0;
-                        if (!empty($obj->update_main_doc_field)) $update_main_doc_field = 1;
+                        if (!empty($obj->update_main_doc_field)) {
+                            $update_main_doc_field = 1;
+                        }
                         if ($update_main_doc_field && !empty($this->table_element)) {
                             $sql = 'UPDATE ' . MAIN_DB_PREFIX . $this->table_element . " SET last_main_doc = '" . ($ecmfile->filepath . '/' . $ecmfile->filename) . "'";
                             $sql .= ' WHERE rowid = ' . $this->id;
                             $resql = $this->db->query($sql);
-                            if (!$resql) dol_print_error($this->db);
+                            if (!$resql) {
+                                dol_print_error($this->db);
+                            }
                         }
                     }
                 } else {
@@ -6638,8 +7379,13 @@ 
     protected function isIndex($info)
     {
         if (is_array($info)) {
-            if (isset($info['index']) && $info['index'] == true) return true;
-            else return false;
-        } else return false;
+            if (isset($info['index']) && $info['index'] == true) {
+                return true;
+            } else {
+                return false;
+            }
+        } else {
+            return false;
+        }
     }
 }
\ No newline at end of file

Base/Translate.php

Braces +171 added lines, -108 removed lines

@@ -30,12 +30,15 @@ 
     {
         Debug::addMessage('Deprecated', 'Unnecessary definition of first parameter ($dir) in Translate');
         $dir = DOL_BASE_PATH;
-        if (!empty($conf->file->character_set_client))
-            $this->charset_output = $conf->file->character_set_client; // If charset output is forced
-        if ($dir)
-            $this->dir = array($dir);
-        else
-            $this->dir = $conf->file->dol_document_root;
+        if (!empty($conf->file->character_set_client)) {
+                    $this->charset_output = $conf->file->character_set_client;
+        }
+        // If charset output is forced
+        if ($dir) {
+                    $this->dir = array($dir);
+        } else {
+                    $this->dir = $conf->file->dol_document_root;
+        }
     }
 
     /**
@@ -47,10 +50,11 @@ 
      */
     function getDefaultLang($mode = 0)
     {
-        if (empty($mode))
-            return $this->defaultlang;
-        else
-            return substr($this->defaultlang, 0, 2);
+        if (empty($mode)) {
+                    return $this->defaultlang;
+        } else {
+                    return substr($this->defaultlang, 0, 2);
+        }
     }
 
     /**
@@ -86,8 +90,9 @@ 
             $langpref = str_replace("-", "_", $langpref);
             $langlist = preg_split("/[;,]/", $langpref);
             $codetouse = $langlist[0];
-        } else
-            $codetouse = $srclang;
+        } else {
+                    $codetouse = $srclang;
+        }
 
         // We redefine $srclang
         $langpart = explode("_", $codetouse);
@@ -96,24 +101,27 @@ 
             // Array force long code from first part, even if long code is defined
             $longforshort = array('ar' => 'ar_SA');
             $longforshortexcep = array('ar_EG');
-            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
+            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]);
                 $longforlong = array('no_nb' => 'nb_NO');
-                if (isset($longforlong[strtolower($srclang)]))
-                    $srclang = $longforlong[strtolower($srclang)];
-            } else
-                $srclang = strtolower($langpart[0]) . "_" . strtoupper($langpart[0]);
+                if (isset($longforlong[strtolower($srclang)])) {
+                                    $srclang = $longforlong[strtolower($srclang)];
+                }
+            } else {
+                            $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]);
-            else
-                $srclang = 'en_US';
+            if (isset($longforshort[strtolower($langpart[0])])) {
+                            $srclang = $longforshort[strtolower($langpart[0])];
+            } else if (!empty($langpart[0])) {
+                            $srclang = strtolower($langpart[0]) . "_" . strtoupper($langpart[0]);
+            } else {
+                            $srclang = 'en_US';
+            }
         }
 
         $this->defaultlang = $srclang;
@@ -163,13 +171,17 @@ 
             dol_print_error('', get_class($this) . "::Load ErrorWrongParameters");
             return -1;
         }
-        if ($this->defaultlang == 'none_NONE')
-            return 0;    // Special language code to not translate keys
+        if ($this->defaultlang == 'none_NONE') {
+                    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.
+        if (empty($loadfromfileonly) && count($this->tab_translate) == 0) {
+                    $this->loadFromDatabase($db);
+        }
+        // No translation was never loaded yet, so we load database.
 
 
         $newdomain = $domain;
@@ -192,10 +204,12 @@ 
 
         // Redefine alt
         $langarray = explode('_', $langofdir);
-        if ($alt < 1 && isset($langarray[1]) && (strtolower($langarray[0]) == strtolower($langarray[1]) || in_array(strtolower($langofdir), array('el_gr'))))
-            $alt = 1;
-        if ($alt < 2 && strtolower($langofdir) == 'en_us')
-            $alt = 2;
+        if ($alt < 1 && isset($langarray[1]) && (strtolower($langarray[0]) == strtolower($langarray[1]) || in_array(strtolower($langofdir), array('el_gr')))) {
+                    $alt = 1;
+        }
+        if ($alt < 2 && strtolower($langofdir) == 'en_us') {
+                    $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);
@@ -236,16 +250,19 @@ 
                         $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.
                         //print $newdomain."\n";
                         //var_dump($this->tab_translate);
-                        if ($alt == 2)
-                            $fileread = 1;
+                        if ($alt == 2) {
+                                                    $fileread = 1;
+                        }
                         $found = true;      // Found in dolibarr PHP cache
                     }
                 }
 
                 if (!$found) {
                     if ($fp = @fopen($file_lang, "rt")) {
-                        if ($usecachekey)
-                            $tabtranslatedomain = array(); // To save lang content in cache
+                        if ($usecachekey) {
+                                                    $tabtranslatedomain = array();
+                        }
+                        // To save lang content in cache
 
                         /**
                          * Read each lines until a '=' (with any combination of spaces around it)
@@ -293,8 +310,10 @@ 
                             }
                         }
 
-                        if (empty($conf->global->MAIN_FORCELANGDIR))
-                            break;  // Break loop on each root dir. If a module has forced dir, we do not stop loop.
+                        if (empty($conf->global->MAIN_FORCELANGDIR)) {
+                                                    break;
+                        }
+                        // Break loop on each root dir. If a module has forced dir, we do not stop loop.
                     }
                 }
             }
@@ -305,10 +324,14 @@ 
             // 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]);
-            if ($langofdir == 'el_EL')
-                $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'
+            if ($langofdir == 'el_EL') {
+                            $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'
             $this->load($domain, $alt + 1, $stopafterdirection, $langofdir);
         }
 
@@ -322,11 +345,15 @@ 
 
         // 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
+            if ($fileread) {
+                            $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
+            if (empty($this->_tab_loaded[$newdomain])) {
+                            $this->_tab_loaded[$newdomain] = 2;
+            }
+            // Set this file as not found
         }
 
         // This part is deprecated and replaced with table llx_overwrite_trans
@@ -338,15 +365,17 @@ 
                 $tmparray = explode(',', $conf->global->$overwritekey);
                 foreach ($tmparray as $tmp) {
                     $tmparray2 = explode(':', $tmp);
-                    if (!empty($tmparray2[1]))
-                        $this->tab_translate[$tmparray2[0]] = $tmparray2[1];
+                    if (!empty($tmparray2[1])) {
+                                            $this->tab_translate[$tmparray2[0]] = $tmparray2[1];
+                    }
                 }
             }
         }
 
         // Check to be sure that SeparatorDecimal differs from SeparatorThousand
-        if (!empty($this->tab_translate["SeparatorDecimal"]) && !empty($this->tab_translate["SeparatorThousand"]) && $this->tab_translate["SeparatorDecimal"] == $this->tab_translate["SeparatorThousand"])
-            $this->tab_translate["SeparatorThousand"] = '';
+        if (!empty($this->tab_translate["SeparatorDecimal"]) && !empty($this->tab_translate["SeparatorThousand"]) && $this->tab_translate["SeparatorDecimal"] == $this->tab_translate["SeparatorThousand"]) {
+                    $this->tab_translate["SeparatorThousand"] = '';
+        }
 
         return 1;
     }
@@ -370,8 +399,10 @@ 
         $domain = 'database';
 
         // Check parameters
-        if (empty($db))
-            return 0;    // Database handler can't be used
+        if (empty($db)) {
+                    return 0;
+        }
+        // Database handler can't be used
 
 
 //dol_syslog("Translate::Load Start domain=".$domain." alt=".$alt." forcelangdir=".$forcelangdir." this->defaultlang=".$this->defaultlang);
@@ -430,8 +461,10 @@ 
             if ($resql) {
                 $num = $db->num_rows($resql);
                 if ($num) {
-                    if ($usecachekey)
-                        $tabtranslatedomain = array(); // To save lang content in cache
+                    if ($usecachekey) {
+                                            $tabtranslatedomain = array();
+                    }
+                    // To save lang content in cache
 
                     $i = 0;
                     while ($i < $num) { // Ex: Need 225ms for all fgets on all lang file for Third party page. Same speed than file_get_contents
@@ -445,8 +478,10 @@ 
                             $value = trim(preg_replace('/\\n/', "\n", $value));
 
                             $this->tab_translate[$key] = $value;
-                            if ($usecachekey)
-                                $tabtranslatedomain[$key] = $value; // To save lang content in cache
+                            if ($usecachekey) {
+                                                            $tabtranslatedomain[$key] = $value;
+                            }
+                            // To save lang content in cache
                         }
 
                         $i++;
@@ -469,11 +504,15 @@ 
             }
         }
 
-        if ($fileread)
-            $this->_tab_loaded[$newdomain] = 1; // Set domain file as loaded
+        if ($fileread) {
+                    $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)
+        if (empty($this->_tab_loaded[$newdomain])) {
+                    $this->_tab_loaded[$newdomain] = 2;
+        }
+        // Marque ce cas comme non trouve (no lines found for language)
 
         return 1;
     }
@@ -487,10 +526,11 @@ 
      */
     function transcountry($str, $countrycode)
     {
-        if ($this->tab_translate["$str$countrycode"])
-            return $this->trans("$str$countrycode");
-        else
-            return $this->trans($str);
+        if ($this->tab_translate["$str$countrycode"]) {
+                    return $this->trans("$str$countrycode");
+        } else {
+                    return $this->trans($str);
+        }
     }
 
     /**
@@ -529,8 +569,9 @@ 
                 $str = sprintf($str, $param1, $param2, $param3, $param4); // Replace %s and %d except for FormatXXX strings.
             }
 
-            if ($maxsize)
-                $str = dol_trunc($str, $maxsize);
+            if ($maxsize) {
+                            $str = dol_trunc($str, $maxsize);
+            }
 
             // We replace some HTML tags by __xx__ to avoid having them encoded by htmlentities
             $str = str_replace(array('<', '>', '"',), array('__lt__', '__gt__', '__quot__'), $str);
@@ -562,8 +603,10 @@ 
     {
         global $conf, $db;
 
-        if (!is_string($key))
-            return 'ErrorBadValueForParamNotAString'; // Avoid multiple errors with code not using function correctly.
+        if (!is_string($key)) {
+                    return 'ErrorBadValueForParamNotAString';
+        }
+        // Avoid multiple errors with code not using function correctly.
 
         $newstr = $key;
         if (preg_match('/^Civility([0-9A-Z]+)$/i', $key, $reg)) {
@@ -608,8 +651,9 @@ 
     function getLabelFromKey($db, $key, $tablename, $fieldkey, $fieldlabel, $keyforselect = '', $filteronentity = 0)
     {
         // If key empty
-        if ($key == '')
-            return '';
+        if ($key == '') {
+                    return '';
+        }
 
         //print 'param: '.$key.'-'.$keydatabase.'-'.$this->trans($key); exit;
         // Check if a translation is available (this can call getTradFromKey)
@@ -626,16 +670,18 @@ 
         $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) . ')';
+        if ($filteronentity) {
+                    $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);
-            if ($obj)
-                $this->cache_labels[$tablename][$key] = $obj->label;
-            else
-                $this->cache_labels[$tablename][$key] = $key;
+            if ($obj) {
+                            $this->cache_labels[$tablename][$key] = $obj->label;
+            } else {
+                            $this->cache_labels[$tablename][$key] = $key;
+            }
 
             $db->free($resql);
             return $this->cache_labels[$tablename][$key];
@@ -700,10 +746,11 @@ 
      */
     function transcountrynoentities($str, $countrycode)
     {
-        if ($this->tab_translate["$str$countrycode"])
-            return $this->transnoentities("$str$countrycode");
-        else
-            return $this->transnoentities($str);
+        if ($this->tab_translate["$str$countrycode"]) {
+                    return $this->transnoentities("$str$countrycode");
+        } else {
+                    return $this->transnoentities($str);
+        }
     }
 
     /**
@@ -736,10 +783,12 @@ 
      */
     function convToOutputCharset($str, $pagecodefrom = 'UTF-8')
     {
-        if ($pagecodefrom == 'ISO-8859-1' && $this->charset_output == 'UTF-8')
-            $str = utf8_encode($str);
-        if ($pagecodefrom == 'UTF-8' && $this->charset_output == 'ISO-8859-1')
-            $str = utf8_decode(str_replace('€', chr(128), $str));
+        if ($pagecodefrom == 'ISO-8859-1' && $this->charset_output == 'UTF-8') {
+                    $str = utf8_encode($str);
+        }
+        if ($pagecodefrom == 'UTF-8' && $this->charset_output == 'ISO-8859-1') {
+                    $str = utf8_decode(str_replace('€', chr(128), $str));
+        }
         return $str;
     }
 
@@ -794,16 +843,19 @@ 
         // 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)))
-                return true;
+            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;
+                if ($this->defaultlang != "en_US") {
+                                    $filenamealt = $searchdir . "/langs/en_US/" . $filename;
+                }
                 //else $filenamealt = $searchdir."/langs/fr_FR/".$filename;
-                if (is_readable(dol_osencode($filenamealt)))
-                    return true;
+                if (is_readable(dol_osencode($filenamealt))) {
+                                    return true;
+                }
             }
         }
 
@@ -833,8 +885,10 @@ 
             $newdir = dol_osencode($dir);
 
             // Check if directory exists
-            if (!is_dir($newdir))
-                continue; // We must not use dol_is_dir here, function may not be loaded
+            if (!is_dir($newdir)) {
+                            continue;
+            }
+            // We must not use dol_is_dir here, function may not be loaded
 
             $fonc = 'numberwords';
             if (file_exists($newdir . '/functions_' . $fonc . '.lib.php')) {
@@ -860,10 +914,11 @@ 
     {
         $symbol = $this->getCurrencySymbol($currency_code);
 
-        if (in_array($currency_code, array('USD')))
-            return $symbol . $amount;
-        else
-            return $amount . $symbol;
+        if (in_array($currency_code, array('USD'))) {
+                    return $symbol . $amount;
+        } else {
+                    return $amount . $symbol;
+        }
     }
 
     /**
@@ -901,16 +956,21 @@ 
     {
         global $db;
 
-        if ($this->cache_currencies_all_loaded)
-            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
+        if ($this->cache_currencies_all_loaded) {
+                    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
 
         $sql = "SELECT code_iso, label, unicode";
         $sql .= " FROM " . MAIN_DB_PREFIX . "c_currencies";
         $sql .= " WHERE active = 1";
-        if (!empty($currency_code))
-            $sql .= " AND code_iso = '" . $db->escape($currency_code) . "'";
+        if (!empty($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);
@@ -918,9 +978,11 @@ 
         if ($resql) {
             $this->load("dict");
             $label = array();
-            if (!empty($currency_code))
-                foreach ($this->cache_currencies as $key => $val)
-                    $label[$key] = $val['label']; // Label in already loaded cache
+            if (!empty($currency_code)) {
+                            foreach ($this->cache_currencies as $key => $val)
+                    $label[$key] = $val['label'];
+            }
+            // Label in already loaded cache
 
             $num = $db->num_rows($resql);
             $i = 0;
@@ -933,8 +995,9 @@ 
                 $label[$obj->code_iso] = $this->cache_currencies[$obj->code_iso]['label'];
                 $i++;
             }
-            if (empty($currency_code))
-                $this->cache_currencies_all_loaded = true;
+            if (empty($currency_code)) {
+                            $this->cache_currencies_all_loaded = true;
+            }
             //print count($label).' '.count($this->cache_currencies);
             // Resort cache
             array_multisort($label, SORT_ASC, $this->cache_currencies);

dolibarr/htdocs/main.inc.php

Braces +341 added lines, -224 removed lines

@@ -217,16 +217,18 @@ 
     foreach ($tmplist as $tmpkey) {
         $postkey = $tmpautoset[0] . '_' . $tmpkey;
         //var_dump('tmpkey='.$tmpkey.' postkey='.$postkey.' value='.$_POST[$postkey]);
-        if (!empty($_POST[$postkey]))
-            $cookiearrayvalue[$tmpkey] = $_POST[$postkey];
+        if (!empty($_POST[$postkey])) {
+                    $cookiearrayvalue[$tmpkey] = $_POST[$postkey];
+        }
     }
     $cookiename = $tmpautoset[0];
     $cookievalue = json_encode($cookiearrayvalue);
     //var_dump('setcookie cookiename='.$cookiename.' cookievalue='.$cookievalue);
     setcookie($cookiename, empty($cookievalue) ? '' : $cookievalue, empty($cookievalue) ? 0 : (time() + (86400 * 354)), '/', null, false, true); // keep cookie 1 year and add tag httponly
-    if (empty($cookievalue))
-        unset($_COOKIE[$cookiename]);
-}
+    if (empty($cookievalue)) {
+            unset($_COOKIE[$cookiename]);
+    }
+    }
 
 
 // Init session. Name of session is specific to Dolibarr instance.
@@ -235,8 +237,9 @@ 
 
 $sessionname = 'DOLSESSID_' . $prefix;
 $sessiontimeout = 'DOLSESSTIMEOUT_' . $prefix;
-if (!empty($_COOKIE[$sessiontimeout]))
+if (!empty($_COOKIE[$sessiontimeout])) {
     ini_set('session.gc_maxlifetime', $_COOKIE[$sessiontimeout]);
+}
 session_name($sessionname);
 session_set_cookie_params(0, '/', null, false, true);   // Add tag httponly on session cookie (same as setting session.cookie_httponly into php.ini). Must be called before the session_start.
 // This create lock, released when session_write_close() or end of page.
@@ -267,11 +270,13 @@ 
     $conf->browser->layout = $tmp['layout'];     // 'classic', 'phone', 'tablet'
     //var_dump($conf->browser);
 
-    if ($conf->browser->layout == 'phone')
-        $conf->dol_no_mouse_hover = 1;
-    if ($conf->browser->layout == 'phone')
-        $conf->global->MAIN_TESTMENUHIDER = 1;
-}
+    if ($conf->browser->layout == 'phone') {
+            $conf->dol_no_mouse_hover = 1;
+    }
+    if ($conf->browser->layout == 'phone') {
+            $conf->global->MAIN_TESTMENUHIDER = 1;
+    }
+    }
 
 // Force HTTPS if required ($conf->file->main_force_https is 0/1 or https dolibarr root url)
 // $_SERVER["HTTPS"] is 'on' when link is https, otherwise $_SERVER["HTTPS"] is empty or 'off'
@@ -316,10 +321,14 @@ 
 }
 
 // Loading of additional presentation includes
-if (!defined('NOREQUIREHTML'))
-    require_once DOL_BASE_PATH . '/core/class/html.form.class.php';     // Need 660ko memory (800ko in 2.2)
-if (!defined('NOREQUIREAJAX') && $conf->use_javascript_ajax)
-    require_once DOL_BASE_PATH . '/core/lib/ajax.lib.php'; // Need 22ko memory
+if (!defined('NOREQUIREHTML')) {
+    require_once DOL_BASE_PATH . '/core/class/html.form.class.php';
+}
+// Need 660ko memory (800ko in 2.2)
+if (!defined('NOREQUIREAJAX') && $conf->use_javascript_ajax) {
+    require_once DOL_BASE_PATH . '/core/lib/ajax.lib.php';
+}
+// Need 22ko memory
 
 
 // If install or upgrade process not done or not completely finished, we call the install page.
@@ -345,8 +354,9 @@ 
 // Creation of a token against CSRF vulnerabilities
 if (!defined('NOTOKENRENEWAL')) {
     // roulement des jetons car cree a chaque appel
-    if (isset($_SESSION['newtoken']))
-        $_SESSION['token'] = $_SESSION['newtoken'];
+    if (isset($_SESSION['newtoken'])) {
+            $_SESSION['token'] = $_SESSION['newtoken'];
+    }
 
     // Save in $_SESSION['newtoken'] what will be next token. Into forms, we will add param token = $_SESSION['newtoken']
     $token = dol_hash(uniqid(mt_rand(), true)); // Generates a hash of a random number
@@ -368,14 +378,16 @@ 
 }
 
 // Disable modules (this must be after session_start and after conf has been loaded)
-if (GETPOST('disablemodules', 'alpha'))
+if (GETPOST('disablemodules', 'alpha')) {
     $_SESSION["disablemodules"] = GETPOST('disablemodules', 'alpha');
+}
 if (!empty($_SESSION["disablemodules"])) {
     $disabled_modules = explode(',', $_SESSION["disablemodules"]);
     foreach ($disabled_modules as $module) {
         if ($module) {
-            if (empty($conf->$module))
-                $conf->$module = new stdClass();
+            if (empty($conf->$module)) {
+                            $conf->$module = new stdClass();
+            }
             $conf->$module->enabled = false;
             if ($module == 'fournisseur') {  // Special case
                 $conf->supplier_order->enabled = 0;
@@ -397,11 +409,13 @@ 
         $dolibarr_main_authentication = constant('MAIN_AUTHENTICATION_MODE');
     } else {
         // Authentication mode
-        if (empty($dolibarr_main_authentication))
-            $dolibarr_main_authentication = 'http,dolibarr';
+        if (empty($dolibarr_main_authentication)) {
+                    $dolibarr_main_authentication = 'http,dolibarr';
+        }
         // Authentication mode: forceuser
-        if ($dolibarr_main_authentication == 'forceuser' && empty($dolibarr_auto_user))
-            $dolibarr_auto_user = 'auto';
+        if ($dolibarr_main_authentication == 'forceuser' && empty($dolibarr_auto_user)) {
+                    $dolibarr_auto_user = 'auto';
+        }
     }
     // Set authmode
     $authmode = explode(',', $dolibarr_main_authentication);
@@ -478,35 +492,41 @@ 
                 $hookmanager->initHooks(array('login'));
                 $parameters = array('dol_authmode' => $dol_authmode, 'dol_loginmesg' => $_SESSION["dol_loginmesg"]);
                 $reshook = $hookmanager->executeHooks('afterLoginFailed', $parameters, $user, $action);    // Note that $action and $object may have been modified by some hooks
-                if ($reshook < 0)
-                    $error++;
+                if ($reshook < 0) {
+                                    $error++;
+                }
 
                 // Note: exit is done later
             }
         }
 
         $allowedmethodtopostusername = 2;
-        if (defined('MAIN_AUTHENTICATION_POST_METHOD'))
-            $allowedmethodtopostusername = constant('MAIN_AUTHENTICATION_POST_METHOD');
+        if (defined('MAIN_AUTHENTICATION_POST_METHOD')) {
+                    $allowedmethodtopostusername = constant('MAIN_AUTHENTICATION_POST_METHOD');
+        }
         $usertotest = (!empty($_COOKIE['login_dolibarr']) ? $_COOKIE['login_dolibarr'] : GETPOST("username", "alpha", $allowedmethodtopostusername));
         $passwordtotest = GETPOST('password', 'none', $allowedmethodtopostusername);
         $entitytotest = (GETPOST('entity', 'int') ? GETPOST('entity', 'int') : (!empty($conf->entity) ? $conf->entity : 1));
 
         // Define if we received data to test the login.
         $goontestloop = false;
-        if (isset($_SERVER["REMOTE_USER"]) && in_array('http', $authmode))
-            $goontestloop = true;
-        if ($dolibarr_main_authentication == 'forceuser' && !empty($dolibarr_auto_user))
-            $goontestloop = true;
-        if (GETPOST("username", "alpha", $allowedmethodtopostusername) || !empty($_COOKIE['login_dolibarr']) || GETPOST('openid_mode', 'alpha', 1))
-            $goontestloop = true;
+        if (isset($_SERVER["REMOTE_USER"]) && in_array('http', $authmode)) {
+                    $goontestloop = true;
+        }
+        if ($dolibarr_main_authentication == 'forceuser' && !empty($dolibarr_auto_user)) {
+                    $goontestloop = true;
+        }
+        if (GETPOST("username", "alpha", $allowedmethodtopostusername) || !empty($_COOKIE['login_dolibarr']) || GETPOST('openid_mode', 'alpha', 1)) {
+                    $goontestloop = true;
+        }
 
         if (!is_object($langs)) { // This can occurs when calling page with NOREQUIRETRAN defined, however we need langs for error messages.
             include_once DOL_BASE_PATH . '/core/class/translate.class.php';
             $langs = new Translate("", $conf);
             $langcode = (GETPOST('lang', 'aZ09', 1) ? GETPOST('lang', 'aZ09', 1) : (empty($conf->global->MAIN_LANG_DEFAULT) ? 'auto' : $conf->global->MAIN_LANG_DEFAULT));
-            if (defined('MAIN_LANG_DEFAULT'))
-                $langcode = constant('MAIN_LANG_DEFAULT');
+            if (defined('MAIN_LANG_DEFAULT')) {
+                            $langcode = constant('MAIN_LANG_DEFAULT');
+            }
             $langs->setDefaultLang($langcode);
         }
 
@@ -528,8 +548,9 @@ 
                     $datenow = dol_now();
                     $datefirst = dol_stringtotime($_POST["dst_first"]);
                     $datesecond = dol_stringtotime($_POST["dst_second"]);
-                    if ($datenow >= $datefirst && $datenow < $datesecond)
-                        $dol_dst = 1;
+                    if ($datenow >= $datefirst && $datenow < $datesecond) {
+                                            $dol_dst = 1;
+                    }
                 }
                 //print $datefirst.'-'.$datesecond.'-'.$datenow.'-'.$dol_tz.'-'.$dol_tzstring.'-'.$dol_dst; exit;
             }
@@ -541,8 +562,9 @@ 
 
                 // Bad password. No authmode has found a good password.
                 // We set a generic message if not defined inside function checkLoginPassEntity or subfunctions
-                if (empty($_SESSION["dol_loginmesg"]))
-                    $_SESSION["dol_loginmesg"] = $langs->trans("ErrorBadLoginPassword");
+                if (empty($_SESSION["dol_loginmesg"])) {
+                                    $_SESSION["dol_loginmesg"] = $langs->trans("ErrorBadLoginPassword");
+                }
 
                 // Call trigger for the "security events" log
                 $user->trigger_mesg = $langs->trans("ErrorBadLoginPassword") . ' - login=' . GETPOST("username", "alpha", 2);
@@ -559,8 +581,9 @@ 
                 $hookmanager->initHooks(array('login'));
                 $parameters = array('dol_authmode' => $dol_authmode, 'dol_loginmesg' => $_SESSION["dol_loginmesg"]);
                 $reshook = $hookmanager->executeHooks('afterLoginFailed', $parameters, $user, $action);    // Note that $action and $object may have been modified by some hooks
-                if ($reshook < 0)
-                    $error++;
+                if ($reshook < 0) {
+                                    $error++;
+                }
 
                 // Note: exit is done in next chapter
             }
@@ -570,10 +593,11 @@ 
         if (!$login || (in_array('ldap', $authmode) && empty($passwordtotest))) { // With LDAP we refused empty password because some LDAP are "opened" for anonymous access so connexion is a success.
             // No data to test login, so we show the login page
             dol_syslog("--- Access to " . $_SERVER["PHP_SELF"] . " showing the login form and exit");
-            if (defined('NOREDIRECTBYMAINTOLOGIN'))
-                return 'ERROR_NOT_LOGGED';
-            else
-                dol_loginfunction($langs, $conf, (!empty($mysoc) ? $mysoc : ''));
+            if (defined('NOREDIRECTBYMAINTOLOGIN')) {
+                            return 'ERROR_NOT_LOGGED';
+            } else {
+                            dol_loginfunction($langs, $conf, (!empty($mysoc) ? $mysoc : ''));
+            }
             exit;
         }
 
@@ -612,21 +636,24 @@ 
             $hookmanager->initHooks(array('login'));
             $parameters = array('dol_authmode' => $dol_authmode, 'dol_loginmesg' => $_SESSION["dol_loginmesg"]);
             $reshook = $hookmanager->executeHooks('afterLoginFailed', $parameters, $user, $action);    // Note that $action and $object may have been modified by some hooks
-            if ($reshook < 0)
-                $error++;
+            if ($reshook < 0) {
+                            $error++;
+            }
 
             $paramsurl = array();
-            if (GETPOST('textbrowser', 'int'))
-                $paramsurl[] = 'textbrowser=' . GETPOST('textbrowser', 'int');
-            if (GETPOST('nojs', 'int'))
-                $paramsurl[] = 'nojs=' . GETPOST('nojs', 'int');
-            if (GETPOST('lang', 'aZ09'))
-                $paramsurl[] = 'lang=' . GETPOST('lang', 'aZ09');
+            if (GETPOST('textbrowser', 'int')) {
+                            $paramsurl[] = 'textbrowser=' . GETPOST('textbrowser', 'int');
+            }
+            if (GETPOST('nojs', 'int')) {
+                            $paramsurl[] = 'nojs=' . GETPOST('nojs', 'int');
+            }
+            if (GETPOST('lang', 'aZ09')) {
+                            $paramsurl[] = 'lang=' . GETPOST('lang', 'aZ09');
+            }
             header('Location: ' . DOL_BASE_URI . '/index.php' . (count($paramsurl) ? '?' . implode('&', $paramsurl) : ''));
             exit;
         }
-    }
-    else {
+    } else {
         // We are already into an authenticated session
         $login = $_SESSION["dol_login"];
         $entity = $_SESSION["dol_entity"];
@@ -668,20 +695,23 @@ 
             $hookmanager->initHooks(array('login'));
             $parameters = array('dol_authmode' => $dol_authmode, 'dol_loginmesg' => $_SESSION["dol_loginmesg"]);
             $reshook = $hookmanager->executeHooks('afterLoginFailed', $parameters, $user, $action);    // Note that $action and $object may have been modified by some hooks
-            if ($reshook < 0)
-                $error++;
+            if ($reshook < 0) {
+                            $error++;
+            }
 
             $paramsurl = array();
-            if (GETPOST('textbrowser', 'int'))
-                $paramsurl[] = 'textbrowser=' . GETPOST('textbrowser', 'int');
-            if (GETPOST('nojs', 'int'))
-                $paramsurl[] = 'nojs=' . GETPOST('nojs', 'int');
-            if (GETPOST('lang', 'aZ09'))
-                $paramsurl[] = 'lang=' . GETPOST('lang', 'aZ09');
+            if (GETPOST('textbrowser', 'int')) {
+                            $paramsurl[] = 'textbrowser=' . GETPOST('textbrowser', 'int');
+            }
+            if (GETPOST('nojs', 'int')) {
+                            $paramsurl[] = 'nojs=' . GETPOST('nojs', 'int');
+            }
+            if (GETPOST('lang', 'aZ09')) {
+                            $paramsurl[] = 'lang=' . GETPOST('lang', 'aZ09');
+            }
             header('Location: ' . DOL_BASE_URI . '/index.php' . (count($paramsurl) ? '?' . implode('&', $paramsurl) : ''));
             exit;
-        }
-        else {
+        } else {
             // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
             $hookmanager->initHooks(array('main'));
 
@@ -690,8 +720,9 @@ 
                 $relativepathstring = preg_replace('/\?.*$/', '', $_SERVER["HTTP_REFERER"]);
                 $relativepathstring = preg_replace('/^https?:\/\/[^\/]*/', '', $relativepathstring);     // Get full path except host server
                 // Clean $relativepathstring
-                if (constant('DOL_BASE_URI'))
-                    $relativepathstring = preg_replace('/^' . preg_quote(constant('DOL_BASE_URI'), '/') . '/', '', $relativepathstring);
+                if (constant('DOL_BASE_URI')) {
+                                    $relativepathstring = preg_replace('/^' . preg_quote(constant('DOL_BASE_URI'), '/') . '/', '', $relativepathstring);
+                }
                 $relativepathstring = preg_replace('/^\//', '', $relativepathstring);
                 $relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);
                 //var_dump($relativepathstring);
@@ -742,16 +773,21 @@ 
         $_SESSION["dol_company"] = $conf->global->MAIN_INFO_SOCIETE_NOM;
         $_SESSION["dol_entity"] = $conf->entity;
         // Store value into session (values stored only if defined)
-        if (!empty($dol_hide_topmenu))
-            $_SESSION['dol_hide_topmenu'] = $dol_hide_topmenu;
-        if (!empty($dol_hide_leftmenu))
-            $_SESSION['dol_hide_leftmenu'] = $dol_hide_leftmenu;
-        if (!empty($dol_optimize_smallscreen))
-            $_SESSION['dol_optimize_smallscreen'] = $dol_optimize_smallscreen;
-        if (!empty($dol_no_mouse_hover))
-            $_SESSION['dol_no_mouse_hover'] = $dol_no_mouse_hover;
-        if (!empty($dol_use_jmobile))
-            $_SESSION['dol_use_jmobile'] = $dol_use_jmobile;
+        if (!empty($dol_hide_topmenu)) {
+                    $_SESSION['dol_hide_topmenu'] = $dol_hide_topmenu;
+        }
+        if (!empty($dol_hide_leftmenu)) {
+                    $_SESSION['dol_hide_leftmenu'] = $dol_hide_leftmenu;
+        }
+        if (!empty($dol_optimize_smallscreen)) {
+                    $_SESSION['dol_optimize_smallscreen'] = $dol_optimize_smallscreen;
+        }
+        if (!empty($dol_no_mouse_hover)) {
+                    $_SESSION['dol_no_mouse_hover'] = $dol_no_mouse_hover;
+        }
+        if (!empty($dol_use_jmobile)) {
+                    $_SESSION['dol_use_jmobile'] = $dol_use_jmobile;
+        }
 
         dol_syslog("This is a new started user session. _SESSION['dol_login']=" . $_SESSION["dol_login"] . " Session id=" . session_id());
 
@@ -776,8 +812,9 @@ 
         $hookmanager->initHooks(array('login'));
         $parameters = array('dol_authmode' => $dol_authmode, 'dol_loginfo' => $loginfo);
         $reshook = $hookmanager->executeHooks('afterLogin', $parameters, $user, $action);    // Note that $action and $object may have been modified by some hooks
-        if ($reshook < 0)
-            $error++;
+        if ($reshook < 0) {
+                    $error++;
+        }
 
         if ($error) {
             $db->rollback();
@@ -815,10 +852,14 @@ 
      */
 
     // Set liste_limit
-    if (isset($user->conf->MAIN_SIZE_LISTE_LIMIT))
-        $conf->liste_limit = $user->conf->MAIN_SIZE_LISTE_LIMIT; // Can be 0
-    if (isset($user->conf->PRODUIT_LIMIT_SIZE))
-        $conf->product->limit_size = $user->conf->PRODUIT_LIMIT_SIZE; // Can be 0
+    if (isset($user->conf->MAIN_SIZE_LISTE_LIMIT)) {
+            $conf->liste_limit = $user->conf->MAIN_SIZE_LISTE_LIMIT;
+    }
+    // Can be 0
+    if (isset($user->conf->PRODUIT_LIMIT_SIZE)) {
+            $conf->product->limit_size = $user->conf->PRODUIT_LIMIT_SIZE;
+    }
+    // Can be 0
 
 
 
@@ -859,8 +900,9 @@ 
     if (!empty($user->conf->MAIN_DISABLE_JAVASCRIPT)) {
         $conf->use_javascript_ajax = !$user->conf->MAIN_DISABLE_JAVASCRIPT;
     }
-} else
+} else {
     $conf->use_javascript_ajax = 0;
+}
 // Set MAIN_OPTIMIZEFORTEXTBROWSER
 if (GETPOST('textbrowser', 'int') || (!empty($conf->browser->name) && $conf->browser->name == 'lynxlinks') || !empty($user->conf->MAIN_OPTIMIZEFORTEXTBROWSER)) {   // If we must enable text browser
     $conf->global->MAIN_OPTIMIZEFORTEXTBROWSER = 1;
@@ -869,25 +911,32 @@ 
 }
 
 // Set terminal output option according to conf->browser.
-if (GETPOST('dol_hide_leftmenu', 'int') || !empty($_SESSION['dol_hide_leftmenu']))
+if (GETPOST('dol_hide_leftmenu', 'int') || !empty($_SESSION['dol_hide_leftmenu'])) {
     $conf->dol_hide_leftmenu = 1;
-if (GETPOST('dol_hide_topmenu', 'int') || !empty($_SESSION['dol_hide_topmenu']))
+}
+if (GETPOST('dol_hide_topmenu', 'int') || !empty($_SESSION['dol_hide_topmenu'])) {
     $conf->dol_hide_topmenu = 1;
-if (GETPOST('dol_optimize_smallscreen', 'int') || !empty($_SESSION['dol_optimize_smallscreen']))
+}
+if (GETPOST('dol_optimize_smallscreen', 'int') || !empty($_SESSION['dol_optimize_smallscreen'])) {
     $conf->dol_optimize_smallscreen = 1;
-if (GETPOST('dol_no_mouse_hover', 'int') || !empty($_SESSION['dol_no_mouse_hover']))
+}
+if (GETPOST('dol_no_mouse_hover', 'int') || !empty($_SESSION['dol_no_mouse_hover'])) {
     $conf->dol_no_mouse_hover = 1;
-if (GETPOST('dol_use_jmobile', 'int') || !empty($_SESSION['dol_use_jmobile']))
+}
+if (GETPOST('dol_use_jmobile', 'int') || !empty($_SESSION['dol_use_jmobile'])) {
     $conf->dol_use_jmobile = 1;
-if (!empty($conf->browser->layout) && $conf->browser->layout != 'classic')
+}
+if (!empty($conf->browser->layout) && $conf->browser->layout != 'classic') {
     $conf->dol_no_mouse_hover = 1;
+}
 if ((!empty($conf->browser->layout) && $conf->browser->layout == 'phone') || (!empty($_SESSION['dol_screenwidth']) && $_SESSION['dol_screenwidth'] < 400) || (!empty($_SESSION['dol_screenheight']) && $_SESSION['dol_screenheight'] < 400)
 ) {
     $conf->dol_optimize_smallscreen = 1;
 }
 // If we force to use jmobile, then we reenable javascript
-if (!empty($conf->dol_use_jmobile))
+if (!empty($conf->dol_use_jmobile)) {
     $conf->use_javascript_ajax = 1;
+}
 // Replace themes bugged with jmobile with eldy
 if (!empty($conf->dol_use_jmobile) && in_array($conf->theme, array('bureau2crea', 'cameleo', 'amarok'))) {
     $conf->theme = 'eldy';
@@ -911,8 +960,9 @@ 
 if (!defined('NOLOGIN')) {
     // If the login is not recovered, it is identified with an account that does not exist.
     // Hacking attempt?
-    if (!$user->login)
-        accessforbidden();
+    if (!$user->login) {
+            accessforbidden();
+    }
 
     // Check if user is active
     if ($user->statut < 1) {
@@ -987,15 +1037,18 @@ 
 
     // Load the menu manager (only if not already done)
     $file_menu = $conf->standard_menu;
-    if (GETPOST('menu', 'alpha'))
-        $file_menu = GETPOST('menu', 'alpha');     // example: menu=eldy_menu.php
+    if (GETPOST('menu', 'alpha')) {
+            $file_menu = GETPOST('menu', 'alpha');
+    }
+    // example: menu=eldy_menu.php
     if (!class_exists('MenuManager')) {
         $menufound = 0;
         $dirmenus = array_merge(array("/core/menus/"), (array) $conf->modules_parts['menus']);
         foreach ($dirmenus as $dirmenu) {
             $menufound = dol_include_once($dirmenu . "standard/" . $file_menu);
-            if (class_exists('MenuManager'))
-                break;
+            if (class_exists('MenuManager')) {
+                            break;
+            }
         }
         if (!class_exists('MenuManager')) { // If failed to include, we try with standard eldy_menu.php
             dol_syslog("You define a menu manager '" . $file_menu . "' that can not be loaded.", LOG_WARNING);
@@ -1145,18 +1198,20 @@ 
     }
     print '<!doctype html>' . "\n";
 
-    if (!empty($conf->global->MAIN_USE_CACHE_MANIFEST))
-        print '<html lang="' . substr($langs->defaultlang, 0, 2) . '" manifest="' . DOL_BASE_URI . '/cache.manifest">' . "\n";
-    else
-        print '<html lang="' . substr($langs->defaultlang, 0, 2) . '">' . "\n";
+    if (!empty($conf->global->MAIN_USE_CACHE_MANIFEST)) {
+            print '<html lang="' . substr($langs->defaultlang, 0, 2) . '" manifest="' . DOL_BASE_URI . '/cache.manifest">' . "\n";
+    } else {
+            print '<html lang="' . substr($langs->defaultlang, 0, 2) . '">' . "\n";
+    }
     //print '<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr">'."\n";
     if (empty($disablehead)) {
         $ext = 'layout=' . $conf->browser->layout . '&version=' . urlencode(DOL_VERSION);
 
         print "<head>\n";
 
-        if (GETPOST('dol_basehref', 'alpha'))
-            print '<base href="' . dol_escape_htmltag(GETPOST('dol_basehref', 'alpha')) . '">' . "\n";
+        if (GETPOST('dol_basehref', 'alpha')) {
+                    print '<base href="' . dol_escape_htmltag(GETPOST('dol_basehref', 'alpha')) . '">' . "\n";
+        }
 
         // Displays meta
         print '<meta charset="UTF-8">' . "\n";
@@ -1166,10 +1221,13 @@ 
 
         // Favicon
         $favicon = dol_buildpath('/theme/' . $conf->theme . '/img/favicon.ico', 1);
-        if (!empty($conf->global->MAIN_FAVICON_URL))
-            $favicon = $conf->global->MAIN_FAVICON_URL;
-        if (empty($conf->dol_use_jmobile))
-            print '<link rel="shortcut icon" type="image/x-icon" href="' . $favicon . '"/>' . "\n"; // Not required into an Android webview
+        if (!empty($conf->global->MAIN_FAVICON_URL)) {
+                    $favicon = $conf->global->MAIN_FAVICON_URL;
+        }
+        if (empty($conf->dol_use_jmobile)) {
+                    print '<link rel="shortcut icon" type="image/x-icon" href="' . $favicon . '"/>' . "\n";
+        }
+        // Not required into an Android webview
 
 
 
@@ -1193,32 +1251,40 @@ 
         //if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) print '<link rel="copyright" title="GNU General Public License" href="http://www.gnu.org/copyleft/gpl.html#SEC1">'."\n";
         //if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) print '<link rel="author" title="Dolibarr Development Team" href="https://www.dolibarr.org">'."\n";
         // Auto refresh page
-        if (GETPOST('autorefresh', 'int') > 0)
-            print '<meta http-equiv="refresh" content="' . GETPOST('autorefresh', 'int') . '">';
+        if (GETPOST('autorefresh', 'int') > 0) {
+                    print '<meta http-equiv="refresh" content="' . GETPOST('autorefresh', 'int') . '">';
+        }
 
         // Displays title
         $appli = constant('DOL_APPLICATION_TITLE');
-        if (!empty($conf->global->MAIN_APPLICATION_TITLE))
-            $appli = $conf->global->MAIN_APPLICATION_TITLE;
+        if (!empty($conf->global->MAIN_APPLICATION_TITLE)) {
+                    $appli = $conf->global->MAIN_APPLICATION_TITLE;
+        }
 
         print '<title>';
         $titletoshow = '';
-        if ($title && !empty($conf->global->MAIN_HTML_TITLE) && preg_match('/noapp/', $conf->global->MAIN_HTML_TITLE))
-            $titletoshow = dol_htmlentities($title);
-        else if ($title)
-            $titletoshow = dol_htmlentities($appli . ' - ' . $title);
-        else
-            $titletoshow = dol_htmlentities($appli);
-
-        if (!is_object($hookmanager))
-            $hookmanager = new HookManager($db);
+        if ($title && !empty($conf->global->MAIN_HTML_TITLE) && preg_match('/noapp/', $conf->global->MAIN_HTML_TITLE)) {
+                    $titletoshow = dol_htmlentities($title);
+        } else if ($title) {
+                    $titletoshow = dol_htmlentities($appli . ' - ' . $title);
+        } else {
+                    $titletoshow = dol_htmlentities($appli);
+        }
+
+        if (!is_object($hookmanager)) {
+                    $hookmanager = new HookManager($db);
+        }
         $hookmanager->initHooks("main");
         $parameters = array('title' => $titletoshow);
         $result = $hookmanager->executeHooks('setHtmlTitle', $parameters);  // Note that $action and $object may have been modified by some hooks
-        if ($result > 0)
-            $titletoshow = $hookmanager->resPrint;    // Replace Title to show
-        else
-            $titletoshow .= $hookmanager->resPrint;      // Concat to Title to show
+        if ($result > 0) {
+                    $titletoshow = $hookmanager->resPrint;
+        }
+        // Replace Title to show
+        else {
+                    $titletoshow .= $hookmanager->resPrint;
+        }
+        // Concat to Title to show
 
         print $titletoshow;
         print '</title>';
@@ -1308,8 +1374,9 @@ 
 
         //print 'themepath='.$themepath.' themeparam='.$themeparam;exit;
         print '<link rel="stylesheet" type="text/css" href="' . $themepath . $themeparam . '">' . "\n";
-        if (!empty($conf->global->MAIN_FIX_FLASH_ON_CHROME))
-            print '<!-- Includes CSS that does not exists as a workaround of flash bug of chrome -->' . "\n" . '<link rel="stylesheet" type="text/css" href="filethatdoesnotexiststosolvechromeflashbug">' . "\n";
+        if (!empty($conf->global->MAIN_FIX_FLASH_ON_CHROME)) {
+                    print '<!-- Includes CSS that does not exists as a workaround of flash bug of chrome -->' . "\n" . '<link rel="stylesheet" type="text/css" href="filethatdoesnotexiststosolvechromeflashbug">' . "\n";
+        }
 
         // CSS forced by modules (relative url starting with /)
         if (!empty($conf->modules_parts['css'])) {
@@ -1317,13 +1384,15 @@ 
             foreach ($arraycss as $modcss => $filescss) {
                 $filescss = (array) $filescss; // To be sure filecss is an array
                 foreach ($filescss as $cssfile) {
-                    if (empty($cssfile))
-                        dol_syslog("Warning: module " . $modcss . " declared a css path file into its descriptor that is empty.", LOG_WARNING);
+                    if (empty($cssfile)) {
+                                            dol_syslog("Warning: module " . $modcss . " declared a css path file into its descriptor that is empty.", LOG_WARNING);
+                    }
                     // cssfile is a relative path
                     print '<!-- Includes CSS added by module ' . $modcss . ' -->' . "\n" . '<link rel="stylesheet" type="text/css" href="' . dol_buildpath($cssfile, 1);
                     // We add params only if page is not static, because some web server setup does not return content type text/css if url has parameters, so browser cache is not used.
-                    if (!preg_match('/\.css$/i', $cssfile))
-                        print $themeparam;
+                    if (!preg_match('/\.css$/i', $cssfile)) {
+                                            print $themeparam;
+                    }
                     print '">' . "\n";
                 }
             }
@@ -1333,8 +1402,9 @@ 
             foreach ($arrayofcss as $cssfile) {
                 print '<!-- Includes CSS added by page -->' . "\n" . '<link rel="stylesheet" type="text/css" title="default" href="' . dol_buildpath($cssfile, 1);
                 // We add params only if page is not static, because some web server setup does not return content type text/css if url has parameters and browser cache is not used.
-                if (!preg_match('/\.css$/i', $cssfile))
-                    print $themeparam;
+                if (!preg_match('/\.css$/i', $cssfile)) {
+                                    print $themeparam;
+                }
                 print '">' . "\n";
             }
         }
@@ -1439,10 +1509,12 @@ 
             // Browser notifications
             if (!defined('DISABLE_BROWSER_NOTIF')) {
                 $enablebrowsernotif = false;
-                if (!empty($conf->agenda->enabled) && !empty($conf->global->AGENDA_REMINDER_BROWSER))
-                    $enablebrowsernotif = true;
-                if ($conf->browser->layout == 'phone')
-                    $enablebrowsernotif = false;
+                if (!empty($conf->agenda->enabled) && !empty($conf->global->AGENDA_REMINDER_BROWSER)) {
+                                    $enablebrowsernotif = true;
+                }
+                if ($conf->browser->layout == 'phone') {
+                                    $enablebrowsernotif = false;
+                }
                 if ($enablebrowsernotif) {
                     print '<!-- Includes JS of Dolibarr (brwoser layout = ' . $conf->browser->layout . ')-->' . "\n";
                     //print '<script type="text/javascript" src="' . DOL_BASE_URI . '/core/js/lib_notification.js.php' . ($ext ? '?' . $ext : '') . '"></script>' . "\n";
@@ -1479,10 +1551,12 @@ 
             }
         }
 
-        if (!empty($head))
-            print $head . "\n";
-        if (!empty($conf->global->MAIN_HTML_HEADER))
-            print $conf->global->MAIN_HTML_HEADER . "\n";
+        if (!empty($head)) {
+                    print $head . "\n";
+        }
+        if (!empty($conf->global->MAIN_HTML_HEADER)) {
+                    print $conf->global->MAIN_HTML_HEADER . "\n";
+        }
 
         print "<!-- Alixar debugBar header -->";
         print Debug::getRenderHeader(); // Includes Alixar debugBar header
@@ -1547,15 +1621,20 @@ 
         if (!empty($conf->global->MAIN_APPLICATION_TITLE)) {
             $appli = $conf->global->MAIN_APPLICATION_TITLE;
             if (preg_match('/\d\.\d/', $appli)) {
-                if (!preg_match('/' . preg_quote(DOL_VERSION) . '/', $appli))
-                    $appli .= " (" . DOL_VERSION . ")"; // If new title contains a version that is different than core
-            } else
-                $appli .= " " . DOL_VERSION;
-        } else
-            $appli .= " " . DOL_VERSION;
+                if (!preg_match('/' . preg_quote(DOL_VERSION) . '/', $appli)) {
+                                    $appli .= " (" . DOL_VERSION . ")";
+                }
+                // If new title contains a version that is different than core
+            } else {
+                            $appli .= " " . DOL_VERSION;
+            }
+        } else {
+                    $appli .= " " . DOL_VERSION;
+        }
 
-        if (!empty($conf->global->MAIN_FEATURES_LEVEL))
-            $appli .= "<br>" . $langs->trans("LevelOfFeature") . ': ' . $conf->global->MAIN_FEATURES_LEVEL;
+        if (!empty($conf->global->MAIN_FEATURES_LEVEL)) {
+                    $appli .= "<br>" . $langs->trans("LevelOfFeature") . ': ' . $conf->global->MAIN_FEATURES_LEVEL;
+        }
 
         $logouttext = '';
         if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
@@ -1593,12 +1672,15 @@ 
         $parameters = array();
         $result = $hookmanager->executeHooks('printTopRightMenu', $parameters);    // Note that $action and $object may have been modified by some hooks
         if (is_numeric($result)) {
-            if ($result == 0)
-                $toprightmenu .= $hookmanager->resPrint;  // add
-            else
-                $toprightmenu = $hookmanager->resPrint;      // replace
-        }
-        else {
+            if ($result == 0) {
+                            $toprightmenu .= $hookmanager->resPrint;
+            }
+            // add
+            else {
+                            $toprightmenu = $hookmanager->resPrint;
+            }
+            // replace
+        } else {
             $toprightmenu .= $result; // For backward compatibility
         }
 
@@ -1692,9 +1774,10 @@ 
         print "<!-- End top horizontal menu -->\n\n";
     }
 
-    if (empty($conf->dol_hide_leftmenu) && empty($conf->dol_use_jmobile))
-        print '<!-- Begin div id-container --><div id="id-container" class="id-container' . ($morecss ? ' ' . $morecss : '') . '">';
-}
+    if (empty($conf->dol_hide_leftmenu) && empty($conf->dol_use_jmobile)) {
+            print '<!-- Begin div id-container --><div id="id-container" class="id-container' . ($morecss ? ' ' . $morecss : '') . '">';
+    }
+    }
 
 /**
  *  Show left menu bar
@@ -1718,8 +1801,9 @@ 
     $searchform = '';
     $bookmarks = '';
 
-    if (!empty($menu_array_before))
-        dol_syslog("Deprecated parameter menu_array_before was used when calling main::left_menu function. Menu entries of module should now be defined into module descriptor and not provided when calling left_menu.", LOG_WARNING);
+    if (!empty($menu_array_before)) {
+            dol_syslog("Deprecated parameter menu_array_before was used when calling main::left_menu function. Menu entries of module should now be defined into module descriptor and not provided when calling left_menu.", LOG_WARNING);
+    }
 
     if (empty($conf->dol_hide_leftmenu) && (!defined('NOREQUIREMENU') || !constant('NOREQUIREMENU'))) {
         // Instantiate hooks of thirdparty module
@@ -1727,8 +1811,10 @@ 
 
         print "\n" . '<!-- Begin side-nav id-left -->' . "\n" . '<div class="side-nav"><div id="id-left">' . "\n";
 
-        if ($conf->browser->layout == 'phone')
-            $conf->global->MAIN_USE_OLD_SEARCH_FORM = 1; // Select into select2 is awfull on smartphone. TODO Is this still true with select2 v4 ?
+        if ($conf->browser->layout == 'phone') {
+                    $conf->global->MAIN_USE_OLD_SEARCH_FORM = 1;
+        }
+        // Select into select2 is awfull on smartphone. TODO Is this still true with select2 v4 ?
 
         print "\n";
 
@@ -1755,8 +1841,9 @@ 
         $reshook = $hookmanager->executeHooks('printSearchForm', $parameters);    // Note that $action and $object may have been modified by some hooks
         if (empty($reshook)) {
             $searchform .= $hookmanager->resPrint;
-        } else
-            $searchform = $hookmanager->resPrint;
+        } else {
+                    $searchform = $hookmanager->resPrint;
+        }
 
         // Force special value for $searchform
         if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) || empty($conf->use_javascript_ajax)) {
@@ -1800,38 +1887,49 @@ 
         if (empty($conf->global->MAIN_HIDE_VERSION)) {    // Version is already on help picto and on login page.
             $doliurl = 'https://www.dolibarr.org';
             //local communities
-            if (preg_match('/fr/i', $langs->defaultlang))
-                $doliurl = 'https://www.dolibarr.fr';
-            if (preg_match('/es/i', $langs->defaultlang))
-                $doliurl = 'https://www.dolibarr.es';
-            if (preg_match('/de/i', $langs->defaultlang))
-                $doliurl = 'https://www.dolibarr.de';
-            if (preg_match('/it/i', $langs->defaultlang))
-                $doliurl = 'https://www.dolibarr.it';
-            if (preg_match('/gr/i', $langs->defaultlang))
-                $doliurl = 'https://www.dolibarr.gr';
+            if (preg_match('/fr/i', $langs->defaultlang)) {
+                            $doliurl = 'https://www.dolibarr.fr';
+            }
+            if (preg_match('/es/i', $langs->defaultlang)) {
+                            $doliurl = 'https://www.dolibarr.es';
+            }
+            if (preg_match('/de/i', $langs->defaultlang)) {
+                            $doliurl = 'https://www.dolibarr.de';
+            }
+            if (preg_match('/it/i', $langs->defaultlang)) {
+                            $doliurl = 'https://www.dolibarr.it';
+            }
+            if (preg_match('/gr/i', $langs->defaultlang)) {
+                            $doliurl = 'https://www.dolibarr.gr';
+            }
 
             $appli = constant('DOL_APPLICATION_TITLE');
             if (!empty($conf->global->MAIN_APPLICATION_TITLE)) {
                 $appli = $conf->global->MAIN_APPLICATION_TITLE;
                 $doliurl = '';
                 if (preg_match('/\d\.\d/', $appli)) {
-                    if (!preg_match('/' . preg_quote(DOL_VERSION) . '/', $appli))
-                        $appli .= " (" . DOL_VERSION . ")"; // If new title contains a version that is different than core
-                } else
-                    $appli .= " " . DOL_VERSION;
-            } else
-                $appli .= " " . DOL_VERSION;
+                    if (!preg_match('/' . preg_quote(DOL_VERSION) . '/', $appli)) {
+                                            $appli .= " (" . DOL_VERSION . ")";
+                    }
+                    // If new title contains a version that is different than core
+                } else {
+                                    $appli .= " " . DOL_VERSION;
+                }
+            } else {
+                            $appli .= " " . DOL_VERSION;
+            }
             print '<div id="blockvmenuhelpapp" class="blockvmenuhelp">';
-            if ($doliurl)
-                print '<a class="help" target="_blank" rel="noopener" href="' . $doliurl . '">';
-            else
-                print '<span class="help">';
+            if ($doliurl) {
+                            print '<a class="help" target="_blank" rel="noopener" href="' . $doliurl . '">';
+            } else {
+                            print '<span class="help">';
+            }
             print $appli;
-            if ($doliurl)
-                print '</a>';
-            else
-                print '</span>';
+            if ($doliurl) {
+                            print '</a>';
+            } else {
+                            print '</span>';
+            }
             print '</div>' . "\n";
         }
 
@@ -1878,9 +1976,10 @@ 
     print "\n";
     print '<!-- Begin right area -->' . "\n";
 
-    if (empty($leftmenuwithoutmainarea))
-        main_area($title);
-}
+    if (empty($leftmenuwithoutmainarea)) {
+            main_area($title);
+    }
+    }
 
 /**
  *  Begin main area
@@ -1892,16 +1991,18 @@ 
 {
     global $conf, $langs;
 
-    if (empty($conf->dol_hide_leftmenu))
-        print '<div id="id-right">';
+    if (empty($conf->dol_hide_leftmenu)) {
+            print '<div id="id-right">';
+    }
 
     print "\n";
 
     print '<!-- Begin div class="fiche" -->' . "\n" . '<div class="fiche">' . "\n";
 
-    if (!empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED))
-        print info_admin($langs->trans("WarningYouAreInMaintenanceMode", $conf->global->MAIN_ONLY_LOGIN_ALLOWED));
-}
+    if (!empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED)) {
+            print info_admin($langs->trans("WarningYouAreInMaintenanceMode", $conf->global->MAIN_ONLY_LOGIN_ALLOWED));
+    }
+    }
 
 /**
  *  Return helpbaseurl, helppage and mode
@@ -1925,18 +2026,21 @@ 
         // If WIKI URL
         if (preg_match('/^es/i', $langs->defaultlang)) {
             $helpbaseurl = 'http://wiki.dolibarr.org/index.php/%s';
-            if (preg_match('/ES:([^|]+)/i', $helppagename, $reg))
-                $helppage = $reg[1];
+            if (preg_match('/ES:([^|]+)/i', $helppagename, $reg)) {
+                            $helppage = $reg[1];
+            }
         }
         if (preg_match('/^fr/i', $langs->defaultlang)) {
             $helpbaseurl = 'http://wiki.dolibarr.org/index.php/%s';
-            if (preg_match('/FR:([^|]+)/i', $helppagename, $reg))
-                $helppage = $reg[1];
+            if (preg_match('/FR:([^|]+)/i', $helppagename, $reg)) {
+                            $helppage = $reg[1];
+            }
         }
         if (empty($helppage)) { // If help page not already found
             $helpbaseurl = 'http://wiki.dolibarr.org/index.php/%s';
-            if (preg_match('/EN:([^|]+)/i', $helppagename, $reg))
-                $helppage = $reg[1];
+            if (preg_match('/EN:([^|]+)/i', $helppagename, $reg)) {
+                            $helppage = $reg[1];
+            }
         }
         $mode = 'wiki';
     }
@@ -1967,8 +2071,9 @@ 
     $ret .= '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
     $ret .= '<input type="hidden" name="mode" value="search">';
     $ret .= '<input type="hidden" name="savelogin" value="' . dol_escape_htmltag($user->login) . '">';
-    if ($showtitlebefore)
-        $ret .= $title . ' ';
+    if ($showtitlebefore) {
+            $ret .= $title . ' ';
+    }
     $ret .= '<input type="text" class="flat ' . $htmlmorecss . '"';
     $ret .= ' style="text-indent: 22px; background-image: url(\'' . $img . '\'); background-repeat: no-repeat; background-position: 3px;"';
     $ret .= ($accesskey ? ' accesskey="' . $accesskey . '"' : '');
@@ -2013,10 +2118,12 @@ 
             foreach ($user->lastsearch_values_tmp as $key => $val) {
                 unset($_SESSION['lastsearch_values_tmp_' . $key]);   // Clean array to rebuild it just after
                 if (count($val) && empty($_POST['button_removefilter'])) { // If there is search criteria to save and we did not click on 'Clear filter' button
-                    if (empty($val['sortfield']))
-                        unset($val['sortfield']);
-                    if (empty($val['sortorder']))
-                        unset($val['sortorder']);
+                    if (empty($val['sortfield'])) {
+                                            unset($val['sortfield']);
+                    }
+                    if (empty($val['sortorder'])) {
+                                            unset($val['sortorder']);
+                    }
                     dol_syslog('Save lastsearch_values_tmp_' . $key . '=' . json_encode($val, 0) . " (systematic recording of last search criterias)");
                     $_SESSION['lastsearch_values_tmp_' . $key] = json_encode($val);
                     unset($_SESSION['lastsearch_values_' . $key]);
@@ -2027,8 +2134,9 @@ 
 
         $relativepathstring = $_SERVER["PHP_SELF"];
         // Clean $relativepathstring
-        if (constant('DOL_BASE_URI'))
-            $relativepathstring = preg_replace('/^' . preg_quote(constant('DOL_BASE_URI'), '/') . '/', '', $relativepathstring);
+        if (constant('DOL_BASE_URI')) {
+                    $relativepathstring = preg_replace('/^' . preg_quote(constant('DOL_BASE_URI'), '/') . '/', '', $relativepathstring);
+        }
         $relativepathstring = preg_replace('/^\//', '', $relativepathstring);
         $relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);
         if (preg_match('/list\.php$/', $relativepathstring)) {
@@ -2036,12 +2144,15 @@ 
             unset($_SESSION['lastsearch_page_tmp_' . $relativepathstring]);
             unset($_SESSION['lastsearch_limit_tmp_' . $relativepathstring]);
 
-            if (!empty($contextpage))
-                $_SESSION['lastsearch_contextpage_tmp_' . $relativepathstring] = $contextpage;
-            if (!empty($page) && $page > 1)
-                $_SESSION['lastsearch_page_tmp_' . $relativepathstring] = $page;
-            if (!empty($limit) && $limit != $conf->limit)
-                $_SESSION['lastsearch_limit_tmp_' . $relativepathstring] = $limit;
+            if (!empty($contextpage)) {
+                            $_SESSION['lastsearch_contextpage_tmp_' . $relativepathstring] = $contextpage;
+            }
+            if (!empty($page) && $page > 1) {
+                            $_SESSION['lastsearch_page_tmp_' . $relativepathstring] = $page;
+            }
+            if (!empty($limit) && $limit != $conf->limit) {
+                            $_SESSION['lastsearch_limit_tmp_' . $relativepathstring] = $limit;
+            }
 
             unset($_SESSION['lastsearch_contextpage_' . $relativepathstring]);
             unset($_SESSION['lastsearch_page_' . $relativepathstring]);
@@ -2068,20 +2179,26 @@ 
 
         print '</div> <!-- End div class="fiche" -->' . "\n"; // End div fiche
 
-        if (empty($conf->dol_hide_leftmenu))
-            print '</div> <!-- End div id-right -->' . "\n"; // End div id-right
+        if (empty($conf->dol_hide_leftmenu)) {
+                    print '</div> <!-- End div id-right -->' . "\n";
+        }
+        // End div id-right
 
-        if (empty($conf->dol_hide_leftmenu) && empty($conf->dol_use_jmobile))
-            print '</div> <!-- End div id-container -->' . "\n"; // End div container
+        if (empty($conf->dol_hide_leftmenu) && empty($conf->dol_use_jmobile)) {
+                    print '</div> <!-- End div id-container -->' . "\n";
+        }
+        // End div container
 
         print "\n";
-        if ($comment)
-            print '<!-- ' . $comment . ' -->' . "\n";
+        if ($comment) {
+                    print '<!-- ' . $comment . ' -->' . "\n";
+        }
 
         printCommonFooter($zone);
 
-        if (!empty($delayedhtmlcontent))
-            print $delayedhtmlcontent;
+        if (!empty($delayedhtmlcontent)) {
+                    print $delayedhtmlcontent;
+        }
 
         if (!empty($conf->use_javascript_ajax)) {
             print "\n" . '<!-- Includes JS Footer of Dolibarr -->' . "\n";

Models/Company.php

Braces +485 added lines, -347 removed lines

@@ -488,8 +488,9 @@ 
         global $langs;
         global $conf;
 
-        if (empty($rowid) && empty($ref) && empty($ref_ext) && empty($ref_int) && empty($idprof1) && empty($idprof2) && empty($idprof3) && empty($idprof4) && empty($idprof5) && empty($idprof6) && empty($email))
-            return -1;
+        if (empty($rowid) && empty($ref) && empty($ref_ext) && empty($ref_int) && empty($idprof1) && empty($idprof2) && empty($idprof3) && empty($idprof4) && empty($idprof5) && empty($idprof6) && empty($email)) {
+                    return -1;
+        }
 
         $sql = 'SELECT s.rowid, s.nom as name, s.name_alias, s.entity, s.ref_ext, s.ref_int, s.address, s.datec as date_creation, s.prefix_comm';
         $sql .= ', s.status';
@@ -526,30 +527,42 @@ 
         $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;
-        if ($ref)
-            $sql .= " AND s.nom = '" . $this->db->escape($ref) . "'";
-        if ($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) . "'";
-        if ($ref_int)
-            $sql .= " AND s.ref_int = '" . $this->db->escape($ref_int) . "'";
-        if ($idprof1)
-            $sql .= " AND s.siren = '" . $this->db->escape($idprof1) . "'";
-        if ($idprof2)
-            $sql .= " AND s.siret = '" . $this->db->escape($idprof2) . "'";
-        if ($idprof3)
-            $sql .= " AND s.ape = '" . $this->db->escape($idprof3) . "'";
-        if ($idprof4)
-            $sql .= " AND s.idprof4 = '" . $this->db->escape($idprof4) . "'";
-        if ($idprof5)
-            $sql .= " AND s.idprof5 = '" . $this->db->escape($idprof5) . "'";
-        if ($idprof6)
-            $sql .= " AND s.idprof6 = '" . $this->db->escape($idprof6) . "'";
-        if ($email)
-            $sql .= " AND s.email = '" . $this->db->escape($email) . "'";
+        if ($rowid) {
+                    $sql .= ' AND s.rowid = ' . $rowid;
+        }
+        if ($ref) {
+                    $sql .= " AND s.nom = '" . $this->db->escape($ref) . "'";
+        }
+        if ($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) . "'";
+        }
+        if ($ref_int) {
+                    $sql .= " AND s.ref_int = '" . $this->db->escape($ref_int) . "'";
+        }
+        if ($idprof1) {
+                    $sql .= " AND s.siren = '" . $this->db->escape($idprof1) . "'";
+        }
+        if ($idprof2) {
+                    $sql .= " AND s.siret = '" . $this->db->escape($idprof2) . "'";
+        }
+        if ($idprof3) {
+                    $sql .= " AND s.ape = '" . $this->db->escape($idprof3) . "'";
+        }
+        if ($idprof4) {
+                    $sql .= " AND s.idprof4 = '" . $this->db->escape($idprof4) . "'";
+        }
+        if ($idprof5) {
+                    $sql .= " AND s.idprof5 = '" . $this->db->escape($idprof5) . "'";
+        }
+        if ($idprof6) {
+                    $sql .= " AND s.idprof6 = '" . $this->db->escape($idprof6) . "'";
+        }
+        if ($email) {
+                    $sql .= " AND s.email = '" . $this->db->escape($email) . "'";
+        }
 
         $resql = $this->db->query($sql);
         if ($resql) {
@@ -700,8 +713,9 @@ 
         }
 
         // Use first price level if level not defined for third party
-        if (!empty($conf->global->PRODUIT_MULTIPRICES) && empty($this->price_level))
-            $this->price_level = 1;
+        if (!empty($conf->global->PRODUIT_MULTIPRICES) && empty($this->price_level)) {
+                    $this->price_level = 1;
+        }
 
         return $result;
     }
@@ -718,8 +732,9 @@ 
     {
         global $langs, $conf, $user;
 
-        if (empty($fuser))
-            $fuser = $user;
+        if (empty($fuser)) {
+                    $fuser = $user;
+        }
 
         require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
 
@@ -737,8 +752,9 @@ 
             if (!$error && $call_trigger) {
                 // Call trigger
                 $result = $this->call_trigger('COMPANY_DELETE', $fuser);
-                if ($result < 0)
-                    $error++;
+                if ($result < 0) {
+                                    $error++;
+                }
                 // End call triggers
             }
 
@@ -821,8 +837,9 @@ 
                 $this->db->rollback();
                 return -1;
             }
-        } else
-            dol_syslog("Can't remove thirdparty with id " . $id . ". There is " . $objectisused . " childs", LOG_WARNING);
+        } else {
+                    dol_syslog("Can't remove thirdparty with id " . $id . ". There is " . $objectisused . " childs", LOG_WARNING);
+        }
         return 0;
     }
 
@@ -836,8 +853,10 @@ 
         // phpcs:enable
         if ($this->id) {
             $newclient = 1;
-            if ($this->client == 2 || $this->client == 3)
-                $newclient = 3; //If prospect, we keep prospect tag
+            if ($this->client == 2 || $this->client == 3) {
+                            $newclient = 3;
+            }
+            //If prospect, we keep prospect tag
             $sql = "UPDATE " . MAIN_DB_PREFIX . "societe";
             $sql .= " SET client = " . $newclient;
             $sql .= " WHERE rowid = " . $this->id;
@@ -846,8 +865,9 @@ 
             if ($resql) {
                 $this->client = $newclient;
                 return 1;
-            } else
-                return -1;
+            } else {
+                            return -1;
+            }
         }
         return 0;
     }
@@ -1023,8 +1043,9 @@ 
                 $this->error = $discount->error;
                 return -3;
             }
-        } else
-            return 0;
+        } else {
+                    return 0;
+        }
     }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -1103,17 +1124,21 @@ 
     {
         global $conf, $langs, $hookmanager;
 
-        if (!empty($conf->dol_no_mouse_hover))
-            $notooltip = 1;   // Force disable tooltips
+        if (!empty($conf->dol_no_mouse_hover)) {
+                    $notooltip = 1;
+        }
+        // Force disable tooltips
 
         $name = $this->name ? $this->name : $this->nom;
 
         if (!empty($conf->global->SOCIETE_ON_SEARCH_AND_LIST_GO_ON_CUSTOMER_OR_SUPPLIER_CARD)) {
 
-            if (empty($option) && $this->client > 0)
-                $option = 'customer';
-            if (empty($option) && $this->fournisseur > 0)
-                $option = 'supplier';
+            if (empty($option) && $this->client > 0) {
+                            $option = 'customer';
+            }
+            if (empty($option) && $this->fournisseur > 0) {
+                            $option = 'supplier';
+            }
         }
 
 
@@ -1138,8 +1163,9 @@ 
             }
         }
 
-        if (!empty($this->name_alias))
-            $name .= ' (' . $this->name_alias . ')';
+        if (!empty($this->name_alias)) {
+                    $name .= ' (' . $this->name_alias . ')';
+        }
 
         $result = '';
         $label = '';
@@ -1197,36 +1223,49 @@ 
 
         if (!empty($this->name)) {
             $label .= '<br><b>' . $langs->trans('Name') . ':</b> ' . $this->name;
-            if (!empty($this->name_alias))
-                $label .= ' (' . $this->name_alias . ')';
+            if (!empty($this->name_alias)) {
+                            $label .= ' (' . $this->name_alias . ')';
+            }
             $label .= '<br><b>' . $langs->trans('Email') . ':</b> ' . $this->email;
         }
-        if (!empty($this->country_code))
-            $label .= '<br><b>' . $langs->trans('Country') . ':</b> ' . $this->country_code;
-        if (!empty($this->tva_intra) || (!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;
+        if (!empty($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;
+        }
         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;
-            if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid2') !== false)
-                $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;
-            if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid4') !== false)
-                $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;
-            if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid6') !== false)
-                $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;
-        if (!empty($this->code_fournisseur) && $this->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);
-        if (!empty($conf->accounting->enabled) && $this->fournisseur)
-            $label .= '<br><b>' . $langs->trans('SupplierAccountancyCode') . ':</b> ' . $this->code_compta_fournisseur;
+            if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid1') !== false) {
+                            $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;
+            }
+            if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid3') !== false) {
+                            $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;
+            }
+            if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid5') !== false) {
+                            $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;
+            }
+        }
+        if (!empty($this->code_client) && ($this->client == 1 || $this->client == 3)) {
+                    $label .= '<br><b>' . $langs->trans('CustomerCode') . ':</b> ' . $this->code_client;
+        }
+        if (!empty($this->code_fournisseur) && $this->fournisseur) {
+                    $label .= '<br><b>' . $langs->trans('SupplierCode') . ':</b> ' . $this->code_fournisseur;
+        }
+        if (!empty($conf->accounting->enabled) && ($this->client == 1 || $this->client == 3)) {
+                    $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 .= '</div>';
 
@@ -1234,10 +1273,12 @@ 
         $linkstart .= (!empty($this->canvas) ? '&canvas=' . $this->canvas : '');
         // Add param to save lastsearch_values or not
         $add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
-        if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"]))
-            $add_save_lastsearch_values = 1;
-        if ($add_save_lastsearch_values)
-            $linkstart .= '&save_lastsearch_values=1';
+        if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) {
+                    $add_save_lastsearch_values = 1;
+        }
+        if ($add_save_lastsearch_values) {
+                    $linkstart .= '&save_lastsearch_values=1';
+        }
         $linkstart .= '"';
 
         $linkclose = '';
@@ -1266,20 +1307,23 @@ 
         }
 
         $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);
-        if ($withpicto != 2)
-            $result .= ($maxlen ? dol_trunc($name, $maxlen) : $name);
+        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);
+        }
+        if ($withpicto != 2) {
+                    $result .= ($maxlen ? dol_trunc($name, $maxlen) : $name);
+        }
         $result .= $linkend;
 
         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
-        if ($reshook > 0)
-            $result = $hookmanager->resPrint;
-        else
-            $result .= $hookmanager->resPrint;
+        if ($reshook > 0) {
+                    $result = $hookmanager->resPrint;
+        } else {
+                    $result .= $hookmanager->resPrint;
+        }
 
         return $result;
     }
@@ -1311,40 +1355,47 @@ 
         $langs->load('companies');
 
         if ($mode == 0) {
-            if ($statut == 0)
-                return $langs->trans("ActivityCeased");
-            elseif ($statut == 1)
-                return $langs->trans("InActivity");
+            if ($statut == 0) {
+                            return $langs->trans("ActivityCeased");
+            } elseif ($statut == 1) {
+                            return $langs->trans("InActivity");
+            }
         } elseif ($mode == 1) {
-            if ($statut == 0)
-                return $langs->trans("ActivityCeased");
-            elseif ($statut == 1)
-                return $langs->trans("InActivity");
+            if ($statut == 0) {
+                            return $langs->trans("ActivityCeased");
+            } elseif ($statut == 1) {
+                            return $langs->trans("InActivity");
+            }
         } elseif ($mode == 2) {
-            if ($statut == 0)
-                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");
+            if ($statut == 0) {
+                            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");
+            }
         } elseif ($mode == 3) {
-            if ($statut == 0)
-                return img_picto($langs->trans("ActivityCeased"), 'statut5', 'class="pictostatus"');
-            elseif ($statut == 1)
-                return img_picto($langs->trans("InActivity"), 'statut4', 'class="pictostatus"');
+            if ($statut == 0) {
+                            return img_picto($langs->trans("ActivityCeased"), 'statut5', 'class="pictostatus"');
+            } elseif ($statut == 1) {
+                            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");
-            elseif ($statut == 1)
-                return img_picto($langs->trans("InActivity"), 'statut4', 'class="pictostatus"') . ' ' . $langs->trans("InActivity");
+            if ($statut == 0) {
+                            return img_picto($langs->trans("ActivityCeased"), 'statut5', 'class="pictostatus"') . ' ' . $langs->trans("ActivityCeased");
+            } elseif ($statut == 1) {
+                            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"');
-            elseif ($statut == 1)
-                return '<span class="hideonsmartphone">' . $langs->trans("InActivity") . '</span> ' . img_picto($langs->trans("InActivity"), 'statut4', 'class="pictostatus"');
+            if ($statut == 0) {
+                            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"');
+            }
         } elseif ($mode == 6) {
-            if ($statut == 0)
-                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"');
+            if ($statut == 0) {
+                            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"');
+            }
         }
     }
 
@@ -1363,8 +1414,9 @@ 
 
         $contact_emails = $this->contact_property_array('email', 1);
         if ($this->email && $addthirdparty) {
-            if (empty($this->name))
-                $this->name = $this->nom;
+            if (empty($this->name)) {
+                            $this->name = $this->nom;
+            }
             $contact_emails['thirdparty'] = $langs->transnoentitiesnoconv("ThirdParty") . ': ' . dol_trunc($this->name, 16) . " <" . $this->email . ">";
         }
         //var_dump($contact_emails)
@@ -1406,20 +1458,22 @@ 
                 $i = 0;
                 while ($i < $nump) {
                     $obj = $this->db->fetch_object($resql);
-                    if ($mode == 'email')
-                        $property = $obj->email;
-                    else if ($mode == 'mobile')
-                        $property = $obj->phone_mobile;
-                    else
-                        $property = $obj->$mode;
+                    if ($mode == 'email') {
+                                            $property = $obj->email;
+                    } else if ($mode == 'mobile') {
+                                            $property = $obj->phone_mobile;
+                    } else {
+                                            $property = $obj->$mode;
+                    }
 
                     // Show all contact. If hidedisabled is 1, showonly contacts with status = 1
                     if ($obj->statut == 1 || empty($hidedisabled)) {
                         if (empty($property)) {
-                            if ($mode == 'email')
-                                $property = $langs->transnoentitiesnoconv("NoEMail");
-                            else if ($mode == 'mobile')
-                                $property = $langs->transnoentitiesnoconv("NoMobilePhone");
+                            if ($mode == 'email') {
+                                                            $property = $langs->transnoentitiesnoconv("NoEMail");
+                            } else if ($mode == 'mobile') {
+                                                            $property = $langs->transnoentitiesnoconv("NoMobilePhone");
+                            }
                         }
 
                         if (!empty($obj->poste)) {
@@ -1450,8 +1504,9 @@ 
         $contact_phone = $this->contact_property_array('mobile');
 
         if (!empty($this->phone)) { // If a phone of thirdparty is defined, we add it ot mobile of contacts
-            if (empty($this->name))
-                $this->name = $this->nom;
+            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 . ">";
         }
@@ -1533,8 +1588,9 @@ 
         // phpcs:enable
         $contact_property = '';
 
-        if (empty($rowid))
-            return '';
+        if (empty($rowid)) {
+                    return '';
+        }
 
         $sql = "SELECT rowid, email, phone_mobile, lastname, firstname";
         $sql .= " FROM " . MAIN_DB_PREFIX . "socpeople";
@@ -1547,10 +1603,11 @@ 
             if ($nump) {
                 $obj = $this->db->fetch_object($resql);
 
-                if ($mode == 'email')
-                    $contact_property = dol_string_nospecial(dolGetFirstLastname($obj->firstname, $obj->lastname), ' ', array(",")) . " <" . $obj->email . ">";
-                else if ($mode == 'mobile')
-                    $contact_property = $obj->phone_mobile;
+                if ($mode == 'email') {
+                                    $contact_property = dol_string_nospecial(dolGetFirstLastname($obj->firstname, $obj->lastname), ' ', array(",")) . " <" . $obj->email . ">";
+                } else if ($mode == 'mobile') {
+                                    $contact_property = $obj->phone_mobile;
+                }
             }
             return $contact_property;
         } else {
@@ -1640,19 +1697,24 @@ 
             $dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
             foreach ($dirsociete as $dirroot) {
                 $res = dol_include_once($dirroot . $module . '.php');
-                if ($res)
-                    break;
+                if ($res) {
+                                    break;
+                }
             }
 
             $mod = new $module();
 
             dol_syslog(get_class($this) . "::codeclient_modifiable code_client=" . $this->code_client . " module=" . $module);
-            if ($mod->code_modifiable_null && !$this->code_client)
-                return 1;
-            if ($mod->code_modifiable_invalide && $this->check_codeclient() < 0)
-                return 1;
-            if ($mod->code_modifiable)
-                return 1; // A mettre en dernier
+            if ($mod->code_modifiable_null && !$this->code_client) {
+                            return 1;
+            }
+            if ($mod->code_modifiable_invalide && $this->check_codeclient() < 0) {
+                            return 1;
+            }
+            if ($mod->code_modifiable) {
+                            return 1;
+            }
+            // A mettre en dernier
             return 0;
         } else {
             return 0;
@@ -1680,8 +1742,9 @@ 
             $dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
             foreach ($dirsociete as $dirroot) {
                 $res = dol_include_once($dirroot . $module . '.php');
-                if ($res)
-                    break;
+                if ($res) {
+                                    break;
+                }
             }
 
             $mod = new $module();
@@ -1711,19 +1774,24 @@ 
             $dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
             foreach ($dirsociete as $dirroot) {
                 $res = dol_include_once($dirroot . $module . '.php');
-                if ($res)
-                    break;
+                if ($res) {
+                                    break;
+                }
             }
 
             $mod = new $module();
 
             dol_syslog(get_class($this) . "::codefournisseur_modifiable code_founisseur=" . $this->code_fournisseur . " module=" . $module);
-            if ($mod->code_modifiable_null && !$this->code_fournisseur)
-                return 1;
-            if ($mod->code_modifiable_invalide && $this->check_codefournisseur() < 0)
-                return 1;
-            if ($mod->code_modifiable)
-                return 1; // A mettre en dernier
+            if ($mod->code_modifiable_null && !$this->code_fournisseur) {
+                            return 1;
+            }
+            if ($mod->code_modifiable_invalide && $this->check_codefournisseur() < 0) {
+                            return 1;
+            }
+            if ($mod->code_modifiable) {
+                            return 1;
+            }
+            // A mettre en dernier
             return 0;
         } else {
             return 0;
@@ -1751,8 +1819,9 @@ 
             $dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
             foreach ($dirsociete as $dirroot) {
                 $res = dol_include_once($dirroot . $module . '.php');
-                if ($res)
-                    break;
+                if ($res) {
+                                    break;
+                }
             }
 
             $mod = new $module();
@@ -1788,8 +1857,9 @@ 
             } else {
                 return -1;
             }
-        } else
-            return -1;
+        } else {
+                    return -1;
+        }
     }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -1809,18 +1879,21 @@ 
 
         $ok = 1;
 
-        if (!empty($conf->global->MAIN_DISABLEPROFIDRULES))
-            return 1;
+        if (!empty($conf->global->MAIN_DISABLEPROFIDRULES)) {
+                    return 1;
+        }
 
         // Verifie SIREN si pays FR
         if ($idprof == 1 && $soc->country_code == 'FR') {
             $chaine = trim($this->idprof1);
             $chaine = preg_replace('/(\s)/', '', $chaine);
 
-            if (!is_numeric($chaine))
-                return -1;
-            if (dol_strlen($chaine) != 9)
-                return -1;
+            if (!is_numeric($chaine)) {
+                            return -1;
+            }
+            if (dol_strlen($chaine) != 9) {
+                            return -1;
+            }
 
             // on prend chaque chiffre un par un
             // si son index (position dans la chaîne en commence à 0 au premier caractère) est impair
@@ -1830,15 +1903,17 @@ 
             for ($index = 0; $index < 9; $index++) {
                 $number = (int)$siren[$index];
                 if (($index % 2) != 0) {
-                    if (($number *= 2) > 9)
-                        $number -= 9;
+                    if (($number *= 2) > 9) {
+                                            $number -= 9;
+                    }
                 }
                 $sum += $number;
             }
 
             // le numéro est valide si la somme des chiffres est multiple de 10
-            if (($sum % 10) != 0)
-                return -1;
+            if (($sum % 10) != 0) {
+                            return -1;
+            }
         }
 
         // Verifie SIRET si pays FR
@@ -1846,10 +1921,12 @@ 
             $chaine = trim($this->idprof2);
             $chaine = preg_replace('/(\s)/', '', $chaine);
 
-            if (!is_numeric($chaine))
-                return -1;
-            if (dol_strlen($chaine) != 14)
-                return -1;
+            if (!is_numeric($chaine)) {
+                            return -1;
+            }
+            if (dol_strlen($chaine) != 14) {
+                            return -1;
+            }
 
             // on prend chaque chiffre un par un
             // si son index (position dans la chaîne en commence à 0 au premier caractère) est pair
@@ -1859,15 +1936,17 @@ 
             for ($index = 0; $index < 14; $index++) {
                 $number = (int)$chaine[$index];
                 if (($index % 2) == 0) {
-                    if (($number *= 2) > 9)
-                        $number -= 9;
+                    if (($number *= 2) > 9) {
+                                            $number -= 9;
+                    }
                 }
                 $sum += $number;
             }
 
             // le numéro est valide si la somme des chiffres est multiple de 10
-            if (($sum % 10) != 0)
-                return -1;
+            if (($sum % 10) != 0) {
+                            return -1;
+            }
         }
 
         //Verify CIF/NIF/NIE if pays ES
@@ -1877,53 +1956,61 @@ 
             $string = preg_replace('/(\s)/', '', $string);
             $string = strtoupper($string);
 
-            for ($i = 0; $i < 9; $i++)
-                $num[$i] = substr($string, $i, 1);
+            for ($i = 0; $i < 9; $i++) {
+                            $num[$i] = substr($string, $i, 1);
+            }
 
             //Check format
-            if (!preg_match('/((^[A-Z]{1}[0-9]{7}[A-Z0-9]{1}$|^[T]{1}[A-Z0-9]{8}$)|^[0-9]{8}[A-Z]{1}$)/', $string))
-                return 0;
+            if (!preg_match('/((^[A-Z]{1}[0-9]{7}[A-Z0-9]{1}$|^[T]{1}[A-Z0-9]{8}$)|^[0-9]{8}[A-Z]{1}$)/', $string)) {
+                            return 0;
+            }
 
             //Check NIF
-            if (preg_match('/(^[0-9]{8}[A-Z]{1}$)/', $string))
-                if ($num[8] == substr('TRWAGMYFPDXBNJZSQVHLCKE', substr($string, 0, 8) % 23, 1))
+            if (preg_match('/(^[0-9]{8}[A-Z]{1}$)/', $string)) {
+                            if ($num[8] == substr('TRWAGMYFPDXBNJZSQVHLCKE', substr($string, 0, 8) % 23, 1))
                     return 1;
-                else
-                    return -1;
+            } else {
+                                    return -1;
+                }
 
             //algorithm checking type code CIF
             $sum = $num[2] + $num[4] + $num[6];
-            for ($i = 1; $i < 8; $i += 2)
-                $sum += intval(substr((2 * $num[$i]), 0, 1)) + intval(substr((2 * $num[$i]), 1, 1));
+            for ($i = 1; $i < 8; $i += 2) {
+                            $sum += intval(substr((2 * $num[$i]), 0, 1)) + intval(substr((2 * $num[$i]), 1, 1));
+            }
             $n = 10 - substr($sum, strlen($sum) - 1, 1);
 
             //Chek special NIF
-            if (preg_match('/^[KLM]{1}/', $string))
-                if ($num[8] == chr(64 + $n) || $num[8] == substr('TRWAGMYFPDXBNJZSQVHLCKE', substr($string, 1, 8) % 23, 1))
+            if (preg_match('/^[KLM]{1}/', $string)) {
+                            if ($num[8] == chr(64 + $n) || $num[8] == substr('TRWAGMYFPDXBNJZSQVHLCKE', substr($string, 1, 8) % 23, 1))
                     return 1;
-                else
-                    return -1;
+            } else {
+                                    return -1;
+                }
 
             //Check CIF
-            if (preg_match('/^[ABCDEFGHJNPQRSUVW]{1}/', $string))
-                if ($num[8] == chr(64 + $n) || $num[8] == substr($n, strlen($n) - 1, 1))
+            if (preg_match('/^[ABCDEFGHJNPQRSUVW]{1}/', $string)) {
+                            if ($num[8] == chr(64 + $n) || $num[8] == substr($n, strlen($n) - 1, 1))
                     return 2;
-                else
-                    return -2;
+            } else {
+                                    return -2;
+                }
 
             //Check NIE T
-            if (preg_match('/^[T]{1}/', $string))
-                if ($num[8] == preg_match('/^[T]{1}[A-Z0-9]{8}$/', $string))
+            if (preg_match('/^[T]{1}/', $string)) {
+                            if ($num[8] == preg_match('/^[T]{1}[A-Z0-9]{8}$/', $string))
                     return 3;
-                else
-                    return -3;
+            } else {
+                                    return -3;
+                }
 
             //Check NIE XYZ
-            if (preg_match('/^[XYZ]{1}/', $string))
-                if ($num[8] == substr('TRWAGMYFPDXBNJZSQVHLCKE', substr(str_replace(array('X', 'Y', 'Z'), array('0', '1', '2'), $string), 0, 8) % 23, 1))
+            if (preg_match('/^[XYZ]{1}/', $string)) {
+                            if ($num[8] == substr('TRWAGMYFPDXBNJZSQVHLCKE', substr(str_replace(array('X', 'Y', 'Z'), array('0', '1', '2'), $string), 0, 8) % 23, 1))
                     return 3;
-                else
-                    return -3;
+            } else {
+                                    return -3;
+                }
 
             //Can not be verified
             return -4;
@@ -2126,8 +2213,9 @@ 
             $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;
+            if ($resql = $this->db->query($sql)) {
+                            return 0;
+            }
         } else {
             return 0;
         }
@@ -2153,8 +2241,9 @@ 
         dol_syslog(get_class($this) . "::create_from_member", LOG_DEBUG);
 
         $name = $socname ? $socname : $member->societe;
-        if (empty($name))
-            $name = $member->getFullName($langs);
+        if (empty($name)) {
+                    $name = $member->getFullName($langs);
+        }
 
         $alias = $socalias ? $socalias : '';
 
@@ -2300,11 +2389,13 @@ 
                 if ($ret >= 0) {
                     // Call trigger
                     $result = $this->call_trigger('COMPANY_CREATE', $user);
-                    if ($result < 0)
-                        $error++;
+                    if ($result < 0) {
+                                            $error++;
+                    }
                     // End call triggers
-                } else
-                    $error++;
+                } else {
+                                    $error++;
+                }
 
                 if (!$error) {
                     dol_syslog(get_class($this) . "::Create success id=" . $this->id);
@@ -2353,8 +2444,9 @@ 
             $dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
             foreach ($dirsociete as $dirroot) {
                 $res = dol_include_once($dirroot . $module . '.php');
-                if ($res)
-                    break;
+                if ($res) {
+                                    break;
+                }
             }
             $mod = new $module();
 
@@ -2385,8 +2477,9 @@ 
             $dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
             foreach ($dirsociete as $dirroot) {
                 $res = dol_include_once($dirroot . $module . '.php');
-                if ($res)
-                    break;
+                if ($res) {
+                                    break;
+                }
             }
             $mod = new $module();
 
@@ -2503,8 +2596,9 @@ 
             }
         }
 
-        if ($error)
-            $result = -4;
+        if ($error) {
+                    $result = -4;
+        }
 
         return $result;
     }
@@ -2522,14 +2616,15 @@ 
 
         // Define if third party is treated as company (or not) when nature is unknown
         $isacompany = empty($conf->global->MAIN_UNKNOWN_CUSTOMERS_ARE_COMPANIES) ? 0 : 1; // 0 by default
-        if (!empty($this->tva_intra))
-            $isacompany = 1;
-        else if (!empty($this->typent_code) && $this->typent_code != 'TE_UNKNOWN') {
+        if (!empty($this->tva_intra)) {
+                    $isacompany = 1;
+        } else if (!empty($this->typent_code) && $this->typent_code != 'TE_UNKNOWN') {
             // TODO Add a field is_a_company into dictionary
-            if (preg_match('/^TE_PRIVATE/', $this->typent_code))
-                $isacompany = 0;
-            else
-                $isacompany = 1;
+            if (preg_match('/^TE_PRIVATE/', $this->typent_code)) {
+                            $isacompany = 0;
+            } else {
+                            $isacompany = 1;
+            }
         }
 
         return $isacompany;
@@ -2612,8 +2707,9 @@ 
 
         //Verify duplicate entries
         $sql = "SELECT COUNT(*) as idprof FROM " . MAIN_DB_PREFIX . "societe WHERE " . $field . " = '" . $value . "' AND entity IN (" . getEntity('societe') . ")";
-        if ($socid)
-            $sql .= " AND rowid <> " . $socid;
+        if ($socid) {
+                    $sql .= " AND rowid <> " . $socid;
+        }
         $resql = $this->db->query($sql);
         if ($resql) {
             $obj = $this->db->fetch_object($resql);
@@ -2624,10 +2720,11 @@ 
         }
         $this->db->free($resql);
 
-        if ($count > 0)
-            return true;
-        else
-            return false;
+        if ($count > 0) {
+                    return true;
+        } else {
+                    return false;
+        }
     }
 
     /**
@@ -2648,8 +2745,9 @@ 
 
         require_once DOL_DOCUMENT_ROOT . '/core/lib/functions2.lib.php';
 
-        if (empty($id))
-            $id = $this->id;
+        if (empty($id)) {
+                    $id = $this->id;
+        }
 
         $error = 0;
 
@@ -2695,11 +2793,13 @@ 
 
         $this->tva_assuj = trim($this->tva_assuj);
         $this->tva_intra = dol_sanitizeFileName($this->tva_intra, '');
-        if (empty($this->status))
-            $this->status = 0;
+        if (empty($this->status)) {
+                    $this->status = 0;
+        }
 
-        if (!empty($this->multicurrency_code))
-            $this->fk_multicurrency = MultiCurrency::getIdFromCode($this->db, $this->multicurrency_code);
+        if (!empty($this->multicurrency_code)) {
+                    $this->fk_multicurrency = MultiCurrency::getIdFromCode($this->db, $this->multicurrency_code);
+        }
         if (empty($this->fk_multicurrency)) {
             $this->multicurrency_code = '';
             $this->fk_multicurrency = 0;
@@ -2712,10 +2812,13 @@ 
         $this->localtax1_value = trim($this->localtax1_value);
         $this->localtax2_value = trim($this->localtax2_value);
 
-        if ($this->capital != '')
-            $this->capital = price2num(trim($this->capital));
-        if (!is_numeric($this->capital))
-            $this->capital = '';     // '' = undef
+        if ($this->capital != '') {
+                    $this->capital = price2num(trim($this->capital));
+        }
+        if (!is_numeric($this->capital)) {
+                    $this->capital = '';
+        }
+        // '' = undef
 
         $this->effectif_id = trim($this->effectif_id);
         $this->forme_juridique_code = trim($this->forme_juridique_code);
@@ -2724,10 +2827,12 @@ 
         $this->barcode = trim($this->barcode);
 
         // For automatic creation
-        if ($this->code_client == -1 || $this->code_client === 'auto')
-            $this->get_codeclient($this, 0);
-        if ($this->code_fournisseur == -1 || $this->code_fournisseur === 'auto')
-            $this->get_codefournisseur($this, 1);
+        if ($this->code_client == -1 || $this->code_client === 'auto') {
+                    $this->get_codeclient($this, 0);
+        }
+        if ($this->code_fournisseur == -1 || $this->code_fournisseur === 'auto') {
+                    $this->get_codefournisseur($this, 1);
+        }
 
         $this->code_compta = trim($this->code_compta);
         $this->code_compta_fournisseur = trim($this->code_compta_fournisseur);
@@ -2744,8 +2849,9 @@ 
             // Attention get_codecompta peut modifier le code suivant le module utilise
             if (empty($this->code_compta)) {
                 $ret = $this->get_codecompta('customer');
-                if ($ret < 0)
-                    return -1;
+                if ($ret < 0) {
+                                    return -1;
+                }
             }
 
             $customer = true;
@@ -2756,8 +2862,9 @@ 
             // Attention get_codecompta peut modifier le code suivant le module utilise
             if (empty($this->code_compta_fournisseur)) {
                 $ret = $this->get_codecompta('supplier');
-                if ($ret < 0)
-                    return -1;
+                if ($ret < 0) {
+                                    return -1;
+                }
             }
 
             $supplier = true;
@@ -2785,12 +2892,16 @@ 
             // So we can update record that were using and old numbering rule.
             if (is_array($this->errors)) {
                 if (in_array('ErrorBadCustomerCodeSyntax', $this->errors) && is_object($this->oldcopy) && $this->oldcopy->code_client == $this->code_client) {
-                    if (($key = array_search('ErrorBadCustomerCodeSyntax', $this->errors)) !== false)
-                        unset($this->errors[$key]); // Remove error message
+                    if (($key = array_search('ErrorBadCustomerCodeSyntax', $this->errors)) !== false) {
+                                            unset($this->errors[$key]);
+                    }
+                    // Remove error message
                 }
                 if (in_array('ErrorBadSupplierCodeSyntax', $this->errors) && is_object($this->oldcopy) && $this->oldcopy->code_fournisseur == $this->code_fournisseur) {
-                    if (($key = array_search('ErrorBadSupplierCodeSyntax', $this->errors)) !== false)
-                        unset($this->errors[$key]); // Remove error message
+                    if (($key = array_search('ErrorBadSupplierCodeSyntax', $this->errors)) !== false) {
+                                            unset($this->errors[$key]);
+                    }
+                    // Remove error message
                 }
                 if (empty($this->errors)) { // If there is no more error, we can make like if there is no error at all
                     $result = 0;
@@ -2844,18 +2955,22 @@ 
             if ($this->localtax1_assuj == 1) {
                 if ($this->localtax1_value != '') {
                     $sql .= ",localtax1_value =" . $this->localtax1_value;
-                } else
-                    $sql .= ",localtax1_value =0.000";
-            } else
-                $sql .= ",localtax1_value =0.000";
+                } else {
+                                    $sql .= ",localtax1_value =0.000";
+                }
+            } else {
+                            $sql .= ",localtax1_value =0.000";
+            }
 
             if ($this->localtax2_assuj == 1) {
                 if ($this->localtax2_value != '') {
                     $sql .= ",localtax2_value =" . $this->localtax2_value;
-                } else
-                    $sql .= ",localtax2_value =0.000";
-            } else
-                $sql .= ",localtax2_value =0.000";
+                } else {
+                                    $sql .= ",localtax2_value =0.000";
+                }
+            } else {
+                            $sql .= ",localtax2_value =0.000";
+            }
 
             $sql .= ",capital = " . ($this->capital == '' ? "null" : $this->capital);
 
@@ -2973,8 +3088,9 @@ 
                 if (!$error && $call_trigger) {
                     // Call trigger
                     $result = $this->call_trigger('COMPANY_MODIFY', $user);
-                    if ($result < 0)
-                        $error++;
+                    if ($result < 0) {
+                                            $error++;
+                    }
                     // End call triggers
                 }
 
@@ -3025,8 +3141,9 @@ 
             $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');
-                if ($res)
-                    break;
+                if ($res) {
+                                    break;
+                }
             }
 
             if ($res) {
@@ -3036,10 +3153,11 @@ 
                 // Defini code compta dans $mod->code
                 $result = $mod->get_code($this->db, $this, $type);
 
-                if ($type == 'customer')
-                    $this->code_compta = $mod->code;
-                else if ($type == 'supplier')
-                    $this->code_compta_fournisseur = $mod->code;
+                if ($type == 'customer') {
+                                    $this->code_compta = $mod->code;
+                } else if ($type == 'supplier') {
+                                    $this->code_compta_fournisseur = $mod->code;
+                }
 
                 return $result;
             } else {
@@ -3047,10 +3165,11 @@ 
                 return -1;
             }
         } else {
-            if ($type == 'customer')
-                $this->code_compta = '';
-            else if ($type == 'supplier')
-                $this->code_compta_fournisseur = '';
+            if ($type == 'customer') {
+                            $this->code_compta = '';
+            } else if ($type == 'supplier') {
+                            $this->code_compta_fournisseur = '';
+            }
 
             return 0;
         }
@@ -3087,8 +3206,9 @@ 
                 $this->context = array('commercial_modified' => $commid);
 
                 $result = $this->call_trigger('COMPANY_LINK_SALE_REPRESENTATIVE', $user);
-                if ($result < 0)
-                    $error++;
+                if ($result < 0) {
+                                    $error++;
+                }
             }
         }
     }
@@ -3135,8 +3255,9 @@ 
         $this->country_id = $country_id;
         $this->country_code = $country_code;
         $this->country = $country_label;
-        if (is_object($langs))
-            $this->country = ($langs->trans('Country' . $country_code) != 'Country' . $country_code) ? $langs->trans('Country' . $country_code) : $country_label;
+        if (is_object($langs)) {
+                    $this->country = ($langs->trans('Country' . $country_code) != 'Country' . $country_code) ? $langs->trans('Country' . $country_code) : $country_label;
+        }
 
         $this->phone = empty($conf->global->MAIN_INFO_SOCIETE_TEL) ? '' : $conf->global->MAIN_INFO_SOCIETE_TEL;
         $this->fax = empty($conf->global->MAIN_INFO_SOCIETE_FAX) ? '' : $conf->global->MAIN_INFO_SOCIETE_FAX;
@@ -3230,19 +3351,21 @@ 
         $sql .= " FROM " . MAIN_DB_PREFIX . "c_tva as t, " . MAIN_DB_PREFIX . "c_country as c";
         $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '" . $this->db->escape($this->country_code) . "'";
         $sql .= " AND t.active = 1";
-        if (empty($localTaxNum))
-            $sql .= " AND (t.localtax1_type <> '0' OR t.localtax2_type <> '0')";
-        elseif ($localTaxNum == 1)
-            $sql .= " AND t.localtax1_type <> '0'";
-        elseif ($localTaxNum == 2)
-            $sql .= " AND t.localtax2_type <> '0'";
+        if (empty($localTaxNum)) {
+                    $sql .= " AND (t.localtax1_type <> '0' OR t.localtax2_type <> '0')";
+        } elseif ($localTaxNum == 1) {
+                    $sql .= " AND t.localtax1_type <> '0'";
+        } elseif ($localTaxNum == 2) {
+                    $sql .= " AND t.localtax2_type <> '0'";
+        }
 
         dol_syslog("useLocalTax", LOG_DEBUG);
         $resql = $this->db->query($sql);
         if ($resql) {
             return ($this->db->num_rows($resql) > 0);
-        } else
-            return false;
+        } else {
+                    return false;
+        }
     }
 
     /**
@@ -3261,8 +3384,9 @@ 
         $resql = $this->db->query($sql);
         if ($resql) {
             return ($this->db->num_rows($resql) > 0);
-        } else
-            return false;
+        } else {
+                    return false;
+        }
     }
 
     /**
@@ -3361,47 +3485,47 @@ 
         $langs->load('customers');
 
         if ($mode == 2) {
-            if ($statut == '-1' || $statut == 'ST_NO')
-                return img_action($langs->trans("StatusProspect-1"), -1) . ' ' . $langs->trans("StatusProspect-1");
-            elseif ($statut == '0' || $statut == 'ST_NEVER')
-                return img_action($langs->trans("StatusProspect0"), 0) . ' ' . $langs->trans("StatusProspect0");
-            elseif ($statut == '1' || $statut == 'ST_TODO')
-                return img_action($langs->trans("StatusProspect1"), 1) . ' ' . $langs->trans("StatusProspect1");
-            elseif ($statut == '2' || $statut == 'ST_PEND')
-                return img_action($langs->trans("StatusProspect2"), 2) . ' ' . $langs->trans("StatusProspect2");
-            elseif ($statut == '3' || $statut == 'ST_DONE')
-                return img_action($langs->trans("StatusProspect3"), 3) . ' ' . $langs->trans("StatusProspect3");
-            else {
+            if ($statut == '-1' || $statut == 'ST_NO') {
+                            return img_action($langs->trans("StatusProspect-1"), -1) . ' ' . $langs->trans("StatusProspect-1");
+            } elseif ($statut == '0' || $statut == 'ST_NEVER') {
+                            return img_action($langs->trans("StatusProspect0"), 0) . ' ' . $langs->trans("StatusProspect0");
+            } elseif ($statut == '1' || $statut == 'ST_TODO') {
+                            return img_action($langs->trans("StatusProspect1"), 1) . ' ' . $langs->trans("StatusProspect1");
+            } elseif ($statut == '2' || $statut == 'ST_PEND') {
+                            return img_action($langs->trans("StatusProspect2"), 2) . ' ' . $langs->trans("StatusProspect2");
+            } elseif ($statut == '3' || $statut == 'ST_DONE') {
+                            return img_action($langs->trans("StatusProspect3"), 3) . ' ' . $langs->trans("StatusProspect3");
+            } else {
                 return img_action(($langs->trans("StatusProspect" . $statut) != "StatusProspect" . $statut) ? $langs->trans("StatusProspect" . $statut) : $label, 0) . ' ' . (($langs->trans("StatusProspect" . $statut) != "StatusProspect" . $statut) ? $langs->trans("StatusProspect" . $statut) : $label);
             }
         }
         if ($mode == 3) {
-            if ($statut == '-1' || $statut == 'ST_NO')
-                return img_action($langs->trans("StatusProspect-1"), -1);
-            elseif ($statut == '0' || $statut == 'ST_NEVER')
-                return img_action($langs->trans("StatusProspect0"), 0);
-            elseif ($statut == '1' || $statut == 'ST_TODO')
-                return img_action($langs->trans("StatusProspect1"), 1);
-            elseif ($statut == '2' || $statut == 'ST_PEND')
-                return img_action($langs->trans("StatusProspect2"), 2);
-            elseif ($statut == '3' || $statut == 'ST_DONE')
-                return img_action($langs->trans("StatusProspect3"), 3);
-            else {
+            if ($statut == '-1' || $statut == 'ST_NO') {
+                            return img_action($langs->trans("StatusProspect-1"), -1);
+            } elseif ($statut == '0' || $statut == 'ST_NEVER') {
+                            return img_action($langs->trans("StatusProspect0"), 0);
+            } elseif ($statut == '1' || $statut == 'ST_TODO') {
+                            return img_action($langs->trans("StatusProspect1"), 1);
+            } elseif ($statut == '2' || $statut == 'ST_PEND') {
+                            return img_action($langs->trans("StatusProspect2"), 2);
+            } elseif ($statut == '3' || $statut == 'ST_DONE') {
+                            return img_action($langs->trans("StatusProspect3"), 3);
+            } else {
                 return img_action(($langs->trans("StatusProspect" . $statut) != "StatusProspect" . $statut) ? $langs->trans("StatusProspect" . $statut) : $label, 0);
             }
         }
         if ($mode == 4) {
-            if ($statut == '-1' || $statut == 'ST_NO')
-                return img_action($langs->trans("StatusProspect-1"), -1) . ' ' . $langs->trans("StatusProspect-1");
-            elseif ($statut == '0' || $statut == 'ST_NEVER')
-                return img_action($langs->trans("StatusProspect0"), 0) . ' ' . $langs->trans("StatusProspect0");
-            elseif ($statut == '1' || $statut == 'ST_TODO')
-                return img_action($langs->trans("StatusProspect1"), 1) . ' ' . $langs->trans("StatusProspect1");
-            elseif ($statut == '2' || $statut == 'ST_PEND')
-                return img_action($langs->trans("StatusProspect2"), 2) . ' ' . $langs->trans("StatusProspect2");
-            elseif ($statut == '3' || $statut == 'ST_DONE')
-                return img_action($langs->trans("StatusProspect3"), 3) . ' ' . $langs->trans("StatusProspect3");
-            else {
+            if ($statut == '-1' || $statut == 'ST_NO') {
+                            return img_action($langs->trans("StatusProspect-1"), -1) . ' ' . $langs->trans("StatusProspect-1");
+            } elseif ($statut == '0' || $statut == 'ST_NEVER') {
+                            return img_action($langs->trans("StatusProspect0"), 0) . ' ' . $langs->trans("StatusProspect0");
+            } elseif ($statut == '1' || $statut == 'ST_TODO') {
+                            return img_action($langs->trans("StatusProspect1"), 1) . ' ' . $langs->trans("StatusProspect1");
+            } elseif ($statut == '2' || $statut == 'ST_PEND') {
+                            return img_action($langs->trans("StatusProspect2"), 2) . ' ' . $langs->trans("StatusProspect2");
+            } elseif ($statut == '3' || $statut == 'ST_DONE') {
+                            return img_action($langs->trans("StatusProspect3"), 3) . ' ' . $langs->trans("StatusProspect3");
+            } else {
                 return img_action(($langs->trans("StatusProspect" . $statut) != "StatusProspect" . $statut) ? $langs->trans("StatusProspect" . $statut) : $label, 0) . ' ' . (($langs->trans("StatusProspect" . $statut) != "StatusProspect" . $statut) ? $langs->trans("StatusProspect" . $statut) : $label);
             }
         }
@@ -3435,8 +3559,9 @@ 
     function getOutstandingProposals($mode = 'customer')
     {
         $table = 'propal';
-        if ($mode == 'supplier')
-            $table = 'supplier_proposal';
+        if ($mode == 'supplier') {
+                    $table = 'supplier_proposal';
+        }
 
         $sql = "SELECT rowid, total_ht, total as total_ttc, fk_statut FROM " . MAIN_DB_PREFIX . $table . " as f";
         $sql .= " WHERE fk_soc = " . $this->id;
@@ -3460,8 +3585,9 @@ 
                 }
             }
             return array('opened' => $outstandingOpened, 'total_ht' => $outstandingTotal, 'total_ttc' => $outstandingTotalIncTax); // 'opened' is 'incl taxes'
-        } else
-            return array();
+        } else {
+                    return array();
+        }
     }
 
     /**
@@ -3473,8 +3599,9 @@ 
     function getOutstandingOrders($mode = 'customer')
     {
         $table = 'commande';
-        if ($mode == 'supplier')
-            $table = 'commande_fournisseur';
+        if ($mode == 'supplier') {
+                    $table = 'commande_fournisseur';
+        }
 
         $sql = "SELECT rowid, total_ht, total_ttc, fk_statut FROM " . MAIN_DB_PREFIX . $table . " as f";
         $sql .= " WHERE fk_soc = " . $this->id;
@@ -3498,8 +3625,9 @@ 
                 }
             }
             return array('opened' => $outstandingOpened, 'total_ht' => $outstandingTotal, 'total_ttc' => $outstandingTotalIncTax); // 'opened' is 'incl taxes'
-        } else
-            return array();
+        } else {
+                    return array();
+        }
     }
 
     /**
@@ -3511,8 +3639,9 @@ 
     function getOutstandingBills($mode = 'customer')
     {
         $table = 'facture';
-        if ($mode == 'supplier')
-            $table = 'facture_fourn';
+        if ($mode == 'supplier') {
+                    $table = 'facture_fourn';
+        }
 
         /* Accurate value of remain to pay is to sum remaintopay for each invoice
           $paiement = $invoice->getSommePaiement();
@@ -3521,10 +3650,11 @@ 
           $alreadypayed=price2num($paiement + $creditnotes + $deposits,'MT');
           $remaintopay=price2num($invoice->total_ttc - $paiement - $creditnotes - $deposits,'MT');
          */
-        if ($mode == 'supplier')
-            $sql = "SELECT rowid, total_ht as total_ht, total_ttc, paye, fk_statut, close_code FROM " . MAIN_DB_PREFIX . $table . " as f";
-        else
-            $sql = "SELECT rowid, total as total_ht, total_ttc, paye, fk_statut, close_code FROM " . MAIN_DB_PREFIX . $table . " as f";
+        if ($mode == 'supplier') {
+                    $sql = "SELECT rowid, total_ht as total_ht, total_ttc, paye, fk_statut, close_code FROM " . MAIN_DB_PREFIX . $table . " as f";
+        } else {
+                    $sql = "SELECT rowid, total as total_ht, total_ttc, paye, fk_statut, close_code FROM " . MAIN_DB_PREFIX . $table . " as f";
+        }
         $sql .= " WHERE fk_soc = " . $this->id;
         if ($mode == 'supplier') {
             $sql .= " AND entity IN (" . getEntity('facture_fourn') . ")";
@@ -3608,8 +3738,9 @@ 
                 $outstandingAmount += $obj->total_ttc - $paiement - $creditnotes - $deposits;
             }
             return $outstandingAmount;
-        } else
-            return 0;
+        } else {
+                    return 0;
+        }
     }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -3636,14 +3767,18 @@ 
         global $langs;
         $langs->load('companies');
 
-        if ($statut == 0)
-            return $langs->trans("NorProspectNorCustomer");
-        if ($statut == 1)
-            return $langs->trans("Customer");
-        if ($statut == 2)
-            return $langs->trans("Prospect");
-        if ($statut == 3)
-            return $langs->trans("ProspectCustomer");
+        if ($statut == 0) {
+                    return $langs->trans("NorProspectNorCustomer");
+        }
+        if ($statut == 1) {
+                    return $langs->trans("Customer");
+        }
+        if ($statut == 2) {
+                    return $langs->trans("Prospect");
+        }
+        if ($statut == 3) {
+                    return $langs->trans("ProspectCustomer");
+        }
     }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -3669,8 +3804,9 @@ 
             include_once DOL_DOCUMENT_ROOT . '/societe/class/companybankaccount.class.php';
             $companybankaccount = new CompanyBankAccount($this->db);
             $result = $companybankaccount->fetch($moreparams['use_companybankid']);
-            if (!$result)
-                dol_print_error($this->db, $companybankaccount->error, $companybankaccount->errors);
+            if (!$result) {
+                            dol_print_error($this->db, $companybankaccount->error, $companybankaccount->errors);
+            }
             $result = $companybankaccount->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
         } else {
             // Positionne le modele sur le nom du modele a utiliser
@@ -3825,8 +3961,9 @@ 
             $sql .= " WHERE ((ug.fk_user = sc.fk_user";
             $sql .= " AND ug.entity = " . $conf->entity . ")";
             $sql .= " OR u.admin = 1)";
-        } else
-            $sql .= " WHERE entity in (0, " . $conf->entity . ")";
+        } else {
+                    $sql .= " WHERE entity in (0, " . $conf->entity . ")";
+        }
 
         $sql .= " AND u.rowid = sc.fk_user AND sc.fk_soc = " . $this->id;
 
@@ -3872,8 +4009,9 @@ 
         $this->context = array('commercial_modified' => $commid);
 
         $result = $this->call_trigger('COMPANY_UNLINK_SALE_REPRESENTATIVE', $user);
-        if ($result < 0)
-            $error++;
+        if ($result < 0) {
+                    $error++;
+        }
 
         if ($this->id > 0 && $commid > 0) {
             $sql = "DELETE FROM  " . MAIN_DB_PREFIX . "societe_commerciaux ";

Controllers/ThirdParty.php

Braces +64 added lines, -21 removed lines

@@ -20,7 +20,9 @@ 
         $langs->load("companies");
 
         $socid = GETPOST('socid', 'int');
-        if ($user->societe_id) $socid = $user->societe_id;
+        if ($user->societe_id) {
+            $socid = $user->societe_id;
+        }
 
 // Security check
         $result = restrictedArea($user, 'societe', 0, '', '', '', '');
@@ -45,11 +47,13 @@ 
         print '<div class="fichecenter"><div class="fichethirdleft">';
 
 
-        if (!empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is useless due to the global search combo
+        if (!empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS)) {
+            // This is useless due to the global search combo
         {
             // Search thirdparty
             if (!empty($conf->societe->enabled) && $user->rights->societe->lire) {
                 $listofsearchfields['search_thirdparty'] = array('text' => 'ThirdParty');
+        }
             }
             // Search contact/address
             if (!empty($conf->societe->enabled) && $user->rights->societe->lire) {
@@ -63,10 +67,14 @@ 
                 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>';
+                    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 '<td rowspan="' . count($listofsearchfields) . '"><input type="submit" value="' . $langs->trans("Search") . '" class="button"></td>';
+                    }
                     print '</tr>';
                     $i++;
                 }
@@ -91,11 +99,20 @@ 
 
         $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";
+        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
+        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) {
@@ -117,9 +134,13 @@ 
                     $found = 1;
                     $third['other']++;
                 }
-                if ($found) $total++;
+                if ($found) {
+                    $total++;
+                }
             }
-        } else dol_print_error($db);
+        } else {
+            dol_print_error($db);
+        }
 
         print '<div class="div-table-responsive-no-min">';
         print '<table class="noborder nohover" width="100%">' . "\n";
@@ -127,10 +148,18 @@ 
         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();
-            if (!empty($conf->societe->enabled) && $user->rights->societe->lire && empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS_STATS)) $dataseries[] = array($langs->trans("Prospects"), round($third['prospect']));
-            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']));
+            if (!empty($conf->societe->enabled) && $user->rights->societe->lire && empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS_STATS)) {
+                $dataseries[] = array($langs->trans("Prospects"), round($third['prospect']));
+            }
+            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';
             $dolgraph = new DolGraph();
             $dolgraph->SetData($dataseries);
@@ -183,7 +212,9 @@ 
             $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) . "'";
+            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;
@@ -250,11 +281,19 @@ 
         $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";
+        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)";
+        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);
 
@@ -304,13 +343,17 @@ 
                         $thirdparty_static->name = $langs->trans("Customer");
                         print $thirdparty_static->getNomUrl(0, 'customer', 0, 1);
                     }
-                    if ($thirdparty_static->client == 3 && empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) print " / ";
+                    if ($thirdparty_static->client == 3 && empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) {
+                        print " / ";
+                    }
                     if (($thirdparty_static->client == 2 || $thirdparty_static->client == 3) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) {
                         $thirdparty_static->name = $langs->trans("Prospect");
                         print $thirdparty_static->getNomUrl(0, 'prospect', 0, 1);
                     }
                     if (!empty($conf->fournisseur->enabled) && $thirdparty_static->fournisseur) {
-                        if ($thirdparty_static->client) print " / ";
+                        if ($thirdparty_static->client) {
+                            print " / ";
+                        }
                         $thirdparty_static->name = $langs->trans("Supplier");
                         print $thirdparty_static->getNomUrl(0, 'supplier', 0, 1);
                     }