Merge branch '6.2' of https://gitea.onecluster.org/OneTeam/trytondo-optical_equipment into 6.2

__init__.py

@@ -16,6 +16,7 @@ def register():
         equipment.EquipmentMaintenance,
         equipment.EquipmentParty,
         equipment.ChangePropietary,
+        equipment.ChangeEquipment,
         configuration_equipment.Configuration,
         maintenance.Calibration,
         maintenance.CreateContractInitial,
@@ -27,8 +28,10 @@ def register():
         maintenance.AgendedInitial,
         maintenance.ReAgended,
         maintenance.ServiceMaintenanceAgended,
+        maintenance.ChangePropietaryMaintenance,
         move.Move,
         move.ShipmentOut,
+        move.ShipmentOutReturn,
         move.ShipmentInternal,
         sale.Sale,
         sale.SaleLine,
@@ -40,5 +43,14 @@ def register():
         maintenance.AssingAgended,
         maintenance.ReAssingAgended,
         maintenance.CreateContract,
+        maintenance.NewPropietaryMaintenance,
         equipment.NewPropietary,
         module='optical_equipment', type_='wizard')
+    Pool.register(
+        maintenance.CalibrationReport,
+        maintenance.MaintenanceServiceReport,
+        contract.ContractReport,
+        equipment.EquipmentReport,
+        move.PickingListDeliveryReport,
+        move.CapacitationReport,
+        module='optical_equipment', type_='report')

account.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<!--This file file is part of Tryton. The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<tryton>
+    <record model="ir.action.report" id="report_payment">
+	<field name="name">Pagos</field>
+        <field name="model">account.move.line</field>
+        <field name="report_name">account.move.line</field>
+        <field name="report">optical_equipment/report/Payment.fodt</field>
+        <field name="single" eval="True"/>
+    </record>
+    <record model="ir.action.keyword" id="report_payment_keyword">
+        <field name="keyword">form_print</field>
+        <field name="model">account.move.line,-1</field>
+        <field name="action" ref="report_payment"/>
+    </record></tryton>

configuration_equipment.py

@@ -1,8 +1,10 @@
 from trytond.model import (
     ModelSingleton, ModelSQL, ModelView, fields)
 from trytond.pyson import Id
+from trytond.modules.company.model import (
+    CompanyMultiValueMixin, CompanyValueMixin)
 
-class Configuration(ModelSingleton, ModelSQL, ModelView):
+class Configuration(ModelSingleton, ModelSQL, ModelView, CompanyMultiValueMixin):
     'Equipment Configuration'
     __name__='optical_equipment.configuration'
 
@@ -18,3 +20,17 @@ class Configuration(ModelSingleton, ModelSQL, ModelView):
     contract_sequence = fields.Many2One('ir.sequence', "Contract Sequence",
                         domain=[('sequence_type', '=', Id('optical_equipment', 'sequence_type_contract'))
                                 ])
+    temperature_min = fields.Float("Temp Min")
+    temperature_max = fields.Float("Temp Max")
+    temperature_uom = fields.Many2One('product.uom', 'Temperature UOM',
+                    domain=[('category', '=', Id('optical_equipment', "uom_cat_temperature"))],
+                    depends=['itemperature_min'])
+    moisture_min = fields.Float("Moisture Min")
+    moisture_max = fields.Float("Moisture Max")
+    moisture_uom = fields.Many2One('product.uom', "Moisture UOM",
+                    domain=[('category', '=', Id('optical_equipment', 'uom_cat_relative_humedity'))],
+                    depends=['moisture_min'])
+    sale_quote_number = fields.Many2One('ir.sequence', "Sale Quote Number",
+                                        domain=[
+                                            ('sequence_type', '=', Id('sale','sequence_type_sale'))
+                                        ])

contract.py

@@ -1,6 +1,7 @@
 from trytond.pool import Pool, PoolMeta
 from trytond.model import (
     ModelSQL, ModelView, Workflow, fields)
+from trytond.modules.company import CompanyReport
 from trytond.pyson import Eval, If, Bool
 from trytond.modules.company.model import set_employee
 from trytond.exceptions import UserError
@@ -61,8 +62,10 @@ class Contract(Workflow, ModelSQL, ModelView):
                                'readonly': Eval('state') != 'draft',
                            })
     maintenance_services = fields.Many2Many('optical_equipment_maintenance.service-equipment.contract',
-                                            'contract', 'maintenance_services', "Prorogues")
+                                            'contract', 'maintenance_services', "Prorogues",
-    equipments = fields.One2Many('optical_equipment.equipment', 'contract', "Equipments")
+                                            states={'readonly': Eval('state') != 'draft'})
+    equipments = fields.One2Many('optical_equipment.equipment', 'contract', "Equipments",
+            states={'readonly': Eval('state') != 'draft'})
     price_contract = Monetary("Price Contract", digits=price_digits, currency='currency', required=True,
                           states={'readonly': Eval('state') != 'draft'})
     state = fields.Selection([
@@ -83,10 +86,12 @@ class Contract(Workflow, ModelSQL, ModelView):
             ]
         cls._transitions = ({
             ('draft', 'running'),
+            ('running', 'draft'),
             ('running', 'closed'),
             ('running', 'cancelled'),
         })
         cls._buttons.update({
+            'draft': {'invisible': Eval('state').in_(['draft','closed'])},
             'running': {'invisible': Eval('state').in_(['cancelled', 'running'])},
             'cancelled': {'invisible': Eval('state').in_(['draft', 'cancelled'])}
         })
@@ -116,6 +121,17 @@ class Contract(Workflow, ModelSQL, ModelView):
         else:
             raise UserError(gettext('optical_equipment.msg_not_sequence_equipment'))
 
+    @classmethod
+    @ModelView.button
+    @Workflow.transition('draft')
+    def draft(cls, contracts):
+        contract = contracts[0]
+        for equipment in contract.equipments:
+            equipment.state = "uncontrated"
+            equipment.contract_history += (contract.id,)
+            equipment.save()
+
+
     @classmethod
     @ModelView.button
     @Workflow.transition('running')
@@ -151,3 +167,20 @@ class ContractEquipment(ModelSQL):
     
     equipment = fields.Many2One('optical_equipment.equipment', 'Equipment', select=True)
     contract = fields.Many2One('optical_equipment.contract', 'Contract', select=True)
+
+class ContractReport(CompanyReport):
+    __name__ = 'optical_equipment.contract'
+
+    @classmethod
+    def execute(cls, ids, data):
+        with Transaction().set_context(address_with_party=True):
+            return super(ContractReport, cls).execute(ids, data)
+
+    @classmethod
+    def get_context(cls, records, header, data):
+        pool = Pool()
+        Date = pool.get('ir.date')
+        context = super().get_context(records, header, data)
+        context['today'] = Date.today()
+
+        return context

contract.xml

@@ -40,6 +40,7 @@
 	<field name="name">Running</field>
 	<field name="sequence" eval="30"/>
 	<field name="domain" eval="[('state', '=', 'running')]" pyson="1"/>
+	<field name="count" eval="True"/>
 	<field name="act_window" ref="act_contract_form"/>
     </record>
     <record model="ir.action.act_window.domain"
@@ -47,6 +48,7 @@
 	<field name="name">Closed</field>
 	<field name="sequence" eval="40"/>
 	<field name="domain" eval="[('state', '=', 'closed')]" pyson="1"/>
+	<field name="count" eval="True"/>
 	<field name="act_window" ref="act_contract_form"/>
     </record>
     <record model="ir.action.act_window.domain"
@@ -56,6 +58,11 @@
 	<field name="domain"></field>
 	<field name="act_window" ref="act_contract_form"/>
     </record>
+    <record model="ir.model.button" id="draft_running_button">
+	<field name="name">draft</field>
+	<field name="string">Draft</field>
+	<field name="model" search="[('model', '=', 'optical_equipment.contract')]"/>
+    </record>
     <record model="ir.model.button" id="contrac_running_button">
 	<field name="name">running</field>
 	<field name="string">Run</field>

diary.py

@@ -4,6 +4,7 @@ from trytond.model import (
 class Diary(ModelSQL, ModelView):
     'Diary'
     __name__ = 'optical_equipment_maintenance.diary'
+    _rec_name = 'code'
     
     code = fields.Char("Code", select=True,states={'readonly': True })
     date_expected = fields.DateTime("Expected Date", required=True)

equipment.py

@@ -12,7 +12,7 @@ from trytond.exceptions import UserError
 from trytond.model.exceptions import AccessError
 from trytond.wizard import (
     Button, StateAction, StateTransition, StateView, Wizard)
-
+from trytond.modules.company import CompanyReport
 
 
 _MAINTENANCE_FREQUENCY = [("none", ''),
@@ -180,12 +180,13 @@ class OpticalEquipment(DeactivableMixin, Workflow, ModelSQL, ModelView):
         super(OpticalEquipment, cls).__setup__()
         cls._transitions = ({ 
             ('draft', 'registred'),
+            ('registred', 'draft'),
             ('registred', 'uncontrated'),
             ('uncontrated', 'contrated'),
             })
         cls._buttons.update({
-            # 'draft': {
+            'draft': {
-            #     'invisible': Eval('state') == 'draft'},
+                 'invisible': Eval('state') != 'registred'},
             'registred': {
                 'invisible': Eval('state').in_(['registred', 'uncontrated', 'contrated'])}}
         )
@@ -288,6 +289,12 @@ class OpticalEquipment(DeactivableMixin, Workflow, ModelSQL, ModelView):
                         gettext('estos equipos no se pueden borrar'))
         super(OpticalEquipment, cls).delete(equipments)
 
+    @classmethod
+    @ModelView.button
+    @Workflow.transition('draft')
+    def draft(cls, equipments):
+        pass
+
     @classmethod
     @ModelView.button
     @Workflow.transition('registred')
@@ -324,10 +331,16 @@ class ChangePropietary(ModelView):
     'Change of Propietary Equipment'
     __name__ = 'optical_equipment.change_propietary.form'
 
-    equipment = fields.Many2One('optical_equipment.equipment', "Equipment")
+    old_propietary = fields.Many2One('party.party', 'Old Propietary',
-    new_propietary = fields.Many2One('party.party', "New Propietary")
+                                     states={'required': True})
+    equipments = fields.Many2Many('optical_equipment.equipment', None, None, "Equipments",
+                                  domain=[('propietary', '=', Eval('old_propietary'))],
+                                  depends=['old_propietary'])
+    new_propietary = fields.Many2One('party.party', "New Propietary",
+                                     states={'required': True})
     new_address = fields.Many2One('party.address', "New Address", required=True,
-                                  domain=[('party', '=', Eval('new_propietary'))],)
+                                  domain=[('party', '=', Eval('new_propietary'))],
+                                  states={'required': True})
     change_date = fields.Date("Change Date", readonly=True)
 
     @classmethod
@@ -349,12 +362,40 @@ class NewPropietary(Wizard):
     change_propietary = StateAction('optical_equipment.act_optical_equipment_form')
     
     def do_change_propietary(self, action):
-        equipment = self.start.equipment
+        old_propietary = self.start.old_propietary
+        equipments = self.start.equipments
         new_propietary = self.start.new_propietary
         new_address = self.start.new_address
 
-        equipment.propietarys += (equipment.propietary,)
+        for equipment in equipments:
-        equipment.propietary = new_propietary
+            equipment.propietarys += (equipment.propietary,)
-        equipment.propietary_address = new_address
+            equipment.propietary = new_propietary
-        equipment.maintenance_frequency = "6" if new_propietary.client_type == 'ips' else "12"
+            equipment.propietary_address = new_address
-        equipment.save()
+            equipment.maintenance_frequency = "6" if new_propietary.client_type == 'ips' else "12"
+            equipment.save()
+
+
+class ChangeEquipment(ModelSQL):
+    'Change Equipment'
+    __name__ =  'optical_equipment.equipment-change_propietary.form'
+
+    maintenance_service = fields.Many2One('optical_equipment_maintenance.service', "Maintenance Service")
+    equipment = fields.Many2One('optical_equipment.equipment', 'Equipment')
+    change = fields.Many2One('optical_equipment.change_propietary.form', 'Change')
+
+class EquipmentReport(CompanyReport):
+    __name__ = 'optical_equipment.equipment'
+
+    @classmethod
+    def execute(cls, ids, data):
+        with Transaction().set_context(address_with_party=True):
+            return super(EquipmentReport, cls).execute(ids, data)
+
+    @classmethod
+    def get_context(cls, records, header, data):
+        pool = Pool()
+        Date = pool.get('ir.date')
+        context = super().get_context(records, header, data)
+        context['today'] = Date.today()
+
+        return context

equipment.xml

@@ -91,7 +91,11 @@
             <field name="domain"></field>
             <field name="act_window" ref="act_optical_equipment_form"/>
         </record>
-
+	<record model="ir.model.button" id="draft_equipment_button">
+	    <field name="name">draft</field>
+	    <field name="string">Draft</field>
+	    <field name="model" search="[('model', '=', 'optical_equipment.equipment')]"/>
+	</record>
 	<record model="ir.model.button" id="registred_equipment_button">
 	    <field name="name">registred</field>
 	    <field name="string">Registred</field>

locale/es.po

@@ -18,6 +18,10 @@ msgctxt "view:product.template:"
 msgid "Calibration"
 msgstr "Calibración"
 
+msgctxt "view:product.template:"
+msgid "Maintenance Activities"
+msgstr "Actividades de Mantenimiento"
+
 msgctxt "view:product.template:"
 msgid "Measurements of Equipment"
 msgstr "Medidas del Equipo"
@@ -426,7 +430,6 @@ msgctxt "field:optical_equipment.contract,invoice_address:"
 msgid "Invoice Address"
 msgstr "Dirección de Facturación"
 
-
 msgctxt "field:optical_equipment.contract,start_date:"
 msgid "Start Date"
 msgstr "Fecha Inicio"
@@ -695,6 +698,14 @@ msgctxt "field:optical_equipment_maintenance.service,description:"
 msgid "Description"
 msgstr "Descripción"
 
+msgctxt "field:sale.sale,quote_number:"
+msgid "Quote Number"
+msgstr "Cotización #"
+
+msgctxt "field:sale.sale,description:sale."
+msgid "Description"
+msgstr "Tiempo de Entrega"
+
 msgctxt "field:optical_equipment_maintenance.service,sale_date:"
 msgid "Sale Date"
 msgstr "Fecha de Venta"
@@ -747,6 +758,30 @@ msgctxt "field:optical_equipment_maintenance.service,state:"
 msgid "State"
 msgstr "Estado"
 
+msgctxt "field:optical_equipment_maintenance.service,temperature_min:"
+msgid "Temp Min"
+msgstr "Temp Mínima"
+
+msgctxt "field:optical_equipment_maintenance.service,temperature_max:"
+msgid "Temp Max"
+msgstr "Temp Máxima"
+
+msgctxt "field:optical_equipment_maintenance.service,temperature_uom:"
+msgid "Temperature UOM"
+msgstr "Temperatura UOM"
+
+msgctxt "field:optical_equipment_maintenance.service,moisture_min:"
+msgid "Moisture Min"
+msgstr "Humedad Mínima"
+
+msgctxt "field:optical_equipment_maintenance.service,moisture_max:"
+msgid "Moisture Max"
+msgstr "Humedad Máxima"
+
+msgctxt "field:optical_equipment_maintenance.service,moisture_uom:"
+msgid "Moisture UOM"
+msgstr "Humedad UOM"
+
 msgctxt "field:party.party,client_type:"
 msgid "Client type"
 msgstr "Tipo de Cliente"
@@ -911,6 +946,30 @@ msgctxt "field:optical_equipment.configuration,contract_sequence:"
 msgid "Contract Sequence"
 msgstr "Secuencia de Contratos"
 
+msgctxt "field:optical_equipment.configuration,temperature_min:"
+msgid "Temp Min"
+msgstr "Temp Mínima"
+
+msgctxt "field:optical_equipment.configuration,temperature_max:"
+msgid "Temp Max"
+msgstr "Temp Máxima"
+
+msgctxt "field:optical_equipment.configuration,temperature_uom:"
+msgid "Temperature UOM"
+msgstr "Temperatura UOM"
+
+msgctxt "field:optical_equipment.configuration,moisture_min:"
+msgid "Moisture Min"
+msgstr "Humedad Mínima"
+
+msgctxt "field:optical_equipment.configuration,moisture_max:"
+msgid "Moisture Max"
+msgstr "Humedad Máxima"
+
+msgctxt "field:optical_equipment.configuration,moisture_uom:"
+msgid "Moisture UOM"
+msgstr "Humedad UOM"
+
 msgctxt "view:optical_equipment_maintenance.diary:"
 msgid "Dates"
 msgstr "Fechas"
@@ -1275,9 +1334,13 @@ msgctxt "field:stock.move,equipment:"
 msgid "Equipment"
 msgstr "Equipo"
 
-msgctxt "field:optical_equipment.change_propietary.form,equipment:"
+msgctxt "field:optical_equipment.change_propietary.form,equipments:"
-msgid "Equipment"
+msgid "Equipments"
-msgstr "Equipo"
+msgstr "Equipos"
+
+msgctxt "field:optical_equipment.change_propietary.form,old_propietary:"
+msgid "Old Propietary"
+msgstr "Antiguo Propietario"
 
 msgctxt "field:optical_equipment.change_propietary.form,new_propietary:"
 msgid "New Propietary"
@@ -1290,3 +1353,84 @@ msgstr "Nueva Dirección"
 msgctxt "field:optical_equipment.change_propietary.form,change_date:"
 msgid "Change Date"
 msgstr "Fecha de Cambio"
+
+
+msgctxt "field:optical_equipment.change_propietary_maintenance.form,maintenance_service:"
+msgid "Maintenance Service"
+msgstr "Servicios de Mantenimiento"
+
+msgctxt "field:optical_equipment.change_propietary_maintenance.form,old_propietary:"
+msgid "Old Propietary"
+msgstr "Antiguo Propietario"
+
+msgctxt "field:optical_equipment.change_propietary_maintenance.form,new_propietary:"
+msgid "New Propietary"
+msgstr "Nuevo Propietario"
+
+msgctxt "field:optical_equipment.change_propietary_maintenance.form,new_address:"
+msgid "New Address"
+msgstr "Nueva Dirección"
+
+msgctxt "field:optical_equipment.change_propietary_maintenance.form,change_date:"
+msgid "Change Date"
+msgstr "Fecha de Cambio"
+
+msgctxt "field:stock.shipment.out,service_maintenance_initial:"
+msgid "Maintenance Initial"
+msgstr "Mantenimiento Inicial"
+
+msgctxt "model:ir.model.button,string:maintenance_initial_button"
+msgid "Maintenance Initial"
+msgstr "Mantenimiento Inicial"
+
+msgctxt "model:ir.model.button,string:maintenance_samples_button"
+msgid "Generate Samples"
+msgstr "Generar Muestras"
+
+msgctxt "model:ir.action,name:report_sale"
+msgid "Sale Equipments"
+msgstr "Venta de Equipos"
+
+msgctxt "model:ir.action,name:report_sale_internal"
+msgid "Sale Equipments Internal"
+msgstr "Venta Interna de Equipos"
+
+msgctxt "model:ir.action,name:report_purchase"
+msgid "Purchase"
+msgstr "Compra de Equipos"
+
+msgctxt "model:ir.action,name:report_maintenance_service"
+msgid "Maintenance Service"
+msgstr "Servicio de Mantenimiento"
+
+msgctxt "model:ir.action,name:report_calibration"
+msgid "Calibration"
+msgstr "Calibración"
+
+msgctxt "model:ir.action,name:report_maintenance_timeline"
+msgid "Time Line Maintenance Service"
+msgstr "Cronograma de Mantenimiento"
+
+msgctxt "model:ir.action,name:report_equipment"
+msgid "Equipment"
+msgstr "Hoja de Vida"
+
+msgctxt "model:ir.action,name:report_history_maintenance"
+msgid "Maintenance History"
+msgstr "Historico de Mantenimiento"
+
+msgctxt "model:ir.action,name:report_capacitation"
+msgid "Capacitation"
+msgstr "Certificado de Capacitación"
+
+msgctxt "model:ir.action,name:equipment_change_propietary"
+msgid "Change Propietary"
+msgstr "Cambiar Propietario"
+
+msgctxt "model:ir.action,name:equipment_change_propietary_maintenance"
+msgid "Change Propietary Maintenance"
+msgstr "Cambiar Propietario al Servicio de Mantenimiento"
+
+msgctxt "model:ir.action,name:maintenance_create_contract"
+msgid "Create Contract"
+msgstr "Crear Contrato"

maintenance.py

@@ -4,8 +4,9 @@ from trytond.model import (
     Workflow, ModelSQL, ModelView, Unique, fields, sequence_ordered)
 from trytond.wizard import (
     Button, StateAction, StateTransition, StateView, Wizard)
+from trytond.modules.company import CompanyReport
 from trytond.transaction  import Transaction
-from trytond.pyson import Bool, Eval, If, Id
+from trytond.pyson import Bool, Eval, If, Id, Equal
 from trytond.pool import Pool
 from trytond.modules.currency.fields import Monetary
 from trytond.modules.product import price_digits
@@ -50,9 +51,10 @@ class MaintenanceService(Workflow, ModelSQL, ModelView):
     propietary_address = fields.Many2One('party.address', "Propietary Address", required=True,
                                          domain=[('party', '=', Eval('propietary'))],
                                          states=_states)
-    lines = fields.One2Many('optical_equipment.maintenance', 'service_maintenance', "Lines",
+    lines = fields.One2Many('optical_equipment.maintenance', 'service_maintenance', "Lines")
-                            states={'readonly': If(Eval('state') != 'in_progress', True)})
     estimated_agended = fields.DateTime("Date Maintenance", states=_states)
+    current_agended = fields.Many2One('optical_equipment_maintenance.diary', "Current Agended",
+                                      states=_states)
     history_agended = fields.Many2Many('optical_equipment_maintenance.service-maintenance.diary', 'maintenance_service', 'agended', "History Agended", readonly=True)
     state_agended = fields.Selection([('no_agenda', "No agenda"),
                                       ('agended', "Agended"),
@@ -69,6 +71,31 @@ class MaintenanceService(Workflow, ModelSQL, ModelView):
                               ], "State", required=True, readonly=True, sort=True)
     
     rec_name = fields.Function(fields.Char('rec_name'), 'get_rec_name')
+    temperature_min = fields.Float("Temp Min", states={
+        'readonly': If(Eval('state') == 'finished', True),
+        'required': If(Eval('state') == 'in_progress', True)})
+    temperature_max = fields.Float("Temp Max",  states={
+        'readonly': If(Eval('state') == 'finished', True),
+        'required': If(Eval('state') == 'in_progress', True)})
+    temperature_uom = fields.Many2One('product.uom', 'Temperature UOM',
+                    domain=[('category', '=', Id('optical_equipment', "uom_cat_temperature"))],
+                    states={'invisible': If(Eval('temperature_min') == None, True),
+                            'readonly' : (Eval('state') == 'finished'),
+                            'required': If(Eval('state') == 'in_progress', True)},
+                    depends=['itemperature_min']
+                                      )
+    moisture_min = fields.Float("Moisture Min",  states={
+        'readonly': If(Eval('state') == 'finished', True),
+        'required': If(Eval('state') == 'in_progress', True)})
+    moisture_max = fields.Float("Moisture Max", states={
+        'readonly': If(Eval('state') == 'finished', True),
+        'required': If(Eval('state') == 'in_progress', True)})
+    moisture_uom = fields.Many2One('product.uom', "Moisture UOM",
+                    domain=[('category', '=', Id('optical_equipment', 'uom_cat_relative_humedity'))],
+                    states={'invisible' : If(Eval('moisture_min') == None, True),
+                            'readonly': Eval('state') == 'finished',
+                            'required': If(Eval('state') == 'in_progress', True)},
+                    depends=['moisture_min'])
  
     @fields.depends('maintenance_type', 'code')
     def get_rec_name(self, name):
@@ -96,6 +123,60 @@ class MaintenanceService(Workflow, ModelSQL, ModelView):
     def default_company():
         return Transaction().context.get('company')
     
+    @staticmethod
+    def default_temperature_min():
+        pool = Pool()
+        Config = pool.get('optical_equipment.configuration')
+        config = Config(1)
+        temperature_min = config.temperature_min
+
+        return temperature_min
+
+    @staticmethod
+    def default_temperature_max():
+        pool = Pool()
+        Config = pool.get('optical_equipment.configuration')
+        config = Config(1)
+        temperature_max = config.temperature_max
+
+        return temperature_max
+    
+    @staticmethod
+    def default_moisture_min():
+        pool = Pool()
+        Config = pool.get('optical_equipment.configuration')
+        config = Config(1)
+        moisture_min = config.moisture_min
+
+        return moisture_min
+
+    @staticmethod
+    def default_temperature_uom():
+        pool = Pool()
+        Config = pool.get('optical_equipment.configuration')
+        config = Config(1)
+        temperature_uom = config.temperature_uom.id
+
+        return temperature_uom
+    
+    @staticmethod
+    def default_moisture_uom():
+        pool = Pool()
+        Config = pool.get('optical_equipment.configuration')
+        config = Config(1)
+        moisture_uom = config.moisture_uom.id
+
+        return moisture_uom
+    
+    @staticmethod
+    def default_moisture_max():
+        pool = Pool()
+        Config = pool.get('optical_equipment.configuration')
+        config = Config(1)
+        moisture_max = config.moisture_max
+
+        return moisture_max
+        
     @classmethod
     def default_maintenance_type(self):
         return 'preventive'
@@ -129,6 +210,7 @@ class MaintenanceService(Workflow, ModelSQL, ModelView):
         'Return list of Model names for origin Reference'
         pool = Pool()
         Contract = pool.get('optical_equipment.contract')
+
         return [Contract.__name__]
 
 
@@ -137,6 +219,7 @@ class MaintenanceService(Workflow, ModelSQL, ModelView):
         Model = Pool().get('ir.model')
         get_name = Model.get_name
         models = cls._get_origin_contract()
+
         return [(None, '')] + [(m, get_name(m)) for m in models]
 
     @classmethod
@@ -159,13 +242,19 @@ class MaintenanceService(Workflow, ModelSQL, ModelView):
     @ModelView.button
     @Workflow.transition('in_progress')
     def in_progress(cls, maintenances):
-        pass
+        for maintenance in maintenances:
+            maintenance.current_agended.state = 'in_progress'
+            maintenance.current_agended.save()
+
 
     @classmethod
     @ModelView.button
     @Workflow.transition('finished')
     def finished(cls, maintenances):
-        pass
+        for maintenance in maintenances:
+            maintenance.current_agended.state = 'finished'
+            maintenance.current_agended.save()
+
 
 
 class Maintenance(Workflow, ModelSQL, ModelView):
@@ -177,6 +266,8 @@ class Maintenance(Workflow, ModelSQL, ModelView):
 
     service_maintenance = fields.Many2One('optical_equipment_maintenance.service', "Maintenance Service",
                                           ondelete='CASCADE', select=True,
+                                          domain=[('state', 'in', ['draft','in_progress', 'finished']),
+                                                  ('propietary', '=', Eval('propietary'))],
                                           states=_states)
     code = fields.Char(
         "Code", select=True,states={'readonly': True })
@@ -195,18 +286,20 @@ class Maintenance(Workflow, ModelSQL, ModelView):
                                          domain=[('party', '=', Eval('propietary'))],
                                          depends=['service_maintenance'])
     equipment = fields.Many2One('optical_equipment.equipment', "Equipment",
-                                domain=[('propietary', '=', Eval('propietary'))],
+                                domain=[('state', 'in', ['registred', 'uncontrated']),
+                                        ('propietary', '=', Eval('propietary')),
+                                        ('propietary_address', '=', Eval('propietary_address'))],
                                 states=_states,
                                 depends=['service_maintenance'])
