Merge branch 'master' of https://github.com/inventree/InvenTree into instance-name-in-title

InvenTree/part/templates/part/manufacturer.html

@@ -0,0 +1,92 @@
+{% extends "part/part_base.html" %}
+{% load static %}
+{% load i18n %}
+{% load inventree_extras %}
+
+{% block menubar %}
+{% include 'part/navbar.html' with tab='manufacturers' %}
+{% endblock %}
+
+{% block heading %}
+{% trans "Part Manufacturers" %}
+{% endblock %}
+
+{% block details %}
+
+<div id='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-striped table-condensed" id='manufacturer-table' data-toolbar='#button-toolbar'>
+</table>
+
+{% endblock %}
+
+{% block js_load %}
+{{ block.super }}
+{% endblock %}
+{% block js_ready %}
+    {{ block.super }}
+
+    $('#manufacturer-create').click(function () {
+        launchModalForm(
+            "{% url 'manufacturer-part-create' %}",
+            {
+                reload: true,
+                data: {
+                    part: {{ part.id }}
+                },
+                secondary: [
+                    {
+                        field: 'manufacturer',
+                        label: '{% trans "New Manufacturer" %}',
+                        title: '{% trans "Create new manufacturer" %}',
+                        url: "{% url 'manufacturer-create' %}",
+                    }
+                ]
+            });
+    });
+
+    $("#manufacturer-part-delete").click(function() {
+        
+        var selections = $("#manufacturer-table").bootstrapTable("getSelections");
+
+        var parts = [];
+
+        selections.forEach(function(item) {
+            parts.push(item.pk);
+        });
+
+        launchModalForm("{% url 'manufacturer-part-delete' %}", {
+            data: {
+                parts: parts,
+            },
+            reload: true,
+        });
+    });
+
+    loadManufacturerPartTable(
+        "#manufacturer-table",
+        "{% url 'api-manufacturer-part-list' %}",
+        {
+            params: {
+                part: {{ part.id }},
+                part_detail: false,
+                manufacturer_detail: true,
+            },
+        }
+    );
+
+    linkButtonsToSelection($("#manufacturer-table"), ['#manufacturer-part-options'])
+
+{% endblock %}

InvenTree/part/templates/part/navbar.html

@@ -69,6 +69,12 @@
     </li>
     {% endif %}
     {% if part.purchaseable and roles.purchase_order.view %}
+    <li class='list-group-item {% if tab == "manufacturers" %}active{% endif %}' title='{% trans "Manufacturers" %}'>
+        <a href='{% url "part-manufacturers" part.id %}'>
+            <span class='menu-tab-icon fas fa-industry'></span>
+            {% trans "Manufacturers" %}
+        </a>
+    </li>
     <li class='list-group-item {% if tab == "suppliers" %}active{% endif %}' title='{% trans "Suppliers" %}'>
         <a href='{% url "part-suppliers" part.id %}'>
             <span class='menu-tab-icon fas fa-building'></span>

InvenTree/part/templates/part/partial_delete.html

@@ -1,14 +1,15 @@
 {% extends "modal_form.html" %}
+{% load i18n %}
 
 {% block pre_form_content %}
 
 <div class='alert alert-block alert-danger'>
-    Are you sure you want to delete part '<b>{{ part.full_name }}</b>'?
+    {% trans "Are you sure you want to delete part" %} '<b>{{ part.full_name }}</b>'?
 </div>
 
 {% if part.used_in_count %}
 <hr>
-<p>This part is used in BOMs for {{ part.used_in_count }} other parts. If you delete this part, the BOMs for the following parts will be updated:
+<p>{% trans "This part is used in BOMs for" %} {{ part.used_in_count }} {% trans "other parts. If you delete this part, the BOMs for the following parts will be updated" %}:
 <ul class="list-group">
     {% for child in part.used_in.all %}
     <li class='list-group-item'>{{ child.part.full_name }} - {{ child.part.description }}</li>
@@ -18,7 +19,7 @@
 
 {% if part.stock_items.all|length > 0 %}
 <hr>
-<p>There are {{ part.stock_items.all|length }} stock entries defined for this part. If you delete this part, the following stock entries will also be deleted:
+<p>{% trans "There are" %} {{ part.stock_items.all|length }} {% trans "stock entries defined for this part. If you delete this part, the following stock entries will also be deleted" %}:
     <ul class='list-group'>
         {% for stock in part.stock_items.all %}
         <li class='list-group-item'>{{ stock }}</li>
@@ -27,9 +28,20 @@
 </p>
 {% endif %}
 
+{% if part.manufacturer_parts.all|length > 0 %}
+<hr>
+<p>{% trans "There are" %} {{ part.manufacturer_parts.all|length }} {% trans "manufacturers defined for this part. If you delete this part, the following manufacturer parts will also be deleted" %}:
+    <ul class='list-group'>
+        {% for spart in part.manufacturer_parts.all %}
+        <li class='list-group-item'>{{ spart.manufacturer.name }} - {{ spart.MPN }}</li>
+        {% endfor %}
+    </ul>
+</p>
+{% endif %}
+
 {% if part.supplier_parts.all|length > 0 %}
 <hr>
-<p>There are {{ part.supplier_parts.all|length }} suppliers defined for this part. If you delete this part, the following supplier parts will also be deleted.
+<p>{% trans "There are" %} {{ part.supplier_parts.all|length }} {% trans "suppliers defined for this part. If you delete this part, the following supplier parts will also be deleted" %}:
     <ul class='list-group'>
         {% for spart in part.supplier_parts.all %}
         <li class='list-group-item'>{{ spart.supplier.name }} - {{ spart.SKU }}</li>
@@ -40,7 +52,7 @@
 
 {% if part.serials.all|length > 0 %}
 <hr>
-<p>There are {{ part.serials.all|length }} unique parts tracked for '{{ part.full_name }}'. Deleting this part will permanently remove this tracking information.</p>
+<p>{% trans "There are" %} {{ part.serials.all|length }} {% trans "unique parts tracked for" %} '{{ part.full_name }}'. {% trans "Deleting this part will permanently remove this tracking information" %}.</p>
 {% endif %}
 
 {% endblock %}

InvenTree/part/templates/part/supplier.html

@@ -85,7 +85,7 @@
         {
             params: {
                 part: {{ part.id }},
-                part_detail: true,
+                part_detail: false,
                 supplier_detail: true,
                 manufacturer_detail: true,
             },