Merge pull request #1117 from SchrodingersGat/currency-support

Currency support

.readthedocs.yml

@@ -1,17 +0,0 @@
-# .readthedocs.yml
-# Read the Docs configuration file
-# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
-
-version: 2
-
-# Build documentation in the docs/ directory with Sphinx
-sphinx:
-  configuration: docs/conf.py
-
-formats: all
-
-# Optionally set the version of Python and requirements required to build your docs
-python:
-  version: 3.5
-  install:
-    - requirements: docs/requirements.txt

InvenTree/InvenTree/exchange.py

@@ -0,0 +1,21 @@
+from djmoney.contrib.exchange.backends.base import BaseExchangeBackend
+
+
+class InvenTreeManualExchangeBackend(BaseExchangeBackend):
+    """
+    Backend for manually updating currency exchange rates
+
+    See the documentation for django-money: https://github.com/django-money/django-money
+
+    Specifically: https://github.com/django-money/django-money/tree/master/djmoney/contrib/exchange/backends
+    """
+
+    name = "inventree"
+    url = None
+
+    def get_rates(self, **kwargs):
+        """
+        Do not get any rates...
+        """
+        
+        return {}

InvenTree/InvenTree/settings.py

@@ -155,8 +155,9 @@ INSTALLED_APPS = [
     'markdownify',                  # Markdown template rendering
     'django_tex',                   # LaTeX output
     'django_admin_shell',           # Python shell for the admin interface
+    'djmoney',                      # django-money integration
+    'djmoney.contrib.exchange',     # django-money exchange rates
     'error_report',                 # Error reporting in the admin interface
-
 ]
 
 LOGGING = {
@@ -356,6 +357,17 @@ LANGUAGES = [
     ('pk', _('Polish')),
 ]
 
+# Currencies available for use
+CURRENCIES = CONFIG.get(
+    'currencies',
+    [
+        'AUD', 'CAD', 'EUR', 'GBP', 'JPY', 'NZD', 'USD',
+    ],
+)
+
+# TODO - Allow live web-based backends in the future
+EXCHANGE_BACKEND = 'InvenTree.exchange.InvenTreeManualExchangeBackend'
+
 LOCALE_PATHS = (
     os.path.join(BASE_DIR, 'locale/'),
 )

InvenTree/InvenTree/test_api.py

@@ -27,8 +27,7 @@ class APITests(APITestCase):
     def setUp(self):
 
         # Create a user (but do not log in!)
-        User = get_user_model()
-        User.objects.create_user(self.username, 'user@email.com', self.password)
+        get_user_model().objects.create_user(self.username, 'user@email.com', self.password)
 
     def basicAuth(self):
         # Use basic authentication

InvenTree/InvenTree/test_views.py

@@ -16,8 +16,7 @@ class ViewTests(TestCase):
     def setUp(self):
 
         # Create a user
-        User = get_user_model()
-        User.objects.create_user(self.username, 'user@email.com', self.password)
+        get_user_model().objects.create_user(self.username, 'user@email.com', self.password)
 
         self.client.login(username=self.username, password=self.password)
 

InvenTree/InvenTree/urls.py

@@ -75,7 +75,6 @@ settings_urls = [
     url(r'^theme/?', ColorThemeSelectView.as_view(), name='settings-theme'),
    
     url(r'^global/?', SettingsView.as_view(template_name='InvenTree/settings/global.html'), name='settings-global'),
-    url(r'^currency/?', SettingsView.as_view(template_name='InvenTree/settings/currency.html'), name='settings-currency'),
     url(r'^category/?', SettingCategorySelectView.as_view(), name='settings-category'),
     url(r'^part/?', SettingsView.as_view(template_name='InvenTree/settings/part.html'), name='settings-part'),
     url(r'^stock/?', SettingsView.as_view(template_name='InvenTree/settings/stock.html'), name='settings-stock'),

InvenTree/InvenTree/validators.py

@@ -6,11 +6,22 @@ from django.conf import settings
 from django.core.exceptions import ValidationError
 from django.utils.translation import gettext_lazy as _
 
+from moneyed import CURRENCIES
+
 import common.models
 
 import re
 
 
+def validate_currency_code(code):
+    """
+    Check that a given code is a valid currency code.
+    """
+
+    if code not in CURRENCIES:
+        raise ValidationError(_('Not a valid currency code'))
+
+
 def allowable_url_schemes():
     """ Return the list of allowable URL schemes.
     In addition to the default schemes allowed by Django,

InvenTree/barcode/tests.py

@@ -24,8 +24,8 @@ class BarcodeAPITest(APITestCase):
 
     def setUp(self):
         # Create a user for auth
-        User = get_user_model()
-        User.objects.create_user('testuser', 'test@testing.com', 'password')
+        user = get_user_model()
+        user.objects.create_user('testuser', 'test@testing.com', 'password')
 
         self.client.login(username='testuser', password='password')
 

InvenTree/build/migrations/0023_auto_20201110_0911.py

@@ -0,0 +1,20 @@
+# Generated by Django 3.0.7 on 2020-11-10 09:11
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('stock', '0054_remove_stockitem_build_order'),
+        ('build', '0022_buildorderattachment'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='builditem',
+            name='stock_item',
+            field=models.ForeignKey(help_text='Source stock item', limit_choices_to={'belongs_to': None, 'sales_order': None}, on_delete=django.db.models.deletion.CASCADE, related_name='allocations', to='stock.StockItem'),
+        ),
+    ]

InvenTree/build/models.py

@@ -962,7 +962,6 @@ class BuildItem(models.Model):
         related_name='allocations',
         help_text=_('Source stock item'),
         limit_choices_to={
-            'build_order': None,
             'sales_order': None,
             'belongs_to': None,
         }

InvenTree/build/test_build.py

@@ -267,17 +267,17 @@ class BuildTest(TestCase):
         # New stock items should have been created!
         self.assertEqual(StockItem.objects.count(), 4)
 
-        A = StockItem.objects.get(pk=self.stock_1_1.pk)
+        a = StockItem.objects.get(pk=self.stock_1_1.pk)
 
         # This stock item has been depleted!
         with self.assertRaises(StockItem.DoesNotExist):
             StockItem.objects.get(pk=self.stock_1_2.pk)
         
-        C = StockItem.objects.get(pk=self.stock_2_1.pk)
+        c = StockItem.objects.get(pk=self.stock_2_1.pk)
 
         # Stock should have been subtracted from the original items
-        self.assertEqual(A.quantity, 900)
-        self.assertEqual(C.quantity, 4500)
+        self.assertEqual(a.quantity, 900)
+        self.assertEqual(c.quantity, 4500)
         
         # And 10 new stock items created for the build output
         outputs = StockItem.objects.filter(build=self.build)

InvenTree/build/tests.py

@@ -28,10 +28,10 @@ class BuildTestSimple(TestCase):
 
     def setUp(self):
         # Create a user for auth
-        User = get_user_model()
-        User.objects.create_user('testuser', 'test@testing.com', 'password')
+        user = get_user_model()
+        user.objects.create_user('testuser', 'test@testing.com', 'password')
 
-        self.user = User.objects.get(username='testuser')
+        self.user = user.objects.get(username='testuser')
 
         g = Group.objects.create(name='builders')
         self.user.groups.add(g)
@@ -109,11 +109,11 @@ class TestBuildAPI(APITestCase):
 
     def setUp(self):
         # Create a user for auth
-        User = get_user_model()
-        user = User.objects.create_user('testuser', 'test@testing.com', 'password')
+        user = get_user_model()
+        self.user = user.objects.create_user('testuser', 'test@testing.com', 'password')
 
         g = Group.objects.create(name='builders')
-        user.groups.add(g)
+        self.user.groups.add(g)
 
         for rule in g.rule_sets.all():
             if rule.name == 'build':
@@ -185,11 +185,11 @@ class TestBuildViews(TestCase):
         super().setUp()
 
         # Create a user
-        User = get_user_model()
-        user = User.objects.create_user('username', 'user@email.com', 'password')
+        user = get_user_model()
+        self.user = user.objects.create_user('username', 'user@email.com', 'password')
 
         g = Group.objects.create(name='builders')
-        user.groups.add(g)
+        self.user.groups.add(g)
 
         for rule in g.rule_sets.all():
             if rule.name == 'build':

InvenTree/common/admin.py

@@ -5,11 +5,7 @@ from django.contrib import admin
 
 from import_export.admin import ImportExportModelAdmin
 
-from .models import Currency, InvenTreeSetting
-
-
-class CurrencyAdmin(ImportExportModelAdmin):
-    list_display = ('symbol', 'suffix', 'description', 'value', 'base')
+from .models import InvenTreeSetting
 
 
 class SettingsAdmin(ImportExportModelAdmin):
@@ -17,5 +13,4 @@ class SettingsAdmin(ImportExportModelAdmin):
     list_display = ('key', 'value')
 
 
-admin.site.register(Currency, CurrencyAdmin)
 admin.site.register(InvenTreeSetting, SettingsAdmin)

InvenTree/common/api.py

@@ -5,35 +5,5 @@ Provides a JSON API for common components.
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from rest_framework import permissions, generics, filters
-
-from django.conf.urls import url
-
-from .models import Currency
-from .serializers import CurrencySerializer
-
-
-class CurrencyList(generics.ListCreateAPIView):
-    """ API endpoint for accessing a list of Currency objects.
-
-    - GET: Return a list of Currencies
-    - POST: Create a new currency
-    """
-
-    queryset = Currency.objects.all()
-    serializer_class = CurrencySerializer
-
-    permission_classes = [
-        permissions.IsAuthenticated,
-    ]
-
-    filter_backends = [
-        filters.OrderingFilter,
-    ]
-
-    ordering_fields = ['suffix', 'value']
-
-
 common_api_urls = [
-    url(r'^currency/?$', CurrencyList.as_view(), name='api-currency-list'),
 ]

InvenTree/common/forms.py

@@ -7,21 +7,7 @@ from __future__ import unicode_literals
 
 from InvenTree.forms import HelperForm
 
-from .models import Currency, InvenTreeSetting
-
-
-class CurrencyEditForm(HelperForm):
-    """ Form for creating / editing a currency object """
-
-    class Meta:
-        model = Currency
-        fields = [
-            'symbol',
-            'suffix',
-            'description',
-            'value',
-            'base'
-        ]
+from .models import InvenTreeSetting
 
 
 class SettingEditForm(HelperForm):

InvenTree/common/migrations/0009_delete_currency.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.0.7 on 2020-11-10 11:40
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('company', '0027_remove_supplierpricebreak_currency'),
+        ('part', '0057_remove_partsellpricebreak_currency'),
+        ('common', '0008_remove_inventreesetting_description'),
+    ]
+
+    operations = [
+        migrations.DeleteModel(
+            name='Currency',
+        ),
+    ]

InvenTree/common/models.py

@@ -7,13 +7,18 @@ These models are 'generic' and do not fit a particular business logic object.
 from __future__ import unicode_literals
 
 import os
-import decimal
 
 from django.db import models
 from django.conf import settings
 
+import djmoney.settings
+from djmoney.models.fields import MoneyField
+from djmoney.contrib.exchange.models import convert_money
+from djmoney.contrib.exchange.exceptions import MissingRate
+
+from django.db.utils import OperationalError
 from django.utils.translation import ugettext as _
-from django.core.validators import MinValueValidator, MaxValueValidator
+from django.core.validators import MinValueValidator
 from django.core.exceptions import ValidationError
 
 import InvenTree.helpers
@@ -59,6 +64,13 @@ class InvenTreeSetting(models.Model):
             'default': 'My company name',
         },
 
+        'INVENTREE_DEFAULT_CURRENCY': {
+            'name': _('Default Currency'),
+            'description': _('Default currency'),
+            'default': 'USD',
+            'choices': djmoney.settings.CURRENCY_CHOICES,
+        },
+
         'PART_IPN_REGEX': {
             'name': _('IPN Regex'),
             'description': _('Regular expression pattern for matching Part IPN')
@@ -233,6 +245,29 @@ class InvenTreeSetting(models.Model):
         else:
             return ''
 
+    @classmethod
+    def get_setting_choices(cls, key):
+        """
+        Return the validator choices available for a particular setting.
+        """
+
+        key = str(key).strip().upper()
+
+        if key in cls.GLOBAL_SETTINGS:
+            setting = cls.GLOBAL_SETTINGS[key]
+            choices = setting.get('choices', None)
+        else:
+            choices = None
+
+        """
+        TODO:
+        if type(choices) is function:
+            # Evaluate the function (we expect it will return a list of tuples...)
+            return choices()
+        """
+        
+        return choices
+
     @classmethod
     def get_setting_object(cls, key):
         """
@@ -246,12 +281,20 @@ class InvenTreeSetting(models.Model):
 
         try:
             setting = InvenTreeSetting.objects.filter(key__iexact=key).first()
-        except (InvenTreeSetting.DoesNotExist):
-            # Create the setting if it does not exist
-            setting = InvenTreeSetting.create(
-                key=key,
-                value=InvenTreeSetting.get_default_value(key)
-            )
+        except OperationalError:
+            # Settings table has not been created yet!
+            return None
+        except (ValueError, InvenTreeSetting.DoesNotExist):
+            
+            try:
+                # Attempt Create the setting if it does not exist
+                setting = InvenTreeSetting.create(
+                    key=key,
+                    value=InvenTreeSetting.get_default_value(key)
+                )
+            except OperationalError:
+                # Settings table has not been created yet
+                setting = None
 
         return setting
 
@@ -403,6 +446,13 @@ class InvenTreeSetting(models.Model):
         except InvenTreeSetting.DoesNotExist:
             pass
 
+    def choices(self):
+        """
+        Return the available choices for this setting (or None if no choices are defined)
+        """
+
+        return InvenTreeSetting.get_setting_choices(self.key)
+
     def is_bool(self):
         """
         Check if this setting is required to be a boolean value
@@ -422,74 +472,6 @@ class InvenTreeSetting(models.Model):
         return InvenTree.helpers.str2bool(self.value)
 
 
-class Currency(models.Model):
-    """
-    A Currency object represents a particular unit of currency.
-    Each Currency has a scaling factor which relates it to the base currency.
-    There must be one (and only one) currency which is selected as the base currency,
-    and each other currency is calculated relative to it.
-
-    Attributes:
-        symbol: Currency symbol e.g. $
-        suffix: Currency suffix e.g. AUD
-        description: Long-form description e.g. "Australian Dollars"
-        value: The value of this currency compared to the base currency.
-        base: True if this currency is the base currency
-
-    """
-
-    symbol = models.CharField(max_length=10, blank=False, unique=False, help_text=_('Currency Symbol e.g. $'))
-
-    suffix = models.CharField(max_length=10, blank=False, unique=True, help_text=_('Currency Suffix e.g. AUD'))
-
-    description = models.CharField(max_length=100, blank=False, help_text=_('Currency Description'))
-
-    value = models.DecimalField(default=1.0, max_digits=10, decimal_places=5, validators=[MinValueValidator(0.00001), MaxValueValidator(100000)], help_text=_('Currency Value'))
-
-    base = models.BooleanField(default=False, help_text=_('Use this currency as the base currency'))
-
-    class Meta:
-        verbose_name_plural = 'Currencies'
-
-    def __str__(self):
-        """ Format string for currency representation """
-        s = "{sym} {suf} - {desc}".format(
-            sym=self.symbol,
-            suf=self.suffix,
-            desc=self.description
-        )
-
-        if self.base:
-            s += " (Base)"
-        
-        else:
-            s += " = {v}".format(v=self.value)
-
-        return s
-
-    def save(self, *args, **kwargs):
-        """ Validate the model before saving
-
-        - Ensure that there is only one base currency!
-        """
-
-        # If this currency is set as the base currency, ensure no others are
-        if self.base:
-            for cur in Currency.objects.filter(base=True).exclude(pk=self.pk):
-                cur.base = False
-                cur.save()
-
-        # If there are no currencies set as the base currency, set this as base
-        if not Currency.objects.exclude(pk=self.pk).filter(base=True).exists():
-            self.base = True
-
-        # If this is the base currency, ensure value is set to unity
-        if self.base:
-            self.value = 1.0
-
-        super().save(*args, **kwargs)
-
-
 class PriceBreak(models.Model):
     """
     Represents a PriceBreak model
@@ -498,32 +480,39 @@ class PriceBreak(models.Model):
     class Meta:
         abstract = True
 
-    quantity = InvenTree.fields.RoundingDecimalField(max_digits=15, decimal_places=5, default=1, validators=[MinValueValidator(1)])
+    quantity = InvenTree.fields.RoundingDecimalField(
+        max_digits=15,
+        decimal_places=5,
+        default=1,
+        validators=[MinValueValidator(1)],
+        verbose_name=_('Quantity'),
+        help_text=_('Price break quantity'),
+    )
 
-    cost = InvenTree.fields.RoundingDecimalField(max_digits=10, decimal_places=5, validators=[MinValueValidator(0)])
+    price = MoneyField(
+        max_digits=19,
+        decimal_places=4,
+        default_currency='USD',
+        null=True,
+        verbose_name=_('Price'),
+        help_text=_('Unit price at specified quantity'),
+    )
 
-    currency = models.ForeignKey(Currency, blank=True, null=True, on_delete=models.SET_NULL)
-
-    @property
-    def symbol(self):
-        return self.currency.symbol if self.currency else ''
-
-    @property
-    def suffix(self):
-        return self.currency.suffix if self.currency else ''
-
-    @property
-    def converted_cost(self):
+    def convert_to(self, currency_code):
         """
-        Return the cost of this price break, converted to the base currency
+        Convert the unit-price at this price break to the specified currency code.
+
+        Args:
+            currency_code - The currency code to convert to (e.g "USD" or "AUD")
         """
 
-        scaler = decimal.Decimal(1.0)
+        try:
+            converted = convert_money(self.price, currency_code)
+        except MissingRate:
+            print(f"WARNING: No currency conversion rate available for {self.price_currency} -> {currency_code}")
+            return self.price.amount
 
-        if self.currency:
-            scaler = self.currency.value
-
-        return self.cost * scaler
+        return converted.amount
 
 
 class ColorTheme(models.Model):

InvenTree/common/serializers.py

@@ -1,22 +1,3 @@
 """
 JSON serializers for common components
 """
-
-from .models import Currency
-
-from InvenTree.serializers import InvenTreeModelSerializer
-
-
-class CurrencySerializer(InvenTreeModelSerializer):
-    """ Serializer for Currency object """
-
-    class Meta:
-        model = Currency
-        fields = [
-            'pk',
-            'symbol',
-            'suffix',
-            'description',
-            'value',
-            'base'
-        ]

InvenTree/common/settings.py

@@ -0,0 +1,23 @@
+"""
+User-configurable settings for the common app
+"""
+
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from moneyed import CURRENCIES
+
+from common.models import InvenTreeSetting
+
+
+def currency_code_default():
+    """
+    Returns the default currency code (or USD if not specified)
+    """
+
+    code = InvenTreeSetting.get_setting('INVENTREE_DEFAULT_CURRENCY')
+
+    if code not in CURRENCIES:
+        code = 'USD'
+    
+    return code

InvenTree/common/tests.py

@@ -18,9 +18,9 @@ class SettingsTest(TestCase):
 
     def setUp(self):
 
-        User = get_user_model()
+        user = get_user_model()
         
-        self.user = User.objects.create_user('username', 'user@email.com', 'password')
+        self.user = user.objects.create_user('username', 'user@email.com', 'password')
         self.user.is_staff = True
         self.user.save()
 

InvenTree/common/urls.py

@@ -2,17 +2,5 @@
 URL lookup for common views
 """
 
-from django.conf.urls import url, include
-
-from . import views
-
-currency_urls = [
-    url(r'^new/', views.CurrencyCreate.as_view(), name='currency-create'),
-
-    url(r'^(?P<pk>\d+)/edit/', views.CurrencyEdit.as_view(), name='currency-edit'),
-    url(r'^(?P<pk>\d+)/delete/', views.CurrencyDelete.as_view(), name='currency-delete'),
-]
-
 common_urls = [
-    url(r'currency/', include(currency_urls)),
 ]

InvenTree/common/views.py

@@ -6,39 +6,15 @@ Django views for interacting with common models
 from __future__ import unicode_literals
 
 from django.utils.translation import ugettext as _
-from django.forms import CheckboxInput
+from django.forms import CheckboxInput, Select
 
-from InvenTree.views import AjaxCreateView, AjaxUpdateView, AjaxDeleteView
+from InvenTree.views import AjaxUpdateView
 from InvenTree.helpers import str2bool
 
 from . import models
 from . import forms
 
 
-class CurrencyCreate(AjaxCreateView):
-    """ View for creating a new Currency object """
-
-    model = models.Currency
-    form_class = forms.CurrencyEditForm
-    ajax_form_title = _('Create new Currency')
-
-
-class CurrencyEdit(AjaxUpdateView):
-    """ View for editing an existing Currency object """
-
-    model = models.Currency
-    form_class = forms.CurrencyEditForm
-    ajax_form_title = _('Edit Currency')
-
-
-class CurrencyDelete(AjaxDeleteView):
-    """ View for deleting an existing Currency object """
-
-    model = models.Currency
-    ajax_form_title = _('Delete Currency')
-    ajax_template_name = "common/delete_currency.html"
-
-
 class SettingEdit(AjaxUpdateView):
     """
     View for editing an InvenTree key:value settings object,
@@ -75,7 +51,11 @@ class SettingEdit(AjaxUpdateView):
         
         setting = self.get_object()
 
-        if setting.is_bool():
+        choices = setting.choices()
+
+        if choices is not None:
+            form.fields['value'].widget = Select(choices=choices)
+        elif setting.is_bool():
             form.fields['value'].widget = CheckboxInput()
 
             self.object.value = str2bool(setting.value)

InvenTree/company/admin.py

@@ -13,7 +13,6 @@ from .models import SupplierPart
 from .models import SupplierPriceBreak
 
 from part.models import Part
-from common.models import Currency
 
 
 class CompanyResource(ModelResource):
@@ -75,8 +74,6 @@ class SupplierPriceBreakResource(ModelResource):
 
     part = Field(attribute='part', widget=widgets.ForeignKeyWidget(SupplierPart))
 
-    currency = Field(attribute='currency', widget=widgets.ForeignKeyWidget(Currency))
-
     supplier_id = Field(attribute='part__supplier__pk', readonly=True)
 
     supplier_name = Field(attribute='part__supplier__name', readonly=True)
@@ -98,7 +95,7 @@ class SupplierPriceBreakAdmin(ImportExportModelAdmin):
 
     resource_class = SupplierPriceBreakResource
 
-    list_display = ('part', 'quantity', 'cost')
+    list_display = ('part', 'quantity', 'price')
 
 
 admin.site.register(Company, CompanyAdmin)

InvenTree/company/fixtures/price_breaks.yaml

@@ -7,21 +7,21 @@
   fields:
     part: 1
     quantity: 1
-    cost: 10
+    price: 10
 
 - model: company.supplierpricebreak
   pk: 2
   fields:
     part: 1
     quantity: 5
-    cost: 7.50
+    price: 7.50
 
 - model: company.supplierpricebreak
   pk: 3
   fields:
     part: 1
     quantity: 25
-    cost: 3.50
+    price: 3.50
 
 # Price breaks for ACME0002
 - model: company.supplierpricebreak
@@ -29,14 +29,14 @@
   fields:
     part: 2
     quantity: 5
-    cost: 7.00
+    price: 7.00
 
 - model: company.supplierpricebreak
   pk: 5
   fields:
     part: 2
     quantity: 50
-    cost: 1.25
+    price: 1.25
 
 # Price breaks for ZERGLPHS
 - model: company.supplierpricebreak
@@ -44,11 +44,11 @@
   fields:
     part: 4
     quantity: 25
-    cost: 8
+    price: 8
 
 - model: company.supplierpricebreak
   pk: 7
   fields:
     part: 4
     quantity: 100
-    cost: 1.25
+    price: 1.25

InvenTree/company/forms.py

@@ -8,6 +8,14 @@ from __future__ import unicode_literals
 from InvenTree.forms import HelperForm
 from InvenTree.fields import RoundingDecimalFormField
 
+from django.utils.translation import ugettext as _
+import django.forms
+
+import djmoney.settings
+from djmoney.forms.fields import MoneyField
+
+import common.settings
+
 from .models import Company
 from .models import SupplierPart
 from .models import SupplierPriceBreak
@@ -24,6 +32,13 @@ class EditCompanyForm(HelperForm):
         'phone': 'fa-phone',
     }
 
+    currency = django.forms.ChoiceField(
+        required=False,
+        help_text=_('Default currency used for this company'),
+        choices=[('', '----------')] + djmoney.settings.CURRENCY_CHOICES,
+        initial=common.settings.currency_code_default,
+    )
+
     class Meta:
         model = Company
         fields = [
@@ -31,6 +46,7 @@ class EditCompanyForm(HelperForm):
             'description',
             'website',
             'address',
+            'currency',
             'phone',
             'email',
             'contact',
@@ -60,6 +76,15 @@ class EditSupplierPartForm(HelperForm):
         'note': 'fa-pencil-alt',
     }
 
+    single_pricing = MoneyField(
+        label=_('Single Price'),
+        default_currency='USD',
+        help_text=_('Single quantity price'),
+        decimal_places=4,
+        max_digits=19,
+        required=False,
+    )
+
     class Meta:
         model = SupplierPart
         fields = [
@@ -71,8 +96,9 @@ class EditSupplierPartForm(HelperForm):
             'MPN',
             'link',
             'note',
-            'base_cost',
-            'multiple',
+            'single_pricing',
+            # 'base_cost',
+            # 'multiple',
             'packaging',
         ]
 
@@ -80,15 +106,17 @@ class EditSupplierPartForm(HelperForm):
 class EditPriceBreakForm(HelperForm):
     """ Form for creating / editing a supplier price break """
 
-    quantity = RoundingDecimalFormField(max_digits=10, decimal_places=5)
-
-    cost = RoundingDecimalFormField(max_digits=10, decimal_places=5)
+    quantity = RoundingDecimalFormField(
+        max_digits=10,
+        decimal_places=5,
+        label=_('Quantity'),
+        help_text=_('Price break quantity'),
+    )
 
     class Meta:
         model = SupplierPriceBreak
         fields = [
             'part',
             'quantity',
-            'cost',
-            'currency',
+            'price',
         ]

InvenTree/company/migrations/0025_auto_20201110_1001.py

@@ -0,0 +1,24 @@
+# Generated by Django 3.0.7 on 2020-11-10 10:01
+
+from django.db import migrations, connection
+import djmoney.models.fields
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('company', '0024_unique_name_email_constraint'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='supplierpricebreak',
+            name='price',
+            field=djmoney.models.fields.MoneyField(decimal_places=4, default_currency='USD', help_text='Unit price at specified quantity', max_digits=19, null=True, verbose_name='Price'),
+        ),
+        migrations.AddField(
+            model_name='supplierpricebreak',
+            name='price_currency',
+            field=djmoney.models.fields.CurrencyField(choices=[('AUD', 'Australian Dollar'), ('CAD', 'Canadian Dollar'), ('EUR', 'Euro'), ('NZD', 'New Zealand Dollar'), ('GBP', 'Pound Sterling'), ('USD', 'US Dollar'), ('JPY', 'Yen')], default='USD', editable=False, max_length=3),
+        ),
+    ]

