openerp-community-reviewer team mailing list archive

["Holger Brunn \(Therp\)" <hbrunn@xxxxxxxx>]

Holger Brunn (Therp) has proposed merging lp:~therp-nl/ocb-addons/6.1-lp1070418 into lp:ocb-addons/6.1.

Requested reviews:
  OpenERP Community Backports Team (ocb)
Related bugs:
  Bug #1070418 in OpenERP Community Backports (Addons): "[6.1 / trunk] budget position should support view accounts"
  https://bugs.launchpad.net/ocb-addons/+bug/1070418

For more details, see:
https://code.launchpad.net/~therp-nl/ocb-addons/6.1-lp1070418/+merge/190116

support view and consolidation children in budget positions
-- 
https://code.launchpad.net/~therp-nl/ocb-addons/6.1-lp1070418/+merge/190116
Your team OpenERP Community Backports Team is requested to review the proposed merge of lp:~therp-nl/ocb-addons/6.1-lp1070418 into lp:ocb-addons/6.1.

=== 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