diff --git a/addons/account/report/account_balance.py b/addons/account/report/account_balance.py index 192cf2d9dc3..e7a10423bf5 100644 --- a/addons/account/report/account_balance.py +++ b/addons/account/report/account_balance.py @@ -117,7 +117,7 @@ class account_balance(report_sxw.rml_parse): 'debit': account.debit, 'credit': account.credit, 'balance': account.balance, - 'leef': not bool(account.child_id) + 'leef': not bool(account.child_id), } self.sum_debit += account.debit self.sum_credit += account.credit @@ -145,6 +145,8 @@ class account_balance(report_sxw.rml_parse): if res1: for r in res1: result_acc.append(r) + if account.code=='0': + result_acc.pop(-1) if account.child_id: ids2 = [(x.code,x.id) for x in account.child_id] ids2.sort() @@ -155,7 +157,7 @@ class account_balance(report_sxw.rml_parse): res={} self.date_lst_string = '\'' + '\',\''.join(map(str,self.date_lst)) + '\'' self.cr.execute( - "SELECT l.id as lid,l.date,j.name as jname, l.ref, l.name as lname, l.debit as debit1, l.credit as credit1 " \ + "SELECT l.id as lid,l.date,j.code as jname, l.ref, l.name as lname, l.debit as debit1, l.credit as credit1 " \ "FROM account_move_line l " \ "LEFT JOIN account_journal j " \ "ON (l.journal_id = j.id) " \ diff --git a/addons/account/report/account_balance.rml b/addons/account/report/account_balance.rml index 5152645c946..84fbaf79b4f 100644 --- a/addons/account/report/account_balance.rml +++ b/addons/account/report/account_balance.rml @@ -2,56 +2,123 @@ - + + - - + + + + + + - - + + + - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - Account Balance - - - -Currency: [[ company.currency_id.name ]] -[[ get_fiscalyear(data['form']) ]]: [[ get_periods(data['form']) ]] - - - - + - - Date - - Code or Journal Name + [[ get_fiscalyear(data['form']) or removeParentNode('tr') ]]: + [[ get_periods(data['form']) or removeParentNode('tr') ]] + + + + + + + + + + Code Account @@ -66,49 +133,45 @@ Balance - -
- [[ repeatIn(lines(data['form']), 'a') ]] - - - - - - [[ a['code'] or removeParentNode('tr') ]] - - [['... '*(a['level']-1)]][[ a['name'] ]] - - - [[ a['debit'] and '%.2f'%a['debit'] or '']] - - - [[ a['credit'] and '%.2f'%a['credit'] or '']] - - - [[ (a['leef'] and removeParentNode('para')) or a['balance'] and '%.2f'%a['balance'] or '' ]] - [[ ((not a['leef']) and removeParentNode('para')) or a['balance'] and a['balance'] or '' ]] - - - - - - [[ a['date'] or removeParentNode('tr') ]] - [[ a['jname'] ]] - - [['... '*(a['level']-1)]][[ a['lname'] ]] - - - [[ a['debit1'] and '%.2f'%a['debit1'] or '']] - - - [[ a['credit1'] and '%.2f'%a['credit1'] or '']] - - - [[ a['balance1'] and '%.2f'%a['balance1'] or '']] - - - -
-
+ + + + [[ 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'] ]] + + + [[ formatLang(a['debit']) and '%.2f'%a['debit'] or '']] + + + [[ formatLang(a['credit']) and '%.2f'%a['credit'] or '']] + + + [[ (a['level']<4) and setTag('para','para',{'style':'P3a'}) ]][[ (a['leef'] and removeParentNode('para')) or formatLang(a['balance']) and '%.2f'%a['balance'] or '' ]] + [[ ((not a['leef']) and removeParentNode('para')) or formatLang(a['balance']) and formatLang(a['balance']) or '' ]] + + + + [[ a['jname'] or removeParentNode('tr') ]] + + [[ '... '*(a['level']-3) ]][[ a['lname'] ]] + + + [[ formatLang(a['debit1']) and '%.2f'%a['debit1'] or '']] + + + [[ formatLang(a['credit1']) and '%.2f'%a['credit1'] or '']] + + + [[ formatLang(a['balance1']) and '%.2f'%a['balance1'] or '']] + + + + + + +