lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lint(stickler)3rd

Browse Source
This commit is contained in:
Antonin MARCHAL 2021-04-26 20:13:55 +02:00
parent 285fa4a506
commit 57118da206
3 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/product/class/product.class.php
View File

@ -2201,14 +2201,12 @@ class Product extends CommonObject
} }
if ($separatedStock) { if ($separatedStock) {
$sql .= " SUM(sp.reel) as stock,"; $sql .= " SUM(sp.reel) as stock,";
} } else {
else {
$sql .= " p.stock,"; $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,"; $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.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"; $sql .= " p.fk_price_expression, p.price_autogen, p.model_pdf";

3
htdocs/product/stock/card.php
View File

@ -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,"; $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) { if ($separatedPMP) {
$sql .= " ppe.pmp as ppmp,"; $sql .= " ppe.pmp as ppmp,";
} } else {
else {
$sql .= " p.pmp as ppmp,"; $sql .= " p.pmp as ppmp,";
} }
$sql .= " ps.reel as value"; $sql .= " ps.reel as value";

5
htdocs/product/stock/class/entrepot.class.php
View File

@ -622,8 +622,7 @@ class Entrepot extends CommonObject
if ($separatedPMP) { if ($separatedPMP) {
$sql = "SELECT sum(ps.reel) as nb, sum(ps.reel * ppe.pmp) as value"; $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 = "SELECT sum(ps.reel) as nb, sum(ps.reel * p.pmp) as value";
} }
$sql .= " FROM ".MAIN_DB_PREFIX."product_stock as ps"; $sql .= " FROM ".MAIN_DB_PREFIX."product_stock as ps";
@ -634,7 +633,7 @@ class Entrepot extends CommonObject
$sql .= " WHERE ps.fk_entrepot = ".$this->id; $sql .= " WHERE ps.fk_entrepot = ".$this->id;
if ($separatedPMP) { if ($separatedPMP) {
$sql .= " AND ppe.fk_product = p.rowid AND ppe.entity = ". (int) $conf->entity; $sql .= " AND ppe.fk_product = p.rowid AND ppe.entity = ". (int) $conf->entity;
} }
$sql .= " AND ps.fk_product = p.rowid"; $sql .= " AND ps.fk_product = p.rowid";
//print $sql; //print $sql;
$result = $this->db->query($sql); $result = $this->db->query($sql);