diff --git a/equipment.py b/equipment.py
index ecf9127..46acf12 100644
--- a/equipment.py
+++ b/equipment.py
@@ -100,17 +100,37 @@ class OpticalEquipment(DeactivableMixin, Workflow, ModelSQL, ModelView):
                                    states=_states,)
 
     maintenance_frequency = fields.Selection(_MAINTENANCE_FREQUENCY, "Maintenance Frequency",
-                                             depends=['propietary'])
-
+                                             depends=['propietary']
+                                             )
     purchase_origin = fields.Reference("Purchase Origin", selection='get_origin',select=True,
-                                       states={'readonly': True})
-
+                                       states={'readonly': True}
+                                       )
     sale_destination = fields.Reference("Sale Destination", selection='get_destination',select=True,
-                                       states={'readonly': True})
-    
+                                       states={'readonly': True}
+                                        )
+    shipment_destination =  fields.Reference("Stock Move", selection='get_shipment', select=True)
 
     del _states_serial, _states, _depends
 
+    @staticmethod
+    def _get_shipment():
+        'Return list of Model names for shipment Reference'
+        return [
+            'stock.shipment.in',
+            'stock.shipment.out',
+            'stock.shipment.out.return',
+            'stock.shipment.in.return',
+            'stock.shipment.internal',
+            ]
+
+    @classmethod
+    def get_shipment(cls):
+        IrModel = Pool().get('ir.model')
+        get_name = IrModel.get_name
+        models = cls._get_shipment()
+
+        return [(None, '')] + [(m, get_name(m)) for m in models]
+
     @classmethod
     def _get_origin(cls):
         'Return list of Model names for origin Reference'
@@ -119,13 +139,6 @@ class OpticalEquipment(DeactivableMixin, Workflow, ModelSQL, ModelView):
 
         return [Purchase.__name__]
 
-
-    @property
-    def origin_name(self):
-        if isinstance(self.origin, self.__class__):
-            return self.origin.invoice.rec_name
-        return self.origin.rec_name if self.origin else None
-
     @classmethod
     def get_origin(cls):
         Model = Pool().get('ir.model')
diff --git a/move.py b/move.py
index cc003df..5b0fab7 100644
--- a/move.py
+++ b/move.py
@@ -1,11 +1,38 @@
-from trytond.model import fields
+from trytond.model import fields, ModelSQL, ModelView, Workflow, dualmethod
+from trytond.modules.company.model import employee_field, set_employee
 from trytond.pool import Pool, PoolMeta
+from trytond.pyson import Eval, If
+
 
 class Move(metaclass=PoolMeta):
     "Stock Move"
     __name__ = "stock.move"
 
-    serial = fields.Char('Serial')
+    equipment = fields.Many2One('optical_equipment.equipment', "Equipment",
+                                domain=[('state', '=', 'registred'),
+                                        ('product','=', Eval('product'))
+                                        ],
+                                states={'invisible': If(~Eval('product_equipment'), True)},)
+
+    equipment_serial = fields.Char('Serial',states={'readonly': True})
+
+    
+    @fields.depends('product', 'equipment', 'uom')
+    def on_change_product(self):
+        if self.product:
+            if (not self.uom
+                    or self.uom.category != self.product.default_uom.category):
+                self.uom = self.product.default_uom
+
+
+
+    def on_change_equipment(self):
+        if self.equipment:
+            self.product = self.equipment.product.id
+            self.equipment_serial = self.equipment.serial
+
+        else:
+            self.equipment_serial = None
 
 
 
@@ -13,6 +40,46 @@ class ShipmentOut(metaclass=PoolMeta):
     "Customer Shipment"
     __name__ = 'stock.shipment.out'
 
+
+    @classmethod
+    @ModelView.button
+    @Workflow.transition('done')
+    @set_employee('done_by')
+    def done(cls, shipments):
+        pool = Pool()
+        Move = pool.get('stock.move')
+        Date = pool.get('ir.date')
+
+
+        pool = Pool()
+        Equipments = pool.get('optical_equipment.equipment')
+        
+        for shipment in shipments:
+            for move in shipment.moves:
+                if move.product.equipment:
+                    equipment=move.serial
+                    equipment.propietary=shipment.customer.id
+                    equipment.propietary_address= shipment.delivery_address.id
+                    equipment.state="uncontrated"
+                    equipment.shipment_destination = move
+                    equipment.maintenance_frequency = "6" if sale.party.client_type == "ips" else "12"
+                    equipment.save()                
+
+        Move.delete([
+                m for s in shipments for m in s.outgoing_moves
+                if m.state == 'staging'])
+
+        Move.do([m for s in shipments for m in s.outgoing_moves])
+        for company, c_shipments in groupby(
+                shipments, key=lambda s: s.company):
+            with Transaction().set_context(company=company.id):
+                
+                today = Date.today()
+                
+            cls.write([s for s in c_shipments if not s.effective_date], {
+                    'effective_date': today,
+                    })
+
     def _get_inventory_move(self, move):
         'Return inventory move for the outgoing move if necessary'
         pool = Pool()
@@ -34,7 +101,6 @@ class ShipmentOut(metaclass=PoolMeta):
             from_location=self.warehouse_storage,
             to_location=move.from_location,
             product=move.product,
-            serial=move.serial,
             uom=move.uom,
             quantity=quantity,
             shipment=self,
diff --git a/product.py b/product.py
index 8c4da01..65edd2d 100644
--- a/product.py
+++ b/product.py
@@ -286,10 +286,10 @@ class Template(metaclass=PoolMeta):
     def default_refurbish():
         return False
 
+
     @fields.depends('software_required', 'software_version')
-    def on_change_sotfware_required(self):
-        if self.software_required:
-            self.software_version = None
+    def on_change_with_sotfware_required(self):
+        self.software_version = None
     
     @fields.depends('d_resolution', 'analog_resolution', 'a_factor_resolution')
     def on_change_resolution_type(self):
diff --git a/report/cv.fods b/report/cv.fods
index ad2e9ae..8adc2dc 100644
--- a/report/cv.fods
+++ b/report/cv.fods
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <office:document xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" xmlns:css3t="http://www.w3.org/TR/css3-text/" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rpt="http://openoffice.org/2005/report" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:drawooo="http://openoffice.org/2010/draw" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:xforms="http://www.w3.org/2002/xforms" office:version="1.3" office:mimetype="application/vnd.oasis.opendocument.spreadsheet">
- <office:meta><meta:creation-date>2022-08-10T10:58:31.260183427</meta:creation-date><dc:date>2022-08-15T13:50:42.372740894</dc:date><meta:editing-duration>PT5H41M3S</meta:editing-duration><meta:editing-cycles>65</meta:editing-cycles><meta:generator>LibreOffice/7.2.7.2$Linux_X86_64 LibreOffice_project/20$Build-2</meta:generator><meta:document-statistic meta:table-count="1" meta:cell-count="87" meta:object-count="1"/></office:meta>
+ <office:meta><meta:creation-date>2022-08-10T10:58:31.260183427</meta:creation-date><dc:date>2022-08-19T13:56:37.618632316</dc:date><meta:editing-duration>PT6H17M10S</meta:editing-duration><meta:editing-cycles>80</meta:editing-cycles><meta:generator>LibreOffice/7.2.7.2$Linux_X86_64 LibreOffice_project/20$Build-2</meta:generator><meta:document-statistic meta:table-count="1" meta:cell-count="85" meta:object-count="1"/></office:meta>
  <office:settings>
   <config:config-item-set config:name="ooo:view-settings">
-   <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
+   <config:config-item config:name="VisibleAreaTop" config:type="int">199</config:config-item>
    <config:config-item config:name="VisibleAreaLeft" config:type="int">199</config:config-item>
-   <config:config-item config:name="VisibleAreaWidth" config:type="int">21856</config:config-item>
-   <config:config-item config:name="VisibleAreaHeight" config:type="int">27042</config:config-item>
+   <config:config-item config:name="VisibleAreaWidth" config:type="int">23677</config:config-item>
+   <config:config-item config:name="VisibleAreaHeight" config:type="int">28792</config:config-item>
    <config:config-item-map-indexed config:name="Views">
     <config:config-item-map-entry>
      <config:config-item config:name="ViewId" config:type="string">view1</config:config-item>
      <config:config-item-map-named config:name="Tables">
       <config:config-item-map-entry config:name="Hoja1">
-       <config:config-item config:name="CursorPositionX" config:type="int">0</config:config-item>
-       <config:config-item config:name="CursorPositionY" config:type="int">0</config:config-item>
+       <config:config-item config:name="CursorPositionX" config:type="int">1</config:config-item>
+       <config:config-item config:name="CursorPositionY" config:type="int">26</config:config-item>
        <config:config-item config:name="HorizontalSplitMode" config:type="short">0</config:config-item>
        <config:config-item config:name="VerticalSplitMode" config:type="short">0</config:config-item>
        <config:config-item config:name="HorizontalSplitPosition" config:type="int">0</config:config-item>
@@ -23,10 +23,10 @@
        <config:config-item config:name="PositionLeft" config:type="int">0</config:config-item>
        <config:config-item config:name="PositionRight" config:type="int">0</config:config-item>
        <config:config-item config:name="PositionTop" config:type="int">0</config:config-item>
-       <config:config-item config:name="PositionBottom" config:type="int">40</config:config-item>
+       <config:config-item config:name="PositionBottom" config:type="int">19</config:config-item>
        <config:config-item config:name="ZoomType" config:type="short">0</config:config-item>
        <config:config-item config:name="ZoomValue" config:type="int">180</config:config-item>
-       <config:config-item config:name="PageViewZoomValue" config:type="int">60</config:config-item>
+       <config:config-item config:name="PageViewZoomValue" config:type="int">180</config:config-item>
        <config:config-item config:name="ShowGrid" config:type="boolean">true</config:config-item>
        <config:config-item config:name="AnchoredTextOverflowLegacy" config:type="boolean">false</config:config-item>
       </config:config-item-map-entry>
@@ -35,8 +35,8 @@
      <config:config-item config:name="HorizontalScrollbarWidth" config:type="int">1845</config:config-item>
      <config:config-item config:name="ZoomType" config:type="short">0</config:config-item>
      <config:config-item config:name="ZoomValue" config:type="int">180</config:config-item>
-     <config:config-item config:name="PageViewZoomValue" config:type="int">60</config:config-item>
-     <config:config-item config:name="ShowPageBreakPreview" config:type="boolean">false</config:config-item>
+     <config:config-item config:name="PageViewZoomValue" config:type="int">180</config:config-item>
+     <config:config-item config:name="ShowPageBreakPreview" config:type="boolean">true</config:config-item>
      <config:config-item config:name="ShowZeroValues" config:type="boolean">true</config:config-item>
      <config:config-item config:name="ShowNotes" config:type="boolean">true</config:config-item>
      <config:config-item config:name="ShowGrid" config:type="boolean">true</config:config-item>
@@ -95,7 +95,7 @@
    <config:config-item config:name="LoadReadonly" config:type="boolean">false</config:config-item>
    <config:config-item config:name="PrinterName" config:type="string">Generic Printer</config:config-item>
    <config:config-item config:name="PrinterPaperFromSetup" config:type="boolean">false</config:config-item>
-   <config:config-item config:name="PrinterSetup" config:type="base64Binary">pAH+/0dlbmVyaWMgUHJpbnRlcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAU0dFTlBSVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWAAMAxQAAAAAAAAAIAFZUAAAkbQAASm9iRGF0YSAxCnByaW50ZXI9R2VuZXJpYyBQcmludGVyCm9yaWVudGF0aW9uPVBvcnRyYWl0CmNvcGllcz0xCmNvbGxhdGU9ZmFsc2UKbWFyZ2luYWRqdXN0bWVudD0wLDAsMCwwCmNvbG9yZGVwdGg9MjQKcHNsZXZlbD0wCnBkZmRldmljZT0xCmNvbG9yZGV2aWNlPTAKUFBEQ29udGV4dERhdGEKUGFnZVNpemU6TGV0dGVyAER1cGxleDpOb25lAAASAENPTVBBVF9EVVBMRVhfTU9ERQ8ARHVwbGV4TW9kZTo6T2Zm</config:config-item>
+   <config:config-item config:name="PrinterSetup" config:type="base64Binary">pAH+/0dlbmVyaWMgUHJpbnRlcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAU0dFTlBSVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWAAMAxQAAAAAAAAAIAFZUAAAkbQAASm9iRGF0YSAxCnByaW50ZXI9R2VuZXJpYyBQcmludGVyCm9yaWVudGF0aW9uPVBvcnRyYWl0CmNvcGllcz0xCmNvbGxhdGU9ZmFsc2UKbWFyZ2luYWRqdXN0bWVudD0wLDAsMCwwCmNvbG9yZGVwdGg9MjQKcHNsZXZlbD0wCnBkZmRldmljZT0xCmNvbG9yZGV2aWNlPTAKUFBEQ29udGV4dERhdGEKRHVwbGV4Ok5vbmUAUGFnZVNpemU6TGV0dGVyAAASAENPTVBBVF9EVVBMRVhfTU9ERQ8ARHVwbGV4TW9kZTo6T2Zm</config:config-item>
    <config:config-item config:name="RasterIsVisible" config:type="boolean">false</config:config-item>
    <config:config-item config:name="RasterResolutionX" config:type="int">1000</config:config-item>
    <config:config-item config:name="RasterResolutionY" config:type="int">1000</config:config-item>
