From 70433aace5e2ec481b38d21500d8fbed7753e241 Mon Sep 17 00:00:00 2001
From: Bernd Bestel <bernd@berrnd.de>
Date: Mon, 12 Jul 2021 18:02:57 +0200
Subject: [PATCH] Added an status filter to only show in-stock products on the
 stock overview page (closes #1263)

---
 changelog/62_UNRELEASED_xxxx-xx-xx.md | 2 +-
 localization/strings.pot              | 3 +++
 views/stockoverview.blade.php         | 4 +++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/changelog/62_UNRELEASED_xxxx-xx-xx.md b/changelog/62_UNRELEASED_xxxx-xx-xx.md
index 2b9c868c..f839a295 100644
--- a/changelog/62_UNRELEASED_xxxx-xx-xx.md
+++ b/changelog/62_UNRELEASED_xxxx-xx-xx.md
@@ -31,7 +31,7 @@
 - Product barcodes are now enforced to be unique across products
 - On the stock overview page it's now also possible to search/filter by product barcodes (via the general search field)
 - The product picker on the consume and transfer page now only shows products which are currently in stock
-- Added a filter option to only show in-stock products on the products list page (master data)
+- Added a filter option to only show in-stock products on the stock overview and products list page (master data)
 - Added new columns on the stock overview page (hidden by default): Product description, product default location, parent product
 - Optimized that when opening a product which has "Default due days after opened" set, the resulting date now never extends the original due date
 - Fixed that editing stock entries was not possible
diff --git a/localization/strings.pot b/localization/strings.pot
index b941ef1b..c663a75b 100644
--- a/localization/strings.pot
+++ b/localization/strings.pot
@@ -2166,3 +2166,6 @@ msgstr ""
 
 msgid "When enabled, then this field must be filled on the destination form"
 msgstr ""
+
+msgid "In-stock products"
+msgstr ""
diff --git a/views/stockoverview.blade.php b/views/stockoverview.blade.php
index da37117d..2772da46 100755
--- a/views/stockoverview.blade.php
+++ b/views/stockoverview.blade.php
@@ -138,6 +138,7 @@
 				<option value="expired">{{ $__t('Expired') }}</option>
 				@endif
 				<option value="belowminstockamount">{{ $__t('Below min. stock amount') }}</option>
+				<option value="instockX">{{ $__t('In-stock products') }}</option>
 			</select>
 		</div>
 	</div>
@@ -380,7 +381,8 @@
 								. ' days'
 								))
 								&&
-								$currentStockEntry->amount > 0) duesoon @elseif ($currentStockEntry->product_missing) belowminstockamount @endif"
+								$currentStockEntry->amount > 0) duesoon @elseif ($currentStockEntry->product_missing) belowminstockamount @endif
+								@if($currentStockEntry->amount_aggregated > 0) instockX @endif
 					</td>
 					<td class="d-none">
 						xx{{ $currentStockEntry->product_group_name }}xx