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

Merge pull request #2696 from SchrodingersGat/bom-table-fix

Browse Source 
Fix some small template / JS errors on the "part" page

(cherry picked from commit f585ee6db77f376de10c28c188d9283c5a9e5cf6)
This commit is contained in:
Oliver 2022-03-02 00:08:18 +11:00
parent 1d04db14f2
commit 1ed2b47353
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -122,7 +122,13 @@
<h4>{% trans "Sales Order Allocations" %}</h4> <h4>{% trans "Sales Order Allocations" %}</h4>
</div> </div>
<div class='panel-content'> <div class='panel-content'>
<table class='table table-striped table-condensed' id='sales-order-allocation-table'></table>
<div id='sales-order-allocation-button-toolbar'>
<div class='btn-group' role='group'>
{% include "filter_list.html" with id="salesorderallocation" %}
</div>
</div>
<table class='table table-striped table-condensed' id='sales-order-allocation-table' data-toolbar='#sales-order-allocation-button-toolbar'></table>
</div> </div>
</div> </div>
@ -342,7 +348,12 @@
<h4>{% trans "Build Order Allocations" %}</h4> <h4>{% trans "Build Order Allocations" %}</h4>
</div> </div>
<div class='panel-content'> <div class='panel-content'>
<table class='table table-striped table-condensed' id='build-order-allocation-table'></table> <div id='build-allocation-button-toolbar'>
<div class='btn-group' role='group'>
{% include "filter_list.html" with id="buildorderallocation" %}
</div>
</div>
<table class='table table-striped table-condensed' id='build-order-allocation-table' data-toolbar='#build-allocation-button-toolbar'></table>
</div> </div>
</div> </div>
@ -722,6 +733,7 @@
}); });
// Load the BOM table data in the pricing view // Load the BOM table data in the pricing view
{% if part.has_bom and roles.sales_order.view %}
loadBomTable($("#bom-pricing-table"), { loadBomTable($("#bom-pricing-table"), {
editable: false, editable: false,
bom_url: "{% url 'api-bom-list' %}", bom_url: "{% url 'api-bom-list' %}",
@ -729,6 +741,7 @@
parent_id: {{ part.id }} , parent_id: {{ part.id }} ,
sub_part_detail: true, sub_part_detail: true,
}); });
{% endif %}
onPanelLoad("purchase-orders", function() { onPanelLoad("purchase-orders", function() {
loadPartPurchaseOrderTable( loadPartPurchaseOrderTable(

2
InvenTree/templates/js/translated/tables.js
View File

@ -278,7 +278,7 @@ $.fn.inventreeTable = function(options) {
} }
}); });
} else { } else {
console.log(`Could not get list of visible columns for column '${tableName}'`); console.log(`Could not get list of visible columns for table '${tableName}'`);
} }
} }