diff --git a/addons/account/report/account_low_level_report.py b/addons/account/report/account_low_level_report.py index 31b0ac5d516..4fd59959d8e 100644 --- a/addons/account/report/account_low_level_report.py +++ b/addons/account/report/account_low_level_report.py @@ -110,6 +110,8 @@ class report_account_common(report_sxw.rml_parse, common_report_header): '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 diff --git a/addons/account/report/account_low_level_report.rml b/addons/account/report/account_low_level_report.rml index 4cd0d564839..fa792a99df0 100644 --- a/addons/account/report/account_low_level_report.rml +++ b/addons/account/report/account_low_level_report.rml @@ -231,8 +231,8 @@ Accounts - - [[data['form']['enable_filter'] == False or removeParentNote('blockTable')]] + + [[ data['form']['enable_filter'] == 0 or removeParentNode('blockTable') ]] Name @@ -243,23 +243,19 @@ [[ repeatIn(get_lines(data), 'a') ]] - [[a.get('name', '')]] - [[a.get('balance',0.0)]] - - + [[ a.get('type')=='report' and a.get('name') or removeParentNode('td') ]] + [[ a.get('type')=='report' and formatLang(a.get('balance')) or removeParentNode('td') ]][[company.currency_id.symbol ]] + [[ a.get('type') == 'account' and a.get('name') or removeParentNode('td') ]] + [[ a.get('type')=='account' and (a.get('account_type')=='view' and a.get('level',1) >= 3) and setTag('para','para',{'style': 'terp_level_'+str(min(3,a.get('level',1)))+'_name_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(4,a.get('level',1)))+'_name'}) ]] + [[ a.get('type')=='account' and (a.get('level',1) <>2) or removeParentNode('td') ]][[ (a.get('account_type') == 'view' and a.get('level',1) >= 3) and setTag('para','para',{'style': 'terp_level_3_balance_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(3,a.get('level',1)))+'_balance'}) ]][[ formatLang(a.get('balance')) ]][[company.currency_id.symbol ]] + [[ a.get('type')=='account' and a.get('level',1) == 2 or removeParentNode('td') ]][[ formatLang(a.get('balance')) ]] [[company.currency_id.symbol ]] + + + - [[data['form']['enable_filter'] == True or removeParentNote('blockTable')]] + [[ data['form']['enable_filter'] == 1 or removeParentNode('blockTable') ]] Name @@ -268,14 +264,20 @@ Balance - [[data['form']['label_filter']]] + [[ data['form']['label_filter'] ]] [[ repeatIn(get_lines(data), 'a') ]] - [[a.get('name', '')]] - [[a.get('balance',0.0)]] - [[a.get('balance_cmp',0.0)]] + [[ a.get('type')=='report' and a.get('name') or removeParentNode('td') ]] + [[ a.get('type')=='report' and formatLang(a.get('balance')) or removeParentNode('td') ]][[company.currency_id.symbol ]] + [[ a.get('type')=='report' and formatLang(a.get('balance_cmp')) or removeParentNode('td') ]][[company.currency_id.symbol ]] + [[ a.get('type') == 'account' and a.get('name') or removeParentNode('td') ]] + [[ a.get('type')=='account' and (a.get('account_type')=='view' and a.get('level',1) >= 3) and setTag('para','para',{'style': 'terp_level_'+str(min(3,a.get('level',1)))+'_name_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(4,a.get('level',1)))+'_name'}) ]] + [[ a.get('type')=='account' and (a.get('level',1) <>2) or removeParentNode('td') ]][[ (a.get('account_type') == 'view' and a.get('level',1) >= 3) and setTag('para','para',{'style': 'terp_level_3_balance_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(3,a.get('level',1)))+'_balance'}) ]][[ formatLang(a.get('balance')) ]][[company.currency_id.symbol ]] + [[ a.get('type')=='account' and a.get('level',1) == 2 or removeParentNode('td') ]][[ formatLang(a.get('balance')) ]] [[company.currency_id.symbol ]] + [[ a.get('type')=='account' and (a.get('level',1) <>2) or removeParentNode('td') ]][[ (a.get('account_type') == 'view' and a.get('level',1) >= 3) and setTag('para','para',{'style': 'terp_level_3_balance_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(3,a.get('level',1)))+'_balance'}) ]][[ formatLang(a.get('balance_cmp')) ]][[company.currency_id.symbol ]] + [[ a.get('type')=='account' and a.get('level',1) == 2 or removeParentNode('td') ]][[ formatLang(a.get('balance_cmp')) ]] [[company.currency_id.symbol ]]