Update to v3.4.0

* Make scan requirement text larger on bulk scan view

* Scanning is now tied to edit permissions

* hotfix 3.3.4

* Ensure full_clean method utilised before saves

* fix bug #22

* form fixes and qol stuff

* organise imports for lint

* fix duplicate stuff for ruff

* Add eol_date to asset serializer

* setup for overview page

* fix ruff

* First draft for overview page plus some language updates for clarity

* Add filter forms to bulk assign views

* Add delivery_instructions to Purchases

* Add delivery_site and storage_site as separate fields

* fix the tests

* Add logic to conditionally handle updating Asset storage_site and storage_location

* thank you isort, very cool

* thank you ruff, very cool

* Closes #23: fr idea for purchase delivery rework

Closes: #23
- Add filters to bulk_assign views and update filtersets to prevent showing Assets that are already assigned to existing models
- Add delivery_instructions field to Purchase model
- Add storage_site field to Asset model and delivery_site field to Delivery model, allow for Assets to be assigned to a site without a location

* overview revision 2

* overview updates

* make the image have the pointer, not the container

* Add what's next section

* Filter Bulk Assign querysets to only show unassigned models

---------

Co-authored-by: Dylan <dylan@sol1.com.au>
Co-authored-by: Lachlan Tripolone <lachlan@sol1.com.au>

Author: 3 people

netbox_inventory/api/serializers_/assets.py

@@ -10,6 +10,7 @@
     ModuleTypeSerializer,
     RackSerializer,
     RackTypeSerializer,
+    SiteSerializer,
 )
 from netbox.api.serializers import NestedGroupModelSerializer, NetBoxModelSerializer
 from tenancy.api.serializers import ContactSerializer, TenantSerializer
@@ -142,6 +143,12 @@ class AssetSerializer(NetBoxModelSerializer):
         allow_null=True,
         default=None,
     )
+    storage_site = SiteSerializer(
+        nested=True,
+        required=False,
+        allow_null=True,
+        default=None,
+    )
     storage_location = LocationSerializer(
         nested=True,
         required=False,
@@ -224,6 +231,7 @@ class Meta:
             'rack',
             'tenant',
             'contact',
+            'storage_site',
             'storage_location',
             'owner',
             'bom',

netbox_inventory/api/serializers_/deliveries.py

@@ -92,6 +92,7 @@ class Meta:
             'status',
             'date',
             'description',
+            'delivery_instructions',
             'comments',
             'tags',
             'custom_fields',
@@ -110,6 +111,7 @@ class Meta:
             "status",
             "date",
             "description",
+            "delivery_instructions",
         )
 
 

netbox_inventory/api/views.py

@@ -48,6 +48,7 @@ class AssetViewSet(NetBoxModelViewSet):
         'module',
         'rack_type',
         'rack',
+        'storage_site',
         'storage_location',
         'delivery',
         'purchase__supplier',

netbox_inventory/filtersets.py

@@ -367,7 +367,7 @@ class AssetFilterSet(NetBoxModelFilterSet):
     )
     storage_site_id = django_filters.ModelMultipleChoiceFilter(
         queryset=Site.objects.all(),
-        field_name="storage_location__site",
+        field_name="storage_site",
         label="Storage site (ID)",
     )
     storage_location_id = django_filters.ModelMultipleChoiceFilter(
@@ -632,6 +632,7 @@ def search(self, queryset, name, value):
             | Q(description__icontains=value)
             | Q(supplier__name__icontains=value)
             | Q(boms__name__icontains=value)
+            | Q(delivery_instructions__icontains=value)
         )
         return queryset.filter(query)
 

netbox_inventory/forms/bulk.py

@@ -176,6 +176,11 @@ class AssetBulkEditForm(NetBoxModelBulkEditForm):
             "group_id": "$contact_group",
         },
     )
+    storage_site = DynamicModelChoiceField(
+        queryset=Site.objects.all(),
+        help_text=Asset._meta.get_field("storage_site").help_text,
+        required=False,
+    )
     storage_location = DynamicModelChoiceField(
         queryset=Location.objects.all(),
         help_text=Asset._meta.get_field("storage_location").help_text,
@@ -209,7 +214,7 @@ class AssetBulkEditForm(NetBoxModelBulkEditForm):
             name='Purchase',
         ),
         FieldSet("tenant", "contact_group", "contact", name="Assigned to"),
