Changeset 587bb95 for remit/vouchers/models.py

Timestamp:

Feb 3, 2010, 3:36:28 PM (15 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, client

Children:

84b3640

Parents:

e2f2aa9

git-author:

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

git-committer:

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

Message:

Mostly done with the voucher approval workflow

File:

• remit/vouchers/models.py (modified) (4 diffs)

remit/vouchers/models.py

@@ -31 +31 @@
         permissions = (
             ('can_list', 'Can list requests',),
+            ('can_approve', 'Can approve requests',),
         )
 
@@ -43 +44 @@
         )
 
-    def convert(self, signatory):
+    def convert(self, signatory, signatory_email=settings.SIGNATORY_EMAIL):
         voucher = Voucher()
-        voucher.group_name = settings.group_name
+        voucher.group_name = settings.GROUP_NAME
         voucher.account = self.budget_area.get_account_number()
         voucher.signatory = signatory
+        voucher.signatory_email = signatory_email
         voucher.first_name = self.check_to_first_name
         voucher.last_name = self.check_to_last_name
@@ -56 +58 @@
         voucher.gl = self.expense_area.get_account_number()
         voucher.save()
+        self.approval_status = 1
+        self.approval_date = datetime.datetime.now()
+        self.save()
 
 class Voucher(models.Model):
@@ -61 +66 @@
     account = models.IntegerField()
     signatory = models.CharField(max_length=50)
+    signatory_email = models.EmailField()
     first_name = models.CharField(max_length=20)
     last_name = models.CharField(max_length=20)