inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-06-18 21:15:41 +00:00
Code Activity

Merge branch 'inventree:master' into matmair/issue2385

Browse Source
This commit is contained in:
Matthias Mair
2022-05-04 12:23:05 +02:00
committed by GitHub
parent 4125803e6d dbc0023c57
commit cf93ba7cf9
45 changed files with 985 additions and 785 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
InvenTree/part/templates/part/category.html
View File

@ -169,13 +169,18 @@
</button>
<ul class='dropdown-menu'>
{% if roles.part.change %}
<li><a class='dropdown-item' href='#' id='multi-part-category' title='{% trans "Set category" %}'>{% trans "Set Category" %}</a></li>
<li><a class='dropdown-item' href='#' id='multi-part-category' title='{% trans "Set category" %}'>
<span class='fas fa-sitemap'></span> {% trans "Set Category" %}
</a></li>
{% endif %}
<li><a class='dropdown-item' href='#' id='multi-part-order' title='{% trans "Order parts" %}'>{% trans "Order Parts" %}</a></li>
<li><a class='dropdown-item' href='#' id='multi-part-order' title='{% trans "Order parts" %}'>
<span class='fas fa-shopping-cart'></span> {% trans "Order Parts" %}
</a></li>
{% if report_enabled %}
<li><a class='dropdown-item' href='#' id='multi-part-print-label' title='{% trans "Print Labels" %}'>{% trans "Print Labels" %}</a></li>
<li><a class='dropdown-item' href='#' id='multi-part-print-label' title='{% trans "Print Labels" %}'>
<span class='fas fa-tag'></span> {% trans "Print Labels" %}
</a></li>
{% endif %}
<li><a class='dropdown-item' href='#' id='multi-part-export' title='{% trans "Export" %}'>{% trans "Export Data" %}</a></li>
</ul>
</div>
{% include "filter_list.html" with id="parts" %}

18
InvenTree/part/templates/part/detail.html
View File

@ -754,12 +754,18 @@
$("#part-order2").click(function() {
launchModalForm("{% url 'order-parts' %}", {
data: {
part: {{ part.id }},
},
reload: true,
});
inventreeGet(
'{% url "api-part-detail" part.pk %}',
{},
{
success: function(part) {
orderParts(
[part],
{}
);
}
}
);
});
onPanelLoad("test-templates", function() {

19
InvenTree/part/templates/part/part_base.html
View File

@ -536,12 +536,19 @@
{% endif %}
$("#part-order").click(function() {
launchModalForm("{% url 'order-parts' %}", {
data: {
part: {{ part.id }},
},
reload: true,
});
inventreeGet(
'{% url "api-part-detail" part.pk %}',
{},
{
success: function(part) {
orderParts(
[part],
{}
);
}
}
);
});
{% if roles.part.add %}