Merge lp:~therp-nl/ocb-addons/6.1-lp1070418 into lp:ocb-addons/6.1

[Holger Brunn (Therp)]

support view and consolidation children in budget positions

[Holger Brunn (Therp) (hbrunn)]

backport of https://code.launchpad.net/~lmi/ocb-addons/trunk-bug1070418/+merge/177360, approving as it's not my work

review: Approve (test, code review)

[Stefan Rijnhart (Opener) (stefan-opener)]

Tnx. This has been merged in ocb-addons/7.0 a long time ago, so this should be good.

review: Approve

[Pedro Manuel Baeza (pedro.baeza)]

LGTM. Works fine on 7.0.

review: Approve

=== modified file 'account_budget/account_budget.py'
--- account_budget/account_budget.py	2011-12-31 07:57:20 +0000
+++ account_budget/account_budget.py	2013-10-09 12:35:12 +0000
@@ -113,8 +113,10 @@
         result = 0.0
         if context is None: 
             context = {}
+        account_obj = self.pool.get('account.account')
         for line in self.browse(cr, uid, ids, context=context):
             acc_ids = [x.id for x in line.general_budget_id.account_ids]
+            acc_ids = account_obj._get_children_and_consol(cr, uid, acc_ids, context=context)
             if not acc_ids:
                 raise osv.except_osv(_('Error!'),_("The Budget '%s' has no accounts!") % str(line.general_budget_id.name))
             date_to = line.date_to