InvenTree/company/migrations/0026_auto_20201110_1011.py

@@ -0,0 +1,147 @@
+# Generated by Django 3.0.7 on 2020-11-10 10:11
+
+import sys
+
+from moneyed import CURRENCIES
+from django.db import migrations, connection
+from company.models import SupplierPriceBreak
+
+
+def migrate_currencies(apps, schema_editor):
+    """
+    Migrate from the 'old' method of handling currencies,
+    to the new method which uses the django-money library.
+
+    Previously, we created a custom Currency model,
+    which was very simplistic.
+
+    Here we will attempt to map each existing "currency" reference
+    for the SupplierPriceBreak model, to a new django-money compatible currency.
+    """
+
+    print("Updating currency references for SupplierPriceBreak model...")
+
+    # A list of available currency codes
+    currency_codes = CURRENCIES.keys()
+
+    cursor = connection.cursor()
+
+    # The 'suffix' field denotes the currency code
+    response = cursor.execute('SELECT id, suffix, description from common_currency;')
+    
+    results = cursor.fetchall()
+
+    remap = {}
+
+    for index, row in enumerate(results):
+        pk, suffix, description = row
+
+        suffix = suffix.strip().upper()
+
+        if suffix not in currency_codes:
+            print("Missing suffix:", suffix)
+
+            while suffix not in currency_codes:
+                # Ask the user to input a valid currency
+                print(f"Could not find a valid currency matching '{suffix}'.")
+                print("Please enter a valid currency code")
+                suffix = str(input("> ")).strip()
+
+        if pk not in remap.keys():
+            remap[pk] = suffix
+
+    # Now iterate through each SupplierPriceBreak and update the rows
+    response = cursor.execute('SELECT id, cost, currency_id, price, price_currency from part_supplierpricebreak;')
+    
+    results = cursor.fetchall()
+
+    count = 0
+
+    for index, row in enumerate(results):
+        pk, cost, currency_id, price, price_currency = row
+
+        # Copy the 'cost' field across to the 'price' field
+        response = cursor.execute(f'UPDATE part_supplierpricebreak set price={cost} where id={pk};')
+
+        # Extract the updated currency code
+        currency_code = remap.get(currency_id, 'USD')
+
+        # Update the currency code
+        response = cursor.execute(f'UPDATE part_supplierpricebreak set price_currency= "{currency_code}" where id={pk};')
+
+        count += 1
+
+    print(f"Updated {count} SupplierPriceBreak rows")
+
+def reverse_currencies(apps, schema_editor):
+    """
+    Reverse the "update" process.
+
+    Here we may be in the situation that the legacy "Currency" table is empty,
+    and so we have to re-populate it based on the new price_currency codes.
+    """
+
+    print("Reversing currency migration...")
+
+    cursor = connection.cursor()
+
+    # Extract a list of currency codes which are in use
+    response = cursor.execute(f'SELECT id, price, price_currency from part_supplierpricebreak;')
+    
+    results = cursor.fetchall()
+
+    codes_in_use = set()
+
+    for index, row in enumerate(results):
+        pk, price, code = row
+
+        codes_in_use.add(code)
+
+        # Copy the 'price' field back into the 'cost' field
+        response = cursor.execute(f'UPDATE part_supplierpricebreak set cost={price} where id={pk};')
+
+    # Keep a dict of which currency objects map to which code
+    code_map = {}
+
+    # For each currency code in use, check if we have a matching Currency object
+    for code in codes_in_use:
+        response = cursor.execute(f'SELECT id, suffix from common_currency where suffix="{code}";')
+        row = response.fetchone()
+
+        if row is not None:
+            # A match exists!
+            pk, suffix = row
+            code_map[suffix] = pk
+        else:
+            # No currency object exists!
+            description = CURRENCIES[code]
+
+            # Create a new object in the database
+            print(f"Creating new Currency object for {code}")
+        
+            # Construct a query to create a new Currency object
+            query = f'INSERT into common_currency (symbol, suffix, description, value, base) VALUES ("$", "{code}", "{description}", 1.0, False);'
+
+            response = cursor.execute(query)
+
+            code_map[code] = cursor.lastrowid
+
+    # Ok, now we know how each suffix maps to a Currency object
+    for suffix in code_map.keys():
+        pk = code_map[suffix]
+
+        # Update the table to point to the Currency objects
+        print(f"Currency {suffix} -> pk {pk}")
+
+        response = cursor.execute(f'UPDATE part_supplierpricebreak set currency_id={pk} where price_currency="{suffix}";')
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('company', '0025_auto_20201110_1001'),
+    ]
+
+    operations = [
+        migrations.RunPython(migrate_currencies, reverse_code=reverse_currencies),
+    ]