@@ -590,7 +590,7 @@
    <style:table-column-properties fo:break-before="auto" style:column-width="0.199cm"/>
   </style:style>
   <style:style style:name="co2" style:family="table-column">
-   <style:table-column-properties fo:break-before="auto" style:column-width="4.325cm"/>
+   <style:table-column-properties fo:break-before="auto" style:column-width="6.249cm"/>
   </style:style>
   <style:style style:name="co3" style:family="table-column">
    <style:table-column-properties fo:break-before="auto" style:column-width="0.499cm"/>
@@ -602,12 +602,9 @@
    <style:table-column-properties fo:break-before="auto" style:column-width="3.836cm"/>
   </style:style>
   <style:style style:name="co6" style:family="table-column">
-   <style:table-column-properties fo:break-before="auto" style:column-width="2.362cm"/>
-  </style:style>
-  <style:style style:name="co7" style:family="table-column">
    <style:table-column-properties fo:break-before="auto" style:column-width="4.059cm"/>
   </style:style>
-  <style:style style:name="co8" style:family="table-column">
+  <style:style style:name="co7" style:family="table-column">
    <style:table-column-properties fo:break-before="auto" style:column-width="5.278cm"/>
   </style:style>
   <style:style style:name="ro1" style:family="table-row">
@@ -617,15 +614,18 @@
    <style:table-row-properties style:row-height="0.452cm" fo:break-before="auto" style:use-optimal-row-height="true"/>
   </style:style>
   <style:style style:name="ro3" style:family="table-row">
-   <style:table-row-properties style:row-height="0.628cm" fo:break-before="auto" style:use-optimal-row-height="true"/>
+   <style:table-row-properties style:row-height="0.614cm" fo:break-before="auto" style:use-optimal-row-height="true"/>
   </style:style>
   <style:style style:name="ro4" style:family="table-row">
    <style:table-row-properties style:row-height="0.526cm" fo:break-before="auto" style:use-optimal-row-height="true"/>
   </style:style>
   <style:style style:name="ro5" style:family="table-row">
-   <style:table-row-properties style:row-height="0.499cm" fo:break-before="auto" style:use-optimal-row-height="false"/>
+   <style:table-row-properties style:row-height="0.54cm" fo:break-before="auto" style:use-optimal-row-height="true"/>
   </style:style>
   <style:style style:name="ro6" style:family="table-row">
+   <style:table-row-properties style:row-height="0.499cm" fo:break-before="auto" style:use-optimal-row-height="false"/>
+  </style:style>
+  <style:style style:name="ro7" style:family="table-row">
    <style:table-row-properties style:row-height="0.529cm" fo:break-before="auto" style:use-optimal-row-height="true"/>
   </style:style>
   <style:style style:name="ta1" style:family="table" style:master-page-name="Default">
@@ -769,10 +769,15 @@
    <style:text-properties style:font-name="Open Sans Condensed" fo:font-size="12pt" fo:font-weight="bold" style:font-size-asian="12pt" style:font-weight-asian="bold" style:font-size-complex="12pt" style:font-weight-complex="bold"/>
   </style:style>
   <style:style style:name="ce44" style:family="table-cell" style:parent-style-name="Default">
+   <style:table-cell-properties fo:background-color="#eeeeee" style:text-align-source="fix" style:repeat-content="false" fo:wrap-option="wrap" fo:border="0.06pt solid #000000" style:vertical-align="middle"/>
+   <style:paragraph-properties fo:text-align="start" fo:margin-left="0cm"/>
+   <style:text-properties style:font-name="Open Sans Condensed1" fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
+  </style:style>
+  <style:style style:name="ce46" style:family="table-cell" style:parent-style-name="Default">
    <style:table-cell-properties fo:border="none"/>
    <style:text-properties style:font-name="Open Sans Condensed1"/>
   </style:style>
-  <style:style style:name="ce46" style:family="table-cell" style:parent-style-name="Default">
+  <style:style style:name="ce49" style:family="table-cell" style:parent-style-name="Default">
    <style:text-properties style:font-name="Cantarell"/>
   </style:style>
   <style:style style:name="ce59" style:family="table-cell" style:parent-style-name="Default">
@@ -784,7 +789,7 @@
    <style:paragraph-properties fo:text-align="center"/>
    <style:text-properties style:use-window-font-color="true" style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" style:font-name="Open Sans Condensed1" fo:font-size="12pt" fo:language="es" fo:country="ES" fo:font-style="normal" fo:text-shadow="none" style:text-underline-style="none" fo:font-weight="bold" style:text-underline-mode="continuous" style:text-overline-mode="continuous" style:text-line-through-mode="continuous" style:font-name-asian="Arial1" style:font-size-asian="12pt" style:language-asian="en" style:country-asian="US" style:font-style-asian="normal" style:font-weight-asian="bold" style:font-name-complex="Arial2" style:font-size-complex="12pt" style:language-complex="ar" style:country-complex="SA" style:font-style-complex="normal" style:font-weight-complex="bold" style:text-emphasize="none" style:font-relief="none" style:text-overline-style="none" style:text-overline-color="font-color"/>
   </style:style>
-  <style:style style:name="ce51" style:family="table-cell" style:parent-style-name="Default">
+  <style:style style:name="ce55" style:family="table-cell" style:parent-style-name="Default">
    <style:table-cell-properties style:text-align-source="fix" style:repeat-content="false" fo:border="0.06pt solid #000000" style:vertical-align="middle"/>
    <style:paragraph-properties fo:text-align="center"/>
    <style:text-properties style:use-window-font-color="true" style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" style:font-name="Open Sans Condensed1" fo:font-size="10pt" fo:language="es" fo:country="CO" fo:font-style="normal" fo:text-shadow="none" style:text-underline-style="none" fo:font-weight="normal" style:text-underline-mode="continuous" style:text-overline-mode="continuous" style:text-line-through-mode="continuous" style:font-name-asian="DejaVu Sans1" style:font-size-asian="10pt" style:language-asian="zh" style:country-asian="CN" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-name-complex="DejaVu Sans1" style:font-size-complex="10pt" style:language-complex="hi" style:country-complex="IN" style:font-style-complex="normal" style:font-weight-complex="normal" style:text-emphasize="none" style:font-relief="none" style:text-overline-style="none" style:text-overline-color="font-color"/>
@@ -809,6 +814,11 @@
    <style:paragraph-properties fo:text-align="start" fo:margin-left="0cm"/>
    <style:text-properties style:font-name="Open Sans Condensed" fo:font-size="10pt" fo:font-weight="normal" style:font-size-asian="10pt" style:font-weight-asian="normal" style:font-size-complex="10pt" style:font-weight-complex="normal"/>
   </style:style>
+  <style:style style:name="ce61" style:family="table-cell" style:parent-style-name="Default">
+   <style:table-cell-properties style:text-align-source="fix" style:repeat-content="false" fo:wrap-option="wrap" fo:border="0.06pt solid #000000" style:vertical-align="middle"/>
+   <style:paragraph-properties fo:text-align="start" fo:margin-left="0cm"/>
+   <style:text-properties style:font-name="Open Sans Condensed1" fo:font-size="10pt" style:font-size-asian="10pt" style:font-size-complex="10pt"/>
+  </style:style>
   <style:style style:name="ce63" style:family="table-cell" style:parent-style-name="Default">
    <style:table-cell-properties fo:background-color="#00b050" style:diagonal-bl-tr="none" style:diagonal-tl-br="none" style:text-align-source="fix" style:repeat-content="false" fo:wrap-option="no-wrap" fo:border="0.06pt solid #000000" style:direction="ltr" style:rotation-angle="0" style:rotation-align="none" style:shrink-to-fit="false" style:vertical-align="middle" loext:vertical-justify="auto"/>
    <style:paragraph-properties fo:text-align="start" css3t:text-justify="auto" fo:margin-left="0cm" style:writing-mode="page"/>
@@ -824,27 +834,22 @@
    <style:paragraph-properties fo:text-align="center"/>
    <style:text-properties style:font-name="Open Sans Condensed1" fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
   </style:style>
-  <style:style style:name="ce64" style:family="table-cell" style:parent-style-name="Default">
+  <style:style style:name="ce66" style:family="table-cell" style:parent-style-name="Default">
    <style:table-cell-properties style:text-align-source="fix" style:repeat-content="false" fo:border="0.06pt solid #000000" style:vertical-align="middle"/>
    <style:paragraph-properties fo:text-align="start" fo:margin-left="0cm"/>
    <style:text-properties style:font-name="Open Sans Condensed1" fo:font-weight="normal" style:font-weight-asian="normal" style:font-weight-complex="normal"/>
   </style:style>
-  <style:style style:name="ce65" style:family="table-cell" style:parent-style-name="Default">
-   <style:table-cell-properties style:text-align-source="fix" style:repeat-content="false" fo:border="0.06pt solid #000000" style:vertical-align="middle"/>
-   <style:paragraph-properties fo:text-align="start" fo:margin-left="0cm"/>
-   <style:text-properties style:font-name="Open Sans Condensed"/>
-  </style:style>
-  <style:style style:name="ce79" style:family="table-cell" style:parent-style-name="Default">
-   <style:table-cell-properties style:text-align-source="fix" style:repeat-content="false" fo:border="0.06pt solid #000000" style:vertical-align="middle"/>
-   <style:paragraph-properties fo:text-align="center" fo:margin-left="0cm"/>
-   <style:text-properties style:font-name="Open Sans Condensed"/>
-  </style:style>
   <style:style style:name="ce72" style:family="table-cell" style:parent-style-name="Default">
    <style:table-cell-properties style:text-align-source="fix" style:repeat-content="false" fo:border="0.06pt solid #000000" style:vertical-align="middle"/>
    <style:paragraph-properties fo:text-align="start" fo:margin-left="0cm"/>
    <style:text-properties style:font-name="Open Sans Condensed1"/>
   </style:style>
   <style:style style:name="ce74" style:family="table-cell" style:parent-style-name="Default">
+   <style:table-cell-properties style:text-align-source="fix" style:repeat-content="false" fo:border="0.06pt solid #000000" style:vertical-align="middle"/>
+   <style:paragraph-properties fo:text-align="start" fo:margin-left="0cm"/>
+   <style:text-properties style:font-name="Open Sans Condensed"/>
+  </style:style>
+  <style:style style:name="ce76" style:family="table-cell" style:parent-style-name="Default">
    <style:table-cell-properties style:text-align-source="fix" style:repeat-content="false" fo:background-color="transparent" fo:border="0.06pt solid #000000" style:vertical-align="middle"/>
    <style:paragraph-properties fo:text-align="start" fo:margin-left="0cm"/>
    <style:text-properties style:font-name="Open Sans Condensed1"/>
@@ -854,7 +859,7 @@
    <style:paragraph-properties fo:text-align="center"/>
    <style:text-properties style:font-name="Open Sans Condensed" fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
   </style:style>
-  <style:style style:name="ce77" style:family="table-cell" style:parent-style-name="Default">
+  <style:style style:name="ce80" style:family="table-cell" style:parent-style-name="Default">
    <style:table-cell-properties fo:border="none"/>
    <style:text-properties style:font-name="Cantarell"/>
   </style:style>
@@ -876,17 +881,22 @@
    <style:paragraph-properties fo:text-align="center"/>
    <style:text-properties style:font-name="Open Sans Condensed" fo:font-size="10pt" fo:font-weight="normal" style:font-size-asian="10pt" style:font-weight-asian="normal" style:font-size-complex="10pt" style:font-weight-complex="normal"/>
   </style:style>
-  <style:style style:name="ce85" style:family="table-cell" style:parent-style-name="Default">
+  <style:style style:name="ce86" style:family="table-cell" style:parent-style-name="Default">
+   <style:table-cell-properties style:text-align-source="fix" style:repeat-content="false" fo:wrap-option="wrap" fo:border="0.06pt solid #000000" style:vertical-align="middle"/>
+   <style:paragraph-properties fo:text-align="center"/>
+   <style:text-properties style:font-name="Open Sans Condensed1" fo:font-size="10pt" style:font-size-asian="10pt" style:font-size-complex="10pt"/>
+  </style:style>
+  <style:style style:name="ce88" style:family="table-cell" style:parent-style-name="Default">
    <style:table-cell-properties style:text-align-source="fix" style:repeat-content="false" fo:border="0.06pt solid #000000" style:vertical-align="middle"/>
    <style:paragraph-properties fo:text-align="center"/>
    <style:text-properties style:font-name="Open Sans Condensed1" fo:font-size="10pt" style:font-size-asian="10pt" style:font-size-complex="10pt"/>
   </style:style>
