inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-06-18 04:55:44 +00:00
Code Activity

Merge remote-tracking branch 'upstream/master' into add-ready-checks

Browse Source
This commit is contained in:
wolflu05
2023-07-12 11:27:15 +00:00
parent 587e934e63 01f2aa5f74
commit 5abbf48991
295 changed files with 97428 additions and 88416 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
InvenTree/users/migrations/0007_alter_ruleset_name.py
View File

@ -1,6 +1,7 @@
# Generated by Django 3.2.18 on 2023-03-14 10:07
from django.db import migrations, models
import users.models
class Migration(migrations.Migration):
@ -13,6 +14,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'), ('return_order', 'Return Orders')], help_text='Permission set', max_length=50),
field=models.CharField(choices=users.models.RuleSet.RULESET_CHOICES, help_text='Permission set', max_length=50),
),
]

7
InvenTree/users/models.py
View File

@ -81,6 +81,7 @@ class RuleSet(models.Model):
'common_newsfeedentry',
'taggit_tag',
'taggit_taggeditem',
'flags_flagstate',
],
'part_category': [
'part_partcategory',
@ -114,6 +115,7 @@ class RuleSet(models.Model):
'stock_location': [
'stock_stocklocation',
'label_stocklocationlabel',
'report_stocklocationreport'
],
'stock': [
'stock_stockitem',
@ -130,15 +132,18 @@ class RuleSet(models.Model):
'part_bomitemsubstitute',
'build_build',
'build_builditem',
'build_buildline',
'build_buildorderattachment',
'stock_stockitem',
'stock_stocklocation',
'report_buildreport',
'label_buildlinelabel',
],
'purchase_order': [
'company_company',
'company_companyattachment',
'company_contact',
'company_address',
'company_manufacturerpart',
'company_manufacturerpartparameter',
'company_supplierpart',
@ -153,6 +158,7 @@ class RuleSet(models.Model):
'company_company',
'company_companyattachment',
'company_contact',
'company_address',
'order_salesorder',
'order_salesorderallocation',
'order_salesorderattachment',
@ -165,6 +171,7 @@ class RuleSet(models.Model):
'company_company',
'company_companyattachment',
'company_contact',
'company_address',
'order_returnorder',
'order_returnorderlineitem',
'order_returnorderextraline',