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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: netbox-contract
-Version: 2.2.6
+Version: 2.2.8
 Summary: Contract management plugin for Netbox
 Author-email: Marc Lebreuil <marc@famillelebreuil.net>
 Project-URL: Homepage, https://github.com/mlebreuil/netbox-contract
@@ -73,13 +73,14 @@ PLUGINS_CONFIG = {
 ```
 
 * top_level_menu : If "Contracts" appears under the "Plugins" menu item or on its own
-* default_accounting_dimensions: The accounting dimensions which will appear in the field' background when empty.
+* default_accounting_dimensions: The accounting dimensions which will appear in the field' background when empty. Note that accounting dimensions are now managed as individual objects. The use of this field is deprecated.  
 * mandatory_contract_fields, mandatory_invoice_fields: Fields which are not required by default and can be set as such. The list of fields is at the bottom of the contract import form.
 * hidden_contract_fields, hidden_invoice_fields: List of fields to be hidden. Fields should not be required to be hidden.
 
 ### Customize the plugin fields choices
 
 Internal partie reference the legal entity of your organization that is a partie to the contract.  
+The first currency will also be the default currency for contracts.  
 
 ```python
 # configuration.py

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

@@ -57,13 +57,14 @@ PLUGINS_CONFIG = {
 ```
 
 * top_level_menu : If "Contracts" appears under the "Plugins" menu item or on its own
-* default_accounting_dimensions: The accounting dimensions which will appear in the field' background when empty.
+* default_accounting_dimensions: The accounting dimensions which will appear in the field' background when empty. Note that accounting dimensions are now managed as individual objects. The use of this field is deprecated.  
 * mandatory_contract_fields, mandatory_invoice_fields: Fields which are not required by default and can be set as such. The list of fields is at the bottom of the contract import form.
 * hidden_contract_fields, hidden_invoice_fields: List of fields to be hidden. Fields should not be required to be hidden.
 
 ### Customize the plugin fields choices
 
 Internal partie reference the legal entity of your organization that is a partie to the contract.  
+The first currency will also be the default currency for contracts.  
 
 ```python
 # configuration.py

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

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

{netbox_contract-2.2.6 → netbox_contract-2.2.8}/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.6'
+    version = '2.2.8'
     author = 'Marc Lebreuil'
     author_email = 'marc@famillelebreuil.net'
     base_url = 'contracts'

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

@@ -65,8 +65,12 @@ class ContractForm(NetBoxModelForm):
         widget=HTMXSelect(),
     )
     external_partie_object = forms.ModelChoiceField(queryset=None)
-    tenant = DynamicModelChoiceField(queryset=Tenant.objects.all(), required=False)
-    parent = DynamicModelChoiceField(queryset=Contract.objects.all(), required=False)
+    tenant = DynamicModelChoiceField(
+        queryset=Tenant.objects.all(), required=False, selector=True
+    )
+    parent = DynamicModelChoiceField(
+        queryset=Contract.objects.all(), required=False, selector=True
+    )
     accounting_dimensions = Dimensions(required=False)
 
     def __init__(self, *args, **kwargs):
@@ -157,15 +161,19 @@ class ContractForm(NetBoxModelForm):
             )
 
 
-class ContractFilterSetForm(NetBoxModelFilterSetForm):
+class ContractFilterForm(NetBoxModelFilterSetForm):
     model = Contract
 
-    tenant = DynamicModelChoiceField(queryset=Tenant.objects.all(), required=False)
+    tenant = DynamicModelChoiceField(
+        queryset=Tenant.objects.all(), required=False, selector=True
+    )
     external_reference = 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)
+    parent = DynamicModelChoiceField(
+        queryset=Contract.objects.all(), required=False, selector=True
+    )
     tag = TagFilterField(model)
 
 
@@ -233,10 +241,18 @@ class ContractBulkEditForm(NetBoxModelBulkEditForm):
     name = forms.CharField(max_length=100, required=False)
     external_reference = forms.CharField(max_length=100, required=False)
     internal_partie = forms.ChoiceField(choices=InternalEntityChoices, required=False)