+    equipment_calibrate = fields.Boolean("Calibrate Equipment", states={'readonly': True})
     #when the maintenance is in agended status
     diary = fields.One2Many('optical_equipment_maintenance.diary', 'diary')
     #Preventive maintenance
-    initial_operation = fields.Boolean("Verificiación inicial de funcionamiento")
+    initial_operation = fields.Boolean("Verificación inicial de funcionamiento")
     check_equipment = fields.Boolean("Revisión del Equipo")
     check_electric_system = fields.Boolean("Revisión del sistema electríco")
     clean_int_ext = fields.Boolean("Limpieza interior y exterior")
     clean_eyes = fields.Boolean("Limpieza de lentes y espejos")
-    optical = fields.Boolean("Optical")
     check_calibration = fields.Boolean("Verificar Calibración")
     maintenance_activity = fields.One2Many('optical_equipment_maintenance.activity', 'maintenance', "Maintenance Activitys")
     #Calibration
@@ -214,7 +307,6 @@ class Maintenance(Workflow, ModelSQL, ModelView):
                                       depends=['equipment'])
     lines_calibration = fields.One2Many('optical_equipment.maintenance.calibration_sample', 'maintenance', "Lines of Calibration",
                                         states={'readonly': Eval('state') == 'finished'})
-
     calibration_total = fields.One2Many('optical_equipment.maintenance.calibration', 'maintenance', "Calibration Total",
                                         states={'readonly': Eval('state') == 'finished'})
     maintenance_lines = fields.One2Many('optical_equipment.maintenance.line', 'maintenance', 'Lines')
@@ -227,8 +319,7 @@ class Maintenance(Workflow, ModelSQL, ModelView):
                     domain=[('category', '=', Id('optical_equipment', "uom_cat_temperature"))],
                     states={'invisible': If(Eval('temperature_min') == None, True),
                             'readonly' : (Eval('state') == 'finished')},
-                    depends=['itemperature_min']
+                    depends=['itemperature_min'])
-                                      )
     moisture_min = fields.Float("Moisture Min")
     moisture_max = fields.Float("Moisture Max")
     moisture_uom = fields.Many2One('product.uom', "Moisture UOM",
@@ -236,7 +327,7 @@ class Maintenance(Workflow, ModelSQL, ModelView):
                     states={'invisible' : If(Eval('moisture_min') == None, True),
                             'readonly': Eval('state') == 'finished'},
                     depends=['moisture_min']
-                              )
+                             )
 
     graph_calibration = fields.Binary('Graphs')
 
@@ -250,8 +341,8 @@ class Maintenance(Workflow, ModelSQL, ModelView):
         cls._buttons.update({
             'in_progress': {'invisible': Eval('state').in_(['draft', 'in_progress', 'finished'])},
             'finished': {'invisible': (Eval('state').in_(['finished'])) |
-                         ((Eval('maintenance_type') == 'corrective') & (Eval('maintenance_lines') == ())) |
+                         ((Eval('maintenance_type') == 'corrective') & (Eval('maintenance_lines') == ()))},
-                         (Eval('calibration_total') == ())},
+            'samples': {'invisible': (Eval('state').in_(['finished'])) | (Eval('lines_calibration') != ())},
             'calibrate': {'invisible': (Eval('lines_calibration') == ()) | (Eval('state').in_(['finished'])),
                           'depends': ['state'],}
                 })
@@ -260,10 +351,16 @@ class Maintenance(Workflow, ModelSQL, ModelView):
     def view_attributes(cls):
         return super(Maintenance, cls).view_attributes() + [
             ('//page[@id="preventive"]', 'states', {
-                'invisible': If(Eval('maintenance_type') != 'preventive', True),
+                'invisible': If(Eval('maintenance_type') == 'corrective', True),
             }),
             ('//page[@id="corrective"]', 'states',{
                 'invisible': If(Eval('maintenance_type') != 'corrective', True),
+            }),
+            ('//page[@id="calibration"]', 'states',{
+                'invisible': ~Eval('equipment_calibrate'),
+            }),
+            ('//page[@id="graph"]', 'states',{
+                'invisible': ~Eval('equipment_calibrate'),
             })
          ]
 
@@ -283,35 +380,6 @@ class Maintenance(Workflow, ModelSQL, ModelView):
     def default_state_agended(cls):
        return 'no_agenda'
 
-    @classmethod
-    def default_initial_operation(self):
-        return True
-
-    @classmethod
-    def default_check_equipment(self):
-        return True
-
-    @classmethod
-    def default_check_electric_system(self):
-        return True
-
-    @classmethod
-    def default_clean_int_ext(self):
-        return True
-
-    @classmethod
-    def default_clean_eyes(self):
-        return True
-
-    @classmethod
-    def default_optical(self):
-        return True
-
-    @classmethod
-    def default_check_calibration(self):
-        return True
-
-
     @fields.depends('temperature_min', 'temperature_uom')
     def on_change_temperature_min(self):
         if self.temperature_min:
@@ -327,13 +395,57 @@ class Maintenance(Workflow, ModelSQL, ModelView):
         self.moisture_uom = Measurements.search(['name', '=', 'Relative Humedity'])[0].id
 
         
+    @fields.depends('service_maintenance')
+    def on_change_service_maintenance(self):
+        if self.service_maintenance:
+            self.propietary = self.service_maintenance.propietary
+            self.propietary_address = self.service_maintenance.propietary_address
+            service = self.service_maintenance
+            self.temperature_min = service.temperature_min
+            self.temperature_max = service.temperature_max
+            self.temperature_uom = service.temperature_uom
+            self.moisture_min = service.moisture_min
+            self.moisture_max = service.moisture_max
+            self.moisture_uom = service.moisture_uom
+        else:
+            self.propietary = None
+            self.propietary_address = None 
+            self.temperature_min = None
+            self.temperature_max = None
+            self.temperature_uom = None
+            self.moisture_min = None
+            self.moisture_max = None
+            self.moisture_uom = None
+ 
+
+    @fields.depends('equipment', 'patterns_equipments')
+    def on_change_equipment(self):
+        if self.equipment:
+            self.patterns_equipments = self.equipment.product.k_pattern
+            self.equipment_calibrate = self.equipment.product.calibration
+            self.initial_operation = self.equipment.product.initial_operation 
+            self.check_equipment = self.equipment.product.check_equipment
+            self.check_electric_system = self.equipment.product.check_electric_system
+            self.clean_int_ext = self.equipment.product.clean_int_ext
+            self.clean_eyes = self.equipment.product.clean_eyes
+            self.check_calibration = self.equipment.product.check_calibration
+        else:
+            self.patterns_equipments = None
+            self.equipment_calibrate = False
+            self.initial_operation = False
+            self.check_equipment = False
+            self.check_electric_system = False
+            self.clean_int_ext = False
+            self.clean_eyes = False
+            self.check_calibration = False
+            
     def get_next_maintenance(self, action):
         next_maintenance = None
         if self.service_maintenance.estimated_agended:
             if self.propietary.client_type == "ips":
-                next_maintenance = self.service_maintenance.estimated_agended + timedelta(days=365)
-            else:
                 next_maintenance = self.service_maintenance.estimated_agended + timedelta(days=182)
+            else:
+                next_maintenance = self.service_maintenance.estimated_agended + timedelta(days=365)
         return next_maintenance
 
     def get_standard_deviation(samples):
@@ -432,7 +544,7 @@ class Maintenance(Workflow, ModelSQL, ModelView):
         x = labels
         y = errors
 
-        if equipment_risk == 'dosB':
+        if equipment_risk == 'IIB':
             if sum(errors) == 0:
                 top = 1.5
                 bottom = -1.5
@@ -446,9 +558,13 @@ class Maintenance(Workflow, ModelSQL, ModelView):
         ls = 'dotted'
         fig, ax1 = plt.subplots(nrows=1, ncols=1)
 
+        ## Límites del Eje Y
         ax1.set_ylim(bottom, top)
-        ax1.set_xlim((-21, 21))
+        ## Límites del Eje X
+        ax1.set_xlim((min(labels)-1, max(labels)+1))
+        
         ax1.yaxis.grid(True)
+        ax1.xaxis.grid(True)
 
         ax1.set_title('Error[D]')
         ax1.set_xlabel('Patrones')
@@ -464,19 +580,6 @@ class Maintenance(Workflow, ModelSQL, ModelView):
 
         return image.getvalue()
 
-
-    @fields.depends('service_maintenance')
-    def on_change_service_maintenance(self):
-        self.propietary = self.service_maintenance.propietary
-        self.propietary_address = self.service_maintenance.propietary_address
-
-    @fields.depends('equipment', 'patterns_equipments')
-    def on_change_equipment(self):
-        if self.equipment and self.equipment.product.calibration:
-            self.patterns_equipments = self.equipment.product.k_pattern
-        else:
-            self.patterns_equipments = None
-
     @classmethod
     @ModelView.button
     @Workflow.transition('in_progress')
@@ -488,13 +591,33 @@ class Maintenance(Workflow, ModelSQL, ModelView):
     @Workflow.transition('finished')
     def finished(cls, maintenances):
         for maintenance in maintenances:
-            if maintenance.calibration_total == ():
+            if maintenance.equipment.product.calibration and maintenance.calibration_total == ():
                 raise UserError("No puede finalizar este mantenimiento sin una calibración")
             else:
                 maintenance.state = 'finished'
                 maintenance.code = maintenance.id
                 maintenance.save()
 
+    @classmethod
+    @ModelView.button
+    def samples(cls, maintenances):
+        pool = Pool()
+        CalibrationSample = pool.get('optical_equipment.maintenance.calibration_sample')
+        for maintenance in maintenances:
+            patterns = maintenance.equipment.product.k_pattern_list
+            for pattern in patterns:
+                samples = []
+                calibrationSample = CalibrationSample(
+                        maintenance=maintenance.id,
+                        product=maintenance.equipment.product.template.id,
+                        value_patterns=pattern.id,
+                        value_equipment=pattern.pattern,
+                        mistake=0,
+                        mistake_rate=0)
+                samples = [calibrationSample]*5
+                maintenance.lines_calibration+=tuple(samples)
+                maintenance.save()
+             
     @classmethod
     @ModelView.button
     def calibrate(cls, maintenances):
@@ -626,12 +749,12 @@ class CalibrationSample(sequence_ordered(), ModelView, ModelSQL):
     'Samples of Calibration'
     __name__ = 'optical_equipment.maintenance.calibration_sample'
         
-    
+    maintenance = fields.Many2One('optical_equipment.maintenance', 'Maintenance')
-    maintenance = fields.Many2One('optical_equipment.maintenance', 'Maintenance',
+    product = fields.Function(fields.Integer("Product ID"), 'on_change_with_product')
-                                  ondelete='CASCADE')
     number_sample = fields.Float("Sample #",  _digits)
-    value_patterns = fields.Many2One('optical_equipment.product_pattern', "Value Pattern", required=True,
+    value_patterns = fields.Many2One('optical_equipment.product_pattern', "Value Pattern", ondelete='RESTRICT', required=True,
-                                    ondelete='RESTRICT')
+                                     domain=[('product', '=', Eval('product'))],
+                                     depends=['product'])
     value_equipment = fields.Float("Value in Equipment",  _digits, required=True,
                                    states={'readonly': Eval('value_patterns') == None})
     mistake = fields.Float("Mistake",  _digits)
@@ -639,6 +762,10 @@ class CalibrationSample(sequence_ordered(), ModelView, ModelSQL):
                                 states={'readonly': True},
                                 depends=['mistake'])
 
+    @fields.depends('maintenance', '_parent_maintenance.equipment')
+    def on_change_with_product(self, name=None):
+        if self.maintenance:
+            return self.maintenance.equipment.product.template.id
                     
     @fields.depends('value_patterns', 'value_equipment',
                     'mistake', 'mistake_rate')
@@ -701,6 +828,7 @@ class AssingAgended(Wizard):
         maintenanceService.technical = self.start.technical
         maintenanceService.state_agended = 'agended'
         maintenanceService.state = 'agended'
+        maintenanceService.current_agended = diary.id
         maintenanceService.history_agended += (diary.id,)
         maintenanceService.set_code(maintenanceService)
         maintenanceService.save()
@@ -753,7 +881,6 @@ class ServiceMaintenanceAgended(ModelSQL):
     'Service Maintenance - Agended'
     __name__ = 'optical_equipment_maintenance.service-maintenance.diary'
 
-
     maintenance_service = fields.Many2One('optical_equipment_maintenance.service', "Maintenance Service")
     agended = fields.Many2One('optical_equipment_maintenance.diary', "Agended")
         
@@ -891,9 +1018,9 @@ class CreateContractInitial(ModelView, ModelSQL):
         if self.party:
             self.invoice_address = self.party.address_get(type='invoice')
             if self.party.client_type == "ips": 
-                self.end_date =  Date.today() + timedelta(days=365)
-            else:
                 self.end_date =  Date.today() + timedelta(days=182)
+            else:
+                self.end_date =  Date.today() + timedelta(days=365)
 
             
 class CreateContract(Wizard):
@@ -952,3 +1079,86 @@ class CreateContract(Wizard):
                             price_contract=maintenance_service.sale_origin.sale.total_amount
                             )
             contract.save()
+
+class ChangePropietaryMaintenance(ModelView):
+    'Change of Propietary Equipment'
+    __name__ = 'optical_equipment.change_propietary_maintenance.form'
+
+    old_propietary = fields.Many2One('party.party', 'Old Propietary',
+                                     states={'required': True})
+    maintenance_service = fields.Many2Many('optical_equipment_maintenance.service', None, None, "Maintenance Service",
+                                  domain=[('propietary', '=', Eval('old_propietary'))],
+                                  depends=['old_propietary'])
+    new_propietary = fields.Many2One('party.party', "New Propietary",
+                                     states={'required': True})
+    new_address = fields.Many2One('party.address', "New Address", required=True,
+                                  domain=[('party', '=', Eval('new_propietary'))],
+                                  states={'required': True})
+    change_date = fields.Date("Change Date", readonly=True)
+
+    @classmethod
+    def default_change_date(cls):
+        pool = Pool()
+        Date = pool.get('ir.date')
+        return Date.today()
+
+
+class NewPropietaryMaintenance(Wizard):
+    'Change Propietary'
+    __name__ = 'optical_equipment.change_propietary_maintenance'
+
+    start = StateView('optical_equipment.change_propietary_maintenance.form',
+                      'optical_equipment.change_propietary_maintenance_view_form',[
+                          Button('Cancel', 'end', 'tryton-cancel'),
+                          Button('Create', 'change_propietary', 'tryton-ok', default=True),
+                      ])
+    change_propietary = StateAction('optical_equipment.act_optical_equipment_form')
+    
+    def do_change_propietary(self, action):
+        old_propietary = self.start.old_propietary
+        services = self.start.maintenance_service
+        new_propietary = self.start.new_propietary
+        new_address = self.start.new_address
+
+        for service in services:
+            service.propietary = new_propietary
+            service.propietary_address = new_address
+            service.save()
+            for maintenance in service.lines:
+                maintenance.propietary = new_propietary
+                maintenance.propietary_address = new_address
+                maintenance.save()
+                
+class CalibrationReport(CompanyReport):
+    __name__ = 'optical_equipment.maintenance'
+
+    @classmethod
+    def execute(cls, ids, data):
+        with Transaction().set_context(address_with_party=True):
+            return super(CalibrationReport, cls).execute(ids, data)
+
+    @classmethod
+    def get_context(cls, records, header, data):
+        pool = Pool()
+        Date = pool.get('ir.date')
+        context = super().get_context(records, header, data)
+        context['today'] = Date.today()
+
+        return context
+
+class MaintenanceServiceReport(CompanyReport):
+    __name__ = 'optical_equipment_maintenance.service'
+
+    @classmethod
+    def execute(cls, ids, data):
+        with Transaction().set_context(address_with_party=True):
+            return super(MaintenanceServiceReport, cls).execute(ids, data)
+
+    @classmethod
+    def get_context(cls, records, header, data):
+        pool = Pool()
+        Date = pool.get('ir.date')
+        context = super().get_context(records, header, data)
+        context['today'] = Date.today()
+
+        return context

maintenance.xml

@@ -18,6 +18,11 @@
 	    <field name="type">form</field>
 	    <field name="name">maintenance_form</field>
 	</record>
+	<record model="ir.ui.view" id="change_propietary_maintenance_view_form">
+	    <field name="model">optical_equipment.change_propietary_maintenance.form</field>
+	    <field name="type">form</field>
+	    <field name="name">change_propietary_maintenance_form</field>
+	</record>
 	<record model="ir.action.act_window" id="act_maintenance_service_form">
 	    <field name="name">Services Maintenance</field>
 	    <field name="res_model">optical_equipment_maintenance.service</field>
@@ -102,6 +107,11 @@
 	    <field name="name">finished</field>
 	    <field name="string">Finished</field>
 	    <field name="model" search="[('model', '=', 'optical_equipment.maintenance')]"/>
+    	</record>
+	<record model="ir.model.button" id="maintenance_samples_button">
+	    <field name="name">samples</field>
+	    <field name="string">Generate Samples</field>
+	    <field name="model" search="[('model', '=', 'optical_equipment.maintenance')]"/>
 	</record>
 	<record model="ir.model.button" id="maintenance_calibrate_button">
 	    <field name="name">calibrate</field>
@@ -236,18 +246,6 @@
             <field name="model">optical_equipment.maintenance,-1</field>
             <field name="action" ref="report_calibration"/>
     	</record>
-    	<record model="ir.action.report" id="report_capacitation">
-            <field name="name">Capacitation</field>
-            <field name="model">optical_equipment_maintenance.service</field>
-            <field name="report_name">optical_equipment_maintenance.service</field>
-            <field name="report">optical_equipment/report/Capacitation.fodt</field>
-            <field name="single" eval="True"/>
-        </record>
-	<record model="ir.action.keyword" id="report_capacitation_keyword">
-            <field name="keyword">form_print</field>
-            <field name="model">optical_equipment_maintenance.service,-1</field>
-            <field name="action" ref="report_capacitation"/>
-        </record>
 	<record model="ir.action.report" id="report_maintenance_service">
             <field name="name">Maintenance Service</field>
             <field name="model">optical_equipment.maintenance</field>
@@ -261,17 +259,27 @@
             <field name="action" ref="report_maintenance_service"/>
         </record>
 	<record model="ir.action.report" id="report_maintenance_timeline">
-            <field name="name">Maintenance Service</field>
+            <field name="name">Time Line Maintenance Service</field>
-            <field name="model">optical_equipment.maintenance</field>
+            <field name="model">optical_equipment_maintenance.service</field>
-            <field name="report_name">optical_equipment.maintenance</field>
+            <field name="report_name">optical_equipment_maintenance.service</field>
             <field name="report">optical_equipment/report/Maintenance_Timeline.fodt</field>
             <field name="single" eval="True"/>
         </record>
 	<record model="ir.action.keyword" id="report_maintenance_timeline_keyword">
             <field name="keyword">form_print</field>
-            <field name="model">optical_equipment.maintenance,-1</field>
+            <field name="model">optical_equipment_maintenance.service,-1</field>
             <field name="action" ref="report_maintenance_timeline"/>
         </record>
+	<record model="ir.action.wizard" id="equipment_change_propietary_maintenance">
+	    <field name="name">Change Propietary Maintenance</field>
+	    <field name="wiz_name">optical_equipment.change_propietary_maintenance</field>
+	    <field name="model">optical_equipment_maintenance.service</field>
+	</record>
+	<record model="ir.action.keyword" id="equipment_change_propietary_maintenance_keyword">
+	    <field name="keyword">form_action</field>
+	    <field name="model">optical_equipment_maintenance.service,-1</field>
+	    <field name="action" ref="equipment_change_propietary_maintenance"/>
+	</record>
 	<menuitem parent="menu_equipment"
 		  action="act_maintenance_service_form"
 		  sequence="20"

move.py

@@ -1,4 +1,5 @@
 from trytond.model import fields, ModelSQL, ModelView, Workflow, dualmethod
+from trytond.modules.company import CompanyReport
 from trytond.modules.company.model import employee_field, set_employee
 from trytond.pool import Pool, PoolMeta
 from trytond.pyson import Eval, If
@@ -61,25 +62,16 @@ class ShipmentOut(metaclass=PoolMeta):
     __name__ = 'stock.shipment.out'
 
     service_maintenance_initial = fields.Boolean('Maintenance Initial', states={'readonly': True})
+    sale_type = fields.Char('Type sale origin')
     
     @classmethod
     def __setup__(cls):
         super(ShipmentOut, cls).__setup__()
         cls._buttons.update({
-            'maintenance_initial': {'invisible': If(Eval('service_maintenance_initial') == True, True)}})
+            'maintenance_initial': {
-
+                'invisible': ((Eval('service_maintenance_initial',True))
-    def get_outgoing_moves(self, name):
+                              | (Eval('sale_type').in_(['maintenance', 'replaces'])))}
-        moves = []
+        })
-        if self.state == 'done':
-            for move in self.inventory_moves:
-                moves.append(move.id)
-            return moves
-        else:
-            for move in self.moves:
-                if move.from_location == self.warehouse_output:
-                    moves.append(move.id)
-            return moves
-
         
     @classmethod
     def view_attributes(cls):
@@ -90,14 +82,14 @@ class ShipmentOut(metaclass=PoolMeta):
 
     @classmethod
     @ModelView.button
-    def maintenance_initial(cls, shipments):
+    @Workflow.transition('done')
+    @set_employee('done_by')
+    def done(cls, shipments):
         pool = Pool()
-        MaintenanceService = pool.get('optical_equipment_maintenance.service')
+        Move = pool.get('stock.move')
-        Maintenance = pool.get('optical_equipment.maintenance')
+        Date = pool.get('ir.date')
-        SaleLine = pool.get('sale.line')
 
         Equipments = pool.get('optical_equipment.equipment')
-
         for shipment in shipments:
             for move in shipment.inventory_moves:
                 count = 0
@@ -117,6 +109,29 @@ class ShipmentOut(metaclass=PoolMeta):
                 else:
                     count+=1
 
+        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,
+                    })
+
+    @classmethod
+    @ModelView.button
+    def maintenance_initial(cls, shipments):
+        pool = Pool()
+        MaintenanceService = pool.get('optical_equipment_maintenance.service')
+        Maintenance = pool.get('optical_equipment.maintenance')
+        SaleLine = pool.get('sale.line')
+
+        Equipments = pool.get('optical_equipment.equipment')
+
         for shipment in shipments:
             sale_origin = shipment.outgoing_moves[0].origin.sale.id
             saleLine = SaleLine(
@@ -130,13 +145,16 @@ class ShipmentOut(metaclass=PoolMeta):
                 sale_origin=saleLine,
                 maintenance_type='initial',
                 propietary=shipment.customer.id,
-                propietary_address=shipment.delivery_address.id)
+                propietary_address=shipment.delivery_address.id,
+                state='draft')
             maintenanceService.save()
             
             serial = False
             for move in shipment.inventory_moves:
                 if move.product_equipment and move.equipment:
                     serial = True
+                elif not move.product_equipment:
+                    serial = True
                 else:
                     serial = False
 
@@ -147,48 +165,27 @@ class ShipmentOut(metaclass=PoolMeta):
                             service_maintenance=maintenanceService.id,
                             maintenance_type='initial',
                             propietary=shipment.customer.id,
+                            equipment_calibrate= True if move.equipment.product.calibration else False,
                             propietary_address=shipment.delivery_address.id,
-                            equipment=move.equipment.id)
+                            equipment=move.equipment.id,
+                            initial_operation = move.equipment.product.initial_operation,
+                            check_equipment = move.equipment.product.template.check_equipment,
+                            check_electric_system = move.equipment.product.template.check_electric_system,
+                            clean_int_ext = move.equipment.product.template.clean_int_ext,
+                            clean_eyes = move.equipment.product.template.clean_eyes,
+                            check_calibration = move.equipment.product.template.check_calibration,
+                            temperature_min = maintenanceService.temperature_min,
+                            temperature_max = maintenanceService.temperature_max,
+                            temperature_uom = maintenanceService.temperature_uom.id,
+                            moisture_min = maintenanceService.moisture_min,
+                            moisture_max = maintenanceService.moisture_max,
+                            moisture_uom = maintenanceService.moisture_uom.id)
                         maintenance.save()
-                        shipment.service_maintenance_initial = True
+                shipment.service_maintenance_initial = True
+                shipment.save()
             else:
                 raise UserError(str('Por favor Primero debe Asignar un serial a todos los Equipos.'))
 
