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

lint(stickler)

Browse Source
This commit is contained in:
Antonin MARCHAL 2021-04-26 20:06:45 +02:00
parent 14269ab8ee
commit 1d162cc62c
3 changed files with 15 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2185,32 +2185,30 @@ class Product extends CommonObject
$separatedEntityPMP = false; $separatedEntityPMP = false;
if (!empty($conf->global->MULTICOMPANY_PRODUCT_SHARING_ENABLED) && !empty($conf->global->MULTICOMPANY_PMP_PER_ENTITY_ENABLED)) { 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); $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; $separatedEntityPMP = true;
} }
} }
//For MultiCompany Stocks Sharings stock_reel includes only stocks shared with this entity //For MultiCompany Stocks Sharings stock_reel includes only stocks shared with this entity
$separatedStock = false; $separatedStock = false;
if (!empty($conf->global->MULTICOMPANY_STOCK_SHARING_ENABLED)){ if (!empty($conf->global->MULTICOMPANY_STOCK_SHARING_ENABLED)) {
global $mc; global $mc;
$separatedStock = true; $separatedStock = true;
$visibleWarehousesEntities = $conf->entity; $visibleWarehousesEntities = $conf->entity;
if(isset($mc->sharings['stock']) && !empty($mc->sharings['stock'])){ if (isset($mc->sharings['stock']) && !empty($mc->sharings['stock'])) {
$visibleWarehousesEntities .= "," . implode(",",$mc->sharings['stock']); $visibleWarehousesEntities .= "," . implode( ",", $mc->sharings['stock'] );
} }
} }
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";
@ -2218,15 +2216,12 @@ class Product extends CommonObject
if (!empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) { 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); $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_perentity as pa ON pa.fk_product = p.rowid AND pa.entity = " . ((int) $conf->entity);
} }
if ($separatedEntityPMP) { if ($separatedEntityPMP) {
$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "entity_product_pmp as ppe ON ppe.fk_product = p.rowid"; $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"; $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_stock as sp ON sp.fk_product = p.rowid";
} }
if ($id) { if ($id) {
$sql .= " WHERE p.rowid = ".((int) $id); $sql .= " WHERE p.rowid = ".((int) $id);
} else { } else {
@ -2239,12 +2234,10 @@ class Product extends CommonObject
$sql .= " AND p.barcode = '".$this->db->escape($barcode)."'"; $sql .= " AND p.barcode = '".$this->db->escape($barcode)."'";
} }
} }
if ($separatedEntityPMP) { if ($separatedEntityPMP) {
$sql .= " AND ppe.entity = " . (int) $conf->entity; $sql .= " AND ppe.entity = " . (int) $conf->entity;
} }
if ($separatedStock) {
if($separatedStock){
$sql .= " AND sp.fk_entrepot IN ( $sql .= " AND sp.fk_entrepot IN (
SELECT rowid SELECT rowid
FROM ".MAIN_DB_PREFIX."entrepot WHERE entity IN (" . $visibleWarehousesEntities ."))"; FROM ".MAIN_DB_PREFIX."entrepot WHERE entity IN (" . $visibleWarehousesEntities ."))";

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

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

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

@ -622,8 +622,8 @@ 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";
@ -632,16 +632,12 @@ class Entrepot extends CommonObject
if ($separatedPMP) { if ($separatedPMP) {
$sql .= ", ".MAIN_DB_PREFIX."entity_product_pmp as ppe"; $sql .= ", ".MAIN_DB_PREFIX."entity_product_pmp as ppe";
} }
$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);
if ($result) { if ($result) {