-        FieldSet("storage_location", name="Location"),
+        FieldSet("storage_site", "storage_location", name="Location"),
     )
     nullable_fields = (
         "name",
@@ -289,7 +294,7 @@ class AssetImportForm(NetBoxModelImportForm):
     storage_site = CSVModelChoiceField(
         queryset=Site.objects.all(),
         to_field_name="name",
-        help_text="Site that contains storage_location asset will be stored in.",
+        help_text="Site where is this asset stored when not in use. It must exist before import.",
         required=False,
     )
     storage_location = CSVModelChoiceField(

netbox_inventory/forms/models.py

@@ -3,7 +3,7 @@
 from tenancy.models import Contact, ContactGroup, Tenant
 from utilities.forms.fields import CommentField, DynamicModelChoiceField, SlugField
 from utilities.forms.rendering import FieldSet
-from utilities.forms.widgets import DatePicker
+from utilities.forms.widgets import DatePicker, MarkdownWidget
 
 from netbox_inventory.choices import HardwareKindChoices
 
@@ -125,6 +125,7 @@ class AssetForm(NetBoxModelForm):
     )
     storage_site = DynamicModelChoiceField(
         queryset=Site.objects.all(),
+        help_text=Asset._meta.get_field("storage_site").help_text,
         required=False,
         initial_params={
             "locations": "$storage_location",
@@ -178,6 +179,7 @@ class Meta:
             'module_type',
             'inventoryitem_type',
             'rack_type',
+            'storage_site',
             'storage_location',
             'owner',
             'bom',
@@ -302,6 +304,7 @@ class PurchaseForm(NetBoxModelForm):
             'date',
             'description',
             'tags',
+            'delivery_instructions',
             name='Purchase',
         ),
     )
@@ -315,11 +318,13 @@ class Meta:
             "status",
             "date",
             "description",
+            "delivery_instructions",
             "comments",
             "tags",
         )
         widgets = {
             "date": DatePicker(),
+            "delivery_instructions": MarkdownWidget(),
         }
 
 

netbox_inventory/forms/reassign.py

@@ -33,6 +33,14 @@ class AssetReassignMixin(forms.Form):
         required=False,
         help_text='Limit New Asset choices only to assets stored at this site',
     )
+    storage_site = DynamicModelChoiceField(
+        queryset=Site.objects.all(),
+        required=False,
+        initial_params={
+            "locations": "$storage_location",
+        },
+        help_text='Limit New Asset choices only to assets stored at this site',
+    )
     storage_location = DynamicModelChoiceField(
         queryset=Location.objects.all(),
         required=False,

netbox_inventory/migrations/0020_asset_storage_site_delivery_delivery_site_and_more.py

@@ -0,0 +1,30 @@
+# Generated by Django 5.1.7 on 2025-05-16 03:59
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('dcim', '0200_populate_mac_addresses'),
+        ('netbox_inventory', '0019_asset_eol_date'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='asset',
+            name='storage_site',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='dcim.site'),
+        ),
+        migrations.AddField(
+            model_name='delivery',
+            name='delivery_site',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='dcim.site'),
+        ),
+        migrations.AddField(
+            model_name='purchase',
+            name='delivery_instructions',
+            field=models.TextField(blank=True),
+        ),
+    ]

netbox_inventory/models/assets.py

@@ -243,9 +243,17 @@ class Asset(NetBoxModel, ImageAttachmentsMixin):
         blank=True,
         null=True,
     )
-
+    storage_site = models.ForeignKey(
+        help_text='Site where this asset is stored when not in use',
+        to='dcim.Site',
+        on_delete=models.PROTECT,
+        related_name='+',
+        blank=True,
+        null=True,
+        verbose_name='Storage Site',
+    )
     storage_location = models.ForeignKey(
-        help_text='Where is this asset stored when not in use',
+        help_text='Location where this asset is stored when not in use',
         to='dcim.Location',
         on_delete=models.PROTECT,
         related_name='+',
@@ -336,6 +344,7 @@ class Asset(NetBoxModel, ImageAttachmentsMixin):
         'eol_date',
         'tenant',
         'contact',
+        'storage_site',
         'storage_location',
         'comments',
     ]
@@ -369,11 +378,6 @@ def hardware_type(self):
     def hardware(self):
         return self.device or self.module or self.inventoryitem or self.rack or None
 
