[MERGE] remove address from report
bzr revid: sbh@tinyerp.com-20120326090419-aqe3c7wzzs030b7h
This commit is contained in:
commit
c9d27d8471
|
@ -169,7 +169,7 @@
|
|||
</para>
|
||||
</td>
|
||||
</tr>
|
||||
</blockTable>
|
||||
</blockTable>
|
||||
<blockTable colWidths="568.0" style="Table3">
|
||||
<tr>
|
||||
<td>
|
||||
|
@ -245,7 +245,7 @@
|
|||
</blockTable>
|
||||
<para style="P2">
|
||||
<font color="white"> </font>
|
||||
</para>
|
||||
</para>
|
||||
<blockTable colWidths="568.0" style="Table1">
|
||||
<tr>
|
||||
<td>
|
||||
|
@ -259,7 +259,7 @@
|
|||
<td>
|
||||
<para style="P9">[[ voucher.journal_id.use_preprint_check and voucher.chk_seq or '' ]]</para>
|
||||
</td>
|
||||
</tr>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>
|
||||
<para style="P9"></para>
|
||||
|
@ -281,10 +281,10 @@
|
|||
</td>
|
||||
<td>
|
||||
<para style="P15">[[ voucher.partner_id.name ]]</para>
|
||||
<para style="P15">[[ voucher.partner_id.address and voucher.partner_id.address[0] and voucher.partner_id.address[0].street or removeParentNode('para') ]]</para>
|
||||
<para style="P15">[[ voucher.partner_id.address and voucher.partner_id.address[0] and voucher.partner_id.address[0].street2 or removeParentNode('para') ]]</para>
|
||||
<para style="P15">[[ get_zip_line(voucher.partner_id.address) ]] </para>
|
||||
<para style="P15">[[ voucher.partner_id.address[0].country_id.name]]</para>
|
||||
<para style="P15">[[ voucher.partner_id.street or removeParentNode('para') ]]</para>
|
||||
<para style="P15">[[ voucher.partner_id.street2 or removeParentNode('para') ]]</para>
|
||||
<para style="P15">[[ get_zip_line(voucher.partner_id) ]] </para>
|
||||
<para style="P15">[[ voucher.partner_id.country_id.name]]</para>
|
||||
</td>
|
||||
</tr>
|
||||
</blockTable>
|
||||
|
@ -295,7 +295,7 @@
|
|||
</td>
|
||||
</tr>
|
||||
</blockTable>
|
||||
|
||||
|
||||
<blockTable colWidths="25.0,500" style="Table12">
|
||||
<tr>
|
||||
<td>
|
||||
|
@ -306,11 +306,11 @@
|
|||
<td>
|
||||
<para style="P3">
|
||||
<font color="white"> </font>
|
||||
</para>
|
||||
</para>
|
||||
<!--para style="P15">[[ voucher.name ]]</para-->
|
||||
</td>
|
||||
</tr>
|
||||
</blockTable>
|
||||
</blockTable>
|
||||
<para style="P3">
|
||||
<font color="white"> </font>
|
||||
</para>
|
||||
|
|
|
@ -193,7 +193,7 @@
|
|||
</para>
|
||||
</td>
|
||||
</tr>
|
||||
</blockTable>
|
||||
</blockTable>
|
||||
<blockTable colWidths="550.0" rowHeights="10" style="Table5">
|
||||
<tr>
|
||||
<td>
|
||||
|
@ -215,7 +215,7 @@
|
|||
<td>
|
||||
<para style="P9"></para>
|
||||
</td>
|
||||
</tr>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>
|
||||
<para style="P9"></para>
|
||||
|
@ -237,10 +237,10 @@
|
|||
</td>
|
||||
<td>
|
||||
<para style="P15">[[ voucher.partner_id.name ]]</para>
|
||||
<para style="P15">[[ voucher.partner_id.address and voucher.partner_id.address[0] and voucher.partner_id.address[0].street or removeParentNode('para') ]]</para>
|
||||
<para style="P15">[[ voucher.partner_id.address and voucher.partner_id.address[0] and voucher.partner_id.address[0].street2 or removeParentNode('para') ]]</para>
|
||||
<para style="P15">[[ get_zip_line(voucher.partner_id.address) ]] </para>
|
||||
<para style="P15">[[ voucher.partner_id.address[0].country_id.name]]</para>
|
||||
<para style="P15">[[ voucher.partner_id.street or removeParentNode('para') ]]</para>
|
||||
<para style="P15">[[ voucher.partner_id.street2 or removeParentNode('para') ]]</para>
|
||||
<para style="P15">[[ get_zip_line(voucher.partner_id) ]] </para>
|
||||
<para style="P15">[[ voucher.partner_id.country_id.name]]</para>
|
||||
</td>
|
||||
</tr>
|
||||
</blockTable>
|
||||
|
@ -254,11 +254,11 @@
|
|||
<td>
|
||||
<para style="P3">
|
||||
<font color="white"> </font>
|
||||
</para>
|
||||
</para>
|
||||
<!--para style="P15">[[ voucher.name ]]</para-->
|
||||
</td>
|
||||
</tr>
|
||||
</blockTable>
|
||||
</blockTable>
|
||||
<para style="P3">
|
||||
<font color="white"> </font>
|
||||
</para>
|
||||
|
|
|
@ -112,7 +112,7 @@
|
|||
<font color="white"> </font>
|
||||
</para>
|
||||
</td>
|
||||
</tr>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>
|
||||
<para style="P6">
|
||||
|
@ -123,7 +123,7 @@
|
|||
<para style="P9">[[ formatLang(voucher.date , date=True) or '' ]] [[ voucher.journal_id.use_preprint_check and voucher.chk_seq or '' ]]</para>
|
||||
</td>
|
||||
</tr>
|
||||
</blockTable>
|
||||
</blockTable>
|
||||
<blockTable colWidths="54.0,425.0,85.0" rowHeights="21.5" style="Table4">
|
||||
<tr>
|
||||
<td>
|
||||
|
@ -153,15 +153,15 @@
|
|||
</td>
|
||||
<td>
|
||||
<para style="P9">[[ voucher.partner_id.name ]] </para>
|
||||
<para style="P15">[[ voucher.partner_id.address and voucher.partner_id.address[0] and voucher.partner_id.address[0].street2 or removeParentNode('para') ]]</para>
|
||||
<para style="P15">[[ get_zip_line(voucher.partner_id.address[0]) ]] </para>
|
||||
<para style="P15">[[ voucher.partner_id.address[0].country_id.name]]</para>
|
||||
<para style="P15">[[ voucher.partner_id.street2 or removeParentNode('para') ]]</para>
|
||||
<para style="P15">[[ get_zip_line(voucher.partner_id) ]] </para>
|
||||
<para style="P15">[[ voucher.partner_id.country_id.name]]</para>
|
||||
</td>
|
||||
<td>
|
||||
<para/>
|
||||
</td>
|
||||
</tr>
|
||||
</blockTable>
|
||||
</blockTable>
|
||||
<blockTable colWidths="25.0,350,150" rowHeights="10.5" style="Table12">
|
||||
<tr>
|
||||
<td>
|
||||
|
@ -176,7 +176,7 @@
|
|||
<para style="P3">
|
||||
<font color="white"> </font>
|
||||
</para>
|
||||
</td>
|
||||
</td>
|
||||
</tr>
|
||||
</blockTable>
|
||||
<para style="P3">
|
||||
|
@ -184,7 +184,7 @@
|
|||
</para>
|
||||
</td>
|
||||
</tr>
|
||||
</blockTable>
|
||||
</blockTable>
|
||||
<blockTable colWidths="568.0" style="Table2" rowHeights="255">
|
||||
<tr>
|
||||
<td>
|
||||
|
|
|
@ -99,7 +99,7 @@
|
|||
</td>
|
||||
<td>
|
||||
<para style="Addressee">[[ o['partner'] and o['partner'].name or False]]</para>
|
||||
<para style="Addressee">[[o['partner'] and o['partner'].address and display_address(o['partner'].address[0]) ]]</para>
|
||||
<para style="Addressee">[[o['partner'] and o['partner'] and display_address(o['partner']) ]]</para>
|
||||
</td>
|
||||
</tr>
|
||||
</blockTable>
|
||||
|
|
|
@ -84,7 +84,7 @@
|
|||
</para>
|
||||
<para style="P5">[[o.bord_vnd_id.partner_id.title]]</para>
|
||||
<para style="P5">[[o.bord_vnd_id.partner_id.name]]</para>
|
||||
<para style="P5">[[o.bord_vnd_id.partner_id.address and display_address(o.bord_vnd_id.partner_id.address[0]) ]] </para>
|
||||
<para style="P5">[[o.bord_vnd_id.partner_id and display_address(o.bord_vnd_id.partner_id) ]] </para>
|
||||
<para style="P6">
|
||||
<font color="white"> </font>
|
||||
</para>
|
||||
|
|
|
@ -74,7 +74,7 @@
|
|||
</td>
|
||||
<td>
|
||||
<para style="Addressee">[[ o['partner'] and o['partner'].name or False]]</para>
|
||||
<para style="Addressee">[[ o['partner'] and o['partner'].address and display_address(o['partner'].address[0]) </para>
|
||||
<para style="Addressee">[[ o['partner'] and o['partner'] and display_address(o['partner']) </para>
|
||||
<para style="P4">
|
||||
<font color="white"> </font>
|
||||
</para>
|
||||
|
|
Loading…
Reference in New Issue