Merge lp:~openerp-dev/openobject-addons/trunk-bug-880844-mdi into lp:openobject-addons

[DJ Patel (OpenERP)]

Hello Sir,

I have fix the issue: https://bugs.launchpad.net/openobject-addons/+bug/880844 "Cost Ledger incorrect for View accounts".

Thanks and Regards,

Divyesh Makwana(MDI)

[lp:~openerp-dev/openobject-addons/trunk-bug-880844-mdi]

5794. By DJ Patel (OpenERP) on 2011-11-30

[IMP] account : Improved the code

[Purnendu Singh (OpenERP) (purnendu-singh)]

hello Divyesh,

Patch is not good.
here you are passing 'account_id' in _get_account method then why you need to search that id again!!!

 + def _get_rec(account_id):
12 + analytic_obj = self.pool.get('account.analytic.account')
13 + analytic_search_ids = analytic_obj.search(self.cr, self.uid, [('id', '=', account_id)])
14 + analytic_datas = analytic_obj.browse(self.cr, self.uid, analytic_search_ids)

you can direct get account like
 -for account in analytic_datas:
 +for account in analytic_obj.browse(self.cr, self.uid, [account_id]):

There is lots of thing to change in your patch

1) result list contains duplicate entries.
2) Unnecessary loops for a single account. etc

Please check it properly

Thanks,
Purnendu Singh

review: Needs Fixing

[lp:~openerp-dev/openobject-addons/trunk-bug-880844-mdi]

5795. By DJ Patel (OpenERP) on 2011-11-30

[IMP] account : Improved the code

[DJ Patel (OpenERP) (mdi-openerp)]

Hello Sir,

I have done the changes as per your suggestion.

Thanks and Regards,

Divyesh Makwana(MDI)

review: Needs Resubmitting

[Purnendu Singh (OpenERP) (purnendu-singh)]

Hello Divyesh,

Why we need to call _get_childre() method from all other method.

chid_ids = self._get_children(account_id) ????

By doing this you are performing same action again and again!!! It would be better if you collect the value in some variable and get that from all other methods!!

Thanks,
Purnendu Singh

review: Needs Fixing

[lp:~openerp-dev/openobject-addons/trunk-bug-880844-mdi]

5796. By DJ Patel (OpenERP) on 2011-12-02

[IMP] account : Improved the code

[DJ Patel (OpenERP) (mdi-openerp)]

Hello Sir,

I have done changes as per your suggestion.

Thanks and Regards,

Divyesh Makwana (MDI)

review: Needs Resubmitting

[Raphael Collet (OpenERP) (rco-openerp)]

Cleaned up a bit the code to make methods independent of calling order.

review: Needs Resubmitting

[lp:~openerp-dev/openobject-addons/trunk-bug-880844-mdi]

5797. By Raphael Collet (OpenERP) on 2012-02-03

[MERGE] from trunk

5798. By Raphael Collet (OpenERP) on 2012-02-03

[IMP] account: fix, simplify and optimize Cost Ledger

=== modified file 'account/project/report/cost_ledger.py'
--- account/project/report/cost_ledger.py	2011-01-14 00:11:01 +0000
+++ account/project/report/cost_ledger.py	2011-12-02 10:39:28 +0000
@@ -26,6 +26,7 @@
 class account_analytic_cost_ledger(report_sxw.rml_parse):
     def __init__(self, cr, uid, name, context):
         super(account_analytic_cost_ledger, self).__init__(cr, uid, name, context=context)
+        self.analytic_acc_ids = [],
         self.localcontext.update( {
             'time': time,
             'lines_g': self._lines_g,
@@ -38,11 +39,25 @@
             'sum_balance': self._sum_balance,
         })
 
