From 148645d220fc6e1edd4c343e2d879b7e6f2c4923 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 31 Mar 2023 12:10:48 +0200
Subject: [PATCH 1/6] Fix error 500 on payment

---
 htdocs/public/payment/paymentko.php | 4 +++-
 htdocs/public/payment/paymentok.php | 8 ++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/htdocs/public/payment/paymentko.php b/htdocs/public/payment/paymentko.php
index 4174267a769..05dc401d158 100644
--- a/htdocs/public/payment/paymentko.php
+++ b/htdocs/public/payment/paymentko.php
@@ -131,7 +131,9 @@ dol_syslog("Callback url when an online payment is refused or canceled. query_st
 
 $tracepost = "";
 foreach ($_POST as $k => $v) {
-	$tracepost .= "{$k} - {$v}\n";
+	if (is_scalar($k) && is_scalar($v)) {
+		$tracepost .= "{$k} - {$v}\n";
+	}
 }
 dol_syslog("POST=".$tracepost, LOG_DEBUG, 0, '_payment');
 
diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index e596fd3d261..e19fd856f23 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -173,12 +173,16 @@ dol_syslog("_SERVER[SERVER_ADDR] = ".(empty($_SERVER["SERVER_ADDR"]) ? '' : dol_
 
 $tracepost = "";
 foreach ($_POST as $k => $v) {
-	$tracepost .= "{$k} - {$v}\n";
+	if (is_scalar($k) && is_scalar($v)) {
+		$tracepost .= "{$k} - {$v}\n";
+	}
 }
 dol_syslog("POST=".$tracepost, LOG_DEBUG, 0, '_payment');
 $tracesession = "";
 foreach ($_SESSION as $k => $v) {
-	$tracesession .= "{$k} - {$v}\n";
+	if (is_scalar($k) && is_scalar($v)) {
+		$tracesession .= "{$k} - {$v}\n";
+	}
 }
 dol_syslog("SESSION=".$tracesession, LOG_DEBUG, 0, '_payment');
 

From e9d92531478c998448feca24c56510327b4c17eb Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Fri, 31 Mar 2023 12:36:43 +0200
Subject: [PATCH 2/6] fix : Warning: Undefined array key align in
 /home/httpd/vhosts/aflac.fr/domains/dev.aflac.fr/httpdocs/core/class/commondocgenerator.class.php
 on line 1575

---
 htdocs/core/class/commondocgenerator.class.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index 1b59d44bdde..2278a1de8dc 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -1567,17 +1567,21 @@ abstract class CommonDocGenerator
 						// set cell padding with column title definition
 						$pdf->setCellPaddings($colDef['title']['padding'][3], $colDef['title']['padding'][0], $colDef['title']['padding'][1], $colDef['title']['padding'][2]);
 					}
-
+					if (isset($colDef['title']['align'])) {
+						$align = $colDef['title']['align'];
+					} else {
+						$align = '';
+					}
 					$pdf->SetXY($colDef['xStartPos'], $tab_top);
 					$textWidth = $colDef['width'];
-					$pdf->MultiCell($textWidth, 2, $colDef['title']['label'], '', $colDef['title']['align']);
+					$pdf->MultiCell($textWidth, 2, $colDef['title']['label'], '', $align);
 
 					// Add variant of translation if $outputlangsbis is an object
 					if (is_object($outputlangsbis) && trim($colDef['title']['label'])) {
 						$pdf->setCellPaddings($colDef['title']['padding'][3], 0, $colDef['title']['padding'][1], $colDef['title']['padding'][2]);
 						$pdf->SetXY($colDef['xStartPos'], $pdf->GetY());
 						$textbis = $outputlangsbis->transnoentities($colDef['title']['textkey']);
-						$pdf->MultiCell($textWidth, 2, $textbis, '', $colDef['title']['align']);
+						$pdf->MultiCell($textWidth, 2, $textbis, '', $align);
 					}
 
 					$this->tabTitleHeight = max($pdf->GetY() - $tab_top, $this->tabTitleHeight);

From a823b10b58682623147d3f1e3dffec358de61b86 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 31 Mar 2023 12:41:52 +0200
Subject: [PATCH 3/6] Fix load lang

---
 htdocs/eventorganization/conferenceorboothattendee_list.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/htdocs/eventorganization/conferenceorboothattendee_list.php b/htdocs/eventorganization/conferenceorboothattendee_list.php
index 1bc9c12d4f6..fc8db4ff6b3 100644
--- a/htdocs/eventorganization/conferenceorboothattendee_list.php
+++ b/htdocs/eventorganization/conferenceorboothattendee_list.php
@@ -41,11 +41,8 @@ if (isModEnabled('categorie')) {
 
 global $dolibarr_main_url_root;
 
-// for other modules
-//dol_include_once('/othermodule/class/otherobject.class.php');
-
 // Load translation files required by the page
-$langs->loadLangs(array("eventorganization", "other", "projects"));
+$langs->loadLangs(array("eventorganization", "other", "projects", "bills"));
 
 // Get Paramters
 $action      = GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'view';   // The action 'add', 'create', 'edit', 'update', 'view', ...

From d388ac58beac00a71a6317f90bb89de7a06f09b8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 31 Mar 2023 13:31:23 +0200
Subject: [PATCH 4/6] Fix public pages

---
 .../public/eventorganization/attendee_new.php |  53 ++++----
 htdocs/public/project/index.php               | 118 ++++++++++++++++--
 htdocs/public/project/suggestbooth.php        |  61 ++++++---
 htdocs/public/project/suggestconference.php   |  68 +++++++---
 4 files changed, 234 insertions(+), 66 deletions(-)

diff --git a/htdocs/public/eventorganization/attendee_new.php b/htdocs/public/eventorganization/attendee_new.php
index a345897070c..1b9a555f246 100644
--- a/htdocs/public/eventorganization/attendee_new.php
+++ b/htdocs/public/eventorganization/attendee_new.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2021		Dorian Vabre			<dorian.vabre@gmail.com>
+ * Copyright (C) 2023		Laurent Destailleur		<eldy@users.sourceforge.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -680,22 +681,25 @@ $formcompany = new FormCompany($db);
 
 llxHeaderVierge($langs->trans("NewRegistration"));
 
-print '<br>';
-print load_fiche_titre($langs->trans("NewRegistration"), '', '', 0, 0, 'center');
-
 
 print '<div align="center">';
 print '<div id="divsubscribe">';
-print '<div class="center subscriptionformhelptext justify">';
 
+// Sub banner
+print '<div class="center subscriptionformbanner subbanner justify margintoponly paddingtop marginbottomonly padingbottom">';
+print load_fiche_titre($langs->trans("NewRegistration"), '', '', 0, 0, 'center');
 // Welcome message
 print '<span class="opacitymedium">'.$langs->trans("EvntOrgWelcomeMessage").'</span>';
 print '<br>';
-
 // Title
-print '<span class="eventlabel">'.dol_escape_htmltag($project->title . ' '. $conference->label).'</span><br>';
+print '<span class="eventlabel large">'.dol_escape_htmltag($project->title . ' '. $conference->label).'</span><br>';
+print '</div>';
+
+// Help text
+print '<div class="justify subscriptionformhelptext">';
+
 if ($project->date_start_event || $project->date_end_event) {
-	print '<br><span class="fa fa-calendar pictofixedwidth"></span>';
+	print '<br><span class="fa fa-calendar pictofixedwidth opacitymedium"></span>';
 }
 if ($project->date_start_event) {
 	$format = 'day';
@@ -720,29 +724,31 @@ if ($project->date_start_event || $project->date_end_event) {
 	print '<br>';
 }
 if ($project->location) {
-	print '<span class="fa fa-map-marked-alt pictofixedwidth"></span>'.dol_escape_htmltag($project->location).'<br>';
+	print '<span class="fa fa-map-marked-alt pictofixedwidth opacitymedium"></span>'.dol_escape_htmltag($project->location).'<br>';
 }
 
+print '</div>';
+
+
 $maxattendees = 0;
 if ($conference->id > 0) {
 	/* date of project is not  date of event so commented
-	print $langs->trans("Date").': ';
-	print dol_print_date($conference->datep);
-	if ($conference->date_end) {
-		print ' - ';
-		print dol_print_date($conference->datef);
-	}*/
+	 print $langs->trans("Date").': ';
+	 print dol_print_date($conference->datep);
+	 if ($conference->date_end) {
+	 print ' - ';
+	 print dol_print_date($conference->datef);
+	 }*/
 } else {
 	/* date of project is not  date of event so commented
-	print $langs->trans("Date").': ';
-	print dol_print_date($project->date_start);
-	if ($project->date_end) {
-		print ' - ';
-		print dol_print_date($project->date_end);
-	}*/
+	 print $langs->trans("Date").': ';
+	 print dol_print_date($project->date_start);
+	 if ($project->date_end) {
+	 print ' - ';
+	 print dol_print_date($project->date_end);
+	 }*/
 	$maxattendees = $project->max_attendees;	// Max attendeed for the project/event
 }
-print '</div>';
 
 if ($maxattendees && $currentnbofattendees >= $maxattendees) {
 	print '<br>';
@@ -884,12 +890,15 @@ if ((!empty($conference->id) && $conference->status == ConferenceOrBooth::STATUS
 		print "</form>\n";
 
 		print "<br>";
-		print '</div></div>';
 	}
 } else {
+	print '<br><br>';
 	print $langs->trans("ConferenceIsNotConfirmed");
+	print '<br><br>';
 }
 
+print '</div></div>';
+
 llxFooterVierge();
 
 $db->close();
diff --git a/htdocs/public/project/index.php b/htdocs/public/project/index.php
index dfcfde94b17..3488fe8e4c4 100644
--- a/htdocs/public/project/index.php
+++ b/htdocs/public/project/index.php
@@ -124,10 +124,14 @@ $conf->dol_hide_topmenu = 1;
 $conf->dol_hide_leftmenu = 1;
 
 $replacemainarea = (empty($conf->dol_hide_leftmenu) ? '<div>' : '').'<div>';
-llxHeader($head, $langs->trans("SuggestForm"), '', '', 0, 0, '', '', '', 'onlinepaymentbody', $replacemainarea);
+
+
+llxHeaderVierge($langs->trans("SuggestForm"));
+
 
 print '<span id="dolpaymentspan"></span>'."\n";
 print '<div class="center">'."\n";
+
 print '<form id="dolpaymentform" class="center" name="paymentform" action="'.$_SERVER["PHP_SELF"].'" method="POST">'."\n";
 print '<input type="hidden" name="token" value="'.newToken().'">'."\n";
 print '<input type="hidden" name="action" value="dopayment">'."\n";
@@ -150,7 +154,7 @@ if (!empty($conf->global->$paramlogo)) {
 } elseif (!empty($conf->global->ONLINE_PAYMENT_LOGO)) {
 	$logosmall = $conf->global->ONLINE_PAYMENT_LOGO;
 }
-//print '<!-- Show logo (logosmall='.$logosmall.' logo='.$logo.') -->'."\n";
+//print '- Show logo (logosmall='.$logosmall.' logo='.$logo.') '."\n";
 // Define urllogo
 $urllogo = '';
 $urllogofull = '';
@@ -184,21 +188,55 @@ if (!empty($conf->global->PROJECT_IMAGE_PUBLIC_ORGANIZEDEVENT)) {
 print '<br>';
 
 
+print '<div align="center">';
+print '<div id="divsubscribe">';
+
+
 // Event summary
 print '<div class="center">';
-print '<span class="large">'.$project->title.'</span><br>';
-print img_picto('', 'calendar', 'class="pictofixedwidth"').$langs->trans("Date").': ';
-print dol_print_date($project->date_start, 'daytext');
-if ($project->date_end && $project->date_start != $project->date_end) {
-	print ' - '.dol_print_date($project->date_end, 'daytext');
-}
+print '<span class="eventlabel large">'.dol_escape_htmltag($project->title . ' '. $project->label).'</span><br>';
 print '<br><br>'."\n";
-print $langs->trans("EvntOrgRegistrationWelcomeMessage")."\n";
+print '<span class="opacitymedium">'.$langs->trans("EvntOrgRegistrationWelcomeMessage")."</span>\n";
 print $project->note_public."\n";
 //print img_picto('', 'map-marker-alt').$langs->trans("Location").': xxxx';
 print '</div>';
 
 
+// Help text
+print '<div class="center subscriptionformhelptext">';
+
+if ($project->date_start_event || $project->date_end_event) {
+	print '<br><span class="fa fa-calendar pictofixedwidth opacitymedium"></span>';
+}
+if ($project->date_start_event) {
+	$format = 'day';
+	$tmparray = dol_getdate($project->date_start_event, false, '');
+	if ($tmparray['hours'] || $tmparray['minutes'] || $tmparray['minutes']) {
+		$format = 'dayhour';
+	}
+	print dol_print_date($project->date_start_event, $format);
+}
+if ($project->date_start_event && $project->date_end_event) {
+	print ' - ';
+}
+if ($project->date_end_event) {
+	$format = 'day';
+	$tmparray = dol_getdate($project->date_end_event, false, '');
+	if ($tmparray['hours'] || $tmparray['minutes'] || $tmparray['minutes']) {
+		$format = 'dayhour';
+	}
+	print dol_print_date($project->date_end_event, $format);
+}
+if ($project->date_start_event || $project->date_end_event) {
+	print '<br>';
+}
+if ($project->location) {
+	print '<span class="fa fa-map-marked-alt pictofixedwidth opacitymedium"></span>'.dol_escape_htmltag($project->location).'<br>';
+}
+
+print '</div>';
+
+
 print '<br>';
 
 print '<table id="dolpaymenttable" summary="Payment form" class="center">'."\n";
@@ -245,6 +283,10 @@ print '</td></tr>'."\n";
 
 print '</table>'."\n";
 
+
+print '</div></div>';
+
+
 print '</form>'."\n";
 print '</div>'."\n";
 print '<br>';
@@ -255,3 +297,61 @@ htmlPrintOnlinePaymentFooter($mysoc, $langs, 1, $suffix, $object);
 llxFooter('', 'public');
 
 $db->close();
+
+
+
+/**
+ * Show header for new member
+ *
+ * @param 	string		$title				Title
+ * @param 	string		$head				Head array
+ * @param 	int    		$disablejs			More content into html header
+ * @param 	int    		$disablehead		More content into html header
+ * @param 	array  		$arrayofjs			Array of complementary js files
+ * @param 	array  		$arrayofcss			Array of complementary css files
+ * @return	void
+ */
+function llxHeaderVierge($title, $head = "", $disablejs = 0, $disablehead = 0, $arrayofjs = '', $arrayofcss = '')
+{
+	global $user, $conf, $langs, $mysoc;
+
+	top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss); // Show html headers
+
+	print '<body id="mainbody" class="publicnewmemberform">';
+
+	// Define urllogo
+	$urllogo = DOL_URL_ROOT.'/theme/common/login_logo.png';
+
+	if (!empty($mysoc->logo_small) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small)) {
+		$urllogo = DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=mycompany&amp;file='.urlencode('logos/thumbs/'.$mysoc->logo_small);
+	} elseif (!empty($mysoc->logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$mysoc->logo)) {
+		$urllogo = DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=mycompany&amp;file='.urlencode('logos/'.$mysoc->logo);
+	} elseif (is_readable(DOL_DOCUMENT_ROOT.'/theme/dolibarr_logo.svg')) {
+		$urllogo = DOL_URL_ROOT.'/theme/dolibarr_logo.svg';
+	}
+
+	print '<div class="center">';
+
+	// Output html code for logo
+	if ($urllogo) {
+		print '<div class="backgreypublicpayment">';
+		print '<div class="logopublicpayment">';
+		print '<img id="dolpaymentlogo" src="'.$urllogo.'"';
+		print '>';
+		print '</div>';
+		if (empty($conf->global->MAIN_HIDE_POWERED_BY)) {
+			print '<div class="poweredbypublicpayment opacitymedium right"><a class="poweredbyhref" href="https://www.dolibarr.org?utm_medium=website&utm_source=poweredby" target="dolibarr" rel="noopener">'.$langs->trans("PoweredBy").'<br><img class="poweredbyimg" src="'.DOL_URL_ROOT.'/theme/dolibarr_logo.svg" width="80px"></a></div>';
+		}
+		print '</div>';
+	}
+
+	if (!empty($conf->global->PROJECT_IMAGE_PUBLIC_SUGGEST_CONFERENCE)) {
+		print '<div class="backimagepublicsuggestconference">';
+		print '<img id="idPROJECT_IMAGE_PUBLIC_SUGGEST_CONFERENCE" src="'.$conf->global->PROJECT_IMAGE_PUBLIC_SUGGEST_CONFERENCE.'">';
+		print '</div>';
+	}
+
+	print '</div>';
+
+	print '<div class="divmainbodylarge">';
+}
diff --git a/htdocs/public/project/suggestbooth.php b/htdocs/public/project/suggestbooth.php
index 0b2e24716d5..772822374d4 100644
--- a/htdocs/public/project/suggestbooth.php
+++ b/htdocs/public/project/suggestbooth.php
@@ -477,6 +477,7 @@ if (empty($reshook) && $action == 'add') {
 			}
 		}
 	}
+
 	if (!$error) {
 		$db->commit();
 
@@ -542,30 +543,61 @@ $formcompany = new FormCompany($db);
 
 llxHeaderVierge($langs->trans("NewSuggestionOfBooth"));
 
+
+print '<div align="center">';
+print '<div id="divsubscribe">';
+
 print '<br>';
 
 // Event summary
 print '<div class="center">';
-print '<span class="large">'.$project->title.'</span><br>';
-print img_picto('', 'calendar', 'class="pictofixedwidth"').$langs->trans("Date").': ';
-print dol_print_date($project->date_start, 'daytext');
-if ($project->date_end && $project->date_start != $project->date_end) {
-	print ' - '.dol_print_date($project->date_end, 'daytext');
-}
+print '<span class="eventlabel large">'.dol_escape_htmltag($project->title . ' '. $project->label).'</span><br>';
 print '<br><br>'."\n";
-//print $langs->trans("EvntOrgRegistrationWelcomeMessage")."\n";
-//print $project->note_public."\n";
+print '<span class="opacitymedium">'.$langs->trans("EvntOrgRegistrationWelcomeMessage")."</span>\n";
+print $project->note_public."\n";
 //print img_picto('', 'map-marker-alt').$langs->trans("Location").': xxxx';
 print '</div>';
 
 
+// Help text
+print '<div class="center subscriptionformhelptext">';
+
+if ($project->date_start_event || $project->date_end_event) {
+	print '<br><span class="fa fa-calendar pictofixedwidth opacitymedium"></span>';
+}
+if ($project->date_start_event) {
+	$format = 'day';
+	$tmparray = dol_getdate($project->date_start_event, false, '');
+	if ($tmparray['hours'] || $tmparray['minutes'] || $tmparray['minutes']) {
+		$format = 'dayhour';
+	}
+	print dol_print_date($project->date_start_event, $format);
+}
+if ($project->date_start_event && $project->date_end_event) {
+	print ' - ';
+}
+if ($project->date_end_event) {
+	$format = 'day';
+	$tmparray = dol_getdate($project->date_end_event, false, '');
+	if ($tmparray['hours'] || $tmparray['minutes'] || $tmparray['minutes']) {
+		$format = 'dayhour';
+	}
+	print dol_print_date($project->date_end_event, $format);
+}
+if ($project->date_start_event || $project->date_end_event) {
+	print '<br>';
+}
+if ($project->location) {
+	print '<span class="fa fa-map-marked-alt pictofixedwidth opacitymedium"></span>'.dol_escape_htmltag($project->location).'<br>';
+}
+
+print '</div>';
+
+print '<br>';
+
 print load_fiche_titre($langs->trans("NewSuggestionOfBooth"), '', '', 0, 0, 'center');
 
 
-print '<div align="center">';
-print '<div id="divsubscribe">';
-print '<div class="center subscriptionformhelptext opacitymedium justify">';
-
 dol_htmloutput_errors($errmsg);
 
 // Print form
@@ -576,7 +608,6 @@ print '<input type="hidden" name="action" value="add" />';
 print '<input type="hidden" name="id" value="'.$id.'" />';
 print '<input type="hidden" name="securekey" value="'.$securekeyreceived.'" />';
 
-print '<br>';
 
 print '<br><span class="opacitymedium">'.$langs->trans("FieldsWithAreMandatory", '*').'</span><br>';
 //print $langs->trans("FieldsWithIsForPublic",'**').'<br>';
@@ -616,8 +647,7 @@ print $formcompany->select_ziptown(GETPOST('town'), 'town', array('zipcode', 'se
 print '</td></tr>';
 // Country
 print '<tr><td>'.$langs->trans('Country');
-print '<span style="color:red">*</span>';
-
+print '<span class="star">*</span>';
 print '</td><td>';
 $country_id = GETPOST('country_id');
 if (!$country_id && !empty($conf->global->MEMBER_NEWFORM_FORCECOUNTRYCODE)) {
@@ -670,7 +700,6 @@ print '</div>';
 print '<br><br>';
 
 
-
 print "</form>\n";
 print "<br>";
 print '</div></div>';
diff --git a/htdocs/public/project/suggestconference.php b/htdocs/public/project/suggestconference.php
index b3418ec9e84..77196c8c6fa 100644
--- a/htdocs/public/project/suggestconference.php
+++ b/htdocs/public/project/suggestconference.php
@@ -72,8 +72,8 @@ $email = GETPOST("email");
 $societe = GETPOST("societe");
 $label = GETPOST("label");
 $note = GETPOST("note");
-$datestart = GETPOST("datestart");
-$dateend = GETPOST("dateend");
+$datestart = dol_mktime(0, 0, 0, GETPOST('datestartmonth', 'int'), GETPOST('datestartday', 'int'), GETPOST('datestartyear', 'int'));
+$dateend = dol_mktime(23, 59, 59, GETPOST('dateendmonth', 'int'), GETPOST('dateendday', 'int'), GETPOST('dateendyear', 'int'));
 
 $id = GETPOST('id');
 
@@ -454,6 +454,7 @@ if (empty($reshook) && $action == 'add') {
 			}
 		}
 	}
+
 	if (!$error) {
 		$db->commit();
 		$securekeyurl = dol_hash($conf->global->EVENTORGANIZATION_SECUREKEY.'conferenceorbooth'.$id, 2);
@@ -475,29 +476,60 @@ $formcompany = new FormCompany($db);
 
 llxHeaderVierge($langs->trans("NewSuggestionOfConference"));
 
+
+print '<div align="center">';
+print '<div id="divsubscribe">';
+
 print '<br>';
 
 // Event summary
 print '<div class="center">';
-print '<span class="large">'.$project->title.'</span><br>';
-print img_picto('', 'calendar', 'class="pictofixedwidth"').$langs->trans("Date").': ';
-print dol_print_date($project->date_start, 'daytext');
-if ($project->date_end && $project->date_start != $project->date_end) {
-	print ' - '.dol_print_date($project->date_end, 'daytext');
-}
+print '<span class="eventlabel large">'.dol_escape_htmltag($project->title . ' '. $project->label).'</span><br>';
 print '<br><br>'."\n";
-//print $langs->trans("EvntOrgRegistrationWelcomeMessage")."\n";
-//print $project->note_public."\n";
+print '<span class="opacitymedium">'.$langs->trans("EvntOrgRegistrationWelcomeMessage")."</span>\n";
+print $project->note_public."\n";
 //print img_picto('', 'map-marker-alt').$langs->trans("Location").': xxxx';
 print '</div>';
 
+// Help text
+print '<div class="center subscriptionformhelptext">';
+
+if ($project->date_start_event || $project->date_end_event) {
+	print '<br><span class="fa fa-calendar pictofixedwidth opacitymedium"></span>';
+}
+if ($project->date_start_event) {
+	$format = 'day';
+	$tmparray = dol_getdate($project->date_start_event, false, '');
+	if ($tmparray['hours'] || $tmparray['minutes'] || $tmparray['minutes']) {
+		$format = 'dayhour';
+	}
+	print dol_print_date($project->date_start_event, $format);
+}
+if ($project->date_start_event && $project->date_end_event) {
+	print ' - ';
+}
+if ($project->date_end_event) {
+	$format = 'day';
+	$tmparray = dol_getdate($project->date_end_event, false, '');
+	if ($tmparray['hours'] || $tmparray['minutes'] || $tmparray['minutes']) {
+		$format = 'dayhour';
+	}
+	print dol_print_date($project->date_end_event, $format);
+}
+if ($project->date_start_event || $project->date_end_event) {
+	print '<br>';
+}
+if ($project->location) {
+	print '<span class="fa fa-map-marked-alt pictofixedwidth opacitymedium"></span>'.dol_escape_htmltag($project->location).'<br>';
+}
+
+print '</div>';
+
+print '<br>';
 
 print load_fiche_titre($langs->trans("NewSuggestionOfConference"), '', '', 0, 0, 'center');
 
 
-print '<div align="center">';
-print '<div id="divsubscribe">';
-print '<div class="center subscriptionformhelptext opacitymedium justify">';
 
 dol_htmloutput_errors($errmsg, $errors);
 
@@ -509,8 +541,6 @@ print '<input type="hidden" name="action" value="add" />';
 print '<input type="hidden" name="id" value="'.$id.'" />';
 print '<input type="hidden" name="securekey" value="'.$securekeyreceived.'" />';
 
-print '<br>';
-
 print '<br><span class="opacitymedium">'.$langs->trans("FieldsWithAreMandatory", '*').'</span><br>';
 //print $langs->trans("FieldsWithIsForPublic",'**').'<br>';
 
@@ -585,11 +615,11 @@ if (empty($conf->global->SOCIETE_DISABLE_STATE)) {
 print '<tr><td>'.$langs->trans("Format").'<span style="color: red">*</span></td>'."\n";
 print '<td>'.Form::selectarray('eventtype', $arrayofconfboothtype, $eventtype, 1).'</td>';
 // Label
-print '<tr><td>'.$langs->trans("LabelOfconference").'<span style="color: red">*</span></td>'."\n";
-print '</td><td><input type="text" name="label" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('label')).'"></td></tr>'."\n";
+print '<tr><td>'.$langs->trans("LabelOfconference").'<span class="star">*</span></td>'."\n";
+print '</td><td><input type="text" name="label" class="minwidth300" value="'.dol_escape_htmltag(GETPOST('label')).'"></td></tr>'."\n";
 // Note
-print '<tr><td>'.$langs->trans("Description").'<span style="color: red">*</span></td>'."\n";
-print '<td><textarea name="note" id="note" wrap="soft" class="quatrevingtpercent" rows="'.ROWS_3.'">'.dol_escape_htmltag(GETPOST('note', 'restricthtml'), 0, 1).'</textarea></td></tr>'."\n";
+print '<tr><td>'.$langs->trans("Description").'<span class="star">*</span></td>'."\n";
+print '<td><textarea name="note" id="note" wrap="soft" class="quatrevingtpercent" rows="'.ROWS_4.'">'.dol_escape_htmltag(GETPOST('note', 'restricthtml'), 0, 1).'</textarea></td></tr>'."\n";
 
 print "</table>\n";
 

From 96d23fac5f9fa8fa307e8c8cc50af3115a9257fa Mon Sep 17 00:00:00 2001
From: Marc de Lima Lucio <68746600+marc-dll@users.noreply.github.com>
Date: Fri, 31 Mar 2023 16:57:03 +0200
Subject: [PATCH 5/6] FIX: project referent elements list: conf to hide tasks
 was flipped

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

diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php
index 935275bfe54..1bdefbcc1e6 100644
--- a/htdocs/projet/element.php
+++ b/htdocs/projet/element.php
@@ -580,7 +580,7 @@ $listofreferent = array(
 	'urlnew'=>DOL_URL_ROOT.'/projet/tasks/time.php?withproject=1&action=createtime&projectid='.$id.'&backtopage='.urlencode($_SERVER['PHP_SELF'].'?id='.$id),
 	'buttonnew'=>'AddTimeSpent',
 	'testnew'=>$user->hasRight('project', 'creer'),
-	'test'=>!empty($conf->project->enabled) && $user->hasRight('projet', 'lire') && !empty($conf->global->PROJECT_HIDE_TASKS)),
+	'test'=>!empty($conf->project->enabled) && $user->hasRight('projet', 'lire') && empty($conf->global->PROJECT_HIDE_TASKS)),
 'stock_mouvement'=>array(
 	'name'=>"MouvementStockAssociated",
 	'title'=>"ListMouvementStockProject",

From 6c589955a679506792676256fe992dff30c0054a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 1 Apr 2023 15:00:54 +0200
Subject: [PATCH 6/6] FIX Autofill / clear qty in inventory page

---
 htdocs/product/inventory/inventory.php | 1516 ++++++++++++------------
 1 file changed, 761 insertions(+), 755 deletions(-)

diff --git a/htdocs/product/inventory/inventory.php b/htdocs/product/inventory/inventory.php
index 506b6e0c198..5f72928ed13 100644
--- a/htdocs/product/inventory/inventory.php
+++ b/htdocs/product/inventory/inventory.php
@@ -428,772 +428,779 @@ $help_url = '';
 llxHeader('', $langs->trans('Inventory'), $help_url);
 
 // Part to show record
-if ($object->id > 0) {
-	$res = $object->fetch_optionals();
-
-	$head = inventoryPrepareHead($object);
-	print dol_get_fiche_head($head, 'inventory', $langs->trans("Inventory"), -1, 'stock');
-
-	$formconfirm = '';
-
-	// Confirmation to delete
-	if ($action == 'delete') {
-		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteInventory'), $langs->trans('ConfirmDeleteOrder'), 'confirm_delete', '', 0, 1);
-	}
-	// Confirmation to delete line
-	if ($action == 'deleteline') {
-		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&lineid='.$lineid.'&page='.$page.$paramwithsearch, $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_deleteline', '', 0, 1);
-	}
-
-	// Clone confirmation
-	if ($action == 'clone') {
-		// Create an array for form
-		$formquestion = array();
-		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneMyObject', $object->ref), 'confirm_clone', $formquestion, 'yes', 1);
-	}
-
-	// Confirmation to close
-	if ($action == 'record') {
-		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('Close'), $langs->trans('ConfirmFinish'), 'update', '', 0, 1);
-		$action = 'view';
-	}
-
-	// Confirmation to close
-	if ($action == 'confirm_cancel') {
-		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('Cancel'), $langs->trans('ConfirmCancel'), 'cancel_record', '', 0, 1);
-		$action = 'view';
-	}
-
-	// Call Hook formConfirm
-	$parameters = array('formConfirm' => $formconfirm, 'lineid' => $lineid);
-	$reshook = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-	if (empty($reshook)) {
-		$formconfirm .= $hookmanager->resPrint;
-	} elseif ($reshook > 0) {
-		$formconfirm = $hookmanager->resPrint;
-	}
-
-	// Print form confirm
-	print $formconfirm;
+if ($object->id <= 0) {
+	dol_print_error('', 'Bad value for object id');
+	exit;
+}
 
 
-	// Object card
-	// ------------------------------------------------------------
-	$linkback = '<a href="'.DOL_URL_ROOT.'/product/inventory/list.php">'.$langs->trans("BackToList").'</a>';
+$res = $object->fetch_optionals();
 
-	$morehtmlref = '<div class="refidno">';
-	/*
-	// Ref bis
-	$morehtmlref.=$form->editfieldkey("RefBis", 'ref_client', $object->ref_client, $object, $user->rights->inventory->creer, 'string', '', 0, 1);
-	$morehtmlref.=$form->editfieldval("RefBis", 'ref_client', $object->ref_client, $object, $user->rights->inventory->creer, 'string', '', null, null, '', 1);
-	// Thirdparty
-	$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $soc->getNomUrl(1);
-	// Project
-	if (!empty($conf->project->enabled))
+$head = inventoryPrepareHead($object);
+print dol_get_fiche_head($head, 'inventory', $langs->trans("Inventory"), -1, 'stock');
+
+$formconfirm = '';
+
+// Confirmation to delete
+if ($action == 'delete') {
+	$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteInventory'), $langs->trans('ConfirmDeleteOrder'), 'confirm_delete', '', 0, 1);
+}
+// Confirmation to delete line
+if ($action == 'deleteline') {
+	$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&lineid='.$lineid.'&page='.$page.$paramwithsearch, $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_deleteline', '', 0, 1);
+}
+
+// Clone confirmation
+if ($action == 'clone') {
+	// Create an array for form
+	$formquestion = array();
+	$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneMyObject', $object->ref), 'confirm_clone', $formquestion, 'yes', 1);
+}
+
+// Confirmation to close
+if ($action == 'record') {
+	$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('Close'), $langs->trans('ConfirmFinish'), 'update', '', 0, 1);
+	$action = 'view';
+}
+
+// Confirmation to close
+if ($action == 'confirm_cancel') {
+	$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('Cancel'), $langs->trans('ConfirmCancel'), 'cancel_record', '', 0, 1);
+	$action = 'view';
+}
+
+// Call Hook formConfirm
+$parameters = array('formConfirm' => $formconfirm, 'lineid' => $lineid);
+$reshook = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+if (empty($reshook)) {
+	$formconfirm .= $hookmanager->resPrint;
+} elseif ($reshook > 0) {
+	$formconfirm = $hookmanager->resPrint;
+}
+
+// Print form confirm
+print $formconfirm;
+
+
+// Object card
+// ------------------------------------------------------------
+$linkback = '<a href="'.DOL_URL_ROOT.'/product/inventory/list.php">'.$langs->trans("BackToList").'</a>';
+
+$morehtmlref = '<div class="refidno">';
+/*
+// Ref bis
+$morehtmlref.=$form->editfieldkey("RefBis", 'ref_client', $object->ref_client, $object, $user->rights->inventory->creer, 'string', '', 0, 1);
+$morehtmlref.=$form->editfieldval("RefBis", 'ref_client', $object->ref_client, $object, $user->rights->inventory->creer, 'string', '', null, null, '', 1);
+// Thirdparty
+$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $soc->getNomUrl(1);
+// Project
+if (!empty($conf->project->enabled))
+{
+	$langs->load("projects");
+	$morehtmlref.='<br>'.$langs->trans('Project') . ' ';
+	if ($user->rights->inventory->creer)
 	{
-		$langs->load("projects");
-		$morehtmlref.='<br>'.$langs->trans('Project') . ' ';
-		if ($user->rights->inventory->creer)
+		if ($action != 'classify')
 		{
-			if ($action != 'classify')
-			{
-				$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&token='.newToken().'&id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
-				if ($action == 'classify') {
-					//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-					$morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-					$morehtmlref.='<input type="hidden" name="action" value="classin">';
-					$morehtmlref.='<input type="hidden" name="token" value="'.newToken().'">';
-					$morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-					$morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-					$morehtmlref.='</form>';
-				} else {
-					$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-				}
+			$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&token='.newToken().'&id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+			if ($action == 'classify') {
+				//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+				$morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+				$morehtmlref.='<input type="hidden" name="action" value="classin">';
+				$morehtmlref.='<input type="hidden" name="token" value="'.newToken().'">';
+				$morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+				$morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+				$morehtmlref.='</form>';
+			} else {
+				$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
 			}
+		}
+	} else {
+		if (!empty($object->fk_project)) {
+			$proj = new Project($db);
+			$proj->fetch($object->fk_project);
+			$morehtmlref.=$proj->getNomUrl();
 		} else {
-			if (!empty($object->fk_project)) {
-				$proj = new Project($db);
-				$proj->fetch($object->fk_project);
-				$morehtmlref.=$proj->getNomUrl();
-			} else {
-				$morehtmlref.='';
-			}
+			$morehtmlref.='';
 		}
 	}
-	*/
-	$morehtmlref .= '</div>';
+}
+*/
+$morehtmlref .= '</div>';
 
 
-	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
 
 
-	print '<div class="fichecenter">';
-	print '<div class="fichehalfleft">';
-	print '<div class="underbanner clearboth"></div>';
-	print '<table class="border centpercent tableforfield">'."\n";
+print '<div class="fichecenter">';
+print '<div class="fichehalfleft">';
+print '<div class="underbanner clearboth"></div>';
+print '<table class="border centpercent tableforfield">'."\n";
 
-	// Common attributes
-	include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_view.tpl.php';
+// Common attributes
+include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_view.tpl.php';
 
-	// Other attributes. Fields from hook formObjectOptions and Extrafields.
-	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
+// Other attributes. Fields from hook formObjectOptions and Extrafields.
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
 
-	//print '<tr><td class="titlefield fieldname_invcode">'.$langs->trans("InventoryCode").'</td><td>INV'.$object->id.'</td></tr>';
+//print '<tr><td class="titlefield fieldname_invcode">'.$langs->trans("InventoryCode").'</td><td>INV'.$object->id.'</td></tr>';
 
-	print '</table>';
-	print '</div>';
-	print '</div>';
+print '</table>';
+print '</div>';
+print '</div>';
 
-	print '<div class="clearboth"></div>';
+print '<div class="clearboth"></div>';
 
-	print dol_get_fiche_end();
+print dol_get_fiche_end();
 
-	print '<form id="formrecord" name="formrecord" method="POST" action="'.$_SERVER["PHP_SELF"].'?page='.$page.'&id='.$object->id.'">';
-	print '<input type="hidden" name="token" value="'.newToken().'">';
-	print '<input type="hidden" name="action" value="updateinventorylines">';
-	print '<input type="hidden" name="id" value="'.$object->id.'">';
-	if ($backtopage) {
-		print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
+print '<form id="formrecord" name="formrecord" method="POST" action="'.$_SERVER["PHP_SELF"].'?page='.$page.'&id='.$object->id.'">';
+print '<input type="hidden" name="token" value="'.newToken().'">';
+print '<input type="hidden" name="action" value="updateinventorylines">';
+print '<input type="hidden" name="id" value="'.$object->id.'">';
+if ($backtopage) {
+	print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
+}
+
+
+// Buttons for actions
+if ($action != 'record') {
+	print '<div class="tabsAction">'."\n";
+	$parameters = array();
+	$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+	if ($reshook < 0) {
+		setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 	}
 
-
-	// Buttons for actions
-	if ($action != 'record') {
-		print '<div class="tabsAction">'."\n";
-		$parameters = array();
-		$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-		if ($reshook < 0) {
-			setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-		}
-
-		if (empty($reshook)) {
-			if ($object->status == Inventory::STATUS_DRAFT) {
-				if ($permissiontoadd) {
-					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=confirm_validate&confirm=yes&token='.newToken().'">'.$langs->trans("Validate").' ('.$langs->trans("Start").')</a>'."\n";
-				} else {
-					print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Validate').' ('.$langs->trans("Start").')</a>'."\n";
-				}
-			}
-
-			// Save
-			if ($object->status == $object::STATUS_VALIDATED) {
-				if ($permissiontoadd) {
-					print '<a class="butAction classfortooltip" id="idbuttonmakemovementandclose" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=record&token='.newToken().'" title="'.dol_escape_htmltag($langs->trans("MakeMovementsAndClose")).'">'.$langs->trans("MakeMovementsAndClose").'</a>'."\n";
-				} else {
-					print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('MakeMovementsAndClose').'</a>'."\n";
-				}
-
-				if ($permissiontoadd) {
-					print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=confirm_cancel&token='.newToken().'">'.$langs->trans("Cancel").'</a>'."\n";
-				}
-			}
-		}
-		print '</div>'."\n";
-
-		if ($object->status != Inventory::STATUS_DRAFT && $object->status != Inventory::STATUS_VALIDATED) {
-			print '<br><br>';
-		}
-	}
-
-
-
-	if ($object->status == Inventory::STATUS_VALIDATED) {
-		print '<center>';
-		if (!empty($conf->use_javascript_ajax)) {
+	if (empty($reshook)) {
+		if ($object->status == Inventory::STATUS_DRAFT) {
 			if ($permissiontoadd) {
-				// Link to launch scan tool
-				if (isModEnabled('barcode') || isModEnabled('productbatch')) {
-					print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=updatebyscaning&token='.currentToken().'" class="marginrightonly paddingright marginleftonly paddingleft">'.img_picto('', 'barcode', 'class="paddingrightonly"').$langs->trans("UpdateByScaning").'</a>';
-				}
-
-				// Link to autofill
-				print '<a id="fillwithexpected" class="marginrightonly paddingright marginleftonly paddingleft" href="#">'.img_picto('', 'autofill', 'class="paddingrightonly"').$langs->trans('AutofillWithExpected').'</a>';
-				print '<script>';
-				print '$( document ).ready(function() {';
-				print '	$("#fillwithexpected").on("click",function fillWithExpected(){
-							$(".expectedqty").each(function(){
-								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();
-							return false;
-				        });';
-				print '});';
-				print '</script>';
-
-				// Link to reset qty
-				print '<a href="#" id="clearqty" class="marginrightonly paddingright marginleftonly paddingleft">'.img_picto('', 'eraser', 'class="paddingrightonly"').$langs->trans("ClearQtys").'</a>';
+				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=confirm_validate&confirm=yes&token='.newToken().'">'.$langs->trans("Validate").' ('.$langs->trans("Start").')</a>'."\n";
 			} else {
-				print '<a class="classfortooltip marginrightonly paddingright marginleftonly paddingleft" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("Save").'</a>'."\n";
+				print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Validate').' ('.$langs->trans("Start").')</a>'."\n";
 			}
 		}
-		print '<br>';
-		print '<br>';
-		print '</center>';
-	}
-
-
-	// Popup for mass barcode scanning
-	if ($action == 'updatebyscaning') {
-		if ($permissiontoadd) {
-			// Output the javascript to manage the scanner tool.
-			print '<script>';
-
-			print '
-			var duplicatedbatchcode = [];
-			var errortab1 = [];
-			var errortab2 = [];
-			var errortab3 = [];
-			var errortab4 = [];
-
-			function barcodescannerjs(){
-				console.log("We catch inputs in scanner box");
-				jQuery("#scantoolmessage").text();
-
-				var selectaddorreplace = $("select[name=selectaddorreplace]").val();
-				var barcodemode = $("input[name=barcodemode]:checked").val();
-				var barcodeproductqty = $("input[name=barcodeproductqty]").val();
-				var textarea = $("textarea[name=barcodelist]").val();
-				var textarray = textarea.split(/[\s,;]+/);
-				var tabproduct = [];
-				duplicatedbatchcode = [];
-				errortab1 = [];
-				errortab2 = [];
-				errortab3 = [];
-				errortab4 = [];
-
-				textarray = textarray.filter(function(value){
-					return value != "";
-				});
-				if(textarray.some((element) => element != "")){
-					$(".expectedqty").each(function(){
-						id = this.id;
-						console.log("Analyze the line "+id+" in inventory, barcodemode="+barcodemode);
-						warehouse = $("#"+id+"_warehouse").attr(\'data-ref\');
-						//console.log(warehouse);
-						productbarcode = $("#"+id+"_product").attr(\'data-barcode\');
-						//console.log(productbarcode);
-						productbatchcode = $("#"+id+"_batch").attr(\'data-batch\');
-						//console.log(productbatchcode);
-
-						if (barcodemode != "barcodeforproduct") {
-							tabproduct.forEach(product=>{
-								console.log("product.Batch="+product.Batch+" productbatchcode="+productbatchcode);
-								if(product.Batch != "" && product.Batch == productbatchcode){
-									console.log("duplicate batch code found for batch code "+productbatchcode);
-									duplicatedbatchcode.push(productbatchcode);
-								}
-							})
-						}
-						productinput = $("#"+id+"_input").val();
-						if(productinput == ""){
-							productinput = 0
-						}
-						tabproduct.push({\'Id\':id,\'Warehouse\':warehouse,\'Barcode\':productbarcode,\'Batch\':productbatchcode,\'Qty\':productinput,\'fetched\':false});
-					});
-
-					console.log("Loop on each record entered in the textarea");
-					textarray.forEach(function(element,index){
-						console.log("Process record element="+element+" id="+id);
-						var verify_batch = false;
-						var verify_barcode = false;
-						switch(barcodemode){
-							case "barcodeforautodetect":
-								verify_barcode = barcodeserialforproduct(tabproduct,index,element,barcodeproductqty,selectaddorreplace,"barcode",true);
-								verify_batch = barcodeserialforproduct(tabproduct,index,element,barcodeproductqty,selectaddorreplace,"lotserial",true);
-								break;
-							case "barcodeforproduct":
-								verify_barcode = barcodeserialforproduct(tabproduct,index,element,barcodeproductqty,selectaddorreplace,"barcode");
-								break;
-							case "barcodeforlotserial":
-								verify_batch = barcodeserialforproduct(tabproduct,index,element,barcodeproductqty,selectaddorreplace,"lotserial");
-								break;
-							default:
-								alert(\''.dol_escape_js($langs->trans("ErrorWrongBarcodemode")).' "\'+barcodemode+\'"\');
-								throw \''.dol_escape_js($langs->trans('ErrorWrongBarcodemode')).' "\'+barcodemode+\'"\';
-						}
-
-						if (verify_batch == false && verify_barcode == false) {		/* If the 2 flags are false, not found error */
-							errortab2.push(element);
-						} else if (verify_batch == true && verify_barcode == true) {		/* If the 2 flags are true, error: we don t know which one to take */
-							errortab3.push(element);
-						} else if (verify_batch == true) {
-							console.log("element="+element);
-							console.log(duplicatedbatchcode);
-							if (duplicatedbatchcode.includes(element)) {
-								errortab1.push(element);
-							}
-						}
-					});
-
-					if (Object.keys(errortab1).length < 1 && Object.keys(errortab2).length < 1 && Object.keys(errortab3).length < 1) {
-						tabproduct.forEach(product => {
-							if(product.Qty!=0){
-								console.log("We change #"+product.Id+"_input to match input in scanner box");
-								if(product.hasOwnProperty("reelqty")){
-									$.ajax({ url: \''.DOL_URL_ROOT.'/product/inventory/ajax/searchfrombarcode.php\',
-										data: { "token":"'.newToken().'", "action":"addnewlineproduct", "fk_entrepot":product.Warehouse, "batch":product.Batch, "fk_inventory":'.dol_escape_js($object->id).', "fk_product":product.fk_product, "reelqty":product.reelqty},
-										type: \'POST\',
-										async: false,
-										success: function(response) {
-											response = JSON.parse(response);
-											if(response.status == "success"){
-												console.log(response.message);
-												$("<input type=\'text\' value=\'"+product.Qty+"\' />")
-												.attr("id", "id_"+response.id_line+"_input")
-												.attr("name", "id_"+response.id_line)
-												.appendTo("#formrecord");
-											}else{
-												console.error(response.message);
-											}
-										},
-										error : function(output) {
-											console.error("Error on line creation function");
-										},
-									});
-								} else {
-									$("#"+product.Id+"_input").val(product.Qty);
-								}
-							}
-						});
-						jQuery("#scantoolmessage").text("'.dol_escape_js($langs->transnoentities("QtyWasAddedToTheScannedBarcode")).'\n");
-						/* document.forms["formrecord"].submit(); */
-					} else {
-						let stringerror = "";
-						if (Object.keys(errortab1).length > 0) {
-							stringerror += "<br>'.dol_escape_js($langs->transnoentities('ErrorSameBatchNumber')).': ";
-							errortab1.forEach(element => {
-								stringerror += (element + ", ")
-							});
-							stringerror = stringerror.slice(0, -2);	/* Remove last ", " */
-						}
-						if (Object.keys(errortab2).length > 0) {
-							stringerror += "<br>'.dol_escape_js($langs->transnoentities('ErrorCantFindCodeInInventory')).': ";
-							errortab2.forEach(element => {
-								stringerror += (element + ", ")
-							});
-							stringerror = stringerror.slice(0, -2);	/* Remove last ", " */
-						}
-						if (Object.keys(errortab3).length > 0) {
-							stringerror += "<br>'.dol_escape_js($langs->transnoentities('ErrorCodeScannedIsBothProductAndSerial')).': ";
-							errortab3.forEach(element => {
-								stringerror += (element + ", ")
-							});
-							stringerror = stringerror.slice(0, -2);	/* Remove last ", " */
-						}
-						if (Object.keys(errortab4).length > 0) {
-							stringerror += "<br>'.dol_escape_js($langs->transnoentities('ErrorBarcodeNotFoundForProductWarehouse')).': ";
-							errortab4.forEach(element => {
-								stringerror += (element + ", ")
-							});
-							stringerror = stringerror.slice(0, -2);	/* Remove last ", " */
-						}
-
-						jQuery("#scantoolmessage").html(\''.dol_escape_js($langs->transnoentities("ErrorOnElementsInventory")).'\' + stringerror);
-						//alert("'.dol_escape_js($langs->trans("ErrorOnElementsInventory")).' :\n" + stringerror);
-					}
-				}
 
+		// Save
+		if ($object->status == $object::STATUS_VALIDATED) {
+			if ($permissiontoadd) {
+				print '<a class="butAction classfortooltip" id="idbuttonmakemovementandclose" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=record&token='.newToken().'" title="'.dol_escape_htmltag($langs->trans("MakeMovementsAndClose")).'">'.$langs->trans("MakeMovementsAndClose").'</a>'."\n";
+			} else {
+				print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('MakeMovementsAndClose').'</a>'."\n";
 			}
 
-			/* This methode is called by parent barcodescannerjs() */
-			function barcodeserialforproduct(tabproduct,index,element,barcodeproductqty,selectaddorreplace,mode,autodetect=false){
-				BarcodeIsInProduct=0;
-				newproductrow=0
-				result=false;
-				tabproduct.forEach(product => {
-					$.ajax({ url: \''.DOL_URL_ROOT.'/product/inventory/ajax/searchfrombarcode.php\',
-						data: { "token":"'.newToken().'", "action":"existbarcode", '.(!empty($object->fk_warehouse)?'"fk_entrepot":'.$object->fk_warehouse.', ':'').(!empty($object->fk_product)?'"fk_product":'.$object->fk_product.', ':'').'"barcode":element, "product":product, "mode":mode},
-						type: \'POST\',
-						async: false,
-						success: function(response) {
-							response = JSON.parse(response);
-							if (response.status == "success"){
-								console.log(response.message);
-								if(!newproductrow){
-									newproductrow = response.object;
-								}
-							}else{
-								if (mode!="lotserial" && autodetect==false && !errortab4.includes(element)){
-									errortab4.push(element);
-									console.error(response.message);
-								}
+			if ($permissiontoadd) {
+				print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=confirm_cancel&token='.newToken().'">'.$langs->trans("Cancel").'</a>'."\n";
+			}
+		}
+	}
+	print '</div>'."\n";
+
+	if ($object->status != Inventory::STATUS_DRAFT && $object->status != Inventory::STATUS_VALIDATED) {
+		print '<br><br>';
+	}
+}
+
+
+
+if ($object->status == Inventory::STATUS_VALIDATED) {
+	print '<center>';
+	if (!empty($conf->use_javascript_ajax)) {
+		if ($permissiontoadd) {
+			// Link to launch scan tool
+			if (isModEnabled('barcode') || isModEnabled('productbatch')) {
+				print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=updatebyscaning&token='.currentToken().'" class="marginrightonly paddingright marginleftonly paddingleft">'.img_picto('', 'barcode', 'class="paddingrightonly"').$langs->trans("UpdateByScaning").'</a>';
+			}
+
+			// Link to autofill
+			print '<a id="fillwithexpected" class="marginrightonly paddingright marginleftonly paddingleft" href="#">'.img_picto('', 'autofill', 'class="paddingrightonly"').$langs->trans('AutofillWithExpected').'</a>';
+			print '<script>';
+			print '$( document ).ready(function() {';
+			print '	$("#fillwithexpected").on("click",function fillWithExpected(){
+						$(".expectedqty").each(function(){
+							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(); */
+						return false;
+			        });';
+			print '});';
+			print '</script>';
+
+			// Link to reset qty
+			print '<a href="#" id="clearqty" class="marginrightonly paddingright marginleftonly paddingleft">'.img_picto('', 'eraser', 'class="paddingrightonly"').$langs->trans("ClearQtys").'</a>';
+		} else {
+			print '<a class="classfortooltip marginrightonly paddingright marginleftonly paddingleft" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("Save").'</a>'."\n";
+		}
+	}
+	print '<br>';
+	print '<br>';
+	print '</center>';
+}
+
+
+// Popup for mass barcode scanning
+if ($action == 'updatebyscaning') {
+	if ($permissiontoadd) {
+		// Output the javascript to manage the scanner tool.
+		print '<script>';
+
+		print '
+		var duplicatedbatchcode = [];
+		var errortab1 = [];
+		var errortab2 = [];
+		var errortab3 = [];
+		var errortab4 = [];
+
+		function barcodescannerjs(){
+			console.log("We catch inputs in scanner box");
+			jQuery("#scantoolmessage").text();
+
+			var selectaddorreplace = $("select[name=selectaddorreplace]").val();
+			var barcodemode = $("input[name=barcodemode]:checked").val();
+			var barcodeproductqty = $("input[name=barcodeproductqty]").val();
+			var textarea = $("textarea[name=barcodelist]").val();
+			var textarray = textarea.split(/[\s,;]+/);
+			var tabproduct = [];
+			duplicatedbatchcode = [];
+			errortab1 = [];
+			errortab2 = [];
+			errortab3 = [];
+			errortab4 = [];
+
+			textarray = textarray.filter(function(value){
+				return value != "";
+			});
+			if(textarray.some((element) => element != "")){
+				$(".expectedqty").each(function(){
+					id = this.id;
+					console.log("Analyze the line "+id+" in inventory, barcodemode="+barcodemode);
+					warehouse = $("#"+id+"_warehouse").attr(\'data-ref\');
+					//console.log(warehouse);
+					productbarcode = $("#"+id+"_product").attr(\'data-barcode\');
+					//console.log(productbarcode);
+					productbatchcode = $("#"+id+"_batch").attr(\'data-batch\');
+					//console.log(productbatchcode);
+
+					if (barcodemode != "barcodeforproduct") {
+						tabproduct.forEach(product=>{
+							console.log("product.Batch="+product.Batch+" productbatchcode="+productbatchcode);
+							if(product.Batch != "" && product.Batch == productbatchcode){
+								console.log("duplicate batch code found for batch code "+productbatchcode);
+								duplicatedbatchcode.push(productbatchcode);
 							}
-						},
-						error : function(output) {
-						   console.error("Error on barcodeserialforproduct function");
-						},
-				    });
-					console.log("Product "+(index+=1)+": "+element);
-					if(mode == "barcode"){
-						testonproduct = product.Barcode
-					}else if (mode == "lotserial"){
-						testonproduct = product.Batch
+						})
 					}
-					if(testonproduct == element){
-						if(selectaddorreplace == "add"){
+					productinput = $("#"+id+"_input").val();
+					if(productinput == ""){
+						productinput = 0
+					}
+					tabproduct.push({\'Id\':id,\'Warehouse\':warehouse,\'Barcode\':productbarcode,\'Batch\':productbatchcode,\'Qty\':productinput,\'fetched\':false});
+				});
+
+				console.log("Loop on each record entered in the textarea");
+				textarray.forEach(function(element,index){
+					console.log("Process record element="+element+" id="+id);
+					var verify_batch = false;
+					var verify_barcode = false;
+					switch(barcodemode){
+						case "barcodeforautodetect":
+							verify_barcode = barcodeserialforproduct(tabproduct,index,element,barcodeproductqty,selectaddorreplace,"barcode",true);
+							verify_batch = barcodeserialforproduct(tabproduct,index,element,barcodeproductqty,selectaddorreplace,"lotserial",true);
+							break;
+						case "barcodeforproduct":
+							verify_barcode = barcodeserialforproduct(tabproduct,index,element,barcodeproductqty,selectaddorreplace,"barcode");
+							break;
+						case "barcodeforlotserial":
+							verify_batch = barcodeserialforproduct(tabproduct,index,element,barcodeproductqty,selectaddorreplace,"lotserial");
+							break;
+						default:
+							alert(\''.dol_escape_js($langs->trans("ErrorWrongBarcodemode")).' "\'+barcodemode+\'"\');
+							throw \''.dol_escape_js($langs->trans('ErrorWrongBarcodemode')).' "\'+barcodemode+\'"\';
+					}
+
+					if (verify_batch == false && verify_barcode == false) {		/* If the 2 flags are false, not found error */
+						errortab2.push(element);
+					} else if (verify_batch == true && verify_barcode == true) {		/* If the 2 flags are true, error: we don t know which one to take */
+						errortab3.push(element);
+					} else if (verify_batch == true) {
+						console.log("element="+element);
+						console.log(duplicatedbatchcode);
+						if (duplicatedbatchcode.includes(element)) {
+							errortab1.push(element);
+						}
+					}
+				});
+
+				if (Object.keys(errortab1).length < 1 && Object.keys(errortab2).length < 1 && Object.keys(errortab3).length < 1) {
+					tabproduct.forEach(product => {
+						if(product.Qty!=0){
+							console.log("We change #"+product.Id+"_input to match input in scanner box");
+							if(product.hasOwnProperty("reelqty")){
+								$.ajax({ url: \''.DOL_URL_ROOT.'/product/inventory/ajax/searchfrombarcode.php\',
+									data: { "token":"'.newToken().'", "action":"addnewlineproduct", "fk_entrepot":product.Warehouse, "batch":product.Batch, "fk_inventory":'.dol_escape_js($object->id).', "fk_product":product.fk_product, "reelqty":product.reelqty},
+									type: \'POST\',
+									async: false,
+									success: function(response) {
+										response = JSON.parse(response);
+										if(response.status == "success"){
+											console.log(response.message);
+											$("<input type=\'text\' value=\'"+product.Qty+"\' />")
+											.attr("id", "id_"+response.id_line+"_input")
+											.attr("name", "id_"+response.id_line)
+											.appendTo("#formrecord");
+										}else{
+											console.error(response.message);
+										}
+									},
+									error : function(output) {
+										console.error("Error on line creation function");
+									},
+								});
+							} else {
+								$("#"+product.Id+"_input").val(product.Qty);
+							}
+						}
+					});
+					jQuery("#scantoolmessage").text("'.dol_escape_js($langs->transnoentities("QtyWasAddedToTheScannedBarcode")).'\n");
+					/* document.forms["formrecord"].submit(); */
+				} else {
+					let stringerror = "";
+					if (Object.keys(errortab1).length > 0) {
+						stringerror += "<br>'.dol_escape_js($langs->transnoentities('ErrorSameBatchNumber')).': ";
+						errortab1.forEach(element => {
+							stringerror += (element + ", ")
+						});
+						stringerror = stringerror.slice(0, -2);	/* Remove last ", " */
+					}
+					if (Object.keys(errortab2).length > 0) {
+						stringerror += "<br>'.dol_escape_js($langs->transnoentities('ErrorCantFindCodeInInventory')).': ";
+						errortab2.forEach(element => {
+							stringerror += (element + ", ")
+						});
+						stringerror = stringerror.slice(0, -2);	/* Remove last ", " */
+					}
+					if (Object.keys(errortab3).length > 0) {
+						stringerror += "<br>'.dol_escape_js($langs->transnoentities('ErrorCodeScannedIsBothProductAndSerial')).': ";
+						errortab3.forEach(element => {
+							stringerror += (element + ", ")
+						});
+						stringerror = stringerror.slice(0, -2);	/* Remove last ", " */
+					}
+					if (Object.keys(errortab4).length > 0) {
+						stringerror += "<br>'.dol_escape_js($langs->transnoentities('ErrorBarcodeNotFoundForProductWarehouse')).': ";
+						errortab4.forEach(element => {
+							stringerror += (element + ", ")
+						});
+						stringerror = stringerror.slice(0, -2);	/* Remove last ", " */
+					}
+
+					jQuery("#scantoolmessage").html(\''.dol_escape_js($langs->transnoentities("ErrorOnElementsInventory")).'\' + stringerror);
+					//alert("'.dol_escape_js($langs->trans("ErrorOnElementsInventory")).' :\n" + stringerror);
+				}
+			}
+
+		}
+
+		/* This methode is called by parent barcodescannerjs() */
+		function barcodeserialforproduct(tabproduct,index,element,barcodeproductqty,selectaddorreplace,mode,autodetect=false){
+			BarcodeIsInProduct=0;
+			newproductrow=0
+			result=false;
+			tabproduct.forEach(product => {
+				$.ajax({ url: \''.DOL_URL_ROOT.'/product/inventory/ajax/searchfrombarcode.php\',
+					data: { "token":"'.newToken().'", "action":"existbarcode", '.(!empty($object->fk_warehouse)?'"fk_entrepot":'.$object->fk_warehouse.', ':'').(!empty($object->fk_product)?'"fk_product":'.$object->fk_product.', ':'').'"barcode":element, "product":product, "mode":mode},
+					type: \'POST\',
+					async: false,
+					success: function(response) {
+						response = JSON.parse(response);
+						if (response.status == "success"){
+							console.log(response.message);
+							if(!newproductrow){
+								newproductrow = response.object;
+							}
+						}else{
+							if (mode!="lotserial" && autodetect==false && !errortab4.includes(element)){
+								errortab4.push(element);
+								console.error(response.message);
+							}
+						}
+					},
+					error : function(output) {
+					   console.error("Error on barcodeserialforproduct function");
+					},
+			    });
+				console.log("Product "+(index+=1)+": "+element);
+				if(mode == "barcode"){
+					testonproduct = product.Barcode
+				}else if (mode == "lotserial"){
+					testonproduct = product.Batch
+				}
+				if(testonproduct == element){
+					if(selectaddorreplace == "add"){
+						productqty = parseInt(product.Qty,10);
+						product.Qty = productqty + parseInt(barcodeproductqty,10);
+					}else if(selectaddorreplace == "replace"){
+						if(product.fetched == false){
+							product.Qty = barcodeproductqty
+							product.fetched=true
+						}else{
 							productqty = parseInt(product.Qty,10);
 							product.Qty = productqty + parseInt(barcodeproductqty,10);
-						}else if(selectaddorreplace == "replace"){
-							if(product.fetched == false){
-								product.Qty = barcodeproductqty
-								product.fetched=true
-							}else{
-								productqty = parseInt(product.Qty,10);
-								product.Qty = productqty + parseInt(barcodeproductqty,10);
-							}
 						}
-						BarcodeIsInProduct+=1;
 					}
-				})
-				if(BarcodeIsInProduct==0 && newproductrow!=0){
-					tabproduct.push({\'Id\':tabproduct.length-1,\'Warehouse\':newproductrow.fk_warehouse,\'Barcode\':mode=="barcode"?element:null,\'Batch\':mode=="lotserial"?element:null,\'Qty\':barcodeproductqty,\'fetched\':true,\'reelqty\':newproductrow.reelqty,\'fk_product\':newproductrow.fk_product,\'mode\':mode});
-					result = true;
+					BarcodeIsInProduct+=1;
 				}
-				if(BarcodeIsInProduct > 0){
-					result = true;
-				}
-				return result;
+			})
+			if(BarcodeIsInProduct==0 && newproductrow!=0){
+				tabproduct.push({\'Id\':tabproduct.length-1,\'Warehouse\':newproductrow.fk_warehouse,\'Barcode\':mode=="barcode"?element:null,\'Batch\':mode=="lotserial"?element:null,\'Qty\':barcodeproductqty,\'fetched\':true,\'reelqty\':newproductrow.reelqty,\'fk_product\':newproductrow.fk_product,\'mode\':mode});
+				result = true;
 			}
-			';
-			print '</script>';
+			if(BarcodeIsInProduct > 0){
+				result = true;
+			}
+			return result;
 		}
-		include DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
-		$formother = new FormOther($db);
-		print $formother->getHTMLScannerForm("barcodescannerjs", 'all');
+		';
+		print '</script>';
 	}
+	include DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
+	$formother = new FormOther($db);
+	print $formother->getHTMLScannerForm("barcodescannerjs", 'all');
+}
 
-	//Call method to undo changes in real qty
-	print '<script>';
-	print 'jQuery(document).ready(function() {
-		$("#clearqty").on("click", function() {
-			console.log("Clear all values");
-			disablebuttonmakemovementandclose();
-			jQuery(".realqty").val("");
-			jQuery(".realqty").trigger("change");
-			return false;	/* disable submit */
-		});
-		$(".undochangesqty").on("click", function undochangesqty() {
-			console.log("Clear value of inventory line");
-			id = this.id;
-			id = id.split("_")[1];
-			tmpvalue = $("#id_"+id+"_input_tmp").val()
-			$("#id_"+id+"_input")[0].value = tmpvalue;
-			disablebuttonmakemovementandclose();
-			return false;	/* disable submit */
-		});
-	});';
-	print '</script>';
+//Call method to undo changes in real qty
+print '<script>';
+print 'jQuery(document).ready(function() {
+	$("#clearqty").on("click", function() {
+		console.log("Clear all values");
+		/* disablebuttonmakemovementandclose(); */
+		jQuery(".realqty").val("");
+		jQuery(".realqty").trigger("change");
+		return false;	/* disable submit */
+	});
+	$(".undochangesqty").on("click", function undochangesqty() {
+		console.log("Clear value of inventory line");
+		id = this.id;
+		id = id.split("_")[1];
+		tmpvalue = $("#id_"+id+"_input_tmp").val()
+		$("#id_"+id+"_input")[0].value = tmpvalue;
+		/* disablebuttonmakemovementandclose(); */
+		return false;	/* disable submit */
+	});
+});';
+print '</script>';
 
-	print '<div class="fichecenter">';
-	//print '<div class="fichehalfleft">';
-	print '<div class="clearboth"></div>';
+print '<div class="fichecenter">';
+//print '<div class="fichehalfleft">';
+print '<div class="clearboth"></div>';
 
-	//print load_fiche_titre($langs->trans('Consumption'), '', '');
+//print load_fiche_titre($langs->trans('Consumption'), '', '');
 
-	print '<div class="div-table-responsive-no-min">';
-	print '<table id="tablelines" class="noborder noshadow centpercent">';
+print '<div class="div-table-responsive-no-min">';
+print '<table id="tablelines" class="noborder noshadow centpercent">';
 
-	print '<tr class="liste_titre">';
-	print '<td>'.$langs->trans("Warehouse").'</td>';
-	print '<td>'.$langs->trans("Product").'</td>';
+print '<tr class="liste_titre">';
+print '<td>'.$langs->trans("Warehouse").'</td>';
+print '<td>'.$langs->trans("Product").'</td>';
+if (isModEnabled('productbatch')) {
+	print '<td>';
+	print $langs->trans("Batch");
+	print '</td>';
+}
+print '<td class="right">'.$langs->trans("ExpectedQty").'</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">'.$form->textwithpicto($langs->trans("RealQty"), $langs->trans("InventoryRealQtyHelp")).'</td>';
+	print '<td class="right">'.$langs->trans('PMPReal').'</td>';
+	print '<td class="right">'.$langs->trans('RealValuation').'</td>';
+} else {
+	print '<td class="right">';
+	print $form->textwithpicto($langs->trans("RealQty"), $langs->trans("InventoryRealQtyHelp"));
+	print '</td>';
+}
+if ($object->status == $object::STATUS_DRAFT || $object->status == $object::STATUS_VALIDATED) {
+	// Actions or link to stock movement
+	print '<td class="center">';
+	print '</td>';
+} else {
+	// Actions or link to stock movement
+	print '<td class="right">';
+	//print $langs->trans("StockMovement");
+	print '</td>';
+}
+print '</tr>';
+
+// Line to add a new line in inventory
+if ($object->status == $object::STATUS_DRAFT || $object->status == $object::STATUS_VALIDATED) {
+	print '<tr>';
+	print '<td>';
+	print $formproduct->selectWarehouses((GETPOSTISSET('fk_warehouse') ? GETPOST('fk_warehouse', 'int') : $object->fk_warehouse), 'fk_warehouse', 'warehouseopen', 1, 0, 0, '', 0, 0, array(), 'maxwidth300');
+	print '</td>';
+	print '<td>';
+	print $form->select_produits((GETPOSTISSET('fk_product') ? GETPOST('fk_product', 'int') : $object->fk_product), 'fk_product', '', 0, 0, -1, 2, '', 0, null, 0, '1', 0, 'maxwidth300');
+	print '</td>';
 	if (isModEnabled('productbatch')) {
 		print '<td>';
-		print $langs->trans("Batch");
+		print '<input type="text" name="batch" class="maxwidth100" value="'.(GETPOSTISSET('batch') ? GETPOST('batch') : '').'">';
 		print '</td>';
 	}
-	print '<td class="right">'.$langs->trans("ExpectedQty").'</td>';
+	print '<td class="right"></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">'.$form->textwithpicto($langs->trans("RealQty"), $langs->trans("InventoryRealQtyHelp")).'</td>';
-		print '<td class="right">'.$langs->trans('PMPReal').'</td>';
-		print '<td class="right">'.$langs->trans('RealValuation').'</td>';
+		print '<td class="right">';
+		print '</td>';
+		print '<td class="right">';
+		print '</td>';
+		print '<td class="right">';
+		print '<input type="text" name="qtytoadd" class="maxwidth75" value="">';
+		print '</td>';
+		print '<td class="right">';
+		print '</td>';
+		print '<td class="right">';
+		print '</td>';
 	} else {
 		print '<td class="right">';
-		print $form->textwithpicto($langs->trans("RealQty"), $langs->trans("InventoryRealQtyHelp"));
-		print '</td>';
-	}
-	if ($object->status == $object::STATUS_DRAFT || $object->status == $object::STATUS_VALIDATED) {
-		// Actions or link to stock movement
-		print '<td class="center">';
-		print '</td>';
-	} else {
-		// Actions or link to stock movement
-		print '<td class="right">';
-		//print $langs->trans("StockMovement");
+		print '<input type="text" name="qtytoadd" class="maxwidth75" value="">';
 		print '</td>';
 	}
+	// Actions
+	print '<td class="center">';
+	print '<input type="submit" class="button paddingright" name="addline" value="'.$langs->trans("Add").'">';
+	print '</td>';
 	print '</tr>';
+}
 
-	// Line to add a new line in inventory
-	if ($object->status == $object::STATUS_DRAFT || $object->status == $object::STATUS_VALIDATED) {
-		print '<tr>';
-		print '<td>';
-		print $formproduct->selectWarehouses((GETPOSTISSET('fk_warehouse') ? GETPOST('fk_warehouse', 'int') : $object->fk_warehouse), 'fk_warehouse', 'warehouseopen', 1, 0, 0, '', 0, 0, array(), 'maxwidth300');
+// 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.pmp_expected';
+$sql .= ' FROM '.MAIN_DB_PREFIX.'inventorydet as id';
+$sql .= ' WHERE id.fk_inventory = '.((int) $object->id);
+$sql .= $db->order('id.rowid', 'ASC');
+$sql .= $db->plimit($limit, $offset);
+
+$cacheOfProducts = array();
+$cacheOfWarehouses = array();
+
+//$sql = '';
+$resql = $db->query($sql);
+if ($resql) {
+	$num = $db->num_rows($resql);
+
+	if (!empty($limit != 0) || $num > $limit || $page) {
+		print_fleche_navigation($page, $_SERVER["PHP_SELF"], $paramwithsearch, ($num >= $limit), '<li class="pagination"><span>' . $langs->trans("Page") . ' ' . ($page + 1) . '</span></li>', '', $limit);
+	}
+
+	$i = 0;
+	$hasinput = false;
+	$totalarray = array();
+	while ($i < $num) {
+		$obj = $db->fetch_object($resql);
+
+		if (isset($cacheOfWarehouses[$obj->fk_warehouse])) {
+			$warehouse_static = $cacheOfWarehouses[$obj->fk_warehouse];
+		} else {
+			$warehouse_static = new Entrepot($db);
+			$warehouse_static->fetch($obj->fk_warehouse);
+
+			$cacheOfWarehouses[$warehouse_static->id] = $warehouse_static;
+		}
+
+		// Load real stock we have now
+		$option = '';
+		if (isset($cacheOfProducts[$obj->fk_product])) {
+			$product_static = $cacheOfProducts[$obj->fk_product];
+		} else {
+			$product_static = new Product($db);
+			$result = $product_static->fetch($obj->fk_product, '', '', '', 1, 1, 1);
+
+			//$option = 'nobatch';
+			$option .= ',novirtual';
+			$product_static->load_stock($option); // Load stock_reel + stock_warehouse.
+
+			$cacheOfProducts[$product_static->id] = $product_static;
+		}
+
+		print '<tr class="oddeven">';
+		print '<td id="id_'.$obj->rowid.'_warehouse" data-ref="'.dol_escape_htmltag($warehouse_static->ref).'">';
+		print $warehouse_static->getNomUrl(1);
 		print '</td>';
-		print '<td>';
-		print $form->select_produits((GETPOSTISSET('fk_product') ? GETPOST('fk_product', 'int') : $object->fk_product), 'fk_product', '', 0, 0, -1, 2, '', 0, null, 0, '1', 0, 'maxwidth300');
+		print '<td id="id_'.$obj->rowid.'_product" data-ref="'.dol_escape_htmltag($product_static->ref).'" data-barcode="'.dol_escape_htmltag($product_static->barcode).'">';
+		print $product_static->getNomUrl(1).' - '.$product_static->label;
 		print '</td>';
+
 		if (isModEnabled('productbatch')) {
-			print '<td>';
-			print '<input type="text" name="batch" class="maxwidth100" value="'.(GETPOSTISSET('batch') ? GETPOST('batch') : '').'">';
+			print '<td id="id_'.$obj->rowid.'_batch" data-batch="'.dol_escape_htmltag($obj->batch).'">';
+			$batch_static = new Productlot($db);
+			$res = $batch_static->fetch(0, $product_static->id, $obj->batch);
+			if ($res) {
+				print $batch_static->getNomUrl(1);
+			} else {
+				print dol_escape_htmltag($obj->batch);
+			}
 			print '</td>';
 		}
-		print '<td class="right"></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 '<input type="text" name="qtytoadd" class="maxwidth75" value="">';
-			print '</td>';
-			print '<td class="right">';
-			print '</td>';
+
+		// Expected quantity = Quantity in stock when we start inventory
+		print '<td class="right expectedqty" id="id_'.$obj->rowid.'" title="Stock viewed at last update: '.$obj->qty_stock.'">';
+		$valuetoshow = $obj->qty_stock;
+		// For inventory not yet close, we overwrite with the real value in stock now
+		if ($object->status == $object::STATUS_DRAFT || $object->status == $object::STATUS_VALIDATED) {
+			if (isModEnabled('productbatch') && $product_static->hasbatch()) {
+				$valuetoshow = $product_static->stock_warehouse[$obj->fk_warehouse]->detail_batch[$obj->batch]->qty;
+			} else {
+				$valuetoshow = $product_static->stock_warehouse[$obj->fk_warehouse]->real;
+			}
+		}
+		print price2num($valuetoshow, 'MS');
+		print '<input type="hidden" name="stock_qty_'.$obj->rowid.'" value="'.$valuetoshow.'">';
+		print '</td>';
+
+		// Real quantity
+		if ($object->status == $object::STATUS_DRAFT || $object->status == $object::STATUS_VALIDATED) {
+			$qty_view = GETPOST("id_".$obj->rowid) && price2num(GETPOST("id_".$obj->rowid), 'MS') >= 0 ? GETPOST("id_".$obj->rowid) : $obj->qty_view;
+
+			//if (!$hasinput && $qty_view !== null && $obj->qty_stock != $qty_view) {
+			if ($qty_view != '') {
+				$hasinput = true;
+			}
+
+			if (!empty($conf->global->INVENTORY_MANAGE_REAL_PMP)) {
+				//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">';
+				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);
+				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="maxwidth50 right realqty" name="id_'.$obj->rowid.'" id="id_'.$obj->rowid.'_input" value="'.$qty_view.'">';
+				print '</td>';
+
+				//PMP Real
+				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 * $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).'">';
+				print '</td>';
+				print '<td class="right">';
+				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;
+				$totalRealValuation += $pmp_valuation_real;
+			} else {
+				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="maxwidth50 right realqty" name="id_'.$obj->rowid.'" id="id_'.$obj->rowid.'_input" value="'.$qty_view.'">';
+				print '</td>';
+			}
+
+			// Picto delete line
 			print '<td class="right">';
+			print '<a class="reposition" href="'.DOL_URL_ROOT.'/product/inventory/inventory.php?id='.$object->id.'&lineid='.$obj->rowid.'&action=deleteline&page='.$page.$paramwithsearch.'&token='.newToken().'">'.img_delete().'</a>';
+			$qty_tmp = price2num(GETPOST("id_".$obj->rowid."_input_tmp", 'MS')) >= 0 ? GETPOST("id_".$obj->rowid."_input_tmp") : $qty_view;
+			print '<input type="hidden" class="maxwidth50 right realqty" name="id_'.$obj->rowid.'_input_tmp" id="id_'.$obj->rowid.'_input_tmp" value="'.$qty_tmp.'">';
 			print '</td>';
 		} else {
-			print '<td class="right">';
-			print '<input type="text" name="qtytoadd" class="maxwidth75" value="">';
-			print '</td>';
-		}
-		// Actions
-		print '<td class="center">';
-		print '<input type="submit" class="button paddingright" name="addline" value="'.$langs->trans("Add").'">';
-		print '</td>';
-		print '</tr>';
-	}
-
-	// 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.pmp_expected';
-	$sql .= ' FROM '.MAIN_DB_PREFIX.'inventorydet as id';
-	$sql .= ' WHERE id.fk_inventory = '.((int) $object->id);
-	$sql .= $db->order('id.rowid', 'ASC');
-	$sql .= $db->plimit($limit, $offset);
-
-	$cacheOfProducts = array();
-	$cacheOfWarehouses = array();
-
-	//$sql = '';
-	$resql = $db->query($sql);
-	if ($resql) {
-		$num = $db->num_rows($resql);
-
-		if (!empty($limit != 0) || $num > $limit || $page) {
-			print_fleche_navigation($page, $_SERVER["PHP_SELF"], $paramwithsearch, ($num >= $limit), '<li class="pagination"><span>' . $langs->trans("Page") . ' ' . ($page + 1) . '</span></li>', '', $limit);
-		}
-
-		$i = 0;
-		$hasinput = false;
-		$totalarray = array();
-		while ($i < $num) {
-			$obj = $db->fetch_object($resql);
-
-			if (isset($cacheOfWarehouses[$obj->fk_warehouse])) {
-				$warehouse_static = $cacheOfWarehouses[$obj->fk_warehouse];
-			} else {
-				$warehouse_static = new Entrepot($db);
-				$warehouse_static->fetch($obj->fk_warehouse);
-
-				$cacheOfWarehouses[$warehouse_static->id] = $warehouse_static;
-			}
-
-			// Load real stock we have now
-			$option = '';
-			if (isset($cacheOfProducts[$obj->fk_product])) {
-				$product_static = $cacheOfProducts[$obj->fk_product];
-			} else {
-				$product_static = new Product($db);
-				$result = $product_static->fetch($obj->fk_product, '', '', '', 1, 1, 1);
-
-				//$option = 'nobatch';
-				$option .= ',novirtual';
-				$product_static->load_stock($option); // Load stock_reel + stock_warehouse.
-
-				$cacheOfProducts[$product_static->id] = $product_static;
-			}
-
-			print '<tr class="oddeven">';
-			print '<td id="id_'.$obj->rowid.'_warehouse" data-ref="'.dol_escape_htmltag($warehouse_static->ref).'">';
-			print $warehouse_static->getNomUrl(1);
-			print '</td>';
-			print '<td id="id_'.$obj->rowid.'_product" data-ref="'.dol_escape_htmltag($product_static->ref).'" data-barcode="'.dol_escape_htmltag($product_static->barcode).'">';
-			print $product_static->getNomUrl(1).' - '.$product_static->label;
-			print '</td>';
-
-			if (isModEnabled('productbatch')) {
-				print '<td id="id_'.$obj->rowid.'_batch" data-batch="'.dol_escape_htmltag($obj->batch).'">';
-				$batch_static = new Productlot($db);
-				$res = $batch_static->fetch(0, $product_static->id, $obj->batch);
-				if ($res) {
-					print $batch_static->getNomUrl(1);
-				} else {
-					print dol_escape_htmltag($obj->batch);
-				}
-				print '</td>';
-			}
-
-			// Expected quantity = Quantity in stock when we start inventory
-			print '<td class="right expectedqty" id="id_'.$obj->rowid.'" title="Stock viewed at last update: '.$obj->qty_stock.'">';
-			$valuetoshow = $obj->qty_stock;
-			// For inventory not yet close, we overwrite with the real value in stock now
-			if ($object->status == $object::STATUS_DRAFT || $object->status == $object::STATUS_VALIDATED) {
-				if (isModEnabled('productbatch') && $product_static->hasbatch()) {
-					$valuetoshow = $product_static->stock_warehouse[$obj->fk_warehouse]->detail_batch[$obj->batch]->qty;
-				} else {
-					$valuetoshow = $product_static->stock_warehouse[$obj->fk_warehouse]->real;
-				}
-			}
-			print price2num($valuetoshow, 'MS');
-			print '<input type="hidden" name="stock_qty_'.$obj->rowid.'" value="'.$valuetoshow.'">';
-			print '</td>';
-
-			// Real quantity
-			if ($object->status == $object::STATUS_DRAFT || $object->status == $object::STATUS_VALIDATED) {
-				$qty_view = GETPOST("id_".$obj->rowid) && price2num(GETPOST("id_".$obj->rowid), 'MS') >= 0 ? GETPOST("id_".$obj->rowid) : $obj->qty_view;
-
-				//if (!$hasinput && $qty_view !== null && $obj->qty_stock != $qty_view) {
-				if ($qty_view != '') {
-					$hasinput = true;
-				}
-
-				if (!empty($conf->global->INVENTORY_MANAGE_REAL_PMP)) {
-					//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">';
-					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);
-					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="maxwidth50 right realqty" name="id_'.$obj->rowid.'" id="id_'.$obj->rowid.'_input" value="'.$qty_view.'">';
-					print '</td>';
-
-					//PMP Real
-					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 * $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).'">';
-					print '</td>';
-					print '<td class="right">';
-					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;
-					$totalRealValuation += $pmp_valuation_real;
-				} else {
-					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="maxwidth50 right realqty" name="id_'.$obj->rowid.'" id="id_'.$obj->rowid.'_input" value="'.$qty_view.'">';
-					print '</td>';
-				}
-
-				// Picto delete line
+			if (!empty($conf->global->INVENTORY_MANAGE_REAL_PMP)) {
+				//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">';
-				print '<a class="reposition" href="'.DOL_URL_ROOT.'/product/inventory/inventory.php?id='.$object->id.'&lineid='.$obj->rowid.'&action=deleteline&page='.$page.$paramwithsearch.'&token='.newToken().'">'.img_delete().'</a>';
-				$qty_tmp = price2num(GETPOST("id_".$obj->rowid."_input_tmp", 'MS')) >= 0 ? GETPOST("id_".$obj->rowid."_input_tmp") : $qty_view;
-				print '<input type="hidden" class="maxwidth50 right realqty" name="id_'.$obj->rowid.'_input_tmp" id="id_'.$obj->rowid.'_input_tmp" value="'.$qty_tmp.'">';
+				print price($pmp_expected);
 				print '</td>';
+				print '<td class="right">';
+				print price($pmp_valuation);
+				print '</td>';
+
+				print '<td class="right nowraponall">';
+				print $obj->qty_view;	// qty found
+				print '</td>';
+
+				//PMP Real
+				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">';
+				print price($pmp_valuation_real);
+				print '</td>';
+				print '<td class="nowraponall right">';
+
+				$totalExpectedValuation += $pmp_valuation;
+				$totalRealValuation += $pmp_valuation_real;
 			} else {
-				if (!empty($conf->global->INVENTORY_MANAGE_REAL_PMP)) {
-					//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">';
-					print price($pmp_expected);
-					print '</td>';
-					print '<td class="right">';
-					print price($pmp_valuation);
-					print '</td>';
-
-					print '<td class="right nowraponall">';
-					print $obj->qty_view;	// qty found
-					print '</td>';
-
-					//PMP Real
-					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">';
-					print price($pmp_valuation_real);
-					print '</td>';
-					print '<td class="nowraponall right">';
-
-					$totalExpectedValuation += $pmp_valuation;
-					$totalRealValuation += $pmp_valuation_real;
-				} else {
-					print '<td class="right nowraponall">';
-					print $obj->qty_view;	// qty found
-					print '</td>';
-				}
-				if ($obj->fk_movement > 0) {
-					$stockmovment = new MouvementStock($db);
-					$stockmovment->fetch($obj->fk_movement);
-					print $stockmovment->getNomUrl(1, 'movements');
-				}
+				print '<td class="right nowraponall">';
+				print $obj->qty_view;	// qty found
 				print '</td>';
 			}
-			print '</tr>';
-
-			$i++;
+			if ($obj->fk_movement > 0) {
+				$stockmovment = new MouvementStock($db);
+				$stockmovment->fetch($obj->fk_movement);
+				print $stockmovment->getNomUrl(1, 'movements');
+			}
+			print '</td>';
 		}
-	} else {
-		dol_print_error($db);
-	}
-	if (!empty($conf->global->INVENTORY_MANAGE_REAL_PMP)) {
-		print '<tr class="liste_total">';
-		print '<td colspan="4">'.$langs->trans("Total").'</td>';
-		print '<td class="right" colspan="2">'.price($totalExpectedValuation).'</td>';
-		print '<td class="right" id="totalRealValuation" colspan="3">'.price($totalRealValuation).'</td>';
-		print '<td></td>';
 		print '</tr>';
+
+		$i++;
 	}
-	print '</table>';
+} else {
+	dol_print_error($db);
+}
+if (!empty($conf->global->INVENTORY_MANAGE_REAL_PMP)) {
+	print '<tr class="liste_total">';
+	print '<td colspan="4">'.$langs->trans("Total").'</td>';
+	print '<td class="right" colspan="2">'.price($totalExpectedValuation).'</td>';
+	print '<td class="right" id="totalRealValuation" colspan="3">'.price($totalRealValuation).'</td>';
+	print '<td></td>';
+	print '</tr>';
+}
+print '</table>';
 
-	print '</div>';
+print '</div>';
 
-	if ($object->status == $object::STATUS_VALIDATED) {
-		print '<center><input id="submitrecord" type="submit" class="button button-save" name="save" value="'.$langs->trans("Save").'"></center>';
-	}
+if ($object->status == $object::STATUS_VALIDATED) {
+	print '<center><input id="submitrecord" type="submit" class="button button-save" name="save" value="'.$langs->trans("Save").'"></center>';
+}
 
-	print '</div>';
+print '</div>';
 
 
-	// Call method to disable the button if no qty entered yet for inventory
-
-	if ($object->status != $object::STATUS_VALIDATED || !$hasinput) {
-		print '<script type="text/javascript">
-					jQuery(document).ready(function() {
-						console.log("Call disablebuttonmakemovementandclose because status = '.((int) $object->status).' or $hasinput = '.((int) $hasinput).'");
-						disablebuttonmakemovementandclose();
-					});
-				</script>';
-	}
-	print '</form>';
-
+// Call method to disable the button if no qty entered yet for inventory
+/*
+if ($object->status != $object::STATUS_VALIDATED || !$hasinput) {
 	print '<script type="text/javascript">
+				jQuery(document).ready(function() {
+					console.log("Call disablebuttonmakemovementandclose because status = '.((int) $object->status).' or $hasinput = '.((int) $hasinput).'");
+					disablebuttonmakemovementandclose();
+				});
+			</script>';
+}
+*/
+
+print '</form>';
+
+print '<script type="text/javascript">
 					$(document).ready(function() {
 
                         $(".paginationnext:last").click(function(e){
@@ -1233,75 +1240,74 @@ if ($object->id > 0) {
        					 	}});
 						 });
 					});
-				</script>';
+</script>';
 
 
-	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();
-			});
-
-			$('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();
-				}
-			});
-
-			$('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
-				}));
-			}
-
-		</script>
-		<?php
+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();
+});
+
+$('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();
+	}
+});
+
+$('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
+	}));
+}
+
+</script>
+	<?php
 }
 
 // End of page