netbox-contract 2.3.2__tar.gz → 2.4.1__tar.gz

{netbox_contract-2.3.2/netbox_contract.egg-info → netbox_contract-2.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: netbox-contract
-Version: 2.3.2
+Version: 2.4.1
 Summary: Contract management plugin for Netbox
 Author-email: Marc Lebreuil <marc@famillelebreuil.net>
 Project-URL: Homepage, https://github.com/mlebreuil/netbox-contract
@@ -13,6 +13,17 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: python-dateutil
 Requires-Dist: drf_yasg
+Requires-Dist: Django
+Provides-Extra: dev
+Requires-Dist: check-manifest; extra == "dev"
+Requires-Dist: mkdocs; extra == "dev"
+Requires-Dist: mkdocs-material; extra == "dev"
+Requires-Dist: ruff; extra == "dev"
+Provides-Extra: test
+Requires-Dist: coverage; extra == "test"
+Requires-Dist: pytest; extra == "test"
+Requires-Dist: pytest-cov; extra == "test"
+Dynamic: license-file
 
 # Contract plugin
 
@@ -36,6 +47,7 @@ Accounting dimensions can be linked with invoice lines.
 |----------------|----------------|
 |     4.1        |      2.2       |
 |     4.2        |      2.3       |
+|     4.3        |      2.4       |
 
 ## Installing
 
@@ -89,13 +101,14 @@ PLUGINS_CONFIG = {
 
 ### Customize the plugin fields choices
 
-Internal partie reference the legal entity of your organization that is a partie to the contract.  
+Internal party reference the legal entity of your organization that is a party to the contract.  
 The first currency will also be the default currency for contracts.  
 
 ```python
 # configuration.py
 FIELD_CHOICES = {
-    'netbox_contract.Contract.internal_partie': (
+    'netbox_contract.Contract.internal_party': (
+        ('default', 'Default entity', 'green'),
         ('entity1', 'Entity 1', 'green'),
         ('entity2', 'Entity 2', 'yellow'),
     ),
@@ -109,6 +122,11 @@ FIELD_CHOICES = {
         ('active', 'Active', 'green'),
         ('canceled', 'Canceled', 'red'),
     )
+    'netbox_contract.Invoice.status': (
+        ('draft', 'Draft', 'yellow'),
+        ('posted', 'Posted', 'green'),
+        ('canceled', 'Canceled', 'red'),
+    )
 }
 
 ```

{netbox_contract-2.3.2 → netbox_contract-2.4.1}/README.md

@@ -20,6 +20,7 @@ Accounting dimensions can be linked with invoice lines.
 |----------------|----------------|
 |     4.1        |      2.2       |
 |     4.2        |      2.3       |
+|     4.3        |      2.4       |
 
 ## Installing
 
@@ -73,13 +74,14 @@ PLUGINS_CONFIG = {
 
 ### Customize the plugin fields choices
 
-Internal partie reference the legal entity of your organization that is a partie to the contract.  
+Internal party reference the legal entity of your organization that is a party to the contract.  
 The first currency will also be the default currency for contracts.  
 
 ```python
 # configuration.py
 FIELD_CHOICES = {
-    'netbox_contract.Contract.internal_partie': (
+    'netbox_contract.Contract.internal_party': (
+        ('default', 'Default entity', 'green'),
         ('entity1', 'Entity 1', 'green'),
         ('entity2', 'Entity 2', 'yellow'),
     ),
@@ -93,6 +95,11 @@ FIELD_CHOICES = {
         ('active', 'Active', 'green'),
         ('canceled', 'Canceled', 'red'),
     )
+    'netbox_contract.Invoice.status': (
+        ('draft', 'Draft', 'yellow'),
+        ('posted', 'Posted', 'green'),
+        ('canceled', 'Canceled', 'red'),
+    )
 }
 
 ```

{netbox_contract-2.3.2 → netbox_contract-2.4.1}/netbox_contract/__init__.py

@@ -5,11 +5,11 @@ class ContractsConfig(PluginConfig):
     name = 'netbox_contract'
     verbose_name = 'Netbox contract'
     description = 'Contract management plugin for Netbox'
-    version = '2.3.2'
+    version = '2.4.1'
     author = 'Marc Lebreuil'
     author_email = 'marc@famillelebreuil.net'
     base_url = 'contracts'
-    min_version = '4.2.0'
+    min_version = '4.3.0'
     required_settings = []
     default_settings = {
         'top_level_menu': False,

{netbox_contract-2.3.2 → netbox_contract-2.4.1}/netbox_contract/api/serializers.py

@@ -11,6 +11,7 @@ from ..models import (
     AccountingDimension,
     Contract,
     ContractAssignment,
+    ContractType,
     Invoice,
     InvoiceLine,
     ServiceProvider,
@@ -23,8 +24,8 @@ class NestedContractSerializer(WritableNestedSerializer):
     )
     yrc = serializers.DecimalField(max_digits=10, decimal_places=2, read_only=True)
     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)
+    external_party_object_type = ContentTypeField(queryset=ContentType.objects.all())
+    external_party_object = serializers.SerializerMethodField(read_only=True)
 
     class Meta:
         model = Contract
@@ -33,11 +34,11 @@ class NestedContractSerializer(WritableNestedSerializer):
             'url',
             'display',
             'name',
-            'external_partie_object_type',
-            'external_partie_object_id',
-            'external_partie_object',
+            'external_party_object_type',
+            'external_party_object_id',
+            'external_party_object',
             'external_reference',
-            'internal_partie',
+            'internal_party',
             'tenant',
             'status',
             'start_date',
@@ -53,13 +54,13 @@ class NestedContractSerializer(WritableNestedSerializer):
         )
 
     @swagger_serializer_method(serializer_or_field=serializers.JSONField)
-    def get_external_partie_object(self, instance):
+    def get_external_party_object(self, instance):
         serializer = get_serializer_for_model(
-            instance.external_partie_object_type.model_class()
+            instance.external_party_object_type.model_class()
         )
         context = {'request': self.context['request']}
         return serializer(
-            instance.external_partie_object, nested=True, context=context
+            instance.external_party_object, nested=True, context=context
         ).data
 
 
@@ -92,8 +93,8 @@ class ContractSerializer(NetBoxModelSerializer):
     yrc = serializers.DecimalField(max_digits=10, decimal_places=2, read_only=True)
     parent = NestedContractSerializer(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)
+    external_party_object_type = ContentTypeField(queryset=ContentType.objects.all())
+    external_party_object = serializers.SerializerMethodField(read_only=True)
 
     class Meta:
         model = Contract
@@ -102,11 +103,11 @@ class ContractSerializer(NetBoxModelSerializer):
             'url',
             'display',
             'name',
-            'external_partie_object_type',
-            'external_partie_object_id',
-            'external_partie_object',
+            'external_party_object_type',
+            'external_party_object_id',
+            'external_party_object',
             'external_reference',
-            'internal_partie',
+            'internal_party',
             'tenant',
             'status',
             'start_date',
@@ -130,11 +131,11 @@ class ContractSerializer(NetBoxModelSerializer):
             'url',
             'display',
             'name',
-            'external_partie_object_type',
-            'external_partie_object_id',
-            'external_partie_object',
+            'external_party_object_type',
+            'external_party_object_id',
+            'external_party_object',
             'external_reference',
-            'internal_partie',
+            'internal_party',
             'tenant',
             'status',
             'start_date',
@@ -151,13 +152,13 @@ class ContractSerializer(NetBoxModelSerializer):
         )
 
     @swagger_serializer_method(serializer_or_field=serializers.JSONField)
-    def get_external_partie_object(self, instance):
+    def get_external_party_object(self, instance):
         serializer = get_serializer_for_model(
-            instance.external_partie_object_type.model_class()
+            instance.external_party_object_type.model_class()
         )
         context = {'request': self.context['request']}
         return serializer(
-            instance.external_partie_object, nested=True, context=context
+            instance.external_party_object, nested=True, context=context
         ).data
 
 
@@ -395,3 +396,22 @@ class AccountingDimensionSerializer(NetBoxModelSerializer):
             'last_updated',
         )
         brief_fields = ('id', 'name', 'value', 'url', 'display')