-  <style:style style:name="ce86" style:family="table-cell" style:parent-style-name="Default">
+  <style:style style:name="ce89" style:family="table-cell" style:parent-style-name="Default">
    <style:table-cell-properties style:text-align-source="fix" style:repeat-content="false" fo:wrap-option="wrap" fo:border="0.06pt solid #000000" style:vertical-align="middle"/>
    <style:paragraph-properties fo:text-align="start" fo:margin-left="0cm"/>
    <style:text-properties style:font-name="Open Sans Condensed1"/>
   </style:style>
-  <style:style style:name="ce88" style:family="table-cell" style:parent-style-name="Default">
+  <style:style style:name="ce90" style:family="table-cell" style:parent-style-name="Default">
    <style:table-cell-properties style:text-align-source="fix" style:repeat-content="false"/>
    <style:paragraph-properties fo:text-align="start" fo:margin-left="0cm"/>
   </style:style>
@@ -916,6 +926,10 @@
    <style:table-cell-properties fo:wrap-option="wrap" fo:border="0.06pt solid #000000"/>
    <style:text-properties style:font-name="Open Sans Condensed" fo:font-size="10pt" fo:font-weight="normal" style:font-size-asian="10pt" style:font-weight-asian="normal" style:font-size-complex="10pt" style:font-weight-complex="normal"/>
   </style:style>
+  <style:style style:name="ce100" style:family="table-cell" style:parent-style-name="Default">
+   <style:table-cell-properties fo:border="0.06pt solid #000000"/>
+   <style:text-properties style:font-name="Open Sans Condensed1" fo:font-size="10pt" style:font-size-asian="10pt" style:font-size-complex="10pt"/>
+  </style:style>
   <style:style style:name="ce94" style:family="table-cell" style:parent-style-name="Default" style:data-style-name="N104">
    <style:table-cell-properties fo:background-color="#ffffff" style:diagonal-bl-tr="none" style:diagonal-tl-br="none" style:text-align-source="fix" style:repeat-content="false" fo:wrap-option="no-wrap" fo:border="0.06pt solid #00b050" style:direction="ltr" style:rotation-angle="0" style:rotation-align="none" style:shrink-to-fit="false" style:vertical-align="middle" loext:vertical-justify="auto"/>
    <style:paragraph-properties fo:text-align="start" css3t:text-justify="auto" fo:margin-left="0cm" style:writing-mode="page"/>
@@ -925,6 +939,11 @@
    <style:table-cell-properties fo:border="0.06pt solid #000000"/>
    <style:text-properties style:font-name="Open Sans Condensed1" fo:font-size="10pt" style:font-size-asian="10pt" style:font-size-complex="10pt"/>
   </style:style>
+  <style:style style:name="ce107" style:family="table-cell" style:parent-style-name="Default">
+   <style:table-cell-properties style:text-align-source="fix" style:repeat-content="false" fo:wrap-option="wrap" fo:border="0.06pt solid #000000"/>
+   <style:paragraph-properties fo:text-align="start" fo:margin-left="0cm"/>
+   <style:text-properties style:font-name="Open Sans Condensed1"/>
+  </style:style>
   <style:style style:name="ce96" style:family="table-cell" style:parent-style-name="Default">
    <style:table-cell-properties style:text-align-source="fix" style:repeat-content="false" fo:wrap-option="wrap" fo:border="0.06pt solid #000000"/>
    <style:paragraph-properties fo:text-align="start" fo:margin-left="0cm"/>
@@ -969,11 +988,6 @@
    <style:paragraph-properties fo:text-align="start" fo:margin-left="0cm"/>
    <style:text-properties style:font-name="Open Sans Condensed1" fo:font-weight="normal" style:font-weight-asian="normal" style:font-weight-complex="normal"/>
   </style:style>
-  <style:style style:name="ce126" style:family="table-cell" style:parent-style-name="Default">
-   <style:table-cell-properties fo:background-color="#eeeeee" style:text-align-source="fix" style:repeat-content="false" fo:border="none" style:vertical-align="middle"/>
-   <style:paragraph-properties fo:text-align="center"/>
-   <style:text-properties style:font-name="Open Sans Condensed1" fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
-  </style:style>
   <style:style style:name="ce47" style:family="table-cell" style:parent-style-name="Default">
    <style:text-properties style:font-name="Open Sans Condensed1" fo:font-size="10pt" style:font-size-asian="10pt" style:font-size-complex="10pt"/>
   </style:style>
@@ -990,11 +1004,6 @@
    <style:table-cell-properties fo:background-color="transparent" fo:border="0.06pt solid #000000"/>
    <style:text-properties style:font-name="Open Sans Condensed1" fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
   </style:style>
-  <style:style style:name="ce131" style:family="table-cell" style:parent-style-name="Default">
-   <style:table-cell-properties style:text-align-source="fix" style:repeat-content="false" fo:wrap-option="wrap" fo:border="0.06pt solid #000000" style:vertical-align="middle"/>
-   <style:paragraph-properties fo:text-align="start" fo:margin-left="0cm"/>
-   <style:text-properties style:font-name="Open Sans Condensed1" fo:font-size="10pt" style:font-size-asian="10pt" style:font-size-complex="10pt"/>
-  </style:style>
   <style:style style:name="ce134" style:family="table-cell" style:parent-style-name="Default">
    <style:table-cell-properties style:text-align-source="value-type" style:repeat-content="false" fo:wrap-option="wrap" fo:border="0.06pt solid #000000" style:vertical-align="middle"/>
    <style:paragraph-properties fo:margin-left="0cm"/>
@@ -1005,12 +1014,17 @@
    <style:paragraph-properties fo:text-align="center" fo:margin-left="0cm"/>
    <style:text-properties style:font-name="Open Sans Condensed1"/>
   </style:style>
+  <style:style style:name="ce140" style:family="table-cell" style:parent-style-name="Default">
+   <style:table-cell-properties style:text-align-source="fix" style:repeat-content="false" fo:background-color="transparent" fo:border="none" style:vertical-align="middle"/>
+   <style:paragraph-properties fo:text-align="center"/>
+   <style:text-properties style:font-name="Open Sans Condensed1"/>
+  </style:style>
   <style:style style:name="ce109" style:family="table-cell" style:parent-style-name="Default">
    <style:table-cell-properties style:text-align-source="fix" style:repeat-content="false" fo:wrap-option="wrap" fo:border="0.06pt solid #000000" style:vertical-align="middle"/>
    <style:paragraph-properties fo:text-align="center"/>
    <style:text-properties style:font-name="Open Sans Condensed1" fo:font-size="10pt" style:font-size-asian="10pt" style:font-size-complex="10pt"/>
   </style:style>
-  <style:style style:name="ce138" style:family="table-cell" style:parent-style-name="Default">
+  <style:style style:name="ce145" style:family="table-cell" style:parent-style-name="Default">
    <style:table-cell-properties style:text-align-source="fix" style:repeat-content="false" fo:border="none" style:vertical-align="middle"/>
    <style:paragraph-properties fo:text-align="start" fo:margin-left="0cm"/>
    <style:text-properties style:font-name="Open Sans Condensed1"/>
@@ -1025,7 +1039,7 @@
    <style:paragraph-properties fo:text-align="start" fo:margin-left="0cm"/>
    <style:text-properties style:font-name="Open Sans Condensed1" fo:font-size="10pt" style:font-size-asian="10pt" style:font-size-complex="10pt"/>
   </style:style>
-  <style:style style:name="ce145" style:family="table-cell" style:parent-style-name="Default">
+  <style:style style:name="ce148" style:family="table-cell" style:parent-style-name="Default">
    <style:table-cell-properties style:text-align-source="fix" style:repeat-content="false" fo:border="none"/>
    <style:paragraph-properties fo:text-align="start" fo:margin-left="0cm"/>
    <style:text-properties style:font-name="Open Sans Condensed1"/>
@@ -1050,7 +1064,7 @@
    <style:paragraph-properties fo:text-align="center"/>
   </style:style>
   <style:page-layout style:name="pm1">
-   <style:page-layout-properties fo:margin-top="1cm" fo:margin-bottom="1cm" fo:margin-left="0.64cm" fo:margin-right="0.64cm" style:scale-to="90%" style:table-centering="horizontal" style:writing-mode="lr-tb"/>
+   <style:page-layout-properties fo:margin-top="1cm" fo:margin-bottom="1cm" fo:margin-left="0.64cm" fo:margin-right="0.64cm" style:scale-to="73%" style:table-centering="horizontal" style:writing-mode="lr-tb"/>
    <style:header-style>
     <style:header-footer-properties fo:min-height="0.499cm" fo:margin-left="0cm" fo:margin-right="0cm" fo:margin-bottom="0cm"/>
    </style:header-style>
@@ -1122,7 +1136,7 @@
      <text:p><text:sheet-name>???</text:sheet-name><text:s/>(<text:title>???</text:title>)</text:p>
     </style:region-left>
     <style:region-right>
-     <text:p><text:date style:data-style-name="N2" text:date-value="2022-08-15">00/00/0000</text:date>, <text:time style:data-style-name="N2" text:time-value="13:50:03.204048443">00:00:00</text:time></text:p>
+     <text:p><text:date style:data-style-name="N2" text:date-value="2022-08-19">00/00/0000</text:date>, <text:time style:data-style-name="N2" text:time-value="13:29:04.405191886">00:00:00</text:time></text:p>
     </style:region-right>
    </style:header>
    <style:header-left style:display="false"/>
@@ -1138,13 +1152,13 @@
   <office:spreadsheet>
    <table:calculation-settings table:automatic-find-labels="false" table:use-regular-expressions="false" table:use-wildcards="true"/>
    <table:content-validations>
-    <table:content-validation table:name="val1" table:base-cell-address="Hoja1.L8">
+    <table:content-validation table:name="val1" table:base-cell-address="Hoja1.L10">
      <table:error-message table:message-type="stop" table:display="true"/>
     </table:content-validation>
    </table:content-validations>
-   <table:table table:name="Hoja1" table:style-name="ta1" table:print-ranges="Hoja1.A1:Hoja1.L59">
+   <table:table table:name="Hoja1" table:style-name="ta1" table:print-ranges="Hoja1.A1:Hoja1.L61">
     <table:shapes>
-     <draw:frame draw:z-index="0" draw:name="Imagen 1" draw:style-name="gr1" draw:text-style-name="P1" svg:width="4.899cm" svg:height="1.257cm" svg:x="0.474cm" svg:y="0.254cm">
+     <draw:frame draw:z-index="0" draw:name="Imagen 1" draw:style-name="gr1" draw:text-style-name="P1" svg:width="4.899cm" svg:height="1.257cm" svg:x="1.439cm" svg:y="0.64cm">
       <draw:image draw:mime-type="image/jpeg">
        <office:binary-data>/9j/4AAQSkZJRgABAQEAYABgAAD/2wBDAAMCAgMCAgMDAwMEAwMEBQgFBQQEBQoHBwYIDAoM
         DAsKCwsNDhIQDQ4RDgsLEBYQERMUFRUVDA8XGBYUGBIUFRT/2wBDAQMEBAUEBQkFBQkUDQsN
@@ -1675,33 +1689,38 @@
       </draw:image>
      </draw:frame></table:shapes>
     <table:table-column table:style-name="co1" table:default-cell-style-name="ce2"/>
-    <table:table-column table:style-name="co2" table:default-cell-style-name="ce46"/>
+    <table:table-column table:style-name="co2" table:default-cell-style-name="ce28"/>
+    <table:table-column table:style-name="co3" table:number-columns-repeated="2" table:default-cell-style-name="ce49"/>
+    <table:table-column table:style-name="co4" table:visibility="collapse" table:default-cell-style-name="ce49"/>
+    <table:table-column table:style-name="co5" table:default-cell-style-name="ce49"/>
+    <table:table-column table:style-name="co4" table:default-cell-style-name="ce46"/>
+    <table:table-column table:style-name="co6" table:default-cell-style-name="ce46"/>
     <table:table-column table:style-name="co3" table:number-columns-repeated="2" table:default-cell-style-name="ce46"/>
