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 branch 'master' of github.com:inventree/InvenTree into part_main_details

Browse Source
This commit is contained in:
eeintech 2021-07-16 10:43:53 -04:00
commit 86f3f56a60
6 changed files with 44 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
InvenTree/InvenTree/static/css/inventree.css
View File

@ -781,8 +781,8 @@ input[type="submit"] {
}
.sidenav .list-group-item.active {
background-color: #b3a997;
border-color: #ccc;
background-color: #c6d4ea;
border: 2px #aab solid;
}
/* The side navigation menu */

10
InvenTree/order/templates/order/purchase_order_detail.html
View File

@ -187,7 +187,11 @@ $('#new-po-line').click(function() {
quantity: {},
reference: {},
purchase_price: {},
purchase_price_currency: {},
purchase_price_currency: {
{% if order.supplier.currency %}
value: '{{ order.supplier.currency }}',
{% endif %}
},
destination: {},
notes: {},
},
@ -324,9 +328,9 @@ $("#po-table").inventreeTable({
title: '{% trans "MPN" %}',
formatter: function(value, row, index, field) {
if (row.supplier_part_detail && row.supplier_part_detail.manufacturer_part) {
return renderLink(value, `/manufacturer-part/${row.supplier_part_detail.manufacturer_part.pk}/`);
return renderLink(value, `/manufacturer-part/${row.supplier_part_detail.manufacturer_part}/`);
} else {
return "";
return "-";
}
},
},

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

@ -223,30 +223,6 @@
</div>
</div>
<div class='panel panel-default panel-inventree panel-hidden' id='panel-part-suppliers'>
<div class='panel-heading'>
<h4>{% trans "Part Suppliers" %}</h4>
</div>
<div class='panel-content'>
<div id='supplier-button-toolbar'>
<div class='btn-group'>
<button class="btn btn-success" id='supplier-create'>
<span class='fas fa-plus-circle'></span> {% trans "New Supplier Part" %}
</button>
<div id='opt-dropdown' class="btn-group">
<button id='supplier-part-options' class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown">{% trans "Options" %}<span class="caret"></span></button>
<ul class="dropdown-menu">
<li><a href='#' id='supplier-part-delete' title='{% trans "Delete supplier parts" %}'>{% trans "Delete" %}</a></li>
</ul>
</div>
</div>
</div>
<table class="table table-striped table-condensed" id='supplier-table' data-toolbar='#supplier-button-toolbar'>
</table>
</div>
</div>
<div class='panel panel-default panel-inventree panel-hidden' id='panel-bom'>
<div class='panel-heading'>
<h4>{% trans "Bill of Materials" %}</h4>
@ -302,7 +278,29 @@
</div>
</div>
<div class='panel panel-default panel-inventree panel-hidden' id='panel-part-manufacturers'>
<div class='panel panel-default panel-inventree panel-hidden' id='panel-suppliers'>
<div class='panel-heading'>
<h4>{% trans "Part Suppliers" %}</h4>
</div>
<div class='panel-content'>
<div id='supplier-button-toolbar'>
<div class='btn-group'>
<button class="btn btn-success" id='supplier-create'>
<span class='fas fa-plus-circle'></span> {% trans "New Supplier Part" %}
</button>
<div id='opt-dropdown' class="btn-group">
<button id='supplier-part-options' class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown">{% trans "Options" %}<span class="caret"></span></button>
<ul class="dropdown-menu">
<li><a href='#' id='supplier-part-delete' title='{% trans "Delete supplier parts" %}'>{% trans "Delete" %}</a></li>
</ul>
</div>
</div>
</div>
<table class="table table-striped table-condensed" id='supplier-part-table' data-toolbar='#supplier-button-toolbar'>
</table>
</div>
<div class='panel-heading'>
<h4>{% trans "Part Manufacturers" %}</h4>
</div>
@ -321,7 +319,7 @@
</div>
</div>
</div>
<table class='table table-condensed table-striped' id='manufacturer-table' data-toolbar='#manufacturer-button-toolbar'></table>
<table class='table table-condensed table-striped' id='manufacturer-part-table' data-toolbar='#manufacturer-button-toolbar'></table>
</div>
</div>
</div>
@ -828,7 +826,7 @@
$("#supplier-part-delete").click(function() {
var selections = $("#supplier-table").bootstrapTable("getSelections");
var selections = $("#supplier-part-table").bootstrapTable("getSelections");
var parts = [];
@ -845,7 +843,7 @@
});
loadSupplierPartTable(
"#supplier-table",
"#supplier-part-table",
"{% url 'api-supplier-part-list' %}",
{
params: {
@ -857,10 +855,10 @@
}
);
linkButtonsToSelection($("#supplier-table"), ['#supplier-part-options']);
linkButtonsToSelection($("#supplier-part-table"), ['#supplier-part-options']);
loadManufacturerPartTable(
'#manufacturer-table',
'#manufacturer-part-table',
"{% url 'api-manufacturer-part-list' %}",
{
params: {
@ -871,15 +869,15 @@
}
);
linkButtonsToSelection($("#manufacturer-table"), ['#manufacturer-part-options']);
linkButtonsToSelection($("#manufacturer-part-table"), ['#manufacturer-part-options']);
$("#manufacturer-part-delete").click(function() {
var selections = $("#manufacturer-table").bootstrapTable("getSelections");
var selections = $("#manufacturer-part-table").bootstrapTable("getSelections");
deleteManufacturerParts(selections, {
onSuccess: function() {
$("#manufacturer-table").bootstrapTable("refresh");
$("#manufacturer-part-table").bootstrapTable("refresh");
}
});
});
@ -900,7 +898,7 @@
method: 'POST',
title: '{% trans "Add Manufacturer Part" %}',
onSuccess: function() {
$("#manufacturer-table").bootstrapTable("refresh");
$("#manufacturer-part-table").bootstrapTable("refresh");
}
});
});

