Divyesh Makwana(OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-bug-880844-mdi into
lp:openobject-addons.
Requested reviews:
OpenERP Core Team (openerp)
Related bugs:
Bug #880844 in OpenERP Addons: "Cost Ledger incorrect for View accounts"
https://bugs.launchpad.net/openobject-addons/+bug/880844
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-880844-mdi/+merge/83604
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)
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-880844-mdi/+merge/83604
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-bug-880844-mdi.
=== 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-11-28 13:26:15 +0000
@@ -38,11 +38,32 @@
'sum_balance': self._sum_balance,
})
+ def _get_children(self, account_id):
+ result = []
+
+ def _get_rec(account_id):
+ analytic_obj = self.pool.get('account.analytic.account')
+ analytic_search_ids = analytic_obj.search(self.cr, self.uid, [('id', '=', account_id)])
+ analytic_datas = analytic_obj.browse(self.cr, self.uid, analytic_search_ids)
+
+ result.append(account_id)
+ for account in analytic_datas:
+ for child in account.child_ids:
+ result.append(child.id)
+ for child_id in child.child_ids:
+ _get_rec(child_id.id)
+ return result
+
+ child_ids = _get_rec(account_id)
+
+ return child_ids
+
def _lines_g(self, account_id, date1, date2):
+ chid_ids = self._get_children(account_id)
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(chid_ids), date1, date2))
res = self.cr.dictfetchall()
for r in res:
@@ -58,10 +79,11 @@
return res
def _lines_a(self, general_account_id, account_id, date1, date2):
+ chid_ids = self._get_children(account_id)
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(chid_ids), date1, date2))
res = self.cr.dictfetchall()
for r in res:
@@ -77,11 +99,13 @@
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))
+ chid_ids = self._get_children(account_id)
+ 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(chid_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))
+ chid_ids = self._get_children(account_id)
+ 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(chid_ids), date1, date2))
return self.cr.fetchone()[0] or 0.0
def _account_sum_balance(self, account_id, date1, date2):
@@ -91,16 +115,18 @@
def _sum_debit(self, accounts, date1, date2):
ids = map(lambda x: x.id, accounts)
- if not ids:
+ chid_ids = self._get_children(ids[0])
+ if not children:
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(chid_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:
+ chid_ids = self._get_children(ids[0])
+ if not children:
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(chid_ids),date1, date2,))
return self.cr.fetchone()[0] or 0.0
def _sum_balance(self, accounts, date1, date2):
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
