Merge branch 'master' of https://github.com/inventree/InvenTree into part-import

InvenTree/part/templates/part/allocation.html

@@ -8,52 +8,43 @@
 {% endblock %}
 
 {% block heading %}
-{% trans "Part Stock Allocations" %}
+{% trans "Build Order Allocations" %}
 {% endblock %}
 
 {% block details %}
-<table class='table table-striped table-condensed' id='build-table'>
-<tr>
-    <th>{% trans "Order" %}</th>
-    <th>{% trans "Stock Item" %}</th>
-    <th>{% trans "Quantity" %}</th>
-</tr>
-{% for allocation in part.build_order_allocations %}
-<tr>
-    <td><a href="{% url 'build-detail' allocation.build.id %}">{% trans "Build Order" %}: {{ allocation.build }}</a></td>
-    <td><a href="{% url 'stock-item-detail' allocation.stock_item.id %}">{% trans "Stock Item" %}: {{ allocation.stock_item }}</a></td>
-    <td>{% decimal allocation.quantity %}</td>
-</tr>
-{% endfor %}
-{% for allocation in part.sales_order_allocations %}
-<tr>
-    <td><a href="{% url 'so-detail' allocation.line.order.id %}">{% trans "Sales Order" %}: {{ allocation.line.order }}</a></td>
-    <td><a href="{% url 'stock-item-detail' allocation.item.id %}">{% trans "Stock Item" %}: {{ allocation.item }}</a></td>
-    <td>{% decimal allocation.quantity %}</td>
-</tr>
-{% endfor %}
-</table>
+
+<table class='table table-striped table-condensed' id='build-order-table'></table>
 
 {% endblock %}
 
+{% block pre_content_panel %}
+
+<div class='panel panel-default panel-inventree'>
+    <div class='panel-heading'>
+        <h4>{% trans "Sales  Order Allocations" %}</h4>
+    </div>
+    
+    <div class='panel-content'>
+        <table class='table table-striped table-condensed' id='sales-order-table'></table>
+    </div>
+</div>
+
+{% endblock %}
+
+
 {% block js_ready %}
 {{ block.super }}
 
