inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-07-09 07:00:56 +00:00
Code Activity

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

Browse Source 
# Conflicts:
#	InvenTree/company/forms.py
This commit is contained in:
Oliver
2021-07-02 11:26:09 +10:00
parent 00e921f505 d243356324
commit 51ebe30754
20 changed files with 240 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
InvenTree/stock/models.py
View File

@ -20,14 +20,10 @@ from django.contrib.auth.models import User
from django.db.models.signals import pre_delete
from django.dispatch import receiver
from common.settings import currency_code_default
from markdownx.models import MarkdownxField
from mptt.models import MPTTModel, TreeForeignKey
from djmoney.models.fields import MoneyField
from decimal import Decimal, InvalidOperation
from datetime import datetime, timedelta
from InvenTree import helpers
@ -38,7 +34,7 @@ import label.models
from InvenTree.status_codes import StockStatus, StockHistoryCode
from InvenTree.models import InvenTreeTree, InvenTreeAttachment
from InvenTree.fields import InvenTreeURLField
from InvenTree.fields import InvenTreeModelMoneyField, InvenTreeURLField
from users.models import Owner
@ -541,10 +537,9 @@ class StockItem(MPTTModel):
help_text=_('Stock Item Notes')
)
purchase_price = MoneyField(
purchase_price = InvenTreeModelMoneyField(
max_digits=19,
decimal_places=4,
default_currency=currency_code_default(),
blank=True,
null=True,
verbose_name=_('Purchase Price'),