diff --git a/addons/product_expiry/product_expiry_view.xml b/addons/product_expiry/product_expiry_view.xml
index 6366c02c63f..2f21ba859a4 100644
--- a/addons/product_expiry/product_expiry_view.xml
+++ b/addons/product_expiry/product_expiry_view.xml
@@ -4,16 +4,16 @@
 		<record model="ir.ui.view" id="view_move_form_expiry">
 			<field name="name">stock.production.lot.form</field>
 			<field name="model">stock.production.lot</field>
-			<field name="inherit_id" ref="stock.prodlot_form" />
+			<field name="inherit_id" ref="stock.view_production_lot_form" />
 			<field name="type">form</field>
 			<field name="arch" type="xml">
-				<form position="inside">
-					<separator string="Dates" colspan="4" />
-					<field name="dlc" />
-					<field name="dluo" />
-					<field name="removal_date" />
+				<field name="date" position="after">
 					<field name="alert_date" />
-				</form>
+					<field name="removal_date" />
+					<field name="dluo" />
+					<field name="dlc" />
+					<separator string="Dates" colspan="4" />
+				</field>
 			</field>
 		</record>
 
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index bd7bd4838b7..ff041e0b4d7 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -216,7 +216,8 @@
 				<field name="name" select="1"/>
 				<field name="ref" select="1"/>
 				<field name="date" select="1"/>
-				<field name="revisions" colspan="4" widget="one2many_list"/>
+				<separator string="Revisions" colspan="4"/>
+				<field name="revisions" colspan="4" widget="one2many_list" nolabel="1"/>
 			</form>
 		</field>
 	</record>