inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-04-29 12:06:44 +00:00
Code

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

Browse Source
This commit is contained in:
Matthias 2021-06-18 23:30:54 +02:00
commit 7d5aa8189d
2 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
InvenTree/common/models.py
View File

@ -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': {

1
InvenTree/order/serializers.py
View File

@ -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