Xavier ALT (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/6.0-opw-575413-xal into
lp:openobject-addons/6.0.
Requested reviews:
OpenERP Core Team (openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/6.0-opw-575413-xal/+merge/138760
Hi,
This fix the sign on "balance sheet" and "profit and loss" reports.
Regards,
Xavier
--
https://code.launchpad.net/~openerp-dev/openobject-addons/6.0-opw-575413-xal/+merge/138760
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/6.0-opw-575413-xal.
=== modified file 'account/report/account_balance_sheet.py'
--- account/report/account_balance_sheet.py 2012-02-16 09:35:52 +0000
+++ account/report/account_balance_sheet.py 2012-12-07 15:47:21 +0000
@@ -70,13 +70,9 @@
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 @@
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 @@
'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 @@
'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:
=== modified file 'account/report/account_balance_sheet.rml'
--- account/report/account_balance_sheet.rml 2011-11-11 09:44:14 +0000
+++ account/report/account_balance_sheet.rml 2012-12-07 15:47:21 +0000
@@ -209,13 +209,13 @@
</tr>
<tr>
<td>
- <para style="terp_default_9"><font face="Times-Roman">[[ repeatIn(get_lines_another('asset'), 'a') ]]</font>[[ translate(a['code']) ]]<font>[[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]]</font></para>
- </td>
- <td>
- <para style="terp_default_9"><font color="white">[[ '. '*(a['level']-1) ]]</font><font>[[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]][[ translate(a['name']) ]]</font></para>
- </td>
- <td>
- <para style="terp_default_Right_9"><font>[[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]]</font><font>[[ formatLang(abs(a['balance'])) ]] [[ company.currency_id.symbol ]]</font></para>
+ <para style="terp_default_9"><font face="Times-Roman">[[ repeatIn(get_lines_another('asset'), 'a') ]]</font>[[ a['code'] ]]<font>[[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]]</font></para>
+ </td>
+ <td>
+ <para style="terp_default_9"><font color="white">[[ '. '*(a['level']-1) ]]</font><font>[[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]][[ a['name'] ]]</font></para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9"><font>[[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]]</font><font>[[ formatLang(a['balance']) ]] [[ company.currency_id.symbol ]]</font></para>
</td>
</tr>
</blockTable>
@@ -225,7 +225,7 @@
<para style="terp_default_Bold_9">Balance:</para>
</td>
<td>
- <para style="terp_default_Right_9_Bold"><u>[[ formatLang(abs(sum_cr())) ]] [[ company.currency_id.symbol ]]</u></para>
+ <para style="terp_default_Right_9_Bold"><u>[[ formatLang(sum_cr()) ]] [[ company.currency_id.symbol ]]</u></para>
</td>
</tr>
</blockTable>
@@ -254,13 +254,13 @@
</tr>
<tr>
<td>
- <para style="terp_default_9"><font face="Times-Roman">[[ repeatIn(get_lines_another('liability'), 'a') ]]</font>[[ translate(a['code']) ]]<font>[[ (a['level']<4 or a['code'] == 'Net Profit') and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]] </font></para>
- </td>
- <td>
- <para style="terp_default_9"><font color="white">[[ '. '*(a['level']-1) ]]</font><font>[[ (a['level']<4 or a['name'] == 'Net Profit') and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]][[ translate(a['name']) ]]</font></para>
- </td>
- <td>
- <para style="terp_default_Right_9"><font>[[ (a['level']<4 or a['name'] == 'Net Profit') and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]]</font><font>[[ formatLang(abs(a['balance'])) ]] [[ company.currency_id.symbol ]]</font></para>
+ <para style="terp_default_9"><font face="Times-Roman">[[ repeatIn(get_lines_another('liability'), 'a') ]]</font>[[ a['code'] ]]<font>[[ (a['level']<4 or a['code'] in ['net_prifit', 'net_loss']) and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]] </font></para>
+ </td>
+ <td>
+ <para style="terp_default_9"><font color="white">[[ '. '*(a['level']-1) ]]</font><font>[[ (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'] ]]</font></para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9"><font>[[ (a['level']<4 or a['code'] in ['net_profit', 'net_loss']) and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]]</font><font>[[ formatLang(a['balance']) ]] [[ company.currency_id.symbol ]]</font></para>
</td>
</tr>
</blockTable>
@@ -270,7 +270,7 @@
<para style="terp_default_Bold_9">Balance:</para>
</td>
<td>
- <para style="terp_default_Right_9_Bold"><u>[[ formatLang(abs(sum_dr())) ]] [[ company.currency_id.symbol ]]</u></para>
+ <para style="terp_default_Right_9_Bold"><u>[[ formatLang(sum_dr()) ]] [[ company.currency_id.symbol ]]</u></para>
</td>
</tr>
</blockTable>
=== modified file 'account/report/account_balance_sheet.sxw'
Binary files account/report/account_balance_sheet.sxw 2011-06-29 05:29:28 +0000 and account/report/account_balance_sheet.sxw 2012-12-07 15:47:21 +0000 differ
=== modified file 'account/report/account_balance_sheet_horizontal.rml'
--- account/report/account_balance_sheet_horizontal.rml 2011-11-11 09:44:14 +0000
+++ account/report/account_balance_sheet_horizontal.rml 2012-12-07 15:47:21 +0000
@@ -197,23 +197,23 @@
</tr>
<tr>
<td>
- <para style="terp_default_9"><font>[[ a['level1']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]]</font><font>[[ translate(a['code1']) ]]</font></para>
- </td>
- <td>
- <para style="terp_default_9"><font color="white">[[ '. '*(a['level1']-1) ]]</font><font>[[ a['level1']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]][[ translate(a['name1']) ]]</font></para>
- </td>
- <td>
- <para style="terp_default_Right_9"><font>[[ a['level1']<4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]]</font><font>[[ formatLang(abs(a['balance1'])) ]] [[ company.currency_id.symbol ]]</font></para>
- </td>
- <td>
- <para style="terp_default_9"><font face="Times-Roman">[[ repeatIn(get_lines(), 'a') ]]</font> <font>[[ (a['level']<4 or a['code'] == 'Net Profit') and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]]</font><font>[[ translate(a['code']) ]]</font></para>
- </td>
- <td>
- <para style="terp_default_9"><font color="white">[[ '. '*(a['level']-1) ]]</font><font>[[ (a['level']<4 or a['name'] == 'Net Profit') and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]][[ translate(a['name']) ]]</font></para>
- </td>
- <td>
- <para style="terp_default_Right_9"><font>[[ (a['level']<4 or a['name'] == 'Net Profit') and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]]</font>
-<font> [[(a['code'] and a['name']) and formatLang(abs(a['balance'])) or removeParentNode('font')]] [[ company.currency_id.symbol ]]</font></para>
+ <para style="terp_default_9"><font>[[ a['level1']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]]</font><font>[[ a['code1'] ]]</font></para>
+ </td>
+ <td>
+ <para style="terp_default_9"><font color="white">[[ '. '*(a['level1']-1) ]]</font><font>[[ a['level1']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]][[ a['name1'] ]]</font></para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9"><font>[[ a['level1']<4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]]</font><font>[[ (a['code1'] and a['name1']) and formatLang(a['balance1']) or removeParentNode('font') ]] [[ company.currency_id.symbol ]]</font></para>
+ </td>
+ <td>
+ <para style="terp_default_9"><font face="Times-Roman">[[ repeatIn(get_lines(), 'a') ]]</font> <font>[[ (a['level']<4 or a['code'] in ['net_profit', 'net_loss']) and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]]</font><font>[[ a['code'] in ['net_profit', 'net_loss'] and a['name'] or a['code'] ]]</font></para>
+ </td>
+ <td>
+ <para style="terp_default_9"><font color="white">[[ '. '*(a['level']-1) ]]</font><font>[[ (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'] ]]</font></para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9"><font>[[ (a['level']<4 or a['code'] in ['net_profit', 'net_loss']) and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]]</font>
+<font> [[(a['code'] and a['name']) and formatLang(a['balance']) or removeParentNode('font')]] [[ company.currency_id.symbol ]]</font></para>
</td>
</tr>
</blockTable>
@@ -223,13 +223,13 @@
<para style="terp_default_Bold_9">Balance:</para>
</td>
<td>
- <para style="terp_default_Right_9_Bold"><u>[[ formatLang(abs(sum_cr())) ]] [[ company.currency_id.symbol ]]</u></para>
+ <para style="terp_default_Right_9_Bold"><u>[[ formatLang(sum_cr()) ]] [[ company.currency_id.symbol ]]</u></para>
</td>
<td>
<para style="terp_default_Bold_9">Balance:</para>
</td>
<td>
- <para style="terp_default_Right_9_Bold"><u>[[ formatLang(abs(sum_dr())) ]] [[ company.currency_id.symbol ]]</u></para>
+ <para style="terp_default_Right_9_Bold"><u>[[ formatLang(sum_dr()) ]] [[ company.currency_id.symbol ]]</u></para>
</td>
</tr>
</blockTable>
=== modified file 'account/report/account_balance_sheet_horizontal.sxw'
Binary files account/report/account_balance_sheet_horizontal.sxw 2011-11-04 08:45:06 +0000 and account/report/account_balance_sheet_horizontal.sxw 2012-12-07 15:47:21 +0000 differ
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : openerp-dev-gtk@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
