Repository: carpentries/amy

Issue:
Invoice status: change some options
- Paid - Feedback loop
- Invoiced - Request has been made (change to Invoice requested)
- Not Invoiced - Request has not been made (change to Invoice not requested)

Invoice status: change some options
- Paid - Feedback loop
- Invoiced - Request has been made (change to Invoice requested)
- Not Invoiced - Request has not been made (change to Invoice not requested)



Discussion:
Sorry, but I don't understand what this issue is all about? Do you mean changing `InvoiceRequest.STATUS_CHOICES`?

@chrismedrela this is about both `InvoiceRequest` (feedback to "paid" `Event.invoice_status`) and `Event.invoice_status`. Low priority for now.

I'm still not sure what exactly changes are requested, so could I reassign this issue to you?

We want to change the labels for the options in invoice status.
Clarifying what @pbanaszkiewicz  noted in his opening comment above:
- Change `Invoiced` to `Invoice requested`
- Change `Not invoiced` to `Invoice not requested`

`Unknown` and all the `Not applicable` options can stay as they are.

Adding `Paid` is not a priority.

@maneesha, thank you, that makes it clear.

Sorry, but I don't understand what this issue is all about? Do you mean changing `InvoiceRequest.STATUS_CHOICES`?

@chrismedrela this is about both `InvoiceRequest` (feedback to "paid" `Event.invoice_status`) and `Event.invoice_status`. Low priority for now.

I'm still not sure what exactly changes are requested, so could I reassign this issue to you?

We want to change the labels for the options in invoice status.
Clarifying what @pbanaszkiewicz  noted in his opening comment above:
- Change `Invoiced` to `Invoice requested`
- Change `Not invoiced` to `Invoice not requested`

`Unknown` and all the `Not applicable` options can stay as they are.

Adding `Paid` is not a priority.

@maneesha, thank you, that makes it clear.


Resolving patch:
diff --git a/workshops/migrations/0119_auto_20161023_1413.py b/workshops/migrations/0119_auto_20161023_1413.py
new file mode 100644
--- /dev/null
+++ b/workshops/migrations/0119_auto_20161023_1413.py
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.5 on 2016-10-23 19:13
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('workshops', '0118_auto_20160922_0009'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='event',
+            name='invoice_status',
+            field=models.CharField(choices=[('unknown', 'Unknown'), ('invoiced', 'Invoice requested'), ('not-invoiced', 'Invoice not requested'), ('na-historic', 'Not applicable for historical reasons'), ('na-member', 'Not applicable because of membership'), ('na-self-org', 'Not applicable because self-organized'), ('na-waiver', 'Not applicable because waiver granted'), ('na-other', 'Not applicable because other arrangements made'), ('paid', 'Paid')], default='not-invoiced', max_length=40, verbose_name='Invoice status'),
+        ),
+        migrations.AlterField(
+            model_name='invoicerequest',
+            name='status',
+            field=models.CharField(choices=[('not-invoiced', 'Invoice not requested'), ('sent', 'Sent out'), ('paid', 'Paid')], default='not-invoiced', max_length=40, verbose_name='Invoice status'),
+        ),
+    ]
diff --git a/workshops/models.py b/workshops/models.py
--- a/workshops/models.py
+++ b/workshops/models.py
@@ -890,13 +890,14 @@ class Event(AssignmentMixin, models.Model):
     admin_fee  = models.DecimalField(max_digits=6, decimal_places=2, null=True, blank=True, validators=[MinValueValidator(0)])
     INVOICED_CHOICES = (
         ('unknown', 'Unknown'),
-        ('invoiced', 'Invoiced'),
-        ('not-invoiced', 'Not invoiced'),
+        ('invoiced', 'Invoice requested'),
+        ('not-invoiced', 'Invoice not requested'),
         ('na-historic', 'Not applicable for historical reasons'),
         ('na-member', 'Not applicable because of membership'),
         ('na-self-org', 'Not applicable because self-organized'),
         ('na-waiver', 'Not applicable because waiver granted'),
         ('na-other', 'Not applicable because other arrangements made'),
+        ('paid', 'Paid'),
     )
     invoice_status = models.CharField(
         max_length=STR_MED,
@@ -1719,7 +1720,7 @@ def __str__(self):
 @reversion.register
 class InvoiceRequest(models.Model):
     STATUS_CHOICES = (
-        ('not-invoiced', 'Not invoiced'),
+        ('not-invoiced', 'Invoice not requested'),
         ('sent', 'Sent out'),
         ('paid', 'Paid'),
     )


Test patch:
diff --git a/workshops/test/test_invoice_requests.py b/workshops/test/test_invoice_requests.py
--- a/workshops/test/test_invoice_requests.py
+++ b/workshops/test/test_invoice_requests.py
@@ -59,7 +59,7 @@ def test_status_repr(self):
         )
 
         tests = [
-            ('not-invoiced', 'Not invoiced'),
+            ('not-invoiced', 'Invoice not requested'),
             ('sent', 'Sent out on 2016-02-09'),
             ('paid', 'Paid on 2016-02-09'),
         ]