Mirrored_Repos/InvenTree
1
0
Fork 0
mirror of https://github.com/inventree/InvenTree synced 2024-08-30 18:33:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Fix duplicate table naming
This commit is contained in:
Oliver 2021-07-19 15:03:31 +10:00 committed by GitHub
commit 44d45050b9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -370,6 +370,16 @@
sub_part_detail: true, sub_part_detail: true,
}); });
// Load the BOM table data in the pricing view
loadBomTable($("#bom-pricing-table"), {
editable: {{ editing_enabled }},
bom_url: "{% url 'api-bom-list' %}",
part_url: "{% url 'api-part-list' %}",
parent_id: {{ part.id }} ,
sub_part_detail: true,
});
linkButtonsToSelection($("#bom-table"), linkButtonsToSelection($("#bom-table"),
[ [
"#bom-item-delete", "#bom-item-delete",

2
InvenTree/part/templates/part/prices.html
View File

@ -217,7 +217,7 @@
<div class='panel-content'> <div class='panel-content'>
<div class="row"> <div class="row">
<div class="col col-md-6"> <div class="col col-md-6">
<table class='table table-bom table-condensed' data-toolbar="#button-toolbar" id='bom-table'></table> <table class='table table-bom table-condensed' data-toolbar="#button-toolbar" id='bom-pricing-table'></table>
</div> </div>
{% if part.bom_count > 0 %} {% if part.bom_count > 0 %}