-    def _get_inventory_move(self, move):
-        'Return inventory move for the outgoing move if necessary'
-        pool = Pool()
-        Move = pool.get('stock.move')
-        Uom = pool.get('product.uom')
-        quantity = move.quantity
-
-        for inventory_move in self.inventory_moves:
-            if (inventory_move.origin == move
-                    and inventory_move.state != 'cancelled'):
-                quantity -= Uom.compute_qty(
-                    inventory_move.uom, inventory_move.quantity, move.uom)
-        quantity = move.uom.round(quantity)
-
-        if quantity <= 0:
-            return
-
-        inventory_move = Move(
-            from_location=self.warehouse_storage,
-            to_location=move.from_location,
-            product=move.product,
-            uom=move.uom,
-            quantity=quantity,
-            shipment=self,
-            planned_date=move.planned_date,
-            company=move.company,
-            origin=move,
-            state='staging' if move.state == 'staging' else 'draft',
-            )
-
-        if inventory_move.on_change_with_unit_price_required():
-            inventory_move.unit_price = move.unit_price
-            inventory_move.currency = move.currency
-
-        return inventory_move
 
 class ShipmentInternal(metaclass=PoolMeta):
     'Shipment Interncal'
@@ -212,3 +209,46 @@ class ShipmentInternal(metaclass=PoolMeta):
         Move.do([m for s in shipments for m in s.incoming_moves])
         cls.write([s for s in shipments if not s.effective_date], {
                 'effective_date': Date.today(),})
+
+
+class ShipmentOutReturn(metaclass=PoolMeta):
+    "Customer Shipment Return"
+    __name__ = 'stock.shipment.out.return'
+
+    service_maintenance_initial = fields.Boolean('Maintenance Initial', states={'readonly': True})
+    sale_type = fields.Char('Type sale origin')
+
+    
+class PickingListDeliveryReport(CompanyReport):
+    __name__ = 'stock.shipment.out.picking_list1'
+
+    @classmethod
+    def execute(cls, ids, data):
+        with Transaction().set_context(address_with_party=True):
+            return super(PickingListDeliveryReport, cls).execute(ids, data)
+
+    @classmethod
+    def get_context(cls, records, header, data):
+        pool = Pool()
+        Date = pool.get('ir.date')
+        context = super().get_context(records, header, data)
+        context['today'] = Date.today()
+
+        return context
+
+class CapacitationReport(CompanyReport):
+    __name__ = 'stock.shipment.out.capacitation_note'
+
+    @classmethod
+    def execute(cls, ids, data):
+        with Transaction().set_context(address_with_party=True):
+            return super(CapacitationReport, cls).execute(ids, data)
+
+    @classmethod
+    def get_context(cls, records, header, data):
+        pool = Pool()
+        Date = pool.get('ir.date')
+        context = super().get_context(records, header, data)
+        context['today'] = Date.today()
+
+        return context

move.xml

@@ -28,4 +28,15 @@ this repository contains the full copyright notices and license terms. -->
             <field name="model">stock.shipment.out,-1</field>
             <field name="action" ref="report_shipment_out_picking_list1"/>
     </record>
+    <record model="ir.action.report" id="report_capacitation">
+	    <field name="name">Capacitation</field>
+            <field name="model">stock.shipment.out</field>
+            <field name="report_name">stock.shipment.out.picking_list1</field>
+            <field name="report">optical_equipment/report/Capacitation.fodt</field>
+    </record>
+    <record model="ir.action.keyword" id="report_capacitation_keyword">
+            <field name="keyword">form_print</field>
+            <field name="model">stock.shipment.out,-1</field>
+            <field name="action" ref="report_capacitation"/>
+    </record>
 </tryton>

product.py

@@ -8,9 +8,9 @@ from trytond.exceptions import UserError
 
 
 _RISK = [('n/a', "No aplíca"),
-         ('uno', 'I'),
+         ('I', 'I'),
-         ('dosA', 'IIA'),
+         ('IIA', 'IIA'),
-         ('dosB', 'IIB')]
+         ('IIB', 'IIB')]
 
 _USE = [('', ""),
         ('medico', 'Médico'),
@@ -34,7 +34,7 @@ _EQUIPMENT_TYPE = [
     ('', ""),
     ('mobiliario_optico', 'Mobiliario óptico'),
     ('refraccion', 'Refracción'),
-    ('medico', 'Medicion'),
+    ('medicion', 'Medicion'),
     ('accesorios', 'Accesorios')]
 
 NON_MEASURABLE = ['service']
@@ -155,9 +155,16 @@ class Template(metaclass=PoolMeta):
     warranty = fields.Integer("Warranty")
 
     #### calibration parameters
+    use_pattern = fields.Selection([
+        ('', ""),
+        ('ojo_esquematico', "Ojo esquematico"),
+        ('lente_prueba', "Lente de Prueba"),
+        ('pesas_calibration', "Pesas de Calibración"),
+        ('esferas_calibration', "Esferas de Calibración")], "Patrón Utilizado", states={'required': Eval('calibration', True)})
     measuring_range = fields.Selection([
+        ('No Aplíca', ""),
         ('dioptria', "Dioptria"),
-        ('mmhg', "mmHg")], "Rango de Medición")
+        ('mmhg', "mmHg")], "Rango de Medición", states={'required': Eval('calibration', True)})
     MEP = fields.Float("MEP", states={'required': Eval('calibration', False)},)
     uncertainy_pattern = fields.Float("Uncertainy Pattern", states={'required': Eval('calibration', True)}, 
                                      help="Agregar valores separados por ',' Ej:-5,+5,-10,+10")
@@ -181,6 +188,15 @@ class Template(metaclass=PoolMeta):
                                 depends=['resolution_type'])
     Usubi = fields.Integer("Usub i",states={'required': Eval('calibration', False)},)
     
+    #maintenance activities
+    initial_operation = fields.Boolean("Verificación inicial de funcionamiento")
+    check_equipment = fields.Boolean("Revisión del Equipo")
+    check_electric_system = fields.Boolean("Revisión del sistema electríco")
+    clean_int_ext = fields.Boolean("Limpieza interior y exterior")
+    clean_eyes = fields.Boolean("Limpieza de lentes y espejos")
+    optical = fields.Boolean("Optical")
+    check_calibration = fields.Boolean("Verificar Calibración")
+
 
     @classmethod
     def view_attributes(cls):
@@ -211,8 +227,20 @@ class Template(metaclass=PoolMeta):
     @fields.depends('temperature')
     def default_temperature_uom(self):
         pool = Pool()
+        measurement = None
         Measurements = pool.get('product.uom')
-        measurement = Measurements.search(['name', '=', 'Celsius'])[0].id
+        if Measurements.search(['name', '=', 'Celsius']) != []:
+            measurement = Measurements.search(['name', '=', 'Celsius'])[0].id
+
+        return measurement
+
+    @staticmethod
+    def default_frequency_uom():
+        pool = Pool()
+        measurement = None
+        Measurements = pool.get('product.uom')
+        if Measurements.search(['name', '=', 'Hertz']) != []:
+            measurement = Measurements.search(['name', '=', 'Hertz'])[0].id
         
         return measurement
 
@@ -237,10 +265,12 @@ class Template(metaclass=PoolMeta):
         return 0
 
     @staticmethod
-    def default_moisture_uom():
+    def default_voltageAC_uom():
         pool = Pool()
+        measurement = None
         Measurements = pool.get('product.uom')
-        measurement = Measurements.search(['name', '=', 'Relative Humedity'])[0].id
+        if Measurements.search(['name', '=', 'Volt']) != []:
+            measurement = Measurements.search(['name', '=', 'Volt'])[0].id
         
         return measurement
 
@@ -289,8 +319,8 @@ class Template(metaclass=PoolMeta):
         return False
 
     @staticmethod
-    def default_refurbish():
+    def default_use_pattern():
-        return False
+        return ''
 
     @staticmethod
     def default_refurbish():
@@ -333,10 +363,48 @@ class Template(metaclass=PoolMeta):
             self.voltageDC = 0
             self.frequency = 0
 
+    @classmethod
+    def copy(cls, templates, default=None):
+        if default is None:
+            default = {}
+        else:
+            default = default.copy()
+        default.setdefault('code', None)
+        default.setdefault('images', None)
+        return super().copy(templates, default=default)
+
 
 class Product(metaclass=PoolMeta):
     __name__ = 'product.product'
 
+    @classmethod
+    def copy(cls, products, default=None):
+        if default is None:
+            default = {}
+        else:
+            default = default.copy()
+
+        default.setdefault('suffix_code', None)
+        default.setdefault('code', None)
+        default.setdefault('poduct', None)
+        default.setdefault('images', None)
+        return super().copy(products, default=default)
+
+
+class Image(metaclass=PoolMeta):
+    __name__ = 'product.image'
+
+    @classmethod
+    def copy(cls, images, default=None):
+        if default is None:
+            default = {}
+        else:
+            default = default.copy()
+        default.setdefault('template', None)
+        default.setdefault('product', None)
+        return super().copy(images, default=default)
+
+    
     
 class Pattern(ModelSQL, ModelView):
     "Pattern K of equipment"
@@ -345,3 +413,4 @@ class Pattern(ModelSQL, ModelView):
     
     product = fields.Many2One('product.template', "Template", ondelete='CASCADE')
     pattern = fields.Float("Value Pattern")
+

purchase.py

@@ -12,6 +12,7 @@ from .exceptions import (
 
 from trytond.transaction import Transaction
 
+
 class Purchase(metaclass=PoolMeta):
     __name__ = 'purchase.purchase'
 
@@ -27,6 +28,25 @@ class Purchase(metaclass=PoolMeta):
                 'depends': ['invoice_state'],}   
         })
 
+    @classmethod
+    def copy(cls, purchases, default=None):
+        if default is None:
+            default = {}
+        else:
+            default = default.copy()
+
+        default.setdefault('number', None)
+        default.setdefault('invoice_state', 'none')
+        default.setdefault('invoices_ignored', None)
+        default.setdefault('moves', None)
+        default.setdefault('shipment_state', 'none')
+        default.setdefault('purchase_date', None)
+        default.setdefault('quoted_by')
+        default.setdefault('confirmed_by')
+        default.setdefault('equipment_create', None)
+
+        return super(Purchase, cls).copy(purchases, default=default)
+
     @classmethod
     @ModelView.button
     def create_equipments(cls, purchases):

purchase.xml

@@ -13,6 +13,16 @@ this repository contains the full copyright notices and license terms. -->
             <field name="inherit" ref="purchase.purchase_view_form"/>
             <field name="name">purchase_form</field>
         </record>
+	<record model="ir.ui.view" id="product_view_list_purchase_line">
+	    <field name="model">product.product</field>
+	    <field name="inherit" ref="purchase.product_view_list_purchase_line"/>
+	    <field name="name">product_list_purchase_line</field>
+	</record>
+	<record model="ir.ui.view" id="purchase_configuration_view_form">
+            <field name="model">purchase.configuration</field>
+            <field name="inherit" ref="purchase.purchase_configuration_view_form"/>
+            <field name="name">configuration_form</field>
+        </record>
 	<record model="ir.model.button" id="purchase_create_equipments">
 	    <field name="name">create_equipments</field>
 	    <field name="string">Create Equipments</field>

report/Capacitation.fodt

@@ -1,30 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<office:document xmlns:officeooo="http://openoffice.org/2009/office" 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.text">
+<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-11T22:48:50.834615710</meta:creation-date><dc:date>2022-11-02T06:41:23.280743489</dc:date><meta:editing-duration>PT1H28M15S</meta:editing-duration><meta:editing-cycles>22</meta:editing-cycles><meta:generator>LibreOffice/7.3.6.2$Linux_X86_64 LibreOffice_project/30$Build-2</meta:generator><meta:document-statistic meta:table-count="1" meta:image-count="1" meta:object-count="0" meta:page-count="1" meta:paragraph-count="19" meta:word-count="165" meta:character-count="1343" meta:non-whitespace-character-count="1193"/></office:meta>
+ <office:meta><meta:creation-date>2022-10-11T22:48:50.834615710</meta:creation-date><dc:date>2023-03-21T02:20:13.029306157</dc:date><meta:editing-duration>PT2H31M31S</meta:editing-duration><meta:editing-cycles>26</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="1" meta:image-count="1" meta:object-count="0" meta:page-count="1" meta:paragraph-count="20" meta:word-count="166" meta:character-count="1296" meta:non-whitespace-character-count="1147"/></office:meta>
  <office:settings>
   <config:config-item-set config:name="ooo:view-settings">
-   <config:config-item config:name="ViewAreaTop" config:type="long">2646</config:config-item>
+   <config:config-item config:name="ViewAreaTop" config:type="long">1376</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">22294</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">8684</config:config-item>
+   <config:config-item config:name="ViewAreaHeight" config:type="long">10982</config:config-item>
    <config:config-item config:name="ShowRedlineChanges" config:type="boolean">true</config:config-item>
    <config:config-item config:name="InBrowseMode" config:type="boolean">false</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">view2</config:config-item>
-     <config:config-item config:name="ViewLeft" config:type="long">2501</config:config-item>
+     <config:config-item config:name="ViewLeft" config:type="long">19098</config:config-item>
-     <config:config-item config:name="ViewTop" config:type="long">6008</config:config-item>
+     <config:config-item config:name="ViewTop" config:type="long">4053</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">2646</config:config-item>
+     <config:config-item config:name="VisibleTop" config:type="long">1376</config:config-item>
-     <config:config-item config:name="VisibleRight" config:type="long">22292</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">11328</config:config-item>
+     <config:config-item config:name="VisibleBottom" config:type="long">12356</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>
-     <config:config-item config:name="ZoomFactor" config:type="short">160</config:config-item>
+     <config:config-item config:name="ZoomFactor" config:type="short">200</config:config-item>
      <config:config-item config:name="IsSelectedFrame" config:type="boolean">false</config:config-item>
      <config:config-item config:name="KeepRatio" config:type="boolean">false</config:config-item>
+     <config:config-item config:name="HideWhitespace" config:type="boolean">false</config:config-item>
      <config:config-item config:name="AnchoredTextOverflowLegacy" config:type="boolean">false</config:config-item>
     </config:config-item-map-entry>
    </config:config-item-map-indexed>
@@ -55,6 +56,7 @@
    <config:config-item config:name="EmbedAsianScriptFonts" config:type="boolean">true</config:config-item>
    <config:config-item config:name="EmbedLatinScriptFonts" config:type="boolean">true</config:config-item>
    <config:config-item config:name="EmbedOnlyUsedFonts" config:type="boolean">false</config:config-item>
+   <config:config-item config:name="WordLikeWrapForAsCharFlys" config:type="boolean">false</config:config-item>
    <config:config-item config:name="ContinuousEndnotes" config:type="boolean">false</config:config-item>
    <config:config-item config:name="EmbedFonts" config:type="boolean">false</config:config-item>
    <config:config-item config:name="ClippedPictures" config:type="boolean">false</config:config-item>
@@ -82,13 +84,14 @@
    <config:config-item config:name="IsKernAsianPunctuation" config:type="boolean">false</config:config-item>
    <config:config-item config:name="SaveThumbnail" config:type="boolean">true</config:config-item>
    <config:config-item config:name="UseFormerTextWrapping" config:type="boolean">false</config:config-item>
+   <config:config-item config:name="AutoFirstLineIndentDisregardLineSpace" config:type="boolean">false</config:config-item>
    <config:config-item config:name="AddExternalLeading" config:type="boolean">true</config:config-item>
    <config:config-item config:name="AddParaTableSpacing" config:type="boolean">true</config:config-item>
    <config:config-item config:name="StylesNoDefault" config:type="boolean">false</config:config-item>
    <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">2237446</config:config-item>
+   <config:config-item config:name="Rsid" config:type="int">2486454</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>
@@ -102,6 +105,7 @@
    <config:config-item config:name="AddParaLineSpacingToTableCells" config:type="boolean">true</config:config-item>
    <config:config-item config:name="UseFormerObjectPositioning" config:type="boolean">false</config:config-item>
    <config:config-item config:name="PrintGraphics" config:type="boolean">true</config:config-item>
+   <config:config-item config:name="ImagePreferredDPI" config:type="int">0</config:config-item>
    <config:config-item config:name="SurroundTextWrapSmall" config:type="boolean">false</config:config-item>
    <config:config-item config:name="ConsiderTextWrapOnObjPos" config:type="boolean">false</config:config-item>
    <config:config-item config:name="MsWordCompTrailingBlanks" config:type="boolean">false</config:config-item>
@@ -109,6 +113,7 @@
    <config:config-item config:name="PrintRightPages" config:type="boolean">true</config:config-item>
    <config:config-item config:name="TabOverSpacing" config:type="boolean">false</config:config-item>
    <config:config-item config:name="IgnoreFirstLineIndentInNumbering" config:type="boolean">false</config:config-item>
+   <config:config-item config:name="NoNumberingShowFollowBy" config:type="boolean">false</config:config-item>
    <config:config-item config:name="RedlineProtectionKey" config:type="base64Binary"/>
    <config:config-item config:name="DoNotJustifyLinesWithManualBreak" config:type="boolean">false</config:config-item>
    <config:config-item config:name="PrintProspectRTL" config:type="boolean">false</config:config-item>
@@ -154,18 +159,20 @@
   <style:font-face style:name="Noto Sans Bengali Light" svg:font-family="&apos;Noto Sans Bengali Light&apos;" style:font-adornments="Light" style:font-family-generic="swiss" style:font-pitch="variable"/>
   <style:font-face style:name="Open Sans Condensed" svg:font-family="&apos;Open Sans Condensed&apos;" style:font-family-generic="swiss" style:font-pitch="variable"/>
   <style:font-face style:name="Source Han Sans CN" svg:font-family="&apos;Source Han Sans CN&apos;" style:font-family-generic="system" style:font-pitch="variable"/>
+  <style:font-face style:name="StarSymbol" svg:font-family="StarSymbol"/>
+  <style:font-face style:name="Verdana" svg:font-family="Verdana" style:font-family-generic="roman" style:font-pitch="variable"/>
  </office:font-face-decls>
  <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.3cm" draw:shadow-offset-y="0.3cm" draw:start-line-spacing-horizontal="0.283cm" draw:start-line-spacing-vertical="0.283cm" draw:end-line-spacing-horizontal="0.283cm" draw:end-line-spacing-vertical="0.283cm" style:flow-with-text="false"/>
+   <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:writing-mode="lr-tb" style:font-independent-line-spacing="false">
+   <style:paragraph-properties style:text-autospace="ideograph-alpha" style:line-break="strict" style:font-independent-line-spacing="false">
     <style:tab-stops/>
    </style:paragraph-properties>
-   <style:text-properties style:use-window-font-color="true" loext:opacity="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"/>
+   <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"/>
   </style:default-style>
   <style:default-style style:family="paragraph">
-   <style:paragraph-properties fo:orphans="2" fo:widows="2" fo:hyphenation-ladder-count="no-limit" style:text-autospace="ideograph-alpha" style:punctuation-wrap="hanging" style:line-break="strict" style:tab-stop-distance="1.251cm" style:writing-mode="page"/>
+   <style:paragraph-properties fo:orphans="2" fo:widows="2" fo:hyphenation-ladder-count="no-limit" style:text-autospace="ideograph-alpha" style:punctuation-wrap="hanging" style:line-break="strict" style:tab-stop-distance="0.4925in" style:writing-mode="page"/>
-   <style:text-properties style:use-window-font-color="true" loext:opacity="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" fo:hyphenate="false" fo:hyphenation-remain-char-count="2" fo:hyphenation-push-char-count="2" loext:hyphenation-no-caps="false"/>
+   <style:text-properties style:use-window-font-color="true" loext:opacity="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" fo:hyphenate="false" fo:hyphenation-remain-char-count="2" fo:hyphenation-push-char-count="2" loext:hyphenation-no-caps="false" loext:hyphenation-no-last-word="false" loext:hyphenation-word-char-count="5" loext:hyphenation-zone="no-limit"/>
   </style:default-style>
   <style:default-style style:family="table">
    <style:table-properties table:border-model="collapsing"/>
@@ -175,17 +182,17 @@
   </style:default-style>
   <style:style style:name="Standard" style:family="paragraph" style:class="text"/>
   <style:style style:name="Heading" style:family="paragraph" style:parent-style-name="Standard" style:next-style-name="Text_20_body" style:class="text">
-   <style:paragraph-properties fo:margin-top="0.423cm" fo:margin-bottom="0.212cm" style:contextual-spacing="false" fo:keep-with-next="always"/>
+   <style:paragraph-properties fo:margin-top="0.1665in" fo:margin-bottom="0.0835in" style:contextual-spacing="false" fo:keep-with-next="always"/>
    <style:text-properties style:font-name="Liberation Sans" fo:font-family="&apos;Liberation Sans&apos;" style:font-family-generic="swiss" style:font-pitch="variable" fo:font-size="14pt" style:font-name-asian="Source Han Sans CN" style:font-family-asian="&apos;Source Han Sans CN&apos;" style:font-family-generic-asian="system" style:font-pitch-asian="variable" style:font-size-asian="14pt" style:font-name-complex="Droid Sans Devanagari1" style:font-family-complex="&apos;Droid Sans Devanagari&apos;" style:font-family-generic-complex="system" style:font-pitch-complex="variable" style:font-size-complex="14pt"/>
   </style:style>
   <style:style style:name="Text_20_body" style:display-name="Text body" style:family="paragraph" style:parent-style-name="Standard" style:class="text">
-   <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0.247cm" style:contextual-spacing="false" fo:line-height="115%"/>
+   <style:paragraph-properties fo:margin-top="0in" fo:margin-bottom="0.0972in" style:contextual-spacing="false" fo:line-height="115%"/>
   </style:style>
   <style:style style:name="List" style:family="paragraph" style:parent-style-name="Text_20_body" style:class="list">
    <style:text-properties style:font-size-asian="12pt" style:font-name-complex="Droid Sans Devanagari" style:font-family-complex="&apos;Droid Sans Devanagari&apos;" style:font-family-generic-complex="swiss"/>
   </style:style>
   <style:style style:name="Caption" style:family="paragraph" style:parent-style-name="Standard" style:class="extra">
-   <style:paragraph-properties fo:margin-top="0.212cm" fo:margin-bottom="0.212cm" style:contextual-spacing="false" text:number-lines="false" text:line-number="0"/>
+   <style:paragraph-properties fo:margin-top="0.0835in" fo:margin-bottom="0.0835in" style:contextual-spacing="false" text:number-lines="false" text:line-number="0"/>
    <style:text-properties fo:font-size="12pt" fo:font-style="italic" style:font-size-asian="12pt" style:font-style-asian="italic" style:font-name-complex="Droid Sans Devanagari" style:font-family-complex="&apos;Droid Sans Devanagari&apos;" style:font-family-generic-complex="swiss" style:font-size-complex="12pt" style:font-style-complex="italic"/>
   </style:style>
   <style:style style:name="Index" style:family="paragraph" style:parent-style-name="Standard" style:class="index">
@@ -195,27 +202,75 @@
   <style:style style:name="Header_20_and_20_Footer" style:display-name="Header and Footer" style:family="paragraph" style:parent-style-name="Standard" style:class="extra">
    <style:paragraph-properties text:number-lines="false" text:line-number="0">
     <style:tab-stops>
-     <style:tab-stop style:position="8.795cm" style:type="center"/>
+     <style:tab-stop style:position="3.4626in" style:type="center"/>
-     <style:tab-stop style:position="17.59cm" style:type="right"/>
+     <style:tab-stop style:position="6.9252in" style:type="right"/>
     </style:tab-stops>
    </style:paragraph-properties>
   </style:style>
   <style:style style:name="Header" style:family="paragraph" style:parent-style-name="Header_20_and_20_Footer" style:class="extra">
    <style:paragraph-properties text:number-lines="false" text:line-number="0">
     <style:tab-stops>
-     <style:tab-stop style:position="8.795cm" style:type="center"/>
+     <style:tab-stop style:position="3.4626in" style:type="center"/>
-     <style:tab-stop style:position="17.59cm" style:type="right"/>
+     <style:tab-stop style:position="6.9252in" style:type="right"/>
     </style:tab-stops>
    </style:paragraph-properties>
   </style:style>
   <style:style style:name="Table_20_Contents" style:display-name="Table Contents" style:family="paragraph" style:parent-style-name="Standard" style:class="extra">
    <style:paragraph-properties fo:orphans="0" fo:widows="0" text:number-lines="false" text:line-number="0"/>
   </style:style>
+  <style:style style:name="Footer" style:family="paragraph" style:parent-style-name="Standard" style:class="extra">
+   <style:paragraph-properties text:number-lines="false" text:line-number="0">
+    <style:tab-stops>
+     <style:tab-stop style:position="3.4626in" style:type="center"/>
+     <style:tab-stop style:position="6.9252in" style:type="right"/>
+    </style:tab-stops>
+   </style:paragraph-properties>
+   <style:text-properties fo:font-size="9pt" style:font-size-asian="10.5pt"/>
+  </style:style>
+  <style:style style:name="Heading_20_1" style:display-name="Heading 1" style:family="paragraph" style:parent-style-name="Standard" style:next-style-name="Standard" style:default-outline-level="1" style:list-style-name="" style:class="text">
+   <style:paragraph-properties fo:keep-with-next="always"/>
+   <style:text-properties style:font-name="Verdana" fo:font-family="Verdana" style:font-family-generic="roman" style:font-pitch="variable" fo:language="es" fo:country="MX" fo:font-weight="bold" style:language-asian="es" style:country-asian="MX" style:font-weight-asian="bold"/>
+  </style:style>
+  <style:style style:name="Table_20_Heading" style:display-name="Table Heading" style:family="paragraph" style:parent-style-name="Table_20_Contents" style:class="extra">
+   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false" text:number-lines="false" text:line-number="0"/>
+   <style:text-properties fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
+  </style:style>
+  <style:style style:name="Heading_20_2" style:display-name="Heading 2" style:family="paragraph" style:parent-style-name="Heading" style:next-style-name="Text_20_body" style:class="text">
+   <style:text-properties fo:font-size="14pt" fo:font-style="italic" fo:font-weight="bold" style:font-size-asian="14pt" style:font-style-asian="italic" style:font-weight-asian="bold" style:font-size-complex="14pt" style:font-style-complex="italic" style:font-weight-complex="bold"/>
+  </style:style>
+  <style:style style:name="Frame_20_contents" style:display-name="Frame contents" style:family="paragraph" style:parent-style-name="Standard" style:class="extra"/>
+  <style:style style:name="Text" style:family="paragraph" style:parent-style-name="Caption" style:class="extra"/>
+  <style:style style:name="Subtitle" style:family="paragraph" style:parent-style-name="Heading" style:next-style-name="Text_20_body" style:class="chapter">
+   <style:paragraph-properties fo:margin-top="0.0417in" fo:margin-bottom="0.0835in" style:contextual-spacing="false" fo:text-align="center" style:justify-single-word="false"/>
+   <style:text-properties fo:font-size="18pt" style:font-size-asian="18pt" style:font-size-complex="18pt"/>
+  </style:style>
+  <style:style style:name="Title" style:family="paragraph" style:parent-style-name="Heading" style:next-style-name="Text_20_body" style:class="chapter">
+   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
+   <style:text-properties fo:font-size="28pt" fo:font-weight="bold" style:font-size-asian="28pt" style:font-weight-asian="bold" style:font-size-complex="28pt" style:font-weight-complex="bold"/>
+  </style:style>
+  <style:style style:name="Quotations" style:family="paragraph" style:parent-style-name="Standard" style:class="html">
+   <style:paragraph-properties fo:margin-left="0.3937in" fo:margin-right="0.3937in" fo:margin-top="0in" fo:margin-bottom="0.1965in" style:contextual-spacing="false" fo:text-indent="0in" style:auto-text-indent="false"/>
+  </style:style>
+  <style:style style:name="Text_20_body_20_indent" style:display-name="Text body indent" style:family="paragraph" style:parent-style-name="Text_20_body" style:class="text">
+   <style:paragraph-properties fo:margin-left="0.1965in" fo:margin-right="0in" fo:text-indent="0in" style:auto-text-indent="false"/>
+  </style:style>
+  <style:style style:name="Heading_20_3" style:display-name="Heading 3" style:family="paragraph" style:parent-style-name="Heading" style:next-style-name="Text_20_body" style:class="text">
+   <style:text-properties fo:font-size="14pt" fo:font-weight="bold" style:font-size-asian="14pt" style:font-weight-asian="bold" style:font-size-complex="14pt" style:font-weight-complex="bold"/>
+  </style:style>
   <style:style style:name="Placeholder" style:family="text">
    <style:text-properties fo:font-variant="small-caps" fo:color="#008080" loext:opacity="100%" style:text-underline-style="dotted" style:text-underline-width="auto" style:text-underline-color="font-color"/>
   </style:style>
