Merge branch 'master' of https://github.com/odoo/odoo

[odoo/odoo.git] / addons / sale_order_dates / sale_order_dates_view.xml

diff --git a/addons/sale_order_dates/sale_order_dates_view.xml b/addons/sale_order_dates/sale_order_dates_view.xml
index 5027fef..7b975bf 100644 (file)
--- a/addons/sale_order_dates/sale_order_dates_view.xml
+++ b/addons/sale_order_dates/sale_order_dates_view.xml
@@ -5,15 +5,12 @@
         <record id="view_sale_orderfor" model="ir.ui.view">
             <field name="name">sale.order.form.inherit5</field>
             <field name="model">sale.order</field>
-            <field name="inherit_id" ref="sale.view_order_form"/>
+            <field name="inherit_id" ref="sale_stock.view_order_form_inherit"/>
             <field name="arch" type="xml">
-                <group name="sale_pay" position="after">
-                    <group colspan="2" col="2" >
-                        <separator string="Dates" colspan="2"/>
-                        <field name="requested_date" on_change="onchange_requested_date(requested_date, commitment_date)"/>
-                        <field name="commitment_date"/>
-                        <field name="effective_date"/>
-                    </group>
+                <group name="sale_shipping" position="inside">
+                    <field name="requested_date" on_change="onchange_requested_date(requested_date, commitment_date)"/>
+                    <field name="commitment_date"/>
+                    <field name="effective_date"/>
                 </group>
             </field>
         </record>