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

lint(stickler) again

Browse Source
This commit is contained in:
Antonin MARCHAL 2021-04-26 20:10:57 +02:00
parent 1d162cc62c
commit 285fa4a506
3 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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 (

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

@ -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";

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

@ -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";
}