inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-10-30 20:55:42 +00:00
Code Activity

CI was not completely fixed

Browse Source
This commit is contained in:
eeintech
2021-07-19 15:29:04 -04:00
parent c1db4c7b3d
commit 9acd57f8e0
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
InvenTree/InvenTree/fields.py
View File

@@ -87,7 +87,6 @@ class InvenTreeMoneyField(MoneyField):
def __init__(self, *args, **kwargs):
# override initial values with the real info from database
kwargs.update(money_kwargs())
print(kwargs)
super().__init__(*args, **kwargs)

6
InvenTree/common/settings.py
View File

@@ -15,7 +15,11 @@ def currency_code_default():
"""
from common.models import InvenTreeSetting
code = InvenTreeSetting.get_setting('INVENTREE_DEFAULT_CURRENCY')
try:
code = InvenTreeSetting.get_setting('INVENTREE_DEFAULT_CURRENCY')
except django.db.utils.ProgrammingError:
# database is not initialized yet
code = ''
if code not in CURRENCIES:
code = 'USD'