kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-08-17 19:16:37 +00:00
Code Issues Projects Releases Wiki Activity

Don't change the displayed QU to the products stock QU when "Only check if a single unit is in stock" is set when editing a recipe ingredient (fixes #606)

Browse Source
This commit is contained in:
Bernd Bestel
2020-04-12 13:55:26 +02:00
parent 4f8ef2859e
commit 9dbd6a68c4
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
changelog/58_UNRELEASED_2020-xx-xx.md
View File

@@ -9,6 +9,7 @@
- When creating a new product, the "QU id stock" is now preset by the "QU id purchase" (because most of the time that's most probably the same) (thanks @Mik-) - When creating a new product, the "QU id stock" is now preset by the "QU id purchase" (because most of the time that's most probably the same) (thanks @Mik-)
### Recipe fixes ### Recipe fixes
- Fixed that when editing an ingredient with "Only check if a single unit is in stock" set, the quantity unit was always set to the products stock quantity unit regardless if a different one was selected for that ingredient
- Fixed a PHP notice on the recipes page when there are no recipes (thanks @mrunkel) - Fixed a PHP notice on the recipes page when there are no recipes (thanks @mrunkel)
### Calendar fixes ### Calendar fixes

3
public/viewjs/recipeposform.js
View File

@@ -79,7 +79,10 @@ Grocy.Components.ProductPicker.GetPicker().on('change', function(e)
$("#not_check_stock_fulfillment").prop("checked", productDetails.product.not_check_stock_fulfillment_for_recipes == 1); $("#not_check_stock_fulfillment").prop("checked", productDetails.product.not_check_stock_fulfillment_for_recipes == 1);
if (!$("#only_check_single_unit_in_stock").prop("checked"))
{
Grocy.Components.ProductAmountPicker.SetQuantityUnit(productDetails.quantity_unit_stock.id); Grocy.Components.ProductAmountPicker.SetQuantityUnit(productDetails.quantity_unit_stock.id);
}
$('#display_amount').focus(); $('#display_amount').focus();
Grocy.FrontendHelpers.ValidateForm('recipe-pos-form'); Grocy.FrontendHelpers.ValidateForm('recipe-pos-form');