Merge branch 'master' into partial-shipment

# Conflicts:
#	InvenTree/company/templates/company/company_base.html
#	InvenTree/stock/templates/stock/item_base.html

InvenTree/company/templates/company/company_base.html

@@ -19,26 +19,26 @@
 {% include "admin_button.html" with url=url %}
 {% endif %}
 {% if company.is_supplier and roles.purchase_order.add %}
-<button type='button' class='btn btn-outline-secondary' id='company-order-2' title='{% trans "Create Purchase Order" %}'>
+<button type='button' class='btn btn-outline-primary' id='company-order-2' title='{% trans "Create Purchase Order" %}'>
     <span class='fas fa-shopping-cart'/>
 </button>
 {% endif %}
-{% if perms.company.change_company or perms.company.delete_company %}
-<div class='btn-group'>
-    <button id='company-options' title='{% trans "Company actions" %}' class='btn btn-outline-secondary dropdown-toggle' type='button' data-bs-toggle='dropdown'>
-        <span class='fas fa-tools'></span> <span class='caret'></span>
-    </button>
-    <ul class='dropdown-menu' role='menu'>
-        {% if perms.company.change_company %}
-        <li><a class='dropdown-item' href='#' id='company-edit'><span class='fas fa-edit icon-green'></span> {% trans "Edit Company" %}</a></li>
-        {% endif %}
-        {% if perms.company.delete_company %}
-        <li><a class='dropdown-item' href='#' id='company-delete'><span class='fas fa-trash-alt icon-red'></span> {% trans "Delete Company" %}</a></li>
-        {% endif %}
-    </ul>
-</div>
-{% endif %}
-{% endblock %}
+<button id='company-edit-actions' title='{% trans "Company actions" %}' class='btn btn-outline-secondary dropdown-toggle' type='button' data-bs-toggle='dropdown'>
+    <span class='fas fa-tools'></span> <span class='caret'></span>
+</button>
+<ul class='dropdown-menu' role='menu'>
+    {% if perms.company.change_company %}
+    <li><a class='dropdown-item' href='#' id='company-edit' title='{% trans "Edit company information" %}'>
+        <span class='fas fa-edit icon-green'></span> {% trans "Edit Company" %}
+    </a></li>
+    {% endif %}
+    {% if perms.company.delete_company %}
+    <li><a class='dropdown-item' href='#' id='company-delete' title='{% trans "Delete company" %}'>
+        <span class='fas fa-trash-alt icon-red'></span> {% trans "Delete Company" %}
+    </a></li>
+    {% endif %}
+</ul>
+{% endblock actions %}
 
 {% block thumbnail %}
 <div class='dropzone part-thumb-container' id='company-thumb'>
@@ -61,7 +61,29 @@
 {% endblock %}
 
 {% block details %}
-<p>{{ company.description }}</p>
+<table class='table table-striped table-condensed'>
+    <col width='25'>
+    <tr>
+        <td><span class='fas fa-info-circle'></span></td>
+        <td>{% trans "Description" %}</td>
+        <td>{{ company.description }}</td>
+    </tr>
+    <tr>
+        <td><span class='fas fa-industry'></span></td>
+        <td>{%trans "Manufacturer" %}</td>
+        <td>{% include "yesnolabel.html" with value=company.is_manufacturer %}</td>
+    </tr>
+    <tr>
+        <td><span class='fas fa-building'></span></td>
+        <td>{% trans "Supplier" %}</td>
+        <td>{% include 'yesnolabel.html' with value=company.is_supplier %}</td>
+    </tr>
+    <tr>
+        <td><span class='fas fa-user-tie'></span></td>
+        <td>{% trans "Customer" %}</td>
+        <td>{% include 'yesnolabel.html' with value=company.is_customer %}</td>
+    </tr>
+</table>
 
 {% endblock %}
 
@@ -115,22 +137,6 @@
     <td>{{ company.contact }}{% include "clip.html"%}</td>
 </tr>
 {% endif %}
-
-<tr>
-    <td><span class='fas fa-industry'></span></td>
-    <td>{%trans "Manufacturer" %}</td>
-    <td>{% include "yesnolabel.html" with value=company.is_manufacturer %}</td>
-</tr>
-<tr>
-    <td><span class='fas fa-building'></span></td>
-    <td>{% trans "Supplier" %}</td>
-    <td>{% include 'yesnolabel.html' with value=company.is_supplier %}</td>
-</tr>
-<tr>
-    <td><span class='fas fa-user-tie'></span></td>
-    <td>{% trans "Customer" %}</td>
-    <td>{% include 'yesnolabel.html' with value=company.is_customer %}</td>
-</tr>
 </table>
 {% endblock %}
 
