update reports Maintenance

calibration.xml

@@ -36,5 +36,17 @@
             <field name="model">optical_equipment.maintenance,-1</field>
             <field name="action" ref="report_calibration"/>
     	</record>
+	<record model="ir.action.report" id="report_calibrations">
+            <field name="name">Calibrations</field>
+            <field name="model">optical_equipment_maintenance.service</field>
+            <field name="report_name">optical_equipment_maintenance.service</field>
+            <field name="report">optical_equipment/report/Calibrations.fodt</field>
+            <field name="single" eval="True"/>
+        </record>
+	<record model="ir.action.keyword" id="report_calibrations_keyword">
+            <field name="keyword">form_print</field>
+            <field name="model">optical_equipment_maintenance.service,-1</field>
+            <field name="action" ref="report_calibrations"/>
+    	</record>
     </data>
 </tryton>

locale/es.po

@@ -74,6 +74,10 @@ msgctxt "field:product.template,calibration:"
 msgid "Apply calibration"
 msgstr "Aplica calibración"
 
+msgctxt "field:product.template,maintenance_required:"
+msgid "Maintenance Required"
+msgstr "Requiere Mantenimiento"
+
 msgctxt "field:product.template,observation:"
 msgid "Observation"
 msgstr "Observación"
@@ -666,6 +670,10 @@ msgctxt "field:optical_equipment_maintenance.service,code:"
 msgid "Code"
 msgstr "Código"
 
+msgctxt "selection:optical_equipment.maintenance,maintenance_type:"
+msgid "Initial"
+msgstr "Inicial"
+
 msgctxt "selection:optical_equipment.maintenance,maintenance_type:"
 msgid "Preventive"
 msgstr "Preventivo"
@@ -678,6 +686,10 @@ msgctxt "field:optical_equipment.maintenance,description_activity:"
 msgid "Activity"
 msgstr "Descripción del Mantenimiento"
 
+msgctxt "field:optical_equipment.maintenance,equipment_calibrate:"
+msgid "Calibrate Equipment"
+msgstr "Equipo Calibrable"
+
 msgctxt "field:optical_equipment.maintenance,temperature_min:"
 msgid "Temp Min"
 msgstr "Temp Min"
@@ -738,6 +750,18 @@ msgctxt "field:optical_equipment_maintenance.service,maintenance_type:"
 msgid "Maintenance Type"
 msgstr "Tipo de Mantenimiento"
 
+msgctxt "selection:optical_equipment_maintenance.service,maintenance_type:"
+msgid "Initial"
+msgstr "Inicial"
+
+msgctxt "selection:optical_equipment_maintenance.service,maintenance_type:"
+msgid "Preventive"
+msgstr "Preventivo"
+
+msgctxt "selection:optical_equipment_maintenance.service,maintenance_type:"
+msgid "Corrective"
+msgstr "Correctivo"
+
 msgctxt "field:optical_equipment_maintenance.service,propietary:"
 msgid "Propietary"
 msgstr "Propietario"
@@ -1427,10 +1451,18 @@ msgctxt "model:ir.action,name:report_calibration"
 msgid "Calibration"
 msgstr "Calibración"
 
+msgctxt "model:ir.action,name:report_calibrations"
+msgid "Calibrations"
+msgstr "Calibraciones"
+
 msgctxt "model:ir.action,name:report_maintenance_timeline"
 msgid "Time Line Maintenance Service"
 msgstr "Cronograma de Mantenimiento"
 
+msgctxt "model:ir.action,name:report_service"
+msgid "Service"
+msgstr "Servicio"
+
 msgctxt "model:ir.action,name:report_equipment"
 msgid "Equipment"
 msgstr "Hoja de Vida"

maintenance.py

@@ -105,6 +105,9 @@ class MaintenanceService(Workflow, ModelSQL, ModelView):
     @classmethod
     def __setup__(cls):
         super(MaintenanceService, cls).__setup__()
+        cls._order = [
+            ('code', 'DESC'),
+            ('id', 'DESC')]
         cls._transitions = ({
             ('draft', 'agended'),
             ('agended', 'in_progress'),
@@ -282,7 +285,7 @@ class MaintenanceServiceLine(Workflow, ModelSQL, ModelView):
                                           states=_states)
     code = fields.Char(
         "Code", select=True,states={'readonly': True })
-    maintenance_type = fields.Selection([('initial', 'initial'),
+    maintenance_type = fields.Selection([('initial', 'Initial'),
                                          ('preventive', 'Preventive'),
                                          ('corrective', 'Corrective')], "Maintenance Type", states=_states)
     state = fields.Selection([('draft', "Draft"),
@@ -353,7 +356,7 @@ class MaintenanceServiceLine(Workflow, ModelSQL, ModelView):
             'in_progress': {'invisible': Eval('state').in_(['draft', 'in_progress', 'finished'])},
             'finished': {'invisible': (Eval('state').in_(['finished'])) |
                          ((Eval('maintenance_type') == 'corrective') & (Eval('maintenance_lines') == ()))},
-            'samples': {'invisible': (Eval('state').in_(['finished'])) | (Eval('lines_calibration') != ())},
+            'samples': {'invisible': (Eval('state').in_(['finished'])) | (Eval('lines_calibration') != ()) | (~Eval('equipment_calibrate'))},
             'calibrate': {'invisible': (Eval('lines_calibration') == ()) | (Eval('state').in_(['finished'])),
                           'depends': ['state'],}
                 })

move.py

@@ -161,7 +161,7 @@ class ShipmentOut(metaclass=PoolMeta):
 
             if serial == True:
                 for move in shipment.inventory_moves:
-                    if move.product_equipment and move.equipment:
+                    if move.product_equipment and move.equipment and move.equipment.product.template.maintenance_required:
                         maintenance = Maintenance(
                             service_maintenance=maintenanceService.id,
                             maintenance_type='initial',

product.py

@@ -57,6 +57,9 @@ class Template(metaclass=PoolMeta):
                                        'readonly': If(Eval('equipment',True), True)
                                        | If(Eval('maintenance_activity',True), True)
                                        })
+
+    maintenance_required = fields.Boolean('Miantenance Required',
+                               states={'invisible': (Eval('type', 'goods') != 'goods')})
     equipment_type = fields.Selection(_EQUIPMENT_TYPE, 'Equipment type',
                                       states={'required': Eval('equipment', False)})
     risk = fields.Selection(_RISK, 'Type risk')
@@ -172,10 +175,12 @@ class Template(metaclass=PoolMeta):
     def view_attributes(cls):
         return super(Template, cls).view_attributes() + [
             ('//page[@id="features"]', 'states', {
-                'invisible': ~Eval('equipment'),
+                'invisible': ~Eval('equipment'),}),
-                    }),
             ('//page[@id="calibration"]', 'states', {
-                    'invisible': ~Eval('calibration')},)
+                    'invisible': ~Eval('calibration')},),
+            ('//page[@id="maintenance_activities"]', 'states', {
+                    'invisible': ~Eval('maintenance_required')},)
+
              ]
 
     @classmethod

