netbox-contract 2.2.4__tar.gz → 2.2.6__tar.gz

{netbox_contract-2.2.4/src/netbox_contract.egg-info → netbox_contract-2.2.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: netbox-contract
-Version: 2.2.4
+Version: 2.2.6
 Summary: Contract management plugin for Netbox
 Author-email: Marc Lebreuil <marc@famillelebreuil.net>
 Project-URL: Homepage, https://github.com/mlebreuil/netbox-contract
@@ -62,10 +62,11 @@ PLUGINS_CONFIG = {
             "project": "", 
             "cost center": ""
         },
-        'mandatory_contract_fields': ['accounting_dimensions'],
+        'mandatory_contract_fields': [],
         'hidden_contract_fields': [],
-        'mandatory_invoice_fields': ['accounting_dimensions'],
+        'mandatory_invoice_fields': [],
         'hidden_invoice_fields': [],
+        'mandatory_dimensions': [],
     }
 }
 

{netbox_contract-2.2.4 → netbox_contract-2.2.6}/README.md

@@ -46,10 +46,11 @@ PLUGINS_CONFIG = {
             "project": "", 
             "cost center": ""
         },
-        'mandatory_contract_fields': ['accounting_dimensions'],
+        'mandatory_contract_fields': [],
         'hidden_contract_fields': [],
-        'mandatory_invoice_fields': ['accounting_dimensions'],
+        'mandatory_invoice_fields': [],
         'hidden_invoice_fields': [],
+        'mandatory_dimensions': [],
     }
 }
 

{netbox_contract-2.2.4 → netbox_contract-2.2.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "netbox-contract"
-version = "2.2.4"
+version = "2.2.6"
 authors = [
   { name="Marc Lebreuil", email="marc@famillelebreuil.net" },
 ]

{netbox_contract-2.2.4 → netbox_contract-2.2.6}/src/netbox_contract/__init__.py

@@ -5,7 +5,7 @@ class ContractsConfig(PluginConfig):
     name = 'netbox_contract'
     verbose_name = 'Netbox contract'
     description = 'Contract management plugin for Netbox'
-    version = '2.2.4'
+    version = '2.2.6'
     author = 'Marc Lebreuil'
     author_email = 'marc@famillelebreuil.net'
     base_url = 'contracts'
@@ -22,6 +22,7 @@ class ContractsConfig(PluginConfig):
         'hidden_contract_fields': [],
         'mandatory_invoice_fields': [],
         'hidden_invoice_fields': [],
+        'mandatory_dimensions': [],
     }
 
 

{netbox_contract-2.2.4 → netbox_contract-2.2.6}/src/netbox_contract/api/serializers.py

@@ -3,9 +3,8 @@ from django.core.exceptions import ObjectDoesNotExist
 from drf_yasg.utils import swagger_serializer_method
 from netbox.api.fields import ContentTypeField, SerializedPKRelatedField
 from netbox.api.serializers import NetBoxModelSerializer, WritableNestedSerializer
-from netbox.constants import NESTED_SERIALIZER_PREFIX
 from rest_framework import serializers
