[FIX] sale report and sale report with layout: when number of caracters are upper...

bzr revid: nel@tinyerp.com-20120116144903-zw9rqmtdoqs3sy48

diff --git a/addons/sale/report/sale_order.rml b/addons/sale/report/sale_order.rml
index 3426400..d5320f7 100644 (file)
--- a/addons/sale/report/sale_order.rml
+++ b/addons/sale/report/sale_order.rml
@@ -362,14 +362,10 @@
     <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 '') ]]</para>
         </td>
       </tr>

diff --git a/addons/sale_layout/report/report_sale_layout.rml b/addons/sale_layout/report/report_sale_layout.rml
index 8b27f24..ec60209 100644 (file)
--- a/addons/sale_layout/report/report_sale_layout.rml
+++ b/addons/sale_layout/report/report_sale_layout.rml
@@ -381,14 +381,10 @@
         </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>
         </td>
       </tr>
@@ -398,4 +394,4 @@
     </para>
    </pto>
   </story>
-</document>
\ No newline at end of file
+</document>