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

Catch exception (#5008)

Browse Source 
* Catch exception

* Update settings.py

Don't print out exception message, just log error

* Update settings.py

Style fixes

* Update settings.py

Remove error message

* Update settings.py

Remove logger
This commit is contained in:
Oliver 2023-06-12 21:03:08 +10:00 committed by GitHub
parent 2f98ed7022
commit 8ca02cb105
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
InvenTree/common/settings.py
View File

@ -7,14 +7,13 @@ from moneyed import CURRENCIES
def currency_code_default(): def currency_code_default():
"""Returns the default currency code (or USD if not specified)""" """Returns the default currency code (or USD if not specified)"""
from django.db.utils import ProgrammingError
from common.models import InvenTreeSetting from common.models import InvenTreeSetting
try: try:
code = InvenTreeSetting.get_setting('INVENTREE_DEFAULT_CURRENCY', create=False, cache=False) code = InvenTreeSetting.get_setting('INVENTREE_DEFAULT_CURRENCY', create=False, cache=False)
except ProgrammingError: # pragma: no cover except Exception: # pragma: no cover
# database is not initialized yet # Database may not yet be ready, no need to throw an error here
code = '' code = ''
if code not in CURRENCIES: if code not in CURRENCIES:
@ -42,4 +41,4 @@ def stock_expiry_enabled():
"""Returns True if the stock expiry feature is enabled.""" """Returns True if the stock expiry feature is enabled."""
from common.models import InvenTreeSetting from common.models import InvenTreeSetting
return InvenTreeSetting.get_setting('STOCK_ENABLE_EXPIRY') return InvenTreeSetting.get_setting('STOCK_ENABLE_EXPIRY', False, create=False)