From 0e496d2191c27f1e7b1103c9d6441d487aabbaa3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 6 Jan 2020 02:55:09 +0100
Subject: [PATCH] MRP

---
 htdocs/mrp/mo_production.php                  | 84 ++++++++++++-------
 .../stock/class/mouvementstock.class.php      |  2 +-
 2 files changed, 57 insertions(+), 29 deletions(-)

diff --git a/htdocs/mrp/mo_production.php b/htdocs/mrp/mo_production.php
index af78ac4b37c..362f04105ec 100644
--- a/htdocs/mrp/mo_production.php
+++ b/htdocs/mrp/mo_production.php
@@ -182,26 +182,40 @@ if (empty($reshook))
     					}
     				}
 
-    				if (! $error) {
-    					// Record consumption
-    					$moline = new MoLine($db);
-
-    					$result = $moline->create($user);
-    					if ($result <= 0) {
-    						$error++;
-    						setEventMessages($moline->error, $moline->errors, 'errors');
-    					}
-    				}
-
-    				if (! $error) {
+    				$idstockmove = 0;
+    				if (! $error && GETPOST('idwarehouse-'.$line->id.'-'.$i) > 0) {
     					// Record stock movement
     					$id_product_batch = 0;
-    					$result = $stockmove->livraison($user, $line->fk_product, GETPOST('idwarehouse-'.$line->id.'-'.$i), GETPOST('qty-'.$line->id.'-'.$i), 0, $labelmovement, dol_now(), '', '', GETPOST('batch-'.$line->id.'-'.$i), $id_product_batch, $codemovement);
-    					if ($result <= 0) {
+    					$idstockmove = $stockmove->livraison($user, $line->fk_product, GETPOST('idwarehouse-'.$line->id.'-'.$i), GETPOST('qty-'.$line->id.'-'.$i), 0, $labelmovement, dol_now(), '', '', GETPOST('batch-'.$line->id.'-'.$i), $id_product_batch, $codemovement);
+    					if ($idstockmove < 0) {
     						$error++;
     						setEventMessages($stockmove->error, $stockmove->errors, 'errors');
     					}
     				}
+var_dump('eee '.$error);
+    				if (! $error) {
+    					$pos = 0;
+    					// Record consumption
+    					$moline = new MoLine($db);
+    					$moline->fk_mo = $object->id;
+    					$moline->position = $pos;
+    					$moline->fk_product = $line->fk_product;
+    					$moline->fk_warehouse = GETPOST('idwarehouse-'.$line->id.'-'.$i);
+    					$moline->qty = GETPOST('qty-'.$line->id.'-'.$i);
+    					$moline->batch = GETPOST('batch-'.$line->id.'-'.$i);
+    					$moline->role = 'consumed';
+    					$moline->fk_mrp_production = $line->id;
+    					$moline->fk_stock_movement = $idstockmove;
+    					$moline->fk_user_creat = $user->id;
+
+    					$resultmoline = $moline->create($user);
+    					if ($resultmoline <= 0) {
+    						$error++;
+    						setEventMessages($moline->error, $moline->errors, 'errors');
+    					}
+
+    					$pos++;
+    				}
 
     				$i++;
     			}
@@ -230,26 +244,40 @@ if (empty($reshook))
     					}
     				}
 
-    				if (! $error) {
-						// Record production
-    					$moline = new MoLine($db);
-
-    					$result = $moline->create($user);
-    					if ($result <= 0) {
-    						$error++;
-    						setEventMessages($moline->error, $moline->errors, 'errors');
-    					}
-    				}
-
-    				if (! $error) {
+    				$idstockmove = 0;
+    				if (! $error && GETPOST('idwarehousetoproduce-'.$line->id.'-'.$i) > 0) {
     					// Record stock movement
     					$id_product_batch = 0;
-    					$result = $stockmove->reception($user, $line->fk_product, GETPOST('idwarehouse-'.$line->id.'-'.$i), GETPOST('qty-'.$line->id.'-'.$i), 0, $labelmovement, dol_now(), '', '', GETPOST('batch-'.$line->id.'-'.$i), $id_product_batch, $codemovement);
-    					if ($result <= 0) {
+    					$idstockmove = $stockmove->reception($user, $line->fk_product, GETPOST('idwarehousetoproduce-'.$line->id.'-'.$i), GETPOST('qtytoproduce-'.$line->id.'-'.$i), 0, $labelmovement, dol_now(), '', '', GETPOST('batchtoproduce-'.$line->id.'-'.$i), $id_product_batch, $codemovement);
+    					if ($idstockmove < 0) {
     						$error++;
     						setEventMessages($stockmove->error, $stockmove->errors, 'errors');
     					}
     				}
+    				var_dump('fff '.$error);
+    				if (! $error) {
+    					$pos = 0;
+						// Record production
+    					$moline = new MoLine($db);
+    					$moline->fk_mo = $object->id;
+    					$moline->position = $pos;
+    					$moline->fk_product = $line->fk_product;
+    					$moline->fk_warehouse = GETPOST('idwarehousetoproduce-'.$line->id.'-'.$i);
+    					$moline->qty = GETPOST('qtytoproduce-'.$line->id.'-'.$i);
+    					$moline->batch = GETPOST('batchtoproduce-'.$line->id.'-'.$i);
+    					$moline->role = 'produced';
+    					$moline->fk_mrp_production = $line->id;
+    					$moline->fk_stock_movement = $idstockmove;
+    					$moline->fk_user_creat = $user->id;
+
+    					$resultmoline = $moline->create($user);
+    					if ($resultmoline <= 0) {
+    						$error++;
+    						setEventMessages($moline->error, $moline->errors, 'errors');
+    					}
+
+    					$pos++;
+    				}
 
     				$i++;
     			}
diff --git a/htdocs/product/stock/class/mouvementstock.class.php b/htdocs/product/stock/class/mouvementstock.class.php
index a85b375b085..c50d816f14f 100644
--- a/htdocs/product/stock/class/mouvementstock.class.php
+++ b/htdocs/product/stock/class/mouvementstock.class.php
@@ -97,7 +97,7 @@ class MouvementStock extends CommonObject
 	 *	@param		int		$entrepot_id	Id of warehouse
 	 *	@param		int		$qty			Qty of movement (can be <0 or >0 depending on parameter type)
 	 *	@param		int		$type			Direction of movement:
-	 *										0=input (stock increase by a stock transfer), 1=output (stock decrease after by a stock transfer),
+	 *										0=input (stock increase by a stock transfer), 1=output (stock decrease by a stock transfer),
 	 *										2=output (stock decrease), 3=input (stock increase)
 	 *                                      Note that qty should be > 0 with 0 or 3, < 0 with 1 or 2.
 	 *	@param		int		$price			Unit price HT of product, used to calculate average weighted price (PMP in french). If 0, average weighted price is not changed.