-from tenancy.api.nested_serializers import NestedTenantSerializer
+from tenancy.api.serializers_.tenants import TenantSerializer
 from utilities.api import get_serializer_for_model
 
 from ..models import (
@@ -18,22 +17,12 @@ from ..models import (
 )
 
 
-class NestedServiceProviderSerializer(WritableNestedSerializer):
-    url = serializers.HyperlinkedIdentityField(
-        view_name='plugins-api:netbox_contract-api:serviceprovider-detail'
-    )
-
-    class Meta:
-        model = ServiceProvider
-        fields = ('id', 'url', 'display', 'name')
-
-
 class NestedContractSerializer(WritableNestedSerializer):
     url = serializers.HyperlinkedIdentityField(
         view_name='plugins-api:netbox_contract-api:contract-detail'
     )
     yrc = serializers.DecimalField(max_digits=10, decimal_places=2, read_only=True)
-    tenant = NestedTenantSerializer(many=False, required=False)
+    tenant = TenantSerializer(nested=True, required=False, allow_null=True)
     external_partie_object_type = ContentTypeField(queryset=ContentType.objects.all())
     external_partie_object = serializers.SerializerMethodField(read_only=True)
 
@@ -67,11 +56,12 @@ class NestedContractSerializer(WritableNestedSerializer):
     @swagger_serializer_method(serializer_or_field=serializers.JSONField)
     def get_external_partie_object(self, instance):
         serializer = get_serializer_for_model(
-            instance.external_partie_object_type.model_class(),
-            prefix=NESTED_SERIALIZER_PREFIX,
+            instance.external_partie_object_type.model_class()
         )
         context = {'request': self.context['request']}
-        return serializer(instance.external_partie_object, context=context).data
+        return serializer(
+            instance.external_partie_object, nested=True, context=context
+        ).data
 
 
 class NestedInvoiceSerializer(WritableNestedSerializer):
@@ -85,35 +75,6 @@ class NestedInvoiceSerializer(WritableNestedSerializer):
         brief_fields = ('id', 'url', 'display', 'number')
 
 
-class NestedContractAssignmentSerializer(WritableNestedSerializer):
-    url = serializers.HyperlinkedIdentityField(
-        view_name='plugins-api:netbox_contract-api:contractassignment-detail'
-    )
-
-    class Meta:
-        model = ContractAssignment
-        fields = ('id', 'url', 'display', 'contract', 'content_object')
-        brief_fields = ('id', 'url', 'display', 'contract', 'content_object')
-
-
-class NestedInvoicelineSerializer(WritableNestedSerializer):
-    url = serializers.HyperlinkedIdentityField(
-        view_name='plugins-api:netbox_contract-api:invoiceline-detail'
-    )
-
-    class Meta:
-        model = InvoiceLine
-        fields = ('id', 'url', 'display', 'invoice', 'accounting_dimensions', 'amount')
-        brief_fields = (
-            'id',
-            'url',
-            'display',
-            'invoice',
-            'accounting_dimensions',
-            'amount',
-        )
-
-
 class NestedAccountingDimensionSerializer(WritableNestedSerializer):
     url = serializers.HyperlinkedIdentityField(
         view_name='plugins-api:netbox_contract-api:accountingdimension-detail'
@@ -131,7 +92,7 @@ class ContractSerializer(NetBoxModelSerializer):
     )
     yrc = serializers.DecimalField(max_digits=10, decimal_places=2, read_only=True)
     parent = NestedContractSerializer(many=False, required=False)
-    tenant = NestedTenantSerializer(many=False, required=False)
+    tenant = TenantSerializer(nested=True, required=False, allow_null=True)
     external_partie_object_type = ContentTypeField(queryset=ContentType.objects.all())
     external_partie_object = serializers.SerializerMethodField(read_only=True)
 
@@ -195,11 +156,12 @@ class ContractSerializer(NetBoxModelSerializer):
     @swagger_serializer_method(serializer_or_field=serializers.JSONField)
     def get_external_partie_object(self, instance):
         serializer = get_serializer_for_model(
-            instance.external_partie_object_type.model_class(),
-            prefix=NESTED_SERIALIZER_PREFIX,
+            instance.external_partie_object_type.model_class()
         )
         context = {'request': self.context['request']}
-        return serializer(instance.external_partie_object, context=context).data
+        return serializer(
+            instance.external_partie_object, nested=True, context=context
+        ).data
 
 
 class InvoiceSerializer(NetBoxModelSerializer):
@@ -363,11 +325,9 @@ class ContractAssignmentSerializer(NetBoxModelSerializer):
 
     @swagger_serializer_method(serializer_or_field=serializers.JSONField)
     def get_content_object(self, instance):
-        serializer = get_serializer_for_model(
-            instance.content_type.model_class(), prefix=NESTED_SERIALIZER_PREFIX
-        )
+        serializer = get_serializer_for_model(instance.content_type.model_class())
         context = {'request': self.context['request']}
-        return serializer(instance.content_object, context=context).data
+        return serializer(instance.content_object, nested=True, context=context).data
 
 
 class InvoiceLineSerializer(NetBoxModelSerializer):

{netbox_contract-2.2.4 → netbox_contract-2.2.6}/src/netbox_contract/api/views.py

@@ -21,6 +21,7 @@ class ContractViewSet(NetBoxModelViewSet):
         )
     )
     serializer_class = ContractSerializer
+    filterset_class = filtersets.ContractFilterSet
 
 
 class InvoiceViewSet(NetBoxModelViewSet):
@@ -44,6 +45,7 @@ class InvoiceLineViewSet(NetBoxModelViewSet):
         'invoice', 'accounting_dimensions', 'tags'
     )
     serializer_class = InvoiceLineSerializer