+  <style:style style:name="Internet_20_link" style:display-name="Internet link" style:family="text">
+   <style:text-properties fo:color="#000080" loext:opacity="100%" fo:language="zxx" fo:country="none" style:text-underline-style="solid" style:text-underline-width="auto" style:text-underline-color="font-color" style:language-asian="zxx" style:country-asian="none" style:language-complex="zxx" style:country-complex="none"/>
+  </style:style>
+  <style:style style:name="Bullet_20_Symbols" style:display-name="Bullet Symbols" style:family="text">
+   <style:text-properties style:font-name="StarSymbol" fo:font-family="StarSymbol" fo:font-size="9pt" style:font-name-asian="StarSymbol" style:font-family-asian="StarSymbol" style:font-size-asian="9pt" style:font-name-complex="StarSymbol" style:font-family-complex="StarSymbol" style:font-size-complex="9pt"/>
+  </style:style>
   <style:style style:name="Graphics" style:family="graphic">
-   <style:graphic-properties text:anchor-type="paragraph" svg:x="0cm" svg:y="0cm" style:wrap="dynamic" style:number-wrapped-paragraphs="no-limit" style:wrap-contour="false" style:vertical-pos="top" style:vertical-rel="paragraph" style:horizontal-pos="center" style:horizontal-rel="paragraph"/>
+   <style:graphic-properties text:anchor-type="paragraph" svg:x="0in" svg:y="0in" style:wrap="dynamic" style:number-wrapped-paragraphs="no-limit" style:wrap-contour="false" style:vertical-pos="top" style:vertical-rel="paragraph" style:horizontal-pos="center" style:horizontal-rel="paragraph"/>
+  </style:style>
+  <style:style style:name="Frame" style:family="graphic">
+   <style:graphic-properties text:anchor-type="paragraph" svg:x="0in" svg:y="0in" fo:margin-left="0.0791in" fo:margin-right="0.0791in" fo:margin-top="0.0791in" fo:margin-bottom="0.0791in" style:wrap="parallel" style:number-wrapped-paragraphs="no-limit" style:wrap-contour="false" style:vertical-pos="top" style:vertical-rel="paragraph-content" style:horizontal-pos="center" style:horizontal-rel="paragraph-content" fo:padding="0.0591in" fo:border="0.06pt solid #000000"/>
   </style:style>
   <text:outline-style style:name="Outline">
    <text:outline-level-style text:level="1" loext:num-list-format="%1%" style:num-format="">
@@ -271,200 +326,131 @@
   </text:outline-style>
   <text:notes-configuration text:note-class="footnote" style:num-format="1" text:start-value="0" text:footnotes-position="page" text:start-numbering-at="document"/>
   <text:notes-configuration text:note-class="endnote" style:num-format="i" text:start-value="0"/>
-  <text:linenumbering-configuration text:number-lines="false" text:offset="0.499cm" style:num-format="1" text:number-position="left" text:increment="5"/>
+  <text:linenumbering-configuration text:number-lines="false" text:offset="0.1965in" style:num-format="1" text:number-position="left" text:increment="5"/>
-  <number:currency-style style:name="N108P0" style:volatile="true">
+  <number:currency-style style:name="N122P0" style:volatile="true">
    <number:currency-symbol number:language="es" number:country="CO">$</number:currency-symbol>
    <number:number number:decimal-places="2" number:min-decimal-places="2" number:min-integer-digits="1" number:grouping="true"/>
   </number:currency-style>
-  <number:currency-style style:name="N108">
+  <number:currency-style style:name="N122">
    <style:text-properties fo:color="#ff0000"/>
    <number:text>-</number:text>
    <number:currency-symbol number:language="es" number:country="CO">$</number:currency-symbol>
    <number:number number:decimal-places="2" number:min-decimal-places="2" number:min-integer-digits="1" number:grouping="true"/>
-   <style:map style:condition="value()&gt;=0" style:apply-style-name="N108P0"/>
+   <style:map style:condition="value()&gt;=0" style:apply-style-name="N122P0"/>
   </number:currency-style>
  </office:styles>
  <office:automatic-styles>
   <style:style style:name="Tabla6" style:family="table">
-   <style:table-properties style:width="17.59cm" table:align="margins"/>
+   <style:table-properties style:width="6.925in" table:align="margins"/>
   </style:style>
   <style:style style:name="Tabla6.A" style:family="table-column">
-   <style:table-column-properties style:column-width="8.795cm" style:rel-column-width="32767*"/>
+   <style:table-column-properties style:column-width="3.4625in" style:rel-column-width="32767*"/>
   </style:style>
   <style:style style:name="Tabla6.B" style:family="table-column">
-   <style:table-column-properties style:column-width="8.795cm" style:rel-column-width="32768*"/>
+   <style:table-column-properties style:column-width="3.4625in" style:rel-column-width="32768*"/>
   </style:style>
   <style:style style:name="Tabla6.A1" style:family="table-cell">
-   <style:table-cell-properties fo:padding="0.097cm" fo:border="none"/>
+   <style:table-cell-properties fo:padding="0.0382in" fo:border="none"/>
   </style:style>
   <style:style style:name="Tabla6" style:family="table">
-   <style:table-properties style:width="17.59cm" table:align="margins"/>
+   <style:table-properties style:width="6.925in" table:align="margins"/>
   </style:style>
   <style:style style:name="Tabla6.A" style:family="table-column">
-   <style:table-column-properties style:column-width="8.795cm" style:rel-column-width="32767*"/>
+   <style:table-column-properties style:column-width="3.4625in" style:rel-column-width="32767*"/>
   </style:style>
   <style:style style:name="Tabla6.B" style:family="table-column">
-   <style:table-column-properties style:column-width="8.795cm" style:rel-column-width="32768*"/>
+   <style:table-column-properties style:column-width="3.4625in" style:rel-column-width="32768*"/>
   </style:style>
   <style:style style:name="Tabla6.A1" style:family="table-cell">
-   <style:table-cell-properties fo:padding="0.097cm" fo:border="none"/>
+   <style:table-cell-properties fo:padding="0.0382in" fo:border="none"/>
   </style:style>
   <style:style style:name="P1" style:family="paragraph" style:parent-style-name="Header">
    <style:text-properties officeooo:paragraph-rsid="001a6461"/>
   </style:style>
-  <style:style style:name="P2" style:family="paragraph" style:parent-style-name="Standard">
+  <style:style style:name="P2" style:family="paragraph" style:parent-style-name="Table_20_Contents">
-   <style:text-properties style:font-name="Open Sans Condensed" fo:font-size="9pt" officeooo:paragraph-rsid="001e3f46" style:font-size-asian="9pt" style:font-size-complex="9pt"/>
+   <style:text-properties officeooo:paragraph-rsid="001a6461"/>
   </style:style>
   <style:style style:name="P3" style:family="paragraph" style:parent-style-name="Header">
-   <style:text-properties officeooo:paragraph-rsid="001a6461"/>
-  </style:style>
-  <style:style style:name="P4" style:family="paragraph" style:parent-style-name="Standard">
-   <style:text-properties officeooo:paragraph-rsid="001a6461"/>
-  </style:style>
-  <style:style style:name="P5" style:family="paragraph" style:parent-style-name="Table_20_Contents">
-   <style:text-properties officeooo:paragraph-rsid="001a6461"/>
-  </style:style>
-  <style:style style:name="P6" style:family="paragraph" style:parent-style-name="Standard">
-   <style:text-properties style:font-name="Open Sans Condensed" fo:font-size="9pt" officeooo:paragraph-rsid="001e3f46" style:font-size-asian="9pt" style:font-size-complex="9pt"/>
-  </style:style>
-  <style:style style:name="P7" style:family="paragraph" style:parent-style-name="Text_20_body">
-   <style:text-properties style:font-name="Open Sans Condensed" fo:font-size="9pt" fo:font-weight="bold" officeooo:rsid="001a6461" officeooo:paragraph-rsid="001e3f46" style:font-size-asian="9pt" style:font-weight-asian="bold" style:font-size-complex="9pt" style:font-weight-complex="bold"/>
-  </style:style>
-  <style:style style:name="P8" style:family="paragraph" style:parent-style-name="Standard">
-   <style:text-properties style:font-name="Open Sans Condensed" officeooo:rsid="001a6461" officeooo:paragraph-rsid="001a6461"/>
-  </style:style>
-  <style:style style:name="P9" style:family="paragraph" style:parent-style-name="Standard">
-   <style:text-properties style:font-name="Open Sans Condensed" fo:font-weight="bold" officeooo:rsid="001a6461" officeooo:paragraph-rsid="001a7e84" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
-  </style:style>
-  <style:style style:name="P10" style:family="paragraph" style:parent-style-name="Standard">
-   <style:text-properties style:font-name="Open Sans Condensed" fo:font-weight="bold" officeooo:rsid="001a6461" officeooo:paragraph-rsid="001a6461" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
-  </style:style>
-  <style:style style:name="P11" style:family="paragraph" style:parent-style-name="Header">
-   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
-   <style:text-properties fo:font-variant="normal" fo:text-transform="none" fo:color="#000000" loext:opacity="100%" style:text-line-through-style="none" style:text-line-through-type="none" style:text-position="0% 100%" style:font-name="Open Sans Condensed" fo:font-size="10.5pt" fo:font-style="normal" style:text-underline-style="none" fo:font-weight="normal" officeooo:paragraph-rsid="001a6461" style:font-name-asian="Calibri" style:font-size-asian="10.5pt" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-name-complex="Calibri" style:font-size-complex="10.5pt" style:font-weight-complex="normal"/>
-  </style:style>
-  <style:style style:name="P12" style:family="paragraph" style:parent-style-name="Header">
-   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
-   <style:text-properties fo:font-variant="normal" fo:text-transform="none" fo:color="#000000" loext:opacity="100%" style:text-line-through-style="none" style:text-line-through-type="none" style:text-position="0% 100%" style:font-name="Noto Sans Bengali Light" fo:font-size="10pt" fo:font-style="normal" style:text-underline-style="none" fo:font-weight="normal" officeooo:paragraph-rsid="001a6461" style:font-name-asian="Calibri" style:font-size-asian="10pt" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-name-complex="Calibri" style:font-size-complex="10pt" style:font-weight-complex="normal"/>
-  </style:style>
-  <style:style style:name="P13" style:family="paragraph" style:parent-style-name="Header">
    <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
    <style:text-properties fo:font-variant="normal" fo:text-transform="none" fo:color="#000000" loext:opacity="100%" style:text-line-through-style="none" style:text-line-through-type="none" style:text-position="0% 100%" style:font-name="Droid Sans Japanese1" fo:font-size="7pt" fo:font-style="normal" style:text-underline-style="none" fo:font-weight="normal" officeooo:paragraph-rsid="001a6461" style:font-name-asian="Calibri" style:font-size-asian="7pt" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-name-complex="Calibri" style:font-size-complex="7pt" style:font-weight-complex="normal"/>
   </style:style>
-  <style:style style:name="P14" style:family="paragraph" style:parent-style-name="Header">
+  <style:style style:name="P4" style:family="paragraph" style:parent-style-name="Header">
    <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
    <style:text-properties fo:font-variant="normal" fo:text-transform="none" fo:color="#000000" loext:opacity="100%" style:text-line-through-style="none" style:text-line-through-type="none" style:text-position="0% 100%" style:font-name="Droid Sans Japanese1" fo:font-size="7pt" fo:font-style="normal" style:text-underline-style="none" fo:font-weight="normal" officeooo:paragraph-rsid="00203a45" style:font-name-asian="Calibri" style:font-size-asian="7pt" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-name-complex="Calibri" style:font-size-complex="7pt" style:font-weight-complex="normal"/>
   </style:style>
-  <style:style style:name="P15" style:family="paragraph" style:parent-style-name="Standard">
+  <style:style style:name="P5" style:family="paragraph" style:parent-style-name="Standard">
-   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
+   <style:text-properties style:font-name="Open Sans Condensed" fo:font-size="9pt" officeooo:paragraph-rsid="001e3f46" style:font-size-asian="9pt" style:font-size-complex="9pt"/>
   </style:style>
-  <style:style style:name="P16" style:family="paragraph" style:parent-style-name="Text_20_body">
+  <style:style style:name="P6" style:family="paragraph" style:parent-style-name="Header">
-   <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:margin-top="0cm" fo:margin-bottom="0.011cm" style:contextual-spacing="false" fo:text-indent="0cm" style:auto-text-indent="false"/>
+   <style:text-properties officeooo:paragraph-rsid="001a6461"/>
-   <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="12pt" fo:font-weight="bold" officeooo:rsid="001cd488" officeooo:paragraph-rsid="001e3f46" 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="P17" style:family="paragraph" style:parent-style-name="Text_20_body">
+  <style:style style:name="P7" style:family="paragraph" style:parent-style-name="Table_20_Contents">
-   <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="9pt" fo:font-weight="bold" officeooo:rsid="001a6461" officeooo:paragraph-rsid="001e3f46" style:font-size-asian="9pt" style:font-weight-asian="bold" style:font-size-complex="9pt" style:font-weight-complex="bold"/>
+   <style:text-properties officeooo:paragraph-rsid="001a6461"/>
   </style:style>
-  <style:style style:name="P18" style:family="paragraph" style:parent-style-name="Standard">
+  <style:style style:name="P8" style:family="paragraph" style:parent-style-name="Standard">
-   <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="9pt" officeooo:rsid="001a6461" officeooo:paragraph-rsid="001e3f46" style:font-size-asian="9pt" style:font-size-complex="9pt"/>
+   <style:text-properties style:font-name="Open Sans Condensed" fo:font-size="9pt" officeooo:paragraph-rsid="001e3f46" style:font-size-asian="9pt" style:font-size-complex="9pt"/>
   </style:style>
-  <style:style style:name="P19" style:family="paragraph" style:parent-style-name="Standard">
+  <style:style style:name="P9" style:family="paragraph" style:parent-style-name="Standard">
    <style:text-properties style:font-name="Droid Sans Japanese1" officeooo:rsid="001a6461" officeooo:paragraph-rsid="001a6461"/>
   </style:style>
-  <style:style style:name="P20" style:family="paragraph" style:parent-style-name="Standard">
+  <style:style style:name="P10" style:family="paragraph" style:parent-style-name="Standard">
-   <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="10pt" officeooo:rsid="001a6461" officeooo:paragraph-rsid="001a6461" style:font-size-asian="10pt" style:font-size-complex="10pt"/>
-  </style:style>
-  <style:style style:name="P21" style:family="paragraph" style:parent-style-name="Standard">
-   <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="10pt" fo:font-weight="bold" officeooo:rsid="001a6461" officeooo:paragraph-rsid="001a7e84" style:font-size-asian="10pt" style:font-weight-asian="bold" style:font-size-complex="10pt" style:font-weight-complex="bold"/>
-  </style:style>
-  <style:style style:name="P22" style:family="paragraph" style:parent-style-name="Standard">
-   <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="10pt" fo:font-weight="bold" officeooo:rsid="001a6461" officeooo:paragraph-rsid="001a6461" style:font-size-asian="10pt" style:font-weight-asian="bold" style:font-size-complex="10pt" style:font-weight-complex="bold"/>
-  </style:style>
-  <style:style style:name="P23" style:family="paragraph" style:parent-style-name="Standard">
    <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="8pt" officeooo:rsid="001a6461" officeooo:paragraph-rsid="001a6461" style:font-size-asian="8pt" style:font-size-complex="8pt"/>
   </style:style>
-  <style:style style:name="P24" style:family="paragraph" style:parent-style-name="Standard">
+  <style:style style:name="P11" style:family="paragraph" style:parent-style-name="Standard">
-   <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="8pt" officeooo:rsid="001a6461" officeooo:paragraph-rsid="001e3f46" style:font-size-asian="8pt" style:font-size-complex="8pt"/>
-  </style:style>
-  <style:style style:name="P25" style:family="paragraph" style:parent-style-name="Standard">
    <style:paragraph-properties fo:text-align="start" style:justify-single-word="false"/>
    <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="8pt" officeooo:rsid="001a6461" officeooo:paragraph-rsid="001a6461" style:font-size-asian="8pt" style:font-size-complex="8pt"/>
   </style:style>
-  <style:style style:name="P26" style:family="paragraph" style:parent-style-name="Standard">
+  <style:style style:name="P12" style:family="paragraph" style:parent-style-name="Standard">
    <style:paragraph-properties fo:text-align="justify" style:justify-single-word="false"/>
    <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="8pt" officeooo:rsid="001a6461" officeooo:paragraph-rsid="001a6461" style:font-size-asian="8pt" style:font-size-complex="8pt"/>
   </style:style>
-  <style:style style:name="P27" style:family="paragraph" style:parent-style-name="Standard">
+  <style:style style:name="P13" style:family="paragraph" style:parent-style-name="Standard">
    <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="8pt" fo:font-weight="bold" officeooo:rsid="001a6461" officeooo:paragraph-rsid="001a7e84" style:font-size-asian="8pt" style:font-weight-asian="bold" style:font-size-complex="8pt" style:font-weight-complex="bold"/>
   </style:style>
-  <style:style style:name="P28" style:family="paragraph" style:parent-style-name="Standard">
+  <style:style style:name="P14" style:family="paragraph" style:parent-style-name="Standard">
    <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="8pt" fo:font-weight="bold" officeooo:rsid="001a6461" officeooo:paragraph-rsid="001a6461" style:font-size-asian="8pt" style:font-weight-asian="bold" style:font-size-complex="8pt" style:font-weight-complex="bold"/>
   </style:style>
-  <style:style style:name="P29" style:family="paragraph" style:parent-style-name="Text_20_body">
+  <style:style style:name="P15" style:family="paragraph" style:parent-style-name="Standard">
-   <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="8pt" fo:font-weight="bold" officeooo:rsid="001a6461" officeooo:paragraph-rsid="001e3f46" style:font-size-asian="8pt" style:font-weight-asian="bold" style:font-size-complex="8pt" style:font-weight-complex="bold"/>
+   <style:paragraph-properties fo:margin-left="0in" fo:margin-right="0in" fo:margin-top="0in" fo:margin-bottom="0.0043in" style:contextual-spacing="false" fo:text-indent="0in" style:auto-text-indent="false"/>
+   <style:text-properties style:font-name="Droid Sans Japanese" fo:font-size="8pt" fo:font-weight="bold" officeooo:rsid="001b9ac0" officeooo:paragraph-rsid="0024622d" 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="P30" style:family="paragraph" style:parent-style-name="Text_20_body">
+  <style:style style:name="P16" style:family="paragraph" style:parent-style-name="Standard">
-   <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:margin-top="0cm" fo:margin-bottom="0.011cm" style:contextual-spacing="false" fo:text-indent="0cm" style:auto-text-indent="false"/>
+   <style:paragraph-properties fo:text-align="start" style:justify-single-word="false"/>
-   <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="8pt" fo:font-weight="bold" officeooo:rsid="001b9ac0" officeooo:paragraph-rsid="001e3f46" 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 style:font-name="Droid Sans Japanese" fo:font-size="8pt" fo:font-weight="bold" officeooo:rsid="000cde7f" officeooo:paragraph-rsid="0024622d" style:font-size-asian="8pt" style:font-weight-asian="bold" style:font-size-complex="8pt" style:font-weight-complex="bold"/>
   </style:style>
-  <style:style style:name="P31" style:family="paragraph" style:parent-style-name="Text_20_body">
+  <style:style style:name="P17" style:family="paragraph" style:parent-style-name="Text_20_body">
-   <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:margin-top="0cm" fo:margin-bottom="0.011cm" style:contextual-spacing="false" fo:text-indent="0cm" style:auto-text-indent="false"/>
+   <style:text-properties style:font-name="Droid Sans Japanese" fo:font-size="8pt" fo:font-weight="bold" officeooo:rsid="001a6461" officeooo:paragraph-rsid="001e3f46" style:font-size-asian="8pt" style:font-weight-asian="bold" style:font-size-complex="8pt" style:font-weight-complex="bold"/>
-   <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="8pt" fo:font-weight="bold" officeooo:rsid="001cd488" officeooo:paragraph-rsid="00203a45" 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="P18" style:family="paragraph" style:parent-style-name="Text_20_body">
+   <style:paragraph-properties fo:margin-left="0in" fo:margin-right="0in" fo:margin-top="0in" fo:margin-bottom="0.0043in" style:contextual-spacing="false" fo:text-indent="0in" style:auto-text-indent="false"/>
+   <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="8pt" fo:font-style="normal" fo:text-shadow="none" style:text-underline-style="none" fo:font-weight="bold" officeooo:rsid="000cde7f" officeooo:paragraph-rsid="0024622d" style:font-size-asian="8pt" style:font-style-asian="normal" style:font-weight-asian="bold" style:font-name-complex="Arial" style:font-size-complex="8pt" style:font-weight-complex="bold" style:text-emphasize="none"/>
+  </style:style>
+  <style:style style:name="P19" style:family="paragraph" style:parent-style-name="Header">
+   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
+   <style:text-properties fo:font-variant="normal" fo:text-transform="none" fo:color="#000000" loext:opacity="100%" style:text-line-through-style="none" style:text-line-through-type="none" style:text-position="0% 100%" style:font-name="Droid Sans Japanese1" fo:font-size="7pt" fo:font-style="normal" style:text-underline-style="none" fo:font-weight="normal" officeooo:paragraph-rsid="001a6461" style:font-name-asian="Calibri" style:font-size-asian="7pt" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-name-complex="Calibri" style:font-size-complex="7pt" style:font-weight-complex="normal"/>
+  </style:style>
+  <style:style style:name="P20" style:family="paragraph" style:parent-style-name="Header">
+   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
+   <style:text-properties fo:font-variant="normal" fo:text-transform="none" fo:color="#000000" loext:opacity="100%" style:text-line-through-style="none" style:text-line-through-type="none" style:text-position="0% 100%" style:font-name="Droid Sans Japanese1" fo:font-size="7pt" fo:font-style="normal" style:text-underline-style="none" fo:font-weight="normal" officeooo:paragraph-rsid="00203a45" style:font-name-asian="Calibri" style:font-size-asian="7pt" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-name-complex="Calibri" style:font-size-complex="7pt" style:font-weight-complex="normal"/>
   </style:style>
   <style:style style:name="T1" style:family="text">
-   <style:text-properties officeooo:rsid="001a7e84"/>
-  </style:style>
-  <style:style style:name="T2" style:family="text">
-   <style:text-properties fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
-  </style:style>
-  <style:style style:name="T3" style:family="text">
-   <style:text-properties fo:font-weight="normal" officeooo:rsid="001b9ac0" style:font-weight-asian="normal" style:font-name-complex="Arial" style:font-weight-complex="normal"/>
-  </style:style>
-  <style:style style:name="T4" style:family="text">
-   <style:text-properties fo:font-weight="normal" officeooo:rsid="001e3f46" style:font-weight-asian="normal" style:font-name-complex="Arial" style:font-weight-complex="normal"/>
-  </style:style>
-  <style:style style:name="T5" style:family="text">
-   <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="T6" style:family="text">
-   <style:text-properties officeooo:rsid="001e3f46"/>
-  </style:style>
-  <style:style style:name="T7" style:family="text">
-   <style:text-properties officeooo:rsid="001b9ac0" style:font-name-complex="Arial"/>
-  </style:style>
-  <style:style style:name="T8" style:family="text">
-   <style:text-properties officeooo:rsid="001e3f46" style:font-name-complex="Arial"/>
-  </style:style>
-  <style:style style:name="T9" 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="T10" style:family="text">
-   <style:text-properties fo:font-size="10pt" style:font-size-asian="10pt" style:font-size-complex="10pt"/>
-  </style:style>
-  <style:style style:name="T11" style:family="text">
    <style:text-properties style:language-asian="es" style:country-asian="CO"/>
   </style:style>
-  <style:style style:name="T12" style:family="text">
+  <style:style style:name="T2" 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:language-asian="es" style:country-asian="CO"/>
   </style:style>
