diff --git a/InvenTree/part/templates/part/detail.html b/InvenTree/part/templates/part/detail.html
index e077e5af01..5132721fec 100644
--- a/InvenTree/part/templates/part/detail.html
+++ b/InvenTree/part/templates/part/detail.html
@@ -238,6 +238,30 @@
{% endblock %}
+{% block post_content_panel %}
+
+<div class='panel panel-default panel-inventree'>
+ <div class='panel-heading'>
+ <h4>
+ {% trans "Part Parameters" %}
+ </h4>
+ </div>
+ <div class='panel-content'>
+ <div id='param-button-toolbar'>
+ <div class='button-toolbar container-fluid' style='float: right;'>
+ {% if roles.part.add %}
+ <button title='{% trans "Add new parameter" %}' class='btn btn-success' id='param-create'>
+ <span class='fas fa-plus-circle'></span> {% trans "New Parameter" %}
+ </button>
+ {% endif %}
+ </div>
+ </div>
+ <table id='parameter-table' class='table table-condensed table-striped' data-toolbar="#param-button-toolbar"></table>
+ </div>
+</div>
+
+{% endblock %}
+
{% block js_load %}
{{ block.super }}
{% endblock %}
@@ -263,4 +287,54 @@
);
});
+ loadPartParameterTable(
+ '#parameter-table',
+ '{% url "api-part-parameter-list" %}',
+ {
+ params: {
+ part: {{ part.pk }},
+ }
+ }
+ );
+
+ $('#param-table').inventreeTable({
+ });
+
+ {% if roles.part.add %}
+ $('#param-create').click(function() {
+
+ constructForm('{% url "api-part-parameter-list" %}', {
+ method: 'POST',
+ fields: {
+ part: {
+ value: {{ part.pk }},
+ hidden: true,
+ },
+ template: {},
+ data: {},
+ },
+ title: '{% trans "Add Parameter" %}',
+ onSuccess: function() {
+ $('#parameter-table').bootstrapTable('refresh');
+ }
+ });
+ });
+ {% endif %}
+
+ $('.param-edit').click(function() {
+ var button = $(this);
+
+ launchModalForm(button.attr('url'), {
+ reload: true,
+ });
+ });
+
+ $('.param-delete').click(function() {
+ var button = $(this);
+
+ launchModalForm(button.attr('url'), {
+ reload: true,
+ });
+ });
+
{% endblock %}
diff --git a/InvenTree/part/templates/part/navbar.html b/InvenTree/part/templates/part/navbar.html
index 6266675aa8..afe4fee374 100644
--- a/InvenTree/part/templates/part/navbar.html
+++ b/InvenTree/part/templates/part/navbar.html
@@ -19,12 +19,6 @@
</span>
</a>
</li>
- <li class='list-group-item {% if tab == "params" %}active{% endif %}' title='{% trans "Part Parameters" %}'>
- <a href='{% url "part-params" part.id %}'>
- <span class='menu-tab-icon fas fa-tasks sidebar-icon'></span>
- {% trans "Parameters" %}
- </a>
- </li>
{% if part.is_template %}
<li class='list-group-item {% if tab == "variants" %}active{% endif %}' title='{% trans "Part Variants" %}'>
<a href='{% url "part-variants" part.id %}'>
diff --git a/InvenTree/part/templates/part/params.html b/InvenTree/part/templates/part/params.html
deleted file mode 100644
index 365003b052..0000000000
--- a/InvenTree/part/templates/part/params.html
+++ /dev/null
@@ -1,81 +0,0 @@
-{% extends "part/part_base.html" %}
-{% load static %}
-{% load i18n %}
-
-{% block menubar %}
-{% include "part/navbar.html" with tab='params' %}
-{% endblock %}
-
-{% block heading %}
-{% trans "Part Parameters" %}
-{% endblock %}
-
-{% block details %}
-<div id='button-toolbar'>
- <div class='button-toolbar container-fluid' style='float: right;'>
- {% if roles.part.add %}
- <button title='{% trans "Add new parameter" %}' class='btn btn-success' id='param-create'>
- <span class='fas fa-plus-circle'></span> {% trans "New Parameter" %}
- </button>
- {% endif %}
- </div>
-</div>
-
-<table id='parameter-table' class='table table-condensed table-striped' data-toolbar="#button-toolbar"></table>
-
-{% endblock %}
-
-{% block js_ready %}
-{{ block.super }}
-
- loadPartParameterTable(
- '#parameter-table',
- '{% url "api-part-parameter-list" %}',
- {
- params: {
- part: {{ part.pk }},
- }
- }
- );
-
- $('#param-table').inventreeTable({
- });
-
- {% if roles.part.add %}
- $('#param-create').click(function() {
-
- constructForm('{% url "api-part-parameter-list" %}', {
- method: 'POST',
- fields: {
- part: {
- value: {{ part.pk }},
- hidden: true,
- },
- template: {},
- data: {},
- },
- title: '{% trans "Add Parameter" %}',
- onSuccess: function() {
- $('#parameter-table').bootstrapTable('refresh');
- }
- });
- });
- {% endif %}
-
- $('.param-edit').click(function() {
- var button = $(this);
-
- launchModalForm(button.attr('url'), {
- reload: true,
- });
- });
-
- $('.param-delete').click(function() {
- var button = $(this);
-
- launchModalForm(button.attr('url'), {
- reload: true,
- });
- });
-
-{% endblock %}
\ No newline at end of file
diff --git a/InvenTree/part/templates/part/supplier.html b/InvenTree/part/templates/part/supplier.html
index 28b6407b33..8c01243541 100644
--- a/InvenTree/part/templates/part/supplier.html
+++ b/InvenTree/part/templates/part/supplier.html
@@ -32,26 +32,28 @@
{% endblock %}
{% block post_content_panel %}
-<div id='manufacturer-button-toolbar'>
- <div class='btn-group'>
- <button class="btn btn-success" id='manufacturer-create'>
- <span class='fas fa-plus-circle'></span> {% trans "New Manufacturer Part" %}
- </button>
- <div id='opt-dropdown' class="btn-group">
- <button id='manufacturer-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='manufacturer-part-delete' title='{% trans "Delete manufacturer parts" %}'>{% trans "Delete" %}</a></li>
- </ul>
- </div>
- </div>
-</div>
+
<div class='panel panel-default panel-inventree'>
<div class='panel-heading'>
<h4>
{% trans "Part Manufacturers" %}
</h4>
</div>
+
<div class='panel-content'>
+ <div id='manufacturer-button-toolbar'>
+ <div class='btn-group'>
+ <button class="btn btn-success" id='manufacturer-create'>
+ <span class='fas fa-plus-circle'></span> {% trans "New Manufacturer Part" %}
+ </button>
+ <div id='opt-dropdown' class="btn-group">
+ <button id='manufacturer-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='manufacturer-part-delete' title='{% trans "Delete manufacturer parts" %}'>{% trans "Delete" %}</a></li>
+ </ul>
+ </div>
+ </div>
+ </div>
<table class='table table-condensed table-striped' id='manufacturer-table' data-toolbar='#manufacturer-button-toolbar'></table>
</div>
</div>
diff --git a/InvenTree/part/urls.py b/InvenTree/part/urls.py
index b45294d565..8843a839a1 100644
--- a/InvenTree/part/urls.py
+++ b/InvenTree/part/urls.py
@@ -48,7 +48,6 @@ part_detail_urls = [
url(r'^bom-upload/?', views.BomUpload.as_view(), name='upload-bom'),
url(r'^bom-duplicate/?', views.BomDuplicate.as_view(), name='duplicate-bom'),
- url(r'^params/', views.PartDetail.as_view(template_name='part/params.html'), name='part-params'),
url(r'^variants/?', views.PartDetail.as_view(template_name='part/variants.html'), name='part-variants'),
url(r'^stock/?', views.PartDetail.as_view(template_name='part/stock.html'), name='part-stock'),
url(r'^allocation/?', views.PartDetail.as_view(template_name='part/allocation.html'), name='part-allocation'),