diff options
Diffstat (limited to 'ishtar_common')
| -rw-r--r-- | ishtar_common/migrations/0205_auto_20201104_0959.py (renamed from ishtar_common/migrations/0205_auto_20201007_1215.py) | 40 | ||||
| -rw-r--r-- | ishtar_common/models_common.py | 3 |
2 files changed, 4 insertions, 39 deletions
diff --git a/ishtar_common/migrations/0205_auto_20201007_1215.py b/ishtar_common/migrations/0205_auto_20201104_0959.py index 41a931843..e6cb86081 100644 --- a/ishtar_common/migrations/0205_auto_20201007_1215.py +++ b/ishtar_common/migrations/0205_auto_20201104_0959.py @@ -1,9 +1,8 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.11.27 on 2020-10-07 12:15 +# Generated by Django 1.11.27 on 2020-11-04 09:59 from __future__ import unicode_literals from django.db import migrations, models -import django.db.models.deletion class Migration(migrations.Migration): @@ -16,7 +15,7 @@ class Migration(migrations.Migration): migrations.AddField( model_name='document', name='complete_identifier', - field=models.TextField(blank=True, verbose_name='Complete identifier'), + field=models.TextField(blank=True, null=True, verbose_name='Complete identifier'), ), migrations.AddField( model_name='ishtarsiteprofile', @@ -63,39 +62,4 @@ class Migration(migrations.Migration): name='warehouse_complete_identifier', field=models.TextField(default='', help_text='Formula to manage warehouse complete identifier.', verbose_name='Warehouse complete identifier'), ), - migrations.AlterField( - model_name='document', - name='format_type', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='ishtar_common.Format', verbose_name='Medium'), - ), - migrations.AlterField( - model_name='document', - name='publisher', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='publish', to='ishtar_common.Organization', verbose_name='Publisher'), - ), - migrations.AlterField( - model_name='importercolumn', - name='regexp_pre_filter', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='columns', to='ishtar_common.Regexp'), - ), - migrations.AlterField( - model_name='importercolumn', - name='value_format', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='columns', to='ishtar_common.ValueFormater'), - ), - migrations.AlterField( - model_name='importertype', - name='associated_models', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='importer_type_associated', to='ishtar_common.ImporterModel', verbose_name='Associated model'), - ), - migrations.AlterField( - model_name='importertype', - name='created_models', - field=models.ManyToManyField(blank=True, help_text='Leave blank for no restrictions', related_name='importer_type_created', to='ishtar_common.ImporterModel', verbose_name='Models that can accept new items'), - ), - migrations.AlterField( - model_name='importtarget', - name='formater_type', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='targets', to='ishtar_common.FormaterType'), - ), ] diff --git a/ishtar_common/models_common.py b/ishtar_common/models_common.py index 8c5d60637..98d435ce9 100644 --- a/ishtar_common/models_common.py +++ b/ishtar_common/models_common.py @@ -2643,7 +2643,8 @@ class ImageContainerModel: class CompleteIdentifierItem(models.Model, ImageContainerModel): HAS_QR_CODE = True - complete_identifier = models.TextField(_("Complete identifier"), blank=True) + complete_identifier = models.TextField(_("Complete identifier"), + blank=True, null=True) qrcode = models.ImageField(upload_to=get_image_path, blank=True, null=True, max_length=255) |