From 22f8c1d8c787a05af0b00922f8ac857393dae9cb Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Thu, 2 May 2019 00:57:44 +1000 Subject: [PATCH 1/3] Adjust model field (haven't run make migrate yet) --- InvenTree/stock/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/InvenTree/stock/models.py b/InvenTree/stock/models.py index 1be1385f5f..a2ccff16a6 100644 --- a/InvenTree/stock/models.py +++ b/InvenTree/stock/models.py @@ -130,7 +130,7 @@ class StockItem(models.Model): 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 - part = models.ForeignKey('part.Part', on_delete=models.CASCADE, related_name='locations') + part = models.ForeignKey('part.Part', on_delete=models.CASCADE, related_name='locations', help_text='Base part') # The 'supplier part' used in this instance. May be null if no supplier parts are defined the master part supplier_part = models.ForeignKey('part.SupplierPart', blank=True, null=True, on_delete=models.SET_NULL) From 20cfa71db2a0b54afdfd43b7bdb1ed2a7354aa79 Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Thu, 2 May 2019 00:59:59 +1000 Subject: [PATCH 2/3] Added migration file --- .../migrations/0012_auto_20190502_0058.py | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 InvenTree/stock/migrations/0012_auto_20190502_0058.py diff --git a/InvenTree/stock/migrations/0012_auto_20190502_0058.py b/InvenTree/stock/migrations/0012_auto_20190502_0058.py new file mode 100644 index 0000000000..1c86926fcd --- /dev/null +++ b/InvenTree/stock/migrations/0012_auto_20190502_0058.py @@ -0,0 +1,19 @@ +# Generated by Django 2.2 on 2019-05-01 14:58 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('stock', '0011_auto_20190502_0041'), + ] + + operations = [ + migrations.AlterField( + model_name='stockitem', + name='part', + field=models.ForeignKey(help_text='Base part', on_delete=django.db.models.deletion.CASCADE, related_name='locations', to='part.Part'), + ), + ] From e852393c1d30bd6d2eeb064b246e1eb0934d52f4 Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Thu, 2 May 2019 01:02:29 +1000 Subject: [PATCH 3/3] Remoe error for now, just list untracked files --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 17b4950914..91d1431f2f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,6 @@ before_install: script: - git ls-files --exclude-standard --others - - test -z "$(git ls-files --exclude-standard --others)" - make coverage - make style