From a0fb0b8741a408c4249fe26629a8fdf6738ce892 Mon Sep 17 00:00:00 2001 From: Florian HENRY Date: Thu, 6 Jan 2022 21:48:12 +0100 Subject: [PATCH 1/4] NEW: add ref product into BOM tooltips --- htdocs/bom/class/bom.class.php | 10 ++++++++++ htdocs/product/stats/bom.php | 6 ++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/htdocs/bom/class/bom.class.php b/htdocs/bom/class/bom.class.php index fd8d4a19a75..ecec1a56709 100644 --- a/htdocs/bom/class/bom.class.php +++ b/htdocs/bom/class/bom.class.php @@ -789,6 +789,16 @@ class BOM extends CommonObject if (isset($this->label)) { $label .= '
'.$langs->trans('Label').': '.$this->label; } + if (!empty($this->fk_product)) { + $product = new Product($db); + $resultFetch = $product->fetch($this->fk_product); + if ($resultFetch < 0) { + setEventMessages($product->error, $product->errors, 'errors'); + } else { + $label .= "
".$langs->trans("Product").': '.$product->getNomUrl(0,'',0,-1,1); + } + } + $url = DOL_URL_ROOT.'/bom/bom_card.php?id='.$this->id; diff --git a/htdocs/product/stats/bom.php b/htdocs/product/stats/bom.php index ef4923e89be..5e4829083f3 100644 --- a/htdocs/product/stats/bom.php +++ b/htdocs/product/stats/bom.php @@ -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'); From f71092e05cd3373c8deae6b7b62af712e04912ab Mon Sep 17 00:00:00 2001 From: stickler-ci Date: Thu, 6 Jan 2022 20:56:51 +0000 Subject: [PATCH 2/4] Fixing style errors. --- htdocs/bom/class/bom.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/bom/class/bom.class.php b/htdocs/bom/class/bom.class.php index ecec1a56709..6b53e3e3405 100644 --- a/htdocs/bom/class/bom.class.php +++ b/htdocs/bom/class/bom.class.php @@ -795,7 +795,7 @@ class BOM extends CommonObject if ($resultFetch < 0) { setEventMessages($product->error, $product->errors, 'errors'); } else { - $label .= "
".$langs->trans("Product").': '.$product->getNomUrl(0,'',0,-1,1); + $label .= "
".$langs->trans("Product").': '.$product->getNomUrl(0, '', 0, -1, 1); } } From 59b1feaf2eae9424d52510bfcd88c094866757f4 Mon Sep 17 00:00:00 2001 From: Florian HENRY Date: Fri, 7 Jan 2022 08:27:49 +0100 Subject: [PATCH 3/4] fix include --- htdocs/bom/class/bom.class.php | 1 + htdocs/mrp/index.php | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/htdocs/bom/class/bom.class.php b/htdocs/bom/class/bom.class.php index ecec1a56709..2dcaa0c0c6b 100644 --- a/htdocs/bom/class/bom.class.php +++ b/htdocs/bom/class/bom.class.php @@ -790,6 +790,7 @@ class BOM extends CommonObject $label .= '
'.$langs->trans('Label').': '.$this->label; } if (!empty($this->fk_product)) { + dol_include_once('/product/class/product.class.php'); $product = new Product($db); $resultFetch = $product->fetch($this->fk_product); if ($resultFetch < 0) { diff --git a/htdocs/mrp/index.php b/htdocs/mrp/index.php index c4480f76ed0..d9ee0e39cc6 100644 --- a/htdocs/mrp/index.php +++ b/htdocs/mrp/index.php @@ -155,7 +155,7 @@ print '
'; $max = 5; -$sql = "SELECT a.rowid, a.status, a.ref, a.tms as datem, a.status"; +$sql = "SELECT a.rowid, a.status, a.ref, a.tms as datem, a.status, a.fk_product"; $sql .= " FROM ".MAIN_DB_PREFIX."bom_bom as a"; $sql .= " WHERE a.entity IN (".getEntity('bom').")"; $sql .= $db->order("a.tms", "DESC"); @@ -176,6 +176,7 @@ if ($resql) { $staticbom->id = $obj->rowid; $staticbom->ref = $obj->ref; + $staticbom->fk_product = $obj->fk_product; $staticbom->date_modification = $obj->datem; $staticbom->status = $obj->status; From c334c3cd58b2322a1da24e854948697610c7e06f Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 10 Jan 2022 20:58:08 +0100 Subject: [PATCH 4/4] Update bom.class.php --- htdocs/bom/class/bom.class.php | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/htdocs/bom/class/bom.class.php b/htdocs/bom/class/bom.class.php index bd411654a04..3855af82083 100644 --- a/htdocs/bom/class/bom.class.php +++ b/htdocs/bom/class/bom.class.php @@ -789,14 +789,12 @@ class BOM extends CommonObject if (isset($this->label)) { $label .= '
'.$langs->trans('Label').': '.$this->label; } - if (!empty($this->fk_product)) { - dol_include_once('/product/class/product.class.php'); + if (!empty($this->fk_product) && $this->fk_product > 0) { + include_once DOL_DOCUMENT_ROO.'/product/class/product.class.php'; $product = new Product($db); $resultFetch = $product->fetch($this->fk_product); - if ($resultFetch < 0) { - setEventMessages($product->error, $product->errors, 'errors'); - } else { - $label .= "
".$langs->trans("Product").': '.$product->getNomUrl(0, '', 0, -1, 1); + if ($resultFetch > 0) { + $label .= "
".$langs->trans("Product").': '.$product->label; } }