alxarafe / alixar

Dolibarr/Code/Fourn/Classes/ProductFournisseur.php

Spacing +5 added lines, -5 removed lines

@@ -137,7 +137,7 @@ 
      */
     public $fourn_remise;
 
-    public $fourn_charges;  // when getDolGlobalString('PRODUCT_CHARGES') is set
+    public $fourn_charges; // when getDolGlobalString('PRODUCT_CHARGES') is set
 
     /**
      * @var int     product-supplier id
@@ -157,7 +157,7 @@ 
     public $fk_availability;
 
     public $fourn_unitprice;
-    public $fourn_unitprice_with_discount;  // not saved into database
+    public $fourn_unitprice_with_discount; // not saved into database
     public $fourn_tva_tx;
     public $fourn_tva_npr;
 
@@ -475,7 +475,7 @@ 
             }
             $sql = "UPDATE " . MAIN_DB_PREFIX . "product_fournisseur_price";
             $sql .= " SET fk_user = " . ((int) $user->id) . " ,";
-            $sql .= " datec = '" . $this->db->idate($now) . "' ,";  // Note: Even if this is an update, we update the creation date as the log of each change is tracked into product_fournisseur_log.
+            $sql .= " datec = '" . $this->db->idate($now) . "' ,"; // Note: Even if this is an update, we update the creation date as the log of each change is tracked into product_fournisseur_log.
             $sql .= " ref_fourn = '" . $this->db->escape($ref_fourn) . "',";
             $sql .= " desc_fourn = '" . $this->db->escape($desc_fourn) . "',";
             $sql .= " price = " . ((float) $buyprice) . ",";
@@ -825,10 +825,10 @@ 
                 $prodfourn->fourn_tva_tx = $record["tva_tx"];
                 $prodfourn->fourn_id = $record["fourn_id"];
                 $prodfourn->fourn_name = $record["supplier_name"];
-                $prodfourn->fk_availability         = $record["fk_availability"];
+                $prodfourn->fk_availability = $record["fk_availability"];
                 $prodfourn->delivery_time_days = $record["delivery_time_days"];
                 $prodfourn->id = $prodid;
-                $prodfourn->fourn_tva_npr                   = $record["info_bits"];
+                $prodfourn->fourn_tva_npr = $record["info_bits"];
                 $prodfourn->fk_supplier_price_expression = $record["fk_supplier_price_expression"];
                 $prodfourn->supplier_reputation = $record["supplier_reputation"];
                 $prodfourn->fourn_date_creation          = $this->db->jdate($record['datec']);

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

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

Spacing +1 added lines, -1 removed lines

@@ -143,7 +143,7 @@
                 $this->note_private         = $obj->note;
                 $this->type_code            = $obj->payment_code;
                 $this->type_label           = $obj->payment_type;
-                $this->fk_paiement           = $obj->fk_paiement;
+                $this->fk_paiement = $obj->fk_paiement;
                 $this->statut               = $obj->statut;
 
                 $error = 1;

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

Spacing +1 added lines, -1 removed lines

@@ -199,7 +199,7 @@
         $default_range = (int) $userauthor->default_range; // if not defined, then 0
         $ranges = $this->getRangesByCategory($fk_c_exp_tax_cat);
         // prevent out of range -1 indice
-        $indice = $default_range  - 1;
+        $indice = $default_range - 1;
         // subtract 1 because array start from 0
         if (empty($ranges) || $indice < 0 || !isset($ranges[$indice])) {
             return false;

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');

Dolibarr/Code/ExpenseReport/Classes/ExpenseReport.php

Spacing +17 added lines, -17 removed lines

@@ -249,8 +249,8 @@ 
      */
     public $fk_user_approve;
 