report/Calibration.fodt

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <office:document 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:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:drawooo="http://openoffice.org/2010/draw" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:rpt="http://openoffice.org/2005/report" xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:officeooo="http://openoffice.org/2009/office" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" office:version="1.3" office:mimetype="application/vnd.oasis.opendocument.text">
- <office:meta><meta:creation-date>2022-10-11T16:28:51.101948480</meta:creation-date><dc:date>2023-03-21T00:31:59.787408383</dc:date><meta:editing-duration>PT4H58M44S</meta:editing-duration><meta:editing-cycles>64</meta:editing-cycles><meta:generator>LibreOffice/7.4.5.1$Linux_X86_64 LibreOffice_project/40$Build-1</meta:generator><meta:document-statistic meta:table-count="8" meta:image-count="1" meta:object-count="0" meta:page-count="4" meta:paragraph-count="100" meta:word-count="356" meta:character-count="3893" meta:non-whitespace-character-count="3631"/></office:meta>
+ <office:meta><meta:creation-date>2022-10-11T16:28:51.101948480</meta:creation-date><dc:date>2023-04-10T00:45:50.419611766</dc:date><meta:editing-duration>PT4H59M29S</meta:editing-duration><meta:editing-cycles>65</meta:editing-cycles><meta:generator>LibreOffice/7.4.6.2$Linux_X86_64 LibreOffice_project/40$Build-2</meta:generator><meta:document-statistic meta:table-count="8" meta:image-count="1" meta:object-count="0" meta:page-count="4" meta:paragraph-count="103" meta:word-count="360" meta:character-count="3954" meta:non-whitespace-character-count="3691"/></office:meta>
  <office:settings>
   <config:config-item-set config:name="ooo:view-settings">
-   <config:config-item config:name="ViewAreaTop" config:type="long">0</config:config-item>
+   <config:config-item config:name="ViewAreaTop" config:type="long">28363</config:config-item>
    <config:config-item config:name="ViewAreaLeft" config:type="long">0</config:config-item>
    <config:config-item config:name="ViewAreaWidth" config:type="long">24502</config:config-item>
    <config:config-item config:name="ViewAreaHeight" config:type="long">10982</config:config-item>
@@ -13,12 +13,12 @@
    <config:config-item-map-indexed config:name="Views">
     <config:config-item-map-entry>
      <config:config-item config:name="ViewId" config:type="string">view2</config:config-item>
-     <config:config-item config:name="ViewLeft" config:type="long">14457</config:config-item>
+     <config:config-item config:name="ViewLeft" config:type="long">5039</config:config-item>
-     <config:config-item config:name="ViewTop" config:type="long">2598</config:config-item>
+     <config:config-item config:name="ViewTop" config:type="long">39550</config:config-item>
      <config:config-item config:name="VisibleLeft" config:type="long">0</config:config-item>
-     <config:config-item config:name="VisibleTop" config:type="long">0</config:config-item>
+     <config:config-item config:name="VisibleTop" config:type="long">28363</config:config-item>
      <config:config-item config:name="VisibleRight" config:type="long">24500</config:config-item>
-     <config:config-item config:name="VisibleBottom" config:type="long">10980</config:config-item>
+     <config:config-item config:name="VisibleBottom" config:type="long">39344</config:config-item>
      <config:config-item config:name="ZoomType" config:type="short">0</config:config-item>
      <config:config-item config:name="ViewLayoutColumns" config:type="short">1</config:config-item>
      <config:config-item config:name="ViewLayoutBookMode" config:type="boolean">false</config:config-item>
@@ -91,7 +91,7 @@
    <config:config-item config:name="ChartAutoUpdate" config:type="boolean">true</config:config-item>
    <config:config-item config:name="PrinterSetup" config:type="base64Binary"/>
    <config:config-item config:name="AddParaTableSpacingAtStart" config:type="boolean">true</config:config-item>
-   <config:config-item config:name="Rsid" config:type="int">4963005</config:config-item>
+   <config:config-item config:name="Rsid" config:type="int">4988719</config:config-item>
    <config:config-item config:name="EmbeddedDatabaseName" config:type="string"/>
    <config:config-item config:name="FieldAutoUpdate" config:type="boolean">true</config:config-item>
    <config:config-item config:name="OutlineLevelYieldsNumbering" config:type="boolean">false</config:config-item>
@@ -163,7 +163,7 @@
  <office:styles>
   <style:default-style style:family="graphic">
    <style:graphic-properties svg:stroke-color="#3465a4" draw:fill-color="#729fcf" fo:wrap-option="no-wrap" draw:shadow-offset-x="0.1181in" draw:shadow-offset-y="0.1181in" draw:start-line-spacing-horizontal="0.1114in" draw:start-line-spacing-vertical="0.1114in" draw:end-line-spacing-horizontal="0.1114in" draw:end-line-spacing-vertical="0.1114in" style:flow-with-text="false"/>
-   <style:paragraph-properties style:text-autospace="ideograph-alpha" style:line-break="strict" style:font-independent-line-spacing="false">
+   <style:paragraph-properties style:text-autospace="ideograph-alpha" style:line-break="strict" style:writing-mode="lr-tb" style:font-independent-line-spacing="false">
     <style:tab-stops/>
    </style:paragraph-properties>
    <style:text-properties style:use-window-font-color="true" loext:opacity="0%" loext:color-lum-mod="100%" loext:color-lum-off="0%" style:font-name="Liberation Serif" fo:font-size="12pt" fo:language="es" fo:country="CO" style:letter-kerning="true" style:font-name-asian="Droid Sans Fallback" style:font-size-asian="10.5pt" style:language-asian="zh" style:country-asian="CN" style:font-name-complex="Droid Sans Devanagari1" style:font-size-complex="12pt" style:language-complex="hi" style:country-complex="IN"/>
@@ -800,6 +800,21 @@
    <style:paragraph-properties fo:text-align="start" style:justify-single-word="false" style:writing-mode="lr-tb"/>
    <style:text-properties style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" style:font-name="Droid Sans Japanese1" fo:font-size="9pt" fo:font-style="normal" fo:text-shadow="none" style:text-underline-style="none" fo:font-weight="bold" officeooo:rsid="000cde7f" officeooo:paragraph-rsid="0045b610" style:font-size-asian="9pt" style:font-style-asian="normal" style:font-weight-asian="bold" style:font-size-complex="9pt" style:font-weight-complex="bold" style:text-emphasize="none"/>
   </style:style>