-  <style:style style:name="T13" style:family="text">
+  <style:style style:name="T3" style:family="text">
-   <style:text-properties style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" 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 fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
-  </style:style>
-  <style:style style:name="T14" style:family="text">
-   <style:text-properties style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" fo:font-size="7pt" fo:font-style="normal" fo:text-shadow="none" style:text-underline-style="none" fo:font-weight="normal" officeooo:rsid="000cde7f" style:font-size-asian="7pt" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-size-complex="7pt" style:font-weight-complex="normal" style:text-emphasize="none"/>
-  </style:style>
-  <style:style style:name="T15" style:family="text">
-   <style:text-properties 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="000cde7f" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-weight-complex="normal" style:text-emphasize="none"/>
   </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(0cm, 0cm, 0cm, 0cm)" 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: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>
   <style:page-layout style:name="pm1">
-   <style:page-layout-properties fo:page-width="21.59cm" fo:page-height="27.94cm" style:num-format="1" style:print-orientation="portrait" fo:margin-top="2cm" fo:margin-bottom="2cm" fo:margin-left="2cm" fo:margin-right="2cm" style:writing-mode="lr-tb" style:layout-grid-color="#c0c0c0" style:layout-grid-lines="20" style:layout-grid-base-height="0.706cm" style:layout-grid-ruby-height="0.353cm" style:layout-grid-mode="none" style:layout-grid-ruby-below="false" style:layout-grid-print="false" style:layout-grid-display="false" style:footnote-max-height="0cm" loext:margin-gutter="0cm">
+   <style:page-layout-properties fo:page-width="8.5in" fo:page-height="11in" style:num-format="1" style:print-orientation="portrait" fo:margin-top="0.7874in" fo:margin-bottom="0.7874in" fo:margin-left="0.7874in" fo:margin-right="0.7874in" style:writing-mode="lr-tb" style:layout-grid-color="#c0c0c0" style:layout-grid-lines="20" style:layout-grid-base-height="0.278in" style:layout-grid-ruby-height="0.139in" style:layout-grid-mode="none" style:layout-grid-ruby-below="false" style:layout-grid-print="false" style:layout-grid-display="false" style:footnote-max-height="0in" loext:margin-gutter="0in">
-    <style:footnote-sep style:width="0.018cm" style:distance-before-sep="0.101cm" style:distance-after-sep="0.101cm" style:line-style="solid" style:adjustment="left" style:rel-width="25%" style:color="#000000"/>
+    <style:footnote-sep style:width="0.0071in" style:distance-before-sep="0.0398in" style:distance-after-sep="0.0398in" style:line-style="solid" style:adjustment="left" style:rel-width="25%" style:color="#000000"/>
    </style:page-layout-properties>
    <style:header-style>
-    <style:header-footer-properties fo:min-height="0cm" fo:margin-left="0cm" fo:margin-right="0cm" fo:margin-bottom="0.499cm" fo:background-color="transparent" draw:fill="none" draw:fill-color="#729fcf"/>
+    <style:header-footer-properties fo:min-height="0in" fo:margin-left="0in" fo:margin-right="0in" fo:margin-bottom="0.1965in" fo:background-color="transparent" draw:fill="none" draw:fill-color="#729fcf"/>
    </style:header-style>
    <style:footer-style/>
   </style:page-layout>
@@ -481,7 +467,7 @@
      <table:table-column table:style-name="Tabla6.B"/>
      <table:table-row>
       <table:table-cell table:style-name="Tabla6.A1" office:value-type="string">
-       <text:p text:style-name="P5"><draw:frame draw:style-name="fr1" draw:name="Imagen2" text:anchor-type="as-char" svg:y="-0.078cm" svg:width="8.576cm" svg:height="1.887cm" draw:z-index="0"><draw:image draw:mime-type="image/jpeg">
+       <text:p text:style-name="P2"><draw:frame draw:style-name="fr1" draw:name="Imagen2" text:anchor-type="as-char" svg:y="-0.0307in" svg:width="3.3764in" svg:height="0.7429in" draw:z-index="0"><draw:image draw:mime-type="image/jpeg">
           <office:binary-data>/9j/4AAQSkZJRgABAQAAAQABAAD/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgK
            CgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/2wBDAQMDAwQDBAgEBAgQCwkL
            EBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBD/wAAR
@@ -1136,15 +1122,15 @@
         </draw:frame></text:p>
       </table:table-cell>
       <table:table-cell table:style-name="Tabla6.A1" office:value-type="string">
-       <text:p text:style-name="P13">Smart Vision S.A.S</text:p>
+       <text:p text:style-name="P3">Smart Vision S.A.S</text:p>
-       <text:p text:style-name="P13">NIT 901091201</text:p>
+       <text:p text:style-name="P3">NIT 901091201</text:p>
-       <text:p text:style-name="P13">DIRECCIÓN Carrera 16 # 52-85 piso 4 </text:p>
+       <text:p text:style-name="P3">DIRECCIÓN Carrera 17 # 53-17</text:p>
-       <text:p text:style-name="P14">TELÉFONOS +57 320 8197664 - <text:span text:style-name="T11">601 7049417</text:span></text:p>
+       <text:p text:style-name="P4">TELÉFONOS +57 320 8197664 - <text:span text:style-name="T1">601 7912965</text:span></text:p>
-       <text:p text:style-name="P13">E – MAIL smartvisioncolombia@gmail.com</text:p>
+       <text:p text:style-name="P3">E – MAIL smartvisioncolombia@gmail.com</text:p>
       </table:table-cell>
      </table:table-row>
     </table:table>
-    <text:p text:style-name="P2"/>
+    <text:p text:style-name="P5"/>
    </style:header>
   </style:master-page>
  </office:master-styles>
@@ -1157,27 +1143,28 @@
     <text:sequence-decl text:display-outline-level="0" text:name="Drawing"/>
     <text:sequence-decl text:display-outline-level="0" text:name="Figure"/>
    </text:sequence-decls>
-   <text:p text:style-name="P24"><text:placeholder text:placeholder-type="text" text:description="for each=&quot;maintenance_service in records&quot;">&lt;for each=&quot;maintenance_service in records&quot;&gt;</text:placeholder></text:p>
+   <text:p text:style-name="P16"><text:placeholder text:placeholder-type="text">&lt;for each=&quot;shipment in records&quot;&gt;</text:placeholder></text:p>
-   <text:p text:style-name="P31"><text:span text:style-name="T5"><text:placeholder text:placeholder-type="text" text:description="maintenance_service. propietary_address.subdivision_municipality.nema">&lt;maintenance_service. propietary_address.subdivision_municipality.name&gt;</text:placeholder></text:span><text:span text:style-name="T5"><text:s/></text:span><text:span text:style-name="T15"><text:placeholder text:placeholder-type="text" text:description="format_datetime(datetime.datetime.now(),user.language, &apos;%25B %25d ,%25Y %25H:%25M%25p&apos;, equipment.company.timezone)">&lt;format_datetime(datetime.datetime.now(),user.language, &apos;%d de %B del %Y&apos;, maintenance_service.company.timezone)&gt;</text:placeholder></text:span></text:p>
+   <text:p text:style-name="P18"><text:placeholder text:placeholder-type="text">&lt;shipment.delivery_address.subdivision_municipality.name&gt;</text:placeholder></text:p>
-   <text:p text:style-name="P30"><text:placeholder text:placeholder-type="text" text:description="maintenance_service.propietary.name">&lt;maintenance_service.propietary.name&gt;</text:placeholder></text:p>
+   <text:p text:style-name="P18"><text:placeholder text:placeholder-type="text" text:description="format_datetime(datetime.datetime.now(),user.language, &apos;%d de %B del %Y&apos;, shipment.company.timezone)">&lt;format_datetime(datetime.datetime.now(),user.language, &apos;%d de %B del %Y&apos;, shipment.company.timezone)&gt;</text:placeholder></text:p>
-   <text:p text:style-name="P29"><text:placeholder text:placeholder-type="text">&lt;/for&gt;</text:placeholder></text:p>
+   <text:p text:style-name="P15"><text:placeholder text:placeholder-type="text">&lt;shipment.customer.rec_name&gt;</text:placeholder></text:p>
-   <text:p text:style-name="P25"><text:span text:style-name="T2">Referencia:</text:span> Certificado de capacitación</text:p>
+   <text:p text:style-name="P17"><text:placeholder text:placeholder-type="text">&lt;/for&gt;</text:placeholder></text:p>
-   <text:p text:style-name="P26"/>
+   <text:p text:style-name="P11"><text:span text:style-name="T3">Referencia:</text:span> Certificado de capacitación</text:p>
-   <text:p text:style-name="P26">Smart Vision S.A.S en nuestro carácter de distribuidores nos comprometemos a capacitar adecuadamente en el uso, manejo y cuidado de los equipos distribuidos por nosotros al personal que va a hacer uso de los mismos, y generar el correspondiente certificado membretado acreditándolos como personal idóneo.</text:p>
+   <text:p text:style-name="P12"/>
-   <text:p text:style-name="P26"/>
+   <text:p text:style-name="P12">Smart Vision S.A.S en nuestro carácter de distribuidores nos comprometemos a capacitar adecuadamente en el uso, manejo y cuidado de los equipos distribuidos por nosotros al personal que va a hacer uso de los mismos, y generar el correspondiente certificado membretado acreditándolos como personal idóneo.</text:p>
-   <text:p text:style-name="P26">El uso y mantenimiento de los equipos suministrados por Smart Vision S.A.S solo debe ser realizado por personal capacitado y certificado por nuestra empresa, las fallas generadas por uso o manipulación por terceros no capacitados y certificados anulará la garantía. </text:p>
+   <text:p text:style-name="P12"/>
-   <text:p text:style-name="P26"/>
+   <text:p text:style-name="P12">El uso y mantenimiento de los equipos suministrados por Smart Vision S.A.S solo debe ser realizado por personal capacitado y certificado por nuestra empresa, las fallas generadas por uso o manipulación por terceros no capacitados y certificados anulará la garantía. </text:p>
-   <text:p text:style-name="P26">Cualquier capacitación adicional o nuevo personal que requiera certificación por parte de Smart Vision S.A.S tendrá un costo adicional.</text:p>
+   <text:p text:style-name="P12"/>
-   <text:p text:style-name="P26"/>
+   <text:p text:style-name="P12">Cualquier capacitación adicional o nuevo personal que requiera certificación por parte de Smart Vision S.A.S tendrá un costo adicional.</text:p>
-   <text:p text:style-name="P26">El certificado de capacitación será emitido y enviado 2 días hábiles posteriores a la misma.</text:p>
+   <text:p text:style-name="P12"/>
-   <text:p text:style-name="P26"/>
+   <text:p text:style-name="P12">El certificado de capacitación será emitido y enviado 2 días hábiles posteriores a la misma.</text:p>
-   <text:p text:style-name="P26">Cordialmente.</text:p>
+   <text:p text:style-name="P12"/>
-   <text:p text:style-name="P23"/>
+   <text:p text:style-name="P12">Cordialmente.</text:p>
-   <text:p text:style-name="P19"/>
+   <text:p text:style-name="P10"/>
-   <text:p text:style-name="P23"/>
+   <text:p text:style-name="P9"/>
-   <text:p text:style-name="P23">___________________________________</text:p>
+   <text:p text:style-name="P10"/>
-   <text:p text:style-name="P27">Jesus Antonio Giraldo García</text:p>
+   <text:p text:style-name="P10">___________________________________</text:p>
-   <text:p text:style-name="P28">C.E.O (Gerente General)</text:p>
+   <text:p text:style-name="P13">Jesus Antonio Giraldo García</text:p>
+   <text:p text:style-name="P14">C.E.O (Gerente General)</text:p>
   </office:text>
  </office:body>
 </office:document>

report/Purchase.fodt

@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <office:document xmlns:officeooo="http://openoffice.org/2009/office" 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.text">
- <office:meta><meta:generator>LibreOffice/7.3.6.2$Linux_X86_64 LibreOffice_project/30$Build-2</meta:generator><meta:creation-date>2008-06-07T15:28:22</meta:creation-date><dc:date>2009-01-10T16:03:32</dc:date><meta:editing-cycles>1</meta:editing-cycles><meta:editing-duration>PT0S</meta:editing-duration><meta:document-statistic meta:table-count="5" meta:image-count="1" meta:object-count="0" meta:page-count="2" meta:paragraph-count="92" meta:word-count="213" meta:character-count="2573" meta:non-whitespace-character-count="2448"/><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/></office:meta>
+ <office:meta><meta:generator>LibreOffice/7.3.7.2$Linux_X86_64 LibreOffice_project/30$Build-2</meta:generator><meta:creation-date>2008-06-07T15:28:22</meta:creation-date><dc:date>2009-01-10T16:03:32</dc:date><meta:editing-cycles>1</meta:editing-cycles><meta:editing-duration>PT0S</meta:editing-duration><meta:document-statistic meta:table-count="5" meta:image-count="1" meta:object-count="0" meta:page-count="2" meta:paragraph-count="83" meta:word-count="200" meta:character-count="2406" meta:non-whitespace-character-count="2284"/><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/></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">38336</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">27437</config:config-item>
+   <config:config-item config:name="ViewAreaWidth" config:type="long">20048</config:config-item>
-   <config:config-item config:name="ViewAreaHeight" config:type="long">10952</config:config-item>
+   <config:config-item config:name="ViewAreaHeight" config:type="long">8733</config:config-item>
    <config:config-item config:name="ShowRedlineChanges" config:type="boolean">true</config:config-item>
    <config:config-item config:name="InBrowseMode" config:type="boolean">false</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">view2</config:config-item>
-     <config:config-item config:name="ViewLeft" config:type="long">4133</config:config-item>
+     <config:config-item config:name="ViewLeft" config:type="long">1711</config:config-item>
      <config:config-item config:name="ViewTop" config:type="long">4852</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">38336</config:config-item>
-     <config:config-item config:name="VisibleRight" config:type="long">27436</config:config-item>
+     <config:config-item config:name="VisibleRight" config:type="long">20047</config:config-item>
-     <config:config-item config:name="VisibleBottom" config:type="long">10950</config:config-item>
+     <config:config-item config:name="VisibleBottom" config:type="long">47068</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">0</config:config-item>
      <config:config-item config:name="ViewLayoutBookMode" config:type="boolean">false</config:config-item>
-     <config:config-item config:name="ZoomFactor" config:type="short">130</config:config-item>
+     <config:config-item config:name="ZoomFactor" config:type="short">170</config:config-item>
      <config:config-item config:name="IsSelectedFrame" config:type="boolean">false</config:config-item>
      <config:config-item config:name="KeepRatio" config:type="boolean">false</config:config-item>
      <config:config-item config:name="AnchoredTextOverflowLegacy" config:type="boolean">false</config:config-item>
@@ -88,7 +88,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">4405812</config:config-item>
+   <config:config-item config:name="Rsid" config:type="int">4897608</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>
@@ -136,13 +136,17 @@
  </office:settings>
  <office:scripts>
   <office:script script:language="ooo:Basic">
-   <ooo:libraries xmlns:ooo="http://openoffice.org/2004/office" xmlns:xlink="http://www.w3.org/1999/xlink"/>
+   <ooo:libraries xmlns:ooo="http://openoffice.org/2004/office" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <ooo:library-embedded ooo:name="Standard"/>
+   </ooo:libraries>
   </office:script>
  </office:scripts>
  <office:font-face-decls>
   <style:font-face style:name="Andale Sans UI" svg:font-family="&apos;Andale Sans UI&apos;" style:font-family-generic="system" style:font-pitch="variable"/>
   <style:font-face style:name="Cantarell" svg:font-family="Cantarell" style:font-pitch="variable"/>
   <style:font-face style:name="DejaVu Sans" svg:font-family="&apos;DejaVu Sans&apos;" style:font-family-generic="system" style:font-pitch="variable"/>
+  <style:font-face style:name="DejaVu Sans Mono" svg:font-family="&apos;DejaVu Sans Mono&apos;" style:font-family-generic="modern" style:font-pitch="fixed"/>
+  <style:font-face style:name="Droid Sans Japanese" svg:font-family="&apos;Droid Sans Japanese&apos;" style:font-family-generic="swiss" style:font-pitch="variable"/>
   <style:font-face style:name="Liberation Sans" svg:font-family="&apos;Liberation Sans&apos;" style:font-adornments="Regular" style:font-family-generic="swiss" style:font-pitch="variable"/>
   <style:font-face style:name="Liberation Serif" svg:font-family="&apos;Liberation Serif&apos;" style:font-adornments="Bold" style:font-family-generic="roman" style:font-pitch="variable"/>
   <style:font-face style:name="Liberation Serif1" svg:font-family="&apos;Liberation Serif&apos;" style:font-adornments="Regular" style:font-family-generic="roman" style:font-pitch="variable"/>
@@ -151,14 +155,14 @@
  </office:font-face-decls>
  <office:styles>
   <style:default-style style:family="graphic">
-   <style:graphic-properties svg:stroke-color="#000000" draw:fill-color="#99ccff" fo:wrap-option="no-wrap" draw:shadow-offset-x="0.3cm" draw:shadow-offset-y="0.3cm" draw:start-line-spacing-horizontal="0.283cm" draw:start-line-spacing-vertical="0.283cm" draw:end-line-spacing-horizontal="0.283cm" draw:end-line-spacing-vertical="0.283cm" style:flow-with-text="false"/>
+   <style:graphic-properties svg:stroke-color="#000000" draw:fill-color="#99ccff" 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: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%" style:font-name="Thorndale AMT" fo:font-size="12pt" fo:language="en" fo:country="US" style:letter-kerning="true" style:font-name-asian="Andale Sans UI" style:font-size-asian="10.5pt" style:language-asian="zxx" style:country-asian="none" style:font-name-complex="Andale Sans UI" style:font-size-complex="12pt" style:language-complex="zxx" style:country-complex="none"/>
   </style:default-style>
   <style:default-style style:family="paragraph">
-   <style:paragraph-properties fo:hyphenation-ladder-count="no-limit" style:text-autospace="ideograph-alpha" style:punctuation-wrap="hanging" style:line-break="strict" style:tab-stop-distance="1.251cm" style:writing-mode="lr-tb"/>
+   <style:paragraph-properties fo:hyphenation-ladder-count="no-limit" style:text-autospace="ideograph-alpha" style:punctuation-wrap="hanging" style:line-break="strict" style:tab-stop-distance="0.4925in" style:writing-mode="lr-tb"/>
    <style:text-properties style:use-window-font-color="true" loext:opacity="0%" style:font-name="Thorndale AMT" fo:font-size="12pt" fo:language="en" fo:country="US" style:letter-kerning="true" style:font-name-asian="Andale Sans UI" style:font-size-asian="10.5pt" style:language-asian="zxx" style:country-asian="none" style:font-name-complex="Andale Sans UI" style:font-size-complex="12pt" style:language-complex="zxx" style:country-complex="none" fo:hyphenate="false" fo:hyphenation-remain-char-count="2" fo:hyphenation-push-char-count="2" loext:hyphenation-no-caps="false"/>
   </style:default-style>
   <style:default-style style:family="table">
@@ -171,18 +175,18 @@
    <style:text-properties style:font-name="Liberation Sans" fo:font-family="&apos;Liberation Sans&apos;" style:font-style-name="Regular" style:font-family-generic="swiss" style:font-pitch="variable" style:font-size-asian="10.5pt"/>
   </style:style>
   <style:style style:name="Heading" style:family="paragraph" style:parent-style-name="Standard" style:next-style-name="Text_20_body" style:class="text">
-   <style:paragraph-properties fo:margin-top="0.423cm" fo:margin-bottom="0.212cm" style:contextual-spacing="false" fo:keep-with-next="always"/>
+   <style:paragraph-properties fo:margin-top="0.1665in" fo:margin-bottom="0.0835in" style:contextual-spacing="false" fo:keep-with-next="always"/>
    <style:text-properties style:font-name="Liberation Serif1" fo:font-family="&apos;Liberation Serif&apos;" style:font-style-name="Regular" style:font-family-generic="roman" style:font-pitch="variable" fo:font-size="16pt" style:font-name-asian="DejaVu Sans" style:font-family-asian="&apos;DejaVu Sans&apos;" style:font-family-generic-asian="system" style:font-pitch-asian="variable" style:font-size-asian="14pt" style:font-name-complex="DejaVu Sans" style:font-family-complex="&apos;DejaVu Sans&apos;" style:font-family-generic-complex="system" style:font-pitch-complex="variable" style:font-size-complex="14pt"/>
   </style:style>
   <style:style style:name="Text_20_body" style:display-name="Text body" style:family="paragraph" style:parent-style-name="Standard" style:class="text">
-   <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0.212cm" style:contextual-spacing="false"/>
+   <style:paragraph-properties fo:margin-top="0in" fo:margin-bottom="0.0835in" style:contextual-spacing="false"/>
    <style:text-properties style:font-name="Liberation Sans" fo:font-family="&apos;Liberation Sans&apos;" style:font-style-name="Regular" style:font-family-generic="swiss" style:font-pitch="variable" style:font-size-asian="10.5pt"/>
   </style:style>
   <style:style style:name="List" style:family="paragraph" style:parent-style-name="Text_20_body" style:class="list">
    <style:text-properties style:font-size-asian="12pt"/>
   </style:style>
   <style:style style:name="Caption" style:family="paragraph" style:parent-style-name="Standard" style:class="extra">
-   <style:paragraph-properties fo:margin-top="0.212cm" fo:margin-bottom="0.212cm" style:contextual-spacing="false" text:number-lines="false" text:line-number="0"/>
+   <style:paragraph-properties fo:margin-top="0.0835in" fo:margin-bottom="0.0835in" style:contextual-spacing="false" text:number-lines="false" text:line-number="0"/>
    <style:text-properties fo:font-size="12pt" fo:font-style="italic" style:font-size-asian="12pt" style:font-style-asian="italic" style:font-size-complex="12pt" style:font-style-complex="italic"/>
   </style:style>
   <style:style style:name="Index" style:family="paragraph" style:parent-style-name="Standard" style:class="index">
@@ -206,16 +210,16 @@
   <style:style style:name="Header_20_and_20_Footer" style:display-name="Header and Footer" style:family="paragraph" style:parent-style-name="Standard" style:class="extra">
    <style:paragraph-properties text:number-lines="false" text:line-number="0">
     <style:tab-stops>
-     <style:tab-stop style:position="8.5cm" style:type="center"/>
+     <style:tab-stop style:position="3.3465in" style:type="center"/>
-     <style:tab-stop style:position="17cm" style:type="right"/>
+     <style:tab-stop style:position="6.6929in" style:type="right"/>
     </style:tab-stops>
    </style:paragraph-properties>
   </style:style>
   <style:style style:name="Header" style:family="paragraph" style:parent-style-name="Standard" style:class="extra">
    <style:paragraph-properties text:number-lines="false" text:line-number="0">
     <style:tab-stops>
-     <style:tab-stop style:position="8.795cm" style:type="center"/>
+     <style:tab-stop style:position="3.4626in" style:type="center"/>
-     <style:tab-stop style:position="17.59cm" style:type="right"/>
+     <style:tab-stop style:position="6.9252in" style:type="right"/>
     </style:tab-stops>
    </style:paragraph-properties>
    <style:text-properties fo:font-size="9pt" style:font-size-asian="10.5pt"/>
@@ -223,8 +227,8 @@
   <style:style style:name="Footer" style:family="paragraph" style:parent-style-name="Standard" style:class="extra">
    <style:paragraph-properties text:number-lines="false" text:line-number="0">
     <style:tab-stops>
-     <style:tab-stop style:position="8.795cm" style:type="center"/>
+     <style:tab-stop style:position="3.4626in" style:type="center"/>
-     <style:tab-stop style:position="17.59cm" style:type="right"/>
+     <style:tab-stop style:position="6.9252in" style:type="right"/>
     </style:tab-stops>
    </style:paragraph-properties>
    <style:text-properties fo:font-size="9pt" style:font-size-asian="10.5pt"/>
@@ -233,20 +237,24 @@
    <style:text-properties fo:font-size="14pt" fo:font-weight="bold" style:font-size-asian="14pt" style:font-weight-asian="bold" style:font-size-complex="14pt" style:font-weight-complex="bold"/>
   </style:style>
   <style:style style:name="Text_20_body_20_indent" style:display-name="Text body indent" style:family="paragraph" style:parent-style-name="Text_20_body" style:class="text">
-   <style:paragraph-properties fo:margin-left="0.499cm" fo:margin-right="0cm" fo:text-indent="0cm" style:auto-text-indent="false"/>
+   <style:paragraph-properties fo:margin-left="0.1965in" fo:margin-right="0in" fo:text-indent="0in" style:auto-text-indent="false"/>
   </style:style>
   <style:style style:name="Text" style:family="paragraph" style:parent-style-name="Caption" style:class="extra"/>
   <style:style style:name="Quotations" style:family="paragraph" style:parent-style-name="Standard" style:class="html">
-   <style:paragraph-properties fo:margin-left="1cm" fo:margin-right="1cm" fo:margin-top="0cm" fo:margin-bottom="0.499cm" style:contextual-spacing="false" fo:text-indent="0cm" style:auto-text-indent="false"/>
+   <style:paragraph-properties fo:margin-left="0.3937in" fo:margin-right="0.3937in" fo:margin-top="0in" fo:margin-bottom="0.1965in" style:contextual-spacing="false" fo:text-indent="0in" style:auto-text-indent="false"/>
   </style:style>
   <style:style style:name="Title" style:family="paragraph" style:parent-style-name="Heading" style:next-style-name="Text_20_body" style:class="chapter">
    <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
    <style:text-properties fo:font-size="28pt" fo:font-weight="bold" style:font-size-asian="28pt" style:font-weight-asian="bold" style:font-size-complex="28pt" style:font-weight-complex="bold"/>
   </style:style>
   <style:style style:name="Subtitle" style:family="paragraph" style:parent-style-name="Heading" style:next-style-name="Text_20_body" style:class="chapter">
-   <style:paragraph-properties fo:margin-top="0.106cm" fo:margin-bottom="0.212cm" style:contextual-spacing="false" fo:text-align="center" style:justify-single-word="false"/>
+   <style:paragraph-properties fo:margin-top="0.0417in" fo:margin-bottom="0.0835in" style:contextual-spacing="false" fo:text-align="center" style:justify-single-word="false"/>
    <style:text-properties fo:font-size="18pt" style:font-size-asian="18pt" style:font-size-complex="18pt"/>
   </style:style>
