2
0
mirror of https://github.com/inventree/InvenTree.git synced 2025-06-15 03:25:42 +00:00

Fix role name (change 'returns' to 'return_order')

- Similar to existing roles for purchase_order and sales_order
This commit is contained in:
Oliver Walters
2023-03-14 21:07:53 +11:00
parent e70d013655
commit e6e76c7a2c
5 changed files with 8 additions and 8 deletions

View File

@ -17,7 +17,7 @@
{% block actions %} {% block actions %}
{% if roles.returns.add %} {% if roles.return_order.add %}
<button class='btn btn-success' type='button' id='return-order-create' title='{% trans "Create new return order" %}'> <button class='btn btn-success' type='button' id='return-order-create' title='{% trans "Create new return order" %}'>
<span class='fas fa-plus-circle'></span> {% trans "New Return Order" %} <span class='fas fa-plus-circle'></span> {% trans "New Return Order" %}
</button> </button>

View File

@ -51,7 +51,7 @@
</ul> </ul>
</li> </li>
{% endif %} {% endif %}
{% if roles.sales_order.view or roles.returns.view %} {% if roles.sales_order.view or roles.return_order.view %}
<li class='nav-item dropdown'> <li class='nav-item dropdown'>
<a class='nav-link dropdown-toggle' href='#' id='sellMenuDropdown' role='button' data-bs-toggle='dropdown'> <a class='nav-link dropdown-toggle' href='#' id='sellMenuDropdown' role='button' data-bs-toggle='dropdown'>
<span class='fas fa-truck icon-header'></span>{% trans "Sell" %} <span class='fas fa-truck icon-header'></span>{% trans "Sell" %}
@ -61,7 +61,7 @@
{% if roles.sales_order.view %} {% if roles.sales_order.view %}
<li><a class='dropdown-item' href="{% url 'sales-order-index' %}"><span class='fas fa-list icon-header'></span>{% trans "Sales Orders" %}</a></li> <li><a class='dropdown-item' href="{% url 'sales-order-index' %}"><span class='fas fa-list icon-header'></span>{% trans "Sales Orders" %}</a></li>
{% endif %} {% endif %}
{% if roles.returns.view %} {% if roles.return_order.view %}
<li><a class='dropdown-item' href="{% url 'return-order-index' %}"><span class='fas fa-undo icon-header'></span>{% trans "Return Orders" %}</a></li> <li><a class='dropdown-item' href="{% url 'return-order-index' %}"><span class='fas fa-undo icon-header'></span>{% trans "Return Orders" %}</a></li>
{% endif %} {% endif %}
</ul> </ul>

View File

@ -163,7 +163,7 @@ class RoleGroupAdmin(admin.ModelAdmin): # pragma: no cover
def return_order(self, obj): def return_order(self, obj):
"""Return the ruleset ofr the ReturnOrder role""" """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): def get_formsets_with_inlines(self, request, obj=None):
"""Return all inline formsets""" """Return all inline formsets"""

View File

@ -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 from django.db import migrations, models
@ -13,6 +13,6 @@ class Migration(migrations.Migration):
migrations.AlterField( migrations.AlterField(
model_name='ruleset', model_name='ruleset',
name='name', 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),
), ),
] ]

View File

@ -42,7 +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')), ('return_order', _('Return Orders')),
] ]
RULESET_NAMES = [ RULESET_NAMES = [
@ -157,7 +157,7 @@ class RuleSet(models.Model):
'order_salesordershipment', 'order_salesordershipment',
'report_salesorderreport', 'report_salesorderreport',
], ],
'returns': [ 'return_order': [
'company_company', 'company_company',
'company_companyattachment', 'company_companyattachment',
'order_returnorder', 'order_returnorder',