-    <table:table-column table:style-name="co4" table:visibility="collapse" table:default-cell-style-name="ce46"/>
-    <table:table-column table:style-name="co5" table:default-cell-style-name="ce46"/>
-    <table:table-column table:style-name="co6" table:default-cell-style-name="ce44"/>
-    <table:table-column table:style-name="co7" table:default-cell-style-name="ce44"/>
-    <table:table-column table:style-name="co3" table:number-columns-repeated="2" table:default-cell-style-name="ce46"/>
-    <table:table-column table:style-name="co8" table:default-cell-style-name="ce46"/>
+    <table:table-column table:style-name="co7" table:default-cell-style-name="ce46"/>
     <table:table-column table:style-name="co1" table:default-cell-style-name="ce2"/>
     <table:table-column table:style-name="co4" table:number-columns-repeated="8" table:default-cell-style-name="Default"/>
+    <table:table-row table:style-name="ro1">
+     <table:table-cell table:style-name="ce1"/>
+     <table:table-cell table:style-name="Default" table:number-columns-repeated="10"/>
+     <table:table-cell table:style-name="ce1"/>
+     <table:table-cell table:number-columns-repeated="8"/>
+    </table:table-row>
     <table:table-row table:style-name="ro1">
      <table:table-cell table:style-name="ce1"/>
      <table:table-cell table:style-name="ce14" office:value-type="string" calcext:value-type="string" table:number-columns-spanned="10" table:number-rows-spanned="1"><text:p><text:a xlink:href="relatorio://for%20each=%22equipment%20in%20records%22" xlink:type="simple">for each=&quot;equipment in records&quot;</text:a></text:p>
      </table:table-cell>
      <table:covered-table-cell table:style-name="ce52"/>
-     <table:covered-table-cell table:number-columns-repeated="3" table:style-name="ce44"/>
-     <table:covered-table-cell table:number-columns-repeated="2"/>
-     <table:covered-table-cell table:number-columns-repeated="3" table:style-name="ce44"/>
+     <table:covered-table-cell table:number-columns-repeated="3" table:style-name="ce46"/>
+     <table:covered-table-cell table:number-columns-repeated="5"/>
      <table:table-cell table:style-name="ce1"/>
      <table:table-cell table:number-columns-repeated="8"/>
     </table:table-row>
     <table:table-row table:style-name="ro2">
      <table:table-cell/>
-     <table:table-cell table:style-name="ce6" table:number-columns-spanned="4" table:number-rows-spanned="3"/>
+     <table:table-cell table:style-name="ce6" table:number-columns-spanned="4" table:number-rows-spanned="4"/>
      <table:covered-table-cell table:style-name="ce6"/>
      <table:covered-table-cell table:number-columns-repeated="2" table:style-name="ce7"/>
-     <table:table-cell table:style-name="ce51" table:number-columns-spanned="6" table:number-rows-spanned="3"/>
+     <table:table-cell table:style-name="ce55" table:number-columns-spanned="6" table:number-rows-spanned="4"/>
      <table:covered-table-cell table:number-columns-repeated="3" table:style-name="ce33"/>
      <table:covered-table-cell table:number-columns-repeated="2" table:style-name="ce7"/>
      <table:table-cell table:style-name="ce1"/>
@@ -1717,6 +1736,11 @@
      <table:covered-table-cell table:number-columns-repeated="10" table:style-name="ce7"/>
      <table:table-cell table:number-columns-repeated="9"/>
     </table:table-row>
+    <table:table-row table:style-name="ro2">
+     <table:table-cell/>
+     <table:covered-table-cell table:number-columns-repeated="10" table:style-name="ce7"/>
+     <table:table-cell table:number-columns-repeated="9"/>
+    </table:table-row>
     <table:table-row table:style-name="ro2">
      <table:table-cell/>
      <table:table-cell table:style-name="ce8" table:number-columns-spanned="10" table:number-rows-spanned="1"/>
@@ -1729,18 +1753,16 @@
      <table:table-cell table:style-name="ce11" office:value-type="string" calcext:value-type="string" table:number-columns-spanned="10" table:number-rows-spanned="1"><text:p><text:span text:style-name="T1">HOJA</text:span><text:span text:style-name="T2"> </text:span><text:span text:style-name="T1">DE</text:span><text:span text:style-name="T3"> </text:span><text:span text:style-name="T1">VIDA</text:span><text:span text:style-name="T4"> </text:span><text:span text:style-name="T1">DISPOSITIVOS</text:span><text:span text:style-name="T5"> </text:span><text:span text:style-name="T1">BIOMEDICOS</text:span></text:p>
      </table:table-cell>
      <table:covered-table-cell table:style-name="ce52"/>
-     <table:covered-table-cell table:number-columns-repeated="3" table:style-name="ce44"/>
-     <table:covered-table-cell table:number-columns-repeated="2"/>
-     <table:covered-table-cell table:number-columns-repeated="3" table:style-name="ce44"/>
+     <table:covered-table-cell table:number-columns-repeated="3" table:style-name="ce46"/>
+     <table:covered-table-cell table:number-columns-repeated="5"/>
      <table:table-cell table:number-columns-repeated="9"/>
     </table:table-row>
     <table:table-row table:style-name="ro2">
      <table:table-cell/>
      <table:table-cell table:style-name="ce14" table:number-columns-spanned="10" table:number-rows-spanned="1"/>
      <table:covered-table-cell table:style-name="ce52"/>
-     <table:covered-table-cell table:number-columns-repeated="3" table:style-name="ce44"/>
-     <table:covered-table-cell table:number-columns-repeated="2"/>
-     <table:covered-table-cell table:number-columns-repeated="3" table:style-name="ce44"/>
+     <table:covered-table-cell table:number-columns-repeated="3" table:style-name="ce46"/>
+     <table:covered-table-cell table:number-columns-repeated="5"/>
      <table:table-cell table:number-columns-repeated="9"/>
     </table:table-row>
     <table:table-row table:style-name="ro4">
@@ -1748,14 +1770,14 @@
      <table:table-cell table:style-name="ce15" office:value-type="string" calcext:value-type="string">
       <text:p>Código Equipo</text:p>
      </table:table-cell>
-     <table:table-cell table:style-name="ce51" office:value-type="string" calcext:value-type="string" table:number-columns-spanned="4" table:number-rows-spanned="1"><text:p><text:span text:style-name="T9"><text:a xlink:href="relatorio://equipment.code" xlink:type="simple">equipment.code</text:a></text:span></text:p>
+     <table:table-cell table:style-name="ce55" office:value-type="string" calcext:value-type="string" table:number-columns-spanned="4" table:number-rows-spanned="1"><text:p><text:span text:style-name="T9"><text:a xlink:href="relatorio://equipment.code" xlink:type="simple">equipment.code</text:a></text:span></text:p>
      </table:table-cell>
      <table:covered-table-cell table:number-columns-repeated="3" table:style-name="ce33"/>
      <table:table-cell table:style-name="ce13" office:value-type="string" calcext:value-type="string" table:number-columns-spanned="2" table:number-rows-spanned="1">
       <text:p>Salida de Equipo</text:p>
      </table:table-cell>
      <table:covered-table-cell table:style-name="ce47"/>
-     <table:table-cell table:style-name="ce85" table:number-columns-spanned="3" table:number-rows-spanned="1"/>
+     <table:table-cell table:style-name="ce88" table:number-columns-spanned="3" table:number-rows-spanned="1"/>
      <table:covered-table-cell table:number-columns-repeated="2" table:style-name="ce112"/>
      <table:table-cell table:number-columns-repeated="9"/>
     </table:table-row>
@@ -1763,9 +1785,8 @@
      <table:table-cell/>
      <table:table-cell table:style-name="ce12" table:number-columns-spanned="10" table:number-rows-spanned="1"/>
      <table:covered-table-cell table:style-name="ce12"/>
-     <table:covered-table-cell table:number-columns-repeated="3" table:style-name="ce44"/>
-     <table:covered-table-cell table:number-columns-repeated="2"/>
-     <table:covered-table-cell table:number-columns-repeated="3" table:style-name="ce44"/>
+     <table:covered-table-cell table:number-columns-repeated="3" table:style-name="ce46"/>
+     <table:covered-table-cell table:number-columns-repeated="5"/>
      <table:table-cell table:number-columns-repeated="9"/>
     </table:table-row>
     <table:table-row table:style-name="ro3">
@@ -1773,9 +1794,8 @@
      <table:table-cell table:style-name="ce11" office:value-type="string" calcext:value-type="string" table:number-columns-spanned="10" table:number-rows-spanned="1"><text:p><text:span text:style-name="T6">INFORMACION</text:span><text:span text:style-name="T7"> </text:span><text:span text:style-name="T6">DEL</text:span><text:span text:style-name="T8"> </text:span><text:span text:style-name="T6">PROPIETARIO</text:span></text:p>
      </table:table-cell>
      <table:covered-table-cell table:style-name="ce23"/>
-     <table:covered-table-cell table:number-columns-repeated="3" table:style-name="ce44"/>
-     <table:covered-table-cell table:number-columns-repeated="2"/>
-     <table:covered-table-cell table:number-columns-repeated="3" table:style-name="ce44"/>
+     <table:covered-table-cell table:number-columns-repeated="3" table:style-name="ce46"/>
+     <table:covered-table-cell table:number-columns-repeated="5"/>
      <table:table-cell table:number-columns-repeated="9"/>
     </table:table-row>
     <table:table-row table:style-name="ro4">
@@ -1800,9 +1820,9 @@
      <table:table-cell table:style-name="ce19" office:value-type="string" calcext:value-type="string">
       <text:p>Documento:</text:p>
      </table:table-cell>
-     <table:table-cell table:style-name="ce131" office:value-type="string" calcext:value-type="string" table:number-columns-spanned="3" table:number-rows-spanned="1"><text:p><text:a xlink:href="relatorio://equipment.propietary.tax_identifier.code" xlink:type="simple">equipment.propietary.tax_identifier.code</text:a></text:p>
+     <table:table-cell table:style-name="ce61" office:value-type="string" calcext:value-type="string" table:number-columns-spanned="3" table:number-rows-spanned="1"><text:p><text:a xlink:href="relatorio://equipment.propietary.tax_identifier.code" xlink:type="simple">equipment.propietary.tax_identifier.code</text:a></text:p>
      </table:table-cell>
-     <table:covered-table-cell table:style-name="ce131"/>
+     <table:covered-table-cell table:style-name="ce61"/>
      <table:covered-table-cell table:style-name="ce110"/>
      <table:table-cell table:number-columns-repeated="9"/>
     </table:table-row>
@@ -1825,25 +1845,32 @@
      <table:table-cell table:number-columns-repeated="8"/>
      <table:table-cell table:style-name="ce144"/>
     </table:table-row>
-    <table:table-row table:style-name="ro4">
+    <table:table-row table:style-name="ro5">
      <table:table-cell/>
      <table:table-cell table:style-name="ce17" office:value-type="string" calcext:value-type="string">
       <text:p>Dirección:</text:p>
      </table:table-cell>
-     <table:table-cell table:style-name="ce70" office:value-type="string" calcext:value-type="string" table:number-columns-spanned="5" table:number-rows-spanned="1"><text:p><text:a xlink:href="relatorio://equipment.propietary_address.street" xlink:type="simple">equipment.propietary_address.street</text:a></text:p>
+     <table:table-cell table:style-name="ce70" office:value-type="string" calcext:value-type="string" table:number-columns-spanned="9" table:number-rows-spanned="1"><text:p><text:a xlink:href="relatorio://equipment.propietary_address.street" xlink:type="simple">equipment.propietary_address.street</text:a></text:p>
      </table:table-cell>
      <table:covered-table-cell table:style-name="ce71"/>
      <table:covered-table-cell table:number-columns-repeated="3" table:style-name="ce78"/>
+     <table:covered-table-cell table:number-columns-repeated="4" table:style-name="ce7"/>
+     <table:table-cell table:number-columns-repeated="9"/>
+    </table:table-row>
+    <table:table-row table:style-name="ro5">
+     <table:table-cell/>
      <table:table-cell table:style-name="ce17" office:value-type="string" calcext:value-type="string">
       <text:p>Telefono:</text:p>
      </table:table-cell>
-     <table:table-cell table:style-name="ce131" office:value-type="string" calcext:value-type="string" table:number-columns-spanned="3" table:number-rows-spanned="1"><text:p><text:a xlink:href="relatorio://equipment.propietary.phone" xlink:type="simple">equipment.propietary.phone</text:a></text:p>
+     <table:table-cell table:style-name="ce61" office:value-type="string" calcext:value-type="string" table:number-columns-spanned="9" table:number-rows-spanned="1"><text:p><text:a xlink:href="relatorio://equipment.propietary.phone" xlink:type="simple">equipment.propietary.phone</text:a></text:p>
      </table:table-cell>