-    $("#build-table").inventreeTable({
-        columns: [
-            {
-                title: '{% trans "Order" %}',
-                sortable: true,
-            },
-            {
-                title: '{% trans "Stock Item" %}',
-                sortable: true,
-            },
-            {
-                title: '{% trans "Quantity" %}',
-                sortable: true,
-            }
-        ]
+    loadSalesOrderAllocationTable("#sales-order-table", {
+        params: {
+            part: {{ part.id }},
+        }
+    });
+
+    loadBuildOrderAllocationTable("#build-order-table", {
+        params: {
+            part: {{ part.id }},
+        }
     });
 
 {% endblock %}

InvenTree/part/templates/part/internal_prices.html

@@ -0,0 +1,122 @@
+{% extends "part/part_base.html" %}
+{% load static %}
+{% load i18n %}
+{% load inventree_extras %}
+
+{% block menubar %}
+{% include 'part/navbar.html' with tab='internal-prices' %}
+{% endblock %}
+
+{% block heading %}
+{% trans "Internal Price Information" %}
+{% endblock %}
+
+{% block details %}
+{% settings_value "PART_INTERNAL_PRICE" as show_internal_price %}
+{% if show_internal_price and roles.sales_order.view %}
+<div id='internal-price-break-toolbar' class='btn-group'>
+    <button class='btn btn-primary' id='new-internal-price-break' type='button'>
+        <span class='fas fa-plus-circle'></span> {% trans "Add Internal Price Break" %}
+    </button>
+</div>
+
+<table class='table table-striped table-condensed' id='internal-price-break-table' data-toolbar='#internal-price-break-toolbar'>
+</table>
+
+{% else %}
+<div class='container-fluid'>
+    <h3>{% trans "Permission Denied" %}</h3>
+
+    <div class='alert alert-danger alert-block'>
+        {% trans "You do not have permission to view this page." %}
+    </div>
+</div>
+{% endif %}
+{% endblock %}
+
+{% block js_ready %}
+{{ block.super }}
+
+{% settings_value "PART_INTERNAL_PRICE" as show_internal_price %}
+{% if show_internal_price and roles.sales_order.view %}
+function reloadPriceBreaks() {
+    $("#internal-price-break-table").bootstrapTable("refresh");
+}
+
+$('#new-internal-price-break').click(function() {
+    launchModalForm("{% url 'internal-price-break-create' %}",
+        {
+            success: reloadPriceBreaks,
+            data: {
+                part: {{ part.id }},
+            }
+        }
+    );
+});
+
+$('#internal-price-break-table').inventreeTable({
+    name: 'internalprice',
+    formatNoMatches: function() { return "{% trans 'No internal price break information found' %}"; },
+    queryParams: {
+        part: {{ part.id }},
+    },
+    url: "{% url 'api-part-internal-price-list' %}",
+    onPostBody: function() {
+        var table = $('#internal-price-break-table');
+
+        table.find('.button-internal-price-break-delete').click(function() {
+            var pk = $(this).attr('pk');
+
+            launchModalForm(
+                `/part/internal-price/${pk}/delete/`,
+                {
+                    success: reloadPriceBreaks
+                }
+            );
+        });
+
+        table.find('.button-internal-price-break-edit').click(function() {
+            var pk = $(this).attr('pk');
+
+            launchModalForm(
+                `/part/internal-price/${pk}/edit/`,
+                {
+                    success: reloadPriceBreaks
+                }
+            );
+        });
+    },
+    columns: [
+        {
+            field: 'pk',
+            title: 'ID',
+            visible: false,
+            switchable: false,
+        },
+        {
+            field: 'quantity',
+            title: '{% trans "Quantity" %}',
+            sortable: true,
+        },
+        {
+            field: 'price',
+            title: '{% trans "Price" %}',
+            sortable: true,
+            formatter: function(value, row, index) {
+                var html = value;
+
+                html += `<div class='btn-group float-right' role='group'>`
+
+                html += makeIconButton('fa-edit icon-blue', 'button-internal-price-break-edit', row.pk, '{% trans "Edit internal price break" %}');
+                html += makeIconButton('fa-trash-alt icon-red', 'button-internal-price-break-delete', row.pk, '{% trans "Delete internal price break" %}');
+
+                html += `</div>`;
+
+                return html;
+            }
+        },
+    ]
+})
+
+{% endif %}
+{% endblock %}

InvenTree/part/templates/part/navbar.html

@@ -2,6 +2,8 @@
 {% load static %}
 {% load inventree_extras %}
 
+{% settings_value "PART_INTERNAL_PRICE" as show_internal_price %}
+
 <ul class='list-group'>
     <li class='list-group-item'>
         <a href='#' id='part-menu-toggle'>
@@ -94,7 +96,13 @@
         </a>
     </li>
     {% endif %}
-    {% if part.salable and roles.sales_order.view %}
+    {% if show_internal_price and roles.sales_order.view %}
+    <li class='list-group-item {% if tab == "internal-prices" %}active{% endif %}' title='{% trans "Internal Price Information" %}'>
+        <a href='{% url "part-internal-prices" part.id %}'>
+            <span class='menu-tab-icon fas fa-dollar-sign' style='width: 20px;'></span>
+            {% trans "Internal Price" %}
+        </a>
+    </li>
     <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 sidebar-icon'></span>

InvenTree/part/templates/part/order_prices.html

@@ -14,8 +14,18 @@
 
 {% block details %}
 {% default_currency as currency %}
+{% settings_value "PART_INTERNAL_PRICE" as show_internal_price %}
 
-{% crispy form %}
+<form method="post" class="form-horizontal">
+    {% csrf_token %}
+    <div class="row">
+        <div class="col-sm-9">{{ form|crispy }}</div>
+        <div class="col-sm-3">
+            <input type="submit" value="{% trans 'Calculate' %}" class="btn btn-primary btn-block">
+        </div>
+    </div>
+</form>
+<hr>
 
 <div class="row"><div class="col col-md-6">
 <h4>{% trans "Pricing ranges" %}</h4>
@@ -77,6 +87,21 @@
     {% endif %}
 {% endif %}
 
+{% if show_internal_price and roles.sales_order.view %}
+{% if total_internal_part_price %}
+    <tr>
+        <td><b>{% trans 'Internal Price' %}</b></td>
+        <td>{% trans 'Unit Cost' %}</td>
+        <td colspan='2'>{% include "price.html" with price=unit_internal_part_price %}</td>
+    </tr>
+    <tr>
+        <td></td>
+        <td>{% trans 'Total Cost' %}</td>
+        <td colspan='2'>{% include "price.html" with price=total_internal_part_price %}</td>
+    </tr>
+{% endif %}
+{% endif %}
+
 {% if total_part_price %}
     <tr>
         <td><b>{% trans 'Sale Price' %}</b></td>
@@ -110,8 +135,8 @@
 
 {% if price_history %}
     <hr>
-    <h4>{% trans 'Stock Pricing' %}<i class="fas fa-info-circle" title="Shows the prices of stock for this part
-the part single price shown is the current price for that supplier part"></i></h4>
+    <h4>{% trans 'Stock Pricing' %}<i class="fas fa-info-circle" title="Shows the purchase prices of stock for this part.
+The part single price is the current purchase price for that supplier part."></i></h4>
     {% if price_history|length > 1 %}
         <div style="max-width: 99%; min-height: 300px">
             <canvas id="StockPriceChart"></canvas>
@@ -157,7 +182,8 @@ the part single price shown is the current price for that supplier part"></i></h
                             {% for line in price_history %}{{ line.price_diff|stringformat:".2f" }},{% endfor %}
                         ],
                         borderWidth: 1,
-                        type: 'line'
+                        type: 'line',
+                        hidden: true,
                     },
                     {
                         label: '{% blocktrans %}Part Single Price - {{currency}}{% endblocktrans %}',
@@ -168,7 +194,8 @@ the part single price shown is the current price for that supplier part"></i></h
                             {% for line in price_history %}{{ line.price_part|stringformat:".2f" }},{% endfor %}
                         ],
                         borderWidth: 1,
