Merge remote-tracking branch 'inventree/master' into currency-support

# Conflicts:
#	InvenTree/InvenTree/settings.py
#	InvenTree/InvenTree/urls.py
#	InvenTree/templates/InvenTree/settings/tabs.html
#	InvenTree/users/models.py
#	requirements.txt

IMPORTANT: Had to merge some migration files due to different migrations applied on the part model tables

InvenTree/templates/InvenTree/settings/category.html

@@ -0,0 +1,114 @@
+{% extends "InvenTree/settings/settings.html" %}
+{% load i18n %}
+
+{% block tabs %}
+{% include "InvenTree/settings/tabs.html" with tab='category' %}
+{% endblock %}
+
+{% block subtitle %}
+{% trans "Category Settings" %}
+{% endblock %}
+
+{% block settings %}
+
+<form action="{% url 'settings-category' %}" method="post">
+    {% csrf_token %}
+    {% load crispy_forms_tags %}
+    <div id="category-select">
+        {% crispy form %}
+    </div>
+</form>
+
+{% if category %}
+<hr>
+
+<h4>{% trans "Category Parameter Templates" %}</h4>
+
+<div id='param-buttons'>
+    <button class='btn btn-success' id='new-param'>
+        <span class='fas fa-plus-circle'></span> {% trans "New Parameter" %}
+    </button>
+</div>
+
+<table class='table table-striped table-condensed' id='param-table' data-toolbar='#param-buttons'>
+</table>
+{% endif %}
+{% endblock %}
+
+{% block js_ready %}
+{{ block.super }}
+    
+    {# Convert dropdown to select2 format #}
+    $(document).ready(function() {
+        attachSelect('#category-select');
+    });
+
+{% if category %}
+	$("#param-table").inventreeTable({
+        url: "{% url 'api-part-category-parameters' category.pk %}",
+        queryParams: {
+            ordering: 'name',
+        },
+        formatNoMatches: function() { return '{% trans "No category parameter templates found" %}'; },
+        columns: [
+            {
+                field: 'pk',
+                title: 'ID',
+                visible: false,
+                switchable: false,
+            },
+            {
+                field: 'parameter_template_detail.name',
+                title: '{% trans "Parameter Template" %}',
+                sortable: 'true',
+            },
+            {
+                field: 'default_value',
+                title: '{% trans "Default Value" %}',
+                sortable: 'true',
+				formatter: function(value, row, index, field) {
+                    var bEdit = "<button title='{% trans "Edit Template" %}' class='template-edit btn btn-default btn-glyph' type='button' pk='" + row.pk + "'><span class='fas fa-edit'></span></button>";
+                    var bDel = "<button title='{% trans "Delete Template" %}' class='template-delete btn btn-default btn-glyph' type='button' pk='" + row.pk + "'><span class='fas fa-trash-alt icon-red'></span></button>";
+
+                    var html = value
+                    html += "<div class='btn-group float-right' role='group'>" + bEdit + bDel + "</div>";
+
+                    return html;
+                }
+            }
+        ]
+    });
+
+	$("#new-param").click(function() {
+        launchModalForm("{% url 'category-param-template-create' category.pk %}", {
+            success: function() {
+                $("#param-table").bootstrapTable('refresh');
+            },
+        });
+    });
+
+    $("#param-table").on('click', '.template-edit', function() {
+        var button = $(this);
+
+        var url = "/part/category/{{ category.pk }}/parameters/" + button.attr('pk') + "/edit/";
+
+        launchModalForm(url, {
+            success: function() {
+                $("#param-table").bootstrapTable('refresh');
+            }
+        });
+    });
+
+    $("#param-table").on('click', '.template-delete', function() {
+        var button = $(this);
+
+        var url = "/part/category/{{ category.pk }}/parameters/" + button.attr('pk') + "/delete/";
+        
+        launchModalForm(url, {
+            success: function() {
+                $("#param-table").bootstrapTable('refresh');
+            }
+        });
+    });
+{% endif %}
+{% endblock %}

InvenTree/templates/InvenTree/settings/part.html

@@ -27,6 +27,7 @@
         {% include "InvenTree/settings/setting.html" with key="PART_COPY_BOM" %}
         {% include "InvenTree/settings/setting.html" with key="PART_COPY_PARAMETERS" %}
         {% include "InvenTree/settings/setting.html" with key="PART_COPY_TESTS" %}
+        {% include "InvenTree/settings/setting.html" with key="PART_CATEGORY_PARAMETERS" %}
     </tbody>
 </table>
 

InvenTree/templates/InvenTree/settings/tabs.html

@@ -15,6 +15,9 @@
     <li {% if tab == 'global' %} class='active' {% endif %}>
         <a href='{% url "settings-global" %}'><span class='fas fa-globe'></span> {% trans "Global" %}</a>
     </li>
+    <li{% ifequal tab 'category' %} class='active'{% endifequal %}>
+        <a href="{% url 'settings-category' %}"><span class='fa fa-sitemap'></span> {% trans "Categories" %}</a>
+    </li>
     <li{% ifequal tab 'part' %} class='active'{% endifequal %}>
         <a href="{% url 'settings-part' %}"><span class='fas fa-shapes'></span> {% trans "Parts" %}</a>
     </li>
@@ -31,4 +34,4 @@
         <a href="{% url 'settings-so' %}"><span class='fas fa-truck'></span> {% trans "Sales Orders" %}</a>
     </li>
 </ul>
-{% endif %}
+{% endif %}