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

InvenTree/common/models.py

@@ -224,7 +224,6 @@ class InvenTreeSetting(models.Model):
             'description': _('Use the internal price (if set) in BOM-price calculations'),
             'default': False,
             'validator': bool
-
         },
 
         'REPORT_DEBUG_MODE': {

InvenTree/order/serializers.py

@@ -19,7 +19,6 @@ from company.serializers import CompanyBriefSerializer, SupplierPartSerializer
 from part.serializers import PartBriefSerializer
 from stock.serializers import LocationBriefSerializer, StockItemSerializer, LocationSerializer
 
-
 from .models import PurchaseOrder, PurchaseOrderLineItem
 from .models import PurchaseOrderAttachment, SalesOrderAttachment
 from .models import SalesOrder, SalesOrderLineItem