diff --git a/addons/sale/sale_demo.xml b/addons/sale/sale_demo.xml
index ce4853e0eda..b2148a4cd61 100644
--- a/addons/sale/sale_demo.xml
+++ b/addons/sale/sale_demo.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data noupdate="1">
+    <data noupdate="0">
     
         <!--Resource: sale.order-->
         
@@ -12,13 +12,15 @@
             <field ref="base.res_partner_address_8" name="partner_invoice_id"/>
             <field ref="base.res_partner_address_8" name="partner_shipping_id"/>
             <field ref="base.res_partner_address_8" name="partner_order_id"/>
-            <field name="order_policy">picking</field>            
+            <field name="order_policy">picking</field>  
+            <field name="note">Invoice after delivery</field>          
         </record>
 
         <!--Resource: sale.order.line-->
         
         <record id="line" model="sale.order.line">
             <field name="order_id" ref="order"/>
+            <field name="name">New server config + material</field>
             <field name="product_id" ref="product.product_product_mb1"/>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="price_unit">123.20</field>
diff --git a/addons/sale/test/order_process.yml b/addons/sale/test/order_process.yml
index e752edf1bdc..7a3af322c4e 100644
--- a/addons/sale/test/order_process.yml
+++ b/addons/sale/test/order_process.yml
@@ -113,14 +113,13 @@
     for invoice in order.invoice_ids:
       assert invoice.type == 'out_invoice',"Invoice should be Customer Invoice."
       assert invoice.account_id.id == ac,"Invoice account is not correspond."
-      #assert invoice.origin == order.name,"Origin of Invoice is not corresponding with sequence number of sale order."
       assert invoice.reference == order.client_order_ref or order.name,"Reference is not correspond."
       assert invoice.partner_id.id == order.partner_id.id,"Customer is not correspond."
       assert invoice.address_invoice_id.id == order.partner_invoice_id.id,"Invoice Address is not correspond."
       assert invoice.currency_id.id == order.pricelist_id.currency_id.id, "Currency is not correspond."
-      #assert invoice.comment == order.note,"Note is not correspond."
+      assert invoice.comment == order.note or '',"Note is not correspond."
       assert invoice.journal_id.id == journal_ids[0],"Sales Journal is not link on Invoice."
-      #assert invoice.payment_term.id == order.payment_term and order.payment_term.id or False, "Payment term is not correspond."
+      assert invoice.payment_term.id == order.payment_term.id, "Payment term is not correspond."
       for so_line in order.order_line:
         inv_line = so_line.invoice_lines[0]
         ac = so_line.product_id.product_tmpl_id.property_account_income.id or so_line.product_id.categ_id.property_account_income_categ.id
diff --git a/addons/sale/test/sale_order_demo.yml b/addons/sale/test/sale_order_demo.yml
index 8d6d7a1c5b7..a1bd7fd83b4 100644
--- a/addons/sale/test/sale_order_demo.yml
+++ b/addons/sale/test/sale_order_demo.yml
@@ -3,6 +3,8 @@
 -
   !record {model: sale.order, id: order}:
     partner_id: base.res_partner_agrolait
+    note: Invoice after delivery
+    payment_term: account.account_payment_term
 -
   !record {model: sale.order.line, id: line}:
     product_id: product.product_product_mb1