Corrections on Indicators

bzr revid: jvo@tinyerp.com-20090120121240-w9e1vlpssncjofum
This commit is contained in:
Jay (Open ERP) 2009-01-20 17:42:40 +05:30
parent 50e73399ec
commit f8d252d59b
2 changed files with 21 additions and 14 deletions

View File

@ -108,16 +108,16 @@ class accounting_report_indicator(report_sxw.rml_parse):
return super(accounting_report_indicator,self).repeatIn(lst, name, nodes_parent=False)
array_header = eval(data,{'year':'Fiscal Year','periods':'Periods'})
value = [array_header]
# value = [array_header]
value = []
value.extend(self.header_name)
type=['string']
if name=='array':
type.extend(['float']*len(self.header_name))
type = ['float']*len(self.header_name)
else:
type=['lable'] * (len(self.header_name)+1)
type = ['lable'] * (len(self.header_name))
width = [538/float(len(value))]*(len(value))
width = [438/float(len(value))]*(len(value))
if not lst:
lst.append(1)
@ -132,6 +132,7 @@ class accounting_report_indicator(report_sxw.rml_parse):
width.append(30)
for v in range(len(width)):
width_str +=',%d'%width[v]
ns.setAttribute('colWidths',width_str)
child_list = ns.childNodes

View File

@ -74,9 +74,9 @@
<paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="Table Contents" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="Caption" fontName="Times-Roman" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="Index" fontName="Times-Roman"/>
<paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="Caption" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="Index" fontName="Helvetica"/>
<paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="12.0" leading="19" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
</stylesheet>
<images/>
@ -148,21 +148,27 @@
</para>
<section>
<para style="P13">[[ repeatIn(getarray(data['form'],o,array_header=data['form']['select_base']),'array_header',td=len(data['form']['base_selection'][0][2]),data=data['form']['select_base']) or removeParentNode('section') ]]</para>
<blockTable colWidths="0.0" style="Table4">
<blockTable colWidths="0.00,90.00" style="Table4">
<tr>
<td>
<para style="P3"> </para>
</td>
<td>
<para style="P3">Indicators</para>
</td>
</tr>
</blockTable>
</section>
<section>
<para style="P1">[[ repeatIn(lines(data['form']),'o')]]</para>
<para style="P13">[[ repeatIn(getarray(data['form'],o,array_header=data['form']['select_base']),'array',td=len(data['form']['base_selection'][0][2]),data=data['form']['select_base']) or removeParentNode('section') ]]</para>
<blockTable colWidths="0.00" style="Table3">
<para style="P1">[[ repeatIn(lines(data['form']),'obj')]]</para>
<para style="P13">[[ repeatIn(getarray(data['form'],obj,array_header=data['form']['select_base']),'array',td=len(data['form']['base_selection'][0][2]),data=data['form']['select_base']) or removeParentNode('section') ]]</para>
<blockTable colWidths="0.00,90.00" style="Table3">
<tr>
<td>
<para style="P9"> </para>
<td>
<para style="P9"> </para>
</td>
<td>
<para style="P5"><font>[['.....'*(obj['level']) ]][[ setTag('font','font',{'color':'white'}) ]]</font>[[ obj['code'] ]]</para>
</td>
</tr>