Changeset 856aac8 for remit/vouchers

Timestamp:

Feb 9, 2010, 2:12:04 AM (15 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, client

Children:

e601d3b

Parents:

004d06d

git-author:

Alex Dehnert <adehnert@…> (02/09/10 02:12:04)

git-committer:

Alex Dehnert <adehnert@…> (02/09/10 02:12:04)

Message:

Handle submission workflow better

Location:

remit/vouchers

Files:

• models.py (modified) (2 diffs)
• views.py (modified) (3 diffs)

remit/vouchers/models.py

@@ -59 +59 @@
         voucher.mailing_address = self.check_to_addr
         voucher.amount = self.amount
-        voucher.description = self.name
+        voucher.description = self.label() + ': ' + self.name
         voucher.gl = self.expense_area.get_account_number()
         voucher.save()
@@ -74 +74 @@
         self.approval_time = datetime.datetime.now()
         self.save()
+
+    def label(self, ):
+        return settings.GROUP_ABBR + unicode(self.pk) + 'RR'
 
 class Voucher(models.Model):

remit/vouchers/views.py

@@ -118 +118 @@
         if form.is_valid(): # All validation rules pass
             form.save()
-            return HttpResponseRedirect(reverse(review_request, args=[new_request.pk],)) # Redirect after POST
+            return HttpResponseRedirect(reverse(review_request, args=[new_request.pk],) + '?new=true') # Redirect after POST
     else:
         form = RequestForm(instance=new_request, initial=initial, ) # An unbound form
@@ -140 +140 @@
 def review_request(http_request, object_id):
     request_obj = get_object_or_404(ReimbursementRequest, pk=object_id)
+    new = False
+    if 'new' in http_request.REQUEST:
+        if http_request.REQUEST['new'].upper() == 'TRUE':
+            new = True
+        else:
+            new = False
 
     show_approve = (http_request.user.has_perm('vouchers.can_approve')
@@ -182 +188 @@
         'rr':request_obj,
         'pagename':'request_reimbursement',
+        'new': new,
     }
     if show_approve: