Merge lp:~openerp-dev/openobject-addons/7.0-opw-591736-rha into lp:openobject-addons/7.0

[Rifakat Husen (OpenERP)]

Allow Children account too if view account is used in Budget Position to be able to get the
Practical amount in Budget based on the account(view) and it's children.

[Naresh(OpenERP) (nch-openerp)]

review: Approve

[Martin Trigaux (OpenERP) (mat-openerp)]

Hello

The amounts of childs accounts is now computed on the parent account of type views. This should not be required anymore than.
I reject the MP then

Regards

[Martin Trigaux (OpenERP) (mat-openerp)]

Oups sorry, wrong model, this still does not work.

However I would like to have a fix allowing to use accounts of type view. The problem come from the fact we use SQL queries with account ids. Look at what we do in __compute from account, we use child account ids, please do the same.

[Rifakat Husen (OpenERP) (rha-openerp)]

Dear Martin,
Does it look ok now?

Please let me know,
Rifakat

review: Needs Resubmitting

[Lionel Sausin - Initiatives/Numérigraphe (ls-initiatives)]

https://code.launchpad.net/~sbi/openobject-addons/trunk-bug1070418/+merge/131043 already proposes the same changes.

review: Disapprove (duplicate)

Unmerged revisions

9626. By Rifakat Husen (OpenERP) on 2013-11-21

[FIX] account_budget: allow children of a view account

=== modified file 'account_budget/account_budget.py'
--- account_budget/account_budget.py	2012-12-17 15:23:03 +0000
+++ account_budget/account_budget.py	2013-11-21 12:04:59 +0000
@@ -109,6 +109,7 @@
 class crossovered_budget_lines(osv.osv):
 
     def _prac_amt(self, cr, uid, ids, context=None):
+        account_obj = self.pool.get('account.account')
         res = {}
         result = 0.0
         if context is None: 
@@ -117,6 +118,7 @@
             acc_ids = [x.id for x in line.general_budget_id.account_ids]
             if not acc_ids:
                 raise osv.except_osv(_('Error!'),_("The Budget '%s' has no accounts!") % str(line.general_budget_id.name))
+            acc_ids = account_obj._get_children_and_consol(cr, uid, acc_ids, context=context)
             date_to = line.date_to
             date_from = line.date_from
             if context.has_key('wizard_date_from'):