[IMP] base, report header: simplified code by removing useless check as partner_id is required on res_company
bzr revid: qdp-launchpad@openerp.com-20120316135339-qsnr1qfcgc7mr94m
This commit is contained in:
parent
3f9ce80a7d
commit
629d662f63
|
@ -204,8 +204,8 @@
|
||||||
</table:table-cell>
|
</table:table-cell>
|
||||||
</table:table-row>
|
</table:table-row>
|
||||||
</table:table>
|
</table:table>
|
||||||
<text:p text:style-name="P3">[[ company.partner_id and company.partner_id.street ]]</text:p>
|
<text:p text:style-name="P3">[[ company.partner_id.street ]]</text:p>
|
||||||
<text:p text:style-name="P3">[[ company.partner_id and company.partner_id.zip ]] [[ company.partner_id and company.partner_id.city ]] - [[ company.partner_id and company.partner_id.country_id and company.partner_id.country_id.name ]]</text:p>
|
<text:p text:style-name="P3">[[ company.partner_id.zip ]] [[ company.partner_id.city ]] - [[ company.partner_id.country_id and company.partner_id.country_id.name ]]</text:p>
|
||||||
<table:table table:name="Table3" table:style-name="Table3">
|
<table:table table:name="Table3" table:style-name="Table3">
|
||||||
<table:table-column table:style-name="Table3.A"/>
|
<table:table-column table:style-name="Table3.A"/>
|
||||||
<table:table-column table:style-name="Table3.B"/>
|
<table:table-column table:style-name="Table3.B"/>
|
||||||
|
@ -214,7 +214,7 @@
|
||||||
<text:p text:style-name="P4">Phone :</text:p>
|
<text:p text:style-name="P4">Phone :</text:p>
|
||||||
</table:table-cell>
|
</table:table-cell>
|
||||||
<table:table-cell table:style-name="Table3.A1" table:value-type="string">
|
<table:table-cell table:style-name="Table3.A1" table:value-type="string">
|
||||||
<text:p text:style-name="P5">[[ company.partner_id and company.partner_id.phone ]]</text:p>
|
<text:p text:style-name="P5">[[ company.partner_id.phone ]]</text:p>
|
||||||
</table:table-cell>
|
</table:table-cell>
|
||||||
</table:table-row>
|
</table:table-row>
|
||||||
<table:table-row>
|
<table:table-row>
|
||||||
|
@ -222,7 +222,7 @@
|
||||||
<text:p text:style-name="P4">Mail :</text:p>
|
<text:p text:style-name="P4">Mail :</text:p>
|
||||||
</table:table-cell>
|
</table:table-cell>
|
||||||
<table:table-cell table:style-name="Table3.A2" table:value-type="string">
|
<table:table-cell table:style-name="Table3.A2" table:value-type="string">
|
||||||
<text:p text:style-name="P5">[[ company.partner_id and company.partner_id.email ]]</text:p>
|
<text:p text:style-name="P5">[[ company.partner_id.email ]]</text:p>
|
||||||
</table:table-cell>
|
</table:table-cell>
|
||||||
</table:table-row>
|
</table:table-row>
|
||||||
</table:table>
|
</table:table>
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
|
|
||||||
<tr>
|
<tr>
|
||||||
<td>
|
<td>
|
||||||
% if company['partner_id'] and company['partner_id']['street']:
|
% if company['partner_id']['street']:
|
||||||
<small>${company.partner_id.street}</small></br>
|
<small>${company.partner_id.street}</small></br>
|
||||||
%endif
|
%endif
|
||||||
</td>
|
</td>
|
||||||
|
@ -22,7 +22,7 @@
|
||||||
|
|
||||||
<tr>
|
<tr>
|
||||||
<td>
|
<td>
|
||||||
% if company['partner_id'] and company['partner_id']['zip']:
|
% if company['partner_id']['zip']:
|
||||||
<small>${company.partner_id.zip}
|
<small>${company.partner_id.zip}
|
||||||
${company.partner_id.city}-${company.partner_id.country_id and company.partner_id.country_id.name}</small></br>
|
${company.partner_id.city}-${company.partner_id.country_id and company.partner_id.country_id.name}</small></br>
|
||||||
%endif
|
%endif
|
||||||
|
@ -31,16 +31,16 @@
|
||||||
|
|
||||||
<tr>
|
<tr>
|
||||||
<td>
|
<td>
|
||||||
% if company['partner_id'] and company['partner_id']['phone']:
|
% if company['partner_id']['phone']:
|
||||||
<small><b>Phone:</b>${company.partner_id and company.partner_id.phone}</small></br>
|
<small><b>Phone:</b>${company.partner_id.phone}</small></br>
|
||||||
%endif
|
%endif
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
|
||||||
<tr>
|
<tr>
|
||||||
<td>
|
<td>
|
||||||
% if company['partner_id'] and company['partner_id']['email']:
|
% if company['partner_id']['email']:
|
||||||
<small><b>Mail:</b>${company.partner_id and company.partner_id.email}</small></br></<address>
|
<small><b>Mail:</b>${company.partner_id.email}</small></br></<address>
|
||||||
%endif
|
%endif
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
|
Loading…
Reference in New Issue