diff --git a/InvenTree/company/tests.py b/InvenTree/company/tests.py index 5229fdb045..f7bcd4e0b6 100644 --- a/InvenTree/company/tests.py +++ b/InvenTree/company/tests.py @@ -1,3 +1,6 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + from django.test import TestCase from django.core.exceptions import ValidationError diff --git a/InvenTree/report/admin.py b/InvenTree/report/admin.py index 390964b590..610b32dd4c 100644 --- a/InvenTree/report/admin.py +++ b/InvenTree/report/admin.py @@ -8,7 +8,7 @@ from .models import ReportSnippet, TestReport, ReportAsset class ReportTemplateAdmin(admin.ModelAdmin): - list_display = ('name', 'description', 'template', 'filters', 'enabled') + list_display = ('name', 'description', 'template', 'filters', 'enabled', 'revision') class ReportSnippetAdmin(admin.ModelAdmin): diff --git a/InvenTree/report/migrations/0009_testreport_revision.py b/InvenTree/report/migrations/0009_testreport_revision.py new file mode 100644 index 0000000000..d78e866968 --- /dev/null +++ b/InvenTree/report/migrations/0009_testreport_revision.py @@ -0,0 +1,18 @@ +# Generated by Django 3.0.7 on 2021-02-05 00:53 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('report', '0008_auto_20210204_2100'), + ] + + operations = [ + migrations.AddField( + model_name='testreport', + name='revision', + field=models.PositiveIntegerField(default=1, help_text='Report revision number (auto-increments)', verbose_name='Revision'), + ), + ] diff --git a/InvenTree/report/migrations/0010_auto_20210205_1201.py b/InvenTree/report/migrations/0010_auto_20210205_1201.py new file mode 100644 index 0000000000..af8821032e --- /dev/null +++ b/InvenTree/report/migrations/0010_auto_20210205_1201.py @@ -0,0 +1,18 @@ +# Generated by Django 3.0.7 on 2021-02-05 01:01 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('report', '0009_testreport_revision'), + ] + + operations = [ + migrations.AlterField( + model_name='testreport', + name='revision', + field=models.PositiveIntegerField(default=1, editable=False, help_text='Report revision number (auto-increments)', verbose_name='Revision'), + ), + ] diff --git a/InvenTree/report/models.py b/InvenTree/report/models.py index 422216f9a9..b5550412e0 100644 --- a/InvenTree/report/models.py +++ b/InvenTree/report/models.py @@ -62,6 +62,13 @@ class ReportBase(models.Model): class Meta: abstract = True + def save(self, *args, **kwargs): + + # Increment revision number + self.revision += 1 + + super().save() + def __str__(self): return "{n} - {d}".format(n=self.name, d=self.description) @@ -113,6 +120,13 @@ class ReportBase(models.Model): help_text=_("Report template description") ) + revision = models.PositiveIntegerField( + default=1, + verbose_name=_("Revision"), + help_text=_("Report revision number (auto-increments)"), + editable=False, + ) + class ReportTemplateBase(ReportBase): """