Fix bug in loading setting from cache (#5612)

* Fix bug in loading setting from cache

- Need to bring out "cache" key first, otherwise it gets included in the calculated cache key
- Reference: https://github.com/inventree/InvenTree/issues/5586

* Unit test fixes

InvenTree/common/models.py

@@ -450,6 +450,9 @@ class BaseInvenTreeSetting(models.Model):
             **cls.get_filters(**kwargs),
         }
 
+        # Unless otherwise specified, attempt to create the setting
+        create = kwargs.pop('create', True)
+
         # Perform cache lookup by default
         do_cache = kwargs.pop('cache', True)
 
@@ -478,9 +481,6 @@ class BaseInvenTreeSetting(models.Model):
         # Setting does not exist! (Try to create it)
         if not setting:
 
-            # Unless otherwise specified, attempt to create the setting
-            create = kwargs.pop('create', True)
-
             # Prevent creation of new settings objects when importing data
             if InvenTree.ready.isImportingData() or not InvenTree.ready.canAppAccessDatabase(allow_test=True, allow_shell=True):
                 create = False

InvenTree/common/settings.py

@@ -15,7 +15,7 @@ def currency_code_default():
     from common.models import InvenTreeSetting
 
     try:
-        code = InvenTreeSetting.get_setting('INVENTREE_DEFAULT_CURRENCY', create=False, cache=False)
+        code = InvenTreeSetting.get_setting('INVENTREE_DEFAULT_CURRENCY', create=True, cache=True)
     except Exception:  # pragma: no cover
         # Database may not yet be ready, no need to throw an error here
         code = ''