|
@@ -133,7 +133,7 @@ if ($id > 0 || !empty($ref)) {
|
|
|
|
|
|
|
|
|
//Qauntity to produce
|
|
|
- $sql = "SELECT b.rowid as rowid, b.ref, b.status, b.date_valid,";
|
|
|
+ $sql = "SELECT b.rowid as rowid, b.ref, b.status, b.date_valid, b.fk_product,";
|
|
|
$sql .= " b.qty as qty_toproduce";
|
|
|
$sql .= " FROM ".MAIN_DB_PREFIX."bom_bom as b";
|
|
|
$sql .= " WHERE ";
|
|
@@ -166,6 +166,7 @@ if ($id > 0 || !empty($ref)) {
|
|
|
$objp = $db->fetch_object($result);
|
|
|
$bomtmp->id = $objp->rowid;
|
|
|
$bomtmp->ref = $objp->ref;
|
|
|
+ $bomtmp->fk_product = $objp->fk_product;
|
|
|
$bom_data_result[$objp->rowid]['link'] = $bomtmp->getNomUrl(1, 'production');
|
|
|
$bom_data_result[$objp->rowid]['qty_toproduce'] += ($objp->qty_toproduce > 0 ? $objp->qty_toproduce : 0);
|
|
|
$bom_data_result[$objp->rowid]['qty_toconsume'] = 0;
|
|
@@ -180,7 +181,7 @@ if ($id > 0 || !empty($ref)) {
|
|
|
$db->free($result);
|
|
|
|
|
|
//Qauntity to consume
|
|
|
- $sql = "SELECT b.rowid as rowid, b.ref, b.status, b.date_valid,";
|
|
|
+ $sql = "SELECT b.rowid as rowid, b.ref, b.status, b.date_valid, b.fk_product,";
|
|
|
$sql .= " SUM(bl.qty) as qty_toconsume";
|
|
|
$sql .= " FROM ".MAIN_DB_PREFIX."bom_bom as b";
|
|
|
$sql .= " INNER JOIN ".MAIN_DB_PREFIX."bom_bomline as bl ON bl.fk_bom=b.rowid";
|
|
@@ -214,6 +215,7 @@ if ($id > 0 || !empty($ref)) {
|
|
|
$objp = $db->fetch_object($result);
|
|
|
$bomtmp->id = $objp->rowid;
|
|
|
$bomtmp->ref = $objp->ref;
|
|
|
+ $bomtmp->fk_product = $objp->fk_product;
|
|
|
|
|
|
if (!array_key_exists($objp->rowid, $bom_data_result)) {
|
|
|
$bom_data_result[$objp->rowid]['link'] = $bomtmp->getNomUrl(1, 'production');
|