2
0
mirror of https://github.com/inventree/InvenTree.git synced 2025-07-03 20:20:58 +00:00

Merge branch 'master' of https://github.com/inventree/InvenTree into fr-1421-sso

This commit is contained in:
Matthias
2021-10-07 18:12:25 +02:00
34 changed files with 1041 additions and 641 deletions

View File

@ -648,14 +648,6 @@ class InvenTreeSetting(BaseInvenTreeSetting):
'validator': bool,
},
# TODO: Remove this setting in future, new API forms make this not useful
'PART_SHOW_QUANTITY_IN_FORMS': {
'name': _('Show Quantity in Forms'),
'description': _('Display available part quantity in some forms'),
'default': True,
'validator': bool,
},
'PART_SHOW_IMPORT': {
'name': _('Show Import in Views'),
'description': _('Display the import wizard in some part views'),
@ -1014,6 +1006,13 @@ class InvenTreeUserSetting(BaseInvenTreeSetting):
'default': 10,
'validator': [int, MinValueValidator(1)]
},
'PART_SHOW_QUANTITY_IN_FORMS': {
'name': _('Show Quantity in Forms'),
'description': _('Display available part quantity in some forms'),
'default': True,
'validator': bool,
},
}
class Meta: