kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-04-29 01:32:38 +00:00
Code Issues Projects Releases Wiki Activity

Fixed embedded /transfer from /stockentries (fixes #1303)

Browse Source
This commit is contained in:
Bernd Bestel 2021-02-21 19:36:37 +01:00
parent 5583074001
commit 906a9db628
No known key found for this signature in database
GPG Key ID: 71BD34C0D4891300
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog/62_UNRELEASED_xxxx-xx-xx.md
View File

@ -3,6 +3,7 @@
- Fixed that editing stock entries was not possible - Fixed that editing stock entries was not possible
- Fixed that consuming with Scan Mode was not possible - Fixed that consuming with Scan Mode was not possible
- Fixed that the current stock total value (header of the stock overview page) didn't include decimal amounts (thanks @Ape) - Fixed that the current stock total value (header of the stock overview page) didn't include decimal amounts (thanks @Ape)
- Fixed that the transfer page was not fully populated when opening it from the stock entries page
### Shopping list fixes ### Shopping list fixes
- Fixed that shopping list prints had a grey background (thanks @Forceu) - Fixed that shopping list prints had a grey background (thanks @Forceu)

16
public/viewjs/transfer.js
View File

@ -126,12 +126,15 @@
Grocy.Components.ProductPicker.GetPicker().on('change', function(e) Grocy.Components.ProductPicker.GetPicker().on('change', function(e)
{ {
$("#specific_stock_entry").find("option").remove().end().append("<option></option>"); $("#specific_stock_entry").find("option").remove().end().append("<option></option>");
if ($("#use_specific_stock_entry").is(":checked")) if ($("#use_specific_stock_entry").is(":checked") && GetUriParam("stockId") == null)
{ {
$("#use_specific_stock_entry").click(); $("#use_specific_stock_entry").click();
} }
$("#location_id_to").val(""); $("#location_id_to").val("");
$("#location_id_from").val(""); if (GetUriParam("stockId") == null)
{
$("#location_id_from").val("");
}
var productId = $(e.target).val(); var productId = $(e.target).val();
@ -185,6 +188,12 @@ Grocy.Components.ProductPicker.GetPicker().on('change', function(e)
$("#location_id_from").trigger('change'); $("#location_id_from").trigger('change');
} }
}); });
if (GetUriParam("locationId") != null)
{
$("#location_id_from").val(GetUriParam("locationId"));
$("#location_id_from").trigger("change");
}
}, },
function(xhr) function(xhr)
{ {
@ -284,7 +293,7 @@ $("#location_id_from").on('change', function(e)
} }
$("#specific_stock_entry").find("option").remove().end().append("<option></option>"); $("#specific_stock_entry").find("option").remove().end().append("<option></option>");
if ($("#use_specific_stock_entry").is(":checked")) if ($("#use_specific_stock_entry").is(":checked") && GetUriParam("stockId") == null)
{ {
$("#use_specific_stock_entry").click(); $("#use_specific_stock_entry").click();
} }
@ -475,6 +484,7 @@ if (GetUriParam("embedded") !== undefined)
$("#location_id_from").trigger('change'); $("#location_id_from").trigger('change');
$("#use_specific_stock_entry").click(); $("#use_specific_stock_entry").click();
$("#use_specific_stock_entry").trigger('change'); $("#use_specific_stock_entry").trigger('change');
Grocy.Components.ProductPicker.GetPicker().trigger('change');
} }
} }