diff --git a/__init__.py b/__init__.py
index a708608..034f98a 100644
--- a/__init__.py
+++ b/__init__.py
@@ -2,7 +2,7 @@
 # this repository contains the full copyright notices and license terms.
 from trytond.pool import Pool
 from . import (agended, calibration, configuration, contract, diary,
-equipment, party, product, maintenance, purchase, sale)
+               equipment, party, product, maintenance, move, purchase, sale)
 
 __all__ = ['register']
 
@@ -41,6 +41,10 @@ def register():
         maintenance.MaintenanceLine,
         maintenance.MaintenanceActivity,
         maintenance.ChangePropietaryMaintenance,
+        move.Move,
+        move.ShipmentOut,
+        move.ShipmentInternal,
+        move.ShipmentOutReturn,
         module='optical_equipment', type_='model')
     Pool.register(
         agended.AssingAgended,
@@ -53,4 +57,6 @@ def register():
         contract.ContractReport,
         equipment.EquipmentReport,
         maintenance.MaintenanceServiceReport,
+        move.PickingListDeliveryReport,
+        move.CapacitationReport,
         module='optical_equipment', type_='report')
diff --git a/calibration.py b/calibration.py
index 6952bbd..0251f69 100644
--- a/calibration.py
+++ b/calibration.py
@@ -5,6 +5,7 @@ from trytond.model import (
 from trytond.pyson import Bool, Eval, If, Id, Equal
 from trytond.pool import Pool
 from trytond.modules.company import CompanyReport
+from trytond.transaction  import Transaction
 
 _digits = (16, 2) 
 _states = {'readonly': If(Eval('state') != 'draft', True)}
diff --git a/maintenance.py b/maintenance.py
index 4bc2df9..9a0d8bf 100644
--- a/maintenance.py
+++ b/maintenance.py
@@ -255,7 +255,7 @@ class MaintenanceService(Workflow, ModelSQL, ModelView):
 class MaintenanceServiceLine(Workflow, ModelSQL, ModelView):
     'Equipment Maintenance Line'
     __name__ = 'optical_equipment.maintenance'
-    _rec_name = 'rec_name'
+    #_rec_name = 'rec_name'
     _states={'required': True,
              'readonly': Eval('state').in_(['finished'])}
 
@@ -317,7 +317,16 @@ class MaintenanceServiceLine(Workflow, ModelSQL, ModelView):
                             'readonly': Eval('state') == 'finished'},)
     graph_calibration = fields.Binary('Graphs')
     rec_name = fields.Function(fields.Char('rec_name'), 'get_rec_name')
-    
+
+    # @fields.depends('maintenance_type', 'code')
+    # def get_rec_name(self, name):
+    #     if self.maintenance_type and self.code:
+    #         name = str(self.maintenance_type) + '@' + str(self.code)
+    #     else:
+    #         name = str(self.maintenance_type) + '@' + 'Borrador'
+            
+    #     return name
+
     @classmethod
     def __setup__(cls):
         super(MaintenanceServiceLine, cls).__setup__()
@@ -350,15 +359,6 @@ class MaintenanceServiceLine(Workflow, ModelSQL, ModelView):
             })
          ]
 
-    @fields.depends('maintenance_type', 'code')
-    def get_rec_name(self, name):
-        if self.maintenance_type and self.code:
-            name = str(self.maintenance_type) + '@' + str(self.code)
-        else:
-            name = str(self.maintenance_type) + '@' + 'Borrador'
-            
-        return name
-
 
     @staticmethod
     def default_company():
diff --git a/product.py b/product.py
index 358c35b..c450a64 100644
--- a/product.py
+++ b/product.py
@@ -135,14 +135,15 @@ class Template(metaclass=PoolMeta):
     warranty = fields.Integer("Warranty")
 
     #### calibration parameters
-    use_pattern = fields.Many2One('optical_equipment.use_pattern', "Use Pattern", ondelete='RESTRICT',
+    use_pattern = fields.Selection([
+        ('', ""),
+        ('ojo_esquematico', "Ojo esquematico"),
+        ('lente_prueba', "Lente de Prueba"),
+        ('pesas_calibration', "Pesas de Calibración"),
+        ('esferas_calibration', "Esferas de Calibración")], "Patrón Utilizado", states={'required': Eval('calibration', True)})
+
+    new_use_pattern = fields.Many2One('optical_equipment.use_pattern', "Use Pattern", ondelete='RESTRICT',
                                    states={'required': Eval('calibration', True)})
-    #use_pattern = fields.Selection([
-    #    ('', ""),
-    #    ('ojo_esquematico', "Ojo esquematico"),
-    #    ('lente_prueba', "Lente de Prueba"),
-    #    ('pesas_calibration', "Pesas de Calibración"),
-    #    ('esferas_calibration', "Esferas de Calibración")], "Patrón Utilizado", states={'required': Eval('calibration', True)})
     measuring_range = fields.Selection([
         ('dioptria', "Dioptria"),
         ('mmhg', "mmHg")], "Rango de Medición")
diff --git a/tryton.cfg b/tryton.cfg
index b003cd3..053268b 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -19,8 +19,10 @@ xml:
    agended.xml
    configuration.xml
    maintenance.xml
+   move.xml
    party.xml
    uom.xml	
    product.xml
    purchase.xml
-   sale.xml
\ No newline at end of file
+   sale.xml
+   shipment.xml
\ No newline at end of file
diff --git a/view/maintenance_form.xml b/view/maintenance_form.xml
index 98f2ce7..8175df2 100644
--- a/view/maintenance_form.xml
+++ b/view/maintenance_form.xml
@@ -63,8 +63,8 @@
 	    <field name="patterns_equipments"/>
 	    <newline/>
 	    <group colspan="6" yexpand="1" id="lines_calibration">
-		<!-- <field name="lines_calibration"/> -->
-		<!-- <newline/>		 -->
+		<field name="lines_calibration"/>
+		<newline/>
 		<field name="calibration_total"/>
 	    </group>
 	</page>