-    tenant = DynamicModelChoiceField(queryset=Tenant.objects.all(), required=False)
+    tenant = DynamicModelChoiceField(
+        queryset=Tenant.objects.all(),
+        required=False,
+        selector=True,
+    )
     accounting_dimensions = Dimensions(required=False)
     comments = CommentField(required=False)
-    parent = DynamicModelChoiceField(queryset=Contract.objects.all(), required=False)
+    parent = DynamicModelChoiceField(
+        queryset=Contract.objects.all(),
+        required=False,
+        selector=True,
+    )
 
     nullable_fields = (
         'accounting_dimensions',
@@ -254,7 +270,7 @@ class InvoiceForm(NetBoxModelForm):
         help_text='Invoice template name will be overriden to _invoice_template_contract name',
     )
     contracts = DynamicModelMultipleChoiceField(
-        queryset=Contract.objects.all(), required=False
+        queryset=Contract.objects.all(), required=False, selector=True
     )
     accounting_dimensions = Dimensions(required=False)
 
@@ -360,7 +376,7 @@ class InvoiceForm(NetBoxModelForm):
         }
 
 
-class InvoiceFilterSetForm(NetBoxModelFilterSetForm):
+class InvoiceFilterForm(NetBoxModelFilterSetForm):
     model = Invoice
     number = forms.CharField(required=False)
     template = forms.NullBooleanField(
@@ -368,7 +384,9 @@ class InvoiceFilterSetForm(NetBoxModelFilterSetForm):
     )
     currency = forms.ChoiceField(choices=CurrencyChoices, required=False)
     contracts = DynamicModelMultipleChoiceField(
-        queryset=Contract.objects.all(), required=False
+        queryset=Contract.objects.all(),
+        required=False,
+        selector=True,
     )
     tag = TagFilterField(model)
 
@@ -403,7 +421,9 @@ class InvoiceBulkEditForm(NetBoxModelBulkEditForm):
     template = forms.BooleanField(required=False)
     date = forms.DateField(required=False)
     contracts = DynamicModelMultipleChoiceField(
-        queryset=Contract.objects.all(), required=False
+        queryset=Contract.objects.all(),
+        required=False,
+        selector=True,
     )
     period_start = forms.DateField(required=False)
     period_end = forms.DateField(required=False)
@@ -432,7 +452,7 @@ class ServiceProviderForm(NetBoxModelForm):
         fields = ('name', 'slug', 'portal_url', 'comments', 'tags')
 
 
-class ServiceProviderFilterSetForm(NetBoxModelFilterSetForm):
+class ServiceProviderFilterForm(NetBoxModelFilterSetForm):
     model = ServiceProvider
     name = forms.CharField(required=False)
     tag = TagFilterField(model)
@@ -458,7 +478,7 @@ class ServiceProviderBulkEditForm(NetBoxModelBulkEditForm):
 
 
 class ContractAssignmentForm(NetBoxModelForm):
-    contract = DynamicModelChoiceField(queryset=Contract.objects.all())
+    contract = DynamicModelChoiceField(queryset=Contract.objects.all(), selector=True)
 
     class Meta:
         model = ContractAssignment
@@ -469,9 +489,12 @@ class ContractAssignmentForm(NetBoxModelForm):
         }
 
 
-class ContractAssignmentFilterSetForm(NetBoxModelFilterSetForm):
+class ContractAssignmentFilterForm(NetBoxModelFilterSetForm):
     model = ContractAssignment
-    contract = DynamicModelChoiceField(queryset=Contract.objects.all())
+    contract = DynamicModelChoiceField(
+        queryset=Contract.objects.all(),
+        selector=True,
+    )
 
 
 class ContractAssignmentImportForm(NetBoxModelImportForm):
@@ -492,9 +515,9 @@ class ContractAssignmentImportForm(NetBoxModelImportForm):
 
 
 class InvoiceLineForm(NetBoxModelForm):
-    invoice = DynamicModelChoiceField(queryset=Invoice.objects.all())
+    invoice = DynamicModelChoiceField(queryset=Invoice.objects.all(), selector=True)
     accounting_dimensions = DynamicModelMultipleChoiceField(
-        queryset=AccountingDimension.objects.all(), required=False
+        queryset=AccountingDimension.objects.all(), required=False, selector=True
     )
 
     def clean(self):
