Merge pull request #163 from mlebreuil/fix-invoice-creation

fix invoice creation
mlebreuil · Aug 22, 2024 · 7b1df14 · 7b1df14
2 parents 6af0095 + f7cfd35
commit 7b1df14
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,7 +7,9 @@
 
 ### Version 2.2.3
 
-* Fix accounting dimensions access through Dynamic Object Fields 
+* Fix accounting dimensions access through Dynamic Object Fields
+* Fix invoice creation from contract. 
+* Add scripts to convert accounting dimensions in the json fields of contract and invoices to invoice template, invoicelines and dimensions objects.
 
 ### Version 2.2.2
 

diff --git a/src/netbox_contract/forms.py b/src/netbox_contract/forms.py
@@ -241,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
     )

diff --git a/src/netbox_contract/views.py b/src/netbox_contract/views.py
@@ -278,7 +278,7 @@ def get(self, request, *args, **kwargs):
             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)

diff --git a/contract_migration.py → utils/contract_migration.py b/contract_migration.py → utils/contract_migration.py