inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-06-15 11:35:41 +00:00
Code Activity

Adds new 'role' specific for return orders

Browse Source
This commit is contained in:
Oliver
2023-03-14 16:09:04 +11:00
parent 139170c26b
commit 2bddba42da
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
InvenTree/users/admin.py
View File

@ -85,7 +85,7 @@ class RoleGroupAdmin(admin.ModelAdmin): # pragma: no cover
] ]
list_display = ('name', 'admin', 'part_category', 'part', 'stocktake', 'stock_location', list_display = ('name', 'admin', 'part_category', 'part', 'stocktake', 'stock_location',
'stock_item', 'build', 'purchase_order', 'sales_order') 'stock_item', 'build', 'purchase_order', 'sales_order', 'return_order')
def get_rule_set(self, obj, rule_set_type): def get_rule_set(self, obj, rule_set_type):
"""Return list of permissions for the given ruleset.""" """Return list of permissions for the given ruleset."""
@ -161,6 +161,10 @@ class RoleGroupAdmin(admin.ModelAdmin): # pragma: no cover
"""Return the ruleset for the SalesOrder role""" """Return the ruleset for the SalesOrder role"""
return self.get_rule_set(obj, 'sales_order') return self.get_rule_set(obj, 'sales_order')
def return_order(self, obj):
"""Return the ruleset ofr the ReturnOrder role"""
return self.get_rule_set(obj, 'returns')
def get_formsets_with_inlines(self, request, obj=None): def get_formsets_with_inlines(self, request, obj=None):
"""Return all inline formsets""" """Return all inline formsets"""
for inline in self.get_inline_instances(request, obj): for inline in self.get_inline_instances(request, obj):

9
InvenTree/users/models.py
View File

@ -42,6 +42,7 @@ class RuleSet(models.Model):
('build', _('Build Orders')), ('build', _('Build Orders')),
('purchase_order', _('Purchase Orders')), ('purchase_order', _('Purchase Orders')),
('sales_order', _('Sales Orders')), ('sales_order', _('Sales Orders')),
('returns', _('Returns')),
] ]
RULESET_NAMES = [ RULESET_NAMES = [
@ -155,6 +156,14 @@ class RuleSet(models.Model):
'order_salesorderextraline', 'order_salesorderextraline',
'order_salesordershipment', 'order_salesordershipment',
'report_salesorderreport', 'report_salesorderreport',
],
'returns': [
'company_company',
'company_companyattachment',
'order_returnorder',
'order_returnorderlineitem',
'order_returnorderextraline',
'order_returnorderattachment',
] ]
} }