+  <style:style style:name="P76" style:family="paragraph" style:parent-style-name="Standard">
+   <style:paragraph-properties style:writing-mode="lr-tb"/>
+   <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="8pt" officeooo:rsid="00205712" officeooo:paragraph-rsid="004c1f2f" style:font-size-asian="8pt" style:font-size-complex="8pt"/>
+  </style:style>
+  <style:style style:name="P77" style:family="paragraph" style:parent-style-name="Text_20_body">
+   <style:paragraph-properties fo:text-align="start" style:justify-single-word="false" style:writing-mode="lr-tb"/>
+   <style:text-properties style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" style:font-name="Droid Sans Japanese1" fo:font-size="9pt" fo:font-style="normal" fo:text-shadow="none" style:text-underline-style="none" fo:font-weight="bold" officeooo:rsid="000cde7f" officeooo:paragraph-rsid="004c1f2f" style:font-size-asian="9pt" style:font-style-asian="normal" style:font-weight-asian="bold" style:font-size-complex="9pt" style:font-weight-complex="bold" style:text-emphasize="none"/>
+  </style:style>
+  <style:style style:name="P78" style:family="paragraph" style:parent-style-name="Text_20_body">
+   <style:paragraph-properties style:writing-mode="lr-tb"/>
+   <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="9pt" officeooo:paragraph-rsid="004c1f2f" style:font-size-asian="9pt" style:font-size-complex="9pt"/>
+  </style:style>
+  <style:style style:name="P79" style:family="paragraph" style:parent-style-name="Text_20_body">
+   <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="9pt" officeooo:paragraph-rsid="004c1f2f" style:font-size-asian="9pt" style:font-size-complex="9pt"/>
+  </style:style>
   <style:style style:name="T1" style:family="text">
    <style:text-properties fo:color="#333333" loext:opacity="100%" fo:font-weight="bold" officeooo:rsid="026544ec" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
   </style:style>
@@ -891,71 +906,80 @@
    <style:text-properties fo:font-weight="normal" officeooo:rsid="0045b610" style:font-weight-asian="normal" style:font-name-complex="Arial" style:font-weight-complex="normal"/>
   </style:style>
   <style:style style:name="T31" style:family="text">
-   <style:text-properties fo:font-weight="normal" style:font-weight-asian="normal" style:font-weight-complex="normal"/>
+   <style:text-properties fo:font-weight="normal" officeooo:rsid="004e714a" style:font-weight-asian="normal" style:font-name-complex="Arial" style:font-weight-complex="normal"/>
   </style:style>
   <style:style style:name="T32" style:family="text">
-   <style:text-properties fo:font-weight="normal" officeooo:rsid="001b9ac0" style:font-weight-asian="normal" style:font-weight-complex="normal"/>
+   <style:text-properties fo:font-weight="normal" style:font-weight-asian="normal" style:font-weight-complex="normal"/>
   </style:style>
   <style:style style:name="T33" style:family="text">
-   <style:text-properties style:font-name-complex="Arial"/>
+   <style:text-properties fo:font-weight="normal" officeooo:rsid="001b9ac0" style:font-weight-asian="normal" style:font-weight-complex="normal"/>
   </style:style>
   <style:style style:name="T34" style:family="text">
-   <style:text-properties officeooo:rsid="001b9ac0" style:font-name-complex="Arial"/>
+   <style:text-properties style:font-name-complex="Arial"/>
   </style:style>
   <style:style style:name="T35" style:family="text">
-   <style:text-properties fo:font-weight="bold" style:font-weight-asian="bold" style:font-name-complex="Arial" style:font-weight-complex="bold"/>
+   <style:text-properties officeooo:rsid="001b9ac0" style:font-name-complex="Arial"/>
   </style:style>
   <style:style style:name="T36" style:family="text">
-   <style:text-properties fo:font-weight="bold" officeooo:rsid="001b9ac0" style:font-weight-asian="bold" style:font-name-complex="Arial" style:font-weight-complex="bold"/>
+   <style:text-properties fo:font-weight="bold" style:font-weight-asian="bold" style:font-name-complex="Arial" style:font-weight-complex="bold"/>
   </style:style>
   <style:style style:name="T37" style:family="text">
-   <style:text-properties fo:font-weight="bold" officeooo:rsid="00205712" style:font-weight-asian="bold" style:font-name-complex="Arial" style:font-weight-complex="bold"/>
+   <style:text-properties fo:font-weight="bold" officeooo:rsid="001b9ac0" style:font-weight-asian="bold" style:font-name-complex="Arial" style:font-weight-complex="bold"/>
   </style:style>
   <style:style style:name="T38" style:family="text">
-   <style:text-properties fo:font-weight="bold" officeooo:rsid="0020199a" style:font-weight-asian="bold" style:font-name-complex="Arial" style:font-weight-complex="bold"/>
+   <style:text-properties fo:font-weight="bold" officeooo:rsid="00205712" style:font-weight-asian="bold" style:font-name-complex="Arial" style:font-weight-complex="bold"/>
   </style:style>
   <style:style style:name="T39" style:family="text">
-   <style:text-properties fo:font-weight="bold" officeooo:rsid="0036953a" style:font-weight-asian="bold" style:font-name-complex="Arial" style:font-weight-complex="bold"/>
+   <style:text-properties fo:font-weight="bold" officeooo:rsid="0020199a" style:font-weight-asian="bold" style:font-name-complex="Arial" style:font-weight-complex="bold"/>
   </style:style>
   <style:style style:name="T40" style:family="text">
-   <style:text-properties fo:font-weight="bold" officeooo:rsid="001cde89" style:font-weight-asian="bold" style:font-name-complex="Arial" style:font-weight-complex="bold"/>
+   <style:text-properties fo:font-weight="bold" officeooo:rsid="0036953a" style:font-weight-asian="bold" style:font-name-complex="Arial" style:font-weight-complex="bold"/>
   </style:style>
   <style:style style:name="T41" style:family="text">
-   <style:text-properties fo:font-weight="bold" officeooo:rsid="001e74c0" style:font-weight-asian="bold" style:font-name-complex="Arial" style:font-weight-complex="bold"/>
+   <style:text-properties fo:font-weight="bold" officeooo:rsid="001cde89" style:font-weight-asian="bold" style:font-name-complex="Arial" style:font-weight-complex="bold"/>
   </style:style>
   <style:style style:name="T42" style:family="text">
