Changeset 680b2bd

Timestamp:

Feb 1, 2011, 7:23:37 AM (14 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, client

Children:

f63d43a

Parents:

1ba734f

git-author:

Alex Dehnert <adehnert@…> (02/01/11 07:23:37)

git-committer:

Alex Dehnert <adehnert@…> (02/01/11 07:23:37)

Message:

Allow marking as RFP'd (WIP)

File:

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

remit/vouchers/models.py

@@ -37 +37 @@
     documentation = models.ForeignKey('Documentation', null=True, blank=True, )
     voucher       = models.ForeignKey('Voucher',       null=True, )
+    rfp           = models.ForeignKey('RFP',           null=True, blank=True, )
 
     class Meta:
@@ -56 +57 @@
         )
 
-    def convert(self, signatory, signatory_email=None):
+    def create_transfers(self, signatory, signatory_email=None):
+        finance_core.models.make_transfer(
+            self.name,
+            self.amount,
+            finance_core.models.LAYER_EXPENDITURE,
+            self.budget_term,
+            self.budget_area,
+            self.expense_area,
+            self.description,
+            self.incurred_time,
+        )
+
+    def convert_to_voucher(self, signatory, signatory_email=None):
         if signatory_email is None:
             signatory_email = settings.SIGNATORY_EMAIL
@@ -73 +86 @@
         voucher.documentation = self.documentation
         voucher.save()
-        finance_core.models.make_transfer(
-            self.name,
-            self.amount,
-            finance_core.models.LAYER_EXPENDITURE,
-            self.budget_term,
-            self.budget_area,
-            self.expense_area,
-            self.description,
-            self.incurred_time,
-        )
+        self.create_transfers()
         self.approval_status = 1
         self.approval_time = datetime.datetime.now()
@@ -88 +92 @@
         self.save()
 
+    def convert_to_rfp(self, ):
+        rfp = RFP()
+        rfp.save()
+        self.create_transfers()
+        self.approval_status = APPROVAL_STATE_APPROVED
+        self.approval_time = datetime.datetime.now()
+        self.rfp = rfp
+        self.save()
+
     def approve(self, approver, signatory_name, signatory_email=None, ):
         """Mark a request as approved.
@@ -95 +108 @@
         signatory_email: email address of signatory (provide None for default)
         """
-        voucher = self.convert(signatory_name, signatory_email,)
+        voucher = self.convert_to_voucher(signatory_name, signatory_email,)
         tmpl = get_template('vouchers/emails/request_approval_admin.txt')
         ctx = Context({
@@ -109 +122 @@
             body,
         )
+
+    def approve_with_rfp(self, approver, ):
+        
 
     def label(self, ):