mirror of
https://github.com/inventree/InvenTree.git
synced 2025-04-29 20:16:44 +00:00
StockItem page template fix (#3601)
- Allow damaged / quarantined items to be adjusted - Fix template rendering logic
This commit is contained in:
parent
349bbb8545
commit
6adfc91c5c
@ -75,24 +75,19 @@
|
|||||||
<div class='btn-group'>
|
<div class='btn-group'>
|
||||||
<button id='stock-actions' title='{% trans "Stock adjustment actions" %}' class='btn btn-outline-secondary dropdown-toggle' type='button' data-bs-toggle='dropdown'><span class='fas fa-boxes'></span> <span class='caret'></span></button>
|
<button id='stock-actions' title='{% trans "Stock adjustment actions" %}' class='btn btn-outline-secondary dropdown-toggle' type='button' data-bs-toggle='dropdown'><span class='fas fa-boxes'></span> <span class='caret'></span></button>
|
||||||
<ul class='dropdown-menu' role='menu'>
|
<ul class='dropdown-menu' role='menu'>
|
||||||
|
{% if item.can_adjust_location %}
|
||||||
{% if not item.serialized %}
|
{% if not item.serialized %}
|
||||||
{% if item.in_stock %}
|
|
||||||
<li><a class='dropdown-item' href='#' id='stock-count' title='{% trans "Count stock" %}'><span class='fas fa-check-circle icon-green'></span> {% trans "Count stock" %}</a></li>
|
<li><a class='dropdown-item' href='#' id='stock-count' title='{% trans "Count stock" %}'><span class='fas fa-check-circle icon-green'></span> {% trans "Count stock" %}</a></li>
|
||||||
{% endif %}
|
|
||||||
{% if not item.customer %}
|
{% if not item.customer %}
|
||||||
<li><a class='dropdown-item' href='#' id='stock-add' title='{% trans "Add stock" %}'><span class='fas fa-plus-circle icon-green'></span> {% trans "Add stock" %}</a></li>
|
<li><a class='dropdown-item' href='#' id='stock-add' title='{% trans "Add stock" %}'><span class='fas fa-plus-circle icon-green'></span> {% trans "Add stock" %}</a></li>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% if item.in_stock %}
|
{% if item.part.trackable %}
|
||||||
<li><a class='dropdown-item' href='#' id='stock-remove' title='{% trans "Remove stock" %}'><span class='fas fa-minus-circle icon-red'></span> {% trans "Remove stock" %}</a></li>
|
|
||||||
{% endif %}
|
|
||||||
{% if item.in_stock and item.part.trackable %}
|
|
||||||
<li><a class='dropdown-item' href='#' id='stock-serialize' title='{% trans "Serialize stock" %}'><span class='fas fa-hashtag'></span> {% trans "Serialize stock" %}</a> </li>
|
<li><a class='dropdown-item' href='#' id='stock-serialize' title='{% trans "Serialize stock" %}'><span class='fas fa-hashtag'></span> {% trans "Serialize stock" %}</a> </li>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% if item.in_stock and item.can_adjust_location %}
|
|
||||||
<li><a class='dropdown-item' href='#' id='stock-move' title='{% trans "Transfer stock" %}'><span class='fas fa-exchange-alt icon-blue'></span> {% trans "Transfer stock" %}</a></li>
|
<li><a class='dropdown-item' href='#' id='stock-move' title='{% trans "Transfer stock" %}'><span class='fas fa-exchange-alt icon-blue'></span> {% trans "Transfer stock" %}</a></li>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% if item.in_stock and item.can_adjust_location and item.part.salable and not item.customer %}
|
{% if item.part.salable and not item.customer %}
|
||||||
<li><a class='dropdown-item' href='#' id='stock-assign-to-customer' title='{% trans "Assign to customer" %}'><span class='fas fa-user-tie'></span> {% trans "Assign to customer" %}</a></li>
|
<li><a class='dropdown-item' href='#' id='stock-assign-to-customer' title='{% trans "Assign to customer" %}'><span class='fas fa-user-tie'></span> {% trans "Assign to customer" %}</a></li>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% if item.customer %}
|
{% if item.customer %}
|
||||||
@ -100,13 +95,12 @@
|
|||||||
{% endif %}
|
{% endif %}
|
||||||
{% if item.belongs_to %}
|
{% if item.belongs_to %}
|
||||||
<li><a class='dropdown-item' href='#' id='stock-uninstall' title='{% trans "Uninstall stock item" %}'><span class='fas fa-unlink'></span> {% trans "Uninstall" %}</a></li>
|
<li><a class='dropdown-item' href='#' id='stock-uninstall' title='{% trans "Uninstall stock item" %}'><span class='fas fa-unlink'></span> {% trans "Uninstall" %}</a></li>
|
||||||
{% else %}
|
{% endif %}
|
||||||
{% if item.part.get_used_in %}
|
{% if item.part.get_used_in %}
|
||||||
<!--
|
<!--
|
||||||
<li><a class='dropdown-item' href='#' id='stock-install-in' title='{% trans "Install stock item" %}'><span class='fas fa-link'></span> {% trans "Install" %}</a></li>
|
<li><a class='dropdown-item' href='#' id='stock-install-in' title='{% trans "Install stock item" %}'><span class='fas fa-link'></span> {% trans "Install" %}</a></li>
|
||||||
-->
|
-->
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% endif %}
|
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
@ -618,37 +612,7 @@ $("#stock-convert").click(function() {
|
|||||||
});
|
});
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
{% if item.in_stock %}
|
{% if item.customer %}
|
||||||
$("#stock-assign-to-customer").click(function() {
|
|
||||||
|
|
||||||
inventreeGet('{% url "api-stock-detail" item.pk %}', {}, {
|
|
||||||
success: function(response) {
|
|
||||||
assignStockToCustomer(
|
|
||||||
[response],
|
|
||||||
{
|
|
||||||
success: function() {
|
|
||||||
location.reload();
|
|
||||||
},
|
|
||||||
}
|
|
||||||
);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
$("#stock-move").click(function() {
|
|
||||||
itemAdjust("move");
|
|
||||||
});
|
|
||||||
|
|
||||||
$("#stock-count").click(function() {
|
|
||||||
itemAdjust('count');
|
|
||||||
});
|
|
||||||
|
|
||||||
$('#stock-remove').click(function() {
|
|
||||||
itemAdjust('take');
|
|
||||||
});
|
|
||||||
|
|
||||||
{% else %}
|
|
||||||
|
|
||||||
$("#stock-return-from-customer").click(function() {
|
$("#stock-return-from-customer").click(function() {
|
||||||
|
|
||||||
constructForm('{% url "api-stock-item-return" item.pk %}', {
|
constructForm('{% url "api-stock-item-return" item.pk %}', {
|
||||||
@ -666,6 +630,37 @@ $("#stock-return-from-customer").click(function() {
|
|||||||
});
|
});
|
||||||
|
|
||||||
});
|
});
|
||||||
|
{% else %}
|
||||||
|
$("#stock-assign-to-customer").click(function() {
|
||||||
|
|
||||||
|
inventreeGet('{% url "api-stock-detail" item.pk %}', {}, {
|
||||||
|
success: function(response) {
|
||||||
|
assignStockToCustomer(
|
||||||
|
[response],
|
||||||
|
{
|
||||||
|
success: function() {
|
||||||
|
location.reload();
|
||||||
|
},
|
||||||
|
}
|
||||||
|
);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
{% if item.can_adjust_location %}
|
||||||
|
|
||||||
|
$("#stock-move").click(function() {
|
||||||
|
itemAdjust("move");
|
||||||
|
});
|
||||||
|
|
||||||
|
$("#stock-count").click(function() {
|
||||||
|
itemAdjust('count');
|
||||||
|
});
|
||||||
|
|
||||||
|
$('#stock-remove').click(function() {
|
||||||
|
itemAdjust('take');
|
||||||
|
});
|
||||||
|
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user