-     <table:covered-table-cell table:style-name="ce109"/>
-     <table:covered-table-cell table:style-name="ce112"/>
+     <table:covered-table-cell table:style-name="ce86"/>
+     <table:covered-table-cell table:style-name="ce100"/>
+     <table:covered-table-cell table:number-columns-repeated="2" table:style-name="ce78"/>
+     <table:covered-table-cell table:number-columns-repeated="4" table:style-name="ce7"/>
      <table:table-cell table:number-columns-repeated="9"/>
     </table:table-row>
-    <table:table-row table:style-name="ro4" table:visibility="collapse">
+    <table:table-row table:style-name="ro4">
      <table:table-cell/>
      <table:table-cell table:style-name="ce25" office:value-type="string" calcext:value-type="string" table:number-columns-spanned="10" table:number-rows-spanned="1"><text:p><text:a xlink:href="relatorio://choose%20test=%22%22" xlink:type="simple">choose test=&quot;&quot;</text:a></text:p>
      </table:table-cell>
@@ -1852,12 +1879,12 @@
      <table:covered-table-cell table:style-name="ce98"/>
      <table:covered-table-cell table:style-name="ce78"/>
      <table:covered-table-cell table:style-name="ce17"/>
-     <table:covered-table-cell table:style-name="ce131"/>
+     <table:covered-table-cell table:style-name="ce61"/>
      <table:covered-table-cell table:style-name="ce109"/>
      <table:covered-table-cell table:style-name="ce112"/>
      <table:table-cell table:number-columns-repeated="9"/>
     </table:table-row>
-    <table:table-row table:style-name="ro4" table:visibility="collapse">
+    <table:table-row table:style-name="ro4">
      <table:table-cell/>
      <table:table-cell table:style-name="ce31" office:value-type="string" calcext:value-type="string" table:number-columns-spanned="10" table:number-rows-spanned="1"><text:p><text:a xlink:href="relatorio://when%20test=%22equipment.propietary_address.party_related%22" xlink:type="simple">when test=&quot;equipment.propietary_address.party_related&quot;</text:a></text:p>
      </table:table-cell>
@@ -1866,7 +1893,7 @@
      <table:covered-table-cell table:style-name="ce98"/>
      <table:covered-table-cell table:style-name="ce78"/>
      <table:covered-table-cell table:style-name="ce17"/>
-     <table:covered-table-cell table:style-name="ce131"/>
+     <table:covered-table-cell table:style-name="ce61"/>
      <table:covered-table-cell table:style-name="ce109"/>
      <table:covered-table-cell table:style-name="ce112"/>
      <table:table-cell table:number-columns-repeated="9"/>
@@ -1878,7 +1905,7 @@
      </table:table-cell>
      <table:table-cell table:style-name="ce73" office:value-type="string" calcext:value-type="string" table:number-columns-spanned="9" table:number-rows-spanned="1"><text:p><text:a xlink:href="relatorio://equipment.propietary_address.party_related.name" xlink:type="simple">equipment.propietary_address.party_related.name</text:a></text:p>
      </table:table-cell>
-     <table:covered-table-cell table:style-name="ce85"/>
+     <table:covered-table-cell table:style-name="ce88"/>
      <table:covered-table-cell table:style-name="ce112"/>
      <table:covered-table-cell table:style-name="ce118"/>
      <table:covered-table-cell table:number-columns-repeated="5" table:style-name="ce33"/>
@@ -1898,126 +1925,136 @@
      <table:table-cell table:style-name="ce143"/>
      <table:table-cell table:number-columns-repeated="7"/>
     </table:table-row>
-    <table:table-row table:style-name="ro5" table:visibility="collapse">
+    <table:table-row table:style-name="ro6" table:visibility="collapse">
      <table:table-cell/>
      <table:table-cell table:style-name="ce39" office:value-type="string" calcext:value-type="string" table:number-columns-spanned="10" table:number-rows-spanned="1"><text:p><text:a xlink:href="relatorio:///choose" xlink:type="simple">/choose</text:a></text:p>
      </table:table-cell>
      <table:covered-table-cell table:number-columns-repeated="2" table:style-name="ce63"/>
      <table:covered-table-cell table:style-name="ce94"/>
      <table:covered-table-cell table:style-name="ce98"/>
-     <table:covered-table-cell table:number-columns-repeated="2"/>
-     <table:covered-table-cell table:number-columns-repeated="3" table:style-name="ce44"/>
+     <table:covered-table-cell table:number-columns-repeated="5"/>
      <table:table-cell table:number-columns-repeated="9"/>
     </table:table-row>
-    <table:table-row table:style-name="ro5">
+    <table:table-row table:style-name="ro6">
      <table:table-cell/>
      <table:table-cell table:style-name="ce40" table:number-columns-spanned="10" table:number-rows-spanned="1"/>
      <table:covered-table-cell table:number-columns-repeated="2" table:style-name="ce63"/>
      <table:covered-table-cell table:style-name="ce94"/>
      <table:covered-table-cell table:style-name="ce98"/>
-     <table:covered-table-cell table:number-columns-repeated="2"/>
-     <table:covered-table-cell table:number-columns-repeated="3" table:style-name="ce44"/>
+     <table:covered-table-cell table:number-columns-repeated="5"/>
      <table:table-cell table:number-columns-repeated="9"/>
     </table:table-row>
-    <table:table-row table:style-name="ro6">
+    <table:table-row table:style-name="ro7">
      <table:table-cell/>
      <table:table-cell table:style-name="ce41" office:value-type="string" calcext:value-type="string" table:number-columns-spanned="10" table:number-rows-spanned="1">
       <text:p>INFORMACION DEL DISPOSITIVO</text:p>
      </table:table-cell>
      <table:covered-table-cell table:style-name="ce75"/>
-     <table:covered-table-cell table:number-columns-repeated="3" table:style-name="ce44"/>
-     <table:covered-table-cell table:number-columns-repeated="2"/>
-     <table:covered-table-cell table:number-columns-repeated="3" table:style-name="ce44"/>
+     <table:covered-table-cell table:number-columns-repeated="3" table:style-name="ce46"/>
+     <table:covered-table-cell table:number-columns-repeated="5"/>
      <table:table-cell table:number-columns-repeated="9"/>
     </table:table-row>
-    <table:table-row table:style-name="ro4">
+    <table:table-row table:style-name="ro5">
      <table:table-cell/>
-     <table:table-cell table:style-name="ce28" office:value-type="string" calcext:value-type="string">
+     <table:table-cell office:value-type="string" calcext:value-type="string">
       <text:p>Nombre Dispositivo:</text:p>
      </table:table-cell>
-     <table:table-cell table:style-name="ce64" office:value-type="string" calcext:value-type="string" table:number-columns-spanned="5" table:number-rows-spanned="1"><text:p><text:a xlink:href="relatorio://equipment.product.name" xlink:type="simple">equipment.product.name</text:a></text:p>
+     <table:table-cell table:style-name="ce66" office:value-type="string" calcext:value-type="string" table:number-columns-spanned="9" table:number-rows-spanned="1"><text:p><text:a xlink:href="relatorio://equipment.product.name" xlink:type="simple">equipment.product.name</text:a></text:p>
      </table:table-cell>
-     <table:covered-table-cell table:style-name="ce86"/>
-     <table:covered-table-cell table:number-columns-repeated="3" table:style-name="ce96"/>
-     <table:table-cell table:style-name="ce28" office:value-type="string" calcext:value-type="string">
-      <text:p>Nuevo / Usado</text:p>
+     <table:covered-table-cell table:style-name="ce89"/>
+     <table:covered-table-cell table:number-columns-repeated="3" table:style-name="ce107"/>
+     <table:covered-table-cell table:number-columns-repeated="4" table:style-name="Default"/>
+     <table:table-cell table:style-name="ce143"/>
+     <table:table-cell table:number-columns-repeated="8"/>
+    </table:table-row>
+    <table:table-row table:style-name="ro5">
+     <table:table-cell/>
+     <table:table-cell office:value-type="string" calcext:value-type="string">
+      <text:p>Restaurado:</text:p>
      </table:table-cell>
-     <table:table-cell table:style-name="ce72" office:value-type="string" calcext:value-type="string" table:number-columns-spanned="3" table:number-rows-spanned="1"><text:p><text:a xlink:href="relatorio://%22SI%22%20if%20equipment.refurbish%20else%20%22NO%22" xlink:type="simple">&quot;SI&quot; if equipment.refurbish else &quot;NO&quot;</text:a></text:p>
+     <table:table-cell table:style-name="ce72" office:value-type="string" calcext:value-type="string" table:number-columns-spanned="9" table:number-rows-spanned="1"><text:p><text:a xlink:href="relatorio://%22SI%22%20if%20equipment.refurbish%20else%20%22NO%22" xlink:type="simple">&quot;SI&quot; if equipment.refurbish else &quot;NO&quot;</text:a></text:p>
      </table:table-cell>
      <table:covered-table-cell table:style-name="ce72"/>
      <table:covered-table-cell table:style-name="ce101"/>
+     <table:covered-table-cell table:number-columns-repeated="2" table:style-name="ce107"/>
+     <table:covered-table-cell table:style-name="ce28"/>
+     <table:covered-table-cell table:number-columns-repeated="2" table:style-name="ce72"/>
+     <table:covered-table-cell table:style-name="ce101"/>
      <table:table-cell table:style-name="ce143"/>
      <table:table-cell table:number-columns-repeated="8"/>
     </table:table-row>
     <table:table-row table:style-name="ro4">
      <table:table-cell/>
-     <table:table-cell table:style-name="ce28" office:value-type="string" calcext:value-type="string">
+     <table:table-cell office:value-type="string" calcext:value-type="string">
       <text:p>Marca:</text:p>
      </table:table-cell>
-     <table:table-cell table:style-name="ce64" office:value-type="string" calcext:value-type="string" table:number-columns-spanned="5" table:number-rows-spanned="1"><text:p><text:a xlink:href="relatorio://equipment.mark_category.name" xlink:type="simple">equipment.mark_category.name</text:a></text:p>
+     <table:table-cell table:style-name="ce66" office:value-type="string" calcext:value-type="string" table:number-columns-spanned="5" table:number-rows-spanned="1"><text:p><text:a xlink:href="relatorio://equipment.mark_category.name" xlink:type="simple">equipment.mark_category.name</text:a></text:p>
      </table:table-cell>
-     <table:covered-table-cell table:style-name="ce86"/>
+     <table:covered-table-cell table:style-name="ce89"/>
      <table:covered-table-cell table:number-columns-repeated="3" table:style-name="ce96"/>
      <table:table-cell table:style-name="ce28" office:value-type="string" calcext:value-type="string">
       <text:p>Modelo:</text:p>
      </table:table-cell>
-     <table:table-cell table:style-name="ce86" office:value-type="string" calcext:value-type="string" table:number-columns-spanned="3" table:number-rows-spanned="1"><text:p><text:a xlink:href="relatorio://equipment.model_category.name" xlink:type="simple">equipment.model_category.name</text:a></text:p>
+     <table:table-cell table:style-name="ce89" office:value-type="string" calcext:value-type="string" table:number-columns-spanned="3" table:number-rows-spanned="1"><text:p><text:a xlink:href="relatorio://equipment.model_category.name" xlink:type="simple">equipment.model_category.name</text:a></text:p>
      </table:table-cell>
-     <table:covered-table-cell table:style-name="ce86"/>
+     <table:covered-table-cell table:style-name="ce89"/>
      <table:covered-table-cell table:style-name="ce101"/>
      <table:table-cell table:number-columns-repeated="9"/>
     </table:table-row>
     <table:table-row table:style-name="ro4">
      <table:table-cell/>
-     <table:table-cell table:style-name="ce28" office:value-type="string" calcext:value-type="string">
+     <table:table-cell office:value-type="string" calcext:value-type="string">
       <text:p>Referencia:</text:p>
      </table:table-cell>
-     <table:table-cell table:style-name="ce65" office:value-type="string" calcext:value-type="string" table:number-columns-spanned="5" table:number-rows-spanned="1"><text:p><text:a xlink:href="relatorio://equipment.reference_category.name" xlink:type="simple">equipment.reference_category.name</text:a></text:p>
+     <table:table-cell table:style-name="ce74" office:value-type="string" calcext:value-type="string" table:number-columns-spanned="5" table:number-rows-spanned="1"><text:p><text:a xlink:href="relatorio://equipment.reference_category.name" xlink:type="simple">equipment.reference_category.name</text:a></text:p>
      </table:table-cell>
-     <table:covered-table-cell table:number-columns-repeated="4" table:style-name="ce88"/>
+     <table:covered-table-cell table:number-columns-repeated="4" table:style-name="ce90"/>
      <table:table-cell table:style-name="ce28" office:value-type="string" calcext:value-type="string">
       <text:p>País Origen:</text:p>
      </table:table-cell>
