From 975667d190dece1e880cec9a079a42dd41310981 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Thu, 15 Mar 2012 19:11:12 +0100
Subject: [PATCH] [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
---
 addons/sale/report/sale_order.rml                | 6 +-----
 addons/sale_layout/report/report_sale_layout.rml | 8 ++------
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/addons/sale/report/sale_order.rml b/addons/sale/report/sale_order.rml
index 26093c0961f..e270ffe61f1 100644
--- a/addons/sale/report/sale_order.rml
+++ b/addons/sale/report/sale_order.rml
@@ -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>
diff --git a/addons/sale_layout/report/report_sale_layout.rml b/addons/sale_layout/report/report_sale_layout.rml
index bd142f123bd..0692497488f 100644
--- a/addons/sale_layout/report/report_sale_layout.rml
+++ b/addons/sale_layout/report/report_sale_layout.rml
@@ -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>
\ No newline at end of file
+</document>