-   <style:text-properties fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
+   <style:text-properties fo:font-weight="bold" officeooo:rsid="001e74c0" style:font-weight-asian="bold" style:font-name-complex="Arial" style:font-weight-complex="bold"/>
   </style:style>
   <style:style style:name="T43" style:family="text">
-   <style:text-properties fo:color="#000000" loext:opacity="100%" style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" fo:font-style="normal" fo:text-shadow="none" style:text-underline-style="none" fo:font-weight="normal" style:font-style-asian="normal" style:font-weight-asian="normal" style:text-emphasize="none"/>
+   <style:text-properties fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
   </style:style>
   <style:style style:name="T44" style:family="text">
-   <style:text-properties fo:color="#000000" loext:opacity="100%" style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" fo:font-style="normal" fo:text-shadow="none" style:text-underline-style="none" fo:font-weight="normal" officeooo:rsid="00205712" style:font-style-asian="normal" style:font-weight-asian="normal" style:text-emphasize="none"/>
+   <style:text-properties fo:color="#000000" loext:opacity="100%" style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" fo:font-style="normal" fo:text-shadow="none" style:text-underline-style="none" fo:font-weight="normal" style:font-style-asian="normal" style:font-weight-asian="normal" style:text-emphasize="none"/>
   </style:style>
   <style:style style:name="T45" style:family="text">
-   <style:text-properties fo:color="#000000" loext:opacity="100%" style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" fo:font-style="normal" fo:text-shadow="none" style:text-underline-style="none" fo:font-weight="normal" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-name-complex="Arial" style:font-weight-complex="normal" style:text-emphasize="none"/>
+   <style:text-properties fo:color="#000000" loext:opacity="100%" style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" fo:font-style="normal" fo:text-shadow="none" style:text-underline-style="none" fo:font-weight="normal" officeooo:rsid="00205712" style:font-style-asian="normal" style:font-weight-asian="normal" style:text-emphasize="none"/>
   </style:style>
   <style:style style:name="T46" style:family="text">
-   <style:text-properties fo:color="#000000" loext:opacity="100%" style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" fo:font-style="normal" fo:text-shadow="none" style:text-underline-style="none" fo:font-weight="normal" officeooo:rsid="00205712" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-name-complex="Arial" style:font-weight-complex="normal" style:text-emphasize="none"/>
+   <style:text-properties fo:color="#000000" loext:opacity="100%" style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" fo:font-style="normal" fo:text-shadow="none" style:text-underline-style="none" fo:font-weight="normal" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-name-complex="Arial" style:font-weight-complex="normal" style:text-emphasize="none"/>
   </style:style>
   <style:style style:name="T47" style:family="text">
-   <style:text-properties style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" style:font-name="Droid Sans Japanese" fo:font-size="9pt" fo:font-style="normal" fo:text-shadow="none" style:text-underline-style="none" fo:font-weight="normal" officeooo:rsid="000cde7f" style:font-size-asian="9pt" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-name-complex="Arial" style:font-size-complex="9pt" style:font-weight-complex="normal" style:text-emphasize="none"/>
+   <style:text-properties fo:color="#000000" loext:opacity="100%" style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" fo:font-style="normal" fo:text-shadow="none" style:text-underline-style="none" fo:font-weight="normal" officeooo:rsid="00205712" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-name-complex="Arial" style:font-weight-complex="normal" style:text-emphasize="none"/>
   </style:style>
   <style:style style:name="T48" style:family="text">
-   <style:text-properties style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" style:font-name="Droid Sans Japanese" fo:font-size="9pt" fo:font-style="normal" fo:text-shadow="none" style:text-underline-style="none" fo:font-weight="normal" officeooo:rsid="000cde7f" style:font-size-asian="9pt" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-size-complex="9pt" style:font-weight-complex="normal" style:text-emphasize="none"/>
+   <style:text-properties style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" style:font-name="Droid Sans Japanese" fo:font-size="9pt" fo:font-style="normal" fo:text-shadow="none" style:text-underline-style="none" fo:font-weight="normal" officeooo:rsid="000cde7f" style:font-size-asian="9pt" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-name-complex="Arial" style:font-size-complex="9pt" style:font-weight-complex="normal" style:text-emphasize="none"/>
   </style:style>
   <style:style style:name="T49" style:family="text">
-   <style:text-properties officeooo:rsid="003ca753"/>
+   <style:text-properties style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" style:font-name="Droid Sans Japanese" fo:font-size="9pt" fo:font-style="normal" fo:text-shadow="none" style:text-underline-style="none" fo:font-weight="normal" officeooo:rsid="000cde7f" style:font-size-asian="9pt" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-size-complex="9pt" style:font-weight-complex="normal" style:text-emphasize="none"/>
   </style:style>
   <style:style style:name="T50" style:family="text">
-   <style:text-properties fo:font-size="8pt" fo:font-weight="bold" style:font-size-asian="8pt" style:font-weight-asian="bold" style:font-name-complex="Arial" style:font-size-complex="8pt" style:font-weight-complex="bold"/>
+   <style:text-properties officeooo:rsid="003ca753"/>
   </style:style>
   <style:style style:name="T51" style:family="text">
-   <style:text-properties fo:font-size="8pt" fo:font-weight="normal" style:font-size-asian="8pt" style:font-weight-asian="normal" style:font-name-complex="Arial" style:font-size-complex="8pt" style:font-weight-complex="normal"/>
+   <style:text-properties fo:font-size="8pt" fo:font-weight="bold" style:font-size-asian="8pt" style:font-weight-asian="bold" style:font-name-complex="Arial" style:font-size-complex="8pt" style:font-weight-complex="bold"/>
   </style:style>
   <style:style style:name="T52" style:family="text">
+   <style:text-properties fo:font-size="8pt" fo:font-weight="bold" officeooo:rsid="001e74c0" style:font-size-asian="8pt" style:font-weight-asian="bold" style:font-name-complex="Arial" style:font-size-complex="8pt" style:font-weight-complex="bold"/>
+  </style:style>
+  <style:style style:name="T53" style:family="text">
+   <style:text-properties fo:font-size="8pt" fo:font-weight="normal" style:font-size-asian="8pt" style:font-weight-asian="normal" style:font-name-complex="Arial" style:font-size-complex="8pt" style:font-weight-complex="normal"/>
+  </style:style>
+  <style:style style:name="T54" style:family="text">
    <style:text-properties fo:font-size="8pt" fo:font-weight="normal" officeooo:rsid="001b9ac0" style:font-size-asian="8pt" style:font-weight-asian="normal" style:font-name-complex="Arial" style:font-size-complex="8pt" style:font-weight-complex="normal"/>
   </style:style>
