From d5b3b1a24791e1c3b73a4885e4e1c9f7a31b6c00 Mon Sep 17 00:00:00 2001 From: "Apa (Open ERP)" Date: Fri, 23 Jan 2009 16:45:20 +0530 Subject: [PATCH] Set FormatLang function in : account/report/wizard_account_journal.rml account/report/wizard_central_journal.rml account/report/wizard_general_journal.rml bzr revid: apa@tinyerp.com-20090123111520-058rmjrgpmdfvy96 --- addons/account/report/wizard_account_journal.rml | 14 +++++++------- addons/account/report/wizard_central_journal.rml | 12 ++++++------ addons/account/report/wizard_general_journal.rml | 16 ++++++++-------- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/addons/account/report/wizard_account_journal.rml b/addons/account/report/wizard_account_journal.rml index def6acbecb8..0cc66191f53 100644 --- a/addons/account/report/wizard_account_journal.rml +++ b/addons/account/report/wizard_account_journal.rml @@ -24,7 +24,7 @@ - [[ time.strftime("%Y-%m-%d %H:%M", time.localtime()) ]] + [[ formatLang(time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()),date_time = True) ]] Page @@ -145,7 +145,7 @@ - [[line[0].period_id.name ]] + [[ line[0].period_id.name ]] [[line[0].journal_id.code ]] @@ -153,16 +153,16 @@ - [[ '%.2f' % sum_debit(line[0].period_id.id, line[0].journal_id.id) or '0.00' ]] + [[ formatLang(sum_debit(line[0].period_id.id, line[0].journal_id.id)) ]] - [[ '%.2f' % sum_credit(line[0].period_id.id, line[0].journal_id.id) or '0.00' ]] + [[ formatLang(sum_credit(line[0].period_id.id, line[0].journal_id.id)) ]] [[repeatIn(line,'l')]] - [[ l.date ]] + [[ formatLang(l.date,date=True) ]] [[ l.ref ]] @@ -177,10 +177,10 @@ [[ l.name ]] - [[ l.debit and '%.2f' % l.debit or '0.00' ]] + [[ formatLang(l.debit) ]] - [[ l.credit and '%.2f' % l.credit or '0.00' ]] + [[ formatLang(l.credit) ]] diff --git a/addons/account/report/wizard_central_journal.rml b/addons/account/report/wizard_central_journal.rml index 4c0b037971a..7cefd80fbe2 100644 --- a/addons/account/report/wizard_central_journal.rml +++ b/addons/account/report/wizard_central_journal.rml @@ -16,7 +16,7 @@ - [[ time.strftime("%Y-%m-%d %H:%M", time.localtime()) ]] + [[ formatLang(time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()),date_time = True) ]] Page @@ -169,7 +169,7 @@ [[ line[0]['journal'].name ]] - [[ time.strftime('%Y-%m-%d') ]] at [[ time.strftime('%H:%M:%S') ]] + [[ formatLang(time.strftime('%Y-%m-%d %H:%M:%S'),date_time = True) ]] @@ -208,10 +208,10 @@ - [[ '%.2f' % sum_debit(line[0]['period'].id, line[0]['journal'].id) ]] + [[ formatLang(sum_debit(line[0]['period'].id, line[0]['journal'].id)) ]] - [[ '%.2f' % sum_credit(line[0]['period'].id, line[0]['journal'].id) ]] + [[ formatLang(sum_credit(line[0]['period'].id, line[0]['journal'].id)) ]] @@ -230,10 +230,10 @@ [[ l['name'] ]] - [[ formatLang(l['debit']) and '%.2f' % l['debit'] or '0.00' ]] + [[ formatLang(l['debit']) ]] - [[ formatLang(l['credit']) and '%.2f' % l['credit'] or '0.00' ]] + [[ formatLang(l['credit']) ]] diff --git a/addons/account/report/wizard_general_journal.rml b/addons/account/report/wizard_general_journal.rml index e61aa9b2267..aba1ad9c98c 100644 --- a/addons/account/report/wizard_general_journal.rml +++ b/addons/account/report/wizard_general_journal.rml @@ -16,7 +16,7 @@ - [[ time.strftime("%Y-%m-%d %H:%M", time.localtime()) ]] + [[ formatLang(time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()),date_time = True) ]] Page @@ -130,7 +130,7 @@ Printing Date : - [[ time.strftime('%Y-%m-%d') ]] at [[ time.strftime('%H:%M:%S') ]] + [[ formatLang(time.strftime('%Y-%m-%d %H:%M:%S'),date_time = True) ]] @@ -178,10 +178,10 @@ - [[ '%.2f' % sum_debit(data['form']['period_id'][0][2],data['form']['journal_id'][0][2]) ]] + [[ formatLang(sum_debit(data['form']['period_id'][0][2],data['form']['journal_id'][0][2])) ]] - [[ '%.2f' % sum_credit(data['form']['period_id'][0][2],data['form']['journal_id'][0][2]) ]] + [[ formatLang(sum_credit(data['form']['period_id'][0][2],data['form']['journal_id'][0][2])) ]] @@ -208,10 +208,10 @@ - [[ '%.2f' % sum_debit_period( line[0]['pid'],data['form']['journal_id'][0][2]) ]] + [[ formatLang(sum_debit_period( line[0]['pid'],data['form']['journal_id'][0][2])) ]] - [[ '%.2f' % sum_credit_period(line[0]['pid'],data['form']['journal_id'][0][2]) ]] + [[ formatLang(sum_credit_period(line[0]['pid'],data['form']['journal_id'][0][2])) ]] @@ -229,10 +229,10 @@ [[ line[0]['period_name'] ]] - [[ l['debit'] and ('%.2f' % l['debit']) or '' ]] + [[ formatLang(l['debit'])]] - [[ l['credit'] and ('%.2f' % l['credit']) or '' ]] + [[ formatLang(l['credit']) ]]