alxarafe / alixar

public/htdocs/product/list.php

Spacing +5 added lines, -5 removed lines

@@ -315,7 +315,7 @@ 
 
 $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
-'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields';  // dol_sort_array looses type for Phan
+'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields'; // dol_sort_array looses type for Phan
 
 // Security check
 if ($search_type == '0') {
@@ -863,7 +863,7 @@ 
 if (isModEnabled('category') && $user->hasRight($rightskey, 'creer')) {
     $arrayofmassactions['preaffecttag'] = img_picto('', 'category', 'class="pictofixedwidth"') . $langs->trans("AffectTag");
 }
-if (in_array($massaction, array('presend', 'predelete','preaffecttag', 'edit_extrafields', 'preupdateprice'))) {
+if (in_array($massaction, array('presend', 'predelete', 'preaffecttag', 'edit_extrafields', 'preupdateprice'))) {
     $arrayofmassactions = array();
 }
 if ($user->hasRight($rightskey, 'supprimer')) {
@@ -976,7 +976,7 @@ 
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN'));  // This also change content of $arrayfields with user setup
+$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup
 $selectedfields = ($mode != 'kanban' ? $htmlofselectarray : '');
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
@@ -1948,10 +1948,10 @@ 
 
         // Multiprices
         if (getDolGlobalString('PRODUIT_MULTIPRICES')) {
-            if (! isset($productpricescache)) {
+            if (!isset($productpricescache)) {
                 $productpricescache = array();
             }
-            if (! isset($productpricescache[$obj->rowid])) {
+            if (!isset($productpricescache[$obj->rowid])) {
                 $productpricescache[$obj->rowid] = array();
             }
 

public/htdocs/product/class/product.class.php

Indentation +99 added lines, -99 removed lines

@@ -1055,7 +1055,7 @@ 
         return $result;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Check barcode
      *
@@ -1068,7 +1068,7 @@ 
      */
     public function check_barcode($valuetotest, $typefortest)
     {
-		// phpcs:enable
+        // phpcs:enable
         global $conf;
         if (isModEnabled('barcode') && getDolGlobalString('BARCODE_PRODUCT_ADDON_NUM')) {
             $module = strtolower(getDolGlobalString('BARCODE_PRODUCT_ADDON_NUM'));
@@ -1984,7 +1984,7 @@ 
     }
 
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Insert a track that we changed a customer price
      *
@@ -1994,7 +1994,7 @@ 
      */
     private function _log_price($user, $level = 0)
     {
-		// phpcs:enable
+        // phpcs:enable
         global $conf;
 
         $now = dol_now();
@@ -2023,7 +2023,7 @@ 
     }
 
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Delete a price line
      *
@@ -2033,7 +2033,7 @@ 
      */
     public function log_price_delete($user, $rowid)
     {
-		// phpcs:enable
+        // phpcs:enable
         $sql = "DELETE FROM " . $this->db->prefix() . "product_price_by_qty";
         $sql .= " WHERE fk_product_price = " . ((int) $rowid);
         $resql = $this->db->query($sql);
@@ -2168,7 +2168,7 @@ 
         return array('pu_ht' => $pu_ht, 'pu_ttc' => $pu_ttc, 'price_min' => $price_min, 'price_base_type' => $price_base_type, 'tva_tx' => $tva_tx, 'tva_npr' => $tva_npr);
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      * Read price used by a provider.
      * We enter as input couple prodfournprice/qty or triplet qty/product_id/fourn_ref.
@@ -2184,7 +2184,7 @@ 
      */
     public function get_buyprice($prodfournprice, $qty, $product_id = 0, $fourn_ref = '', $fk_soc = 0)
     {
-		// phpcs:enable
+        // phpcs:enable
         global $action, $hookmanager;
 
         // Call hook if any
@@ -2988,7 +2988,7 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Charge tableau des stats OF pour le produit/service
      *
@@ -2997,7 +2997,7 @@ 
      */
     public function load_stats_mo($socid = 0)
     {
-		// phpcs:enable
+        // phpcs:enable
         global $user, $hookmanager, $action;
 
         $error = 0;
@@ -3048,7 +3048,7 @@ 
         return 1;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Charge tableau des stats OF pour le produit/service
      *
@@ -3057,7 +3057,7 @@ 
      */
     public function load_stats_bom($socid = 0)
     {
-		// phpcs:enable
+        // phpcs:enable
         global $user, $hookmanager, $action;
 
         $error = 0;
@@ -3117,7 +3117,7 @@ 
         return 1;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Charge tableau des stats propale pour le produit/service
      *
@@ -3126,7 +3126,7 @@ 
      */
     public function load_stats_propale($socid = 0)
     {
-		// phpcs:enable
+        // phpcs:enable
         global $conf, $user, $hookmanager, $action;
 
         $sql = "SELECT COUNT(DISTINCT p.fk_soc) as nb_customers, COUNT(DISTINCT p.rowid) as nb,";
@@ -3192,7 +3192,7 @@ 
     }
 
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Charge tableau des stats propale pour le produit/service
      *
@@ -3201,7 +3201,7 @@ 
      */
     public function load_stats_proposal_supplier($socid = 0)
     {
-		// phpcs:enable
+        // phpcs:enable
         global $conf, $user, $hookmanager, $action;
 
         $sql = "SELECT COUNT(DISTINCT p.fk_soc) as nb_suppliers, COUNT(DISTINCT p.rowid) as nb,";
@@ -3246,7 +3246,7 @@ 
     }
 
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Charge tableau des stats commande client pour le produit/service
      *
@@ -3257,7 +3257,7 @@ 
      */
     public function load_stats_commande($socid = 0, $filtrestatut = '', $forVirtualStock = 0)
     {
-		// phpcs:enable
+        // phpcs:enable
         global $conf, $user, $hookmanager, $action;
 
         $sql = "SELECT COUNT(DISTINCT c.fk_soc) as nb_customers, COUNT(DISTINCT c.rowid) as nb,";
@@ -3373,7 +3373,7 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Charge tableau des stats commande fournisseur pour le produit/service
      *
@@ -3385,7 +3385,7 @@ 
      */
     public function load_stats_commande_fournisseur($socid = 0, $filtrestatut = '', $forVirtualStock = 0, $dateofvirtualstock = null)
     {
-		// phpcs:enable
+        // phpcs:enable
         global $conf, $user, $hookmanager, $action;
 
         $sql = "SELECT COUNT(DISTINCT c.fk_soc) as nb_suppliers, COUNT(DISTINCT c.rowid) as nb,";
@@ -3434,7 +3434,7 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Charge tableau des stats expedition client pour le produit/service
      *
@@ -3446,7 +3446,7 @@ 
      */
     public function load_stats_sending($socid = 0, $filtrestatut = '', $forVirtualStock = 0, $filterShipmentStatus = '')
     {
-		// phpcs:enable
+        // phpcs:enable
         global $conf, $user, $hookmanager, $action;
 
         $sql = "SELECT COUNT(DISTINCT e.fk_soc) as nb_customers, COUNT(DISTINCT e.rowid) as nb,";
@@ -3520,7 +3520,7 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Charge tableau des stats réception fournisseur pour le produit/service
      *
@@ -3532,7 +3532,7 @@ 
      */
     public function load_stats_reception($socid = 0, $filtrestatut = '', $forVirtualStock = 0, $dateofvirtualstock = null)
     {
-		// phpcs:enable
+        // phpcs:enable
         global $conf, $user, $hookmanager, $action;
 
         $sql = "SELECT COUNT(DISTINCT cf.fk_soc) as nb_suppliers, COUNT(DISTINCT cf.rowid) as nb,";
@@ -3581,7 +3581,7 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Charge tableau des stats production pour le produit/service
      *
@@ -3594,7 +3594,7 @@ 
      */
     public function load_stats_inproduction($socid = 0, $filtrestatut = '', $forVirtualStock = 0, $dateofvirtualstock = null, $warehouseid = 0)
     {
-		// phpcs:enable
+        // phpcs:enable
         global $user, $hookmanager, $action;
 
         $serviceStockIsEnabled = isModEnabled("service") && getDolGlobalString('STOCK_SUPPORTS_SERVICES');
@@ -3708,7 +3708,7 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Charge tableau des stats contrat pour le produit/service
      *
@@ -3717,7 +3717,7 @@ 
      */
     public function load_stats_contrat($socid = 0)
     {
-		// phpcs:enable
+        // phpcs:enable
         global $conf, $user, $hookmanager, $action;
 
         $sql = "SELECT COUNT(DISTINCT c.fk_soc) as nb_customers, COUNT(DISTINCT c.rowid) as nb,";
@@ -3782,7 +3782,7 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Charge tableau des stats facture pour le produit/service
      *
@@ -3791,7 +3791,7 @@ 
      */
     public function load_stats_facture($socid = 0)
     {
-		// phpcs:enable
+        // phpcs:enable
         global $conf, $user, $hookmanager, $action;
 
         $sql = "SELECT COUNT(DISTINCT f.fk_soc) as nb_customers, COUNT(DISTINCT f.rowid) as nb,";
@@ -3857,7 +3857,7 @@ 
     }
 
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Charge tableau des stats facture recurrentes pour le produit/service
      *
@@ -3866,7 +3866,7 @@ 
      */
     public function load_stats_facturerec($socid = 0)
     {
-		// phpcs:enable
+        // phpcs:enable
         global $conf, $user, $hookmanager, $action;
 
         $sql = "SELECT COUNT(DISTINCT f.fk_soc) as nb_customers, COUNT(DISTINCT f.rowid) as nb,";
@@ -3931,7 +3931,7 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Charge tableau des stats facture pour le produit/service
      *
@@ -3940,7 +3940,7 @@ 
      */
     public function load_stats_facture_fournisseur($socid = 0)
     {
-		// phpcs:enable
+        // phpcs:enable
         global $conf, $user, $hookmanager, $action;
 
         $sql = "SELECT COUNT(DISTINCT f.fk_soc) as nb_suppliers, COUNT(DISTINCT f.rowid) as nb,";
@@ -3984,7 +3984,7 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Return an array formatted for showing graphs
      *
@@ -3995,7 +3995,7 @@ 
      */
     private function _get_stats($sql, $mode, $year = 0)
     {
-		// phpcs:enable
+        // phpcs:enable
         $tab = array();
 
         $resql = $this->db->query($sql);
@@ -4062,7 +4062,7 @@ 
     }
 
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Return nb of units or customers invoices in which product is included
      *
@@ -4075,7 +4075,7 @@ 
      */
     public function get_nb_vente($socid, $mode, $filteronproducttype = -1, $year = 0, $morefilter = '')
     {
-		// phpcs:enable
+        // phpcs:enable
         global $conf;
         global $user;
 
@@ -4116,7 +4116,7 @@ 
     }
 
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Return nb of units or supplier invoices in which product is included
      *
@@ -4129,7 +4129,7 @@ 
      */
     public function get_nb_achat($socid, $mode, $filteronproducttype = -1, $year = 0, $morefilter = '')
     {
-		// phpcs:enable
+        // phpcs:enable
         global $conf;
         global $user;
 
@@ -4169,7 +4169,7 @@ 
         return $this->_get_stats($sql, $mode, $year);
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      * Return nb of units in proposals in which product is included
      *
@@ -4182,7 +4182,7 @@ 
      */
     public function get_nb_propal($socid, $mode, $filteronproducttype = -1, $year = 0, $morefilter = '')
     {
-		// phpcs:enable
+        // phpcs:enable
         global $conf, $user;
 
         $sql = "SELECT sum(d.qty) as qty, date_format(p.datep, '%Y%m')";
@@ -4221,7 +4221,7 @@ 
         return $this->_get_stats($sql, $mode, $year);
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Return nb of units in proposals in which product is included
      *
@@ -4234,7 +4234,7 @@ 
      */
     public function get_nb_propalsupplier($socid, $mode, $filteronproducttype = -1, $year = 0, $morefilter = '')
     {
-		// phpcs:enable
+        // phpcs:enable
         global $conf;
         global $user;
 
@@ -4274,7 +4274,7 @@ 
         return $this->_get_stats($sql, $mode, $year);
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Return nb of units in orders in which product is included
      *
@@ -4287,7 +4287,7 @@ 
      */
     public function get_nb_order($socid, $mode, $filteronproducttype = -1, $year = 0, $morefilter = '')
     {
-		// phpcs:enable
+        // phpcs:enable
         global $conf, $user;
 
         $sql = "SELECT sum(d.qty) as qty, date_format(c.date_commande, '%Y%m')";
@@ -4326,7 +4326,7 @@ 
         return $this->_get_stats($sql, $mode, $year);
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Return nb of units in orders in which product is included
      *
@@ -4339,7 +4339,7 @@ 
      */
     public function get_nb_ordersupplier($socid, $mode, $filteronproducttype = -1, $year = 0, $morefilter = '')
     {
-		// phpcs:enable
+        // phpcs:enable
         global $conf, $user;
 
         $sql = "SELECT sum(d.qty) as qty, date_format(c.date_commande, '%Y%m')";
@@ -4378,7 +4378,7 @@ 
         return $this->_get_stats($sql, $mode, $year);
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Return nb of units in orders in which product is included
      *
@@ -4391,7 +4391,7 @@ 
      */
     public function get_nb_contract($socid, $mode, $filteronproducttype = -1, $year = 0, $morefilter = '')
     {
-		// phpcs:enable
+        // phpcs:enable
         global $conf, $user;
 
         $sql = "SELECT sum(d.qty) as qty, date_format(c.date_contrat, '%Y%m')";
@@ -4432,7 +4432,7 @@ 
         return $this->_get_stats($sql, $mode, $year);
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Return nb of units in orders in which product is included
      *
@@ -4445,7 +4445,7 @@ 
      */
     public function get_nb_mos($socid, $mode, $filteronproducttype = -1, $year = 0, $morefilter = '')
     {
-		// phpcs:enable
+        // phpcs:enable
         global $conf, $user;
 
         $sql = "SELECT sum(d.qty), date_format(d.date_valid, '%Y%m')";
@@ -4485,7 +4485,7 @@ 
         return $this->_get_stats($sql, $mode, $year);
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Link a product/service to a parent product/service
      *
@@ -4500,7 +4500,7 @@ 
     {
         global $user;
 
-		// phpcs:enable
+        // phpcs:enable
         // Clean parameters
         if (!is_numeric($id_pere)) {
             $id_pere = 0;
@@ -4558,7 +4558,7 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Modify composed product
      *
@@ -4573,7 +4573,7 @@ 
     {
         global $user;
 
-		// phpcs:enable
+        // phpcs:enable
         // Clean parameters
         if (!is_numeric($id_pere)) {
             $id_pere = 0;
@@ -4612,7 +4612,7 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Remove a link between a subproduct and a parent product/service
      *
@@ -4625,7 +4625,7 @@ 
     {
         global $user;
 
-		// phpcs:enable
+        // phpcs:enable
         if (!is_numeric($fk_parent)) {
             $fk_parent = 0;
         }
@@ -4676,7 +4676,7 @@ 
         return 1;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Check if it is a sub-product into a kit
      *
@@ -4686,7 +4686,7 @@ 
      */
     public function is_sousproduit($fk_parent, $fk_child)
     {
-		// phpcs:enable
+        // phpcs:enable
         $sql = "SELECT fk_product_pere, qty, incdec";
         $sql .= " FROM " . $this->db->prefix() . "product_association";
         $sql .= " WHERE fk_product_pere  = " . ((int) $fk_parent);
@@ -4713,7 +4713,7 @@ 
     }
 
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Add a supplier price for the product.
      *  Note: Duplicate ref is accepted for different quantity only, or for different companies.
@@ -4726,7 +4726,7 @@ 
      */
     public function add_fournisseur($user, $id_fourn, $ref_fourn, $quantity)
     {
-		// phpcs:enable
+        // phpcs:enable
         global $conf;
 
         $now = dol_now();
@@ -4814,7 +4814,7 @@ 
     }
 
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      * Return list of suppliers providing the product or service
      *
@@ -4822,7 +4822,7 @@ 
      */
     public function list_suppliers()
     {
-		// phpcs:enable
+        // phpcs:enable
         global $conf;
 
         $list = array();
@@ -4846,7 +4846,7 @@ 
         return $list;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Recopie les prix d'un produit/service sur un autre
      *
@@ -4934,7 +4934,7 @@ 
         return 1;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      * Clone links between products
      *
@@ -4944,7 +4944,7 @@ 
      */
     public function clone_associations($fromId, $toId)
     {
-		// phpcs:enable
+        // phpcs:enable
         $this->db->begin();
 
         $sql = 'INSERT INTO ' . $this->db->prefix() . 'product_association (fk_product_pere, fk_product_fils, qty, incdec)';
@@ -4961,7 +4961,7 @@ 
         return 1;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Recopie les fournisseurs et prix fournisseurs d'un produit/service sur un autre
      *
@@ -4971,7 +4971,7 @@ 
      */
     public function clone_fournisseurs($fromId, $toId)
     {
-		// phpcs:enable
+        // phpcs:enable
         $this->db->begin();
 
         $now = dol_now();
@@ -5007,7 +5007,7 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Function recursive, used only by get_arbo_each_prod(), to build tree of subproducts into ->res
      *  Define value of this->res
@@ -5022,7 +5022,7 @@ 
      */
     public function fetch_prod_arbo($prod, $compl_path = '', $multiply = 1, $level = 1, $id_parent = 0, $ignore_stock_load = 0)
     {
-		// phpcs:enable
+        // phpcs:enable
         global $conf, $langs;
 
         $tmpproduct = null;
@@ -5075,7 +5075,7 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Build the tree of subproducts and return it.
      *  this->sousprods must have been loaded by this->get_sousproduits_arbo()
@@ -5086,7 +5086,7 @@ 
      */
     public function get_arbo_each_prod($multiply = 1, $ignore_stock_load = 0)
     {
-		// phpcs:enable
+        // phpcs:enable
         $this->res = array();
         if (isset($this->sousprods) && is_array($this->sousprods)) {
             foreach ($this->sousprods as $prod_name => $desc_product) {
@@ -5297,7 +5297,7 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *     Return tree of all subproducts for product. Tree contains array of array(0=prodid, 1=>qty, 2=>product type, 3=>label, 4=>incdec, 5=>product ref)
      *     Set this->sousprods
@@ -5306,7 +5306,7 @@ 
      */
     public function get_sousproduits_arbo()
     {
-		// phpcs:enable
+        // phpcs:enable
         $parent = array();
 
         foreach ($this->getChildsArbo($this->id) as $keyChild => $valueChild) {    // Warning. getChildsArbo can call getChildsArbo recursively. Starting point is $value[0]=id of product
@@ -5602,7 +5602,7 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *    Return label of a given status
      *
@@ -5613,7 +5613,7 @@ 
      */
     public function LibStatut($status, $mode = 0, $type = 0)
     {
-		// phpcs:enable
+        // phpcs:enable
         global $conf, $langs;
 
         $labelStatus = $labelStatusShort = '';
@@ -5711,7 +5711,7 @@ 
     }
 
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Adjust stock in a warehouse for product
      *
@@ -5730,7 +5730,7 @@ 
      */
     public function correct_stock($user, $id_entrepot, $nbpiece, $movement, $label = '', $price = 0, $inventorycode = '', $origin_element = '', $origin_id = null, $disablestockchangeforsubproduct = 0, $extrafields = null)
     {
-		// phpcs:enable
+        // phpcs:enable
         if ($id_entrepot) {
             $this->db->begin();
 
@@ -5770,7 +5770,7 @@ 
         return -1;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Adjust stock in a warehouse for product with batch number
      *
@@ -5793,7 +5793,7 @@ 
      */
     public function correct_stock_batch($user, $id_entrepot, $nbpiece, $movement, $label = '', $price = 0, $dlc = '', $dluo = '', $lot = '', $inventorycode = '', $origin_element = '', $origin_id = null, $disablestockchangeforsubproduct = 0, $extrafields = null, $force_update_batch = false)
     {
-		// phpcs:enable
+        // phpcs:enable
         if ($id_entrepot) {
             $this->db->begin();
 
@@ -5833,7 +5833,7 @@ 
         return -1;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      * Load information about stock of a product into ->stock_reel, ->stock_warehouse[] (including stock_warehouse[idwarehouse]->detail_batch for batch products)
      * This function need a lot of load. If you use it on list, use a cache to execute it once for each product id.
@@ -5848,7 +5848,7 @@ 
      */
     public function load_stock($option = '', $includedraftpoforvirtual = null, $dateofvirtualstock = null)
     {
-		// phpcs:enable
+        // phpcs:enable
         global $conf;
 
         $this->stock_reel = 0;
@@ -5915,7 +5915,7 @@ 
     }
 
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Load value ->stock_theorique of a product. Property this->id must be defined.
      *  This function need a lot of load. If you use it on list, use a cache to execute it one for each product id.
@@ -5927,7 +5927,7 @@ 
      */
     public function load_virtual_stock($includedraftpoforvirtual = null, $dateofvirtualstock = null)
     {
-		// phpcs:enable
+        // phpcs:enable
         global $conf, $hookmanager, $action;
 
         $stock_commande_client = 0;
@@ -6086,7 +6086,7 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Move an uploaded file described into $file array into target directory $sdir.
      *
@@ -6096,7 +6096,7 @@ 
      */
     public function add_photo($sdir, $file)
     {
-		// phpcs:enable
+        // phpcs:enable
         global $conf;
 
         include_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
@@ -6133,7 +6133,7 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Return if at least one photo is available
      *
@@ -6142,7 +6142,7 @@ 
      */
     public function is_photo_available($sdir)
     {
-		// phpcs:enable
+        // phpcs:enable
         include_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
         include_once DOL_DOCUMENT_ROOT . '/core/lib/images.lib.php';
 
@@ -6174,7 +6174,7 @@ 
         return false;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      * Return an array with all photos of product found on disk. There is no sorting criteria.
      *
@@ -6184,7 +6184,7 @@ 
      */
     public function liste_photos($dir, $nbmax = 0)
     {
-		// phpcs:enable
+        // phpcs:enable
         include_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
         include_once DOL_DOCUMENT_ROOT . '/core/lib/images.lib.php';
 
@@ -6235,7 +6235,7 @@ 
         return $tabobj;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Delete a photo and its thumbs
      *
@@ -6244,7 +6244,7 @@ 
      */
     public function delete_photo($file)
     {
-		// phpcs:enable
+        // phpcs:enable
         include_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
         include_once DOL_DOCUMENT_ROOT . '/core/lib/images.lib.php';
 
@@ -6269,7 +6269,7 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Load size of image file
      *
@@ -6278,7 +6278,7 @@ 
      */
     public function get_image_size($file)
     {
-		// phpcs:enable
+        // phpcs:enable
         $file_osencoded = dol_osencode($file);
         $infoImg = getimagesize($file_osencoded); // Get information on image
         $this->imgWidth = $infoImg[0]; // Largeur de l'image
@@ -6376,7 +6376,7 @@ 
     }
 
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Get a barcode from the module to generate barcode values.
      *  Return value is stored into this->barcode
@@ -6387,7 +6387,7 @@ 
      */
     public function get_barcode($object, $type = '')
     {
-		// phpcs:enable
+        // phpcs:enable
         global $conf;
 
         $result = '';
@@ -6494,7 +6494,7 @@ 
         return $label;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      * Return minimum product recommended price
      *
@@ -6502,7 +6502,7 @@ 
      */
     public function min_recommended_price()
     {
-		// phpcs:enable
+        // phpcs:enable
         global $conf;
 
         $maxpricesupplier = 0;

Spacing +20 added lines, -20 removed lines

@@ -146,7 +146,7 @@ 
      */
     public $price;
 
-    public $price_formated;         // used by takepos/ajax/ajax.php
+    public $price_formated; // used by takepos/ajax/ajax.php
 
     /**
      * Selling price with tax
@@ -155,7 +155,7 @@ 
      */
     public $price_ttc;
 
-    public $price_ttc_formated;     // used by takepos/ajax/ajax.php
+    public $price_ttc_formated; // used by takepos/ajax/ajax.php
 
     /**
      * Minimum price net
@@ -408,20 +408,20 @@ 
 
     //! Metric of products
     public $weight;
-    public $weight_units;   // scale -3, 0, 3, 6
+    public $weight_units; // scale -3, 0, 3, 6
     public $length;
-    public $length_units;   // scale -3, 0, 3, 6
+    public $length_units; // scale -3, 0, 3, 6
     public $width;
-    public $width_units;    // scale -3, 0, 3, 6
+    public $width_units; // scale -3, 0, 3, 6
     public $height;
-    public $height_units;   // scale -3, 0, 3, 6
+    public $height_units; // scale -3, 0, 3, 6
     public $surface;
-    public $surface_units;  // scale -3, 0, 3, 6
+    public $surface_units; // scale -3, 0, 3, 6
     public $volume;
-    public $volume_units;   // scale -3, 0, 3, 6
+    public $volume_units; // scale -3, 0, 3, 6
 
     public $net_measure;
-    public $net_measure_units;  // scale -3, 0, 3, 6
+    public $net_measure_units; // scale -3, 0, 3, 6
 
     public $accountancy_code_sell;
     public $accountancy_code_sell_intra;
@@ -633,7 +633,7 @@ 
         'import_key'    => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => 1, 'visible' => -2, 'notnull' => -1, 'index' => 0, 'position' => 1000),
         //'tosell'       =>array('type'=>'integer',      'label'=>'Status',           'enabled'=>1, 'visible'=>1,  'notnull'=>1, 'default'=>'0', 'index'=>1,  'position'=>1000, 'arrayofkeyval'=>array(0=>'Draft', 1=>'Active', -1=>'Cancel')),
         //'tobuy'        =>array('type'=>'integer',      'label'=>'Status',           'enabled'=>1, 'visible'=>1,  'notnull'=>1, 'default'=>'0', 'index'=>1,  'position'=>1000, 'arrayofkeyval'=>array(0=>'Draft', 1=>'Active', -1=>'Cancel')),
-        'mandatory_period' => array('type' => 'integer', 'label' => 'mandatoryperiod', 'enabled' => 1, 'visible' => 1,  'notnull' => 1, 'default' => '0', 'index' => 1,  'position' => 1000),
+        'mandatory_period' => array('type' => 'integer', 'label' => 'mandatoryperiod', 'enabled' => 1, 'visible' => 1, 'notnull' => 1, 'default' => '0', 'index' => 1, 'position' => 1000),
     );
 
     /**
@@ -1957,7 +1957,7 @@ 
      */
     private function getArrayForPriceCompare($level = 0)
     {
-        $testExit = array('multiprices','multiprices_ttc','multiprices_base_type','multiprices_min','multiprices_min_ttc','multiprices_tva_tx','multiprices_recuperableonly');
+        $testExit = array('multiprices', 'multiprices_ttc', 'multiprices_base_type', 'multiprices_min', 'multiprices_min_ttc', 'multiprices_tva_tx', 'multiprices_recuperableonly');
 
         foreach ($testExit as $field) {
             if (!isset($this->$field)) {
@@ -2601,8 +2601,8 @@ 
 
         //For MultiCompany
         //PMP per entity & Stocks Sharings stock_reel includes only stocks shared with this entity
-        $separatedEntityPMP = false;    // Set to true to get the AWP from table llx_product_perentity instead of field 'pmp' into llx_product.
-        $separatedStock = false;        // Set to true will count stock from subtable llx_product_stock. It is slower than using denormalized field 'stock', but it is required when using multientity and shared warehouses.
+        $separatedEntityPMP = false; // Set to true to get the AWP from table llx_product_perentity instead of field 'pmp' into llx_product.
+        $separatedStock = false; // Set to true will count stock from subtable llx_product_stock. It is slower than using denormalized field 'stock', but it is required when using multientity and shared warehouses.
         $visibleWarehousesEntities = $conf->entity;
         if (getDolGlobalString('MULTICOMPANY_PRODUCT_SHARING_ENABLED')) {
             if (getDolGlobalString('MULTICOMPANY_PMP_PER_ENTITY_ENABLED')) {
@@ -2795,15 +2795,15 @@ 
                         $sql .= " WHERE entity IN (" . getEntity('productprice') . ")";
                         $sql .= " AND price_level=" . ((int) $i);
                         $sql .= " AND fk_product = " . ((int) $this->id);
-                        $sql .= " ORDER BY date_price DESC, rowid DESC";    // Get the most recent line
-                        $sql .= " LIMIT 1";                                 // Only the first one
+                        $sql .= " ORDER BY date_price DESC, rowid DESC"; // Get the most recent line
+                        $sql .= " LIMIT 1"; // Only the first one
                         $resql = $this->db->query($sql);
                         if ($resql) {
                             $result = $this->db->fetch_array($resql);
 
                             $this->multiprices[$i] = $result ? $result["price"] : null;
                             $this->multiprices_ttc[$i] = $result ? $result["price_ttc"] : null;
-                            $this->multiprices_min[$i] =  $result ? $result["price_min"] : null;
+                            $this->multiprices_min[$i] = $result ? $result["price_min"] : null;
                             $this->multiprices_min_ttc[$i] = $result ? $result["price_min_ttc"] : null;
                             $this->multiprices_base_type[$i] = $result ? $result["price_base_type"] : null;
                             // Next two fields are used only if PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL is on
@@ -3028,7 +3028,7 @@ 
                 $obj = $this->db->fetch_object($result);
                 $this->stats_mo['customers_' . $role] = $obj->nb_customers ? $obj->nb_customers : 0;
                 $this->stats_mo['nb_' . $role] = $obj->nb ? $obj->nb : 0;
-                $this->stats_mo['qty_' . $role] = $obj->qty ? price2num($obj->qty, 'MS') : 0;     // qty may be a float due to the SUM()
+                $this->stats_mo['qty_' . $role] = $obj->qty ? price2num($obj->qty, 'MS') : 0; // qty may be a float due to the SUM()
             } else {
                 $this->error = $this->db->error();
                 $error++;
@@ -4534,7 +4534,7 @@ 
                 //Addition of a product with the highest rank +1
                 $sql = "INSERT INTO " . $this->db->prefix() . "product_association(fk_product_pere,fk_product_fils,qty,incdec,rang)";
                 $sql .= " VALUES (" . ((int) $id_pere) . ", " . ((int) $id_fils) . ", " . price2num($qty, 'MS') . ", " . ((int) $incdec) . ", " . ((int) $rank) . ")";
-                if (! $this->db->query($sql)) {
+                if (!$this->db->query($sql)) {
                     dol_print_error($this->db);
                     return -1;
                 } else {
@@ -4655,7 +4655,7 @@ 
                 $sql = "UPDATE " . $this->db->prefix() . "product_association";
                 $sql .= " SET rang = " . ((int) $cpt);
                 $sql .= " WHERE rowid = " . ((int) $objrank->rowid);
-                if (! $this->db->query($sql)) {
+                if (!$this->db->query($sql)) {
                     dol_print_error($this->db);
                     return -1;
                 }
@@ -6722,7 +6722,7 @@ 
      */
     public function getKanbanView($option = '', $arraydata = null)
     {
-        global $langs,$conf;
+        global $langs, $conf;
 
         $selected = (empty($arraydata['selected']) ? 0 : $arraydata['selected']);
 

public/htdocs/product/class/html.formproduct.class.php

Indentation +4 added lines, -4 removed lines

@@ -233,7 +233,7 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      * Return full path to current warehouse in $tab (recursive function)
      *
@@ -243,7 +243,7 @@ 
      */
     private function get_parent_path($tab, $final_label = '')
     {
-		//phpcs:enable
+        //phpcs:enable
         if (empty($final_label)) {
             $final_label = $tab['label'];
         }
@@ -524,7 +524,7 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Output a combo box with list of units
      *  Currently the units are not define in the DB
@@ -539,7 +539,7 @@ 
      */
     public function select_measuring_units($name = 'measuring_units', $measuring_style = '', $selected = '0', $adddefault = 0, $mode = 0)
     {
-		//phpcs:enable
+        //phpcs:enable
         print $this->selectMeasuringUnits($name, $measuring_style, $selected, $adddefault, $mode);
     }
 

public/htdocs/product/class/productfournisseurprice.class.php

Indentation +2 added lines, -2 removed lines

@@ -725,7 +725,7 @@ 
         return $this->LibStatut($this->status, $mode);
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Return the status
      *
@@ -735,7 +735,7 @@ 
      */
     public function LibStatut($status, $mode = 0)
     {
-		// phpcs:enable
+        // phpcs:enable
         if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
             global $langs;
             //$langs->load("buypricehistory@buypricehistory");

public/htdocs/product/class/productbatch.class.php

Spacing +10 added lines, -10 removed lines

@@ -58,18 +58,18 @@ 
     public $fk_product;
 
     // Properties of the lot
-    public $lotid;          // ID in table of the details of properties of each lots
+    public $lotid; // ID in table of the details of properties of each lots
 
     /**
      * @var int|string
      * @deprecated
      */
-    public $sellby = '';    // dlc
+    public $sellby = ''; // dlc
     /**
      * @var int|string
      * @deprecated
      */
-    public $eatby = '';     // dmd/dluo
+    public $eatby = ''; // dmd/dluo
 
 
     /**
@@ -103,15 +103,15 @@ 
         // Insert request
         $sql = "INSERT INTO " . $this->db->prefix() . "product_batch (";
         $sql .= "fk_product_stock,";
-        $sql .= "sellby,";              // no more used
-        $sql .= "eatby,";               // no more used
+        $sql .= "sellby,"; // no more used
+        $sql .= "eatby,"; // no more used
         $sql .= "batch,";
         $sql .= "qty,";
         $sql .= "import_key";
         $sql .= ") VALUES (";
         $sql .= " " . (!isset($this->fk_product_stock) ? 'NULL' : $this->fk_product_stock) . ",";
-        $sql .= " " . (!isset($this->sellby) || dol_strlen($this->sellby) == 0 ? 'NULL' : "'" . $this->db->idate($this->sellby) . "'") . ",";       // no more used
-        $sql .= " " . (!isset($this->eatby) || dol_strlen($this->eatby) == 0 ? 'NULL' : "'" . $this->db->idate($this->eatby) . "'") . ",";          // no more used
+        $sql .= " " . (!isset($this->sellby) || dol_strlen($this->sellby) == 0 ? 'NULL' : "'" . $this->db->idate($this->sellby) . "'") . ","; // no more used
+        $sql .= " " . (!isset($this->eatby) || dol_strlen($this->eatby) == 0 ? 'NULL' : "'" . $this->db->idate($this->eatby) . "'") . ","; // no more used
         $sql .= " " . (!isset($this->batch) ? 'NULL' : "'" . $this->db->escape($this->batch) . "'") . ",";
         $sql .= " " . (!isset($this->qty) ? 'NULL' : $this->qty) . ",";
         $sql .= " " . (!isset($this->import_key) ? 'NULL' : "'" . $this->db->escape($this->import_key) . "'");
@@ -162,7 +162,7 @@ 
         $sql .= " pl.eatby,";
         $sql .= " pl.sellby";
         $sql .= " FROM " . $this->db->prefix() . "product_batch as t";
-        $sql .= " INNER JOIN " . $this->db->prefix() . "product_stock w on t.fk_product_stock = w.rowid";   // llx_product_stock is a parent table so this link does NOT generate duplicate record
+        $sql .= " INNER JOIN " . $this->db->prefix() . "product_stock w on t.fk_product_stock = w.rowid"; // llx_product_stock is a parent table so this link does NOT generate duplicate record
         $sql .= " LEFT JOIN " . $this->db->prefix() . "product_lot as pl on pl.fk_product = w.fk_product and pl.batch = t.batch";
         $sql .= " WHERE t.rowid = " . ((int) $id);
 
@@ -431,7 +431,7 @@ 
                 $this->tms = $this->db->jdate($obj->tms);
                 $this->fk_product_stock = $obj->fk_product_stock;
                 $this->sellby = $this->db->jdate($obj->sellby); // deprecated. do no tuse this data.
-                $this->eatby = $this->db->jdate($obj->eatby);   // deprecated. do not use this data.
+                $this->eatby = $this->db->jdate($obj->eatby); // deprecated. do not use this data.
                 $this->batch = $obj->batch;
                 $this->qty = $obj->qty;
                 $this->import_key = $obj->import_key;
@@ -529,7 +529,7 @@ 
 
                 if ($fk_product > 0) {
                     // Some properties of the lot
-                    $tmp->lotid = $obj->lotid;  // ID in table of the details of properties of each lots
+                    $tmp->lotid = $obj->lotid; // ID in table of the details of properties of each lots
                     $tmp->sellby = $dbs->jdate($obj->sellby ? $obj->sellby : $obj->oldsellby);
                     $tmp->eatby = $dbs->jdate($obj->eatby ? $obj->eatby : $obj->oldeatby);
                 }

public/htdocs/product/class/productcustomerprice.class.php

Spacing +1 added lines, -1 removed lines

@@ -256,7 +256,7 @@
         $sql .= " " . (empty($this->localtax2_type) ? "'0'" : "'" . $this->db->escape($this->localtax2_type) . "'") . ",";
         $sql .= " " . (!isset($this->localtax2_tx) ? 'NULL' : (empty($this->localtax2_tx) ? 0 : $this->localtax2_tx)) . ",";
         $sql .= " " . ((int) $user->id) . ",";
-        $sql .=  " " . (!isset($this->price_label) ? 'NULL' : "'" . $this->db->escape($this->price_label) . "'") . ",";
+        $sql .= " " . (!isset($this->price_label) ? 'NULL' : "'" . $this->db->escape($this->price_label) . "'") . ",";
         $sql .= " " . (!isset($this->import_key) ? 'NULL' : "'" . $this->db->escape($this->import_key) . "'");
         $sql .= ")";
 

public/htdocs/product/class/propalmergepdfproduct.class.php

Indentation +6 added lines, -6 removed lines

@@ -226,7 +226,7 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Load object in memory from the database
      *
@@ -236,7 +236,7 @@ 
      */
     public function fetch_by_product($product_id, $lang = '')
     {
-		// phpcs:enable
+        // phpcs:enable
         global $langs, $conf;
 
         $sql = "SELECT";
@@ -404,7 +404,7 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Delete object in database
      *
@@ -416,7 +416,7 @@ 
      */
     public function delete_by_product($user, $product_id, $lang_id = '', $notrigger = 0)
     {
-		// phpcs:enable
+        // phpcs:enable
         global $conf, $langs;
         $error = 0;
 
@@ -452,7 +452,7 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Delete object in database
      *
@@ -461,7 +461,7 @@ 
      */
     public function delete_by_file($user)
     {
-		// phpcs:enable
+        // phpcs:enable
         global $conf, $langs;
         $error = 0;
 

public/htdocs/product/class/api_products.class.php

Indentation +2 added lines, -2 removed lines

@@ -1942,7 +1942,7 @@ 
         return array('stock_warehouses' => $stockData);
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
     /**
      * Clean sensible object datas
      *
@@ -1951,7 +1951,7 @@ 
      */
     protected function _cleanObjectDatas($object)
     {
-		// phpcs:enable
+        // phpcs:enable
         $object = parent::_cleanObjectDatas($object);
 
         unset($object->statut);

Spacing +3 added lines, -3 removed lines

@@ -232,7 +232,7 @@ 
         }
 
         //this query will return total products with the filters given
-        $sqlTotals =  str_replace('SELECT t.rowid, t.ref, t.ref_ext', 'SELECT count(t.rowid) as total', $sql);
+        $sqlTotals = str_replace('SELECT t.rowid, t.ref, t.ref_ext', 'SELECT count(t.rowid) as total', $sql);
 
         $sql .= $this->db->order($sortfield, $sortorder);
         if ($limit) {
@@ -329,7 +329,7 @@ 
 
         if (getDolGlobalString('PRODUIT_MULTIPRICES')) {
             $key_max = getDolGlobalString('PRODUIT_MULTIPRICES_LIMIT');
-            for ($key = 1; $key <= $key_max ; $key++) {
+            for ($key = 1; $key <= $key_max; $key++) {
                 $newvat = $this->product->multiprices_tva_tx[$key];
                 $newnpr = 0;
                 $newvatsrccode = $this->product->default_vat_code;
@@ -462,7 +462,7 @@ 
 
         if ($result > 0 && getDolGlobalString('PRODUIT_MULTIPRICES')) {
             $key_max = getDolGlobalString('PRODUIT_MULTIPRICES_LIMIT');
-            for ($key = 1; $key <= $key_max ; $key++) {
+            for ($key = 1; $key <= $key_max; $key++) {
                 $pricemodified = false;
                 if ($this->product->multiprices_base_type[$key] != $oldproduct->multiprices_base_type[$key]) {
                     $pricemodified = true;

Braces +15 added lines, -5 removed lines

@@ -467,13 +467,23 @@
                 if ($this->product->multiprices_base_type[$key] != $oldproduct->multiprices_base_type[$key]) {
                     $pricemodified = true;
                 } else {
-                    if ($this->product->multiprices_tva_tx[$key] != $oldproduct->multiprices_tva_tx[$key]) $pricemodified = true;
+                    if ($this->product->multiprices_tva_tx[$key] != $oldproduct->multiprices_tva_tx[$key]) {
+                        $pricemodified = true;
+                    }
                     if ($this->product->multiprices_base_type[$key] == 'TTC') {
-                        if ($this->product->multiprices_ttc[$key] != $oldproduct->multiprices_ttc[$key]) $pricemodified = true;
-                        if ($this->product->multiprices_min_ttc[$key] != $oldproduct->multiprices_min_ttc[$key]) $pricemodified = true;
+                        if ($this->product->multiprices_ttc[$key] != $oldproduct->multiprices_ttc[$key]) {
+                            $pricemodified = true;
+                        }
+                        if ($this->product->multiprices_min_ttc[$key] != $oldproduct->multiprices_min_ttc[$key]) {
+                            $pricemodified = true;
+                        }
                     } else {
-                        if ($this->product->multiprices[$key] != $oldproduct->multiprices[$key]) $pricemodified = true;
-                        if ($this->product->multiprices_min[$key] != $oldproduct->multiprices[$key]) $pricemodified = true;
+                        if ($this->product->multiprices[$key] != $oldproduct->multiprices[$key]) {
+                            $pricemodified = true;
+                        }
+                        if ($this->product->multiprices_min[$key] != $oldproduct->multiprices[$key]) {
+                            $pricemodified = true;
+                        }
                     }
                 }
                 if ($pricemodified && $result > 0) {

public/htdocs/product/composition/card.php

Spacing +1 added lines, -1 removed lines

@@ -444,7 +444,7 @@
 
                     $unitline = price2num(($fourn_unitprice * (1 - ($fourn_remise_percent / 100)) - $fourn_remise), 'MU');
                     $totalline = price2num($value['nb'] * ($fourn_unitprice * (1 - ($fourn_remise_percent / 100)) - $fourn_remise), 'MT');
-                    $total +=  $totalline;
+                    $total += $totalline;
 
                     print '<td class="right nowraponall">';
                     print($notdefined ? '' : ($value['nb'] > 1 ? $value['nb'] . 'x ' : '') . '<span class="amount">' . price($unitline, 0, '', 0, 0, -1, $conf->currency)) . '</span>';