Merge lp:~therp-nl/openobject-addons/trunk_lp1237832 into lp:openobject-addons

[Holger Brunn (Therp)]

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

That looks fine

review: Approve

Unmerged revisions

8941. By Holger Brunn (Therp) on 2013-10-28

[ADD] test to verify recursing into analytic child accounts

8940. By Holger Brunn (Therp) on 2013-10-10

[FIX] recurse into analytic account's children when calculating practical
amount in budgets

=== modified file 'account_budget/account_budget.py'
--- account_budget/account_budget.py	2013-04-15 10:23:49 +0000
+++ account_budget/account_budget.py	2013-10-28 14:14:05 +0000
@@ -122,7 +122,21 @@
             if context.has_key('wizard_date_to'):
                 date_to = context['wizard_date_to']
             if line.analytic_account_id.id:
-                cr.execute("SELECT SUM(amount) FROM account_analytic_line WHERE account_id=%s AND (date "
+                cr.execute("SELECT SUM(amount) FROM account_analytic_line WHERE account_id in "
+                       """(with recursive account_analytic_account_hierarchy(id)
+                        as 
+                            (
+                                select id from account_analytic_account 
+                                    where id=%s
+                                union all
+                                select account_analytic_account.id from 
+                                    account_analytic_account 
+                                    join account_analytic_account_hierarchy
+                                    on account_analytic_account.parent_id=
+                                        account_analytic_account_hierarchy.id
+                            )"""
+                       "select id from account_analytic_account_hierarchy) "
+                       "AND (date "
                        "between to_date(%s,'yyyy-mm-dd') AND to_date(%s,'yyyy-mm-dd')) AND "
                        "general_account_id=ANY(%s)", (line.analytic_account_id.id, date_from, date_to,acc_ids,))
                 result = cr.fetchone()[0]
 
=== added directory 'account_budget/tests'
=== added file 'account_budget/tests/__init__.py'
--- account_budget/tests/__init__.py	1970-01-01 00:00:00 +0000
+++ account_budget/tests/__init__.py	2013-10-28 14:14:05 +0000
@@ -0,0 +1,5 @@
+from . import test_child_accounts
+
+fast_suite = [
+        test_child_accounts,
+        ]
 
=== added file 'account_budget/tests/test_child_accounts.py'
--- account_budget/tests/test_child_accounts.py	1970-01-01 00:00:00 +0000
+++ account_budget/tests/test_child_accounts.py	2013-10-28 14:14:05 +0000
@@ -0,0 +1,126 @@
+from datetime import datetime
+from openerp.tests.common import TransactionCase
+from openerp.tools.misc import DEFAULT_SERVER_DATETIME_FORMAT
+
+class TestChildAccounts(TransactionCase):
+    
+    def setUp(self):
+        super(TestChildAccounts, self).setUp()
+        self.budget_model = self.registry('crossovered.budget')
+        self.budget_post_model = self.registry('account.budget.post')
+        self.account_model = self.registry('account.account')
+        self.analytic_account_model = self.registry('account.analytic.account')
+
+    def test_child_accounts(self):
+        '''
+        Test if an analytic's child account's lines are also counted in a
+        budget
+        '''
+        account_id = self.account_model.create(
+                self.cr,
+                self.uid,
+                {
+                    'name': 'testaccount',
+                    'code': 'test42',
+                    'user_type': self.ref(
+                        'account.data_account_type_receivable'),
+                })
+        analytic_account_id = self.analytic_account_model.create(
+                self.cr,
+                self.uid,
+                {
+                    'name': 'testaccount',
+                    'code': 'test42',
+                })
+        analytic_account_child_id = self.analytic_account_model.create(
+                self.cr,
+                self.uid,
+                {
+                    'name': 'testaccount child',
+                    'code': 'test42.1',
+                    'parent_id': analytic_account_id,
+                })
+        budget_post_id = self.budget_post_model.create(
+                self.cr,
+                self.uid,
+                {
+                    'name': 'testbudgetpost',
+                    'code': 'test42',
+                    'account_ids': [(6, 0, [account_id])],
+                })
+        budget_id = self.budget_model.create(
+                self.cr,
+                self.uid,
+                {
+                    'name': 'testbudget',
+                    'code': 'test42',
+                    'date_from': datetime.today().replace(month=1, day=1)\
+                            .strftime(DEFAULT_SERVER_DATETIME_FORMAT),
+                    'date_to': datetime.today().replace(month=12, day=31)\
+                            .strftime(DEFAULT_SERVER_DATETIME_FORMAT),
+                    'crossovered_budget_line': [
+                        (
+                            0, 0,
+                            {
+                                'general_budget_id': budget_post_id,
+                                'analytic_account_id': analytic_account_id,
+                                'date_from': datetime.today()\
+                                        .replace(month=1, day=1)\
+                                        .strftime(
+                                            DEFAULT_SERVER_DATETIME_FORMAT),
+                                'date_to': datetime.today()\
+                                        .replace(month=12, day=31)\
+                                        .strftime(
+                                            DEFAULT_SERVER_DATETIME_FORMAT),
+                                'planned_amount': 42,
+                            },
+                        )
+                        ],
+                })
+        journal_id = self.registry('account.analytic.journal').search(
+                self.cr, self.uid, [])[0]
+
+        self.analytic_account_model.write(
+                self.cr,
+                self.uid,
+                analytic_account_id,
+                {
+                    'line_ids': [
+                        (
+                            0, 0,
+                            {
+                                'name': '/',
+                                'date': datetime.today()\
+                                        .strftime(
+                                            DEFAULT_SERVER_DATETIME_FORMAT),
+                                'amount': 42,
+                                'general_account_id': account_id,
+                                'journal_id': journal_id,
+                            },
+                        ),
+                    ],
+                })
+        self.analytic_account_model.write(
+                self.cr,
+                self.uid,
+                analytic_account_child_id,
+                {
+                    'line_ids': [
+                        (
+                            0, 0,
+                            {
+                                'name': '/',
+                                'date': datetime.today()\
+                                        .strftime(
+                                            DEFAULT_SERVER_DATETIME_FORMAT),
+                                'amount': 42,
+                                'general_account_id': account_id,
+                                'journal_id': journal_id,
+                            },
+                        ),
+                    ],
+                })
+
+
+        budget = self.budget_model.browse(self.cr, self.uid, budget_id)
+        assert budget.crossovered_budget_line[0].practical_amount == 84