+    filterset_class = filtersets.InvoiceLineFilterSet
 
 
 class AccountingDimensionViewSet(NetBoxModelViewSet):

{netbox_contract-2.2.4 → netbox_contract-2.2.6}/src/netbox_contract/filtersets.py

@@ -1,20 +1,42 @@
+import django_filters
 from django.db.models import Q
 from netbox.filtersets import NetBoxModelFilterSet
+from tenancy.filtersets import TenancyFilterSet
 
 from .models import (
     AccountingDimension,
+    AccountingDimensionStatusChoices,
     Contract,
     ContractAssignment,
+    CurrencyChoices,
+    InternalEntityChoices,
     Invoice,
     InvoiceLine,
     ServiceProvider,
+    StatusChoices,
 )
 
 
-class ContractFilterSet(NetBoxModelFilterSet):
+class ContractFilterSet(NetBoxModelFilterSet, TenancyFilterSet):
+    status = django_filters.MultipleChoiceFilter(choices=StatusChoices, null_value=None)
+    internal_partie = django_filters.MultipleChoiceFilter(
+        choices=InternalEntityChoices, null_value=None
+    )
+    currency = django_filters.MultipleChoiceFilter(
+        choices=CurrencyChoices, null_value=None
+    )
+
     class Meta:
         model = Contract
