From 879afaa59e0251639e66981be8d00668f6800da3 Mon Sep 17 00:00:00 2001
From: Quentin VIAL-GOUTEYRON <quentin.vial-gouteyron@atm-consulting.fr>
Date: Fri, 18 Feb 2022 12:16:50 +0100
Subject: [PATCH 1/8] NEW : Beginning of PMP management on inventory

---
 .../install/mysql/migration/15.0.0-16.0.0.sql |  2 +
 .../mysql/tables/llx_inventorydet-stock.sql   |  2 +
 htdocs/langs/en_US/products.lang              |  4 +
 htdocs/product/inventory/inventory.php        | 86 ++++++++++++++++++-
 .../product/stock/tpl/extrafields_add.tpl.php |  2 +-
 5 files changed, 91 insertions(+), 5 deletions(-)

diff --git a/htdocs/install/mysql/migration/15.0.0-16.0.0.sql b/htdocs/install/mysql/migration/15.0.0-16.0.0.sql
index b78e53bd287..85d8763a4fe 100644
--- a/htdocs/install/mysql/migration/15.0.0-16.0.0.sql
+++ b/htdocs/install/mysql/migration/15.0.0-16.0.0.sql
@@ -237,4 +237,6 @@ ALTER TABLE llx_advtargetemailing RENAME TO llx_mailing_advtarget;
 
 ALTER TABLE llx_mailing ADD UNIQUE uk_mailing(titre, entity);
 
+ALTER TABLE llx_inventorydet ADD COLUMN pmp_real double DEFAULT NULL;
+ALTER TABLE llx_inventorydet ADD COLUMN valuation_real double DEFAULT NULL;
 
diff --git a/htdocs/install/mysql/tables/llx_inventorydet-stock.sql b/htdocs/install/mysql/tables/llx_inventorydet-stock.sql
index 8b75f68460d..5ce878124b6 100644
--- a/htdocs/install/mysql/tables/llx_inventorydet-stock.sql
+++ b/htdocs/install/mysql/tables/llx_inventorydet-stock.sql
@@ -29,6 +29,8 @@ CREATE TABLE llx_inventorydet
 	qty_stock double DEFAULT NULL,     -- Value or real stock we have, when we start the inventory (may be updated during intermediary steps).
 	qty_view double DEFAULT NULL, 	   -- Quantity found during inventory. It is the targeted value, filled during edition of inventory.
 	qty_regulated double DEFAULT NULL, -- Never used. Deprecated because we already have the fk_movement now.
+	pmp_real double DEFAULT NULL, -- Never used. Deprecated because we already have the fk_movement now.
+	valuation_real double DEFAULT NULL, -- Never used. Deprecated because we already have the fk_movement now.
 	fk_movement integer NULL           -- can contain the id of stock movement we recorded to make the inventory regulation of this line
 ) 
 ENGINE=innodb;
diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang
index 14715670882..947b743fa7a 100644
--- a/htdocs/langs/en_US/products.lang
+++ b/htdocs/langs/en_US/products.lang
@@ -411,3 +411,7 @@ Rank=Rank
 SwitchOnSaleStatus=Switch on sale status
 SwitchOnPurchaseStatus=Switch on purchase status
 StockMouvementExtraFields= Extra Fields (stock mouvement)
+PMPExpected=Expected PMP
+ExpectedValuation=Expected Valuation
+PMPReal=Real PMP
+RealValuation=Real Valuation
\ No newline at end of file
diff --git a/htdocs/product/inventory/inventory.php b/htdocs/product/inventory/inventory.php
index 95c9e2972cb..795e3ad11bb 100644
--- a/htdocs/product/inventory/inventory.php
+++ b/htdocs/product/inventory/inventory.php
@@ -45,7 +45,8 @@ $fk_warehouse = GETPOST('fk_warehouse', 'int');
 $fk_product = GETPOST('fk_product', 'int');
 $lineid = GETPOST('lineid', 'int');
 $batch = GETPOST('batch', 'alphanohtml');
