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

InvenTree/common/models.py

@@ -14,11 +14,12 @@ from django.db import models, transaction
 from django.db.utils import IntegrityError, OperationalError
 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 common.settings import currency_code_default
+
 from django.utils.translation import ugettext_lazy as _
 from django.core.validators import MinValueValidator, URLValidator
 from django.core.exceptions import ValidationError
@@ -80,20 +81,6 @@ class InvenTreeSetting(models.Model):
             'default': '',
         },
 
-        'INVENTREE_DEFAULT_CURRENCY': {
-            'name': _('Default Currency'),
-            'description': _('Default currency'),
-            'default': 'USD',
-            'choices': djmoney.settings.CURRENCY_CHOICES,
-        },
-
-        'CUSTOM_EXCHANGE_RATES': {
-            'name': _('Custom Exchange Rates'),
-            'description': _('Enable custom exchange rates'),
-            'validator': bool,
-            'default': False,
-        },
-
         'INVENTREE_DOWNLOAD_FROM_URL': {
             'name': _('Download from URL'),
             'description': _('Allow download of remote images and files from external URL'),
@@ -773,7 +760,7 @@ def get_price(instance, quantity, moq=True, multiples=True, currency=None):
 
     if currency is None:
         # Default currency selection
-        currency = InvenTreeSetting.get_setting('INVENTREE_DEFAULT_CURRENCY')
+        currency = currency_code_default()
 
     pb_min = None
     for pb in instance.price_breaks.all():