-        fields = ('id', 'internal_partie', 'status', 'parent')
+        fields = (
+            'id',
+            'name',
+            'external_reference',
+            'start_date',
+            'end_date',
+            'initial_term',
+            'parent',
+        )
 
     def search(self, queryset, name, value):
         return queryset.filter(
@@ -26,9 +48,22 @@ class ContractFilterSet(NetBoxModelFilterSet):
 
 
 class InvoiceFilterSet(NetBoxModelFilterSet):
+    currency = django_filters.MultipleChoiceFilter(
+        choices=CurrencyChoices, null_value=None
+    )
+
     class Meta:
         model = Invoice
-        fields = ('id', 'contracts')
+        fields = (
+            'id',
+            'number',
+            'template',
+            'date',
+            'contracts',
+            'period_start',
+            'period_end',
+            'amount',
+        )
 
     def search(self, queryset, name, value):
         return queryset.filter(
@@ -55,9 +90,13 @@ class ContractAssignmentFilterSet(NetBoxModelFilterSet):
 
 
 class InvoiceLineFilterSet(NetBoxModelFilterSet):
+    currency = django_filters.MultipleChoiceFilter(
+        choices=CurrencyChoices, null_value=None
+    )
+
     class Meta:
         model = InvoiceLine
-        fields = ('id', 'invoice')
+        fields = ('id', 'invoice', 'accounting_dimensions')
 
     def search(self, queryset, name, value):
         return queryset.filter(
@@ -66,6 +105,10 @@ class InvoiceLineFilterSet(NetBoxModelFilterSet):
 
 
 class AccountingDimensionFilterSet(NetBoxModelFilterSet):
+    status = django_filters.MultipleChoiceFilter(
+        choices=AccountingDimensionStatusChoices, null_value=None
+    )
+
     class Meta:
         model = AccountingDimension
         fields = ('name', 'value')

{netbox_contract-2.2.4 → netbox_contract-2.2.6}/src/netbox_contract/forms.py

@@ -2,7 +2,6 @@ from django import forms
 from django.conf import settings
 from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import ObjectDoesNotExist, ValidationError
-from extras.filters import TagFilter
 from netbox.forms import (
     NetBoxModelBulkEditForm,
     NetBoxModelFilterSetForm,
@@ -10,6 +9,7 @@ from netbox.forms import (
     NetBoxModelImportForm,
 )
 from tenancy.models import Tenant
+from utilities.forms import BOOLEAN_WITH_BLANK_CHOICES
 from utilities.forms.fields import (
     CommentField,
     ContentTypeChoiceField,
@@ -21,6 +21,7 @@ from utilities.forms.fields import (
     DynamicModelMultipleChoiceField,
     JSONField,
     SlugField,
+    TagFilterField,
 )
 from utilities.forms.widgets import DatePicker, HTMXSelect
 
@@ -161,9 +162,11 @@ class ContractFilterSetForm(NetBoxModelFilterSetForm):
 
     tenant = DynamicModelChoiceField(queryset=Tenant.objects.all(), required=False)
     external_reference = forms.CharField(required=False)
-    internal_partie = forms.CharField(required=False)
+    internal_partie = forms.ChoiceField(choices=InternalEntityChoices, required=False)
     status = forms.ChoiceField(choices=StatusChoices, required=False)
+    currency = forms.ChoiceField(choices=CurrencyChoices, required=False)
     parent = DynamicModelChoiceField(queryset=Contract.objects.all(), required=False)
+    tag = TagFilterField(model)
 
 
 class ContractCSVForm(NetBoxModelImportForm):
@@ -359,9 +362,15 @@ class InvoiceForm(NetBoxModelForm):
 
 class InvoiceFilterSetForm(NetBoxModelFilterSetForm):
     model = Invoice
+    number = forms.CharField(required=False)
+    template = forms.NullBooleanField(
+        required=False, widget=forms.Select(choices=BOOLEAN_WITH_BLANK_CHOICES)
+    )
+    currency = forms.ChoiceField(choices=CurrencyChoices, required=False)
     contracts = DynamicModelMultipleChoiceField(
         queryset=Contract.objects.all(), required=False
     )
+    tag = TagFilterField(model)
 
 
 class InvoiceCSVForm(NetBoxModelImportForm):
@@ -425,7 +434,8 @@ class ServiceProviderForm(NetBoxModelForm):
 
 class ServiceProviderFilterSetForm(NetBoxModelFilterSetForm):
     model = ServiceProvider
-    tag = TagFilter()
+    name = forms.CharField(required=False)
+    tag = TagFilterField(model)
 
 
 class ServiceProviderCSVForm(NetBoxModelImportForm):
@@ -499,6 +509,12 @@ class InvoiceLineForm(NetBoxModelForm):
             else:
                 dimensions_names.append(dimension.name)
 
+        # Make sure mandatory dimensions are present
+        mandatory_dimensions = plugin_settings.get('mandatory_dimensions')
+        for dimension in mandatory_dimensions:
+            if dimension not in dimensions_names:
+                raise ValidationError(f'dimension {dimension} missing')
+
     class Meta:
         model = InvoiceLine
         fields = [
@@ -514,9 +530,11 @@ class InvoiceLineForm(NetBoxModelForm):
 class InvoiceLineFilterSetForm(NetBoxModelFilterSetForm):
     model = InvoiceLine
     invoice = DynamicModelChoiceField(queryset=Invoice.objects.all(), required=False)
-    accounting_dimensions = DynamicModelChoiceField(
+    accounting_dimensions = DynamicModelMultipleChoiceField(
         queryset=AccountingDimension.objects.all(), required=False
     )
+    currency = forms.ChoiceField(choices=CurrencyChoices, required=False)
+    tag = TagFilterField(model)
 
 
 class InvoiceLineImportForm(NetBoxModelImportForm):

{netbox_contract-2.2.4 → netbox_contract-2.2.6}/src/netbox_contract/tables.py

@@ -200,7 +200,9 @@ class ServiceProviderListTable(NetBoxTable):
 
 class InvoiceLineListTable(NetBoxTable):
     invoice = tables.Column(linkify=True)
-    accounting_dimensions = tables.ManyToManyColumn(linkify=True)
+    accounting_dimensions = tables.ManyToManyColumn(
+        linkify=True, filter=lambda qs: qs.order_by('name')
+    )
 
     class Meta(NetBoxTable.Meta):
         model = InvoiceLine

{netbox_contract-2.2.4 → netbox_contract-2.2.6/src/netbox_contract.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: netbox-contract
-Version: 2.2.4
+Version: 2.2.6
 Summary: Contract management plugin for Netbox
 Author-email: Marc Lebreuil <marc@famillelebreuil.net>
 Project-URL: Homepage, https://github.com/mlebreuil/netbox-contract
@@ -62,10 +62,11 @@ PLUGINS_CONFIG = {
             "project": "", 
             "cost center": ""
         },
-        'mandatory_contract_fields': ['accounting_dimensions'],
+        'mandatory_contract_fields': [],
         'hidden_contract_fields': [],
-        'mandatory_invoice_fields': ['accounting_dimensions'],
+        'mandatory_invoice_fields': [],
         'hidden_invoice_fields': [],
+        'mandatory_dimensions': [],
     }
 }