Merge remote-tracking branch 'inventree/master' into drf-api-forms

# Conflicts:
#	InvenTree/company/forms.py

InvenTree/order/forms.py

@@ -10,15 +10,12 @@ from django.utils.translation import ugettext_lazy as _
 
 from mptt.fields import TreeNodeChoiceField
 
-from djmoney.forms.fields import MoneyField
-
 from InvenTree.forms import HelperForm
-from InvenTree.fields import RoundingDecimalFormField
+from InvenTree.fields import InvenTreeMoneyField, RoundingDecimalFormField
 from InvenTree.fields import DatePickerFormField
 
 from InvenTree.helpers import clean_decimal
 
-from common.models import InvenTreeSetting
 from common.forms import MatchItemForm
 
 import part.models
@@ -297,9 +294,8 @@ class OrderMatchItemForm(MatchItemForm):
             )
         # set price field
         elif 'price' in col_guess.lower():
-            return MoneyField(
+            return InvenTreeMoneyField(
                 label=_(col_guess),
-                default_currency=InvenTreeSetting.get_setting('INVENTREE_DEFAULT_CURRENCY'),
                 decimal_places=5,
                 max_digits=19,
                 required=False,

InvenTree/order/migrations/0047_auto_20210701_0509.py

@@ -0,0 +1,35 @@
+# Generated by Django 3.2.4 on 2021-07-01 05:09
+
+import InvenTree.fields
+from django.db import migrations
+import djmoney.models.fields
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('order', '0046_purchaseorderlineitem_destination'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='purchaseorderlineitem',
+            name='purchase_price',
+            field=InvenTree.fields.InvenTreeModelMoneyField(blank=True, currency_choices=[], decimal_places=4, default_currency='', help_text='Unit purchase price', max_digits=19, null=True, verbose_name='Purchase Price'),
+        ),
+        migrations.AlterField(
+            model_name='purchaseorderlineitem',
+            name='purchase_price_currency',
+            field=djmoney.models.fields.CurrencyField(choices=[], default='', editable=False, max_length=3),
+        ),
+        migrations.AlterField(
+            model_name='salesorderlineitem',
+            name='sale_price',
+            field=InvenTree.fields.InvenTreeModelMoneyField(blank=True, currency_choices=[], decimal_places=4, default_currency='', help_text='Unit sale price', max_digits=19, null=True, verbose_name='Sale Price'),
+        ),
+        migrations.AlterField(
+            model_name='salesorderlineitem',
+            name='sale_price_currency',
+            field=djmoney.models.fields.CurrencyField(choices=[], default='', editable=False, max_length=3),
+        ),
+    ]

InvenTree/order/models.py

@@ -17,19 +17,15 @@ from django.contrib.auth.models import User
 from django.urls import reverse
 from django.utils.translation import ugettext_lazy as _
 
-from common.settings import currency_code_default
-
 from markdownx.models import MarkdownxField
 from mptt.models import TreeForeignKey
 
-from djmoney.models.fields import MoneyField
-
 from users import models as UserModels
 from part import models as PartModels
 from stock import models as stock_models
 from company.models import Company, SupplierPart
 
-from InvenTree.fields import RoundingDecimalField
+from InvenTree.fields import InvenTreeModelMoneyField, RoundingDecimalField
 from InvenTree.helpers import decimal2string, increment, getSetting
 from InvenTree.status_codes import PurchaseOrderStatus, SalesOrderStatus, StockStatus, StockHistoryCode
 from InvenTree.models import InvenTreeAttachment
@@ -684,10 +680,9 @@ class PurchaseOrderLineItem(OrderLineItem):
 
     received = models.DecimalField(decimal_places=5, max_digits=15, default=0, verbose_name=_('Received'), help_text=_('Number of items received'))
 
-    purchase_price = MoneyField(
+    purchase_price = InvenTreeModelMoneyField(
         max_digits=19,
         decimal_places=4,
-        default_currency=currency_code_default(),
         null=True, blank=True,
         verbose_name=_('Purchase Price'),
         help_text=_('Unit purchase price'),
@@ -740,10 +735,9 @@ class SalesOrderLineItem(OrderLineItem):
 
     part = models.ForeignKey('part.Part', on_delete=models.SET_NULL, related_name='sales_order_line_items', null=True, verbose_name=_('Part'), help_text=_('Part'), limit_choices_to={'salable': True})
 
-    sale_price = MoneyField(
+    sale_price = InvenTreeModelMoneyField(
         max_digits=19,
         decimal_places=4,
-        default_currency=currency_code_default(),
         null=True, blank=True,
         verbose_name=_('Sale Price'),
         help_text=_('Unit sale price'),