diff --git a/addons/account/report/account_balance_sheet.py b/addons/account/report/account_balance_sheet.py index 5b83fd32269..6743cf4a7ac 100644 --- a/addons/account/report/account_balance_sheet.py +++ b/addons/account/report/account_balance_sheet.py @@ -104,7 +104,7 @@ class report_balancesheet_horizontal(rml_parse.rml_parse, common_report_header): account_ids = account_pool._get_children_and_consol(cr, uid, account_id, context=ctx) accounts = account_pool.browse(cr, uid, account_ids, context=ctx) - if self.res_bl['type'] == 'Net Profit C.F.B.L.': + if self.res_bl['type'] == 'Net Profit': self.res_bl['type'] = 'Net Profit' else: self.res_bl['type'] = 'Net Loss' diff --git a/addons/account/report/account_profit_horizontal.rml b/addons/account/report/account_profit_horizontal.rml index 886d58aa092..89cbc4f8502 100644 --- a/addons/account/report/account_profit_horizontal.rml +++ b/addons/account/report/account_profit_horizontal.rml @@ -250,19 +250,19 @@ - [[ final_result()['type'] == 'Net Profit C.F.B.L.' and final_result()['type'] or '' ]] + [[ final_result()['type'] == 'Net Profit' and final_result()['type'] or '' ]] - [[ final_result()['balance'] and final_result()['type'] == 'Net Profit C.F.B.L.' and formatLang(abs(final_result()['balance'])) ]] [[ company.currency_id.symbol ]] + [[ final_result()['balance'] and final_result()['type'] == 'Net Profit' and formatLang(abs(final_result()['balance'])) ]] [[ company.currency_id.symbol ]] - [[ final_result()['type'] == 'Net Loss C.F.B.L.' and final_result()['type'] or '' ]] + [[ final_result()['type'] == 'Net Loss' and final_result()['type'] or '' ]] - [[ final_result()['balance'] and final_result()['type'] == 'Net Loss C.F.B.L.' and formatLang(abs(final_result()['balance'])) ]] [[ final_result()['balance'] and final_result()['type'] == 'Net Loss C.F.B.L.' and company.currency_id.symbol ]] + [[ final_result()['balance'] and final_result()['type'] == 'Net Loss' and formatLang(abs(final_result()['balance'])) ]] [[ final_result()['balance'] and final_result()['type'] == 'Net Loss' and company.currency_id.symbol ]] diff --git a/addons/account/report/account_profit_loss.py b/addons/account/report/account_profit_loss.py index 792b88053a1..3d4ff1accf6 100644 --- a/addons/account/report/account_profit_loss.py +++ b/addons/account/report/account_profit_loss.py @@ -62,12 +62,12 @@ class report_pl_account_horizontal(rml_parse.rml_parse, common_report_header): return self.res_pl def sum_dr(self): - if self.res_pl['type'] == 'Net Profit C.F.B.L.': + if self.res_pl['type'] == 'Net Profit': self.result_sum_dr += self.res_pl['balance'] return self.result_sum_dr def sum_cr(self): - if self.res_pl['type'] == 'Net Loss C.F.B.L.': + if self.res_pl['type'] == 'Net Loss': self.result_sum_cr += self.res_pl['balance'] return self.result_sum_cr @@ -114,10 +114,10 @@ class report_pl_account_horizontal(rml_parse.rml_parse, common_report_header): else: accounts_temp.append(account) if self.result_sum_dr > self.result_sum_cr: - self.res_pl['type'] = 'Net Loss C.F.B.L.' + self.res_pl['type'] = 'Net Loss' self.res_pl['balance'] = (self.result_sum_dr - self.result_sum_cr) else: - self.res_pl['type'] = 'Net Profit C.F.B.L.' + self.res_pl['type'] = 'Net Profit' self.res_pl['balance'] = (self.result_sum_cr - self.result_sum_dr) self.result[typ] = accounts_temp cal_list[typ] = self.result[typ] diff --git a/addons/account/report/account_profit_loss.rml b/addons/account/report/account_profit_loss.rml index 2d85dc590e6..c371ab4c638 100644 --- a/addons/account/report/account_profit_loss.rml +++ b/addons/account/report/account_profit_loss.rml @@ -228,10 +228,10 @@ - [[ final_result()['type'] == 'Net Profit C.F.B.L.' and final_result()['type'] or removeParentNode('blockTable') ]] + [[ final_result()['type'] == 'Net Profit' and final_result()['type'] or removeParentNode('blockTable') ]] - [[ final_result()['balance'] and final_result()['type'] == 'Net Loss C.F.B.L.' and formatLang(abs(final_result()['balance'])) ]] [[ final_result()['balance'] and final_result()['type'] == 'Net Loss C.F.B.L.' and company.currency_id.symbol ]] + [[ final_result()['balance'] and final_result()['type'] == 'Net Loss' and formatLang(abs(final_result()['balance'])) ]] [[ final_result()['balance'] and final_result()['type'] == 'Net Loss' and company.currency_id.symbol ]] @@ -283,10 +283,10 @@ - [[ final_result()['type'] == 'Net Loss C.F.B.L.' and final_result()['type'] or removeParentNode('blockTable') ]] + [[ final_result()['type'] == 'Net Loss' and final_result()['type'] or removeParentNode('blockTable') ]] - [[ final_result()['balance'] and final_result()['type'] == 'Net Loss C.F.B.L.' and formatLang(abs(final_result()['balance'])) ]] [[ final_result()['balance'] and final_result()['type'] == 'Net Loss C.F.B.L.' and company.currency_id.symbol ]] + [[ final_result()['balance'] and final_result()['type'] == 'Net Loss' and formatLang(abs(final_result()['balance'])) ]] [[ final_result()['balance'] and final_result()['type'] == 'Net Loss' and company.currency_id.symbol ]]