diff --git a/InvenTree/order/templates/order/return_orders.html b/InvenTree/order/templates/order/return_orders.html index c2be127342..03d708bba1 100644 --- a/InvenTree/order/templates/order/return_orders.html +++ b/InvenTree/order/templates/order/return_orders.html @@ -17,7 +17,7 @@ {% block actions %} -{% if roles.returns.add %} +{% if roles.return_order.add %} diff --git a/InvenTree/templates/navbar.html b/InvenTree/templates/navbar.html index 3064bf68b3..c9d7b9c79a 100644 --- a/InvenTree/templates/navbar.html +++ b/InvenTree/templates/navbar.html @@ -51,7 +51,7 @@ {% endif %} - {% if roles.sales_order.view or roles.returns.view %} + {% if roles.sales_order.view or roles.return_order.view %}
  • {% trans "Sales Orders" %}
  • {% endif %} - {% if roles.returns.view %} + {% if roles.return_order.view %}
  • {% trans "Return Orders" %}
  • {% endif %} diff --git a/InvenTree/users/admin.py b/InvenTree/users/admin.py index 6ac2cece36..693840187d 100644 --- a/InvenTree/users/admin.py +++ b/InvenTree/users/admin.py @@ -163,7 +163,7 @@ class RoleGroupAdmin(admin.ModelAdmin): # pragma: no cover def return_order(self, obj): """Return the ruleset ofr the ReturnOrder role""" - return self.get_rule_set(obj, 'returns') + return self.get_rule_set(obj, 'return_order') def get_formsets_with_inlines(self, request, obj=None): """Return all inline formsets""" diff --git a/InvenTree/users/migrations/0007_alter_ruleset_name.py b/InvenTree/users/migrations/0007_alter_ruleset_name.py index 90e75d450c..b38511dc30 100644 --- a/InvenTree/users/migrations/0007_alter_ruleset_name.py +++ b/InvenTree/users/migrations/0007_alter_ruleset_name.py @@ -1,4 +1,4 @@ -# Generated by Django 3.2.18 on 2023-03-14 07:25 +# Generated by Django 3.2.18 on 2023-03-14 10:07 from django.db import migrations, models @@ -13,6 +13,6 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='ruleset', name='name', - field=models.CharField(choices=[('admin', 'Admin'), ('part_category', 'Part Categories'), ('part', 'Parts'), ('stocktake', 'Stocktake'), ('stock_location', 'Stock Locations'), ('stock', 'Stock Items'), ('build', 'Build Orders'), ('purchase_order', 'Purchase Orders'), ('sales_order', 'Sales Orders'), ('returns', 'Returns')], help_text='Permission set', max_length=50), + field=models.CharField(choices=[('admin', 'Admin'), ('part_category', 'Part Categories'), ('part', 'Parts'), ('stocktake', 'Stocktake'), ('stock_location', 'Stock Locations'), ('stock', 'Stock Items'), ('build', 'Build Orders'), ('purchase_order', 'Purchase Orders'), ('sales_order', 'Sales Orders'), ('return_order', 'Return Orders')], help_text='Permission set', max_length=50), ), ] diff --git a/InvenTree/users/models.py b/InvenTree/users/models.py index b9be20d682..fcbb8397a9 100644 --- a/InvenTree/users/models.py +++ b/InvenTree/users/models.py @@ -42,7 +42,7 @@ class RuleSet(models.Model): ('build', _('Build Orders')), ('purchase_order', _('Purchase Orders')), ('sales_order', _('Sales Orders')), - ('returns', _('Returns')), + ('return_order', _('Return Orders')), ] RULESET_NAMES = [ @@ -157,7 +157,7 @@ class RuleSet(models.Model): 'order_salesordershipment', 'report_salesorderreport', ], - 'returns': [ + 'return_order': [ 'company_company', 'company_companyattachment', 'order_returnorder',