From 3ab08be0da7522e79f6d6e1a29f32491484de4cb Mon Sep 17 00:00:00 2001 From: ced <> Date: Mon, 23 Jul 2007 05:15:27 +0000 Subject: [PATCH] account: add multi company to third party ledger report bzr revid: ced-ca2301d2414b70d701f1930cf318509ad9fe5f2b --- addons/account/report/third_party_ledger.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/addons/account/report/third_party_ledger.py b/addons/account/report/third_party_ledger.py index 806c58db7a9..ec200257150 100644 --- a/addons/account/report/third_party_ledger.py +++ b/addons/account/report/third_party_ledger.py @@ -47,14 +47,23 @@ class third_party_ledger(report_sxw.rml_parse): self.cr.execute( "SELECT DISTINCT line.partner_id " \ "FROM account_move_line AS line, account_account AS account " \ +<<<<<<< HEAD:server/bin/addons/account/report/third_party_ledger.py "WHERE line.partner_id IS NOT NULL AND line.date>=%s AND line.date<=%s AND line.state<>'draft' AND line.period_id in (SELECT id FROM account_period WHERE fiscalyear_id=%d) " \ "AND line.account_id = account.id AND account.company_id = %d AND account.active", +======= + "WHERE line.partner_id IS NOT NULL AND line.date>=%s AND line.date<=%s AND line.state<>'draft' AND line.period_id in (SELECT id FROM account_period WHERE fiscalyear_id=%d)" \ + "AND line.account_id = account.id AND account.company_id = %d", +>>>>>>> account: add multi company to third party ledger report:server/bin/addons/account/report/third_party_ledger.py (data['form']['date1'], data['form']['date2'], data['form']['fiscalyear'], data['form']['company_id'])) new_ids = [id for (id,) in self.cr.fetchall()] self.cr.execute( "SELECT a.id " \ "FROM account_account a LEFT JOIN account_account_type t ON (a.type=t.code) " \ +<<<<<<< HEAD:server/bin/addons/account/report/third_party_ledger.py "WHERE t.partner_account=TRUE AND a.company_id = %d AND a.active", (data['form']['company_id'],)) +======= + "WHERE t.partner_account=TRUE AND a.company_id = %d", (data['form']['company_id'],)) +>>>>>>> account: add multi company to third party ledger report:server/bin/addons/account/report/third_party_ledger.py self.account_ids = ','.join([str(a) for (a,) in self.cr.fetchall()]) self.partner_ids = ','.join(map(str, new_ids)) objects = self.pool.get('res.partner').browse(self.cr, self.uid, new_ids)