@@ -527,11 +550,17 @@ class InvoiceLineForm(NetBoxModelForm):
         ]
 
 
-class InvoiceLineFilterSetForm(NetBoxModelFilterSetForm):
+class InvoiceLineFilterForm(NetBoxModelFilterSetForm):
     model = InvoiceLine
-    invoice = DynamicModelChoiceField(queryset=Invoice.objects.all(), required=False)
+    invoice = DynamicModelChoiceField(
+        queryset=Invoice.objects.all(),
+        required=False,
+        selector=True,
+    )
     accounting_dimensions = DynamicModelMultipleChoiceField(
-        queryset=AccountingDimension.objects.all(), required=False
+        queryset=AccountingDimension.objects.all(),
+        required=False,
+        selector=True,
     )
     currency = forms.ChoiceField(choices=CurrencyChoices, required=False)
     tag = TagFilterField(model)
@@ -564,7 +593,9 @@ class InvoiceLineImportForm(NetBoxModelImportForm):
 class InvoiceLineBulkEditForm(NetBoxModelBulkEditForm):
     invoice = DynamicModelChoiceField(queryset=Invoice.objects.all(), required=False)
     accounting_dimensions = DynamicModelMultipleChoiceField(
-        queryset=AccountingDimension.objects.all(), required=False
+        queryset=AccountingDimension.objects.all(),
+        required=False,
+        selector=True,
     )
     model = InvoiceLine
 
@@ -584,7 +615,7 @@ class AccountingDimensionForm(NetBoxModelForm):
         ]
 
 
-class AccountingDimensionFilterSetForm(NetBoxModelFilterSetForm):
+class AccountingDimensionFilterForm(NetBoxModelFilterSetForm):
     model = AccountingDimension
 
     name = forms.CharField(required=False)

{netbox_contract-2.2.6 → netbox_contract-2.2.8}/src/netbox_contract/migrations/0026_auto_20240421_1550.py

