alxarafe / alixar

htdocs/contrat/class/contrat.class.php

Indentation +14 added lines, -14 removed lines

@@ -364,7 +364,7 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Activate a contract line
      *
@@ -377,7 +377,7 @@ 
      */
     public function active_line($user, $line_id, $date_start, $date_end = '', $comment = '')
     {
-		// phpcs:enable
+        // phpcs:enable
         $result = $this->lines[$this->lines_id_index_mapper[$line_id]]->active_line($user, $date_start, $date_end, $comment);
         if ($result < 0) {
             $this->error = $this->lines[$this->lines_id_index_mapper[$line_id]]->error;
@@ -387,7 +387,7 @@ 
     }
 
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Close a contract line
      *
@@ -399,7 +399,7 @@ 
      */
     public function close_line($user, $line_id, $date_end, $comment = '')
     {
-		// phpcs:enable
+        // phpcs:enable
         $result = $this->lines[$this->lines_id_index_mapper[$line_id]]->close_line($user, $date_end, $comment);
         if ($result < 0) {
             $this->error = $this->lines[$this->lines_id_index_mapper[$line_id]]->error;
@@ -821,7 +821,7 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Load lines array into this->lines.
      *  This set also nbofserviceswait, nbofservicesopened, nbofservicesexpired and nbofservicesclosed
@@ -833,7 +833,7 @@ 
      */
     public function fetch_lines($only_services = 0, $loadalsotranslation = 0, $noextrafields = 0)
     {
-		// phpcs:enable
+        // phpcs:enable
         $this->nbofservices = 0;
         $this->nbofserviceswait = 0;
         $this->nbofservicesopened = 0;
@@ -1964,7 +1964,7 @@ 
     }
 
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Update statut of contract according to services
      *
@@ -1974,7 +1974,7 @@ 
      */
     public function update_statut($user)
     {
-		// phpcs:enable
+        // phpcs:enable
         dol_syslog(__METHOD__ . " is deprecated", LOG_WARNING);
 
         // If draft, we keep it (should not happen)
@@ -2006,7 +2006,7 @@ 
         return $this->LibStatut($this->statut, $mode);
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Return the label of a given contrat status
      *
@@ -2016,7 +2016,7 @@ 
      */
     public function LibStatut($status, $mode)
     {
-		// phpcs:enable
+        // phpcs:enable
         global $langs;
 
         if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
@@ -2226,7 +2226,7 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Return list of line rowid
      *
@@ -2235,7 +2235,7 @@ 
      */
     public function array_detail($status = -1)
     {
-		// phpcs:enable
+        // phpcs:enable
         $tab = array();
 
         $sql = "SELECT cd.rowid";
@@ -2307,7 +2307,7 @@ 
     }
 
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *      Load indicators for dashboard (this->nbtodo and this->nbtodolate)
      *
@@ -2317,7 +2317,7 @@ 
      */
     public function load_board($user, $mode)
     {
-		// phpcs:enable
+        // phpcs:enable
         global $conf, $langs;
 
         $this->from = " FROM " . MAIN_DB_PREFIX . "contrat as c";

htdocs/contrat/class/contratligne.class.php

Indentation +8 added lines, -8 removed lines

@@ -241,7 +241,7 @@ 
         return $this->LibStatut($this->statut, $mode, ((!empty($this->date_end)) ? ($this->date_end < dol_now() ? 1 : 0) : -1));
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Return label of a contract line status
      *
@@ -253,7 +253,7 @@ 
      */
     public static function LibStatut($status, $mode, $expired = -1, $moreatt = '')
     {
-		// phpcs:enable
+        // phpcs:enable
         global $langs;
         $langs->load("contracts");
 
@@ -688,7 +688,7 @@ 
     }
 
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Update in database the fields total_xxx of lines
      *  Used by migration process
@@ -697,7 +697,7 @@ 
      */
     public function update_total()
     {
-		// phpcs:enable
+        // phpcs:enable
         $this->db->begin();
 
         // Mise a jour ligne en base
@@ -815,7 +815,7 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Activate a contract line
      *
@@ -827,7 +827,7 @@ 
      */
     public function active_line($user, $date, $date_end = '', $comment = '')
     {
-		// phpcs:enable
+        // phpcs:enable
         $error = 0;
 
         $this->db->begin();
@@ -873,7 +873,7 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Close a contract line
      *
@@ -885,7 +885,7 @@ 
      */
     public function close_line($user, $date_end_real, $comment = '', $notrigger = 0)
     {
-		// phpcs:enable
+        // phpcs:enable
         $this->date_cloture = $date_end_real;
         $this->date_end_real = $date_end_real;
         $this->user_closing_id = $user->id;

htdocs/comm/propal/class/propalligne.class.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

htdocs/comm/propal/class/propal.class.php

Indentation +30 added lines, -30 removed lines

@@ -410,7 +410,7 @@ 
     }
 
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Add line into array ->lines
      *  $this->thirdparty should be loaded
@@ -424,7 +424,7 @@ 
      */
     public function add_product($idproduct, $qty, $remise_percent = 0)
     {
-		// phpcs:enable
+        // phpcs:enable
         global $conf, $mysoc;
 
         if (!$qty) {
@@ -475,7 +475,7 @@ 
         return 1;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Adding line of fixed discount in the proposal in DB
      *
@@ -484,7 +484,7 @@ 
      */
     public function insert_discount($idremise)
     {
-		// phpcs:enable
+        // phpcs:enable
         global $langs;
 
         include_once DOL_DOCUMENT_ROOT . '/core/lib/price.lib.php';
@@ -1826,7 +1826,7 @@ 
     }
 
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      * Load array lines
      *
@@ -1837,7 +1837,7 @@ 
      */
     public function fetch_lines($only_product = 0, $loadalsotranslation = 0, $sqlforgedfilters = '')
     {
-		// phpcs:enable
+        // phpcs:enable
         $this->lines = array();
 
         $sql = 'SELECT d.rowid, d.fk_propal, d.fk_parent_line, d.label as custom_label, d.description, d.price, d.vat_src_code, d.tva_tx, d.localtax1_tx, d.localtax2_tx, d.localtax1_type, d.localtax2_type, d.qty, d.fk_remise_except, d.remise_percent, d.subprice, d.fk_product,';
@@ -2086,7 +2086,7 @@ 
     }
 
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Define proposal date
      *
@@ -2097,7 +2097,7 @@ 
      */
     public function set_date($user, $date, $notrigger = 0)
     {
-		// phpcs:enable
+        // phpcs:enable
         if (empty($date)) {
             $this->error = 'ErrorBadParameter';
             dol_syslog(get_class($this) . "::set_date " . $this->error, LOG_ERR);
@@ -2150,7 +2150,7 @@ 
         return -1;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Define end validity date
      *
@@ -2161,7 +2161,7 @@ 
      */
     public function set_echeance($user, $date_end_validity, $notrigger = 0)
     {
-		// phpcs:enable
+        // phpcs:enable
         if ($user->hasRight('propal', 'creer')) {
             $error = 0;
 
@@ -2209,7 +2209,7 @@ 
         return -1;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Set delivery date
      *
@@ -2221,7 +2221,7 @@ 
      */
     public function set_date_livraison($user, $delivery_date, $notrigger = 0)
     {
-		// phpcs:enable
+        // phpcs:enable
         return $this->setDeliveryDate($user, $delivery_date, $notrigger);
     }
 
@@ -2281,7 +2281,7 @@ 
         return -1;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Set delivery
      *
@@ -2292,7 +2292,7 @@ 
      */
     public function set_availability($user, $id, $notrigger = 0)
     {
-		// phpcs:enable
+        // phpcs:enable
         if ($user->hasRight('propal', 'creer') && $this->statut >= self::STATUS_DRAFT) {
             $error = 0;
 
@@ -2344,7 +2344,7 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Set source of demand
      *
@@ -2355,7 +2355,7 @@ 
      */
     public function set_demand_reason($user, $id, $notrigger = 0)
     {
-		// phpcs:enable
+        // phpcs:enable
         if ($user->hasRight('propal', 'creer') && $this->statut >= self::STATUS_DRAFT) {
             $error = 0;
 
@@ -2409,7 +2409,7 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      * Set customer reference number
      *
@@ -2420,7 +2420,7 @@ 
      */
     public function set_ref_client($user, $ref_client, $notrigger = 0)
     {
-		// phpcs:enable
+        // phpcs:enable
         if ($user->hasRight('propal', 'creer')) {
             $error = 0;
 
@@ -2772,7 +2772,7 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Set draft status
      *
@@ -2782,7 +2782,7 @@ 
      */
     public function setDraft($user, $notrigger = 0)
     {
-		// phpcs:enable
+        // phpcs:enable
         $error = 0;
 
         // Protection
@@ -2835,7 +2835,7 @@ 
     }
 
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *    Return list of proposal (eventually filtered on user) into an array
      *
@@ -2851,7 +2851,7 @@ 
      */
     public function liste_array($shortlist = 0, $draft = 0, $notcurrentuser = 0, $socid = 0, $limit = 0, $offset = 0, $sortfield = 'p.datep', $sortorder = 'DESC')
     {
-		// phpcs:enable
+        // phpcs:enable
         global $user;
 
         $ga = array();
@@ -2928,7 +2928,7 @@ 
         return $this->InvoiceArrayList($this->id);
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Returns an array with id and ref of related invoices
      *
@@ -2937,7 +2937,7 @@ 
      */
     public function InvoiceArrayList($id)
     {
-		// phpcs:enable
+        // phpcs:enable
         $ga = array();
         $linkedInvoices = array();
 
@@ -3185,7 +3185,7 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Change source demand
      *
@@ -3196,7 +3196,7 @@ 
      */
     public function demand_reason($demand_reason_id, $notrigger = 0)
     {
-		// phpcs:enable
+        // phpcs:enable
         global $user;
 
         if ($this->status >= self::STATUS_DRAFT) {
@@ -3306,7 +3306,7 @@ 
         return $this->LibStatut($this->statut, $mode);
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *      Return label of a status (draft, validated, ...)
      *
@@ -3316,7 +3316,7 @@ 
      */
     public function LibStatut($status, $mode = 1)
     {
-		// phpcs:enable
+        // phpcs:enable
         global $conf, $hookmanager;
 
         // Init/load array of translation of status
@@ -3364,7 +3364,7 @@ 
     }
 
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *      Load indicators for dashboard (this->nbtodo and this->nbtodolate)
      *
@@ -3374,7 +3374,7 @@ 
      */
     public function load_board($user, $mode)
     {
-		// phpcs:enable
+        // phpcs:enable
         global $conf, $langs;
 
         $clause = " WHERE";

htdocs/expensereport/class/expensereport.class.php

Spacing +17 added lines, -17 removed lines

@@ -229,8 +229,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)
 
     /**
      * @var array
@@ -331,8 +331,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
@@ -689,8 +689,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;
 
@@ -1157,7 +1157,7 @@ 
 
                 $deplig->rule_warning_message = $objp->rule_warning_message;
 
-                $deplig->rang               = $objp->rang;
+                $deplig->rang = $objp->rang;
 
                 $this->lines[$i] = $deplig;
 
@@ -1953,8 +1953,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);
@@ -2036,8 +2036,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);
@@ -2121,8 +2121,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);
@@ -2216,10 +2216,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);

htdocs/expensereport/class/expensereportline.class.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');

htdocs/main.inc.functions.php

Spacing +3 added lines, -3 removed lines

@@ -2230,7 +2230,7 @@ 
 
         // Permit to add user company information on each printed document by setting SHOW_SOCINFO_ON_PRINT
         if (getDolGlobalString('SHOW_SOCINFO_ON_PRINT') && GETPOST('optioncss', 'aZ09') == 'print' && empty(GETPOST('disable_show_socinfo_on_print', 'aZ09'))) {
-            $parameters = [];  // @phan-suppress-current-line PhanPluginRedundantAssignment
+            $parameters = []; // @phan-suppress-current-line PhanPluginRedundantAssignment
             $reshook = $hookmanager->executeHooks('showSocinfoOnPrint', $parameters);
             if (empty($reshook)) {
                 print '<!-- Begin show mysoc info header -->' . "\n";
@@ -2537,7 +2537,7 @@ 
         $forceping = GETPOST('forceping', 'alpha');
         if (($_SERVER['PHP_SELF'] == DOL_URL_ROOT . '/index.php') || $forceping) {
             //print '<!-- instance_unique_id='.$conf->file->instance_unique_id.' MAIN_FIRST_PING_OK_ID='.$conf->global->MAIN_FIRST_PING_OK_ID.' -->';
-            $hash_unique_id = dol_hash('dolibarr' . $conf->file->instance_unique_id, 'sha256');   // Note: if the global salt changes, this hash changes too so ping may be counted twice. We don't mind. It is for statistics purpose only.
+            $hash_unique_id = dol_hash('dolibarr' . $conf->file->instance_unique_id, 'sha256'); // Note: if the global salt changes, this hash changes too so ping may be counted twice. We don't mind. It is for statistics purpose only.
 
             if (
                 !getDolGlobalString('MAIN_FIRST_PING_OK_DATE')
@@ -2634,7 +2634,7 @@ 
             }
         }
 
-        $parameters = [];  // @phan-suppress-current-line PhanPluginRedundantAssignment
+        $parameters = []; // @phan-suppress-current-line PhanPluginRedundantAssignment
         $reshook = $hookmanager->executeHooks('beforeBodyClose', $parameters); // Note that $action and $object may have been modified by some hooks
         if ($reshook > 0) {
             print $hookmanager->resPrint;

htdocs/product/class/productcustomerprice.class.php

Spacing +2 added lines, -2 removed lines

@@ -41,8 +41,8 @@
     public $fields = [
         'ref' => ['type' => 'varchar(128)', 'label' => 'Ref', 'enabled' => 1, 'visible' => 4, 'position' => 10, 'notnull' => 1, 'default' => '(PROV)', 'index' => 1, 'searchall' => 1, 'comment' => "Reference of object", 'showoncombobox' => 1, 'noteditable' => 1],
         'fk_product' => ['type' => 'integer:Product:product/class/product.class.php:0', 'label' => 'Product', 'enabled' => '$conf->product->enabled', 'visible' => 1, 'position' => 35, 'notnull' => 1, 'index' => 1, 'comment' => "Product to produce", 'css' => 'maxwidth300', 'csslist' => 'tdoverflowmax100', 'picto' => 'product'],
-        'ref_customer' => ['type' => 'varchar(128)', 'label' => 'RefCustomer', 'enabled' => 1, 'visible' => 4, 'position' => 10, 'notnull' => 1,],
-        'datec' => ['type' => 'datetime', 'label' => 'AppliedPricesFrom', 'enabled' => 1, 'visible' => 1, 'position' => 500, 'notnull' => 1,],
+        'ref_customer' => ['type' => 'varchar(128)', 'label' => 'RefCustomer', 'enabled' => 1, 'visible' => 4, 'position' => 10, 'notnull' => 1, ],
+        'datec' => ['type' => 'datetime', 'label' => 'AppliedPricesFrom', 'enabled' => 1, 'visible' => 1, 'position' => 500, 'notnull' => 1, ],
         'price_base_type' => ['type' => 'varchar(255)', 'label' => 'PriceBase', 'enabled' => 1, 'visible' => 1, 'position' => 11, 'notnull' => -1, 'comment' => 'Price Base Type'],
         'tva_tx' => ['type' => 'decimal(20,6)', 'label' => 'VAT', 'enabled' => 1, 'visible' => 1, 'position' => 12, 'notnull' => -1, 'comment' => 'TVA Tax Rate'],
         'price' => ['type' => 'decimal(20,6)', 'label' => 'HT', 'enabled' => 1, 'visible' => 1, 'position' => 8, 'notnull' => -1, 'comment' => 'Price HT'],

htdocs/fourn/class/fournisseur.commande-ligne.class.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);