+  <style:style style:name="T55" style:family="text">
+   <style:text-properties fo:font-size="8pt" fo:font-weight="normal" officeooo:rsid="0045b610" style:font-size-asian="8pt" style:font-weight-asian="normal" style:font-name-complex="Arial" style:font-size-complex="8pt" style:font-weight-complex="normal"/>
+  </style:style>
   <style:style style:name="fr1" style:family="graphic" style:parent-style-name="Graphics">
    <style:graphic-properties style:vertical-pos="from-top" style:horizontal-pos="from-left" style:horizontal-rel="paragraph" style:mirror="none" fo:clip="rect(0in, 0in, 0in, 0in)" draw:luminance="0%" draw:contrast="0%" draw:red="0%" draw:green="0%" draw:blue="0%" draw:gamma="100%" draw:color-inversion="false" draw:image-opacity="100%" draw:color-mode="standard"/>
   </style:style>
@@ -1663,7 +1687,7 @@
     <text:p text:style-name="Standard"/>
    </style:header>
    <style:footer>
-    <text:p text:style-name="P10"><text:span text:style-name="T11">Pagina</text:span> <text:page-number text:select-page="current">4</text:page-number></text:p>
+    <text:p text:style-name="P10"><text:span text:style-name="T11">Pagina</text:span> <text:page-number text:select-page="current">3</text:page-number></text:p>
    </style:footer>
   </style:master-page>
  </office:master-styles>
@@ -1682,10 +1706,10 @@
     <table:table-column table:style-name="Tabla2.B"/>
     <table:table-row>
      <table:table-cell table:style-name="Tabla2.A1" office:value-type="string">
-      <text:p text:style-name="P23">Fecha: <text:span text:style-name="T48"><text:placeholder text:placeholder-type="text" text:description="format_datetime(datetime.datetime.now(),user.language, &apos;%b/%d/%Y&apos;, maintenance.company.timezone)">&lt;format_datetime(datetime.datetime.now(),user.language, &apos;%b/%d/%Y&apos;, maintenance.company.timezone)&gt;</text:placeholder></text:span></text:p>
+      <text:p text:style-name="P23">Fecha: <text:span text:style-name="T49"><text:placeholder text:placeholder-type="text" text:description="format_datetime(datetime.datetime.now(),user.language, &apos;%b/%d/%Y&apos;, maintenance.company.timezone)">&lt;format_datetime(datetime.datetime.now(),user.language, &apos;%b/%d/%Y&apos;, maintenance.company.timezone)&gt;</text:placeholder></text:span></text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tabla2.A1" office:value-type="string">
-      <text:p text:style-name="P22">Consecutivo: <text:s/><text:span text:style-name="T34"><text:placeholder text:placeholder-type="text" text:description="maintenance.code">&lt;maintenance.code&gt;</text:placeholder></text:span><text:span text:style-name="T34"><text:s/></text:span></text:p>
+      <text:p text:style-name="P22">Consecutivo: <text:s/><text:span text:style-name="T35"><text:placeholder text:placeholder-type="text" text:description="maintenance.code">&lt;maintenance.code&gt;</text:placeholder></text:span><text:span text:style-name="T35"><text:s/></text:span></text:p>
      </table:table-cell>
     </table:table-row>
    </table:table>
@@ -1693,10 +1717,10 @@
     <table:table-column table:style-name="Tabla5.A"/>
     <table:table-row>
      <table:table-cell table:style-name="Tabla5.A1" office:value-type="string">
-      <text:p text:style-name="P27"><text:span text:style-name="T42">Señores:</text:span><text:span text:style-name="T31"> <text:s/></text:span><text:span text:style-name="T28"><text:placeholder text:placeholder-type="text" text:description="maintenance.propietary.name">&lt;maintenance.propietary.name&gt;</text:placeholder></text:span></text:p>
+      <text:p text:style-name="P27"><text:span text:style-name="T43">Señores:</text:span><text:span text:style-name="T32"> <text:s/></text:span><text:span text:style-name="T28"><text:placeholder text:placeholder-type="text" text:description="maintenance.propietary.name">&lt;maintenance.propietary.name&gt;</text:placeholder></text:span></text:p>
-      <text:p text:style-name="P21"><text:span text:style-name="T34">D</text:span><text:span text:style-name="T33">ocumento: </text:span><text:span text:style-name="T47"><text:placeholder text:placeholder-type="text">&lt;&quot;NIT&quot; if maintenance.propietary.tax_identifier.type==&quot;31&quot; else &quot;CC&quot;&gt;</text:placeholder></text:span><text:span text:style-name="T47"><text:s/></text:span><text:span text:style-name="T47"><text:placeholder text:placeholder-type="text">&lt;maintenance.propietary.tax_identifier.code&gt;</text:placeholder></text:span></text:p>
+      <text:p text:style-name="P21"><text:span text:style-name="T35">D</text:span><text:span text:style-name="T34">ocumento: </text:span><text:span text:style-name="T48"><text:placeholder text:placeholder-type="text">&lt;&quot;NIT&quot; if maintenance.propietary.tax_identifier.type==&quot;31&quot; else &quot;CC&quot;&gt;</text:placeholder></text:span><text:span text:style-name="T48"><text:s/></text:span><text:span text:style-name="T48"><text:placeholder text:placeholder-type="text">&lt;maintenance.propietary.tax_identifier.code&gt;</text:placeholder></text:span></text:p>
-      <text:p text:style-name="P21"><text:span text:style-name="T33">Ciudad: </text:span><text:span text:style-name="T47"><text:placeholder text:placeholder-type="text">&lt;maintenance.propietary_address.subdivision_municipality.name&gt;</text:placeholder></text:span></text:p>
+      <text:p text:style-name="P21"><text:span text:style-name="T34">Ciudad: </text:span><text:span text:style-name="T48"><text:placeholder text:placeholder-type="text">&lt;maintenance.propietary_address.subdivision_municipality.name&gt;</text:placeholder></text:span></text:p>
-      <text:p text:style-name="P27"><text:span text:style-name="T36">D</text:span><text:span text:style-name="T35">irección:</text:span><text:span text:style-name="T27"> </text:span><text:span text:style-name="T28"><text:placeholder text:placeholder-type="text" text:description="maintenance.propietary_address.street">&lt;maintenance.propietary_address.street&gt;</text:placeholder></text:span></text:p>
+      <text:p text:style-name="P27"><text:span text:style-name="T37">D</text:span><text:span text:style-name="T36">irección:</text:span><text:span text:style-name="T27"> </text:span><text:span text:style-name="T28"><text:placeholder text:placeholder-type="text" text:description="maintenance.propietary_address.street">&lt;maintenance.propietary_address.street&gt;</text:placeholder></text:span></text:p>
       <text:p text:style-name="P44"/>
      </table:table-cell>
     </table:table-row>