InvenTree/company/migrations/0027_remove_supplierpricebreak_currency.py

@@ -0,0 +1,17 @@
+# Generated by Django 3.0.7 on 2020-11-10 11:40
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('company', '0026_auto_20201110_1011'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='supplierpricebreak',
+            name='currency',
+        ),
+    ]

InvenTree/company/migrations/0028_remove_supplierpricebreak_cost.py

@@ -0,0 +1,17 @@
+# Generated by Django 3.0.7 on 2020-11-10 11:42
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('company', '0027_remove_supplierpricebreak_currency'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='supplierpricebreak',
+            name='cost',
+        ),
+    ]

InvenTree/company/migrations/0029_company_currency.py

@@ -0,0 +1,19 @@
+# Generated by Django 3.0.7 on 2020-11-11 23:22
+
+import InvenTree.validators
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('company', '0028_remove_supplierpricebreak_cost'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='company',
+            name='currency',
+            field=models.CharField(blank=True, help_text='Default currency used for this company', max_length=3, validators=[InvenTree.validators.validate_currency_code], verbose_name='Currency'),
+        ),
+    ]

InvenTree/company/migrations/0030_auto_20201112_1112.py

@@ -0,0 +1,20 @@
+# Generated by Django 3.0.7 on 2020-11-12 00:12
+
+import InvenTree.fields
+import django.core.validators
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('company', '0029_company_currency'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='supplierpricebreak',
+            name='quantity',
+            field=InvenTree.fields.RoundingDecimalField(decimal_places=5, default=1, help_text='Price break quantity', max_digits=15, validators=[django.core.validators.MinValueValidator(1)], verbose_name='Quantity'),
+        ),
+    ]

InvenTree/company/models.py

@@ -17,6 +17,8 @@ from django.db.models import Sum, Q, UniqueConstraint
 from django.apps import apps
 from django.urls import reverse
 
+from moneyed import CURRENCIES
+
 from markdownx.models import MarkdownxField
 
 from stdimage.models import StdImageField
@@ -26,7 +28,10 @@ from InvenTree.helpers import normalize
 from InvenTree.fields import InvenTreeURLField
 from InvenTree.status_codes import PurchaseOrderStatus
 
+import InvenTree.validators
+
 import common.models
+import common.settings
 
 
 def rename_company_image(instance, filename):
@@ -77,6 +82,7 @@ class Company(models.Model):
         is_customer: boolean value, is this company a customer
         is_supplier: boolean value, is this company a supplier
         is_manufacturer: boolean value, is this company a manufacturer
+        currency_code: Specifies the default currency for the company
     """
 
     class Meta:
@@ -126,6 +132,30 @@ class Company(models.Model):
 
     is_manufacturer = models.BooleanField(default=False, help_text=_('Does this company manufacture parts?'))
 
+    currency = models.CharField(
+        max_length=3,
+        verbose_name=_('Currency'),
+        blank=True,
+        help_text=_('Default currency used for this company'),
+        validators=[InvenTree.validators.validate_currency_code],
+    )
+
+    @property
+    def currency_code(self):
+        """
+        Return the currency code associated with this company.
+        
+        - If the currency code is invalid, use the default currency
+        - If the currency code is not specified, use the default currency
+        """
+
+        code = self.currency
+
+        if code not in CURRENCIES:
+            code = common.settings.currency_code_default()
+
+        return code
+
     def __str__(self):
         """ Get string representation of a Company """
         return "{n} - {d}".format(n=self.name, d=self.description)
@@ -350,7 +380,26 @@ class SupplierPart(models.Model):
     def unit_pricing(self):
         return self.get_price(1)
 
-    def get_price(self, quantity, moq=True, multiples=True):
+    def add_price_break(self, quantity, price):
+        """
+        Create a new price break for this part
+
+        args:
+            quantity - Numerical quantity
+            price - Must be a Money object
+        """
+
+        # Check if a price break at that quantity already exists...
+        if self.price_breaks.filter(quantity=quantity, part=self.pk).exists():
+            return
+
+        SupplierPriceBreak.objects.create(
+            part=self,
+            quantity=quantity,
+            price=price
+        )
+
+    def get_price(self, quantity, moq=True, multiples=True, currency=None):
         """ Calculate the supplier price based on quantity price breaks.
 
         - Don't forget to add in flat-fee cost (base_cost field)
@@ -372,6 +421,10 @@ class SupplierPart(models.Model):
         pb_quantity = -1
         pb_cost = 0.0
 
+        if currency is None:
+            # Default currency selection
+            currency = common.models.InvenTreeSetting.get_setting('INVENTREE_DEFAULT_CURRENCY')
+
         for pb in self.price_breaks.all():
             # Ignore this pricebreak (quantity is too high)
             if pb.quantity > quantity:
@@ -382,8 +435,9 @@ class SupplierPart(models.Model):
             # If this price-break quantity is the largest so far, use it!
             if pb.quantity > pb_quantity:
                 pb_quantity = pb.quantity
-                # Convert everything to base currency
-                pb_cost = pb.converted_cost
+
+                # Convert everything to the selected currency
+                pb_cost = pb.convert_to(currency)
 
         if pb_found:
             cost = pb_cost * quantity
