From b1cd6c5ecf3c745e4953f312decc9602ba5f3f87 Mon Sep 17 00:00:00 2001
From: Francis Appels <francis.appels@yahoo.com>
Date: Tue, 26 Jan 2021 16:18:50 +0100
Subject: [PATCH 01/12] mo line is line so no fetchLines

---
 htdocs/mrp/class/mo.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/mrp/class/mo.class.php b/htdocs/mrp/class/mo.class.php
index 274782a14ea..1d04852efea 100644
--- a/htdocs/mrp/class/mo.class.php
+++ b/htdocs/mrp/class/mo.class.php
@@ -1487,7 +1487,7 @@ class MoLine extends CommonObjectLine
 	public function fetch($id, $ref = null)
 	{
 		$result = $this->fetchCommon($id, $ref);
-		if ($result > 0 && !empty($this->table_element_line)) $this->fetchLines();
+
 		return $result;
 	}
 

From 060ddff88389a8ecfa2264afb47cb5383fe7e009 Mon Sep 17 00:00:00 2001
From: Francis Appels <francis.appels@yahoo.com>
Date: Sat, 30 Jan 2021 17:27:16 +0100
Subject: [PATCH 02/12] Add missing pmp valorisation to MO production. (Issue
 #16072)

---
 htdocs/mrp/mo_movements.php  |  6 ++-
 htdocs/mrp/mo_production.php | 76 +++++++++++++++++++++++++++++++-----
 2 files changed, 72 insertions(+), 10 deletions(-)

diff --git a/htdocs/mrp/mo_movements.php b/htdocs/mrp/mo_movements.php
index b4dbed059bc..8a54a8b0cbd 100644
--- a/htdocs/mrp/mo_movements.php
+++ b/htdocs/mrp/mo_movements.php
@@ -119,7 +119,7 @@ $arrayfields = array(
 	'm.type_mouvement'=>array('label'=>$langs->trans("TypeMovement"), 'checked'=>1, 'position'=>48),
 	'origin'=>array('label'=>$langs->trans("Origin"), 'enabled'=>0, 'checked'=>0, 'position'=>50),
 	'm.value'=>array('label'=>$langs->trans("Qty"), 'checked'=>1, 'position'=>60),
-	'm.price'=>array('label'=>$langs->trans("UnitPurchaseValue"), 'enabled'=>0, 'checked'=>0, 'position'=>62),
+	'm.price'=>array('label'=>$langs->trans("UnitCost"), 'enabled'=>0, 'checked'=>0, 'position'=>62),
 	//'m.datec'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500),
 	//'m.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500)
 );
@@ -139,7 +139,11 @@ $permissiontodelete = $user->rights->mrp->delete || ($permissiontoadd && isset($
 $upload_dir = $conf->mrp->multidir_output[isset($object->entity) ? $object->entity : 1];
 
 $permissiontoproduce = $permissiontoadd;
+$permissiontoupdatecost = $user->rights->bom->write; // User who can define cost must have knowledge of pricing
 
+if ($permissiontoupdatecost) {
+	$arrayfields['m.price']['enabled'] = 1;
+}
 
 /*
  * Actions
diff --git a/htdocs/mrp/mo_production.php b/htdocs/mrp/mo_production.php
index c1b6fa64ec8..eb40b1d6f8b 100644
--- a/htdocs/mrp/mo_production.php
+++ b/htdocs/mrp/mo_production.php
@@ -34,6 +34,7 @@ require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/stock/class/productlot.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
 dol_include_once('/mrp/class/mo.class.php');
+dol_include_once('/bom/class/bom.class.php');
 dol_include_once('/mrp/lib/mrp_mo.lib.php');
 
 // Load translation files required by the page
@@ -88,6 +89,7 @@ $permissiontodelete = $user->rights->mrp->delete || ($permissiontoadd && isset($
 $upload_dir = $conf->mrp->multidir_output[isset($object->entity) ? $object->entity : 1];
 
 $permissiontoproduce = $permissiontoadd;
+$permissiontoupdatecost = $user->rights->bom->write; // User who can define cost must have knowledge of pricing
 
 
 /*
@@ -149,7 +151,7 @@ if (empty($reshook))
 		$moline->fk_mo = $object->id;
 		$moline->qty = GETPOST('qtytoadd', 'int'); ;
 		$moline->fk_product = GETPOST('productidtoadd', 'int');
-		$moline->role = 'toconsume';
+		$moline->role = 'toconsumef'; // free consume line
 		$moline->position = 0;
 
 		$resultline = $moline->create($user, false); // Never use triggers here
@@ -168,10 +170,10 @@ if (empty($reshook))
 		$codemovement  = GETPOST('inventorycode', 'alphanohtml');
 
 		$db->begin();
-
+		$pos = 0;
 		// Process line to consume
 		foreach ($object->lines as $line) {
-			if ($line->role == 'toconsume') {
+			if (preg_match('/toconsume/', $line->role)) {
 				$tmpproduct = new Product($db);
 				$tmpproduct->fetch($line->fk_product);
 
@@ -207,7 +209,6 @@ if (empty($reshook))
 						}
 
 						if (!$error) {
-							$pos = 0;
 							// Record consumption
 							$moline = new MoLine($db);
 							$moline->fk_mo = $object->id;
@@ -237,6 +238,7 @@ if (empty($reshook))
 		}
 
 		// Process line to produce
+		$pos = 0;
 		foreach ($object->lines as $line) {
 			if ($line->role == 'toproduce') {
 				$tmpproduct = new Product($db);
@@ -245,6 +247,7 @@ if (empty($reshook))
 				$i = 1;
 				while (GETPOSTISSET('qtytoproduce-'.$line->id.'-'.$i)) {
 					$qtytoprocess = price2num(GETPOST('qtytoproduce-'.$line->id.'-'.$i));
+					$pricetoprocess = GETPOST('pricetoproduce-'.$line->id.'-'.$i) ? price2num(GETPOST('pricetoproduce-'.$line->id.'-'.$i)) : 0;
 
 					if ($qtytoprocess != 0) {
 						// Check warehouse is set if we should have to
@@ -266,7 +269,7 @@ if (empty($reshook))
 							// Record stock movement
 							$id_product_batch = 0;
 							$stockmove->origin = $object;
-							$idstockmove = $stockmove->reception($user, $line->fk_product, GETPOST('idwarehousetoproduce-'.$line->id.'-'.$i), $qtytoprocess, 0, $labelmovement, '', '', GETPOST('batchtoproduce-'.$line->id.'-'.$i), dol_now(), $id_product_batch, $codemovement);
+							$idstockmove = $stockmove->reception($user, $line->fk_product, GETPOST('idwarehousetoproduce-'.$line->id.'-'.$i), $qtytoprocess, $pricetoprocess, $labelmovement, '', '', GETPOST('batchtoproduce-'.$line->id.'-'.$i), dol_now(), $id_product_batch, $codemovement);
 							if ($idstockmove < 0) {
 								$error++;
 								setEventMessages($stockmove->error, $stockmove->errors, 'errors');
@@ -274,7 +277,6 @@ if (empty($reshook))
 						}
 
 						if (!$error) {
-							$pos = 0;
 							// Record production
 							$moline = new MoLine($db);
 							$moline->fk_mo = $object->id;
@@ -309,7 +311,7 @@ if (empty($reshook))
 
 			if (GETPOST('autoclose', 'int')) {
 				foreach ($object->lines as $line) {
-					if ($line->role == 'toconsume') {
+					if (preg_match('/toconsume/', $line->role)) {
 						$arrayoflines = $object->fetchLinesLinked('consumed', $line->id);
 						$alreadyconsumed = 0;
 						foreach ($arrayoflines as $line2) {
@@ -677,12 +679,23 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		// Show object lines
 		$object->fetchLines();
 
+		$bomcost = 0;
+		if ($object->fk_bom > 0) {
+			$bom = new Bom($db);
+			$res = $bom->fetch($object->fk_bom);
+			if ($res > 0) {
+				$bomcost = $bom->unit_cost;
+			}
+		}
+
+		// consumtion
+
 		print '<div class="fichecenter">';
 		print '<div class="fichehalfleft">';
 		print '<div class="clearboth"></div>';
 
 		$newlinetext = '';
-		if ($action != 'consumeorproduce' && $action != 'consumeandproduceall') {
+		if (($object->status == $object::STATUS_DRAFT || $object->status == $object::STATUS_VALIDATED) && $action != 'consumeorproduce' && $action != 'consumeandproduceall') {
 			$newlinetext = '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=addconsumeline">'.$langs->trans("AddNewConsumeLines").'</a>';
 		}
 		print load_fiche_titre($langs->trans('Consumption'), '', '', 0, '', '', $newlinetext);
@@ -693,6 +706,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		print '<tr class="liste_titre">';
 		print '<td>'.$langs->trans("Product").'</td>';
 		print '<td class="right">'.$langs->trans("Qty").'</td>';
+		if ($permissiontoupdatecost) print '<td class="right">'.$langs->trans("PMPValue").'</td>';
 		print '<td class="right">'.$langs->trans("QtyAlreadyConsumed").'</td>';
 		print '<td>';
 		if ($collapse || in_array($action, array('consumeorproduce', 'consumeandproduceall'))) print $langs->trans("Warehouse");
@@ -711,6 +725,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			print $form->select_produits('', 'productidtoadd', '', 0, 0, -1, 2, '', 0, array(), 0, '1', 0, 'maxwidth300');
 			print '</td>';
 			print '<td class="right"><input type="text" name="qtytoadd" value="1" class="width50 right"></td>';
+			if ($permissiontoupdatecost) print '<td></td>';
 			print '<td class="right"></td>';
 			print '<td>';
 			print '<input type="submit" class="button buttongen" name="addconsumelinebutton" value="'.$langs->trans("Add").'">';
@@ -734,12 +749,25 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 			$nblinetoconsumecursor = 0;
 			foreach ($object->lines as $line) {
-				if ($line->role == 'toconsume') {
+				if (preg_match('/toconsume/', $line->role)) {
 					$nblinetoconsumecursor++;
 
 					$tmpproduct = new Product($db);
 					$tmpproduct->fetch($line->fk_product);
 
+					if (!empty($bomcost) && $line->role == 'toconsumef' && $object->qty > 0) {
+						// add free consume line cost to bomcost
+						require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
+						$productFournisseur = new ProductFournisseur($db);
+						$linecost = price2num((!empty($tmpproduct->cost_price)) ? $tmpproduct->cost_price : $tmpproduct->pmp);
+						if (empty($linecost)) {
+							if ($productFournisseur->find_min_price_product_fournisseur($line->fk_product) > 0){
+								$linecost = $productFournisseur->fourn_unitprice;
+							}
+						}
+						$bomcost += price2num(($line->qty * $linecost) / $object->qty, 'MT');
+					}
+
 					$arrayoflines = $object->fetchLinesLinked('consumed', $line->id);
 					$alreadyconsumed = 0;
 					foreach ($arrayoflines as $line2) {
@@ -760,6 +788,11 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 						print $line->qty;
 					}
 					print '</td>';
+					if ($permissiontoupdatecost) {
+						print '<td class="right nowraponall">';
+						print price($tmpproduct->pmp);
+						print '</td>';
+					}
 					print '<td class="right">';
 					if ($alreadyconsumed) {
 						print '<script>';
@@ -799,6 +832,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 						print '</td>';
 						print '<td></td>';
 						print '<td class="right">'.$line2['qty'].'</td>';
+						if ($permissiontoupdatecost) print '<td></td>';
 						print '<td class="tdoverflowmax150">';
 						if ($line2['fk_warehouse'] > 0) {
 							$result = $tmpwarehouse->fetch($line2['fk_warehouse']);
@@ -823,6 +857,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 						$preselected = (GETPOSTISSET('qty-'.$line->id.'-'.$i) ? GETPOST('qty-'.$line->id.'-'.$i) : max(0, $line->qty - $alreadyconsumed));
 						if ($action == 'consumeorproduce' && !GETPOSTISSET('qty-'.$line->id.'-'.$i)) $preselected = 0;
 						print '<td class="right"><input type="text" class="width50 right" name="qty-'.$line->id.'-'.$i.'" value="'.$preselected.'"></td>';
+						if ($permissiontoupdatecost) print '<td></td>';
 						print '<td></td>';
 						print '<td>';
 						if ($tmpproduct->type == Product::TYPE_PRODUCT || !empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
@@ -868,6 +903,13 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		print '<tr class="liste_titre">';
 		print '<td>'.$langs->trans("Product").'</td>';
 		print '<td class="right">'.$langs->trans("Qty").'</td>';
+		if ($permissiontoupdatecost) {
+			if (empty($bomcost)) {
+				print '<td class="right">'.$langs->trans("PMPValue").'</td>';
+			} else {
+				print '<td class="right">'.$langs->trans("UnitCost").'</td>';
+			}
+		}
 		print '<td class="right">'.$langs->trans("QtyAlreadyProduced").'</td>';
 		print '<td>';
 		if ($collapse || in_array($action, array('consumeorproduce', 'consumeandproduceall'))) print $langs->trans("Warehouse");
@@ -899,6 +941,10 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 					$tmpproduct = new Product($db);
 					$tmpproduct->fetch($line->fk_product);
 
+					if (empty($bomcost)) {
+						$bomcost = $tmpproduct->pmp;
+					}
+
 					$arrayoflines = $object->fetchLinesLinked('produced', $line->id);
 					$alreadyproduced = 0;
 					foreach ($arrayoflines as $line2) {
@@ -916,6 +962,11 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 					print '<br><span class="opacitymedium small">'.$tmpproduct->label.'</span>';
 					print '</td>';
 					print '<td class="right">'.$line->qty.'</td>';
+					if ($permissiontoupdatecost) {
+						print '<td class="right nowraponall">';
+						print price($bomcost);
+						print '</td>';
+					}
 					print '<td class="right nowraponall">';
 					if ($alreadyproduced) {
 						print '<script>';
@@ -952,6 +1003,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 						print '</td>';
 						print '<td></td>';
 						print '<td class="right">'.$line2['qty'].'</td>';
+						if ($permissiontoupdatecost) print '<td></td>';
 						print '<td class="tdoverflowmax150">';
 						if ($line2['fk_warehouse'] > 0) {
 							$result = $tmpwarehouse->fetch($line2['fk_warehouse']);
@@ -977,6 +1029,12 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 						$preselected = (GETPOSTISSET('qtytoproduce-'.$line->id.'-'.$i) ? GETPOST('qtytoproduce-'.$line->id.'-'.$i) : max(0, $line->qty - $alreadyproduced));
 						if ($action == 'consumeorproduce' && !GETPOSTISSET('qtytoproduce-'.$line->id.'-'.$i)) $preselected = 0;
 						print '<td class="right"><input type="text" class="width50 right" id="qtytoproduce-'.$line->id.'-'.$i.'" name="qtytoproduce-'.$line->id.'-'.$i.'" value="'.$preselected.'"></td>';
+						if ($permissiontoupdatecost) {
+							$preselected = (GETPOSTISSET('pricetoproduce-'.$line->id.'-'.$i) ? GETPOST('pricetoproduce-'.$line->id.'-'.$i) : price($bomcost));
+							print '<td class="right"><input type="text" class="width50 right" name="pricetoproduce-'.$line->id.'-'.$i.'" value="'.$preselected.'"></td>';
+						} else {
+							print '<input type="hidden" class="width50 right" name="pricetoproduce-'.$line->id.'-'.$i.'" value="'.$bomcost.'"></td>';
+						}
 						print '<td></td>';
 						print '<td>';
 						if ($tmpproduct->type == Product::TYPE_PRODUCT || !empty($conf->global->STOCK_SUPPORTS_SERVICES)) {

From bf305d7083030c33faf76e2d0a995778781bf691 Mon Sep 17 00:00:00 2001
From: Francis Appels <francis.appels@yahoo.com>
Date: Sat, 30 Jan 2021 17:28:21 +0100
Subject: [PATCH 03/12] create MO, Column 'tms' cannot be null

---
 htdocs/mrp/class/mo.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/mrp/class/mo.class.php b/htdocs/mrp/class/mo.class.php
index 1d04852efea..383fd45c095 100644
--- a/htdocs/mrp/class/mo.class.php
+++ b/htdocs/mrp/class/mo.class.php
@@ -106,7 +106,7 @@ class Mo extends CommonObject
 		'note_public' => array('type'=>'html', 'label'=>'NotePublic', 'enabled'=>1, 'visible'=>0, 'position'=>61, 'notnull'=>-1,),
 		'note_private' => array('type'=>'html', 'label'=>'NotePrivate', 'enabled'=>1, 'visible'=>0, 'position'=>62, 'notnull'=>-1,),
 		'date_creation' => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-2, 'position'=>500, 'notnull'=>1,),
-		'tms' => array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-2, 'position'=>501, 'notnull'=>-1,),
+		'tms' => array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-2, 'position'=>501, 'notnull'=>1,),
 		'date_valid' => array('type'=>'datetime', 'label'=>'DateValidation', 'enabled'=>1, 'visible'=>-2, 'position'=>502,),
 		'fk_user_creat' => array('type'=>'integer', 'label'=>'UserAuthor', 'enabled'=>1, 'visible'=>-2, 'position'=>510, 'notnull'=>1, 'foreignkey'=>'user.rowid',),
 		'fk_user_modif' => array('type'=>'integer', 'label'=>'UserModif', 'enabled'=>1, 'visible'=>-2, 'position'=>511, 'notnull'=>-1,),

From 45970ac443713915bdc8ac88626fb6bd4fccf0ba Mon Sep 17 00:00:00 2001
From: Francis Appels <francis.appels@yahoo.com>
Date: Tue, 2 Feb 2021 11:13:14 +0100
Subject: [PATCH 04/12] Update database with new fields

---
 htdocs/install/mysql/migration/13.0.0-14.0.0.sql   | 3 +++
 htdocs/install/mysql/tables/llx_mrp_production.sql | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
index bfdecd334b7..6a1a3d46cc3 100644
--- a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
+++ b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
@@ -122,3 +122,6 @@ ALTER TABLE llx_societe ADD INDEX idx_societe_warehouse(fk_warehouse);
 ALTER TABLE llx_socpeople MODIFY poste varchar(255);
 
 ALTER TABLE llx_chargesociales ADD COLUMN fk_user integer DEFAULT NULL;
+
+ALTER TABLE llx_mrp_production ADD COLUMN origin_id integer AFTER fk_mo;
+ALTER TABLE llx_mrp_production ADD COLUMN origin_type varchar(10) AFTER origin_id;
\ No newline at end of file
diff --git a/htdocs/install/mysql/tables/llx_mrp_production.sql b/htdocs/install/mysql/tables/llx_mrp_production.sql
index bd0cd722f1a..b977d59ba55 100644
--- a/htdocs/install/mysql/tables/llx_mrp_production.sql
+++ b/htdocs/install/mysql/tables/llx_mrp_production.sql
@@ -17,6 +17,8 @@
 CREATE TABLE llx_mrp_production(
 	rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL, 
 	fk_mo integer NOT NULL, 
+	origin_id integer, 
+	origin_type varchar(10),		-- 'bom' bom production line or 'free' free production line added after Mo creation from bom
 	position integer NOT NULL DEFAULT 0,
 	fk_product integer NOT NULL, 
 	fk_warehouse integer,
@@ -24,7 +26,7 @@ CREATE TABLE llx_mrp_production(
 	qty_frozen smallint DEFAULT 0,
     disable_stock_change smallint DEFAULT 0,
 	batch varchar(128),
-	role varchar(10),      			-- 'toconsume' or 'toproduce' (initialized at MO creation), 'consumed' or 'produced' (added after MO validation)
+	role varchar(10),				-- 'toconsume' or 'toproduce' (initialized at MO creation), 'consumed' or 'produced' (added after MO validation)
 	fk_mrp_production integer,		-- if role = 'consumed', id of line with role 'toconsume', if role = 'produced' id of line with role 'toproduce'
 	fk_stock_movement integer,		-- id of stock movement when movements are validated
 	date_creation datetime NOT NULL, 

From 731ca02789fbdb611c880fefecca1fc1275946bd Mon Sep 17 00:00:00 2001
From: Francis Appels <francis.appels@yahoo.com>
Date: Tue, 2 Feb 2021 11:19:58 +0100
Subject: [PATCH 05/12] Use new origin field to mark free lines. Allow add free
 line when production started

---
 htdocs/mrp/class/mo.class.php |  6 ++++++
 htdocs/mrp/mo_production.php  | 13 +++++++------
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/htdocs/mrp/class/mo.class.php b/htdocs/mrp/class/mo.class.php
index 383fd45c095..5fa2ee90a9f 100644
--- a/htdocs/mrp/class/mo.class.php
+++ b/htdocs/mrp/class/mo.class.php
@@ -655,6 +655,8 @@ class Mo extends CommonObject
 							$moline = new MoLine($this->db);
 
 							$moline->fk_mo = $this->id;
+							$moline->origin_id = $line->id;
+							$moline->origin_type = 'bom';
 							if ($line->qty_frozen) {
 								$moline->qty = $line->qty; // Qty to consume does not depends on quantity to produce
 							} else {
@@ -1386,6 +1388,8 @@ class MoLine extends CommonObjectLine
 	public $fields = array(
 		'rowid' =>array('type'=>'integer', 'label'=>'ID', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>10),
 		'fk_mo' =>array('type'=>'integer', 'label'=>'Mo', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>15),
+		'origin_id' =>array('type'=>'integer', 'label'=>'Origin', 'enabled'=>1, 'visible'=>-1, 'notnull'=>0, 'position'=>17),
+		'origin_type' =>array('type'=>'varchar(10)', 'label'=>'Origin type', 'enabled'=>1, 'visible'=>-1, 'notnull'=>0, 'position'=>18),
 		'position' =>array('type'=>'integer', 'label'=>'Position', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>20),
 		'fk_product' =>array('type'=>'integer', 'label'=>'Product', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>25),
 		'fk_warehouse' =>array('type'=>'integer', 'label'=>'Warehouse', 'enabled'=>1, 'visible'=>-1, 'position'=>30),
@@ -1405,6 +1409,8 @@ class MoLine extends CommonObjectLine
 
 	public $rowid;
 	public $fk_mo;
+	public $origin_id;
+	public $origin_type;
 	public $position;
 	public $fk_product;
 	public $fk_warehouse;
diff --git a/htdocs/mrp/mo_production.php b/htdocs/mrp/mo_production.php
index eb40b1d6f8b..bd254c404d4 100644
--- a/htdocs/mrp/mo_production.php
+++ b/htdocs/mrp/mo_production.php
@@ -151,7 +151,8 @@ if (empty($reshook))
 		$moline->fk_mo = $object->id;
 		$moline->qty = GETPOST('qtytoadd', 'int'); ;
 		$moline->fk_product = GETPOST('productidtoadd', 'int');
-		$moline->role = 'toconsumef'; // free consume line
+		$moline->role = 'toconsume';
+		$moline->origin_type = 'free'; // free consume line
 		$moline->position = 0;
 
 		$resultline = $moline->create($user, false); // Never use triggers here
@@ -173,7 +174,7 @@ if (empty($reshook))
 		$pos = 0;
 		// Process line to consume
 		foreach ($object->lines as $line) {
-			if (preg_match('/toconsume/', $line->role)) {
+			if ($line->role == 'toconsume') {
 				$tmpproduct = new Product($db);
 				$tmpproduct->fetch($line->fk_product);
 
@@ -311,7 +312,7 @@ if (empty($reshook))
 
 			if (GETPOST('autoclose', 'int')) {
 				foreach ($object->lines as $line) {
-					if (preg_match('/toconsume/', $line->role)) {
+					if ($line->role == 'toconsume') {
 						$arrayoflines = $object->fetchLinesLinked('consumed', $line->id);
 						$alreadyconsumed = 0;
 						foreach ($arrayoflines as $line2) {
@@ -695,7 +696,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		print '<div class="clearboth"></div>';
 
 		$newlinetext = '';
-		if (($object->status == $object::STATUS_DRAFT || $object->status == $object::STATUS_VALIDATED) && $action != 'consumeorproduce' && $action != 'consumeandproduceall') {
+		if ($object->status != $object::STATUS_PRODUCED && $object->status != $object::STATUS_CANCELED && $action != 'consumeorproduce' && $action != 'consumeandproduceall') {
 			$newlinetext = '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=addconsumeline">'.$langs->trans("AddNewConsumeLines").'</a>';
 		}
 		print load_fiche_titre($langs->trans('Consumption'), '', '', 0, '', '', $newlinetext);
@@ -749,13 +750,13 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 			$nblinetoconsumecursor = 0;
 			foreach ($object->lines as $line) {
-				if (preg_match('/toconsume/', $line->role)) {
+				if ($line->role == 'toconsume') {
 					$nblinetoconsumecursor++;
 
 					$tmpproduct = new Product($db);
 					$tmpproduct->fetch($line->fk_product);
 
-					if (!empty($bomcost) && $line->role == 'toconsumef' && $object->qty > 0) {
+					if ($line->origin_type == 'free' && $object->qty > 0) {
 						// add free consume line cost to bomcost
 						require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
 						$productFournisseur = new ProductFournisseur($db);

From 1f295923fcad38d11193ddb450fbfe0e4ae10c3b Mon Sep 17 00:00:00 2001
From: Francis Appels <francis.appels@yahoo.com>
Date: Tue, 2 Feb 2021 12:12:39 +0100
Subject: [PATCH 06/12] Show also unit cost iso pmp value for consumption

---
 htdocs/mrp/mo_production.php | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/htdocs/mrp/mo_production.php b/htdocs/mrp/mo_production.php
index bd254c404d4..f13853a2f72 100644
--- a/htdocs/mrp/mo_production.php
+++ b/htdocs/mrp/mo_production.php
@@ -707,7 +707,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		print '<tr class="liste_titre">';
 		print '<td>'.$langs->trans("Product").'</td>';
 		print '<td class="right">'.$langs->trans("Qty").'</td>';
-		if ($permissiontoupdatecost) print '<td class="right">'.$langs->trans("PMPValue").'</td>';
+		if ($permissiontoupdatecost) print '<td class="right">'.$langs->trans("UnitCost").'</td>';
 		print '<td class="right">'.$langs->trans("QtyAlreadyConsumed").'</td>';
 		print '<td>';
 		if ($collapse || in_array($action, array('consumeorproduce', 'consumeandproduceall'))) print $langs->trans("Warehouse");
@@ -755,6 +755,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 					$tmpproduct = new Product($db);
 					$tmpproduct->fetch($line->fk_product);
+					$linecost = price2num($tmpproduct->pmp, 'MT');
 
 					if ($line->origin_type == 'free' && $object->qty > 0) {
 						// add free consume line cost to bomcost
@@ -767,6 +768,12 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 							}
 						}
 						$bomcost += price2num(($line->qty * $linecost) / $object->qty, 'MT');
+					} elseif ($line->origin_id > 0 && $line->origin_type == 'bom' && $object->qty > 0) {
+						foreach ($bom->lines as $bomline) {
+							if ($bomline->id == $line->origin_id) {
+								$linecost = price2num(($line->qty * $bomline->unit_cost) / $object->qty, 'MT');
+							}
+						}
 					}
 
 					$arrayoflines = $object->fetchLinesLinked('consumed', $line->id);
@@ -791,7 +798,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 					print '</td>';
 					if ($permissiontoupdatecost) {
 						print '<td class="right nowraponall">';
-						print price($tmpproduct->pmp);
+						print $linecost;
 						print '</td>';
 					}
 					print '<td class="right">';

From b685a7549ebf77d692f30caab7c7f0c04696c173 Mon Sep 17 00:00:00 2001
From: Francis Appels <francis.appels@yahoo.com>
Date: Tue, 2 Feb 2021 12:19:34 +0100
Subject: [PATCH 07/12] add newline at end of file

---
 htdocs/install/mysql/migration/13.0.0-14.0.0.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
index 6a1a3d46cc3..d0430ffa0ca 100644
--- a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
+++ b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
@@ -124,4 +124,4 @@ ALTER TABLE llx_socpeople MODIFY poste varchar(255);
 ALTER TABLE llx_chargesociales ADD COLUMN fk_user integer DEFAULT NULL;
 
 ALTER TABLE llx_mrp_production ADD COLUMN origin_id integer AFTER fk_mo;
-ALTER TABLE llx_mrp_production ADD COLUMN origin_type varchar(10) AFTER origin_id;
\ No newline at end of file
+ALTER TABLE llx_mrp_production ADD COLUMN origin_type varchar(10) AFTER origin_id;

From 24a23f9fd09178258f31fe63b2887d19aabc92f1 Mon Sep 17 00:00:00 2001
From: Francis Appels <francis.appels@yahoo.com>
Date: Tue, 2 Feb 2021 14:13:59 +0100
Subject: [PATCH 08/12] Show consumption unitcost as price.

---
 htdocs/mrp/mo_production.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/mrp/mo_production.php b/htdocs/mrp/mo_production.php
index f13853a2f72..287d974c18f 100644
--- a/htdocs/mrp/mo_production.php
+++ b/htdocs/mrp/mo_production.php
@@ -798,7 +798,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 					print '</td>';
 					if ($permissiontoupdatecost) {
 						print '<td class="right nowraponall">';
-						print $linecost;
+						print price($linecost);
 						print '</td>';
 					}
 					print '<td class="right">';

From 41fcbbf2d74f57cbae327e98ffd0b4dc2a94ad0c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 8 Feb 2021 18:04:07 +0100
Subject: [PATCH 09/12] Update mo_production.php

---
 htdocs/mrp/mo_production.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/mrp/mo_production.php b/htdocs/mrp/mo_production.php
index 287d974c18f..62fdd0bd0cb 100644
--- a/htdocs/mrp/mo_production.php
+++ b/htdocs/mrp/mo_production.php
@@ -89,7 +89,7 @@ $permissiontodelete = $user->rights->mrp->delete || ($permissiontoadd && isset($
 $upload_dir = $conf->mrp->multidir_output[isset($object->entity) ? $object->entity : 1];
 
 $permissiontoproduce = $permissiontoadd;
-$permissiontoupdatecost = $user->rights->bom->write; // User who can define cost must have knowledge of pricing
+$permissiontoupdatecost = $user->rights->bom->read; // User who can define cost must have knowledge of pricing
 
 
 /*

From bca9004f36ef2f6e66ba58a0a9e7cce4439b693f Mon Sep 17 00:00:00 2001
From: Francis Appels <francis.appels@yahoo.com>
Date: Wed, 24 Feb 2021 15:48:44 +0100
Subject: [PATCH 10/12] Fix displayed unit cost of free consumption line

---
 htdocs/mrp/mo_production.php | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/htdocs/mrp/mo_production.php b/htdocs/mrp/mo_production.php
index 62fdd0bd0cb..a1994f958e7 100644
--- a/htdocs/mrp/mo_production.php
+++ b/htdocs/mrp/mo_production.php
@@ -759,15 +759,18 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 					if ($line->origin_type == 'free' && $object->qty > 0) {
 						// add free consume line cost to bomcost
-						require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
-						$productFournisseur = new ProductFournisseur($db);
-						$linecost = price2num((!empty($tmpproduct->cost_price)) ? $tmpproduct->cost_price : $tmpproduct->pmp);
-						if (empty($linecost)) {
+						$costprice = price2num((!empty($tmpproduct->cost_price)) ? $tmpproduct->cost_price : $tmpproduct->pmp);
+						if (empty($costprice)) {
+							require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
+							$productFournisseur = new ProductFournisseur($db);
 							if ($productFournisseur->find_min_price_product_fournisseur($line->fk_product) > 0){
-								$linecost = $productFournisseur->fourn_unitprice;
+								$costprice = $productFournisseur->fourn_unitprice;
+							} else {
+								$costprice = 0;
 							}
 						}
-						$bomcost += price2num(($line->qty * $linecost) / $object->qty, 'MT');
+						$linecost = price2num(($line->qty * $costprice) / $object->qty, 'MT');
+						$bomcost += $linecost;
 					} elseif ($line->origin_id > 0 && $line->origin_type == 'bom' && $object->qty > 0) {
 						foreach ($bom->lines as $bomline) {
 							if ($bomline->id == $line->origin_id) {

From 0e89dd73447d4a2f4158197c5d8e9c262b2fa3a8 Mon Sep 17 00:00:00 2001
From: Francis Appels <francis.appels@yahoo.com>
Date: Thu, 25 Feb 2021 11:23:19 +0100
Subject: [PATCH 11/12] Also register movement for 0 produced to update cost.
 Use correct movement label for negative consumed.

---
 htdocs/mrp/mo_production.php | 57 +++++++++++++++++++-----------------
 1 file changed, 30 insertions(+), 27 deletions(-)

diff --git a/htdocs/mrp/mo_production.php b/htdocs/mrp/mo_production.php
index a1994f958e7..c519fb91260 100644
--- a/htdocs/mrp/mo_production.php
+++ b/htdocs/mrp/mo_production.php
@@ -202,7 +202,11 @@ if (empty($reshook))
 							// Record stock movement
 							$id_product_batch = 0;
 							$stockmove->origin = $object;
-							$idstockmove = $stockmove->livraison($user, $line->fk_product, GETPOST('idwarehouse-'.$line->id.'-'.$i), $qtytoprocess, 0, $labelmovement, dol_now(), '', '', GETPOST('batch-'.$line->id.'-'.$i), $id_product_batch, $codemovement);
+							if ($qtytoprocess >= 0) {
+								$idstockmove = $stockmove->livraison($user, $line->fk_product, GETPOST('idwarehouse-'.$line->id.'-'.$i), $qtytoprocess, 0, $labelmovement, dol_now(), '', '', GETPOST('batch-'.$line->id.'-'.$i), $id_product_batch, $codemovement);
+							} else {
+								$idstockmove = $stockmove->reception($user, $line->fk_product, GETPOST('idwarehouse-'.$line->id.'-'.$i), $qtytoprocess, 0, $labelmovement, dol_now(), '', '', GETPOST('batch-'.$line->id.'-'.$i), $id_product_batch, $codemovement);
+							}
 							if ($idstockmove < 0) {
 								$error++;
 								setEventMessages($stockmove->error, $stockmove->errors, 'errors');
@@ -250,33 +254,32 @@ if (empty($reshook))
 					$qtytoprocess = price2num(GETPOST('qtytoproduce-'.$line->id.'-'.$i));
 					$pricetoprocess = GETPOST('pricetoproduce-'.$line->id.'-'.$i) ? price2num(GETPOST('pricetoproduce-'.$line->id.'-'.$i)) : 0;
 
+					// Check warehouse is set if we should have to
+					if (GETPOSTISSET('idwarehousetoproduce-'.$line->id.'-'.$i)) {	// If there is a warehouse to set
+						if (!(GETPOST('idwarehousetoproduce-'.$line->id.'-'.$i) > 0)) {	// If there is no warehouse set.
+							$langs->load("errors");
+							setEventMessages($langs->trans("ErrorFieldRequiredForProduct", $langs->transnoentitiesnoconv("Warehouse"), $tmpproduct->ref), null, 'errors');
+							$error++;
+						}
+						if (!empty($conf->productbatch->enabled) && $tmpproduct->status_batch && (!GETPOST('batchtoproduce-'.$line->id.'-'.$i))) {
+							$langs->load("errors");
+							setEventMessages($langs->trans("ErrorFieldRequiredForProduct", $langs->transnoentitiesnoconv("Batch"), $tmpproduct->ref), null, 'errors');
+							$error++;
+						}
+					}
+
+					$idstockmove = 0;
+					if (!$error && GETPOST('idwarehousetoproduce-'.$line->id.'-'.$i) > 0) {
+						// Record stock movement
+						$id_product_batch = 0;
+						$stockmove->origin = $object;
+						$idstockmove = $stockmove->reception($user, $line->fk_product, GETPOST('idwarehousetoproduce-'.$line->id.'-'.$i), $qtytoprocess, $pricetoprocess, $labelmovement, '', '', GETPOST('batchtoproduce-'.$line->id.'-'.$i), dol_now(), $id_product_batch, $codemovement);
+						if ($idstockmove < 0) {
+							$error++;
+							setEventMessages($stockmove->error, $stockmove->errors, 'errors');
+						}
+					}
 					if ($qtytoprocess != 0) {
-						// Check warehouse is set if we should have to
-						if (GETPOSTISSET('idwarehousetoproduce-'.$line->id.'-'.$i)) {	// If there is a warehouse to set
-							if (!(GETPOST('idwarehousetoproduce-'.$line->id.'-'.$i) > 0)) {	// If there is no warehouse set.
-								$langs->load("errors");
-								setEventMessages($langs->trans("ErrorFieldRequiredForProduct", $langs->transnoentitiesnoconv("Warehouse"), $tmpproduct->ref), null, 'errors');
-								$error++;
-							}
-							if (!empty($conf->productbatch->enabled) && $tmpproduct->status_batch && (!GETPOST('batchtoproduce-'.$line->id.'-'.$i))) {
-								$langs->load("errors");
-								setEventMessages($langs->trans("ErrorFieldRequiredForProduct", $langs->transnoentitiesnoconv("Batch"), $tmpproduct->ref), null, 'errors');
-								$error++;
-							}
-						}
-
-						$idstockmove = 0;
-						if (!$error && GETPOST('idwarehousetoproduce-'.$line->id.'-'.$i) > 0) {
-							// Record stock movement
-							$id_product_batch = 0;
-							$stockmove->origin = $object;
-							$idstockmove = $stockmove->reception($user, $line->fk_product, GETPOST('idwarehousetoproduce-'.$line->id.'-'.$i), $qtytoprocess, $pricetoprocess, $labelmovement, '', '', GETPOST('batchtoproduce-'.$line->id.'-'.$i), dol_now(), $id_product_batch, $codemovement);
-							if ($idstockmove < 0) {
-								$error++;
-								setEventMessages($stockmove->error, $stockmove->errors, 'errors');
-							}
-						}
-
 						if (!$error) {
 							// Record production
 							$moline = new MoLine($db);

From 3216120f4403c7ec25b2bb04db8c51a915ccfc37 Mon Sep 17 00:00:00 2001
From: Francis Appels <francis.appels@yahoo.com>
Date: Fri, 26 Feb 2021 15:38:02 +0100
Subject: [PATCH 12/12] MoLine origin is bomline not bom

---
 htdocs/mrp/class/mo.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/mrp/class/mo.class.php b/htdocs/mrp/class/mo.class.php
index 0f5804490eb..2ee97e9e22a 100644
--- a/htdocs/mrp/class/mo.class.php
+++ b/htdocs/mrp/class/mo.class.php
@@ -656,7 +656,7 @@ class Mo extends CommonObject
 
 							$moline->fk_mo = $this->id;
 							$moline->origin_id = $line->id;
-							$moline->origin_type = 'bom';
+							$moline->origin_type = 'bomline';
 							if ($line->qty_frozen) {
 								$moline->qty = $line->qty; // Qty to consume does not depends on quantity to produce
 							} else {