From d091a5c0d098b020b81920f0ef291db039b69a23 Mon Sep 17 00:00:00 2001 From: "Apa (Open ERP)" Date: Fri, 23 Jan 2009 11:34:03 +0530 Subject: [PATCH] set formatLang function in general_ledger_landscap bzr revid: apa@tinyerp.com-20090123060403-hztz9cux38vvom5e --- .../report/general_ledger_landscape.py | 4 +-- .../report/general_ledger_landscape.rml | 34 +++++++++---------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/addons/account/report/general_ledger_landscape.py b/addons/account/report/general_ledger_landscape.py index 4dc1060ab1e..7b52e44fb48 100644 --- a/addons/account/report/general_ledger_landscape.py +++ b/addons/account/report/general_ledger_landscape.py @@ -300,8 +300,8 @@ class general_ledger_landscape(rml_parse.rml_parse): sum = l['debit'] - l ['credit'] - c = time.strptime(l['date'],"%Y-%m-%d") - l['date'] = time.strftime("%d-%m-%Y",c) +# c = time.strptime(l['date'],"%Y-%m-%d") +# l['date'] = time.strftime("%d-%m-%Y",c) l['progress'] = sum l['line_corresp'] = self._calc_contrepartie(self.cr,self.uid,[l['id']])[l['id']] # Modification du amount Currency diff --git a/addons/account/report/general_ledger_landscape.rml b/addons/account/report/general_ledger_landscape.rml index 3162811e063..51593eacf05 100644 --- a/addons/account/report/general_ledger_landscape.rml +++ b/addons/account/report/general_ledger_landscape.rml @@ -115,27 +115,27 @@ [[ o.code ]] [[ o.name ]] - [[ sum_debit_account(o, data['form']) or '0.0' ]] - [[ sum_credit_account(o, data['form']) or '0.0' ]] - [[ sum_solde_account(o, data['form']) or '0.0' ]] - [[ sum_currency_amount_account(o, data['form']) or '0.0' ]] + [[ formatLang(sum_debit_account(o, data['form'])) ]] + [[ formatLang(sum_credit_account(o, data['form'])) ]] + [[ formatLang(sum_solde_account(o, data['form'])) ]] + [[ formatLang(sum_currency_amount_account(o, data['form'])) ]] [[ repeatIn(lines(o, data['form']), 'line') ]] - [[ line['date'] ]] + [[ formatLang(line['date'],date=True) ]] [[ line['code'] ]] [[ line['partner'] ]] [[ line['ref'] ]] [[ line['move'] ]] [[ line['name'] ]] [[ strip_name(line['line_corresp'],55) ]] - [[ line['debit'] and line['debit'] or '0.0' ]] - [[ line['credit'] and line['credit'] or '0.0' ]] - [[ line['progress'] and line['progress'] or '0.0' ]] - [[ line['amount_currency'] or '0.0' ]] [[ line['currency_code'] ]] + [[ formatLang(line['debit']) ]] + [[ formatLang(line['credit']) ]] + [[ formatLang(line['progress']) ]] + [[ formatLang(line['amount_currency'] or 0.00)]] [[ line['currency_code'] ]] @@ -168,26 +168,26 @@ [[ o.code ]] [[ o.name ]] - [[ sum_debit_account(o, data['form']) or '0.0']] - [[sum_credit_account(o, data['form']) or '0.0']] - [[sum_solde_account(o, data['form']) or '0.0' ]] + [[ formatLang(sum_debit_account(o, data['form']))]] + [[formatLang(sum_credit_account(o, data['form']))]] + [[formatLang(sum_solde_account(o, data['form'])) ]] [[ repeatIn(lines(o, data['form']), 'line') ]] - [[ line['date'] ]] + [[ formatLang(line['date'],date=True) ]] [[ line['code'] ]] [[ line['partner'] ]] [[ line['ref'] ]] [[ line['move'] ]] [[ line['name'] ]] [[ strip_name(line['line_corresp'],55) ]] - [[ line['debit'] and line['debit'] or '0.0' ]] - [[ line['credit'] and line['credit'] or '0.0' ]] - [[ line['progress'] and line['progress'] or '0.0' ]] - + [[ formatLang(line['debit']) ]] + [[ formatLang(line['credit']) ]] + [[ formatLang(line['progress']) ]] +