alxarafe / alixar

Dolibarr/Code/Compta/Classes/RejetPrelevement.php

Spacing +1 added lines, -1 removed lines

@@ -180,7 +180,7 @@
             // Make a negative payment
             // Amount must be an array (id of invoice -> amount)
             $pai->amounts = array();
-            $pai->amounts[$facs[$i][0]] = price2num($amountrejected * -1);      // The payment must be negative because it is a refund
+            $pai->amounts[$facs[$i][0]] = price2num($amountrejected * -1); // The payment must be negative because it is a refund
 
             $pai->datepaye = $date_rejet;
             $pai->paiementid = 3; // type of payment: withdrawal

Dolibarr/Code/Compta/Classes/PaymentVarious.php

Spacing +2 added lines, -2 removed lines

@@ -342,7 +342,7 @@ 
                 $this->type_payment         = $obj->fk_typepayment;
                 $this->num_payment          = $obj->num_payment;
                 $this->label                = $obj->label;
-                $this->note                 = $obj->note_private;   // For backward compatibility
+                $this->note                 = $obj->note_private; // For backward compatibility
                 $this->note_private         = $obj->note_private;
                 $this->subledger_account    = $obj->subledger_account;
                 $this->accountancy_code     = $obj->accountancy_code;
@@ -523,7 +523,7 @@ 
         $sql .= ", " . ($this->fk_project > 0 ? ((int) $this->fk_project) : 0);
         $sql .= ", " . ((int) $user->id);
         $sql .= ", '" . $this->db->idate($now) . "'";
-        $sql .= ", NULL";   // Filled later
+        $sql .= ", NULL"; // Filled later
         $sql .= ", " . ((int) $conf->entity);
         $sql .= ")";
 

Dolibarr/Code/Compta/Classes/FactureRec.php

Spacing +1 added lines, -1 removed lines

@@ -1358,7 +1358,7 @@
 
                     $facture->type = self::TYPE_STANDARD;
                     $facture->subtype = $facturerec->subtype;
-                    $facture->statut = self::STATUS_DRAFT;  // deprecated
+                    $facture->statut = self::STATUS_DRAFT; // deprecated
                     $facture->status = self::STATUS_DRAFT;
                     $facture->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.
                     $facture->socid = $facturerec->socid;

Dolibarr/Code/Compta/Classes/Account.php

Spacing +3 added lines, -3 removed lines

@@ -501,13 +501,13 @@ 
         $sql = "INSERT INTO " . MAIN_DB_PREFIX . "bank_url (";
         $sql .= "fk_bank";
         $sql .= ", url_id";
-        $sql .= ", url";        // deprecated
+        $sql .= ", url"; // deprecated
         $sql .= ", label";
         $sql .= ", type";
         $sql .= ") VALUES (";
         $sql .= ((int) $line_id);
         $sql .= ", " . ((int) $url_id);
-        $sql .= ", '" . $this->db->escape($url) . "'";      // deprecated
+        $sql .= ", '" . $this->db->escape($url) . "'"; // deprecated
         $sql .= ", '" . $this->db->escape($label) . "'";
         $sql .= ", '" . $this->db->escape($type) . "'";
         $sql .= ")";
@@ -1634,7 +1634,7 @@ 
             $this->error = 'SwiftNotValid';
         }
 
