inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-06-17 20:45:44 +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

4
InvenTree/users/models.py
View File

@ -58,6 +58,7 @@ class RuleSet(models.Model):
'part_partparametertemplate',
'part_partparameter',
'part_partrelated',
'part_partcategoryparametertemplate',
],
'stock': [
'stock_stockitem',
@ -108,6 +109,9 @@ class RuleSet(models.Model):
'report_reportasset',
'report_testreport',
'part_partstar',
# Third-party tables
'error_report_error',
'exchange_rate',
'exchange_exchangebackend',
]