diff --git a/maintenance.py b/maintenance.py
index 3b49cb0..c91fbf3 100644
--- a/maintenance.py
+++ b/maintenance.py
@@ -216,7 +216,7 @@ class Maintenance(Workflow, ModelSQL, ModelView):
 
     service_maintenance = fields.Many2One('optical_equipment_maintenance.service', "Maintenance Service",
                                           ondelete='CASCADE', select=True,
-                                          domain=[('state', 'in', ['in_progress']),
+                                          domain=[('state', 'in', ['draft','in_progress']),
                                                   ('propietary', '=', Eval('propietary'))],
                                           states=_states)
     code = fields.Char(
diff --git a/move.py b/move.py
index 62cd6b0..bf3ec40 100644
--- a/move.py
+++ b/move.py
@@ -120,7 +120,8 @@ class ShipmentOut(metaclass=PoolMeta):
                 sale_origin=saleLine,
                 maintenance_type='initial',
                 propietary=shipment.customer.id,
-                propietary_address=shipment.delivery_address.id)
+                propietary_address=shipment.delivery_address.id,
+                state='draft')
             maintenanceService.save()
             
             serial = False
@@ -137,6 +138,7 @@ class ShipmentOut(metaclass=PoolMeta):
                             service_maintenance=maintenanceService.id,
                             maintenance_type='initial',
                             propietary=shipment.customer.id,
+                            equipment_calibrate= True if move.equipment.product.calibration else False,
                             propietary_address=shipment.delivery_address.id,
                             equipment=move.equipment.id)
                         maintenance.save()
diff --git a/sale.xml b/sale.xml
index 813885f..cf518a4 100644
--- a/sale.xml
+++ b/sale.xml
@@ -15,7 +15,7 @@
         <field name="name">Sale Equipments</field>
         <field name="model">sale.sale</field>
         <field name="report_name">sale.sale</field>
-	<field name="report">optical_equipment/report/Sale.fodt</field>
+	<field name="report">optical_equipment/report/Sale_Internal.fodt</field>
         <field name="single" eval="True"/>
     </record>
     <record model="ir.action.keyword" id="report_sale_keyword">
@@ -27,7 +27,7 @@
         <field name="name">Sale Equipments Internal</field>
         <field name="model">sale.sale</field>
         <field name="report_name">sale.sale</field>
-	<field name="report">optical_equipment/report/Sale_Internal.fodt</field>
+	<field name="report">optical_equipment/report/Sale.fodt</field>
         <field name="single" eval="True"/>
     </record>
     <record model="ir.action.keyword" id="report_sale_internal_keyword">