Merge lp:~camptocamp/sale-reports/7.0-fix-1182812 into lp:~sale-core-editors/sale-reports/7.0

[Yannick Vaucher @ Camptocamp]

[Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c)]

works fine.

review: Approve (code review, test)

=== modified file 'sale_order_webkit/report/sale_order.mako'
--- sale_order_webkit/report/sale_order.mako	2013-04-15 13:33:33 +0000
+++ sale_order_webkit/report/sale_order.mako	2013-05-22 14:33:29 +0000
@@ -170,12 +170,6 @@
             %endfor
         </table>
     </div>
-    <div>
-
-    %if order.note1:
-        <p class="std_text"> ${order.note1| n} </p>
-    %endif
-    </div>
 
     <h1 style="clear:both;">${quotation and _(u'Quotation N°') or _(u'Order N°') } ${order.name}</h1>
 
@@ -190,10 +184,16 @@
             <td>${formatLang(order.date_order, date=True)}</td>
             <td>${order.client_order_ref or ''}</td>
             <td>${order.user_id and order.user_id.name or ''}</td>
-            <td>${order.payment_term and order.payment_term.name or ''}</td>
+            <td>${order.payment_term and order.payment_term.note or ''}</td>
         </tr>
     </table>
 
+    <div>
+    %if order.note1:
+        <p class="std_text"> ${order.note1| n} </p>
+    %endif
+    </div>
+
     <table class="list_sale_table" width="100%" style="margin-top: 20px;">
         <thead>
             <tr>