From 01581bff3730c0c2088f505af6e7fee6e1e6fd75 Mon Sep 17 00:00:00 2001 From: Xavier ALT Date: Thu, 6 Dec 2012 13:09:59 +0100 Subject: [PATCH] [FIX] account: fix balance sheet which was not considering the sign correctly bzr revid: xal@openerp.com-20121206120959-38mr4ihyr4da2kw7 --- addons/account/report/account_balance_sheet.py | 22 ++++++++++---------- addons/account/report/account_balance_sheet.rml | 16 +++++++------- .../report/account_balance_sheet_horizontal.rml | 18 ++++++++-------- 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/addons/account/report/account_balance_sheet.py b/addons/account/report/account_balance_sheet.py index 56b2e19..f3aa421 100644 --- a/addons/account/report/account_balance_sheet.py +++ b/addons/account/report/account_balance_sheet.py @@ -70,13 +70,9 @@ class report_balancesheet_horizontal(report_sxw.rml_parse, common_report_header) return super(report_balancesheet_horizontal, self).set_context(objects, data, new_ids, report_type=report_type) def sum_dr(self): - if self.res_bl['type'] == _('Net Profit'): - self.result_sum_dr += self.res_bl['balance']*-1 - return self.result_sum_dr + return self.result_sum_dr + self.res_bl['balance'] def sum_cr(self): - if self.res_bl['type'] == _('Net Loss'): - self.result_sum_cr += self.res_bl['balance'] return self.result_sum_cr def get_pl_balance(self): @@ -116,18 +112,22 @@ class report_balancesheet_horizontal(report_sxw.rml_parse, common_report_header) accounts = account_pool.browse(cr, uid, account_ids, context=ctx) if not self.res_bl: + self.res_bl['code'] = 'net_profit' self.res_bl['type'] = _('Net Profit') self.res_bl['balance'] = 0.0 - if self.res_bl['type'] == _('Net Profit'): + if self.res_bl['code'] == 'net_profit': + self.res_bl['code'] = 'net_profit' self.res_bl['type'] = _('Net Profit') else: self.res_bl['type'] = _('Net Loss') + self.res_bl['code'] = 'net_loss' + self.res_bl['balance'] = -self.res_bl['balance'] pl_dict = { - 'code': self.res_bl['type'], + 'code': self.res_bl['code'], 'name': self.res_bl['type'], 'level': False, - 'balance':self.res_bl['balance'], + 'balance': self.res_bl['balance'], } for typ in types: accounts_temp = [] @@ -138,11 +138,11 @@ class report_balancesheet_horizontal(report_sxw.rml_parse, common_report_header) 'code': account.code, 'name': account.name, 'level': account.level, - 'balance':account.balance, + 'balance': typ == 'liability' and -account.balance or account.balance, } currency = account.currency_id and account.currency_id or account.company_id.currency_id if typ == 'liability' and account.type <> 'view' and (account.debit <> account.credit): - self.result_sum_dr += account.balance + self.result_sum_dr -= account.balance if typ == 'asset' and account.type <> 'view' and (account.debit <> account.credit): self.result_sum_cr += account.balance if data['form']['display_account'] == 'bal_movement': @@ -216,4 +216,4 @@ report_sxw.report_sxw('report.account.balancesheet', 'account.account', 'addons/account/report/account_balance_sheet.rml',parser=report_balancesheet_horizontal, header='internal') -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account/report/account_balance_sheet.rml b/addons/account/report/account_balance_sheet.rml index 9db507c..c811399 100644 --- a/addons/account/report/account_balance_sheet.rml +++ b/addons/account/report/account_balance_sheet.rml @@ -209,13 +209,13 @@ - [[ repeatIn(get_lines_another('asset'), 'a') ]][[ translate(a['code']) ]][[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]] + [[ repeatIn(get_lines_another('asset'), 'a') ]][[ a['code'] ]][[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]] - [[ '. '*(a['level']-1) ]][[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]][[ translate(a['name']) ]] + [[ '. '*(a['level']-1) ]][[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]][[ a['name'] ]] - [[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]][[ formatLang(abs(a['balance'])) ]] [[ company.currency_id.symbol ]] + [[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]][[ formatLang(a['balance']) ]] [[ company.currency_id.symbol ]] @@ -225,7 +225,7 @@ Balance: - [[ formatLang(abs(sum_cr())) ]] [[ company.currency_id.symbol ]] + [[ formatLang(sum_cr()) ]] [[ company.currency_id.symbol ]] @@ -254,13 +254,13 @@ - [[ repeatIn(get_lines_another('liability'), 'a') ]][[ translate(a['code']) ]][[ (a['level']<4 or a['code'] == 'Net Profit') and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]] + [[ repeatIn(get_lines_another('liability'), 'a') ]][[ a['code'] ]][[ (a['level']<4 or a['code'] in ['net_prifit', 'net_loss']) and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]] - [[ '. '*(a['level']-1) ]][[ (a['level']<4 or a['name'] == 'Net Profit') and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]][[ translate(a['name']) ]] + [[ '. '*(a['level']-1) ]][[ (a['level']<4 or a['code'] in ['net_profit', 'net_loss']) and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]][[ a['name'] ]] - [[ (a['level']<4 or a['name'] == 'Net Profit') and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]][[ formatLang(abs(a['balance'])) ]] [[ company.currency_id.symbol ]] + [[ (a['level']<4 or a['code'] in ['net_profit', 'net_loss']) and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]][[ formatLang(a['balance']) ]] [[ company.currency_id.symbol ]] @@ -270,7 +270,7 @@ Balance: - [[ formatLang(abs(sum_dr())) ]] [[ company.currency_id.symbol ]] + [[ formatLang(sum_dr()) ]] [[ company.currency_id.symbol ]] diff --git a/addons/account/report/account_balance_sheet_horizontal.rml b/addons/account/report/account_balance_sheet_horizontal.rml index 57b6044..e6d265d 100644 --- a/addons/account/report/account_balance_sheet_horizontal.rml +++ b/addons/account/report/account_balance_sheet_horizontal.rml @@ -197,23 +197,23 @@ - [[ a['level1']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]][[ translate(a['code1']) ]] + [[ a['level1']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]][[ a['code1'] ]] - [[ '. '*(a['level1']-1) ]][[ a['level1']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]][[ translate(a['name1']) ]] + [[ '. '*(a['level1']-1) ]][[ a['level1']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]][[ a['name1'] ]] - [[ a['level1']<4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]][[ formatLang(abs(a['balance1'])) ]] [[ company.currency_id.symbol ]] + [[ a['level1']<4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]][[ (a['code1'] and a['name1']) and formatLang(a['balance1']) or removeParentNode('font') ]] [[ company.currency_id.symbol ]] - [[ repeatIn(get_lines(), 'a') ]] [[ (a['level']<4 or a['code'] == 'Net Profit') and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]][[ translate(a['code']) ]] + [[ repeatIn(get_lines(), 'a') ]] [[ (a['level']<4 or a['code'] in ['net_profit', 'net_loss']) and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]][[ a['code'] in ['net_profit', 'net_loss'] and a['name'] or a['code'] ]] - [[ '. '*(a['level']-1) ]][[ (a['level']<4 or a['name'] == 'Net Profit') and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]][[ translate(a['name']) ]] + [[ '. '*(a['level']-1) ]][[ (a['level']<4 or a['code'] in ['net_profit', 'net_loss']) and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]][[ a['name'] ]] - [[ (a['level']<4 or a['name'] == 'Net Profit') and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]] - [[(a['code'] and a['name']) and formatLang(abs(a['balance'])) or removeParentNode('font')]] [[ company.currency_id.symbol ]] + [[ (a['level']<4 or a['code'] in ['net_profit', 'net_loss']) and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]] + [[(a['code'] and a['name']) and formatLang(a['balance']) or removeParentNode('font')]] [[ company.currency_id.symbol ]] @@ -223,13 +223,13 @@ Balance: - [[ formatLang(abs(sum_cr())) ]] [[ company.currency_id.symbol ]] + [[ formatLang(sum_cr()) ]] [[ company.currency_id.symbol ]] Balance: - [[ formatLang(abs(sum_dr())) ]] [[ company.currency_id.symbol ]] + [[ formatLang(sum_dr()) ]] [[ company.currency_id.symbol ]] -- 1.7.10.4