-
+$totalExpectedValuation = 0;
+$totalRealValuation = 0;
 if (empty($conf->global->MAIN_USE_ADVANCED_PERMS)) {
 	$result = restrictedArea($user, 'stock', $id);
 } else {
@@ -863,6 +864,12 @@ if ($object->id > 0) {
 	print '<td class="right">';
 	print $form->textwithpicto($langs->trans("RealQty"), $langs->trans("InventoryRealQtyHelp"));
 	print '</td>';
+	if(!empty($conf->global->INVENTORY_MANAGE_REAL_PMP)) {
+		print '<td class="right">'.$langs->trans('PMPExpected').'</td>';
+		print '<td class="right">'.$langs->trans('ExpectedValuation').'</td>';
+		print '<td class="right">'.$langs->trans('PMPReal').'</td>';
+		print '<td class="right">'.$langs->trans('RealValuation').'</td>';
+	}
 	if ($object->status == $object::STATUS_DRAFT || $object->status == $object::STATUS_VALIDATED) {
 		// Actions or link to stock movement
 		print '<td class="center">';
@@ -893,6 +900,16 @@ if ($object->id > 0) {
 		print '<td class="right">';
 		print '<input type="text" name="qtytoadd" class="maxwidth75" value="">';
 		print '</td>';
+		if(!empty($conf->global->INVENTORY_MANAGE_REAL_PMP)) {
+			print '<td class="right">';
+			print '</td>';
+			print '<td class="right">';
+			print '</td>';
+			print '<td class="right">';
+			print '</td>';
+			print '<td class="right">';
+			print '</td>';
+		}
 		// Actions
 		print '<td class="center">';
 		print '<input type="submit" class="button paddingright" name="addline" value="'.$langs->trans("Add").'">';
@@ -902,7 +919,7 @@ if ($object->id > 0) {
 
 	// Request to show lines of inventory (prefilled after start/validate step)
 	$sql = 'SELECT id.rowid, id.datec as date_creation, id.tms as date_modification, id.fk_inventory, id.fk_warehouse,';
-	$sql .= ' id.fk_product, id.batch, id.qty_stock, id.qty_view, id.qty_regulated, id.fk_movement';
+	$sql .= ' id.fk_product, id.batch, id.qty_stock, id.qty_view, id.qty_regulated, id.fk_movement, id.pmp_real, id.valuation_real';
 	$sql .= ' FROM '.MAIN_DB_PREFIX.'inventorydet as id';
 	$sql .= ' WHERE id.fk_inventory = '.((int) $object->id);
 
@@ -988,6 +1005,36 @@ if ($object->id > 0) {
 				print '</a>';
 				print '<input type="text" class="maxwidth75 right realqty" name="id_'.$obj->rowid.'" id="id_'.$obj->rowid.'_input" value="'.$qty_view.'">';
 				print '</td>';
+				if(! empty($conf->global->INVENTORY_MANAGE_REAL_PMP)) {
+					//PMP Expected
+					$pmp_valuation = $product_static->pmp * $valuetoshow;
+					print '<td class="right">';
+					print price($product_static->pmp);
+					print '</td>';
+					print '<td class="right">';
+					print price($pmp_valuation);
+					print '</td>';
+					//PMP Real
+					print '<td class="right">';
+					print '<a id="undochangesqty_'.$obj->rowid.'" href="#" class="undochangesqty reposition marginrightonly" title="'.dol_escape_htmltag($langs->trans("Clear")).'">';
+					print img_picto('', 'eraser', 'class="opacitymedium"');
+					print '</a>';
+
+					if(! empty($obj->pmp_real)) $pmp_real = $obj->pmp_real;
+					else $pmp_real = $product_static->pmp;
+					$pmp_valuation_real = $pmp_real * $qty_view;
+					print '<input type="text" class="maxwidth75 right realqty" name="id_'.$obj->rowid.'" id="id_'.$obj->rowid.'_input" value="'.price2num($pmp_real).'">';
+					print '</td>';
+					print '<td class="right">';
+					print '<a id="undochangesqty_'.$obj->rowid.'" href="#" class="undochangesqty reposition marginrightonly" title="'.dol_escape_htmltag($langs->trans("Clear")).'">';
+					print img_picto('', 'eraser', 'class="opacitymedium"');
+					print '</a>';
+					print '<input type="text" class="maxwidth75 right realqty" name="id_'.$obj->rowid.'" id="id_'.$obj->rowid.'_input" value="'.$pmp_real * $qty_view.'">';
+					print '</td>';
+
+					$totalExpectedValuation += $pmp_valuation;
+					$totalRealValuation += $pmp_valuation_real;
+				}
 
 				// Picto delete line
 				print '<td class="right">';
@@ -999,7 +1046,31 @@ if ($object->id > 0) {
 				print '<td class="right nowraponall">';
 				print $obj->qty_view;	// qty found
 				print '</td>';
-				print '<td class="nowraponall right">';
+				if(!empty($conf->global->INVENTORY_MANAGE_REAL_PMP)) {
+					//PMP Expected
+					$pmp_valuation = $product_static->pmp * $valuetoshow;
+					$pmp_valuation_real = $pmp_real * $obj->qty_view;
+					print '<td class="right">';
+					print price($product_static->pmp);
+					print '</td>';
+					print '<td class="right">';
+					print price($pmp_valuation);
+					print '</td>';
+
+					//PMP Real
+					print '<td class="right">';
+					if(! empty($obj->pmp_real)) $pmp_real = $obj->pmp_real;
+					else $pmp_real = $product_static->pmp;
+					print price($pmp_real);
+					print '</td>';
+					print '<td class="right">';
+					print price($pmp_valuation_real);
+					print '</td>';
+					print '<td class="nowraponall right">';
+
+					$totalExpectedValuation += $pmp_valuation;
+					$totalRealValuation += $pmp_valuation_real;
+				}
 				if ($obj->fk_movement > 0) {
 					$stockmovment = new MouvementStock($db);
 					$stockmovment->fetch($obj->fk_movement);
@@ -1014,7 +1085,14 @@ if ($object->id > 0) {
 	} else {
 		dol_print_error($db);
 	}
-
+	if(!empty($conf->global->INVENTORY_MANAGE_REAL_PMP)) {
+		print '<tr class="liste_total">';
+		print '<td colspan="5">'.$langs->trans("Total").'</td>';
+		print '<td class="right" colspan="2">'.price($totalExpectedValuation).'</td>';
+		print '<td class="right" colspan="2">'.price($totalRealValuation).'</td>';
+		print '<td></td>';
+		print '</tr>';
+	}
 	print '</table>';
 
 	print '</div>';
diff --git a/htdocs/product/stock/tpl/extrafields_add.tpl.php b/htdocs/product/stock/tpl/extrafields_add.tpl.php
index 62921f0a6e0..aec8c971deb 100644
--- a/htdocs/product/stock/tpl/extrafields_add.tpl.php
+++ b/htdocs/product/stock/tpl/extrafields_add.tpl.php
@@ -44,7 +44,7 @@ if (empty($reshook)) {
 	$params = array();
 	if (isset($tpl_context)) $params['tpl_context'] = $tpl_context;
 	$params['cols'] = $parameters['colspanvalue'];
-	print $movement->showOptionals($extrafields, 'create', $params);
+//	print $movement->showOptionals($extrafields, 'create', $params);
 }
 
 ?>

From 5c2c06de3b2fd5bc6f74c829bf9c28dabfdaa673 Mon Sep 17 00:00:00 2001
From: Quentin VIAL-GOUTEYRON <quentin.vial-gouteyron@atm-consulting.fr>
Date: Fri, 18 Feb 2022 15:39:56 +0100
Subject: [PATCH 2/8] NEW : JS inventory autocalc input

---
 htdocs/product/inventory/inventory.php | 76 +++++++++++++++++++++++---
 1 file changed, 67 insertions(+), 9 deletions(-)

diff --git a/htdocs/product/inventory/inventory.php b/htdocs/product/inventory/inventory.php
index 795e3ad11bb..06c8ae0d2f5 100644
--- a/htdocs/product/inventory/inventory.php
+++ b/htdocs/product/inventory/inventory.php
@@ -1016,20 +1016,15 @@ if ($object->id > 0) {
 					print '</td>';
 					//PMP Real
 					print '<td class="right">';
-					print '<a id="undochangesqty_'.$obj->rowid.'" href="#" class="undochangesqty reposition marginrightonly" title="'.dol_escape_htmltag($langs->trans("Clear")).'">';
-					print img_picto('', 'eraser', 'class="opacitymedium"');
-					print '</a>';
+
 
 					if(! empty($obj->pmp_real)) $pmp_real = $obj->pmp_real;
 					else $pmp_real = $product_static->pmp;
 					$pmp_valuation_real = $pmp_real * $qty_view;
-					print '<input type="text" class="maxwidth75 right realqty" name="id_'.$obj->rowid.'" id="id_'.$obj->rowid.'_input" value="'.price2num($pmp_real).'">';
+					print '<input type="text" class="maxwidth75 right realpmp'.$obj->fk_product.'" name="realpmp_'.$obj->fk_product.'" id="id_'.$obj->rowid.'_input_pmp" value="'.price2num($pmp_real).'">';
 					print '</td>';
 					print '<td class="right">';
-					print '<a id="undochangesqty_'.$obj->rowid.'" href="#" class="undochangesqty reposition marginrightonly" title="'.dol_escape_htmltag($langs->trans("Clear")).'">';
-					print img_picto('', 'eraser', 'class="opacitymedium"');
-					print '</a>';
-					print '<input type="text" class="maxwidth75 right realqty" name="id_'.$obj->rowid.'" id="id_'.$obj->rowid.'_input" value="'.$pmp_real * $qty_view.'">';
+					print '<input type="text" class="maxwidth75 right realvaluation'.$obj->fk_product.'" name="realvaluation_'.$obj->fk_product.'" id="id_'.$obj->rowid.'_input_real_valuation" value="'.$pmp_real * $qty_view.'">';
 					print '</td>';
 
 					$totalExpectedValuation += $pmp_valuation;
@@ -1089,7 +1084,7 @@ if ($object->id > 0) {
 		print '<tr class="liste_total">';
 		print '<td colspan="5">'.$langs->trans("Total").'</td>';
 		print '<td class="right" colspan="2">'.price($totalExpectedValuation).'</td>';
-		print '<td class="right" colspan="2">'.price($totalRealValuation).'</td>';
+		print '<td class="right" id="totalRealValuation" colspan="2">'.price($totalRealValuation).'</td>';
 		print '<td></td>';
 		print '</tr>';
 	}
@@ -1115,6 +1110,69 @@ if ($object->id > 0) {
 				</script>';
 	}
 	print '</form>';
+
+
+	if(! empty($conf->global->INVENTORY_MANAGE_REAL_PMP)) {
+		?>
+		<script type="text/javascript">
+            $('.realqty').on('change', function () {
+                let realqty = $(this).closest('tr').find('.realqty').val();
+                let inputPmp = $(this).closest('tr').find('input[name^=realpmp]');
+                let realpmp = $(inputPmp).val();
+                if (!isNaN(realqty) && !isNaN(realpmp) && realpmp !== '' && realqty !== '') {
+                    let realval = realqty * realpmp;
+                    $(this).closest('tr').find('input[name^=realvaluation]').val(realval.toFixed(2));
+                }
+                updateTotalValuation();
+            });
+
+            $('input[name^=realpmp]').on('change', function () {
+                let inputQtyReal = $(this).closest('tr').find('.realqty');
+                let realqty = $(inputQtyReal).val();
+                let inputPmp = $(this).closest('tr').find('input[name^=realpmp]');
+                let realPmpClassname = $(inputPmp).attr('class').match(/[\w-]*realpmp[\w-]*/g)[0];
+                let realpmp = $(inputPmp).val();
+                if (!isNaN(realpmp) && realpmp !== '') {
+                    $('.'+realPmpClassname).val(realpmp); //For batch case if pmp is changed we change it everywhere it's same product and calc back everything
+
+                    if (!isNaN(realqty) && realqty !== '') {
+                        let realval = realqty * realpmp;
+                        $(this).closest('tr').find('input[name^=realvaluation]').val(realval.toFixed(2));
+                    }
+                    $('.realqty').trigger('change');
+                    updateTotalValuation();
+                }
+            });
+
+            $('input[name^=realvaluation]').on('change', function () {
+                let inputQtyReal = $(this).closest('tr').find('.realqty');
+                let realqty = $(inputQtyReal).val();
+                let inputPmp = $(this).closest('tr').find('input[name^=realpmp]');
+                let inputRealValuation = $(this).closest('tr').find('input[name^=realvaluation]');
+                let realPmpClassname = $(inputPmp).attr('class').match(/[\w-]*realpmp[\w-]*/g)[0];
+                let realvaluation = $(inputRealValuation).val();
+                if (!isNaN(realvaluation) && !isNaN(realqty) && realvaluation !== '' && realqty !== '' && realqty !== 0) {
+                    let realpmp = realvaluation / realqty
+                    $('.'+realPmpClassname).val(realpmp); //For batch case if pmp is changed we change it everywhere it's same product and calc back everything
+                    $('.realqty').trigger('change');
+                    updateTotalValuation();
+                }
+            });
+
+            function updateTotalValuation() {
+                let total = 0;
+                $('input[name^=realvaluation]').each(function( index ) {
+                    let val = $(this).val();
+                    if(!isNaN(val)) total += parseFloat($(this).val());
+                });
+                $('#totalRealValuation').html(total.toLocaleString('fr-FR', {
+                    style: 'currency', currency: 'EUR'
+                }));
+            }
+
+		</script>
+		<?php
+	}
 }
 
 // End of page

From 595a6c2782b6b2c9df9b373f1e6172dfb8fed3b4 Mon Sep 17 00:00:00 2001
From: Quentin VIAL-GOUTEYRON <quentin.vial-gouteyron@atm-consulting.fr>
Date: Mon, 21 Feb 2022 14:25:18 +0100
Subject: [PATCH 3/8] new pmp column

---
 .../install/mysql/migration/15.0.0-16.0.0.sql |  2 +-
 .../mysql/tables/llx_inventorydet-stock.sql   |  4 +-
 .../inventory/class/inventory.class.php       |  4 ++
 htdocs/product/inventory/inventory.php        | 62 +++++++++++++------
 4 files changed, 51 insertions(+), 21 deletions(-)

diff --git a/htdocs/install/mysql/migration/15.0.0-16.0.0.sql b/htdocs/install/mysql/migration/15.0.0-16.0.0.sql
index 85d8763a4fe..2667ac03e0e 100644
--- a/htdocs/install/mysql/migration/15.0.0-16.0.0.sql
+++ b/htdocs/install/mysql/migration/15.0.0-16.0.0.sql
@@ -238,5 +238,5 @@ ALTER TABLE llx_advtargetemailing RENAME TO llx_mailing_advtarget;
 ALTER TABLE llx_mailing ADD UNIQUE uk_mailing(titre, entity);
 
 ALTER TABLE llx_inventorydet ADD COLUMN pmp_real double DEFAULT NULL;
-ALTER TABLE llx_inventorydet ADD COLUMN valuation_real double DEFAULT NULL;
+ALTER TABLE llx_inventorydet ADD COLUMN pmp_expected double DEFAULT NULL;
 
diff --git a/htdocs/install/mysql/tables/llx_inventorydet-stock.sql b/htdocs/install/mysql/tables/llx_inventorydet-stock.sql
index 5ce878124b6..8999b0e298b 100644
--- a/htdocs/install/mysql/tables/llx_inventorydet-stock.sql
+++ b/htdocs/install/mysql/tables/llx_inventorydet-stock.sql
@@ -29,8 +29,8 @@ CREATE TABLE llx_inventorydet
 	qty_stock double DEFAULT NULL,     -- Value or real stock we have, when we start the inventory (may be updated during intermediary steps).
 	qty_view double DEFAULT NULL, 	   -- Quantity found during inventory. It is the targeted value, filled during edition of inventory.
 	qty_regulated double DEFAULT NULL, -- Never used. Deprecated because we already have the fk_movement now.
-	pmp_real double DEFAULT NULL, -- Never used. Deprecated because we already have the fk_movement now.
-	valuation_real double DEFAULT NULL, -- Never used. Deprecated because we already have the fk_movement now.
+	pmp_real double DEFAULT NULL,
+	pmp_expected double DEFAULT NULL,
 	fk_movement integer NULL           -- can contain the id of stock movement we recorded to make the inventory regulation of this line
 ) 
 ENGINE=innodb;
diff --git a/htdocs/product/inventory/class/inventory.class.php b/htdocs/product/inventory/class/inventory.class.php
index 92061972e60..81300d6bac8 100644
--- a/htdocs/product/inventory/class/inventory.class.php
+++ b/htdocs/product/inventory/class/inventory.class.php
@@ -755,6 +755,8 @@ class InventoryLine extends CommonObjectLine
 		'qty_stock'     => array('type'=>'double', 'label'=>'QtyFound', 'visible'=>1, 'enabled'=>1, 'position'=>32, 'index'=>1, 'help'=>'Qty we found/want (to define during draft edition)'),
 		'qty_view'      => array('type'=>'double', 'label'=>'QtyBefore', 'visible'=>1, 'enabled'=>1, 'position'=>33, 'index'=>1, 'help'=>'Qty before (filled once movements are validated)'),
 		'qty_regulated' => array('type'=>'double', 'label'=>'QtyDelta', 'visible'=>1, 'enabled'=>1, 'position'=>34, 'index'=>1, 'help'=>'Qty aadded or removed (filled once movements are validated)'),
+		'pmp_real' => array('type'=>'double', 'label'=>'PMPReal', 'visible'=>1, 'enabled'=>1, 'position'=>35),
+		'pmp_expected' => array('type'=>'double', 'label'=>'PMPExpected', 'visible'=>1, 'enabled'=>1, 'position'=>36),
 	);
 
 	/**
@@ -771,6 +773,8 @@ class InventoryLine extends CommonObjectLine
 	public $qty_stock;
 	public $qty_view;
 	public $qty_regulated;
+	public $pmp_real;
+	public $pmp_expected;
 
 
 	/**
diff --git a/htdocs/product/inventory/inventory.php b/htdocs/product/inventory/inventory.php
index 06c8ae0d2f5..b593fc1b414 100644
--- a/htdocs/product/inventory/inventory.php
+++ b/htdocs/product/inventory/inventory.php
@@ -127,7 +127,7 @@ if (empty($reshook)) {
 		$db->begin();
 
 		$sql = 'SELECT id.rowid, id.datec as date_creation, id.tms as date_modification, id.fk_inventory, id.fk_warehouse,';
-		$sql .= ' id.fk_product, id.batch, id.qty_stock, id.qty_view, id.qty_regulated';
+		$sql .= ' id.fk_product, id.batch, id.qty_stock, id.qty_view, id.qty_regulated, id.pmp_real';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'inventorydet as id';
 		$sql .= ' WHERE id.fk_inventory = '.((int) $object->id);
 
@@ -176,14 +176,26 @@ if (empty($reshook)) {
 						$datemovement = '';
 						//$inventorycode = 'INV'.$object->id;
 						$inventorycode = 'INV-'.$object->ref;
+                        $price = 0;
+                        if(!empty($line->pmp_real) && !empty($conf->global->INVENTORY_MANAGE_REAL_PMP)) $price = $line->pmp_real;
 
-						$idstockmove = $stockmovment->_create($user, $line->fk_product, $line->fk_warehouse, $stock_movement_qty, $movement_type, 0, $langs->trans('LabelOfInventoryMovemement', $object->ref), $inventorycode, $datemovement, '', '', $line->batch);
+						$idstockmove = $stockmovment->_create($user, $line->fk_product, $line->fk_warehouse, $stock_movement_qty, $movement_type, $price, $langs->trans('LabelOfInventoryMovemement', $object->ref), $inventorycode, $datemovement, '', '', $line->batch);
 						if ($idstockmove < 0) {
 							$error++;
 							setEventMessages($stockmovment->error, $stockmovment->errors, 'errors');
 							break;
 						}
 
+                        if(!empty($line->pmp_real) && !empty($conf->global->INVENTORY_MANAGE_REAL_PMP)) {
+                            $sqlpmp = 'UPDATE '.MAIN_DB_PREFIX.'product SET pmp = '.((float) $line->pmp_real).' WHERE rowid = '.((int) $line->fk_product);
+                            $resqlpmp = $db->query($sqlpmp);
+							if(! $resqlpmp) {
+								$error++;
+								setEventMessages($db->lasterror(), null, 'errors');
+								break;
+							}
+                        }
+
 						// Update line with id of stock movement (and the start quantity if it has changed this last recording)
 						$sqlupdate = "UPDATE ".MAIN_DB_PREFIX."inventorydet";
 						$sqlupdate .= " SET fk_movement = ".((int) $idstockmove);
@@ -247,6 +259,8 @@ if (empty($reshook)) {
 					if ($result > 0) {
 						$inventoryline->qty_stock = price2num(GETPOST('stock_qty_'.$lineid, 'alpha'), 'MS');	// The new value that was set in as hidden field
 						$inventoryline->qty_view = $qtytoupdate;	// The new value we want
+                        $inventoryline->pmp_real = price2num(GETPOST('realpmp_'.$lineid, 'alpha'), 'MS');
+                        $inventoryline->pmp_expected = price2num(GETPOST('expectedpmp_'.$lineid, 'alpha'), 'MS');
 						$resultupdate = $inventoryline->update($user);
 					}
 				} else {
@@ -584,6 +598,7 @@ if ($object->id > 0) {
 								var object = $(this)[0];
 								var objecttofill = $("#"+object.id+"_input")[0];
 								objecttofill.value = object.innerText;
+								jQuery(".realqty").trigger("change");
 							})
 							console.log("Values filled (after click on fillwithexpected)");
 							disablebuttonmakemovementandclose();
@@ -829,6 +844,7 @@ if ($object->id > 0) {
 		$("#clearqty").on("click", function() {
 			console.log("Clear all values");
 			jQuery(".realqty").val("");
+			jQuery(".realqty").trigger("change");
 			return false;	/* disable submit */
 		});
 		$(".undochangesqty").on("click", function undochangesqty() {
@@ -919,7 +935,7 @@ if ($object->id > 0) {
 
 	// Request to show lines of inventory (prefilled after start/validate step)
 	$sql = 'SELECT id.rowid, id.datec as date_creation, id.tms as date_modification, id.fk_inventory, id.fk_warehouse,';
-	$sql .= ' id.fk_product, id.batch, id.qty_stock, id.qty_view, id.qty_regulated, id.fk_movement, id.pmp_real, id.valuation_real';
+	$sql .= ' id.fk_product, id.batch, id.qty_stock, id.qty_view, id.qty_regulated, id.fk_movement, id.pmp_real, id.pmp_expected';
 	$sql .= ' FROM '.MAIN_DB_PREFIX.'inventorydet as id';
 	$sql .= ' WHERE id.fk_inventory = '.((int) $object->id);
 
@@ -1007,9 +1023,12 @@ if ($object->id > 0) {
 				print '</td>';
 				if(! empty($conf->global->INVENTORY_MANAGE_REAL_PMP)) {
 					//PMP Expected
-					$pmp_valuation = $product_static->pmp * $valuetoshow;
+                    if(! empty($obj->pmp_expected)) $pmp_expected = $obj->pmp_expected;
+					else $pmp_expected = $product_static->pmp;
+					$pmp_valuation = $pmp_expected * $valuetoshow;
 					print '<td class="right">';
-					print price($product_static->pmp);
+					print price($pmp_expected);
+					print '<input type="hidden" name="expectedpmp_'.$obj->rowid.'" value="'.$pmp_expected.'"/>';
 					print '</td>';
 					print '<td class="right">';
 					print price($pmp_valuation);
@@ -1021,10 +1040,10 @@ if ($object->id > 0) {
 					if(! empty($obj->pmp_real)) $pmp_real = $obj->pmp_real;
 					else $pmp_real = $product_static->pmp;
 					$pmp_valuation_real = $pmp_real * $qty_view;
-					print '<input type="text" class="maxwidth75 right realpmp'.$obj->fk_product.'" name="realpmp_'.$obj->fk_product.'" id="id_'.$obj->rowid.'_input_pmp" value="'.price2num($pmp_real).'">';
+					print '<input type="text" class="maxwidth75 right realpmp'.$obj->fk_product.'" name="realpmp_'.$obj->rowid.'" id="id_'.$obj->rowid.'_input_pmp" value="'.price2num($pmp_real).'">';
 					print '</td>';
 					print '<td class="right">';
-					print '<input type="text" class="maxwidth75 right realvaluation'.$obj->fk_product.'" name="realvaluation_'.$obj->fk_product.'" id="id_'.$obj->rowid.'_input_real_valuation" value="'.$pmp_real * $qty_view.'">';
+					print '<input type="text" class="maxwidth75 right realvaluation'.$obj->fk_product.'" name="realvaluation_'.$obj->rowid.'" id="id_'.$obj->rowid.'_input_real_valuation" value="'.$pmp_valuation_real.'">';
 					print '</td>';
 
 					$totalExpectedValuation += $pmp_valuation;
@@ -1043,10 +1062,11 @@ if ($object->id > 0) {
 				print '</td>';
 				if(!empty($conf->global->INVENTORY_MANAGE_REAL_PMP)) {
 					//PMP Expected
-					$pmp_valuation = $product_static->pmp * $valuetoshow;
-					$pmp_valuation_real = $pmp_real * $obj->qty_view;
+                    if(! empty($obj->pmp_expected)) $pmp_expected = $obj->pmp_expected;
+					else $pmp_expected = $product_static->pmp;
+					$pmp_valuation = $pmp_expected * $valuetoshow;
 					print '<td class="right">';
-					print price($product_static->pmp);
+					print price($pmp_expected);
 					print '</td>';
 					print '<td class="right">';
 					print price($pmp_valuation);
@@ -1056,6 +1076,7 @@ if ($object->id > 0) {
 					print '<td class="right">';
 					if(! empty($obj->pmp_real)) $pmp_real = $obj->pmp_real;
 					else $pmp_real = $product_static->pmp;
+                    $pmp_valuation_real = $pmp_real * $obj->qty_view;
 					print price($pmp_real);
 					print '</td>';
 					print '<td class="right">';
@@ -1117,25 +1138,26 @@ if ($object->id > 0) {
 		<script type="text/javascript">
             $('.realqty').on('change', function () {
                 let realqty = $(this).closest('tr').find('.realqty').val();
-                let inputPmp = $(this).closest('tr').find('input[name^=realpmp]');
+                let inputPmp = $(this).closest('tr').find('input[class*=realpmp]');
                 let realpmp = $(inputPmp).val();
-                if (!isNaN(realqty) && !isNaN(realpmp) && realpmp !== '' && realqty !== '') {
+                if (!isNaN(realqty) && !isNaN(realpmp)) {
                     let realval = realqty * realpmp;
                     $(this).closest('tr').find('input[name^=realvaluation]').val(realval.toFixed(2));
                 }
                 updateTotalValuation();
             });
 
-            $('input[name^=realpmp]').on('change', function () {
+            $('input[class*=realpmp]').on('change', function () {
                 let inputQtyReal = $(this).closest('tr').find('.realqty');
                 let realqty = $(inputQtyReal).val();
-                let inputPmp = $(this).closest('tr').find('input[name^=realpmp]');
+                let inputPmp = $(this).closest('tr').find('input[class*=realpmp]');
+                console.log(inputPmp);
                 let realPmpClassname = $(inputPmp).attr('class').match(/[\w-]*realpmp[\w-]*/g)[0];
                 let realpmp = $(inputPmp).val();
-                if (!isNaN(realpmp) && realpmp !== '') {
+                if (!isNaN(realpmp)) {
                     $('.'+realPmpClassname).val(realpmp); //For batch case if pmp is changed we change it everywhere it's same product and calc back everything
 
-                    if (!isNaN(realqty) && realqty !== '') {
+                    if (!isNaN(realqty)) {
                         let realval = realqty * realpmp;
                         $(this).closest('tr').find('input[name^=realvaluation]').val(realval.toFixed(2));
                     }
@@ -1147,7 +1169,7 @@ if ($object->id > 0) {
             $('input[name^=realvaluation]').on('change', function () {
                 let inputQtyReal = $(this).closest('tr').find('.realqty');
                 let realqty = $(inputQtyReal).val();
-                let inputPmp = $(this).closest('tr').find('input[name^=realpmp]');
+                let inputPmp = $(this).closest('tr').find('input[class*=realpmp]');
                 let inputRealValuation = $(this).closest('tr').find('input[name^=realvaluation]');
                 let realPmpClassname = $(inputPmp).attr('class').match(/[\w-]*realpmp[\w-]*/g)[0];
                 let realvaluation = $(inputRealValuation).val();
@@ -1165,8 +1187,12 @@ if ($object->id > 0) {
                     let val = $(this).val();
                     if(!isNaN(val)) total += parseFloat($(this).val());
                 });
+                let currencyFractionDigits = new Intl.NumberFormat('fr-FR', {
+                    style: 'currency',
+                    currency: 'EUR',
+                }).resolvedOptions().maximumFractionDigits;
                 $('#totalRealValuation').html(total.toLocaleString('fr-FR', {
-                    style: 'currency', currency: 'EUR'
+                    maximumFractionDigits: currencyFractionDigits
                 }));
             }
 

From 76e2ee2ddedc43e0766d14223310bf638b7072a3 Mon Sep 17 00:00:00 2001
From: Quentin VIAL-GOUTEYRON <quentin.vial-gouteyron@atm-consulting.fr>
Date: Mon, 21 Feb 2022 15:36:58 +0100
Subject: [PATCH 4/8] uncomment line

---
 htdocs/product/stock/tpl/extrafields_add.tpl.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/product/stock/tpl/extrafields_add.tpl.php b/htdocs/product/stock/tpl/extrafields_add.tpl.php
index aec8c971deb..62921f0a6e0 100644
--- a/htdocs/product/stock/tpl/extrafields_add.tpl.php
+++ b/htdocs/product/stock/tpl/extrafields_add.tpl.php
@@ -44,7 +44,7 @@ if (empty($reshook)) {
 	$params = array();
 	if (isset($tpl_context)) $params['tpl_context'] = $tpl_context;
 	$params['cols'] = $parameters['colspanvalue'];
-//	print $movement->showOptionals($extrafields, 'create', $params);
+	print $movement->showOptionals($extrafields, 'create', $params);
 }
 
 ?>

From 0eb8eab7f0d382055ad29291b85233a09cfffcdf Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Mon, 21 Feb 2022 14:51:57 +0000
Subject: [PATCH 5/8] Fixing style errors.

---
 htdocs/product/inventory/inventory.php | 150 ++++++++++++-------------
 1 file changed, 75 insertions(+), 75 deletions(-)

diff --git a/htdocs/product/inventory/inventory.php b/htdocs/product/inventory/inventory.php
index b593fc1b414..536aaf7d354 100644
--- a/htdocs/product/inventory/inventory.php
+++ b/htdocs/product/inventory/inventory.php
@@ -176,8 +176,8 @@ if (empty($reshook)) {
 						$datemovement = '';
 						//$inventorycode = 'INV'.$object->id;
 						$inventorycode = 'INV-'.$object->ref;
-                        $price = 0;
-                        if(!empty($line->pmp_real) && !empty($conf->global->INVENTORY_MANAGE_REAL_PMP)) $price = $line->pmp_real;
+						$price = 0;
+						if (!empty($line->pmp_real) && !empty($conf->global->INVENTORY_MANAGE_REAL_PMP)) $price = $line->pmp_real;
 
 						$idstockmove = $stockmovment->_create($user, $line->fk_product, $line->fk_warehouse, $stock_movement_qty, $movement_type, $price, $langs->trans('LabelOfInventoryMovemement', $object->ref), $inventorycode, $datemovement, '', '', $line->batch);
 						if ($idstockmove < 0) {
@@ -186,15 +186,15 @@ if (empty($reshook)) {
 							break;
 						}
 
-                        if(!empty($line->pmp_real) && !empty($conf->global->INVENTORY_MANAGE_REAL_PMP)) {
-                            $sqlpmp = 'UPDATE '.MAIN_DB_PREFIX.'product SET pmp = '.((float) $line->pmp_real).' WHERE rowid = '.((int) $line->fk_product);
-                            $resqlpmp = $db->query($sqlpmp);
-							if(! $resqlpmp) {
+						if (!empty($line->pmp_real) && !empty($conf->global->INVENTORY_MANAGE_REAL_PMP)) {
+							$sqlpmp = 'UPDATE '.MAIN_DB_PREFIX.'product SET pmp = '.((float) $line->pmp_real).' WHERE rowid = '.((int) $line->fk_product);
+							$resqlpmp = $db->query($sqlpmp);
+							if (! $resqlpmp) {
 								$error++;
 								setEventMessages($db->lasterror(), null, 'errors');
 								break;
 							}
-                        }
+						}
 
 						// Update line with id of stock movement (and the start quantity if it has changed this last recording)
 						$sqlupdate = "UPDATE ".MAIN_DB_PREFIX."inventorydet";
@@ -259,8 +259,8 @@ if (empty($reshook)) {
 					if ($result > 0) {
 						$inventoryline->qty_stock = price2num(GETPOST('stock_qty_'.$lineid, 'alpha'), 'MS');	// The new value that was set in as hidden field
 						$inventoryline->qty_view = $qtytoupdate;	// The new value we want
-                        $inventoryline->pmp_real = price2num(GETPOST('realpmp_'.$lineid, 'alpha'), 'MS');
-                        $inventoryline->pmp_expected = price2num(GETPOST('expectedpmp_'.$lineid, 'alpha'), 'MS');
+						$inventoryline->pmp_real = price2num(GETPOST('realpmp_'.$lineid, 'alpha'), 'MS');
+						$inventoryline->pmp_expected = price2num(GETPOST('expectedpmp_'.$lineid, 'alpha'), 'MS');
 						$resultupdate = $inventoryline->update($user);
 					}
 				} else {
@@ -880,7 +880,7 @@ if ($object->id > 0) {
 	print '<td class="right">';
 	print $form->textwithpicto($langs->trans("RealQty"), $langs->trans("InventoryRealQtyHelp"));
 	print '</td>';
-	if(!empty($conf->global->INVENTORY_MANAGE_REAL_PMP)) {
+	if (!empty($conf->global->INVENTORY_MANAGE_REAL_PMP)) {
 		print '<td class="right">'.$langs->trans('PMPExpected').'</td>';
 		print '<td class="right">'.$langs->trans('ExpectedValuation').'</td>';
 		print '<td class="right">'.$langs->trans('PMPReal').'</td>';
@@ -916,7 +916,7 @@ if ($object->id > 0) {
 		print '<td class="right">';
 		print '<input type="text" name="qtytoadd" class="maxwidth75" value="">';
 		print '</td>';
-		if(!empty($conf->global->INVENTORY_MANAGE_REAL_PMP)) {
+		if (!empty($conf->global->INVENTORY_MANAGE_REAL_PMP)) {
 			print '<td class="right">';
 			print '</td>';
 			print '<td class="right">';
@@ -1021,9 +1021,9 @@ if ($object->id > 0) {
 				print '</a>';
 				print '<input type="text" class="maxwidth75 right realqty" name="id_'.$obj->rowid.'" id="id_'.$obj->rowid.'_input" value="'.$qty_view.'">';
 				print '</td>';
-				if(! empty($conf->global->INVENTORY_MANAGE_REAL_PMP)) {
+				if (! empty($conf->global->INVENTORY_MANAGE_REAL_PMP)) {
 					//PMP Expected
-                    if(! empty($obj->pmp_expected)) $pmp_expected = $obj->pmp_expected;
+					if (! empty($obj->pmp_expected)) $pmp_expected = $obj->pmp_expected;
 					else $pmp_expected = $product_static->pmp;
 					$pmp_valuation = $pmp_expected * $valuetoshow;
 					print '<td class="right">';
@@ -1037,7 +1037,7 @@ if ($object->id > 0) {
 					print '<td class="right">';
 
 
-					if(! empty($obj->pmp_real)) $pmp_real = $obj->pmp_real;
+					if (! empty($obj->pmp_real)) $pmp_real = $obj->pmp_real;
 					else $pmp_real = $product_static->pmp;
 					$pmp_valuation_real = $pmp_real * $qty_view;
 					print '<input type="text" class="maxwidth75 right realpmp'.$obj->fk_product.'" name="realpmp_'.$obj->rowid.'" id="id_'.$obj->rowid.'_input_pmp" value="'.price2num($pmp_real).'">';
@@ -1060,9 +1060,9 @@ if ($object->id > 0) {
 				print '<td class="right nowraponall">';
 				print $obj->qty_view;	// qty found
 				print '</td>';
-				if(!empty($conf->global->INVENTORY_MANAGE_REAL_PMP)) {
+				if (!empty($conf->global->INVENTORY_MANAGE_REAL_PMP)) {
 					//PMP Expected
-                    if(! empty($obj->pmp_expected)) $pmp_expected = $obj->pmp_expected;
+					if (! empty($obj->pmp_expected)) $pmp_expected = $obj->pmp_expected;
 					else $pmp_expected = $product_static->pmp;
 					$pmp_valuation = $pmp_expected * $valuetoshow;
 					print '<td class="right">';
@@ -1074,9 +1074,9 @@ if ($object->id > 0) {
 
 					//PMP Real
 					print '<td class="right">';
-					if(! empty($obj->pmp_real)) $pmp_real = $obj->pmp_real;
+					if (! empty($obj->pmp_real)) $pmp_real = $obj->pmp_real;
 					else $pmp_real = $product_static->pmp;
-                    $pmp_valuation_real = $pmp_real * $obj->qty_view;
+					$pmp_valuation_real = $pmp_real * $obj->qty_view;
 					print price($pmp_real);
 					print '</td>';
 					print '<td class="right">';
@@ -1101,7 +1101,7 @@ if ($object->id > 0) {
 	} else {
 		dol_print_error($db);
 	}
-	if(!empty($conf->global->INVENTORY_MANAGE_REAL_PMP)) {
+	if (!empty($conf->global->INVENTORY_MANAGE_REAL_PMP)) {
 		print '<tr class="liste_total">';
 		print '<td colspan="5">'.$langs->trans("Total").'</td>';
 		print '<td class="right" colspan="2">'.price($totalExpectedValuation).'</td>';
@@ -1133,68 +1133,68 @@ if ($object->id > 0) {
 	print '</form>';
 
 
-	if(! empty($conf->global->INVENTORY_MANAGE_REAL_PMP)) {
+	if (! empty($conf->global->INVENTORY_MANAGE_REAL_PMP)) {
 		?>
 		<script type="text/javascript">
-            $('.realqty').on('change', function () {
-                let realqty = $(this).closest('tr').find('.realqty').val();
-                let inputPmp = $(this).closest('tr').find('input[class*=realpmp]');
-                let realpmp = $(inputPmp).val();
-                if (!isNaN(realqty) && !isNaN(realpmp)) {
-                    let realval = realqty * realpmp;
-                    $(this).closest('tr').find('input[name^=realvaluation]').val(realval.toFixed(2));
-                }
-                updateTotalValuation();
-            });
+			$('.realqty').on('change', function () {
+				let realqty = $(this).closest('tr').find('.realqty').val();
+				let inputPmp = $(this).closest('tr').find('input[class*=realpmp]');
+				let realpmp = $(inputPmp).val();
+				if (!isNaN(realqty) && !isNaN(realpmp)) {
+					let realval = realqty * realpmp;
+					$(this).closest('tr').find('input[name^=realvaluation]').val(realval.toFixed(2));
+				}
+				updateTotalValuation();
+			});
 
-            $('input[class*=realpmp]').on('change', function () {
-                let inputQtyReal = $(this).closest('tr').find('.realqty');
-                let realqty = $(inputQtyReal).val();
-                let inputPmp = $(this).closest('tr').find('input[class*=realpmp]');
-                console.log(inputPmp);
-                let realPmpClassname = $(inputPmp).attr('class').match(/[\w-]*realpmp[\w-]*/g)[0];
-                let realpmp = $(inputPmp).val();
-                if (!isNaN(realpmp)) {
-                    $('.'+realPmpClassname).val(realpmp); //For batch case if pmp is changed we change it everywhere it's same product and calc back everything
+			$('input[class*=realpmp]').on('change', function () {
+				let inputQtyReal = $(this).closest('tr').find('.realqty');
+				let realqty = $(inputQtyReal).val();
+				let inputPmp = $(this).closest('tr').find('input[class*=realpmp]');
+				console.log(inputPmp);
+				let realPmpClassname = $(inputPmp).attr('class').match(/[\w-]*realpmp[\w-]*/g)[0];
+				let realpmp = $(inputPmp).val();
+				if (!isNaN(realpmp)) {
+					$('.'+realPmpClassname).val(realpmp); //For batch case if pmp is changed we change it everywhere it's same product and calc back everything
 
-                    if (!isNaN(realqty)) {
-                        let realval = realqty * realpmp;
-                        $(this).closest('tr').find('input[name^=realvaluation]').val(realval.toFixed(2));
-                    }
-                    $('.realqty').trigger('change');
-                    updateTotalValuation();
-                }
-            });
+					if (!isNaN(realqty)) {
+						let realval = realqty * realpmp;
+						$(this).closest('tr').find('input[name^=realvaluation]').val(realval.toFixed(2));
+					}
+					$('.realqty').trigger('change');
+					updateTotalValuation();
+				}
+			});
 
-            $('input[name^=realvaluation]').on('change', function () {
-                let inputQtyReal = $(this).closest('tr').find('.realqty');
-                let realqty = $(inputQtyReal).val();
-                let inputPmp = $(this).closest('tr').find('input[class*=realpmp]');
-                let inputRealValuation = $(this).closest('tr').find('input[name^=realvaluation]');
-                let realPmpClassname = $(inputPmp).attr('class').match(/[\w-]*realpmp[\w-]*/g)[0];
-                let realvaluation = $(inputRealValuation).val();
-                if (!isNaN(realvaluation) && !isNaN(realqty) && realvaluation !== '' && realqty !== '' && realqty !== 0) {
-                    let realpmp = realvaluation / realqty
-                    $('.'+realPmpClassname).val(realpmp); //For batch case if pmp is changed we change it everywhere it's same product and calc back everything
-                    $('.realqty').trigger('change');
-                    updateTotalValuation();
-                }
-            });
+			$('input[name^=realvaluation]').on('change', function () {
+				let inputQtyReal = $(this).closest('tr').find('.realqty');
+				let realqty = $(inputQtyReal).val();
+				let inputPmp = $(this).closest('tr').find('input[class*=realpmp]');
+				let inputRealValuation = $(this).closest('tr').find('input[name^=realvaluation]');
+				let realPmpClassname = $(inputPmp).attr('class').match(/[\w-]*realpmp[\w-]*/g)[0];
+				let realvaluation = $(inputRealValuation).val();
+				if (!isNaN(realvaluation) && !isNaN(realqty) && realvaluation !== '' && realqty !== '' && realqty !== 0) {
+					let realpmp = realvaluation / realqty
+					$('.'+realPmpClassname).val(realpmp); //For batch case if pmp is changed we change it everywhere it's same product and calc back everything
+					$('.realqty').trigger('change');
+					updateTotalValuation();
+				}
+			});
 
-            function updateTotalValuation() {
-                let total = 0;
-                $('input[name^=realvaluation]').each(function( index ) {
-                    let val = $(this).val();
-                    if(!isNaN(val)) total += parseFloat($(this).val());
-                });
-                let currencyFractionDigits = new Intl.NumberFormat('fr-FR', {
-                    style: 'currency',
-                    currency: 'EUR',
-                }).resolvedOptions().maximumFractionDigits;
-                $('#totalRealValuation').html(total.toLocaleString('fr-FR', {
-                    maximumFractionDigits: currencyFractionDigits
-                }));
-            }
+			function updateTotalValuation() {
+				let total = 0;
+				$('input[name^=realvaluation]').each(function( index ) {
+					let val = $(this).val();
+					if(!isNaN(val)) total += parseFloat($(this).val());
+				});
+				let currencyFractionDigits = new Intl.NumberFormat('fr-FR', {
+					style: 'currency',
+					currency: 'EUR',
+				}).resolvedOptions().maximumFractionDigits;
+				$('#totalRealValuation').html(total.toLocaleString('fr-FR', {
+					maximumFractionDigits: currencyFractionDigits
+				}));
+			}
 
 		</script>
 		<?php

From 6462fd83067f07f9a7a667fcd3f7b55668be0c4a Mon Sep 17 00:00:00 2001
From: Quentin VIAL-GOUTEYRON <quentin.vial-gouteyron@atm-consulting.fr>
Date: Mon, 28 Mar 2022 16:02:18 +0200
Subject: [PATCH 6/8] update pmp real even if it's not edit

---
 htdocs/product/inventory/inventory.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/htdocs/product/inventory/inventory.php b/htdocs/product/inventory/inventory.php
index 536aaf7d354..895ff8105cd 100644
--- a/htdocs/product/inventory/inventory.php
+++ b/htdocs/product/inventory/inventory.php
@@ -268,6 +268,8 @@ if (empty($reshook)) {
 					$result = $inventoryline->fetch($lineid);
 					if ($result > 0) {
 						$inventoryline->qty_view = null;			// The new value we want
+						$inventoryline->pmp_real = price2num(GETPOST('realpmp_'.$lineid, 'alpha'), 'MS');
+						$inventoryline->pmp_expected = price2num(GETPOST('expectedpmp_'.$lineid, 'alpha'), 'MS');
 						$resultupdate = $inventoryline->update($user);
 					}
 				}

From 67e7c91c3ed34b1c8a0f94c0e5032e4ee7ce8edb Mon Sep 17 00:00:00 2001
From: Quentin VIAL-GOUTEYRON <quentin.vial-gouteyron@atm-consulting.fr>
Date: Mon, 11 Apr 2022 15:47:38 +0200
Subject: [PATCH 7/8] pmp inventory conf MAIN_PRODUCT_PERENTITY_SHARED

---
 htdocs/product/inventory/inventory.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/htdocs/product/inventory/inventory.php b/htdocs/product/inventory/inventory.php
index 2b21de99079..77cdc965164 100644
--- a/htdocs/product/inventory/inventory.php
+++ b/htdocs/product/inventory/inventory.php
@@ -194,6 +194,15 @@ if (empty($reshook)) {
 								setEventMessages($db->lasterror(), null, 'errors');
 								break;
 							}
+                            if(!empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) {
+                                $sqlpmp = 'UPDATE '.MAIN_DB_PREFIX.'product_perentity SET pmp = '.((float) $line->pmp_real).' WHERE fk_product = '.((int) $line->fk_product).' AND entity='.$conf->entity;
+                                $resqlpmp = $db->query($sqlpmp);
+                                if (! $resqlpmp) {
+                                    $error++;
+                                    setEventMessages($db->lasterror(), null, 'errors');
+                                    break;
+                                }
+                            }
 						}
 
 						// Update line with id of stock movement (and the start quantity if it has changed this last recording)

From ddb50264aeb5c132ec89aa39c09c074f0b65e234 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Mon, 11 Apr 2022 13:58:59 +0000
Subject: [PATCH 8/8] Fixing style errors.

---
 htdocs/product/inventory/inventory.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/htdocs/product/inventory/inventory.php b/htdocs/product/inventory/inventory.php
index 77cdc965164..9cef5671041 100644
--- a/htdocs/product/inventory/inventory.php
+++ b/htdocs/product/inventory/inventory.php
@@ -194,15 +194,15 @@ if (empty($reshook)) {
 								setEventMessages($db->lasterror(), null, 'errors');
 								break;
 							}
-                            if(!empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) {
-                                $sqlpmp = 'UPDATE '.MAIN_DB_PREFIX.'product_perentity SET pmp = '.((float) $line->pmp_real).' WHERE fk_product = '.((int) $line->fk_product).' AND entity='.$conf->entity;
-                                $resqlpmp = $db->query($sqlpmp);
-                                if (! $resqlpmp) {
-                                    $error++;
-                                    setEventMessages($db->lasterror(), null, 'errors');
-                                    break;
-                                }
-                            }
+							if (!empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) {
+								$sqlpmp = 'UPDATE '.MAIN_DB_PREFIX.'product_perentity SET pmp = '.((float) $line->pmp_real).' WHERE fk_product = '.((int) $line->fk_product).' AND entity='.$conf->entity;
+								$resqlpmp = $db->query($sqlpmp);
+								if (! $resqlpmp) {
+									$error++;
+									setEventMessages($db->lasterror(), null, 'errors');
+									break;
+								}
+							}
 						}
 
 						// Update line with id of stock movement (and the start quantity if it has changed this last recording)