diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 6a6678d6163..9b8057c2289 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -582,6 +582,13 @@ class sale_order(osv.osv):
         result.update(view_id = res and res[1] or False)
         return result
 
+    def test_no_product(self, cr, uid, ids, *args):
+        for order in self.browse(cr, uid, ids):
+            for line in order.order_line:
+                if line.product_id:
+                    return False
+        return True
+
     def action_invoice_create(self, cr, uid, ids, grouped=False, states=['confirmed', 'done', 'exception'], date_inv = False, context=None):
         res = False
         invoices = {}
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 2c2acff227e..ae93500be59 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -163,7 +163,7 @@
                             <button name="action_button_confirm" states="draft" string="Confirm" type="object"/>
                             <button name="action_button_confirm" states="sent" string="Confirm" class="oe_highlight" type="object"/>
                             <button name="action_view_invoice" string="View Invoice" type="object" class="oe_highlight"
-                              attrs="{'invisible': ['|','|',('state', '!=','progress'), ('invoiced', '=', True),('order_policy','=','picking')]}"/>
+                              attrs="{'invisible': ['|','|',('state', '!=','progress'), ('invoiced', '=', True),('order_policy','=','picking')]}"/> <!-- ('invoice_ids','=',[]) should be work-->
                             <button name="action_view_delivery" string="View Delivery Order" type="object" class="oe_highlight"
                               attrs="{'invisible': ['|','|','|',('picking_ids','=',False),('picking_ids','=',[]), ('state', 'not in', ('progress','manual')),('shipped','=',True)]}"/>
                             <button name="%(action_view_sale_advance_payment_inv)d" string="Create Invoice"
@@ -184,8 +184,8 @@
                     <group>
                         <group>
                             <field name="partner_id" on_change="onchange_partner_id(partner_id)" domain="[('customer','=',True)]" context="{'search_default_customer':1, 'show_address': 1}" options='{"always_reload": true, "highlight_first_line": true}'/>
-                            <field domain="[('parent_id','=',partner_id)]" name="partner_invoice_id" groups="sale.group_delivery_invoice_address"/>
-                            <field domain="[('parent_id','=',partner_id)]" name="partner_shipping_id" groups="sale.group_delivery_invoice_address"/>
+                            <field domain="[('parent_id','=',partner_id)]" name="partner_invoice_id" groups="sale.group_delivery_invoice_address" context="{'default_parent_id': partner_id}"/>
+                            <field domain="[('parent_id','=',partner_id)]" name="partner_shipping_id" groups="sale.group_delivery_invoice_address" context="{'default_parent_id': partner_id}"/>
                             <field name="project_id" context="{'partner_id':partner_id, 'pricelist_id':pricelist_id, 'default_name':name}" groups="sale.group_analytic_accounting" domain="[('type','in',['view','normal','contract'])]"/>
                         </group>
                         <group>
diff --git a/addons/sale/sale_workflow.xml b/addons/sale/sale_workflow.xml
index c18e271d480..48e299c8314 100644
--- a/addons/sale/sale_workflow.xml
+++ b/addons/sale/sale_workflow.xml
@@ -162,7 +162,7 @@
         <record id="trans_router_wait_invoice_shipping" model="workflow.transition">
             <field name="act_from" ref="act_wait_invoice"/>
             <field name="act_to" ref="act_invoice_end"/>
-            <field name="condition">(order_policy=='picking')</field>
+            <field name="condition">(order_policy=='picking') and (not test_no_product())</field>
         </record>
 
         <record id="trans_router_wait_invoice" model="workflow.transition">
@@ -196,7 +196,7 @@
         <record id="trans_wait_invoice_invoice" model="workflow.transition">
             <field name="act_from" ref="act_wait_invoice"/>
             <field name="act_to" ref="act_invoice"/>
-            <field name="condition">(order_policy=='prepaid')</field>
+            <field name="condition">(order_policy=='prepaid') or test_no_product()</field>
         </record>
 
         <record id="trans_wait_invoice_invoice_manual" model="workflow.transition">