From 0e5e6ab6bc0347217b27c1243e317148265feec7 Mon Sep 17 00:00:00 2001 From: apa-tiny Date: Wed, 15 Oct 2008 15:58:55 +0530 Subject: [PATCH] Account Journal Report Completed...(Viral Rami) bzr revid: patelamit2003@gmail.com-20081015102855-xk9m6bo030ds6bvv --- addons/account/report/account_journal.rml | 66 +++++++++++------------ 1 file changed, 30 insertions(+), 36 deletions(-) diff --git a/addons/account/report/account_journal.rml b/addons/account/report/account_journal.rml index f224402569a..4831315864a 100644 --- a/addons/account/report/account_journal.rml +++ b/addons/account/report/account_journal.rml @@ -17,7 +17,7 @@ [[ company.name ]] - Print Journal + Print Journal - [[ company.currency_id.name ]] @@ -44,13 +44,11 @@ - - - - - - - + + + + + @@ -61,7 +59,7 @@ - + @@ -77,10 +75,11 @@ - - - + + + + @@ -119,16 +118,16 @@ [[ repeatIn(objects, 'o') ]] - + Date - Voucher No + Voucher No - Account Number + A/c No. Third party @@ -137,40 +136,38 @@ Entry label - Debit + Debit - Credit + Credit - - - - - - + - Total + [[o.period_id.name ]] - [[ '%.2f' % sum_debit(o.period_id.id, o.journal_id.id) ]] + [[ o.journal_id.code ]] + + + + + [[ '%.2f' % sum_debit(o.period_id.id, o.journal_id.id) or '0.00' ]] - [[ '%.2f' % sum_credit(o.period_id.id, o.journal_id.id) ]] + [[ '%.2f' % sum_credit(o.period_id.id, o.journal_id.id) or '0.00' ]] - - - + [[ repeatIn(lines(o.period_id.id, o.journal_id.id), 'line') ]] [[ line.date ]] - [[ line.ref ]] + [[ line.ref ]] - [[ line.account_id.code ]] + [[ line.account_id.code ]] [[ line.partner_id and line.partner_id.name ]] @@ -179,18 +176,15 @@ [[ line.name ]] - [[ line.debit and '%.2f' % line.debit or '' ]] + [[ line.debit and '%.2f' % line.debit or '0.00' ]] - [[ line.credit and '%.2f' % line.credit or '' ]] + [[ line.credit and '%.2f' % line.credit or '0.00' ]] - - - \ No newline at end of file