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

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/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/api_products.class.php

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;

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

public/htdocs/product/stock/replenish.php

Spacing +1 added lines, -1 removed lines

@@ -227,7 +227,7 @@
         $i = 0;
         $fail = 0;
         $orders = array();
-        $suppliersid = array_keys($suppliers);  // array of ids of suppliers
+        $suppliersid = array_keys($suppliers); // array of ids of suppliers
         foreach ($suppliers as $supplier) {
             $order = new CommandeFournisseur($db);
 

public/htdocs/product/stock/massstockmove.php

Spacing +1 added lines, -1 removed lines

@@ -579,7 +579,7 @@
 $maxfilesizearray = getMaxFileSizeArray();
 $maxmin = $maxfilesizearray['maxmin'];
 if ($maxmin > 0) {
-    print '<input type="hidden" name="MAX_FILE_SIZE" value="' . ($maxmin * 1024) . '">';    // MAX_FILE_SIZE must precede the field type=file
+    print '<input type="hidden" name="MAX_FILE_SIZE" value="' . ($maxmin * 1024) . '">'; // MAX_FILE_SIZE must precede the field type=file
 }
 print '<input type="file" name="userfile" size="20" maxlength="80"> &nbsp; &nbsp; ';
 $out = (!getDolGlobalString('MAIN_UPLOAD_DOC') ? ' disabled' : '');

public/htdocs/product/stock/product.php

Spacing +1 added lines, -1 removed lines

@@ -1294,7 +1294,7 @@
         $pse = new ProductStockEntrepot($db);
         $lines = $pse->fetchAll($id);
 
-        $visibleWarehouseEntities = explode(',', getEntity('stock'));   // For MultiCompany compatibility
+        $visibleWarehouseEntities = explode(',', getEntity('stock')); // For MultiCompany compatibility
 
         if (!empty($lines)) {
             $var = false;