Changeset 064683a

Timestamp:

Jan 27, 2010, 1:00:36 PM (15 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, client

Children:

17193ee

Parents:

5abe506

git-author:

Alex Dehnert <adehnert@…> (01/27/10 13:00:36)

git-committer:

Alex Dehnert <adehnert@…> (01/27/10 13:00:36)

Message:

Store account numbers

Location:

treasury

Files:

• finance_core/models.py (modified) (4 diffs)
• vouchers/import_budget.py (modified) (2 diffs)

treasury/finance_core/models.py

@@ -1 @@
-from django.db import models
+from django.db import models, connection
 import settings
 import treebeard.mp_tree
@@ -9 +9 @@
     name = models.CharField(max_length=50)
     comment = models.TextField(blank=True)
+
+    # Applicable to every term?
     always = models.BooleanField(blank=True, default=False)
 
@@ -16 +18 @@
     interested = models.EmailField(help_text='Email address of parties interested in the area', blank=True) # interested parties (ie, whole committee)
     use_owner = models.BooleanField(default=False, blank=True)
+    account_number = models.IntegerField(help_text='Account number: for example, cost object or GL', blank=True, null=True)
 
     def contact_address(self,):
@@ -24 +27 @@
             address = self.interested or self.owner
         return address or self.get_parent().contact_address()
+
+    def get_account_number(self):
+        """Retrieve the account number for this account.
+
+        This properly recurses through the hierarchy until reaching the root
+        or an account with the account number set."""
+
+        print self.account_number
+        if self.account_number:
+            return self.account_number
+        else:
+            parent = self.get_parent()
+            if parent:
+                return parent.get_account_number()
+            else:
+                return 0
 
     def mark_used(self, term, comment=""):

treasury/vouchers/import_budget.py

@@ -49 +49 @@
                         always=True, use_owner=True,
                         owner='ua-treasurer@mit.edu',
-                        interested='ua-treasurer@mit.edu', )
+                        interested='ua-treasurer@mit.edu',
+                        account_number=0,
+                    )
         # This is sorta evil, in that it abuses the fact that Python
         # won't put name out of scope
@@ -73 +75 @@
                 interested=coerce_full_email(comm['email_list']),
                 use_owner=comm['prefer_chair'],
+                account_number=(comm['account'] or 0),
                 always=True,
             )