From 63b0e19313de322790341ca5bdf650f845757ace Mon Sep 17 00:00:00 2001 From: "Apa (Open ERP)" Date: Thu, 22 Jan 2009 18:29:31 +0530 Subject: [PATCH] modify formatLan function in some report's rml and sxw bzr revid: apa@tinyerp.com-20090122125931-zb31y9i1rah8t153 --- addons/account/report/aged_trial_balance.rml | 30 +-- addons/account/report/central_journal.rml | 157 ++++++------- addons/account/report/general_journal.rml | 221 +++++++++---------- 3 files changed, 188 insertions(+), 220 deletions(-) diff --git a/addons/account/report/aged_trial_balance.rml b/addons/account/report/aged_trial_balance.rml index 4fc50be7ae2..d3658c684c4 100644 --- a/addons/account/report/aged_trial_balance.rml +++ b/addons/account/report/aged_trial_balance.rml @@ -103,7 +103,7 @@ Partners - [[ data['form']['direction_selection'] == 'future' and 'Due' or 'Not due' ]] [[formatLang(data['form']['date1'],date=True) ]] + [[ data['form']['direction_selection'] == 'future' and 'Due' or 'Not due' ]] [[ formatLang(data['form']['date1'],date=True) ]] [[ data['form']['4']['name'] ]] @@ -134,31 +134,31 @@ - [[ get_direction('6') ]] + [[ formatLang(get_direction('6') or 0.00) ]] - [[ get_for_period('4') ]] + [[ formatLang(get_for_period('4') or 0.00) ]] - [[ get_for_period('3') ]] + [[ formatLang(get_for_period('3') or 0.00) ]] - [[ get_for_period('2') ]] + [[ formatLang(get_for_period('2') or 0.00) ]] - [[ get_for_period('1') ]] + [[ formatLang(get_for_period('1') or 0.00) ]] - [[ get_for_period('0') ]] + [[ formatLang(get_for_period('0') or 0.00) ]] - [[ get_total('5') ]] + [[ formatLang(get_total('5') or 0.00) ]] @@ -168,25 +168,25 @@ [[ partner['name'] ]] - [[ (partner['direction']) or 0.0 ]] + [[ formatLang(partner['direction'] or 0.00) ]] - [[ (partner['4']) or 0.0 ]] + [[ formatLang(partner['4'] or 0.00)]] - [[ (partner['3']) or 0.0 ]] + [[ formatLang(partner['3'] or 0.00)]] - [[ (partner['2']) or 0.0 ]] + [[ formatLang(partner['2'] or 0.00) ]] - [[ (partner['1']) or 0.0 ]] + [[ formatLang(partner['1'] or 0.00) ]] - [[ (partner['0']) or 0.0 ]] + [[ formatLang(partner['0'] or 0.00) ]] - [[ (partner['total']) or 0.0 ]] + [[ formatLang(partner['total'] or 0.00 ) ]] diff --git a/addons/account/report/central_journal.rml b/addons/account/report/central_journal.rml index 92ed232beff..8ebc61c86e1 100644 --- a/addons/account/report/central_journal.rml +++ b/addons/account/report/central_journal.rml @@ -2,31 +2,7 @@ @@ -69,7 +45,10 @@ - + + + + @@ -103,13 +82,13 @@ - + - - + + @@ -124,7 +103,17 @@ - + - - - - [[ repeatIn(objects, 'o') ]] @@ -162,26 +147,23 @@ - [[ o.journal_id.code or '' ]] + [[ o.journal_id.code or '' ]] - [[ o.journal_id.name ]] + [[ o.journal_id.name ]] - [[ time.strftime('%Y-%m-%d') ]] at [[ time.strftime('%H:%M:%S') ]] + [[ formatLang(time.strftime('%Y-%m-%d %H:%M:%S'),date_time = True) ]] - - - - + - Account Num. + Account Num. Account Name @@ -193,52 +175,53 @@ Credit - + + + + + - - - - - Total: - - - - - - - - [[ '%.2f' % sum_debit(o.period_id.id, o.journal_id.id) ]] - - - [[ '%.2f' % sum_credit(o.period_id.id, o.journal_id.id) ]] - - - - + + Total: + + + + + + + + [[ formatLang( sum_debit(o.period_id.id, o.journal_id.id)) ]] + + + [[ formatLang( sum_credit(o.period_id.id, o.journal_id.id)) ]] + - - - - [[ repeatIn(lines(o.period_id.id,o.journal_id.id),'line') ]] - - - - [[ line['code'] ]] - - - [[ line['name'] ]] - - - [[ formatLang(line['debit']) and '%.2f' % line['debit'] or '0.00' ]] - - - [[ formatLang(line['credit']) and '%.2f' % line['credit'] or '0.00' ]] - - - - - - + + + + +
+ [[ repeatIn(lines(o.period_id.id,o.journal_id.id),'line') ]] + + + + [[ line['code'] ]] + + + [[ line['name'] ]] + + + [[ formatLang(line['debit']) ]] + + + [[ formatLang(line['credit'])]] + + + + + + +
diff --git a/addons/account/report/general_journal.rml b/addons/account/report/general_journal.rml index d7775dd3cbb..365967e47e5 100644 --- a/addons/account/report/general_journal.rml +++ b/addons/account/report/general_journal.rml @@ -2,31 +2,7 @@ @@ -45,7 +21,11 @@ - + + + + + @@ -59,8 +39,9 @@ - - + + + @@ -82,13 +63,13 @@ - + - - + + @@ -106,7 +87,13 @@ - + - + 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) ]] @@ -140,11 +127,10 @@ -
- + - Jrl Code + Code Journal Name @@ -159,87 +145,86 @@ Credit Trans. - + + + + + - - - - - Total: - - - - - - - - - - - - - [[ '%.2f' % sum_debit() ]] - - - [[ '%.2f' % sum_credit() ]] - - - - - - - - - [[ repeatIn( periods(objects), 'o') ]] - - - - [[ o.name ]] : - - - - - - - - - - - - - [[ '%.2f' % sum_debit_period(o.id) ]] - - - [[ '%.2f' % sum_credit_period(o.id) ]] - - - - - - - - [[ repeatIn(lines(o.id),'line')]][[ line['code'] ]] - - - [[ line['name'] ]] - - - [[ o.name ]] - - - [[ line['debit'] and ('%.2f' % line['debit']) or '' ]] - - - [[ line['credit'] and ('%.2f' % line['credit']) or '' ]] - - - - - - - - - + + Total: + + + + + + + + + + + + + [[ formatLang(sum_debit()) ]] + + + [[ formatLang( sum_credit()) ]] + + + + + + +
+ [[ repeatIn( periods(objects), 'o') ]] + + + + [[ o.name ]] : + + + + + + + + + + + + + [[ formatLang(sum_debit_period(o.id)) ]] + + + [[ formatLang(sum_credit_period(o.id)) ]] + + + + + + + + + + [[ repeatIn(lines(o.id),'line')]] [[ line['code'] ]] + + + [[ line['name'] ]] + + + [[ o.name ]] + + + [[ formatLang(line['debit'] )]] + + + [[ formatLang(line['credit']) ]] + + + + + +