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

Revert "doc"

Browse Source 
This reverts commit 380cae761a.
This commit is contained in:
Laurent Destailleur 2022-06-25 04:06:55 +02:00
parent 380cae761a
commit eeaa4f8205
3 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/expedition/card.php
View File

@ -2155,7 +2155,7 @@ elseif ($id || $ref)
//if ($filter) $sql.= $filter; //if ($filter) $sql.= $filter;
$sql .= " ORDER BY obj.fk_product"; $sql .= " ORDER BY obj.fk_product";
dol_syslog("expedition/card.php get list of shipment lines", LOG_DEBUG); dol_syslog("get list of shipment lines", LOG_DEBUG);
$resql = $db->query($sql); $resql = $db->query($sql);
if ($resql) if ($resql)
{ {

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

@ -801,12 +801,6 @@ class Expedition extends CommonObject
} }
} }
} }
// If stock is now 0, we can remove entry into llx_product_stock, but only if there is no child lines into llx_product_batch (detail of batch, because we can imagine
// having a lot1/qty=X and lot2/qty=-X, so 0 but we must not loose repartition of different lot.
$sql = "DELETE FROM ".MAIN_DB_PREFIX."product_stock WHERE reel = 0 AND rowid NOT IN (SELECT fk_product_stock FROM ".MAIN_DB_PREFIX."product_batch as pb)";
$resql = $this->db->query($sql);
// We do not test error, it can fails if there is child in batch details
} }
else else
{ {

12
htdocs/product/stock/class/mouvementstock.class.php
View File

@ -571,13 +571,11 @@ class MouvementStock extends CommonObject
} }
} }
if (empty($donotcleanemptyline)) { // If stock is now 0, we can remove entry into llx_product_stock, but only if there is no child lines into llx_product_batch (detail of batch, because we can imagine
// If stock is now 0, we can remove entry into llx_product_stock, but only if there is no child lines into llx_product_batch (detail of batch, because we can imagine // having a lot1/qty=X and lot2/qty=-X, so 0 but we must not loose repartition of different lot.
// having a lot1/qty=X and lot2/qty=-X, so 0 but we must not loose repartition of different lot. $sql = "DELETE FROM ".MAIN_DB_PREFIX."product_stock WHERE reel = 0 AND rowid NOT IN (SELECT fk_product_stock FROM ".MAIN_DB_PREFIX."product_batch as pb)";
$sql = "DELETE FROM ".MAIN_DB_PREFIX."product_stock WHERE reel = 0 AND rowid NOT IN (SELECT fk_product_stock FROM ".MAIN_DB_PREFIX."product_batch as pb)"; $resql = $this->db->query($sql);
$resql = $this->db->query($sql); // We do not test error, it can fails if there is child in batch details
// We do not test error, it can fails if there is child in batch details
}
} }
// Add movement for sub products (recursive call) // Add movement for sub products (recursive call)