+  <style:style style:name="Preformatted_20_Text" style:display-name="Preformatted Text" style:family="paragraph" style:parent-style-name="Standard" style:class="html">
+   <style:paragraph-properties fo:margin-top="0in" fo:margin-bottom="0in" style:contextual-spacing="false"/>
+   <style:text-properties style:font-name="DejaVu Sans Mono" fo:font-family="&apos;DejaVu Sans Mono&apos;" style:font-family-generic="modern" style:font-pitch="fixed" fo:font-size="10pt" style:font-name-asian="DejaVu Sans Mono" style:font-family-asian="&apos;DejaVu Sans Mono&apos;" style:font-family-generic-asian="modern" style:font-pitch-asian="fixed" style:font-size-asian="10pt" style:font-name-complex="DejaVu Sans Mono" style:font-family-complex="&apos;DejaVu Sans Mono&apos;" style:font-family-generic-complex="modern" style:font-pitch-complex="fixed" style:font-size-complex="10pt"/>
+  </style:style>
   <style:style style:name="Placeholder" style:family="text">
    <style:text-properties fo:font-variant="small-caps" fo:color="#008080" loext:opacity="100%" style:text-underline-style="dotted" style:text-underline-width="auto" style:text-underline-color="font-color"/>
   </style:style>
@@ -254,229 +262,240 @@
    <style:text-properties style:font-name="StarSymbol" fo:font-family="StarSymbol" fo:font-size="9pt" style:font-name-asian="StarSymbol" style:font-family-asian="StarSymbol" style:font-size-asian="9pt" style:font-name-complex="StarSymbol" style:font-family-complex="StarSymbol" style:font-size-complex="9pt"/>
   </style:style>
   <style:style style:name="Graphics" style:family="graphic">
-   <style:graphic-properties text:anchor-type="paragraph" svg:x="0cm" svg:y="0cm" style:wrap="dynamic" style:number-wrapped-paragraphs="no-limit" style:wrap-contour="false" style:vertical-pos="top" style:vertical-rel="paragraph" style:horizontal-pos="center" style:horizontal-rel="paragraph"/>
+   <style:graphic-properties text:anchor-type="paragraph" svg:x="0in" svg:y="0in" style:wrap="dynamic" style:number-wrapped-paragraphs="no-limit" style:wrap-contour="false" style:vertical-pos="top" style:vertical-rel="paragraph" style:horizontal-pos="center" style:horizontal-rel="paragraph"/>
   </style:style>
   <text:outline-style style:name="Outline">
    <text:outline-level-style text:level="1" loext:num-list-format="%1%" style:num-format="">
-    <style:list-level-properties text:min-label-distance="0.381cm"/>
+    <style:list-level-properties text:min-label-distance="0.15in"/>
    </text:outline-level-style>
    <text:outline-level-style text:level="2" loext:num-list-format="%2%" style:num-format="">
-    <style:list-level-properties text:min-label-distance="0.381cm"/>
+    <style:list-level-properties text:min-label-distance="0.15in"/>
    </text:outline-level-style>
    <text:outline-level-style text:level="3" loext:num-list-format="%3%" style:num-format="">
-    <style:list-level-properties text:min-label-distance="0.381cm"/>
+    <style:list-level-properties text:min-label-distance="0.15in"/>
    </text:outline-level-style>
    <text:outline-level-style text:level="4" loext:num-list-format="%4%" style:num-format="">
-    <style:list-level-properties text:min-label-distance="0.381cm"/>
+    <style:list-level-properties text:min-label-distance="0.15in"/>
    </text:outline-level-style>
    <text:outline-level-style text:level="5" loext:num-list-format="%5%" style:num-format="">
-    <style:list-level-properties text:min-label-distance="0.381cm"/>
+    <style:list-level-properties text:min-label-distance="0.15in"/>
    </text:outline-level-style>
    <text:outline-level-style text:level="6" loext:num-list-format="%6%" style:num-format="">
-    <style:list-level-properties text:min-label-distance="0.381cm"/>
+    <style:list-level-properties text:min-label-distance="0.15in"/>
    </text:outline-level-style>
    <text:outline-level-style text:level="7" loext:num-list-format="%7%" style:num-format="">
-    <style:list-level-properties text:min-label-distance="0.381cm"/>
+    <style:list-level-properties text:min-label-distance="0.15in"/>
    </text:outline-level-style>
    <text:outline-level-style text:level="8" loext:num-list-format="%8%" style:num-format="">
-    <style:list-level-properties text:min-label-distance="0.381cm"/>
+    <style:list-level-properties text:min-label-distance="0.15in"/>
    </text:outline-level-style>
    <text:outline-level-style text:level="9" loext:num-list-format="%9%" style:num-format="">
-    <style:list-level-properties text:min-label-distance="0.381cm"/>
+    <style:list-level-properties text:min-label-distance="0.15in"/>
    </text:outline-level-style>
    <text:outline-level-style text:level="10" loext:num-list-format="%10%" style:num-format="">
-    <style:list-level-properties text:min-label-distance="0.381cm"/>
+    <style:list-level-properties text:min-label-distance="0.15in"/>
    </text:outline-level-style>
   </text:outline-style>
   <text:notes-configuration text:note-class="footnote" style:num-format="1" text:start-value="0" text:footnotes-position="page" text:start-numbering-at="document"/>
   <text:notes-configuration text:note-class="endnote" style:num-format="i" text:start-value="0"/>
-  <text:linenumbering-configuration text:number-lines="false" text:offset="0.499cm" style:num-format="1" text:number-position="left" text:increment="5"/>
+  <text:linenumbering-configuration text:number-lines="false" text:offset="0.1965in" style:num-format="1" text:number-position="left" text:increment="5"/>
+  <number:currency-style style:name="N122P0" style:volatile="true">
+   <number:currency-symbol number:language="es" number:country="CO">$</number:currency-symbol>
+   <number:number number:decimal-places="2" number:min-decimal-places="2" number:min-integer-digits="1" number:grouping="true"/>
+  </number:currency-style>
+  <number:currency-style style:name="N122">
+   <style:text-properties fo:color="#ff0000"/>
+   <number:text>-</number:text>
+   <number:currency-symbol number:language="es" number:country="CO">$</number:currency-symbol>
+   <number:number number:decimal-places="2" number:min-decimal-places="2" number:min-integer-digits="1" number:grouping="true"/>
+   <style:map style:condition="value()&gt;=0" style:apply-style-name="N122P0"/>
+  </number:currency-style>
  </office:styles>
  <office:automatic-styles>
   <style:style style:name="Tabla2" style:family="table">
-   <style:table-properties style:width="19.41cm" table:align="margins"/>
+   <style:table-properties style:width="7.6417in" table:align="margins"/>
   </style:style>
   <style:style style:name="Tabla2.A" style:family="table-column">
-   <style:table-column-properties style:column-width="9.705cm" style:rel-column-width="32767*"/>
+   <style:table-column-properties style:column-width="3.8208in" style:rel-column-width="32767*"/>
   </style:style>
   <style:style style:name="Tabla2.B" style:family="table-column">
-   <style:table-column-properties style:column-width="9.705cm" style:rel-column-width="32768*"/>
+   <style:table-column-properties style:column-width="3.8208in" style:rel-column-width="32768*"/>
   </style:style>
   <style:style style:name="Tabla2.A1" style:family="table-cell">
-   <style:table-cell-properties fo:padding="0.097cm" fo:border="none"/>
+   <style:table-cell-properties fo:padding="0.0382in" fo:border="none"/>
   </style:style>
   <style:style style:name="Tabla1" style:family="table">
-   <style:table-properties style:width="19.41cm" table:align="margins"/>
+   <style:table-properties style:width="7.6417in" table:align="margins"/>
   </style:style>
   <style:style style:name="Tabla1.A" style:family="table-column">
-   <style:table-column-properties style:column-width="9.705cm" style:rel-column-width="32767*"/>
+   <style:table-column-properties style:column-width="3.8201in" style:rel-column-width="32761*"/>
   </style:style>
   <style:style style:name="Tabla1.B" style:family="table-column">
-   <style:table-column-properties style:column-width="9.705cm" style:rel-column-width="32768*"/>
+   <style:table-column-properties style:column-width="3.8215in" style:rel-column-width="32774*"/>
   </style:style>
   <style:style style:name="Tabla1.1" style:family="table-row">
-   <style:table-row-properties style:min-row-height="3.096cm"/>
+   <style:table-row-properties style:min-row-height="1.2188in"/>
   </style:style>
   <style:style style:name="Tabla1.A1" style:family="table-cell">
-   <style:table-cell-properties fo:padding="0.097cm" fo:border="none"/>
+   <style:table-cell-properties fo:padding="0.0382in" fo:border="none"/>
   </style:style>
   <style:style style:name="Table1" style:family="table">
-   <style:table-properties style:width="18.597cm" table:align="left"/>
+   <style:table-properties style:width="7.3215in" table:align="left"/>
   </style:style>
   <style:style style:name="Table1.A" style:family="table-column">
-   <style:table-column-properties style:column-width="6.71cm"/>
+   <style:table-column-properties style:column-width="2.6417in"/>
   </style:style>
   <style:style style:name="Table1.B" style:family="table-column">
-   <style:table-column-properties style:column-width="1.984cm"/>
+   <style:table-column-properties style:column-width="0.7813in"/>
   </style:style>
   <style:style style:name="Table1.C" style:family="table-column">
-   <style:table-column-properties style:column-width="3.911cm"/>
+   <style:table-column-properties style:column-width="1.5396in"/>
   </style:style>
   <style:style style:name="Table1.D" style:family="table-column">
-   <style:table-column-properties style:column-width="2.893cm"/>
+   <style:table-column-properties style:column-width="1.1389in"/>
   </style:style>
   <style:style style:name="Table1.E" style:family="table-column">
-   <style:table-column-properties style:column-width="3.099cm"/>
+   <style:table-column-properties style:column-width="1.2201in"/>
   </style:style>
   <style:style style:name="Table1.A1" style:family="table-cell">
-   <style:table-cell-properties fo:background-color="transparent" fo:padding="0.097cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="0.05pt solid #000000" fo:border-bottom="0.05pt solid #000000">
+   <style:table-cell-properties fo:background-color="transparent" fo:padding="0.0382in" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="0.05pt solid #000000" fo:border-bottom="0.05pt solid #000000">
     <style:background-image/>
    </style:table-cell-properties>
   </style:style>
   <style:style style:name="Table1.E1" style:family="table-cell">
-   <style:table-cell-properties fo:background-color="transparent" fo:padding="0.097cm" fo:border="0.05pt solid #000000">
+   <style:table-cell-properties fo:background-color="transparent" fo:padding="0.0382in" fo:border="0.05pt solid #000000">
     <style:background-image/>
    </style:table-cell-properties>
   </style:style>
   <style:style style:name="Table1.A2" style:family="table-cell">
-   <style:table-cell-properties fo:padding="0.097cm" fo:border-left="0.05pt solid #000000" fo:border-right="0.05pt solid #000000" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
+   <style:table-cell-properties fo:padding="0.0382in" fo:border-left="0.05pt solid #000000" fo:border-right="0.05pt solid #000000" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
   </style:style>
   <style:style style:name="Table1.A3" style:family="table-cell">
-   <style:table-cell-properties fo:padding="0.097cm" fo:border-left="0.05pt solid #000000" fo:border-right="0.05pt solid #000000" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
+   <style:table-cell-properties fo:padding="0.0382in" fo:border-left="0.05pt solid #000000" fo:border-right="0.05pt solid #000000" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
   </style:style>
   <style:style style:name="Table1.A4" style:family="table-cell">
-   <style:table-cell-properties fo:padding="0.097cm" fo:border-left="0.05pt solid #000000" fo:border-right="0.05pt solid #000000" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
+   <style:table-cell-properties fo:padding="0.0382in" fo:border-left="0.05pt solid #000000" fo:border-right="0.05pt solid #000000" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
   </style:style>
   <style:style style:name="Table1.A5" style:family="table-cell">
-   <style:table-cell-properties fo:padding="0.097cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
+   <style:table-cell-properties fo:padding="0.0382in" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
   </style:style>
   <style:style style:name="Table1.B5" style:family="table-cell">
-   <style:table-cell-properties fo:padding="0.097cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
+   <style:table-cell-properties fo:padding="0.0382in" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
   </style:style>
   <style:style style:name="Table1.C5" style:family="table-cell">
-   <style:table-cell-properties fo:padding="0.097cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
+   <style:table-cell-properties fo:padding="0.0382in" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
   </style:style>
   <style:style style:name="Table1.D5" style:family="table-cell">
-   <style:table-cell-properties fo:padding="0.097cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
+   <style:table-cell-properties fo:padding="0.0382in" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
   </style:style>
   <style:style style:name="Table1.E5" style:family="table-cell">
-   <style:table-cell-properties fo:padding="0.097cm" fo:border-left="0.05pt solid #000000" fo:border-right="0.05pt solid #000000" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
+   <style:table-cell-properties fo:padding="0.0382in" fo:border-left="0.05pt solid #000000" fo:border-right="0.05pt solid #000000" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
   </style:style>
   <style:style style:name="Table1.A6" style:family="table-cell">
-   <style:table-cell-properties fo:padding="0.097cm" fo:border-left="0.05pt solid #000000" fo:border-right="0.05pt solid #000000" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
+   <style:table-cell-properties fo:padding="0.0382in" fo:border-left="0.05pt solid #000000" fo:border-right="0.05pt solid #000000" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
   </style:style>
   <style:style style:name="Table1.A7" style:family="table-cell">
-   <style:table-cell-properties fo:padding="0.097cm" fo:border-left="0.05pt solid #000000" fo:border-right="0.05pt solid #000000" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
+   <style:table-cell-properties fo:padding="0.0382in" fo:border-left="0.05pt solid #000000" fo:border-right="0.05pt solid #000000" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
   </style:style>
   <style:style style:name="Table1.A8" style:family="table-cell">
-   <style:table-cell-properties fo:padding="0.097cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
+   <style:table-cell-properties fo:padding="0.0382in" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
   </style:style>
   <style:style style:name="Table1.E8" style:family="table-cell">
-   <style:table-cell-properties fo:padding="0.097cm" fo:border-left="0.05pt solid #000000" fo:border-right="0.05pt solid #000000" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
+   <style:table-cell-properties fo:padding="0.0382in" fo:border-left="0.05pt solid #000000" fo:border-right="0.05pt solid #000000" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
   </style:style>
   <style:style style:name="Table1.A9" style:family="table-cell">
-   <style:table-cell-properties fo:padding="0.097cm" fo:border-left="0.05pt solid #000000" fo:border-right="0.05pt solid #000000" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
+   <style:table-cell-properties fo:padding="0.0382in" fo:border-left="0.05pt solid #000000" fo:border-right="0.05pt solid #000000" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
   </style:style>
   <style:style style:name="Table1.A10" style:family="table-cell">
-   <style:table-cell-properties fo:padding="0.097cm" fo:border-left="0.05pt solid #000000" fo:border-right="0.05pt solid #000000" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
+   <style:table-cell-properties fo:padding="0.0382in" fo:border-left="0.05pt solid #000000" fo:border-right="0.05pt solid #000000" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
   </style:style>
   <style:style style:name="Table1.A11" style:family="table-cell">
-   <style:table-cell-properties fo:background-color="transparent" fo:padding="0.097cm" fo:border-left="0.05pt solid #000000" fo:border-right="0.05pt solid #000000" fo:border-top="none" fo:border-bottom="0.05pt solid #000000">
+   <style:table-cell-properties fo:background-color="transparent" fo:padding="0.0382in" fo:border-left="0.05pt solid #000000" fo:border-right="0.05pt solid #000000" fo:border-top="none" fo:border-bottom="0.05pt solid #000000">
     <style:background-image/>
    </style:table-cell-properties>
   </style:style>
   <style:style style:name="Table1.A12" style:family="table-cell">
-   <style:table-cell-properties fo:padding="0.097cm" fo:border-left="0.05pt solid #000000" fo:border-right="0.05pt solid #000000" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
+   <style:table-cell-properties fo:padding="0.0382in" fo:border-left="0.05pt solid #000000" fo:border-right="0.05pt solid #000000" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
   </style:style>
   <style:style style:name="Table1.A13" style:family="table-cell">
-   <style:table-cell-properties fo:padding="0.097cm" fo:border-left="0.05pt solid #000000" fo:border-right="0.05pt solid #000000" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
+   <style:table-cell-properties fo:padding="0.0382in" fo:border-left="0.05pt solid #000000" fo:border-right="0.05pt solid #000000" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
   </style:style>
   <style:style style:name="Table1.A14" style:family="table-cell">
-   <style:table-cell-properties fo:padding="0.097cm" fo:border-left="0.05pt solid #000000" fo:border-right="0.05pt solid #000000" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
+   <style:table-cell-properties fo:padding="0.0382in" fo:border-left="0.05pt solid #000000" fo:border-right="0.05pt solid #000000" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
   </style:style>
   <style:style style:name="Table1.A15" style:family="table-cell">
-   <style:table-cell-properties fo:padding="0.097cm" fo:border-left="0.05pt solid #000000" fo:border-right="0.05pt solid #000000" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
+   <style:table-cell-properties fo:padding="0.0382in" fo:border-left="0.05pt solid #000000" fo:border-right="0.05pt solid #000000" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
   </style:style>
   <style:style style:name="Table1.A16" style:family="table-cell">
-   <style:table-cell-properties fo:padding="0.097cm" fo:border-left="0.05pt solid #000000" fo:border-right="0.05pt solid #000000" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
+   <style:table-cell-properties fo:padding="0.0382in" fo:border-left="0.05pt solid #000000" fo:border-right="0.05pt solid #000000" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
   </style:style>
   <style:style style:name="Table1.A17" style:family="table-cell">
-   <style:table-cell-properties fo:padding="0.097cm" fo:border-left="0.05pt solid #000000" fo:border-right="0.05pt solid #000000" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
+   <style:table-cell-properties fo:padding="0.0382in" fo:border-left="0.05pt solid #000000" fo:border-right="0.05pt solid #000000" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
   </style:style>
   <style:style style:name="Table2" style:family="table">
-   <style:table-properties style:width="19.41cm" table:align="margins" style:may-break-between-rows="false"/>
+   <style:table-properties style:width="7.6417in" table:align="margins" style:may-break-between-rows="false"/>
   </style:style>
   <style:style style:name="Table2.A" style:family="table-column">
-   <style:table-column-properties style:column-width="4.895cm" style:rel-column-width="16526*"/>
+   <style:table-column-properties style:column-width="1.9271in" style:rel-column-width="16526*"/>
   </style:style>
   <style:style style:name="Table2.B" style:family="table-column">
-   <style:table-column-properties style:column-width="14.515cm" style:rel-column-width="49009*"/>
+   <style:table-column-properties style:column-width="5.7146in" style:rel-column-width="49009*"/>
   </style:style>
   <style:style style:name="Table4" style:family="table">
-   <style:table-properties style:width="13.097cm" fo:margin-left="0.021cm" table:align="left" style:may-break-between-rows="true"/>
+   <style:table-properties style:width="5.3729in" fo:margin-left="0.0083in" table:align="left" style:may-break-between-rows="true"/>
   </style:style>
   <style:style style:name="Table4.A" style:family="table-column">
-   <style:table-column-properties style:column-width="3.006cm"/>
+   <style:table-column-properties style:column-width="1.1833in"/>
   </style:style>
   <style:style style:name="Table4.B" style:family="table-column">
-   <style:table-column-properties style:column-width="10.091cm"/>
+   <style:table-column-properties style:column-width="4.1896in"/>
   </style:style>
   <style:style style:name="Table4.A1" style:family="table-cell">
-   <style:table-cell-properties fo:background-color="transparent" fo:padding="0.097cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="0.05pt solid #000000" fo:border-bottom="0.05pt solid #000000">
+   <style:table-cell-properties fo:background-color="transparent" fo:padding="0.0382in" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="0.05pt solid #000000" fo:border-bottom="0.05pt solid #000000">
     <style:background-image/>
    </style:table-cell-properties>
   </style:style>
   <style:style style:name="Table4.B1" style:family="table-cell">
-   <style:table-cell-properties fo:background-color="transparent" fo:padding="0.097cm" fo:border="0.05pt solid #000000">
+   <style:table-cell-properties fo:background-color="transparent" fo:padding="0.0382in" fo:border="0.05pt solid #000000">
     <style:background-image/>
    </style:table-cell-properties>
   </style:style>
   <style:style style:name="Table4.A2" style:family="table-cell">
-   <style:table-cell-properties fo:background-color="transparent" fo:padding="0.097cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000">
+   <style:table-cell-properties fo:background-color="transparent" fo:padding="0.0382in" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000">
     <style:background-image/>
    </style:table-cell-properties>
   </style:style>
   <style:style style:name="Table4.B2" style:family="table-cell">
-   <style:table-cell-properties fo:background-color="transparent" fo:padding="0.097cm" fo:border-left="0.05pt solid #000000" fo:border-right="0.05pt solid #000000" fo:border-top="none" fo:border-bottom="0.05pt solid #000000">
+   <style:table-cell-properties fo:background-color="transparent" fo:padding="0.0382in" fo:border-left="0.05pt solid #000000" fo:border-right="0.05pt solid #000000" fo:border-top="none" fo:border-bottom="0.05pt solid #000000">
     <style:background-image/>
    </style:table-cell-properties>
   </style:style>
   <style:style style:name="Table4" style:family="table">
-   <style:table-properties style:width="13.097cm" fo:margin-left="0.021cm" table:align="left" style:may-break-between-rows="true"/>
+   <style:table-properties style:width="5.3729in" fo:margin-left="0.0083in" table:align="left" style:may-break-between-rows="true"/>
   </style:style>
   <style:style style:name="Table4.A" style:family="table-column">
-   <style:table-column-properties style:column-width="3.006cm"/>
+   <style:table-column-properties style:column-width="1.1833in"/>
   </style:style>
   <style:style style:name="Table4.B" style:family="table-column">
-   <style:table-column-properties style:column-width="10.091cm"/>
+   <style:table-column-properties style:column-width="4.1896in"/>
   </style:style>
   <style:style style:name="Table4.A1" style:family="table-cell">
-   <style:table-cell-properties fo:background-color="transparent" fo:padding="0.097cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="0.05pt solid #000000" fo:border-bottom="0.05pt solid #000000">
+   <style:table-cell-properties fo:background-color="transparent" fo:padding="0.0382in" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="0.05pt solid #000000" fo:border-bottom="0.05pt solid #000000">
     <style:background-image/>
    </style:table-cell-properties>
   </style:style>
   <style:style style:name="Table4.B1" style:family="table-cell">
-   <style:table-cell-properties fo:background-color="transparent" fo:padding="0.097cm" fo:border="0.05pt solid #000000">
+   <style:table-cell-properties fo:background-color="transparent" fo:padding="0.0382in" fo:border="0.05pt solid #000000">
     <style:background-image/>
    </style:table-cell-properties>
   </style:style>
   <style:style style:name="Table4.A2" style:family="table-cell">
-   <style:table-cell-properties fo:background-color="transparent" fo:padding="0.097cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000">
+   <style:table-cell-properties fo:background-color="transparent" fo:padding="0.0382in" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000">
     <style:background-image/>
    </style:table-cell-properties>
   </style:style>
   <style:style style:name="Table4.B2" style:family="table-cell">
-   <style:table-cell-properties fo:background-color="transparent" fo:padding="0.097cm" fo:border-left="0.05pt solid #000000" fo:border-right="0.05pt solid #000000" fo:border-top="none" fo:border-bottom="0.05pt solid #000000">
+   <style:table-cell-properties fo:background-color="transparent" fo:padding="0.0382in" fo:border-left="0.05pt solid #000000" fo:border-right="0.05pt solid #000000" fo:border-top="none" fo:border-bottom="0.05pt solid #000000">
     <style:background-image/>
    </style:table-cell-properties>
   </style:style>
@@ -527,19 +546,19 @@
    <style:text-properties style:font-name="Cantarell" fo:font-size="7pt" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
   </style:style>
   <style:style style:name="P13" style:family="paragraph" style:parent-style-name="Standard">
-   <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:text-align="start" style:justify-single-word="false" fo:text-indent="0cm" style:auto-text-indent="false"/>
+   <style:paragraph-properties fo:margin-left="0in" fo:margin-right="0in" fo:text-align="start" style:justify-single-word="false" fo:text-indent="0in" style:auto-text-indent="false"/>
    <style:text-properties style:font-name="Cantarell" fo:font-size="7pt" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
   </style:style>
   <style:style style:name="P14" style:family="paragraph" style:parent-style-name="Standard">
-   <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:text-indent="0cm" style:auto-text-indent="false"/>
+   <style:paragraph-properties fo:margin-left="0in" fo:margin-right="0in" fo:text-indent="0in" style:auto-text-indent="false"/>
    <style:text-properties style:font-name="Cantarell" fo:font-size="7pt" officeooo:paragraph-rsid="002df6ba" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
   </style:style>
   <style:style style:name="P15" style:family="paragraph" style:parent-style-name="Standard">
-   <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:text-indent="0cm" style:auto-text-indent="false"/>
+   <style:paragraph-properties fo:margin-left="0in" fo:margin-right="0in" fo:text-indent="0in" style:auto-text-indent="false"/>
    <style:text-properties style:font-name="Cantarell" fo:font-size="7pt" officeooo:paragraph-rsid="002cc9ef" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
   </style:style>
   <style:style style:name="P16" style:family="paragraph" style:parent-style-name="Standard">
-   <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:text-indent="0cm" style:auto-text-indent="false"/>
+   <style:paragraph-properties fo:margin-left="0in" fo:margin-right="0in" fo:text-indent="0in" style:auto-text-indent="false"/>
    <style:text-properties style:font-name="Cantarell" fo:font-size="7pt" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
   </style:style>
   <style:style style:name="P17" style:family="paragraph" style:parent-style-name="Table_20_Contents">
@@ -558,90 +577,112 @@
    <style:text-properties style:font-name="Cantarell" fo:font-size="7pt" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
   </style:style>
   <style:style style:name="P21" style:family="paragraph" style:parent-style-name="Text_20_body">
-   <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0.011cm" style:contextual-spacing="false"/>
+   <style:paragraph-properties fo:margin-top="0in" fo:margin-bottom="0.0043in" style:contextual-spacing="false"/>
    <style:text-properties style:font-name="Cantarell" fo:font-size="7pt" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
   </style:style>
   <style:style style:name="P22" style:family="paragraph" style:parent-style-name="Text_20_body">
