diff --git a/addons/delivery/views/delivery_view.xml b/addons/delivery/views/delivery_view.xml
index 87258b2c883..21b7f8dd919 100644
--- a/addons/delivery/views/delivery_view.xml
+++ b/addons/delivery/views/delivery_view.xml
@@ -271,9 +271,9 @@
         <record id="view_picking_withweight_internal_move_form" model="ir.ui.view">
             <field name="name">stock.picking_withweight.internal.move.form.view</field>
             <field name="model">stock.move</field>
-            <field name="inherit_id" ref="stock.view_move_picking_form"/>
+            <field name="inherit_id" ref="stock.view_move_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//field[@name='date_expected']" position="after">
+                <xpath expr="//field[@name='location_dest_id']" position="after">
                     <field name="weight"/>
                 </xpath>
             </field>
diff --git a/addons/stock/views/stock_move_views.xml b/addons/stock/views/stock_move_views.xml
index 0a0f9586e11..4a9ac214581 100644
--- a/addons/stock/views/stock_move_views.xml
+++ b/addons/stock/views/stock_move_views.xml
@@ -268,11 +268,11 @@
                                     <field name="product_uom" options="{'no_open': True, 'no_create': True}" groups="uom.group_uom"/>
                                 </div>
                                 <field name="name" invisible="1"/>
-                                <field name="date_expected" invisible="1"/>
+                                <field name="date_expected"/>
                                 <field name="date" attrs="{'invisible': [('state', '!=', 'done')]}"/>
                             </group>
                         </group>
-                        <group name="origin_grp" string="Origin">
+                        <group name="origin_grp" string="Origin" groups="base.group_no_one" >
                             <field name="origin"/>
                             <field name="group_id"/>
                             <field name="procure_method" attrs="{'readonly': [('state', '!=', 'draft')]}" groups="stock.group_adv_location"/>
@@ -303,50 +303,6 @@
             </field>
         </record>
 
-        <record id="view_move_picking_form" model="ir.ui.view">
-            <field name="name">stock.move.form</field>
-            <field name="model">stock.move</field>
-            <field eval="20" name="priority"/>
-            <field name="arch" type="xml">
-                <form string="Stock Moves">
-                <header>
-                        <field name="state" widget="statusbar"/>
-                </header>
-                <field name="scrapped" invisible="1"/>
-                <group>
-                    <group string="#Products">
-                        <field name="product_id"/>
-                        <field name="picking_type_id" invisible="1"/>
-                        <field name="group_id" invisible="1"/>
-                        <field name="product_uom_category_id" invisible="1"/>
-                        <label for="product_uom_qty"/>
-                        <div>
-                            <field name="product_uom_qty"/>
-                            <field name="product_uom" options="{'no_open': True, 'no_create': True}" string="Unit Of Measure" groups="uom.group_uom" class="oe_inline"/>
-                        </div>
-                        <field name="product_tmpl_id" invisible="1"/>
-                    </group>
-                    <group string="Locations" groups="base.group_no_one">
-                        <field name="name"/>
-                        <field name="location_id" options="{'no_create': True}"/>
-                        <field name="location_dest_id" options="{'no_create': True}"/>
-                    </group>
-                </group>
-                <group>
-                    <group string="Conditions">
-                       <field name="procure_method" attrs="{'readonly': [('state', '!=', 'draft')]}" groups="stock.group_adv_location"/>
-                        <field name="create_date" invisible="1"/>
-                        <field name="date_expected"/>
-                        <field name="move_dest_ids" groups="base.group_no_one" readonly="1"/>
-                    </group>
-                    <group name="quants_grp" string="Reserved" attrs="{'invisible': [('state', '=', 'draft')]}">
-                        <field name="string_availability_info"/>
-                    </group>
-                </group>
-                </form>
-            </field>
-        </record>
-
         <record id="view_move_search" model="ir.ui.view">
             <field name="name">stock.move.search</field>
             <field name="model">stock.move</field>
diff --git a/addons/stock/views/stock_picking_views.xml b/addons/stock/views/stock_picking_views.xml
index a0bad560f22..96e4f3b331f 100644
--- a/addons/stock/views/stock_picking_views.xml
+++ b/addons/stock/views/stock_picking_views.xml
@@ -245,7 +245,7 @@
                             help="List view of operations"
                             groups="base.group_no_one"
                             attrs="{'invisible': ['|', '&amp;', ('show_operations', '=', True), '|', ('is_locked', '=', True), ('state', '=', 'done'), '&amp;', ('state', '=', 'done'), ('is_locked', '=', True)]}"
-                            context="{'picking_type_code': picking_type_code, 'default_picking_id': id, 'form_view_ref':'stock.view_move_picking_form', 'address_in_id': partner_id, 'default_picking_type_id': picking_type_id, 'default_location_id': location_id, 'default_location_dest_id': location_dest_id}">
+                            context="{'picking_type_code': picking_type_code, 'default_picking_id': id, 'form_view_ref':'stock.view_move_form', 'address_in_id': partner_id, 'default_picking_type_id': picking_type_id, 'default_location_id': location_id, 'default_location_dest_id': location_dest_id}">
                             <div class="o_form_field o_stat_info">
                                 <span class="o_stat_text">Operations</span>
                             </div>
@@ -300,7 +300,7 @@
                         </page>
                         <page string="Operations">
                             <field name="id" invisible="1"/>
-                            <field name="move_ids_without_package" attrs="{'readonly': ['|', '&amp;', ('show_operations', '=', True), '|', ('is_locked', '=', True), ('state', '=', 'done'), '&amp;', ('state', '=', 'done'), ('is_locked', '=', True)]}" context="{'picking_type_code': picking_type_code, 'default_picking_id': id, 'form_view_ref':'stock.view_move_picking_form', 'address_in_id': partner_id, 'default_picking_type_id': picking_type_id, 'default_location_id': location_id, 'default_location_dest_id': location_dest_id}">
+                            <field name="move_ids_without_package" attrs="{'readonly': ['|', '&amp;', ('show_operations', '=', True), '|', ('is_locked', '=', True), ('state', '=', 'done'), '&amp;', ('state', '=', 'done'), ('is_locked', '=', True)]}" context="{'picking_type_code': picking_type_code, 'default_picking_id': id, 'form_view_ref':'stock.view_move_form', 'address_in_id': partner_id, 'default_picking_type_id': picking_type_id, 'default_location_id': location_id, 'default_location_dest_id': location_dest_id}">
                                 <tree decoration-danger="not parent.immediate_transfer and state != 'done' and quantity_done > reserved_availability and show_reserved_availability" decoration-muted="scrapped == True or state == 'cancel' or (state == 'done' and is_locked == True)" string="Stock Moves" editable="bottom">
                                     <field name="name" invisible="1"/>
                                     <field name="date_expected" invisible="1"/>