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

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

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: netbox-contract
-Version: 2.3.2
+Version: 2.4.0
 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
 
@@ -96,6 +108,7 @@ The first currency will also be the default currency for contracts.
 # configuration.py
 FIELD_CHOICES = {
     'netbox_contract.Contract.internal_partie': (
+        ('default', 'Default entity', 'green'),
         ('entity1', 'Entity 1', 'green'),
         ('entity2', 'Entity 2', 'yellow'),
     ),

{netbox_contract-2.3.2 → netbox_contract-2.4.0}/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
 
@@ -80,6 +81,7 @@ The first currency will also be the default currency for contracts.
 # configuration.py
 FIELD_CHOICES = {
     'netbox_contract.Contract.internal_partie': (
+        ('default', 'Default entity', 'green'),
         ('entity1', 'Entity 1', 'green'),
         ('entity2', 'Entity 2', 'yellow'),
     ),

{netbox_contract-2.3.2 → netbox_contract-2.4.0}/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.0'
     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.0}/netbox_contract/api/serializers.py

@@ -11,6 +11,7 @@ from ..models import (
     AccountingDimension,
     Contract,
     ContractAssignment,
+    ContractType,
     Invoice,
     InvoiceLine,
     ServiceProvider,
@@ -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.0}/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.0}/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.0}/netbox_contract/filtersets.py

@@ -1,13 +1,14 @@
 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,
@@ -17,7 +18,7 @@ from .models import (
 )
 
 
-class ContractFilterSet(NetBoxModelFilterSet, TenancyFilterSet):
+class ContractFilterSet(ContactModelFilterSet, NetBoxModelFilterSet, TenancyFilterSet):
     status = django_filters.MultipleChoiceFilter(choices=StatusChoices, null_value=None)
     internal_partie = django_filters.MultipleChoiceFilter(
         choices=InternalEntityChoices, null_value=None
@@ -25,12 +26,16 @@ class ContractFilterSet(NetBoxModelFilterSet, TenancyFilterSet):
     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',
@@ -71,7 +76,7 @@ class InvoiceFilterSet(NetBoxModelFilterSet):
         )
 
 
-class ServiceProviderFilterSet(NetBoxModelFilterSet):
+class ServiceProviderFilterSet(ContactModelFilterSet, NetBoxModelFilterSet):
     class Meta:
         model = ServiceProvider
         fields = ('id', 'name')
@@ -80,6 +85,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.0}/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,12 +27,13 @@ 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,
@@ -63,6 +65,9 @@ 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)
@@ -101,6 +106,7 @@ class ContractForm(NetBoxModelForm):
         model = Contract
         fields = (
             'name',
+            'contract_type',
             'external_partie_object_type',
             'external_partie_object',
             'external_reference',
@@ -135,9 +141,15 @@ 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'))
     status = forms.ChoiceField(choices=StatusChoices, required=False, label=_('Status'))
@@ -175,11 +187,19 @@ 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',
+            'contract_type',
             'external_partie_object_type',
             'external_partie_object_id',
             'external_reference',
@@ -210,6 +230,12 @@ class ContractCSVForm(NetBoxModelImportForm):
 
 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'))
     tenant = DynamicModelChoiceField(queryset=Tenant.objects.all(), required=False, selector=True, label=_('Tenant'))
@@ -225,6 +251,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
 
 
@@ -437,7 +501,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)