Merge remote-tracking branch 'inventree/master' into stock-expiry

# Conflicts: # InvenTree/common/models.py
2025-08-08 12:50:55 +00:00 · 2021-01-05 00:58:32 +11:00
parent 213d6550d3 bc72cd612e
commit e715ea5d79
15 changed files with 246 additions and 46 deletions
--- a/InvenTree/part/forms.py
+++ b/InvenTree/part/forms.py
@@ -232,9 +232,13 @@ class EditPartForm(HelperForm):
            'default_expiry',
            'units',
            'minimum_stock',
+            'component',
+            'assembly',
+            'is_template',
            'trackable',
            'purchaseable',
            'salable',
+            'virtual',
        ]