kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-04-30 10:05:45 +00:00
Code Issues Projects Releases Wiki Activity

Prvent potentially duplicate stock items in drodpown on /consume and /transfer page (fixes #1368)

Browse Source
This commit is contained in:
Bernd Bestel 2021-07-02 16:59:37 +02:00
parent b856911f0f
commit 9f833b9bd5
No known key found for this signature in database
GPG Key ID: 71BD34C0D4891300
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
public/viewjs/consume.js
View File

@ -250,12 +250,15 @@ $("#location_id").on('change', function(e)
} }
if (stockEntry.location_id == locationId) if (stockEntry.location_id == locationId)
{
if ($("#specific_stock_entry option[value='" + stockEntry.stock_id + "']").length == 0)
{ {
$("#specific_stock_entry").append($("<option>", { $("#specific_stock_entry").append($("<option>", {
value: stockEntry.stock_id, value: stockEntry.stock_id,
amount: stockEntry.amount, 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 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); sumValue = sumValue + parseFloat(stockEntry.amount || 0);

5
public/viewjs/transfer.js
View File

@ -312,16 +312,21 @@ $("#location_id_from").on('change', function(e)
} }
if (stockEntry.location_id == locationId) if (stockEntry.location_id == locationId)
{
if ($("#specific_stock_entry option[value='" + stockEntry.stock_id + "']").length == 0)
{ {
$("#specific_stock_entry").append($("<option>", { $("#specific_stock_entry").append($("<option>", {
value: stockEntry.stock_id, value: stockEntry.stock_id,
amount: stockEntry.amount, 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 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) if (stockEntry.stock_id == stockId)
{ {
$("#specific_stock_entry").val(stockId); $("#specific_stock_entry").val(stockId);
} }
sumValue = sumValue + parseFloat(stockEntry.amount); sumValue = sumValue + parseFloat(stockEntry.amount);
} }
}); });