Merge branch 'inventree:master' into price-history

InvenTree/templates/InvenTree/settings/currencies.html

@@ -0,0 +1,55 @@
+{% extends "InvenTree/settings/settings.html" %}
+{% load i18n %}
+{% load inventree_extras %}
+
+{% block tabs %}
+{% include "InvenTree/settings/tabs.html" with tab='currencies' %}
+{% endblock %}
+
+{% block subtitle %}
+{% trans "Currency Settings" %}
+{% endblock %}
+
+{% block settings %}
+
+<table class='table table-striped table-condensed'>
+    <tbody>
+        <tr>
+            <th>{% trans "Base Currency" %}</th>
+            <th>{{ base_currency }}</th>
+        </tr>
+        <tr>
+            <th colspan='2'>{% trans "Exchange Rates" %}</th>
+        </tr>
+        {% for rate in rates %}
+        <tr>
+            <td>{{ rate.currency }}</td>
+            <td>{{ rate.value }}</td>
+        </tr>
+        {% endfor %}
+        <tr>
+            <th>
+                {% trans "Last Update" %}
+            </th>
+            <td>
+                {% if rates_updated %}
+                {{ rates_updated }}
+                {% else %}
+                <i>{% trans "Never" %}</i>
+                {% endif %}
+                <form action='{% url "settings-currencies-refresh" %}' method='post'>
+                    <div id='refresh-rates-form'>
+                        {% csrf_token %}
+                        <button type='submit' id='update-rates' class='btn btn-default float-right'>{% trans "Update Now" %}</button>
+                    </div>
+                </form>
+            </td>
+        </tr>
+    </tbody>
+</table>
+
+{% endblock %}
+
+{% block js_ready %}
+{{ block.super }}
+{% endblock %}

InvenTree/templates/InvenTree/settings/global.html

@@ -19,8 +19,6 @@
         {% include "InvenTree/settings/setting.html" with key="INVENTREE_INSTANCE_TITLE" icon="fa-info-circle" %}
         {% include "InvenTree/settings/setting.html" with key="INVENTREE_BASE_URL" icon="fa-globe" %}
         {% include "InvenTree/settings/setting.html" with key="INVENTREE_COMPANY_NAME" icon="fa-building" %}
-        {% include "InvenTree/settings/setting.html" with key="INVENTREE_DEFAULT_CURRENCY" icon="fa-dollar-sign" %}
-        {% include "InvenTree/settings/setting.html" with key="INVENTREE_FIXER_API_KEY" icon="fa-key" %}
         {% include "InvenTree/settings/setting.html" with key="INVENTREE_DOWNLOAD_FROM_URL" icon="fa-cloud-download-alt" %}
     </tbody>
 </table>
@@ -33,4 +31,4 @@
     </tbody>
 </table>
 
-{% endblock %}
+{% endblock %}

InvenTree/templates/InvenTree/settings/tabs.html

@@ -15,6 +15,9 @@
     <li {% if tab == 'global' %} class='active' {% endif %}>
         <a href='{% url "settings-global" %}'><span class='fas fa-globe'></span> {% trans "Global" %}</a>
     </li>
+    <li {% if tab == 'currencies' %} class='active'{% endif %}>
+        <a href="{% url 'settings-currencies' %}"><span class='fas fa-dollar-sign'></span> {% trans "Currencies" %}</a>
+    </li>
     <li {% if tab == 'report' %} class='active' {% endif %}>
         <a href='{% url "settings-report" %}'><span class='fas fa-file-pdf'></span> {% trans "Report" %}</a>
     </li>

InvenTree/templates/js/bom.js

@@ -243,6 +243,22 @@ function loadBomTable(table, options) {
         }
     });
 
+    cols.push(
+    {
+        field: 'purchase_price_range',
+        title: '{% trans "Purchase Price Range" %}',
+        searchable: false,
+        sortable: true,
+    });
+
+    cols.push(
+    {
+        field: 'purchase_price_avg',
+        title: '{% trans "Purchase Price Average" %}',
+        searchable: false,
+        sortable: true,
+    });
+
     /*
 
     // TODO - Re-introduce the pricing column at a later stage,