mirror of
https://github.com/inventree/InvenTree
synced 2024-08-30 18:33:04 +00:00
CI was not completely fixed
This commit is contained in:
parent
c1db4c7b3d
commit
9acd57f8e0
@ -87,7 +87,6 @@ class InvenTreeMoneyField(MoneyField):
|
|||||||
def __init__(self, *args, **kwargs):
|
def __init__(self, *args, **kwargs):
|
||||||
# override initial values with the real info from database
|
# override initial values with the real info from database
|
||||||
kwargs.update(money_kwargs())
|
kwargs.update(money_kwargs())
|
||||||
print(kwargs)
|
|
||||||
super().__init__(*args, **kwargs)
|
super().__init__(*args, **kwargs)
|
||||||
|
|
||||||
|
|
||||||
|
@ -15,7 +15,11 @@ def currency_code_default():
|
|||||||
"""
|
"""
|
||||||
from common.models import InvenTreeSetting
|
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:
|
if code not in CURRENCIES:
|
||||||
code = 'USD'
|
code = 'USD'
|
||||||
|
Loading…
Reference in New Issue
Block a user