+    def _get_children(self, account_id):
+        analytic_obj = self.pool.get('account.analytic.account')
+        if not isinstance(account_id, list):
+            account_id = [account_id]
+        search_ids = analytic_obj.search(self.cr, self.uid, [('parent_id', 'child_of', account_id)])
+        result = []
+        for rec in analytic_obj.browse(self.cr, self.uid, search_ids):
+            for child in rec.child_ids:
+                result.append(child.id)
+        if result:
+            result = self._get_children(result)
+        self.analytic_acc_ids = search_ids + result
+        return self.analytic_acc_ids
+
     def _lines_g(self, account_id, date1, date2):
         self.cr.execute("SELECT sum(aal.amount) AS balance, aa.code AS code, aa.name AS name, aa.id AS id \
                 FROM account_account AS aa, account_analytic_line AS aal \
-                WHERE (aal.account_id=%s) AND (aal.date>=%s) AND (aal.date<=%s) AND (aal.general_account_id=aa.id) AND aa.active \
-                GROUP BY aa.code, aa.name, aa.id ORDER BY aa.code", (account_id, date1, date2))
+                WHERE (aal.account_id IN %s) AND (aal.date>=%s) AND (aal.date<=%s) AND (aal.general_account_id=aa.id) AND aa.active \
+                GROUP BY aa.code, aa.name, aa.id ORDER BY aa.code", (tuple(self.analytic_acc_ids), date1, date2))
         res = self.cr.dictfetchall()
 
         for r in res:
@@ -59,9 +74,9 @@
 
     def _lines_a(self, general_account_id, account_id, date1, date2):
         self.cr.execute("SELECT aal.name AS name, aal.code AS code, aal.amount AS balance, aal.date AS date, aaj.code AS cj FROM account_analytic_line AS aal, account_analytic_journal AS aaj \
-                WHERE (aal.general_account_id=%s) AND (aal.account_id=%s) AND (aal.date>=%s) AND (aal.date<=%s) \
+                WHERE (aal.general_account_id=%s) AND (aal.account_id IN %s) AND (aal.date>=%s) AND (aal.date<=%s) \
                 AND (aal.journal_id=aaj.id) \
-                ORDER BY aal.date, aaj.code, aal.code", (general_account_id, account_id, date1, date2))
+                ORDER BY aal.date, aaj.code, aal.code", (general_account_id, tuple(self.analytic_acc_ids), date1, date2))
         res = self.cr.dictfetchall()
 
         for r in res:
@@ -77,11 +92,11 @@
         return res
 
     def _account_sum_debit(self, account_id, date1, date2):
-        self.cr.execute("SELECT sum(amount) FROM account_analytic_line WHERE account_id=%s AND date>=%s AND date<=%s AND amount>0", (account_id, date1, date2))
+        self.cr.execute("SELECT sum(amount) FROM account_analytic_line WHERE account_id IN %s AND date>=%s AND date<=%s AND amount>0", (tuple(self.analytic_acc_ids), date1, date2))
         return self.cr.fetchone()[0] or 0.0
 
     def _account_sum_credit(self, account_id, date1, date2):
-        self.cr.execute("SELECT -sum(amount) FROM account_analytic_line WHERE account_id=%s AND date>=%s AND date<=%s AND amount<0", (account_id, date1, date2))
+        self.cr.execute("SELECT -sum(amount) FROM account_analytic_line WHERE account_id IN %s AND date>=%s AND date<=%s AND amount<0", (tuple(self.analytic_acc_ids), date1, date2))
         return self.cr.fetchone()[0] or 0.0
 
     def _account_sum_balance(self, account_id, date1, date2):
@@ -91,16 +106,16 @@
 
     def _sum_debit(self, accounts, date1, date2):
         ids = map(lambda x: x.id, accounts)
-        if not ids:
+        self.analytic_acc_ids = self._get_children(ids)
+        if not self.analytic_acc_ids:
             return 0.0
-        self.cr.execute("SELECT sum(amount) FROM account_analytic_line WHERE account_id IN %s AND date>=%s AND date<=%s AND amount>0", (tuple(ids), date1, date2,))
+        self.cr.execute("SELECT sum(amount) FROM account_analytic_line WHERE account_id IN %s AND date>=%s AND date<=%s AND amount>0", (tuple(self.analytic_acc_ids), date1, date2,))
         return self.cr.fetchone()[0] or 0.0
 
     def _sum_credit(self, accounts, date1, date2):
-        ids = map(lambda x: x.id, accounts)
-        if not ids:
+        if not self.analytic_acc_ids:
             return 0.0
-        self.cr.execute("SELECT -sum(amount) FROM account_analytic_line WHERE account_id IN %s AND date>=%s AND date<=%s AND amount<0", (tuple(ids),date1, date2,))
+        self.cr.execute("SELECT -sum(amount) FROM account_analytic_line WHERE account_id IN %s AND date>=%s AND date<=%s AND amount<0", (tuple(self.analytic_acc_ids),date1, date2,))
         return self.cr.fetchone()[0] or 0.0
 
     def _sum_balance(self, accounts, date1, date2):