openerp-dev-web team mailing list archive
-
openerp-dev-web team
-
Mailing list archive
-
Message #06656
[Merge] lp:~openerp-dev/openobject-addons/6.0-opw-5629-jvo into lp:openobject-addons/6.0
Jay Vora (OpenERP) has proposed merging lp:~openerp-dev/openobject-addons/6.0-opw-5629-jvo into lp:openobject-addons/6.0.
Requested reviews:
OpenERP Core Team (openerp)
Related bugs:
Bug #779957 in OpenERP Addons: "[V6] Balance sheet : account layout problem"
https://bugs.launchpad.net/openobject-addons/+bug/779957
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/6.0-opw-5629-jvo/+merge/60751
--
https://code.launchpad.net/~openerp-dev/openobject-addons/6.0-opw-5629-jvo/+merge/60751
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/6.0-opw-5629-jvo.
=== modified file 'account/report/account_balance_sheet.py'
--- account/report/account_balance_sheet.py 2011-04-05 08:52:20 +0000
+++ account/report/account_balance_sheet.py 2011-05-12 09:55:59 +0000
@@ -136,6 +136,7 @@
'name': account.name,
'level': account.level,
'balance':account.balance,
+ 'type':account.type
}
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):
@@ -152,11 +153,11 @@
accounts_temp.append(account_dict)
if account.id == data['form']['reserve_account_id']:
pl_dict['level'] = account['level'] + 1
+ pl_dict['type'] = account.type
accounts_temp.append(pl_dict)
self.result[typ] = accounts_temp
cal_list[typ]=self.result[typ]
-
if cal_list:
temp = {}
for i in range(0,max(len(cal_list['liability']),len(cal_list['asset']))):
@@ -166,12 +167,15 @@
'name': cal_list['liability'][i]['name'],
'level': cal_list['liability'][i]['level'],
'balance':cal_list['liability'][i]['balance'],
+ 'type': cal_list['liability'][i]['type'],
'code1': cal_list['asset'][i]['code'],
'name1': cal_list['asset'][i]['name'],
'level1': cal_list['asset'][i]['level'],
'balance1':cal_list['asset'][i]['balance'],
+ 'type1': cal_list['asset'][i]['type'],
}
self.result_temp.append(temp)
+
else:
if i < len(cal_list['asset']):
temp={
@@ -179,10 +183,12 @@
'name': '',
'level': False,
'balance':False,
+ 'type': '',
'code1': cal_list['asset'][i]['code'],
'name1': cal_list['asset'][i]['name'],
'level1': cal_list['asset'][i]['level'],
'balance1':cal_list['asset'][i]['balance'],
+ 'type1':cal_list['asset'][i]['type'],
}
self.result_temp.append(temp)
if i < len(cal_list['liability']):
@@ -191,10 +197,12 @@
'name': cal_list['liability'][i]['name'],
'level': cal_list['liability'][i]['level'],
'balance':cal_list['liability'][i]['balance'],
+ 'type': cal_list['liability'][i]['type'],
'code1': '',
'name1': '',
'level1': False,
'balance1':False,
+ 'type1': '',
}
self.result_temp.append(temp)
return None
@@ -213,4 +221,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-01-14 00:11:01 +0000
+++ account/report/account_balance_sheet.rml 2011-05-12 09:55:59 +0000
@@ -208,13 +208,13 @@
</tr>
<tr>
<td>
- <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(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['type'] == "view" 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['type'] == "view" 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['type'] == "view" 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>
</td>
</tr>
</blockTable>
@@ -253,13 +253,13 @@
</tr>
<tr>
<td>
- <para style="terp_default_9"><font face="Times-Roman">[[ repeatIn(get_lines_another('liability'), 'a') ]]</font>[[ a['code'] ]]<font>[[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]] </font><font>[[ a['name']=='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 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]][[ a['name'] ]]</font><font>[[ a['name']=='Net Profit' and setTag('para','para',{'style':'terp_default_Bold_9'}) or removeParentNode('font') ]]</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><font>[[ a['name']=='Net Profit' and setTag('para','para',{'style':'terp_default_Right_9_Bold'}) or removeParentNode('font') ]]</font></para>
+ <para style="terp_default_9"><font face="Times-Roman">[[ repeatIn(get_lines_another('liability'), 'a') ]]</font>[[ a['code'] ]]<font>[[ a['type'] == "view" and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]] </font><font>[[ a['name']=='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['type'] == "view" and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]][[ a['name'] ]]</font><font>[[ a['name']=='Net Profit' and setTag('para','para',{'style':'terp_default_Bold_9'}) or removeParentNode('font') ]]</font></para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9"><font>[[ (a['type'] == "view" 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>
</td>
</tr>
</blockTable>
=== modified file 'account/report/account_balance_sheet_horizontal.rml'
--- account/report/account_balance_sheet_horizontal.rml 2011-01-14 00:11:01 +0000
+++ account/report/account_balance_sheet_horizontal.rml 2011-05-12 09:55:59 +0000
@@ -196,22 +196,22 @@
</tr>
<tr>
<td>
- <para style="terp_default_9"><font>[[ a['level']<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>[[ 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 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]]</font><font>[[ a['code'] ]]</font><font>[[ a['name']=='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 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]][[ a['name'] ]]</font><font>[[ a['name']=='Net Profit' and setTag('para','para',{'style':'terp_default_Bold_9'}) or removeParentNode('font') ]]</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>
+ <para style="terp_default_9"><font>[[ a['type1'] == "view" 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['type1'] == "view" 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['type1'] == "view" 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['type'] == "view" or a['name']=='Net Profit')and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]][[ a['code'] ]]</font></para>
+ </td>
+ <td>
+ <para style="terp_default_9"><font color="white">[[ '. '*(a['level']-1) ]]</font><font>[[ (a['type'] == "view" or a['name']=='Net Profit') 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['type'] == "view" and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]]</font>
<font>[[ 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>
</td>
=== modified file 'account/report/account_profit_horizontal.rml'
--- account/report/account_profit_horizontal.rml 2011-01-14 00:11:01 +0000
+++ account/report/account_profit_horizontal.rml 2011-05-12 09:55:59 +0000
@@ -212,29 +212,29 @@
<td>
<para style="terp_default_9">
- <font face="Times-Roman">[[ repeatIn(get_lines(),'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(abs(a['balance'])) ]] [[ company.currency_id.symbol ]]</font></para>
- </td>
- <td>
- <para style="terp_default_9">
- [[ a['code1'] ]]<font>[[ a['level1']<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['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['level']<4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]]</font><font>[[(a['code1'] and a['name1']) and formatLang(abs(a['balance1'])) or removeParentNode('font') ]] [[ company.currency_id.symbol ]]</font></para>
+ <font face="Times-Roman">[[ repeatIn(get_lines(),'a' ) ]] </font>[[ a['code'] ]]<font>[[ a['type'] == "view" 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['type'] == "view" 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['type'] == "view" 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>
+ </td>
+ <td>
+ <para style="terp_default_9">
+ [[ a['code1'] ]]<font>[[ a['type1'] == "view" 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['level1']-1) ]]</font><font>[[ a['type1'] == "view" 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['type1'] == "view" and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]]</font><font>[[(a['code1'] and a['name1']) and formatLang(abs(a['balance1'])) or removeParentNode('font') ]] [[ company.currency_id.symbol ]]</font></para>
</td>
</tr>
</blockTable>
=== modified file 'account/report/account_profit_loss.py'
--- account/report/account_profit_loss.py 2011-04-05 08:52:20 +0000
+++ account/report/account_profit_loss.py 2011-05-12 09:55:59 +0000
@@ -137,10 +137,12 @@
'name': cal_list['expense'][i].name,
'level': cal_list['expense'][i].level,
'balance':cal_list['expense'][i].balance,
+ 'type' : cal_list['expense'][i].type,
'code1': cal_list['income'][i].code,
'name1': cal_list['income'][i].name,
'level1': cal_list['income'][i].level,
'balance1':cal_list['income'][i].balance,
+ 'type1' : cal_list['income'][i].type
}
self.result_temp.append(temp)
else:
@@ -150,10 +152,13 @@
'name': '',
'level': False,
'balance':False,
+ 'type': '',
'code1': cal_list['income'][i].code,
'name1': cal_list['income'][i].name,
'level1': cal_list['income'][i].level,
'balance1':cal_list['income'][i].balance,
+ 'type1' : cal_list['income'][i].type
+
}
self.result_temp.append(temp)
if i < len(cal_list['expense']):
@@ -162,10 +167,12 @@
'name': cal_list['expense'][i].name,
'level': cal_list['expense'][i].level,
'balance':cal_list['expense'][i].balance,
+ 'type' : cal_list['expense'][i].type,
'code1': '',
'name1': '',
'level1': False,
'balance1':False,
+ 'type1' : ''
}
self.result_temp.append(temp)
return None
=== modified file 'account/report/account_profit_loss.rml'
--- account/report/account_profit_loss.rml 2011-01-14 00:11:01 +0000
+++ account/report/account_profit_loss.rml 2011-05-12 09:55:59 +0000
@@ -209,16 +209,16 @@
<tr>
<td>
<para style="terp_default_9">
- <font face="Times-Roman">[[ repeatIn(get_lines_another('expense'),'a' ) ]] </font>[[ a.code ]]<font>[[ a.level<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]]</font>
+ <font face="Times-Roman">[[ repeatIn(get_lines_another('expense'),'a' ) ]] </font>[[ a.code ]]<font>[[ a['type'] == "view" 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>
+ <font color="white">[[ '. '*(a.level-1) ]]</font><font>[[ a['type'] == "view" 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(abs(a.balance)) ]] [[ company.currency_id.symbol ]]</font></para>
+ <para style="terp_default_Right_9"><font>[[ a['type'] == "view" 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>
</td>
</tr>
</blockTable>
@@ -264,16 +264,16 @@
<tr>
<td>
<para style="terp_default_9">
- <font face="Times-Roman">[[ repeatIn(get_lines_another('income'),'a') ]] </font>[[ a.code ]]<font>[[ a.level<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]]</font>
+ <font face="Times-Roman">[[ repeatIn(get_lines_another('income'),'a') ]] </font>[[ a.code ]]<font>[[ a['type'] == "view" 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>
+ <font color="white">[[ '. '*(a.level-1) ]]</font><font>[[ a['type'] == "view" 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(abs(a.balance)) ]] [[ company.currency_id.symbol ]]</font></para>
+ <para style="terp_default_Right_9"><font>[[ a['type'] == "view" 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>
</td>
</tr>
</blockTable>
