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

InvenTree/part/templates/part/category.html

@@ -137,6 +137,13 @@
                 <li><a href='#' id='multi-part-export' title='{% trans "Export" %}'>{% trans "Export Data" %}</a></li>
             </ul>
         </div>
+        <!-- Buttons to toggle between grid and table view -->
+        <button id='view-list' class='btn btn-default' type='button' title='{% trans "View list display" %}'>
+            <span class='fas fa-th-list'></span>
+        </button>
+        <button id='view-grid' class='btn btn-default' type='button' title='{% trans "View grid display" %}'>
+            <span class='fas fa-th'></span>
+        </button>
         <div class='filter-list' id='filter-list-parts'>
             <!-- Empty div -->
         </div>
@@ -147,7 +154,7 @@
     <div class='panel-heading'>
         <h4>
             {% block heading %}
-            {% trans "Part Categories" %}
+            {% trans "Parts" %}
             {% endblock %}
         </h4>
     </div>
@@ -178,6 +185,22 @@
         toggleId: '#category-menu-toggle',
     });
 
+    $('#view-list').click(function() {
+        $('#view-list').hide();
+        $('#view-grid').show();
+
+        $('#part-table').bootstrapTable('toggleCustomView');
+        inventreeSave('part-grid-view', '');
+    });
+
+    $('#view-grid').click(function() {
+        $('#view-grid').hide();
+        $('#view-list').show();
+
+        $('#part-table').bootstrapTable('toggleCustomView');
+        inventreeSave('part-grid-view', 1);
+    });
+
     $("#cat-create").click(function() {
         launchModalForm(
             "{% url 'category-create' %}",
@@ -282,7 +305,15 @@
             },
             buttons: ['#part-options'],
             checkbox: true,
+            gridView: true,
         },
     );
 
+    if (inventreeLoad("part-grid-view")) {
+        $('#view-grid').hide();
+        $('#part-table').bootstrapTable('toggleCustomView');
+    } else {
+        $('#view-list').hide();
+    }
+
 {% 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 == "order-prices" %}active{% endif %}' title='{% trans "Order Price Information" %}'>
+        <a href='{% url "part-order-prices" part.id %}'>
+            <span class='menu-tab-icon fas fa-dollar-sign' style='width: 20px;'></span>
+            {% trans "Order Price" %}
+        </a>
+    </li>
     <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>

InvenTree/part/templates/part/order_prices.html