@@ -462,7 +516,4 @@ class SupplierPriceBreak(common.models.PriceBreak):
         db_table = 'part_supplierpricebreak'
 
     def __str__(self):
-        return "{mpn} - {cost} @ {quan}".format(
-            mpn=self.part.MPN,
-            cost=self.cost,
-            quan=self.quantity)
+        return f'{self.part.MPN} - {self.price} @ {self.quantity}'

InvenTree/company/serializers.py

@@ -137,13 +137,9 @@ class SupplierPartSerializer(InvenTreeModelSerializer):
 class SupplierPriceBreakSerializer(InvenTreeModelSerializer):
     """ Serializer for SupplierPriceBreak object """
 
-    symbol = serializers.CharField(read_only=True)
-
-    suffix = serializers.CharField(read_only=True)
-
     quantity = serializers.FloatField()
 
-    cost = serializers.FloatField()
+    price = serializers.CharField()
 
     class Meta:
         model = SupplierPriceBreak
@@ -151,8 +147,5 @@ class SupplierPriceBreakSerializer(InvenTreeModelSerializer):
             'pk',
             'part',
             'quantity',
-            'cost',
-            'currency',
-            'symbol',
-            'suffix',
+            'price',
         ]

InvenTree/company/templates/company/detail.html

@@ -8,25 +8,64 @@
 <h4>{% trans "Company Details" %}</h4>
 <hr>
 
-<table class='table table-striped'>
-    <col width='25'>
-    <col>
-    <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>
+<div class='row'>
+    <div class='col-sm-6'>
+        <table class='table table-striped'>
+            <col width='25'>
+            <col>
+            <tr>
+                <td><span class='fas fa-font'></span></td>
+                <td>{% trans "Company Name" %}</td>
+                <td>{{ company.name }}</td>
+            </tr>
+            <tr>
+                <td><span class='fas fa-info'></span></td>
+                <td>{% trans "Description" %}</td>
+                <td>{{ company.description }}</td>
+            </tr>
+            <tr>
+                <td><span class='fas fa-globe'></span></td>
+                <td>{% trans "Website" %}</td>
+                <td>
+                    {% if company.website %}<a href='{{ company.website }}'>{{ company.website }}</a>
+                    {% else %}<i>{% trans "No website specified" %}</i>
+                    {% endif %}
+                </td>
+            </tr>
+            <tr>
+                <td><span class='fas fa-dollar-sign'></span></td>
+                <td>{% trans "Currency" %}</td>
+                <td>
+                    {% if company.currency %}{{ company.currency }}
+                    {% else %}<i>{% trans "Uses default currency" %}</i>
+                    {% endif %}
+                </td>
+            </tr>
+        </table>
+    </div>
+    <div class='col-sm-6'>
+        <table class='table table-striped'>
+            <col width='25'>
+            <col>
+            <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>
+
+    </div>
+</div>
 
 {% endblock %}
 {% block js_ready %}

InvenTree/company/templates/company/supplier_part_pricing.html

@@ -76,18 +76,11 @@ $('#price-break-table').inventreeTable({
             sortable: true,
         },
         {
-            field: 'cost',
+            field: 'price',
             title: '{% trans "Price" %}',
             sortable: true,
             formatter: function(value, row, index) {
-                var html = '';
-
-                html += row.symbol || '';
-                html += value;
-
-                if (row.suffix) {
-                    html += ' ' + row.suffix || '';
-                }
+                var html = value;
 
                 html += `<div class='btn-group float-right' role='group'>`
 

InvenTree/company/test_api.py

@@ -15,8 +15,8 @@ class CompanyTest(APITestCase):
 
     def setUp(self):
         # Create a user for auth
-        User = get_user_model()
-        self.user = User.objects.create_user('testuser', 'test@testing.com', 'password')
+        user = get_user_model()
+        self.user = user.objects.create_user('testuser', 'test@testing.com', 'password')
         
         perms = [
             'view_company',

InvenTree/company/test_views.py

@@ -3,6 +3,8 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
+import json
+
 from django.test import TestCase
 from django.urls import reverse
 from django.contrib.auth import get_user_model
@@ -11,7 +13,7 @@ from django.contrib.auth.models import Group
 from .models import SupplierPart
 
 
-class CompanyViewTest(TestCase):
+class CompanyViewTestBase(TestCase):
 
     fixtures = [
         'category',
@@ -25,8 +27,9 @@ class CompanyViewTest(TestCase):
         super().setUp()
 
         # Create a user
-        User = get_user_model()
-        self.user = User.objects.create_user(
+        user = get_user_model()
+        
+        self.user = user.objects.create_user(
             username='username',
             email='user@email.com',
             password='password'
@@ -47,14 +50,104 @@ class CompanyViewTest(TestCase):
 
         self.client.login(username='username', password='password')
 
-    def test_company_index(self):
-        """ Test the company index """
+    def post(self, url, data, valid=None):
+        """
+        POST against this form and return the response (as a JSON object)
+        """
+
+        response = self.client.post(url, data, HTTP_X_REQUESTED_WITH='XMLHttpRequest')
 
-        response = self.client.get(reverse('company-index'))
         self.assertEqual(response.status_code, 200)
 
+        json_data = json.loads(response.content)
+
+        # If a particular status code is required
+        if valid is not None:
+            if valid:
+                self.assertEqual(json_data['form_valid'], True)
+            else:
+                self.assertEqual(json_data['form_valid'], False)
+
+        form_errors = json.loads(json_data['form_errors'])
+
+        return json_data, form_errors
+
+
+class SupplierPartViewTests(CompanyViewTestBase):
+    """
+    Tests for the SupplierPart views.
+    """
+
+    def test_supplier_part_create(self):
+        """
+        Test the SupplierPartCreate view.
+        
+        This view allows some additional functionality,
+        specifically it allows the user to create a single-quantity price break
+        automatically, when saving the new SupplierPart model.
+        """
+
+        url = reverse('supplier-part-create')
+
+        # First check that we can GET the form
+        response = self.client.get(url, HTTP_X_REQUESTED_WITH='XMLHttpRequest')
+        self.assertEqual(response.status_code, 200)
+
+        # How many supplier parts are already in the database?
+        n = SupplierPart.objects.all().count()
+
+        data = {
+            'part': 1,
+            'supplier': 1,
+        }
+
+        # SKU is required! (form should fail)
+        (response, errors) = self.post(url, data, valid=False)
+
+        self.assertIsNotNone(errors.get('SKU', None))
+
+        data['SKU'] = 'TEST-ME-123'
+
+        (response, errors) = self.post(url, data, valid=True)
+
+        # Check that the SupplierPart was created!
+        self.assertEqual(n + 1, SupplierPart.objects.all().count())
+
+        # Check that it was created *without* a price-break
+        supplier_part = SupplierPart.objects.get(pk=response['pk'])
+
+        self.assertEqual(supplier_part.price_breaks.count(), 0)
+
+        # Duplicate SKU is prohibited
+        (response, errors) = self.post(url, data, valid=False)
+
+        self.assertIsNotNone(errors.get('__all__', None))
+
+        # Add with a different SKU, *and* a single-quantity price
+        data['SKU'] = 'TEST-ME-1234'
+        data['single_pricing_0'] = '123.4'
+        data['single_pricing_1'] = 'CAD'
+
+        (response, errors) = self.post(url, data, valid=True)
+
+        pk = response.get('pk')
+
+        # Check that *another* SupplierPart was created
+        self.assertEqual(n + 2, SupplierPart.objects.all().count())
+
+        supplier_part = SupplierPart.objects.get(pk=pk)
+
+        # Check that a price-break has been created!
+        self.assertEqual(supplier_part.price_breaks.count(), 1)
+
+        price_break = supplier_part.price_breaks.first()
+
+        self.assertEqual(price_break.quantity, 1)
+
     def test_supplier_part_delete(self):
-        """ Test the SupplierPartDelete view """
+        """
+        Test the SupplierPartDelete view
+        """
 
         url = reverse('supplier-part-delete')
 
@@ -80,3 +173,30 @@ class CompanyViewTest(TestCase):
         self.assertEqual(response.status_code, 200)
 
         self.assertEqual(n - 2, SupplierPart.objects.count())
+
+
+class CompanyViewTest(CompanyViewTestBase):
+    """
+    Tests for various 'Company' views
+    """
+
+    def test_company_index(self):
+        """ Test the company index """
+
+        response = self.client.get(reverse('company-index'))
+        self.assertEqual(response.status_code, 200)
+
+    def test_company_create(self):
+        """
+        Test the view for creating a company
+        """
+
+        # Check that different company types return different form titles
+        response = self.client.get(reverse('supplier-create'), HTTP_X_REQUESTED_WITH='XMLHttpRequest')
+        self.assertContains(response, 'Create new Supplier')
+
+        response = self.client.get(reverse('manufacturer-create'), HTTP_X_REQUESTED_WITH='XMLHttpRequest')
+        self.assertContains(response, 'Create new Manufacturer')
+
+        response = self.client.get(reverse('customer-create'), HTTP_X_REQUESTED_WITH='XMLHttpRequest')
+        self.assertContains(response, 'Create new Customer')

InvenTree/company/tests.py

@@ -1,4 +1,5 @@
 from django.test import TestCase
+from django.core.exceptions import ValidationError
 
 import os
 
@@ -6,6 +7,9 @@ from .models import Company, Contact, SupplierPart
 from .models import rename_company_image
 from part.models import Part
 
+from InvenTree.exchange import InvenTreeManualExchangeBackend
+from djmoney.contrib.exchange.models import Rate
+
 
 class CompanySimpleTest(TestCase):
 
@@ -32,6 +36,14 @@ class CompanySimpleTest(TestCase):
         self.zerglphs = SupplierPart.objects.get(SKU='ZERGLPHS')
         self.zergm312 = SupplierPart.objects.get(SKU='ZERGM312')
 
+        InvenTreeManualExchangeBackend().update_rates()
+
+        Rate.objects.create(
+            currency='AUD',
+            value='1.35',
+            backend_id='inventree',
+        )
+
     def test_company_model(self):
         c = Company.objects.get(name='ABC Co.')
         self.assertEqual(c.name, 'ABC Co.')
@@ -108,6 +120,30 @@ class CompanySimpleTest(TestCase):
         self.assertIsNone(m3x12.get_price_info(3))
         self.assertIsNotNone(m3x12.get_price_info(50))
 
+    def test_currency_validation(self):
+        """
+        Test validation for currency selection
+        """
+
+        # Create a company with a valid currency code (should pass)
+        company = Company.objects.create(
+            name='Test',
+            description='Toast',
+            currency='AUD',
+        )
+
+        company.full_clean()
+
+        # Create a company with an invalid currency code (should fail)
+        company = Company.objects.create(
+            name='test',
+            description='Toasty',
+            currency='XZY',
+        )
+
+        with self.assertRaises(ValidationError):
+            company.full_clean()
+
 
 class ContactSimpleTest(TestCase):
 

InvenTree/company/views.py

@@ -12,12 +12,12 @@ from django.views.generic import DetailView, ListView, UpdateView
 from django.urls import reverse
 from django.forms import HiddenInput
 
+from moneyed import CURRENCIES
+
 from InvenTree.views import AjaxCreateView, AjaxUpdateView, AjaxDeleteView
 from InvenTree.helpers import str2bool
 from InvenTree.views import InvenTreeRoleMixin
 
-from common.models import Currency
-
 from .models import Company
 from .models import SupplierPart
 from .models import SupplierPriceBreak
@@ -29,6 +29,9 @@ from .forms import CompanyImageForm
 from .forms import EditSupplierPartForm
 from .forms import EditPriceBreakForm
 
+import common.models
+import common.settings
+
 
 class CompanyIndex(InvenTreeRoleMixin, ListView):
     """ View for displaying list of companies
@@ -268,6 +271,14 @@ class SupplierPartEdit(AjaxUpdateView):
     ajax_form_title = _('Edit Supplier Part')
     role_required = 'purchase_order.change'
 
+    def get_form(self):
+        form = super().get_form()
+
+        # Hide the single-pricing field (only for creating a new SupplierPart!)
+        form.fields['single_pricing'].widget = HiddenInput()
+
+        return form
+
 
 class SupplierPartCreate(AjaxCreateView):
     """ Create view for making new SupplierPart """
@@ -279,6 +290,30 @@ class SupplierPartCreate(AjaxCreateView):
     context_object_name = 'part'
     role_required = 'purchase_order.add'
 
+    def validate(self, part, form):
+
+        single_pricing = form.cleaned_data.get('single_pricing', None)
+
+        if single_pricing:
+            # TODO - What validation steps can be performed on the single_pricing field?
+            pass
+
+    def save(self, form):
+        """
+        If single_pricing is defined, add a price break for quantity=1
+        """
+
+        # Save the supplier part object
+        supplier_part = super().save(form)
+
+        single_pricing = form.cleaned_data.get('single_pricing', None)
+
+        if single_pricing:
+
+            supplier_part.add_price_break(1, single_pricing)
+
+        return supplier_part
+
     def get_form(self):
         """ Create Form instance to create a new SupplierPart object.
         Hide some fields if they are not appropriate in context
@@ -303,11 +338,14 @@ class SupplierPartCreate(AjaxCreateView):
         supplier_id = self.get_param('supplier')
         part_id = self.get_param('part')
 
+        supplier = None
+
         if supplier_id:
             try:
-                initials['supplier'] = Company.objects.get(pk=supplier_id)
+                supplier = Company.objects.get(pk=supplier_id)
+                initials['supplier'] = supplier
             except (ValueError, Company.DoesNotExist):
-                pass
+                supplier = None
 
         if manufacturer_id:
             try:
@@ -320,6 +358,17 @@ class SupplierPartCreate(AjaxCreateView):
                 initials['part'] = Part.objects.get(pk=part_id)
             except (ValueError, Part.DoesNotExist):
                 pass
+
+        # Initial value for single pricing
+        if supplier:
+            currency_code = supplier.currency_code
+        else:
+            currency_code = common.settings.currency_code_default()
+
+        currency = CURRENCIES.get(currency_code, None)
+
+        if currency_code:
+            initials['single_pricing'] = ('', currency)
         
         return initials
 
@@ -417,10 +466,23 @@ class PriceBreakCreate(AjaxCreateView):
         }
 
     def get_part(self):
+        """
+        Attempt to extract SupplierPart object from the supplied data.
+        """
+
         try:
-            return SupplierPart.objects.get(id=self.request.GET.get('part'))
-        except SupplierPart.DoesNotExist:
-            return SupplierPart.objects.get(id=self.request.POST.get('part'))
+            supplier_part = SupplierPart.objects.get(pk=self.request.GET.get('part'))
+            return supplier_part
+        except (ValueError, SupplierPart.DoesNotExist):
+            pass
+
+        try:
+            supplier_part = SupplierPart.objects.get(pk=self.request.POST.get('part'))
+            return supplier_part
+        except (ValueError, SupplierPart.DoesNotExist):
+            pass
+
+        return None
 
     def get_form(self):
 
@@ -433,14 +495,20 @@ class PriceBreakCreate(AjaxCreateView):
 
         initials = super(AjaxCreateView, self).get_initial()
 
+        supplier_part = self.get_part()
+
         initials['part'] = self.get_part()
 
-        # Pre-select the default currency
-        try:
-            base = Currency.objects.get(base=True)
-            initials['currency'] = base
-        except Currency.DoesNotExist:
-            pass
+        if supplier_part is not None:
+            currency_code = supplier_part.supplier.currency_code
+        else:
+            currency_code = common.settings.currency_code_default()
+
+        # Extract the currency object associated with the code
+        currency = CURRENCIES.get(currency_code, None)
+        
+        if currency:
+            initials['price'] = [1.0, currency]
 
         return initials
 

InvenTree/config_template.yaml

@@ -26,6 +26,17 @@ language: en-us
 # Select an option from the "TZ database name" column
 timezone: UTC
 
+# List of currencies supported by default.
+# Add other currencies here to allow use in InvenTree
+currencies:
+  - AUD
+  - CAD
+  - EUR
+  - GBP
+  - JPY
+  - NZD
+  - USD
+
 # Set debug to False to run in production mode
 debug: True
 

InvenTree/order/forms.py

@@ -175,6 +175,7 @@ class EditPurchaseOrderLineItemForm(HelperForm):
             'part',
             'quantity',
             'reference',
+            'purchase_price',
             'notes',
         ]
 

InvenTree/order/migrations/0037_auto_20201110_0911.py

@@ -0,0 +1,20 @@
+# Generated by Django 3.0.7 on 2020-11-10 09:11
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('stock', '0054_remove_stockitem_build_order'),
+        ('order', '0036_auto_20200831_0912'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='salesorderallocation',
+            name='item',
+            field=models.ForeignKey(help_text='Select stock item to allocate', limit_choices_to={'belongs_to': None, 'part__salable': True, 'sales_order': None}, on_delete=django.db.models.deletion.CASCADE, related_name='sales_order_allocations', to='stock.StockItem'),
+        ),
+    ]

InvenTree/order/migrations/0038_auto_20201112_1737.py

@@ -0,0 +1,24 @@
+# Generated by Django 3.0.7 on 2020-11-12 06:37
+
+from django.db import migrations
+import djmoney.models.fields
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('order', '0037_auto_20201110_0911'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='purchaseorderlineitem',
+            name='purchase_price',
+            field=djmoney.models.fields.MoneyField(decimal_places=4, default_currency='USD', help_text='Unit purchase price', max_digits=19, null=True, verbose_name='Purchase Price'),
+        ),
+        migrations.AddField(
+            model_name='purchaseorderlineitem',
+            name='purchase_price_currency',
+            field=djmoney.models.fields.CurrencyField(choices=[('AUD', 'Australian Dollar'), ('CAD', 'Canadian Dollar'), ('EUR', 'Euro'), ('NZD', 'New Zealand Dollar'), ('GBP', 'Pound Sterling'), ('USD', 'US Dollar'), ('JPY', 'Yen')], default='USD', editable=False, max_length=3),
+        ),
+    ]

InvenTree/order/migrations/0039_auto_20201112_2203.py

@@ -0,0 +1,19 @@
+# Generated by Django 3.0.7 on 2020-11-12 11:03
+
+from django.db import migrations
+import djmoney.models.fields
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('order', '0038_auto_20201112_1737'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='purchaseorderlineitem',
+            name='purchase_price',
+            field=djmoney.models.fields.MoneyField(blank=True, decimal_places=4, default_currency='USD', help_text='Unit purchase price', max_digits=19, null=True, verbose_name='Purchase Price'),
+        ),
+    ]

InvenTree/order/models.py

@@ -4,6 +4,10 @@ Order model definitions
 
 # -*- coding: utf-8 -*-
 
+import os
+from datetime import datetime
+from decimal import Decimal
+
 from django.db import models, transaction
 from django.db.models import F, Sum
 from django.db.models.functions import Coalesce
@@ -15,9 +19,7 @@ from django.utils.translation import ugettext as _
 
 from markdownx.models import MarkdownxField
 
-import os
-from datetime import datetime
-from decimal import Decimal
+from djmoney.models.fields import MoneyField
 
 from part import models as PartModels
 from stock import models as stock_models
@@ -499,6 +501,15 @@ class PurchaseOrderLineItem(OrderLineItem):
 
     received = models.DecimalField(decimal_places=5, max_digits=15, default=0, help_text=_('Number of items received'))
 
+    purchase_price = MoneyField(
+        max_digits=19,
+        decimal_places=4,
+        default_currency='USD',
+        null=True, blank=True,
+        verbose_name=_('Purchase Price'),
+        help_text=_('Unit purchase price'),
+    )
+
     def remaining(self):
         """ Calculate the number of items remaining to be received """
         r = self.quantity - self.received
@@ -621,7 +632,6 @@ class SalesOrderAllocation(models.Model):
             'part__salable': True,
             'belongs_to': None,
             'sales_order': None,
-            'build_order': None,
         },
         help_text=_('Select stock item to allocate')
     )

