Report Improvements (ref:nch)

bzr revid: hda@hda-20090608061704-fvhkjjs49lwrne6q
This commit is contained in:
husen daudi
2009-06-08 11:47:04 +05:30
4 changed files with 17 additions and 14 deletions
@@ -1,8 +1,8 @@
<?xml version="1.0"?>
<document filename="test.pdf">
<template pageSize="(5.5cm,2.8cm)" title="Test" author="Martin Simon" allowSplitting="20">
<template pageSize="(550,280)" title="Test" author="Martin Simon" allowSplitting="20">
<pageTemplate id="first">
<frame id="first" x1="0.1cm" y1="0.1cm" width="5.3cm" height="2.4cm"/>
<frame id="first" x1="0.1cm" y1="0.1cm" width="530" height="240"/>
</pageTemplate>
</template>
<stylesheet>
@@ -34,7 +34,7 @@
<tr>
<td>
<para style="P1">[[ str(o.name) ]] ([[ str(o.code) ]])</para>
<barCode code="code128" x="26.9mm" height="68.1mm" quiet="9" fontName="Times-Roman" fontSize="50" alignment="CENTER">[['ID'+str(o.id)]]</barCode>
<barCode code="code128" x="300" height="180" quiet="9" fontName="Times-Roman" fontSize="50" alignment="CENTER">[['ID'+str(o.id)]]</barCode>
</td>
</tr>
</blockTable>
@@ -1,8 +1,8 @@
<?xml version="1.0"?>
<document filename="test.pdf">
<template pageSize="(5.5cm,2.8cm)" title="Test" author="Martin Simon" allowSplitting="20">
<template pageSize="(550,280)" title="Test" author="Martin Simon" allowSplitting="20">
<pageTemplate id="first">
<frame id="first" x1="0.1cm" y1="0.1cm" width="5.3cm" height="2.4cm"/>
<frame id="first" x1="0.1cm" y1="0.1cm" width="530" height="240"/>
</pageTemplate>
</template>
<stylesheet>
@@ -34,7 +34,7 @@
<tr>
<td>
<para style="P1">[[ str(o.name) ]]</para>
<barCode code="code128" x="26.9mm" height="68.1mm" quiet="9" fontName="Times-Roman" fontSize="50" alignment="CENTER">[['ID'+str(o.id)]]</barCode>
<barCode code="code128" x="300" height="180" quiet="9" fontName="Times-Roman" fontSize="50" alignment="CENTER">[['ID'+str(o.id)]]</barCode>
</td>
</tr>
</blockTable>
+10 -7
View File
@@ -277,18 +277,17 @@
</tr>
</blockTable>
<section>
<para style="P30">
<font color="white"> </font>
</para>
<para style="P30"><font color="white">[[ repeatIn(o.operations,'line') ]] </font></para>
<para style="P30"><font color="white">[[ line or removeParentNode('section')]]</font></para>
<para style="P29">Operation Line(s)</para>
<blockTable colWidths="28.0,145.0,150.0,96.0,51.0,69.0" style="Table5">
<tr>
<td>
<para style="P4"><font face="Times-Roman" size="2.0">[[ repeatIn(o.operations,'line') ]]</font>Add [[ ((line.type == 'add') or removeParentNode('para')) and '' ]] </para>
<para style="P4">Add [[ ((line.type == 'add') or removeParentNode('para')) and '' ]] </para>
<para style="P4">Remove [[ ((line.type == 'remove') or removeParentNode('para')) and '' ]]</para>
</td>
<td>
<para style="P3">[[ line.name ]][[ (line.to_invoice==True) or removeParentNode('tr') ]]</para>
<para style="P3"><font>[[ line.name ]]</font><font>[[ (line.to_invoice==True) or removeParentNode('blockTable') ]]</font></para>
</td>
<td>
<para style="P6">[[ ','.join(map( lambda x: x.name, line.tax_id)) ]]</para>
@@ -306,14 +305,17 @@
</tr>
</blockTable>
</section>
<section>
<para style="P30"><font color="white">[[ repeatIn(o.fees_lines,'fees') ]]</font></para>
<para style="P30"><font color="white">[[ fees or removeParentNode('section')]]</font></para>
<para style="P23">Fees Line(s) [[ (o.fees_lines ==[] and removeParentNode('para') ) ]]</para>
<blockTable colWidths="28.0,145.0,150.0,96.0,51.0,69.0" style="Table6">
<tr>
<td>
<para style="P21">[[ repeatIn(o.fees_lines,'fees') ]]</para>
<para style="P21"></para>
</td>
<td>
<para style="P3">[[ fees.name ]][[ (fees.to_invoice==True) or removeParentNode('tr') ]]</para>
<para style="P3"><font>[[ fees.name ]]</font><font>[[ (fees.to_invoice==True) or removeParentNode('blockTable') ]]</font></para>
</td>
<td>
<para style="P6">[[ ','.join(map( lambda x: x.name, fees.tax_id)) ]]</para>
@@ -329,6 +331,7 @@
</td>
</tr>
</blockTable>
</section>
<para style="P22">
<font color="white"> </font>
</para>
+1 -1
View File
@@ -290,7 +290,7 @@
<para style="terp_default_Centre_9">[[ o.name ]]</para>
</td>
<td>
<para style="terp_default_Centre_9">[[ o.date_invoice ]]</para>
<para style="terp_default_Centre_9">[[ formatLang(o.date_invoice,date=True) ]]</para>
</td>
<td>
<para style="terp_default_Centre_9">[[ o.address_invoice_id.partner_id.ref or '' ]]</para>