From 997d69a6671b58d33f51f8c6a7052a4b4bd36a79 Mon Sep 17 00:00:00 2001 From: ced <> Date: Tue, 10 Jul 2007 15:24:59 +0000 Subject: [PATCH] account: add multi company to third party ledger report bzr revid: ced-15f14615f0c7b315036d06c1dc53038a3b298630 --- addons/account/report/third_party_ledger.py | 24 +++-- addons/account/report/third_party_ledger.rml | 93 ++++++++++--------- .../wizard/wizard_third_party_ledger.py | 12 ++- 3 files changed, 76 insertions(+), 53 deletions(-) diff --git a/addons/account/report/third_party_ledger.py b/addons/account/report/third_party_ledger.py index c664c58cfcd..9e596a39150 100644 --- a/addons/account/report/third_party_ledger.py +++ b/addons/account/report/third_party_ledger.py @@ -38,20 +38,23 @@ class third_party_ledger(report_sxw.rml_parse): 'sum_debit_partner': self._sum_debit_partner, 'sum_credit_partner': self._sum_credit_partner, 'sum_debit': self._sum_debit, - 'sum_credit': self._sum_credit + 'sum_credit': self._sum_credit, + 'get_company': self._get_company, + 'get_currency': self._get_currency, }) def preprocess(self, objects, data, ids): self.cr.execute( - "SELECT DISTINCT partner_id " \ - "FROM account_move_line " \ - "WHERE partner_id IS NOT NULL AND date>=%s AND date<=%s AND state<>'draft' AND period_id in (SELECT id FROM account_period WHERE fiscalyear_id=%d)", - (data['form']['date1'], data['form']['date2'], data['form']['fiscalyear'])) + "SELECT DISTINCT line.partner_id " \ + "FROM account_move_line AS line, account_account AS account " \ + "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", + (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) " \ - "WHERE t.partner_account=TRUE") + "WHERE t.partner_account=TRUE AND a.company_id = %d", (data['form']['company_id'],)) 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) @@ -123,5 +126,12 @@ class third_party_ledger(report_sxw.rml_parse): "AND period_id in (SELECT id FROM account_period WHERE fiscalyear_id=%d)", (self.datas['form']['date1'], self.datas['form']['date2'], self.datas['form']['fiscalyear'])) return self.cr.fetchone()[0] or 0.0 -report_sxw.report_sxw('report.account.third_party_ledger', 'res.partner', 'addons/account/report/third_party_ledger.rml',parser=third_party_ledger) + + def _get_company(self, form): + return pooler.get_pool(self.cr.dbname).get('res.company').browse(self.cr, self.uid, form['company_id']).name + + def _get_currency(self, form): + return pooler.get_pool(self.cr.dbname).get('res.company').browse(self.cr, self.uid, form['company_id']).currency_id.name + +report_sxw.report_sxw('report.account.third_party_ledger', 'res.partner', 'addons/account/report/third_party_ledger.rml',parser=third_party_ledger, header=False) diff --git a/addons/account/report/third_party_ledger.rml b/addons/account/report/third_party_ledger.rml index 7f568eb7518..079dfd2e8cd 100644 --- a/addons/account/report/third_party_ledger.rml +++ b/addons/account/report/third_party_ledger.rml @@ -16,6 +16,9 @@ + + + @@ -40,19 +43,19 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + @@ -73,51 +76,51 @@ Third party ledger - From [[ data['form']['date1'] ]] - to [[ data['form']['date2'] ]] + From [[ data['form']['date1'] ]] + to [[ data['form']['date2'] ]] - [[ company.name ]] + [[ get_company(data['form']) ]] - Complete + Complete - Currency: [[ company.currency_id.name ]] + Currency: [[ get_currency(data['form']) ]] - Printing date: [[ time.strftime('%Y-%m-%d') ]] at [[ time.strftime('%H:%M:%S') ]] - + Printing date: [[ time.strftime('%Y-%m-%d') ]] at [[ time.strftime('%H:%M:%S') ]] + - Date + Date - J. code + J. code - Voucher Nb + Voucher Nb - Entry label + Entry label - Debit + Debit - Credit + Credit - Progressive balance + Progressive balance @@ -125,49 +128,49 @@
- [[ repeatIn(objects, 'p') ]] - [[ p.ref ]] [[ p.name ]] + [[ repeatIn(objects, 'p') ]] + [[ p.ref ]] [[ p.name ]] - [[ repeatIn(lines(p), 'line') ]][[ line['date'] ]] + [[ repeatIn(lines(p), 'line') ]][[ line['date'] ]] - [[ line['code'] ]] + [[ line['code'] ]] - [[ line['ref'] ]] + [[ line['ref'] ]] - [[ line['name'] ]] + [[ line['name'] ]] - [[ line['debit'] and '%.2f' % line['debit'] or '' ]] + [[ line['debit'] and '%.2f' % line['debit'] or '' ]] - [[ line['credit'] and '%.2f' % line['credit'] or '' ]] + [[ line['credit'] and '%.2f' % line['credit'] or '' ]] - [[ line['progress'] and '%.2f' % line['progress'] or '' ]] + [[ line['progress'] and '%.2f' % line['progress'] or '' ]] - Total for [[ p.ref ]] - + Total for [[ p.ref ]] + - [[ '%.2f' % sum_debit_partner(p) ]] + [[ '%.2f' % sum_debit_partner(p) ]] - [[ '%.2f' % sum_credit_partner(p) ]] + [[ '%.2f' % sum_credit_partner(p) ]] - [[ '%.2f' %(sum_debit_partner(p) - sum_credit_partner(p)) ]] + [[ '%.2f' %(sum_debit_partner(p) - sum_credit_partner(p)) ]] @@ -181,16 +184,16 @@ - Balance brought forward + Balance brought forward - [[ '%.2f' % sum_debit() ]] + [[ '%.2f' % sum_debit() ]] - [[ '%.2f' % sum_credit() ]] + [[ '%.2f' % sum_credit() ]] - [[ '%.2f' %(sum_debit() - sum_credit()) ]] + [[ '%.2f' %(sum_debit() - sum_credit()) ]] diff --git a/addons/account/wizard/wizard_third_party_ledger.py b/addons/account/wizard/wizard_third_party_ledger.py index a28a7dde386..4e492b4393a 100644 --- a/addons/account/wizard/wizard_third_party_ledger.py +++ b/addons/account/wizard/wizard_third_party_ledger.py @@ -31,13 +31,15 @@ import pooler dates_form = '''
- + + ''' dates_fields = { + 'company_id': {'string': 'Company', 'type': 'many2one', 'relation': 'res.company', 'required': True}, 'fiscalyear': {'string': 'Fiscal year', 'type': 'many2one', 'relation': 'account.fiscalyear', 'required': True}, 'date1': {'string':'Start of period', 'type':'date', 'required':True, 'default': lambda *a: time.strftime('%Y-01-01')}, 'date2': {'string':'End of period', 'type':'date', 'required':True, 'default': lambda *a: time.strftime('%Y-%m-%d')}, @@ -47,6 +49,14 @@ class wizard_report(wizard.interface): def _get_defaults(self, cr, uid, data, context): fiscalyear_obj = pooler.get_pool(cr.dbname).get('account.fiscalyear') data['form']['fiscalyear'] = fiscalyear_obj.find(cr, uid) + + user = pooler.get_pool(cr.dbname).get('res.users').browse(cr, uid, uid, context=context) + if user.company_id: + company_id = user.company_id.id + else: + company_id = pooler.get_pool(cr.dbname).get('res.company').search(cr, uid, [('parent_id', '=', False)])[0] + data['form']['company_id'] = company_id + return data['form'] states = {