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 'inventree/master'

Browse Source
This commit is contained in:
Oliver Walters 2020-09-21 10:10:14 +10:00
commit fda686e528
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
InvenTree/build/templates/build/allocate.html
View File

@ -415,7 +415,7 @@ InvenTree | Allocate Parts
launchModalForm( launchModalForm(
"{% url 'build-auto-allocate' build.id %}", "{% url 'build-auto-allocate' build.id %}",
{ {
reload: true, success: reloadTable,
} }
); );
}); });
@ -424,7 +424,7 @@ InvenTree | Allocate Parts
launchModalForm( launchModalForm(
"{% url 'build-unallocate' build.id %}", "{% url 'build-unallocate' build.id %}",
{ {
reload: true, success: reloadTable,
} }
); );
}); });

7
InvenTree/build/templates/build/auto_allocate.html
View File

@ -1,5 +1,6 @@
{% extends "modal_form.html" %} {% extends "modal_form.html" %}
{% load i18n %} {% load i18n %}
{% load inventree_extras %}
{% block pre_form_content %} {% block pre_form_content %}
{{ block.super }} {{ block.super }}
@ -28,7 +29,7 @@
{{ item.stock_item.part.full_name }}<br> {{ item.stock_item.part.full_name }}<br>
<i>{{ item.stock_item.part.description }}</i> <i>{{ item.stock_item.part.description }}</i>
</td> </td>
<td>{{ item.quantity }}</td> <td>{% decimal item.quantity %}</td>
<td>{{ item.stock_item.location }}</td> <td>{{ item.stock_item.location }}</td>
</tr> </tr>
{% endfor %} {% endfor %}
@ -36,7 +37,9 @@
{% else %} {% else %}
<div class='alert alert-block alert-warning'> <div class='alert alert-block alert-warning'>
{% trans "No stock items found that can be allocated to this build" %} {% trans "No stock items found that can be automatically allocated to this build" %}
<br>
{% trans "Stock items will have to be manually allocated" %}
</div> </div>
{% endif %} {% endif %}