Merge branch 'master' into customer_orders

InvenTree/build/migrations/0004_auto_20180417_0657.py

@@ -0,0 +1,48 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.12 on 2018-04-17 06:57
+from __future__ import unicode_literals
+
+import django.core.validators
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('part', '0019_auto_20180416_1249'),
+        ('build', '0003_build_part'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='BuildOutput',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('quantity', models.PositiveIntegerField(default=1, help_text='Number of parts to build', validators=[django.core.validators.MinValueValidator(1)])),
+            ],
+        ),
+        migrations.RemoveField(
+            model_name='build',
+            name='part',
+        ),
+        migrations.RemoveField(
+            model_name='build',
+            name='quantity',
+        ),
+        migrations.AlterField(
+            model_name='build',
+            name='status',
+            field=models.PositiveIntegerField(choices=[(40, 'Cancelled'), (10, 'Pending'), (20, 'Allocated'), (50, 'Complete'), (30, 'Holding')], default=10, validators=[django.core.validators.MinValueValidator(0)]),
+        ),
+        migrations.AddField(
+            model_name='buildoutput',
+            name='build',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='outputs', to='build.Build'),
+        ),
+        migrations.AddField(
+            model_name='buildoutput',
+            name='part',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='builds', to='part.Part'),
+        ),
+    ]

InvenTree/build/migrations/0005_buildoutput_batch.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.12 on 2018-04-17 08:29
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('build', '0004_auto_20180417_0657'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='buildoutput',
+            name='batch',
+            field=models.CharField(blank=True, help_text='Batch code for this build output', max_length=100),
+        ),
+    ]

InvenTree/build/migrations/0006_auto_20180417_0933.py

@@ -0,0 +1,66 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.12 on 2018-04-17 09:33
+from __future__ import unicode_literals
+
+import django.core.validators
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('part', '0022_auto_20180417_0819'),
+        ('build', '0005_buildoutput_batch'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='buildoutput',
+            name='build',
+        ),
+        migrations.RemoveField(
+            model_name='buildoutput',
+            name='part',
+        ),
+        migrations.AddField(
+            model_name='build',
+            name='batch',
+            field=models.CharField(blank=True, help_text='Batch code for this build output', max_length=100, null=True),
+        ),
+        migrations.AddField(
+            model_name='build',
+            name='completion_date',
+            field=models.DateField(blank=True, null=True),
+        ),
+        migrations.AddField(
+            model_name='build',
+            name='creation_date',
+            field=models.DateField(auto_now=True),
+        ),
+        migrations.AddField(
+            model_name='build',
+            name='notes',
+            field=models.CharField(blank=True, max_length=500),
+        ),
+        migrations.AddField(
+            model_name='build',
+            name='part',
+            field=models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, related_name='builds', to='part.Part'),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name='build',
+            name='quantity',
+            field=models.PositiveIntegerField(default=1, help_text='Number of parts to build', validators=[django.core.validators.MinValueValidator(1)]),
+        ),
+        migrations.AddField(
+            model_name='build',
+            name='title',
+            field=models.CharField(default='Build title', help_text='Brief description of the build', max_length=100),
+            preserve_default=False,
+        ),
+        migrations.DeleteModel(
+            name='BuildOutput',
+        ),
+    ]

InvenTree/build/migrations/0007_auto_20180417_1025.py

@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.12 on 2018-04-17 10:25
+from __future__ import unicode_literals
+
+import django.core.validators
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('build', '0006_auto_20180417_0933'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='build',
+            name='status',
+            field=models.PositiveIntegerField(choices=[(40, 'Complete'), (10, 'Pending'), (20, 'Holding'), (30, 'Cancelled')], default=10, validators=[django.core.validators.MinValueValidator(0)]),
+        ),
+    ]