Mirrored_Repos/InvenTree
1
0
Fork 0
mirror of https://github.com/inventree/InvenTree synced 2024-08-30 18:33:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #867 from SchrodingersGat/name-conventions

Browse Source 
Update verbose names for some fields
This commit is contained in:
Oliver 2020-06-13 20:52:15 +10:00 committed by GitHub
commit 16bea33695
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 64 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
InvenTree/company/migrations/0022_auto_20200613_1045.py Normal file
View File

@ -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'),
),
]

13
InvenTree/company/models.py
View File

@ -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,