diff options
Diffstat (limited to 'app/dispatch/migrations')
| -rw-r--r-- | app/dispatch/migrations/0001_initial.py | 12 | ||||
| -rw-r--r-- | app/dispatch/migrations/0002_auto_20171018_1602.py | 30 | ||||
| -rw-r--r-- | app/dispatch/migrations/0003_remove_load_load_number.py | 19 |
3 files changed, 6 insertions, 55 deletions
diff --git a/app/dispatch/migrations/0001_initial.py b/app/dispatch/migrations/0001_initial.py index 7a920f7..500e6ea 100644 --- a/app/dispatch/migrations/0001_initial.py +++ b/app/dispatch/migrations/0001_initial.py @@ -1,7 +1,8 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.11.5 on 2017-10-18 15:46 +# Generated by Django 1.11.5 on 2017-10-20 00:51 from __future__ import unicode_literals +import dispatch.models from django.conf import settings from django.db import migrations, models import django.db.models.deletion @@ -17,7 +18,7 @@ class Migration(migrations.Migration): operations = [ migrations.CreateModel( - name='Company', + name='Customer', fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('name', models.CharField(max_length=256)), @@ -31,11 +32,11 @@ class Migration(migrations.Migration): name='Load', fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('load_number', models.CharField(default='', max_length=64)), ('date', models.DateField()), ('description', models.CharField(max_length=256)), + ('delivered_to', models.CharField(default='', max_length=256)), ('amount', models.DecimalField(decimal_places=2, default='0', max_digits=10)), - ('company', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='dispatch.Company')), + ('customer', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='dispatch.Customer')), ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), ], ), @@ -44,8 +45,7 @@ class Migration(migrations.Migration): fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('description', models.CharField(max_length=256)), - ('filename', models.CharField(max_length=256)), - ('document', models.FileField(upload_to='paperwork/')), + ('document', models.FileField(upload_to=dispatch.models.paperwork_user_directory_path)), ('load', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='dispatch.Load')), ], ), diff --git a/app/dispatch/migrations/0002_auto_20171018_1602.py b/app/dispatch/migrations/0002_auto_20171018_1602.py deleted file mode 100644 index 6446dd4..0000000 --- a/app/dispatch/migrations/0002_auto_20171018_1602.py +++ /dev/null @@ -1,30 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.5 on 2017-10-18 16:02 -from __future__ import unicode_literals - -import dispatch.models -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('dispatch', '0001_initial'), - ] - - operations = [ - migrations.RemoveField( - model_name='paperwork', - name='filename', - ), - migrations.AddField( - model_name='load', - name='delivered_to', - field=models.CharField(default='', max_length=256), - ), - migrations.AlterField( - model_name='paperwork', - name='document', - field=models.FileField(upload_to=dispatch.models.paperwork_user_directory_path), - ), - ] diff --git a/app/dispatch/migrations/0003_remove_load_load_number.py b/app/dispatch/migrations/0003_remove_load_load_number.py deleted file mode 100644 index cd352ee..0000000 --- a/app/dispatch/migrations/0003_remove_load_load_number.py +++ /dev/null @@ -1,19 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.5 on 2017-10-20 00:39 -from __future__ import unicode_literals - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('dispatch', '0002_auto_20171018_1602'), - ] - - operations = [ - migrations.RemoveField( - model_name='load', - name='load_number', - ), - ] |