From edddfe234ca3fe86d53f925e82df3b198ecc7ee9 Mon Sep 17 00:00:00 2001
From: Bernd Bestel <bernd@berrnd.de>
Date: Mon, 8 Nov 2021 17:06:20 +0100
Subject: [PATCH] Include duesoon/overdue/expired products for the
 belowminstockamount filter on the stock overview page (closes #1666)

---
 changelog/65_UNRELEASED_xxxx-xx-xx.md | 1 +
 views/stockoverview.blade.php         | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/changelog/65_UNRELEASED_xxxx-xx-xx.md b/changelog/65_UNRELEASED_xxxx-xx-xx.md
index 9b8672e0..0e97145e 100644
--- a/changelog/65_UNRELEASED_xxxx-xx-xx.md
+++ b/changelog/65_UNRELEASED_xxxx-xx-xx.md
@@ -1 +1,2 @@
+- The "Below min. stock amount" filter on the stock overview page now also includes due-soon, overdue or already expired products
 - Fixed that the "Stay logged in permanently" checkbox on the login page had no effect (thanks @0)
diff --git a/views/stockoverview.blade.php b/views/stockoverview.blade.php
index ded6518e..a5cfacb9 100755
--- a/views/stockoverview.blade.php
+++ b/views/stockoverview.blade.php
@@ -320,7 +320,7 @@
 					<td>
 						@if($currentStockEntry->product_group_name !== null){{ $currentStockEntry->product_group_name }}@endif
 					</td>
-					<td data-order={{ $currentStockEntry->amount }}>
+					<td data-order="{{ $currentStockEntry->amount }}">
 						<span id="product-{{ $currentStockEntry->product_id }}-amount"
 							class="locale-number locale-number-quantity-amount">{{ $currentStockEntry->amount }}</span> <span id="product-{{ $currentStockEntry->product_id }}-qu-name">{{ $__n($currentStockEntry->amount, $currentStockEntry->qu_unit_name, $currentStockEntry->qu_unit_name_plural) }}</span>
 						<span id="product-{{ $currentStockEntry->product_id }}-opened-amount"
@@ -374,8 +374,9 @@
 								. ' days'
 								))
 								&&
-								$currentStockEntry->amount > 0) duesoon @elseif ($currentStockEntry->product_missing) belowminstockamount @endif
+								$currentStockEntry->amount > 0) duesoon @endif
 								@if($currentStockEntry->amount_aggregated > 0) instockX @endif
+								@if ($currentStockEntry->product_missing) belowminstockamount @endif
 					</td>
 					<td class="d-none">
 						xx{{ $currentStockEntry->product_group_name }}xx