From 285fa4a506c47f0a4e97ec420904e492b963c229 Mon Sep 17 00:00:00 2001 From: Antonin MARCHAL Date: Mon, 26 Apr 2021 20:10:57 +0200 Subject: [PATCH] lint(stickler) again --- htdocs/product/class/product.class.php | 10 +++++----- htdocs/product/stock/card.php | 1 - htdocs/product/stock/class/entrepot.class.php | 2 -- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index cefc4a27b23..1c803fefd7e 100644 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -2185,7 +2185,7 @@ 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; } } @@ -2196,18 +2196,18 @@ class Product extends CommonObject $separatedStock = true; $visibleWarehousesEntities = $conf->entity; if (isset($mc->sharings['stock']) && !empty($mc->sharings['stock'])) { - $visibleWarehousesEntities .= "," . implode( ",", $mc->sharings['stock'] ); + $visibleWarehousesEntities .= "," . implode(",", $mc->sharings['stock']); } } if ($separatedStock) { $sql .= " SUM(sp.reel) as stock,"; - } + } else { $sql .= " p.stock,"; } 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 { $sql .= " p.pmp, p.datec, p.tms, p.import_key, p.entity, p.desiredstock, p.tobatch, p.batch_mask, p.fk_unit,"; } @@ -2235,7 +2235,7 @@ class Product extends CommonObject } } if ($separatedEntityPMP) { - $sql .= " AND ppe.entity = " . (int) $conf->entity; + $sql .= " AND ppe.entity = " . (int) $conf->entity; } if ($separatedStock) { $sql .= " AND sp.fk_entrepot IN ( diff --git a/htdocs/product/stock/card.php b/htdocs/product/stock/card.php index 86b97204cf0..b0b5cdfe2c9 100644 --- a/htdocs/product/stock/card.php +++ b/htdocs/product/stock/card.php @@ -609,7 +609,6 @@ if ($action == 'create') { else { $sql .= " p.pmp as ppmp,"; } - $sql .= " ps.reel as value"; if (!empty($conf->global->PRODUCT_USE_UNITS)) { $sql .= ",fk_unit"; diff --git a/htdocs/product/stock/class/entrepot.class.php b/htdocs/product/stock/class/entrepot.class.php index f58f12f3240..8777450fbb9 100644 --- a/htdocs/product/stock/class/entrepot.class.php +++ b/htdocs/product/stock/class/entrepot.class.php @@ -627,9 +627,7 @@ class Entrepot extends CommonObject $sql = "SELECT sum(ps.reel) as nb, sum(ps.reel * p.pmp) as value"; } $sql .= " FROM ".MAIN_DB_PREFIX."product_stock as ps"; - $sql .= ", ".MAIN_DB_PREFIX."product as p"; - if ($separatedPMP) { $sql .= ", ".MAIN_DB_PREFIX."entity_product_pmp as ppe"; }