odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] sale,sale_layout: avoid RML loop when printing SO with very long notes 

Forward port of revision 5001 from the
6.0 branch. Apparently very long SO
notes (above 2200 characters) will cause
an endless loop while trying to render
inside a blockTable

bzr revid: odo@openerp.com-20120315181112-qa4ezlckzfycv5uy
This commit is contained in:
Olivier Dony 2012-03-15 19:11:12 +01:00
parent 3e0279ac4a
commit 975667d190
2 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
addons/sale/report/sale_order.rml
View File

@ -351,12 +351,8 @@
<para style="terp_default_8">
<font color="white"> </font>
</para>
<para style="terp_default_9">[[ format(o.note or '') ]]</para>
<blockTable colWidths="533.0" style="Table7">
<tr>
<td>
<para style="terp_default_9">[[ format(o.note or '') ]]</para>
</td>
</tr>
<tr>
<td>
<para style="terp_default_9">[[ format(o.payment_term and o.payment_term.note or (o.partner_id.property_payment_term and o.partner_id.property_payment_term.note or '')) ]]</para>

8
addons/sale_layout/report/report_sale_layout.rml
View File

@ -343,12 +343,8 @@
</td>
</tr>
</blockTable>
<para style="terp_default_9">[[ format(o.note or '') ]]</para>
<blockTable colWidths="539.0" style="Table2">
<tr>
<td>
<para style="terp_default_9">[[ format(o.note or '') ]]</para>
</td>
</tr>
<tr>
<td>
<para style="terp_default_9">[[ format((o.partner_id and o.partner_id.property_payment_term and o.partner_id.property_payment_term.note) or '') ]]</para>
@ -359,4 +355,4 @@
<font color="white"> </font>
</para>
</story>
</document>
</document>