-     <table:table-cell table:style-name="ce86" office:value-type="string" calcext:value-type="string" table:number-columns-spanned="3" table:number-rows-spanned="1"><text:p><text:a xlink:href="relatorio://equipment.origin_country.name" xlink:type="simple">equipment.origin_country.name</text:a></text:p>
+     <table:table-cell table:style-name="ce89" office:value-type="string" calcext:value-type="string" table:number-columns-spanned="3" table:number-rows-spanned="1"><text:p><text:a xlink:href="relatorio://equipment.origin_country.name" xlink:type="simple">equipment.origin_country.name</text:a></text:p>
      </table:table-cell>
-     <table:covered-table-cell table:style-name="ce86"/>
+     <table:covered-table-cell table:style-name="ce89"/>
      <table:covered-table-cell table:style-name="ce101"/>
      <table:table-cell table:number-columns-repeated="9"/>
     </table:table-row>
-    <table:table-row table:style-name="ro4">
+    <table:table-row table:style-name="ro5">
      <table:table-cell/>
-     <table:table-cell table:style-name="ce28" office:value-type="string" calcext:value-type="string">
+     <table:table-cell office:value-type="string" calcext:value-type="string">
       <text:p>Registro Invima</text:p>
      </table:table-cell>
-     <table:table-cell table:style-name="ce65" office:value-type="string" calcext:value-type="string" table:number-columns-spanned="5" table:number-rows-spanned="1"><text:p><text:a xlink:href="relatorio://equipment.health_register" xlink:type="simple">equipment.health_register</text:a></text:p>
+     <table:table-cell table:style-name="ce74" office:value-type="string" calcext:value-type="string" table:number-columns-spanned="5" table:number-rows-spanned="1"><text:p><text:a xlink:href="relatorio://equipment.health_register" xlink:type="simple">equipment.health_register</text:a></text:p>
      </table:table-cell>
-     <table:covered-table-cell table:number-columns-repeated="4" table:style-name="ce88"/>
+     <table:covered-table-cell table:number-columns-repeated="4" table:style-name="ce90"/>
      <table:table-cell table:style-name="ce28" office:value-type="string" calcext:value-type="string">
       <text:p>Software Version</text:p>
      </table:table-cell>
-     <table:table-cell table:style-name="ce65" office:value-type="string" calcext:value-type="string" table:number-columns-spanned="3" table:number-rows-spanned="1"><text:p><text:a xlink:href="relatorio://equipment.software_version" xlink:type="simple">equipment.software_version</text:a></text:p>
+     <table:table-cell table:style-name="ce74" office:value-type="string" calcext:value-type="string" table:number-columns-spanned="3" table:number-rows-spanned="1"><text:p><text:a xlink:href="relatorio://equipment.software_version%20if%20equipment.software_version%20!=%20%22%22%20else%20%22No%20Aplica%22" xlink:type="simple">equipment.software_version if equipment.software_version != &quot;&quot; else &quot;No Aplica&quot;</text:a></text:p>
      </table:table-cell>
-     <table:covered-table-cell table:number-columns-repeated="2" table:style-name="ce88"/>
-     <table:table-cell table:style-name="ce88" table:number-columns-repeated="2"/>
+     <table:covered-table-cell table:number-columns-repeated="2" table:style-name="ce90"/>
+     <table:table-cell table:style-name="ce90" table:number-columns-repeated="2"/>
      <table:table-cell table:number-columns-repeated="7"/>
     </table:table-row>
-    <table:table-row table:style-name="ro4">
+    <table:table-row table:style-name="ro5">
      <table:table-cell/>
-     <table:table-cell table:style-name="ce28" office:value-type="string" calcext:value-type="string">
-      <text:p>Fabricante</text:p>
-     </table:table-cell>
-     <table:table-cell table:style-name="ce79" table:number-columns-spanned="5" table:number-rows-spanned="1"/>
-     <table:covered-table-cell table:number-columns-repeated="4" table:style-name="ce88"/>
-     <table:table-cell table:style-name="ce28" office:value-type="string" calcext:value-type="string">
+     <table:table-cell office:value-type="string" calcext:value-type="string">
       <text:p>Serial:</text:p>
      </table:table-cell>
-     <table:table-cell table:style-name="ce64" office:value-type="string" calcext:value-type="string" table:number-columns-spanned="3" table:number-rows-spanned="1"><text:p><text:a xlink:href="relatorio://equipment.serial" xlink:type="simple">equipment.serial</text:a></text:p>
+     <table:table-cell table:style-name="ce66" office:value-type="string" calcext:value-type="string" table:number-columns-spanned="5" table:number-rows-spanned="1"><text:p><text:a xlink:href="relatorio://equipment.serial" xlink:type="simple">equipment.serial</text:a></text:p>
      </table:table-cell>
-     <table:covered-table-cell table:style-name="ce86"/>
-     <table:covered-table-cell table:style-name="ce96"/>
+     <table:covered-table-cell table:style-name="ce89"/>
+     <table:covered-table-cell table:style-name="ce107"/>
+     <table:covered-table-cell table:number-columns-repeated="2" table:style-name="ce90"/>
+     <table:table-cell table:style-name="ce28" office:value-type="string" calcext:value-type="string">
+      <text:p>Clase de Riesgo:</text:p>
+     </table:table-cell>
+     <table:table-cell table:style-name="ce72" office:value-type="string" calcext:value-type="string" table:number-columns-spanned="3" table:number-rows-spanned="1"><text:p><text:a xlink:href="relatorio://equipment.product.risk" xlink:type="simple">equipment.product.risk</text:a></text:p>
+     </table:table-cell>
+     <table:covered-table-cell table:style-name="ce72"/>
+     <table:covered-table-cell table:style-name="ce101"/>
      <table:table-cell table:number-columns-repeated="9"/>
     </table:table-row>
-    <table:table-row table:style-name="ro4">
+    <table:table-row table:style-name="ro5">
      <table:table-cell/>
      <table:table-cell table:style-name="ce29" office:value-type="string" calcext:value-type="string">
       <text:p>Tipo:</text:p>
@@ -2025,44 +2062,38 @@
      <table:table-cell table:style-name="ce72" office:value-type="string" calcext:value-type="string" table:number-columns-spanned="5" table:number-rows-spanned="1"><text:p><text:a xlink:href="relatorio://equipment.equipment_type" xlink:type="simple">equipment.equipment_type</text:a></text:p>
      </table:table-cell>
      <table:covered-table-cell table:number-columns-repeated="3" table:style-name="ce101"/>
-     <table:covered-table-cell table:style-name="ce88"/>
-     <table:table-cell table:style-name="ce28" office:value-type="string" calcext:value-type="string">
-      <text:p>Clase de Riesgo:</text:p>
-     </table:table-cell>
-     <table:table-cell table:style-name="ce72" office:value-type="string" calcext:value-type="string" table:number-columns-spanned="3" table:number-rows-spanned="1"><text:p><text:a xlink:href="relatorio://equipment.risk" xlink:type="simple">equipment.risk</text:a></text:p>
-     </table:table-cell>
-     <table:covered-table-cell table:style-name="ce72"/>
-     <table:covered-table-cell table:style-name="ce101"/>
-     <table:table-cell table:style-name="ce145"/>
-     <table:table-cell table:number-columns-repeated="8"/>
-    </table:table-row>
-    <table:table-row table:style-name="ro4">
-     <table:table-cell/>
-     <table:table-cell table:style-name="ce28" office:value-type="string" calcext:value-type="string">
-      <text:p>Uso:</text:p>
-     </table:table-cell>
-     <table:table-cell table:style-name="ce72" office:value-type="string" calcext:value-type="string" table:number-columns-spanned="5" table:number-rows-spanned="1"><text:p><text:a xlink:href="relatorio://equipment.use" xlink:type="simple">equipment.use</text:a></text:p>
-     </table:table-cell>
-     <table:covered-table-cell table:number-columns-repeated="3" table:style-name="ce101"/>
-     <table:covered-table-cell table:style-name="ce88"/>
+     <table:covered-table-cell table:style-name="ce90"/>
      <table:table-cell table:style-name="ce28" office:value-type="string" calcext:value-type="string">
       <text:p>Clase Biomedica:</text:p>
      </table:table-cell>
      <table:table-cell table:style-name="ce72" office:value-type="string" calcext:value-type="string" table:number-columns-spanned="3" table:number-rows-spanned="1"><text:p><text:a xlink:href="relatorio://equipment.biomedical_class" xlink:type="simple">equipment.biomedical_class</text:a></text:p>
      </table:table-cell>
-     <table:covered-table-cell table:style-name="ce138"/>
      <table:covered-table-cell table:style-name="ce145"/>
-     <table:table-cell table:style-name="ce44"/>
-     <table:table-cell table:style-name="ce138"/>
-     <table:table-cell table:style-name="ce44" table:number-columns-repeated="4"/>
+     <table:covered-table-cell table:style-name="ce148"/>
+     <table:table-cell table:style-name="ce148"/>
+     <table:table-cell table:number-columns-repeated="8"/>
+    </table:table-row>
+    <table:table-row table:style-name="ro5">
+     <table:table-cell/>
+     <table:table-cell office:value-type="string" calcext:value-type="string">
+      <text:p>Uso:</text:p>
+     </table:table-cell>
+     <table:table-cell table:style-name="ce72" office:value-type="string" calcext:value-type="string" table:number-columns-spanned="9" table:number-rows-spanned="1"><text:p><text:a xlink:href="relatorio://equipment.use" xlink:type="simple">equipment.use</text:a></text:p>
+     </table:table-cell>
+     <table:covered-table-cell table:number-columns-repeated="3" table:style-name="ce101"/>
+     <table:covered-table-cell table:style-name="ce90"/>
+     <table:covered-table-cell table:number-columns-repeated="4" table:style-name="Default"/>
+     <table:table-cell table:style-name="ce46"/>
+     <table:table-cell table:style-name="ce145"/>
+     <table:table-cell table:style-name="ce46" table:number-columns-repeated="4"/>
      <table:table-cell table:number-columns-repeated="3"/>
     </table:table-row>
     <table:table-row table:style-name="ro4">
      <table:table-cell/>
-     <table:table-cell table:style-name="ce28" office:value-type="string" calcext:value-type="string">
+     <table:table-cell office:value-type="string" calcext:value-type="string">
       <text:p>Garantía:</text:p>
      </table:table-cell>
-     <table:table-cell table:style-name="ce74" office:value-type="string" calcext:value-type="string" table:number-columns-spanned="5" table:number-rows-spanned="1"><text:p><text:a xlink:href="relatorio://equipment.warranty" xlink:type="simple">equipment.warranty</text:a> Meses</text:p>
+     <table:table-cell table:style-name="ce76" office:value-type="string" calcext:value-type="string" table:number-columns-spanned="5" table:number-rows-spanned="1"><text:p><text:a xlink:href="relatorio://equipment.warranty" xlink:type="simple">equipment.warranty</text:a> Meses</text:p>
      </table:table-cell>
      <table:covered-table-cell table:style-name="ce102"/>
      <table:covered-table-cell table:number-columns-repeated="2" table:style-name="ce115"/>
@@ -2070,37 +2101,36 @@
      <table:table-cell table:style-name="ce28" office:value-type="string" calcext:value-type="string">
       <text:p>Vida útil:</text:p>
      </table:table-cell>
-     <table:table-cell table:style-name="ce74" office:value-type="string" calcext:value-type="string" table:number-columns-spanned="3" table:number-rows-spanned="1"><text:p><text:a xlink:href="relatorio://equipment.useful_life" xlink:type="simple">equipment.useful_life</text:a> Meses</text:p>
+     <table:table-cell table:style-name="ce76" office:value-type="string" calcext:value-type="string" table:number-columns-spanned="3" table:number-rows-spanned="1"><text:p><text:a xlink:href="relatorio://equipment.useful_life" xlink:type="simple">equipment.useful_life</text:a> Meses</text:p>
      </table:table-cell>
      <table:covered-table-cell table:style-name="ce139"/>
      <table:covered-table-cell table:style-name="ce142"/>
-     <table:table-cell table:style-name="ce145"/>
+     <table:table-cell table:style-name="ce148"/>
      <table:table-cell table:number-columns-repeated="8"/>
     </table:table-row>
     <table:table-row table:style-name="ro2">
      <table:table-cell/>
      <table:table-cell table:style-name="ce45" table:number-columns-spanned="10" table:number-rows-spanned="1"/>
-     <table:covered-table-cell table:number-columns-repeated="2" table:style-name="ce74"/>
+     <table:covered-table-cell table:number-columns-repeated="2" table:style-name="ce76"/>
      <table:covered-table-cell table:number-columns-repeated="2" table:style-name="ce116"/>
      <table:covered-table-cell table:style-name="ce122"/>
      <table:covered-table-cell table:style-name="ce28"/>
      <table:covered-table-cell table:style-name="ce136"/>
      <table:covered-table-cell table:style-name="ce139"/>
      <table:covered-table-cell table:style-name="ce142"/>