-        if (! $error) {
+        if (!$error) {
             return 1;
         } else {
             return 0;

Dolibarr/Code/Compta/Classes/Facture.php

Spacing +12 added lines, -12 removed lines

@@ -532,7 +532,7 @@ 
             if (!empty($_facrec->frequency)) {  // Invoice are created on same thirdparty than template when there is a recurrence, but not necessarily when there is no recurrence.
                 $this->socid = $_facrec->socid;
             }
-            $this->entity            = $_facrec->entity; // Invoice created in same entity than template
+            $this->entity = $_facrec->entity; // Invoice created in same entity than template
 
             // Fields coming from GUI.
             // @TODO Value of template should be used as default value on the form on the GUI, and we should here always use the value from GUI
@@ -815,7 +815,7 @@ 
 
                         // Complete vat rate with code
                         $vatrate = $newinvoiceline->tva_tx;
-                        if ($newinvoiceline->vat_src_code && ! preg_match('/\(.*\)/', (string) $vatrate)) {
+                        if ($newinvoiceline->vat_src_code && !preg_match('/\(.*\)/', (string) $vatrate)) {
                             $vatrate .= ' (' . $newinvoiceline->vat_src_code . ')';
                         }
 
@@ -1047,7 +1047,7 @@ 
                         $buyprice,
                         $_facrec->lines[$i]->label,
                         empty($_facrec->lines[$i]->array_options) ? null : $_facrec->lines[$i]->array_options,
-                        100,    // situation percent is undefined on recurring invoice lines
+                        100, // situation percent is undefined on recurring invoice lines
                         '',
                         $_facrec->lines[$i]->fk_unit,
                         $_facrec->lines[$i]->multicurrency_subprice,
@@ -1157,7 +1157,7 @@ 
 
         $facture->origin            = $this->origin;
         $facture->origin_id         = $this->origin_id;
-        $facture->fk_account         = $this->fk_account;
+        $facture->fk_account = $this->fk_account;
 
         $facture->lines = $this->lines; // Array of lines of invoice
         $facture->situation_counter = $this->situation_counter;
@@ -1631,7 +1631,7 @@ 
     {
         global $conf, $langs, $hookmanager, $action;
 
-        if (! in_array($origin->element, array('propal', 'commande'))) {
+        if (!in_array($origin->element, array('propal', 'commande'))) {
             $origin->error = 'ErrorCanOnlyAutomaticallyGenerateADepositFromProposalOrOrder';
             return null;
         }
@@ -2192,7 +2192,7 @@ 
                 $this->fk_project = $obj->fk_project;
                 $this->project = null; // Clear if another value was already set by fetch_projet
 
-                $this->statut = $obj->status;   // deprecated
+                $this->statut = $obj->status; // deprecated
                 $this->status = $obj->status;
 
                 $this->date_lim_reglement = $this->db->jdate($obj->dlr);
@@ -3202,7 +3202,7 @@ 
             return -1;
         }
         if (
-            (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref)) &&   // empty should not happened, but when it occurs, the test save life
+            (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref)) && // empty should not happened, but when it occurs, the test save life
             getDolGlobalString('FAC_FORCE_DATE_VALIDATION')                     // If option enabled, we force invoice date
         ) {
             $this->date = dol_now();
@@ -5695,14 +5695,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('facture', 0) . ")";   // One batch process only one company (no sharing)
+        $sql .= " AND f.entity IN (" . getEntity('facture', 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) . "'";
         }
@@ -5920,7 +5920,7 @@ 
                                 $actioncomm->create($user);
                             }
 
-                            $this->db->commit();    // We always commit
+                            $this->db->commit(); // We always commit
                         }
 
                         if ($errormesg) {
@@ -5962,7 +5962,7 @@ 
         // get date of last validated invoices of same type
         $sql  = "SELECT datef";
         $sql .= " FROM " . MAIN_DB_PREFIX . "facture";
-        $sql .= " WHERE type = " . (int) $this->type ;
+        $sql .= " WHERE type = " . (int) $this->type;
         $sql .= " AND date_valid IS NOT NULL";
         $sql .= " AND entity IN (" . getEntity('invoice') . ")";
         $sql .= " ORDER BY datef DESC LIMIT 1";

Dolibarr/Code/Compta/Classes/Paiement.php

Spacing +2 added lines, -2 removed lines

@@ -738,8 +738,8 @@
 
             // if dolibarr currency != bank currency then we received an amount in customer currency (currently I don't manage the case : my currency is USD, the customer currency is EUR and he paid me in GBP. Seems no sense for me)
             if (isModEnabled('multicurrency') && $conf->currency != $acc->currency_code) {
-                $totalamount = $this->multicurrency_amount;     // We will insert into llx_bank.amount in foreign currency
-                $totalamount_main_currency = $this->amount;     // We will also save the amount in main currency into column llx_bank.amount_main_currency
+                $totalamount = $this->multicurrency_amount; // We will insert into llx_bank.amount in foreign currency
+                $totalamount_main_currency = $this->amount; // We will also save the amount in main currency into column llx_bank.amount_main_currency
             }
 
             if ($mode == 'payment_supplier') {

Dolibarr/Code/Comm/Classes/CActionComm.php

Spacing +3 added lines, -3 removed lines

@@ -263,7 +263,7 @@ 
                             }
                         }
                         // For the case type is not 'system...' neither 'module', we just check module is on
-                        if (! in_array($obj->type, array('system', 'systemauto', 'module', 'moduleauto'))) {
+                        if (!in_array($obj->type, array('system', 'systemauto', 'module', 'moduleauto'))) {
                             $tmpmodule = $obj->module;
                             //var_dump($tmpmodule);
                             if ($tmpmodule && isset($conf->$tmpmodule) && isModEnabled($tmpmodule)) {
@@ -351,10 +351,10 @@ 
                 $idorcode = 'all';
             }
             $TType = $TSystem[$idorcode];
-            if (! empty($TSystemAuto[$idorcode])) {
+            if (!empty($TSystemAuto[$idorcode])) {
                 $TType = array_merge($TType, $TSystemAuto[$idorcode]);
             }
-            if (! empty($TModule[$idorcode])) {
+            if (!empty($TModule[$idorcode])) {
                 $TType = array_merge($TType, $TModule[$idorcode]);
             }
             $this->liste_array = $TType;

Dolibarr/Code/Comm/Classes/Propal.php

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/Mailing.php

Spacing +2 added lines, -2 removed lines

@@ -384,7 +384,7 @@ 
                 $this->title = $obj->title;
                 $this->messtype = $obj->messtype;
 
-                $this->statut = $obj->status;   // deprecated
+                $this->statut = $obj->status; // deprecated
                 $this->status = $obj->status;
 
                 $this->nbemail = $obj->nbemail;
@@ -727,7 +727,7 @@ 
                 $sql .= ' WHERE rowid = ' . ((int) $this->id);
 
                 $resqlupdate = $this->db->query($sql);
-                if (! $resqlupdate) {
+                if (!$resqlupdate) {
                     $this->error = $this->db->lasterror();
                     return -1;
                 } else {