@@ -1705,7 +1729,7 @@
     <table:table-column table:style-name="Tabla7.A"/>
     <table:table-row>
      <table:table-cell table:style-name="Tabla7.A1" office:value-type="string">
-      <text:p text:style-name="P27"><text:span text:style-name="T36">A</text:span><text:span text:style-name="T35">sunto: </text:span><text:span text:style-name="T27">Certificación de calibración</text:span></text:p>
+      <text:p text:style-name="P27"><text:span text:style-name="T37">A</text:span><text:span text:style-name="T36">sunto: </text:span><text:span text:style-name="T27">Certificación de calibración</text:span></text:p>
      </table:table-cell>
     </table:table-row>
    </table:table>
@@ -1714,45 +1738,48 @@
     <table:table-column table:style-name="Tabla3.B"/>
     <table:table-row>
      <table:table-cell table:style-name="Tabla3.A1" office:value-type="string">
-      <text:p text:style-name="P37"><text:span text:style-name="T36">Método </text:span><text:span text:style-name="T39">de calibración</text:span><text:span text:style-name="T37">:</text:span><text:span text:style-name="T29"> </text:span><text:span text:style-name="T45">Comparaci</text:span><text:span text:style-name="T43">ón</text:span></text:p>
+      <text:p text:style-name="P37"><text:span text:style-name="T37">Método </text:span><text:span text:style-name="T40">de calibración</text:span><text:span text:style-name="T38">:</text:span><text:span text:style-name="T29"> </text:span><text:span text:style-name="T46">Comparaci</text:span><text:span text:style-name="T44">ón</text:span></text:p>
-      <text:p text:style-name="P30"><text:span text:style-name="T35">Rango de medición:</text:span><text:span text:style-name="T27"> </text:span><text:span text:style-name="T28"><text:placeholder text:placeholder-type="text" text:description="maintenance.equipment.product.measuring_range">&lt;maintenance.equipment.product.measuring_range&gt;</text:placeholder></text:span></text:p>
+      <text:p text:style-name="P30"><text:span text:style-name="T36">Rango de medición:</text:span><text:span text:style-name="T27"> </text:span><text:span text:style-name="T28"><text:placeholder text:placeholder-type="text" text:description="maintenance.equipment.product.measuring_range">&lt;maintenance.equipment.product.measuring_range&gt;</text:placeholder></text:span></text:p>
+      <text:p text:style-name="P78"><text:placeholder text:placeholder-type="text">&lt;choose test=&quot;&quot;&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P78"><text:placeholder text:placeholder-type="text">&lt;when test=&quot;maintenance.equipment.product.use_pattern.id==1&quot;&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P76"><text:span text:style-name="T41">Patrón utilizado: </text:span><text:span text:style-name="T30">Ojo Esquemático</text:span></text:p>
+      <text:p text:style-name="P79"><text:placeholder text:placeholder-type="text">&lt;/when&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P78"><text:placeholder text:placeholder-type="text">&lt;when test=&quot;maintenance.equipment.product.use_pattern.id==2&quot;&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P76"><text:span text:style-name="T41">Patrón utilizado: </text:span><text:span text:style-name="T30">Lente</text:span><text:span text:style-name="T31">s</text:span><text:span text:style-name="T30"> de Prueba</text:span></text:p>
+      <text:p text:style-name="P79"><text:placeholder text:placeholder-type="text">&lt;/when&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P78"><text:placeholder text:placeholder-type="text">&lt;when test=&quot;maintenance.equipment.product.use_pattern.id==3&quot;&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P76"><text:span text:style-name="T41">Patrón utilizado: </text:span><text:span text:style-name="T30">Pesas de Calibración</text:span></text:p>
+      <text:p text:style-name="P79"><text:placeholder text:placeholder-type="text">&lt;/when&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P78"><text:placeholder text:placeholder-type="text">&lt;when test=&quot;maintenance.equipment.product.use_pattern.id==4&quot;&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P76"><text:span text:style-name="T41">Patrón utilizado: </text:span><text:span text:style-name="T31">Esferas de Calibración</text:span></text:p>
+      <text:p text:style-name="P79"><text:placeholder text:placeholder-type="text">&lt;/when&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P79"><text:soft-page-break/><text:placeholder text:placeholder-type="text">&lt;otherwise test=&quot;&quot;&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P79"><text:span text:style-name="T52">Patrón utilizado: </text:span><text:span text:style-name="T55">Barras de Calibración</text:span></text:p>
+      <text:p text:style-name="P79"><text:placeholder text:placeholder-type="text">&lt;/otherwise&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P77"><text:placeholder text:placeholder-type="text">&lt;/choose&gt;</text:placeholder></text:p>
       <text:p text:style-name="P50"><text:placeholder text:placeholder-type="text">&lt;choose test=&quot;&quot;&gt;</text:placeholder></text:p>
-      <text:p text:style-name="P50"><text:placeholder text:placeholder-type="object">&lt;when test=&quot;maintenance.equipment.product.use_pattern == &apos;ojo_esquematico&apos;&quot;&gt;</text:placeholder></text:p>
-      <text:p text:style-name="P31"><text:span text:style-name="T40">Patrón utilizado: </text:span><text:span text:style-name="T30">Ojo Esquemático</text:span></text:p>
-      <text:p text:style-name="P51"><text:placeholder text:placeholder-type="text">&lt;/when&gt;</text:placeholder></text:p>
-      <text:p text:style-name="P50"><text:placeholder text:placeholder-type="text">&lt;when test=&quot;maintenance.equipment.product.use_pattern== &apos;lente_prueba&apos;&quot;&gt;</text:placeholder></text:p>
-      <text:p text:style-name="P31"><text:span text:style-name="T40">Patrón utilizado: </text:span><text:span text:style-name="T30">Lente de Prueba</text:span></text:p>
-      <text:p text:style-name="P51"><text:placeholder text:placeholder-type="text">&lt;/when&gt;</text:placeholder></text:p>
-      <text:p text:style-name="P50"><text:placeholder text:placeholder-type="text">&lt;when test=&quot;maintenance.equipment.product.use_pattern== &apos;pesas_calibration&apos;&quot;&gt;</text:placeholder></text:p>
-      <text:p text:style-name="P31"><text:span text:style-name="T40">Patrón utilizado: </text:span><text:span text:style-name="T30">Pesas de Calibración</text:span></text:p>
-      <text:p text:style-name="P51"><text:placeholder text:placeholder-type="text">&lt;/when&gt;</text:placeholder></text:p>
-      <text:p text:style-name="P51"><text:placeholder text:placeholder-type="text">&lt;otherwise test=&quot;&quot;&gt;</text:placeholder></text:p>
-      <text:p text:style-name="P31"><text:span text:style-name="T41">Patrón utilizado: </text:span><text:span text:style-name="T30">Esferas de Calibración</text:span></text:p>
-      <text:p text:style-name="P51"><text:placeholder text:placeholder-type="text">&lt;/otherwise&gt;</text:placeholder></text:p>
-      <text:p text:style-name="P75"><text:placeholder text:placeholder-type="text">&lt;/choose&gt;</text:placeholder></text:p>
-      <text:p text:style-name="P50"><text:soft-page-break/><text:placeholder text:placeholder-type="text">&lt;choose test=&quot;&quot;&gt;</text:placeholder></text:p>
       <text:p text:style-name="P50"><text:placeholder text:placeholder-type="text">&lt;when test=&quot;maintenance.equipment.use == &apos;medico&apos;&quot;&gt;</text:placeholder></text:p>
