[FIX] sale, sale order report: display the payment term accordingly to what is specif...

bzr revid: qdp-launchpad@openerp.com-20120208161548-4r3ypz6fotf4rvpg

diff --git a/addons/sale/report/sale_order.rml b/addons/sale/report/sale_order.rml
index 29951d4..26093c0 100644 (file)
--- a/addons/sale/report/sale_order.rml
+++ b/addons/sale/report/sale_order.rml
@@ -359,7 +359,7 @@
       </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>
+          <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>
         </td>
       </tr>
     </blockTable>