Changeset 248b30b

Timestamp:

Feb 3, 2010, 3:30:03 AM (15 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, client

Children:

b7fc501

Parents:

88e897a

git-author:

Alex Dehnert <adehnert@…> (02/03/10 03:30:03)

git-committer:

Alex Dehnert <adehnert@…> (02/03/10 03:30:03)

Message:

Split check recipient into first and last names

Location:

remit/vouchers

Files:

• admin.py (modified) (1 diff)
• models.py (modified) (2 diffs)
• views.py (modified) (1 diff)

remit/vouchers/admin.py

@@ -18 +18 @@
         ('Expense details', {'fields': ['name', 'description', 'amount', 'budget_area', 'budget_term', ] }),
         ('Request metadata', {'fields': ['submitter', 'request_time', 'approval_time', 'approval_status', 'printing_time', ]}),
-        ('Recipient', {'fields': ['check_to_name', 'check_to_email', 'check_to_addr', ] }),
+        ('Recipient', {'fields': ['check_to_first_name', 'check_to_last_name', 'check_to_email', 'check_to_addr', ] }),
     ]
-    list_display = ('name', 'submitter', 'check_to_name', 'amount', 'budget_area', 'budget_term', )
+    list_display = ('name', 'submitter', 'check_to_first_name', 'check_to_last_name', 'amount', 'budget_area', 'budget_term', )
 
 

remit/vouchers/models.py

@@ -13 +13 @@
 class ReimbursementRequest(models.Model):
     submitter = models.CharField(max_length=10) # MIT username of submitter
-    check_to_name = models.CharField(max_length=50, verbose_name="check recipient's name")
+    check_to_first_name = models.CharField(max_length=50, verbose_name="check recipient's first name")
+    check_to_last_name = models.CharField(max_length=50, verbose_name="check recipient's last name")
     check_to_email = models.EmailField(verbose_name="email address for check pickup")
     check_to_addr = models.TextField(blank=True, verbose_name="address for check mailing", help_text="For most requests, this should be blank for pickup in SAO (W20-549)")
@@ -28 +29 @@
 
     def __unicode__(self, ):
-        return "%s: %s (%s) (by %s) for $%s in %s during %s" % (
+        return "%s: %s %s (%s) (by %s) for $%s" % (
             self.name,
-            self.check_to_name,
+            self.check_to_first_name,
+            self.check_to_last_name,
             self.check_to_email,
             self.submitter,
             self.amount,
-            self.budget_area.name,
-            self.budget_term.name,
         )
 

remit/vouchers/views.py

@@ -21 +21 @@
             'budget_area',
             'expense_area',
-            'check_to_name',
+            'check_to_first_name',
+            'check_to_last_name',
             'check_to_email',
             'check_to_addr',