From 57118da2068acb06f8c11db0a82d2d81430f3f69 Mon Sep 17 00:00:00 2001 From: Antonin MARCHAL Date: Mon, 26 Apr 2021 20:13:55 +0200 Subject: [PATCH] lint(stickler)3rd --- htdocs/product/class/product.class.php | 6 ++---- htdocs/product/stock/card.php | 3 +-- htdocs/product/stock/class/entrepot.class.php | 5 ++--- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index 1c803fefd7e..d79ae061ae9 100644 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -2201,14 +2201,12 @@ class Product extends CommonObject } if ($separatedStock) { $sql .= " SUM(sp.reel) as stock,"; - } - else { + } 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 { + } 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"; diff --git a/htdocs/product/stock/card.php b/htdocs/product/stock/card.php index b0b5cdfe2c9..1faa19be499 100644 --- a/htdocs/product/stock/card.php +++ b/htdocs/product/stock/card.php @@ -605,8 +605,7 @@ 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,"; } $sql .= " ps.reel as value"; diff --git a/htdocs/product/stock/class/entrepot.class.php b/htdocs/product/stock/class/entrepot.class.php index 8777450fbb9..b51c0d4ea75 100644 --- a/htdocs/product/stock/class/entrepot.class.php +++ b/htdocs/product/stock/class/entrepot.class.php @@ -622,8 +622,7 @@ 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"; @@ -634,7 +633,7 @@ class Entrepot extends CommonObject $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);