2
0
mirror of https://github.com/inventree/InvenTree.git synced 2025-06-19 21:45:39 +00:00

Merge remote-tracking branch 'inventree/master' into partial-shipment

# Conflicts:
#	InvenTree/order/api.py
This commit is contained in:
Oliver
2021-12-04 09:35:54 +11:00
18 changed files with 4326 additions and 428 deletions

View File

@ -73,7 +73,7 @@
<div class='panel-content'>
<div id='po-button-bar'>
<div class='button-toolbar container-fluid' style='float: right;'>
{% include "filter_list.html" with id="purchaseorder" %}
{% include "filter_list.html" with id="partpurchaseorders" %}
</div>
</div>
@ -703,12 +703,10 @@
});
onPanelLoad("purchase-orders", function() {
loadPurchaseOrderTable($("#purchase-order-table"), {
url: "{% url 'api-po-list' %}",
params: {
part: {{ part.id }},
},
});
loadPartPurchaseOrderTable(
"#purchase-order-table",
{{ part.pk }},
);
});
onPanelLoad("sales-orders", function() {