inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-04-30 04:26:44 +00:00
Code

Differentiate between "fully allocated" and "partially allocated" in stock item table

Browse Source
This commit is contained in:
Oliver 2021-12-02 21:46:05 +11:00
parent 586d38fb61
commit d5ace1a8da
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
InvenTree/order/serializers.py
View File

@ -526,6 +526,7 @@ class SalesOrderAllocationSerializer(InvenTreeModelSerializer):
'order_detail', 'order_detail',
'part', 'part',
'part_detail', 'part_detail',
'shipment',
] ]

4
InvenTree/stock/templates/stock/item_base.html
View File

@ -252,7 +252,7 @@
<div class='alert alert-block alert-info'> <div class='alert alert-block alert-info'>
{% object_link 'so-detail' allocation.line.order.id allocation.line.order as link %} {% object_link 'so-detail' allocation.line.order.id allocation.line.order as link %}
{% decimal allocation.quantity as qty %} {% decimal allocation.quantity as qty %}
{% blocktrans %}This stock item is allocated to Sales Order {{ link }} (Quantity: {{ qty }}){% endblocktrans %} {% trans "This stock item is allocated to Sales Order" %} {{ link }} {% if qty < item.quantity %}({% trans "Quantity" %}: {{ qty }}){% endif %}
</div> </div>
{% endfor %} {% endfor %}
@ -260,7 +260,7 @@
<div class='alert alert-block alert-info'> <div class='alert alert-block alert-info'>
{% object_link 'build-detail' allocation.build.id allocation.build %} {% object_link 'build-detail' allocation.build.id allocation.build %}
{% decimal allocation.quantity as qty %} {% decimal allocation.quantity as qty %}
{% blocktrans %}This stock item is allocated to Build {{ link }} (Quantity: {{ qty }}){% endblocktrans %} {% trans "This stock item is allocated to Build Order" %} {{ link }} {% if qty < item.quantity %}({% trans "Quantity" %}: {{ qty }}){% endif %}
</div> </div>
{% endfor %} {% endfor %}

9
InvenTree/templates/js/translated/stock.js
View File

@ -1278,7 +1278,14 @@ function loadStockTable(table, options) {
} }
if (row.allocated) { if (row.allocated) {
html += makeIconBadge('fa-bookmark', '{% trans "Stock item has been allocated" %}');
if (row.serial != null && row.quantity == 1) {
html += makeIconBadge('fa-bookmark icon-yellow', '{% trans "Serialized stock item has been allocated" %}');
} else if (row.allocated >= row.quantity) {
html += makeIconBadge('fa-bookmark icon-red', '{% trans "Stock item has been fully allocated" %}');
} else {
html += makeIconBadge('fa-bookmark', '{% trans "Stock item has been partially allocated" %}');
}
} }
if (row.belongs_to) { if (row.belongs_to) {