Changeset 074fac7

Timestamp:

Apr 18, 2010, 4:59:29 PM (14 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, client

Children:

6497b49

Parents:

bc798fc

git-author:

Alex Dehnert <adehnert@…> (04/18/10 16:59:29)

git-committer:

Alex Dehnert <adehnert@…> (04/18/10 16:59:29)

Message:

Refactor mass account adding from add_gl_accounts

Location:

remit

Files:

• finance_core/util.py (added)
• vouchers/add_gl_accounts.py (modified) (3 diffs)

remit/vouchers/add_gl_accounts.py

@@ +1 @@
+import sys
+import os
+
 if __name__ == '__main__':
-    import sys
-    import os
-
     cur_file = os.path.abspath(__file__)
     django_dir = os.path.abspath(os.path.join(os.path.dirname(cur_file), '..'))
@@ -10 +10 @@
 import finance_core.models
 import vouchers.models
+import finance_core.util
 
 expense_gls = (
@@ -33 +34 @@
         base = finance_core.models.BudgetArea.get_by_path(['Accounts',])
         base = base.add_child(name='Expenses', always=True, use_owner=True)
+        base = finance_core.models.BudgetArea.get_by_path(['Accounts', 'Expenses', ])
+    finance_core.util.mass_add_accounts(base, expense_gls, writeto=sys.stdout)
 
-    for name, number in expense_gls:
-        try:
-            path = 'Accounts.Expenses.' + name
-            elem = finance_core.models.BudgetArea.get_by_pathstr(path)
-        except KeyError:
-            print "Adding %s (%s)" % (name, number,)
-            # It doesn't exist
-            if '.' in name:
-                parts = name.rsplit('.', 1)
-                path = 'Accounts.Expenses.'+parts[0]
-                name = parts[1]
-                parent = finance_core.models.BudgetArea.get_by_pathstr(path)
-            else:
-                parent = base
-            parent.add_child(name=name, account_number=number, always=True, )
-        else:
-            print "%s (%s) already present" % (name, number,)
 
 if __name__ == '__main__':