[MERGE]:lp:~openerp-report/openobject-addons/report-dev

bzr revid: apa@tinyerp.com-20101014133939-a1he0vfdmymnkrr5
This commit is contained in:
apa-tiny
2010-10-14 19:09:39 +05:30
@@ -75,7 +75,6 @@
<initialize>
<paraStyle name="all" alignment="justify"/>
</initialize>
<paraStyle name="P1" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="Standard" fontName="Helvetica"/>
<paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
@@ -171,7 +170,7 @@
</tr>
</blockTable>
<section>
<para style="terp_default_8">[[ requisition.line_ids==[] and removeParentNode('section') ]] [[ repeatIn(requisition.line_ids,'line_ids') ]]</para>
<para style="terp_default_2">[[ requisition.line_ids==[] and removeParentNode('section') ]] [[ repeatIn(requisition.line_ids,'line_ids') ]]</para>
<blockTable colWidths="375.0,71.0,84.0" style="Table5">
<tr>
<td>
@@ -204,7 +203,7 @@
</tr>
</blockTable>
<section>
<para style="terp_default_8">[[ requisition.purchase_ids ==[] and removeParentNode('section') ]] [[ repeatIn(requisition.purchase_ids,'purchase_ids') ]]</para>
<para style="terp_default_2">[[ requisition.purchase_ids ==[] and removeParentNode('section') ]] [[ repeatIn(requisition.purchase_ids,'purchase_ids') ]]</para>
<blockTable colWidths="338.0,96.0,96.0" style="Table7">
<tr>
<td>
@@ -218,9 +217,6 @@
</td>
</tr>
</blockTable>
<para style="terp_default_8">
<font color="white"> </font>
</para>
</section>
</story>
</document>