Merge branch 'master' of https://github.com/inventree/InvenTree into plugin-2037

2025-07-03 20:20:58 +00:00 · 2021-11-23 18:39:51 +01:00
parent aae0018a72 e53e3b4a51
commit 6eee332da8
109 changed files with 57408 additions and 55108 deletions
--- a/InvenTree/common/models.py
+++ b/InvenTree/common/models.py
@ -487,7 +487,7 @@ class BaseInvenTreeSetting(models.Model):

        elif self.is_int():
            return 'integer'
-        
+
        else:
            return 'string'