inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-07-04 04:30:56 +00:00
Code Activity

Merge remote-tracking branch 'inventree/master' into currency-support

Browse Source 
# Conflicts:
#	InvenTree/InvenTree/settings.py
#	InvenTree/InvenTree/urls.py
#	InvenTree/templates/InvenTree/settings/tabs.html
#	InvenTree/users/models.py
#	requirements.txt

IMPORTANT: Had to merge some migration files due to different migrations applied on the part model tables
This commit is contained in:
Oliver Walters
2020-11-12 17:24:48 +11:00
parent b7187c5e06 265a29fa1a
commit cb3c86f87a
31 changed files with 878 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
InvenTree/common/models.py
View File

@ -103,6 +103,13 @@ class InvenTreeSetting(models.Model):
'validator': bool
},
'PART_CATEGORY_PARAMETERS': {
'name': _('Copy Category Parameter Templates'),
'description': _('Copy category parameter templates when creating a part'),
'default': True,
'validator': bool
},
'PART_COMPONENT': {
'name': _('Component'),
'description': _('Parts can be used as sub-components by default'),