Mirrored_Repos/InvenTree
1
0
Fork 0
mirror of https://github.com/inventree/InvenTree synced 2024-08-30 18:33:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Oliver Walters 2020-08-27 22:50:52 +10:00
commit f6d8a3f229
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
InvenTree/InvenTree/static/script/inventree/modals.js
View File

@ -77,7 +77,7 @@ function setFieldOptions(fieldName, optionList, options={}) {
if (addEmptyOption) { if (addEmptyOption) {
// Add an 'empty' option at the top of the list // Add an 'empty' option at the top of the list
field.append(makeOption('---------', '', '---------')); field.append(`<option value="">---------</option>`);
} }
optionList.forEach(function(option) { optionList.forEach(function(option) {

1
InvenTree/stock/templates/stock/location.html
View File

@ -205,6 +205,7 @@
$('#item-create').click(function () { $('#item-create').click(function () {
createNewStockItem({ createNewStockItem({
follow: true,
data: { data: {
{% if location %} {% if location %}
location: {{ location.id }} location: {{ location.id }}