[IMP]updated according to spec. v2.0

stesch01 · Nov 24, 2017 · 02fddeb · 02fddeb
1 parent 3f00d78
commit 02fddeb
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 8 deletions.
diff --git a/so_requested_date/inherited_sale_order.xml b/so_requested_date/inherited_sale_order.xml
@@ -8,10 +8,21 @@
             <field name="inherit_id" ref="sale.view_order_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//group/group/field[@name='client_order_ref']" position="after">
-                    <field name="requested_date" on_change="onchange_requested_date(requested_date, commitment_date)"/>
+                    <field name="exworks_date"/>
                 </xpath>
             </field>
         </record>
 
+        <record id="so_requested_date_view_order_tree_inherited" model="ir.ui.view">
+            <field name="name">so.requested.date.view.order.tree.inherited</field>
+            <field name="model">sale.order</field>
+            <field name="inherit_id" ref="sale.view_order_tree"/>
+            <field name="arch" type="xml">
+                <field name="partner_id" position="before">
+                    <field name="exworks_date"/>
+                </field>
+            </field>
+        </record>
+
     </data>
 </openerp>
diff --git a/so_requested_date/inherited_sale_order_dates.xml b/so_requested_date/inherited_sale_order_dates.xml
@@ -2,14 +2,15 @@
 <openerp>
     <data>
 
-        <record id="so_resquested_date_view_sale_orderfor_inherited" model="ir.ui.view">
-            <field name="name">so.resquested.date.view.sale.orderfor.inherited</field>
+        <record id="so_requested_date_view_quotation_tree_date_inherited" model="ir.ui.view">
+            <field name="name">so.requested.date.view.quotation.tree.date.inherited</field>
             <field name="model">sale.order</field>
-            <field name="inherit_id" ref="sale_order_dates.view_sale_orderfor"/>
+            <field name="inherit_id" ref="sale_order_dates.view_quotation_tree_date"/>
             <field name="arch" type="xml">
-                <xpath expr="//field[@name='requested_date']" position="replace">
-                    <field name="resuested_date_2"/>
-                </xpath>
+                <field name="requested_date" position="replace"/>
+                <field name="commitment_date" position="replace">
+                    <field name="exworks_date"/>
+                </field>
             </field>
         </record>
 

diff --git a/so_requested_date/so_request_date.py b/so_requested_date/so_request_date.py
@@ -6,4 +6,4 @@
 class SoRequestedDateSaleOrder(models.Model):
     _inherit = 'sale.order'
 
-    resuested_date_2 = fields.Datetime(related='requested_date')
+    exworks_date = fields.Date(string='Ex Works Date')