diff --git a/invoice_stock_move/views/invoice_stock_move_view.xml b/invoice_stock_move/views/invoice_stock_move_view.xml
index dc69ead97..bbf1bc41f 100644
--- a/invoice_stock_move/views/invoice_stock_move_view.xml
+++ b/invoice_stock_move/views/invoice_stock_move_view.xml
@@ -7,15 +7,15 @@
         <field name="inherit_id" ref="account.view_move_form"/>
         <field name="arch" type="xml">
             <xpath expr="//header" position="inside">
-                <button name="action_stock_move" string="Transfer" type="object"  class="oe_highlight"
+                <button name="action_stock_move" string="Create Transfer" type="object"  class="oe_highlight"
                      attrs="{'invisible':['|',('state', '=', 'draft'),('transfer_state', '!=', 'not_initiated')]}"/>
             </xpath>
             <xpath expr="//field[@name='invoice_date']" position="after">
-                <field name='picking_type_code' invisible="0" readonly="1" force_save="1"/>
-                <field name="picking_type_id" attrs="{'readonly':[('state','not in',['draft'])]}" 
+                <field name='picking_type_code' invisible="1" readonly="1" force_save="1"/>
+                <field name="picking_type_id" attrs="{'readonly':[('invoice_picking_id','!=',False)]}" 
                 				domain="[('code','=',picking_type_code)]"/> <!--'invisible':[('transfer_state','not in',[,,])],  -->
                 <field name="transfer_state" invisible="0" readonly="1" force_save="1"/>
-                <field name="invoice_picking_id" invisible="0" readonly="1" force_save="1"/>
+                <field name="invoice_picking_id" invisible="1" readonly="1" force_save="1"/>
             </xpath>
             <xpath expr="//field[@name='name']" position="before">
                 <div class="oe_button_box" name="button_box">