diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 973ba90fca9..6fa752a9f01 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -534,7 +534,6 @@ class purchase_order(osv.osv):
             'invoice_state': '2binvoiced' if order.invoice_method == 'picking' else 'none',
             'type': 'in',
             'partner_id': order.dest_address_id.id or order.partner_id.id,
-            'invoice_state': '2binvoiced' if order.invoice_method in ('picking', 'order') else 'none',
             'purchase_id': order.id,
             'company_id': order.company_id.id,
             'move_lines' : [],
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index ae30d2ab461..810caf25c83 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -264,7 +264,7 @@
                             <label for="notes"/>
                             <field name="notes" class="oe_inline"/>
                         </page>
-                        <page string="Incoming Shipments">
+                        <page string="Incoming Shipments &amp; Invoices">
                             <group>
                                 <group>
                                     <field name="dest_address_id" string="Customer Address" on_change="onchange_dest_address_id(dest_address_id)"/>