-    public $localtax1;  // for backward compatibility (real field should be total_localtax1 defined into CommonObject)
-    public $localtax2;  // for backward compatibility (real field should be total_localtax2 defined into CommonObject)
+    public $localtax1; // for backward compatibility (real field should be total_localtax1 defined into CommonObject)
+    public $localtax2; // for backward compatibility (real field should be total_localtax2 defined into CommonObject)
 
     /**
      * Draft status
@@ -341,8 +341,8 @@ 
         $this->total_tva = 0;
         $this->total_localtax1 = 0;
         $this->total_localtax2 = 0;
-        $this->localtax1 = 0;   // For backward compatibility
-        $this->localtax2 = 0;   // For backward compatibility
+        $this->localtax1 = 0; // For backward compatibility
+        $this->localtax2 = 0; // For backward compatibility
         $this->modepaymentid = 0;
 
         // List of language codes for status
@@ -699,8 +699,8 @@ 
                 $this->total_ht     = $obj->total_ht;
                 $this->total_tva    = $obj->total_tva;
                 $this->total_ttc    = $obj->total_ttc;
-                $this->localtax1    = $obj->total_localtax1;        // For backward compatibility
-                $this->localtax2    = $obj->total_localtax2;        // For backward compatibility
+                $this->localtax1    = $obj->total_localtax1; // For backward compatibility
+                $this->localtax2    = $obj->total_localtax2; // For backward compatibility
                 $this->total_localtax1 = $obj->total_localtax1;
                 $this->total_localtax2 = $obj->total_localtax2;
 
@@ -1167,7 +1167,7 @@ 
 
                 $deplig->rule_warning_message = $objp->rule_warning_message;
 
-                $deplig->rang               = $objp->rang;
+                $deplig->rang = $objp->rang;
 
                 $this->lines[$i] = $deplig;
 
@@ -1963,8 +1963,8 @@ 
             $this->line = new ExpenseReportLine($this->db);
 
             // We don't know seller and buyer for expense reports
-            $seller = $mysoc;           // We use same than current company (expense report are often done in same country)
-            $seller->tva_assuj = 1;     // Most seller uses vat
+            $seller = $mysoc; // We use same than current company (expense report are often done in same country)
+            $seller->tva_assuj = 1; // Most seller uses vat
             $buyer = new Societe($this->db);
 
             $localtaxes_type = getLocalTaxesFromRate($vatrate, 0, $buyer, $seller);
@@ -2046,8 +2046,8 @@ 
 
         // We don't know seller and buyer for expense reports
         if (!is_object($seller)) {
-            $seller = $mysoc;           // We use same than current company (expense report are often done in same country)
-            $seller->tva_assuj = 1;     // Most seller uses vat
+            $seller = $mysoc; // We use same than current company (expense report are often done in same country)
+            $seller->tva_assuj = 1; // Most seller uses vat
         }
 
         $expensereportrule = new ExpenseReportRule($db);
@@ -2131,8 +2131,8 @@ 
 
         // We don't know seller and buyer for expense reports
         if (!is_object($seller)) {
-            $seller = $mysoc;           // We use same than current company (expense report are often done in same country)
-            $seller->tva_assuj = 1;     // Most seller uses vat
+            $seller = $mysoc; // We use same than current company (expense report are often done in same country)
+            $seller->tva_assuj = 1; // Most seller uses vat
         }
 
         $expenseik = new ExpenseReportIk($this->db);
@@ -2226,10 +2226,10 @@ 
             $type = 0; // TODO What if type is service ?
 
             // We don't know seller and buyer for expense reports
-            $seller = $mysoc;           // We use same than current company (expense report are often done in same country)
-            $seller->tva_assuj = 1;     // Most seller uses vat
-            $seller->localtax1_assuj = $mysoc->localtax1_assuj;     // We don't know, we reuse the state of company
-            $seller->localtax2_assuj = $mysoc->localtax1_assuj;     // We don't know, we reuse the state of company
+            $seller = $mysoc; // We use same than current company (expense report are often done in same country)
+            $seller->tva_assuj = 1; // Most seller uses vat
+            $seller->localtax1_assuj = $mysoc->localtax1_assuj; // We don't know, we reuse the state of company
+            $seller->localtax2_assuj = $mysoc->localtax1_assuj; // We don't know, we reuse the state of company
             $buyer = new Societe($this->db);
 
             $localtaxes_type = getLocalTaxesFromRate($vatrate, 0, $buyer, $seller);