-   <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0.011cm" style:contextual-spacing="false" fo:line-height="100%"/>
+   <style:paragraph-properties fo:margin-top="0in" fo:margin-bottom="0.0043in" style:contextual-spacing="false" fo:line-height="100%"/>
    <style:text-properties style:font-name="Cantarell" fo:font-size="7pt" officeooo:paragraph-rsid="003bba97" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
   </style:style>
-  <style:style style:name="P23" style:family="paragraph" style:parent-style-name="Text_20_body">
+  <style:style style:name="P23" style:family="paragraph" style:parent-style-name="Table_20_Contents">
-   <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0.011cm" style:contextual-spacing="false"/>
+   <style:text-properties style:font-name="Cantarell" fo:font-size="7pt" officeooo:paragraph-rsid="0046f4f2" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
-   <style:text-properties style:font-name="Cantarell" fo:font-size="7pt" fo:font-weight="bold" style:font-size-asian="7pt" style:font-weight-asian="bold" style:font-size-complex="7pt" style:font-weight-complex="bold"/>
   </style:style>
   <style:style style:name="P24" style:family="paragraph" style:parent-style-name="Text_20_body">
+   <style:paragraph-properties fo:margin-top="0in" fo:margin-bottom="0.0043in" style:contextual-spacing="false"/>
    <style:text-properties style:font-name="Cantarell" fo:font-size="7pt" fo:font-weight="bold" style:font-size-asian="7pt" style:font-weight-asian="bold" style:font-size-complex="7pt" style:font-weight-complex="bold"/>
   </style:style>
-  <style:style style:name="P25" style:family="paragraph" style:parent-style-name="Standard">
+  <style:style style:name="P25" style:family="paragraph" style:parent-style-name="Text_20_body">
-   <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:text-indent="0cm" style:auto-text-indent="false"/>
+   <style:text-properties style:font-name="Cantarell" fo:font-size="7pt" fo:font-weight="bold" style:font-size-asian="7pt" style:font-weight-asian="bold" style:font-size-complex="7pt" style:font-weight-complex="bold"/>
-   <style:text-properties style:font-name="Cantarell" fo:font-size="8pt" officeooo:paragraph-rsid="002b1070" style:font-size-asian="8pt" style:font-size-complex="8pt"/>
   </style:style>
   <style:style style:name="P26" style:family="paragraph" style:parent-style-name="Standard">
-   <style:paragraph-properties fo:margin-left="11.28cm" fo:margin-right="0cm" fo:text-indent="0cm" style:auto-text-indent="false"/>
+   <style:paragraph-properties fo:margin-left="0in" fo:margin-right="0in" fo:text-indent="0in" style:auto-text-indent="false"/>
    <style:text-properties style:font-name="Cantarell" fo:font-size="8pt" officeooo:paragraph-rsid="002b1070" style:font-size-asian="8pt" style:font-size-complex="8pt"/>
   </style:style>
   <style:style style:name="P27" style:family="paragraph" style:parent-style-name="Standard">
-   <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:text-indent="0cm" style:auto-text-indent="false"/>
+   <style:paragraph-properties fo:margin-left="4.4409in" fo:margin-right="0in" fo:text-indent="0in" style:auto-text-indent="false"/>
+   <style:text-properties style:font-name="Cantarell" fo:font-size="8pt" officeooo:paragraph-rsid="002b1070" style:font-size-asian="8pt" style:font-size-complex="8pt"/>
+  </style:style>
+  <style:style style:name="P28" style:family="paragraph" style:parent-style-name="Standard">
+   <style:paragraph-properties fo:margin-left="0in" fo:margin-right="0in" fo:text-indent="0in" style:auto-text-indent="false"/>
    <style:text-properties style:font-name="Cantarell" fo:font-size="8pt" officeooo:paragraph-rsid="003da5ab" style:font-size-asian="8pt" style:font-size-complex="8pt"/>
   </style:style>
-  <style:style style:name="P28" style:family="paragraph" style:parent-style-name="Table_20_Contents">
-   <style:text-properties style:font-name="Cantarell" fo:font-size="8pt" style:font-size-asian="8pt" style:font-size-complex="8pt"/>
-  </style:style>
   <style:style style:name="P29" style:family="paragraph" style:parent-style-name="Table_20_Contents">
-   <style:paragraph-properties fo:text-align="end" style:justify-single-word="false"/>
    <style:text-properties style:font-name="Cantarell" fo:font-size="8pt" style:font-size-asian="8pt" style:font-size-complex="8pt"/>
   </style:style>
-  <style:style style:name="P30" style:family="paragraph" style:parent-style-name="Table_20_Heading">
+  <style:style style:name="P30" style:family="paragraph" style:parent-style-name="Table_20_Contents">
    <style:paragraph-properties fo:text-align="end" style:justify-single-word="false"/>
    <style:text-properties style:font-name="Cantarell" fo:font-size="8pt" style:font-size-asian="8pt" style:font-size-complex="8pt"/>
   </style:style>
   <style:style style:name="P31" style:family="paragraph" style:parent-style-name="Table_20_Heading">
+   <style:paragraph-properties fo:text-align="end" style:justify-single-word="false"/>
    <style:text-properties style:font-name="Cantarell" fo:font-size="8pt" style:font-size-asian="8pt" style:font-size-complex="8pt"/>
   </style:style>
   <style:style style:name="P32" style:family="paragraph" style:parent-style-name="Table_20_Heading">
+   <style:text-properties style:font-name="Cantarell" fo:font-size="8pt" style:font-size-asian="8pt" style:font-size-complex="8pt"/>
+  </style:style>
+  <style:style style:name="P33" style:family="paragraph" style:parent-style-name="Table_20_Heading">
    <style:text-properties style:font-name="Cantarell" fo:font-size="8pt" officeooo:rsid="003bba97" officeooo:paragraph-rsid="003bba97" style:font-size-asian="8pt" style:font-size-complex="8pt"/>
   </style:style>
-  <style:style style:name="P33" style:family="paragraph" style:parent-style-name="Text_20_body" style:master-page-name="">
+  <style:style style:name="P34" style:family="paragraph" style:parent-style-name="Text_20_body" style:master-page-name="">
    <style:paragraph-properties style:page-number="auto"/>
    <style:text-properties style:font-name="Cantarell" fo:font-size="8pt" style:font-size-asian="8pt" style:font-size-complex="8pt"/>
   </style:style>
-  <style:style style:name="P34" style:family="paragraph" style:parent-style-name="Text_20_body">
+  <style:style style:name="P35" style:family="paragraph" style:parent-style-name="Text_20_body">
    <loext:graphic-properties draw:fill="none"/>
-   <style:paragraph-properties fo:margin-left="1cm" fo:margin-right="0cm" fo:margin-top="0cm" fo:margin-bottom="0.212cm" style:contextual-spacing="false" fo:text-indent="0cm" style:auto-text-indent="false" fo:background-color="transparent"/>
+   <style:paragraph-properties fo:margin-left="0.3937in" fo:margin-right="0in" fo:margin-top="0in" fo:margin-bottom="0.0835in" style:contextual-spacing="false" fo:text-indent="0in" style:auto-text-indent="false" fo:background-color="transparent"/>
    <style:text-properties style:font-name="Cantarell" fo:font-size="8pt" officeooo:rsid="0019f6b5" officeooo:paragraph-rsid="0019f6b5" style:font-size-asian="8pt" style:font-size-complex="8pt"/>
   </style:style>
-  <style:style style:name="P35" style:family="paragraph" style:parent-style-name="Text_20_body">
+  <style:style style:name="P36" style:family="paragraph" style:parent-style-name="Text_20_body">
    <style:paragraph-properties fo:break-before="column"/>
    <style:text-properties style:font-name="Cantarell" fo:font-size="8pt" officeooo:rsid="0019f6b5" officeooo:paragraph-rsid="0024fff1" style:font-size-asian="8pt" style:font-size-complex="8pt"/>
   </style:style>
-  <style:style style:name="P36" style:family="paragraph" style:parent-style-name="Text_20_body">
+  <style:style style:name="P37" style:family="paragraph" style:parent-style-name="Text_20_body">
    <style:text-properties style:font-name="Cantarell" fo:font-size="8pt" style:font-size-asian="8pt" style:font-size-complex="8pt"/>
   </style:style>
-  <style:style style:name="P37" style:family="paragraph" style:parent-style-name="Text_20_body">
+  <style:style style:name="P38" style:family="paragraph" style:parent-style-name="Text_20_body">
-   <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:text-indent="0cm" style:auto-text-indent="false"/>
+   <style:paragraph-properties fo:margin-left="0in" fo:margin-right="0in" fo:text-indent="0in" style:auto-text-indent="false"/>
    <style:text-properties style:font-name="Cantarell" fo:font-size="8pt" officeooo:paragraph-rsid="003fc8ab" style:font-size-asian="8pt" style:font-size-complex="8pt"/>
   </style:style>
-  <style:style style:name="P38" style:family="paragraph" style:parent-style-name="Text_20_body">
+  <style:style style:name="P39" style:family="paragraph" style:parent-style-name="Text_20_body">
+   <style:text-properties style:font-name="Cantarell" fo:font-size="8pt" officeooo:rsid="00452a7b" officeooo:paragraph-rsid="00452a7b" style:font-size-asian="8pt" style:font-size-complex="8pt"/>
+  </style:style>
+  <style:style style:name="P40" style:family="paragraph" style:parent-style-name="Text_20_body">
    <style:paragraph-properties fo:text-align="start" style:justify-single-word="false"/>
    <style:text-properties style:font-name="Cantarell" fo:font-size="8pt" style:text-underline-style="none" style:font-size-asian="8pt" style:font-size-complex="8pt"/>
   </style:style>
-  <style:style style:name="P39" style:family="paragraph" style:parent-style-name="Text_20_body">
+  <style:style style:name="P41" style:family="paragraph" style:parent-style-name="Text_20_body">
    <style:paragraph-properties fo:break-before="column"/>
    <style:text-properties style:font-name="Cantarell" fo:font-size="8pt" fo:font-weight="bold" officeooo:rsid="001bf6f1" officeooo:paragraph-rsid="0024fff1" style:font-size-asian="8pt" style:font-weight-asian="bold" style:font-size-complex="8pt" style:font-weight-complex="bold"/>
   </style:style>
-  <style:style style:name="P40" style:family="paragraph" style:parent-style-name="Text_20_body">
+  <style:style style:name="P42" style:family="paragraph" style:parent-style-name="Text_20_body">
    <style:text-properties style:font-name="Cantarell" fo:font-size="8pt" fo:font-weight="bold" style:font-size-asian="8pt" style:font-weight-asian="bold" style:font-size-complex="8pt" style:font-weight-complex="bold"/>
   </style:style>
-  <style:style style:name="P41" style:family="paragraph" style:parent-style-name="Text_20_body">
+  <style:style style:name="P43" style:family="paragraph" style:parent-style-name="Text_20_body">
    <style:text-properties style:font-name="Cantarell" fo:font-size="8pt" fo:font-weight="bold" officeooo:paragraph-rsid="003bba97" style:font-size-asian="8pt" style:font-weight-asian="bold" style:font-size-complex="8pt" style:font-weight-complex="bold"/>
   </style:style>
-  <style:style style:name="P42" style:family="paragraph" style:parent-style-name="Text_20_body">
+  <style:style style:name="P44" style:family="paragraph" style:parent-style-name="Text_20_body">
-   <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0.011cm" style:contextual-spacing="false"/>
+   <style:paragraph-properties fo:margin-top="0in" fo:margin-bottom="0.0043in" style:contextual-spacing="false"/>
    <style:text-properties style:font-name="Cantarell" fo:font-size="8pt" fo:font-weight="bold" style:font-size-asian="8pt" style:font-weight-asian="bold" style:font-size-complex="8pt" style:font-weight-complex="bold"/>
   </style:style>
-  <style:style style:name="P43" style:family="paragraph" style:parent-style-name="Table_20_Contents">
+  <style:style style:name="P45" style:family="paragraph" style:parent-style-name="Heading_20_1">
+   <style:paragraph-properties fo:text-align="start" style:justify-single-word="false"/>
+   <style:text-properties style:font-name="Cantarell" fo:font-size="10pt" style:text-underline-style="solid" style:text-underline-width="auto" style:text-underline-color="font-color" officeooo:paragraph-rsid="003f07ae" style:font-size-asian="10pt" style:font-size-complex="10pt"/>
+  </style:style>
+  <style:style style:name="P46" style:family="paragraph" style:parent-style-name="Text_20_body">
+   <style:paragraph-properties fo:text-align="start" style:justify-single-word="false"/>
+   <style:text-properties style:font-name="Cantarell" fo:font-size="10pt" officeooo:paragraph-rsid="003f07ae" style:font-size-asian="10pt" style:font-size-complex="10pt"/>
+  </style:style>
+  <style:style style:name="P47" style:family="paragraph" style:parent-style-name="Text_20_body">
+   <style:paragraph-properties fo:text-align="start" style:justify-single-word="false"/>
+   <style:text-properties style:font-name="Cantarell" fo:font-size="10pt" style:text-underline-style="none" officeooo:paragraph-rsid="003f07ae" style:font-size-asian="10pt" style:font-size-complex="10pt"/>
+  </style:style>
+  <style:style style:name="P48" style:family="paragraph" style:parent-style-name="Table_20_Contents">
    <style:text-properties fo:font-size="9pt" style:font-size-complex="9pt"/>
   </style:style>
+  <style:style style:name="P49" style:family="paragraph" style:parent-style-name="Standard">
+   <style:paragraph-properties fo:margin-left="0in" fo:margin-right="0in" fo:text-indent="0in" style:auto-text-indent="false"/>
+   <style:text-properties style:font-name="Droid Sans Japanese" fo:font-size="7pt" officeooo:paragraph-rsid="0046f4f2" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
+  </style:style>
   <style:style style:name="T1" style:family="text">
    <style:text-properties fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
   </style:style>
@@ -657,26 +698,32 @@
   <style:style style:name="T5" style:family="text">
    <style:text-properties officeooo:rsid="003fc8ab"/>
   </style:style>
+  <style:style style:name="T6" style:family="text">
+   <style:text-properties fo:font-size="12pt" style:text-underline-style="solid" style:text-underline-width="auto" style:text-underline-color="font-color" style:font-size-asian="12pt" style:font-size-complex="12pt"/>
+  </style:style>
+  <style:style style:name="T7" style:family="text">
+   <style:text-properties style:text-underline-style="solid" style:text-underline-width="auto" style:text-underline-color="font-color"/>
+  </style:style>
   <style:style style:name="fr1" style:family="graphic" style:parent-style-name="Graphics">
-   <style:graphic-properties style:vertical-pos="from-top" style:vertical-rel="paragraph" style:horizontal-pos="from-left" style:horizontal-rel="paragraph" style:mirror="none" fo:clip="rect(0cm, 0cm, 0cm, 0cm)" 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:graphic-properties style:vertical-pos="from-top" style:vertical-rel="paragraph" 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>
   <style:style style:name="Sect1" style:family="section">
    <style:section-properties text:dont-balance-text-columns="true" style:editable="false">
-    <style:columns fo:column-count="2" fo:column-gap="0cm">
+    <style:columns fo:column-count="2" fo:column-gap="0in">
-     <style:column style:rel-width="32767*" fo:start-indent="0cm" fo:end-indent="0cm"/>
+     <style:column style:rel-width="32767*" fo:start-indent="0in" fo:end-indent="0in"/>
-     <style:column style:rel-width="32768*" fo:start-indent="0cm" fo:end-indent="0cm"/>
+     <style:column style:rel-width="32768*" fo:start-indent="0in" fo:end-indent="0in"/>
     </style:columns>
    </style:section-properties>
   </style:style>
   <style:page-layout style:name="pm1">
-   <style:page-layout-properties fo:page-width="21.59cm" fo:page-height="27.94cm" style:num-format="1" style:print-orientation="portrait" fo:margin-top="2cm" fo:margin-bottom="2cm" fo:margin-left="1.21cm" fo:margin-right="0.97cm" style:writing-mode="lr-tb" style:layout-grid-color="#c0c0c0" style:layout-grid-lines="44" style:layout-grid-base-height="0.55cm" style:layout-grid-ruby-height="0cm" style:layout-grid-mode="none" style:layout-grid-ruby-below="false" style:layout-grid-print="true" style:layout-grid-display="true" style:footnote-max-height="0cm" loext:margin-gutter="0cm">
+   <style:page-layout-properties fo:page-width="8.5in" fo:page-height="11in" style:num-format="1" style:print-orientation="portrait" fo:margin-top="0.7874in" fo:margin-bottom="0.7874in" fo:margin-left="0.4764in" fo:margin-right="0.3819in" style:writing-mode="lr-tb" style:layout-grid-color="#c0c0c0" style:layout-grid-lines="44" style:layout-grid-base-height="0.2165in" style:layout-grid-ruby-height="0in" style:layout-grid-mode="none" style:layout-grid-ruby-below="false" style:layout-grid-print="true" style:layout-grid-display="true" style:footnote-max-height="0in" loext:margin-gutter="0in">
-    <style:footnote-sep style:width="0.018cm" style:distance-before-sep="0.101cm" style:distance-after-sep="0.101cm" style:line-style="none" style:adjustment="left" style:rel-width="25%" style:color="#000000"/>
+    <style:footnote-sep style:width="0.0071in" style:distance-before-sep="0.0398in" style:distance-after-sep="0.0398in" style:line-style="none" style:adjustment="left" style:rel-width="25%" style:color="#000000"/>
    </style:page-layout-properties>
    <style:header-style>
-    <style:header-footer-properties fo:min-height="0cm" fo:margin-left="0cm" fo:margin-right="0cm" fo:margin-bottom="0.499cm" fo:background-color="transparent" draw:fill="none" draw:fill-color="#99ccff"/>
+    <style:header-footer-properties fo:min-height="0in" fo:margin-left="0in" fo:margin-right="0in" fo:margin-bottom="0.1965in" fo:background-color="transparent" draw:fill="none" draw:fill-color="#99ccff"/>
    </style:header-style>
    <style:footer-style>
-    <style:header-footer-properties fo:min-height="0cm" fo:margin-left="0cm" fo:margin-right="0cm" fo:margin-top="0.499cm"/>
+    <style:header-footer-properties fo:min-height="0in" fo:margin-left="0in" fo:margin-right="0in" fo:margin-top="0.1965in"/>
    </style:footer-style>
   </style:page-layout>
   <style:style style:name="dp1" style:family="drawing-page">
@@ -717,7 +764,7 @@
     <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="P43"><draw:frame draw:style-name="fr1" draw:name="Imagen3" text:anchor-type="char" svg:x="0.212cm" svg:y="0.284cm" svg:width="7.92cm" svg:height="1.722cm" draw:z-index="0"><draw:image draw:mime-type="image/png">
+      <text:p text:style-name="P48"><draw:frame draw:style-name="fr1" draw:name="Imagen3" text:anchor-type="char" svg:x="0.0835in" svg:y="0.1118in" svg:width="3.1181in" svg:height="0.678in" draw:z-index="0"><draw:image draw:mime-type="image/png">
          <office:binary-data>iVBORw0KGgoAAAANSUhEUgAAATsAAABFCAYAAAA1g0HCAAAAAXNSR0IArs4c6QAAADhlWElm
           TU0AKgAAAAgAAYdpAAQAAAABAAAAGgAAAAAAAqACAAQAAAABAAABO6ADAAQAAAABAAAARQAA
           AACTFYNyAABAAElEQVR4Aey9B3xc13XuuwAMeu+VBECwV5FiJ0VRpKhmVVvFRXYcO4mdn/1y
@@ -1200,47 +1247,48 @@
        </draw:frame></text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tabla2.A1" office:value-type="string">
-      <text:p text:style-name="P9"><text:placeholder text:placeholder-type="text">&lt;choose test=&quot;&quot;&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P46"><text:placeholder text:placeholder-type="text">&lt;choose test=&quot;&quot;&gt;</text:placeholder></text:p>
-      <text:p text:style-name="P10"><text:placeholder text:placeholder-type="text">&lt;when test=&quot;purchase.state == &apos;draft&apos;&quot;&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P47"><text:placeholder text:placeholder-type="text">&lt;when test=&quot;purchase.state == &apos;draft&apos;&quot;&gt;</text:placeholder></text:p>
-      <text:p text:style-name="P8"><text:span text:style-name="T4">C</text:span><text:span text:style-name="T5">OMPRA EN ESTADO BORRADOR</text:span></text:p>
+      <text:p text:style-name="P45"><text:span text:style-name="T4">C</text:span><text:span text:style-name="T5">OMPRA EN ESTADO BORRADOR</text:span></text:p>
-      <text:p text:style-name="P10"><text:placeholder text:placeholder-type="text">&lt;/when&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P47"><text:placeholder text:placeholder-type="text">&lt;/when&gt;</text:placeholder></text:p>
-      <text:p text:style-name="P10"><text:placeholder text:placeholder-type="text">&lt;when test=&quot;purchase.state == &apos;quotation&apos;&quot;&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P47"><text:placeholder text:placeholder-type="text">&lt;when test=&quot;purchase.state == &apos;quotation&apos;&quot;&gt;</text:placeholder></text:p>
-      <text:p text:style-name="P8"><text:span text:style-name="T4">C</text:span><text:span text:style-name="T5">OMPRA</text:span> N°: <text:placeholder text:placeholder-type="text">&lt;purchase.full_number&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P45"><text:span text:style-name="T4">C</text:span><text:span text:style-name="T5">OMPRA</text:span> N°: <text:placeholder text:placeholder-type="text">&lt;purchase.full_number&gt;</text:placeholder></text:p>
-      <text:p text:style-name="P10"><text:placeholder text:placeholder-type="text">&lt;/when&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P47"><text:placeholder text:placeholder-type="text">&lt;/when&gt;</text:placeholder></text:p>
-      <text:p text:style-name="P10"><text:placeholder text:placeholder-type="text">&lt;otherwise test=&quot;&quot;&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P47"><text:placeholder text:placeholder-type="text">&lt;otherwise test=&quot;&quot;&gt;</text:placeholder></text:p>
-      <text:p text:style-name="P8">O<text:span text:style-name="T5">RDEN DE COMPRA</text:span> N°: <text:placeholder text:placeholder-type="text">&lt;purchase.full_number&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P45">O<text:span text:style-name="T5">RDEN DE COMPRA</text:span> N°: <text:placeholder text:placeholder-type="text">&lt;purchase.full_number&gt;</text:placeholder></text:p>
-      <text:p text:style-name="P10"><text:placeholder text:placeholder-type="text">&lt;/otherwise&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P47"><text:placeholder text:placeholder-type="text">&lt;/otherwise&gt;</text:placeholder></text:p>
-      <text:p text:style-name="P10"><text:placeholder text:placeholder-type="text">&lt;/choose&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P47"><text:placeholder text:placeholder-type="text">&lt;/choose&gt;</text:placeholder></text:p>
      </table:table-cell>
     </table:table-row>
    </table:table>
-   <text:p text:style-name="P25"/>
+   <text:p text:style-name="P26"/>
    <table:table table:name="Tabla1" table:style-name="Tabla1">
     <table:table-column table:style-name="Tabla1.A"/>
     <table:table-column table:style-name="Tabla1.B"/>
     <table:table-row table:style-name="Tabla1.1">
      <table:table-cell table:style-name="Tabla1.A1" office:value-type="string">
-      <text:p text:style-name="P37"><text:span text:style-name="T2">Fecha</text:span><text:span text:style-name="T1">: </text:span><text:span text:style-name="T1"><text:placeholder text:placeholder-type="text">&lt;format_date(purchase.purchase_date or today, purchase.party.lang)&gt;</text:placeholder></text:span></text:p>
+      <text:p text:style-name="P38"><text:span text:style-name="T2">Fecha</text:span><text:span text:style-name="T1">: </text:span><text:span text:style-name="T1"><text:placeholder text:placeholder-type="text">&lt;format_date(purchase.purchase_date or today, purchase.party.lang)&gt;</text:placeholder></text:span></text:p>
-      <text:p text:style-name="P27"><text:span text:style-name="T1">NIT:</text:span> 901091201-1</text:p>
+      <text:p text:style-name="P28"><text:span text:style-name="T1">NIT:</text:span> 901091201-1</text:p>
-      <text:p text:style-name="P27">Regimen Común</text:p>
+      <text:p text:style-name="P28">Regimen Común</text:p>
-      <text:p text:style-name="P27">Actividad Economica 4690</text:p>
+      <text:p text:style-name="P28">Actividad Economica 4690</text:p>
-      <text:p text:style-name="P27">CARRERA 16 No 52-85 PISO 4</text:p>
+      <text:p text:style-name="P28">CARRERA 16 No 52-85 PISO 4</text:p>
-      <text:p text:style-name="P27"><text:span text:style-name="T1">Tel:</text:span> 7163487-3000931 <text:s text:c="4"/>BOGOTA</text:p>
+      <text:p text:style-name="P28"><text:span text:style-name="T1">Tel:</text:span> 7163487-3000931 <text:s text:c="4"/>BOGOTA</text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tabla1.A1" office:value-type="string">
-      <text:p text:style-name="P27"><text:placeholder text:placeholder-type="text">&lt;replace text:p=&quot;set_lang(purchase.party.lang)&quot;&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P28"><text:placeholder text:placeholder-type="text">&lt;replace text:p=&quot;set_lang(purchase.party.lang)&quot;&gt;</text:placeholder></text:p>
-      <text:p text:style-name="P27"><text:placeholder text:placeholder-type="text">&lt;replace text:p=&quot;purchase.set_lang(purchase.party.lang)&quot;&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P28"><text:placeholder text:placeholder-type="text">&lt;replace text:p=&quot;purchase.set_lang(purchase.party.lang)&quot;&gt;</text:placeholder></text:p>
-      <text:p text:style-name="P27"><text:placeholder text:placeholder-type="text">&lt;for each=&quot;line in purchase.report_address.splitlines()&quot;&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P28"><text:placeholder text:placeholder-type="text">&lt;for each=&quot;line in purchase.report_address.splitlines()&quot;&gt;</text:placeholder></text:p>
-      <text:p text:style-name="P27"><text:placeholder text:placeholder-type="text">&lt;line&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P28"><text:placeholder text:placeholder-type="text">&lt;line&gt;</text:placeholder></text:p>
-      <text:p text:style-name="P27"><text:placeholder text:placeholder-type="text">&lt;/for&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P28"><text:placeholder text:placeholder-type="text">&lt;/for&gt;</text:placeholder></text:p>
-      <text:p text:style-name="P27"><text:placeholder text:placeholder-type="text">&lt;if test=&quot;purchase.party.tax_identifier&quot;&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P28"><text:placeholder text:placeholder-type="text">&lt;if test=&quot;purchase.party.tax_identifier&quot;&gt;</text:placeholder></text:p>
-      <text:p text:style-name="P27"><text:placeholder text:placeholder-type="text">&lt;purchase.party.tax_identifier.type_string&gt;</text:placeholder>: <text:placeholder text:placeholder-type="text">&lt;purchase.party.tax_identifier.code&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P28"><text:placeholder text:placeholder-type="text">&lt;purchase.party.tax_identifier.type_string&gt;</text:placeholder>: <text:placeholder text:placeholder-type="text">&lt;purchase.party.tax_identifier.code&gt;</text:placeholder></text:p>
-      <text:p text:style-name="P27"><text:placeholder text:placeholder-type="text">&lt;/if&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P28"><text:placeholder text:placeholder-type="text">&lt;/if&gt;</text:placeholder></text:p>
      </table:table-cell>
     </table:table-row>
    </table:table>
    <text:section text:style-name="Sect1" text:name="Section1">
