From 1d162cc62ca8ff486afb558ccf80c8cfa83ad9b4 Mon Sep 17 00:00:00 2001 From: Antonin MARCHAL Date: Mon, 26 Apr 2021 20:06:45 +0200 Subject: [PATCH] lint(stickler) --- htdocs/product/class/product.class.php | 27 +++++++------------ htdocs/product/stock/card.php | 4 +-- htdocs/product/stock/class/entrepot.class.php | 10 +++---- 3 files changed, 15 insertions(+), 26 deletions(-) diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index be18056c223..cefc4a27b23 100644 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -2185,32 +2185,30 @@ class Product extends CommonObject $separatedEntityPMP = false; if (!empty($conf->global->MULTICOMPANY_PRODUCT_SHARING_ENABLED) && !empty($conf->global->MULTICOMPANY_PMP_PER_ENTITY_ENABLED)) { $checkPMPPerEntity = $this->db->query("SELECT pmp FROM " . MAIN_DB_PREFIX . "entity_product_pmp WHERE fk_product = ".((int) $id)." AND entity = ".(int) $conf->entity); - if($this->db->num_rows($checkPMPPerEntity)>0){ + if( $this->db->num_rows($checkPMPPerEntity)>0 ){ $separatedEntityPMP = true; } } - //For MultiCompany Stocks Sharings stock_reel includes only stocks shared with this entity $separatedStock = false; - if (!empty($conf->global->MULTICOMPANY_STOCK_SHARING_ENABLED)){ + if (!empty($conf->global->MULTICOMPANY_STOCK_SHARING_ENABLED)) { global $mc; $separatedStock = true; $visibleWarehousesEntities = $conf->entity; - if(isset($mc->sharings['stock']) && !empty($mc->sharings['stock'])){ - $visibleWarehousesEntities .= "," . implode(",",$mc->sharings['stock']); + if (isset($mc->sharings['stock']) && !empty($mc->sharings['stock'])) { + $visibleWarehousesEntities .= "," . implode( ",", $mc->sharings['stock'] ); } } - if($separatedStock){ + if ($separatedStock) { $sql .= " SUM(sp.reel) as stock,"; } - else{ + else { $sql .= " p.stock,"; } - - if ($separatedEntityPMP){ + if ($separatedEntityPMP) { $sql .= " ppe.pmp, p.datec, p.tms, p.import_key, p.entity, p.desiredstock, p.tobatch, p.batch_mask, p.fk_unit,"; } - else{ + else { $sql .= " p.pmp, p.datec, p.tms, p.import_key, p.entity, p.desiredstock, p.tobatch, p.batch_mask, p.fk_unit,"; } $sql .= " p.fk_price_expression, p.price_autogen, p.model_pdf"; @@ -2218,15 +2216,12 @@ class Product extends CommonObject if (!empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) { $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_perentity as pa ON pa.fk_product = p.rowid AND pa.entity = " . ((int) $conf->entity); } - if ($separatedEntityPMP) { $sql .= " INNER JOIN " . MAIN_DB_PREFIX . "entity_product_pmp as ppe ON ppe.fk_product = p.rowid"; } - - if($separatedStock){ + if ($separatedStock) { $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_stock as sp ON sp.fk_product = p.rowid"; } - if ($id) { $sql .= " WHERE p.rowid = ".((int) $id); } else { @@ -2239,12 +2234,10 @@ class Product extends CommonObject $sql .= " AND p.barcode = '".$this->db->escape($barcode)."'"; } } - if ($separatedEntityPMP) { $sql .= " AND ppe.entity = " . (int) $conf->entity; } - - if($separatedStock){ + if ($separatedStock) { $sql .= " AND sp.fk_entrepot IN ( SELECT rowid FROM ".MAIN_DB_PREFIX."entrepot WHERE entity IN (" . $visibleWarehousesEntities ."))"; diff --git a/htdocs/product/stock/card.php b/htdocs/product/stock/card.php index 865245aef72..86b97204cf0 100644 --- a/htdocs/product/stock/card.php +++ b/htdocs/product/stock/card.php @@ -605,8 +605,8 @@ if ($action == 'create') { $sql = "SELECT p.rowid as rowid, p.ref, p.label as produit, p.tobatch, p.fk_product_type as type, p.price, p.price_ttc, p.entity,"; if ($separatedPMP) { $sql .= " ppe.pmp as ppmp,"; - } - else{ + } + else { $sql .= " p.pmp as ppmp,"; } diff --git a/htdocs/product/stock/class/entrepot.class.php b/htdocs/product/stock/class/entrepot.class.php index 53799617420..f58f12f3240 100644 --- a/htdocs/product/stock/class/entrepot.class.php +++ b/htdocs/product/stock/class/entrepot.class.php @@ -622,8 +622,8 @@ class Entrepot extends CommonObject if ($separatedPMP) { $sql = "SELECT sum(ps.reel) as nb, sum(ps.reel * ppe.pmp) as value"; - } - else{ + } + else { $sql = "SELECT sum(ps.reel) as nb, sum(ps.reel * p.pmp) as value"; } $sql .= " FROM ".MAIN_DB_PREFIX."product_stock as ps"; @@ -632,16 +632,12 @@ class Entrepot extends CommonObject if ($separatedPMP) { $sql .= ", ".MAIN_DB_PREFIX."entity_product_pmp as ppe"; - } - + } $sql .= " WHERE ps.fk_entrepot = ".$this->id; - if ($separatedPMP) { $sql .= " AND ppe.fk_product = p.rowid AND ppe.entity = ". (int) $conf->entity; } - $sql .= " AND ps.fk_product = p.rowid"; - //print $sql; $result = $this->db->query($sql); if ($result) {