-     <table:table-cell table:style-name="ce145"/>
+     <table:table-cell table:style-name="ce148"/>
      <table:table-cell table:number-columns-repeated="8"/>
     </table:table-row>
-    <table:table-row table:style-name="ro6">
+    <table:table-row table:style-name="ro7">
      <table:table-cell/>
      <table:table-cell table:style-name="ce41" office:value-type="string" calcext:value-type="string" table:number-columns-spanned="10" table:number-rows-spanned="1">
       <text:p>CARACTERISTICAS TECNICAS</text:p>
      </table:table-cell>
-     <table:covered-table-cell table:number-columns-repeated="4" table:style-name="ce44"/>
-     <table:covered-table-cell table:number-columns-repeated="2"/>
-     <table:covered-table-cell table:number-columns-repeated="3" table:style-name="ce44"/>
+     <table:covered-table-cell table:number-columns-repeated="4" table:style-name="ce46"/>
+     <table:covered-table-cell table:number-columns-repeated="5"/>
      <table:table-cell table:number-columns-repeated="9"/>
     </table:table-row>
-    <table:table-row table:style-name="ro5">
+    <table:table-row table:style-name="ro6">
      <table:table-cell/>
      <table:table-cell table:style-name="ce48" office:value-type="string" calcext:value-type="string" table:number-columns-spanned="1" table:number-rows-spanned="2">
       <text:p>Caracteristicas Físicas</text:p>
@@ -2109,7 +2139,7 @@
       <text:p>Peso</text:p>
      </table:table-cell>
      <table:covered-table-cell table:number-columns-repeated="3" table:style-name="ce103"/>
-     <table:table-cell table:style-name="ce74" office:value-type="string" calcext:value-type="string" table:number-columns-spanned="5" table:number-rows-spanned="1"><text:p><text:a xlink:href="relatorio://str(equipment.product.weight)%20+%20%22%20%22+%20equipment.product.weight_uom.symbol" xlink:type="simple">str(equipment.product.weight) + &quot; &quot;+ equipment.product.weight_uom.symbol</text:a></text:p>
+     <table:table-cell table:style-name="ce76" office:value-type="string" calcext:value-type="string" table:number-columns-spanned="5" table:number-rows-spanned="1"><text:p><text:a xlink:href="relatorio://str(equipment.product.weight)%20+%20%22%20%22+%20equipment.product.weight_uom.symbol" xlink:type="simple">str(equipment.product.weight) + &quot; &quot;+ equipment.product.weight_uom.symbol</text:a></text:p>
      </table:table-cell>
      <table:covered-table-cell table:style-name="ce129"/>
      <table:covered-table-cell table:number-columns-repeated="3" table:style-name="ce38"/>
@@ -2137,7 +2167,7 @@
       <text:p>Voltaje (VAC)</text:p>
      </table:table-cell>
      <table:covered-table-cell table:number-columns-repeated="3" table:style-name="ce36"/>
-     <table:table-cell table:style-name="ce74" office:value-type="string" calcext:value-type="string" table:number-columns-spanned="5" table:number-rows-spanned="1"><text:p><text:a xlink:href="relatorio://str(equipment.product.voltageAC)%20+%20%22%20%22+%20equipment.product.voltageAC_uom.symbol" xlink:type="simple">str(equipment.product.voltageAC) + &quot; &quot;+ equipment.product.voltageAC_uom.symbol</text:a></text:p>
+     <table:table-cell table:style-name="ce76" office:value-type="string" calcext:value-type="string" table:number-columns-spanned="5" table:number-rows-spanned="1"><text:p><text:a xlink:href="relatorio://str(equipment.product.voltageAC)%20+%20%22%20%22+%20equipment.product.voltageAC_uom.symbol" xlink:type="simple">str(equipment.product.voltageAC) + &quot; &quot;+ equipment.product.voltageAC_uom.symbol</text:a></text:p>
      </table:table-cell>
      <table:covered-table-cell table:style-name="ce129"/>
      <table:covered-table-cell table:number-columns-repeated="3" table:style-name="ce38"/>
@@ -2150,7 +2180,7 @@
       <text:p>Voltaje (VDC)</text:p>
      </table:table-cell>
      <table:covered-table-cell table:number-columns-repeated="3" table:style-name="ce36"/>
-     <table:table-cell table:style-name="ce74" office:value-type="string" calcext:value-type="string" table:number-columns-spanned="5" table:number-rows-spanned="1"><text:p><text:a xlink:href="relatorio://str(equipment.product.voltageDC)%20+%20%22%20%22+%20equipment.product.voltageDC_uom.symbol" xlink:type="simple">str(equipment.product.voltageDC) + &quot; &quot;+ equipment.product.voltageDC_uom.symbol</text:a></text:p>
+     <table:table-cell table:style-name="ce76" office:value-type="string" calcext:value-type="string" table:number-columns-spanned="5" table:number-rows-spanned="1"><text:p><text:a xlink:href="relatorio://str(equipment.product.voltageDC)%20+%20%22%20%22+%20equipment.product.voltageDC_uom.symbol" xlink:type="simple">str(equipment.product.voltageDC) + &quot; &quot;+ equipment.product.voltageDC_uom.symbol</text:a></text:p>
      </table:table-cell>
      <table:covered-table-cell table:style-name="ce129"/>
      <table:covered-table-cell table:number-columns-repeated="3" table:style-name="ce38"/>
@@ -2165,7 +2195,7 @@
       <text:p>Temperatura Min Uso</text:p>
      </table:table-cell>
      <table:covered-table-cell table:number-columns-repeated="3" table:style-name="ce104"/>
-     <table:table-cell table:style-name="ce74" office:value-type="string" calcext:value-type="string" table:number-columns-spanned="5" table:number-rows-spanned="1"><text:p><text:a xlink:href="relatorio://str(equipment.product.temperature_min)%20+%20%22%20%22+%20equipment.product.temperature_uom.symbol" xlink:type="simple">str(equipment.product.temperature_min) + &quot; &quot;+ equipment.product.temperature_uom.symbol</text:a></text:p>
+     <table:table-cell table:style-name="ce76" office:value-type="string" calcext:value-type="string" table:number-columns-spanned="5" table:number-rows-spanned="1"><text:p><text:a xlink:href="relatorio://str(equipment.product.temperature_min)%20+%20%22%20%22+%20equipment.product.temperature_uom.symbol" xlink:type="simple">str(equipment.product.temperature_min) + &quot; &quot;+ equipment.product.temperature_uom.symbol</text:a></text:p>
      </table:table-cell>
      <table:covered-table-cell table:style-name="ce129"/>
      <table:covered-table-cell table:number-columns-repeated="3" table:style-name="ce38"/>
@@ -2178,7 +2208,7 @@
       <text:p>Temperatura Max Uso</text:p>
      </table:table-cell>
      <table:covered-table-cell table:number-columns-repeated="3" table:style-name="ce104"/>
-     <table:table-cell table:style-name="ce74" office:value-type="string" calcext:value-type="string" table:number-columns-spanned="5" table:number-rows-spanned="1"><text:p><text:a xlink:href="relatorio://str(equipment.product.temperature_max)%20+%20%22%20%22+%20equipment.product.temperature_uom.symbol" xlink:type="simple">str(equipment.product.temperature_max) + &quot; &quot;+ equipment.product.temperature_uom.symbol</text:a></text:p>
+     <table:table-cell table:style-name="ce76" office:value-type="string" calcext:value-type="string" table:number-columns-spanned="5" table:number-rows-spanned="1"><text:p><text:a xlink:href="relatorio://str(equipment.product.temperature_max)%20+%20%22%20%22+%20equipment.product.temperature_uom.symbol" xlink:type="simple">str(equipment.product.temperature_max) + &quot; &quot;+ equipment.product.temperature_uom.symbol</text:a></text:p>
      </table:table-cell>
      <table:covered-table-cell table:style-name="ce129"/>
      <table:covered-table-cell table:number-columns-repeated="3" table:style-name="ce38"/>
@@ -2191,7 +2221,7 @@
       <text:p>Humedad Min Uso</text:p>
      </table:table-cell>
      <table:covered-table-cell table:number-columns-repeated="3" table:style-name="ce104"/>
-     <table:table-cell table:style-name="ce74" office:value-type="string" calcext:value-type="string" table:number-columns-spanned="5" table:number-rows-spanned="1"><text:p><text:a xlink:href="relatorio://str(equipment.product.moisture_min)%20+%20%22%20%22+%20equipment.product.moisture_uom.symbol" xlink:type="simple">str(equipment.product.moisture_min) + &quot; &quot;+ equipment.product.moisture_uom.symbol</text:a></text:p>
+     <table:table-cell table:style-name="ce76" office:value-type="string" calcext:value-type="string" table:number-columns-spanned="5" table:number-rows-spanned="1"><text:p><text:a xlink:href="relatorio://str(equipment.product.moisture_min)%20+%20%22%20%22+%20equipment.product.moisture_uom.symbol" xlink:type="simple">str(equipment.product.moisture_min) + &quot; &quot;+ equipment.product.moisture_uom.symbol</text:a></text:p>
      </table:table-cell>
      <table:covered-table-cell table:style-name="ce129"/>
      <table:covered-table-cell table:number-columns-repeated="3" table:style-name="ce38"/>
@@ -2204,7 +2234,7 @@
       <text:p>Humedad Max Uso</text:p>
      </table:table-cell>
      <table:covered-table-cell table:number-columns-repeated="3" table:style-name="ce104"/>
-     <table:table-cell table:style-name="ce74" office:value-type="string" calcext:value-type="string" table:number-columns-spanned="5" table:number-rows-spanned="1"><text:p><text:a xlink:href="relatorio://str(equipment.product.moisture_max)%20+%20%22%20%22+%20equipment.product.moisture_uom.symbol" xlink:type="simple">str(equipment.product.moisture_max) + &quot; &quot;+ equipment.product.moisture_uom.symbol</text:a></text:p>
+     <table:table-cell table:style-name="ce76" office:value-type="string" calcext:value-type="string" table:number-columns-spanned="5" table:number-rows-spanned="1"><text:p><text:a xlink:href="relatorio://str(equipment.product.moisture_max)%20+%20%22%20%22+%20equipment.product.moisture_uom.symbol" xlink:type="simple">str(equipment.product.moisture_max) + &quot; &quot;+ equipment.product.moisture_uom.symbol</text:a></text:p>
      </table:table-cell>
      <table:covered-table-cell table:style-name="ce129"/>
      <table:covered-table-cell table:number-columns-repeated="3" table:style-name="ce38"/>
@@ -2216,7 +2246,7 @@
      <table:covered-table-cell table:number-columns-repeated="9" table:style-name="Default"/>
      <table:table-cell table:number-columns-repeated="9"/>
     </table:table-row>
-    <table:table-row table:style-name="ro6">
+    <table:table-row table:style-name="ro7">
      <table:table-cell/>
      <table:table-cell table:style-name="ce54" office:value-type="string" calcext:value-type="string" table:number-columns-spanned="10" table:number-rows-spanned="1">
       <text:p>MANTENIMIENTO</text:p>
@@ -2237,22 +2267,20 @@
      <table:covered-table-cell table:number-columns-repeated="5" table:style-name="Default"/>
      <table:table-cell table:number-columns-repeated="9"/>
     </table:table-row>
-    <table:table-row table:style-name="ro4">
+    <table:table-row table:style-name="ro5">
      <table:table-cell/>
-     <table:table-cell table:style-name="ce29" office:value-type="string" calcext:value-type="string" table:number-columns-spanned="2" table:number-rows-spanned="1">
+     <table:table-cell table:style-name="ce44" office:value-type="string" calcext:value-type="string" table:number-columns-spanned="2" table:number-rows-spanned="1">
       <text:p>Frecuencia de Mantenimiento Preventivo:</text:p>
      </table:table-cell>
      <table:covered-table-cell table:style-name="ce28"/>
-     <table:table-cell table:style-name="ce72" office:value-type="string" calcext:value-type="string" table:number-columns-spanned="3" table:number-rows-spanned="1"><text:p><text:a xlink:href="relatorio://equipment.maintenance_frequency" xlink:type="simple">equipment.maintenance_frequency</text:a> Meses</text:p>
+     <table:table-cell table:style-name="ce72" office:value-type="string" calcext:value-type="string" table:number-columns-spanned="8" table:number-rows-spanned="1"><text:p><text:a xlink:href="relatorio://equipment.maintenance_frequency" xlink:type="simple">equipment.maintenance_frequency</text:a> Meses</text:p>
      </table:table-cell>
      <table:covered-table-cell table:style-name="ce72"/>
      <table:covered-table-cell table:style-name="ce101"/>
