Changeset f6c7295

Timestamp:

Feb 2, 2010, 3:36:42 AM (15 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, client

Children:

bdc699e

Parents:

4bde242

git-author:

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

git-committer:

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

Message:

Handle GLs in reimbursement requests

Location:

treasury

Files:

• remit_templates/vouchers/ReimbursementRequest_review.html (modified) (1 diff)
• vouchers/views.py (modified) (4 diffs)

treasury/remit_templates/vouchers/ReimbursementRequest_review.html

@@ -25 +25 @@
 <tr>
     <th>Budget area</th>
-    <td>{{rr.budget_area}}</td>
+    <td>{{rr.budget_area.pathstr}}</td>
+</tr>
+<tr>
+    <th>Expense area</th>
+    <td>{{rr.expense_area.pathstr}}</td>
 </tr>
 <tr>

treasury/vouchers/views.py

@@ -19 +19 @@
             'amount',
             'budget_area',
+            'expense_area',
             'check_to_name',
             'check_to_email',
@@ -70 +71 @@
         return obj.indented_name(strip_levels=self.strip_levels)
 
+class ExpenseAreasField(ModelChoiceField):
+    def __init__(self, *args, **kargs):
+        base_area = vouchers.models.BudgetArea.get_by_path(['Accounts', 'Expenses'])
+        self.strip_levels = base_area.depth
+        areas = base_area.get_descendants()
+        ModelChoiceField.__init__(self, queryset=areas,
+            help_text='In general, this should be a fully indented budget area, not one with children',
+            *args, **kargs)
+
+    def label_from_instance(self, obj,):
+        return obj.indented_name(strip_levels=self.strip_levels)
+
 @user_passes_test(lambda u: u.is_authenticated())
 def submit_request(http_request, term, committee):
@@ -82 +95 @@
         form = RequestForm(http_request.POST, instance=new_request) # A form bound to the POST data
         form.fields['budget_area'] = CommitteeBudgetAreasField(comm_obj)
+        form.fields['expense_area'] = ExpenseAreasField()
         if form.is_valid(): # All validation rules pass
             form.save()
@@ -88 +102 @@
         form = RequestForm(instance=new_request) # An unbound form
         form.fields['budget_area'] = CommitteeBudgetAreasField(comm_obj)
+        form.fields['expense_area'] = ExpenseAreasField()
 
     context = {