Merge branch 'master' of https://github.com/inventree/InvenTree into price-history

InvenTree/part/templates/part/build.html

@@ -46,5 +46,5 @@
             part: {{ part.id }},
         }
     });
-        
+
 {% endblock %}

InvenTree/part/templates/part/category.html

@@ -198,7 +198,7 @@
     })
 
     $("#part-export").click(function() {
-        
+
         var url = "{% url 'part-export' %}?category={{ category.id }}";
 
         location.href = url;

InvenTree/part/templates/part/detail.html

@@ -20,20 +20,20 @@
         <tr>
             <td><span class='fas fa-font'></span></td>
             <td><strong>{% trans "Part name" %}</strong></td>
-            <td>{{ part.name }}</td>
+            <td>{{ part.name }}{% include "clip.html"%}</td>
         </tr>
         {% if part.IPN %}
         <tr>
             <td></td>
             <td><strong>{% trans "IPN" %}</strong></td>
-            <td>{{ part.IPN }}</td>
+            <td>{{ part.IPN }}{% include "clip.html"%}</td>
         </tr>
         {% endif %}
         {% if part.revision %}
         <tr>
             <td><span class='fas fa-code-branch'></span></td>
             <td><strong>{% trans "Revision" %}</strong></td>
-            <td>{{ part.revision }}</td>
+            <td>{{ part.revision }}{% include "clip.html"%}</td>
         </tr>
         {% endif %}
         {% if part.trackable %}
@@ -42,7 +42,7 @@
             <td><strong>{% trans "Latest Serial Number" %}</strong></td>
             <td>
                 {% if part.getLatestSerialNumber %}
-                {{ part.getLatestSerialNumber }}
+                {{ part.getLatestSerialNumber }}{% include "clip.html"%}
                 {% else %}
                 <em>{% trans "No serial numbers recorded" %}</em>
                 {% endif %}
@@ -52,7 +52,7 @@
         <tr>
             <td><span class='fas fa-info-circle'></span></td>
             <td><strong>{% trans "Description" %}</strong></td>
-            <td>{{ part.description }}</td>
+            <td>{{ part.description }}{% include "clip.html"%}</td>
         </tr>
         {% if part.variant_of %}
         <tr>
@@ -96,7 +96,7 @@
             <td></td>
             <td><strong>{% trans "Default Supplier" %}</strong></td>
             <td><a href="{% url 'supplier-part-detail' part.default_supplier.id %}">
-                {{ part.default_supplier.supplier.name }} | {{ part.default_supplier.SKU }}
+                {{ part.default_supplier.supplier.name }} | {{ part.default_supplier.SKU }}{% include "clip.html"%}
             </a></td>
         </tr>
         {% endif %}
@@ -262,5 +262,5 @@
             },
         );
     });
-    
+
 {% endblock %}

InvenTree/part/templates/part/manufacturer.html

