From 72453eac0a2ae840dccebcee12fae9ae719d6eb9 Mon Sep 17 00:00:00 2001
From: Bernd Bestel <bernd@berrnd.de>
Date: Thu, 27 Feb 2025 17:07:30 +0100
Subject: [PATCH] Transpose product column index when searching in it (fixes
 #2688)

---
 changelog/79_UNRELEASED_xx-xx-xxxx.md | 1 +
 public/viewjs/stockentries.js         | 2 +-
 views/stockentries.blade.php          | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/changelog/79_UNRELEASED_xx-xx-xxxx.md b/changelog/79_UNRELEASED_xx-xx-xxxx.md
index 1291b4db..f5fc71e8 100644
--- a/changelog/79_UNRELEASED_xx-xx-xxxx.md
+++ b/changelog/79_UNRELEASED_xx-xx-xxxx.md
@@ -11,6 +11,7 @@
 ### Stock
 
 - Optimized that the built-in Open Food Facts external barcode lookup plugin now uses the localized product name (if provided by the Open Food Facts API, based on the set Grocy language of the current user)
+- Fixed that the product filter on the stock entires page didn't work when the product column was reordered / not the second one
 
 ### Shopping list
 
diff --git a/public/viewjs/stockentries.js b/public/viewjs/stockentries.js
index e4b1e614..3f1d21d0 100644
--- a/public/viewjs/stockentries.js
+++ b/public/viewjs/stockentries.js
@@ -19,7 +19,7 @@ $.fn.dataTable.ext.search.push(function(settings, data, dataIndex)
 {
 	var productId = Grocy.Components.ProductPicker.GetValue();
 
-	if (!productId || Number.isNaN(productId) || productId == data[1])
+	if (!productId || Number.isNaN(productId) || productId == data[stockEntriesTable.colReorder.transpose(1)])
 	{
 		return true;
 	}
diff --git a/views/stockentries.blade.php b/views/stockentries.blade.php
index 761a909c..063711d6 100644
--- a/views/stockentries.blade.php
+++ b/views/stockentries.blade.php
@@ -75,7 +75,7 @@
 							data-table-selector="#stockentries-table"
 							href="#"><i class="fa-solid fa-eye"></i></a>
 					</th>
-					<th class="d-none">Hidden product_id</th> <!-- This must be in the first column for searching -->
+					<th class="d-none">Hidden product_id</th>
 					<th class="allow-grouping">{{ $__t('Product') }}</th>
 					<th>{{ $__t('Amount') }}</th>
 					<th class="@if(!GROCY_FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_TRACKING) d-none @endif allow-grouping">{{ $__t('Due date') }}</th>