@@ -8,7 +8,7 @@ def update_changed_object_type(apps, schema_editor):
     Update the Change Log related object type to match
     renamed contract_assignment type
     """
-    ObjectChange = apps.get_model('extras', 'ObjectChange')
+    ObjectChange = apps.get_model('core', 'ObjectChange')
     ContentType = apps.get_model('contenttypes', 'ContentType')
     ct = ContentType.objects.get(
         app_label='netbox_contract', model='contractassignment'

{netbox_contract-2.2.6 → netbox_contract-2.2.8}/src/netbox_contract/models.py

@@ -52,6 +52,7 @@ class CurrencyChoices(ChoiceSet):
         ('chf', 'CHF'),
     ]
 
+CURRENCY_DEFAULT = CurrencyChoices.CHOICES[0][0]
 
 class AccountingDimension(NetBoxModel):
     name = models.CharField(max_length=20)
@@ -151,7 +152,7 @@ class Contract(NetBoxModel):
         help_text='In month', default=12, blank=True, null=True
     )
     currency = models.CharField(
-        max_length=3, choices=CurrencyChoices, default=CurrencyChoices.CURRENCY_USD
+        max_length=3, choices=CurrencyChoices, default=CURRENCY_DEFAULT
     )
     accounting_dimensions = models.JSONField(null=True, blank=True)
     yrc = models.DecimalField(
@@ -207,7 +208,7 @@ class Invoice(NetBoxModel):
     period_start = models.DateField(blank=True, null=True)
     period_end = models.DateField(blank=True, null=True)
     currency = models.CharField(
-        max_length=3, choices=CurrencyChoices, default=CurrencyChoices.CURRENCY_USD
+        max_length=3, choices=CurrencyChoices, default=CURRENCY_DEFAULT
     )
     accounting_dimensions = models.JSONField(null=True)
     amount = models.DecimalField(max_digits=10, decimal_places=2)
@@ -236,7 +237,7 @@ class InvoiceLine(NetBoxModel):
         to='Invoice', on_delete=models.CASCADE, related_name='invoicelines'
     )
     currency = models.CharField(
-        max_length=3, choices=CurrencyChoices, default=CurrencyChoices.CURRENCY_USD
+        max_length=3, choices=CurrencyChoices, default=CURRENCY_DEFAULT
     )
     amount = models.DecimalField(max_digits=10, decimal_places=2)
     accounting_dimensions = models.ManyToManyField(AccountingDimension, blank=True)

{netbox_contract-2.2.6 → netbox_contract-2.2.8}/src/netbox_contract/views.py

@@ -42,7 +42,7 @@ class ServiceProviderListView(generic.ObjectListView):
     queryset = ServiceProvider.objects.all()
     table = tables.ServiceProviderListTable
     filterset = filtersets.ServiceProviderFilterSet
-    filterset_form = forms.ServiceProviderFilterSetForm
+    filterset_form = forms.ServiceProviderFilterForm
 
 
 class ServiceProviderEditView(generic.ObjectEditView):
@@ -84,7 +84,7 @@ class ContractAssignmentListView(generic.ObjectListView):
     queryset = ContractAssignment.objects.all()
     table = tables.ContractAssignmentListTable
     filterset = filtersets.ContractAssignmentFilterSet
-    filterset_form = forms.ContractAssignmentFilterSetForm
+    filterset_form = forms.ContractAssignmentFilterForm
     actions = {
         'import': {'add'},
         'export': set(),
@@ -184,7 +184,7 @@ class ContractListView(generic.ObjectListView):
     )
     table = tables.ContractListTable
     filterset = filtersets.ContractFilterSet
-    filterset_form = forms.ContractFilterSetForm
+    filterset_form = forms.ContractFilterForm
 
 
 class ContractEditView(generic.ObjectEditView):
@@ -270,7 +270,7 @@ class InvoiceListView(generic.ObjectListView):
     queryset = Invoice.objects.all()
     table = tables.InvoiceListTable
     filterset = filtersets.InvoiceFilterSet
-    filterset_form = forms.InvoiceFilterSetForm
+    filterset_form = forms.InvoiceFilterForm
 
 
 class InvoiceEditView(generic.ObjectEditView):
@@ -377,7 +377,7 @@ class InvoiceLineListView(generic.ObjectListView):
     queryset = InvoiceLine.objects.all()
     table = tables.InvoiceLineListTable
     filterset = filtersets.InvoiceLineFilterSet
-    filterset_form = forms.InvoiceLineFilterSetForm
+    filterset_form = forms.InvoiceLineFilterForm
 
 
 class InvoiceLineEditView(generic.ObjectEditView):
@@ -453,7 +453,7 @@ class AccountingDimensionListView(generic.ObjectListView):
     queryset = AccountingDimension.objects.all()
     table = tables.AccountingDimensionListTable
     filterset = filtersets.AccountingDimensionFilterSet
-    filterset_form = forms.AccountingDimensionFilterSetForm
+    filterset_form = forms.AccountingDimensionFilterForm
 
 
 class AccountingDimensionEditView(generic.ObjectEditView):

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: netbox-contract
-Version: 2.2.6
+Version: 2.2.8
 Summary: Contract management plugin for Netbox
 Author-email: Marc Lebreuil <marc@famillelebreuil.net>
 Project-URL: Homepage, https://github.com/mlebreuil/netbox-contract
@@ -73,13 +73,14 @@ PLUGINS_CONFIG = {
 ```
 
 * top_level_menu : If "Contracts" appears under the "Plugins" menu item or on its own
-* default_accounting_dimensions: The accounting dimensions which will appear in the field' background when empty.
+* default_accounting_dimensions: The accounting dimensions which will appear in the field' background when empty. Note that accounting dimensions are now managed as individual objects. The use of this field is deprecated.  
 * mandatory_contract_fields, mandatory_invoice_fields: Fields which are not required by default and can be set as such. The list of fields is at the bottom of the contract import form.
 * hidden_contract_fields, hidden_invoice_fields: List of fields to be hidden. Fields should not be required to be hidden.
 
 ### Customize the plugin fields choices
 
 Internal partie reference the legal entity of your organization that is a partie to the contract.  
+The first currency will also be the default currency for contracts.  
 
 ```python
 # configuration.py