@@ -58,7 +58,7 @@
     });
 
     $("#manufacturer-part-delete").click(function() {
-        
+
         var selections = $("#manufacturer-table").bootstrapTable("getSelections");
 
         var parts = [];

InvenTree/part/templates/part/navbar.html

@@ -91,7 +91,7 @@
     {% if part.salable and roles.sales_order.view %}
     <li class='list-group-item {% if tab == "sales-prices" %}active{% endif %}' title='{% trans "Sales Price Information" %}'>
         <a href='{% url "part-sale-prices" part.id %}'>
-            <span class='menu-tab-icon fas fa-dollar-sign'></span>
+            <span class='menu-tab-icon fas fa-dollar-sign' style='width: 20px;'></span>
             {% trans "Sale Price" %}
         </a>
     </li>

InvenTree/part/templates/part/notes.html

@@ -20,12 +20,12 @@
 {% if editing %}
 <form method='POST'>
     {% csrf_token %}
-        
+
     {{ form }}
     <hr>
 
     <button type="submit" class='btn btn-default'>{% trans "Save" %}</button>
-    
+
 </form>
 
 {{ form.media }}

InvenTree/part/templates/part/params.html

@@ -49,7 +49,7 @@
         {% endfor %}
     </tbody>
 </table>
-            
+
 
 {% endblock %}
 

InvenTree/part/templates/part/part_base.html

@@ -151,7 +151,7 @@
                 <td>{% decimal allocated %}</td>
             </tr>
             {% endif %}
-            
+
             {% if not part.is_template %}
             {% if part.assembly %}
             <tr>
@@ -177,11 +177,11 @@
         </table>
     </div>
     </div>
-        
+
 </div>
 
 <div class='panel panel-default panel-inventree'>
-    
+
     <div class='panel-heading'>
         <h4>
             {% block heading %}
@@ -272,7 +272,7 @@
     function onSelectImage(response) {
         // Callback when the image-selection modal form is displayed
         // Populate the form with image data (requested via AJAX)
-        
+
         $("#modal-form").find("#image-select-table").bootstrapTable({
             pagination: true,
             pageSize: 25,
@@ -301,9 +301,9 @@
             }
         });
     }
-    
+
     {% if roles.part.change %}
-    
+
     {% settings_value "INVENTREE_DOWNLOAD_FROM_URL" as allow_download %}
     {% if allow_download %}
     $("#part-image-url").click(function() {

InvenTree/part/templates/part/part_pricing.html

@@ -9,19 +9,20 @@
 </div>
 
 <h4>{% trans 'Quantity' %}</h4>
-<table class='table table-striped table-condensed'>
+<table class='table table-striped table-condensed table-price-two'>
     <tr>
         <td><b>{% trans 'Part' %}</b></td>
-        <td colspan='2'>{{ part  }}</td>
+        <td>{{ part  }}</td>
     </tr>
     <tr>
         <td><b>{% trans 'Quantity' %}</b></td>
-        <td colspan='2'>{{ quantity }}</td>
+        <td>{{ quantity }}</td>
     </tr>
 </table>
-    {% if part.supplier_count > 0 %}
+
+{% if part.supplier_count > 0 %}
     <h4>{% trans 'Supplier Pricing' %}</h4>
-<table class='table table-striped table-condensed'>
+    <table class='table table-striped table-condensed table-price-three'>
     {% if min_total_buy_price %}
     <tr>
         <td><b>{% trans 'Unit Cost' %}</b></td>
@@ -42,12 +43,12 @@
         </td>
     </tr>
     {% endif %}
-</table>
-    {% endif %}
+    </table>
+{% endif %}
 
-    {% if part.bom_count > 0 %}
+{% if part.bom_count > 0 %}
     <h4>{% trans 'BOM Pricing' %}</h4>
-<table class='table table-striped table-condensed'>
+    <table class='table table-striped table-condensed table-price-three'>
     {% if min_total_bom_price %}
     <tr>
         <td><b>{% trans 'Unit Cost' %}</b></td>
@@ -75,8 +76,22 @@
         </td>
     </tr>
     {% endif %}
-</table>
-    {% endif %}
+    </table>
+{% endif %}
+
+{% if total_part_price %}
+    <h4>{% trans 'Sale Price' %}</h4>
+    <table class='table table-striped table-condensed table-price-two'>
+        <tr>
+            <td><b>{% trans 'Unit Cost' %}</b></td>
+            <td>{% include "price.html" with price=unit_part_price %}</td>
+        </tr>
+        <tr>
+            <td><b>{% trans 'Total Cost' %}</b></td>
+            <td>{% include "price.html" with price=total_part_price %}</td>
+        </tr>
+    </table>
+{% endif %}
 
     {% if min_unit_buy_price or min_unit_bom_price %}
     {% else %}

InvenTree/part/templates/part/sale_prices.html

@@ -2,7 +2,7 @@
 {% load static %}
 {% load i18n %}
 
-{% block menubar %}}
+{% block menubar %}
 {% include 'part/navbar.html' with tab='sales-prices' %}
 {% endblock %}
 

InvenTree/part/templates/part/select_image.html

@@ -11,7 +11,7 @@
 <form method='post' action='' class='js-modal-form' enctype='multipart/form-data'>
     {% csrf_token %}
     {% load crispy_forms_tags %}
-    
+
     <input id='image-input' name='image' type='hidden' value="{{ part.image }}">
 
 <table id='image-select-table' class='table table-striped table-condensed table-img-grid'>

InvenTree/part/templates/part/set_category.html

@@ -4,10 +4,10 @@
 {% block form %}
 <form method="post" action='' class='js-modal-form' enctype="multipart/form-data">
     {% load crispy_forms_tags %}
-    
+
     <label class='control-label'>Parts</label>
     <p class='help-block'>{% trans "Set category for the following parts" %}</p>
-    
+
     <table class='table table-striped'>
         <tr>
             <th>{% trans "Part" %}</th>
@@ -36,8 +36,8 @@
             </tr>
             {% endfor %}
         </table>
-    
+
     {% crispy form %}
-        
+
     </form>
     {% endblock %}

InvenTree/part/templates/part/subcategory.html

@@ -11,7 +11,7 @@
 {% block category_content %}
 
 <div class='panel panel-default panel-inventree'>
-    
+
     <div class='panel-heading'>
         <h4>{% trans "Subcategories" %}</h4>
     </div>

InvenTree/part/templates/part/supplier.html

@@ -62,7 +62,7 @@
     });
 
     $("#supplier-part-delete").click(function() {
-        
+
         var selections = $("#supplier-table").bootstrapTable("getSelections");
 
         var parts = [];