[FIX] account: Fixed account report page break problem.
bzr revid: uco@tinyerp.com-20110824072325-xl7fgfzcfg7dx0ne
This commit is contained in:
Ujjvala Collins (OpenERP)
parent
374829400a
commit
d1648222ee
|
|
@ -56,7 +56,8 @@ class report_account_common(report_sxw.rml_parse, common_report_header):
|
|||
balance = 0.0
|
||||
name = data['form'].get('account_report_id') and data['form']['account_report_id'][1] or ''
|
||||
report_id = data['form'].get('account_report_id') and data['form']['account_report_id'][0] or False
|
||||
datas.append({'id': report_id, 'label': data['form']['label_filter'] or ''})
|
||||
label = data['form']['label_filter'] or ''
|
||||
datas.append({'id': report_id, 'label': label})
|
||||
ctx = self.context.copy()
|
||||
if report_id:
|
||||
child_ids = report_obj.search(cr, uid, [('parent_id','=',report_id)])
|
||||
|
|
@ -66,7 +67,7 @@ class report_account_common(report_sxw.rml_parse, common_report_header):
|
|||
if child.id == datas[0]['id']:
|
||||
datas[0].update({'name': child.name, 'balance': balance})
|
||||
else:
|
||||
datas.append({'id': child.id, 'name': child.name, 'balance': balance})
|
||||
datas.append({'id': child.id, 'name': child.name, 'balance': balance, 'label': label})
|
||||
return datas
|
||||
|
||||
def get_account_details(self, acc_id, data):
|
||||
|
|
|
|||
|
|
@ -216,52 +216,46 @@
|
|||
<para style="Standard">
|
||||
<font color="white"> </font>
|
||||
</para>
|
||||
<blockTable colWidths="490.0" style="Table1_main">
|
||||
<para style="Standard">[[ repeatIn(get_report_details(data),'r') ]] </para>
|
||||
<tr>
|
||||
<td>
|
||||
<blockTable colWidths="314.0,156.0" style="Table2_Report">
|
||||
<tr>
|
||||
<td><para style="terp_default_Bold_9">Report Name</para></td>
|
||||
<td><para style="terp_default_Bold_9">Report Balance</para></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><para style="terp_default_8">[[ r['name'] ]]</para></td>
|
||||
<td><para style="terp_default_8">[[ formatLang(r['balance']) ]][[ company.currency_id.symbol ]]</para></td>
|
||||
</tr>
|
||||
</blockTable>
|
||||
<para style="Standard">
|
||||
<font color="white"> </font>
|
||||
</para>
|
||||
<para style="terp_header">Accounts</para>
|
||||
<blockTable colWidths="110.0,153.0,100.0,120.0" style="Table_Account_Line_Title">
|
||||
<tr>
|
||||
<td>
|
||||
<para style="terp_default_Bold_9">Code</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="terp_default_Bold_9">Name</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="terp_tblheader_Details_Right">Balance</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="terp_tblheader_Details_Right">[[ r['label'] ]]</para>
|
||||
</td>
|
||||
</tr>
|
||||
<tr style="Table3">
|
||||
[[ repeatIn(get_account_details(r['id'], data), 'a') ]]
|
||||
[[ setTag('tr','tr',{'style': 'Table'+str(min(3,a.level))}) ]]
|
||||
<td><para style="terp_level_3_code">[[ (a.type =='view' and a.level >= 3) and setTag('para','para',{'style': 'terp_level_3_code_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(3,a.level))+'_code'}) ]]<i>[[ a.code ]]</i></para></td>
|
||||
<td><para style="terp_level_3_name">[[ (a.type =='view' and a.level >= 3) and setTag('para','para',{'style': 'terp_level_'+str(min(3,a.level))+'_name_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(4,a.level))+'_name'}) ]][[ a.name ]]</para></td>
|
||||
<td>[[ (a.level <>2) or removeParentNode('td') ]]<para style="terp_level_3_balance">[[ (a.type =='view' and a.level >= 3) and setTag('para','para',{'style': 'terp_level_3_balance_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(3,a.level))+'_balance'}) ]][[ formatLang(a.balance) ]] [[company.currency_id.symbol ]]</para></td>
|
||||
<td>[[ a.level == 2 or removeParentNode('td') ]]<para style="terp_level_2_balance"><u>[[ formatLang(a.balance) ]] [[company.currency_id.symbol ]]</u></para></td>
|
||||
<td>[[ get_filter(data)!='No Filter' and (a.level <>2) or removeParentNode('td') ]]<para style="terp_level_3_balance">[[ (a.type =='view' and a.level >= 3) and setTag('para','para',{'style': 'terp_level_3_balance_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(3,a.level))+'_balance'}) ]][[ formatLang(a.balance) ]] [[company.currency_id.symbol ]]</para></td>
|
||||
<td>[[ get_filter(data)!='No Filter' and a.level == 2 or removeParentNode('td') ]]<para style="terp_level_2_balance"><u>[[ formatLang(a.balance) ]] [[company.currency_id.symbol ]]</u></para></td>
|
||||
</tr>
|
||||
</blockTable>
|
||||
</td>
|
||||
</tr>
|
||||
<para style="Standard">[[ repeatIn(get_report_details(data),'r') ]] </para>
|
||||
<blockTable colWidths="314.0,156.0" style="Table2_Report">
|
||||
<tr>
|
||||
<td><para style="terp_default_Bold_9">Report Name</para></td>
|
||||
<td><para style="terp_default_Bold_9">Report Balance</para></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><para style="terp_default_8">[[ r['name'] ]]</para></td>
|
||||
<td><para style="terp_default_8">[[ formatLang(r['balance']) ]][[ company.currency_id.symbol ]]</para></td>
|
||||
</tr>
|
||||
</blockTable>
|
||||
<para style="Standard">
|
||||
<font color="white"> </font>
|
||||
</para>
|
||||
<para style="terp_header">Accounts</para>
|
||||
<blockTable colWidths="110.0,153.0,100.0,120.0" style="Table_Account_Line_Title">
|
||||
<tr>
|
||||
<td>
|
||||
<para style="terp_default_Bold_9">Code</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="terp_default_Bold_9">Name</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="terp_tblheader_Details_Right">Balance</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="terp_tblheader_Details_Right">[[ r['label'] ]]</para>
|
||||
</td>
|
||||
</tr>
|
||||
<tr style="Table3">
|
||||
[[ repeatIn(get_account_details(r['id'], data), 'a') ]]
|
||||
[[ setTag('tr','tr',{'style': 'Table'+str(min(3,a.level))}) ]]
|
||||
<td><para style="terp_level_3_code">[[ (a.type =='view' and a.level >= 3) and setTag('para','para',{'style': 'terp_level_3_code_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(3,a.level))+'_code'}) ]]<i>[[ a.code ]]</i></para></td>
|
||||
<td><para style="terp_level_3_name">[[ (a.type =='view' and a.level >= 3) and setTag('para','para',{'style': 'terp_level_'+str(min(3,a.level))+'_name_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(4,a.level))+'_name'}) ]][[ a.name ]]</para></td>
|
||||
<td>[[ (a.level <>2) or removeParentNode('td') ]]<para style="terp_level_3_balance">[[ (a.type =='view' and a.level >= 3) and setTag('para','para',{'style': 'terp_level_3_balance_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(3,a.level))+'_balance'}) ]][[ formatLang(a.balance) ]] [[company.currency_id.symbol ]]</para></td>
|
||||
<td>[[ a.level == 2 or removeParentNode('td') ]]<para style="terp_level_2_balance"><u>[[ formatLang(a.balance) ]] [[company.currency_id.symbol ]]</u></para></td>
|
||||
<td>[[ get_filter(data)!='No Filter' and (a.level <>2) or removeParentNode('td') ]]<para style="terp_level_3_balance">[[ (a.type =='view' and a.level >= 3) and setTag('para','para',{'style': 'terp_level_3_balance_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(3,a.level))+'_balance'}) ]][[ formatLang(a.balance) ]] [[company.currency_id.symbol ]]</para></td>
|
||||
<td>[[ get_filter(data)!='No Filter' and a.level == 2 or removeParentNode('td') ]]<para style="terp_level_2_balance"><u>[[ formatLang(a.balance) ]] [[company.currency_id.symbol ]]</u></para></td>
|
||||
</tr>
|
||||
</blockTable>
|
||||
<para style="Standard">
|
||||
<font color="white"> </font>
|
||||
|
|
|
|||
Loading…
Reference in New Issue