-     <table:table-cell table:style-name="ce126" office:value-type="string" calcext:value-type="string" table:number-columns-spanned="2" table:number-rows-spanned="1">
-      <text:p>Frecuencia de Calibración del Equipo:</text:p>
-     </table:table-cell>
-     <table:covered-table-cell/>
-     <table:table-cell table:style-name="ce12" table:number-columns-spanned="3" table:number-rows-spanned="1"/>
-     <table:covered-table-cell table:number-columns-repeated="2" table:style-name="ce44"/>
+     <table:covered-table-cell table:style-name="ce45"/>
+     <table:covered-table-cell table:style-name="ce122"/>
+     <table:covered-table-cell table:style-name="ce140"/>
+     <table:covered-table-cell table:number-columns-repeated="2" table:style-name="ce122"/>
      <table:table-cell table:number-columns-repeated="9"/>
     </table:table-row>
     <table:table-row table:style-name="ro2">
@@ -2264,115 +2292,115 @@
     </table:table-row>
     <table:table-row table:style-name="ro2">
      <table:table-cell/>
-     <table:table-cell table:style-name="ce44" table:number-columns-repeated="4"/>
+     <table:table-cell table:style-name="ce46" table:number-columns-repeated="4"/>
      <table:table-cell table:style-name="ce12" office:value-type="string" calcext:value-type="string" table:number-columns-spanned="3" table:number-rows-spanned="1">
       <text:p>Imagen</text:p>
      </table:table-cell>
      <table:covered-table-cell table:number-columns-repeated="2"/>
-     <table:table-cell table:style-name="ce44" table:number-columns-repeated="3"/>
-     <table:table-cell table:number-columns-repeated="9"/>
+     <table:table-cell table:number-columns-repeated="12"/>
     </table:table-row>
     <table:table-row table:style-name="ro2">
      <table:table-cell/>
      <table:table-cell table:style-name="Default"/>
-     <table:table-cell table:style-name="ce77" table:number-columns-repeated="3"/>
+     <table:table-cell table:style-name="ce80" table:number-columns-repeated="3"/>
      <table:table-cell table:style-name="ce117" table:number-columns-spanned="3" table:number-rows-spanned="10"/>
-     <table:covered-table-cell table:number-columns-repeated="2" table:style-name="ce77"/>
-     <table:table-cell table:style-name="ce77" table:number-columns-repeated="3"/>
+     <table:covered-table-cell table:number-columns-repeated="2" table:style-name="ce80"/>
+     <table:table-cell table:style-name="ce80" table:number-columns-repeated="3"/>
      <table:table-cell table:number-columns-repeated="9"/>
     </table:table-row>
     <table:table-row table:style-name="ro2">
      <table:table-cell table:style-name="Default"/>
-     <table:table-cell table:number-columns-repeated="4"/>
-     <table:covered-table-cell/>
-     <table:covered-table-cell table:number-columns-repeated="2" table:style-name="ce46"/>
+     <table:table-cell table:style-name="ce49"/>
      <table:table-cell table:number-columns-repeated="3"/>
+     <table:covered-table-cell/>
+     <table:covered-table-cell table:number-columns-repeated="2" table:style-name="ce49"/>
+     <table:table-cell table:style-name="ce49" table:number-columns-repeated="3"/>
      <table:table-cell table:style-name="Default"/>
      <table:table-cell table:number-columns-repeated="8"/>
     </table:table-row>
     <table:table-row table:style-name="ro2">
      <table:table-cell table:style-name="Default"/>
-     <table:table-cell table:number-columns-repeated="4"/>
-     <table:covered-table-cell/>
-     <table:covered-table-cell table:number-columns-repeated="2" table:style-name="ce46"/>
+     <table:table-cell table:style-name="ce49"/>
      <table:table-cell table:number-columns-repeated="3"/>
+     <table:covered-table-cell/>
+     <table:covered-table-cell table:number-columns-repeated="2" table:style-name="ce49"/>
+     <table:table-cell table:style-name="ce49" table:number-columns-repeated="3"/>
      <table:table-cell table:style-name="Default"/>
      <table:table-cell table:number-columns-repeated="8"/>
     </table:table-row>
     <table:table-row table:style-name="ro2">
      <table:table-cell table:style-name="Default"/>
-     <table:table-cell table:number-columns-repeated="4"/>
-     <table:covered-table-cell/>
-     <table:covered-table-cell table:number-columns-repeated="2" table:style-name="ce46"/>
+     <table:table-cell table:style-name="ce49"/>
      <table:table-cell table:number-columns-repeated="3"/>
+     <table:covered-table-cell/>
+     <table:covered-table-cell table:number-columns-repeated="2" table:style-name="ce49"/>
+     <table:table-cell table:style-name="ce49" table:number-columns-repeated="3"/>
      <table:table-cell table:style-name="Default"/>
      <table:table-cell table:number-columns-repeated="8"/>
     </table:table-row>
     <table:table-row table:style-name="ro2">
      <table:table-cell table:style-name="Default"/>
-     <table:table-cell table:number-columns-repeated="4"/>
-     <table:covered-table-cell/>
-     <table:covered-table-cell table:number-columns-repeated="2" table:style-name="ce46"/>
+     <table:table-cell table:style-name="ce49"/>
      <table:table-cell table:number-columns-repeated="3"/>
+     <table:covered-table-cell/>
+     <table:covered-table-cell table:number-columns-repeated="2" table:style-name="ce49"/>
+     <table:table-cell table:style-name="ce49" table:number-columns-repeated="3"/>
      <table:table-cell table:style-name="Default"/>
      <table:table-cell table:number-columns-repeated="8"/>
     </table:table-row>
     <table:table-row table:style-name="ro2">
      <table:table-cell table:style-name="Default"/>
-     <table:table-cell table:number-columns-repeated="4"/>
-     <table:covered-table-cell/>
-     <table:covered-table-cell table:number-columns-repeated="2" table:style-name="ce46"/>
+     <table:table-cell table:style-name="ce49"/>
      <table:table-cell table:number-columns-repeated="3"/>
+     <table:covered-table-cell/>
+     <table:covered-table-cell table:number-columns-repeated="2" table:style-name="ce49"/>
+     <table:table-cell table:style-name="ce49" table:number-columns-repeated="3"/>
      <table:table-cell table:style-name="Default"/>
      <table:table-cell table:number-columns-repeated="8"/>
     </table:table-row>
     <table:table-row table:style-name="ro2">
      <table:table-cell table:style-name="Default"/>
-     <table:table-cell table:number-columns-repeated="4"/>
-     <table:covered-table-cell/>
-     <table:covered-table-cell table:number-columns-repeated="2" table:style-name="ce46"/>
+     <table:table-cell table:style-name="ce49"/>
      <table:table-cell table:number-columns-repeated="3"/>
+     <table:covered-table-cell/>
+     <table:covered-table-cell table:number-columns-repeated="2" table:style-name="ce49"/>
+     <table:table-cell table:style-name="ce49" table:number-columns-repeated="3"/>
      <table:table-cell table:style-name="Default"/>
      <table:table-cell table:number-columns-repeated="8"/>
     </table:table-row>
     <table:table-row table:style-name="ro2">
      <table:table-cell table:style-name="Default"/>
-     <table:table-cell table:number-columns-repeated="4"/>
-     <table:covered-table-cell/>
-     <table:covered-table-cell table:number-columns-repeated="2" table:style-name="ce46"/>
+     <table:table-cell table:style-name="ce49"/>
      <table:table-cell table:number-columns-repeated="3"/>
+     <table:covered-table-cell/>
+     <table:covered-table-cell table:number-columns-repeated="2" table:style-name="ce49"/>
+     <table:table-cell table:style-name="ce49" table:number-columns-repeated="3"/>
      <table:table-cell table:style-name="Default"/>
      <table:table-cell table:number-columns-repeated="8"/>
     </table:table-row>
     <table:table-row table:style-name="ro2">
      <table:table-cell table:style-name="Default"/>
-     <table:table-cell table:number-columns-repeated="4"/>
-     <table:covered-table-cell/>
-     <table:covered-table-cell table:number-columns-repeated="2" table:style-name="ce46"/>
+     <table:table-cell table:style-name="ce49"/>
      <table:table-cell table:number-columns-repeated="3"/>
+     <table:covered-table-cell/>
+     <table:covered-table-cell table:number-columns-repeated="2" table:style-name="ce49"/>
+     <table:table-cell table:style-name="ce49" table:number-columns-repeated="3"/>
      <table:table-cell table:style-name="Default"/>
      <table:table-cell table:number-columns-repeated="8"/>
     </table:table-row>
     <table:table-row table:style-name="ro2">
      <table:table-cell table:style-name="Default"/>
-     <table:table-cell table:number-columns-repeated="4"/>
+     <table:table-cell table:style-name="ce49"/>
+     <table:table-cell table:number-columns-repeated="3"/>
      <table:covered-table-cell/>
-     <table:covered-table-cell table:number-columns-repeated="2" table:style-name="ce46"/>
-     <table:table-cell table:number-columns-repeated="3"/>
-     <table:table-cell table:style-name="Default"/>
-     <table:table-cell table:number-columns-repeated="8"/>
-    </table:table-row>
-    <table:table-row table:style-name="ro2" table:number-rows-repeated="2">
-     <table:table-cell table:style-name="Default"/>
-     <table:table-cell table:number-columns-repeated="5"/>
-     <table:table-cell table:style-name="ce46" table:number-columns-repeated="2"/>
-     <table:table-cell table:number-columns-repeated="3"/>
+     <table:covered-table-cell table:number-columns-repeated="2" table:style-name="ce49"/>
+     <table:table-cell table:style-name="ce49" table:number-columns-repeated="3"/>
      <table:table-cell table:style-name="Default"/>
      <table:table-cell table:number-columns-repeated="8"/>
     </table:table-row>
     <table:table-row table:style-name="ro2">
      <table:table-cell/>
-     <table:table-cell table:style-name="ce28" office:value-type="string" calcext:value-type="string">
+     <table:table-cell office:value-type="string" calcext:value-type="string">
       <text:p>Responsable:</text:p>
      </table:table-cell>
      <table:table-cell table:style-name="ce87" table:number-columns-spanned="9" table:number-rows-spanned="1"/>
diff --git a/sale.py b/sale.py
index 561a8f5..3bed1ff 100644
--- a/sale.py
+++ b/sale.py
@@ -18,6 +18,7 @@ class Sale(metaclass=PoolMeta):
     'Sale'
     __name__ = 'sale.sale'
 
+    """
     @classmethod
     @ModelView.button
     @Workflow.transition('confirmed')
@@ -47,7 +48,8 @@ class Sale(metaclass=PoolMeta):
                 queue_name='sale',
                 queue_scheduled_at=config.sale_process_after):
             cls.__queue__.process(sales)
-
+    """
+    
 class SaleLine(metaclass=PoolMeta):
     'SaleLine'
     __name__ = 'sale.line'
@@ -106,9 +108,10 @@ class SaleLine(metaclass=PoolMeta):
         if self.product_equipment == False:
             self.equipment = None
             self.on_change_equipment()
+        """
         else:
             self.quantity = 1
-
+        """
             
 
     @fields.depends('product', 'unit', 'quantity', 'sale',
diff --git a/view/move_form.xml b/view/move_form.xml
index d470067..a9e6d2c 100644
--- a/view/move_form.xml
+++ b/view/move_form.xml
@@ -4,7 +4,9 @@ this repository contains the full copyright notices and license terms. -->
 <data>
     <xpath expr="/form/field[@name='product']" position="after">
 	<newline/>
-	<label name="serial"/>
-	<field name="serial"/>
+	<label name="equipment"/>
+	<field name="equipment"/>	
+	<label name="equipment_serial"/>
+	<field name="equipment_serial"/>
     </xpath>
 </data>
diff --git a/view/move_list_shipment.xml b/view/move_list_shipment.xml
index d189157..0e42c39 100644
--- a/view/move_list_shipment.xml
+++ b/view/move_list_shipment.xml
@@ -3,6 +3,7 @@
 <data>
     <xpath
 	expr="//field[@name='product']" position="after">
-	<field name="serial"/>
+	<field name="equipment"/>
+	<field name="equipment_serial"/>
     </xpath>
 </data>
diff --git a/view/optical_equipment_form.xml b/view/optical_equipment_form.xml
index 294d42f..eafeba6 100644
--- a/view/optical_equipment_form.xml
+++ b/view/optical_equipment_form.xml
@@ -64,6 +64,8 @@
 	    <newline/>
 	    <separator id="sale_destination" string="Sale Destination" colspan="4"/>
 	    <field name="sale_destination"/>
+	    <separator id="shipment_destination" string="Shipment Destination" colspan="4"/>
+	    <field name="shipment_destination"/>
 	</page>
     </notebook>
     <group col="2" colspan="2" id="button">