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

fix for travis and sticker

Browse Source
This commit is contained in:
Christophe Battarel 2021-03-04 17:47:43 +01:00
parent 83350cde8f
commit 1d2372b9ef
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1219,7 +1219,9 @@ class MouvementStock extends CommonObject
/** /**
* Retrieve number of equipments for a product batch * Retrieve number of equipments for a product batch
* *
* @return int <0 if KO, number of equipments if OK * @param int $fk_product Product id
* @param varchar $batch batch number
* @return int <0 if KO, number of equipments if OK
*/ */
private function getBatchCount($fk_product, $batch) private function getBatchCount($fk_product, $batch)
{ {
@ -1231,7 +1233,7 @@ class MouvementStock extends CommonObject
$sql .= " FROM ".MAIN_DB_PREFIX."product_batch as pb"; $sql .= " FROM ".MAIN_DB_PREFIX."product_batch as pb";
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_stock as ps ON ps.rowid = pb.fk_product_stock"; $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_stock as ps ON ps.rowid = pb.fk_product_stock";
$sql .= " WHERE ps.fk_product = " . $fk_product; $sql .= " WHERE ps.fk_product = " . $fk_product;
$sql .= " AND pb.batch = '" . $batch . "'"; $sql .= " AND pb.batch = '" . $this->db->escape($batch) . "'";
$result = $this->db->query($sql); $result = $this->db->query($sql);
if ($result) { if ($result) {
@ -1241,12 +1243,11 @@ class MouvementStock extends CommonObject
$cpt = $obj->cpt; $cpt = $obj->cpt;
} }
$this->db->free($result); $this->db->free($result);
} }
else else {
{
dol_print_error($this->db); dol_print_error($this->db);
return -1; return -1;
} }