diff options
| author | luxagraf <sng@luxagraf.net> | 2015-11-18 16:35:14 -0500 |
|---|---|---|
| committer | luxagraf <sng@luxagraf.net> | 2015-11-18 16:35:14 -0500 |
| commit | 996e8ab3715d287fde7d204d3345d3384a496ef4 (patch) | |
| tree | 3af29a685e6c77772f449031c70a361e7ecff02e /app/income | |
| parent | db28a05cbfa907025e45fc98f5c588ebf356cfbb (diff) | |
| parent | 625c485c2f21d1b01ece1e982ad0dc8a211a7303 (diff) | |
Merge branch 'master' of ssh://luxagraf:/home/lxf/git/luxagraf
Diffstat (limited to 'app/income')
| -rw-r--r-- | app/income/admin.py | 4 | ||||
| -rw-r--r-- | app/income/models.py | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/app/income/admin.py b/app/income/admin.py index 7fb1ee0..c47d7a2 100644 --- a/app/income/admin.py +++ b/app/income/admin.py @@ -4,7 +4,7 @@ from .models import Gig class GigAdmin(admin.ModelAdmin): - list_display = ('title', 'status', 'payment', 'payment_status', 'publisher', 'pub_date', 'created') + list_display = ('title', 'status', 'payment_status', 'invoice_date', 'payment', 'publisher', 'pub_date', 'created') list_filter = ('publisher', 'status', 'payment_status') fieldsets = ( ('Gig', { @@ -12,7 +12,7 @@ class GigAdmin(admin.ModelAdmin): 'title', 'pitch', ('payment', 'pay_type'), - ('status', 'pub_date', 'payment_status'), + ('status', 'pub_date', 'payment_status', 'invoice_date'), 'publisher', 'pub_item' ), diff --git a/app/income/models.py b/app/income/models.py index 0d06967..4fb5497 100644 --- a/app/income/models.py +++ b/app/income/models.py @@ -17,6 +17,7 @@ class Gig(models.Model): (4, "Rejected"), ) status = models.IntegerField(choices=STATUS, default=1) + invoice_date = models.DateTimeField(null=True, blank=True) payment = models.DecimalField(max_digits=10, decimal_places=2) PAY_STATUS = ( (0, "NOT SUBMITTED"), |