diff --git a/InvenTree/label/migrations/0004_auto_20210111_2302.py b/InvenTree/label/migrations/0004_auto_20210111_2302.py new file mode 100644 index 0000000000..5194a4bda1 --- /dev/null +++ b/InvenTree/label/migrations/0004_auto_20210111_2302.py @@ -0,0 +1,56 @@ +# Generated by Django 3.0.7 on 2021-01-11 12:02 + +import InvenTree.helpers +import django.core.validators +from django.db import migrations, models +import label.models + + +class Migration(migrations.Migration): + + dependencies = [ + ('label', '0003_stocklocationlabel'), + ] + + operations = [ + migrations.AlterField( + model_name='stockitemlabel', + name='description', + field=models.CharField(blank=True, help_text='Label description', max_length=250, null=True, verbose_name='Description'), + ), + migrations.AlterField( + model_name='stockitemlabel', + name='filters', + field=models.CharField(blank=True, help_text='Query filters (comma-separated list of key=value pairs', max_length=250, validators=[InvenTree.helpers.validateFilterString], verbose_name='Filters'), + ), + migrations.AlterField( + model_name='stockitemlabel', + name='label', + field=models.FileField(help_text='Label template file', unique=True, upload_to=label.models.rename_label, validators=[django.core.validators.FileExtensionValidator(allowed_extensions=['html'])], verbose_name='Label'), + ), + migrations.AlterField( + model_name='stockitemlabel', + name='name', + field=models.CharField(help_text='Label name', max_length=100, verbose_name='Name'), + ), + migrations.AlterField( + model_name='stocklocationlabel', + name='description', + field=models.CharField(blank=True, help_text='Label description', max_length=250, null=True, verbose_name='Description'), + ), + migrations.AlterField( + model_name='stocklocationlabel', + name='filters', + field=models.CharField(blank=True, help_text='Query filters (comma-separated list of key=value pairs', max_length=250, validators=[InvenTree.helpers.validateFilterString], verbose_name='Filters'), + ), + migrations.AlterField( + model_name='stocklocationlabel', + name='label', + field=models.FileField(help_text='Label template file', unique=True, upload_to=label.models.rename_label, validators=[django.core.validators.FileExtensionValidator(allowed_extensions=['html'])], verbose_name='Label'), + ), + migrations.AlterField( + model_name='stocklocationlabel', + name='name', + field=models.CharField(help_text='Label name', max_length=100, verbose_name='Name'), + ), + ] diff --git a/InvenTree/label/models.py b/InvenTree/label/models.py index 2242fe41e4..3e693b1e50 100644 --- a/InvenTree/label/models.py +++ b/InvenTree/label/models.py @@ -50,20 +50,23 @@ class LabelTemplate(models.Model): ) name = models.CharField( - unique=True, blank=False, max_length=100, + verbose_name=_('Name'), help_text=_('Label name'), ) description = models.CharField( max_length=250, blank=True, null=True, + verbose_name=_('Description'), help_text=_('Label description'), ) label = models.FileField( upload_to=rename_label, + unique=True, blank=False, null=False, + verbose_name=_('Label'), help_text=_('Label template file'), validators=[FileExtensionValidator(allowed_extensions=['html'])], ) @@ -71,13 +74,14 @@ class LabelTemplate(models.Model): filters = models.CharField( blank=True, max_length=250, help_text=_('Query filters (comma-separated list of key=value pairs'), + verbose_name=_('Filters'), validators=[validateFilterString] ) enabled = models.BooleanField( default=True, + verbose_name=_('Enabled'), help_text=_('Label template is enabled'), - verbose_name=_('Enabled') ) def get_record_data(self, items):