@@ -0,0 +1,208 @@
+{% extends "part/part_base.html" %}
+{% load static %}
+{% load i18n %}
+{% load crispy_forms_tags %}
+{% load inventree_extras %}
+
+{% block menubar %}
+{% include 'part/navbar.html' with tab='order-prices' %}
+{% endblock %}
+
+{% block heading %}
+{% trans "Order Price Information" %}
+{% endblock %}
+
+{% block details %}
+{% settings_value "INVENTREE_DEFAULT_CURRENCY" as currency %}
+
+{% crispy form %}
+
+<div class="row"><div class="col col-md-6">
+<h4>{% trans "Pricing ranges" %}</h4>
+<table class='table table-striped table-condensed'>
+{% if part.supplier_count > 0 %}
+    {% if min_total_buy_price %}
+        <tr>
+            <td><b>{% trans 'Supplier Pricing' %}</b></td>
+            <td>{% trans 'Unit Cost' %}</td>
+            <td>Min: {% include "price.html" with price=min_unit_buy_price %}</td>
+            <td>Max: {% include "price.html" with price=max_unit_buy_price %}</td>
+        </tr>
+        {% if quantity > 1 %}
+        <tr>
+            <td></td>
+            <td>{% trans 'Total Cost' %}</td>
+            <td>Min: {% include "price.html" with price=min_total_buy_price %}</td>
+            <td>Max: {% include "price.html" with price=max_total_buy_price %}</td>
+        </tr>
+        {% endif %}
+    {% else %}
+        <tr>
+            <td colspan='4'>
+                <span class='warning-msg'><i>{% trans 'No supplier pricing available' %}</i></span>
+            </td>
+        </tr>
+    {% endif %}
+{% endif %}
+
+{% if part.bom_count > 0 %}
+    {% if min_total_bom_price %}
+        <tr>
+            <td><b>{% trans 'BOM Pricing' %}</b></td>
+            <td>{% trans 'Unit Cost' %}</td>
+            <td>Min: {% include "price.html" with price=min_unit_bom_price %}</td>
+            <td>Max: {% include "price.html" with price=max_unit_bom_price %}</td>
+        </tr>
+        {% if quantity > 1 %}
+            <tr>
+                <td></td>
+                <td>{% trans 'Total Cost' %}</td>
+                <td>Min: {% include "price.html" with price=min_total_bom_price %}</td>
+                <td>Max: {% include "price.html" with price=max_total_bom_price %}</td>
+            </tr>
+        {% endif %}
+        {% if part.has_complete_bom_pricing == False %}
+            <tr>
+                <td colspan='4'>
+                    <span class='warning-msg'><i>{% trans 'Note: BOM pricing is incomplete for this part' %}</i></span>
+                </td>
+            </tr>
+        {% endif %}
+    {% else %}
+        <tr>
+            <td colspan='4'>
+                <span class='warning-msg'><i>{% trans 'No BOM pricing available' %}</i></span>
+            </td>
+        </tr>
+    {% endif %}
+{% endif %}
+
+{% if total_part_price %}
+    <tr>
+        <td><b>{% trans 'Sale Price' %}</b></td>
+        <td>{% trans 'Unit Cost' %}</td>
+        <td colspan='2'>{% include "price.html" with price=unit_part_price %}</td>
+    </tr>
+    <tr>
+        <td></td>
+        <td>{% trans 'Total Cost' %}</td>
+        <td colspan='2'>{% include "price.html" with price=total_part_price %}</td>
+    </tr>
+{% endif %}
+</table>
+
+{% if min_unit_buy_price or min_unit_bom_price %}
+{% else %}
+    <div class='alert alert-danger alert-block'>
+        {% trans 'No pricing information is available for this part.' %}
+    </div>
+{% endif %}
+</div>
+{% if part.bom_count > 0 %}
+<div class="col col-md-6">
+    <h4>{% trans 'BOM Pricing' %}</h4>
+    <div style="max-width: 99%;">
+        <canvas id="BomChart"></canvas>
+    </div>
+</div>
+{% endif %}
+</div>
+
+{% 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>
+    {% if price_history|length > 1 %}
+        <div style="max-width: 99%; min-height: 300px">
+            <canvas id="StockPriceChart"></canvas>
+        </div>
+    {% else %}
+        <div class='alert alert-danger alert-block'>
+            {% trans 'No stock pricing history is available for this part.' %}
+        </div>
+    {% endif %}
+{% endif %}
+{% endblock %}
+
+
+
+
+{% block js_ready %}
+    {{ block.super }}
+
+    {% settings_value "INVENTREE_DEFAULT_CURRENCY" as currency %}
+    {% if price_history %}
+            var pricedata = {
+                    labels: [
+                        {% for line in price_history %}'{{ line.date }}',{% endfor %}
+                    ],
+                    datasets: [{
+                        label: '{% blocktrans %}Single Price - {{currency}}{% endblocktrans %}',
+                        backgroundColor: 'rgba(255, 99, 132, 0.2)',
+                        borderColor: 'rgb(255, 99, 132)',
+                        yAxisID: 'y',
+                        data: [
+                            {% for line in price_history %}{{ line.price|stringformat:".2f" }},{% endfor %}
+                        ],
+                        borderWidth: 1,
+                        type: 'line'
+                    },
+                    {% if 'price_diff' in price_history.0 %}
+                    {
+                        label: '{% blocktrans %}Single Price Difference - {{currency}}{% endblocktrans %}',
+                        backgroundColor: 'rgba(68, 157, 68, 0.2)',
+                        borderColor: 'rgb(68, 157, 68)',
+                        yAxisID: 'y2',
+                        data: [
+                            {% for line in price_history %}{{ line.price_diff|stringformat:".2f" }},{% endfor %}
+                        ],
+                        borderWidth: 1,
+                        type: 'line'
+                    },
+                    {
+                        label: '{% blocktrans %}Part Single Price - {{currency}}{% endblocktrans %}',
+                        backgroundColor: 'rgba(70, 127, 155, 0.2)',
+                        borderColor: 'rgb(70, 127, 155)',
+                        yAxisID: 'y',
+                        data: [
+                            {% for line in price_history %}{{ line.price_part|stringformat:".2f" }},{% endfor %}
+                        ],
+                        borderWidth: 1,
+                        type: 'line'
+                    },
+                    {% endif %}
+                    {
+                        label: '{% trans "Quantity" %}',
+                        backgroundColor: 'rgba(255, 206, 86, 0.2)',
+                        borderColor: 'rgb(255, 206, 86)',
+                        yAxisID: 'y1',
+                        data: [
+                            {% for line in price_history %}{{ line.qty|stringformat:"f" }},{% endfor %}
+                        ],
+                        borderWidth: 1
+                    }]
+                }
+            var StockPriceChart = loadStockPricingChart(document.getElementById('StockPriceChart'), pricedata)
+            var bom_colors =  randomColor({hue: 'green', count: {{ bom_parts|length }} })
+            var bomdata = {
+                labels: [{% for line in bom_parts %}'{{ line.name }}',{% endfor %}],
+                datasets:  [
+                {% if bom_pie_min %}
+                {
+                    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)
+
+    {% endif %}
+
+{% endblock %}

InvenTree/part/templates/part/part_base.html

@@ -102,6 +102,11 @@
         </div>
 
         <div class='info-messages'>
+            {% if part.virtual %}
+            <div class='alert alert-warning alert-block'>
+                {% trans "This is a virtual part" %}
+            </div>
+            {% endif %}
             {% if part.variant_of %}
             <div class='alert alert-info alert-block'>
                 {% object_link 'part-variants' part.variant_of.id part.variant_of.full_name as link %}

InvenTree/part/templates/part/part_pricing.html

@@ -3,7 +3,6 @@
 {% load i18n %}
 
 {% block pre_form_content %}
-
 <table class='table table-striped table-condensed table-price-two'>
     <tr>
         <td><b>{% trans 'Part' %}</b></td>
@@ -95,4 +94,4 @@
 </div>
 {% endif %}
 <hr>
-{% endblock %}
+{% endblock %}