8
InvenTree/part/templates/part/navbar.html
View File

@ -63,17 +63,11 @@
</li>
{% if part.purchaseable and roles.purchase_order.view %}
<li class='list-group-item' title='{% trans "Suppliers" %}'>
<a href='#' id='select-part-suppliers' class='nav-toggle'>
<a href='#' id='select-suppliers' class='nav-toggle'>
<span class='menu-tab-icon fas fa-building sidebar-icon'></span>
{% trans "Suppliers" %}
</a>
</li>
<li class='list-group-item' title='{% trans "Manufacturers" %}'>
<a href='#' id='select-part-manufacturers' class='nav-toggle'>
<span class='menu-tab-icon fas fa-tools sidebar-icon'></span>
{% trans "Manufacturers" %}
</a>
</li>
<li class='list-group-item' title='{% trans "Purchase Orders" %}'>
<a href='#' id='select-purchase-orders' class='nav-toggle'>
<span class='menu-tab-icon fas fa-shopping-cart sidebar-icon'></span>

2
InvenTree/templates/js/company.js
View File

@ -539,7 +539,7 @@ function loadSupplierPartTable(table, url, options) {
title: '{% trans "MPN" %}',
formatter: function(value, row, index, field) {
if (value && row.manufacturer_part) {
return renderLink(value, `/manufacturer-part/${row.manufacturer_part.pk}/`);
return renderLink(value, `/manufacturer-part/${row.manufacturer_part}/`);
} else {
return "-";
}

2
InvenTree/templates/registration/logged_out.html
View File

@ -14,7 +14,7 @@
<!-- CSS -->
<link rel="stylesheet" href="{% static 'css/bootstrap_3.3.7_css_bootstrap.min.css' %}">
<link rel="stylesheet" href="{% static 'select2/css/select2.css' %}">
<link rel="stylesheet" href="{% static 'select2/css/inventree.css' %}">
<link rel="stylesheet" href="{% static 'css/inventree.css' %}">
<link rel="stylesheet" href="{% static 'fontawesome/css/brands.css' %}">
<link rel="stylesheet" href="{% static 'fontawesome/css/solid.css' %}">