From dedc25d68155b26d5b44ed5d36e2e8fd2f6edfee Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Sat, 13 Jun 2020 20:46:19 +1000 Subject: [PATCH] Update verbose names for some fields --- .../migrations/0022_auto_20200613_1045.py | 55 +++++++++++++++++++ InvenTree/company/models.py | 13 +++-- 2 files changed, 64 insertions(+), 4 deletions(-) create mode 100644 InvenTree/company/migrations/0022_auto_20200613_1045.py diff --git a/InvenTree/company/migrations/0022_auto_20200613_1045.py b/InvenTree/company/migrations/0022_auto_20200613_1045.py new file mode 100644 index 0000000000..66cd1231b8 --- /dev/null +++ b/InvenTree/company/migrations/0022_auto_20200613_1045.py @@ -0,0 +1,55 @@ +# Generated by Django 3.0.7 on 2020-06-13 10:45 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('part', '0045_auto_20200605_0932'), + ('company', '0021_remove_supplierpart_manufacturer_name'), + ] + + operations = [ + migrations.AlterField( + model_name='company', + name='address', + field=models.CharField(blank=True, help_text='Company address', max_length=200, verbose_name='Address'), + ), + migrations.AlterField( + model_name='company', + name='contact', + field=models.CharField(blank=True, help_text='Point of contact', max_length=100, verbose_name='Contact'), + ), + migrations.AlterField( + model_name='company', + name='description', + field=models.CharField(help_text='Description of the company', max_length=500, verbose_name='Company description'), + ), + migrations.AlterField( + model_name='company', + name='email', + field=models.EmailField(blank=True, help_text='Contact email address', max_length=254, verbose_name='Email'), + ), + migrations.AlterField( + model_name='company', + name='name', + field=models.CharField(help_text='Company name', max_length=100, unique=True, verbose_name='Company name'), + ), + migrations.AlterField( + model_name='company', + name='phone', + field=models.CharField(blank=True, help_text='Contact phone number', max_length=50, verbose_name='Phone number'), + ), + migrations.AlterField( + model_name='company', + name='website', + field=models.URLField(blank=True, help_text='Company website URL', verbose_name='Website'), + ), + migrations.AlterField( + model_name='supplierpart', + name='part', + field=models.ForeignKey(help_text='Select part', limit_choices_to={'is_template': False, 'purchaseable': True}, on_delete=django.db.models.deletion.CASCADE, related_name='supplier_parts', to='part.Part', verbose_name='Base Part'), + ), + ] diff --git a/InvenTree/company/models.py b/InvenTree/company/models.py index ec87619cdb..2179897263 100644 --- a/InvenTree/company/models.py +++ b/InvenTree/company/models.py @@ -80,21 +80,25 @@ class Company(models.Model): """ name = models.CharField(max_length=100, blank=False, unique=True, - help_text=_('Company name')) + help_text=_('Company name'), + verbose_name=_('Company name')) - description = models.CharField(max_length=500, help_text=_('Description of the company')) + description = models.CharField(max_length=500, verbose_name=_('Company description'), help_text=_('Description of the company')) - website = models.URLField(blank=True, help_text=_('Company website URL')) + website = models.URLField(blank=True, verbose_name=_('Website'), help_text=_('Company website URL')) address = models.CharField(max_length=200, + verbose_name=_('Address'), blank=True, help_text=_('Company address')) phone = models.CharField(max_length=50, + verbose_name=_('Phone number'), blank=True, help_text=_('Contact phone number')) - email = models.EmailField(blank=True, help_text=_('Contact email address')) + email = models.EmailField(blank=True, verbose_name=_('Email'), help_text=_('Contact email address')) contact = models.CharField(max_length=100, + verbose_name=_('Contact'), blank=True, help_text=_('Point of contact')) link = InvenTreeURLField(blank=True, help_text=_('Link to external company information')) @@ -269,6 +273,7 @@ class SupplierPart(models.Model): part = models.ForeignKey('part.Part', on_delete=models.CASCADE, related_name='supplier_parts', + verbose_name=_('Base Part'), limit_choices_to={ 'purchaseable': True, 'is_template': False,