diff --git a/addons/account_balance/report/account_balance.py b/addons/account_balance/report/account_balance.py index c8e1e9d8a68..0f0e92d9ad1 100644 --- a/addons/account_balance/report/account_balance.py +++ b/addons/account_balance/report/account_balance.py @@ -393,7 +393,6 @@ class account_balance(report_sxw.rml_parse): ids = self.ids if not ids: return [] - ctx = self.context.copy() result_total_parent=[] @@ -413,16 +412,16 @@ class account_balance(report_sxw.rml_parse): if level==1: doneAccount={} for entry in merged_accounts: - + if entry[0].id in doneAccount: continue doneAccount[entry[0].id] = 1 for k in range(0,len(entry)): temp_credit=0.00 temp_debit=0.00 - - temp_credit+=entry[k].credit - temp_debit+=entry[k].debit + if entry[0].type <> 'view': + temp_credit+=entry[k].credit + temp_debit+=entry[k].debit if self.flag==1: self.result_total["sum_credit" + str(k)]=0.00 diff --git a/addons/account_balance/report/account_balance.rml b/addons/account_balance/report/account_balance.rml index af7e85e6397..804c560ef72 100644 --- a/addons/account_balance/report/account_balance.rml +++ b/addons/account_balance/report/account_balance.rml @@ -227,7 +227,7 @@ [[ (data['form']['format_perc'] or not data['form']['show_columns']) and removeParentNode('blockTable') ]][[ a['code'] ]] - [[ a['name'] ]] + [['.....'*(a['level']-1) ]][[ a['name'] ]] [[ a['pattern'] ]] @@ -252,7 +252,7 @@ [[ (not data['form']['format_perc'] or not data['form']['show_columns']) and removeParentNode('blockTable') ]][[ a['code'] ]] - [[ a['name'] ]] + [['.....'*(a['level']-1) ]][[ a['name'] ]] [[ a['pattern'] ]] @@ -280,7 +280,7 @@ [[ (data['form']['format_perc'] or data['form']['show_columns']) and removeParentNode('blockTable') ]][[ a['code'] ]] - [[ a['name'] ]] + [['.....'*(a['level']-1) ]][[ a['name'] ]] [[ a['pattern'] ]] @@ -297,7 +297,7 @@ [[ (not data['form']['format_perc'] or data['form']['show_columns']) and removeParentNode('blockTable') ]][[ a['code'] ]] - [[ a['name'] ]] + [['.....'*(a['level']-1) ]][[ a['name'] ]] [[ a['pattern'] ]] diff --git a/addons/account_balance/report/account_balance_landscape.py b/addons/account_balance/report/account_balance_landscape.py index 25563ef65b9..2638a628990 100644 --- a/addons/account_balance/report/account_balance_landscape.py +++ b/addons/account_balance/report/account_balance_landscape.py @@ -421,9 +421,9 @@ class account_balance_landscape(rml_parse.rml_parse): for k in range(0,len(entry)): temp_credit=0.00 temp_debit=0.00 - - temp_credit+=entry[k].credit - temp_debit+=entry[k].debit + if entry[0].type <> 'view': + temp_credit+=entry[k].credit + temp_debit+=entry[k].debit if self.flag==1: self.result_total["sum_credit" + str(k)]=0.00 diff --git a/addons/account_balance/report/account_balance_landscape.rml b/addons/account_balance/report/account_balance_landscape.rml index 626bd10f291..3f4dc66cd10 100644 --- a/addons/account_balance/report/account_balance_landscape.rml +++ b/addons/account_balance/report/account_balance_landscape.rml @@ -227,7 +227,7 @@ [[ (data['form']['format_perc'] or not data['form']['show_columns']) and removeParentNode('blockTable') ]][[ a['code'] ]] - [[ a['name'] ]] + [['.....'*(a['level']-1) ]][[ a['name'] ]] [[ a['pattern'] ]] @@ -252,7 +252,7 @@ [[ (not data['form']['format_perc'] or not data['form']['show_columns']) and removeParentNode('blockTable') ]][[ a['code'] ]] - [[ a['name'] ]] + [['.....'*(a['level']-1) ]][[ a['name'] ]] [[ a['pattern'] ]] @@ -280,7 +280,7 @@ [[ (data['form']['format_perc'] or data['form']['show_columns']) and removeParentNode('blockTable') ]][[ a['code'] ]] - [[ a['name'] ]] + [['.....'*(a['level']-1) ]][[ a['name'] ]] [[ a['pattern'] ]] @@ -299,7 +299,7 @@ [[ (not data['form']['format_perc'] or data['form']['show_columns']) and removeParentNode('blockTable') ]][[ a['code'] ]] - [[ a['name'] ]] + [['.....'*(a['level']-1) ]][[ a['name'] ]] [[ a['pattern'] ]]