+
+
+class ContractTypeSerializer(NetBoxModelSerializer):
+    url = serializers.HyperlinkedIdentityField(view_name='plugins-api:netbox_contract-api:contracttype-detail')
+
+    class Meta:
+        model = ContractType
+        fields = (
+            'id',
+            'url',
+            'display',
+            'name',
+            'description',
+            'tags',
+            'custom_fields',
+            'created',
+            'last_updated',
+        )
+        brief_fields = ('id', 'name', 'description', 'url', 'display')

{netbox_contract-2.3.2 → netbox_contract-2.4.1}/netbox_contract/api/urls.py

@@ -6,6 +6,7 @@ app_name = 'netbox_contract'
 
 router = NetBoxRouter()
 router.register('contracts', views.ContractViewSet)
+router.register('contracttype', views.ContractTypeViewSet)
 router.register('invoices', views.InvoiceViewSet)
 router.register('serviceproviders', views.ServiceProviderViewSet)
 router.register('contractassignment', views.ContractAssignmentViewSet)

{netbox_contract-2.3.2 → netbox_contract-2.4.1}/netbox_contract/api/views.py

@@ -7,6 +7,7 @@ from .serializers import (
     AccountingDimensionSerializer,
     ContractAssignmentSerializer,
     ContractSerializer,
+    ContractTypeSerializer,
     InvoiceLineSerializer,
     InvoiceSerializer,
     ServiceProviderSerializer,
@@ -51,3 +52,8 @@ class InvoiceLineViewSet(NetBoxModelViewSet):
 class AccountingDimensionViewSet(NetBoxModelViewSet):
     queryset = models.AccountingDimension.objects.prefetch_related('tags')
     serializer_class = AccountingDimensionSerializer
+
+
+class ContractTypeViewSet(NetBoxModelViewSet):
+    queryset = models.ContractType.objects.prefetch_related('tags')
+    serializer_class = ContractTypeSerializer

{netbox_contract-2.3.2 → netbox_contract-2.4.1}/netbox_contract/constants.py

@@ -7,6 +7,7 @@ SERVICE_PROVIDER_MODELS = Q(
 
 ASSIGNEMENT_MODELS = Q(
     Q(app_label='circuits', model__in=('circuit',))
+    | Q(app_label='circuits', model__in=('virtualcircuit',))
     | Q(app_label='dcim', model__in=('site',))
     | Q(app_label='dcim', model__in=('device',))
     | Q(app_label='virtualization', model__in=('virtualmachine',))

{netbox_contract-2.3.2 → netbox_contract-2.4.1}/netbox_contract/filtersets.py

@@ -1,36 +1,42 @@
 import django_filters
 from django.db.models import Q
 from netbox.filtersets import NetBoxModelFilterSet
-from tenancy.filtersets import TenancyFilterSet
+from tenancy.filtersets import ContactModelFilterSet, TenancyFilterSet
 
 from .models import (
     AccountingDimension,
     AccountingDimensionStatusChoices,
     Contract,
     ContractAssignment,
+    ContractType,
     CurrencyChoices,
     InternalEntityChoices,
     Invoice,
     InvoiceLine,
     ServiceProvider,
     StatusChoices,
+    InvoiceStatusChoices,
 )
 
 
-class ContractFilterSet(NetBoxModelFilterSet, TenancyFilterSet):
+class ContractFilterSet(ContactModelFilterSet, NetBoxModelFilterSet, TenancyFilterSet):
     status = django_filters.MultipleChoiceFilter(choices=StatusChoices, null_value=None)
-    internal_partie = django_filters.MultipleChoiceFilter(
+    internal_party = django_filters.MultipleChoiceFilter(
         choices=InternalEntityChoices, null_value=None
     )
     currency = django_filters.MultipleChoiceFilter(
         choices=CurrencyChoices, null_value=None
     )
+    contract_type = django_filters.ModelMultipleChoiceFilter(
+        field_name='contract_type__name', to_field_name='name', queryset=ContractType.objects.all()
+    )
 
     class Meta:
         model = Contract
         fields = (
             'id',
             'name',
+            'contract_type',
             'external_reference',
             'start_date',
             'end_date',
@@ -48,9 +54,15 @@ class ContractFilterSet(NetBoxModelFilterSet, TenancyFilterSet):
 
 
 class InvoiceFilterSet(NetBoxModelFilterSet):
+    status = django_filters.MultipleChoiceFilter(choices=InvoiceStatusChoices, null_value=None)
     currency = django_filters.MultipleChoiceFilter(
         choices=CurrencyChoices, null_value=None
     )
+    accounting_dimensions = django_filters.ModelChoiceFilter(
+        field_name='invoicelines__accounting_dimensions',
+        queryset=AccountingDimension.objects.all(),
+        label='Accounting Dimension'
+    )
 
     class Meta:
         model = Invoice
@@ -71,7 +83,7 @@ class InvoiceFilterSet(NetBoxModelFilterSet):
         )
 
 
-class ServiceProviderFilterSet(NetBoxModelFilterSet):
+class ServiceProviderFilterSet(ContactModelFilterSet, NetBoxModelFilterSet):
     class Meta:
         model = ServiceProvider
         fields = ('id', 'name')
@@ -80,6 +92,15 @@ class ServiceProviderFilterSet(NetBoxModelFilterSet):
         return queryset.filter(name__icontains=value)
 
 
+class ContractTypeFilterSet(NetBoxModelFilterSet):
+    class Meta:
+        model = ContractType
+        fields = ('name', 'description', 'color')
+
+    def search(self, queryset, name, value):
+        return queryset.filter(name__icontains=value)
+
+
 class ContractAssignmentFilterSet(NetBoxModelFilterSet):
     class Meta:
         model = ContractAssignment

{netbox_contract-2.3.2 → netbox_contract-2.4.1}/netbox_contract/forms.py

@@ -9,10 +9,11 @@ from netbox.forms import (
     NetBoxModelForm,
     NetBoxModelImportForm,
 )
+from tenancy.forms import ContactModelFilterForm, TenancyFilterForm
 from tenancy.models import Tenant
-from tenancy.forms import TenancyFilterForm
 from utilities.forms import BOOLEAN_WITH_BLANK_CHOICES
 from utilities.forms.fields import (
+    ColorField,
     CommentField,
     ContentTypeChoiceField,
     CSVChoiceField,
@@ -26,18 +27,20 @@ from utilities.forms.fields import (
 )
 from utilities.forms.widgets import DatePicker, HTMXSelect
 
-from .constants import SERVICE_PROVIDER_MODELS, ASSIGNEMENT_MODELS
+from .constants import ASSIGNEMENT_MODELS, SERVICE_PROVIDER_MODELS
 from .models import (
     AccountingDimension,
     AccountingDimensionStatusChoices,
     Contract,
     ContractAssignment,
+    ContractType,
     CurrencyChoices,
     InternalEntityChoices,
     Invoice,
     InvoiceLine,
     ServiceProvider,
     StatusChoices,
+    InvoiceStatusChoices,
 )
 
 plugin_settings = settings.PLUGINS_CONFIG['netbox_contract']
@@ -49,13 +52,13 @@ plugin_settings = settings.PLUGINS_CONFIG['netbox_contract']
 class ContractForm(NetBoxModelForm):
     comments = CommentField(label=_('Comments'))
 
-    external_partie_object_type = ContentTypeChoiceField(
+    external_party_object_type = ContentTypeChoiceField(
         queryset=ContentType.objects.all(),
         limit_choices_to=SERVICE_PROVIDER_MODELS,
         widget=HTMXSelect(),
-        label=_('External partie object type'),
+        label=_('External party object type'),
     )
-    external_partie_object = forms.ModelChoiceField(queryset=None, label=_('External partie object'))
+    external_party_object = forms.ModelChoiceField(queryset=None, label=_('External party object'))
     tenant = DynamicModelChoiceField(queryset=Tenant.objects.all(), required=False, selector=True, label=_('Tenant'))
     parent = DynamicModelChoiceField(
         queryset=Contract.objects.all(),
@@ -63,30 +66,33 @@ class ContractForm(NetBoxModelForm):
         selector=True,
         label=_('Parent'),
     )
+    contract_type = DynamicModelChoiceField(
+        queryset=ContractType.objects.all(), required=False, selector=True, label=_('Contract type')
+    )
 
     def __init__(self, *args, **kwargs):
         initial = kwargs.get('initial', None)
         super().__init__(*args, **kwargs)
 
         # Initialize the external party object gfk
-        if initial and 'external_partie_object_type' in initial:
-            external_partie_object_type = ContentType.objects.get_for_id(initial['external_partie_object_type'])
-            external_partie_class = external_partie_object_type.model_class()
-            self.fields['external_partie_object'].queryset = external_partie_class.objects.all()
+        if initial and 'external_party_object_type' in initial:
+            external_party_object_type = ContentType.objects.get_for_id(initial['external_party_object_type'])
+            external_party_class = external_party_object_type.model_class()
+            self.fields['external_party_object'].queryset = external_party_class.objects.all()
             if (
-                self.instance.external_partie_object_type
-                and self.instance.external_partie_object_type.id == external_partie_object_type.id
+                self.instance.external_party_object_type
+                and self.instance.external_party_object_type.id == external_party_object_type.id
             ):
-                self.fields['external_partie_object'].initial = self.instance.external_partie_object
+                self.fields['external_party_object'].initial = self.instance.external_party_object
             else:
-                self.fields['external_partie_object'].initial = None
-        elif self.instance.external_partie_object_type:
-            external_partie_class = self.instance.external_partie_object_type.model_class()
-            self.fields['external_partie_object'].queryset = external_partie_class.objects.all()
-            self.fields['external_partie_object'].initial = self.instance.external_partie_object
+                self.fields['external_party_object'].initial = None
+        elif self.instance.external_party_object_type:
+            external_party_class = self.instance.external_party_object_type.model_class()
+            self.fields['external_party_object'].queryset = external_party_class.objects.all()
+            self.fields['external_party_object'].initial = self.instance.external_party_object
         else:
-            self.fields['external_partie_object'].queryset = ServiceProvider.objects.all()
-            self.fields['external_partie_object'].initial = None
+            self.fields['external_party_object'].queryset = ServiceProvider.objects.all()
+            self.fields['external_party_object'].initial = None
 
         # Initialise fields settings
         mandatory_fields = plugin_settings.get('mandatory_contract_fields')
@@ -101,10 +107,11 @@ class ContractForm(NetBoxModelForm):
         model = Contract
         fields = (
             'name',
-            'external_partie_object_type',
-            'external_partie_object',
+            'contract_type',
+            'external_party_object_type',
+            'external_party_object',
             'external_reference',
-            'internal_partie',
+            'internal_party',
             'tenant',
             'status',
             'start_date',
@@ -135,11 +142,17 @@ class ContractForm(NetBoxModelForm):
             raise ValidationError('you should set monthly OR yearly recuring costs not both')
 
 
-class ContractFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
+class ContractFilterForm(ContactModelFilterForm, TenancyFilterForm, NetBoxModelFilterSetForm):
     model = Contract
 
+    contract_type = DynamicModelChoiceField(
+        queryset=ContractType.objects.all(),
+        required=False,
+        selector=True,
+        label=_('Contract type'),
+    )
     external_reference = forms.CharField(required=False, label=_('External reference'))
-    internal_partie = forms.ChoiceField(choices=InternalEntityChoices, required=False, label=_('Internal partie'))
+    internal_party = forms.ChoiceField(choices=InternalEntityChoices, required=False, label=_('Internal party'))
     status = forms.ChoiceField(choices=StatusChoices, required=False, label=_('Status'))
     currency = forms.ChoiceField(choices=CurrencyChoices, required=False, label=_('Currency'))
     parent = DynamicModelChoiceField(
@@ -152,13 +165,13 @@ class ContractFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
 
 
 class ContractCSVForm(NetBoxModelImportForm):
-    external_partie_object_type = CSVContentTypeField(
+    external_party_object_type = CSVContentTypeField(
         queryset=ContentType.objects.all(),
         limit_choices_to=SERVICE_PROVIDER_MODELS,
         help_text='service provider object type in the form <app>.<model>',
     )
-    external_partie_object_id = forms.CharField(
-        help_text='service provider object name', label=_('External partie name')
+    external_party_object_id = forms.CharField(
+        help_text='service provider object name', label=_('External party name')
     )
     tenant = CSVModelChoiceField(
         queryset=Tenant.objects.all(),
@@ -175,15 +188,23 @@ class ContractCSVForm(NetBoxModelImportForm):
         required=False,
         label=_('Parent'),
     )
+    contract_type = CSVModelChoiceField(
+        queryset=ContractType.objects.all(),
+        to_field_name='name',
+        help_text='Contract type name',
+        required=False,
+        label=_('Contract type'),
+    )
 
     class Meta:
         model = Contract
         fields = [
             'name',
-            'external_partie_object_type',
-            'external_partie_object_id',
+            'contract_type',
+            'external_party_object_type',
+            'external_party_object_id',
             'external_reference',
-            'internal_partie',
+            'internal_party',
             'tenant',
             'status',
             'start_date',
@@ -200,18 +221,24 @@ class ContractCSVForm(NetBoxModelImportForm):
             'parent',
         ]
 
-    def clean_external_partie_object_id(self):
-        name = self.cleaned_data.get('external_partie_object_id')
-        external_partie_object_type = self.cleaned_data.get('external_partie_object_type')
-        external_partie_object = external_partie_object_type.get_object_for_this_type(name=name)
+    def clean_external_party_object_id(self):
+        name = self.cleaned_data.get('external_party_object_id')
+        external_party_object_type = self.cleaned_data.get('external_party_object_type')
+        external_party_object = external_party_object_type.get_object_for_this_type(name=name)
 
-        return external_partie_object.id
+        return external_party_object.id
 
 
 class ContractBulkEditForm(NetBoxModelBulkEditForm):
     name = forms.CharField(max_length=100, required=False, label=_('Name'))
+    contract_type = DynamicModelChoiceField(
+        queryset=ContractType.objects.all(),
+        required=False,
+        selector=True,
+        label=_('Contract Type')
+    )
     external_reference = forms.CharField(max_length=100, required=False, label=_('External reference'))
-    internal_partie = forms.ChoiceField(choices=InternalEntityChoices, required=False, label=_('Internal partie'))
+    internal_party = forms.ChoiceField(choices=InternalEntityChoices, required=False, label=_('Internal party'))
     tenant = DynamicModelChoiceField(queryset=Tenant.objects.all(), required=False, selector=True, label=_('Tenant'))
     comments = CommentField(required=False, label=_('Comments'))
     parent = DynamicModelChoiceField(
@@ -225,6 +252,44 @@ class ContractBulkEditForm(NetBoxModelBulkEditForm):
     model = Contract
 
 
+# ContractType
+
+
+class ContractTypeForm(NetBoxModelForm):
+    color = ColorField(label=_('Color'))
+
+    class Meta:
+        model = ContractType
+        fields = (
+            'name',
+            'description',
+            'color',
+            'tags',
+        )
+
+
+class ContractTypeCSVForm(NetBoxModelImportForm):
+    name = forms.CharField(max_length=100, label=_('Name'))
+    description = CommentField(label=_('Description'))
+    color = ColorField(label=_('Color'))
+
+    class Meta:
+        model = ContractType
+        fields = ['name', 'description', 'color']
+
+
+class ContractTypeBulkEditForm(NetBoxModelBulkEditForm):
+    description = CommentField(label=_('Description'))
+    nullable_fields = ('comments',)
+    color = ColorField(label=_('Color'), required=False,)
+    model = ContractType
+
+
+class ContractTypeFilterForm(NetBoxModelFilterSetForm):
+    model = ContractType
+    name = forms.CharField(required=False, label=_('Name'))
+    description = CommentField(label=_('Description'))
+
 # Invoice
 
 
@@ -316,6 +381,7 @@ class InvoiceForm(NetBoxModelForm):
             'date',
             'contracts',
             'template',
+            'status',
             'period_start',
             'period_end',
             'currency',
@@ -342,6 +408,7 @@ class InvoiceFilterForm(NetBoxModelFilterSetForm):
         widget=forms.Select(choices=BOOLEAN_WITH_BLANK_CHOICES),
         label=_('Template'),
     )
+    status = forms.ChoiceField(choices=InvoiceStatusChoices, required=False, label=_('Status'))
     currency = forms.ChoiceField(choices=CurrencyChoices, required=False, label=_('Currency'))
     contracts = DynamicModelMultipleChoiceField(
         queryset=Contract.objects.all(),
@@ -349,6 +416,13 @@ class InvoiceFilterForm(NetBoxModelFilterSetForm):
         selector=True,
         label=_('Contracts'),
     )
+    accounting_dimensions = DynamicModelMultipleChoiceField(
+        queryset=AccountingDimension.objects.all(),
+        required=False,
+        selector=True,
+        label=_('Accounting Dimensions'),
+    )
+
     tag = TagFilterField(model)
 
 
@@ -359,6 +433,7 @@ class InvoiceCSVForm(NetBoxModelImportForm):
         help_text='Related Contracts',
         label=_('Contracts'),
     )
+    status = CSVChoiceField(choices=InvoiceStatusChoices, help_text='Invoice status', label=_('Status'))
 
     class Meta:
         model = Invoice
@@ -367,6 +442,7 @@ class InvoiceCSVForm(NetBoxModelImportForm):
             'date',
             'contracts',
             'template',
+            'status',
             'period_start',
             'period_end',
             'currency',
@@ -437,7 +513,7 @@ class ServiceProviderForm(NetBoxModelForm):
         fields = ('name', 'slug', 'portal_url', 'comments', 'tags')
 
 
-class ServiceProviderFilterForm(NetBoxModelFilterSetForm):
+class ServiceProviderFilterForm(ContactModelFilterForm, NetBoxModelFilterSetForm):
     model = ServiceProvider
     name = forms.CharField(required=False, label=_('Name'))
     tag = TagFilterField(model)