-      <text:p text:style-name="P49"><text:span text:style-name="T42">Uso:</text:span> Médico</text:p>
+      <text:p text:style-name="P49"><text:span text:style-name="T43">Uso:</text:span> Médico</text:p>
       <text:p text:style-name="P51"><text:placeholder text:placeholder-type="text">&lt;/when&gt;</text:placeholder></text:p>
       <text:p text:style-name="P50"><text:placeholder text:placeholder-type="text">&lt;when test=&quot;maintenance.equipment.use == &apos;basico&apos;&quot;&gt;</text:placeholder></text:p>
-      <text:p text:style-name="P50"><text:span text:style-name="T42">Uso:</text:span> Básico</text:p>
+      <text:p text:style-name="P50"><text:span text:style-name="T43">Uso:</text:span> Básico</text:p>
       <text:p text:style-name="P51"><text:placeholder text:placeholder-type="text">&lt;/when&gt;</text:placeholder></text:p>
       <text:p text:style-name="P50"><text:placeholder text:placeholder-type="text">&lt;when test=&quot;maintenance.equipment.use == &apos;apoyo&apos;&quot;&gt;</text:placeholder></text:p>
-      <text:p text:style-name="P49"><text:span text:style-name="T42">Uso:</text:span> Apoyo</text:p>
+      <text:p text:style-name="P49"><text:span text:style-name="T43">Uso:</text:span> Apoyo</text:p>
       <text:p text:style-name="P51"><text:placeholder text:placeholder-type="text">&lt;/when&gt;</text:placeholder></text:p>
       <text:p text:style-name="P51"><text:placeholder text:placeholder-type="text">&lt;otherwise test=&quot;&quot;&gt;</text:placeholder></text:p>
-      <text:p text:style-name="P49"><text:span text:style-name="T42">Uso:</text:span> n/a</text:p>
+      <text:p text:style-name="P49"><text:span text:style-name="T43">Uso:</text:span> n/a</text:p>
       <text:p text:style-name="P51"><text:placeholder text:placeholder-type="text">&lt;/otherwise&gt;</text:placeholder></text:p>
       <text:p text:style-name="P53"><text:placeholder text:placeholder-type="text">&lt;/choose&gt;</text:placeholder></text:p>
-      <text:p text:style-name="P52"><text:span text:style-name="T50">División de escala:</text:span><text:span text:style-name="T51"> </text:span><text:span text:style-name="T52"><text:placeholder text:placeholder-type="text" text:description="&quot;0.25D&quot; if maintenance.equipment.product.measuring_range == &quot;dioptria&quot; else &quot;1mmHg&quot;">&lt;&quot;0.25D&quot; if maintenance.equipment.product.measuring_range == &quot;dioptria&quot; else &quot;1mmHg&quot;&gt;</text:placeholder></text:span></text:p>
+      <text:p text:style-name="P52"><text:span text:style-name="T51">División de escala:</text:span><text:span text:style-name="T53"> </text:span><text:span text:style-name="T54"><text:placeholder text:placeholder-type="text" text:description="&quot;0.25D&quot; if maintenance.equipment.product.measuring_range == &quot;dioptria&quot; else &quot;1mmHg&quot;">&lt;&quot;0.25D&quot; if maintenance.equipment.product.measuring_range == &quot;dioptria&quot; else &quot;1mmHg&quot;&gt;</text:placeholder></text:span></text:p>
-      <text:p text:style-name="P41"><text:span text:style-name="T42">Sitio de medición: </text:span><text:span text:style-name="T31">Consultorio</text:span></text:p>
+      <text:p text:style-name="P41"><text:span text:style-name="T43">Sitio de medición: </text:span><text:span text:style-name="T32">Consultorio</text:span></text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tabla3.A1" office:value-type="string">
-      <text:p text:style-name="P27"><text:span text:style-name="T35">Equipo:</text:span><text:span text:style-name="T27"> </text:span><text:span text:style-name="T28"><text:placeholder text:placeholder-type="text" text:description="maintenance.equipment.product.name">&lt;maintenance.equipment.product.name&gt;</text:placeholder></text:span></text:p>
+      <text:p text:style-name="P27"><text:span text:style-name="T36">Equipo:</text:span><text:span text:style-name="T27"> </text:span><text:span text:style-name="T28"><text:placeholder text:placeholder-type="text" text:description="maintenance.equipment.product.name">&lt;maintenance.equipment.product.name&gt;</text:placeholder></text:span></text:p>
-      <text:p text:style-name="P28"><text:span text:style-name="T36">M</text:span><text:span text:style-name="T35">arca: </text:span><text:span text:style-name="T28"><text:placeholder text:placeholder-type="text" text:description="maintenance.equipment.mark_category.name">&lt;maintenance.equipment.mark_category.name&gt;</text:placeholder></text:span></text:p>
+      <text:p text:style-name="P28"><text:span text:style-name="T37">M</text:span><text:span text:style-name="T36">arca: </text:span><text:span text:style-name="T28"><text:placeholder text:placeholder-type="text" text:description="maintenance.equipment.mark_category.name">&lt;maintenance.equipment.mark_category.name&gt;</text:placeholder></text:span></text:p>
-      <text:p text:style-name="P29"><text:span text:style-name="T36">M</text:span><text:span text:style-name="T35">odelo: </text:span><text:span text:style-name="T28"><text:placeholder text:placeholder-type="text" text:description="maintenance.equipment.model_category.name">&lt;maintenance.equipment.model_category.name&gt;</text:placeholder></text:span></text:p>
+      <text:p text:style-name="P29"><text:span text:style-name="T37">M</text:span><text:span text:style-name="T36">odelo: </text:span><text:span text:style-name="T28"><text:placeholder text:placeholder-type="text" text:description="maintenance.equipment.model_category.name">&lt;maintenance.equipment.model_category.name&gt;</text:placeholder></text:span></text:p>
-      <text:p text:style-name="P29"><text:span text:style-name="T36">R</text:span><text:span text:style-name="T38">eferencia: </text:span><text:span text:style-name="T28"><text:placeholder text:placeholder-type="text" text:description="maintenance.equipment.reference_category.name">&lt;maintenance.equipment.reference_category.name&gt;</text:placeholder></text:span></text:p>
+      <text:p text:style-name="P29"><text:span text:style-name="T37">R</text:span><text:span text:style-name="T39">eferencia: </text:span><text:span text:style-name="T28"><text:placeholder text:placeholder-type="text" text:description="maintenance.equipment.reference_category.name">&lt;maintenance.equipment.reference_category.name&gt;</text:placeholder></text:span></text:p>
-      <text:p text:style-name="P40"><text:span text:style-name="T42">Serie:</text:span><text:span text:style-name="T31"> </text:span><text:span text:style-name="T32"><text:placeholder text:placeholder-type="text" text:description="maintenance.equipment.serial">&lt;maintenance.equipment.serial&gt;</text:placeholder></text:span></text:p>
+      <text:p text:style-name="P40"><text:span text:style-name="T43">Serie:</text:span><text:span text:style-name="T32"> </text:span><text:span text:style-name="T33"><text:placeholder text:placeholder-type="text" text:description="maintenance.equipment.serial">&lt;maintenance.equipment.serial&gt;</text:placeholder></text:span></text:p>
      </table:table-cell>
     </table:table-row>
    </table:table>
