diff --git a/product.py b/product.py
index 35c5782..6fd5738 100644
--- a/product.py
+++ b/product.py
@@ -118,13 +118,9 @@ class Template(metaclass=PoolMeta):
                                     domain=[('category', '=', Id('optical_equipment', 'uom_cat_electrical_tension'))],
                                     states={'invisible' : If(Eval('voltageDC') == None, True)},
                                       depends=['voltageDC'])
+    
     useful_life = fields.Integer("Useful life")
-    useful_life_uom = fields.Many2One('product.uom', 'Useful Life UOM',
-                    domain=[('category', '=', Id('product', "uom_cat_time"))])
     warranty = fields.Integer("Warranty")
-    warranty_uom = fields.Many2One('product.uom', 'Useful Life UOM',
-                    domain=[('category', '=', Id('product', "uom_cat_time"))])
-
 
     @classmethod
     @fields.depends('temperature')
diff --git a/view/template_form.xml b/view/template_form.xml
index 2d0a363..d7cb4d2 100644
--- a/view/template_form.xml
+++ b/view/template_form.xml
@@ -31,6 +31,10 @@ this repository contains the full copyright notices and license terms. -->
 	    <field name="main_tecnology"/>
 	    <label name="software_version"/>
 	    <field name="software_version"/>
+	    <label name="useful_life"/>
+	    <field name="useful_life"/>
+	    <label name="warranty"/>
+	    <field name="warranty"/>
 	    <label name="observation"/>
 	    <field name="observation"/>
 	</page>
@@ -56,23 +60,12 @@ this repository contains the full copyright notices and license terms. -->
 	<field name="frequency"/>
 	<field name="frequency_uom"/>
 
-
 	<label name="voltageAC"/>
 	<field name="voltageAC"/>
 	<field name="voltageAC_uom"/>
 
 	<label name="voltageDC"/>
 	<field name="voltageDC"/>
-	<field name="voltageDC_uom"/>
-	
-	<separator id="time_life_equipment" string="Time Life Equipment" colspan="4"/> 
-
-	<label name="useful_life"/>
-	<field name="useful_life"/>
-	<field name="useful_life_uom"/>
-
-	<label name="warranty"/>
-	<field name="warranty"/>
-	<field name="warranty_uom"/>
+	<field name="voltageDC_uom"/>	
     </xpath>
 </data>