-    @property
-    def storage_site(self):
-        if self.storage_location:
-            return self.storage_location.site
-
     @property
     def installed_site(self):
         device = self.installed_device
@@ -499,13 +503,35 @@ def clean(self):
         self.validate_hardware()
         self.update_status()
         self.update_location()
+        self.infer_storage_site()
         self.sync_hardware_eol()
         return super().clean()
 
     def save(self, clear_old_hw=True, *args, **kwargs):
         self.update_hardware_used(clear_old_hw)
         return super().save(*args, **kwargs)
 
+    def clean_delivery(self):
+        if self.delivery and not self.purchase:
+            self.purchase = self.delivery.purchases.first()
+        if self.delivery:
+            if self.purchase and self.purchase not in self.delivery.purchases.all():
+                raise ValidationError(
+                    {
+                        'purchase': 'The selected purchase is not associated with the delivery.'
+                    }
+                )
+
+    def clean_warranty_dates(self):
+        if (
+            self.warranty_start
+            and self.warranty_end
+            and self.warranty_end <= self.warranty_start
+        ):
+            raise ValidationError(
+                {'warranty_end': 'Warranty end date must be after warranty start date.'}
+            )
+
     def validate_hardware_types(self):
         """
         Ensure only one device/module_type/inventoryitem_type/rack_type is set at a time.
@@ -581,7 +607,8 @@ def update_status(self):
         ordered_status = get_status_for('ordered')
         planned_status = get_status_for('planned')
 
-        # Manual/Bulk Assignment: Status has been set manually or Asset is part of bulk assignment; do not change it
+        # Manual/Bulk Assignment: Status has been set manually or Asset is part of bulk assignment;
+        # do not change it
         if not getattr(self, '_in_bulk_assignment', False) and old_status != self.status:
             return
 
@@ -603,6 +630,28 @@ def update_status(self):
         # Planned: Default status
         self.status = planned_status
 
+    def update_location(self):
+        """
+        Update the location of the Asset based on the location of the assigned Delivery. Only
+        update if the assigned Delivery changes.
+        """
+        old_delivery = get_prechange_field(self, 'delivery')
+        new_delivery = self.delivery
+        new_hw = getattr(self, self.kind)
+
+        if old_delivery != new_delivery:
+            if new_delivery and not new_hw:
+                self.storage_site = new_delivery.delivery_site
+                self.storage_location = new_delivery.delivery_location
+
+    def infer_storage_site(self):
+        """
+        If only storage_location is set, infer storage_site from it
+        """
+        if self.storage_location and not self.storage_site:
+            self.storage_site = self.storage_location.site
+            return
+
     def update_hardware_used(self, clear_old_hw=True):
         """
         If assigning as device, module, inventoryitem or rack set serial and
@@ -632,29 +681,6 @@ def update_hardware_used(self, clear_old_hw=True):
             if new_hw:
                 asset_set_new_hw(asset=self, hw=new_hw)
 
-    def update_location(self):
-        """
-        Update the location of the asset based on the location of the assigned
-        delivery.
-        """
-        new_hw = getattr(self, self.kind)
-
-        if self.delivery and not new_hw:
-            self.storage_location = self.delivery.delivery_location
-        else:
-            self.storage_location = None
-
-    def clean_delivery(self):
-        if self.delivery and not self.purchase:
-            self.purchase = self.delivery.purchases.first()
-        if self.delivery:
-            if self.purchase and self.purchase not in self.delivery.purchases.all():
-                raise ValidationError(
-                    {
-                        'purchase': 'The selected purchase is not associated with the delivery.'
-                    }
-                )
-
     def sync_hardware_eol(self):
         """
         Sync asset's eol_date from corresponding hardware type if plugin setting is enabled.
@@ -679,16 +705,6 @@ def sync_hardware_eol(self):
             eol_date = hw_type.cf.get('eol_date') if hasattr(hw_type, 'cf') else None
             self.eol_date = eol_date if eol_date else None
 
-    def clean_warranty_dates(self):
-        if (
-            self.warranty_start
-            and self.warranty_end
-            and self.warranty_end <= self.warranty_start
-        ):
-            raise ValidationError(
-                {'warranty_end': 'Warranty end date must be after warranty start date.'}
-            )
-
     def get_absolute_url(self):
         return reverse('plugins:netbox_inventory:asset', args=[self.pk])