Merge remote-tracking branch 'inventree/master'

This commit is contained in:
Oliver Walters 2019-05-02 00:56:42 +10:00
commit 4de3445c58
3 changed files with 22 additions and 1 deletions

View File

@ -13,6 +13,8 @@ before_install:
- make migrate - make migrate
script: script:
- git ls-files --exclude-standard --others
- test -z "$(git ls-files --exclude-standard --others)"
- make coverage - make coverage
- make style - make style

View File

@ -0,0 +1,19 @@
# Generated by Django 2.2 on 2019-05-01 14:41
from django.db import migrations, models
import uuid
class Migration(migrations.Migration):
dependencies = [
('stock', '0010_auto_20190501_2344'),
]
operations = [
migrations.AlterField(
model_name='stockitem',
name='uuid',
field=models.UUIDField(blank=True, default=uuid.uuid4, editable=False, help_text='Unique ID for the StockItem'),
),
]

View File

@ -127,7 +127,7 @@ class StockItem(models.Model):
] ]
# UUID for generating QR codes # UUID for generating QR codes
uuid = models.UUIDField(default=uuid.uuid4, blank=True, editable=False) uuid = models.UUIDField(default=uuid.uuid4, blank=True, editable=False, help_text='Unique ID for the StockItem')
# The 'master' copy of the part of which this stock item is an instance # The 'master' copy of the part of which this stock item is an instance
part = models.ForeignKey('part.Part', on_delete=models.CASCADE, related_name='locations') part = models.ForeignKey('part.Part', on_delete=models.CASCADE, related_name='locations')