@@ -216,4 +222,4 @@
         });
     }
 
-{% endblock %}
+{% endblock %}

InvenTree/company/templates/company/manufacturer_part.html

@@ -8,7 +8,7 @@ InvenTree | {% trans "Manufacturer Part" %}
 
 {% block sidebar %}
 {% include "company/manufacturer_part_sidebar.html" %}
-{% endblock %}
+{% endblock sidebar %}
 
 {% block breadcrumbs %}
 <li class='breadcrumb-item'><a href='{% url "manufacturer-index" %}'>{% trans "Manufacturers" %}</a></li>
@@ -16,13 +16,13 @@ InvenTree | {% trans "Manufacturer Part" %}
 <li class='breadcrumb-item'><a href='{% url "company-detail" part.manufacturer.id %}'>{{ part.manufacturer.name }}</a></li>
 {% endif %}
 <li class="breadcrumb-item active" aria-current="page"><a href='{% url "manufacturer-part-detail" part.id %}'>{{ part.MPN }}</a></li>
-{% endblock %}
+{% endblock breadcrumbs %}
 
 {% block heading %}
 <h4>
     {% trans "Manufacturer Part" %}: {{ part.part.full_name }}
 </h4>
-{% endblock %}
+{% endblock heading %}
 
 {% block actions %}
 {% if user.is_staff and perms.company.change_company %}
@@ -46,7 +46,7 @@ InvenTree | {% trans "Manufacturer Part" %}
 </button>
 {% endif %}
 {% endif %}
-{% endblock %}
+{% endblock actions %}
 
 {% block thumbnail %}
 <img class='part-thumb'
@@ -55,50 +55,56 @@ src='{{ part.part.image.url }}'
 {% else %}
 src="{% static 'img/blank_image.png' %}"
 {% endif %}/>
-{% endblock %}
+{% endblock thumbnail %}
 
 {% block details %}
 
-{% endblock %}
+<table class='table table-striped table-condensed'>
+    <col width='25'>
+    <tr>
+        <td><span class='fas fa-shapes'></span></td>
+        <td>{% trans "Internal Part" %}</td>
+        <td>
+            {% if part.part %}
+            <a href="{% url 'part-detail' part.part.id %}?display=part-suppliers">{{ part.part.full_name }}</a>{% include "clip.html"%}
+            {% endif %}
+        </td>
+    </tr>
+    {% if part.description %}
+    <tr>
+        <td></td>
+        <td>{% trans "Description" %}</td>
+        <td>{{ part.description }}{% include "clip.html"%}</td>
+    </tr>
+    {% endif %}
+</table>
+
+{% endblock details %}
 
 {% block details_right %}
 
 <table class="table table-striped table-condensed">
     <col width='25'>
-        <tr>
-            <td><span class='fas fa-shapes'></span></td>
-            <td>{% trans "Internal Part" %}</td>
-            <td>
-                {% if part.part %}
-                <a href="{% url 'part-detail' part.part.id %}?display=part-suppliers">{{ part.part.full_name }}</a>{% include "clip.html"%}
-                {% endif %}
-            </td>
-        </tr>
-        {% if part.description %}
-        <tr>
-            <td></td>
-            <td>{% trans "Description" %}</td>
-            <td>{{ part.description }}{% include "clip.html"%}</td>
-        </tr>
-        {% endif %}
-        {% if part.link %}
-        <tr>
-            <td><span class='fas fa-link'></span></td>
-            <td>{% trans "External Link" %}</td>
-            <td><a href="{{ part.link }}">{{ part.link }}</a>{% include "clip.html"%}</td>
-        </tr>
-        {% endif %}
-        <tr>
-            <td><span class='fas fa-industry'></span></td>
-            <td>{% trans "Manufacturer" %}</td>
-            <td><a href="{% url 'company-detail' part.manufacturer.id %}">{{ part.manufacturer.name }}</a>{% include "clip.html"%}</td></tr>
-        <tr>
-            <td><span class='fas fa-hashtag'></span></td>
-            <td>{% trans "MPN" %}</td>
-            <td>{{ part.MPN }}{% include "clip.html"%}</td>
-        </tr>
+
+    <tr>
+        <td><span class='fas fa-industry'></span></td>
+        <td>{% trans "Manufacturer" %}</td>
+        <td><a href="{% url 'company-detail' part.manufacturer.id %}">{{ part.manufacturer.name }}</a>{% include "clip.html"%}</td>
+    </tr>
+    <tr>
+        <td><span class='fas fa-hashtag'></span></td>
+        <td>{% trans "MPN" %}</td>
+        <td>{{ part.MPN }}{% include "clip.html"%}</td>
+    </tr>
+    {% if part.link %}
+    <tr>
+        <td><span class='fas fa-link'></span></td>
+        <td>{% trans "External Link" %}</td>
+        <td><a href="{{ part.link }}">{{ part.link }}</a>{% include "clip.html"%}</td>
+    </tr>
+    {% endif %}
 </table>
