diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 8f755d77a54..aa0f4233a42 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -519,7 +519,7 @@
             <field name="name">On Purchase Order Lines</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">purchase.order.line</field>
-            <field name="domain">[('order_id.invoice_method','&lt;&gt;','picking'), ('state','in',('confirmed','done')), ('invoiced', '=', False)]</field>
+            <field name="domain">['|', ('product_id','=',False),('order_id.invoice_method','&lt;&gt;','picking'),('state','in',('confirmed','done')), ('invoiced', '=', False)]</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="search_view_id" ref="purchase_order_line_search"/>
diff --git a/addons/purchase/purchase_workflow.xml b/addons/purchase/purchase_workflow.xml
index 00fb5517568..212ce304e07 100644
--- a/addons/purchase/purchase_workflow.xml
+++ b/addons/purchase/purchase_workflow.xml
@@ -145,7 +145,7 @@
         <record id="trans_router_invoice_no_order" model="workflow.transition">
             <field name="act_from" ref="act_router"/>
             <field name="act_to" ref="act_invoice_end"/>
-            <field name="condition">invoice_method&lt;&gt;'order'</field>
+            <field name="condition">invoice_method&lt;&gt;'order' and invoiced</field>
         </record>
         <record id="trans_except_picking_picking_done" model="workflow.transition">
             <field name="act_from" ref="act_except_picking"/>