From 61d42b02c7925b32444ba4493e8755980b40eba8 Mon Sep 17 00:00:00 2001
From: "Randhir Mayatra (OpenERP)" <rma@tinyerp.com>
Date: Tue, 6 Aug 2013 14:24:50 +0530
Subject: [PATCH 1/2] [IMP] adjust the view of serial number in product expiry

bzr revid: rma@tinyerp.com-20130806085450-hjnus4byiv47501b
---
 addons/product_expiry/product_expiry_view.xml | 19 ++++++++++++-------
 addons/stock/stock_view.xml                   |  2 +-
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/addons/product_expiry/product_expiry_view.xml b/addons/product_expiry/product_expiry_view.xml
index d6dfb22b317..54e1515537e 100644
--- a/addons/product_expiry/product_expiry_view.xml
+++ b/addons/product_expiry/product_expiry_view.xml
@@ -6,13 +6,18 @@
             <field name="model">stock.production.lot</field>
             <field name="inherit_id" ref="stock.view_production_lot_form" />
             <field name="arch" type="xml">
-                <field name="date" position="after">
-                    <field name="life_date" />
-                    <field name="use_date" />
-                    <field name="removal_date" />
-                    <field name="alert_date" />
-                    <separator colspan="4" />
-                </field>
+			<xpath expr="//group[@name='date_view']" position="after">
+	        	<group string="Dates">
+                	<group>
+                    	<field name="use_date" />
+                        <field name="removal_date" />
+                    </group>
+                    <group>
+                    	<field name="life_date" />
+                        <field name="alert_date" />
+                    </group>
+                </group>
+            </xpath> 
             </field>
         </record>
 
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index f73b74a08ea..8dcc88eb6d1 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -219,7 +219,7 @@
                             <field name="name"/>
                         </h1>
                     </div>
-                    <group>
+                    <group name="date_view">
                         <group>
                             <field name="product_id"/>
                             <field name="ref"/>

From 6e4f5576a47a68f1980771d61863fd7399b2c08b Mon Sep 17 00:00:00 2001
From: "Randhir Mayatra (OpenERP)" <rma@tinyerp.com>
Date: Tue, 6 Aug 2013 14:43:08 +0530
Subject: [PATCH 2/2] [IMP] product_expiry

bzr revid: rma@tinyerp.com-20130806091308-3v23s0f593aj912f
---
 addons/product_expiry/product_expiry_view.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/product_expiry/product_expiry_view.xml b/addons/product_expiry/product_expiry_view.xml
index 54e1515537e..e6579bad868 100644
--- a/addons/product_expiry/product_expiry_view.xml
+++ b/addons/product_expiry/product_expiry_view.xml
@@ -6,10 +6,10 @@
             <field name="model">stock.production.lot</field>
             <field name="inherit_id" ref="stock.view_production_lot_form" />
             <field name="arch" type="xml">
-			<xpath expr="//group[@name='date_view']" position="after">
-	        	<group string="Dates">
-                	<group>
-                    	<field name="use_date" />
+            <xpath expr="//group[@name='date_view']" position="after">
+                <group string="Dates">
+                    <group>
+                        <field name="use_date" />
                         <field name="removal_date" />
                     </group>
                     <group>