netbox-contract 2.2.2__tar.gz → 2.2.3__tar.gz

{netbox_contract-2.2.2/src/netbox_contract.egg-info → netbox_contract-2.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: netbox-contract
-Version: 2.2.2
+Version: 2.2.3
 Summary: Contract management plugin for Netbox
 Author-email: Marc Lebreuil <marc@famillelebreuil.net>
 Project-URL: Homepage, https://github.com/mlebreuil/netbox-contract

{netbox_contract-2.2.2 → netbox_contract-2.2.3}/pyproject.toml

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

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

{netbox_contract-2.2.2 → netbox_contract-2.2.3}/src/netbox_contract/api/serializers.py

@@ -284,4 +284,4 @@ class AccountingDimensionSerializer(NetBoxModelSerializer):
             'created',
             'last_updated',
         )
-        brief_fields = ('name', 'value', 'url', 'display')
+        brief_fields = ('id', 'name', 'value', 'url', 'display')

{netbox_contract-2.2.2 → netbox_contract-2.2.3}/src/netbox_contract/forms.py

@@ -16,6 +16,7 @@ from utilities.forms.fields import (
     CSVChoiceField,
     CSVContentTypeField,
     CSVModelChoiceField,
+    CSVModelMultipleChoiceField,
     DynamicModelChoiceField,
     DynamicModelMultipleChoiceField,
     JSONField,
@@ -240,6 +241,10 @@ class ContractBulkEditForm(NetBoxModelBulkEditForm):
 
 
 class InvoiceForm(NetBoxModelForm):
+    number = forms.CharField(
+        max_length=100,
+        help_text='Invoice template name will be overriden to _invoice_template_contract name',
+    )
     contracts = DynamicModelMultipleChoiceField(
         queryset=Contract.objects.all(), required=False
     )
@@ -459,7 +464,7 @@ class ContractAssignmentImportForm(NetBoxModelImportForm):
 
 class InvoiceLineForm(NetBoxModelForm):
     invoice = DynamicModelChoiceField(queryset=Invoice.objects.all())
-    accounting_dimensions = forms.ModelMultipleChoiceField(
+    accounting_dimensions = DynamicModelMultipleChoiceField(
         queryset=AccountingDimension.objects.all(), required=False
     )
 
@@ -490,6 +495,9 @@ class InvoiceLineForm(NetBoxModelForm):
 class InvoiceLineFilterSetForm(NetBoxModelFilterSetForm):
     model = InvoiceLine
     invoice = DynamicModelChoiceField(queryset=Invoice.objects.all(), required=False)
+    accounting_dimensions = DynamicModelChoiceField(
+        queryset=AccountingDimension.objects.all(), required=False
+    )
 
 
 class InvoiceLineImportForm(NetBoxModelImportForm):
@@ -498,7 +506,7 @@ class InvoiceLineImportForm(NetBoxModelImportForm):
         to_field_name='number',
         help_text='Invoice number',
     )
-    accounting_dimensions = CSVModelChoiceField(
+    accounting_dimensions = CSVModelMultipleChoiceField(
         queryset=AccountingDimension.objects.all(),
         to_field_name='id',
         help_text='accounting dimension id',

{netbox_contract-2.2.2 → netbox_contract-2.2.3}/src/netbox_contract/views.py

@@ -278,7 +278,7 @@ class InvoiceEditView(generic.ObjectEditView):
             contract = Contract.objects.get(pk=initial_data['contracts'])
 
             try:
-                last_invoice = contract.invoices.filter(template=False).latest(
+                last_invoice = contract.invoices.exclude(template=True).latest(
                     'period_end'
                 )
                 new_period_start = last_invoice.period_end + timedelta(days=1)

{netbox_contract-2.2.2 → netbox_contract-2.2.3/src/netbox_contract.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: netbox-contract
-Version: 2.2.2
+Version: 2.2.3
 Summary: Contract management plugin for Netbox
 Author-email: Marc Lebreuil <marc@famillelebreuil.net>
 Project-URL: Homepage, https://github.com/mlebreuil/netbox-contract