netbox-contract 2.3.0__tar.gz → 2.3.1__tar.gz

netbox_contract-2.3.1/CONTRIBUTING.md

@@ -0,0 +1,144 @@
+# Contributing
+
+Contributions are welcome!
+
+## Types of contributions
+
+### Report bugs or submit feedback
+
+Report bugs and submit feetback [here](https://github.com/mlebreuil/netbox-contract/issues).
+
+### Fix bugs
+
+Look through the GitHub issues for bugs. Anything tagged with "bug" and "help
+wanted" is open to whoever wants to implement it.
+
+### Implement features
+
+Look through the GitHub issues for features. Anything tagged with "enhancement"
+and "help wanted" is open to whoever wants to implement it.
+
+## Coding conventions
+ 
+Netbox [Style Guide](https://docs.netbox.dev/en/stable/development/style-guide/)  
+Django [Coding style](https://docs.djangoproject.com/en/4.2/internals/contributing/writing-code/coding-style/)  
+
+For this:  
+All files will be formated using the [black](https://black.readthedocs.io/en/stable/) auto-formatter.  
+Configuration is stored in pyproject.toml  
+
+[isort](https://github.com/PyCQA/isort#readme) is used to automate import sorting.  
+
+Linting and PEP8 style enforcement will be done with  [Flake8](https://flake8.pycqa.org/en/latest/) which is a wrapper arround:  
+- PyFlakes
+- pycodestyle
+- Ned Batchelder’s McCabe script
+Configuration is maintained in the .flake8 file (no support for pyproject.toml)
+
+The pre-commit Python framework is used to simplify the managment of pre-commit hooks.  
+Config is stored in .pre-commit-config.yaml   
+
+## Repository structure
+
+There are 2 permanent branch in the repository:
+
+* master - The current stable release. Individual changes should never be pushed directly to this branch, but rather merged from develop.
+* develop - Active development for the upcoming patch release. Pull requests will typically be based on this branch unless they introduce breaking changes that must be deferred until the next minor release.
+
+For each new feature or bug fix a branch is created from the corresponding issue.
+
+## Setup your development environment
+
+
+1. [Install Netbox](https://github.com/netbox-community/netbox/blob/develop/docs/installation/).
+Make sure taht at the Netbox installtion step you follow the "Option B: Clone the Git Repository"
+
+2. From the Netbox directory you activate the NetBox virtual environment 
+
+    ```
+    $ cd netbox
+    $ source venv/netbox/bin/activate
+    ```
+ 
+3. Fork the [netbox-contract](https://github.com/mlebreuil/netbox-contract/) repo on GitHub.
+4. Clone your fork locally
+
+    ```
+    $ cd ..
+    $ git clone git@github.com:your_name_here/netbox-contract.git
+    ```
+
+5. Add the plugin to NetBox virtual environment:
+
+    ```
+    $ cd  netbox-contract
+    $ python3 -m pip install -e .
+    ```
+
+6. install pre-commit:
+
+    ```bash
+    python -m pip install pre-commit
+    pre-commit install
+    ```
+
+6. Update the Netbox configuration and run the database migrations as mentionned in the plugin installation steps.
+
+7. Create a branch for local development:
+
+    ```
+    $ git checkout -b name-of-your-bugfix-or-feature
+    ```
+
+    Make your changes locally.
+
+8. You can test your changes using the django development server:
+
+    ```
+    $ python3 netbox/netbox/manage.py runserver 0.0.0.0:8000 --insecure
+    ```
+
+    Connect to the name or IP of the server (as defined in ALLOWED_HOSTS) on port 8000; for example, http://127.0.0.1:8000/.
+
+9. Commit your changes and push your branch to GitHub:
+
+    ```
+    $ git add .
+    $ git commit -m "Your detailed description of your changes."
+    $ git push origin name-of-your-bugfix-or-feature
+    ```
+
+10. Submit a pull request through the GitHub website.
+
+## Model changes
+
+Create the migrations:  
+
+```bash
+source netbox/venv/bin/activate
+python3 netbox/netbox/manage.py makemigrations netbox_contract --dry-run
+python3 netbox/netbox/manage.py makemigrations netbox_contract
+```
+
+Apply the migrations:  
+
+```bash
+source netbox/venv/bin/activate
+python3 netbox/netbox/manage.py migrate
+```
+
+## Pull Request Guidelines
+
+Before you submit a pull request, check that it meets these guidelines:
+
+1. The pull request should include tests.
+2. If the pull request adds functionality, the docs should be updated. 
+3. The pull request should work for Python 3.10 and 3.11. Check [Actions](https://github.com/mlebreuil/netbox-contract/actions)
+   and make sure that the tests pass for all supported Python versions.
+
+
+## Deploying
+
+A reminder for the maintainers on how to deploy.
+Make sure all your changes are committed (including an entry in CHANGELOG.md) and that all tests pass.
+Then in the github project go to `Releases` and create a new release with a new tag.  This will automatically upload the release to pypi:

netbox_contract-2.3.1/MANIFEST.in

@@ -0,0 +1,13 @@
+include CONTRIBUTING.md
+include LICENSE
+include README.md
+
+recursive-include tests *
+recursive-exclude * __pycache__
+recursive-exclude * *.py[co]
+
+recursive-include docs *.rst conf.py Makefile make.bat *.jpg *.png *.gif
+
+
+graft src/netbox_contract/templates
+graft src/netbox_contract/templates/netbox_contract

{netbox_contract-2.3.0/src/netbox_contract.egg-info → netbox_contract-2.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: netbox-contract
-Version: 2.3.0
+Version: 2.3.1
 Summary: Contract management plugin for Netbox
 Author-email: Marc Lebreuil <marc@famillelebreuil.net>
 Project-URL: Homepage, https://github.com/mlebreuil/netbox-contract
@@ -15,14 +15,29 @@ Requires-Dist: python-dateutil
 Requires-Dist: drf_yasg
 
 # Contract pluggin
-## Overview
+
+NetBox plugin to manage contracts.
+
+
+* Free software: MIT
+* Documentation: https://mlebreuil.github.io/netbox-contract/
+
+## Features
+
 The pluggin adds contracts and invoices model to Netbox.  
-It allows to register contract with objects.  
-Add invoices to contracts. 
+It allows to link contract with objects.  
+And link invoice templates and invoices with contracts.  
+Invoice lines can be linked to each invoice / invoice template.  
+Accounitng dimentoins can be linked with invoice lines.  
+
+## Compatibility
 
-Check the [documentation](https://mlebreuil.github.io/netbox-contract/) for additional information 
+| NetBox Version | Plugin Version |
+|----------------|----------------|
+|     4.1        |      2.2       |
+|     4.2        |      2.3       |
 
-## Installation
+## Installing
 
 ### Activate venv
 To ensure our plugin is accessible to the NetBox installation, we first need to activate the Python [virtual environment](https://docs.python.org/3/library/venv.html) that was created when we installed NetBox. To do this, determine the virtual environment's path (this will be `/opt/netbox/venv/` if you use the documentation's defaults) and activate it:
@@ -57,11 +72,6 @@ The following configurationitems can be set:
 PLUGINS_CONFIG = {
     'netbox_contract': {
         'top_level_menu': True,
-        'default_accounting_dimensions':{
-            "account": "", 
-            "project": "", 
-            "cost center": ""
-        },
         'mandatory_contract_fields': [],
         'hidden_contract_fields': [],
         'mandatory_invoice_fields': [],
@@ -86,9 +96,8 @@ The first currency will also be the default currency for contracts.
 # configuration.py
 FIELD_CHOICES = {
     'netbox_contract.Contract.internal_partie': (
-        ('Nagravision SARL', 'Nagravision SARL', 'green'),
-        ('Nagra USA', 'Nagra USA', 'green'),
-        ('Nagra India', 'Nagra India', 'green'),
+        ('entity1', 'Entity 1', 'green'),
+        ('entity2', 'Entity 2', 'yellow'),
     ),
     'netbox_contract.Contract.currency': (
         ('usd', 'USD'),

{netbox_contract-2.3.0 → netbox_contract-2.3.1}/README.md

@@ -1,12 +1,27 @@
 # Contract pluggin
-## Overview
+
+NetBox plugin to manage contracts.
+
+
+* Free software: MIT
+* Documentation: https://mlebreuil.github.io/netbox-contract/
+
+## Features
+
 The pluggin adds contracts and invoices model to Netbox.  
-It allows to register contract with objects.  
-Add invoices to contracts. 
+It allows to link contract with objects.  
+And link invoice templates and invoices with contracts.  
+Invoice lines can be linked to each invoice / invoice template.  
+Accounitng dimentoins can be linked with invoice lines.  
+
+## Compatibility
 
-Check the [documentation](https://mlebreuil.github.io/netbox-contract/) for additional information 
+| NetBox Version | Plugin Version |
+|----------------|----------------|
+|     4.1        |      2.2       |
+|     4.2        |      2.3       |
 
-## Installation
+## Installing
 
 ### Activate venv
 To ensure our plugin is accessible to the NetBox installation, we first need to activate the Python [virtual environment](https://docs.python.org/3/library/venv.html) that was created when we installed NetBox. To do this, determine the virtual environment's path (this will be `/opt/netbox/venv/` if you use the documentation's defaults) and activate it:
@@ -41,11 +56,6 @@ The following configurationitems can be set:
 PLUGINS_CONFIG = {
     'netbox_contract': {
         'top_level_menu': True,
-        'default_accounting_dimensions':{
-            "account": "", 
-            "project": "", 
-            "cost center": ""
-        },
         'mandatory_contract_fields': [],
         'hidden_contract_fields': [],
         'mandatory_invoice_fields': [],
@@ -70,9 +80,8 @@ The first currency will also be the default currency for contracts.
 # configuration.py
 FIELD_CHOICES = {
     'netbox_contract.Contract.internal_partie': (
-        ('Nagravision SARL', 'Nagravision SARL', 'green'),
-        ('Nagra USA', 'Nagra USA', 'green'),
-        ('Nagra India', 'Nagra India', 'green'),
+        ('entity1', 'Entity 1', 'green'),
+        ('entity2', 'Entity 2', 'yellow'),
     ),
     'netbox_contract.Contract.currency': (
         ('usd', 'USD'),

{netbox_contract-2.3.0 → netbox_contract-2.3.1}/pyproject.toml

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

{netbox_contract-2.3.0 → netbox_contract-2.3.1}/src/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.0'
+    version = '2.3.1'
     author = 'Marc Lebreuil'
     author_email = 'marc@famillelebreuil.net'
     base_url = 'contracts'
-    min_version = '4.1.10'
+    min_version = '4.2.0'
     required_settings = []
     default_settings = {
         'top_level_menu': False,

{netbox_contract-2.3.0 → netbox_contract-2.3.1}/src/netbox_contract/forms.py

@@ -54,12 +54,8 @@ class ContractForm(NetBoxModelForm):
         widget=HTMXSelect(),
         label=_('External partie object type'),
     )
-    external_partie_object = forms.ModelChoiceField(
-        queryset=None, label=_('External partie object')
-    )
-    tenant = DynamicModelChoiceField(
-        queryset=Tenant.objects.all(), required=False, selector=True, label=_('Tenant')
-    )
+    external_partie_object = forms.ModelChoiceField(queryset=None, label=_('External partie object'))
+    tenant = DynamicModelChoiceField(queryset=Tenant.objects.all(), required=False, selector=True, label=_('Tenant'))
     parent = DynamicModelChoiceField(
         queryset=Contract.objects.all(),
         required=False,
@@ -73,37 +69,22 @@ class ContractForm(NetBoxModelForm):
 
         # 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_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()
+            self.fields['external_partie_object'].queryset = external_partie_class.objects.all()
             if (
                 self.instance.external_partie_object_type
-                and self.instance.external_partie_object_type.id
-                == external_partie_object_type.id
+                and self.instance.external_partie_object_type.id == external_partie_object_type.id
             ):
-                self.fields[
-                    'external_partie_object'
-                ].initial = self.instance.external_partie_object
+                self.fields['external_partie_object'].initial = self.instance.external_partie_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
+            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
         else:
-            self.fields[
-                'external_partie_object'
-            ].queryset = ServiceProvider.objects.all()
+            self.fields['external_partie_object'].queryset = ServiceProvider.objects.all()
             self.fields['external_partie_object'].initial = None
 
         # Initialise fields settings
@@ -150,25 +131,17 @@ class ContractForm(NetBoxModelForm):
         super().clean()
 
         if self.cleaned_data['mrc'] and self.cleaned_data['yrc']:
-            raise ValidationError(
-                'you should set monthly OR yearly recuring costs not both'
-            )
+            raise ValidationError('you should set monthly OR yearly recuring costs not both')
 
 
 class ContractFilterForm(NetBoxModelFilterSetForm):
     model = Contract
 
-    tenant = DynamicModelChoiceField(
-        queryset=Tenant.objects.all(), required=False, selector=True, label=_('Tenant')
-    )
+    tenant = DynamicModelChoiceField(queryset=Tenant.objects.all(), required=False, selector=True, label=_('Tenant'))
     external_reference = forms.CharField(required=False, label=_('External reference'))
-    internal_partie = forms.ChoiceField(
-        choices=InternalEntityChoices, required=False, label=_('Internal partie')
-    )
+    internal_partie = forms.ChoiceField(choices=InternalEntityChoices, required=False, label=_('Internal partie'))
     status = forms.ChoiceField(choices=StatusChoices, required=False, label=_('Status'))
-    currency = forms.ChoiceField(
-        choices=CurrencyChoices, required=False, label=_('Currency')
-    )
+    currency = forms.ChoiceField(choices=CurrencyChoices, required=False, label=_('Currency'))
     parent = DynamicModelChoiceField(
         queryset=Contract.objects.all(),
         required=False,
@@ -194,9 +167,7 @@ class ContractCSVForm(NetBoxModelImportForm):
         required=False,
         label=_('Tenant'),
     )
-    status = CSVChoiceField(
-        choices=StatusChoices, help_text='Contract status', label=_('Status')
-    )
+    status = CSVChoiceField(choices=StatusChoices, help_text='Contract status', label=_('Status'))
     parent = CSVModelChoiceField(
         queryset=Contract.objects.all(),
         to_field_name='name',
@@ -231,27 +202,17 @@ class ContractCSVForm(NetBoxModelImportForm):
 
     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
-        )
+        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)
 
         return external_partie_object.id
 
 
 class ContractBulkEditForm(NetBoxModelBulkEditForm):
     name = forms.CharField(max_length=100, required=False, label=_('Name'))
-    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')
-    )
+    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'))
     comments = CommentField(required=False, label=_('Comments'))
     parent = DynamicModelChoiceField(
         queryset=Contract.objects.all(),
@@ -302,9 +263,7 @@ class InvoiceForm(NetBoxModelForm):
             for contract in contracts:
                 for invoice in contract.invoices.all():
                     if invoice.template and invoice.pk != self.instance.pk:
-                        raise ValidationError(
-                            'Only one invoice template allowed per contract'
-                        )
+                        raise ValidationError('Only one invoice template allowed per contract')
 
             # Prefix the invoice name with _template
             self.cleaned_data['number'] = '_invoice_template_' + contract.name
@@ -324,9 +283,7 @@ class InvoiceForm(NetBoxModelForm):
             for contract in contracts:
                 try:
                     template_exists = True
-                    invoice_template = Invoice.objects.get(
-                        template=True, contracts=contract
-                    )
+                    invoice_template = Invoice.objects.get(template=True, contracts=contract)
                 except ObjectDoesNotExist:
                     template_exists = False
 
@@ -341,15 +298,8 @@ class InvoiceForm(NetBoxModelForm):
 
                         # adjust the first invoice line amount
                         amount = self.cleaned_data['amount']
-                        if (
-                            first
-                            and amount != invoice_template.total_invoicelines_amount
-                        ):
-                            line.amount = (
-                                line.amount
-                                + amount
-                                - invoice_template.total_invoicelines_amount
-                            )
+                        if first and amount != invoice_template.total_invoicelines_amount:
+                            line.amount = line.amount + amount - invoice_template.total_invoicelines_amount
 
                         line.save()
 
@@ -392,9 +342,7 @@ class InvoiceFilterForm(NetBoxModelFilterSetForm):
         widget=forms.Select(choices=BOOLEAN_WITH_BLANK_CHOICES),
         label=_('Template'),
     )
-    currency = forms.ChoiceField(
-        choices=CurrencyChoices, required=False, label=_('Currency')
-    )
+    currency = forms.ChoiceField(choices=CurrencyChoices, required=False, label=_('Currency'))
     contracts = DynamicModelMultipleChoiceField(
         queryset=Contract.objects.all(),
         required=False,
@@ -515,9 +463,7 @@ class ServiceProviderBulkEditForm(NetBoxModelBulkEditForm):
 
 
 class ContractAssignmentForm(NetBoxModelForm):
-    contract = DynamicModelChoiceField(
-        queryset=Contract.objects.all(), selector=True, label=_('Contract')
-    )
+    contract = DynamicModelChoiceField(queryset=Contract.objects.all(), selector=True, label=_('Contract'))
 
     class Meta:
         model = ContractAssignment

{netbox_contract-2.3.0 → netbox_contract-2.3.1}/src/netbox_contract/models.py

@@ -86,13 +86,9 @@ class AccountingDimension(NetBoxModel):
 
     def get_status_color(self):
         return AccountingDimensionStatusChoices.colors.get(self.status)
-    
+
     class Meta:
-        constraints = [
-            models.UniqueConstraint(
-                fields=['name', 'value'], name='unique_accounting_dimension'
-            )
-        ]
+        constraints = [models.UniqueConstraint(fields=['name', 'value'], name='unique_accounting_dimension')]
         ordering = ('name', 'value')
         verbose_name = _('accounting dimension')
         verbose_name_plural = _('accounting dimensions')
@@ -117,9 +113,7 @@ class ServiceProvider(ContactsMixin, NetBoxModel):
 
 
 class ContractAssignment(NetBoxModel):
-    content_type = models.ForeignKey(
-        to=ContentType, on_delete=models.CASCADE, verbose_name=_('content type')
-    )
+    content_type = models.ForeignKey(to=ContentType, on_delete=models.CASCADE, verbose_name=_('content type'))
     object_id = models.PositiveBigIntegerField(verbose_name=_('object ID'))
     content_object = GenericForeignKey(ct_field='content_type', fk_field='object_id')
     contract = models.ForeignKey(
@@ -157,12 +151,9 @@ class Contract(NetBoxModel):
     external_partie_object = GenericForeignKey(
         ct_field='external_partie_object_type', fk_field='external_partie_object_id'
     )
-    external_reference = models.CharField(
-        max_length=100, blank=True, null=True, verbose_name=_('external reference')
-    )
-    internal_partie = models.CharField(
-        max_length=50, choices=InternalEntityChoices, verbose_name=_('internal partie')
-    )
+    external_partie_object.editable = True
+    external_reference = models.CharField(max_length=100, blank=True, null=True, verbose_name=_('external reference'))
+    internal_partie = models.CharField(max_length=50, choices=InternalEntityChoices, verbose_name=_('internal partie'))
     tenant = models.ForeignKey(
         to='tenancy.Tenant',
         on_delete=models.PROTECT,
@@ -220,9 +211,7 @@ class Contract(NetBoxModel):
         null=True,
         help_text=_('Use either this field of the yearly recuring cost field'),
     )
-    nrc = models.DecimalField(
-        verbose_name=_('none recuring cost'), default=0, max_digits=10, decimal_places=2
-    )
+    nrc = models.DecimalField(verbose_name=_('none recuring cost'), default=0, max_digits=10, decimal_places=2)
     invoice_frequency = models.IntegerField(
         help_text=_('The frequency of invoices in month'),
         default=1,
@@ -248,12 +237,11 @@ class Contract(NetBoxModel):
 
     def get_status_color(self):
         return StatusChoices.colors.get(self.status)
+
     class Meta:
         ordering = ('name',)
         indexes = [
-            models.Index(
-                fields=['external_partie_object_type', 'external_partie_object_id']
-            ),
+            models.Index(fields=['external_partie_object_type', 'external_partie_object_id']),
         ]
         verbose_name = _('contract')
         verbose_name_plural = _('contracts')
@@ -276,12 +264,8 @@ class Invoice(NetBoxModel):
         help_text=_('Wether this invoice is a template or not'),
     )
     date = models.DateField(blank=True, null=True, verbose_name=_('date'))
-    contracts = models.ManyToManyField(
-        Contract, related_name='invoices', blank=True, verbose_name=_('contracts')
-    )
-    period_start = models.DateField(
-        blank=True, null=True, verbose_name=_('period start')
-    )
+    contracts = models.ManyToManyField(Contract, related_name='invoices', blank=True, verbose_name=_('contracts'))
+    period_start = models.DateField(blank=True, null=True, verbose_name=_('period start'))
     period_end = models.DateField(blank=True, null=True, verbose_name=_('period end'))
     currency = models.CharField(
         max_length=3,
@@ -289,9 +273,7 @@ class Invoice(NetBoxModel):
         default=CURRENCY_DEFAULT,
         verbose_name=_('currency'),
     )
-    amount = models.DecimalField(
-        max_digits=10, decimal_places=2, verbose_name=_('amount')
-    )
+    amount = models.DecimalField(max_digits=10, decimal_places=2, verbose_name=_('amount'))
     documents = models.URLField(
         blank=True,
         verbose_name=_('documents'),
@@ -331,9 +313,7 @@ class InvoiceLine(NetBoxModel):
         default=CURRENCY_DEFAULT,
         verbose_name=_('currency'),
     )
-    amount = models.DecimalField(
-        max_digits=10, decimal_places=2, verbose_name=_('amount')
-    )
+    amount = models.DecimalField(max_digits=10, decimal_places=2, verbose_name=_('amount'))
     accounting_dimensions = models.ManyToManyField(
         AccountingDimension, blank=True, verbose_name=_('accounting dimensions')
     )
@@ -355,14 +335,8 @@ class InvoiceLine(NetBoxModel):
         is_new = not bool(self.pk)
         if is_new:
             if amount > (invoice.amount - invoice.total_invoicelines_amount):
-                raise ValidationError(
-                    'Sum of invoice line amount greater than invoice amount'
-                )
+                raise ValidationError('Sum of invoice line amount greater than invoice amount')
         else:
             previous_amount = self.__class__.objects.get(pk=self.pk).amount
-            if amount > (
-                invoice.amount - invoice.total_invoicelines_amount + previous_amount
-            ):
-                raise ValidationError(
-                    'Sum of invoice line amount greater than invoice amount'
-                )
+            if amount > (invoice.amount - invoice.total_invoicelines_amount + previous_amount):
+                raise ValidationError('Sum of invoice line amount greater than invoice amount')

{netbox_contract-2.3.0 → netbox_contract-2.3.1}/src/netbox_contract/tables.py

@@ -45,6 +45,9 @@ class ContractAssignmentObjectTable(NetBoxTable):
     contract__external_partie_object = tables.Column(
         verbose_name='Partner', linkify=True
     )
+    contract__status = columns.ChoiceFieldColumn(
+        verbose_name=('Status'),
+    )
 
     class Meta(NetBoxTable.Meta):
         model = ContractAssignment
@@ -75,7 +78,9 @@ class ContractAssignmentObjectTable(NetBoxTable):
 class ContractAssignmentContractTable(NetBoxTable):
     content_type = columns.ContentTypeColumn(verbose_name='Object Type')
     content_object = tables.Column(linkify=True, verbose_name='Object', orderable=False)
-    content_object__status = tables.Column(verbose_name='Status')
+    content_object__status = columns.ChoiceFieldColumn(
+        verbose_name=('Status'),
+    )
     actions = columns.ActionsColumn(actions=('edit', 'delete'))
 
     class Meta(NetBoxTable.Meta):
@@ -136,6 +141,9 @@ class ContractListTable(NetBoxTable):
 class ContractListBottomTable(NetBoxTable):
     name = tables.Column(linkify=True)
     external_partie_object = tables.Column(linkify=True)
+    status = columns.ChoiceFieldColumn(
+        verbose_name=('Status'),
+    )
 
     class Meta(NetBoxTable.Meta):
         model = Contract
@@ -201,9 +209,7 @@ class ServiceProviderListTable(NetBoxTable):
 
 class InvoiceLineListTable(NetBoxTable):
     invoice = tables.Column(linkify=True)
-    accounting_dimensions = tables.ManyToManyColumn(
-        linkify=True, filter=lambda qs: qs.order_by('name')
-    )
+    accounting_dimensions = tables.ManyToManyColumn(linkify=True, filter=lambda qs: qs.order_by('name'))
 
     class Meta(NetBoxTable.Meta):
         model = InvoiceLine
@@ -229,6 +235,7 @@ class AccountingDimensionListTable(NetBoxTable):
     status = columns.ChoiceFieldColumn(
         verbose_name=('Status'),
     )
+
     class Meta(NetBoxTable.Meta):
         model = AccountingDimension
         fields = (

{netbox_contract-2.3.0 → netbox_contract-2.3.1}/src/netbox_contract/templates/netbox_contract/contract.html

@@ -76,7 +76,7 @@
             {% endif %}
             <tr>
               <th scope="row">{% trans "Currency" %}</th>
-              <td>{{ object.currency }}</td>
+              <td>{{ object.get_currency_display  }}</td>
             </tr>
             <tr>
               <th scope="row">{% trans "Monthly recuring costs" %}</th>
@@ -87,7 +87,7 @@
               <td>{{ object.yrc }}</td>
             </tr>
             <tr>
-              <th scope="row">{% trans "calculated corresponding Yearly or Monthly value" %}</th>
+              <th scope="row">{% trans "Calculated corresponding Yearly or Monthly value" %}</th>
               <td>{{ object.calculated_rc }}</td>
             </tr>
             <tr>
@@ -135,7 +135,7 @@
           </tr>
           <tr>
             <th scope="row">{% trans "Currency" %}</th>
-            <td>{{ invoice_template.currency }}</td>
+            <td>{{ invoice_template.get_currency_display  }}</td>
           </tr>
           <tr>
             <th scope="row">{% trans "Total amount" %}</th>

{netbox_contract-2.3.0 → netbox_contract-2.3.1}/src/netbox_contract/templates/netbox_contract/contractassignment.html

@@ -12,7 +12,7 @@
             </tr>
             <tr>
               <th scope="row">{% trans "Object" %}</th>
-              <td><a href="{{ object.content_object.get_absolute_url }}">{{ object.content_object.name }}</a></td>
+              <td><a href="{{ object.content_object.get_absolute_url }}">{{ object.content_object }}</a></td>
             </tr>
             <tr>
               <th scope="row">{% trans "Contract" %}</th>

{netbox_contract-2.3.0 → netbox_contract-2.3.1}/src/netbox_contract/templates/netbox_contract/invoice.html

@@ -40,7 +40,7 @@
             {% endif %}
             <tr>
               <th scope="row">{% trans "Currency" %}</th>
-              <td>{{ object.currency }}</td>
+              <td>{{ object.get_currency_display  }}</td>
             </tr>
             <tr>
               <th scope="row">{% trans "Amount" %}</th>

{netbox_contract-2.3.0 → netbox_contract-2.3.1}/src/netbox_contract/templates/netbox_contract/invoiceline.html

@@ -26,7 +26,7 @@
             </tr>
             <tr>
               <th scope="row">{% trans "Currency" %}</th>
-              <td>{{ object.currency }}</td>
+              <td>{{ object.get_currency_display  }}</td>
             </tr>
             <tr>
               <th scope="row">{% trans "Accounting dimensions" %}</th>

{netbox_contract-2.3.0 → netbox_contract-2.3.1/src/netbox_contract.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: netbox-contract
-Version: 2.3.0
+Version: 2.3.1
 Summary: Contract management plugin for Netbox
 Author-email: Marc Lebreuil <marc@famillelebreuil.net>
 Project-URL: Homepage, https://github.com/mlebreuil/netbox-contract
@@ -15,14 +15,29 @@ Requires-Dist: python-dateutil
 Requires-Dist: drf_yasg
 
 # Contract pluggin
-## Overview
+
+NetBox plugin to manage contracts.
+
+
+* Free software: MIT
+* Documentation: https://mlebreuil.github.io/netbox-contract/
+
+## Features
+
 The pluggin adds contracts and invoices model to Netbox.  
-It allows to register contract with objects.  
-Add invoices to contracts. 
+It allows to link contract with objects.  
+And link invoice templates and invoices with contracts.  
+Invoice lines can be linked to each invoice / invoice template.  
+Accounitng dimentoins can be linked with invoice lines.  
+
+## Compatibility
 
-Check the [documentation](https://mlebreuil.github.io/netbox-contract/) for additional information 
+| NetBox Version | Plugin Version |
+|----------------|----------------|
+|     4.1        |      2.2       |
+|     4.2        |      2.3       |
 
-## Installation
+## Installing
 
 ### Activate venv
 To ensure our plugin is accessible to the NetBox installation, we first need to activate the Python [virtual environment](https://docs.python.org/3/library/venv.html) that was created when we installed NetBox. To do this, determine the virtual environment's path (this will be `/opt/netbox/venv/` if you use the documentation's defaults) and activate it:
@@ -57,11 +72,6 @@ The following configurationitems can be set:
 PLUGINS_CONFIG = {
     'netbox_contract': {
         'top_level_menu': True,
-        'default_accounting_dimensions':{
-            "account": "", 
-            "project": "", 
-            "cost center": ""
-        },
         'mandatory_contract_fields': [],
         'hidden_contract_fields': [],
         'mandatory_invoice_fields': [],
@@ -86,9 +96,8 @@ The first currency will also be the default currency for contracts.
 # configuration.py
 FIELD_CHOICES = {
     'netbox_contract.Contract.internal_partie': (
-        ('Nagravision SARL', 'Nagravision SARL', 'green'),
-        ('Nagra USA', 'Nagra USA', 'green'),
-        ('Nagra India', 'Nagra India', 'green'),
+        ('entity1', 'Entity 1', 'green'),
+        ('entity2', 'Entity 2', 'yellow'),
     ),
     'netbox_contract.Contract.currency': (
         ('usd', 'USD'),

{netbox_contract-2.3.0 → netbox_contract-2.3.1}/src/netbox_contract.egg-info/SOURCES.txt

@@ -1,8 +1,15 @@
+CONTRIBUTING.md
 LICENSE
 MANIFEST.in
 README.md
 pyproject.toml
 setup.py
+docs/img/accounting_dimensions.png
+docs/img/contract.png
+docs/img/contract_linked_objects.png
+docs/img/invoice.png
+docs/img/invoice_line.png
+docs/img/invoice_linked_objects.png
 src/netbox_contract/__init__.py
 src/netbox_contract/constants.py
 src/netbox_contract/filtersets.py
@@ -71,4 +78,6 @@ src/netbox_contract/templates/netbox_contract/contract.html
 src/netbox_contract/templates/netbox_contract/contractassignment.html
 src/netbox_contract/templates/netbox_contract/invoice.html
 src/netbox_contract/templates/netbox_contract/invoiceline.html
-src/netbox_contract/templates/netbox_contract/serviceprovider.html
+src/netbox_contract/templates/netbox_contract/serviceprovider.html
+tests/__init__.py
+tests/test_netbox_contract.py

netbox_contract-2.3.1/tests/__init__.py

@@ -0,0 +1 @@
+"""Unit test package for test_plugin."""

netbox_contract-2.3.1/tests/test_netbox_contract.py

@@ -0,0 +1,5 @@
+#!/usr/bin/env python
+
+"""Tests for `netbox_contract` package."""
+
+# from netbox_contract import netbox_contract

netbox_contract-2.3.0/MANIFEST.in

@@ -1,2 +0,0 @@
-graft src/netbox_contract/templates
-graft src/netbox_contract/templates/netbox_contract