diff --git a/InvenTree/order/admin.py b/InvenTree/order/admin.py index 2fdf71950d..18f1dd32f8 100644 --- a/InvenTree/order/admin.py +++ b/InvenTree/order/admin.py @@ -11,6 +11,7 @@ class PurchaseOrderAdmin(admin.ModelAdmin): list_display = ( 'reference', + 'supplier', 'description', 'creation_date' ) diff --git a/InvenTree/order/migrations/0002_auto_20190604_2224.py b/InvenTree/order/migrations/0002_auto_20190604_2224.py new file mode 100644 index 0000000000..2565eae2a2 --- /dev/null +++ b/InvenTree/order/migrations/0002_auto_20190604_2224.py @@ -0,0 +1,29 @@ +# Generated by Django 2.2 on 2019-06-04 12:24 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('order', '0001_initial'), + ] + + operations = [ + migrations.AddField( + model_name='purchaseorder', + name='URL', + field=models.URLField(blank=True, help_text='Link to external page'), + ), + migrations.AlterField( + model_name='purchaseorder', + name='description', + field=models.CharField(blank=True, help_text='Order description', max_length=250), + ), + migrations.AlterField( + model_name='purchaseorder', + name='supplier', + field=models.ForeignKey(help_text='Company', limit_choices_to={'is_supplier': True}, on_delete=django.db.models.deletion.CASCADE, related_name='Orders', to='company.Company'), + ), + ] diff --git a/InvenTree/order/models.py b/InvenTree/order/models.py index ce9370e45e..25eccd4df2 100644 --- a/InvenTree/order/models.py +++ b/InvenTree/order/models.py @@ -39,7 +39,9 @@ class Order(models.Model): reference = models.CharField(unique=True, max_length=64, blank=False, help_text=_('Order reference')) - description = models.CharField(max_length=250, blank=False, help_text=_('Order description')) + description = models.CharField(max_length=250, blank=True, help_text=_('Order description')) + + URL = models.URLField(blank=True, help_text=_('Link to external page')) creation_date = models.DateField(auto_now=True, editable=False) @@ -51,7 +53,6 @@ class Order(models.Model): issue_date = models.DateField(blank=True, null=True) - notes = models.TextField(blank=True, help_text=_('Order notes')) diff --git a/Makefile b/Makefile index c7fdddc1e2..70d3781629 100644 --- a/Makefile +++ b/Makefile @@ -12,6 +12,7 @@ migrate: python InvenTree/manage.py makemigrations part python InvenTree/manage.py makemigrations stock python InvenTree/manage.py makemigrations build + python InvenTree/manage.py makemigrations order python InvenTree/manage.py migrate --run-syncdb python InvenTree/manage.py check @@ -27,11 +28,11 @@ style: test: python InvenTree/manage.py check - python InvenTree/manage.py test build company part stock + python InvenTree/manage.py test build company part stock order coverage: python InvenTree/manage.py check - coverage run InvenTree/manage.py test build company part stock + coverage run InvenTree/manage.py test build company part stock order coverage html documentation: