Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-06 01:28:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix CommandeFournisseur::getDispachedLines line ID & return quantity

Browse Source
This commit is contained in:
François J
2018-04-04 12:32:49 +02:00
parent 2d3a55a6a8
commit 9b61272bb7
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
htdocs/fourn/class/fournisseur.commande.class.php
View File

@@ -1959,7 +1959,7 @@ class CommandeFournisseur extends CommonOrder
// List of already dispatched lines // List of already dispatched lines
$sql = "SELECT p.ref, p.label,"; $sql = "SELECT p.ref, p.label,";
$sql.= " e.rowid as warehouse_id, e.ref as entrepot,"; $sql.= " e.rowid as warehouse_id, e.ref as entrepot,";
$sql.= " cfd.rowid as dispatchlineid, cfd.fk_product, cfd.qty, cfd.eatby, cfd.sellby, cfd.batch, cfd.comment, cfd.status"; $sql.= " cfd.rowid as dispatchedlineid, cfd.fk_product, cfd.qty, cfd.eatby, cfd.sellby, cfd.batch, cfd.comment, cfd.status";
$sql.= " FROM ".MAIN_DB_PREFIX."product as p,"; $sql.= " FROM ".MAIN_DB_PREFIX."product as p,";
$sql.= " ".MAIN_DB_PREFIX."commande_fournisseur_dispatch as cfd"; $sql.= " ".MAIN_DB_PREFIX."commande_fournisseur_dispatch as cfd";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."entrepot as e ON cfd.fk_entrepot = e.rowid"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."entrepot as e ON cfd.fk_entrepot = e.rowid";
@@ -1977,7 +1977,15 @@ class CommandeFournisseur extends CommonOrder
while ($i < $num) while ($i < $num)
{ {
$objp = $this->db->fetch_object($resql); $objp = $this->db->fetch_object($resql);
if ($objp) $ret[]=array('id'=>$objp->dispatchedlineid, 'productid'=>$objp->fk_product, 'warehouseid'=>$objp->warehouse_id); if ($objp)
{
$ret[] = array(
'id' => $objp->dispatchedlineid,
'productid' => $objp->fk_product,
'warehouseid' => $objp->warehouse_id,
'qty' => $objp->qty,
);
}
$i++; $i++;
} }