diff options
| author | Ujjvala Collins (OpenERP) <uco@tinyerp.com> | 2011-08-25 17:43:02 +0530 |
|---|---|---|
| committer | Ujjvala Collins (OpenERP) <uco@tinyerp.com> | 2011-08-25 17:43:02 +0530 |
| commit | 03130debf2f5ec6391fe5bac7bb50bfe7ffbc76e (patch) | |
| tree | 8effe02bebc675a5cac46a55f29d4f276bf0d75a | |
| parent | d3a3f5ba3a2a98f9e5605fb5a7f7fe396dc46e45 (diff) | |
[IMP] account: Improved formatting of account report.
bzr revid: uco@tinyerp.com-20110825121302-fa4fl9k19jleh409
| -rw-r--r-- | addons/account/report/account_low_level_report.py | 23 | ||||
| -rw-r--r-- | addons/account/report/account_low_level_report.rml | 17 |
2 files changed, 14 insertions, 26 deletions
diff --git a/addons/account/report/account_low_level_report.py b/addons/account/report/account_low_level_report.py index 4fd59959d8e..3f834921f86 100644 --- a/addons/account/report/account_low_level_report.py +++ b/addons/account/report/account_low_level_report.py @@ -106,18 +106,19 @@ class report_account_common(report_sxw.rml_parse, common_report_header): lines.append(vals) if report.type == 'accounts' and report.display_detail: for account in report.account_ids: - vals = { - 'name': account.code + ' ' + account.name, - 'balance': account.balance, - 'type': 'account', - 'level': account.level, - 'account_type': account.type, - } - if data['form']['enable_filter']: - vals['balance_cmp'] = self.pool.get('account.account').browse(self.cr, self.uid, account.id, context=data['form']['comparison_context']).balance - lines.append(vals) + if account.level != 0: + vals = { + 'name': account.code + ' ' + account.name, + 'balance': account.balance, + 'type': 'account', + 'level': account.level, + 'account_type': account.type, + } + if data['form']['enable_filter']: + vals['balance_cmp'] = self.pool.get('account.account').browse(self.cr, self.uid, account.id, context=data['form']['comparison_context']).balance + lines.append(vals) return lines -# + # def get_report_balance(self, child, child_ids, context=None): # cr, uid = self.cr, self.uid # report_obj = self.pool.get('account.report') diff --git a/addons/account/report/account_low_level_report.rml b/addons/account/report/account_low_level_report.rml index fa792a99df0..a8487862ea5 100644 --- a/addons/account/report/account_low_level_report.rml +++ b/addons/account/report/account_low_level_report.rml @@ -216,21 +216,10 @@ <para style="Standard"> <font color="white"> </font> </para> - <!--<para style="Standard">[[ repeatIn(get_report_details(data),'r') ]] </para> - <blockTable colWidths="314.0,156.0" style="Table2_Report"> - <tr> - <td><para style="terp_default_Bold_9">Report Name</para></td> - <td><para style="terp_default_Bold_9">Report Balance</para></td> - </tr> - <tr> - <td><para style="terp_default_8">[[ r['name'] ]]</para></td> - <td><para style="terp_default_8">[[ formatLang(r['balance']) ]][[ company.currency_id.symbol ]]</para></td> - </tr> - </blockTable>--> <para style="Standard"> <font color="white"> </font> </para> - <para style="terp_header">Accounts</para> + <para style="terp_header">Reports</para> <blockTable colWidths="330.0,160.0" style="Table_Account_Line_Title"> [[ data['form']['enable_filter'] == 0 or removeParentNode('blockTable') ]] <tr> @@ -243,6 +232,7 @@ </tr> <tr style="Table3"> [[ repeatIn(get_lines(data), 'a') ]] + [[ setTag('tr','tr',{'style': 'Table'+str(min(3,'level' in a and a.get('level') or 1))}) or removeParentNode('tr') ]] <td><para style="terp_level_1_name">[[ a.get('type')=='report' and a.get('name') or removeParentNode('td') ]]</para></td> <td><para style="terp_level_1_balance">[[ a.get('type')=='report' and formatLang(a.get('balance')) or removeParentNode('td') ]][[company.currency_id.symbol ]]</para></td> <td><para style="terp_level_3_name">[[ a.get('type') == 'account' and a.get('name') or removeParentNode('td') ]] @@ -283,8 +273,5 @@ <para style="Standard"> <font color="white"> </font> </para> - <para style="terp_default_Right_9_Bold"> - <font color="white"> </font> - </para> </story> </document> |