From fc21bd988037354de1edc856131f8bd0b22a875b Mon Sep 17 00:00:00 2001 From: apa-tiny Date: Tue, 7 Oct 2008 13:11:40 +0530 Subject: [PATCH] account report completed(Rana vinay) bzr revid: patelamit2003@gmail.com-20081007074140-5rw8utfttxe1f9e7 --- addons/account/report/account_balance.py | 2 +- addons/account/report/account_balance.rml | 195 ++++++++++++++++------ 2 files changed, 146 insertions(+), 51 deletions(-) mode change 100644 => 100755 addons/account/report/account_balance.py mode change 100644 => 100755 addons/account/report/account_balance.rml diff --git a/addons/account/report/account_balance.py b/addons/account/report/account_balance.py old mode 100644 new mode 100755 index 1ecb0869876..624f49ebdfa --- a/addons/account/report/account_balance.py +++ b/addons/account/report/account_balance.py @@ -224,5 +224,5 @@ class account_balance(report_sxw.rml_parse): def _sum_debit(self): return self.sum_debit -report_sxw.report_sxw('report.account.account.balance', 'account.account', 'addons/account/report/account_balance.rml', parser=account_balance, header=2) +report_sxw.report_sxw('report.account.account.balance', 'account.account', 'addons/account/report/account_balance.rml', parser=account_balance, header=False) diff --git a/addons/account/report/account_balance.rml b/addons/account/report/account_balance.rml old mode 100644 new mode 100755 index 0b614106551..cfabf9d545f --- a/addons/account/report/account_balance.rml +++ b/addons/account/report/account_balance.rml @@ -19,6 +19,7 @@ 1cm 27.7cm 20cm 27.7cm + @@ -40,7 +41,7 @@ - + @@ -51,12 +52,15 @@ + + + - + @@ -75,25 +79,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - @@ -139,46 +244,36 @@ Balance - - - - [[ repeatIn(lines(data['form']), 'a') ]] - - [[ setTag('para','para',{'style':('Level'+str(a['level']))}) ]][[ a['code'] or removeParentNode('tr') ]] - - [[ setTag('para','para',{'style':('Level'+str(a['level']))}) ]][[ (a['level']<6 and removeParentNode('font') or '... '*(a['level']-4)) ]][[ setTag('blockTable','blockTable',{'style':'TrLevel'+str(a['level'])}) ]][[ a['name'] ]] - - - [[ (a['level']<4) and setTag('para','para',{'style':'P3'}) ]][[ (a['leef'] and removeParentNode('para')) or formatLang(a['debit']) and '%.2f'%a['debit'] or '0.00' ]] - [[ ((not a['leef']) and removeParentNode('para')) or formatLang(a['debit']) and '%.2f'%a['debit'] or '0.00' ]] - - - [[ (a['level']<4) and setTag('para','para',{'style':'P3'}) ]][[ (a['leef'] and removeParentNode('para')) or formatLang(a['credit']) and '%.2f'%a['credit'] or '0.00' ]] - [[ ((not a['leef']) and removeParentNode('para')) or formatLang(a['credit']) and '%.2f'%a['credit'] or '0.00' ]] - - - [[ (a['level']<4) and setTag('para','para',{'style':'P3a'}) ]][[ (a['leef'] and removeParentNode('para')) or formatLang(a['balance']) and '%.2f'%a['balance'] or '0.00' ]] - [[ ((not a['leef']) and removeParentNode('para')) or formatLang(a['balance']) and formatLang(a['balance']) or '0.00' ]] - - - - [[ a['jname'] or removeParentNode('tr') ]] - - [[ '... '*(a['level']-3) ]][[ a['lname'] ]] - - - [[ formatLang(a['debit1']) and '%.2f'%a['debit1'] or '0.00']] - - - [[ formatLang(a['credit1']) and '%.2f'%a['credit1'] or '0.00']] - - - [[ formatLang(a['balance1']) and '%.2f'%a['balance1'] or '0.00' ]] - - - - - + + + + [[ repeatIn(lines(data['form']), 'a') ]] + + [[ setTag('para','para',{'style':('Level'+str(a['level']))}) ]][[ a['code'] or removeParentNode('tr') ]] + [[ setTag('para','para',{'style':('Level'+str(a['level']))}) ]][[ setTag('blockTable','blockTable',{'style':'TrLevel'+str(a['level'])}) ]][[ a['name'] ]] + + [[ a['level']>3 and removeParentNode('font') ]][[ setTag('para','para',{'style':('Amt_Level'+str(a['level']))}) ]][[ formatLang(a['debit']) and '%.2f'%a['debit'] or '0.00' ]] + [[ a['level']<4 and removeParentNode('font') ]][[ setTag('para','para',{'style':('Amt_Level'+str(a['level']))}) ]][[ formatLang(a['debit']) and '%.2f'%a['debit'] or '0.00' ]] + + + [[ a['level']>3 and removeParentNode('font') ]][[ setTag('para','para',{'style':('Amt_Level'+str(a['level']))}) ]][[ formatLang(a['credit']) and '%.2f'%a['credit'] or '0.00' ]] + [[ a['level']<4 and removeParentNode('font') ]][[ setTag('para','para',{'style':('Amt_Level'+str(a['level']))}) ]][[ formatLang(a['credit']) and '%.2f'%a['credit'] or '0.00' ]] + + + [[ a['level']>3 and removeParentNode('font') ]][[ setTag('para','para',{'style':('Amt_Level'+str(a['level']))}) ]][[ formatLang(a['balance']) and '%.2f'%a['balance'] or '0.00' ]] + [[ a['level']<4 and removeParentNode('font') ]][[ setTag('para','para',{'style':('Amt_Level'+str(a['level']))}) ]][[ formatLang(a['balance']) and '%.2f'%a['balance'] or '0.00' ]] + + + + [[ setTag('para','para',{'style':('Det_Level'+str(a['level']))}) ]][[ a['jname'] or removeParentNode('tr') ]] + [[ a['level']<4 and removeParentNode('font') or '...'*(2) ]][[ setTag('para','para',{'style':('Det_Level'+str(a['level']))}) ]][ref: [[ a['ref'] or removeParentNode('font') ]] ] [[ a['lname'] ]] + [[ setTag('para','para',{'style':('Det_Amt_Level'+str(a['level']))}) ]][[ formatLang(a['debit1']) and '%.2f'%a['debit1'] or '0.00']] + [[ setTag('para','para',{'style':('Det_Amt_Level'+str(a['level']))}) ]][[ formatLang(a['credit1']) and '%.2f'%a['credit1'] or '0.00']] + [[ setTag('para','para',{'style':('Det_Amt_Level'+str(a['level']))}) ]][[ formatLang(a['balance1']) and '%.2f'%a['balance1'] or '0.00' ]] + + + +