Merged master and updated stock_table.html

2025-06-18 04:55:44 +00:00 · 2021-01-17 13:11:59 -05:00
parent 7d5571ba5b 2991ce9317
commit 72c7ceb553
33 changed files with 4998 additions and 2133 deletions
--- a/InvenTree/users/models.py
+++ b/InvenTree/users/models.py
@ -116,6 +116,7 @@ class RuleSet(models.Model):
        'common_inventreesetting',
        'company_contact',
        'label_stockitemlabel',
+        'label_stocklocationlabel',
        'report_reportasset',
        'report_testreport',
        'part_partstar',