From 33a6e5cb02189b7621a279c32c12b5c3d83ba680 Mon Sep 17 00:00:00 2001 From: Mitch Riedstra Date: Thu, 9 Nov 2017 15:57:46 -0500 Subject: Show number of attachments, and color code issues with loads. Prevent invoice generation on zero amounts and no attachments. Add a way for superusers to edit invoices. Add a field to invoices for a payment identifier. E.g. "Check #1234" --- app/dispatch/migrations/0001_initial.py | 2 +- app/dispatch/migrations/0002_auto_20171102_1949.py | 65 ---------------------- app/dispatch/migrations/0002_auto_20171107_1912.py | 65 ++++++++++++++++++++++ .../migrations/0003_invoice_payment_identifer.py | 20 +++++++ 4 files changed, 86 insertions(+), 66 deletions(-) delete mode 100644 app/dispatch/migrations/0002_auto_20171102_1949.py create mode 100644 app/dispatch/migrations/0002_auto_20171107_1912.py create mode 100644 app/dispatch/migrations/0003_invoice_payment_identifer.py (limited to 'app/dispatch/migrations') diff --git a/app/dispatch/migrations/0001_initial.py b/app/dispatch/migrations/0001_initial.py index a358b07..d2aa2f8 100644 --- a/app/dispatch/migrations/0001_initial.py +++ b/app/dispatch/migrations/0001_initial.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.11.5 on 2017-11-02 19:49 +# Generated by Django 1.11.5 on 2017-11-07 19:12 from __future__ import unicode_literals import dispatch.misc diff --git a/app/dispatch/migrations/0002_auto_20171102_1949.py b/app/dispatch/migrations/0002_auto_20171102_1949.py deleted file mode 100644 index 4be45e9..0000000 --- a/app/dispatch/migrations/0002_auto_20171102_1949.py +++ /dev/null @@ -1,65 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.5 on 2017-11-02 19:49 -from __future__ import unicode_literals - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('dispatch', '0001_initial'), - ] - - operations = [ - migrations.AddField( - model_name='userinvoicenumber', - name='user', - field=models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL), - ), - migrations.AddField( - model_name='paperwork', - name='load', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='dispatch.Load'), - ), - migrations.AddField( - model_name='load', - name='customer', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='dispatch.Customer'), - ), - migrations.AddField( - model_name='load', - name='user', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL), - ), - migrations.AddField( - model_name='invoiceitem', - name='invoice', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='dispatch.Invoice'), - ), - migrations.AddField( - model_name='invoice', - name='bill_to', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='bill_to', to='dispatch.Identity'), - ), - migrations.AddField( - model_name='invoice', - name='owner', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='owner', to='dispatch.Identity'), - ), - migrations.AddField( - model_name='invoice', - name='user', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL), - ), - migrations.AddField( - model_name='identity', - name='user', - field=models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL), - ), - ] diff --git a/app/dispatch/migrations/0002_auto_20171107_1912.py b/app/dispatch/migrations/0002_auto_20171107_1912.py new file mode 100644 index 0000000..059d7be --- /dev/null +++ b/app/dispatch/migrations/0002_auto_20171107_1912.py @@ -0,0 +1,65 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.5 on 2017-11-07 19:12 +from __future__ import unicode_literals + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ('dispatch', '0001_initial'), + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ] + + operations = [ + migrations.AddField( + model_name='userinvoicenumber', + name='user', + field=models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL), + ), + migrations.AddField( + model_name='paperwork', + name='load', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='dispatch.Load'), + ), + migrations.AddField( + model_name='load', + name='customer', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='dispatch.Customer'), + ), + migrations.AddField( + model_name='load', + name='user', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL), + ), + migrations.AddField( + model_name='invoiceitem', + name='invoice', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='dispatch.Invoice'), + ), + migrations.AddField( + model_name='invoice', + name='bill_to', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='bill_to', to='dispatch.Identity'), + ), + migrations.AddField( + model_name='invoice', + name='owner', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='owner', to='dispatch.Identity'), + ), + migrations.AddField( + model_name='invoice', + name='user', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL), + ), + migrations.AddField( + model_name='identity', + name='user', + field=models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL), + ), + ] diff --git a/app/dispatch/migrations/0003_invoice_payment_identifer.py b/app/dispatch/migrations/0003_invoice_payment_identifer.py new file mode 100644 index 0000000..21130a7 --- /dev/null +++ b/app/dispatch/migrations/0003_invoice_payment_identifer.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.5 on 2017-11-09 20:53 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('dispatch', '0002_auto_20171107_1912'), + ] + + operations = [ + migrations.AddField( + model_name='invoice', + name='payment_identifer', + field=models.CharField(default='', max_length=256), + ), + ] -- cgit v1.2.3