alxarafe / alixar

Dolibarr/Code/Comm/Classes/Propal.php

Indentation +14 added lines, -14 removed lines

@@ -194,9 +194,9 @@ 
     public $fin_validite;    // code
         public $user_author_id;         // label
         /**
-     * @deprecated
-     * @see $total_ht
-     */
+         * @deprecated
+         * @see $total_ht
+         */
     public $price;     // label doc
     /**
      * @deprecated
@@ -204,9 +204,9 @@ 
      */
     public $tva;    // code
         /**
-     * @deprecated
-     * @see $total_ttc
-     */
+         * @deprecated
+         * @see $total_ttc
+         */
     public $total;         // label
 public $cond_reglement_code;
 public $cond_reglement;
@@ -226,14 +226,14 @@ 
      */
     public $availability_id;       // id
         /**
-     * @var int availability ID
-     * @deprecated
-     * @see $availability_id
-     */
+         * @var int availability ID
+         * @deprecated
+         * @see $availability_id
+         */
     public $fk_availability;     // code
         /**
-     * @var string availability code
-     */
+         * @var string availability code
+         */
     public $availability_code;          // label
     /**
      * @var string availability label
@@ -338,8 +338,8 @@ 
         'import_key' => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => 1, 'visible' => -2, 'position' => 900),
     );
         /**
-     * {@inheritdoc}
-     */
+         * {@inheritdoc}
+         */
     protected $table_ref_field = 'ref'; // Todo rename into STATUS_CLOSE ?
 
     /**

Spacing +73 added lines, -73 removed lines

@@ -191,23 +191,23 @@ 
      * @var integer|string $delivery_date ;
      */
     public $delivery_date;
-    public $fin_validite;    // code
-        public $user_author_id;         // label
+    public $fin_validite; // code
+        public $user_author_id; // label
         /**
      * @deprecated
      * @see $total_ht
      */
-    public $price;     // label doc
+    public $price; // label doc
     /**
      * @deprecated
      * @see $total_tva
      */
-    public $tva;    // code
+    public $tva; // code
         /**
      * @deprecated
      * @see $total_ttc
      */
-    public $total;         // label
+    public $total; // label
 public $cond_reglement_code;
 public $cond_reglement;
 public $cond_reglement_doc;
@@ -224,17 +224,17 @@ 
     /**
      * @var int availability ID
      */
-    public $availability_id;       // id
+    public $availability_id; // id
         /**
      * @var int availability ID
      * @deprecated
      * @see $availability_id
      */
-    public $fk_availability;     // code
+    public $fk_availability; // code
         /**
      * @var string availability code
      */
-    public $availability_code;          // label
+    public $availability_code; // label
     /**
      * @var string availability label
      */
@@ -513,14 +513,14 @@ 
 
         if (!empty($ref)) {
             if (!empty($forceentity)) {
-                $sql .= " WHERE p.entity = " . (int)$forceentity; // Check only the current entity because we may have the same reference in several entities
+                $sql .= " WHERE p.entity = " . (int) $forceentity; // Check only the current entity because we may have the same reference in several entities
             } else {
                 $sql .= " WHERE p.entity IN (" . getEntity('propal') . ")";
             }
             $sql .= " AND p.ref='" . $this->db->escape($ref) . "'";
         } else {
             // Don't use entity if you use rowid
-            $sql .= " WHERE p.rowid = " . ((int)$rowid);
+            $sql .= " WHERE p.rowid = " . ((int) $rowid);
         }
 
         dol_syslog(get_class($this) . "::fetch", LOG_DEBUG);
@@ -537,7 +537,7 @@ 
                 $this->ref_customer = $obj->ref_client;
                 $this->ref_ext = $obj->ref_ext;
 
-                $this->total = $obj->total_ttc;          // TODO deprecated
+                $this->total = $obj->total_ttc; // TODO deprecated
                 $this->total_ttc = $obj->total_ttc;
                 $this->total_ht = $obj->total_ht;
                 $this->total_tva = $obj->total_tva;
@@ -556,7 +556,7 @@ 
                 $this->note_private = $obj->note_private;
                 $this->note_public = $obj->note_public;
 
-                $this->status = (int)$obj->fk_statut;
+                $this->status = (int) $obj->fk_statut;
                 $this->statut = $this->status; // deprecated
 
                 $this->datec = $this->db->jdate($obj->datec); // TODO deprecated
@@ -589,7 +589,7 @@ 
                 $this->cond_reglement_doc = $obj->cond_reglement_libelle_doc;
                 $this->deposit_percent = $obj->deposit_percent;
 
-                $this->extraparams = !empty($obj->extraparams) ? (array)json_decode($obj->extraparams, true) : array();
+                $this->extraparams = !empty($obj->extraparams) ? (array) json_decode($obj->extraparams, true) : array();
 
                 $this->user_author_id = $obj->fk_user_author;
                 $this->user_validation_id = $obj->fk_user_valid;
@@ -655,7 +655,7 @@ 
         $sql .= ' d.fk_multicurrency, d.multicurrency_code, d.multicurrency_subprice, d.multicurrency_total_ht, d.multicurrency_total_tva, d.multicurrency_total_ttc';
         $sql .= ' FROM ' . MAIN_DB_PREFIX . 'propaldet as d';
         $sql .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'product as p ON (d.fk_product = p.rowid)';
-        $sql .= ' WHERE d.fk_propal = ' . ((int)$this->id);
+        $sql .= ' WHERE d.fk_propal = ' . ((int) $this->id);
         if ($only_product) {
             $sql .= ' AND p.fk_product_type = 0';
         }
@@ -875,10 +875,10 @@ 
 
         // Clean parameters
         $remise_percent = price2num($remise_percent);
-        $qty = (float)price2num($qty);
+        $qty = (float) price2num($qty);
         $pu = price2num($pu);
         $pu_ht_devise = price2num($pu_ht_devise);