InvenTree/order/serializers.py

@@ -95,6 +95,8 @@ class POLineItemSerializer(InvenTreeModelSerializer):
     part_detail = PartBriefSerializer(source='get_base_part', many=False, read_only=True)
     supplier_part_detail = SupplierPartSerializer(source='part', many=False, read_only=True)
     
+    purchase_price_string = serializers.CharField(source='purchase_price', read_only=True)
+
     class Meta:
         model = PurchaseOrderLineItem
 
@@ -108,6 +110,9 @@ class POLineItemSerializer(InvenTreeModelSerializer):
             'part_detail',
             'supplier_part_detail',
             'received',
+            'purchase_price',
+            'purchase_price_currency',
+            'purchase_price_string',
         ]
 
 

InvenTree/order/templates/order/purchase_order_detail.html

@@ -146,6 +146,7 @@ $("#po-table").inventreeTable({
             field: 'part',
             sortable: true,
             title: '{% trans "Part" %}',
+            switchable: false,
             formatter: function(value, row, index, field) {
                 if (row.part) {
                     return imageHoverIcon(row.part_detail.thumbnail) + renderLink(row.part_detail.full_name, `/part/${row.part_detail.pk}/`);
@@ -177,9 +178,18 @@ $("#po-table").inventreeTable({
             field: 'quantity',
             title: '{% trans "Quantity" %}'
         },
+        {
+            sortable: true,
+            field: 'purchase_price',
+            title: '{% trans "Unit Price" %}',
+            formatter: function(value, row) {
+                return row.purchase_price_string || row.purchase_price;
+            }
+        },
         {
             sortable: true,
             field: 'received',
+            switchable: false,
             title: '{% trans "Received" %}',
             formatter: function(value, row, index, field) {
                 return makeProgressBar(row.received, row.quantity, {
@@ -203,6 +213,7 @@ $("#po-table").inventreeTable({
             title: '{% trans "Notes" %}',
         },
         {
+            switchable: false,
             field: 'buttons',
             title: '',
             formatter: function(value, row, index, field) {

InvenTree/order/test_api.py

@@ -23,8 +23,7 @@ class OrderTest(APITestCase):
     def setUp(self):
 
         # Create a user for auth
-        User = get_user_model()
-        User.objects.create_user('testuser', 'test@testing.com', 'password')
+        get_user_model().objects.create_user('testuser', 'test@testing.com', 'password')
         self.client.login(username='testuser', password='password')
 
     def doGet(self, url, options=''):

InvenTree/order/test_sales_order.py

@@ -120,12 +120,12 @@ class SalesOrderTest(TestCase):
         # There should now be 4 stock items
         self.assertEqual(StockItem.objects.count(), 4)
 
-        Sa = StockItem.objects.get(pk=self.Sa.pk)
-        Sb = StockItem.objects.get(pk=self.Sb.pk)
+        sa = StockItem.objects.get(pk=self.Sa.pk)
+        sb = StockItem.objects.get(pk=self.Sb.pk)
 
         # 25 units subtracted from each of the original items
-        self.assertEqual(Sa.quantity, 75)
-        self.assertEqual(Sb.quantity, 175)
+        self.assertEqual(sa.quantity, 75)
+        self.assertEqual(sb.quantity, 175)
 
         # And 2 items created which are associated with the order
         outputs = StockItem.objects.filter(sales_order=self.order)
@@ -134,8 +134,8 @@ class SalesOrderTest(TestCase):
         for item in outputs.all():
             self.assertEqual(item.quantity, 25)
     
-        self.assertEqual(Sa.sales_order, None)
-        self.assertEqual(Sb.sales_order, None)
+        self.assertEqual(sa.sales_order, None)
+        self.assertEqual(sb.sales_order, None)
 
         # And no allocations
         self.assertEqual(SalesOrderAllocation.objects.count(), 0)

InvenTree/order/test_views.py

@@ -32,8 +32,7 @@ class OrderViewTestCase(TestCase):
         super().setUp()
 
         # Create a user
-        User = get_user_model()
-        user = User.objects.create_user('username', 'user@email.com', 'password')
+        user = get_user_model().objects.create_user('username', 'user@email.com', 'password')
 
         # Ensure that the user has the correct permissions!
         g = Group.objects.create(name='orders')

InvenTree/part/admin.py

@@ -285,7 +285,7 @@ class PartSellPriceBreakAdmin(admin.ModelAdmin):
     class Meta:
         model = PartSellPriceBreak
 
-    list_display = ('part', 'quantity', 'cost', 'currency')
+    list_display = ('part', 'quantity', 'price',)
 
 
 admin.site.register(Part, PartAdmin)

InvenTree/part/fixtures/part.yaml

@@ -8,6 +8,7 @@
     category: 8
     link: www.acme.com/parts/m2x4lphs
     tree_id: 0
+    purchaseable: True
     level: 0
     lft: 0
     rght: 0

InvenTree/part/forms.py

@@ -20,8 +20,6 @@ from .models import PartCategoryParameterTemplate
 from .models import PartTestTemplate
 from .models import PartSellPriceBreak
 
-from common.models import Currency
-
 
 class PartModelChoiceField(forms.ModelChoiceField):
     """ Extending string representation of Part instance with available stock """
@@ -333,13 +331,10 @@ class PartPriceForm(forms.Form):
         help_text=_('Input quantity for price calculation')
     )
 
-    currency = forms.ModelChoiceField(queryset=Currency.objects.all(), label='Currency', help_text=_('Select currency for price calculation'))
-
     class Meta:
         model = Part
         fields = [
             'quantity',
-            'currency',
         ]
 
 
@@ -350,13 +345,10 @@ class EditPartSalePriceBreakForm(HelperForm):
 
     quantity = RoundingDecimalFormField(max_digits=10, decimal_places=5)
 
-    cost = RoundingDecimalFormField(max_digits=10, decimal_places=5)
-
     class Meta:
         model = PartSellPriceBreak
         fields = [
             'part',
             'quantity',
-            'cost',
-            'currency',
+            'price',
         ]

InvenTree/part/migrations/0054_auto_20201109_1246.py

@@ -7,7 +7,7 @@ import part.settings
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('part', '0053_partcategoryparametertemplate'),
+        ('part', '0052_partrelated'),
     ]
 
     operations = [

InvenTree/part/migrations/0055_auto_20201110_1001.py

@@ -0,0 +1,24 @@
+# Generated by Django 3.0.7 on 2020-11-10 10:01
+
+from django.db import migrations
+import djmoney.models.fields
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('part', '0054_auto_20201109_1246'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='partsellpricebreak',
+            name='price',
+            field=djmoney.models.fields.MoneyField(decimal_places=4, default_currency='USD', help_text='Unit price at specified quantity', max_digits=19, null=True, verbose_name='Price'),
+        ),
+        migrations.AddField(
+            model_name='partsellpricebreak',
+            name='price_currency',
+            field=djmoney.models.fields.CurrencyField(choices=[('AUD', 'Australian Dollar'), ('CAD', 'Canadian Dollar'), ('EUR', 'Euro'), ('NZD', 'New Zealand Dollar'), ('GBP', 'Pound Sterling'), ('USD', 'US Dollar'), ('JPY', 'Yen')], default='USD', editable=False, max_length=3),
+        ),
+    ]

InvenTree/part/migrations/0056_auto_20201110_1125.py

@@ -0,0 +1,147 @@
+# Generated by Django 3.0.7 on 2020-11-10 11:25
+
+from django.db import migrations
+
+from moneyed import CURRENCIES
+from django.db import migrations, connection
+from company.models import SupplierPriceBreak
+
+
+def migrate_currencies(apps, schema_editor):
+    """
+    Migrate from the 'old' method of handling currencies,
+    to the new method which uses the django-money library.
+
+    Previously, we created a custom Currency model,
+    which was very simplistic.
+
+    Here we will attempt to map each existing "currency" reference
+    for the SupplierPriceBreak model, to a new django-money compatible currency.
+    """
+
+    print("Updating currency references for SupplierPriceBreak model...")
+
+    # A list of available currency codes
+    currency_codes = CURRENCIES.keys()
+
+    cursor = connection.cursor()
+
+    # The 'suffix' field denotes the currency code
+    response = cursor.execute('SELECT id, suffix, description from common_currency;')
+    
+    results = cursor.fetchall()
+
+    remap = {}
+
+    for index, row in enumerate(results):
+        pk, suffix, description = row
+
+        suffix = suffix.strip().upper()
+
+        if suffix not in currency_codes:
+            print("Missing suffix:", suffix)
+
+            while suffix not in currency_codes:
+                # Ask the user to input a valid currency
+                print(f"Could not find a valid currency matching '{suffix}'.")
+                print("Please enter a valid currency code")
+                suffix = str(input("> ")).strip()
+
+        if pk not in remap.keys():
+            remap[pk] = suffix
+
+    # Now iterate through each PartSellPriceBreak and update the rows
+    response = cursor.execute('SELECT id, cost, currency_id, price, price_currency from part_partsellpricebreak;')
+    
+    results = cursor.fetchall()
+
+    count = 0
+
+    for index, row in enumerate(results):
+        pk, cost, currency_id, price, price_currency = row
+
+        # Copy the 'cost' field across to the 'price' field
+        response = cursor.execute(f'UPDATE part_partsellpricebreak set price={cost} where id={pk};')
+
+        # Extract the updated currency code
+        currency_code = remap.get(currency_id, 'USD')
+
+        # Update the currency code
+        response = cursor.execute(f'UPDATE part_partsellpricebreak set price_currency= "{currency_code}" where id={pk};')
+
+        count += 1
+
+    print(f"Updated {count} SupplierPriceBreak rows")
+
+def reverse_currencies(apps, schema_editor):
+    """
+    Reverse the "update" process.
+
+    Here we may be in the situation that the legacy "Currency" table is empty,
+    and so we have to re-populate it based on the new price_currency codes.
+    """
+
+    print("Reversing currency migration...")
+
+    cursor = connection.cursor()
+
+    # Extract a list of currency codes which are in use
+    response = cursor.execute(f'SELECT id, price, price_currency from part_partsellpricebreak;')
+    
+    results = cursor.fetchall()
+
+    codes_in_use = set()
+
+    for index, row in enumerate(results):
+        pk, price, code = row
+
+        codes_in_use.add(code)
+
+        # Copy the 'price' field back into the 'cost' field
+        response = cursor.execute(f'UPDATE part_partsellpricebreak set cost={price} where id={pk};')
+
+    # Keep a dict of which currency objects map to which code
+    code_map = {}
+
+    # For each currency code in use, check if we have a matching Currency object
+    for code in codes_in_use:
+        response = cursor.execute(f'SELECT id, suffix from common_currency where suffix="{code}";')
+        row = response.fetchone()
+
+        if row is not None:
+            # A match exists!
+            pk, suffix = row
+            code_map[suffix] = pk
+        else:
+            # No currency object exists!
+            description = CURRENCIES[code]
+
+            # Create a new object in the database
+            print(f"Creating new Currency object for {code}")
+        
+            # Construct a query to create a new Currency object
+            query = f'INSERT into common_currency (symbol, suffix, description, value, base) VALUES ("$", "{code}", "{description}", 1.0, False);'
+
+            response = cursor.execute(query)
+
+            code_map[code] = cursor.lastrowid
+
+    # Ok, now we know how each suffix maps to a Currency object
+    for suffix in code_map.keys():
+        pk = code_map[suffix]
+
+        # Update the table to point to the Currency objects
+        print(f"Currency {suffix} -> pk {pk}")
+
+        response = cursor.execute(f'UPDATE part_partsellpricebreak set currency_id={pk} where price_currency="{suffix}";')
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('part', '0055_auto_20201110_1001'),
+    ]
+
+    operations = [
+        migrations.RunPython(migrate_currencies, reverse_code=reverse_currencies),
+    ]

InvenTree/part/migrations/0057_remove_partsellpricebreak_currency.py

@@ -0,0 +1,17 @@
+# Generated by Django 3.0.7 on 2020-11-10 11:40
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('part', '0056_auto_20201110_1125'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='partsellpricebreak',
+            name='currency',
+        ),
+    ]

InvenTree/part/migrations/0058_remove_partsellpricebreak_cost.py

@@ -0,0 +1,17 @@
+# Generated by Django 3.0.7 on 2020-11-10 11:42
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('part', '0057_remove_partsellpricebreak_currency'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='partsellpricebreak',
+            name='cost',
+        ),
+    ]

InvenTree/part/migrations/0059_auto_20201112_1112.py

@@ -0,0 +1,20 @@
+# Generated by Django 3.0.7 on 2020-11-12 00:12
+
+import InvenTree.fields
+import django.core.validators
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('part', '0058_remove_partsellpricebreak_cost'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='partsellpricebreak',
+            name='quantity',
+            field=InvenTree.fields.RoundingDecimalField(decimal_places=5, default=1, help_text='Price break quantity', max_digits=15, validators=[django.core.validators.MinValueValidator(1)], verbose_name='Quantity'),
+        ),
+    ]

InvenTree/part/migrations/0060_merge_20201112_1722.py

@@ -0,0 +1,14 @@
+# Generated by Django 3.0.7 on 2020-11-12 06:22
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('part', '0053_partcategoryparametertemplate'),
+        ('part', '0059_auto_20201112_1112'),
+    ]
+
+    operations = [
+    ]

InvenTree/part/serializers.py

@@ -84,13 +84,9 @@ class PartSalePriceSerializer(InvenTreeModelSerializer):
     Serializer for sale prices for Part model.
     """
 
-    symbol = serializers.CharField(read_only=True)
-
-    suffix = serializers.CharField(read_only=True)
-
     quantity = serializers.FloatField()
 
-    cost = serializers.FloatField()
+    price = serializers.CharField()
 
     class Meta:
         model = PartSellPriceBreak
@@ -98,10 +94,7 @@ class PartSalePriceSerializer(InvenTreeModelSerializer):
             'pk',
             'part',
             'quantity',
-            'cost',
-            'currency',
-            'symbol',
-            'suffix',
+            'price',
         ]
 
 

InvenTree/part/templates/part/sale_prices.html

@@ -10,7 +10,9 @@
 <hr>
 
 <div id='price-break-toolbar' class='btn-group'>
-    <button class='btn btn-primary' id='new-price-break' type='button'>{% trans "Add Price Break" %}</button>
+    <button class='btn btn-primary' id='new-price-break' type='button'>
+        <span class='fas fa-plus-circle'></span> {% trans "Add Price Break" %}
+    </button>
 </div>
 
 <table class='table table-striped table-condensed' id='price-break-table' data-toolbar='#price-break-toolbar'>
@@ -81,18 +83,11 @@ $('#price-break-table').inventreeTable({
             sortable: true,
         },
         {
-            field: 'cost',
+            field: 'price',
             title: '{% trans "Price" %}',
             sortable: true,
             formatter: function(value, row, index) {
-                var html = '';
-
-                html += row.symbol || '';
-                html += value;
-
-                if (row.suffix) {
-                    html += ' ' + row.suffix || '';
-                }
+                var html = value;
 
                 html += `<div class='btn-group float-right' role='group'>`
 

InvenTree/part/test_api.py

@@ -29,8 +29,9 @@ class PartAPITest(APITestCase):
 
     def setUp(self):
         # Create a user for auth
-        User = get_user_model()
-        self.user = User.objects.create_user(
+        user = get_user_model()
+        
+        self.user = user.objects.create_user(
             username='testuser',
             email='test@testing.com',
             password='password'
@@ -269,8 +270,9 @@ class PartAPIAggregationTest(APITestCase):
 
     def setUp(self):
         # Create a user for auth
-        User = get_user_model()
-        User.objects.create_user('testuser', 'test@testing.com', 'password')
+        user = get_user_model()
+        
+        user.objects.create_user('testuser', 'test@testing.com', 'password')
 
         self.client.login(username='testuser', password='password')
 

InvenTree/part/test_category.py

@@ -165,14 +165,14 @@ class CategoryTest(TestCase):
             self.assert_equal(p.get_default_location().pathstring, 'Office/Drawer_1')
 
         # Any part under electronics should default to 'Home'
-        R1 = Part.objects.get(name='R_2K2_0805')
-        self.assertIsNone(R1.default_location)
-        self.assertEqual(R1.get_default_location().name, 'Home')
+        r1 = Part.objects.get(name='R_2K2_0805')
+        self.assertIsNone(r1.default_location)
+        self.assertEqual(r1.get_default_location().name, 'Home')
 
         # But one part has a default_location set
-        R2 = Part.objects.get(name='R_4K7_0603')
-        self.assertEqual(R2.get_default_location().name, 'Bathroom')
+        r2 = Part.objects.get(name='R_4K7_0603')
+        self.assertEqual(r2.get_default_location().name, 'Bathroom')
 
         # And one part should have no default location at all
-        W = Part.objects.get(name='Widget')
-        self.assertIsNone(W.get_default_location())
+        w = Part.objects.get(name='Widget')
+        self.assertIsNone(w.get_default_location())

InvenTree/part/test_part.py

@@ -54,10 +54,10 @@ class PartTest(TestCase):
     ]
 
     def setUp(self):
-        self.R1 = Part.objects.get(name='R_2K2_0805')
-        self.R2 = Part.objects.get(name='R_4K7_0603')
+        self.r1 = Part.objects.get(name='R_2K2_0805')
+        self.r2 = Part.objects.get(name='R_4K7_0603')
 
-        self.C1 = Part.objects.get(name='C_22N_0805')
+        self.c1 = Part.objects.get(name='C_22N_0805')
 
         Part.objects.rebuild()
 
@@ -78,18 +78,18 @@ class PartTest(TestCase):
         self.assertEqual(str(p), "BOB | Bob | A2 - Can we build it?")
 
     def test_metadata(self):
-        self.assertEqual(self.R1.name, 'R_2K2_0805')
-        self.assertEqual(self.R1.get_absolute_url(), '/part/3/')
+        self.assertEqual(self.r1.name, 'R_2K2_0805')
+        self.assertEqual(self.r1.get_absolute_url(), '/part/3/')
 
     def test_category(self):
-        self.assertEqual(str(self.C1.category), 'Electronics/Capacitors - Capacitors')
+        self.assertEqual(str(self.c1.category), 'Electronics/Capacitors - Capacitors')
 
         orphan = Part.objects.get(name='Orphan')
         self.assertIsNone(orphan.category)
         self.assertEqual(orphan.category_path, '')
 
     def test_rename_img(self):
-        img = rename_part_image(self.R1, 'hello.png')
+        img = rename_part_image(self.r1, 'hello.png')
         self.assertEqual(img, os.path.join('part_images', 'hello.png'))
         
     def test_stock(self):
@@ -100,12 +100,12 @@ class PartTest(TestCase):
             self.assertEqual(r.available_stock, 0)
 
     def test_barcode(self):
-        barcode = self.R1.format_barcode()
+        barcode = self.r1.format_barcode()
         self.assertIn('InvenTree', barcode)
-        self.assertIn(self.R1.name, barcode)
+        self.assertIn(self.r1.name, barcode)
 
     def test_copy(self):
-        self.R2.deep_copy(self.R1, image=True, bom=True)
+        self.r2.deep_copy(self.r1, image=True, bom=True)
 
     def test_match_names(self):
 
@@ -181,9 +181,9 @@ class PartSettingsTest(TestCase):
     
     def setUp(self):
         # Create a user for auth
-        User = get_user_model()
+        user = get_user_model()
 
-        self.user = User.objects.create_user(
+        self.user = user.objects.create_user(
             username='testuser',
             email='test@testing.com',
             password='password',

InvenTree/part/test_views.py

@@ -23,8 +23,9 @@ class PartViewTestCase(TestCase):
         super().setUp()
 
         # Create a user
-        User = get_user_model()
-        self.user = User.objects.create_user(
+        user = get_user_model()
+        
+        self.user = user.objects.create_user(
             username='username',
             email='user@email.com',
             password='password'

InvenTree/part/views.py

@@ -17,6 +17,8 @@ from django.forms.models import model_to_dict
 from django.forms import HiddenInput, CheckboxInput
 from django.conf import settings
 
+from moneyed import CURRENCIES
+
 import os
 
 from rapidfuzz import fuzz
@@ -30,7 +32,7 @@ from .models import match_part_names
 from .models import PartTestTemplate
 from .models import PartSellPriceBreak
 
-from common.models import Currency, InvenTreeSetting
+from common.models import InvenTreeSetting
 from company.models import SupplierPart
 
 from . import forms as part_forms
@@ -1877,19 +1879,12 @@ class PartPricing(AjaxView):
         if quantity < 1:
             quantity = 1
 
-        if currency is None:
-            # No currency selected? Try to select a default one
-            try:
-                currency = Currency.objects.get(base=1)
-            except Currency.DoesNotExist:
-                currency = None
+        # TODO - Capacity for price comparison in different currencies
+        currency = None
 
         # Currency scaler
         scaler = Decimal(1.0)
 
-        if currency is not None:
-            scaler = Decimal(currency.value)
-
         part = self.get_part()
         
         ctx = {
@@ -1959,13 +1954,8 @@ class PartPricing(AjaxView):
         except ValueError:
             quantity = 1
 
-        try:
-            currency_id = int(self.request.POST.get('currency', None))
-
-            if currency_id:
-                currency = Currency.objects.get(pk=currency_id)
-        except (ValueError, Currency.DoesNotExist):
-            currency = None
+        # TODO - How to handle pricing in different currencies?
+        currency = None
 
         # Always mark the form as 'invalid' (the user may wish to keep getting pricing data)
         data = {
@@ -2589,12 +2579,11 @@ class PartSalePriceBreakCreate(AjaxCreateView):
 
         initials['part'] = self.get_part()
 
-        # Pre-select the default currency
-        try:
-            base = Currency.objects.get(base=True)
-            initials['currency'] = base
-        except Currency.DoesNotExist:
-            pass
+        default_currency = InvenTreeSetting.get_setting('INVENTREE_DEFAULT_CURRENCY')
+        currency = CURRENCIES.get(default_currency, None)
+
+        if currency is not None:
+            initials['price'] = [1.0, currency]
 
         return initials
 

InvenTree/stock/admin.py

@@ -83,8 +83,6 @@ class StockItemResource(ModelResource):
 
     sales_order = Field(attribute='sales_order', widget=widgets.ForeignKeyWidget(SalesOrder))
 
-    build_order = Field(attribute='build_order', widget=widgets.ForeignKeyWidget(Build))
-
     purchase_order = Field(attribute='purchase_order', widget=widgets.ForeignKeyWidget(PurchaseOrder))
 
     # Date management

InvenTree/stock/api.py

@@ -488,11 +488,7 @@ class StockList(generics.ListCreateAPIView):
         if build:
             queryset = queryset.filter(build=build)
 
-        build_order = params.get('build_order', None)
-
-        if build_order:
-            queryset = queryset.filter(build_order=build_order)
-
+        # Filter by 'is building' status
         is_building = params.get('is_building', None)
 
         if is_building:
@@ -621,10 +617,10 @@ class StockList(generics.ListCreateAPIView):
                 queryset = queryset.exclude(quantity__lte=0)
 
         # Filter by internal part number
-        IPN = params.get('IPN', None)
+        ipn = params.get('IPN', None)
 
-        if IPN is not None:
-            queryset = queryset.filter(part__IPN=IPN)
+        if ipn is not None:
+            queryset = queryset.filter(part__IPN=ipn)
 
         # Does the client wish to filter by the Part ID?
         part_id = params.get('part', None)

InvenTree/stock/forms.py

@@ -124,6 +124,7 @@ class CreateStockItemForm(HelperForm):
         fields = [
             'part',
             'supplier_part',
+            'purchase_price',
             'location',
             'quantity',
             'batch',
@@ -399,6 +400,7 @@ class EditStockItemForm(HelperForm):
             'serial',
             'batch',
             'status',
+            'purchase_price',
             'link',
             'delete_on_deplete',
         ]

InvenTree/stock/migrations/0054_remove_stockitem_build_order.py

@@ -0,0 +1,17 @@
+# Generated by Django 3.0.7 on 2020-11-10 09:11
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('stock', '0053_auto_20201110_0513'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='stockitem',
+            name='build_order',
+        ),
+    ]

InvenTree/stock/models.py

@@ -24,6 +24,8 @@ from markdownx.models import MarkdownxField
 
 from mptt.models import MPTTModel, TreeForeignKey
 
+from djmoney.models.fields import MoneyField
+
 from decimal import Decimal, InvalidOperation
 from datetime import datetime
 from InvenTree import helpers
@@ -134,14 +136,13 @@ class StockItem(MPTTModel):
         purchase_order: Link to a PurchaseOrder (if this stock item was created from a PurchaseOrder)
         infinite: If True this StockItem can never be exhausted
         sales_order: Link to a SalesOrder object (if the StockItem has been assigned to a SalesOrder)
-        build_order: Link to a BuildOrder object (if the StockItem has been assigned to a BuildOrder)
+        purchase_price: The unit purchase price for this StockItem - this is the unit price at time of purchase (if this item was purchased from an external supplier)
     """
 
     # A Query filter which will be re-used in multiple places to determine if a StockItem is actually "in stock"
     IN_STOCK_FILTER = Q(
         quantity__gt=0,
         sales_order=None,
-        build_order=None,
         belongs_to=None,
         customer=None,
         is_building=False,
@@ -427,14 +428,6 @@ class StockItem(MPTTModel):
         related_name='stock_items',
         null=True, blank=True)
 
-    build_order = models.ForeignKey(
-        'build.Build',
-        on_delete=models.SET_NULL,
-        verbose_name=_("Destination Build Order"),
-        related_name='stock_items',
-        null=True, blank=True
-    )
-
     # last time the stock was checked / counted
     stocktake_date = models.DateField(blank=True, null=True)
 
@@ -456,6 +449,15 @@ class StockItem(MPTTModel):
         help_text=_('Stock Item Notes')
     )
 
+    purchase_price = MoneyField(
+        max_digits=19,
+        decimal_places=4,
+        default_currency='USD',
+        null=True,
+        verbose_name=_('Purchase Price'),
+        help_text=_('Single unit purchase price at time of purchase'),
+    )
+
     def clearAllocations(self):
         """
         Clear all order allocations for this StockItem:
@@ -602,9 +604,6 @@ class StockItem(MPTTModel):
         if self.sales_order is not None:
             return False
 
-        if self.build_order is not None:
-            return False
-
         return True
 
     def installedItemCount(self):
@@ -622,12 +621,12 @@ class StockItem(MPTTModel):
         return self.installedItemCount() > 0
 
     @transaction.atomic
-    def installStockItem(self, otherItem, quantity, user, notes):
+    def installStockItem(self, other_item, quantity, user, notes):
         """
         Install another stock item into this stock item.
 
         Args
-            otherItem: The stock item to install into this stock item
+            other_item: The stock item to install into this stock item
             quantity: The quantity of stock to install
             user: The user performing the operation
             notes: Any notes associated with the operation
@@ -638,10 +637,10 @@ class StockItem(MPTTModel):
             return False
 
         # If the quantity is less than the stock item, split the stock!
-        stock_item = otherItem.splitStock(quantity, None, user)
+        stock_item = other_item.splitStock(quantity, None, user)
 
         if stock_item is None:
-            stock_item = otherItem
+            stock_item = other_item
 
         # Assign the other stock item into this one
         stock_item.belongs_to = self
@@ -738,10 +737,6 @@ class StockItem(MPTTModel):
         if self.sales_order is not None:
             return False
 
-        # Not 'in stock' if it has been allocated to a BuildOrder
-        if self.build_order is not None:
-            return False
-
         # Not 'in stock' if it has been assigned to a customer
         if self.customer is not None:
             return False

InvenTree/stock/serializers.py

@@ -73,7 +73,6 @@ class StockItemSerializer(InvenTreeModelSerializer):
         return queryset.prefetch_related(
             'belongs_to',
             'build',
-            'build_order',
             'customer',
             'sales_order',
             'supplier_part',
@@ -155,7 +154,6 @@ class StockItemSerializer(InvenTreeModelSerializer):
             'batch',
             'belongs_to',
             'build',
-            'build_order',
             'customer',
             'in_stock',
             'is_building',

InvenTree/stock/templates/stock/item_base.html

@@ -221,12 +221,6 @@ InvenTree | {% trans "Stock Item" %} - {{ item }}
         <td>{% trans "Sales Order" %}</td>
         <td><a href="{% url 'so-detail' item.sales_order.id %}">{{ item.sales_order.reference }}</a> - <a href="{% url 'company-detail' item.sales_order.customer.id %}">{{ item.sales_order.customer.name }}</a></td>
     </tr>
-    {% elif item.build_order %}
-    <tr>
-        <td><span class='fas fa-tools'></span></td>
-        <td>{% trans "Build Order" %}</td>
-        <td><a href="{% url 'build-detail' item.build_order.id %}">{{ item.build_order }}</a></td>
-    </tr>
     {% else %}
     <tr>
         <td><span class='fas fa-map-marker-alt'></span></td>
@@ -266,6 +260,13 @@ InvenTree | {% trans "Stock Item" %} - {{ item }}
         <td><a href="{% url 'po-detail' item.purchase_order.id %}">{{ item.purchase_order }}</a></td>
     </tr>
     {% endif %}
+    {% if item.purchase_price %}
+    <tr>
+        <td><span class='fas fa-dollar-sign'></span></td>
+        <td>{% trans "Purchase Price" %}</td>
+        <td>{{ item.purchase_price }}</td>
+    </tr>
+    {% endif %}
     {% if item.parent %}
     <tr>
         <td><span class='fas fa-sitemap'></span></td>

InvenTree/stock/test_api.py

@@ -22,8 +22,9 @@ class StockAPITestCase(APITestCase):
 
     def setUp(self):
         # Create a user for auth
-        User = get_user_model()
-        self.user = User.objects.create_user('testuser', 'test@testing.com', 'password')
+        user = get_user_model()
+        
+        self.user = user.objects.create_user('testuser', 'test@testing.com', 'password')
 
         # Add the necessary permissions to the user
         perms = [

InvenTree/stock/test_views.py

@@ -23,8 +23,9 @@ class StockViewTestCase(TestCase):
         super().setUp()
 
         # Create a user
-        User = get_user_model()
-        self.user = User.objects.create_user(
+        user = get_user_model()
+        
+        self.user = user.objects.create_user(
             username='username',
             email='user@email.com',
             password='password'

InvenTree/stock/tests.py

@@ -38,12 +38,12 @@ class StockTest(TestCase):
         self.drawer3 = StockLocation.objects.get(name='Drawer_3')
 
         # Create a user
-        User = get_user_model()
-        User.objects.create_user('username', 'user@email.com', 'password')
+        user = get_user_model()
+        user.objects.create_user('username', 'user@email.com', 'password')
 
         self.client.login(username='username', password='password')
 
-        self.user = User.objects.get(username='username')
+        self.user = user.objects.get(username='username')
 
         # Ensure the MPTT objects are correctly rebuild
         Part.objects.rebuild()
@@ -221,21 +221,21 @@ class StockTest(TestCase):
     def test_split_stock(self):
         # Split the 1234 x 2K2 resistors in Drawer_1
 
-        N = StockItem.objects.filter(part=3).count()
+        n = StockItem.objects.filter(part=3).count()
 
         stock = StockItem.objects.get(id=1234)
         stock.splitStock(1000, None, self.user)
         self.assertEqual(stock.quantity, 234)
 
         # There should be a new stock item too!
-        self.assertEqual(StockItem.objects.filter(part=3).count(), N + 1)
+        self.assertEqual(StockItem.objects.filter(part=3).count(), n + 1)
 
         # Try to split a negative quantity
         stock.splitStock(-10, None, self.user)
-        self.assertEqual(StockItem.objects.filter(part=3).count(), N + 1)
+        self.assertEqual(StockItem.objects.filter(part=3).count(), n + 1)
 
         stock.splitStock(stock.quantity, None, self.user)
-        self.assertEqual(StockItem.objects.filter(part=3).count(), N + 1)
+        self.assertEqual(StockItem.objects.filter(part=3).count(), n + 1)
 
     def test_stocktake(self):
         # Perform stocktake

InvenTree/stock/views.py

@@ -14,6 +14,8 @@ from django.urls import reverse
 
 from django.utils.translation import ugettext as _
 
+from moneyed import CURRENCIES
+
 from InvenTree.views import AjaxView
 from InvenTree.views import AjaxUpdateView, AjaxDeleteView, AjaxCreateView
 from InvenTree.views import QRCodeView
@@ -32,6 +34,8 @@ from report.models import TestReport
 from label.models import StockItemLabel
 from .models import StockItem, StockLocation, StockItemTracking, StockItemAttachment, StockItemTestResult
 
+import common.settings
+
 from .admin import StockItemResource
 
 from . import forms as StockForms
@@ -1572,6 +1576,8 @@ class StockItemCreate(AjaxCreateView):
             initials['location'] = part.get_default_location()
             initials['supplier_part'] = part.default_supplier
 
+        currency_code = common.settings.currency_code_default()
+
         # SupplierPart field has been specified
         # It must match the Part, if that has been supplied
         if sup_part_id:
@@ -1581,6 +1587,8 @@ class StockItemCreate(AjaxCreateView):
                 if part is None or supplier_part.part == part:
                     initials['supplier_part'] = supplier_part
 
+                    currency_code = supplier_part.supplier.currency_code
+
             except (ValueError, SupplierPart.DoesNotExist):
                 pass
 
@@ -1592,6 +1600,11 @@ class StockItemCreate(AjaxCreateView):
             except (ValueError, StockLocation.DoesNotExist):
                 pass
 
+        currency = CURRENCIES.get(currency_code, None)
+
+        if currency:
+            initials['purchase_price'] = (None, currency)
+
         return initials
 
     def post(self, request, *args, **kwargs):

InvenTree/templates/InvenTree/settings/currency.html

@@ -1,118 +0,0 @@
-{% extends "InvenTree/settings/settings.html" %}
-{% load i18n %}
-
-{% block subtitle %}
-{% trans "General Settings" %}
-{% endblock %}
-
-{% block tabs %}
-{% include "InvenTree/settings/tabs.html" with tab='currency' %}
-{% endblock %}
-
-{% block settings %}
-
-<h4>{% trans "Currencies" %}</h4>
-
-<div id='currency-buttons'>
-    <button class='btn btn-success' id='new-currency'>
-        <span class='fas fa-plus-circle'></span> {% trans "New Currency" %}</button>
-</div>
-
-<table class='table table-striped table-condensed' id='currency-table' data-toolbar='#currency-buttons'>
-</table>
-{% endblock %}
-
-{% block js_ready %}
-{{ block.super }}
-
-    $("#currency-table").inventreeTable({
-        url: "{% url 'api-currency-list' %}",
-        queryParams: {
-            ordering: 'suffix'
-        },
-        formatNoMatches: function() { return "No currencies found"; },
-        rowStyle: function(row, index) {
-            if (row.base) {
-                return {classes: 'basecurrency'};
-            } else {
-                return {};
-            }
-        },
-        columns: [
-            {
-                field: 'pk',
-                title: 'ID',
-                visible: false,
-                switchable: false,
-            },
-            {
-                field: 'symbol',
-                title: 'Symbol',
-            },
-            {
-                field: 'suffix',
-                title: 'Currency',
-                sortable: true,
-            },
-            {
-                field: 'description',
-                title: 'Description',
-                sortable: true,
-            },
-            {
-                field: 'value',
-                title: 'Value',
-                sortable: true,
-                formatter: function(value, row, index, field) {
-                    if (row.base) {
-                        return "Base Currency";
-                    } else {
-                        return value;
-                    }
-                }
-            },
-            {
-                formatter: function(value, row, index, field) {
-
-                    var bEdit = "<button title='Edit Currency' class='cur-edit btn btn-default btn-glyph' type='button' pk='" + row.pk + "'><span class='fas fa-edit'></span></button>";
-                    var bDel = "<button title='Delete Currency' class='cur-delete btn btn-default btn-glyph' type='button' pk='" + row.pk + "'><span class='fas fa-trash-alt icon-red'></span></button>";
-
-                    var html = "<div class='btn-group' role='group'>" + bEdit + bDel + "</div>";
-
-                    return html;
-                }
-            }
-        ]
-    });
-
-    $("#currency-table").on('click', '.cur-edit', function() {
-        var button = $(this);
-        var url = "/common/currency/" + button.attr('pk') + "/edit/";
-
-        launchModalForm(url, {
-            success: function() {
-                $("#currency-table").bootstrapTable('refresh');
-            },
-        });
-    });
-
-    $("#currency-table").on('click', '.cur-delete', function() {
-        var button = $(this);
-        var url = "/common/currency/" + button.attr('pk') + "/delete/";
-
-        launchModalForm(url, {
-            success: function() {
-                $("#currency-table").bootstrapTable('refresh');
-            },
-        });
-    });
-
-    $("#new-currency").click(function() {
-        launchModalForm("{% url 'currency-create' %}", {
-            success: function() {
-                $("#currency-table").bootstrapTable('refresh');
-            },
-        });
-    });
-
-{% endblock %}

InvenTree/templates/InvenTree/settings/global.html

@@ -17,6 +17,7 @@
     <tbody>
         {% include "InvenTree/settings/setting.html" with key="INVENTREE_INSTANCE" %}
         {% include "InvenTree/settings/setting.html" with key="INVENTREE_COMPANY_NAME" %}
+        {% include "InvenTree/settings/setting.html" with key="INVENTREE_DEFAULT_CURRENCY" %}
     </tbody>
 </table>
 

InvenTree/templates/InvenTree/settings/tabs.html

@@ -15,9 +15,6 @@
     <li {% if tab == 'global' %} class='active' {% endif %}>
         <a href='{% url "settings-global" %}'><span class='fas fa-globe'></span> {% trans "Global" %}</a>
     </li>
-    <li{% ifequal tab 'currency' %} class='active'{% endifequal %}>
-        <a href="{% url 'settings-currency' %}"><span class='fas fa-dollar-sign'></span> {% trans "Currency" %}</a>
-    </li>
     <li{% ifequal tab 'category' %} class='active'{% endifequal %}>
         <a href="{% url 'settings-category' %}"><span class='fa fa-sitemap'></span> {% trans "Categories" %}</a>
     </li>
@@ -37,4 +34,4 @@
         <a href="{% url 'settings-so' %}"><span class='fas fa-truck'></span> {% trans "Sales Orders" %}</a>
     </li>
 </ul>
-{% endif %}
+{% endif %}

InvenTree/templates/js/company.js

@@ -187,7 +187,7 @@ function loadSupplierPartTable(table, url, options) {
                 field: 'manufacturer',
                 title: '{% trans "Manufacturer" %}',
                 formatter: function(value, row, index, field) {
-                    if (value) {
+                    if (value && row.manufacturer_detail) {
                         var name = row.manufacturer_detail.name;
                         var url = `/company/${value}/`;
                         var html = imageHoverIcon(row.manufacturer_detail.image) + renderLink(name, url);

InvenTree/templates/js/order.js

@@ -137,6 +137,7 @@ function loadPurchaseOrderTable(table, options) {
                 sortable: true,
                 field: 'reference',
                 title: '{% trans "Purchase Order" %}',
+                switchable: false,
                 formatter: function(value, row, index, field) {
 
                     var prefix = "{% settings_value 'PURCHASEORDER_REFERENCE_PREFIX' %}";

InvenTree/users/models.py

@@ -103,7 +103,6 @@ class RuleSet(models.Model):
 
         # Models which currently do not require permissions
         'common_colortheme',
-        'common_currency',
         'common_inventreesetting',
         'company_contact',
         'label_stockitemlabel',
@@ -113,6 +112,8 @@ class RuleSet(models.Model):
 
         # Third-party tables
         'error_report_error',
+        'exchange_rate',
+        'exchange_exchangebackend',
     ]
 
     RULE_OPTIONS = [

requirements.txt

@@ -18,6 +18,7 @@ django-import-export==2.0.0     # Data import / export for admin interface
 django-cleanup==4.0.0           # Manage deletion of old / unused uploaded files
 django-qr-code==1.2.0           # Generate QR codes
 flake8==3.8.3                   # PEP checking
+pep8-naming==0.11.1             # PEP naming convention extension
 coverage==5.3                   # Unit test coverage
 coveralls==2.1.2                # Coveralls linking (for Travis)
 rapidfuzz==0.7.6                # Fuzzy string matching
@@ -26,6 +27,8 @@ django-tex==1.1.7               # LaTeX PDF export
 django-weasyprint==1.0.1        # HTML PDF export
 django-debug-toolbar==2.2       # Debug / profiling toolbar
 django-admin-shell==0.1.2       # Python shell for the admin interface
-django-error-report==0.2.0      # Error report viewer for the admin interface
+django-money==1.1               # Django app for currency management
+certifi                         # Certifi is (most likely) installed through one of the requirements above
+django-error-report==0.2.0     # Error report viewer for the admin interface
 
-inventree                       # Install the latest version of the InvenTree API python library
+inventree                       # Install the latest version of the InvenTree API python library

setup.cfg

@@ -7,5 +7,8 @@ ignore =
 	E501, E722,
 	# - C901 - function is too complex
 	C901,
+	# - N802 - function name should be lowercase (In the future, we should conform to this!)
+	N802,
+	N812,
 exclude = .git,__pycache__,*/migrations/*,*/lib/*,*/bin/*,*/media/*,*/static/*,*ci_*.py*
 max-complexity = 20