-    <text:p text:style-name="P36"/>
+    <text:p text:style-name="P37"/>
+    <text:p text:style-name="P39"><text:span text:style-name="T1">Descripción: </text:span><text:span text:style-name="T7"><text:placeholder text:placeholder-type="text">&lt;purchase.description&gt;</text:placeholder></text:span></text:p>
    </text:section>
    <table:table table:name="Table1" table:style-name="Table1">
     <table:table-column table:style-name="Table1.A"/>
@@ -1251,19 +1299,19 @@
     <table:table-header-rows>
      <table:table-row>
       <table:table-cell table:style-name="Table1.A1" office:value-type="string">
-       <text:p text:style-name="P31">Descrip<text:span text:style-name="T4">c</text:span>i<text:span text:style-name="T1">ó</text:span>n</text:p>
+       <text:p text:style-name="P32">Descrip<text:span text:style-name="T4">c</text:span>i<text:span text:style-name="T1">ó</text:span>n</text:p>
       </table:table-cell>
       <table:table-cell table:style-name="Table1.A1" office:value-type="string">
-       <text:p text:style-name="P32">Cantidad</text:p>
+       <text:p text:style-name="P33">Cantidad</text:p>
       </table:table-cell>
       <table:table-cell table:style-name="Table1.A1" office:value-type="string">
-       <text:p text:style-name="P32">Precio u/n</text:p>
+       <text:p text:style-name="P33">Precio u/n</text:p>
       </table:table-cell>
       <table:table-cell table:style-name="Table1.A1" office:value-type="string">
-       <text:p text:style-name="P32">Impuestos</text:p>
+       <text:p text:style-name="P33">Impuestos</text:p>
       </table:table-cell>
       <table:table-cell table:style-name="Table1.E1" office:value-type="string">
-       <text:p text:style-name="P32">Total</text:p>
+       <text:p text:style-name="P33">Total</text:p>
       </table:table-cell>
      </table:table-row>
     </table:table-header-rows>
@@ -1296,22 +1344,12 @@
     </table:table-row>
     <table:table-row>
      <table:table-cell table:style-name="Table1.A5" office:value-type="string">
-      <text:p text:style-name="P14"><text:placeholder text:placeholder-type="text">&lt;choose&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P49"><text:placeholder text:placeholder-type="text">&lt;if test=&quot;line.product&quot;&gt;</text:placeholder></text:p>
-      <text:p text:style-name="P14"><text:placeholder text:placeholder-type="text">&lt;when test=&quot;line.product_supplier&quot;&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P49"><text:placeholder text:placeholder-type="text">&lt;line.product.rec_name&gt;</text:placeholder></text:p>
-      <text:p text:style-name="P15"><text:placeholder text:placeholder-type="text">&lt;line.product_supplier.rec_name&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P49"><text:placeholder text:placeholder-type="text">&lt;/if&gt;</text:placeholder><text:tab/></text:p>
-      <text:p text:style-name="P15"><text:placeholder text:placeholder-type="text">&lt;/when&gt;</text:placeholder></text:p>
-      <text:p text:style-name="P15"><text:placeholder text:placeholder-type="text">&lt;when test=&quot;line.product&quot;&gt;</text:placeholder></text:p>
-      <text:p text:style-name="P15"><text:placeholder text:placeholder-type="text">&lt;line.product.rec_name&gt;</text:placeholder></text:p>
-      <text:p text:style-name="P15"><text:placeholder text:placeholder-type="text">&lt;/when&gt;</text:placeholder></text:p>
-      <text:p text:style-name="P15"><text:placeholder text:placeholder-type="text">&lt;/choose&gt;</text:placeholder></text:p>
-      <text:p text:style-name="P15"><text:placeholder text:placeholder-type="text">&lt;if test=&quot;line.description&quot;&gt;</text:placeholder></text:p>
-      <text:p text:style-name="P15"><text:placeholder text:placeholder-type="text">&lt;for each=&quot;description in line.description.split(&apos;\n&apos;)&quot;&gt;</text:placeholder></text:p>
-      <text:p text:style-name="P15"><text:soft-page-break/><text:placeholder text:placeholder-type="text">&lt;description&gt;</text:placeholder></text:p>
-      <text:p text:style-name="P15"><text:placeholder text:placeholder-type="text">&lt;/for&gt;</text:placeholder></text:p>
-      <text:p text:style-name="P15"><text:placeholder text:placeholder-type="text">&lt;/if&gt;</text:placeholder></text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Table1.B5" office:value-type="string">
-      <text:p text:style-name="P18"><text:placeholder text:placeholder-type="text">&lt;format_number_symbol(line.quantity, purchase.party.lang, line.unit, digits=line.unit.digits) if line.unit else format_number(line.quantity, purchase.party.lang)&gt;</text:placeholder><text:soft-page-break/></text:p>
+      <text:p text:style-name="P18"><text:placeholder text:placeholder-type="text">&lt;format_number_symbol(line.quantity, purchase.party.lang, line.unit, digits=line.unit.digits) if line.unit else format_number(line.quantity, purchase.party.lang)&gt;</text:placeholder></text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Table1.C5" office:value-type="string">
       <text:p text:style-name="P19"><text:placeholder text:placeholder-type="text">&lt;format_currency(line.unit_price, purchase.party.lang, purchase.currency, digits=line.__class__.unit_price.digits[1])&gt;</text:placeholder></text:p>
@@ -1325,9 +1363,10 @@
       <text:p text:style-name="P18"><text:placeholder text:placeholder-type="text">&lt;format_currency(line.amount, purchase.party.lang, purchase.currency)&gt;</text:placeholder></text:p>
      </table:table-cell>
     </table:table-row>
+    <text:soft-page-break/>
     <table:table-row>
      <table:table-cell table:style-name="Table1.A2" table:number-columns-spanned="5" office:value-type="string">
-      <text:p text:style-name="P17"><text:placeholder text:placeholder-type="text">&lt;/when&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P23"><text:placeholder text:placeholder-type="text">&lt;/when&gt;</text:placeholder></text:p>
      </table:table-cell>
      <table:covered-table-cell/>
      <table:covered-table-cell/>
@@ -1447,7 +1486,7 @@
     <table:table-column table:style-name="Table2.B"/>
     <table:table-row>
      <table:table-cell office:value-type="string">
-      <text:p text:style-name="P28"/>
+      <text:p text:style-name="P29"/>
      </table:table-cell>
      <table:table-cell office:value-type="string">
       <table:table table:name="Table4" table:style-name="Table4">
@@ -1455,38 +1494,38 @@
        <table:table-column table:style-name="Table4.B"/>
        <table:table-row>
         <table:table-cell table:style-name="Table4.A1" office:value-type="string">
-         <text:p text:style-name="P30">Total (<text:span text:style-name="T4">Sin impuesto</text:span>):</text:p>
+         <text:p text:style-name="P31">Total (<text:span text:style-name="T4">Sin impuesto</text:span>):</text:p>
         </table:table-cell>
         <table:table-cell table:style-name="Table4.B1" office:value-type="string">
-         <text:p text:style-name="P29"><text:placeholder text:placeholder-type="text">&lt;format_currency(purchase.untaxed_amount, purchase.party.lang, purchase.currency)&gt;</text:placeholder></text:p>
+         <text:p text:style-name="P30"><text:placeholder text:placeholder-type="text">&lt;format_currency(purchase.untaxed_amount, purchase.party.lang, purchase.currency)&gt;</text:placeholder></text:p>
         </table:table-cell>
        </table:table-row>
        <table:table-row>
         <table:table-cell table:style-name="Table4.A2" office:value-type="string">
-         <text:p text:style-name="P30"><text:span text:style-name="T4">Impuestos</text:span>:</text:p>
+         <text:p text:style-name="P31"><text:span text:style-name="T4">Impuestos</text:span>:</text:p>
         </table:table-cell>
         <table:table-cell table:style-name="Table4.B2" office:value-type="string">
-         <text:p text:style-name="P29"><text:placeholder text:placeholder-type="text">&lt;format_currency(purchase.tax_amount, purchase.party.lang, purchase.currency)&gt;</text:placeholder></text:p>
+         <text:p text:style-name="P30"><text:placeholder text:placeholder-type="text">&lt;format_currency(purchase.tax_amount, purchase.party.lang, purchase.currency)&gt;</text:placeholder></text:p>
         </table:table-cell>
        </table:table-row>
        <table:table-row>
         <table:table-cell table:style-name="Table4.A2" office:value-type="string">
-         <text:p text:style-name="P30">Total:</text:p>
+         <text:p text:style-name="P31">Total:</text:p>
         </table:table-cell>
         <table:table-cell table:style-name="Table4.B2" office:value-type="string">
-         <text:p text:style-name="P29"><text:placeholder text:placeholder-type="text">&lt;format_currency(purchase.total_amount, purchase.party.lang, purchase.currency)&gt;</text:placeholder></text:p>
+         <text:p text:style-name="P30"><text:placeholder text:placeholder-type="text">&lt;format_currency(purchase.total_amount, purchase.party.lang, purchase.currency)&gt;</text:placeholder></text:p>
         </table:table-cell>
        </table:table-row>
       </table:table>
-      <text:p text:style-name="P28"/>
+      <text:p text:style-name="P29"/>
      </table:table-cell>
     </table:table-row>
    </table:table>
-   <text:p text:style-name="P36"><text:placeholder text:placeholder-type="text">&lt;for each=&quot;comment in (purchase.comment or &apos;&apos;).split(&apos;\n&apos;)&quot;&gt;</text:placeholder></text:p>
+   <text:p text:style-name="P37"><text:placeholder text:placeholder-type="text">&lt;for each=&quot;comment in (purchase.comment or &apos;&apos;).split(&apos;\n&apos;)&quot;&gt;</text:placeholder></text:p>
-   <text:p text:style-name="P36"><text:placeholder text:placeholder-type="text">&lt;comment&gt;</text:placeholder></text:p>
+   <text:p text:style-name="P37"><text:placeholder text:placeholder-type="text">&lt;comment&gt;</text:placeholder></text:p>
-   <text:p text:style-name="P36"><text:placeholder text:placeholder-type="text">&lt;/for&gt;</text:placeholder></text:p>
+   <text:p text:style-name="P37"><text:placeholder text:placeholder-type="text">&lt;/for&gt;</text:placeholder></text:p>
-   <text:p text:style-name="P36"><text:placeholder text:placeholder-type="text">&lt;/for&gt;</text:placeholder></text:p>
+   <text:p text:style-name="P37"><text:placeholder text:placeholder-type="text">&lt;/for&gt;</text:placeholder></text:p>
-   <text:p text:style-name="P42"/>
+   <text:p text:style-name="P44"/>
   </office:text>
  </office:body>
 </office:document>

sale.py

@@ -19,7 +19,7 @@ class Sale(metaclass=PoolMeta):
     'Sale'
     __name__ = 'sale.sale'
 
-
+    quote_number = fields.Char("Quote Number", readonly=True)
     sale_type = fields.Selection([('maintenance', 'Maintenance'),
                                   ('equipments', 'Equipments'),
                                   ('replaces', 'Replaces')], "Sale Type", required=True,
@@ -50,6 +50,9 @@ class Sale(metaclass=PoolMeta):
     def __setup__(cls):
         super(Sale, cls).__setup__()
         cls.contact.states['required']=True
+        cls.description.states['required']=True
+        cls.sale_date.states['required']=True
+        cls.payment_term.states['required']=True
         cls._buttons.update({
             'draft': {
                 'invisible': (Eval('state').in_(
@@ -69,6 +72,7 @@ class Sale(metaclass=PoolMeta):
                 ('cancelled', 'draft'),
                 ('processing', 'draft')
                 ))
+        
     @fields.depends('lines', 'sale_type', 'agended')
     def on_chage_sale_type(self):
         self.lines= []
@@ -95,6 +99,70 @@ class Sale(metaclass=PoolMeta):
 
         return [(None, '')] + [(m, get_name(m)) for m in models]
 
+    def _get_shipment_sale(self, Shipment, key):
+        values = {
+            'customer': self.shipment_party or self.party,
+            'delivery_address': self.shipment_address,
+            'company': self.company,
+            'sale_type': self.sale_type,
+            'service_maintenance_initial': True if self.sale_type != 'equipments' else False,
+            }
+
+        values.update(dict(key))
+
+        return Shipment(**values)
+
+    
+    @classmethod
+    def set_quote_number(cls, sales):
+        '''
+        Fill the number field with the sale sequence
+        '''
+        pool = Pool()
+        Config = pool.get('optical_equipment.configuration')
+        config = Config(1)
+        for sale in sales:
+            if config.equipment_sequence != None:
+                if not sale.quote_number:
+                    try:
+                        sale.quote_number = config.sale_quote_number.get()
+                        cls.save(sales)
+                    except UserError:
+                        raise UserError(str('Validation Error'))
+            else:
+                raise UserError(gettext('optical_equipment.msg_not_sequence_quote'))
+        
+    @classmethod
+    def copy(cls, sales, default=None):
+        if default is None:
+            default = {}
+        else:
+            default = default.copy()
+
+        default.setdefault('number', None)
+        default.setdefault('invoice_state', 'none')
+        default.setdefault('invoices_ignored', None)
+        default.setdefault('moves', None)
+        default.setdefault('shipment_state', 'none')
+        default.setdefault('quoted_by')
+        default.setdefault('confirmed_by')
+
+        return super(Sale, cls).copy(sales, default=default)
+
+    @classmethod
+    @ModelView.button
+    @Workflow.transition('quotation')
+    def quote(cls, sales):
+        pool = Pool()
+        AdvancePaymentCondition = pool.get('sale.advance_payment.condition')
+        for sale in sales:
+            sale.check_for_quotation()
+        cls.set_quote_number(sales)
+                    
+        for sale in sales:
+            sale.set_advance_payment_term()
+        cls.save(sales)
+        
     @classmethod
     @ModelView.button
     @Workflow.transition('confirmed')
@@ -128,6 +196,7 @@ class Sale(metaclass=PoolMeta):
                 sale.agended = True
                 sale.save()
                 
+        cls.set_number(sales)
         with transaction.set_context(
                 queue_scheduled_at=config.sale_process_after,
                 queue_batch=context.get('queue_batch', True)):
@@ -155,12 +224,9 @@ class SaleLine(metaclass=PoolMeta):
             If(Eval('_parent_sale.sale_type') == 'maintenance',
                [('type', '=', 'service'),
                 ('maintenance_activity', '=', True)], []))
-        cls.product.domain.append(If(Eval('_parent_sale.sale_type') == 'equipments',
-               [('equipment', '=', True)], []))
         cls.product.domain.append(If(Eval('_parent_sale.sale_type') == 'replaces',
-               [('replacement', '=', True),
+               [('replacement', '=', True)], []))
-                ('maintenance_activity', '=', True)], []))
+
-        cls.quantity.states['readonly'] = Eval('_parent_sale.sale_type') == 'equipments'
         
     def on_change_with_unit_digits(self, name=None):
         if self.unit:

sale.xml

@@ -1,6 +1,11 @@
 <?xml version="1.0"?>
 <!--This file file is part of Tryton. The COPYRIGHT file at the top level of this repository contains the full copyright notices and license terms. -->
 <tryton>
+    <record model="ir.ui.view" id="sale_view_tree">
+        <field name="model">sale.sale</field>
+	<field name="inherit" ref="sale.sale_view_tree"/>
+        <field name="name">sale_tree</field>
+    </record>
     <record model="ir.ui.view" id="sale_view_form">
 	<field name="model">sale.sale</field>
 	<field name="inherit" ref="sale.sale_view_form"/>
@@ -11,11 +16,15 @@
 	<field name="inherit" ref="sale.product_view_list_sale_line"/>
 	<field name="name">product_list_sale_line</field>
     </record>
+    <record model="ir.sequence" id="sequence_quote_sale">
+        <field name="name">Sale Quote</field>
+        <field name="sequence_type" ref="sale.sequence_type_sale"/>
+    </record>
     <record model="ir.action.report" id="report_sale">
         <field name="name">Sale Equipments</field>
         <field name="model">sale.sale</field>
         <field name="report_name">sale.sale</field>
-	<field name="report">optical_equipment/report/Sale.fodt</field>
+	<field name="report">optical_equipment/report/Sale_Internal.fodt</field>
         <field name="single" eval="True"/>
     </record>
     <record model="ir.action.keyword" id="report_sale_keyword">
@@ -23,4 +32,16 @@
         <field name="model">sale.sale,-1</field>
         <field name="action" ref="report_sale"/>
     </record>
+    <record model="ir.action.report" id="report_sale_internal">
+        <field name="name">Sale Equipments Internal</field>
+        <field name="model">sale.sale</field>
+        <field name="report_name">sale.sale</field>
+	<field name="report">optical_equipment/report/Sale.fodt</field>
+        <field name="single" eval="True"/>
+    </record>
+    <record model="ir.action.keyword" id="report_sale_internal_keyword">
+        <field name="keyword">form_print</field>
+        <field name="model">sale.sale,-1</field>
+        <field name="action" ref="report_sale_internal"/>
+    </record>
 </tryton>

tryton.cfg

@@ -1,5 +1,5 @@
 [tryton]
-version=6.6
+version=6.2
 depends:
     ir
     party
@@ -20,6 +20,7 @@ depends:
 xml:
     address.xml
     party.xml
+    account.xml
     product.xml
     equipment.xml
     contract.xml

view/change_propietary_form.xml

@@ -2,8 +2,11 @@
 <!-- This file is part of Tryton.  The COPYRIGHT file at the top level 
 this repository contains the full copyright notices and license terms. -->
 <form>
-    <label name="equipment"/>
+    <label name="old_propietary"/>
-    <field name="equipment" colspan="3"/>
+    <field name="old_propietary"/>
+    <newline/>
+    <field name="equipments" colspan="3"/>
+    <newline/>
     <label name="new_propietary"/>
     <field name="new_propietary" colspan="3"/>
     <label name="new_address"/>

view/change_propietary_maintenance_form.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton.  The COPYRIGHT file at the top level 
+this repository contains the full copyright notices and license terms. -->
+<form>
+    <label name="old_propietary"/>
+    <field name="old_propietary"/>
+    <newline/>
+    <field name="maintenance_service" colspan="3"/>
+    <newline/>
+    <label name="new_propietary"/>
+    <field name="new_propietary" colspan="3"/>
+    <label name="new_address"/>
+    <field name="new_address" colspan="3"/>
+    <label name="change_date"/>
+    <field name="change_date" colspan="3"/>
+</form>

view/contract_form.xml

@@ -40,7 +40,7 @@ this repository contains the full copyright notices and license terms. -->
     <label name="state"/>
     <field name="state"/>
     <group col="2" colspan="2" id="button">
-	<!--<button name="draft"/> -->
+	<button name="draft"/>
 	<button name="cancelled"/>	
 	<button name="running"/>
     </group>

view/maintenance_form.xml

@@ -16,6 +16,8 @@
     <field name="equipment"/>
     <label name="service_maintenance"/>
     <field name="service_maintenance"/>
+    <label name="equipment_calibrate"/>
+    <field name="equipment_calibrate" invisible="1"/>    
     <newline/>
     <label name="description_activity"/>
     <field name="description_activity" colspan="3"/>
@@ -31,8 +33,6 @@
 	    <field name="clean_int_ext"/>
 	    <label name="clean_eyes"/>
 	    <field name="clean_eyes"/>
-	    <label name="optical"/>
-	    <field name="optical"/>
 	    <label name="check_calibration"/>
 	    <field name="check_calibration"/>
 	</page>
@@ -78,6 +78,7 @@
     <group id="button">
       <button name="in_progress"/>
       <button name="finished"/>
+      <button name="samples"/>
       <button name="calibrate"/>
     </group>
 </form>

view/maintenance_sample_form.xml

@@ -13,4 +13,8 @@
     <field name="mistake"/>
     <label name="mistake_rate"/>
     <field name="mistake_rate"/>
+    <label name="product"/>
+    <field name="product" invisible="1"/>
+    <label name="maintenance" />
+    <field name="maintenance"/>
 </form>

view/maintenance_service_form.xml

@@ -21,6 +21,18 @@
     <label name="maintenance_type"/>
     <field name="maintenance_type"/>
     <newline/>
+    <label name="temperature_min"/>
+    <field name="temperature_min"/>
+    <label name="temperature_max"/>
+    <field name="temperature_max"/>
+    <label name="temperature_uom"/>
+    <field name="temperature_uom"/>
+    <label name="moisture_min"/>
+    <field name="moisture_min"/>
+    <label name="moisture_max"/>
+    <field name="moisture_max"/>
+    <label name="moisture_uom"/>
+    <field name="moisture_uom"/>
     <notebook colspan="6">
 	<page string="General" id="general">
 	    <label name="state_agended"/>
@@ -34,6 +46,11 @@
 	    <field name="lines"/>
 	</page>
 	<page string="Agendes" id="agendes">
+	    <group col="-1" id="current_agended">
+		<label name="current_agended"/>
+		<field name="current_agended"/>
+	    </group>
+	    <newline/>
 	    <field name="history_agended"/>
 	</page>
 	<page string="Other Info" id="other_info">

view/maintenance_service_tree.xml

@@ -3,6 +3,7 @@
      this repository contains the full copyright notices and license terms.-->
 <tree>
     <field name="code"/>
+    <field name="maintenance_type"/>	
     <field name="propietary"/>
     <field name="propietary_address"/>
     <field name="sale_origin"/>

view/optical_equipment_configuration_form.xml

@@ -15,5 +15,27 @@ this repository contains the full copyright notices and license terms. -->
     <newline/>
     <label name="contract_sequence"/>
     <field name="contract_sequence"/>
+    <newline/>
+    <label name="sale_quote_number"/>
+    <field name="sale_quote_number"/>
+    <newline/>    
+    <separator id="environmental_conditions" string="Environmental Conditions" colspan="4"/>
+    <label name="temperature_min"/>
+    <field name="temperature_min"/>
+    <newline/>
+    <label name="temperature_max"/>
+    <field name="temperature_max"/>
+    <newline/>
+    <label name="temperature_uom"/>
+    <field name="temperature_uom"/>
+    <newline/> 
+    <label name="moisture_min"/>
+    <field name="moisture_min"/>
+    <newline/> 
+    <label name="moisture_max"/>
+    <field name="moisture_max"/>
+    <newline/>
+    <label name="moisture_uom"/>
+    <field name="moisture_uom"/>
+    <newline/>
 </form>
-

view/optical_equipment_form.xml

@@ -72,7 +72,7 @@
 	</page>
     </notebook>
     <group col="2" colspan="2" id="button">
-	<!--<button name="draft"/> -->
+	<button name="draft"/>
 	<button name="registred"/>
     </group>
     <label name="state"/>

view/product_list_purchase_line.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
+     this repository contains the full copyright notices and license terms. -->
+<data>
+    <xpath expr="//field[@name='name']" position="after">
+	<field name="attributes_name" expand="1"/>
+    </xpath>
+</data>

view/sale_form.xml

@@ -2,6 +2,10 @@
 <!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
      this repository contains the full copyright notices and license terms. -->
 <data>
+    <xpath expr="//label[@name='number']" position="before">
+	<label name="quote_number"/>
+	<field name="quote_number"/>
+    </xpath>
     <xpath expr="//field[@name='reference']" position="after">
 	<newline/>
     	<label name="sale_type"/>

view/sale_tree.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
+     this repository contains the full copyright notices and license terms. -->
+<data>
+    <xpath expr="//field[@name='number']" position="before">
+	<field name="quote_number"/>
+    </xpath>
+    <xpath expr="//field[@name='number']" position="replace">
+	<field name="number"/>
+    </xpath>
+</data>

view/template_form.xml

@@ -55,6 +55,8 @@ this repository contains the full copyright notices and license terms. -->
 	    <label name="uncertainy_pattern"/>
 	    <field name="uncertainy_pattern"/>
 	    <newline/>
+	    <label name="use_pattern"/>
+	    <field name="use_pattern"/>	    
 	    <label name="k_pattern"/>
 	    <field name="k_pattern"/>
 	    <newline/>
@@ -82,6 +84,20 @@ this repository contains the full copyright notices and license terms. -->
 	    <label name="Usubi"/>
 	    <field name="Usubi"/>
 	</page>
+	<page string="Maintenance Activities" id="maintenance_activities">
+	    <label name="initial_operation"/>
+	    <field name="initial_operation"/>
+	    <label name="check_equipment"/>
+	    <field name="check_equipment"/>
+	    <label name="check_electric_system"/>
+	    <field name="check_electric_system"/>
+	    <label name="clean_int_ext"/>
+	    <field name="clean_int_ext"/>
+	    <label name="clean_eyes"/>
+	    <field name="clean_eyes"/>
+	    <label name="check_calibration"/>
+	    <field name="check_calibration"/>
+	</page>
     </xpath>
     <xpath expr="/form/notebook/page[@id='measurements']/label[@name='length']" position="before">
 	<separator id="measurements_equipment" string="Measurements of Equipment" colspan="4"/>