-{% endblock %}
+{% endblock details_right %}
 
 {% block page_content %}
 

InvenTree/company/templates/company/supplier_part.html

@@ -5,11 +5,11 @@
 
 {% block page_title %}
 {% inventree_title %} | {% trans "Supplier Part" %}
-{% endblock %}
+{% endblock page_title %}
 
 {% block sidebar %}
 {% include "company/supplier_part_sidebar.html" %}
-{% endblock %}
+{% endblock sidebar %}
 
 {% block breadcrumbs %}
 <li class='breadcrumb-item'><a href='{% url "supplier-index" %}'>{% trans "Suppliers" %}</a></li>
@@ -17,13 +17,13 @@
 <li class='breadcrumb-item'><a href='{% url "company-detail" part.supplier.id %}'>{{ part.supplier.name }}</a></li>
 {% endif %}
 <li class="breadcrumb-item active" aria-current="page"><a href='{% url "supplier-part-detail" part.id %}'>{{ part.SKU }}</a></li>
-{% endblock %}
+{% endblock breadcrumbs %}
 
 {% block heading %}
 <h4>
     {% trans "Supplier Part" %}: {{ part.SKU }}
 </h4>
-{% endblock %}
+{% endblock heading %}
 
 {% block actions %}
 {% if user.is_staff and perms.company.change_company %}
@@ -43,7 +43,7 @@
     <span class='fas fa-trash-alt icon-red'/>
 </button>
 {% endif %}
-{% endblock %}
+{% endblock actions %}
 
 {% block thumbnail %}
 <img class='part-thumb'
@@ -56,39 +56,32 @@ src="{% static 'img/blank_image.png' %}"
 
 {% block details %}
 
-<p>
-    {{ part.part.full_name }}
-</p>
+<table class='table table-striped table-condensed'>
+    <col width='25'>
+    <tr>
+        <td><span class='fas fa-shapes'></span></td>
+        <td>{% trans "Internal Part" %}</td>
+        <td>
+            {% if part.part %}
+            <a href="{% url 'part-detail' part.part.id %}?display=part-suppliers">{{ part.part.full_name }}</a>{% include "clip.html"%}
+            {% endif %}
+        </td>
+    </tr>
+    {% if part.description %}
+    <tr>
+        <td></td>
+        <td>{% trans "Description" %}</td>
+        <td>{{ part.description }}{% include "clip.html"%}</td>
+    </tr>
+    {% endif %}
+</table>
 
-{% endblock %}
+{% endblock details %}
 
 {% block details_right %}
 
 <table class="table table-striped table-condensed">
     <col width='25'>
-        <tr>
-            <td><span class='fas fa-shapes'></span></td>
-            <td>{% trans "Internal Part" %}</td>
-            <td>
-                {% if part.part %}
-                <a href="{% url 'part-detail' part.part.id %}?display=part-suppliers">{{ part.part.full_name }}</a>{% include "clip.html"%}
-                {% endif %}
-            </td>
-        </tr>
-        {% if part.description %}
-        <tr>
-            <td></td>
-            <td>{% trans "Description" %}</td>
-            <td>{{ part.description }}{% include "clip.html"%}</td>
-        </tr>
-        {% endif %}
-        {% if part.link %}
-        <tr>
-            <td><span class='fas fa-link'></span></td>
-            <td>{% trans "External Link" %}</td>
-            <td><a href="{{ part.link }}">{{ part.link }}</a>{% include "clip.html"%}</td>
-        </tr>
-        {% endif %}
         <tr>
             <td><span class='fas fa-building'></span></td>
             <td>{% trans "Supplier" %}</td>
@@ -127,6 +120,13 @@ src="{% static 'img/blank_image.png' %}"
             <td>{{ part.note }}{% include "clip.html"%}</td>
         </tr>
         {% endif %}
+        {% if part.link %}
+        <tr>
+            <td><span class='fas fa-link'></span></td>
+            <td>{% trans "External Link" %}</td>
+            <td><a href="{{ part.link }}">{{ part.link }}</a>{% include "clip.html"%}</td>
+        </tr>
+        {% endif %}
 </table>
 {% endblock %}