-        if (!preg_match('/\((.*)\)/', (string)$txtva)) {
+        if (!preg_match('/\((.*)\)/', (string) $txtva)) {
             $txtva = price2num($txtva); // $txtva can have format '5.0(XXX)' or '5'
         }
         $txlocaltax1 = price2num($txlocaltax1);
@@ -939,9 +939,9 @@ 
             // Anciens indicateurs: $price, $remise (a ne plus utiliser)
             $price = $pu;
             $remise = 0;
-            if ((float)$remise_percent > 0) {
-                $remise = round(((float)$pu * (float)$remise_percent / 100), 2);
-                $price = (float)$pu - $remise;
+            if ((float) $remise_percent > 0) {
+                $remise = round(((float) $pu * (float) $remise_percent / 100), 2);
+                $price = (float) $pu - $remise;
             }
 
             //Fetch current line from the database and then clone the object and set it in $oldline property
@@ -1099,7 +1099,7 @@ 
         $sql .= " note_public=" . (isset($this->note_public) ? "'" . $this->db->escape($this->note_public) . "'" : "null") . ",";
         $sql .= " model_pdf=" . (isset($this->model_pdf) ? "'" . $this->db->escape($this->model_pdf) . "'" : "null") . ",";
         $sql .= " import_key=" . (isset($this->import_key) ? "'" . $this->db->escape($this->import_key) . "'" : "null");
-        $sql .= " WHERE rowid=" . ((int)$this->id);
+        $sql .= " WHERE rowid=" . ((int) $this->id);
 
         $this->db->begin();
 
@@ -1218,8 +1218,8 @@ 
         // Delete extrafields of lines and lines
         if (!$error && !empty($this->table_element_line)) {
             $tabletodelete = $this->table_element_line;
-            $sqlef = "DELETE FROM " . MAIN_DB_PREFIX . $tabletodelete . "_extrafields WHERE fk_object IN (SELECT rowid FROM " . MAIN_DB_PREFIX . $tabletodelete . " WHERE " . $this->fk_element . " = " . ((int)$this->id) . ")";
-            $sql = "DELETE FROM " . MAIN_DB_PREFIX . $tabletodelete . " WHERE " . $this->fk_element . " = " . ((int)$this->id);
+            $sqlef = "DELETE FROM " . MAIN_DB_PREFIX . $tabletodelete . "_extrafields WHERE fk_object IN (SELECT rowid FROM " . MAIN_DB_PREFIX . $tabletodelete . " WHERE " . $this->fk_element . " = " . ((int) $this->id) . ")";
+            $sql = "DELETE FROM " . MAIN_DB_PREFIX . $tabletodelete . " WHERE " . $this->fk_element . " = " . ((int) $this->id);
             if (!$this->db->query($sqlef) || !$this->db->query($sql)) {
                 $error++;
                 $this->error = $this->db->lasterror();
@@ -1255,7 +1255,7 @@ 
 
         // Delete main record
         if (!$error) {
-            $sql = "DELETE FROM " . MAIN_DB_PREFIX . $this->table_element . " WHERE rowid = " . ((int)$this->id);
+            $sql = "DELETE FROM " . MAIN_DB_PREFIX . $this->table_element . " WHERE rowid = " . ((int) $this->id);
             $res = $this->db->query($sql);
             if (!$res) {
                 $error++;
@@ -1291,7 +1291,7 @@ 
                     }
                 }
                 if (file_exists($dir)) {
-                    $res = @dol_delete_dir_recursive($dir);     // delete files physically + into ecm tables
+                    $res = @dol_delete_dir_recursive($dir); // delete files physically + into ecm tables
                     if (!$res) {
                         $this->error = 'ErrorFailToDeleteDir';
                         $this->errors[] = $this->error;
@@ -1612,15 +1612,15 @@ 
         $sql .= ", '" . $this->db->idate($this->date) . "'";
         $sql .= ", '" . $this->db->idate($now) . "'";
         $sql .= ", '(PROV)'";
-        $sql .= ", " . ($user->id > 0 ? ((int)$user->id) : "NULL");
+        $sql .= ", " . ($user->id > 0 ? ((int) $user->id) : "NULL");
         $sql .= ", '" . $this->db->escape($this->note_private) . "'";
         $sql .= ", '" . $this->db->escape($this->note_public) . "'";
         $sql .= ", '" . $this->db->escape($this->model_pdf) . "'";
         $sql .= ", " . ($this->fin_validite != '' ? "'" . $this->db->idate($this->fin_validite) . "'" : "NULL");
-        $sql .= ", " . ($this->cond_reglement_id > 0 ? ((int)$this->cond_reglement_id) : 'NULL');
+        $sql .= ", " . ($this->cond_reglement_id > 0 ? ((int) $this->cond_reglement_id) : 'NULL');
         $sql .= ", " . (!empty($this->deposit_percent) ? "'" . $this->db->escape($this->deposit_percent) . "'" : 'NULL');
-        $sql .= ", " . ($this->mode_reglement_id > 0 ? ((int)$this->mode_reglement_id) : 'NULL');
-        $sql .= ", " . ($this->fk_account > 0 ? ((int)$this->fk_account) : 'NULL');
+        $sql .= ", " . ($this->mode_reglement_id > 0 ? ((int) $this->mode_reglement_id) : 'NULL');
+        $sql .= ", " . ($this->fk_account > 0 ? ((int) $this->fk_account) : 'NULL');
         $sql .= ", '" . $this->db->escape($this->ref_client) . "'";
         $sql .= ", '" . $this->db->escape($this->ref_ext) . "'";
         $sql .= ", " . (empty($delivery_date) ? "NULL" : "'" . $this->db->idate($delivery_date) . "'");
@@ -1629,12 +1629,12 @@ 
         $sql .= ", " . $this->availability_id;
         $sql .= ", " . $this->demand_reason_id;
         $sql .= ", " . ($this->fk_project ? $this->fk_project : "null");
-        $sql .= ", " . (int)$this->fk_incoterms;
+        $sql .= ", " . (int) $this->fk_incoterms;
         $sql .= ", '" . $this->db->escape($this->location_incoterms) . "'";
         $sql .= ", " . setEntity($this);
-        $sql .= ", " . (int)$this->fk_multicurrency;
+        $sql .= ", " . (int) $this->fk_multicurrency;
         $sql .= ", '" . $this->db->escape($this->multicurrency_code) . "'";
-        $sql .= ", " . (float)$this->multicurrency_tx;
+        $sql .= ", " . (float) $this->multicurrency_tx;
         $sql .= ")";
 
         dol_syslog(get_class($this) . "::create", LOG_DEBUG);
@@ -1644,7 +1644,7 @@ 
 
             if ($this->id) {
                 $this->ref = '(PROV' . $this->id . ')';
-                $sql = 'UPDATE ' . MAIN_DB_PREFIX . "propal SET ref='" . $this->db->escape($this->ref) . "' WHERE rowid=" . ((int)$this->id);
+                $sql = 'UPDATE ' . MAIN_DB_PREFIX . "propal SET ref='" . $this->db->escape($this->ref) . "' WHERE rowid=" . ((int) $this->id);
 
                 dol_syslog(get_class($this) . "::create", LOG_DEBUG);
                 $resql = $this->db->query($sql);
@@ -1689,7 +1689,7 @@ 
                     for ($i = 0; $i < $num; $i++) {
                         if (!is_object($this->lines[$i])) { // If this->lines is not array of objects, coming from REST API
                             // Convert into object this->lines[$i].
-                            $line = (object)$this->lines[$i];
+                            $line = (object) $this->lines[$i];
                         } else {
                             $line = $this->lines[$i];
                         }
@@ -1882,11 +1882,11 @@ 
             }
 
             $remise_percent = price2num($remise_percent);
-            $qty = (float)price2num($qty);
+            $qty = (float) price2num($qty);
             $pu_ht = price2num($pu_ht);
             $pu_ht_devise = price2num($pu_ht_devise);
             $pu_ttc = price2num($pu_ttc);
-            if (!preg_match('/\((.*)\)/', (string)$txtva)) {
+            if (!preg_match('/\((.*)\)/', (string) $txtva)) {
                 $txtva = price2num($txtva); // $txtva can have format '5,1' or '5.1' or '5.1(XXX)', we must clean only if '5,1'
             }
             $txlocaltax1 = price2num($txlocaltax1);
@@ -1968,9 +1968,9 @@ 
             // Anciens indicateurs: $price, $remise (a ne plus utiliser)
             $price = $pu;
             $remise = 0;
-            if ((float)$remise_percent > 0) {
-                $remise = round(((float)$pu * (float)$remise_percent / 100), 2);
-                $price = (float)$pu - $remise;
+            if ((float) $remise_percent > 0) {
+                $remise = round(((float) $pu * (float) $remise_percent / 100), 2);
+                $price = (float) $pu - $remise;
             }
 
             // Insert line
@@ -2121,8 +2121,8 @@ 
 
         $sql = "UPDATE " . MAIN_DB_PREFIX . "propal";
         $sql .= " SET ref = '" . $this->db->escape($num) . "',";
-        $sql .= " fk_statut = " . self::STATUS_VALIDATED . ", date_valid='" . $this->db->idate($now) . "', fk_user_valid=" . ((int)$user->id);
-        $sql .= " WHERE rowid = " . ((int)$this->id) . " AND fk_statut = " . self::STATUS_DRAFT;
+        $sql .= " fk_statut = " . self::STATUS_VALIDATED . ", date_valid='" . $this->db->idate($now) . "', fk_user_valid=" . ((int) $user->id);
+        $sql .= " WHERE rowid = " . ((int) $this->id) . " AND fk_statut = " . self::STATUS_DRAFT;
 
         dol_syslog(get_class($this) . "::valid", LOG_DEBUG);
         $resql = $this->db->query($sql);
@@ -2148,7 +2148,7 @@ 
             if (preg_match('/^[\(]?PROV/i', $this->ref)) {
                 // Now we rename also files into index
                 $sql = 'UPDATE ' . MAIN_DB_PREFIX . "ecm_files set filename = CONCAT('" . $this->db->escape($this->newref) . "', SUBSTR(filename, " . (strlen($this->ref) + 1) . ")), filepath = 'propale/" . $this->db->escape($this->newref) . "'";
-                $sql .= " WHERE filename LIKE '" . $this->db->escape($this->ref) . "%' AND filepath = 'propale/" . $this->db->escape($this->ref) . "' and entity = " . ((int)$conf->entity);
+                $sql .= " WHERE filename LIKE '" . $this->db->escape($this->ref) . "%' AND filepath = 'propale/" . $this->db->escape($this->ref) . "' and entity = " . ((int) $conf->entity);
                 $resql = $this->db->query($sql);
                 if (!$resql) {
                     $error++;
@@ -2219,12 +2219,12 @@ 
             $file = $classname . ".php";
 
             // Include file with class
-            $dirmodels = array_merge(array('/'), (array)$conf->modules_parts['models']);
+            $dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
             foreach ($dirmodels as $reldir) {
                 $dir = dol_buildpath($reldir . "core/modules/propale/");
 
                 // Load file with numbering class (if found)
-                $mybool = ((bool)@include_once $dir . $file) || $mybool;
+                $mybool = ((bool) @include_once $dir . $file) || $mybool;
             }
 
             if (!$mybool) {
@@ -2275,7 +2275,7 @@ 
             $this->db->begin();
 
             $sql = "UPDATE " . MAIN_DB_PREFIX . "propal SET datep = '" . $this->db->idate($date) . "'";
-            $sql .= " WHERE rowid = " . ((int)$this->id);
+            $sql .= " WHERE rowid = " . ((int) $this->id);
 
             dol_syslog(__METHOD__, LOG_DEBUG);
             $resql = $this->db->query($sql);
@@ -2334,7 +2334,7 @@ 
             $this->db->begin();
 
             $sql = "UPDATE " . MAIN_DB_PREFIX . "propal SET fin_validite = " . ($date_end_validity != '' ? "'" . $this->db->idate($date_end_validity) . "'" : 'null');
-            $sql .= " WHERE rowid = " . ((int)$this->id);
+            $sql .= " WHERE rowid = " . ((int) $this->id);
 
             dol_syslog(__METHOD__, LOG_DEBUG);
 
@@ -2409,7 +2409,7 @@ 
 
             $sql = "UPDATE " . MAIN_DB_PREFIX . "propal ";
             $sql .= " SET date_livraison = " . ($delivery_date != '' ? "'" . $this->db->idate($delivery_date) . "'" : 'null');
-            $sql .= " WHERE rowid = " . ((int)$this->id);
+            $sql .= " WHERE rowid = " . ((int) $this->id);
 
             dol_syslog(__METHOD__, LOG_DEBUG);
             $resql = $this->db->query($sql);
@@ -2465,8 +2465,8 @@ 
             $this->db->begin();
 
             $sql = "UPDATE " . MAIN_DB_PREFIX . "propal";
-            $sql .= " SET fk_availability = " . ((int)$id);
-            $sql .= " WHERE rowid = " . ((int)$this->id);
+            $sql .= " SET fk_availability = " . ((int) $id);
+            $sql .= " WHERE rowid = " . ((int) $this->id);
 
             dol_syslog(__METHOD__ . ' availability(' . $id . ')', LOG_DEBUG);
             $resql = $this->db->query($sql);
@@ -2527,8 +2527,8 @@ 
             $this->db->begin();
 
             $sql = "UPDATE " . MAIN_DB_PREFIX . "propal ";
-            $sql .= " SET fk_input_reason = " . ((int)$id);
-            $sql .= " WHERE rowid = " . ((int)$this->id);
+            $sql .= " SET fk_input_reason = " . ((int) $id);
+            $sql .= " WHERE rowid = " . ((int) $this->id);
 
             dol_syslog(__METHOD__, LOG_DEBUG);
             $resql = $this->db->query($sql);
@@ -2591,7 +2591,7 @@ 
             $this->db->begin();
 
             $sql = "UPDATE " . MAIN_DB_PREFIX . "propal SET ref_client = " . (empty($ref_client) ? 'NULL' : "'" . $this->db->escape($ref_client) . "'");
-            $sql .= " WHERE rowid = " . ((int)$this->id);
+            $sql .= " WHERE rowid = " . ((int) $this->id);
 
             dol_syslog(__METHOD__ . ' $this->id=' . $this->id . ', ref_client=' . $ref_client, LOG_DEBUG);
             $resql = $this->db->query($sql);
@@ -2646,12 +2646,12 @@ 
         $error = 0;
 
         $sql = "UPDATE " . MAIN_DB_PREFIX . "propal";
-        $sql .= " SET fk_statut = " . ((int)$status) . ",";
+        $sql .= " SET fk_statut = " . ((int) $status) . ",";
         if (!empty($note)) {
             $sql .= " note_private = '" . $this->db->escape($note) . "',";
         }
         $sql .= " date_cloture=NULL, fk_user_cloture=NULL";
-        $sql .= " WHERE rowid = " . ((int)$this->id);
+        $sql .= " WHERE rowid = " . ((int) $this->id);
 
         $this->db->begin();
 
@@ -2729,17 +2729,17 @@ 
         }
 
         $sql = "UPDATE " . MAIN_DB_PREFIX . "propal";
-        $sql .= " SET fk_statut = " . ((int)$status) . ", note_private = '" . $this->db->escape($newprivatenote) . "', date_signature='" . $this->db->idate($date_signature) . "', fk_user_signature=" . $fk_user_signature;
-        $sql .= " WHERE rowid = " . ((int)$this->id);
+        $sql .= " SET fk_statut = " . ((int) $status) . ", note_private = '" . $this->db->escape($newprivatenote) . "', date_signature='" . $this->db->idate($date_signature) . "', fk_user_signature=" . $fk_user_signature;
+        $sql .= " WHERE rowid = " . ((int) $this->id);
 
         $resql = $this->db->query($sql);
         if ($resql) {
             // Status self::STATUS_REFUSED by default
             $modelpdf = getDolGlobalString('PROPALE_ADDON_PDF_ODT_CLOSED', $this->model_pdf);
-            $trigger_name = 'PROPAL_CLOSE_REFUSED';     // used later in call_trigger()
+            $trigger_name = 'PROPAL_CLOSE_REFUSED'; // used later in call_trigger()
 
             if ($status == self::STATUS_SIGNED) {   // Status self::STATUS_SIGNED
-                $trigger_name = 'PROPAL_CLOSE_SIGNED';  // used later in call_trigger()
+                $trigger_name = 'PROPAL_CLOSE_SIGNED'; // used later in call_trigger()
                 $modelpdf = getDolGlobalString('PROPALE_ADDON_PDF_ODT_TOBILL') ? $conf->global->PROPALE_ADDON_PDF_ODT_TOBILL : $this->model_pdf;
 
                 // The connected company is classified as a client
@@ -2820,7 +2820,7 @@ 
         $sql .= " c.datec, c.date_valid as datev, c.date_signature, c.date_cloture,";
         $sql .= " c.fk_user_author, c.fk_user_valid, c.fk_user_signature, c.fk_user_cloture";
         $sql .= " FROM " . MAIN_DB_PREFIX . "propal as c";
-        $sql .= " WHERE c.rowid = " . ((int)$id);
+        $sql .= " WHERE c.rowid = " . ((int) $id);
 
         $result = $this->db->query($sql);
 
@@ -2911,8 +2911,8 @@ 
         $newprivatenote = dol_concatdesc($this->note_private, $note);
 
         $sql = 'UPDATE ' . MAIN_DB_PREFIX . 'propal SET fk_statut = ' . self::STATUS_BILLED . ", ";
-        $sql .= " note_private = '" . $this->db->escape($newprivatenote) . "', date_cloture='" . $this->db->idate($now) . "', fk_user_cloture=" . ((int)$user->id);
-        $sql .= ' WHERE rowid = ' . ((int)$this->id) . ' AND fk_statut = ' . ((int)self::STATUS_SIGNED);
+        $sql .= " note_private = '" . $this->db->escape($newprivatenote) . "', date_cloture='" . $this->db->idate($now) . "', fk_user_cloture=" . ((int) $user->id);
+        $sql .= ' WHERE rowid = ' . ((int) $this->id) . ' AND fk_statut = ' . ((int) self::STATUS_SIGNED);
 
         dol_syslog(__METHOD__, LOG_DEBUG);
         $resql = $this->db->query($sql);
@@ -2986,8 +2986,8 @@ 
 
         $sql = "UPDATE " . MAIN_DB_PREFIX . "propal";
         $sql .= " SET fk_statut = " . self::STATUS_CANCELED . ",";
-        $sql .= " fk_user_modif = " . ((int)$user->id);
-        $sql .= " WHERE rowid = " . ((int)$this->id);
+        $sql .= " fk_user_modif = " . ((int) $user->id);
+        $sql .= " WHERE rowid = " . ((int) $this->id);
 
         dol_syslog(get_class($this) . "::cancel", LOG_DEBUG);
         if ($this->db->query($sql)) {
@@ -3045,7 +3045,7 @@ 
         $sql = "UPDATE " . MAIN_DB_PREFIX . "propal";
         $sql .= " SET fk_statut = " . self::STATUS_DRAFT;
         $sql .= ",  online_sign_ip = NULL , online_sign_name = NULL";
-        $sql .= " WHERE rowid = " . ((int)$this->id);
+        $sql .= " WHERE rowid = " . ((int) $this->id);
 
         $resql = $this->db->query($sql);
         if (!$resql) {
@@ -3120,18 +3120,18 @@ 
             if ($search_sale == -2) {
                 $sql .= " AND NOT EXISTS (SELECT sc.fk_soc FROM " . MAIN_DB_PREFIX . "societe_commerciaux as sc WHERE sc.fk_soc = p.fk_soc)";
             } elseif ($search_sale > 0) {
-                $sql .= " AND EXISTS (SELECT sc.fk_soc FROM " . MAIN_DB_PREFIX . "societe_commerciaux as sc WHERE sc.fk_soc = p.fk_soc AND sc.fk_user = " . ((int)$search_sale) . ")";
+                $sql .= " AND EXISTS (SELECT sc.fk_soc FROM " . MAIN_DB_PREFIX . "societe_commerciaux as sc WHERE sc.fk_soc = p.fk_soc AND sc.fk_user = " . ((int) $search_sale) . ")";
             }
         }
         // Search on socid
         if ($socid) {
-            $sql .= " AND p.fk_soc = " . ((int)$socid);
+            $sql .= " AND p.fk_soc = " . ((int) $socid);
         }
         if ($draft) {
-            $sql .= " AND p.fk_statut = " . ((int)self::STATUS_DRAFT);
+            $sql .= " AND p.fk_statut = " . ((int) self::STATUS_DRAFT);
         }
         if ($notcurrentuser > 0) {
-            $sql .= " AND p.fk_user_author <> " . ((int)$user->id);
+            $sql .= " AND p.fk_user_author <> " . ((int) $user->id);
         }
         $sql .= $this->db->order($sortfield, $sortorder);
         $sql .= $this->db->plimit($limit, $offset);
@@ -3269,8 +3269,8 @@ 
             $this->db->begin();
 
             $sql = 'UPDATE ' . MAIN_DB_PREFIX . 'propal';
-            $sql .= ' SET fk_availability = ' . ((int)$availability_id);
-            $sql .= ' WHERE rowid=' . ((int)$this->id);
+            $sql .= ' SET fk_availability = ' . ((int) $availability_id);
+            $sql .= ' WHERE rowid=' . ((int) $this->id);
 
             dol_syslog(__METHOD__ . ' availability(' . $availability_id . ')', LOG_DEBUG);
             $resql = $this->db->query($sql);
@@ -3332,8 +3332,8 @@ 
             $this->db->begin();
 
             $sql = 'UPDATE ' . MAIN_DB_PREFIX . 'propal';
-            $sql .= ' SET fk_input_reason = ' . ((int)$demand_reason_id);
-            $sql .= ' WHERE rowid=' . ((int)$this->id);
+            $sql .= ' SET fk_input_reason = ' . ((int) $demand_reason_id);
+            $sql .= ' WHERE rowid=' . ((int) $this->id);
 
             dol_syslog(__METHOD__ . ' demand_reason(' . $demand_reason_id . ')', LOG_DEBUG);
             $resql = $this->db->query($sql);
@@ -3409,7 +3409,7 @@ 
             if ($search_sale == -2) {
                 $sql .= " AND NOT EXISTS (SELECT sc.fk_soc FROM " . MAIN_DB_PREFIX . "societe_commerciaux as sc WHERE sc.fk_soc = p.fk_soc)";
             } elseif ($search_sale > 0) {
-                $sql .= " AND EXISTS (SELECT sc.fk_soc FROM " . MAIN_DB_PREFIX . "societe_commerciaux as sc WHERE sc.fk_soc = p.fk_soc AND sc.fk_user = " . ((int)$search_sale) . ")";
+                $sql .= " AND EXISTS (SELECT sc.fk_soc FROM " . MAIN_DB_PREFIX . "societe_commerciaux as sc WHERE sc.fk_soc = p.fk_soc AND sc.fk_user = " . ((int) $search_sale) . ")";
             }
         }
 
@@ -3585,7 +3585,7 @@ 
             if ($search_sale == -2) {
                 $sql .= " AND NOT EXISTS (SELECT sc.fk_soc FROM " . MAIN_DB_PREFIX . "societe_commerciaux as sc WHERE sc.fk_soc = p.fk_soc)";
             } elseif ($search_sale > 0) {
-                $sql .= " AND EXISTS (SELECT sc.fk_soc FROM " . MAIN_DB_PREFIX . "societe_commerciaux as sc WHERE sc.fk_soc = p.fk_soc AND sc.fk_user = " . ((int)$search_sale) . ")";
+                $sql .= " AND EXISTS (SELECT sc.fk_soc FROM " . MAIN_DB_PREFIX . "societe_commerciaux as sc WHERE sc.fk_soc = p.fk_soc AND sc.fk_user = " . ((int) $search_sale) . ")";
             }
         }
 

Dolibarr/Code/Comm/Classes/PropaleLigne.php

Indentation +2 added lines, -2 removed lines

@@ -665,7 +665,7 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Update DB line fields total_xxx
      *  Used by migration
@@ -674,7 +674,7 @@ 
      */
     public function update_total()
     {
-		// phpcs:enable
+        // phpcs:enable
         $this->db->begin();
 
         // Mise a jour ligne en base

Dolibarr/Code/Fourn/Classes/FactureFournisseurLigneRec.php

Spacing +4 added lines, -4 removed lines

@@ -87,8 +87,8 @@ 
         $error = 0;
         $this->db->begin();
 
-        if (! $error) {
-            if (! $notrigger) {
+        if (!$error) {
+            if (!$notrigger) {
                 // Call triggers
                 $result = $this->call_trigger('LINESUPPLIERBILLREC_DELETE', $user);
                 if ($result < 0) {
@@ -98,14 +98,14 @@ 
             }
         }
 
-        if (! $error) {
+        if (!$error) {
             $result = $this->deleteExtraFields();
             if ($result < 0) {
                 $error++;
             }
         }
 
-        if (! $error) {
+        if (!$error) {
             $sql = 'DELETE FROM ' . MAIN_DB_PREFIX . $this->table_element . ' WHERE rowid=' . (int) $this->id;
 
             $res = $this->db->query($sql);

Dolibarr/Code/Fourn/Classes/CommandeFournisseurLigne.php

Spacing +3 added lines, -3 removed lines

@@ -188,10 +188,10 @@
                     $sqlsearchpackage .= ' WHERE entity IN (' . getEntity('product_fournisseur_price') . ")";
                     $sqlsearchpackage .= " AND fk_product = " . ((int) $objp->fk_product);
                     $sqlsearchpackage .= " AND ref_fourn = '" . $this->db->escape($objp->ref_supplier) . "'";
-                    $sqlsearchpackage .= " AND quantity <= " . ((float) $objp->qty);  // required to be qualified
-                    $sqlsearchpackage .= " AND (packaging IS NULL OR packaging = 0 OR packaging <= " . ((float) $objp->qty) . ")";  // required to be qualified
+                    $sqlsearchpackage .= " AND quantity <= " . ((float) $objp->qty); // required to be qualified
+                    $sqlsearchpackage .= " AND (packaging IS NULL OR packaging = 0 OR packaging <= " . ((float) $objp->qty) . ")"; // required to be qualified
                     $sqlsearchpackage .= " AND fk_soc = " . ((int) $objp->socid);
-                    $sqlsearchpackage .= " ORDER BY packaging ASC";     // Take the smaller package first
+                    $sqlsearchpackage .= " ORDER BY packaging ASC"; // Take the smaller package first
                     $sqlsearchpackage .= " LIMIT 1";
 
                     $resqlsearchpackage = $this->db->query($sqlsearchpackage);

Dolibarr/Code/Fourn/Classes/SupplierInvoiceLine.php

Indentation +2 added lines, -2 removed lines

@@ -776,7 +776,7 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Mise a jour de l'objet ligne de commande en base
      *
@@ -784,7 +784,7 @@ 
      */
     public function update_total()
     {
-		// phpcs:enable
+        // phpcs:enable
         $this->db->begin();
 
         // Mise a jour ligne en base

Spacing +1 added lines, -2 removed lines

@@ -694,8 +694,7 @@
         $sql .= " " . ($this->fk_parent_line > 0 ? "'" . $this->db->escape($this->fk_parent_line) . "'" : "null") . ",";
         $product_label
             = !empty($this->product_label)
-              ? $this->product_label :
-                (!empty($this->label) ? $this->label : null);
+              ? $this->product_label : (!empty($this->label) ? $this->label : null);
         $sql .= " " . (!empty($product_label) ? "'" . $this->db->escape($product_label) . "'" : "null") . ",";
         $sql .= " '" . $this->db->escape($this->desc ? $this->desc : $this->description) . "',";
         $sql .= " '" . $this->db->escape($this->ref_supplier) . "',";

Dolibarr/Code/Fourn/Classes/FactureFournisseur.php

Indentation +14 added lines, -14 removed lines

@@ -1015,7 +1015,7 @@ 
     }
 
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Load this->lines
      *
@@ -1023,7 +1023,7 @@ 
      */
     public function fetch_lines()
     {
-		// phpcs:enable
+        // phpcs:enable
         $this->lines = array();
 
         $sql = 'SELECT f.rowid, f.ref as ref_supplier, f.description as line_desc, f.date_start, f.date_end, f.pu_ht, f.pu_ttc, f.qty, f.remise_percent, f.vat_src_code, f.tva_tx';
@@ -1310,7 +1310,7 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *    Add a discount line into an invoice (as an invoice line) using an existing absolute discount (Consume the discount)
      *
@@ -1319,7 +1319,7 @@ 
      */
     public function insert_discount($idremise)
     {
-		// phpcs:enable
+        // phpcs:enable
         global $conf, $langs;
 
         include_once DOL_DOCUMENT_ROOT . '/core/lib/price.lib.php';
@@ -1545,7 +1545,7 @@ 
     }
 
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Tag invoice as a paid invoice
      *
@@ -1558,7 +1558,7 @@ 
      */
     public function set_paid($user, $close_code = '', $close_note = '')
     {
-		// phpcs:enable
+        // phpcs:enable
         dol_syslog(get_class($this) . "::set_paid is deprecated, use setPaid instead", LOG_NOTICE);
         return $this->setPaid($user, $close_code, $close_note);
     }
@@ -1623,7 +1623,7 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Tag the invoice as not fully paid + trigger call BILL_UNPAYED
      *  Function used when a direct debit payment is refused,
@@ -1636,7 +1636,7 @@ 
      */
     public function set_unpaid($user)
     {
-		// phpcs:enable
+        // phpcs:enable
         dol_syslog(get_class($this) . "::set_unpaid is deprecated, use setUnpaid instead", LOG_NOTICE);
         return $this->setUnpaid($user);
     }
@@ -2571,7 +2571,7 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Return list of replaceable invoices
      *  Status valid or abandoned for other reason + not paid + no payment + not already replaced
@@ -2582,7 +2582,7 @@ 
      */
     public function list_replacable_supplier_invoices($socid = 0)
     {
-		// phpcs:enable
+        // phpcs:enable
         global $conf;
 
         $return = array();
@@ -2620,7 +2620,7 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Return list of qualifying invoices for correction by credit note
      *  Invoices that respect the following rules are returned:
@@ -2632,7 +2632,7 @@ 
      */
     public function list_qualified_avoir_supplier_invoices($socid = 0)
     {
-		// phpcs:enable
+        // phpcs:enable
         global $conf;
 
         $return = array();
@@ -2674,7 +2674,7 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Load indicators for dashboard (this->nbtodo and this->nbtodolate)
      *
@@ -2683,7 +2683,7 @@ 
      */
     public function load_board($user)
     {
-		// phpcs:enable
+        // phpcs:enable
         global $conf, $langs;
 
         $sql = 'SELECT ff.rowid, ff.date_lim_reglement as datefin, ff.fk_statut as status, ff.total_ht, ff.total_ttc';

Spacing +16 added lines, -16 removed lines

@@ -230,7 +230,7 @@ 
     /**
      * @var int ID
      */
-    public $fk_account;     // default bank account
+    public $fk_account; // default bank account
 
     /**
      * @var int Transport mode id
@@ -466,7 +466,7 @@ 
             $this->location_incoterms = $_facrec->location_incoterms;
 
             // Clean parameters
-            if (! $this->type) {
+            if (!$this->type) {
                 $this->type = self::TYPE_STANDARD;
             }
             if (!empty(GETPOST('ref_supplier'))) {
@@ -480,7 +480,7 @@ 
 
             $this->array_options = $_facrec->array_options;
 
-            if (! $this->mode_reglement_id) {
+            if (!$this->mode_reglement_id) {
                 $this->mode_reglement_id = 0;
             }
             $this->status = self::STATUS_DRAFT;
@@ -729,7 +729,7 @@ 
             /*
              * Insert lines of template invoices
              */
-            if (! $error && $this->fac_rec > 0 && $_facrec instanceof FactureFournisseurRec) {
+            if (!$error && $this->fac_rec > 0 && $_facrec instanceof FactureFournisseurRec) {
                 foreach ($_facrec->lines as $i => $val) {
                     if ($_facrec->lines[$i]->fk_product) {
                         $prod = new Product($this->db);
@@ -756,7 +756,7 @@ 
                     $buyprice = empty($_facrec->lines[$i]->buyprice) ? 0 : $_facrec->lines[$i]->buyprice;
 
                     // If buyprice not defined from template invoice, we try to guess the best value
-                    if (! $buyprice && $_facrec->lines[$i]->fk_product > 0) {
+                    if (!$buyprice && $_facrec->lines[$i]->fk_product > 0) {
                         $producttmp = new ProductFournisseur($this->db);
                         $producttmp->fetch($_facrec->lines[$i]->fk_product);
 
@@ -1006,7 +1006,7 @@ 
 
                 $this->extraparams = isset($obj->extraparams) ? (array) json_decode($obj->extraparams, true) : array();
 
-                $this->socid  = $obj->socid;
+                $this->socid = $obj->socid;
 
                 // Retrieve all extrafield
                 // fetch optionals attributes and labels
@@ -2280,7 +2280,7 @@ 
             // Multicurrency
             $supplierinvoiceline->fk_multicurrency = $this->fk_multicurrency;
             $supplierinvoiceline->multicurrency_code = $this->multicurrency_code;
-            $supplierinvoiceline->multicurrency_subprice    = ($this->type == self::TYPE_CREDIT_NOTE ? -abs($pu_ht_devise) : $pu_ht_devise); // For credit note, unit price always negative, always positive otherwise
+            $supplierinvoiceline->multicurrency_subprice = ($this->type == self::TYPE_CREDIT_NOTE ? -abs($pu_ht_devise) : $pu_ht_devise); // For credit note, unit price always negative, always positive otherwise
 
             $supplierinvoiceline->multicurrency_total_ht = (($this->type == self::TYPE_CREDIT_NOTE || $qty < 0) ? -abs($multicurrency_total_ht) : $multicurrency_total_ht); // For credit note and if qty is negative, total is negative
             $supplierinvoiceline->multicurrency_total_tva = (($this->type == self::TYPE_CREDIT_NOTE || $qty < 0) ? -abs($multicurrency_total_tva) : $multicurrency_total_tva); // For credit note and if qty is negative, total is negative
@@ -2446,7 +2446,7 @@ 
 
         $line->qty = ($this->type == self::TYPE_CREDIT_NOTE ? abs((float) $qty) : $qty); // For credit note, quantity is always positive and unit price negative
         $line->subprice = ($this->type == self::TYPE_CREDIT_NOTE ? -abs($pu_ht) : $pu_ht); // For credit note, unit price always negative, always positive otherwise
-        $line->pu_ht = $line->subprice;  // deprecated
+        $line->pu_ht = $line->subprice; // deprecated
         $line->pu_ttc = ($this->type == self::TYPE_CREDIT_NOTE ? -abs($pu_ttc) : $pu_ttc); // For credit note, unit price always negative, always positive otherwise
 
         $line->remise_percent = $remise_percent;
@@ -2731,7 +2731,7 @@ 
 
             while ($obj = $this->db->fetch_object($resql)) {
                 $facturestatic->date_echeance = $this->db->jdate($obj->datefin);
-                $facturestatic->statut = $obj->status;  // For backward compatibility
+                $facturestatic->statut = $obj->status; // For backward compatibility
                 $facturestatic->status = $obj->status;
 
                 $response->nbtodo++;
@@ -3165,15 +3165,15 @@ 
         // Load source object
         $object->fetch($fromid);
         $object->id = 0;
-        $object->statut = self::STATUS_DRAFT;   // For backward compatibility
+        $object->statut = self::STATUS_DRAFT; // For backward compatibility
         $object->status = self::STATUS_DRAFT;
 
         $object->fetch_thirdparty(); // We need it to recalculate VAT localtaxes according to main sale taxes and vendor
 
         // Clear fields
         $object->ref_supplier       = (empty($this->ref_supplier) ? $langs->trans("CopyOf") . ' ' . $object->ref_supplier : $this->ref_supplier);
-        $object->author             = $user->id;  // FIXME? user_validation_id is replacement for author
-        $object->user_validation_id = 0;  // FIXME?  user_validation_id is replacement for author
+        $object->author             = $user->id; // FIXME? user_validation_id is replacement for author
+        $object->user_validation_id = 0; // FIXME?  user_validation_id is replacement for author
         $object->fk_facture_source  = 0;
         $object->date_creation      = '';
         $object->date_validation    = '';
@@ -3475,14 +3475,14 @@ 
         if (!empty($paymentmode) && $paymentmode != 'all') {
             $sql .= ", " . MAIN_DB_PREFIX . "c_paiement as cp";
         }
-        $sql .= " WHERE f.paye = 0";    // Only unpaid
-        $sql .= " AND f.fk_statut = " . self::STATUS_VALIDATED;   // Only validated status
+        $sql .= " WHERE f.paye = 0"; // Only unpaid
+        $sql .= " AND f.fk_statut = " . self::STATUS_VALIDATED; // Only validated status
         if ($datetouse == 'invoicedate') {
             $sql .= " AND f.datef = '" . $this->db->idate($tmpidate, 'gmt') . "'";
         } else {
             $sql .= " AND f.date_lim_reglement = '" . $this->db->idate($tmpidate, 'gmt') . "'";
         }
-        $sql .= " AND f.entity IN (" . getEntity('supplier_invoice', 0) . ")";  // One batch process only one company (no sharing)
+        $sql .= " AND f.entity IN (" . getEntity('supplier_invoice', 0) . ")"; // One batch process only one company (no sharing)
         if (!empty($paymentmode) && $paymentmode != 'all') {
             $sql .= " AND f.fk_mode_reglement = cp.id AND cp.code = '" . $this->db->escape($paymentmode) . "'";
         }
@@ -3702,7 +3702,7 @@ 
                                 $actioncomm->create($user);
                             }
 
-                            $this->db->commit();    // We always commit
+                            $this->db->commit(); // We always commit
                         }
 
                         if ($errormesg) {

Dolibarr/Code/Fourn/Classes/FactureFournisseurRec.php

Spacing +9 added lines, -9 removed lines

@@ -355,13 +355,13 @@ 
             $sql .= ", '" . $this->db->idate($now) . "'";
             $sql .= ", " . ((int) $this->suspended);
             $sql .= ", '" . $this->db->escape($this->libelle) . "'";
-            $sql .= ", " . (!empty($facfourn_src->total_ttc) ? (float) $facfourn_src->total_ttc : '0');                              // amount
+            $sql .= ", " . (!empty($facfourn_src->total_ttc) ? (float) $facfourn_src->total_ttc : '0'); // amount
             $sql .= ", " . ((int) $user->id);
             $sql .= ", " . (!empty($this->fk_project) ? ((int) $this->fk_project) : 'NULL');
             $sql .= ", " . (!empty($facfourn_src->fk_account) ? ((int) $facfourn_src->fk_account) : 'NULL');
             $sql .= ", " . ($this->cond_reglement_id > 0 ? (int) $this->cond_reglement_id : 'NULL');
             $sql .= ", " . ($this->mode_reglement_id > 0 ? (int) $this->mode_reglement_id : 'NULL');
-            $sql .= ", " . ($facfourn_src->date_echeance > 0 ? "'" . $this->db->idate($facfourn_src->date_echeance) . "'" : 'NULL');      // date_lim_reglement
+            $sql .= ", " . ($facfourn_src->date_echeance > 0 ? "'" . $this->db->idate($facfourn_src->date_echeance) . "'" : 'NULL'); // date_lim_reglement
             $sql .= ", " . (!empty($this->note_private) ? "'" . $this->db->escape($this->note_private) . "'" : 'NULL');
             $sql .= ", " . (!empty($this->note_public) ? "'" . $this->db->escape($this->note_public) . "'" : 'NULL');
             $sql .= ", " . (!empty($this->model_pdf) ? "'" . $this->db->escape($this->model_pdf) . "'" : 'NULL');
@@ -516,7 +516,7 @@ 
         $error = 0;
 
         $sql = "UPDATE " . MAIN_DB_PREFIX . "facture_fourn_rec SET";
-        $sql .= " titre = '" . (!empty($this->title) ? $this->db->escape($this->title) : "") . "'," ;
+        $sql .= " titre = '" . (!empty($this->title) ? $this->db->escape($this->title) : "") . "',";
         $sql .= " subtype=" . (isset($this->subtype) ? $this->db->escape($this->subtype) : "null") . ",";
         $sql .= " ref_supplier = '" . (!empty($this->ref_supplier) ? $this->db->escape($this->ref_supplier) : "") . "',";
         $sql .= " entity = " . (!empty($this->entity) ? ((int) $this->entity) : 1) . ',';
@@ -634,7 +634,7 @@ 
                 $this->id                       = $obj->rowid;
                 $this->titre                    = $obj->title;
                 $this->title                    = $obj->title;
-                $this->subtype                        = $obj->subtype;
+                $this->subtype = $obj->subtype;
                 $this->ref                      = $obj->title;
                 $this->ref_supplier             = $obj->ref_supplier;
                 $this->entity                   = $obj->entity;
@@ -792,7 +792,7 @@ 
                 $line->product_type             = $objp->product_type;
                 $line->date_start               = $objp->date_start;
                 $line->date_end                 = $objp->date_end;
-                $line->info_bits                = $objp->info_bits  ;
+                $line->info_bits                = $objp->info_bits;
                 $line->special_code             = $objp->special_code;
                 $line->rang                     = $objp->rang;
                 $line->fk_unit                  = $objp->fk_unit;
@@ -875,7 +875,7 @@ 
             }
             // End call triggers
         }
-        if (! $error) {
+        if (!$error) {
             $this->db->commit();
             return 1;
         } else {
@@ -1019,7 +1019,7 @@ 
             $sql .= ', fk_user_author';
             $sql .= ', fk_multicurrency, multicurrency_code, multicurrency_subprice, multicurrency_total_ht, multicurrency_total_tva, multicurrency_total_ttc';
             $sql .= ') VALUES (';
-            $sql .= ' ' . (int) $facid;   // source supplier invoice id
+            $sql .= ' ' . (int) $facid; // source supplier invoice id
             $sql .= ', ' . (!empty($fk_product) ? "'" . $this->db->escape($fk_product) . "'" : 'null');
             $sql .= ', ' . (!empty($ref) ? "'" . $this->db->escape($ref) . "'" : 'null');
             $sql .= ', ' . (!empty($label) ? "'" . $this->db->escape($label) . "'" : 'null');
@@ -1360,7 +1360,7 @@ 
 
                     $new_fac_fourn->type = self::TYPE_STANDARD;
                     $new_fac_fourn->subtype = $facturerec->subtype;
-                    $new_fac_fourn->statut = self::STATUS_DRAFT;    // deprecated
+                    $new_fac_fourn->statut = self::STATUS_DRAFT; // deprecated
                     $new_fac_fourn->status = self::STATUS_DRAFT;
                     $new_fac_fourn->date = empty($facturerec->date_when) ? $now : $facturerec->date_when; // We could also use dol_now here but we prefer date_when so invoice has real date when we would like even if we generate later.
                     $new_fac_fourn->socid = $facturerec->socid;
@@ -1369,7 +1369,7 @@ 
                     $new_fac_fourn->model_pdf = $facturerec->model_pdf;
                     $new_fac_fourn->fk_project = $facturerec->fk_project;
                     $new_fac_fourn->label = $facturerec->label;
-                    $new_fac_fourn->libelle = $facturerec->label;   // deprecated
+                    $new_fac_fourn->libelle = $facturerec->label; // deprecated
 
                     $invoiceidgenerated = $new_fac_fourn->create($user);
                     $laststep = "Create invoiceidgenerated $invoiceidgenerated";

Dolibarr/Code/Fourn/Classes/CommandeFournisseur.php

Spacing +12 added lines, -12 removed lines

@@ -523,7 +523,7 @@ 
             $this->ref_supplier = $obj->ref_supplier;
             $this->socid = $obj->fk_soc;
             $this->fourn_id = $obj->fk_soc;
-            $this->statut = $obj->status;   // deprecated
+            $this->statut = $obj->status; // deprecated
             $this->status = $obj->status;
             $this->billed = $obj->billed;
             $this->user_author_id = $obj->user_author_id;
@@ -554,7 +554,7 @@ 
             $this->fk_project = $obj->fk_project;
             $this->cond_reglement_id = $obj->fk_cond_reglement;
             $this->cond_reglement_code = $obj->cond_reglement_code;
-            $this->cond_reglement = $obj->cond_reglement_label;         // deprecated
+            $this->cond_reglement = $obj->cond_reglement_label; // deprecated
             $this->cond_reglement_label = $obj->cond_reglement_label;
             $this->cond_reglement_doc = $obj->cond_reglement_doc;
             $this->fk_account = $obj->fk_account;
@@ -687,10 +687,10 @@ 
                     $sqlsearchpackage .= ' WHERE entity IN (' . getEntity('product_fournisseur_price') . ")";
                     $sqlsearchpackage .= " AND fk_product = " . ((int) $objp->fk_product);
                     $sqlsearchpackage .= " AND ref_fourn = '" . $this->db->escape($objp->ref_supplier) . "'";
-                    $sqlsearchpackage .= " AND quantity <= " . ((float) $objp->qty);  // required to be qualified
-                    $sqlsearchpackage .= " AND (packaging IS NULL OR packaging = 0 OR packaging <= " . ((float) $objp->qty) . ")";  // required to be qualified
+                    $sqlsearchpackage .= " AND quantity <= " . ((float) $objp->qty); // required to be qualified
+                    $sqlsearchpackage .= " AND (packaging IS NULL OR packaging = 0 OR packaging <= " . ((float) $objp->qty) . ")"; // required to be qualified
                     $sqlsearchpackage .= " AND fk_soc = " . ((int) $this->socid);
-                    $sqlsearchpackage .= " ORDER BY packaging ASC";     // Take the smaller package first
+                    $sqlsearchpackage .= " ORDER BY packaging ASC"; // Take the smaller package first
                     $sqlsearchpackage .= " LIMIT 1";
 
                     $resqlsearchpackage = $this->db->query($sqlsearchpackage);
@@ -1626,10 +1626,10 @@ 
                         $line->date_end,
                         $line->array_options,
                         $line->fk_unit,
-                        $line->multicurrency_subprice,  // pu_ht_devise
-                        $line->origin,     // origin
-                        $line->origin_id,  // origin_id
-                        $line->rang,       // rang
+                        $line->multicurrency_subprice, // pu_ht_devise
+                        $line->origin, // origin
+                        $line->origin_id, // origin_id
+                        $line->rang, // rang
                         $line->special_code
                     );
                     if ($result < 0) {
@@ -2003,7 +2003,7 @@ 
             $this->db->begin();
 
             $product_type = $type;
-            $label = '';    // deprecated
+            $label = ''; // deprecated
 
             if ($fk_product > 0) {
                 if (getDolGlobalString('SUPPLIER_ORDER_WITH_PREDEFINED_PRICES_ONLY')) { // Not the common case
@@ -2146,7 +2146,7 @@ 
             $this->line->total_localtax2 = $total_localtax2;
             $this->line->total_ttc = $total_ttc;
             $this->line->product_type = $type;
-            $this->line->special_code   = (!empty($special_code) ? $special_code : 0);
+            $this->line->special_code = (!empty($special_code) ? $special_code : 0);
             $this->line->origin = $origin;
             $this->line->origin_id = $origin_id;
             $this->line->fk_unit = $fk_unit;
@@ -3353,7 +3353,7 @@ 
         global $conf, $langs;
 
         if (!dol_strlen($modele)) {
-            $modele = '';   // No doc template/generation by default
+            $modele = ''; // No doc template/generation by default
 
             if (!empty($this->model_pdf)) {
                 $modele = $this->model_pdf;

Dolibarr/Code/ExpenseReport/Classes/ExpenseReportLine.php

Spacing +1 added lines, -1 removed lines

@@ -336,7 +336,7 @@
         } elseif ($mode == 'mon' || $mode == 'EX_MON') {
             $sql .= " AND DATE_FORMAT(d.date, '%Y-%m') = '" . dol_print_date($this->date, '%Y-%m') . "'"; // @todo DATE_FORMAT is forbidden
         } elseif ($mode == 'year' || $mode == 'EX_YEA') {
-            $sql .= " AND DATE_FORMAT(d.date, '%Y') = '" . dol_print_date($this->date, '%Y') . "'";     // @todo DATE_FORMAT is forbidden
+            $sql .= " AND DATE_FORMAT(d.date, '%Y') = '" . dol_print_date($this->date, '%Y') . "'"; // @todo DATE_FORMAT is forbidden
         }
 
         dol_syslog('ExpenseReportLine::getExpAmount');