From ac82640c6c722a23620f9096dfc9cd6d235cf2c1 Mon Sep 17 00:00:00 2001 From: eeintech Date: Mon, 12 Oct 2020 17:51:48 -0500 Subject: [PATCH] Company: allowed duplicate names, made email field unique, custom migration --- .../migrations/0024_auto_20201012_2238.py | 30 +++++++++++++++++++ InvenTree/company/models.py | 5 ++-- 2 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 InvenTree/company/migrations/0024_auto_20201012_2238.py diff --git a/InvenTree/company/migrations/0024_auto_20201012_2238.py b/InvenTree/company/migrations/0024_auto_20201012_2238.py new file mode 100644 index 0000000000..8066ea960d --- /dev/null +++ b/InvenTree/company/migrations/0024_auto_20201012_2238.py @@ -0,0 +1,30 @@ +from django.db import migrations, models + + +def make_empty_email_field_null(apps, schema_editor): + Company = apps.get_model('company', 'Company') + for company in Company.objects.all(): + if company.email == '': + company.email = None + company.save() + + +class Migration(migrations.Migration): + + dependencies = [ + ('company', '0023_auto_20200808_0715'), + ] + + operations = [ + migrations.RunPython(make_empty_email_field_null), + migrations.AlterField( + model_name='company', + name='email', + field=models.EmailField(blank=True, help_text='Contact email address', max_length=254, null=True, unique=True, verbose_name='Email'), + ), + migrations.AlterField( + model_name='company', + name='name', + field=models.CharField(help_text='Company name', max_length=100, verbose_name='Company name'), + ), + ] diff --git a/InvenTree/company/models.py b/InvenTree/company/models.py index 2a8d907b76..dd3d170a89 100644 --- a/InvenTree/company/models.py +++ b/InvenTree/company/models.py @@ -82,7 +82,7 @@ class Company(models.Model): class Meta: ordering = ['name', ] - name = models.CharField(max_length=100, blank=False, unique=True, + name = models.CharField(max_length=100, blank=False, help_text=_('Company name'), verbose_name=_('Company name')) @@ -98,7 +98,8 @@ class Company(models.Model): verbose_name=_('Phone number'), blank=True, help_text=_('Contact phone number')) - email = models.EmailField(blank=True, verbose_name=_('Email'), help_text=_('Contact email address')) + email = models.EmailField(blank=True, null=True, unique=True, + verbose_name=_('Email'), help_text=_('Contact email address')) contact = models.CharField(max_length=100, verbose_name=_('Contact'),