-                        type: 'line'
+                        type: 'line',
+                        hidden: true,
                     },
                     {% endif %}
                     {
@@ -187,18 +214,18 @@ the part single price shown is the current price for that supplier part"></i></h
             var bomdata = {
                 labels: [{% for line in bom_parts %}'{{ line.name }}',{% endfor %}],
                 datasets:  [
-                {% if bom_pie_min %}
+                {
+                  label: 'Price',
+                  data: [{% for line in bom_parts %}{{ line.min_price }},{% endfor %}],
+                  backgroundColor: bom_colors,
+                },
+                {% if bom_pie_max %}
                 {
                     label: 'Max Price',
                     data: [{% for line in bom_parts %}{{ line.max_price }},{% endfor %}],
                     backgroundColor: bom_colors,
                   },
                 {% endif %}
-                {
-                  label: 'Price',
-                  data: [{% for line in bom_parts %}{% if bom_pie_min %}{{ line.min_price }}{% else %}{{ line.price }}{% endif%},{% endfor %}],
-                  backgroundColor: bom_colors,
-                }
               ]
             };
             var BomChart = loadBomChart(document.getElementById('BomChart'), bomdata)

InvenTree/part/templates/part/part_base.html

@@ -181,14 +181,27 @@
             {% endif %}
             {% endif %}
         {% endif %}
+        {% if part.trackable and part.getLatestSerialNumber %}
+            <tr><td colspan="3"></td></tr>
+            <tr>
+                <td><span class='fas fa-hashtag'></span></td>
+                <td>{% trans "Latest Serial Number" %}</td>
+                <td>{{ part.getLatestSerialNumber }}{% include "clip.html"%}</td>
+            </tr>
+        {% endif %}
         </table>
     </div>
     </div>
 
 </div>
 
+{% block pre_content_panel %}
+
+{% endblock %}
+
 <div class='panel panel-default panel-inventree'>
 
+
     <div class='panel-heading'>
         <h4>
             {% block heading %}
@@ -202,7 +215,11 @@
         <!-- Specific part details go here... -->
         {% endblock %}
     </div>
+
 </div>
+{% block post_content_panel %}
+
+{% endblock %}
 
 {% endblock %}
 

InvenTree/part/templates/part/part_pricing.html

@@ -3,7 +3,10 @@
 {% load i18n inventree_extras %}
 
 {% block pre_form_content %}
+
 {% default_currency as currency %}
+{% settings_value "PART_INTERNAL_PRICE" as show_internal_price %}
+
 <table class='table table-striped table-condensed table-price-two'>
     <tr>
         <td><b>{% trans 'Part' %}</b></td>
@@ -74,6 +77,22 @@
     </table>
 {% endif %}
 
+{% if show_internal_price and roles.sales_order.view %}
+{% if total_internal_part_price %}
+    <h4>{% trans 'Internal 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_internal_part_price %}</td>
+        </tr>
+        <tr>
+            <td><b>{% trans 'Total Cost' %}</b></td>
+            <td>{% include "price.html" with price=total_internal_part_price %}</td>
+        </tr>
+    </table>
+{% endif %}
+{% endif %}
+
 {% if total_part_price %}
     <h4>{% trans 'Sale Price' %}</h4>
     <table class='table table-striped table-condensed table-price-two'>