From 9f833b9bd512a40f6c66d59c9e4c590e6ca00ea7 Mon Sep 17 00:00:00 2001
From: Bernd Bestel <bernd@berrnd.de>
Date: Fri, 2 Jul 2021 16:59:37 +0200
Subject: [PATCH] Prvent potentially duplicate stock items in drodpown on
 /consume and /transfer page (fixes #1368)

---
 public/viewjs/consume.js  | 13 ++++++++-----
 public/viewjs/transfer.js | 15 ++++++++++-----
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/public/viewjs/consume.js b/public/viewjs/consume.js
index fbce4707..8f6e4a39 100644
--- a/public/viewjs/consume.js
+++ b/public/viewjs/consume.js
@@ -251,11 +251,14 @@ $("#location_id").on('change', function(e)
 
 					if (stockEntry.location_id == locationId)
 					{
-						$("#specific_stock_entry").append($("<option>", {
-							value: stockEntry.stock_id,
-							amount: stockEntry.amount,
-							text: __t("Amount: %1$s; Due on %2$s; Bought on %3$s", stockEntry.amount, moment(stockEntry.best_before_date).format("YYYY-MM-DD"), moment(stockEntry.purchased_date).format("YYYY-MM-DD")) + "; " + openTxt
-						}));
+						if ($("#specific_stock_entry option[value='" + stockEntry.stock_id + "']").length == 0)
+						{
+							$("#specific_stock_entry").append($("<option>", {
+								value: stockEntry.stock_id,
+								amount: stockEntry.amount,
+								text: __t("Amount: %1$s; Due on %2$s; Bought on %3$s", stockEntry.amount, moment(stockEntry.best_before_date).format("YYYY-MM-DD"), moment(stockEntry.purchased_date).format("YYYY-MM-DD")) + "; " + openTxt
+							}));
+						}
 
 						sumValue = sumValue + parseFloat(stockEntry.amount || 0);
 
diff --git a/public/viewjs/transfer.js b/public/viewjs/transfer.js
index 2651ce37..92a608cb 100644
--- a/public/viewjs/transfer.js
+++ b/public/viewjs/transfer.js
@@ -313,15 +313,20 @@ $("#location_id_from").on('change', function(e)
 
 					if (stockEntry.location_id == locationId)
 					{
-						$("#specific_stock_entry").append($("<option>", {
-							value: stockEntry.stock_id,
-							amount: stockEntry.amount,
-							text: __t("Amount: %1$s; Due on %2$s; Bought on %3$s", stockEntry.amount, moment(stockEntry.best_before_date).format("YYYY-MM-DD"), moment(stockEntry.purchased_date).format("YYYY-MM-DD")) + "; " + openTxt
-						}));
+						if ($("#specific_stock_entry option[value='" + stockEntry.stock_id + "']").length == 0)
+						{
+							$("#specific_stock_entry").append($("<option>", {
+								value: stockEntry.stock_id,
+								amount: stockEntry.amount,
+								text: __t("Amount: %1$s; Due on %2$s; Bought on %3$s", stockEntry.amount, moment(stockEntry.best_before_date).format("YYYY-MM-DD"), moment(stockEntry.purchased_date).format("YYYY-MM-DD")) + "; " + openTxt
+							}));
+						}
+
 						if (stockEntry.stock_id == stockId)
 						{
 							$("#specific_stock_entry").val(stockId);
 						}
+
 						sumValue = sumValue + parseFloat(stockEntry.amount);
 					}
 				});