From afa4cc7bce7dfde702480078d2cb0840e70d88b3 Mon Sep 17 00:00:00 2001
From: FLIO <oflifli@nltechno.com>
Date: Tue, 4 Jul 2023 23:19:04 +0200
Subject: [PATCH 1/3] FIX|Fix (#24085) Add the Project filter

---
 htdocs/product/stock/movement_list.php | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/htdocs/product/stock/movement_list.php b/htdocs/product/stock/movement_list.php
index 232b31ca984..b0d61297e97 100644
--- a/htdocs/product/stock/movement_list.php
+++ b/htdocs/product/stock/movement_list.php
@@ -85,7 +85,7 @@ $search_user = trim(GETPOST("search_user"));
 $search_batch = trim(GETPOST("search_batch"));
 $search_qty = trim(GETPOST("search_qty"));
 $search_type_mouvement = GETPOST('search_type_mouvement', 'int');
-$search_fk_projet=GETPOST("search_fk_projet", 'int');
+$search_fk_project=GETPOST("search_fk_project");
 
 $type = GETPOST("type", "int");
 
@@ -226,10 +226,10 @@ if (empty($reshook)) {
 		$search_user = "";
 		$search_batch = "";
 		$search_qty = '';
-		$search_fk_projet=0;
 		$search_all = "";
 		$toselect = array();
 		$search_array_options = array();
+		$search_fk_project = "";
 	}
 	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')
 		|| GETPOST('button_search_x', 'alpha') || GETPOST('button_search.x', 'alpha') || GETPOST('button_search', 'alpha')) {
@@ -690,8 +690,8 @@ if (!empty($search_batch)) {
 if (!empty($product_id) && $product_id != '-1') {
 	$sql .= natural_search('p.rowid', $product_id);
 }
-if (!empty($search_fk_projet) && $search_fk_projet != '-1') {
-	$sql .= natural_search('m.fk_projet', $search_fk_projet);
+if (!empty($search_fk_project)) {
+	$sql .= natural_search('m.fk_projet', $search_fk_project);
 }
 if ($search_qty != '') {
 	$sql .= natural_search('m.value', $search_qty, 1);
@@ -1008,6 +1008,9 @@ if ($search_user) {
 if ($idproduct > 0) {
 	$param .= '&idproduct='.urlencode($idproduct);
 }
+if ($search_fk_project != '') {
+	$param .= '&search_fk_project='.urlencode($search_fk_project);
+}
 // Add $param from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 // Add $param from hooks
@@ -1178,10 +1181,17 @@ if (!empty($arrayfields['origin']['checked'])) {
 	print '&nbsp; ';
 	print '</td>';
 }
+// if (!empty($arrayfields['p.ref']['checked'])) {
+// 	print '<td class="liste_titre">';
+// 	print '<input type="text" class="flat" name="search_project_ref" value="'.$search_project_ref.'" size="4">';
+// 	print '</td>';
+// }
 if (!empty($arrayfields['m.fk_projet']['checked'])) {
 	// fk_project
 	print '<td class="liste_titre" align="left">';
-	print '&nbsp; ';
+	// var_dump($val, $key, $search_fk_projet, $object->fields['fk_project']);
+	print $object->showInputField($object->fields['fk_project'], 'fk_project', '', '', '', 'search_', 'maxwidth125', 1);
+	// print '<input type="text" class="flat" name="search_fk_projet" value="'.($search_fk_projet).'" size="4">';
 	print '</td>';
 }
 if (!empty($arrayfields['m.type_mouvement']['checked'])) {

From b8232551da792591587dfe829d8b1b6f7800e4f8 Mon Sep 17 00:00:00 2001
From: FLIO <oflifli@nltechno.com>
Date: Tue, 4 Jul 2023 23:22:28 +0200
Subject: [PATCH 2/3] remove comments

---
 htdocs/product/stock/movement_list.php | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/htdocs/product/stock/movement_list.php b/htdocs/product/stock/movement_list.php
index b0d61297e97..fc9e9bf19bd 100644
--- a/htdocs/product/stock/movement_list.php
+++ b/htdocs/product/stock/movement_list.php
@@ -1181,17 +1181,10 @@ if (!empty($arrayfields['origin']['checked'])) {
 	print '&nbsp; ';
 	print '</td>';
 }
-// if (!empty($arrayfields['p.ref']['checked'])) {
-// 	print '<td class="liste_titre">';
-// 	print '<input type="text" class="flat" name="search_project_ref" value="'.$search_project_ref.'" size="4">';
-// 	print '</td>';
-// }
 if (!empty($arrayfields['m.fk_projet']['checked'])) {
 	// fk_project
 	print '<td class="liste_titre" align="left">';
-	// var_dump($val, $key, $search_fk_projet, $object->fields['fk_project']);
 	print $object->showInputField($object->fields['fk_project'], 'fk_project', '', '', '', 'search_', 'maxwidth125', 1);
-	// print '<input type="text" class="flat" name="search_fk_projet" value="'.($search_fk_projet).'" size="4">';
 	print '</td>';
 }
 if (!empty($arrayfields['m.type_mouvement']['checked'])) {

From 11509c2e9447c527864a40f0ec9fb734126cc187 Mon Sep 17 00:00:00 2001
From: FLIO <oflifli@nltechno.com>
Date: Wed, 5 Jul 2023 13:16:12 +0200
Subject: [PATCH 3/3] fix the condition if you put nothing in the selectbox

---
 htdocs/product/stock/movement_list.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/product/stock/movement_list.php b/htdocs/product/stock/movement_list.php
index fc9e9bf19bd..addb445b8e6 100644
--- a/htdocs/product/stock/movement_list.php
+++ b/htdocs/product/stock/movement_list.php
@@ -690,7 +690,7 @@ if (!empty($search_batch)) {
 if (!empty($product_id) && $product_id != '-1') {
 	$sql .= natural_search('p.rowid', $product_id);
 }
-if (!empty($search_fk_project)) {
+if (!empty($search_fk_project) && $search_fk_project != '-1') {
 	$sql .= natural_search('m.fk_projet', $search_fk_project);
 }
 if ($search_qty != '') {
@@ -1008,7 +1008,7 @@ if ($search_user) {
 if ($idproduct > 0) {
 	$param .= '&idproduct='.urlencode($idproduct);
 }
-if ($search_fk_project != '') {
+if ($search_fk_project != '' && $search_fk_project != '-1') {
 	$param .= '&search_fk_project='.urlencode($search_fk_project);
 }
 // Add $param from extra fields