2
0
mirror of https://github.com/inventree/InvenTree.git synced 2025-06-19 21:45:39 +00:00

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

This commit is contained in:
2021-06-18 23:30:54 +02:00
2 changed files with 0 additions and 2 deletions
InvenTree

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

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