@@ -1776,13 +1803,13 @@
       <text:p text:style-name="P24">Temperatura Min</text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tabla6.A2" office:value-type="string">
-      <text:p text:style-name="P45"><text:placeholder text:placeholder-type="text" text:description="str(maintenance.temperature_min) + str(maintenance.temperature_uom.symbol) if maintenance.temperature_min else &quot;&quot;">&lt;str(maintenance.temperature_min) + str(maintenance.temperature_uom.symbol) if maintenance.temperature_min else &quot;&quot;&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P45"><text:placeholder text:placeholder-type="text" text:description="str(maintenance.temperature_min) + str(maintenance.temperature_uom.symbol) if maintenance.temperature_min else &quot;&quot;">&lt;str(maintenance.temperature_min) + str(maintenance.temperature_uom.symbol) if maintenance.temperature_min else &quot;&quot;&gt;</text:placeholder><text:soft-page-break/></text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tabla6.A2" office:value-type="string">
       <text:p text:style-name="P24">Humedad Min</text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tabla6.D2" office:value-type="string">
-      <text:p text:style-name="P45"><text:placeholder text:placeholder-type="text" text:description="str(maintenance.moisture_min) + str(maintenance.equipment.product.moisture_uom.symbol) if maintenance.moisture_min else &quot;&quot;">&lt;str(maintenance.moisture_min) + str(maintenance.equipment.product.moisture_uom.symbol) if maintenance.moisture_min else &quot;&quot;&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P45"><text:placeholder text:placeholder-type="text" text:description="str(maintenance.moisture_min) + str(maintenance.equipment.product.moisture_uom.symbol) if maintenance.moisture_min else &quot;&quot;">&lt;str(maintenance.moisture_min) + str(maintenance.equipment.product.moisture_uom.symbol) if maintenance.moisture_min else &quot;&quot;&gt;</text:placeholder><text:soft-page-break/></text:p>
      </table:table-cell>
     </table:table-row>
     <table:table-row>
@@ -1813,7 +1840,6 @@
      <table:covered-table-cell/>
      <table:covered-table-cell/>
     </table:table-row>
-    <text:soft-page-break/>
     <table:table-row>
      <table:table-cell table:style-name="Tabla8.A2" office:value-type="string">
       <text:p text:style-name="P25">Patrón</text:p>
@@ -1822,7 +1848,7 @@
       <text:p text:style-name="P25">Valor en Equipo</text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tabla8.A1" office:value-type="string">
-      <text:p text:style-name="P26">% <text:span text:style-name="T49">Error</text:span></text:p>
+      <text:p text:style-name="P26">% <text:span text:style-name="T50">Error</text:span></text:p>
      </table:table-cell>
     </table:table-row>
     <table:table-row>
@@ -1931,8 +1957,8 @@
       <text:p text:style-name="P74"/>
       <text:p text:style-name="Text">Texto <text:sequence text:ref-name="refText0" text:name="Text" text:formula="ooow:Text+1" style:num-format="1">1</text:sequence>: </text:p>
      </draw:text-box>
-    </draw:frame></text:p>
+    </draw:frame><text:soft-page-break/></text:p>
-   <text:p text:style-name="P39"><text:soft-page-break/><text:span text:style-name="T46">Este certificado expresa fielmente el resultado de las mediciones realizadas. Los resultados </text:span><text:span text:style-name="T44">contenidos en el presente certificado se refieren al momento y condiciones en que se realizaron las mediciones. No nos responsabilizamos de los perjuicios que pueden derivarse del uso inadecuado de los instrumentos calibrados. El usuario es responsable de la recalibración de sus instrumentos a intervalos apropiados.</text:span></text:p>
+   <text:p text:style-name="P39"><text:span text:style-name="T47">Este certificado expresa fielmente el resultado de las mediciones realizadas. Los resultados </text:span><text:span text:style-name="T45">contenidos en el presente certificado se refieren al momento y condiciones en que se realizaron las mediciones. No nos responsabilizamos de los perjuicios que pueden derivarse del uso inadecuado de los instrumentos calibrados. El usuario es responsable de la recalibración de sus instrumentos a intervalos apropiados.</text:span></text:p>
    <text:p text:style-name="P64"/>
    <text:p text:style-name="P64"/>
    <text:p text:style-name="P64"/>

view/maintenance_form.xml

@@ -17,7 +17,7 @@
     <label name="service_maintenance"/>
     <field name="service_maintenance"/>
     <label name="equipment_calibrate"/>
-    <field name="equipment_calibrate" invisible="1"/>    
+    <field name="equipment_calibrate"/>    
     <newline/>
     <label name="description_activity"/>
     <field name="description_activity" colspan="3"/>

view/template_form.xml

@@ -25,6 +25,8 @@ this repository contains the full copyright notices and license terms. -->
 	    <label name="equipment_type"/>
 	    <field name="equipment_type"/>
 	    <newline/>
+	    <label name="maintenance_required"/>
+	    <field name="maintenance_required"/>
 	    <label name="calibration"/>
 	    <field name="calibration"/>
 	    <newline/>