Merge branch '6.4' into 62to64

Se acopla a rama oficial 6.4

.gitignore

@@ -28,11 +28,6 @@ share/python-wheels/
 .installed.cfg
 *.egg
 MANIFEST
-GPATH
-GRTAGS
-GTAGS
-
-
 
 # PyInstaller
 #  Usually these files are written by a python script from a template

COPYRIGHT

@@ -1,4 +1,4 @@
-Copyright (C) 2022 trytondo-smart-vision
+Copyright (C) 2023 
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

MANIFEST.in

@@ -2,4 +2,5 @@ include CHANGELOG
 include COPYRIGHT
 include LICENSE
 include README.rst
+include icons/LICENSE
 graft doc

__init__.py

@@ -1,56 +1,73 @@
+# This file is part of Tryton.  The COPYRIGHT file at the top level of
+# this repository contains the full copyright notices and license terms.
 from trytond.pool import Pool
-from . import (address, diary, party, product, purchase, sale,
-               equipment, configuration_equipment, contract, maintenance, move, exceptions)
+from . import (agended, balance_sale_party, calibration, configuration,
+               contract, company, diary, equipment, party, product,
+               maintenance, move, purchase, sale)
+
+__all__ = ['register']
+
 
 def register():
     Pool.register(
-        address.Address,
+        company.Emplyee,
+        equipment.OpticalEquipment,
+        equipment.EquipmentMaintenance,
+        equipment.EquipmentContract,
+        equipment.EquipmentParty,
+        equipment.ChangePropietary,
+        equipment.ChangeEquipment,
+        agended.AgendedInitial,
+        agended.ReAgended,
+        agended.ServiceMaintenanceAgended,
+        calibration.Calibration,
+        calibration.CalibrationSample,
+        configuration.Configuration,
         diary.Diary,
+        contract.Cron,
+        contract.Contract,
+        contract.ContractMaintenanceServices,
+        contract.ContractEquipment,
+        contract.CreateContractInitial,
+        party.Address,
         party.Party,
         product.Template,
         product.Product,
         product.Pattern,
+        product.UsePattern,
+        product.Image,
         purchase.Purchase,
         purchase.Line,
-        equipment.OpticalEquipment,
-        equipment.EquipmentMaintenance,
-        equipment.EquipmentParty,
-        equipment.ChangePropietary,
-        equipment.ChangeEquipment,
-        configuration_equipment.Configuration,
-        maintenance.Calibration,
-        maintenance.CreateContractInitial,
-        maintenance.CalibrationSample,
-        maintenance.Maintenance,
+        sale.Sale,
+        sale.SaleDate,
+        sale.SaleLine,
+        balance_sale_party.BalanceSalePartyStart,
         maintenance.MaintenanceService,
-        maintenance.MaintenanceActivity,
+        maintenance.MaintenanceServiceLine,
         maintenance.MaintenanceLine,
-        maintenance.AgendedInitial,
-        maintenance.ReAgended,
-        maintenance.ServiceMaintenanceAgended,
+        maintenance.MaintenanceActivity,
         maintenance.ChangePropietaryMaintenance,
         move.Move,
         move.ShipmentOut,
-        move.ShipmentOutReturn,
         move.ShipmentInternal,
-        sale.Sale,
-        sale.SaleLine,
-        contract.Contract,
-        contract.ContractEquipment,
-        contract.ContractMaintenanceServices,
+        move.ShipmentOutReturn,
+        balance_sale_party.BalanceSalePartyStart,
         module='optical_equipment', type_='model')
     Pool.register(
-        maintenance.AssingAgended,
-        maintenance.ReAssingAgended,
-        maintenance.CreateContract,
-        maintenance.NewPropietaryMaintenance,
+        agended.AssingAgended,
+        agended.ReAssingAgended,
+        contract.CreateContract,
         equipment.NewPropietary,
+        maintenance.NewPropietaryMaintenance,
+        balance_sale_party.PrintBalanceSaleParty,
+        sale.ConfirmSaleDate,
         module='optical_equipment', type_='wizard')
     Pool.register(
-        maintenance.CalibrationReport,
-        maintenance.MaintenanceServiceReport,
+        calibration.CalibrationReport,
         contract.ContractReport,
         equipment.EquipmentReport,
+        maintenance.MaintenanceServiceReport,
         move.PickingListDeliveryReport,
         move.CapacitationReport,
+        balance_sale_party.BalanceSaleParty,
         module='optical_equipment', type_='report')

account.xml

@@ -1,16 +0,0 @@
-<?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>

address.py

@@ -1,11 +0,0 @@
-from trytond.pool import PoolMeta
-from trytond.model import fields
-from trytond.pyson import Eval, If
-
-
-class Address(metaclass=PoolMeta):
-    __name__ = 'party.address'
-
-    campus = fields.Boolean("Campus")
-    party_related = fields.Many2One('party.party', "Party Related",
-                                    states ={ 'invisible': (~Eval("campus"))})

address.xml

@@ -1,15 +0,0 @@
-<?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. -->
-<tryton>
-    <record model="ir.ui.view" id="address_view_tree">
-	<field name="model">party.address</field>
-	<field name="inherit" ref="party.address_view_tree"/>
-        <field name="name">address_tree</field>
-    </record>
-    <record model="ir.ui.view" id="address_view_form">
-            <field name="model">party.address</field>
-            <field name="inherit" ref="party.address_view_form"/>
-            <field name="name">address_form</field>
-    </record>
-</tryton>

agended.py

@@ -0,0 +1,125 @@
+# This file is part of Tryton.  The COPYRIGHT file at the top level of
+# this repository contains the full copyright notices and license terms.
+from trytond.model import ModelSQL, ModelView, fields
+from trytond.wizard import (
+    Button, StateAction, StateTransition, StateView, Wizard)
+from trytond.pool import Pool
+from trytond.exceptions import UserError
+
+import datetime
+from datetime import timedelta
+
+
+class AgendedInitial(ModelView):
+    'Agended maintenance service'
+    __name__ = 'optical_equipment_maintenance.agended'
+
+    maintenance_service = fields.Many2One('optical_equipment_maintenance.service',"Maintenaince Service",
+                                          required=True, domain=[('state', '=', 'draft')])
+    estimated_agended = fields.DateTime("Date Maintenance", required=True)
+    technical = fields.Many2One('company.employee', "Technical", required=True)
+
+    
+class AssingAgended(Wizard):
+    'Assing Agended'
+    __name__ = 'optical_equipment_maintenance.assing_agended'
+
+    start = StateView('optical_equipment_maintenance.agended',
+                      'optical_equipment.assing_agended_view_form', [
+                          Button('Cancel', 'end', 'tryton-cancel'),
+                          Button('Assing', 'assing_agended', 'tryton-ok', default=True),
+                      ])
+
+    assing_agended = StateAction('optical_equipment.act_maintenance_service_form')
+
+
+    def default_start(self, fields):
+        if len(self.records) > 0: 
+            default = {'maintenance_service': self.records[0].id}
+        else:
+            default = {'maintenance_service': None}
+        return default
+    
+    def do_assing_agended(self, action):
+        pool = Pool()
+        Diary = pool.get('optical_equipment_maintenance.diary')
+        Config = pool.get('optical_equipment.configuration')
+        config = Config(3)
+        
+        MaintenanceService = pool.get('optical_equipment_maintenance.service')
+        diary = Diary(code=config.agended_sequence.get(),
+                      maintenance_service=self.start.maintenance_service,
+                      date_expected=self.start.estimated_agended,
+                      date_estimated=self.start.estimated_agended + timedelta(days=15),
+                      date_end=self.start.estimated_agended + timedelta(days=15),
+                      technical=self.start.technical.id,
+                      state='agended')
+        diary.save()
+
+        maintenanceService = self.start.maintenance_service
+        maintenanceService.estimated_agended = self.start.estimated_agended
+        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()
+        
+        
+class ReAgended(ModelView):
+    'Agended maintenance service'
+    __name__ = 'optical_equipment_maintenance.reagended'
+
+    maintenance_service = fields.Many2One('optical_equipment_maintenance.service',"Maintenaince Service",
+                                          required=True, domain=[('state', '=', 'failed')])
+    estimated_agended = fields.DateTime("Date Maintenance", required=True)
+    technical = fields.Many2One('company.employee', "Technical", required=True)
+
+    
+class ReAssingAgended(Wizard):
+    'Assing Agended'
+    __name__ = 'optical_equipment_maintenance.reassing_agended'
+
+    start = StateView('optical_equipment_maintenance.reagended',
+                      'optical_equipment.reassing_agended_view_form', [
+                          Button('Cancel', 'end', 'tryton-cancel'),
+                          Button('Assing', 'assing_agended', 'tryton-ok', default=True),
+                      ])
+
+    assing_agended = StateAction('optical_equipment.act_maintenance_service_form')
+
+    def default_start(self, fields):
+        if len(self.records) > 0: 
+            default = {'maintenance_service': self.records[0].id}
+        else:
+            default = {'maintenance_service': None}
+        return default
+
+    def do_assing_agended(self, action):
+        pool = Pool()
+        Diary = pool.get('optical_equipment_maintenance.diary')
+        
+        diary = Diary(maintenance_service=self.start.maintenance_service,
+                      date_expected=self.start.estimated_agended,
+                      date_estimated=self.start.estimated_agended + timedelta(days=15),
+                      date_end=self.start.estimated_agended + timedelta(days=15),
+                      technical=self.start.technical.id,
+                      state='agended')
+        diary.save()
+
+        maintenanceService = self.start.maintenance_service
+        maintenanceService.estimated_agended = self.start.estimated_agended
+        maintenanceService.technical = self.start.technical
+        maintenanceService.state_agended = 'agended'
+        maintenanceService.state = 'agended'
+        maintenanceService.history_agended += (diary.id,)
+        maintenanceService.save()
+
+
+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")

agended.xml

@@ -0,0 +1,33 @@
+<?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. -->
+<tryton>
+    <data>
+	<record model="ir.ui.view" id="assing_agended_view_form">
+	    <field name="model">optical_equipment_maintenance.agended</field>
+	    <field name="type">form</field>
+	    <field name="name">assing_agended_form</field>
+	</record>
+	<record model="ir.action.wizard" id="act_assing_agended">
+	    <field name="name">Assing Agended</field>
+	    <field name="wiz_name">optical_equipment_maintenance.assing_agended</field>
+	</record>
+	<record model="ir.ui.view" id="reassing_agended_view_form">
+	    <field name="model">optical_equipment_maintenance.reagended</field>
+	    <field name="type">form</field>
+	    <field name="name">reassing_agended_form</field>
+	</record>
+	<record model="ir.action.wizard" id="act_reassing_agended">
+	    <field name="name">ReAssing Agended</field>
+	    <field name="wiz_name">optical_equipment_maintenance.reassing_agended</field>
+	</record>
+	<menuitem parent="menu_diary"
+		  action="act_assing_agended"
+		  sequence="30"
+		  id="menu_assing_agended_form"/>
+	<menuitem parent="menu_diary"
+		  action="act_reassing_agended"
+		  sequence="40"
+		  id="menu_reassing_agended_form"/>
+    </data>
+</tryton>

balance_sale_party.py

@@ -0,0 +1,147 @@
+# The COPYRIGHT file at the top level of this repository contains the full
+# copyright notices and license terms.
+from trytond.model import ModelView, fields
+from trytond.wizard import Wizard, StateView, Button, StateReport
+from trytond.report import Report
+from trytond.pool import Pool, PoolMeta
+from trytond.transaction import Transaction
+from trytond.pyson import Eval
+from trytond.exceptions import UserError
+
+__all__ = ['BalancePartyStart', 'PrintBalanceParty', 'BalanceParty']
+
+class BalanceSalePartyStart(ModelView):
+    'Balance Party Start'
+    __name__ = 'optical_equipment.print_balance_sale_party.start'
+
+    party = fields.Many2One('party.party', 'Party', required=True)
+    start_period = fields.Many2One('account.period', 'Start Period',
+                                   domain=[
+                                       ('start_date', '<=', (Eval('end_period'), 'start_date')),
+                                   ], depends=['fiscalyear', 'end_period'])
+    end_period = fields.Many2One('account.period', 'End Period',
+                                 domain=[
+                                     ('start_date', '>=', (Eval('start_period'), 'start_date'))
+                                 ],
+                                 depends=['start_period'])
+    company = fields.Many2One('company.company', 'Company', required=True)
+    party_type = fields.Selection([('out', 'Customer')], "Party Type", required=True)
+    
+    @staticmethod
+    def default_company():
+        return Transaction().context.get('company')
+    
+    @staticmethod
+    def default_party_type():
+        return 'out'
+
+    
+class PrintBalanceSaleParty(Wizard):
+    'Print Balance Sale Party'
+    __name__ = 'optical_equipment.print_balance_sale_party'
+
+    start = StateView('optical_equipment.print_balance_sale_party.start',
+                      'optical_equipment.print_balance_sale_party_start_view_form', [
+                          Button('Cancel', 'end', 'tryton-cancel'),
+                          Button('Print', 'print_', 'tryton-print', default=True),
+                      ])
+    
+    print_ = StateReport('optical_equipment.balance_sale_party')
+
+    def default_start(self, fields):
+        if len(self.records) > 0: 
+            default = {'party': self.records[0].party.id}
+        else:
+            default = {'party': None}
+        return default
+
+    def do_print_(self, action):
+        party = None
+        party_type = None
+        
+        if self.start.party:
+            party = self.start.party.id
+        if self.start.party_type:
+            party_type = self.start.party_type
+
+        data = {
+            'company': self.start.company.id,
+            'party': party,
+            'party_type': party_type,
+            'start_period': self.start.start_period.id if self.start.start_period else None,
+            'end_period' : self.start.end_period.id if self.start.end_period else None
+        }
+        return action, data
+
+    def transition_print_(self):
+        return 'end'
+
+
+class BalanceSaleParty(Report):
+    __name__ = 'optical_equipment.balance_sale_party'
+
+    @classmethod
+    def get_context(cls, records, header, data):
+        report_context = super(BalanceSaleParty, cls).get_context(records, header, data)
+        pool = Pool()
+        Company = pool.get('company.company')
+        Period = pool.get('account.period')
+        Sale = pool.get('sale.sale')
+        Party = pool.get('party.party')
+        start_period = None
+        end_period = None
+        party = None
+        company = Company(data['company'])
+        dom_sale = [('state', 'in', ["processing", "done"])]
+    
+        if data.get('party'):
+            party = data['party']
+            dom_sale.append(('party', '=', party))
+
+        if data.get('start_period'):
+            start_period = Period(data['start_period'])
+            dom_sale.append(('sale_date', '>=', start_period.start_date))
+        if data.get('end_period'):
+            end_period = Period(data['end_period'])
+            dom_sale.append(('sale_date', '<=', end_period.start_date))
+
+        sales = Sale.search(dom_sale,
+                                      order=[('sale_date', 'DESC'),
+                                             ('id', 'DESC')],)
+        
+        res = {}
+        dict_location = {}
+
+        id_ = party
+        party_ = Party.search(['id', '=', party])[0]
+        name = party_.rec_name
+
+        try:
+            if party_.identifiers:
+                id_number = party_.identifiers[0].code
+            else:
+                id_number = ''
+        except IndexError:
+            pass
+
+        res[id_] = {'name': name,
+                    'id_number': id_number,
+                    'party': party_
+                    }
+
+        if sales:
+            res[id_]['sales'] = sales
+        else:
+            raise UserError(str("Este Tercero no Cuenta Con Ventas en Proceso ó Confirmadas."))
+            
+        report_context['records'] = res.values()
+        report_context['start_period'] = start_period.name if start_period else '*'
+        report_context['end_period'] = end_period.name if end_period else '*'
+        report_context['company'] = company
+
+        residual_amount = 0
+        for sale in sales:
+            residual_amount += sale.residual_amount
+        report_context['residual_amount'] = residual_amount
+        
+        return report_context

balance_sale_party.xml

@@ -0,0 +1,28 @@
+<?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. -->
+<tryton>
+  <data>
+    <record model="ir.action.report" id="report_balance_sale_party">
+      <field name="name">Balance by Party</field>
+      <field name="model"></field>
+      <field name="report_name">optical_equipment.balance_sale_party</field>
+      <field name="report">optical_equipment/report/balance_sale_party.fods</field>
+      <field name="template_extension">ods</field>
+    </record>
+    <record model="ir.ui.view" id="print_balance_sale_party_start_view_form">
+      <field name="model">optical_equipment.print_balance_sale_party.start</field>
+      <field name="type">form</field>
+      <field name="name">print_balance_sale_party_start_form</field>
+    </record>
+    <record model="ir.action.wizard" id="wizard_print_balance_sale_party">
+      <field name="name">Print Balance Sale by Party</field>
+      <field name="wiz_name">optical_equipment.print_balance_sale_party</field>
+    </record>
+    <menuitem
+	parent="sale.menu_reporting"
+	action="wizard_print_balance_sale_party"
+	id="menu_print_balance_sale_party"
+	icon="tryton-print"/>
+  </data>
+</tryton>

calibration.py

@@ -0,0 +1,94 @@
+# This file is part of Tryton.  The COPYRIGHT file at the top level of
+# this repository contains the full copyright notices and license terms.
+from trytond.model import (
+    Workflow, ModelSQL, ModelView,fields, sequence_ordered)
+from trytond.pyson import Bool, Eval, If, Id, Equal
+from trytond.pool import Pool
+from trytond.modules.company import CompanyReport
+from trytond.transaction  import Transaction
+
+_digits = (16, 2) 
+_states = {'readonly': If(Eval('state') != 'draft', True)}
+
+class Calibration(ModelSQL, ModelView):
+    'Calibration of Maintenance'
+    __name__ = 'optical_equipment.maintenance.calibration'
+
+    _states={'readonly': True}
+    
+    maintenance = fields.Many2One('optical_equipment.maintenance', "Maintenance", ondelete="CASCADE",
+                                  select=True, required=True)
+    graph_dates = fields.Char("Graph Dates", readonly=True)
+    diopter = fields.Float("Diopter", states=_states)
+    mean = fields.Float("Mean", states=_states)
+    dev_std = fields.Float("Standart Desviation", states=_states)
+    uncertain_type_A = fields.Float("Uncertain Type A", states=_states)
+    uncertain_pattern = fields.Float("Uncertain Pattern", states=_states)
+    k_c_calibration = fields.Float("K Crt Calibration",states=_states)
+    uncertain_U_b1 = fields.Float("U_b1", states=_states)
+    d_resolution = fields.Float("d_resolution", states=_states)
+    uncertain_U_b2_dig = fields.Float("U_b2", states=_states)
+    uncertain_U_b2_ana = fields.Float("U_b2", states=_states)
+    uncertain_combinated = fields.Float("U_combinated", states=_states)
+    uncertain_eff = fields.Float("U eff", states=_states)
+    t_student = fields.Float("T Student", states=_states)
+    
+    uncertain_expanded = fields.Float("Uexpand",  _digits, states=_states)
+
+    state = fields.Char('State')
+            
+class CalibrationSample(sequence_ordered(), ModelView, ModelSQL):
+    'Samples of Calibration'
+    __name__ = 'optical_equipment.maintenance.calibration_sample'
+        
+    maintenance = fields.Many2One('optical_equipment.maintenance', 'Maintenance')
+    product = fields.Function(fields.Integer("Product ID"), 'on_change_with_product')
+    number_sample = fields.Float("Sample #",  _digits)
+    value_patterns = fields.Many2One('optical_equipment.product_pattern', "Value Pattern", ondelete='RESTRICT', required=True,
+                                     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)
+    mistake_rate = fields.Float("% Mistake",  _digits,
+                                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')
+    def on_change_value_equipment(self):
+        if float(self.value_patterns.pattern) < 0:
+            self.mistake = self.value_patterns.pattern - self.value_equipment
+        else:
+            if self.value_patterns.pattern > self.value_equipment:
+                self.mistake = self.value_patterns.pattern - self.value_equipment
+            else:
+                self.mistake = -self.value_patterns.pattern + self.value_equipment
+
+        if self.value_patterns.pattern == self.value_equipment:
+            self.mistake_rate = 0
+        else:
+            self.mistake_rate = abs(self.mistake / self.value_patterns.pattern) * 100
+
+            
+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

calibration.xml

@@ -0,0 +1,52 @@
+<?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. -->
+<tryton>
+    <data>
+	<record model="ir.ui.view" id="maintenance_calibration_view_form">
+            <field name="model">optical_equipment.maintenance.calibration_sample</field>
+            <field name="type">form</field>
+            <field name="name">maintenance_sample_form</field>
+        </record>
+        <record model="ir.ui.view" id="maintenance_calibration_view_tree">
+            <field name="model">optical_equipment.maintenance.calibration_sample</field>
+            <field name="type">tree</field>
+            <field name="priority" eval="10"/>
+            <field name="name">maintenance_calibration_tree</field>
+        </record>
+	<record model="ir.ui.view" id="calibration_total_view_tree">
+            <field name="model">optical_equipment.maintenance.calibration</field>
+            <field name="type">tree</field>
+            <field name="name">calibration_total_tree</field>
+        </record>
+	<record model="ir.ui.view" id="calibration_total_view_form">
+            <field name="model">optical_equipment.maintenance.calibration</field>
+            <field name="type">form</field>
+            <field name="name">calibration_total_form</field>
+        </record>
+	<record model="ir.action.report" id="report_calibration">
+            <field name="name">Calibration</field>
+            <field name="model">optical_equipment.maintenance</field>
+            <field name="report_name">optical_equipment.maintenance</field>
+            <field name="report">optical_equipment/report/Calibration.fodt</field>
+            <field name="single" eval="True"/>
+        </record>
+	<record model="ir.action.keyword" id="report_calibration_keyword">
+            <field name="keyword">form_print</field>
+            <field name="model">optical_equipment.maintenance,-1</field>
+            <field name="action" ref="report_calibration"/>
+    	</record>
+	<record model="ir.action.report" id="report_calibrations">
+            <field name="name">Calibrations</field>
+            <field name="model">optical_equipment_maintenance.service</field>
+            <field name="report_name">optical_equipment_maintenance.service</field>
+            <field name="report">optical_equipment/report/Calibrations.fodt</field>
+            <field name="single" eval="True"/>
+        </record>
+	<record model="ir.action.keyword" id="report_calibrations_keyword">
+            <field name="keyword">form_print</field>
+            <field name="model">optical_equipment_maintenance.service,-1</field>
+            <field name="action" ref="report_calibrations"/>
+    	</record>
+    </data>
+</tryton>

company.py

@@ -0,0 +1,9 @@
+from trytond.pool import PoolMeta
+from trytond.model import fields
+
+
+class Emplyee(metaclass=PoolMeta):
+    'Company'
+    __name__ = 'company.employee'
+
+    invima = fields.Char('Invima')

company.xml

@@ -0,0 +1,10 @@
+<?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="employee_view_form">
+	<field name="model">company.employee</field>
+	<field name="inherit" ref="company.employee_view_form"/>
+	<field name="name">employee_form</field>
+    </record>
+</tryton>

configuration.py

@@ -0,0 +1,51 @@
+from trytond.model import (
+    ModelSingleton, ModelSQL, ModelView, fields)
+from trytond.pyson import Id, Eval
+
+
+class Configuration(ModelSingleton, ModelSQL, ModelView):
+    'Equipment Configuration'
+    __name__ = 'optical_equipment.configuration'
+
+    technician_responsible = fields.Many2One(
+        'company.employee', "Technician Responsible")
+    invima = fields.Char('Invima', states={
+        'required': Eval('technician_responsible', True)
+    })
+    equipment_sequence = fields.Many2One(
+        'ir.sequence', "Equipment Sequence", domain=[
+            ('sequence_type', '=',
+             Id('optical_equipment', 'sequence_type_equipment'))])
+    maintenance_sequence = fields.Many2One(
+        'ir.sequence', "Maintenance Sequence",
+        domain=[('sequence_type', '=',
+                 Id('optical_equipment', 'sequence_type_maintenances'))])
+    agended_sequence = fields.Many2One(
+        'ir.sequence', "Agended Sequence",
+        domain=[('sequence_type', '=',
+                 Id('optical_equipment', 'sequence_type_agended'))])
+    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'))
+                                        ])

configuration.xml

@@ -0,0 +1,81 @@
+<?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. -->
+<tryton>
+    <data>
+	<record model="ir.action.act_window" id="act_optical_equipment_configuration_form">
+	    <field name="name">Configuration</field>
+	    <field name="res_model">optical_equipment.configuration</field>
+	</record>
+	<record model="ir.ui.view" id="optical_equipment_configuration_view_form">
+	    <field name="model">optical_equipment.configuration</field>
+	    <field name="type">form</field>
+	    <field name="name">configuration_form</field>
+	</record>
+	<record model="ir.action.act_window.view" id="act_optical_equipment_configuration_form_view1">
+	    <field name="sequence" eval="10"/>
+	    <field name="view" ref="optical_equipment_configuration_view_form"/>
+	    <field name="act_window" ref="act_optical_equipment_configuration_form"/>
+	</record>
+	<menuitem
+            name="Configuration"
+            parent="menu_equipment"
+            sequence="0"
+            id="menu_equipment_configuration"
+            icon="tryton-settings"/>
+	<menuitem
+            parent="menu_equipment_configuration"
+            action="act_optical_equipment_configuration_form"
+            sequence="10"
+            id="menu_optical_equipment_configuration"
+            icon="tryton-list"/>
+
+	<record model="res.group" id="group_maintenance_admin">
+            <field name="name">Maintenance Administration</field>
+        </record>
+	<record model="res.user-res.group"
+            id="user_admin_group_maintenance_admin">
+            <field name="user" ref="res.user_admin"/>
+            <field name="group" ref="group_maintenance_admin"/>
+        </record>
+	<record model="ir.ui.menu-res.group"
+            id="menu_party_group_equipment_admin">
+            <field name="menu" ref="menu_equipment"/>
+            <field name="group" ref="group_equipment_admin"/>
+        </record>
+	<record model="ir.sequence.type" id="sequence_type_equipment">
+	    <field name="name">Equipment</field>
+	</record>	
+	<record model="ir.sequence.type-res.group"
+            id="sequence_type_equipment_group_admin">
+            <field name="sequence_type" ref="sequence_type_equipment"/>
+            <field name="group" ref="res.group_admin"/>
+        </record>
+        <record model="ir.sequence.type-res.group"
+            id="sequence_type_equipment_group_equipment_admin">
+            <field name="sequence_type" ref="sequence_type_equipment"/>
+            <field name="group" ref="group_equipment_admin"/>
+        </record>
+	<record model="ir.sequence" id="sequence_equipment">
+	    <field name="name">Equipment</field>
+            <field name="sequence_type" ref="sequence_type_equipment"/>
+        </record>
+	<record model="ir.sequence.type" id="sequence_type_maintenances">
+	    <field name="name">Maintenances</field>
+	</record>
+	<record model="ir.sequence.type-res.group"
+            id="sequence_type_maintenance_group_admin">
+            <field name="sequence_type" ref="sequence_type_maintenances"/>
+            <field name="group" ref="res.group_admin"/>
+        </record>
+        <record model="ir.sequence.type-res.group"
+            id="sequence_type_maintenance_group_maintenance_admin">
+            <field name="sequence_type" ref="sequence_type_maintenances"/>
+            <field name="group" ref="group_maintenance_admin"/>
+        </record>
+	<record model="ir.sequence" id="sequence_maintenances">
+	    <field name="name">Maintenance</field>
+            <field name="sequence_type" ref="sequence_type_maintenances"/>
+        </record>
+    </data>
+</tryton>

configuration_equipment.py

@@ -1,36 +0,0 @@
-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, CompanyMultiValueMixin):
-    'Equipment Configuration'
-    __name__='optical_equipment.configuration'
-
-    equipment_sequence = fields.Many2One('ir.sequence', "Equipment Sequence",
-                        domain=[('sequence_type', '=', Id('optical_equipment', 'sequence_type_equipment'))
-                                ])
-    maintenance_sequence = fields.Many2One('ir.sequence', "Maintenance Sequence",
-                        domain=[('sequence_type', '=', Id('optical_equipment', 'sequence_type_maintenances'))
-                                ])
-    agended_sequence = fields.Many2One('ir.sequence', "Agended Sequence",
-                        domain=[('sequence_type', '=', Id('optical_equipment', 'sequence_type_agended'))
-                                ])
-    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'))
-                                        ])

configuration_equipment.xml

@@ -1,33 +0,0 @@
-<?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. -->
-<tryton>
-    <data>
-	<record model="ir.ui.view" id="optical_equipment_configuration_view_form">
-	    <field name="model">optical_equipment.configuration</field>
-	    <field name="type">form</field>
-	    <field name="name">optical_equipment_configuration_form</field>
-	</record>
-	<record model="ir.action.act_window" id="act_optical_equipment_configuration_form">
-	    <field name="name">Configuration</field>
-	    <field name="res_model">optical_equipment.configuration</field>
-	</record>
-	<record model="ir.action.act_window.view" id="act_optical_equipment_configuration_form_view1">
-	    <field name="sequence" eval="10"/>
-	    <field name="view" ref="optical_equipment_configuration_view_form"/>
-	    <field name="act_window" ref="act_optical_equipment_configuration_form"/>
-	</record>
-	<menuitem
-            name="Configuration"
-            parent="menu_equipment"
-            sequence="0"
-            id="menu_equipment_configuration"
-            icon="tryton-settings"/>
-	<menuitem
-            parent="menu_equipment_configuration"
-            action="act_optical_equipment_configuration_form"
-            sequence="10"
-            id="menu_optical_equipment_configuration"
-            icon="tryton-list"/>
-    </data>
-</tryton>

contract.py

@@ -13,7 +13,17 @@ from trytond.modules.currency.fields import Monetary
 from trytond.modules.product import price_digits
 
 import datetime
-from datetime import timedelta
+from datetime import timedelta, date
+
+class Cron(metaclass=PoolMeta):
+    __name__ = 'ir.cron'
+
+    @classmethod
+    def __setup__(cls):
+        super().__setup__()
+        cls.method.selection.append(
+            ('optical_equipment.contract|contract_expiration', 'Contract Expiration'),
+        )
 
         
 class Contract(Workflow, ModelSQL, ModelView):
@@ -43,6 +53,7 @@ class Contract(Workflow, ModelSQL, ModelView):
         states={
             'readonly': (Eval('state') != 'draft') | Eval('party', True),
             },help="The party who subscribes.")
+    equipment = fields.Many2One('optical_equipment.equipment', "Equipment")
     contact = fields.Many2One('party.contact_mechanism', "Contact", required=True)
     invoice_address = fields.Many2One('party.address', 'Invoice Address',
                                       required=True, domain=[('party', '=', Eval('party'))],
@@ -61,10 +72,16 @@ class Contract(Workflow, ModelSQL, ModelView):
                            states={
                                'readonly': Eval('state') != 'draft',
                            })
+
+    
     maintenance_services = fields.Many2Many('optical_equipment_maintenance.service-equipment.contract',
                                             'contract', 'maintenance_services', "Prorogues",
                                             states={'readonly': Eval('state') != 'draft'})
-    equipments = fields.One2Many('optical_equipment.equipment', 'contract', "Equipments",
+
+    current_equipments = fields.Many2Many('optical_equipment.contract-optical_equipment.equipment',
+                                          'contract', 'equipment', "Current Equipments",
+                                            states={'readonly': Eval('state') != 'draft'})
+    history_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'})
@@ -89,10 +106,12 @@ class Contract(Workflow, ModelSQL, ModelView):
             ('running', 'draft'),
             ('running', 'closed'),
             ('running', 'cancelled'),
+            ('cancelled', 'draft')
         })
         cls._buttons.update({
             'draft': {'invisible': Eval('state').in_(['draft','closed'])},
             'running': {'invisible': Eval('state').in_(['cancelled', 'running'])},
+            'closed':  {'invisible': Eval('state').in_(['draft','cancelled'])},
             'cancelled': {'invisible': Eval('state').in_(['draft', 'cancelled'])}
         })
 
@@ -121,15 +140,37 @@ class Contract(Workflow, ModelSQL, ModelView):
         else:
             raise UserError(gettext('optical_equipment.msg_not_sequence_equipment'))
 
+    @classmethod
+    def contract_expiration(cls):
+        pool = Pool()
+        Contracts = pool.get('optical_equipment.contract')
+
+        contracts_to_expire = cls.search([('state', '=', 'running'),
+                                          ('end_date', '<=', date.today())])
+
+        if contracts_to_expire != []:
+            for contract in contracts_to_expire:
+                cls.closed([contract])
+    
     @classmethod
     @ModelView.button
     @Workflow.transition('draft')
     def draft(cls, contracts):
         contract = contracts[0]
-        for equipment in contract.equipments:
+        for equipment in contract.current_equipments:
             equipment.state = "uncontrated"
             equipment.contract_history += (contract.id,)
             equipment.save()
+        contract.save()
+
+    @classmethod
+    @ModelView.button
+    @Workflow.transition('closed')
+    def closed(cls, contracts):
+        contract = contracts[0]
+        for equipment in contract.current_equipments:
+            equipment.state = "uncontrated"
+            equipment.save()
 
 
     @classmethod
@@ -137,7 +178,7 @@ class Contract(Workflow, ModelSQL, ModelView):
     @Workflow.transition('running')
     def running(cls, contracts):
         contract = contracts[0]
-        for equipment in contract.equipments:
+        for equipment in contract.current_equipments:
             equipment.state = "contrated"
             equipment.contract_history += (contract.id,)
             equipment.save()
@@ -150,7 +191,10 @@ class Contract(Workflow, ModelSQL, ModelView):
     @ModelView.button
     @Workflow.transition('cancelled')
     def cancelled(cls, contracts):
-        pass
+        contract = contracts[0]
+        for equipment in contract.current_equipments:
+            equipment.state = "uncontrated"
+            equipment.save()
 
         
 class ContractMaintenanceServices(ModelSQL):
@@ -168,6 +212,7 @@ 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'
 
@@ -184,3 +229,137 @@ class ContractReport(CompanyReport):
         context['today'] = Date.today()
 
         return context
+
+    
+class CreateContractInitial(ModelView, ModelSQL):
+    'Create Contract Inicial'
+    __name__ = 'optical_equipment_create.contract'
+
+    currency = fields.Many2One('currency.currency', 'Currency', required=True)
+    company = fields.Many2One(
+        'company.company', "Company", readonly=True, required=True, select=True,
+        states={
+            'readonly': (Eval('state') != 'draft') | Eval('party', True),
+            },help="Make the subscription belong to the company.")
+    party = fields.Many2One(
+        'party.party', "Party", required=True,
+        help="The party who subscribes.")
+    invoice_address = fields.Many2One('party.address', 'Invoice Address',
+                                      required=True, domain=[('party', '=', Eval('party'))])
+    payment_term = fields.Many2One('account.invoice.payment_term',
+        'Payment Term')
+    contact = fields.Many2One(
+        'party.contact_mechanism', "Contact", required=True,
+        domain=[('party', '=', Eval('party'))],
+        context={
+            'company': Eval('company', -1),
+            })
+    start_date = fields.Date("Start Date", required=True)
+    end_date = fields.Date("End Date",
+                           domain=['OR',
+                                   ('end_date', '>=', If(
+                                       Bool(Eval('start_date')),
+                                       Eval('start_date', datetime.date.min),
+                                       datetime.date.min)),
+                                   ('end_date', '=', None),
+                                   ])
+    unit_price = Monetary("Unit Price", digits=price_digits, currency='currency', required=True)
+    
+    @staticmethod
+    def default_company():
+        return Transaction().context.get('company')
+
+    @staticmethod
+    def default_currency():
+        Company = Pool().get('company.company')
+        if Transaction().context.get('company'):
+            company = Company(Transaction().context['company'])
+            return company.currency.id
+    
+    @classmethod
+    def default_start_date(cls):
+        pool = Pool()
+        Date = pool.get('ir.date')
+        return Date.today()
+
+    
+    @fields.depends('party')
+    def on_change_party(self):
+        pool = Pool()
+        Date = pool.get('ir.date')
+        if self.party:
+            self.invoice_address = self.party.address_get(type='invoice')
+            if self.party.customer_type == "ips": 
+                self.end_date =  Date.today() + timedelta(days=182)
+            else:
+                self.end_date =  Date.today() + timedelta(days=365)
+
+            
+class CreateContract(Wizard):
+    __name__ = 'optical_equipment.maintenance.contract'
+
+    start = StateView('optical_equipment_create.contract',
+                      'optical_equipment.create_contract_view_form',[
+                          Button('Cancel', 'end', 'tryton-cancel'),
+                          Button('Create', 'create_contract', 'tryton-ok', default=True),
+                      ])
+    create_contract = StateAction('optical_equipment.act_contract_form')
+
+
+    def default_start(self, fields):
+        if self.record:
+            default = {'party': self.record.propietary.id,
+                       'invoice_address': self.record.propietary_address.id,
+                       'unit_price': (self.record.sale_origin.amount
+                                      if self.record.sale_origin.__name__ == "sale.line"
+                                      else self.record.sale_origin.total_amount),
+                       }
+            return default
+        
+    @property
+    def _subscription_start(self):
+        return dict(
+            party=self.start.party,
+            contact=self.start.contact,
+            start_date=self.start.start_date,
+            end_date=self.start.end_date,
+            invoice_address=self.start.invoice_address,
+            unit_price=self.start.unit_price
+        )
+    
+    def do_create_contract(self, action):
+        maintenance_service = self.records[0]
+        pool = Pool()
+        Contract = pool.get('optical_equipment.contract')
+
+        dates = self._subscription_start
+
+        prorogues = (maintenance_service,)
+        equipments = []
+        for line in maintenance_service.lines:
+            equipments.append(line.equipment.id)
+
+        if maintenance_service.contract_origin:
+            contract=maintenance_service.contract_origin
+            contract.history_equipments+=tuple(equipments)
+            contract.current_equipments=equipments
+            contract.invoice_address=dates['invoice_address']
+            contract.contact=dates['contact']
+            contract.start_date=dates['start_date']
+            contract.end_date=dates['end_date']
+            contract.maintenance_services+=prorogues
+            contract.state='draft'
+            contract.price_contract=dates['unit_price']
+        else:
+            contract = Contract(party=dates['party'],
+                            invoice_address=dates['invoice_address'],
+                            contact=dates['contact'],
+                            start_date=dates['start_date'],
+                            end_date=dates['end_date'],
+                            maintenance_services=prorogues,
+                            current_equipments=equipments,
+                            state='draft',
+                            price_contract=dates['unit_price']
+                            )
+
+        contract.save()

contract.xml

@@ -1,135 +1,163 @@
 <?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. -->
+<!-- This 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="contract_view_form">
-	<field name="model">optical_equipment.contract</field>
-        <field name="type">form</field>
-        <field name="name">contract_form</field>
-    </record>
-    <record model="ir.ui.view" id="contract_view_list">
-	<field name="model">optical_equipment.contract</field>
-	<field name="type">tree</field>
-	<field name="name">contract_list</field>
-    </record>
-    <record model="ir.action.act_window" id="act_contract_form">
-	<field name="name">Contracts</field>
-	<field name="res_model">optical_equipment.contract</field>
-    </record>
-    <record model="ir.action.act_window.view"
-	    id="act_contract_form_view1">
-	<field name="sequence" eval="10"/>
-	<field name="view" ref="contract_view_list"/>
-	<field name="act_window" ref="act_contract_form"/>
-    </record>
-    <record model="ir.action.act_window.view"
-            id="act_contract_form_view2">
-	<field name="sequence" eval="20"/>
-	<field name="view" ref="contract_view_form"/>
-	<field name="act_window" ref="act_contract_form"/>
-    </record>
-    <record model="ir.action.act_window.domain"
-	id="act_contract_form_domain_draft">
-	<field name="name">Draft</field>
-	<field name="sequence" eval="10"/>
-	<field name="domain" eval="[('state', '=', 'draft')]" pyson="1"/>
-	<field name="count" eval="True"/>
-	<field name="act_window" ref="act_contract_form"/>
-    </record>
-    <record model="ir.action.act_window.domain"
-	id="act_contract_form_domain_running">
-	<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"
-	id="act_contract_form_domain_closed">
-	<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"
-	id="act_contract_form_domain_all">
-	<field name="name">All</field>
-	<field name="sequence" eval="9999"/>
-	<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>
-	<field name="model" search="[('model', '=', 'optical_equipment.contract')]"/>
-    </record>
-    <record model="ir.model.button" id="contract_cancelled_button">
-	<field name="name">cancelled</field>
-	<field name="string">Cancel</field>
-	<field name="model" search="[('model', '=', 'optical_equipment.contract')]"/>
-    </record>
-    <record model="res.group" id="group_contract_admin">
-	<field name="name">Contract Administration</field>
-    </record>
-    <record model="res.user-res.group"
+    <data>
+	<record model="ir.ui.view" id="contract_view_form">
+	    <field name="model">optical_equipment.contract</field>
+            <field name="type">form</field>
+            <field name="name">contract_form</field>
+	</record>
+	<record model="ir.ui.view" id="contract_view_list">
+	    <field name="model">optical_equipment.contract</field>
+	    <field name="type">tree</field>
+	    <field name="name">contract_list</field>
+	</record>
+	<record model="ir.action.act_window" id="act_contract_form">
+	    <field name="name">Contracts</field>
+	    <field name="res_model">optical_equipment.contract</field>
+	</record>
+	<record model="ir.action.act_window.view"
+		id="act_contract_form_view1">
+	    <field name="sequence" eval="10"/>
+	    <field name="view" ref="contract_view_list"/>
+	    <field name="act_window" ref="act_contract_form"/>
+	</record>
+	<record model="ir.action.act_window.view"
+		id="act_contract_form_view2">
+	    <field name="sequence" eval="20"/>
+	    <field name="view" ref="contract_view_form"/>
+	    <field name="act_window" ref="act_contract_form"/>
+	</record>
+	<record model="ir.action.act_window.domain"
+		id="act_contract_form_domain_draft">
+	    <field name="name">Draft</field>
+	    <field name="sequence" eval="10"/>
+	    <field name="domain" eval="[('state', '=', 'draft')]" pyson="1"/>
+	    <field name="count" eval="True"/>
+	    <field name="act_window" ref="act_contract_form"/>
+	</record>
+	<record model="ir.action.act_window.domain"
+		id="act_contract_form_domain_running">
+	    <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"
+		id="act_contract_form_domain_closed">
+	    <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"
+		id="act_contract_form_domain_all">
+	    <field name="name">All</field>
+	    <field name="sequence" eval="9999"/>
+	    <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>
+	    <field name="model" search="[('model', '=', 'optical_equipment.contract')]"/>
+	</record>
+	<record model="ir.model.button" id="contract_closed_button">
+	    <field name="name">closed</field>
+	    <field name="string">Closed</field>
+	    <field name="model" search="[('model', '=', 'optical_equipment.contract')]"/>
+	</record>
+	<record model="ir.model.button" id="contract_cancelled_button">
+	    <field name="name">cancelled</field>
+	    <field name="string">Cancel</field>
+	    <field name="model" search="[('model', '=', 'optical_equipment.contract')]"/>
+	</record>
+	<record model="res.group" id="group_contract_admin">
+	    <field name="name">Contract Administration</field>
+	</record>
+	<record model="res.user-res.group"
 	    id="user_admin_group_contract_admin">
-        <field name="user" ref="res.user_admin"/>
-	<field name="group" ref="group_contract_admin"/>
-    </record>
-    <record model="ir.sequence.type" id="sequence_type_contract">
-	<field name="name">Contract</field>
-    </record>
-    <record model="ir.sequence.type-res.group"
-	    id="sequence_type_contract_group_admin">
-	<field name="sequence_type" ref="sequence_type_contract"/>
-        <field name="group" ref="res.group_admin"/>
-    </record>
-    <record model="ir.sequence.type-res.group"
-            id="sequence_type_contract_group_contract_admin">
-	<field name="sequence_type" ref="sequence_type_contract"/>
-        <field name="group" ref="group_contract_admin"/>
-    </record>
-    <record model="ir.sequence" id="sequence_contract">
-	<field name="name">Contract</field>
-        <field name="sequence_type" ref="sequence_type_contract"/>
-    </record>
-    <record model="ir.action.report" id="report_contract">
-	<field name="name">Contract</field>
-        <field name="model">optical_equipment.contract</field>
-        <field name="report_name">optical_equipment.contract</field>
-        <field name="report">optical_equipment/report/Contract.fodt</field>
-        <field name="single" eval="True"/>
-    </record>
-    <record model="ir.action.keyword" id="report_contract_keyword">
-	<field name="keyword">form_print</field>
-	<field name="model">optical_equipment.contract,-1</field>
-	<field name="action" ref="report_contract"/>
-    </record>
-    <record model="ir.action.report" id="report_prorrogation">
-	<field name="name">Prorrogation</field>
-        <field name="model">optical_equipment.contract</field>
-        <field name="report_name">optical_equipment.contract</field>
-        <field name="report">optical_equipment/report/Prorrogation.fodt</field>
-        <field name="single" eval="True"/>
-    </record>
-    <record model="ir.action.keyword" id="report_prorrogation_keyword">
-	<field name="keyword">form_print</field>
-	<field name="model">optical_equipment.contract,-1</field>
-	<field name="action" ref="report_prorrogation"/>
-    </record>
-   <menuitem
-	parent="menu_equipment"
-	name="Contracts Management"
-	sequence="50"
-	id="menu_contracts"/>
-    <menuitem
-	parent="menu_contracts"
-	action="act_contract_form"
-        sequence="30"
-        id="menu_contract_form"/>
+            <field name="user" ref="res.user_admin"/>
+	    <field name="group" ref="group_contract_admin"/>
+	</record>
+	<record model="ir.sequence.type" id="sequence_type_contract">
+	    <field name="name">Contract</field>
+	</record>
+	<record model="ir.sequence.type-res.group"
+		id="sequence_type_contract_group_admin">
+	    <field name="sequence_type" ref="sequence_type_contract"/>
+            <field name="group" ref="res.group_admin"/>
+	</record>
+	<record model="ir.sequence.type-res.group"
+		id="sequence_type_contract_group_contract_admin">
+	    <field name="sequence_type" ref="sequence_type_contract"/>
+            <field name="group" ref="group_contract_admin"/>
+	</record>
+	<record model="ir.sequence" id="sequence_contract">
+	    <field name="name">Contract</field>
+            <field name="sequence_type" ref="sequence_type_contract"/>
+	</record>
+	<record model="ir.ui.view" id="create_contract_view_form">
+	    <field name="model">optical_equipment_create.contract</field>
+	    <field name="type">form</field>
+	    <field name="name">create_contract_form</field>
+	</record>
+	<record model="ir.action.wizard" id="maintenance_create_contract">
+	    <field name="name">Create Contract</field>
+	    <field name="wiz_name">optical_equipment.maintenance.contract</field>
+	    <field name="model">optical_equipment_maintenance.service</field>
+	</record>
+	<record model="ir.action.keyword" id="maintenance_create_contract_keyword">
+	    <field name="keyword">form_action</field>
+	    <field name="model">optical_equipment_maintenance.service,-1</field>
+	    <field name="action" ref="maintenance_create_contract"/>
+	</record>
+	<record model="ir.action.report" id="report_contract">
+	    <field name="name">Contract</field>
+            <field name="model">optical_equipment.contract</field>
+            <field name="report_name">optical_equipment.contract</field>
+            <field name="report">optical_equipment/report/Contract.fodt</field>
+            <field name="single" eval="True"/>
+	</record>
+	<record model="ir.action.keyword" id="report_contract_keyword">
+	    <field name="keyword">form_print</field>
+	    <field name="model">optical_equipment.contract,-1</field>
+	    <field name="action" ref="report_contract"/>
+	</record>
+	<record model="ir.action.report" id="report_prorrogation">
+	    <field name="name">Prorrogation</field>
+            <field name="model">optical_equipment.contract</field>
+            <field name="report_name">optical_equipment.contract</field>
+            <field name="report">optical_equipment/report/Prorrogation.fodt</field>
+            <field name="single" eval="True"/>
+	</record>
+	<record model="ir.action.keyword" id="report_prorrogation_keyword">
+	    <field name="keyword">form_print</field>
+	    <field name="model">optical_equipment.contract,-1</field>
+	    <field name="action" ref="report_prorrogation"/>
+	</record>
+	<menuitem
+	    parent="menu_equipment"
+	    name="Contracts Management"
+	    sequence="50"
+	    id="menu_contracts"/>
+	<menuitem
+	    parent="menu_contracts"
+	    action="act_contract_form"
+            sequence="30"
+            id="menu_contract_form"/>
+	<record model="ir.cron" id="cron_fe_delivery">
+	    <field name="method">optical_equipment.contract|contract_expiration</field>
+	    <field name="interval_number" eval="1"/>
+	    <field name="interval_type">hours</field>
+	</record>
+    </data>
 </tryton>

diary.py

@@ -1,23 +1,27 @@
 from trytond.model import (
     ModelSQL, ModelView, fields)
 
+
 class Diary(ModelSQL, ModelView):
     'Diary'
     __name__ = 'optical_equipment_maintenance.diary'
     _rec_name = 'code'
 
-    code = fields.Char("Code", select=True,states={'readonly': True })
+    code = fields.Char("Code", select=True, states={'readonly': True})
     date_expected = fields.DateTime("Expected Date", required=True)
     date_estimated = fields.DateTime("Estimated Date")
     date_end = fields.DateTime("Date End")
-    maintenance_service = fields.Many2One('optical_equipment_maintenance.service', 'Maintenance Service', required=True)
+    maintenance_service = fields.Many2One(
+        'optical_equipment_maintenance.service', 'Maintenance Service',
+        required=True)
     technical = fields.Many2One('company.employee', "Technical", required=True)
     state = fields.Selection([('draft', "Draft"),
                               ('agended', "Agended"),
                               ('in_progress', "In Progress"),
                               ('failed', "Failed"),
                               ('finished', "Finished")
-                              ], "State", required=True, readonly=True, sort=True)
+                              ], "State",
+                             required=True, readonly=True, sort=True)
 
     @classmethod
     def default_state(self):

doc/index.rst

@@ -1,9 +1,10 @@
-###################
-Smart Vision Module
-###################
+########################
+Optical Equipment Module
+########################
 
 .. toctree::
    :maxdepth: 2
 
    usage
    design
+   releases

doc/releases.rst

@@ -0,0 +1,7 @@
+.. _releases-index:
+
+=============
+Release notes
+=============
+
+.. include:: ../CHANGELOG

equipment.py

@@ -6,7 +6,7 @@ from trytond.pool import Pool
 from trytond.model import (
     DeactivableMixin, Workflow, ModelSQL, ModelView, Unique, fields)
 from trytond.pyson import Eval, If
-from trytond.transaction  import Transaction
+from trytond.transaction import Transaction
 from trytond.i18n import gettext
 from trytond.exceptions import UserError
 from trytond.model.exceptions import AccessError
@@ -19,24 +19,25 @@ _MAINTENANCE_FREQUENCY = [("none", ''),
                           ("6", 'Seis Meses'),
                           ("12", 'Doce Meses')]
 
+
 class OpticalEquipment(DeactivableMixin, Workflow, ModelSQL, ModelView):
     'Optical Equipment'
     __name__ = 'optical_equipment.equipment'
     _rec_name = 'rec_name'
     _order_name = 'code'
 
-    _states={
+    _states = {
         'readonly': Eval('state') != 'draft',
     }
 
     _depends = ['state']
 
-    _states_serial={
+    _states_serial = {
         'readonly': Eval('state') != 'draft',
     }
 
     code = fields.Char(
-        "Code", select=True,states={'readonly': True })
+        "Code", select=True, states={'readonly': True})
 
     state = fields.Selection([('draft', "Draft"),
                               ('registred', "Registred"),
@@ -44,17 +45,22 @@ class OpticalEquipment(DeactivableMixin, Workflow, ModelSQL, ModelView):
                               ('contrated', "Contrated")
                               ], "State",
                              required=True, readonly=True, sort=False)
-    contract = fields.Many2One('optical_equipment.contract', "Contract", ondelete='CASCADE')
+
     company = fields.Many2One('company.company', "Company", readonly=True)
+    contract = fields.Many2One('optical_equipment.contract', "Contract", ondelete='CASCADE')
     location = fields.Many2One('stock.location', "Location",
                                states=_states,)
-    propietary = fields.Many2One('party.party',"Propietary", required=True,
+    propietary = fields.Many2One('party.party', "Propietary", required=True,
                                  states=_states,)
     propietary_address = fields.Many2One('party.address', "Propietary Address", required=True,
                                          domain=[('party', '=', Eval('propietary'))],
                                          states=_states
                                          )
-    propietarys = fields.Many2Many('optical_equipment.equipment-party.party', 'equipment', 'party', "Propietarys")
+    propietarys = fields.Many2Many(
+        'optical_equipment.equipment-party.party',
+        'equipment',
+        'party',
+        "Propietarys")
     product = fields.Many2One('product.product', "Product",
                               domain=[('equipment', '=', True)],
                               states=_states,
@@ -63,8 +69,8 @@ class OpticalEquipment(DeactivableMixin, Workflow, ModelSQL, ModelView):
     refurbish = fields.Boolean("Refurbish",
                                states=_states,)
     equipment_type = fields.Char('type', states={'readonly': If('product', True)})
-    risk = fields.Char('Type risk',states={'readonly': If('product', True)})
-    use  = fields.Char('Use', states={'readonly': If('product', True)})
+    risk = fields.Char('Type risk', states={'readonly': If('product', True)})
+    use = fields.Char('Use', states={'readonly': If('product', True)})
     biomedical_class = fields.Char('Biomedical Class', states={'readonly': If('product', True)})
     main_tecnology = fields.Char('Main tecnology', states={'readonly': If('product', True)})
     calibration = fields.Boolean("Apply calibration", states={'readonly': If('product', True)})
@@ -73,16 +79,16 @@ class OpticalEquipment(DeactivableMixin, Workflow, ModelSQL, ModelView):
                                             ('accounting', '=', False)],
                                     states=_states
                                     )
-    model_category  = fields.Many2One('product.category', "Model", required=True,
-                                      domain=[('parent', '=', Eval('mark_category')),
-                                              ('accounting', '=', False)],
-                                      states=_states,)
+    model_category = fields.Many2One('product.category', "Model", required=True,
+                                     domain=[('parent', '=', Eval('mark_category')),
+                                             ('accounting', '=', False)],
+                                     states=_states,)
     reference_category = fields.Many2One('product.category', "Reference",
                                          domain=[('parent', '=', Eval('model_category'))],
                                          states=_states,
                                          depends=['model_category']
-                                        )
-    origin_country = fields.Many2One('country.country',"Origin Country",
+                                         )
+    origin_country = fields.Many2One('country.country', "Origin Country",
                                      states=_states,)
 
     software_version = fields.Char("Software version", size=None,
@@ -96,33 +102,59 @@ class OpticalEquipment(DeactivableMixin, Workflow, ModelSQL, ModelView):
                          depends=_depends)
     health_register = fields.Char("Health Register", size=None,
                                   states=_states,)
-    contract_history = fields.Many2Many('optical_equipment.contract-optical_equipment.equipment', 'equipment','contract', "Contracts", states={'readonly': True})
+    # contract_history =
+    # fields.Many2Many('optical_equipment.contract-optical_equipment.equipment',
+    # 'equipment','contract', "Contracts", states={'readonly': True})
+    contract_history = fields.Function(
+        fields.One2Many(
+            'optical_equipment.contract',
+            'equipment',
+            "Contracts"),
+        'get_contracts_of_equipment')
     maintenance_history = fields.Function(
         fields.Many2Many('optical_equipment.maintenance-optical_equipment.equipment',
-                         'equipment', 'maintenance',"Maintenances"), 'get_maintenances_of_equipment')
+                         'equipment', 'maintenance', "Maintenances"), 'get_maintenances_of_equipment')
     software_version = fields.Char("Software version", size=None,
                                    states=_states,)
 
     maintenance_frequency = fields.Selection(_MAINTENANCE_FREQUENCY, "Maintenance Frequency",
                                              depends=['propietary'])
-    purchase_origin = fields.Reference("Purchase Origin", selection='get_origin',select=True,
+    purchase_origin = fields.Reference("Purchase Origin", selection='get_origin', select=True,
                                        states={'readonly': True})
-    sale_destination = fields.Reference("Sale Destination", selection='get_destination',select=True,
-                                       states={'readonly': True})
-    shipment_destination =  fields.Reference("Stock Move", selection='get_shipment', select=True,
-                                             states={'readonly': True})
+    sale_destination = fields.Reference("Sale Destination", selection='get_destination', select=True,
+                                        states={'readonly': True})
+    shipment_destination = fields.Reference("Stock Move", selection='get_shipment', select=True,
+                                            states={'readonly': True})
     rec_name = fields.Function(fields.Char("rec_name"), 'get_rec_name')
 
+    technician_responsible = fields.Function(fields.Char('Technician Responsible'), 'get_technical')
+    invima = fields.Function(fields.Char('Invima'), 'get_invima')
+
     del _states_serial, _states, _depends
 
+    def get_technical(self, name):
+        pool = Pool()
+        ConfigurationEquipment = pool.get('optical_equipment.configuration')
+        config = ConfigurationEquipment(1)
 
-    @fields.depends('product', 'serial', 'code')
+        if config.technician_responsible:
+            technician_responsible = config.technician_responsible
+            return technician_responsible.party.name
+
+    def get_invima(self, name):
+        pool = Pool()
+        ConfigurationEquipment = pool.get('optical_equipment.configuration')
+        config = ConfigurationEquipment(1)
+        if config.technician_responsible.invima:
+            return config.technician_responsible.invima
+
+    @ fields.depends('product', 'serial', 'code')
     def get_rec_name(self, name):
         name = str(self.product.name) + '@' + str(self.serial) + '/' + str(self.code)
 
         return name
 
-    @staticmethod
+    @ staticmethod
     def _get_shipment():
         'Return list of Model names for shipment Reference'
         return [
@@ -131,9 +163,9 @@ class OpticalEquipment(DeactivableMixin, Workflow, ModelSQL, ModelView):
             'stock.shipment.out.return',
             'stock.shipment.in.return',
             'stock.shipment.internal',
-            ]
+        ]
 
-    @classmethod
+    @ classmethod
     def get_shipment(cls):
         IrModel = Pool().get('ir.model')
         get_name = IrModel.get_name
@@ -141,7 +173,7 @@ class OpticalEquipment(DeactivableMixin, Workflow, ModelSQL, ModelView):
 
         return [(None, '')] + [(m, get_name(m)) for m in models]
 
-    @classmethod
+    @ classmethod
     def _get_origin(cls):
         'Return list of Model names for origin Reference'
         pool = Pool()
@@ -149,7 +181,7 @@ class OpticalEquipment(DeactivableMixin, Workflow, ModelSQL, ModelView):
 
         return [Purchase.__name__]
 
-    @classmethod
+    @ classmethod
     def get_origin(cls):
         Model = Pool().get('ir.model')
         get_name = Model.get_name
@@ -157,7 +189,7 @@ class OpticalEquipment(DeactivableMixin, Workflow, ModelSQL, ModelView):
 
         return [(None, '')] + [(m, get_name(m)) for m in models]
 
-    @classmethod
+    @ classmethod
     def _get_destination(cls):
         'Return list of Model names for origin Reference'
         pool = Pool()
@@ -165,8 +197,7 @@ class OpticalEquipment(DeactivableMixin, Workflow, ModelSQL, ModelView):
 
         return [Sale.__name__]
 
-
-    @classmethod
+    @ classmethod
     def get_destination(cls):
         Model = Pool().get('ir.model')
         get_name = Model.get_name
@@ -174,8 +205,7 @@ class OpticalEquipment(DeactivableMixin, Workflow, ModelSQL, ModelView):
 
         return [(None, '')] + [(m, get_name(m)) for m in models]
 
-    
-    @classmethod
+    @ classmethod
     def __setup__(cls):
         super(OpticalEquipment, cls).__setup__()
         cls._transitions = ({
@@ -183,22 +213,22 @@ class OpticalEquipment(DeactivableMixin, Workflow, ModelSQL, ModelView):
             ('registred', 'draft'),
             ('registred', 'uncontrated'),
             ('uncontrated', 'contrated'),
-            })
+        })
         cls._buttons.update({
             'draft': {
-                 'invisible': Eval('state') != 'registred'},
+                'invisible': Eval('state') != 'registred'},
             'registred': {
                 'invisible': Eval('state').in_(['registred', 'uncontrated', 'contrated'])}}
         )
 
-    @classmethod
+    @ classmethod
     def set_code(cls, equipments):
         pool = Pool()
         Config = pool.get('optical_equipment.configuration')
         config = Config(1)
 
         for equipment in equipments:
-            if config.equipment_sequence != None:
+            if config.equipment_sequence is not None:
                 if not equipment.code:
                     try:
                         equipment.code = config.equipment_sequence.get()
@@ -208,6 +238,20 @@ class OpticalEquipment(DeactivableMixin, Workflow, ModelSQL, ModelView):
             else:
                 raise UserError(gettext('optical_equipment.msg_not_sequence_equipment'))
 
+    def get_contracts_of_equipment(self, records):
+        pool = Pool()
+        ContractsEquipment = pool.get('optical_equipment.contract')
+        contractsEquipment = set()
+
+        contractsEquipment = ContractsEquipment.search(
+            [('party', '=', self.propietary), ('history_equipments', 'in', [self.id])])
+        contracts = []
+
+        for key in contractsEquipment:
+            contracts.append(key.id)
+
+        return contracts
+
     def get_maintenances_of_equipment(self, records):
         pool = Pool()
         MaintenancesEquipment = pool.get('optical_equipment.maintenance')
@@ -221,97 +265,99 @@ class OpticalEquipment(DeactivableMixin, Workflow, ModelSQL, ModelView):
 
         return maintenances
 
-    @classmethod
+    @ classmethod
     def default_state(cls):
-       return 'draft'
+        return 'draft'
 
-    @staticmethod
+    @ staticmethod
     def default_company():
         return Transaction().context.get('company')
 
-    @fields.depends('propietary', 'maintenance_frequency')
+    @ fields.depends('propietary', 'maintenance_frequency')
     def on_change_propietary(self):
         if self.propietary:
-           if self.propietary.client_type == 'ips':
-               self.maintenance_frequency = "6"
-           else:
-               self.maintenance_frequency = "12"
+            if self.propietary.customer_type == 'ips':
+                self.maintenance_frequency = "6"
+            else:
+                self.maintenance_frequency = "12"
         else:
             self.maintenance_frequency = "none"
 
-    @fields.depends('product', 'equipment_type','use',
-                    'biomedical_class', 'calibration',
-                    'mark_category', 'model_category')
+    @ fields.depends('product', 'equipment_type', 'use',
+                     'biomedical_class', 'calibration',
+                     'mark_category', 'model_category')
     def on_change_product(self):
         if self.product:
-           self.equipment_type=self.product.equipment_type
-           self.use=self.product.use
-           self.biomedical_class=self.product.biomedical_class
-           self.calibration=self.product.calibration
-           self.mark_category=self.product.mark_category
-           self.model_category=self.product.model_category
-           self.reference_category=self.product.reference_category
-           self.useful_life=self.product.useful_life if self.product.useful_life else int(0)
-           self.calibration=True  if self.product.calibration else False
-           self.warranty=self.product.warranty if self.product.warranty else int(0)
-           self.risk=self.product.risk
-           self.origin_country=self.product.origin_country
-           self.use=self.product.use
-           self.biomedical_class=self.product.biomedical_class
+            self.equipment_type = self.product.equipment_type
+            self.use = self.product.use
+            self.biomedical_class = self.product.biomedical_class
+            self.calibration = self.product.calibration
+            self.mark_category = self.product.mark_category
+            self.model_category = self.product.model_category
+            self.reference_category = self.product.reference_category
+            self.useful_life = self.product.useful_life if self.product.useful_life else int(0)
+            self.calibration = True if self.product.calibration else False
+            self.warranty = self.product.warranty if self.product.warranty else int(0)
+            self.risk = self.product.risk
+            self.origin_country = self.product.origin_country
+            self.use = self.product.use
+            self.biomedical_class = self.product.biomedical_class
         else:
-            self.equipment_type=None
-            self.use=None
-            self.biomedical_class=None
-            self.calibration=None
-            self.mark_category=None
-            self.model_category=None
-            self.reference_category=None
-            self.useful_life=None
-            self.calibration=False
-            self.warranty=None
-            self.risk=None
-            self.origin_country=None
-            self.use=None
-            self.biomedical_class=None
-            self.refurbish=None
-            self.serial=None
-            self.health_register=None
-            self.software_version=None
+            self.equipment_type = None
+            self.use = None
+            self.biomedical_class = None
+            self.calibration = None
+            self.mark_category = None
+            self.model_category = None
+            self.reference_category = None
+            self.useful_life = None
+            self.calibration = False
+            self.warranty = None
+            self.risk = None
+            self.origin_country = None
+            self.use = None
+            self.biomedical_class = None
+            self.refurbish = None
+            self.serial = None
+            self.health_register = None
+            self.software_version = None
 
-    @classmethod
+    @ classmethod
     def delete(cls, equipments):
-        for equipment  in equipments:
+        for equipment in equipments:
             if equipment.purchase_origin:
                 raise AccessError(
                     gettext('estos equipos no se pueden borrar'))
-            elif equipment.state != 'draft' and equipment.serial != None:
-                    raise AccessError(
-                        gettext('estos equipos no se pueden borrar'))
+            elif equipment.state != 'draft' and equipment.serial is not None:
+                raise AccessError(
+                    gettext('estos equipos no se pueden borrar'))
         super(OpticalEquipment, cls).delete(equipments)
 
-    @classmethod
-    @ModelView.button
-    @Workflow.transition('draft')
+    @ classmethod
+    @ ModelView.button
+    @ Workflow.transition('draft')
     def draft(cls, equipments):
         pass
 
-    @classmethod
-    @ModelView.button
-    @Workflow.transition('registred')
+    @ classmethod
+    @ ModelView.button
+    @ Workflow.transition('registred')
     def registred(cls, equipments):
         for i in equipments:
-            if i.serial == None:
+            if i.serial is None:
                 raise UserError(str("El Equipo no cuenta con un Serial"))
             else:
                 cls.set_code(equipments)
 
+
 class EquipmentMaintenance(ModelSQL, ModelView):
     'Optical Equipment - Equipment - Maintenance'
-    __name__ ='optical_equipment.maintenance-optical_equipment.equipment'
+    __name__ = 'optical_equipment.maintenance-optical_equipment.equipment'
 
     equipment = fields.Many2One('optical_equipment.equipment', 'Equipment', select=True)
     maintenance = fields.Many2One('optical_equipment.maintenance', 'Maintenances', select=True)
 
+
 class EquipmentContract(ModelSQL, ModelView):
     'Optical Equipment - Contracs Equipment'
     __name__ = 'optical_equipment.contract-optical_equipment.equipment'
@@ -319,6 +365,7 @@ class EquipmentContract(ModelSQL, ModelView):
     equipment = fields.Many2One('optical_equipment.equipment', 'Equipment', select=True)
     contract = fields.Many2One('optical_equipment.contract', 'Contract', select=True)
 
+
 class EquipmentParty(ModelSQL, ModelView):
     'Optical Equipment - Party'
     __name__ = 'optical_equipment.equipment-party.party'
@@ -343,7 +390,7 @@ class ChangePropietary(ModelView):
                                   states={'required': True})
     change_date = fields.Date("Change Date", readonly=True)
 
-    @classmethod
+    @ classmethod
     def default_change_date(cls):
         pool = Pool()
         Date = pool.get('ir.date')
@@ -355,7 +402,7 @@ class NewPropietary(Wizard):
     __name__ = 'optical_equipment.change_propietary'
 
     start = StateView('optical_equipment.change_propietary.form',
-                      'optical_equipment.change_propietary_view_form',[
+                      'optical_equipment.change_propietary_view_form', [
                           Button('Cancel', 'end', 'tryton-cancel'),
                           Button('Create', 'change_propietary', 'tryton-ok', default=True),
                       ])
@@ -371,27 +418,30 @@ class NewPropietary(Wizard):
             equipment.propietarys += (equipment.propietary,)
             equipment.propietary = new_propietary
             equipment.propietary_address = new_address
-            equipment.maintenance_frequency = "6" if new_propietary.client_type == 'ips' else "12"
+            equipment.maintenance_frequency = "6" if new_propietary.customer_type == 'ips' else "12"
             equipment.save()
 
 
 class ChangeEquipment(ModelSQL):
     'Change Equipment'
-    __name__ =  'optical_equipment.equipment-change_propietary.form'
+    __name__ = 'optical_equipment.equipment-change_propietary.form'
 
-    maintenance_service = fields.Many2One('optical_equipment_maintenance.service', "Maintenance Service")
+    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
+    @ classmethod
     def execute(cls, ids, data):
         with Transaction().set_context(address_with_party=True):
             return super(EquipmentReport, cls).execute(ids, data)
 
-    @classmethod
+    @ classmethod
     def get_context(cls, records, header, data):
         pool = Pool()
         Date = pool.get('ir.date')

equipment.xml

@@ -11,15 +11,7 @@
             <field name="user" ref="res.user_admin"/>
             <field name="group" ref="group_equipment_admin"/>
         </record>
-	<record model="res.group" id="group_maintenance_admin">
-            <field name="name">Maintenance Administration</field>
-        </record>
-	<record model="res.user-res.group"
-            id="user_admin_group_maintenance_admin">
-            <field name="user" ref="res.user_admin"/>
-            <field name="group" ref="group_maintenance_admin"/>
-        </record>	
-        <menuitem
+	<menuitem
             name="Equipment"
             sequence="40"
             id="menu_equipment"/>
@@ -31,12 +23,12 @@
 	<record model="ir.ui.view" id="optical_equipment_view_tree">
             <field name="model">optical_equipment.equipment</field>
             <field name="type">tree</field>
-            <field name="name">optical_equipment_tree</field>
+            <field name="name">equipment_tree</field>
         </record>
 	<record model="ir.ui.view" id="optical_equipment_view_form">
             <field name="model">optical_equipment.equipment</field>
             <field name="type">form</field>
-            <field name="name">optical_equipment_form</field>
+            <field name="name">equipment_form</field>
         </record>
 	<record model="ir.action.act_window.view" id="act_optical_equipment_view1">
             <field name="sequence" eval="10"/>
@@ -75,7 +67,6 @@
             <field name="count" eval="True"/>
             <field name="act_window" ref="act_optical_equipment_form"/>
         </record>
-
         <record model="ir.action.act_window.domain" id="act_optical_equipment_form_domain_contrated">
             <field name="name">Contrated</field>
             <field name="sequence" eval="30"/>
@@ -115,7 +106,7 @@
 	<record model="ir.ui.view" id="optical_equipment_view_tree1">
             <field name="model">optical_equipment.equipment</field>
             <field name="type">tree</field>
-            <field name="name">optical_equipment_serial_tree</field>
+            <field name="name">equipment_serial_tree</field>
         </record>
 	<record model="ir.action.act_window.view" id="act_optical_equipment_view3">
             <field name="sequence" eval="10"/>
@@ -137,46 +128,6 @@
 	    sequence="70"
 	    id="menu_optical_equipment_serial_form"/>
 	
-	<record model="ir.ui.menu-res.group"
-            id="menu_party_group_equipment_admin">
-            <field name="menu" ref="menu_equipment"/>
-            <field name="group" ref="group_equipment_admin"/>
-        </record>
- 	<record model="ir.sequence.type" id="sequence_type_equipment">
-	    <field name="name">Equipment</field>
-	</record>
-	<record model="ir.sequence.type-res.group"
-            id="sequence_type_equipment_group_admin">
-            <field name="sequence_type" ref="sequence_type_equipment"/>
-            <field name="group" ref="res.group_admin"/>
-        </record>
-        <record model="ir.sequence.type-res.group"
-            id="sequence_type_equipment_group_equipment_admin">
-            <field name="sequence_type" ref="sequence_type_equipment"/>
-            <field name="group" ref="group_equipment_admin"/>
-        </record>
-	<record model="ir.sequence" id="sequence_equipment">
-	    <field name="name">Equipment</field>
-            <field name="sequence_type" ref="sequence_type_equipment"/>
-        </record>
-	<record model="ir.sequence.type" id="sequence_type_maintenances">
-	    <field name="name">Maintenances</field>
-	</record>
-	<record model="ir.sequence.type-res.group"
-            id="sequence_type_maintenance_group_admin">
-            <field name="sequence_type" ref="sequence_type_maintenances"/>
-            <field name="group" ref="res.group_admin"/>
-        </record>
-        <record model="ir.sequence.type-res.group"
-            id="sequence_type_maintenance_group_maintenance_admin">
-            <field name="sequence_type" ref="sequence_type_maintenances"/>
-            <field name="group" ref="group_maintenance_admin"/>
-        </record>
-	<record model="ir.sequence" id="sequence_maintenances">
-	    <field name="name">Maintenance</field>
-            <field name="sequence_type" ref="sequence_type_maintenances"/>
-        </record>
-	
 	<record model="ir.action.report" id="report_equipment">
             <field name="name">Equipment</field>
             <field name="model">optical_equipment.equipment</field>

exceptions.py

@@ -1,11 +0,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.
-from trytond.exceptions import UserError
-from trytond.model.exceptions import ValidationError
-
-
-class InvalidNumberPurchases(UserError):
-    pass
-
-class NotSequenceEquipment(ValidationError):
-    pass

icons/LICENSE

@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

locale/es.po

@@ -74,6 +74,10 @@ msgctxt "field:product.template,calibration:"
 msgid "Apply calibration"
 msgstr "Aplica calibración"
 
+msgctxt "field:product.template,maintenance_required:"
+msgid "Maintenance Required"
+msgstr "Requiere Mantenimiento"
+
 msgctxt "field:product.template,observation:"
 msgid "Observation"
 msgstr "Observación"
@@ -134,6 +138,10 @@ msgctxt "field:product.template,uncertainy_pattern:"
 msgid "Uncertainy Pattern"
 msgstr "Incertidumbre Patrón"
 
+msgctxt "field:product.template,use_pattern:"
+msgid "Use Pattern"
+msgstr "Patrón Utilizado"
+
 msgctxt "field:product.template,k_pattern:"
 msgid "K Pattern"
 msgstr "Patrón K"
@@ -351,8 +359,16 @@ msgid "Serials"
 msgstr "Seriales"
 
 msgctxt "model:ir.ui.menu,name:menu_maintenance_form"
-msgid "Maintenances"
-msgstr "Mantenimientos"
+msgid "Maintenance Lines"
+msgstr "Líneas de Mantenimiento"
+
+msgctxt "model:ir.ui.menu,name:menu_properties_equipments"
+msgid "Properties of Equipments"
+msgstr "Propiedades de Equipos"
+
+msgctxt "model:ir.ui.menu,name:menu_pattern"
+msgid "Pattern Use"
+msgstr "Patrónes de Calibración"
 
 msgctxt "model:ir.sequence,name:sequence_equipment"
 msgid "Equipment"
@@ -654,6 +670,10 @@ msgctxt "field:optical_equipment_maintenance.service,code:"
 msgid "Code"
 msgstr "Código"
 
+msgctxt "selection:optical_equipment.maintenance,maintenance_type:"
+msgid "Initial"
+msgstr "Inicial"
+
 msgctxt "selection:optical_equipment.maintenance,maintenance_type:"
 msgid "Preventive"
 msgstr "Preventivo"
@@ -666,6 +686,10 @@ msgctxt "field:optical_equipment.maintenance,description_activity:"
 msgid "Activity"
 msgstr "Descripción del Mantenimiento"
 
+msgctxt "field:optical_equipment.maintenance,equipment_calibrate:"
+msgid "Calibrate Equipment"
+msgstr "Equipo Calibrable"
+
 msgctxt "field:optical_equipment.maintenance,temperature_min:"
 msgid "Temp Min"
 msgstr "Temp Min"
@@ -686,6 +710,50 @@ msgctxt "field:optical_equipment.maintenance,moisture_uom:"
 msgid "Moisture UOM"
 msgstr "Humedad UOM"
 
+msgctxt "field:optical_equipment.maintenance.line,line_replace:"
+msgid "Replace"
+msgstr "Repuesto"
+
+msgctxt "field:optical_equipment.maintenance.line,line_maintenance_activity:"
+msgid "Maintenance Activity"
+msgstr "Actividad de Mantenimiento"
+
+msgctxt "field:optical_equipment.maintenance.line,maintenance:"
+msgid "Maintenance"
+msgstr "Mantenimiento"
+
+msgctxt "field:optical_equipment.maintenance.line,replacement:"
+msgid "Replacement"
+msgstr "Reemplazo"
+
+msgctxt "field:optical_equipment.maintenance.line,maintenance_activity:"
+msgid "Maintenance activity"
+msgstr "Actividad de Mantenimiento"
+
+msgctxt "field:optical_equipment.maintenance.line,quantity:"
+msgid "Quantity"
+msgstr "Cantidad"
+
+msgctxt "field:optical_equipment.maintenance.line,actual_quantity:"
+msgid "Actual Quantity"
+msgstr "Cantidad Actual"
+
+msgctxt "field:optical_equipment.maintenance.line,unit:"
+msgid "Unit"
+msgstr "Unidad"
+
+msgctxt "field:optical_equipment.maintenance.line,product_uom_category:"
+msgid "Product Uom Category"
+msgstr "Categoría de unidad de producto"
+
+msgctxt "field:optical_equipment.maintenance.line,description:"
+msgid "Description"
+msgstr "Detalles"
+
+msgctxt "field:optical_equipment.maintenance.line,company:"
+msgid "Company"
+msgstr "Empresa"
+
 msgctxt "field:optical_equipment.maintenance,temperature_uom:"
 msgid "Temperature UOM"
 msgstr "Temperatura UOM"
@@ -702,6 +770,10 @@ msgctxt "field:sale.sale,quote_number:"
 msgid "Quote Number"
 msgstr "Cotización #"
 
+msgctxt "field:sale.sale,payment_term_description:"
+msgid "Payment Term"
+msgstr "Plazo de Pago"
+
 msgctxt "field:sale.sale,description:sale."
 msgid "Description"
 msgstr "Tiempo de Entrega"
@@ -726,6 +798,18 @@ msgctxt "field:optical_equipment_maintenance.service,maintenance_type:"
 msgid "Maintenance Type"
 msgstr "Tipo de Mantenimiento"
 
+msgctxt "selection:optical_equipment_maintenance.service,maintenance_type:"
+msgid "Initial"
+msgstr "Inicial"
+
+msgctxt "selection:optical_equipment_maintenance.service,maintenance_type:"
+msgid "Preventive"
+msgstr "Preventivo"
+
+msgctxt "selection:optical_equipment_maintenance.service,maintenance_type:"
+msgid "Corrective"
+msgstr "Correctivo"
+
 msgctxt "field:optical_equipment_maintenance.service,propietary:"
 msgid "Propietary"
 msgstr "Propietario"
@@ -782,12 +866,8 @@ 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"
-
-msgctxt "field:party.party,client_type:"
-msgid "Client type"
+msgctxt "field:party.party,customer_type:"
+msgid "Customer type"
 msgstr "Tipo de Cliente"
 
 msgctxt "field:product.template,software_required:"
@@ -1138,6 +1218,14 @@ msgctxt "selection:optical_equipment.maintenance,state:"
 msgid "Finished"
 msgstr "Finalizado"
 
+msgctxt "model:ir.model.button,string:assing_agended_button"
+msgid "Assing Agended"
+msgstr "Agendar"
+
+msgctxt "model:ir.model.button,string:reassing_agended_button"
+msgid "Reassing Agended"
+msgstr "Reagendar"
+
 msgctxt "model:ir.model.button,string:maintenance_service_draft_button"
 msgid "Draft"
 msgstr "Borrador"
@@ -1330,6 +1418,10 @@ msgctxt "field:optical_equipment_create.contract,end_date:"
 msgid "End Date"
 msgstr "Fecha Final"
 
+msgctxt "field:optical_equipment_create.contract,unit_price:"
+msgid "Unit Price"
+msgstr "Precio Unitario"
+
 msgctxt "field:stock.move,equipment:"
 msgid "Equipment"
 msgstr "Equipo"
@@ -1379,6 +1471,34 @@ msgctxt "field:stock.shipment.out,service_maintenance_initial:"
 msgid "Maintenance Initial"
 msgstr "Mantenimiento Inicial"
 
+msgctxt "field:optical_equipment.print_balance_sale_party.start,company:"
+msgid "Company"
+msgstr "Empresa"
+
+msgctxt "field:optical_equipment.print_balance_sale_party.start,party:"
+msgid "Party"
+msgstr "Tercero"
+
+msgctxt "field:optical_equipment.print_balance_sale_party.start,start_period:"
+msgid "Start Period"
+msgstr "Periodo Inicial"
+
+msgctxt "field:optical_equipment.print_balance_sale_party.start,end_period:"
+msgid "End Period"
+msgstr "Periodo Final"
+
+msgctxt "field:optical_equipment.print_balance_sale_party.start,party_type:"
+msgid "Party Type"
+msgstr "Tipo"
+
+msgctxt "selection:optical_equipment.print_balance_sale_party.start,party_type:"
+msgid "Customer"
+msgstr "Cliente"
+
+msgctxt "model:ir.ui.menu,name:menu_print_balance_sale_party"
+msgid "Print Balance Sale by Party"
+msgstr "Estado de Cuenta por Tercero"
+
 msgctxt "model:ir.model.button,string:maintenance_initial_button"
 msgid "Maintenance Initial"
 msgstr "Mantenimiento Inicial"
@@ -1407,10 +1527,18 @@ msgctxt "model:ir.action,name:report_calibration"
 msgid "Calibration"
 msgstr "Calibración"
 
+msgctxt "model:ir.action,name:report_calibrations"
+msgid "Calibrations"
+msgstr "Calibraciones"
+
 msgctxt "model:ir.action,name:report_maintenance_timeline"
 msgid "Time Line Maintenance Service"
 msgstr "Cronograma de Mantenimiento"
 
+msgctxt "model:ir.action,name:report_service"
+msgid "Service"
+msgstr "Registro de Mantenimiento Preventivo"
+
 msgctxt "model:ir.action,name:report_equipment"
 msgid "Equipment"
 msgstr "Hoja de Vida"
@@ -1419,6 +1547,10 @@ msgctxt "model:ir.action,name:report_history_maintenance"
 msgid "Maintenance History"
 msgstr "Historico de Mantenimiento"
 
+msgctxt "model:ir.action,name:report_historys_maintenances"
+msgid "Maintenances Historys"
+msgstr "Historicos de Mantenimiento"
+
 msgctxt "model:ir.action,name:report_capacitation"
 msgid "Capacitation"
 msgstr "Certificado de Capacitación"
@@ -1434,3 +1566,20 @@ msgstr "Cambiar Propietario al Servicio de Mantenimiento"
 msgctxt "model:ir.action,name:maintenance_create_contract"
 msgid "Create Contract"
 msgstr "Crear Contrato"
+
+msgctxt "model:optical_equipment.use_pattern,name_pattern:schematic_eye"
+msgid "Schematic Eye"
+msgstr "Ojo Esquemático"
+
+msgctxt "model:optical_equipment.use_pattern,name_pattern:trial_lens"
+msgid "Trial Lens"
+msgstr "Lentes de Prueba"
+
+msgctxt "model:optical_equipment.use_pattern,name_pattern:calibration_weights"
+msgid "Calibration Weights"
+msgstr "Pesas de Calibración"
+
+msgctxt "model:optical_equipment.use_pattern,name_pattern:calibration_spheres"
+msgid "Calibration Spheres"
+msgstr "Esferas de Calibración"
+

maintenance.xml

@@ -3,32 +3,12 @@
      this repository contains the full copyright notices and license terms. -->
 <tryton>
     <data>
-	<record model="ir.action.act_window" id="act_maintenance_form">
-	    <field name="name">Maintenances</field>
-	    <field name="res_model">optical_equipment.maintenance</field>
-	    <field name="search_value"></field>
-	</record>
-	<record model="ir.ui.view" id= "maintenance_view_tree">
-	    <field name="model">optical_equipment.maintenance</field>
-	    <field name="type">tree</field>
-	    <field name="name">maintenance_tree</field>
-	</record>
-	<record model="ir.ui.view" id="maintenance_view_form">
-	    <field name="model">optical_equipment.maintenance</field>
-	    <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>
 	    <field name="search_value"></field>
 	</record>
-	<record model="ir.ui.view" id= "maintenance_service_view_tree">
+	<record model="ir.ui.view" id="maintenance_service_view_tree">
 	    <field name="model">optical_equipment_maintenance.service</field>
 	    <field name="type">tree</field>
 	    <field name="name">maintenance_service_tree</field>
@@ -38,87 +18,16 @@
 	    <field name="type">form</field>
 	    <field name="name">maintenance_service_form</field>
 	</record>
-	<record model="ir.ui.view" id= "maintenance_equipment_view_form">
-	    <field name="model">optical_equipment.maintenance-optical_equipment.equipment</field>
-	    <field name="inherit" ref="maintenance_view_form"/>
-	    <field name="name">maintenance_equipment_form</field>
-	</record>
-	<record model="ir.ui.view" id="maintenance_activity_view_form">
-	    <field name="model">optical_equipment_maintenance.activity</field>
-	    <field name="type">form</field>
-	    <field name="name">maintenance_activity_form</field>
-	</record>
-	<record model="ir.ui.view" id="maintenance_activity_view_tree">
-            <field name="model">optical_equipment_maintenance.activity</field>
-            <field name="type">tree</field>
-            <field name="priority" eval="10"/>
-            <field name="name">maintenance_activity_tree</field>
-        </record>
-	<record model="ir.action.act_window.view" id="act_maintenance_view1">
+	<record model="ir.action.act_window.view" id="act_maintenance_service_view1">
             <field name="sequence" eval="10"/>
-	    <field name="view" ref="maintenance_view_tree"/>
-            <field name="act_window" ref="act_maintenance_form"/>
+	    <field name="view" ref="maintenance_service_view_tree"/>
+            <field name="act_window" ref="act_maintenance_service_form"/>
 	</record>
-	<record model="ir.action.act_window.view" id="act_maintenance_view2">
+	<record model="ir.action.act_window.view" id="act_maintenance_service_view2">
             <field name="sequence" eval="20"/>
-	    <field name="view" ref="maintenance_view_form"/>
-            <field name="act_window" ref="act_maintenance_form"/>
+	    <field name="view" ref="maintenance_service_view_form"/>
+            <field name="act_window" ref="act_maintenance_service_form"/>
 	</record>
-	<record model="ir.action.act_window.domain" id="act_maintenance_form_domain_draft">
-	    <field name="name">Draft</field>
-            <field name="sequence" eval="10"/>
-            <field name="domain"
-                eval="[('state', '=', 'draft')]"
-                pyson="1"/>
-            <field name="count" eval="True"/>
-            <field name="act_window" ref="act_maintenance_form"/>
-        </record>
-	<record model="ir.action.act_window.domain" id="act_maintenance_form_domain_finished">
-            <field name="name">Finished</field>
-            <field name="sequence" eval="40"/>
-            <field name="domain"
-                eval="[('state', '=', 'finished')]"
-                pyson="1"/>
-            <field name="count" eval="True"/>
-            <field name="act_window" ref="act_maintenance_form"/>
-        </record>
-        <record model="ir.action.act_window.domain" id="act_maintenance_form_domain_all">
-            <field name="name">All</field>
-            <field name="sequence" eval="9999"/>
-            <field name="domain"></field>
-            <field name="act_window" ref="act_maintenance_form"/>
-        </record>	
-	<record model="ir.model.button" id="maintenance_service_draft_button">
-	    <field name="name">draft</field>
-	    <field name="string">Draft</field>
-	    <field name="model" search="[('model', '=', 'optical_equipment_maintenance.service')]"/>
-	</record>
-	<record model="ir.model.button" id="maintenance_service_in_progress_button">
-	    <field name="name">in_progress</field>
-	    <field name="string">In progress</field>
-	    <field name="model" search="[('model', '=', 'optical_equipment_maintenance.service')]"/>
-	</record>
-	<record model="ir.model.button" id="maintenance_service_finished_button">
-	    <field name="name">finished</field>
-	    <field name="string">Finished</field>
-	    <field name="model" search="[('model', '=', 'optical_equipment_maintenance.service')]"/>
-	</record>
-	<record model="ir.model.button" id="maintenance_finished_button">
-	    <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>
-	    <field name="string">Calibrate</field>
-	    <field name="model" search="[('model', '=', 'optical_equipment.maintenance')]"/>
-	</record>
-
 	<record model="ir.action.act_window.domain" id="act_maintenance_service_form_domain_draft">
             <field name="name">Draft</field>
             <field name="sequence" eval="10"/>
@@ -170,6 +79,76 @@
             <field name="domain"></field>
             <field name="act_window" ref="act_maintenance_service_form"/>
         </record>
+	<record model="ir.action.act_window" id="act_maintenance_form">
+	    <field name="name">Maintenance Lines</field>
+	    <field name="res_model">optical_equipment.maintenance</field>
+	    <field name="search_value"></field>
+	</record>
+	<record model="ir.ui.view" id= "maintenance_view_tree">
+	    <field name="model">optical_equipment.maintenance</field>
+	    <field name="type">tree</field>
+	    <field name="name">maintenance_tree</field>
+	</record>
+	<record model="ir.ui.view" id="maintenance_view_form">
+	    <field name="model">optical_equipment.maintenance</field>
+	    <field name="type">form</field>
+	    <field name="name">maintenance_form</field>
+	</record>
+	<record model="ir.action.act_window.view" id="act_maintenance_view1">
+            <field name="sequence" eval="10"/>
+	    <field name="view" ref="maintenance_view_tree"/>
+            <field name="act_window" ref="act_maintenance_form"/>
+	</record>
+	<record model="ir.action.act_window.view" id="act_maintenance_view2">
+            <field name="sequence" eval="20"/>
+	    <field name="view" ref="maintenance_view_form"/>
+            <field name="act_window" ref="act_maintenance_form"/>
+	</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.ui.view" id= "maintenance_equipment_view_form">
+	    <field name="model">optical_equipment.maintenance-optical_equipment.equipment</field>
+	    <field name="inherit" ref="maintenance_view_form"/>
+	    <field name="name">maintenance_equipment_form</field>
+	</record>
+	<record model="ir.ui.view" id="maintenance_activity_view_form">
+	    <field name="model">optical_equipment_maintenance.activity</field>
+	    <field name="type">form</field>
+	    <field name="name">maintenance_activity_form</field>
+	</record>
+	<record model="ir.ui.view" id="maintenance_activity_view_tree">
+            <field name="model">optical_equipment_maintenance.activity</field>
+            <field name="type">tree</field>
+            <field name="priority" eval="10"/>
+            <field name="name">maintenance_activity_tree</field>
+        </record>
+	<record model="ir.action.act_window.domain" id="act_maintenance_form_domain_draft">
+	    <field name="name">Draft</field>
+            <field name="sequence" eval="10"/>
+            <field name="domain"
+                eval="[('state', '=', 'draft')]"
+                pyson="1"/>
+            <field name="count" eval="True"/>
+            <field name="act_window" ref="act_maintenance_form"/>
+        </record>
+	<record model="ir.action.act_window.domain" id="act_maintenance_form_domain_finished">
+            <field name="name">Finished</field>
+            <field name="sequence" eval="40"/>
+            <field name="domain"
+                eval="[('state', '=', 'finished')]"
+                pyson="1"/>
+            <field name="count" eval="True"/>
+            <field name="act_window" ref="act_maintenance_form"/>
+        </record>
+        <record model="ir.action.act_window.domain" id="act_maintenance_form_domain_all">
+            <field name="name">All</field>
+            <field name="sequence" eval="9999"/>
+            <field name="domain"></field>
+            <field name="act_window" ref="act_maintenance_form"/>
+        </record>
 	<record model="ir.ui.view" id="maintenance_line_view_form">
 	    <field name="model">optical_equipment.maintenance.line</field>
 	    <field name="type">form</field>
@@ -180,72 +159,70 @@
 	    <field name="type">tree</field>
 	    <field name="name">maintenance_line_tree</field>
 	</record>
-	<record model="ir.ui.view" id="maintenance_calibration_view_form">
-            <field name="model">optical_equipment.maintenance.calibration_sample</field>
-            <field name="type">form</field>
-            <field name="name">maintenance_sample_form</field>
-        </record>
-        <record model="ir.ui.view" id="maintenance_calibration_view_tree">
-            <field name="model">optical_equipment.maintenance.calibration_sample</field>
-            <field name="type">tree</field>
-            <field name="priority" eval="10"/>
-            <field name="name">maintenance_calibration_tree</field>
-        </record>
-	<record model="ir.ui.view" id="calibration_total_view_tree">
-            <field name="model">optical_equipment.maintenance.calibration</field>
-            <field name="type">tree</field>
-            <field name="name">calibration_total_tree</field>
-        </record>
-	<record model="ir.ui.view" id="calibration_total_view_form">
-            <field name="model">optical_equipment.maintenance.calibration</field>
-            <field name="type">form</field>
-            <field name="name">calibration_total_form</field>
-        </record>
-	<record model="ir.ui.view" id="assing_agended_view_form">
-	    <field name="model">optical_equipment_maintenance.agended</field>
-	    <field name="type">form</field>
-	    <field name="name">assing_agended_form</field>
+	<record model="ir.model.button" id="assing_agended_button">
+	    <field name="name">assing_agended</field>
+	    <field name="string">Assing Agended</field>
+	    <field name="model" search="[('model', '=', 'optical_equipment_maintenance.service')]"/>
 	</record>
-	<record model="ir.action.wizard" id="act_assing_agended">
-	    <field name="name">Assing Agended</field>
-	    <field name="wiz_name">optical_equipment_maintenance.assing_agended</field>
+	<record model="ir.model.button" id="reassing_agended_button">
+	    <field name="name">reassing_agended</field>
+	    <field name="string">Reassing Agended</field>
+	    <field name="model" search="[('model', '=', 'optical_equipment_maintenance.service')]"/>
 	</record>
-	<record model="ir.ui.view" id="reassing_agended_view_form">
-	    <field name="model">optical_equipment_maintenance.reagended</field>
-	    <field name="type">form</field>
-	    <field name="name">reassing_agended_form</field>
+	<record model="ir.model.button" id="maintenance_service_draft_button">
+	    <field name="name">draft</field>
+	    <field name="string">Draft</field>
+	    <field name="model" search="[('model', '=', 'optical_equipment_maintenance.service')]"/>
 	</record>
-	<record model="ir.action.wizard" id="act_reassing_agended">
-	    <field name="name">ReAssing Agended</field>
-	    <field name="wiz_name">optical_equipment_maintenance.reassing_agended</field>
+	<record model="ir.model.button" id="maintenance_service_in_progress_button">
+	    <field name="name">in_progress</field>
+	    <field name="string">In progress</field>
+	    <field name="model" search="[('model', '=', 'optical_equipment_maintenance.service')]"/>
 	</record>
-	<record model="ir.ui.view" id="create_contract_view_form">
-	    <field name="model">optical_equipment_create.contract</field>
-	    <field name="type">form</field>
-	    <field name="name">create_contract_form</field>
+	<record model="ir.model.button" id="maintenance_service_finished_button">
+	    <field name="name">finished</field>
+	    <field name="string">Finished</field>
+	    <field name="model" search="[('model', '=', 'optical_equipment_maintenance.service')]"/>
 	</record>
-	<record model="ir.action.wizard" id="maintenance_create_contract">
-	    <field name="name">Create Contract</field>
-	    <field name="wiz_name">optical_equipment.maintenance.contract</field>
-	    <field name="model">optical_equipment_maintenance.service</field>
+	<record model="ir.model.button" id="maintenance_finished_button">
+	    <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.action.keyword" id="maintenance_create_contract_keyword">
-	    <field name="keyword">form_action</field>
-	    <field name="model">optical_equipment_maintenance.service,-1</field>
-	    <field name="action" ref="maintenance_create_contract"/>
+	<record model="ir.model.button" id="maintenance_calibrate_button">
+	    <field name="name">calibrate</field>
+	    <field name="string">Calibrate</field>
+	    <field name="model" search="[('model', '=', 'optical_equipment.maintenance')]"/>
 	</record>
-	<record model="ir.action.report" id="report_calibration">
-            <field name="name">Calibration</field>
-            <field name="model">optical_equipment.maintenance</field>
-            <field name="report_name">optical_equipment.maintenance</field>
-            <field name="report">optical_equipment/report/Calibration.fodt</field>
+	<record model="ir.action.report" id="report_service">
+            <field name="name">Service</field>
+            <field name="model">optical_equipment_maintenance.service</field>
+            <field name="report_name">optical_equipment_maintenance.service</field>
+            <field name="report">optical_equipment/report/Service.fodt</field>
             <field name="single" eval="True"/>
         </record>
-	<record model="ir.action.keyword" id="report_calibration_keyword">
+	<record model="ir.action.keyword" id="report_service_keyword">
             <field name="keyword">form_print</field>
-            <field name="model">optical_equipment.maintenance,-1</field>
-            <field name="action" ref="report_calibration"/>
-    	</record>
+            <field name="model">optical_equipment_maintenance.service,-1</field>
+            <field name="action" ref="report_service"/>
+        </record>
+	<record model="ir.action.report" id="report_cvs">
+            <field name="name">Hojas de Vida</field>
+            <field name="model">optical_equipment_maintenance.service</field>
+            <field name="report_name">optical_equipment_maintenance.service</field>
+            <field name="report">optical_equipment/report/CVS_Equipments.fodt</field>
+            <field name="single" eval="True"/>
+        </record>
+	<record model="ir.action.keyword" id="report_cvs_keyword">
+            <field name="keyword">form_print</field>
+            <field name="model">optical_equipment_maintenance.service,-1</field>
+            <field name="action" ref="report_cvs"/>
+        </record>
 	<record model="ir.action.report" id="report_maintenance_service">
             <field name="name">Maintenance Service</field>
             <field name="model">optical_equipment.maintenance</field>
@@ -270,6 +247,18 @@
             <field name="model">optical_equipment_maintenance.service,-1</field>
             <field name="action" ref="report_maintenance_timeline"/>
         </record>
+	<record model="ir.action.report" id="report_historys_maintenances">
+            <field name="name">Maintenances Historys</field>
+            <field name="model">optical_equipment_maintenance.service</field>
+            <field name="report_name">optical_equipment_maintenance.service</field>
+            <field name="report">optical_equipment/report/Maintenances_Historys.fodt</field>
+            <field name="single" eval="True"/>
+        </record>
+	<record model="ir.action.keyword" id="report_historys_maintenances_keyword">
+            <field name="keyword">form_print</field>
+            <field name="model">optical_equipment_maintenance.service,-1</field>
+            <field name="action" ref="report_historys_maintenances"/>
+        </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>
@@ -288,13 +277,5 @@
 		  action="act_maintenance_form"
 		  sequence="30"
 		  id="menu_maintenance_form"/>
-	<menuitem parent="menu_diary"
-		  action="act_assing_agended"
-		  sequence="30"
-		  id="menu_assing_agended_form"/>
-	<menuitem parent="menu_diary"
-		  action="act_reassing_agended"
-		  sequence="40"
-		  id="menu_reassing_agended_form"/>
     </data>
 </tryton>

message.xml

@@ -1,16 +0,0 @@
-<?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. -->
-<tryton>
-    <data grouped="1">
-	<record model="ir.message" id="msg_invalid_number_purchases">
-            <field name="text">Please, select only one purchase.</field>
-        </record>
-	<record model="ir.message" id="msg_serial_unique">
-            <field name="text">The serial number of equipment, should be unique.</field>
-        </record>
-	<record model="ir.message" id="msg_not_sequence_equipment">
-            <field name="text">You do not have a sequence assigned for equipments</field>
-        </record>
-    </data>
-</tryton>

move.py

@@ -12,13 +12,19 @@ class Move(metaclass=PoolMeta):
     "Stock Move"
     __name__ = "stock.move"
 
+
+    return_equipment = fields.Boolean("Devolución", states={'invisible': If(~Eval('product_equipment'), True),
+                                                            'readonly': (Eval('state').in_(['cancelled', 'done'])),}
+                                      )
     equipment = fields.Many2One('optical_equipment.equipment', "Equipment",
-                                domain=[('state', '=', 'registred'),
+                                domain=[If(Eval('return_equipment', True),
+                                           ('state', 'in', ['uncontrated','contrated']),
+                                           ('state', '=', 'registred')),
                                         ('product','=', Eval('product'))
                                         ],
                                 states={'invisible': If(~Eval('product_equipment'), True),
                                         'readonly': (Eval('state').in_(['cancelled', 'done'])),},
-                                depends=['product_equipment'])
+                                depends=['product_equipment', 'move_type'])
     equipment_serial = fields.Function(fields.Char('Serial',
                                                    states={'readonly': True,
                                                            'invisible': If(~Eval('product_equipment'), True)},
@@ -26,6 +32,10 @@ class Move(metaclass=PoolMeta):
                                        'get_equipment_serial')
     product_equipment = fields.Function(fields.Boolean("It Equipment"),'get_product_equipment')
 
+    @classmethod
+    def __setup__(cls):
+        super(Move, cls).__setup__()
+        cls.origin.states['required']=False
                 
     @fields.depends('product')
     def get_product_equipment(self, product):
@@ -88,7 +98,7 @@ class ShipmentOut(metaclass=PoolMeta):
         pool = Pool()
         Move = pool.get('stock.move')
         Date = pool.get('ir.date')
-
+        Locations = pool.get('stock.location')
         Equipments = pool.get('optical_equipment.equipment')
         for shipment in shipments:
             for move in shipment.inventory_moves:
@@ -99,11 +109,12 @@ class ShipmentOut(metaclass=PoolMeta):
                     equipment = Equipments.search(['id', '=',Id])[0]
                     equipment.propietary = shipment.customer.id
                     equipment.propietary_address= shipment.delivery_address.id
+                    equipment.location = Locations.search(['name', '=', 'Cliente'])[0].id
                     equipment.state="uncontrated"
                     equipment.shipment_destination = shipment
                     equipment.sale_destination = shipment.outgoing_moves[count].origin
                     equipment.propietarys += (shipment.customer,)
-                    equipment.maintenance_frequency = "6" if shipment.customer.client_type == "ips" else "12"
+                    equipment.maintenance_frequency = "6" if shipment.customer.customer_type == "ips" else "12"
                     count+=1
                     equipment.save()
                 else:
@@ -133,34 +144,45 @@ class ShipmentOut(metaclass=PoolMeta):
         Equipments = pool.get('optical_equipment.equipment')
 
         for shipment in shipments:
-            sale_origin = shipment.outgoing_moves[0].origin.sale.id
-            saleLine = SaleLine(
-                type='line',
-                quantity=1,
-                unit_price=0,
-                sale=sale_origin)
-            saleLine.save()
-            maintenanceService = MaintenanceService(
-                sale_date=shipment.outgoing_moves[0].origin.sale.sale_date,
-                sale_origin=saleLine,
-                maintenance_type='initial',
-                propietary=shipment.customer.id,
-                propietary_address=shipment.delivery_address.id,
-                state='draft')
-            maintenanceService.save()
-            
             serial = False
+            number_equipments = 0
+            maintenance_required = 0
             for move in shipment.inventory_moves:
                 if move.product_equipment and move.equipment:
                     serial = True
+                    number_equipments +=1
+                    if move.equipment.product.maintenance_required:
+                        maintenance_required +=1
                 elif not move.product_equipment:
                     serial = True
                 else:
                     serial = False
                     
+            if number_equipments < 1 or maintenance_required < 1:
+                shipment.service_maintenance_initial = True
+                shipment.save()
+                #raise UserError(str("No se generó un mantenimiento inicial dado que los equipos no requiren mantenimiento, ó no se encontró ningún producto de tipo equipo en este envío."))
+                break
+            
+            sale_origin = shipment.outgoing_moves[0].origin.sale
+            maintenanceService = MaintenanceService.search(['sale_origin', '=', sale_origin])
+            if maintenanceService == []:
+                maintenanceService = MaintenanceService(
+                    sale_date=shipment.outgoing_moves[0].origin.sale.sale_date,
+                    sale_origin=shipment.outgoing_moves[0].origin.sale,
+                    maintenance_type='initial',
+                    propietary=shipment.customer.id,
+                    propietary_address=shipment.delivery_address.id,
+                    state='draft')
+                maintenanceService.save()
+            else:
+                maintenanceService = maintenanceService[0]
+                maintenanceService.state = 'draft'
+                maintenanceService.save()
+
             if serial == True:
                 for move in shipment.inventory_moves:
-                    if move.product_equipment and move.equipment:
+                    if move.product_equipment and move.equipment and move.equipment.product.template.maintenance_required:
                         maintenance = Maintenance(
                             service_maintenance=maintenanceService.id,
                             maintenance_type='initial',
@@ -218,7 +240,36 @@ class ShipmentOutReturn(metaclass=PoolMeta):
     service_maintenance_initial = fields.Boolean('Maintenance Initial', states={'readonly': True})
     sale_type = fields.Char('Type sale origin')
 
+    @classmethod
+    @ModelView.button
+    @Workflow.transition('received')
+    @set_employee('received_by')
+    def receive(cls, shipments):
+        Move = Pool().get('stock.move')
+        Equipments = Pool().get('optical_equipment.equipment')
+        Locations = Pool().get('stock.location')
+        Move.do([m for s in shipments for m in s.incoming_moves])
+        for s in shipments:
+            for m in s.incoming_moves:
+               if m.equipment:
+                   equipment  = m.equipment
+                   Id = equipment.id
+                   equipment = Equipments.search(['id', '=',Id])[0]
+                   equipment.propietary = s.company.party.id
+                   equipment.propietary_address= s.company.party.addresses[0].id
+                   equipment.location = m.to_location.id
+                   equipment.state="registred"
+                   equipment.save()
             
+        cls.create_inventory_moves(shipments)
+        # Set received state to allow done transition
+        cls.write(shipments, {'state': 'received'})
+        to_do = [s for s in shipments
+            if s.warehouse_storage == s.warehouse_input]
+
+        
+        if to_do:
+            cls.done(to_do)
 class PickingListDeliveryReport(CompanyReport):
     __name__ = 'stock.shipment.out.picking_list1'
 
@@ -236,6 +287,7 @@ class PickingListDeliveryReport(CompanyReport):
 
         return context
 
+    
 class CapacitationReport(CompanyReport):
     __name__ = 'stock.shipment.out.capacitation_note'
 

party.py

@@ -1,12 +1,25 @@
+# This file is part of Tryton.  The COPYRIGHT file at the top level of
+# this repository contains the full copyright notices and license terms.
+
 from trytond.pool import PoolMeta
 from trytond.model import ModelSQL, ModelView, fields
-from . import equipment
+from trytond.pyson import Eval, If
 
-_CLIENT_TYPE = [('ips', 'IPS'),
+#from . import equipment
+
+_CUSTOMER_TYPE = [('ips', 'IPS'),
                 ('optica', 'Optica'),
                 ('otro', 'Otro')]
 
 class Party(metaclass=PoolMeta):
     __name__ = 'party.party'
 
-    client_type = fields.Selection(_CLIENT_TYPE, 'Client type')
+    customer_type = fields.Selection(_CUSTOMER_TYPE, "Customer Type")
+
+    
+class Address(metaclass=PoolMeta):
+    __name__ = 'party.address'
+
+    campus = fields.Boolean("Campus")
+    party_related = fields.Many2One('party.party', "Party Related",
+                                    states ={ 'invisible': (~Eval("campus"))})

party.xml

@@ -2,14 +2,25 @@
 <!-- This 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="party_view_form">
-            <field name="model">party.party</field>
-            <field name="inherit" ref="party.party_view_form"/>
-            <field name="name">party_form</field>
-    </record>
     <record model="ir.ui.view" id="party_view_tree">
             <field name="model">party.party</field>
             <field name="inherit" ref="party.party_view_tree"/>
             <field name="name">party_tree</field>
     </record>
+    <record model="ir.ui.view" id="party_view_form">
+            <field name="model">party.party</field>
+            <field name="inherit" ref="party.party_view_form"/>
+            <field name="name">party_form</field>
+    </record>
+    <!-- Party Address -->
+    <record model="ir.ui.view" id="address_view_tree">
+	<field name="model">party.address</field>
+	<field name="inherit" ref="party.address_view_tree"/>
+        <field name="name">address_tree</field>
+    </record>
+    <record model="ir.ui.view" id="address_view_form">
+            <field name="model">party.address</field>
+            <field name="inherit" ref="party.address_view_form"/>
+            <field name="name">address_form</field>
+    </record>
 </tryton>

product.py

@@ -4,13 +4,12 @@ from trytond.pool  import Pool, PoolMeta
 from trytond.model import (
     ModelView, ModelSQL, fields, Exclude)
 from trytond.pyson import Bool, If, Eval, Id
-from trytond.exceptions import UserError
 
 
 _RISK = [('n/a', "No aplíca"),
-         ('I', 'I'),
-         ('IIA', 'IIA'),
-         ('IIB', 'IIB')]
+         ('uno', 'I'),
+         ('dosA', 'IIA'),
+         ('dosB', 'IIB')]
 
 _USE = [('', ""),
         ('medico', 'Médico'),
@@ -24,7 +23,7 @@ _BIOMEDICAL_CLASS = [
 
 _MAIN_TECNOLOGY = [
     ('', ""),
-    ('mecanico', 'Mecánico'),
+   ('mecanico', 'Mecánico'),
     ('electrico', 'Electrico'),
     ('electronico', 'Electrónico'),
     ('hidraulico', 'Hidraulico'),
@@ -34,12 +33,11 @@ _EQUIPMENT_TYPE = [
     ('', ""),
     ('mobiliario_optico', 'Mobiliario óptico'),
     ('refraccion', 'Refracción'),
-    ('medicion', 'Medicion'),
+    ('medico', 'Medicion'),
     ('accesorios', 'Accesorios')]
 
 NON_MEASURABLE = ['service']
 
-
 class Template(metaclass=PoolMeta):
     'Template'
     __name__ = 'product.template'
@@ -48,60 +46,52 @@ class Template(metaclass=PoolMeta):
                               ondelete='CASCADE', select=True)
     equipment = fields.Boolean('It is equipment',
                                states={'invisible': Eval('type', 'goods') != 'goods',
-                                       },depends=['type']
-                               )
+                                       })
     maintenance_activity = fields.Boolean('Maintenance Activity',
                                states={'invisible': Eval('type', 'service') != 'service',
                                        'readonly': If(Eval('equipment',True), True)
                                        | If(Eval('replacement',True), True)
-                                       },depends=['type']
-                                          )
+                                       })
     replacement = fields.Boolean('Replacement',
                                states={'invisible': Eval('type', 'goods') != 'goods',
                                        'readonly': If(Eval('equipment',True), True)
                                        | If(Eval('maintenance_activity',True), True)
-                                       },depends=['type']
-                                 )
+                                       })
+
+    maintenance_required = fields.Boolean('Miantenance Required',
+                               states={'invisible': (Eval('type', 'goods') != 'goods')})
     equipment_type = fields.Selection(_EQUIPMENT_TYPE, 'Equipment type',
-                                      states={'required': Eval('equipment', False)},
-                                      depends=['equipment']
-                                      )
+                                      states={'required': Eval('equipment', False)})
     risk = fields.Selection(_RISK, 'Type risk')
     use  = fields.Selection(_USE, 'Use',
                             states={'required': Eval('equipment', False)},
-                            depends=['equipment']
-                            )
+                            depends={'equipment'})
     biomedical_class = fields.Selection(_BIOMEDICAL_CLASS,'Biomedical Class',
-                                        states={'required': Eval('equipment', False)},
-                                        depends=['equipment']
-                                        )
+                                        states={'required': Eval('equipment', False)})
     main_tecnology = fields.Selection(_MAIN_TECNOLOGY,'Main tecnology',
-                            states={'required': Eval('equipment', False)},
-                            depends=['equipment']
-                                      )
+                            states={'required': Eval('equipment', False)})
     calibration = fields.Boolean("Apply calibration")
     observation = fields.Text('Observation')
+
+    # Mark, Category, Reference
     mark_category = fields.Many2One('product.category', 'Mark',
                                     domain=[('parent', '=', None),
                                             ('accounting', '=', False)],
-                                    states={'required': Eval('equipment', False)},
-                                    depends=['equipment']
-                                    )
+                                    states={'required': Eval('equipment', False)})
     model_category  = fields.Many2One('product.category', "Model",
                                       domain=[('parent', '=', Eval('mark_category')),
                                               ('accounting', '=', False)],
-                                      states={'required': Eval('equipment', False)},
-                                      depends=['equipment']
-                                      )
+                                      states={'required': Eval('equipment', False)})
     reference_category = fields.Many2One('product.category', "Reference",
-                                         domain=[('parent', '=', Eval('model_category'))],
-                                        )
+                                         domain=[('parent', '=', Eval('model_category'))],)
+    
+    # Iformation Equipment
     origin_country = fields.Many2One('country.country',"Origin Country")
     refurbish = fields.Boolean('Refurbish')
     software_required = fields.Boolean("Software Required")
     software_version = fields.Char("Software version",
                                    states={'invisible': If(~Eval('software_required'), True)},
-                                   depends=['software_required'])
+                                   depends={'software_required'})
 
     #These are measurements required for the equipments, are in this place
     # for manage of class 'product.template'
@@ -110,21 +100,17 @@ class Template(metaclass=PoolMeta):
     temperature_max = fields.Float("Temp Max")
     temperature_uom = fields.Many2One('product.uom', 'Temperature UOM',
                     domain=[('category', '=', Id('optical_equipment', "uom_cat_temperature"))],
-                    states={'invisible' : If(Eval('temperature_min') == None, True)},
-                    depends=['itemperature_min']
-                                      )
+                    states={'invisible' : If(Eval('temperature_min') == None, True)})
     frequency = fields.Float("Frequency")
     frequency_uom = fields.Many2One('product.uom', "Frequency UOM",
                     domain=[('category', '=', Id('optical_equipment', 'uom_cat_frequency'))],
-                    states={'invisible' : If(Eval('frequency') == None, True)},
-                    depends=['frequency']
+                    states={'invisible' : If(Eval('frequency') == None, True)}
                                     )
     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'))],
                     states={'invisible' : If(Eval('moisture_min') == None, True)},
-                    depends=['moisture_min']
                               )
     electrical_equipment = fields.Boolean("Electrical Equipment")
     frequency = fields.Float("Frequency",
@@ -133,7 +119,6 @@ class Template(metaclass=PoolMeta):
                     domain=[('category', '=', Id('optical_equipment', 'uom_cat_frequency'))],
                     states={'invisible' : If(Eval('frequency') == None, True) |
                             ~Eval('electrical_equipment', True)},
-                    depends=['frequency']
                                     )
     voltageAC = fields.Float("Voltage AC",
                              states={'invisible': ~Bool(Eval('electrical_equipment'))})
@@ -141,30 +126,23 @@ class Template(metaclass=PoolMeta):
                     domain=[('category', '=', Id('optical_equipment', 'uom_cat_electrical_tension'))],
                     states={'invisible' : If(Eval('voltageAC') == None, True) |
                             ~Eval('electrical_equipment', True)},
-                    depends=['voltageAC']
                                     )
     voltageDC = fields.Float("Voltage DC",
                              states={'invisible': ~Bool(Eval('electrical_equipment'))})
     voltageDC_uom = fields.Many2One('product.uom', "Voltage DC UOM",
                     domain=[('category', '=', Id('optical_equipment', 'uom_cat_electrical_tension'))],
                     states={'invisible' : If(Eval('voltageDC') == None, True) |
-                            ~Eval('electrical_equipment', True)},
-                    depends=['voltageDC'])
+                            ~Eval('electrical_equipment', True)},)
     
     useful_life = fields.Integer("Useful life")
     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)})
+    use_pattern = fields.Many2One('optical_equipment.use_pattern', "Use Pattern", ondelete='RESTRICT',
+                                   states={'required': Eval('calibration', True)})
     measuring_range = fields.Selection([
-        ('No Aplíca', ""),
         ('dioptria', "Dioptria"),
-        ('mmhg', "mmHg")], "Rango de Medición", states={'required': Eval('calibration', True)})
+        ('mmhg', "mmHg")], "Rango de Medición")
     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")
@@ -175,17 +153,13 @@ class Template(metaclass=PoolMeta):
     resolution_type = fields.Selection([('',""),
                                     ('analoga', "Analoga"),
                                     ('digital', "Digital")], "Resolution Type",
-                                   states={'required': Eval('calibration', False)},
-                                   depends=['calibration'])
+                                   states={'required': Eval('calibration', False)},)
     d_resolution = fields.Float("Resolution d",
-                                states={'invisible': If(Eval('resolution_type') != 'digital', True)},
-                                depends=['resolution_type'])
+                                states={'invisible': If(Eval('resolution_type') != 'digital', True)},)
     analog_resolution = fields.Float("Analog resolution",
-                                states={'invisible': If(Eval('resolution_type') != 'analoga', True),},
-                                depends=['resolution_type'])
+                                states={'invisible': If(Eval('resolution_type') != 'analoga', True),},)
     a_factor_resolution = fields.Float("(a) Resolution",
-                                states={'invisible': If(Eval('resolution_type') != 'analoga', True)},
-                                depends=['resolution_type'])
+                                states={'invisible': If(Eval('resolution_type') != 'analoga', True)},)
     Usubi = fields.Integer("Usub i",states={'required': Eval('calibration', False)},)
 
     #maintenance activities
@@ -197,15 +171,16 @@ class Template(metaclass=PoolMeta):
     optical = fields.Boolean("Optical")
     check_calibration = fields.Boolean("Verificar Calibración")
     
-
     @classmethod
     def view_attributes(cls):
         return super(Template, cls).view_attributes() + [
             ('//page[@id="features"]', 'states', {
-                'invisible': ~Eval('equipment'),
-                    }),
+                'invisible': ~Eval('equipment'),}),
             ('//page[@id="calibration"]', 'states', {
-                    'invisible': ~Eval('calibration')},)
+                    'invisible': ~Eval('calibration')},),
+            ('//page[@id="maintenance_activities"]', 'states', {
+                    'invisible': ~Eval('maintenance_required')},)
+
              ]
 
     @classmethod
@@ -223,72 +198,91 @@ class Template(metaclass=PoolMeta):
     def default_temperature_max(self):
         return 0
 
+    @classmethod
+    def default_frequency(cls):
+        return 0
+
+    @classmethod
+    def default_moisture_min(cls):
+        return 0
+
+    @classmethod
+    def default_moisture_max(cls):
+        return 0
+
+    @classmethod
+    def default_voltageDC(cls):
+        return 0
+
+    @classmethod
+    def default_voltageAC(cls):        
+        return 0
+
+    def default_risk():
+        return 'n/a'
+
+    def default_use():
+        return None
+
+    def default_biomedical_class():
+        return 'n/a'
+
+
+    def default_main_tecnology():
+        return None
+
+
+    def default_calibration():
+        return False
+
+
+    def default_refurbish():
+        return False
+
+
+    def default_refurbish():
+        return False
+
     @classmethod
     @fields.depends('temperature')
     def default_temperature_uom(self):
         pool = Pool()
-        measurement = None
         Measurements = pool.get('product.uom')
-        if Measurements.search(['name', '=', 'Celsius']) != []:
-            measurement = Measurements.search(['name', '=', 'Celsius'])[0].id
+        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
-
-    @staticmethod
-    def default_frequency():
-        return 0
-
-    @staticmethod
-    def default_frequency_uom():
+    @classmethod
+    def default_frequency_uom(cls):
         pool = Pool()
         Measurements = pool.get('product.uom')
         measurement = Measurements.search(['name', '=', 'Hertz'])[0].id
         
         return measurement
 
-    @staticmethod
-    def default_moisture_min():
-        return 0
-
-    @staticmethod
-    def default_moisture_max():
-        return 0
-
-    @staticmethod
-    def default_voltageAC_uom():
+    @classmethod
+    def default_moisture_uom(cls):
         pool = Pool()
-        measurement = None
         Measurements = pool.get('product.uom')
-        if Measurements.search(['name', '=', 'Volt']) != []:
-            measurement = Measurements.search(['name', '=', 'Volt'])[0].id
+        measurement = Measurements.search(['name', '=', 'Relative Humedity'])[0].id
         
         return measurement
 
-    @staticmethod
-    def default_voltageAC():        
-        return 0
-
-    @staticmethod
-    def default_voltageAC_uom():
+    @classmethod
+    def default_voltageAC_uom(cls):
         pool = Pool()
         Measurements = pool.get('product.uom')
         measurement = Measurements.search(['name', '=', 'Volt'])[0].id
         
         return measurement
 
-    @staticmethod
-    def default_voltageDC():
-        return 0
+    @classmethod
+    def default_voltageDC_uom(cls):
+        pool = Pool()
+        Measurements = pool.get('product.uom')
+        measurement = Measurements.search(['name', '=', 'Volt'])[0].id
+        
+        return measurement
 
     @fields.depends('voltageDC', 'voltageDC_uom')
     def on_change_voltageDC_uom(self):
@@ -297,36 +291,6 @@ class Template(metaclass=PoolMeta):
         measurement = Measurements.search(['name', '=', 'Volt'])[0].id
         self.voltageDC_uom = measurement
 
-
-    @staticmethod
-    def default_risk():
-        return 'n/a'
-
-    @staticmethod
-    def default_use():
-        return None
-
-    @staticmethod
-    def default_biomedical_class():
-        return 'n/a'
-
-    @staticmethod
-    def default_main_tecnology():
-        return None
-
-    @staticmethod
-    def default_calibration():
-        return False
-
-    @staticmethod
-    def default_use_pattern():
-        return ''
-
-    @staticmethod
-    def default_refurbish():
-        return False
-
-
     @fields.depends('software_required', 'software_version')
     def on_change_with_sotfware_required(self):
         self.software_version = None
@@ -337,13 +301,21 @@ class Template(metaclass=PoolMeta):
         self.analog_resolution = None
         self.a_factor_resolution = None
             
-            
     @fields.depends('equipment', 'replacement')
     def on_change_equipment(self):
         if self.equipment:
             self.replacement=False
             self.maintenance_activity=False
             self.calibration=False
+            self.mark_category = None
+            self.model_category = None
+            self.reference_category = None
+            self.equipment_type = None
+            self.risk = 'n/a'
+            self.biomedical_class = 'n/a'
+            self.use = ''
+            self.useful_life = 0
+            self.warranty = 0
        
     @fields.depends('mark_category', 'model_category', 'reference_category')
     def on_change_mark_category(self):
@@ -394,6 +366,10 @@ class Product(metaclass=PoolMeta):
 class Image(metaclass=PoolMeta):
     __name__ = 'product.image'
 
+    @classmethod
+    def __setup__(cls):
+        super().__setup__()
+        
     @classmethod
     def copy(cls, images, default=None):
         if default is None:
@@ -405,6 +381,12 @@ class Image(metaclass=PoolMeta):
         return super().copy(images, default=default)
 
 
+class UsePattern(ModelSQL,ModelView):
+    "Use Pattern"
+    __name__ = 'optical_equipment.use_pattern'
+    _rec_name = 'name_pattern'
+    
+    name_pattern = fields.Char('Name Pattern', required=True)
     
 class Pattern(ModelSQL, ModelView):
     "Pattern K of equipment"
@@ -413,4 +395,3 @@ class Pattern(ModelSQL, ModelView):
     
     product = fields.Many2One('product.template', "Template", ondelete='CASCADE')
     pattern = fields.Float("Value Pattern")
-

product.xml

@@ -3,6 +3,43 @@
      this repository contains the full copyright notices and license terms. -->
 <tryton>
     <data>
+	<record model="ir.action.act_window" id="act_use_pattern">
+	    <field name="name">Use Pattern</field>
+	    <field name="res_model">optical_equipment.use_pattern</field>
+	</record>
+	<record model="ir.ui.view" id="use_pattern_view_tree">
+            <field name="model">optical_equipment.use_pattern</field>
+	    <field name="type">tree</field>
+            <field name="name">use_pattern_tree</field>
+        </record>
+	<record model="ir.ui.view" id="use_pattern_view_form">
+            <field name="model">optical_equipment.use_pattern</field>
+	    <field name="type">form</field>
+            <field name="name">use_pattern_form</field>
+        </record>
+	<record model="ir.action.act_window.view" id="act_use_pattern_view1">
+            <field name="sequence" eval="10"/>
+	    <field name="view" ref="use_pattern_view_tree"/>
+            <field name="act_window" ref="act_use_pattern"/>
+	</record>
+	<record model="ir.action.act_window.view" id="act_use_pattern_view2">
+            <field name="sequence" eval="20"/>
+	    <field name="view" ref="use_pattern_view_form"/>
+            <field name="act_window" ref="act_use_pattern"/>
+	</record>
+	<menuitem
+            name="Properties of Equipments"
+            parent="product.menu_configuration"
+            sequence="10"
+            id="menu_properties_equipments"
+            icon="tryton-settings"/>
+	<menuitem
+	    parent="menu_properties_equipments"
+            name="Pattern Use"
+	    action="act_use_pattern"
+            sequence="10"
+            id="menu_pattern"
+            icon="tryton-list"/>
 	<record model="ir.ui.view" id="template_view_form1">
 	    <field name="model">product.template</field>
 	    <field name="inherit" ref="product.template_view_form"/>
@@ -23,5 +60,19 @@
 	    <field name="type">tree</field>
             <field name="name">pattern_tree</field>
         </record>
+
+	<!--Patterns use-->
+	<record model="optical_equipment.use_pattern" id="schematic_eye">
+            <field name="name_pattern">Schematic Eye</field>
+        </record>
+	<record model="optical_equipment.use_pattern" id="trial_lens">
+            <field name="name_pattern">Trial Lens</field>
+        </record>
+	<record model="optical_equipment.use_pattern" id="calibration_weights">
+            <field name="name_pattern">Calibration Weights</field>
+        </record>
+	<record model="optical_equipment.use_pattern" id="calibration_spheres">
+            <field name="name_pattern">Calibration Spheres</field>
+        </record>
     </data>
 </tryton>

purchase.py

@@ -7,13 +7,11 @@ from trytond.modules.product import price_digits, round_price
 from trytond.pyson import Eval, If, Bool
 from trytond.exceptions import UserError
 from trytond.i18n import gettext
-from .exceptions import (
-    InvalidNumberPurchases)
-
 from trytond.transaction import Transaction
 
 
 class Purchase(metaclass=PoolMeta):
+    "Purchase Equipment" 
     __name__ = 'purchase.purchase'
 
     equipment_create = fields.Boolean("Equipments Creates", readonly=True)
@@ -24,9 +22,8 @@ class Purchase(metaclass=PoolMeta):
         cls._buttons.update({
             'create_equipments': {
                 'invisible':  If(Eval('invoice_state') == 'none', True) |
-                              If(Bool(Eval('equipment_create')), True),
-                'depends': ['invoice_state'],}   
-        })
+                If(Bool(Eval('equipment_create')), True),
+                'depends': ['invoice_state'],}})
 
     @classmethod
     def copy(cls, purchases, default=None):
@@ -91,18 +88,17 @@ class Purchase(metaclass=PoolMeta):
             purchase.equipment_create = True
             cls.save(purchases)
         else:
-            raise InvalidNumberPurchases(
-                gettext('purchase.msg_invalid_number_purchases'))
+            raise UserError(str("Número de Compras Invalido."))
 
             
 class Line(metaclass=PoolMeta):
+    "Purchase Line Equipment"
     __name__ = 'purchase.line'
 
-    origin_country = origin_country = fields.Many2One('country.country',"Origin Country")
+    origin_country = fields.Many2One('country.country',"Origin Country")
     address_equipment = fields.Many2One('party.address', "Direccion", required=True)
     serial_equipment = fields.Char("Serial", size=None,
-                                   states={'invisible': If(Eval('quantity') > 1, True),
-                                           },depends=['quantity'])
+                                   states={'invisible': If(Eval('quantity') > 1, True)})
     refurbish = fields.Boolean("Refurbish")
     product_equipment = fields.Boolean("Product Equipment",
                                        states={'readonly': True})
@@ -117,6 +113,7 @@ class Line(metaclass=PoolMeta):
         company = Transaction().context.get('company')
         if company:
             company = Company(company)
+            
             return company.party.addresses[0].id
 
     @fields.depends(
@@ -137,12 +134,11 @@ class Line(metaclass=PoolMeta):
             if self.unit_price:
                 self.unit_price = round_price(self.unit_price)
 
-    @fields.depends('product', 'unit', 'purchase',
-    '_parent_purchase.party', '_parent_purchase.invoice_party',
-                    'product_supplier', 'product_equipment',
-                    'serial_equipment', 'software_version',
-                    'health_register', 'refurbish', methods=['compute_taxes', 'compute_unit_price',
-                                 '_get_product_supplier_pattern'])
+    @fields.depends('product', 'unit', 'purchase', '_parent_purchase.party',
+                    '_parent_purchase.invoice_party', 'product_supplier', 'product_equipment',
+                    'serial_equipment', 'software_version', 'health_register',
+                    'refurbish', methods=['compute_taxes', 'compute_unit_price',
+                                          '_get_product_supplier_pattern'])
     def on_change_product(self):
         if not self.product:
             self.product_equipment = False
@@ -155,7 +151,6 @@ class Line(metaclass=PoolMeta):
             self.unit_price = None
             self.unit = None
 
-
             return
 
         party = None

purchase.xml

@@ -3,31 +3,29 @@
 this repository contains the full copyright notices and license terms. -->
 <tryton>
     <data>
-        <record model="ir.ui.view" id="purchase_line_view_form">
-            <field name="model">purchase.line</field>
-            <field name="inherit" ref="purchase.purchase_line_view_form"/>
-            <field name="name">purchase_line_form</field>
-        </record>
 	<record model="ir.ui.view" id="purchase_view_form">
             <field name="model">purchase.purchase</field>
             <field name="inherit" ref="purchase.purchase_view_form"/>
             <field name="name">purchase_form</field>
         </record>
+	<record model="ir.ui.view" id="purchase_line_view_form">
+            <field name="model">purchase.line</field>
+            <field name="inherit" ref="purchase.purchase_line_view_form"/>
+            <field name="name">purchase_line_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>
 	    <field name="model" search="[('model', '=', 'purchase.purchase')]"/>
 	</record>
+	<record model="ir.action.report" id="purchase.report_purchase">
+            <field name="active" eval="False"/>
+        </record>
 	<record model="ir.action.report" id="report_purchase">
             <field name="name">Purchase</field>
             <field name="model">purchase.purchase</field>

report/Contract.fodt

@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <office:document xmlns:css3t="http://www.w3.org/TR/css3-text/" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:drawooo="http://openoffice.org/2010/draw" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:rpt="http://openoffice.org/2005/report" xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:officeooo="http://openoffice.org/2009/office" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" office:version="1.3" office:mimetype="application/vnd.oasis.opendocument.text">
- <office:meta><meta:creation-date>2022-09-12T08:15:04.977101930</meta:creation-date><dc:date>2023-03-21T00:34:58.420306768</dc:date><meta:editing-duration>PT3H6M47S</meta:editing-duration><meta:editing-cycles>42</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="5" meta:image-count="2" meta:object-count="0" meta:page-count="3" meta:paragraph-count="93" meta:word-count="1514" meta:character-count="10527" meta:non-whitespace-character-count="9014"/></office:meta>
+ <office:meta><meta:creation-date>2022-09-12T08:15:04.977101930</meta:creation-date><dc:date>2023-06-05T14:19:19.427278694</dc:date><meta:editing-duration>PT3H9M36S</meta:editing-duration><meta:editing-cycles>44</meta:editing-cycles><meta:generator>LibreOffice/7.4.6.2$Linux_X86_64 LibreOffice_project/40$Build-2</meta:generator><meta:document-statistic meta:table-count="5" meta:image-count="2" meta:object-count="0" meta:page-count="3" meta:paragraph-count="93" meta:word-count="1514" meta:character-count="10522" meta:non-whitespace-character-count="9009"/></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">68792</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">30628</config:config-item>
-   <config:config-item config:name="ViewAreaHeight" config:type="long">13727</config:config-item>
+   <config:config-item config:name="ViewAreaWidth" config:type="long">14406</config:config-item>
+   <config:config-item config:name="ViewAreaHeight" config:type="long">13594</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">19974</config:config-item>
-     <config:config-item config:name="ViewTop" config:type="long">7486</config:config-item>
+     <config:config-item config:name="ViewLeft" config:type="long">2598</config:config-item>
+     <config:config-item config:name="ViewTop" config:type="long">75874</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="VisibleRight" config:type="long">30626</config:config-item>
-     <config:config-item config:name="VisibleBottom" config:type="long">13725</config:config-item>
+     <config:config-item config:name="VisibleTop" config:type="long">68792</config:config-item>
+     <config:config-item config:name="VisibleRight" config:type="long">14404</config:config-item>
+     <config:config-item config:name="VisibleBottom" config:type="long">82384</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>
@@ -91,7 +91,7 @@
    <config:config-item config:name="ChartAutoUpdate" config:type="boolean">true</config:config-item>
    <config:config-item config:name="PrinterSetup" config:type="base64Binary"/>
    <config:config-item config:name="AddParaTableSpacingAtStart" config:type="boolean">true</config:config-item>
-   <config:config-item config:name="Rsid" config:type="int">3903550</config:config-item>
+   <config:config-item config:name="Rsid" config:type="int">4033500</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>
@@ -503,54 +503,55 @@
   </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="Droid Sans Japanese" fo:font-size="7pt" fo:font-style="normal" style:text-underline-style="none" fo:font-weight="normal" officeooo:paragraph-rsid="0032e8b3" 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:text-properties style:font-name="Droid Sans Japanese" fo:font-size="7pt" officeooo:paragraph-rsid="00066dfa" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
   </style:style>
-  <style:style style:name="P12" style:family="paragraph" style:parent-style-name="Header">
-   <style:paragraph-properties fo:text-align="start" style:justify-single-word="false" fo:orphans="0" fo:widows="0"/>
-   <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 Japanese" fo:font-size="7pt" fo:font-style="normal" style:text-underline-style="none" fo:font-weight="normal" officeooo:paragraph-rsid="0032e8b3" 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:style style:name="P12" style:family="paragraph" style:parent-style-name="Footer">
+   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
+   <style:text-properties style:font-name="Droid Sans Japanese" fo:font-size="7pt" officeooo:paragraph-rsid="00066dfa" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
   </style:style>
   <style:style style:name="P13" style:family="paragraph" style:parent-style-name="Header">
-   <style:paragraph-properties fo:margin-left="0in" fo:margin-right="0in" fo:margin-top="0in" fo:margin-bottom="0in" style:contextual-spacing="false" fo:line-height="100%" fo:text-align="start" style:justify-single-word="false" fo:keep-together="auto" fo:orphans="0" fo:widows="0" fo:text-indent="0in" style:auto-text-indent="false" fo:padding="0in" fo:border="none" fo:keep-with-next="auto"/>
-   <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 Japanese" fo:font-size="7pt" fo:font-style="normal" style:text-underline-style="none" fo:font-weight="normal" officeooo:rsid="001fed33" officeooo:paragraph-rsid="0032e8b3" 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:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
+   <style:text-properties style:font-name="Droid Sans Japanese" fo:font-size="7pt" officeooo:paragraph-rsid="0049dca0" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
   </style:style>
-  <style:style style:name="P14" style:family="paragraph" style:parent-style-name="Header">
-   <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-style="normal" style:text-underline-style="none" fo:font-weight="normal" style:font-name-asian="Calibri" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-name-complex="Calibri"/>
+  <style:style style:name="P14" style:family="paragraph" style:parent-style-name="Standard">
+   <style:paragraph-properties fo:margin-left="0in" fo:margin-right="0in" fo:text-align="center" style:justify-single-word="false" 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="0049dca0" 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:text-align="start" style:justify-single-word="false"/>
-   <style:text-properties style:font-name="Droid Sans Japanese" fo:font-size="7pt" fo:font-weight="bold" officeooo:rsid="001b9ac0" officeooo:paragraph-rsid="001dfe2f" style:font-size-asian="7pt" style:font-weight-asian="bold" style:font-name-complex="Arial" style:font-size-complex="7pt" style:font-weight-complex="bold"/>
+   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
+   <style:text-properties style:font-name="Droid Sans Japanese" fo:font-size="7pt" officeooo:paragraph-rsid="001b9ac0" 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:text-align="start" style:justify-single-word="false"/>
-   <style:text-properties style:font-name="Droid Sans Japanese" fo:font-size="7pt" fo:font-weight="bold" officeooo:rsid="001b9ac0" officeooo:paragraph-rsid="00296a83" style:font-size-asian="7pt" style:font-weight-asian="bold" style:font-name-complex="Arial" style:font-size-complex="7pt" style:font-weight-complex="bold"/>
+   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
+   <style:text-properties style:font-name="Droid Sans Japanese" fo:font-size="7pt" officeooo:paragraph-rsid="001dfe2f" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
   </style:style>
   <style:style style:name="P17" 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 Japanese" fo:font-size="7pt" fo:font-weight="bold" officeooo:rsid="001b9ac0" officeooo:paragraph-rsid="002ac0d9" style:font-size-asian="7pt" style:font-weight-asian="bold" style:font-name-complex="Arial" style:font-size-complex="7pt" style:font-weight-complex="bold"/>
-  </style:style>
-  <style:style style:name="P18" 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 Japanese" fo:font-size="7pt" fo:font-weight="bold" officeooo:paragraph-rsid="001b9ac0" style:font-size-asian="7pt" style:font-weight-asian="bold" style:font-name-complex="Arial" style:font-size-complex="7pt" style:font-weight-complex="bold"/>
-  </style:style>
-  <style:style style:name="P19" 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="Droid Sans Japanese" fo:font-size="7pt" fo:font-weight="bold" officeooo:paragraph-rsid="001b9ac0" style:font-size-asian="7pt" style:font-weight-asian="bold" style:font-name-complex="Arial" style:font-size-complex="7pt"/>
-  </style:style>
-  <style:style style:name="P20" style:family="paragraph" style:parent-style-name="Standard">
    <style:paragraph-properties fo:text-align="center" style:justify-single-word="false">
     <style:tab-stops>
      <style:tab-stop style:position="3.6425in"/>
     </style:tab-stops>
    </style:paragraph-properties>
-   <style:text-properties style:font-name="Droid Sans Japanese" fo:font-size="7pt" fo:font-weight="bold" officeooo:paragraph-rsid="001b9ac0" style:font-size-asian="7pt" style:font-weight-asian="bold" style:font-name-complex="Arial" style:font-size-complex="7pt"/>
+   <style:text-properties style:font-name="Droid Sans Japanese" fo:font-size="7pt" officeooo:paragraph-rsid="001b9ac0" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
+  </style:style>
+  <style:style style:name="P18" style:family="paragraph" style:parent-style-name="Standard">
+   <style:paragraph-properties fo:text-align="justify" style:justify-single-word="false" fo:orphans="0" fo:widows="0"/>
+   <style:text-properties style:font-name="Droid Sans Japanese" fo:font-size="7pt" officeooo:paragraph-rsid="001fed33" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
+  </style:style>
+  <style:style style:name="P19" style:family="paragraph" style:parent-style-name="Standard">
+   <style:paragraph-properties fo:text-align="justify" style:justify-single-word="false" fo:orphans="0" fo:widows="0"/>
+   <style:text-properties style:font-name="Droid Sans Japanese" fo:font-size="7pt" officeooo:paragraph-rsid="001b9ac0" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
+  </style:style>
+  <style:style style:name="P20" 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 Japanese" fo:font-size="7pt" officeooo:paragraph-rsid="001b9ac0" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
   </style:style>
   <style:style style:name="P21" style:family="paragraph" style:parent-style-name="Standard">
-   <style:paragraph-properties fo:text-align="start" style:justify-single-word="false" fo:orphans="0" fo:widows="0"/>
-   <style:text-properties style:font-name="Droid Sans Japanese" fo:font-size="7pt" fo:font-weight="bold" officeooo:paragraph-rsid="001b9ac0" style:font-size-asian="7pt" style:font-weight-asian="bold" style:font-name-complex="Arial" style:font-size-complex="7pt"/>
+   <style:paragraph-properties fo:text-align="justify" style:justify-single-word="false"/>
+   <style:text-properties style:font-name="Droid Sans Japanese" fo:font-size="7pt" officeooo:paragraph-rsid="002089d3" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
   </style:style>
   <style:style style:name="P22" 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 Japanese" fo:font-size="7pt" fo:font-weight="bold" officeooo:paragraph-rsid="001b9ac0" style:font-size-asian="7pt" style:font-weight-asian="bold" style:font-name-complex="Arial" style:font-size-complex="7pt"/>
+   <style:text-properties style:font-name="Droid Sans Japanese" fo:font-size="7pt" officeooo:paragraph-rsid="00384e44" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
   </style:style>
   <style:style style:name="P23" style:family="paragraph" style:parent-style-name="Standard">
    <style:paragraph-properties>
@@ -558,7 +559,7 @@
      <style:tab-stop style:position="3.6425in"/>
     </style:tab-stops>
    </style:paragraph-properties>
-   <style:text-properties style:font-name="Droid Sans Japanese" fo:font-size="7pt" fo:font-weight="bold" officeooo:paragraph-rsid="001b9ac0" style:font-size-asian="7pt" style:font-weight-asian="bold" style:font-name-complex="Arial" style:font-size-complex="7pt"/>
+   <style:text-properties style:font-name="Droid Sans Japanese" fo:font-size="7pt" officeooo:paragraph-rsid="001b9ac0" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
   </style:style>
   <style:style style:name="P24" style:family="paragraph" style:parent-style-name="Standard">
    <style:paragraph-properties>
@@ -566,75 +567,75 @@
      <style:tab-stop style:position="3.6425in"/>
     </style:tab-stops>
    </style:paragraph-properties>
-   <style:text-properties style:font-name="Droid Sans Japanese" fo:font-size="7pt" fo:font-weight="bold" officeooo:paragraph-rsid="002844c3" 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="Droid Sans Japanese" fo:font-size="7pt" officeooo:paragraph-rsid="002844c3" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
   </style:style>
   <style:style style:name="P25" style:family="paragraph" style:parent-style-name="Text_20_body">
-   <style:paragraph-properties fo:text-align="start" style:justify-single-word="false">
+   <style:paragraph-properties>
     <style:tab-stops>
      <style:tab-stop style:position="3.6425in"/>
     </style:tab-stops>
    </style:paragraph-properties>
-   <style:text-properties style:font-name="Droid Sans Japanese" fo:font-size="7pt" fo:font-weight="bold" officeooo:rsid="00296a83" officeooo:paragraph-rsid="002ac0d9" 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="Droid Sans Japanese" fo:font-size="7pt" officeooo:paragraph-rsid="002844c3" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
   </style:style>
   <style:style style:name="P26" style:family="paragraph" style:parent-style-name="Table_20_Contents">
    <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
-   <style:text-properties style:font-name="Droid Sans Japanese" fo:font-size="7pt" fo:font-weight="bold" officeooo:rsid="00296a83" officeooo:paragraph-rsid="00296a83" 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="Droid Sans Japanese" fo:font-size="7pt" officeooo:rsid="00296a83" officeooo:paragraph-rsid="00296a83" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
   </style:style>
   <style:style style:name="P27" style:family="paragraph" style:parent-style-name="Standard">
    <style:paragraph-properties fo:text-align="justify" style:justify-single-word="false" fo:orphans="0" fo:widows="0"/>
-   <style:text-properties style:font-name="Droid Sans Japanese" fo:font-size="7pt" fo:font-weight="bold" officeooo:rsid="001b9ac0" officeooo:paragraph-rsid="00383277" fo:background-color="transparent" style:font-size-asian="7pt" style:font-weight-asian="bold" style:font-name-complex="Arial" style:font-size-complex="7pt" style:font-weight-complex="bold"/>
+   <style:text-properties style:font-name="Droid Sans Japanese" fo:font-size="7pt" officeooo:paragraph-rsid="001b9ac0" style:font-size-asian="7pt" style:font-name-complex="Arial" style:font-size-complex="7pt"/>
   </style:style>
   <style:style style:name="P28" 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="Droid Sans Japanese" fo:font-size="7pt" officeooo:paragraph-rsid="001b9ac0" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
+   <style:paragraph-properties fo:text-align="justify" style:justify-single-word="false"/>
+   <style:text-properties style:font-name="Droid Sans Japanese" fo:font-size="7pt" officeooo:paragraph-rsid="001b9ac0" style:font-size-asian="7pt" style:font-name-complex="Arial" style:font-size-complex="7pt"/>
   </style:style>
   <style:style style:name="P29" 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="Droid Sans Japanese" fo:font-size="7pt" officeooo:paragraph-rsid="001dfe2f" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
+   <style:paragraph-properties fo:text-align="justify" style:justify-single-word="false"/>
+   <style:text-properties style:font-name="Droid Sans Japanese" fo:font-size="7pt" officeooo:paragraph-rsid="001b9ac0" style:font-size-asian="7pt" style:font-name-complex="Arial" style:font-size-complex="7pt" style:font-weight-complex="bold"/>
   </style:style>
-  <style:style style:name="P30" style:family="paragraph" style:parent-style-name="Standard">
+  <style:style style:name="P30" style:family="paragraph" style:parent-style-name="Header">
+   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
+   <style:text-properties style:font-name="Droid Sans Japanese" fo:font-size="7pt" style:text-underline-style="solid" style:text-underline-type="double" style:text-underline-width="auto" style:text-underline-color="font-color" officeooo:rsid="026544ec" officeooo:paragraph-rsid="0049dca0" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
+  </style:style>
+  <style:style style:name="P31" style:family="paragraph" style:parent-style-name="Header">
+   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
+   <style:text-properties style:font-name="Droid Sans Japanese" fo:font-size="7pt" style:text-underline-style="solid" style:text-underline-type="double" style:text-underline-width="auto" style:text-underline-color="font-color" officeooo:rsid="0266c2a9" officeooo:paragraph-rsid="0049dca0" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
+  </style:style>
+  <style:style style:name="P32" 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 Japanese" fo:font-size="7pt" fo:font-weight="bold" officeooo:rsid="001b9ac0" officeooo:paragraph-rsid="001dfe2f" style:font-size-asian="7pt" style:font-weight-asian="bold" style:font-name-complex="Arial" style:font-size-complex="7pt" style:font-weight-complex="bold"/>
+  </style:style>
+  <style:style style:name="P33" 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 Japanese" fo:font-size="7pt" fo:font-weight="bold" officeooo:rsid="001b9ac0" officeooo:paragraph-rsid="00296a83" style:font-size-asian="7pt" style:font-weight-asian="bold" style:font-name-complex="Arial" style:font-size-complex="7pt" style:font-weight-complex="bold"/>
+  </style:style>
+  <style:style style:name="P34" 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 Japanese" fo:font-size="7pt" fo:font-weight="bold" officeooo:rsid="001b9ac0" officeooo:paragraph-rsid="002ac0d9" style:font-size-asian="7pt" style:font-weight-asian="bold" style:font-name-complex="Arial" style:font-size-complex="7pt" style:font-weight-complex="bold"/>
+  </style:style>
+  <style:style style:name="P35" 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 Japanese" fo:font-size="7pt" fo:font-weight="bold" officeooo:paragraph-rsid="001b9ac0" style:font-size-asian="7pt" style:font-weight-asian="bold" style:font-name-complex="Arial" style:font-size-complex="7pt" style:font-weight-complex="bold"/>
+  </style:style>
+  <style:style style:name="P36" 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="Droid Sans Japanese" fo:font-size="7pt" fo:font-weight="bold" officeooo:paragraph-rsid="001b9ac0" style:font-size-asian="7pt" style:font-weight-asian="bold" style:font-name-complex="Arial" style:font-size-complex="7pt"/>
+  </style:style>
+  <style:style style:name="P37" style:family="paragraph" style:parent-style-name="Standard">
    <style:paragraph-properties fo:text-align="center" style:justify-single-word="false">
     <style:tab-stops>
      <style:tab-stop style:position="3.6425in"/>
     </style:tab-stops>
    </style:paragraph-properties>
-   <style:text-properties style:font-name="Droid Sans Japanese" fo:font-size="7pt" officeooo:paragraph-rsid="001b9ac0" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
-  </style:style>
-  <style:style style:name="P31" style:family="paragraph" style:parent-style-name="Footer">
-   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
-   <style:text-properties style:font-name="Droid Sans Japanese" fo:font-size="7pt" officeooo:paragraph-rsid="00066dfa" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
-  </style:style>
-  <style:style style:name="P32" style:family="paragraph" style:parent-style-name="Header">
-   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
-   <style:text-properties style:font-name="Droid Sans Japanese" fo:font-size="7pt" officeooo:paragraph-rsid="00066dfa" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
-  </style:style>
-  <style:style style:name="P33" style:family="paragraph" style:parent-style-name="Header">
-   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
-   <style:text-properties style:font-name="Droid Sans Japanese" fo:font-size="7pt" officeooo:paragraph-rsid="0049dca0" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
-  </style:style>
-  <style:style style:name="P34" style:family="paragraph" style:parent-style-name="Standard">
-   <style:paragraph-properties fo:margin-left="0in" fo:margin-right="0in" fo:text-align="center" style:justify-single-word="false" 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="0049dca0" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
-  </style:style>
-  <style:style style:name="P35" style:family="paragraph" style:parent-style-name="Standard">
-   <style:paragraph-properties fo:text-align="justify" style:justify-single-word="false" fo:orphans="0" fo:widows="0"/>
-   <style:text-properties style:font-name="Droid Sans Japanese" fo:font-size="7pt" officeooo:paragraph-rsid="001fed33" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
-  </style:style>
-  <style:style style:name="P36" style:family="paragraph" style:parent-style-name="Standard">
-   <style:paragraph-properties fo:text-align="justify" style:justify-single-word="false" fo:orphans="0" fo:widows="0"/>
-   <style:text-properties style:font-name="Droid Sans Japanese" fo:font-size="7pt" officeooo:paragraph-rsid="001b9ac0" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
-  </style:style>
-  <style:style style:name="P37" 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 Japanese" fo:font-size="7pt" officeooo:paragraph-rsid="001b9ac0" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
+   <style:text-properties style:font-name="Droid Sans Japanese" fo:font-size="7pt" fo:font-weight="bold" officeooo:paragraph-rsid="001b9ac0" style:font-size-asian="7pt" style:font-weight-asian="bold" style:font-name-complex="Arial" style:font-size-complex="7pt"/>
   </style:style>
   <style:style style:name="P38" 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 Japanese" fo:font-size="7pt" officeooo:paragraph-rsid="002089d3" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
+   <style:paragraph-properties fo:text-align="start" style:justify-single-word="false" fo:orphans="0" fo:widows="0"/>
+   <style:text-properties style:font-name="Droid Sans Japanese" fo:font-size="7pt" fo:font-weight="bold" officeooo:paragraph-rsid="001b9ac0" style:font-size-asian="7pt" style:font-weight-asian="bold" style:font-name-complex="Arial" style:font-size-complex="7pt"/>
   </style:style>
   <style:style style:name="P39" 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 Japanese" fo:font-size="7pt" officeooo:paragraph-rsid="00384e44" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
+   <style:text-properties style:font-name="Droid Sans Japanese" fo:font-size="7pt" fo:font-weight="bold" officeooo:paragraph-rsid="001b9ac0" style:font-size-asian="7pt" style:font-weight-asian="bold" style:font-name-complex="Arial" style:font-size-complex="7pt"/>
   </style:style>
   <style:style style:name="P40" style:family="paragraph" style:parent-style-name="Standard">
    <style:paragraph-properties>
@@ -642,7 +643,7 @@
      <style:tab-stop style:position="3.6425in"/>
     </style:tab-stops>
    </style:paragraph-properties>
-   <style:text-properties style:font-name="Droid Sans Japanese" fo:font-size="7pt" officeooo:paragraph-rsid="001b9ac0" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
+   <style:text-properties style:font-name="Droid Sans Japanese" fo:font-size="7pt" fo:font-weight="bold" officeooo:paragraph-rsid="001b9ac0" style:font-size-asian="7pt" style:font-weight-asian="bold" style:font-name-complex="Arial" style:font-size-complex="7pt"/>
   </style:style>
   <style:style style:name="P41" style:family="paragraph" style:parent-style-name="Standard">
    <style:paragraph-properties>
@@ -650,37 +651,29 @@
      <style:tab-stop style:position="3.6425in"/>
     </style:tab-stops>
    </style:paragraph-properties>
-   <style:text-properties style:font-name="Droid Sans Japanese" fo:font-size="7pt" officeooo:paragraph-rsid="002844c3" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
+   <style:text-properties style:font-name="Droid Sans Japanese" fo:font-size="7pt" fo:font-weight="bold" officeooo:paragraph-rsid="002844c3" 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="P42" style:family="paragraph" style:parent-style-name="Text_20_body">
-   <style:paragraph-properties>
+   <style:paragraph-properties fo:text-align="start" style:justify-single-word="false">
     <style:tab-stops>
      <style:tab-stop style:position="3.6425in"/>
     </style:tab-stops>
    </style:paragraph-properties>
-   <style:text-properties style:font-name="Droid Sans Japanese" fo:font-size="7pt" officeooo:paragraph-rsid="002844c3" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
+   <style:text-properties style:font-name="Droid Sans Japanese" fo:font-size="7pt" fo:font-weight="bold" officeooo:rsid="00296a83" officeooo:paragraph-rsid="002ac0d9" 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="P43" style:family="paragraph" style:parent-style-name="Table_20_Contents">
    <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
-   <style:text-properties style:font-name="Droid Sans Japanese" fo:font-size="7pt" officeooo:rsid="00296a83" officeooo:paragraph-rsid="00296a83" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
+   <style:text-properties style:font-name="Droid Sans Japanese" fo:font-size="7pt" fo:font-weight="bold" officeooo:rsid="00296a83" officeooo:paragraph-rsid="00296a83" 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="P44" style:family="paragraph" style:parent-style-name="Standard">
    <style:paragraph-properties fo:text-align="justify" style:justify-single-word="false" fo:orphans="0" fo:widows="0"/>
-   <style:text-properties style:font-name="Droid Sans Japanese" fo:font-size="7pt" officeooo:paragraph-rsid="001b9ac0" style:font-size-asian="7pt" style:font-name-complex="Arial" style:font-size-complex="7pt"/>
+   <style:text-properties style:font-name="Droid Sans Japanese" fo:font-size="7pt" fo:font-weight="bold" officeooo:rsid="001b9ac0" officeooo:paragraph-rsid="00383277" fo:background-color="transparent" style:font-size-asian="7pt" style:font-weight-asian="bold" style:font-name-complex="Arial" style:font-size-complex="7pt" style:font-weight-complex="bold"/>
   </style:style>
   <style:style style:name="P45" 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 Japanese" fo:font-size="7pt" officeooo:paragraph-rsid="001b9ac0" style:font-size-asian="7pt" style:font-name-complex="Arial" style:font-size-complex="7pt"/>
-  </style:style>
-  <style:style style:name="P46" 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 Japanese" fo:font-size="7pt" officeooo:paragraph-rsid="001b9ac0" style:font-size-asian="7pt" style:font-name-complex="Arial" style:font-size-complex="7pt" style:font-weight-complex="bold"/>
-  </style:style>
-  <style:style style:name="P47" style:family="paragraph" style:parent-style-name="Standard">
    <style:paragraph-properties fo:text-align="start" style:justify-single-word="false" fo:orphans="0" fo:widows="0"/>
    <style:text-properties style:font-name="Droid Sans Japanese" fo:font-size="7pt" fo:font-weight="normal" officeooo:rsid="001b9ac0" officeooo:paragraph-rsid="0032e8b3" style:font-size-asian="7pt" style:font-weight-asian="normal" style:font-name-complex="Arial" style:font-size-complex="7pt" style:font-weight-complex="normal"/>
   </style:style>
-  <style:style style:name="P48" style:family="paragraph" style:parent-style-name="Standard">
+  <style:style style:name="P46" style:family="paragraph" style:parent-style-name="Standard">
    <style:paragraph-properties fo:text-align="start" style:justify-single-word="false" fo:orphans="0" fo:widows="0">
     <style:tab-stops>
      <style:tab-stop style:position="0.1972in"/>
@@ -688,11 +681,11 @@
    </style:paragraph-properties>
    <style:text-properties style:font-name="Droid Sans Japanese" fo:font-size="7pt" fo:font-weight="normal" officeooo:rsid="001b9ac0" officeooo:paragraph-rsid="0032e8b3" style:font-size-asian="7pt" style:font-weight-asian="normal" style:font-name-complex="Arial" style:font-size-complex="7pt" style:font-weight-complex="normal"/>
   </style:style>
-  <style:style style:name="P49" style:family="paragraph" style:parent-style-name="Standard">
+  <style:style style:name="P47" style:family="paragraph" style:parent-style-name="Standard">
    <style:paragraph-properties fo:text-align="start" style:justify-single-word="false" fo:orphans="0" fo:widows="0"/>
    <style:text-properties style:font-name="Droid Sans Japanese" fo:font-size="7pt" fo:font-weight="normal" officeooo:rsid="001b9ac0" officeooo:paragraph-rsid="0020269f" style:font-size-asian="7pt" style:font-weight-asian="normal" style:font-name-complex="Arial" style:font-size-complex="7pt" style:font-weight-complex="normal"/>
   </style:style>
-  <style:style style:name="P50" style:family="paragraph" style:parent-style-name="Heading_20_1">
+  <style:style style:name="P48" style:family="paragraph" style:parent-style-name="Heading_20_1">
    <style:paragraph-properties fo:text-align="justify" style:justify-single-word="false" fo:orphans="0" fo:widows="0">
     <style:tab-stops>
      <style:tab-stop style:position="0.1972in"/>
@@ -700,19 +693,19 @@
    </style:paragraph-properties>
    <style:text-properties style:font-name="Droid Sans Japanese" fo:font-size="7pt" fo:font-weight="normal" officeooo:paragraph-rsid="001b9ac0" fo:background-color="transparent" style:font-size-asian="7pt" style:font-weight-asian="normal" style:font-name-complex="Arial" style:font-size-complex="7pt"/>
   </style:style>
-  <style:style style:name="P51" style:family="paragraph" style:parent-style-name="Standard">
+  <style:style style:name="P49" 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 Japanese" fo:font-size="7pt" fo:language="es" fo:country="CO" officeooo:paragraph-rsid="001b9ac0" style:font-size-asian="7pt" style:font-name-complex="Arial" style:font-size-complex="7pt" style:font-weight-complex="bold"/>
   </style:style>
-  <style:style style:name="P52" style:family="paragraph" style:parent-style-name="Standard">
+  <style:style style:name="P50" 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 Japanese" fo:font-size="7pt" fo:language="es" fo:country="CO" officeooo:paragraph-rsid="001b9ac0" style:font-size-asian="7pt" style:font-name-complex="Arial" style:font-size-complex="7pt"/>
   </style:style>
-  <style:style style:name="P53" style:family="paragraph" style:parent-style-name="Standard">
+  <style:style style:name="P51" 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 Japanese" fo:font-size="7pt" fo:language="es" fo:country="CO" fo:font-weight="bold" officeooo:paragraph-rsid="001b9ac0" style:font-size-asian="7pt" style:font-weight-asian="bold" style:font-name-complex="Arial" style:font-size-complex="7pt" style:font-weight-complex="bold"/>
   </style:style>
-  <style:style style:name="P54" style:family="paragraph" style:parent-style-name="Standard">
+  <style:style style:name="P52" style:family="paragraph" style:parent-style-name="Standard">
    <style:paragraph-properties>
     <style:tab-stops>
      <style:tab-stop style:position="3.6425in"/>
@@ -720,30 +713,36 @@
    </style:paragraph-properties>
    <style:text-properties style:font-name="Droid Sans Japanese" fo:font-size="7pt" fo:language="es" fo:country="CO" fo:font-weight="bold" officeooo:paragraph-rsid="001b9ac0" style:font-size-asian="7pt" style:font-weight-asian="bold" style:font-name-complex="Arial" style:font-size-complex="7pt"/>
   </style:style>
-  <style:style style:name="P55" style:family="paragraph" style:parent-style-name="Header">
-   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
-   <style:text-properties style:font-name="Droid Sans Japanese" fo:font-size="7pt" style:text-underline-style="solid" style:text-underline-type="double" style:text-underline-width="auto" style:text-underline-color="font-color" officeooo:rsid="026544ec" officeooo:paragraph-rsid="0049dca0" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
-  </style:style>
-  <style:style style:name="P56" style:family="paragraph" style:parent-style-name="Header">
-   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
-   <style:text-properties style:font-name="Droid Sans Japanese" fo:font-size="7pt" style:text-underline-style="solid" style:text-underline-type="double" style:text-underline-width="auto" style:text-underline-color="font-color" officeooo:rsid="0266c2a9" officeooo:paragraph-rsid="0049dca0" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
-  </style:style>
-  <style:style style:name="P57" style:family="paragraph" style:parent-style-name="Header">
-   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
-   <style:text-properties fo:color="#666666" loext:opacity="100%" style:font-name="Droid Sans Japanese" fo:font-size="7pt" style:text-underline-style="solid" style:text-underline-type="double" style:text-underline-width="auto" style:text-underline-color="font-color" fo:font-weight="bold" officeooo:rsid="0266c2a9" officeooo:paragraph-rsid="0049dca0" 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="P58" style:family="paragraph" style:parent-style-name="Header">
+  <style:style style:name="P53" style:family="paragraph" style:parent-style-name="Header">
    <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
    <style:text-properties fo:color="#666666" loext:opacity="100%" style:font-name="Droid Sans Japanese" fo:font-size="8pt" fo:font-weight="normal" officeooo:paragraph-rsid="0049dca0" style:font-size-asian="8pt" style:font-weight-asian="normal" style:font-size-complex="8pt" style:font-weight-complex="normal"/>
   </style:style>
-  <style:style style:name="P59" style:family="paragraph" style:parent-style-name="Header">
+  <style:style style:name="P54" style:family="paragraph" style:parent-style-name="Header">
    <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
-   <style:text-properties style:font-name="Droid Sans Japanese" fo:font-size="7pt" officeooo:paragraph-rsid="00066dfa" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
+   <style:text-properties fo:color="#666666" loext:opacity="100%" style:font-name="Droid Sans Japanese" fo:font-size="7pt" style:text-underline-style="solid" style:text-underline-type="double" style:text-underline-width="auto" style:text-underline-color="font-color" fo:font-weight="bold" officeooo:rsid="0266c2a9" officeooo:paragraph-rsid="0049dca0" 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="P60" style:family="paragraph" style:parent-style-name="Header">
+  <style:style style:name="P55" style:family="paragraph" style:parent-style-name="Header">
    <style:paragraph-properties fo:margin-left="0in" fo:margin-right="0in" fo:text-align="center" style:justify-single-word="false" fo:text-indent="0in" style:auto-text-indent="false"/>
    <style:text-properties fo:color="#666666" loext:opacity="100%" style:font-name="Droid Sans Japanese" fo:font-size="7pt" fo:font-style="normal" style:text-underline-style="none" fo:font-weight="normal" officeooo:paragraph-rsid="0049dca0" style:font-size-asian="7pt" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-size-complex="7pt" style:font-style-complex="normal" style:font-weight-complex="normal"/>
   </style:style>
+  <style:style style:name="P56" style:family="paragraph" style:parent-style-name="Header">
+   <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-style="normal" style:text-underline-style="none" fo:font-weight="normal" style:font-name-asian="Calibri" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-name-complex="Calibri"/>
+  </style:style>
+  <style:style style:name="P57" 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 Japanese" fo:font-size="7pt" fo:font-style="normal" style:text-underline-style="none" fo:font-weight="normal" officeooo:paragraph-rsid="0032e8b3" 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="P58" style:family="paragraph" style:parent-style-name="Header">
+   <style:paragraph-properties fo:text-align="start" style:justify-single-word="false" fo:orphans="0" fo:widows="0"/>
+   <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 Japanese" fo:font-size="7pt" fo:font-style="normal" style:text-underline-style="none" fo:font-weight="normal" officeooo:paragraph-rsid="0032e8b3" 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:style>
+  <style:style style:name="P59" style:family="paragraph" style:parent-style-name="Header">
+   <style:paragraph-properties fo:margin-left="0in" fo:margin-right="0in" fo:margin-top="0in" fo:margin-bottom="0in" style:contextual-spacing="false" fo:line-height="100%" fo:text-align="start" style:justify-single-word="false" fo:keep-together="auto" fo:orphans="0" fo:widows="0" fo:text-indent="0in" style:auto-text-indent="false" fo:padding="0in" fo:border="none" fo:keep-with-next="auto"/>
+   <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 Japanese" fo:font-size="7pt" fo:font-style="normal" style:text-underline-style="none" fo:font-weight="normal" officeooo:rsid="001fed33" officeooo:paragraph-rsid="0032e8b3" 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:style>
+  <style:style style:name="P60" style:family="paragraph" style:parent-style-name="Standard">
+   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
+  </style:style>
   <style:style style:name="P61" style:family="paragraph">
    <style:paragraph-properties fo:text-align="center"/>
   </style:style>
@@ -763,104 +762,113 @@
    <style:text-properties fo:color="#333333" loext:opacity="100%" style:text-underline-style="none" fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
   </style:style>
   <style:style style:name="T6" style:family="text">
-   <style:text-properties fo:color="#333333" loext:opacity="100%" style:text-underline-style="none" fo:font-weight="bold" officeooo:rsid="026544ec" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
+   <style:text-properties fo:color="#666666" loext:opacity="100%" style:text-underline-style="none" fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
   </style:style>
   <style:style style:name="T7" style:family="text">
-   <style:text-properties fo:color="#666666" loext:opacity="100%" style:text-underline-style="none" fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
-  </style:style>
-  <style:style style:name="T8" style:family="text">
-   <style:text-properties fo:color="#333333" loext:opacity="100%" style:text-underline-style="none" officeooo:rsid="026544ec"/>
-  </style:style>
-  <style:style style:name="T9" style:family="text">
-   <style:text-properties officeooo:rsid="026544ec"/>
-  </style:style>
-  <style:style style:name="T10" style:family="text">
-   <style:text-properties fo:color="#333333" loext:opacity="100%" style:text-underline-style="none" officeooo:rsid="0049dca0"/>
-  </style:style>
-  <style:style style:name="T11" style:family="text">
-   <style:text-properties fo:font-weight="bold" style:font-weight-asian="bold" style:font-name-complex="Arial"/>
-  </style:style>
-  <style:style style:name="T12" style:family="text">
-   <style:text-properties fo:font-weight="bold" officeooo:rsid="001b9ac0" style:font-weight-asian="bold" style:font-name-complex="Arial"/>
-  </style:style>
-  <style:style style:name="T13" style:family="text">
-   <style:text-properties fo:font-weight="bold" style:font-weight-asian="bold" style:font-name-complex="Arial" style:font-weight-complex="bold"/>
-  </style:style>
-  <style:style style:name="T14" style:family="text">
-   <style:text-properties fo:font-weight="bold" officeooo:rsid="001b9ac0" style:font-weight-asian="bold" style:font-name-complex="Arial" style:font-weight-complex="bold"/>
-  </style:style>
-  <style:style style:name="T15" style:family="text">
-   <style:text-properties fo:font-weight="bold" officeooo:rsid="002844c3" style:font-weight-asian="bold" style:font-name-complex="Arial"/>
-  </style:style>
-  <style:style style:name="T16" style:family="text">
-   <style:text-properties fo:font-weight="bold" officeooo:rsid="001b9ac0" fo:background-color="transparent" loext:char-shading-value="0" style:font-weight-asian="bold" style:font-name-complex="Arial" style:font-weight-complex="bold"/>
-  </style:style>
-  <style:style style:name="T17" style:family="text">
-   <style:text-properties style:font-name-complex="Arial"/>
-  </style:style>
-  <style:style style:name="T18" style:family="text">
-   <style:text-properties officeooo:rsid="001b9ac0" style:font-name-complex="Arial"/>
-  </style:style>
-  <style:style style:name="T19" style:family="text">
-   <style:text-properties style:font-name-complex="Arial" style:font-weight-complex="bold"/>
-  </style:style>
-  <style:style style:name="T20" style:family="text">
-   <style:text-properties officeooo:rsid="003a47a3" style:font-name-complex="Arial"/>
-  </style:style>
-  <style:style style:name="T21" style:family="text">
-   <style:text-properties fo:background-color="transparent" loext:char-shading-value="0" style:font-name-complex="Arial"/>
-  </style:style>
-  <style:style style:name="T22" style:family="text">
-   <style:text-properties officeooo:rsid="001fed33" fo:background-color="transparent" loext:char-shading-value="0" style:font-name-complex="Arial"/>
-  </style:style>
-  <style:style style:name="T23" style:family="text">
-   <style:text-properties fo:language="es" fo:country="CO" fo:font-weight="bold" style:font-weight-asian="bold" style:font-name-complex="Arial"/>
-  </style:style>
-  <style:style style:name="T24" style:family="text">
-   <style:text-properties fo:language="es" fo:country="CO" fo:font-weight="bold" style:font-weight-asian="bold" style:font-name-complex="Arial" style:font-weight-complex="bold"/>
-  </style:style>
-  <style:style style:name="T25" style:family="text">
-   <style:text-properties fo:language="es" fo:country="CO" fo:font-weight="bold" officeooo:rsid="001b9ac0" style:font-weight-asian="bold" style:font-name-complex="Arial" style:font-weight-complex="bold"/>
-  </style:style>
-  <style:style style:name="T26" style:family="text">
-   <style:text-properties fo:language="es" fo:country="CO" style:font-name-complex="Arial"/>
-  </style:style>
-  <style:style style:name="T27" style:family="text">
-   <style:text-properties fo:language="es" fo:country="CO" style:font-name-complex="Arial" style:font-weight-complex="bold"/>
-  </style:style>
-  <style:style style:name="T28" 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="T29" style:family="text">
-   <style:text-properties fo:color="#333333" loext:opacity="100%" fo:font-weight="bold" officeooo:rsid="026544ec" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
-  </style:style>
-  <style:style style:name="T30" style:family="text">
-   <style:text-properties fo:color="#333333" loext:opacity="100%" style:text-underline-style="none" fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
-  </style:style>
-  <style:style style:name="T31" style:family="text">
    <style:text-properties fo:color="#333333" loext:opacity="100%" style:text-underline-style="none" fo:font-weight="bold" officeooo:rsid="026544ec" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
   </style:style>
-  <style:style style:name="T32" style:family="text">
+  <style:style style:name="T8" style:family="text">
+   <style:text-properties fo:color="#666666" loext:opacity="100%" style:text-underline-style="none" fo:font-weight="bold" officeooo:rsid="026544ec" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
+  </style:style>
+  <style:style style:name="T9" style:family="text">
    <style:text-properties fo:color="#333333" loext:opacity="100%" style:text-underline-style="none" officeooo:rsid="026544ec"/>
   </style:style>
-  <style:style style:name="T33" style:family="text">
+  <style:style style:name="T10" style:family="text">
+   <style:text-properties style:text-underline-style="none" officeooo:rsid="026544ec"/>
+  </style:style>
+  <style:style style:name="T11" style:family="text">
    <style:text-properties fo:color="#333333" loext:opacity="100%" style:text-underline-style="none" officeooo:rsid="0049dca0"/>
   </style:style>
-  <style:style style:name="T34" style:family="text">
+  <style:style style:name="T12" style:family="text">
+   <style:text-properties fo:color="#333333" loext:opacity="100%" fo:font-weight="bold" officeooo:rsid="026544ec" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
+  </style:style>
+  <style:style style:name="T13" style:family="text">
+   <style:text-properties fo:color="#333333" loext:opacity="100%" style:text-underline-style="none" 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 fo:color="#333333" loext:opacity="100%" style:text-underline-style="none" fo:font-weight="bold" officeooo:rsid="026544ec" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
+  </style:style>
+  <style:style style:name="T15" style:family="text">
+   <style:text-properties fo:color="#333333" loext:opacity="100%" style:text-underline-style="none" officeooo:rsid="026544ec"/>
+  </style:style>
+  <style:style style:name="T16" style:family="text">
+   <style:text-properties fo:color="#333333" loext:opacity="100%" style:text-underline-style="none" officeooo:rsid="0049dca0"/>
+  </style:style>
+  <style:style style:name="T17" style:family="text">
    <style:text-properties fo:color="#666666" loext:opacity="100%" fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
   </style:style>
-  <style:style style:name="T35" style:family="text">
+  <style:style style:name="T18" style:family="text">
    <style:text-properties fo:color="#666666" loext:opacity="100%" fo:font-weight="bold" officeooo:rsid="026544ec" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
   </style:style>
-  <style:style style:name="T36" style:family="text">
+  <style:style style:name="T19" style:family="text">
    <style:text-properties fo:color="#666666" loext:opacity="100%" fo:font-weight="bold" officeooo:rsid="001cd488" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
   </style:style>
-  <style:style style:name="T37" style:family="text">
+  <style:style style:name="T20" style:family="text">
    <style:text-properties fo:color="#666666" loext:opacity="100%" style:text-underline-style="none" fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
   </style:style>
-  <style:style style:name="T38" style:family="text">
+  <style:style style:name="T21" style:family="text">
+   <style:text-properties fo:color="#666666" loext:opacity="100%" style:text-underline-style="none" fo:font-weight="bold" officeooo:rsid="026544ec" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
+  </style:style>
+  <style:style style:name="T22" style:family="text">
+   <style:text-properties style:text-underline-style="none" officeooo:rsid="026544ec"/>
+  </style:style>
+  <style:style style:name="T23" style:family="text">
    <style:text-properties officeooo:rsid="026544ec"/>
   </style:style>
+  <style:style style:name="T24" style:family="text">
+   <style:text-properties fo:font-weight="bold" style:font-weight-asian="bold" style:font-name-complex="Arial"/>
+  </style:style>
+  <style:style style:name="T25" style:family="text">
+   <style:text-properties fo:font-weight="bold" officeooo:rsid="001b9ac0" style:font-weight-asian="bold" style:font-name-complex="Arial"/>
+  </style:style>
+  <style:style style:name="T26" style:family="text">
+   <style:text-properties fo:font-weight="bold" style:font-weight-asian="bold" style:font-name-complex="Arial" style:font-weight-complex="bold"/>
+  </style:style>
+  <style:style style:name="T27" style:family="text">
+   <style:text-properties fo:font-weight="bold" officeooo:rsid="001b9ac0" style:font-weight-asian="bold" style:font-name-complex="Arial" style:font-weight-complex="bold"/>
+  </style:style>
+  <style:style style:name="T28" style:family="text">
+   <style:text-properties fo:font-weight="bold" officeooo:rsid="002844c3" style:font-weight-asian="bold" style:font-name-complex="Arial"/>
+  </style:style>
+  <style:style style:name="T29" style:family="text">
+   <style:text-properties fo:font-weight="bold" officeooo:rsid="001b9ac0" fo:background-color="transparent" loext:char-shading-value="0" style:font-weight-asian="bold" style:font-name-complex="Arial" style:font-weight-complex="bold"/>
+  </style:style>
+  <style:style style:name="T30" style:family="text">
+   <style:text-properties style:font-name-complex="Arial"/>
+  </style:style>
+  <style:style style:name="T31" style:family="text">
+   <style:text-properties officeooo:rsid="001b9ac0" style:font-name-complex="Arial"/>
+  </style:style>
+  <style:style style:name="T32" style:family="text">
+   <style:text-properties style:font-name-complex="Arial" style:font-weight-complex="bold"/>
+  </style:style>
+  <style:style style:name="T33" style:family="text">
+   <style:text-properties officeooo:rsid="003a47a3" style:font-name-complex="Arial"/>
+  </style:style>
+  <style:style style:name="T34" style:family="text">
+   <style:text-properties fo:background-color="transparent" loext:char-shading-value="0" style:font-name-complex="Arial"/>
+  </style:style>
+  <style:style style:name="T35" style:family="text">
+   <style:text-properties officeooo:rsid="001fed33" fo:background-color="transparent" loext:char-shading-value="0" style:font-name-complex="Arial"/>
+  </style:style>
+  <style:style style:name="T36" style:family="text">
+   <style:text-properties fo:language="es" fo:country="CO" fo:font-weight="bold" style:font-weight-asian="bold" style:font-name-complex="Arial"/>
+  </style:style>
+  <style:style style:name="T37" style:family="text">
+   <style:text-properties fo:language="es" fo:country="CO" fo:font-weight="bold" style:font-weight-asian="bold" style:font-name-complex="Arial" style:font-weight-complex="bold"/>
+  </style:style>
+  <style:style style:name="T38" style:family="text">
+   <style:text-properties fo:language="es" fo:country="CO" fo:font-weight="bold" officeooo:rsid="001b9ac0" style:font-weight-asian="bold" style:font-name-complex="Arial" style:font-weight-complex="bold"/>
+  </style:style>
+  <style:style style:name="T39" style:family="text">
+   <style:text-properties fo:language="es" fo:country="CO" style:font-name-complex="Arial"/>
+  </style:style>
+  <style:style style:name="T40" style:family="text">
+   <style:text-properties fo:language="es" fo:country="CO" style:font-name-complex="Arial" style:font-weight-complex="bold"/>
+  </style:style>
+  <style:style style:name="T41" style:family="text">
+   <style:text-properties fo:font-weight="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="fr1" style:family="graphic" style:parent-style-name="Graphics">
    <style:graphic-properties style:vertical-pos="from-top" style:horizontal-pos="from-left" style:horizontal-rel="paragraph" style:mirror="none" fo:clip="rect(0in, 0in, 0in, 0in)" draw:luminance="0%" draw:contrast="0%" draw:red="0%" draw:green="0%" draw:blue="0%" draw:gamma="100%" draw:color-inversion="false" draw:image-opacity="100%" draw:color-mode="standard"/>
   </style:style>
@@ -1559,10 +1567,10 @@
        <text:p text:style-name="P4"><text:span text:style-name="T1">NIT:</text:span><text:span text:style-name="T2"> </text:span><text:span text:style-name="T3"><text:placeholder text:placeholder-type="text">&lt;company.party.identifiers[0].code&gt;</text:placeholder></text:span></text:p>
        <text:p text:style-name="P5">Regimen Común</text:p>
        <text:p text:style-name="P5"><text:span text:style-name="T3">Actividad Economica 46</text:span><text:span text:style-name="T4">59</text:span></text:p>
-       <text:p text:style-name="P6"><text:span text:style-name="T5">Dirección: </text:span><text:span text:style-name="T3"><text:placeholder text:placeholder-type="text">&lt;company.party.addresses[0].street&gt;</text:placeholder></text:span><text:span text:style-name="T3"><text:s/></text:span><text:span text:style-name="T3"><text:placeholder text:placeholder-type="text">&lt;company.party.addresses[0].city&gt;</text:placeholder></text:span></text:p>
-       <text:p text:style-name="P7"><text:span text:style-name="T6">Teléfono:</text:span><text:span text:style-name="T7"> </text:span><text:span text:style-name="T2"><text:placeholder text:placeholder-type="text">&lt;company.party.phone&gt;</text:placeholder></text:span></text:p>
-       <text:p text:style-name="P8"><text:span text:style-name="T8">Celular: </text:span><text:span text:style-name="T9"><text:placeholder text:placeholder-type="text">&lt;company.party.mobile&gt;</text:placeholder></text:span></text:p>
-       <text:p text:style-name="P8"><text:span text:style-name="T10">E-mail</text:span><text:span text:style-name="T8">: </text:span><text:span text:style-name="T9"><text:placeholder text:placeholder-type="text">&lt;company.party.email&gt;</text:placeholder></text:span></text:p>
+       <text:p text:style-name="P6"><text:span text:style-name="T5">Dirección: </text:span><text:span text:style-name="T6"><text:placeholder text:placeholder-type="text">&lt;company.party.addresses[0].street&gt;</text:placeholder></text:span><text:span text:style-name="T3"><text:s/></text:span><text:span text:style-name="T6"><text:placeholder text:placeholder-type="text">&lt;company.party.addresses[0].city&gt;</text:placeholder></text:span></text:p>
+       <text:p text:style-name="P7"><text:span text:style-name="T7">Teléfono:</text:span><text:span text:style-name="T6"> </text:span><text:span text:style-name="T8"><text:placeholder text:placeholder-type="text">&lt;company.party.phone&gt;</text:placeholder></text:span></text:p>
+       <text:p text:style-name="P8"><text:span text:style-name="T9">Celular: </text:span><text:span text:style-name="T10"><text:placeholder text:placeholder-type="text">&lt;company.party.mobile&gt;</text:placeholder></text:span></text:p>
+       <text:p text:style-name="P8"><text:span text:style-name="T11">E-mail</text:span><text:span text:style-name="T9">: </text:span><text:span text:style-name="T10"><text:placeholder text:placeholder-type="text">&lt;company.party.email&gt;</text:placeholder></text:span></text:p>
        <text:p text:style-name="P9"><text:placeholder text:placeholder-type="text">&lt;/if&gt;</text:placeholder></text:p>
       </table:table-cell>
      </table:table-row>
@@ -1580,202 +1588,202 @@
     <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="P15"><text:placeholder text:placeholder-type="text">&lt;for each=&quot;subscription in records&quot;&gt;</text:placeholder></text:p>
-   <text:p text:style-name="P28"><text:span text:style-name="T12">C</text:span><text:bookmark-start text:name="OLE_LINK2"/><text:bookmark-start text:name="OLE_LINK1"/><text:span text:style-name="T11">ONTRATO DE MANTENIMIENTO PREVENTIVO</text:span></text:p>
-   <text:p text:style-name="P19">DATOS GENERALES DEL CONTRATO</text:p>
-   <text:p text:style-name="P29"><text:span text:style-name="T11">N° </text:span><text:span text:style-name="T14"><text:placeholder text:placeholder-type="text" text:description="subscription.number">&lt;subscription.number&gt;</text:placeholder></text:span></text:p>
-   <text:p text:style-name="P19"/>
+   <text:p text:style-name="P32"><text:placeholder text:placeholder-type="text">&lt;for each=&quot;subscription in records&quot;&gt;</text:placeholder></text:p>
+   <text:p text:style-name="P15"><text:span text:style-name="T25">C</text:span><text:bookmark-start text:name="OLE_LINK2"/><text:bookmark-start text:name="OLE_LINK1"/><text:span text:style-name="T24">ONTRATO DE MANTENIMIENTO PREVENTIVO</text:span></text:p>
+   <text:p text:style-name="P36">DATOS GENERALES DEL CONTRATO</text:p>
+   <text:p text:style-name="P16"><text:span text:style-name="T24">N° </text:span><text:span text:style-name="T27"><text:placeholder text:placeholder-type="text" text:description="subscription.number">&lt;subscription.number&gt;</text:placeholder></text:span></text:p>
+   <text:p text:style-name="P36"/>
    <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="P21">FECHA FIRMA</text:p>
+      <text:p text:style-name="P38">FECHA FIRMA</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;subscription.start_date&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P44"><text:placeholder text:placeholder-type="text">&lt;subscription.start_date&gt;</text:placeholder></text:p>
      </table:table-cell>
     </table:table-row>
     <table:table-row table:style-name="Tabla1.2">
      <table:table-cell table:style-name="Tabla1.A2" office:value-type="string">
-      <text:p text:style-name="P21">OBJETO</text:p>
+      <text:p text:style-name="P38">OBJETO</text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tabla1.A2" office:value-type="string">
-      <text:h text:style-name="P50" text:outline-level="1">PRESTACIÓN DEL SERVICIO DE MANTENIMIENTO TÉCNICO PREVENTIVO SIN REPUESTOS A LOS EQUIPOS DE OPTOMETRÍA.</text:h>
+      <text:h text:style-name="P48" text:outline-level="1">PRESTACIÓN DEL SERVICIO DE MANTENIMIENTO TÉCNICO PREVENTIVO SIN REPUESTOS A LOS EQUIPOS DE OPTOMETRÍA.</text:h>
      </table:table-cell>
     </table:table-row>
     <table:table-row table:style-name="Tabla1.3">
      <table:table-cell table:style-name="Tabla1.A1" office:value-type="string">
-      <text:p text:style-name="P21">DURACIÓN CONTRATO</text:p>
+      <text:p text:style-name="P38">DURACIÓN CONTRATO</text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tabla1.A1" office:value-type="string">
-      <text:p text:style-name="P44">EL PRESENTE TENDRÁ UNA DURACIÓN DE UN AÑO CONTADO DESDE LA FECHA DE LA FIRMA DE ESTE CONTRATO.</text:p>
+      <text:p text:style-name="P27">EL PRESENTE TENDRÁ UNA DURACIÓN DE UN AÑO CONTADO DESDE LA FECHA DE LA FIRMA DE ESTE CONTRATO.</text:p>
      </table:table-cell>
     </table:table-row>
     <table:table-row table:style-name="Tabla1.4">
      <table:table-cell table:style-name="Tabla1.A1" office:value-type="string">
-      <text:p text:style-name="P21">VALOR ANUAL</text:p>
+      <text:p text:style-name="P38">VALOR ANUAL</text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tabla1.A1" office:value-type="string">
-      <text:p text:style-name="P35"><text:span text:style-name="T17">LAS SUMA DE </text:span><text:span text:style-name="T21"><text:s/>(</text:span><text:span text:style-name="T22">$ <text:s/></text:span><text:span text:style-name="T16"><text:placeholder text:placeholder-type="text">&lt;subscription.price_contract&gt;</text:placeholder></text:span><text:span text:style-name="T21">M/Cte.) ESTA SUMA SERA CANCELADA EL DÍA DE LA FIRMA DEL CONTRATO. </text:span></text:p>
+      <text:p text:style-name="P18"><text:span text:style-name="T30">LAS SUMA DE </text:span><text:span text:style-name="T34"><text:s/>(</text:span><text:span text:style-name="T35">$ <text:s/></text:span><text:span text:style-name="T29"><text:placeholder text:placeholder-type="text">&lt;subscription.price_contract&gt;</text:placeholder></text:span><text:span text:style-name="T34">M/Cte.) ESTA SUMA SERA CANCELADA EL DÍA DE LA FIRMA DEL CONTRATO. </text:span></text:p>
      </table:table-cell>
     </table:table-row>
     <table:table-row table:style-name="Tabla1.5">
      <table:table-cell table:style-name="Tabla1.A1" office:value-type="string">
-      <text:p text:style-name="P21">OBSERVACIÓN</text:p>
-      <text:p text:style-name="P21"/>
+      <text:p text:style-name="P38">OBSERVACIÓN</text:p>
+      <text:p text:style-name="P38"/>
      </table:table-cell>
      <table:table-cell table:style-name="Tabla1.A1" office:value-type="string">
-      <text:p text:style-name="P36"><text:span text:style-name="T17">ESTE CONTRATO NO INCLUYE EL MANTENIMIENTO CORRECTIVO DE LOS EQUIPOS DE OPTOMETRÍA. SIN EMBARGO, </text:span><text:span text:style-name="T21">EL COSTO DE ESTE SERVICIO ADICIONAL TENDRÁ UN DESCUENTO DEL 50%.</text:span></text:p>
+      <text:p text:style-name="P19"><text:span text:style-name="T30">ESTE CONTRATO NO INCLUYE EL MANTENIMIENTO CORRECTIVO DE LOS EQUIPOS DE OPTOMETRÍA. SIN EMBARGO, </text:span><text:span text:style-name="T34">EL COSTO DE ESTE SERVICIO ADICIONAL TENDRÁ UN DESCUENTO DEL 50%.</text:span></text:p>
      </table:table-cell>
     </table:table-row>
    </table:table>
-   <text:p text:style-name="P19"/>
-   <text:p text:style-name="P19"><text:s/>INFORMACIÓN DEL CONTRATISTA</text:p>
-   <text:p text:style-name="P19"/>
+   <text:p text:style-name="P36"/>
+   <text:p text:style-name="P36"><text:s/>INFORMACIÓN DEL CONTRATISTA</text:p>
+   <text:p text:style-name="P36"/>
    <table:table table:name="Tabla2" table:style-name="Tabla2">
     <table:table-column table:style-name="Tabla2.A"/>
     <table:table-column table:style-name="Tabla2.B"/>
     <table:table-row table:style-name="Tabla2.1">
      <table:table-cell table:style-name="Tabla2.A1" office:value-type="string">
-      <text:p text:style-name="P21">NOMBRE</text:p>
+      <text:p text:style-name="P38">NOMBRE</text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tabla2.A1" office:value-type="string">
-      <text:p text:style-name="P47"><text:placeholder text:placeholder-type="text" text:description="subscription.company.rec_name">&lt;subscription.company.rec_name&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P45"><text:placeholder text:placeholder-type="text" text:description="subscription.company.rec_name">&lt;subscription.company.rec_name&gt;</text:placeholder></text:p>
      </table:table-cell>
     </table:table-row>
     <table:table-row table:style-name="Tabla2.2">
      <table:table-cell table:style-name="Tabla2.A1" office:value-type="string">
-      <text:p text:style-name="P21">NIT</text:p>
+      <text:p text:style-name="P38">NIT</text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tabla2.A1" office:value-type="string">
-      <text:p text:style-name="P48"><text:placeholder text:placeholder-type="text" text:description="subscription.company.party.tax_identifier.code">&lt;subscription.company.party.tax_identifier.code&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P46"><text:placeholder text:placeholder-type="text" text:description="subscription.company.party.tax_identifier.code">&lt;subscription.company.party.tax_identifier.code&gt;</text:placeholder></text:p>
      </table:table-cell>
     </table:table-row>
     <table:table-row table:style-name="Tabla2.3">
      <table:table-cell table:style-name="Tabla2.A1" office:value-type="string">
-      <text:p text:style-name="P21">DIRECCIÓN</text:p>
+      <text:p text:style-name="P38">DIRECCIÓN</text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tabla2.A1" office:value-type="string">
-      <text:p text:style-name="P12"><text:placeholder text:placeholder-type="text" text:description="subscription.company.party.addresses[0].street">&lt;subscription.company.party.addresses[0].street&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P58"><text:placeholder text:placeholder-type="text" text:description="subscription.company.party.addresses[0].street">&lt;subscription.company.party.addresses[0].street&gt;</text:placeholder></text:p>
      </table:table-cell>
     </table:table-row>
     <table:table-row table:style-name="Tabla2.4">
      <table:table-cell table:style-name="Tabla2.A1" office:value-type="string">
-      <text:p text:style-name="P21">TELÉFONOS</text:p>
+      <text:p text:style-name="P38">TELÉFONOS</text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tabla2.A1" office:value-type="string">
-      <text:p text:style-name="P12"><text:placeholder text:placeholder-type="text" text:description="subscription.company.party.phone">&lt;subscription.company.party.phone&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P58"><text:placeholder text:placeholder-type="text" text:description="subscription.company.party.phone">&lt;subscription.company.party.phone&gt;</text:placeholder></text:p>
      </table:table-cell>
     </table:table-row>
     <table:table-row table:style-name="Tabla2.5">
      <table:table-cell table:style-name="Tabla2.A1" office:value-type="string">
-      <text:p text:style-name="P21">E - MAIL</text:p>
+      <text:p text:style-name="P38">E - MAIL</text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tabla2.A1" office:value-type="string">
-      <text:p text:style-name="P13"><text:placeholder text:placeholder-type="text" text:description="subscription.company.party.email">&lt;subscription.company.party.email&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P59"><text:placeholder text:placeholder-type="text" text:description="subscription.company.party.email">&lt;subscription.company.party.email&gt;</text:placeholder></text:p>
      </table:table-cell>
     </table:table-row>
     <table:table-row table:style-name="Tabla2.5">
      <table:table-cell table:style-name="Tabla2.A1" office:value-type="string">
-      <text:p text:style-name="P21">WEB</text:p>
+      <text:p text:style-name="P38">WEB</text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tabla2.A1" office:value-type="string">
-      <text:p text:style-name="P13"><text:placeholder text:placeholder-type="text" text:description="subscription.company.party.website">&lt;subscription.company.party.website&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P59"><text:placeholder text:placeholder-type="text" text:description="subscription.company.party.website">&lt;subscription.company.party.website&gt;</text:placeholder></text:p>
      </table:table-cell>
     </table:table-row>
    </table:table>
-   <text:p text:style-name="P19"/>
-   <text:p text:style-name="P19">INFORMACIÓN DEL CONTRATANTE</text:p>
-   <text:p text:style-name="P19"/>
+   <text:p text:style-name="P36"/>
+   <text:p text:style-name="P36">INFORMACIÓN DEL CONTRATANTE</text:p>
+   <text:p text:style-name="P36"/>
    <table:table table:name="Tabla3" table:style-name="Tabla3">
     <table:table-column table:style-name="Tabla3.A"/>
     <table:table-column table:style-name="Tabla3.B"/>
     <table:table-row table:style-name="Tabla3.1">
      <table:table-cell table:style-name="Tabla3.A1" office:value-type="string">
-      <text:p text:style-name="P21">NOMBRE</text:p>
+      <text:p text:style-name="P38">NOMBRE</text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tabla3.A1" office:value-type="string">
-      <text:p text:style-name="P49"><text:placeholder text:placeholder-type="text" text:description="subscription.party.name">&lt;subscription.party.name&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P47"><text:placeholder text:placeholder-type="text" text:description="subscription.party.name">&lt;subscription.party.name&gt;</text:placeholder></text:p>
      </table:table-cell>
     </table:table-row>
     <table:table-row table:style-name="Tabla3.1">
      <table:table-cell table:style-name="Tabla3.A1" office:value-type="string">
-      <text:p text:style-name="P21">NIT O CEDULA</text:p>
+      <text:p text:style-name="P38">NIT O CEDULA</text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tabla3.A1" office:value-type="string">
-      <text:p text:style-name="P49"><text:placeholder text:placeholder-type="text" text:description="subscription.party.tax_identifier.code">&lt;subscription.party.tax_identifier.code&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P47"><text:placeholder text:placeholder-type="text" text:description="subscription.party.tax_identifier.code">&lt;subscription.party.tax_identifier.code&gt;</text:placeholder></text:p>
      </table:table-cell>
     </table:table-row>
     <table:table-row table:style-name="Tabla3.1">
      <table:table-cell table:style-name="Tabla3.A1" office:value-type="string">
-      <text:p text:style-name="P21">DIRECCIÓN</text:p>
+      <text:p text:style-name="P38">DIRECCIÓN</text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tabla3.A1" office:value-type="string">
-      <text:p text:style-name="P49"><text:placeholder text:placeholder-type="text" text:description="subscription.invoice_address.street">&lt;subscription.invoice_address.street&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P47"><text:placeholder text:placeholder-type="text" text:description="subscription.invoice_address.street">&lt;subscription.invoice_address.street&gt;</text:placeholder></text:p>
      </table:table-cell>
     </table:table-row>
     <table:table-row table:style-name="Tabla3.1">
      <table:table-cell table:style-name="Tabla3.A1" office:value-type="string">
-      <text:p text:style-name="P21">TELÉFONOS</text:p>
+      <text:p text:style-name="P38">TELÉFONOS</text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tabla3.A1" office:value-type="string">
-      <text:p text:style-name="P49"><text:placeholder text:placeholder-type="text" text:description="subscription.party.phone">&lt;subscription.party.phone&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P47"><text:placeholder text:placeholder-type="text" text:description="subscription.party.phone">&lt;subscription.party.phone&gt;</text:placeholder></text:p>
      </table:table-cell>
     </table:table-row>
     <table:table-row table:style-name="Tabla3.1">
      <table:table-cell table:style-name="Tabla3.A1" office:value-type="string">
-      <text:p text:style-name="P21">E-MAIL</text:p>
+      <text:p text:style-name="P38">E-MAIL</text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tabla3.A1" office:value-type="string">
-      <text:p text:style-name="P49"><text:placeholder text:placeholder-type="text" text:description="subscription.party.email">&lt;subscription.party.email&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P47"><text:placeholder text:placeholder-type="text" text:description="subscription.party.email">&lt;subscription.party.email&gt;</text:placeholder></text:p>
      </table:table-cell>
     </table:table-row>
    </table:table>
-   <text:p text:style-name="P19"><text:bookmark-end text:name="OLE_LINK1"/><text:bookmark-end text:name="OLE_LINK2"/></text:p>
-   <text:p text:style-name="P37"><text:span text:style-name="T17">Entre los suscritos a saber </text:span><text:span text:style-name="T11">EL CONTRATANTE Y EL CONTRATISTA</text:span><text:span text:style-name="T17">, hemos convenido celebrar el presente CONTRATO DE PRESTACIÓN DE </text:span><text:span text:style-name="T13">SERVICIOS DE MANTENIMIENTO TÉCNICO PREVENTIVO, </text:span><text:span text:style-name="T19">que</text:span><text:span text:style-name="T24"> </text:span><text:span text:style-name="T26">se regulará por las cláusulas que a continuación se expresan y en general por las disposiciones del Código Civil y Código de Comercio aplicables a la materia de qué trata este contrato: </text:span></text:p>
-   <text:p text:style-name="P45"/>
-   <text:p text:style-name="P37"><text:span text:style-name="T13">PRIMERA - OBJETO: </text:span><text:span text:style-name="T11">El CONTRATISTA</text:span><text:span text:style-name="T19"> se obliga para con </text:span><text:span text:style-name="T11">El CONTRATANTE</text:span><text:span text:style-name="T19"> a ejecutar los trabajos y demás actividades propias del servicio contratado, el cual debe realizar de conformidad con las condiciones y cláusulas del presente documento y que consistirá en el mantenimiento técnico preventivo sin repuestos a los equipos de optometría de propiedad del CONTRATANTE los cuales se encuentran relacionados e identificados en el anexo 1 del presente documento. </text:span></text:p>
-   <text:p text:style-name="P46"/>
-   <text:p text:style-name="P37"><text:span text:style-name="T11">SEGUNDA - VALOR: </text:span><text:span text:style-name="T19">El valor de este contrato será el señalado en la sección de datos generales</text:span><text:span text:style-name="T13">. </text:span></text:p>
-   <text:p text:style-name="P18"/>
-   <text:p text:style-name="P37"><text:span text:style-name="T11">TERCERA - FORMA DE PAGO: EL CONTRATANTE </text:span><text:span text:style-name="T19">pagara </text:span><text:span text:style-name="T11">AL CONTRATISTA</text:span><text:span text:style-name="T19"> el valor del contrato en a la firma del presente documento.</text:span></text:p>
-   <text:p text:style-name="P46"/>
-   <text:p text:style-name="P38"><text:span text:style-name="T11">CUARTA </text:span><text:span text:style-name="T13">- PLAZO:</text:span><text:span text:style-name="T17"> El plazo para la ejecución del contrato será contado desde la fecha de inicio y tendrá una duración de un año. Es decir, que este contrato inicia el día </text:span><text:span text:style-name="T14"><text:placeholder text:placeholder-type="text" text:description="subscription.start_date">&lt;subscription.start_date&gt;</text:placeholder></text:span><text:span text:style-name="T17"><text:s/>y finaliza el </text:span><text:span text:style-name="T14"><text:placeholder text:placeholder-type="text" text:description="subscription.end_date">&lt;subscription.end_date&gt;</text:placeholder></text:span><text:span text:style-name="T17"><text:s/>. </text:span></text:p>
-   <text:p text:style-name="P45"/>
-   <text:p text:style-name="P37"><text:span text:style-name="T13">QUINTA</text:span><text:span text:style-name="T17"> </text:span><text:span text:style-name="T24">– PRORROGA:</text:span><text:span text:style-name="T26"> Si vencido el plazo establecido para la ejecución del contrato de prestación de servicios de mantenimiento técnico preventivo </text:span><text:span text:style-name="T24">EL CONTRATANTE </text:span><text:span text:style-name="T27">no ha comunicado</text:span><text:span text:style-name="T24"> AL CONTRATISTA</text:span><text:span text:style-name="T27"> la intención de dar por terminado el contrato de manera escrita, con una antelación de dos meses al vencimiento del contrato este se entenderá prorrogado automáticamente, por un tiempo al igualmente pactado y por un valor al inicialmente fijado más el incremento del IPC del año anterior. El contrato se podrá prorrogar de manera indefinida y en cada una de sus prorrogas se seguirán los lineamientos establecidos aquí, respectivamente. </text:span><text:span text:style-name="T24">PARÁGRAFO:</text:span><text:span text:style-name="T27"> </text:span><text:span text:style-name="T24">EL CONTRATATE</text:span><text:span text:style-name="T27"> deberá cancelar el valor del contrato dentro de los 10 días siguientes a la fecha de inicio de cada una sus prorrogas y </text:span><text:span text:style-name="T24">EL CONTRATISTA</text:span><text:span text:style-name="T27"> deberá entregar la prórroga del contrato.</text:span></text:p>
+   <text:p text:style-name="P36"><text:bookmark-end text:name="OLE_LINK1"/><text:bookmark-end text:name="OLE_LINK2"/></text:p>
+   <text:p text:style-name="P20"><text:span text:style-name="T30">Entre los suscritos a saber </text:span><text:span text:style-name="T24">EL CONTRATANTE Y EL CONTRATISTA</text:span><text:span text:style-name="T30">, hemos convenido celebrar el presente CONTRATO DE PRESTACIÓN DE </text:span><text:span text:style-name="T26">SERVICIOS DE MANTENIMIENTO TÉCNICO PREVENTIVO, </text:span><text:span text:style-name="T32">que</text:span><text:span text:style-name="T37"> </text:span><text:span text:style-name="T39">se regulará por las cláusulas que a continuación se expresan y en general por las disposiciones del Código Civil y Código de Comercio aplicables a la materia de qué trata este contrato: </text:span></text:p>
+   <text:p text:style-name="P28"/>
+   <text:p text:style-name="P20"><text:span text:style-name="T26">PRIMERA - OBJETO: </text:span><text:span text:style-name="T24">El CONTRATISTA</text:span><text:span text:style-name="T32"> se obliga para con </text:span><text:span text:style-name="T24">El CONTRATANTE</text:span><text:span text:style-name="T32"> a ejecutar los trabajos y demás actividades propias del servicio contratado, el cual debe realizar de conformidad con las condiciones y cláusulas del presente documento y que consistirá en el mantenimiento técnico preventivo sin repuestos a los equipos de optometría de propiedad del CONTRATANTE los cuales se encuentran relacionados e identificados en el anexo 1 del presente documento. </text:span></text:p>
+   <text:p text:style-name="P29"/>
+   <text:p text:style-name="P20"><text:span text:style-name="T24">SEGUNDA - VALOR: </text:span><text:span text:style-name="T32">El valor de este contrato será el señalado en la sección de datos generales</text:span><text:span text:style-name="T26">. </text:span></text:p>
+   <text:p text:style-name="P35"/>
+   <text:p text:style-name="P20"><text:span text:style-name="T24">TERCERA - FORMA DE PAGO: EL CONTRATANTE </text:span><text:span text:style-name="T32">pagara </text:span><text:span text:style-name="T24">AL CONTRATISTA</text:span><text:span text:style-name="T32"> el valor del contrato en a la firma del presente documento.</text:span></text:p>
+   <text:p text:style-name="P29"/>
+   <text:p text:style-name="P21"><text:span text:style-name="T24">CUARTA </text:span><text:span text:style-name="T26">- PLAZO:</text:span><text:span text:style-name="T30"> El plazo para la ejecución del contrato será contado desde la fecha de inicio y tendrá una duración de un año. Es decir, que este contrato inicia el día </text:span><text:span text:style-name="T27"><text:placeholder text:placeholder-type="text" text:description="subscription.start_date">&lt;subscription.start_date&gt;</text:placeholder></text:span><text:span text:style-name="T30"><text:s/>y finaliza el </text:span><text:span text:style-name="T27"><text:placeholder text:placeholder-type="text" text:description="subscription.end_date">&lt;subscription.end_date&gt;</text:placeholder></text:span><text:span text:style-name="T30"><text:s/>. </text:span></text:p>
+   <text:p text:style-name="P28"/>
+   <text:p text:style-name="P20"><text:span text:style-name="T26">QUINTA</text:span><text:span text:style-name="T30"> </text:span><text:span text:style-name="T37">– PRORROGA:</text:span><text:span text:style-name="T39"> Si vencido el plazo establecido para la ejecución del contrato de prestación de servicios de mantenimiento técnico preventivo </text:span><text:span text:style-name="T37">EL CONTRATANTE </text:span><text:span text:style-name="T40">no ha comunicado</text:span><text:span text:style-name="T37"> AL CONTRATISTA</text:span><text:span text:style-name="T40"> la intención de dar por terminado el contrato de manera escrita, con una antelación de dos meses al vencimiento del contrato este se entenderá prorrogado automáticamente, por un tiempo al igualmente pactado y por un valor al inicialmente fijado más el incremento del IPC del año anterior. El contrato se podrá prorrogar de manera indefinida y en cada una de sus prorrogas se seguirán los lineamientos establecidos aquí, respectivamente. </text:span><text:span text:style-name="T37">PARÁGRAFO:</text:span><text:span text:style-name="T40"> </text:span><text:span text:style-name="T37">EL CONTRATATE</text:span><text:span text:style-name="T40"> deberá cancelar el valor del contrato dentro de los 10 días siguientes a la fecha de inicio de cada una sus prorrogas y </text:span><text:span text:style-name="T37">EL CONTRATISTA</text:span><text:span text:style-name="T40"> deberá entregar la prórroga del contrato.</text:span></text:p>
+   <text:p text:style-name="P49"/>
+   <text:p text:style-name="P20"><text:soft-page-break/><text:span text:style-name="T37">SEXTA – OBLIGACIONES DEL CONTRATANTE: <text:s/></text:span><text:span text:style-name="T24">1</text:span><text:span text:style-name="T30">. Cumplir a cabalidad con las cláusulas pactadas en el presente contrato, las cuales solamente podrán ser modificadas por medio de documento adicional firmado por las partes. </text:span><text:span text:style-name="T24">2.</text:span><text:span text:style-name="T30"> Atender con diligencia, celeridad y prioridad las indicaciones que </text:span><text:span text:style-name="T24">EL CONTRATISTA </text:span><text:span text:style-name="T30">le</text:span><text:span text:style-name="T24"> </text:span><text:span text:style-name="T30">realice con el objetivo de cumplir con el desarrollo normal del objeto del contrato. </text:span><text:span text:style-name="T26">3.</text:span><text:span text:style-name="T30"> Pagar oportunamente a </text:span><text:span text:style-name="T24">EL CONTRATISTA</text:span><text:span text:style-name="T30"> el valor de los bienes y/o servicios contratados en la forma, fecha y valor pactados en el contrato durante su vigencia y sus prorrogas.</text:span><text:span text:style-name="T36"> 4.</text:span><text:span text:style-name="T40"> Entregar toda la información que solicite </text:span><text:span text:style-name="T36">EL CONTRATISTA</text:span><text:span text:style-name="T40"> para poder desarrollar con normalidad su labor de mantenimiento técnico preventivo. </text:span><text:span text:style-name="T37">5.</text:span><text:span text:style-name="T40"> Realizar los pagos adicionales que surjan durante la realización del mantenimiento preventivo y/o correctivo si se llega a contratar de manera adicional</text:span><text:bookmark text:name="_GoBack"/><text:span text:style-name="T40">. </text:span><text:span text:style-name="T37">6.</text:span><text:span text:style-name="T40"> </text:span><text:span text:style-name="T37">EL CONTRATANTE </text:span><text:span text:style-name="T40">deberá abstenerse</text:span><text:span text:style-name="T37"> </text:span><text:span text:style-name="T40">de realizar oferta alguna de trabajo o contrato al personal o dependientes del </text:span><text:span text:style-name="T37">CONTRATISTA.</text:span><text:span text:style-name="T40"> </text:span></text:p>
    <text:p text:style-name="P51"/>
-   <text:p text:style-name="P37"><text:soft-page-break/><text:span text:style-name="T24">SEXTA – OBLIGACIONES DEL CONTRATANTE: <text:s/></text:span><text:span text:style-name="T11">1</text:span><text:span text:style-name="T17">. Cumplir a cabalidad con las cláusulas pactadas en el presente contrato, las cuales solamente podrán ser modificadas por medio de documento adicional firmado por las partes. </text:span><text:span text:style-name="T11">2.</text:span><text:span text:style-name="T17"> Atender con diligencia, celeridad y prioridad las indicaciones que </text:span><text:span text:style-name="T11">EL CONTRATISTA </text:span><text:span text:style-name="T17">le</text:span><text:span text:style-name="T11"> </text:span><text:span text:style-name="T17">realice con el objetivo de cumplir con el desarrollo normal del objeto del contrato. </text:span><text:span text:style-name="T13">3.</text:span><text:span text:style-name="T17"> Pagar oportunamente a </text:span><text:span text:style-name="T11">EL CONTRATISTA</text:span><text:span text:style-name="T17"> el valor de los bienes y/o servicios contratados en la forma, fecha y valor pactados en el contrato durante su vigencia y sus prorrogas.</text:span><text:span text:style-name="T23"> 4.</text:span><text:span text:style-name="T27"> Entregar toda la información que solicite </text:span><text:span text:style-name="T23">EL CONTRATISTA</text:span><text:span text:style-name="T27"> para poder desarrollar con normalidad su labor de mantenimiento técnico preventivo. </text:span><text:span text:style-name="T24">5.</text:span><text:span text:style-name="T27"> Realizar los pagos adicionales que surjan durante la realización del mantenimiento preventivo y/o correctivo si se llega a contratar de manera adicional</text:span><text:bookmark text:name="_GoBack"/><text:span text:style-name="T27">. </text:span><text:span text:style-name="T24">6.</text:span><text:span text:style-name="T27"> </text:span><text:span text:style-name="T24">EL CONTRATANTE </text:span><text:span text:style-name="T27">deberá abstenerse</text:span><text:span text:style-name="T24"> </text:span><text:span text:style-name="T27">de realizar oferta alguna de trabajo o contrato al personal o dependientes del </text:span><text:span text:style-name="T24">CONTRATISTA.</text:span><text:span text:style-name="T27"> </text:span></text:p>
-   <text:p text:style-name="P53"/>
-   <text:p text:style-name="P37"><text:span text:style-name="T24">SÉPTIMA </text:span><text:span text:style-name="T13">OBLIGACIONES DEL CONTRATISTA:</text:span><text:span text:style-name="T17"> </text:span><text:span text:style-name="T11">1</text:span><text:span text:style-name="T17">. Cumplir a cabalidad con las cláusulas pactadas en el presente contrato, las cuales solamente podrán ser modificadas por medio de documento adicional firmado por las partes. </text:span><text:span text:style-name="T11">2. </text:span><text:span text:style-name="T26">Realizar el mantenimiento preventivo a los equipos de optometría de propiedad del </text:span><text:span text:style-name="T23">CONTRATANTE.</text:span><text:span text:style-name="T26"> </text:span><text:span text:style-name="T13">3</text:span><text:span text:style-name="T26">. </text:span><text:span text:style-name="T17">Realizar las observaciones que considere pertinentes dentro de la ejecución del objeto del presente contrato. </text:span><text:span text:style-name="T13">4</text:span><text:span text:style-name="T26">. Obrar con seriedad y diligencia en el servicio contratado</text:span><text:span text:style-name="T24"> 5</text:span><text:span text:style-name="T26">. Atender las solicitudes y recomendaciones que haga </text:span><text:span text:style-name="T24">EL CONTRATANTE</text:span><text:span text:style-name="T26"> o sus delegados, con la mayor prontitud. </text:span></text:p>
-   <text:p text:style-name="P52"/>
-   <text:p text:style-name="P37"><text:span text:style-name="T23">OCTAVA</text:span><text:span text:style-name="T24"> – </text:span><text:span text:style-name="T13">CAUSALES DE TERMINACION DEL CONTRATO: </text:span><text:span text:style-name="T17">El presente contrato terminará por acuerdo entre las partes y unilateralmente por el incumplimiento de las obligaciones derivadas del contrato. Finalmente, por la ocurrencia de hechos imprevisibles que imposibiliten su cumplimiento. </text:span></text:p>
-   <text:p text:style-name="P45"/>
-   <text:p text:style-name="P37"><text:span text:style-name="T24">NOVENA - </text:span><text:span text:style-name="T11">CERTIFICADOS: EL CONTRATISTA </text:span><text:span text:style-name="T17">expedirá las respectivas hojas de vida y/o certificados de los equipos para que </text:span><text:span text:style-name="T11">EL CONTRATANTE </text:span><text:span text:style-name="T17">puede presentarlos ante la autoridad competente. Estos serán expedidos por </text:span><text:span text:style-name="T11">EL CONTRATISTA</text:span><text:span text:style-name="T17"> en una sola oportunidad durante la vigencia del contrato. </text:span><text:span text:style-name="T24">PARÁGRAFO: </text:span><text:span text:style-name="T19">En caso de que </text:span><text:span text:style-name="T13">EL CONTRATANTE</text:span><text:span text:style-name="T19"> se traslade o mueva los equipos y deban volverse a generar los documentos; se generara un costo adicional.</text:span></text:p>
-   <text:p text:style-name="P45"/>
-   <text:p text:style-name="P37"><text:span text:style-name="T23">DECIMA - </text:span><text:span text:style-name="T24">DERECHOS LABORALES Y SEGURIDAD SOCIAL: </text:span><text:span text:style-name="T13">El CONTRATISTA</text:span><text:span text:style-name="T17"> en su calidad de persona jurídica, garantizara el pago de los derechos laborales y seguridad social de sus trabajadores y/o dependientes que envié para el cumplimiento del objeto del contrato. Razón por la cual, </text:span><text:span text:style-name="T11">EL CONTRATISTA</text:span><text:span text:style-name="T17"> mantendrá indemne a </text:span><text:span text:style-name="T11">EL CONTRATANTE</text:span><text:span text:style-name="T17"> ante cualquier demanda o acción judicial o administrativa con ocasión de la ejecución del presente contrato; relacionada con el derecho laboral y la seguridad social. </text:span></text:p>
-   <text:p text:style-name="P45"/>
-   <text:p text:style-name="P37"><text:span text:style-name="T11">DECIMA PRIMERA – </text:span><text:span text:style-name="T13">PERFECCIONAMIENTO:</text:span><text:span text:style-name="T17"> El contrato se entiende perfeccionado una vez suscrito por las partes, de conformidad con lo establecido en la ley y para todos sus efectos presta merito ejecutivo.</text:span></text:p>
-   <text:p text:style-name="P46"/>
-   <text:p text:style-name="P37"><text:span text:style-name="T11">DECIMA SEGUNDA </text:span><text:span text:style-name="T13">- VALIDEZ:</text:span><text:span text:style-name="T17"> El presente contrato anula todo contrato de prestación de servicios de mantenimiento preventivo anterior suscrito por las partes y solamente podrá ser modificado por escrito suscrito por la Partes. </text:span></text:p>
-   <text:p text:style-name="P45"/>
-   <text:p text:style-name="P37"><text:span text:style-name="T13">DECIMA TERCERA – CESION: El CONTRATISTA </text:span><text:span text:style-name="T17">no podrá ceder parcial ni totalmente la ejecución del presente contrato a un tercero, sin la previa, expresa y escrita autorización del</text:span><text:span text:style-name="T13"> CONTRATANTE.</text:span></text:p>
-   <text:p text:style-name="P37"><text:span text:style-name="T13">DECIMA CUARTA – COFIDENCIALIDAD:</text:span><text:span text:style-name="T19"> Las partes acuerdan que ellas y sus empleados se abstendrán de divulgar, publicar o comunicar, directa o indirectamente a terceros la información, documentos o fotografías, relacionados con los documentos que conozcan en desarrollo y por virtud del presente contrato o por cualquier otra causa. Para estos efectos las partes convienen que toda información que reciba </text:span><text:span text:style-name="T13">EL CONTRATISTA</text:span><text:span text:style-name="T19"> o </text:span><text:span text:style-name="T13">EL CONTRATANTE,</text:span><text:span text:style-name="T19"> para la ejecución del presente contrato, se considera importante y confidencial y divulgarla y/o transmitirla, puede lesionar los intereses públicos de las partes.</text:span></text:p>
-   <text:p text:style-name="P18"/>
-   <text:p text:style-name="P37"><text:span text:style-name="T13">DECIMA QUINTA – CLÁUSULA PENAL: </text:span><text:span text:style-name="T17">En el evento de incumplimiento por parte del </text:span><text:span text:style-name="T13">CONTRATISTA o DEL CONTRATANTE</text:span><text:span text:style-name="T17"> a las obligaciones a su cargo contenidas en la ley o en este Contrato. Deberá pagar el 30% del valor total del contrato, a título de pena.</text:span></text:p>
-   <text:p text:style-name="P45"/>
-   <text:p text:style-name="P37"><text:span text:style-name="T13">DECIMA SEXTA – </text:span><text:span text:style-name="T24">CLÁUSULA COMPROMISORIA: </text:span><text:span text:style-name="T26">Toda controversia o diferencia relativa a este contrato, su ejecución y liquidación, se resolverá por un tribunal de arbitramento que por economía será designado por las partes, está conformado por solamente un árbitro y será en el domicilio contractual establecido en este contrato. El tribunal de Arbitramento se sujetará a lo dispuesto en el decreto 1818 de 1998 o estatuto orgánico de los sistemas alternativos de solución de conflictos y demás normas concordantes</text:span><text:span text:style-name="T24">.</text:span></text:p>
-   <text:p text:style-name="P45"/>
-   <text:p text:style-name="P37"><text:span text:style-name="T13">DECIMA SÉPTIMA </text:span><text:span text:style-name="T11">– </text:span><text:span text:style-name="T13">DOMICILIO CONTRACTUAL Y NOTIFICACIONES</text:span><text:span text:style-name="T17">: Las partes contratantes convienen que, para todos los efectos legales, judiciales o extrajudiciales, que diere a lugar el presente contrato será el domicilio la ciudad de Bogotá D.C., las direcciones de Notificación de las partes serán las establecidas en la parte inicial del presente contrato. Las comunicaciones remitidas a las direcciones aquí señaladas serán válidas aún en el caso en que las partes hayan variado su ubicación si, antes de la fecha de la comunicación, la parte que ha variado su dirección no ha avisado por escrito a la otra sobre este hecho, las cuales se tendrán por recibidas y producirán efectos al tercer día hábil siguiente al recibo de la comunicación.</text:span></text:p>
-   <text:p text:style-name="P22"/>
-   <text:p text:style-name="P37"><text:span text:style-name="T13">DECIMA OCTAVA - </text:span><text:span text:style-name="T11">IMPUESTOS: </text:span><text:span text:style-name="T17">Los impuestos que se generen por la ejecución y desarrollo de este contrato, serán asumidos por las partes de conformidad con lo establecido por régimen tributario y legal, y demás directrices establecidas por la DIAN.</text:span></text:p>
-   <text:p text:style-name="P45"><text:soft-page-break/></text:p>
-   <text:p text:style-name="P37"><text:span text:style-name="T13">DECIMA NOVENA - FORMALIDADES E INEFICACIA:</text:span><text:span text:style-name="T17"> Cualquier modificación deberá costar por escrito, con la firma de la totalidad de las partes, no tendrá validez acuerdos verbales de ningún tipo, ya que las partes acuerdan que este es un contrato que exige como formalidad para su modificación, el medio escrito como única prueba de validez de dichos pactos, así como para exigir su cumplimiento o el pago de las obligaciones que de él surjan.</text:span></text:p>
-   <text:p text:style-name="P45"/>
-   <text:p text:style-name="P39"><text:span text:style-name="T17">Para constancia, el presente Contrato es suscrito en la ciudad de Bogotá el día </text:span><text:span text:style-name="T28"><text:placeholder text:placeholder-type="text" text:description="subscription.start_date">&lt;subscription.start_date&gt;</text:placeholder></text:span><text:span text:style-name="T21">, en dos (2) ejemplares de igual valor, cada uno de ellos con destino a cada una de las Partes.</text:span></text:p>
-   <text:p text:style-name="P22"/>
-   <text:p text:style-name="P22"/>
-   <text:p text:style-name="P40"><draw:frame draw:style-name="fr2" draw:name="Image1" text:anchor-type="char" svg:x="0.0138in" svg:y="0.1118in" svg:width="1.7283in" svg:height="0.9563in" draw:z-index="5"><draw:image draw:mime-type="image/png">
+   <text:p text:style-name="P20"><text:span text:style-name="T37">SÉPTIMA </text:span><text:span text:style-name="T26">OBLIGACIONES DEL CONTRATISTA:</text:span><text:span text:style-name="T30"> </text:span><text:span text:style-name="T24">1</text:span><text:span text:style-name="T30">. Cumplir a cabalidad con las cláusulas pactadas en el presente contrato, las cuales solamente podrán ser modificadas por medio de documento adicional firmado por las partes. </text:span><text:span text:style-name="T24">2. </text:span><text:span text:style-name="T39">Realizar el mantenimiento preventivo a los equipos de optometría de propiedad del </text:span><text:span text:style-name="T36">CONTRATANTE.</text:span><text:span text:style-name="T39"> </text:span><text:span text:style-name="T26">3</text:span><text:span text:style-name="T39">. </text:span><text:span text:style-name="T30">Realizar las observaciones que considere pertinentes dentro de la ejecución del objeto del presente contrato. </text:span><text:span text:style-name="T26">4</text:span><text:span text:style-name="T39">. Obrar con seriedad y diligencia en el servicio contratado</text:span><text:span text:style-name="T37"> 5</text:span><text:span text:style-name="T39">. Atender las solicitudes y recomendaciones que haga </text:span><text:span text:style-name="T37">EL CONTRATANTE</text:span><text:span text:style-name="T39"> o sus delegados, con la mayor prontitud. </text:span></text:p>
+   <text:p text:style-name="P50"/>
+   <text:p text:style-name="P20"><text:span text:style-name="T36">OCTAVA</text:span><text:span text:style-name="T37"> – </text:span><text:span text:style-name="T26">CAUSALES DE TERMINACION DEL CONTRATO: </text:span><text:span text:style-name="T30">El presente contrato terminará por acuerdo entre las partes y unilateralmente por el incumplimiento de las obligaciones derivadas del contrato. Finalmente, por la ocurrencia de hechos imprevisibles que imposibiliten su cumplimiento. </text:span></text:p>
+   <text:p text:style-name="P28"/>
+   <text:p text:style-name="P20"><text:span text:style-name="T37">NOVENA - </text:span><text:span text:style-name="T24">CERTIFICADOS: EL CONTRATISTA </text:span><text:span text:style-name="T30">expedirá las respectivas hojas de vida y/o certificados de los equipos para que </text:span><text:span text:style-name="T24">EL CONTRATANTE </text:span><text:span text:style-name="T30">puede presentarlos ante la autoridad competente. Estos serán expedidos por </text:span><text:span text:style-name="T24">EL CONTRATISTA</text:span><text:span text:style-name="T30"> en una sola oportunidad durante la vigencia del contrato. </text:span><text:span text:style-name="T37">PARÁGRAFO: </text:span><text:span text:style-name="T32">En caso de que </text:span><text:span text:style-name="T26">EL CONTRATANTE</text:span><text:span text:style-name="T32"> se traslade o mueva los equipos y deban volverse a generar los documentos; se generara un costo adicional.</text:span></text:p>
+   <text:p text:style-name="P28"/>
+   <text:p text:style-name="P20"><text:span text:style-name="T36">DECIMA - </text:span><text:span text:style-name="T37">DERECHOS LABORALES Y SEGURIDAD SOCIAL: </text:span><text:span text:style-name="T26">El CONTRATISTA</text:span><text:span text:style-name="T30"> en su calidad de persona jurídica, garantizara el pago de los derechos laborales y seguridad social de sus trabajadores y/o dependientes que envié para el cumplimiento del objeto del contrato. Razón por la cual, </text:span><text:span text:style-name="T24">EL CONTRATISTA</text:span><text:span text:style-name="T30"> mantendrá indemne a </text:span><text:span text:style-name="T24">EL CONTRATANTE</text:span><text:span text:style-name="T30"> ante cualquier demanda o acción judicial o administrativa con ocasión de la ejecución del presente contrato; relacionada con el derecho laboral y la seguridad social. </text:span></text:p>
+   <text:p text:style-name="P28"/>
+   <text:p text:style-name="P20"><text:span text:style-name="T24">DECIMA PRIMERA – </text:span><text:span text:style-name="T26">PERFECCIONAMIENTO:</text:span><text:span text:style-name="T30"> El contrato se entiende perfeccionado una vez suscrito por las partes, de conformidad con lo establecido en la ley y para todos sus efectos presta merito ejecutivo.</text:span></text:p>
+   <text:p text:style-name="P29"/>
+   <text:p text:style-name="P20"><text:span text:style-name="T24">DECIMA SEGUNDA </text:span><text:span text:style-name="T26">- VALIDEZ:</text:span><text:span text:style-name="T30"> El presente contrato anula todo contrato de prestación de servicios de mantenimiento preventivo anterior suscrito por las partes y solamente podrá ser modificado por escrito suscrito por la Partes. </text:span></text:p>
+   <text:p text:style-name="P28"/>
+   <text:p text:style-name="P20"><text:span text:style-name="T26">DECIMA TERCERA – CESION: El CONTRATISTA </text:span><text:span text:style-name="T30">no podrá ceder parcial ni totalmente la ejecución del presente contrato a un tercero, sin la previa, expresa y escrita autorización del</text:span><text:span text:style-name="T26"> CONTRATANTE.</text:span></text:p>
+   <text:p text:style-name="P20"><text:span text:style-name="T26">DECIMA CUARTA – COFIDENCIALIDAD:</text:span><text:span text:style-name="T32"> Las partes acuerdan que ellas y sus empleados se abstendrán de divulgar, publicar o comunicar, directa o indirectamente a terceros la información, documentos o fotografías, relacionados con los documentos que conozcan en desarrollo y por virtud del presente contrato o por cualquier otra causa. Para estos efectos las partes convienen que toda información que reciba </text:span><text:span text:style-name="T26">EL CONTRATISTA</text:span><text:span text:style-name="T32"> o </text:span><text:span text:style-name="T26">EL CONTRATANTE,</text:span><text:span text:style-name="T32"> para la ejecución del presente contrato, se considera importante y confidencial y divulgarla y/o transmitirla, puede lesionar los intereses públicos de las partes.</text:span></text:p>
+   <text:p text:style-name="P35"/>
+   <text:p text:style-name="P20"><text:span text:style-name="T26">DECIMA QUINTA – CLÁUSULA PENAL: </text:span><text:span text:style-name="T30">En el evento de incumplimiento por parte del </text:span><text:span text:style-name="T26">CONTRATISTA o DEL CONTRATANTE</text:span><text:span text:style-name="T30"> a las obligaciones a su cargo contenidas en la ley o en este Contrato. Deberá pagar el 30% del valor total del contrato, a título de pena.</text:span></text:p>
+   <text:p text:style-name="P28"/>
+   <text:p text:style-name="P20"><text:span text:style-name="T26">DECIMA SEXTA – </text:span><text:span text:style-name="T37">CLÁUSULA COMPROMISORIA: </text:span><text:span text:style-name="T39">Toda controversia o diferencia relativa a este contrato, su ejecución y liquidación, se resolverá por un tribunal de arbitramento que por economía será designado por las partes, está conformado por solamente un árbitro y será en el domicilio contractual establecido en este contrato. El tribunal de Arbitramento se sujetará a lo dispuesto en el decreto 1818 de 1998 o estatuto orgánico de los sistemas alternativos de solución de conflictos y demás normas concordantes</text:span><text:span text:style-name="T37">.</text:span></text:p>
+   <text:p text:style-name="P28"/>
+   <text:p text:style-name="P20"><text:span text:style-name="T26">DECIMA SÉPTIMA </text:span><text:span text:style-name="T24">– </text:span><text:span text:style-name="T26">DOMICILIO CONTRACTUAL Y NOTIFICACIONES</text:span><text:span text:style-name="T30">: Las partes contratantes convienen que, para todos los efectos legales, judiciales o extrajudiciales, que diere a lugar el presente contrato será el domicilio la ciudad de Bogotá D.C., las direcciones de Notificación de las partes serán las establecidas en la parte inicial del presente contrato. Las comunicaciones remitidas a las direcciones aquí señaladas serán válidas aún en el caso en que las partes hayan variado su ubicación si, antes de la fecha de la comunicación, la parte que ha variado su dirección no ha avisado por escrito a la otra sobre este hecho, las cuales se tendrán por recibidas y producirán efectos al tercer día hábil siguiente al recibo de la comunicación.</text:span></text:p>
+   <text:p text:style-name="P39"/>
+   <text:p text:style-name="P20"><text:span text:style-name="T26">DECIMA OCTAVA - </text:span><text:span text:style-name="T24">IMPUESTOS: </text:span><text:span text:style-name="T30">Los impuestos que se generen por la ejecución y desarrollo de este contrato, serán asumidos por las partes de conformidad con lo establecido por régimen tributario y legal, y demás directrices establecidas por la DIAN.</text:span></text:p>
+   <text:p text:style-name="P28"><text:soft-page-break/></text:p>
+   <text:p text:style-name="P20"><text:span text:style-name="T26">DECIMA NOVENA - FORMALIDADES E INEFICACIA:</text:span><text:span text:style-name="T30"> Cualquier modificación deberá costar por escrito, con la firma de la totalidad de las partes, no tendrá validez acuerdos verbales de ningún tipo, ya que las partes acuerdan que este es un contrato que exige como formalidad para su modificación, el medio escrito como única prueba de validez de dichos pactos, así como para exigir su cumplimiento o el pago de las obligaciones que de él surjan.</text:span></text:p>
+   <text:p text:style-name="P28"/>
+   <text:p text:style-name="P22"><text:span text:style-name="T30">Para constancia, el presente Contrato es suscrito en la ciudad de Bogotá el día </text:span><text:span text:style-name="T41"><text:placeholder text:placeholder-type="text" text:description="subscription.start_date">&lt;subscription.start_date&gt;</text:placeholder></text:span><text:span text:style-name="T34">, en dos (2) ejemplares de igual valor, cada uno de ellos con destino a cada una de las Partes.</text:span></text:p>
+   <text:p text:style-name="P39"/>
+   <text:p text:style-name="P39"/>
+   <text:p text:style-name="P23"><draw:frame draw:style-name="fr2" draw:name="Image1" text:anchor-type="char" svg:x="0.0138in" svg:y="0.1118in" svg:width="1.7283in" svg:height="0.9563in" draw:z-index="5"><draw:image draw:mime-type="image/png">
       <office:binary-data>iVBORw0KGgoAAAANSUhEUgAABA4AAAI+CAYAAAA8dEjXAAKLKElEQVR4nOz9B4Bd13UeCn97
        n3PvnV4ADHolwQawgypUBWXKsmRZcgMSx3qOXCIlTpzELY5f/j+Did9L3OTYUiyHcpEtK3YC
        qFik1QtAkaIosYoEwAIQvc8Mps9t55z91lp7n5kLYFBIAkRbH3lw5557et3ft9f6Vuycg0Kh
@@ -4867,77 +4875,77 @@
        gg==
       </office:binary-data>
      </draw:image>
-    </draw:frame><text:span text:style-name="T11">EL CONTRATISTA<text:tab/></text:span><text:span text:style-name="T15">EL CONTRATANTE</text:span></text:p>
-   <text:p text:style-name="P23"/>
-   <text:p text:style-name="P23"/>
-   <text:p text:style-name="P23"/>
-   <text:p text:style-name="P23"/>
-   <text:p text:style-name="P23"/>
-   <text:p text:style-name="P23"><draw:line text:anchor-type="paragraph" draw:z-index="0" draw:name="Línea horizontal 3" draw:style-name="gr2" draw:text-style-name="P61" svg:x1="-0.0083in" svg:y1="0.0902in" svg:x2="2.0752in" svg:y2="0.0902in">
+    </draw:frame><text:span text:style-name="T24">EL CONTRATISTA<text:tab/></text:span><text:span text:style-name="T28">EL CONTRATANTE</text:span></text:p>
+   <text:p text:style-name="P40"/>
+   <text:p text:style-name="P40"/>
+   <text:p text:style-name="P40"/>
+   <text:p text:style-name="P40"/>
+   <text:p text:style-name="P40"/>
+   <text:p text:style-name="P40"><draw:line text:anchor-type="paragraph" draw:z-index="0" draw:name="Línea horizontal 3" draw:style-name="gr2" draw:text-style-name="P61" svg:x1="-0.0083in" svg:y1="0.0902in" svg:x2="2.0752in" svg:y2="0.0902in">
      <text:p/>
     </draw:line><draw:line text:anchor-type="paragraph" draw:z-index="1" draw:name="Línea horizontal 4" draw:style-name="gr1" draw:text-style-name="P61" svg:x1="3.6311in" svg:y1="0.0543in" svg:x2="6.7768in" svg:y2="0.0516in">
      <text:p/>
     </draw:line><text:tab/><text:tab/><text:tab/></text:p>
-   <text:p text:style-name="P41"><text:span text:style-name="T23">JESÚS ANTONIO GIIRALDO<text:tab/></text:span><text:span text:style-name="T25"><text:placeholder text:placeholder-type="text" text:description="subscription.party.name">&lt;subscription.party.name&gt;</text:placeholder></text:span></text:p>
-   <text:p text:style-name="P24"><text:span text:style-name="T17">CC 80.173.191 DE BOGOTÁ <text:s text:c="64"/></text:span><text:span text:style-name="T20">NIT/CC </text:span><text:span text:style-name="T18"><text:placeholder text:placeholder-type="text" text:description="subscription.party.tax_identifier.code">&lt;subscription.party.tax_identifier.code&gt;</text:placeholder></text:span></text:p>
-   <text:p text:style-name="P23">REPRESENTANTE LEGAL</text:p>
-   <text:p text:style-name="P54">SMART VISION S.A.S</text:p>
-   <text:p text:style-name="P40"><text:span text:style-name="T23">NIT </text:span><text:span text:style-name="T11">901091201-1</text:span></text:p>
-   <text:p text:style-name="P23"/>
-   <text:p text:style-name="P23"/>
-   <text:p text:style-name="P20"/>
-   <text:p text:style-name="P20"/>
-   <text:p text:style-name="P20"/>
-   <text:p text:style-name="P20">ANEXO 1</text:p>
-   <text:p text:style-name="P20">LISTADO DE EQUIPOS CONTEMPLADOS EN EL CONTRATO</text:p>
-   <text:p text:style-name="P20"/>
+   <text:p text:style-name="P24"><text:span text:style-name="T36">JESÚS ANTONIO GIIRALDO<text:tab/></text:span><text:span text:style-name="T38"><text:placeholder text:placeholder-type="text" text:description="subscription.party.name">&lt;subscription.party.name&gt;</text:placeholder></text:span></text:p>
+   <text:p text:style-name="P41"><text:span text:style-name="T30">CC 80.173.191 DE BOGOTÁ <text:s text:c="64"/></text:span><text:span text:style-name="T33">NIT/CC </text:span><text:span text:style-name="T31"><text:placeholder text:placeholder-type="text" text:description="subscription.party.tax_identifier.code">&lt;subscription.party.tax_identifier.code&gt;</text:placeholder></text:span></text:p>
+   <text:p text:style-name="P40">REPRESENTANTE LEGAL</text:p>
+   <text:p text:style-name="P52">SMART VISION S.A.S</text:p>
+   <text:p text:style-name="P23"><text:span text:style-name="T36">NIT </text:span><text:span text:style-name="T24">901091201-1</text:span></text:p>
+   <text:p text:style-name="P40"/>
+   <text:p text:style-name="P40"/>
+   <text:p text:style-name="P37"/>
+   <text:p text:style-name="P37"/>
+   <text:p text:style-name="P37"/>
+   <text:p text:style-name="P37">ANEXO 1</text:p>
+   <text:p text:style-name="P37">LISTADO DE EQUIPOS CONTEMPLADOS EN EL CONTRATO</text:p>
+   <text:p text:style-name="P37"/>
    <table:table table:name="Tabla5" table:style-name="Tabla5">
     <table:table-column table:style-name="Tabla5.A"/>
     <table:table-column table:style-name="Tabla5.B"/>
     <table:table-column table:style-name="Tabla5.C"/>
     <table:table-row>
      <table:table-cell table:style-name="Tabla5.A1" office:value-type="string">
-      <text:p text:style-name="P26">Código</text:p>
+      <text:p text:style-name="P43">Código</text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tabla5.A1" office:value-type="string">
-      <text:p text:style-name="P26">Nombre</text:p>
+      <text:p text:style-name="P43">Nombre</text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tabla5.C1" office:value-type="string">
-      <text:p text:style-name="P26">Serial</text:p>
+      <text:p text:style-name="P43">Serial</text:p>
      </table:table-cell>
     </table:table-row>
     <table:table-row>
      <table:table-cell table:style-name="Tabla5.A2" table:number-columns-spanned="3" office:value-type="string">
-      <text:p text:style-name="P16"><text:placeholder text:placeholder-type="text" text:description="for each=&quot;equipment in subscription.equipments">&lt;for each=&quot;equipment in subscription.equipments&quot;&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P33"><text:placeholder text:placeholder-type="text" text:description="for each=&quot;equipment in subscription.current_equipments&quot;">&lt;for each=&quot;equipment in subscription.current_equipments&quot;&gt;</text:placeholder></text:p>
      </table:table-cell>
      <table:covered-table-cell/>
      <table:covered-table-cell/>
     </table:table-row>
     <table:table-row table:style-name="Tabla5.3">
      <table:table-cell table:style-name="Tabla5.A3" office:value-type="string">
-      <text:p text:style-name="P17"><text:placeholder text:placeholder-type="text" text:description="equipment.code">&lt;equipment.code&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P34"><text:placeholder text:placeholder-type="text" text:description="equipment.code">&lt;equipment.code&gt;</text:placeholder></text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tabla5.A3" office:value-type="string">
-      <text:p text:style-name="P17"><text:placeholder text:placeholder-type="text" text:description="equipment.product.name">&lt;equipment.product.name&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P34"><text:placeholder text:placeholder-type="text" text:description="equipment.product.name">&lt;equipment.product.name&gt;</text:placeholder></text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tabla5.A2" office:value-type="string">
-      <text:p text:style-name="P17"><text:placeholder text:placeholder-type="text" text:description="equipment.serial">&lt;equipment.serial&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P34"><text:placeholder text:placeholder-type="text" text:description="equipment.serial">&lt;equipment.serial&gt;</text:placeholder></text:p>
      </table:table-cell>
     </table:table-row>
     <table:table-row>
      <table:table-cell table:style-name="Tabla5.A3" office:value-type="string">
-      <text:p text:style-name="P25"><text:placeholder text:placeholder-type="text">&lt;/for&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P42"><text:placeholder text:placeholder-type="text">&lt;/for&gt;</text:placeholder></text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tabla5.A3" office:value-type="string">
-      <text:p text:style-name="P43"/>
+      <text:p text:style-name="P26"/>
      </table:table-cell>
      <table:table-cell table:style-name="Tabla5.A2" office:value-type="string">
-      <text:p text:style-name="P43"/>
+      <text:p text:style-name="P26"/>
      </table:table-cell>
     </table:table-row>
    </table:table>
-   <text:p text:style-name="P30"/>
-   <text:p text:style-name="P42"><text:placeholder text:placeholder-type="text">&lt;/for&gt;</text:placeholder></text:p>
+   <text:p text:style-name="P17"/>
+   <text:p text:style-name="P25"><text:placeholder text:placeholder-type="text">&lt;/for&gt;</text:placeholder></text:p>
   </office:text>
  </office:body>
 </office:document>

report/Delivery_Certificated.fodt

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <office:document xmlns:css3t="http://www.w3.org/TR/css3-text/" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:drawooo="http://openoffice.org/2010/draw" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:rpt="http://openoffice.org/2005/report" xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:officeooo="http://openoffice.org/2009/office" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" office:version="1.3" office:mimetype="application/vnd.oasis.opendocument.text">
- <office:meta><meta:creation-date>2022-08-14T09:29:40.387726317</meta:creation-date><dc:date>2023-03-21T00:52:14.611168052</dc:date><meta:editing-duration>PT4H14M17S</meta:editing-duration><meta:editing-cycles>73</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="4" meta:image-count="2" meta:object-count="0" meta:page-count="1" meta:paragraph-count="56" meta:word-count="176" meta:character-count="1886" meta:non-whitespace-character-count="1763"/></office:meta>
+ <office:meta><meta:creation-date>2022-08-14T09:29:40.387726317</meta:creation-date><dc:date>2023-04-10T01:17:53.781803899</dc:date><meta:editing-duration>PT4H14M43S</meta:editing-duration><meta:editing-cycles>75</meta:editing-cycles><meta:generator>LibreOffice/7.4.6.2$Linux_X86_64 LibreOffice_project/40$Build-2</meta:generator><meta:document-statistic meta:table-count="4" meta:image-count="2" meta:object-count="0" meta:page-count="1" meta:paragraph-count="56" meta:word-count="176" meta:character-count="1886" meta:non-whitespace-character-count="1763"/></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>
@@ -13,8 +13,8 @@
    <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">14215</config:config-item>
-     <config:config-item config:name="ViewTop" config:type="long">1822</config:config-item>
+     <config:config-item config:name="ViewLeft" config:type="long">15563</config:config-item>
+     <config:config-item config:name="ViewTop" config:type="long">6064</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="VisibleRight" config:type="long">25790</config:config-item>
@@ -91,7 +91,7 @@
    <config:config-item config:name="ChartAutoUpdate" config:type="boolean">true</config:config-item>
    <config:config-item config:name="PrinterSetup" config:type="base64Binary"/>
    <config:config-item config:name="AddParaTableSpacingAtStart" config:type="boolean">true</config:config-item>
-   <config:config-item config:name="Rsid" config:type="int">1730641</config:config-item>
+   <config:config-item config:name="Rsid" config:type="int">1812387</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>
@@ -479,314 +479,316 @@
   </style:style>
   <style:style style:name="P3" style:family="paragraph" style:parent-style-name="Header">
    <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
-   <style:text-properties officeooo:paragraph-rsid="00066dfa"/>
+   <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="7pt" officeooo:paragraph-rsid="00066dfa" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
   </style:style>
-  <style:style style:name="P4" style:family="paragraph" style:parent-style-name="Header">
+  <style:style style:name="P4" style:family="paragraph" style:parent-style-name="Footer">
    <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
    <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="7pt" officeooo:paragraph-rsid="00066dfa" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
   </style:style>
-  <style:style style:name="P5" style:family="paragraph" style:parent-style-name="Footer">
+  <style:style style:name="P5" style:family="paragraph" style:parent-style-name="Header">
    <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
-   <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="7pt" officeooo:paragraph-rsid="00066dfa" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
+   <style:text-properties fo:color="#666666" loext:opacity="100%" style:font-name="Droid Sans Japanese1" fo:font-size="8pt" fo:font-weight="normal" officeooo:paragraph-rsid="0049dca0" style:font-size-asian="8pt" style:font-weight-asian="normal" style:font-size-complex="8pt" style:font-weight-complex="normal"/>
   </style:style>
   <style:style style:name="P6" style:family="paragraph" style:parent-style-name="Header">
-   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
-   <style:text-properties fo:color="#666666" loext:opacity="100%" style:font-name="Droid Sans Japanese1" fo:font-size="8pt" fo:font-weight="normal" officeooo:paragraph-rsid="0049dca0" style:font-size-asian="8pt" style:font-weight-asian="normal" style:font-size-complex="8pt" style:font-weight-complex="normal"/>
-  </style:style>
-  <style:style style:name="P7" style:family="paragraph" style:parent-style-name="Header">
    <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
    <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="7pt" officeooo:paragraph-rsid="0049dca0" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
   </style:style>
-  <style:style style:name="P8" style:family="paragraph" style:parent-style-name="Standard">
+  <style:style style:name="P7" style:family="paragraph" style:parent-style-name="Standard">
    <style:paragraph-properties fo:margin-left="0in" fo:margin-right="0in" fo:text-align="center" style:justify-single-word="false" fo:text-indent="0in" style:auto-text-indent="false"/>
    <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="7pt" officeooo:paragraph-rsid="0049dca0" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
   </style:style>
+  <style:style style:name="P8" style:family="paragraph" style:parent-style-name="Header">
+   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
+   <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="7pt" style:text-underline-style="solid" style:text-underline-type="double" style:text-underline-width="auto" style:text-underline-color="font-color" officeooo:rsid="026544ec" officeooo:paragraph-rsid="0049dca0" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
+  </style:style>
   <style:style style:name="P9" style:family="paragraph" style:parent-style-name="Header">
    <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
-   <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="7pt" style:text-underline-style="solid" style:text-underline-type="double" style:text-underline-width="auto" style:text-underline-color="font-color" officeooo:rsid="026544ec" officeooo:paragraph-rsid="0049dca0" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
+   <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="7pt" style:text-underline-style="solid" style:text-underline-type="double" style:text-underline-width="auto" style:text-underline-color="font-color" officeooo:rsid="0266c2a9" officeooo:paragraph-rsid="0049dca0" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
   </style:style>
   <style:style style:name="P10" style:family="paragraph" style:parent-style-name="Header">
-   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
-   <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="7pt" style:text-underline-style="solid" style:text-underline-type="double" style:text-underline-width="auto" style:text-underline-color="font-color" officeooo:rsid="0266c2a9" officeooo:paragraph-rsid="0049dca0" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
-  </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:color="#666666" loext:opacity="100%" style:font-name="Droid Sans Japanese1" fo:font-size="7pt" style:text-underline-style="solid" style:text-underline-type="double" style:text-underline-width="auto" style:text-underline-color="font-color" fo:font-weight="bold" officeooo:rsid="0266c2a9" officeooo:paragraph-rsid="0049dca0" 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="P12" style:family="paragraph" style:parent-style-name="Header">
+  <style:style style:name="P11" style:family="paragraph" style:parent-style-name="Header">
    <style:paragraph-properties fo:margin-left="0in" fo:margin-right="0in" fo:text-align="center" style:justify-single-word="false" fo:text-indent="0in" style:auto-text-indent="false"/>
    <style:text-properties fo:color="#666666" loext:opacity="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="0049dca0" style:font-size-asian="7pt" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-size-complex="7pt" style:font-style-complex="normal" style:font-weight-complex="normal"/>
   </style:style>
+  <style:style style:name="P12" style:family="paragraph" style:parent-style-name="Standard">
+   <style:paragraph-properties fo:text-align="start" 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="000e86ef" 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:style>
   <style:style style:name="P13" style:family="paragraph" style:parent-style-name="Standard">
-   <style:paragraph-properties fo:text-align="start" 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="000e86ef" 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:style>
-  <style:style style:name="P14" 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="Nimbus Sans" fo:font-size="10pt" fo:font-weight="bold" officeooo:rsid="000cde7f" officeooo:paragraph-rsid="000e86ef" 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="P15" style:family="paragraph" style:parent-style-name="Table_20_Contents">
+  <style:style style:name="P14" style:family="paragraph" style:parent-style-name="Table_20_Contents">
    <style:paragraph-properties fo:text-align="start" style:justify-single-word="false"/>
    <style:text-properties style:font-name="Nimbus Sans" fo:font-size="10pt" style:font-size-asian="10pt" style:font-size-complex="10pt"/>
   </style:style>
-  <style:style style:name="P16" style:family="paragraph" style:parent-style-name="Header">
+  <style:style style:name="P15" 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="000e86ef" 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:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="7pt" officeooo:paragraph-rsid="00066dfa" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
+  </style:style>
+  <style:style style:name="P16" style:family="paragraph" style:parent-style-name="Footer">
+   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
+   <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="7pt" officeooo:paragraph-rsid="00066dfa" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
   </style:style>
   <style:style style:name="P17" 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="0012e334" 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:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="7pt" officeooo:paragraph-rsid="0049dca0" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
   </style:style>
   <style:style style:name="P18" style:family="paragraph" style:parent-style-name="Standard">
-   <style:paragraph-properties fo:text-align="start" 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="000e86ef" 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:style>
-  <style:style style:name="P19" style:family="paragraph" style:parent-style-name="Table_20_Contents">
-   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
-   <style:text-properties style:use-window-font-color="true" loext:opacity="0%" style:font-name="Droid Sans Japanese1" fo:font-size="8pt" fo:font-weight="bold" officeooo:rsid="000a373e" officeooo:paragraph-rsid="000a373e" fo:background-color="transparent" 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="P20" style:family="paragraph" style:parent-style-name="Text_20_body">
-   <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="10pt" fo:font-weight="bold" officeooo:paragraph-rsid="000eca68" 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="P21" 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="10pt" fo:font-weight="bold" officeooo:rsid="000cde7f" officeooo:paragraph-rsid="000eca68" 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="Text_20_body">
-   <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="10pt" fo:font-weight="bold" officeooo:rsid="000a373e" officeooo:paragraph-rsid="0012e334" 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="Header">
-   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
-   <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="8pt" officeooo:paragraph-rsid="000cde7f" style:font-size-asian="8pt" style:font-size-complex="8pt"/>
-  </style:style>
-  <style:style style:name="P24" style:family="paragraph" style:parent-style-name="Table_20_Contents">
-   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
-   <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="8pt" 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:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="8pt" officeooo:paragraph-rsid="000d5b36" 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:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="8pt" officeooo:rsid="000d5b36" officeooo:paragraph-rsid="000d5b36" 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:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="8pt" officeooo:rsid="000d5b36" officeooo:paragraph-rsid="0013690d" 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:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="8pt" officeooo:rsid="000cde7f" officeooo:paragraph-rsid="0013690d" style:font-size-asian="8pt" style:font-size-complex="8pt"/>
-  </style:style>
-  <style:style style:name="P29" style:family="paragraph" style:parent-style-name="Standard">
-   <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="8pt" officeooo:paragraph-rsid="000a373e" style:font-size-asian="8pt" style:font-size-complex="8pt"/>
-  </style:style>
-  <style:style style:name="P30" style:family="paragraph" style:parent-style-name="Standard">
-   <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="8pt" officeooo:paragraph-rsid="0012e334" style:font-size-asian="8pt" style:font-size-complex="8pt"/>
-  </style:style>
-  <style:style style:name="P31" 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:paragraph-rsid="0013690d" style:font-size-asian="8pt" style:font-size-complex="8pt"/>
-  </style:style>
-  <style:style style:name="P32" style:family="paragraph" style:parent-style-name="Standard">
-   <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="8pt" fo:font-weight="normal" officeooo:paragraph-rsid="000a373e" style:font-size-asian="8pt" style:font-weight-asian="normal" style:font-size-complex="8pt" style:font-weight-complex="normal"/>
-  </style:style>
-  <style:style style:name="P33" style:family="paragraph" style:parent-style-name="Table_20_Contents">
-   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
-   <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="8pt" fo:font-weight="normal" officeooo:rsid="000a373e" officeooo:paragraph-rsid="000d5b36" style:font-size-asian="8pt" style:font-weight-asian="normal" style:font-size-complex="8pt" style:font-weight-complex="normal"/>
-  </style:style>
-  <style:style style:name="P34" style:family="paragraph" style:parent-style-name="Table_20_Contents">
-   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
-   <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="8pt" fo:font-weight="normal" officeooo:rsid="000a373e" officeooo:paragraph-rsid="000cde7f" style:font-size-asian="8pt" style:font-weight-asian="normal" style:font-size-complex="8pt" style:font-weight-complex="normal"/>
-  </style:style>
-  <style:style style:name="P35" style:family="paragraph" style:parent-style-name="Table_20_Contents">
-   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
-   <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="8pt" fo:font-weight="normal" officeooo:rsid="000a373e" officeooo:paragraph-rsid="000a373e" style:font-size-asian="8pt" style:font-weight-asian="normal" style:font-size-complex="8pt" style:font-weight-complex="normal"/>
-  </style:style>
-  <style:style style:name="P36" style:family="paragraph" style:parent-style-name="Table_20_Contents">
-   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
-   <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="8pt" fo:font-weight="normal" officeooo:rsid="000a373e" officeooo:paragraph-rsid="0018cb79" style:font-size-asian="8pt" style:font-weight-asian="normal" style:font-size-complex="8pt" style:font-weight-complex="normal"/>
-  </style:style>
-  <style:style style:name="P37" style:family="paragraph" style:parent-style-name="Standard">
-   <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="8pt" fo:font-weight="normal" officeooo:rsid="000cde7f" officeooo:paragraph-rsid="000d5b36" style:font-size-asian="8pt" style:font-weight-asian="normal" style:font-size-complex="8pt" style:font-weight-complex="normal"/>
-  </style:style>
-  <style:style style:name="P38" style:family="paragraph" style:parent-style-name="Standard">
-   <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="8pt" fo:font-weight="normal" officeooo:rsid="000cde7f" officeooo:paragraph-rsid="000e5f26" style:font-size-asian="8pt" style:font-weight-asian="normal" style:font-size-complex="8pt" style:font-weight-complex="normal"/>
-  </style:style>
-  <style:style style:name="P39" style:family="paragraph" style:parent-style-name="Table_20_Contents">
-   <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="000a373e" officeooo:paragraph-rsid="000e86ef" 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="Table_20_Contents">
-   <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="000a373e" officeooo:paragraph-rsid="000a373e" 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="Standard">
-   <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="8pt" fo:font-weight="bold" officeooo:rsid="0012e334" officeooo:paragraph-rsid="0012e334" 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="Standard">
-   <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="8pt" fo:font-weight="bold" officeooo:rsid="0012e334" officeooo:paragraph-rsid="0013690d" 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="Standard">
-   <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="9pt" fo:font-weight="bold" officeooo:rsid="000a373e" officeooo:paragraph-rsid="0012e334" 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="P44" style:family="paragraph" style:parent-style-name="Standard">
-   <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="9pt" fo:font-weight="bold" officeooo:rsid="000a373e" officeooo:paragraph-rsid="000a373e" 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="P45" style:family="paragraph" style:parent-style-name="Standard">
-   <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="9pt" fo:font-weight="bold" officeooo:rsid="000eca68" officeooo:paragraph-rsid="0012e334" 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="P46" style:family="paragraph" style:parent-style-name="Standard">
-   <style:paragraph-properties fo:margin-left="0in" fo:margin-right="0in" fo:text-align="center" style:justify-single-word="false" fo:text-indent="0in" style:auto-text-indent="false"/>
-   <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="7pt" fo:font-weight="normal" officeooo:rsid="000a373e" officeooo:paragraph-rsid="0018cb79" style:font-size-asian="7pt" style:font-weight-asian="normal" style:font-size-complex="7pt" style:font-weight-complex="normal"/>
-  </style:style>
-  <style:style style:name="P47" style:family="paragraph" style:parent-style-name="Footer">
-   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
-   <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="7pt" officeooo:paragraph-rsid="00066dfa" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
-  </style:style>
-  <style:style style:name="P48" style:family="paragraph" style:parent-style-name="Header">
-   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
-   <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="7pt" officeooo:paragraph-rsid="00066dfa" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
-  </style:style>
-  <style:style style:name="P49" style:family="paragraph" style:parent-style-name="Header">
-   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
-   <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="7pt" officeooo:paragraph-rsid="0049dca0" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
-  </style:style>
-  <style:style style:name="P50" style:family="paragraph" style:parent-style-name="Standard">
    <style:paragraph-properties fo:margin-left="0in" fo:margin-right="0in" fo:text-align="center" style:justify-single-word="false" fo:text-indent="0in" style:auto-text-indent="false"/>
    <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="7pt" officeooo:paragraph-rsid="0049dca0" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
   </style:style>
-  <style:style style:name="P51" style:family="paragraph" style:parent-style-name="Header">
+  <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 style:font-name="Droid Sans Japanese1" fo:font-size="7pt" style:text-underline-style="solid" style:text-underline-type="double" style:text-underline-width="auto" style:text-underline-color="font-color" officeooo:rsid="026544ec" officeooo:paragraph-rsid="0049dca0" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
   </style:style>
-  <style:style style:name="P52" style:family="paragraph" style:parent-style-name="Header">
+  <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 style:font-name="Droid Sans Japanese1" fo:font-size="7pt" style:text-underline-style="solid" style:text-underline-type="double" style:text-underline-width="auto" style:text-underline-color="font-color" officeooo:rsid="0266c2a9" officeooo:paragraph-rsid="0049dca0" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
   </style:style>
-  <style:style style:name="P53" style:family="paragraph" style:parent-style-name="Header">
-   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
-   <style:text-properties fo:color="#666666" loext:opacity="100%" style:font-name="Droid Sans Japanese1" fo:font-size="7pt" style:text-underline-style="solid" style:text-underline-type="double" style:text-underline-width="auto" style:text-underline-color="font-color" fo:font-weight="bold" officeooo:rsid="0266c2a9" officeooo:paragraph-rsid="0049dca0" 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="P54" style:family="paragraph" style:parent-style-name="Header">
-   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
-   <style:text-properties fo:color="#666666" loext:opacity="100%" style:font-name="Droid Sans Japanese1" fo:font-size="8pt" fo:font-weight="normal" officeooo:paragraph-rsid="0049dca0" style:font-size-asian="8pt" style:font-weight-asian="normal" style:font-size-complex="8pt" style:font-weight-complex="normal"/>
-  </style:style>
-  <style:style style:name="P55" style:family="paragraph" style:parent-style-name="Header">
-   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
-   <style:text-properties officeooo:paragraph-rsid="00201d29"/>
-  </style:style>
-  <style:style style:name="P56" style:family="paragraph" style:parent-style-name="Header">
-   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
-   <style:text-properties officeooo:paragraph-rsid="00066dfa"/>
-  </style:style>
-  <style:style style:name="P57" style:family="paragraph" style:parent-style-name="Header">
+  <style:style style:name="P21" style:family="paragraph" style:parent-style-name="Standard">
    <style:paragraph-properties fo:margin-left="0in" fo:margin-right="0in" fo:text-align="center" style:justify-single-word="false" fo:text-indent="0in" style:auto-text-indent="false"/>
-   <style:text-properties fo:color="#666666" loext:opacity="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="0049dca0" style:font-size-asian="7pt" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-size-complex="7pt" style:font-style-complex="normal" style:font-weight-complex="normal"/>
+   <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="7pt" fo:font-weight="normal" officeooo:rsid="000a373e" officeooo:paragraph-rsid="0018cb79" style:font-size-asian="7pt" style:font-weight-asian="normal" style:font-size-complex="7pt" style:font-weight-complex="normal"/>
   </style:style>
-  <style:style style:name="P58" style:family="paragraph" style:parent-style-name="Table_20_Contents">
+  <style:style style:name="P22" style:family="paragraph" style:parent-style-name="Table_20_Contents">
    <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
    <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="7pt" fo:font-weight="normal" officeooo:rsid="000a373e" officeooo:paragraph-rsid="0018cb79" style:font-size-asian="7pt" style:font-weight-asian="normal" style:font-size-complex="7pt" style:font-weight-complex="normal"/>
   </style:style>
-  <style:style style:name="T1" style:family="text">
-   <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="7pt" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
+  <style:style style:name="P23" style:family="paragraph" style:parent-style-name="Text_20_body">
+   <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="10pt" fo:font-weight="bold" officeooo:paragraph-rsid="000eca68" 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="T2" style:family="text">
+  <style:style style:name="P24" 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="10pt" fo:font-weight="bold" officeooo:rsid="000cde7f" officeooo:paragraph-rsid="000eca68" 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="P25" style:family="paragraph" style:parent-style-name="Text_20_body">
+   <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="10pt" fo:font-weight="bold" officeooo:rsid="000a373e" officeooo:paragraph-rsid="0012e334" 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="P26" style:family="paragraph" style:parent-style-name="Header">
+   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
+   <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="8pt" officeooo:paragraph-rsid="000cde7f" style:font-size-asian="8pt" style:font-size-complex="8pt"/>
+  </style:style>
+  <style:style style:name="P27" style:family="paragraph" style:parent-style-name="Table_20_Contents">
+   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
+   <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="8pt" 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:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="8pt" officeooo:paragraph-rsid="000d5b36" style:font-size-asian="8pt" style:font-size-complex="8pt"/>
+  </style:style>
+  <style:style style:name="P29" style:family="paragraph" style:parent-style-name="Standard">
+   <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="8pt" officeooo:rsid="000d5b36" officeooo:paragraph-rsid="000d5b36" style:font-size-asian="8pt" style:font-size-complex="8pt"/>
+  </style:style>
+  <style:style style:name="P30" style:family="paragraph" style:parent-style-name="Standard">
+   <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="8pt" officeooo:rsid="000d5b36" officeooo:paragraph-rsid="0013690d" style:font-size-asian="8pt" style:font-size-complex="8pt"/>
+  </style:style>
+  <style:style style:name="P31" style:family="paragraph" style:parent-style-name="Standard">
+   <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="8pt" officeooo:rsid="000cde7f" officeooo:paragraph-rsid="0013690d" style:font-size-asian="8pt" style:font-size-complex="8pt"/>
+  </style:style>
+  <style:style style:name="P32" style:family="paragraph" style:parent-style-name="Standard">
+   <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="8pt" officeooo:paragraph-rsid="000a373e" style:font-size-asian="8pt" style:font-size-complex="8pt"/>
+  </style:style>
+  <style:style style:name="P33" style:family="paragraph" style:parent-style-name="Standard">
+   <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="8pt" officeooo:paragraph-rsid="0012e334" style:font-size-asian="8pt" style:font-size-complex="8pt"/>
+  </style:style>
+  <style:style style:name="P34" 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:paragraph-rsid="0013690d" style:font-size-asian="8pt" style:font-size-complex="8pt"/>
+  </style:style>
+  <style:style style:name="P35" style:family="paragraph" style:parent-style-name="Standard">
+   <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="8pt" fo:font-weight="normal" officeooo:paragraph-rsid="000a373e" style:font-size-asian="8pt" style:font-weight-asian="normal" style:font-size-complex="8pt" style:font-weight-complex="normal"/>
+  </style:style>
+  <style:style style:name="P36" style:family="paragraph" style:parent-style-name="Table_20_Contents">
+   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
+   <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="8pt" fo:font-weight="normal" officeooo:rsid="000a373e" officeooo:paragraph-rsid="000d5b36" style:font-size-asian="8pt" style:font-weight-asian="normal" style:font-size-complex="8pt" style:font-weight-complex="normal"/>
+  </style:style>
+  <style:style style:name="P37" style:family="paragraph" style:parent-style-name="Table_20_Contents">
+   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
+   <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="8pt" fo:font-weight="normal" officeooo:rsid="000a373e" officeooo:paragraph-rsid="000cde7f" style:font-size-asian="8pt" style:font-weight-asian="normal" style:font-size-complex="8pt" style:font-weight-complex="normal"/>
+  </style:style>
+  <style:style style:name="P38" style:family="paragraph" style:parent-style-name="Table_20_Contents">
+   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
+   <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="8pt" fo:font-weight="normal" officeooo:rsid="000a373e" officeooo:paragraph-rsid="000a373e" style:font-size-asian="8pt" style:font-weight-asian="normal" style:font-size-complex="8pt" style:font-weight-complex="normal"/>
+  </style:style>
+  <style:style style:name="P39" style:family="paragraph" style:parent-style-name="Table_20_Contents">
+   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
+   <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="8pt" fo:font-weight="normal" officeooo:rsid="000a373e" officeooo:paragraph-rsid="0018cb79" style:font-size-asian="8pt" style:font-weight-asian="normal" style:font-size-complex="8pt" style:font-weight-complex="normal"/>
+  </style:style>
+  <style:style style:name="P40" style:family="paragraph" style:parent-style-name="Standard">
+   <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="8pt" fo:font-weight="normal" officeooo:rsid="000cde7f" officeooo:paragraph-rsid="000d5b36" style:font-size-asian="8pt" style:font-weight-asian="normal" style:font-size-complex="8pt" style:font-weight-complex="normal"/>
+  </style:style>
+  <style:style style:name="P41" style:family="paragraph" style:parent-style-name="Standard">
+   <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="8pt" fo:font-weight="normal" officeooo:rsid="000cde7f" officeooo:paragraph-rsid="000e5f26" style:font-size-asian="8pt" style:font-weight-asian="normal" style:font-size-complex="8pt" style:font-weight-complex="normal"/>
+  </style:style>
+  <style:style style:name="P42" style:family="paragraph" style:parent-style-name="Table_20_Contents">
+   <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="000a373e" officeooo:paragraph-rsid="000e86ef" 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: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="000a373e" officeooo:paragraph-rsid="000a373e" 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="P44" 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="0012e334" officeooo:paragraph-rsid="0012e334" 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="P45" 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="0012e334" officeooo:paragraph-rsid="0013690d" 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="P46" style:family="paragraph" style:parent-style-name="Standard">
+   <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="9pt" fo:font-weight="bold" officeooo:rsid="000a373e" officeooo:paragraph-rsid="0012e334" 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="P47" style:family="paragraph" style:parent-style-name="Standard">
+   <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="9pt" fo:font-weight="bold" officeooo:rsid="000a373e" officeooo:paragraph-rsid="000a373e" 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="P48" style:family="paragraph" style:parent-style-name="Standard">
+   <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="9pt" fo:font-weight="bold" officeooo:rsid="000eca68" officeooo:paragraph-rsid="0012e334" 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="P49" style:family="paragraph" style:parent-style-name="Header">
+   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
+   <style:text-properties fo:color="#666666" loext:opacity="100%" style:font-name="Droid Sans Japanese1" fo:font-size="8pt" fo:font-weight="normal" officeooo:paragraph-rsid="0049dca0" style:font-size-asian="8pt" style:font-weight-asian="normal" style:font-size-complex="8pt" style:font-weight-complex="normal"/>
+  </style:style>
+  <style:style style:name="P50" style:family="paragraph" style:parent-style-name="Header">
+   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
+   <style:text-properties fo:color="#666666" loext:opacity="100%" style:font-name="Droid Sans Japanese1" fo:font-size="7pt" style:text-underline-style="solid" style:text-underline-type="double" style:text-underline-width="auto" style:text-underline-color="font-color" fo:font-weight="bold" officeooo:rsid="0266c2a9" officeooo:paragraph-rsid="0049dca0" 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="P51" style:family="paragraph" style:parent-style-name="Header">
+   <style:paragraph-properties fo:margin-left="0in" fo:margin-right="0in" fo:text-align="center" style:justify-single-word="false" fo:text-indent="0in" style:auto-text-indent="false"/>
+   <style:text-properties fo:color="#666666" loext:opacity="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="0049dca0" style:font-size-asian="7pt" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-size-complex="7pt" style:font-style-complex="normal" style:font-weight-complex="normal"/>
+  </style:style>
+  <style:style style:name="P52" style:family="paragraph" style:parent-style-name="Standard">
+   <style:paragraph-properties fo:text-align="start" 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="000e86ef" 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:style>
+  <style:style style:name="P53" 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="000e86ef" 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="P54" 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="0012e334" 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="P55" style:family="paragraph" style:parent-style-name="Header">
+   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
+   <style:text-properties officeooo:paragraph-rsid="00066dfa"/>
+  </style:style>
+  <style:style style:name="P56" style:family="paragraph" style:parent-style-name="Header">
+   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
+   <style:text-properties officeooo:paragraph-rsid="00201d29"/>
+  </style:style>
+  <style:style style:name="P57" style:family="paragraph" style:parent-style-name="Table_20_Contents">
+   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
+   <style:text-properties style:use-window-font-color="true" loext:opacity="0%" style:font-name="Droid Sans Japanese1" fo:font-size="8pt" fo:font-weight="bold" officeooo:rsid="000a373e" officeooo:paragraph-rsid="000a373e" fo:background-color="transparent" 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="T1" style:family="text">
    <style:text-properties fo:color="#333333" loext:opacity="100%" fo:font-weight="bold" officeooo:rsid="026544ec" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
   </style:style>
-  <style:style style:name="T3" style:family="text">
+  <style:style style:name="T2" style:family="text">
    <style:text-properties fo:color="#666666" loext:opacity="100%" fo:font-weight="bold" officeooo:rsid="026544ec" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
   </style:style>
-  <style:style style:name="T4" style:family="text">
+  <style:style style:name="T3" style:family="text">
    <style:text-properties fo:color="#666666" loext:opacity="100%" fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
   </style:style>
-  <style:style style:name="T5" style:family="text">
+  <style:style style:name="T4" style:family="text">
    <style:text-properties fo:color="#666666" loext:opacity="100%" fo:font-weight="bold" officeooo:rsid="001cd488" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
   </style:style>
-  <style:style style:name="T6" style:family="text">
+  <style:style style:name="T5" style:family="text">
    <style:text-properties fo:color="#333333" loext:opacity="100%" style:text-underline-style="none" fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
   </style:style>
+  <style:style style:name="T6" style:family="text">
+   <style:text-properties fo:color="#666666" loext:opacity="100%" style:text-underline-style="none" fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
+  </style:style>
   <style:style style:name="T7" style:family="text">
    <style:text-properties fo:color="#333333" loext:opacity="100%" style:text-underline-style="none" fo:font-weight="bold" officeooo:rsid="026544ec" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
   </style:style>
   <style:style style:name="T8" style:family="text">
-   <style:text-properties fo:color="#666666" loext:opacity="100%" style:text-underline-style="none" fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
+   <style:text-properties fo:color="#666666" loext:opacity="100%" style:text-underline-style="none" fo:font-weight="bold" officeooo:rsid="026544ec" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
   </style:style>
   <style:style style:name="T9" style:family="text">
    <style:text-properties fo:color="#333333" loext:opacity="100%" style:text-underline-style="none" officeooo:rsid="026544ec"/>
   </style:style>
   <style:style style:name="T10" style:family="text">
-   <style:text-properties officeooo:rsid="026544ec"/>
+   <style:text-properties style:text-underline-style="none" officeooo:rsid="026544ec"/>
   </style:style>
   <style:style style:name="T11" style:family="text">
    <style:text-properties fo:color="#333333" loext:opacity="100%" style:text-underline-style="none" officeooo:rsid="0049dca0"/>
   </style:style>
   <style:style style:name="T12" style:family="text">
-   <style:text-properties style:language-asian="es" style:country-asian="CO"/>
-  </style:style>
-  <style:style style:name="T13" 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="T14" style:family="text">
-   <style:text-properties fo:font-weight="bold" officeooo:rsid="000cde7f" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
-  </style:style>
-  <style:style style:name="T15" style:family="text">
-   <style:text-properties fo:font-weight="bold" officeooo:rsid="000d5b36" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
-  </style:style>
-  <style:style style:name="T16" style:family="text">
-   <style:text-properties fo:font-weight="bold" officeooo:rsid="0012e334" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
-  </style:style>
-  <style:style style:name="T17" style:family="text">
-   <style:text-properties fo:font-weight="normal" style:font-weight-asian="normal" style:font-weight-complex="normal"/>
-  </style:style>
-  <style:style style:name="T18" style:family="text">
-   <style:text-properties fo:font-weight="normal" officeooo:rsid="000d5b36" style:font-weight-asian="normal" style:font-weight-complex="normal"/>
-  </style:style>
-  <style:style style:name="T19" style:family="text">
-   <style:text-properties fo:font-weight="normal" officeooo:rsid="000cde7f" style:font-weight-asian="normal" style:font-weight-complex="normal"/>
-  </style:style>
-  <style:style style:name="T20" 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" style:font-style-asian="normal" style:text-emphasize="none"/>
-  </style:style>
-  <style:style style:name="T21" 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-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="T22" 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-style="normal" fo:text-shadow="none" style:text-underline-style="none" style:font-style-asian="normal" style:text-emphasize="none"/>
-  </style:style>
-  <style:style style:name="T23" 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-style="normal" fo:text-shadow="none" style:text-underline-style="none" officeooo:rsid="000cde7f" style:font-style-asian="normal" style:text-emphasize="none"/>
-  </style:style>
-  <style:style style:name="T24" style:family="text">
    <style:text-properties fo:color="#333333" loext:opacity="100%" fo:font-weight="bold" officeooo:rsid="026544ec" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
   </style:style>
-  <style:style style:name="T25" style:family="text">
+  <style:style style:name="T13" style:family="text">
    <style:text-properties fo:color="#333333" loext:opacity="100%" style:text-underline-style="none" fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
   </style:style>
-  <style:style style:name="T26" style:family="text">
+  <style:style style:name="T14" style:family="text">
    <style:text-properties fo:color="#333333" loext:opacity="100%" style:text-underline-style="none" fo:font-weight="bold" officeooo:rsid="026544ec" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
   </style:style>
-  <style:style style:name="T27" style:family="text">
+  <style:style style:name="T15" style:family="text">
    <style:text-properties fo:color="#333333" loext:opacity="100%" style:text-underline-style="none" officeooo:rsid="026544ec"/>
   </style:style>
-  <style:style style:name="T28" style:family="text">
+  <style:style style:name="T16" style:family="text">
    <style:text-properties fo:color="#333333" loext:opacity="100%" style:text-underline-style="none" officeooo:rsid="0049dca0"/>
   </style:style>
-  <style:style style:name="T29" style:family="text">
+  <style:style style:name="T17" style:family="text">
    <style:text-properties fo:color="#666666" loext:opacity="100%" fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
   </style:style>
-  <style:style style:name="T30" style:family="text">
+  <style:style style:name="T18" style:family="text">
    <style:text-properties fo:color="#666666" loext:opacity="100%" fo:font-weight="bold" officeooo:rsid="026544ec" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
   </style:style>
-  <style:style style:name="T31" style:family="text">
+  <style:style style:name="T19" style:family="text">
    <style:text-properties fo:color="#666666" loext:opacity="100%" fo:font-weight="bold" officeooo:rsid="001cd488" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
   </style:style>
-  <style:style style:name="T32" style:family="text">
+  <style:style style:name="T20" style:family="text">
    <style:text-properties fo:color="#666666" loext:opacity="100%" style:text-underline-style="none" fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
   </style:style>
-  <style:style style:name="T33" style:family="text">
+  <style:style style:name="T21" style:family="text">
+   <style:text-properties fo:color="#666666" loext:opacity="100%" style:text-underline-style="none" fo:font-weight="bold" officeooo:rsid="026544ec" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
+  </style:style>
+  <style:style style:name="T22" style:family="text">
    <style:text-properties officeooo:rsid="026544ec"/>
   </style:style>
-  <style:style style:name="T34" style:family="text">
+  <style:style style:name="T23" style:family="text">
    <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="7pt" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
   </style:style>
+  <style:style style:name="T24" style:family="text">
+   <style:text-properties style:language-asian="es" style:country-asian="CO"/>
+  </style:style>
+  <style:style style:name="T25" 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="T26" style:family="text">
+   <style:text-properties fo:font-weight="bold" officeooo:rsid="000cde7f" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
+  </style:style>
+  <style:style style:name="T27" style:family="text">
+   <style:text-properties fo:font-weight="bold" officeooo:rsid="000d5b36" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
+  </style:style>
+  <style:style style:name="T28" style:family="text">
+   <style:text-properties fo:font-weight="bold" officeooo:rsid="0012e334" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
+  </style:style>
+  <style:style style:name="T29" style:family="text">
+   <style:text-properties fo:font-weight="normal" style:font-weight-asian="normal" style:font-weight-complex="normal"/>
+  </style:style>
+  <style:style style:name="T30" style:family="text">
+   <style:text-properties fo:font-weight="normal" officeooo:rsid="000d5b36" style:font-weight-asian="normal" style:font-weight-complex="normal"/>
+  </style:style>
+  <style:style style:name="T31" style:family="text">
+   <style:text-properties fo:font-weight="normal" officeooo:rsid="000cde7f" style:font-weight-asian="normal" style:font-weight-complex="normal"/>
+  </style:style>
+  <style:style style:name="T32" 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" style:font-style-asian="normal" style:text-emphasize="none"/>
+  </style:style>
+  <style:style style:name="T33" 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-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="T34" 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-style="normal" fo:text-shadow="none" style:text-underline-style="none" style:font-style-asian="normal" style:text-emphasize="none"/>
+  </style:style>
+  <style:style style:name="T35" 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-style="normal" fo:text-shadow="none" style:text-underline-style="none" officeooo:rsid="000cde7f" style:font-style-asian="normal" style:text-emphasize="none"/>
+  </style:style>
+  <style:style style:name="T36" style:family="text">
+   <style:text-properties style:text-underline-style="none" officeooo:rsid="026544ec"/>
+  </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(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>
@@ -1471,25 +1473,25 @@
         </draw:frame></text:p>
       </table:table-cell>
       <table:table-cell table:style-name="Tabla4.B1" office:value-type="string">
-       <text:p text:style-name="P3"><text:span text:style-name="T1"><text:placeholder text:placeholder-type="text">&lt;if test=&quot;company and company.header&quot;&gt;</text:placeholder></text:span></text:p>
-       <text:p text:style-name="P4"><text:placeholder text:placeholder-type="text">&lt;for each=&quot;line in company.header.split(&apos;\n&apos;)&quot;&gt;</text:placeholder></text:p>
-       <text:p text:style-name="P4"><text:placeholder text:placeholder-type="text">&lt;line&gt;</text:placeholder></text:p>
-       <text:p text:style-name="P4"><text:placeholder text:placeholder-type="text">&lt;/for&gt;</text:placeholder></text:p>
-       <text:p text:style-name="P5"><text:placeholder text:placeholder-type="text">&lt;/if&gt;</text:placeholder></text:p>
-       <text:p text:style-name="P5"><text:placeholder text:placeholder-type="text">&lt;company.rec_name if company else &apos;&apos;&gt;</text:placeholder></text:p>
-       <text:p text:style-name="P6"><text:placeholder text:placeholder-type="text" text:description="if test=&quot;company&quot;">&lt;if test=&quot;company&quot;&gt;</text:placeholder></text:p>
-       <text:p text:style-name="P7"><text:span text:style-name="T2">NIT:</text:span><text:span text:style-name="T3"> </text:span><text:span text:style-name="T4"><text:placeholder text:placeholder-type="text">&lt;company.party.identifiers[0].code&gt;</text:placeholder></text:span></text:p>
-       <text:p text:style-name="P8">Regimen Común</text:p>
-       <text:p text:style-name="P8"><text:span text:style-name="T4">Actividad Economica 46</text:span><text:span text:style-name="T5">59</text:span></text:p>
-       <text:p text:style-name="P9"><text:span text:style-name="T6">Dirección: </text:span><text:span text:style-name="T4"><text:placeholder text:placeholder-type="text">&lt;company.party.addresses[0].street&gt;</text:placeholder></text:span><text:span text:style-name="T4"><text:s/></text:span><text:span text:style-name="T4"><text:placeholder text:placeholder-type="text">&lt;company.party.addresses[0].city&gt;</text:placeholder></text:span></text:p>
-       <text:p text:style-name="P10"><text:span text:style-name="T7">Teléfono:</text:span><text:span text:style-name="T8"> </text:span><text:span text:style-name="T3"><text:placeholder text:placeholder-type="text">&lt;company.party.phone&gt;</text:placeholder></text:span></text:p>
-       <text:p text:style-name="P11"><text:span text:style-name="T9">Celular: </text:span><text:span text:style-name="T10"><text:placeholder text:placeholder-type="text">&lt;company.party.mobile&gt;</text:placeholder></text:span></text:p>
-       <text:p text:style-name="P11"><text:span text:style-name="T11">E-mail</text:span><text:span text:style-name="T9">: </text:span><text:span text:style-name="T10"><text:placeholder text:placeholder-type="text">&lt;company.party.email&gt;</text:placeholder></text:span></text:p>
-       <text:p text:style-name="P12"><text:placeholder text:placeholder-type="text">&lt;/if&gt;</text:placeholder></text:p>
+       <text:p text:style-name="P3"><text:placeholder text:placeholder-type="text">&lt;if test=&quot;company and company.header&quot;&gt;</text:placeholder></text:p>
+       <text:p text:style-name="P3"><text:placeholder text:placeholder-type="text">&lt;for each=&quot;line in company.header.split(&apos;\n&apos;)&quot;&gt;</text:placeholder></text:p>
+       <text:p text:style-name="P3"><text:placeholder text:placeholder-type="text">&lt;line&gt;</text:placeholder></text:p>
+       <text:p text:style-name="P3"><text:placeholder text:placeholder-type="text">&lt;/for&gt;</text:placeholder></text:p>
+       <text:p text:style-name="P4"><text:placeholder text:placeholder-type="text">&lt;/if&gt;</text:placeholder></text:p>
+       <text:p text:style-name="P4"><text:placeholder text:placeholder-type="text">&lt;company.rec_name if company else &apos;&apos;&gt;</text:placeholder></text:p>
+       <text:p text:style-name="P5"><text:placeholder text:placeholder-type="text" text:description="if test=&quot;company&quot;">&lt;if test=&quot;company&quot;&gt;</text:placeholder></text:p>
+       <text:p text:style-name="P6"><text:span text:style-name="T1">NIT:</text:span><text:span text:style-name="T2"> </text:span><text:span text:style-name="T3"><text:placeholder text:placeholder-type="text">&lt;company.party.identifiers[0].code&gt;</text:placeholder></text:span></text:p>
+       <text:p text:style-name="P7">Regimen Común</text:p>
+       <text:p text:style-name="P7"><text:span text:style-name="T3">Actividad Economica 46</text:span><text:span text:style-name="T4">59</text:span></text:p>
+       <text:p text:style-name="P8"><text:span text:style-name="T5">Dirección: </text:span><text:span text:style-name="T6"><text:placeholder text:placeholder-type="text">&lt;company.party.addresses[0].street&gt;</text:placeholder></text:span><text:span text:style-name="T6"><text:s/></text:span><text:span text:style-name="T6"><text:placeholder text:placeholder-type="text">&lt;company.party.addresses[0].city&gt;</text:placeholder></text:span></text:p>
+       <text:p text:style-name="P9"><text:span text:style-name="T7">Teléfono:</text:span><text:span text:style-name="T6"> </text:span><text:span text:style-name="T8"><text:placeholder text:placeholder-type="text">&lt;company.party.phone&gt;</text:placeholder></text:span></text:p>
+       <text:p text:style-name="P10"><text:span text:style-name="T9">Celular: </text:span><text:span text:style-name="T10"><text:placeholder text:placeholder-type="text">&lt;company.party.mobile&gt;</text:placeholder></text:span></text:p>
+       <text:p text:style-name="P10"><text:span text:style-name="T11">E-mail</text:span><text:span text:style-name="T9">: </text:span><text:span text:style-name="T10"><text:placeholder text:placeholder-type="text">&lt;company.party.email&gt;</text:placeholder></text:span></text:p>
+       <text:p text:style-name="P11"><text:placeholder text:placeholder-type="text">&lt;/if&gt;</text:placeholder></text:p>
       </table:table-cell>
      </table:table-row>
     </table:table>
-    <text:p text:style-name="P13"/>
+    <text:p text:style-name="P12"/>
    </style:header>
   </style:master-page>
  </office:master-styles>
@@ -1502,54 +1504,54 @@
     <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="P21"><text:placeholder text:placeholder-type="text">&lt;for each=&quot;shipment in records&quot;&gt;</text:placeholder></text:p>
-   <text:p text:style-name="P23"><text:span text:style-name="T14">ACTA DE ENTREGA DE EQUIPOS No <text:s text:c="2"/></text:span><text:span text:style-name="T19"><text:placeholder text:placeholder-type="text">&lt;shipment.number&gt;</text:placeholder></text:span></text:p>
-   <text:p text:style-name="P32"/>
+   <text:p text:style-name="P24"><text:placeholder text:placeholder-type="text">&lt;for each=&quot;shipment in records&quot;&gt;</text:placeholder></text:p>
+   <text:p text:style-name="P26"><text:span text:style-name="T26">ACTA DE ENTREGA DE EQUIPOS No <text:s text:c="2"/></text:span><text:span text:style-name="T31"><text:placeholder text:placeholder-type="text">&lt;shipment.number&gt;</text:placeholder></text:span></text:p>
+   <text:p text:style-name="P35"/>
    <table:table table:name="Tabla3" table:style-name="Tabla3">
     <table:table-column table:style-name="Tabla3.A"/>
     <table:table-column table:style-name="Tabla3.B"/>
     <table:table-row table:style-name="Tabla3.1">
      <table:table-cell table:style-name="Tabla3.A1" office:value-type="string">
-      <text:p text:style-name="P30"><text:span text:style-name="T15">Fecha </text:span><text:span text:style-name="T16">de entrega</text:span><text:span text:style-name="T15">:</text:span><text:span text:style-name="T18"> </text:span><text:span text:style-name="T17"><text:placeholder text:placeholder-type="text">&lt;shipment.effective_date and format_date(shipment.effective_date, user.language) or &apos;&apos;&gt;</text:placeholder></text:span></text:p>
+      <text:p text:style-name="P33"><text:span text:style-name="T27">Fecha </text:span><text:span text:style-name="T28">de entrega</text:span><text:span text:style-name="T27">:</text:span><text:span text:style-name="T30"> </text:span><text:span text:style-name="T29"><text:placeholder text:placeholder-type="text">&lt;shipment.effective_date and format_date(shipment.effective_date, user.language) or &apos;&apos;&gt;</text:placeholder></text:span></text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tabla3.A1" office:value-type="string">
-      <text:p text:style-name="P42"><text:span text:style-name="T23">O</text:span><text:span text:style-name="T22">rden de compra: </text:span><text:span text:style-name="T20"><text:placeholder text:placeholder-type="text" text:description="shipment.outgoing_moves[0].origin.sale.number">&lt;shipment.outgoing_moves[0].origin.sale.number&gt;</text:placeholder></text:span></text:p>
+      <text:p text:style-name="P45"><text:span text:style-name="T35">O</text:span><text:span text:style-name="T34">rden de compra: </text:span><text:span text:style-name="T32"><text:placeholder text:placeholder-type="text" text:description="shipment.outgoing_moves[0].origin.sale.number">&lt;shipment.outgoing_moves[0].origin.sale.number&gt;</text:placeholder></text:span></text:p>
      </table:table-cell>
     </table:table-row>
     <table:table-row table:style-name="Tabla3.1">
      <table:table-cell table:style-name="Tabla3.A1" office:value-type="string">
-      <text:p text:style-name="P25"><text:span text:style-name="T14">Cliente</text:span><text:span text:style-name="T13">:</text:span><text:span text:style-name="T17"> </text:span><text:span text:style-name="T17"><text:placeholder text:placeholder-type="text">&lt;shipment.customer.rec_name&gt;</text:placeholder></text:span></text:p>
+      <text:p text:style-name="P28"><text:span text:style-name="T26">Cliente</text:span><text:span text:style-name="T25">:</text:span><text:span text:style-name="T29"> </text:span><text:span text:style-name="T29"><text:placeholder text:placeholder-type="text">&lt;shipment.customer.rec_name&gt;</text:placeholder></text:span></text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tabla3.A1" office:value-type="string">
-      <text:p text:style-name="P26"><text:span text:style-name="T13">Nit / C.C: </text:span><text:span text:style-name="T17"><text:placeholder text:placeholder-type="text">&lt;shipment.customer.tax_identifier.code&gt;</text:placeholder></text:span></text:p>
+      <text:p text:style-name="P29"><text:span text:style-name="T25">Nit / C.C: </text:span><text:span text:style-name="T29"><text:placeholder text:placeholder-type="text">&lt;shipment.customer.tax_identifier.code&gt;</text:placeholder></text:span></text:p>
      </table:table-cell>
     </table:table-row>
     <table:table-row table:style-name="Tabla3.1">
      <table:table-cell table:style-name="Tabla3.A1" office:value-type="string">
-      <text:p text:style-name="P41">Ciudad: <text:span text:style-name="T21"><text:placeholder text:placeholder-type="text">&lt;shipment.delivery_address.subdivision_municipality.name&gt;</text:placeholder></text:span></text:p>
+      <text:p text:style-name="P44">Ciudad: <text:span text:style-name="T33"><text:placeholder text:placeholder-type="text">&lt;shipment.delivery_address.subdivision_municipality.name&gt;</text:placeholder></text:span></text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tabla3.A1" office:value-type="string">
-      <text:p text:style-name="P27"><text:span text:style-name="T13">Movil: </text:span><text:span text:style-name="T17"><text:placeholder text:placeholder-type="text">&lt;shipment.customer.mobile&gt;</text:placeholder></text:span></text:p>
+      <text:p text:style-name="P30"><text:span text:style-name="T25">Movil: </text:span><text:span text:style-name="T29"><text:placeholder text:placeholder-type="text">&lt;shipment.customer.mobile&gt;</text:placeholder></text:span></text:p>
      </table:table-cell>
     </table:table-row>
     <table:table-row table:style-name="Tabla3.1">
      <table:table-cell table:style-name="Tabla3.A1" office:value-type="string">
-      <text:p text:style-name="P26"><text:span text:style-name="T13">Teléfono: </text:span><text:span text:style-name="T17"><text:placeholder text:placeholder-type="text">&lt;shipment.customer.phone&gt;</text:placeholder></text:span></text:p>
+      <text:p text:style-name="P29"><text:span text:style-name="T25">Teléfono: </text:span><text:span text:style-name="T29"><text:placeholder text:placeholder-type="text">&lt;shipment.customer.phone&gt;</text:placeholder></text:span></text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tabla3.A1" office:value-type="string">
-      <text:p text:style-name="P28"><text:span text:style-name="T13">Entregado en: </text:span><text:span text:style-name="T17"><text:placeholder text:placeholder-type="text">&lt;shipment.delivery_address.street&gt;</text:placeholder></text:span></text:p>
+      <text:p text:style-name="P31"><text:span text:style-name="T25">Entregado en: </text:span><text:span text:style-name="T29"><text:placeholder text:placeholder-type="text">&lt;shipment.delivery_address.street&gt;</text:placeholder></text:span></text:p>
      </table:table-cell>
     </table:table-row>
     <table:table-row table:style-name="Tabla3.1">
      <table:table-cell table:style-name="Tabla3.A1" office:value-type="string">
-      <text:p text:style-name="P37"/>
+      <text:p text:style-name="P40"/>
      </table:table-cell>
      <table:table-cell table:style-name="Tabla3.A1" office:value-type="string">
-      <text:p text:style-name="P38"/>
+      <text:p text:style-name="P41"/>
      </table:table-cell>
     </table:table-row>
    </table:table>
-   <text:p text:style-name="P29"/>
+   <text:p text:style-name="P32"/>
    <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"/>
@@ -1558,27 +1560,27 @@
     <table:table-column table:style-name="Tabla1.F"/>
     <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="P19">Código</text:p>
+      <text:p text:style-name="P57">Código</text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tabla1.A1" office:value-type="string">
-      <text:p text:style-name="P19">Equipo</text:p>
+      <text:p text:style-name="P57">Equipo</text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tabla1.A1" office:value-type="string">
-      <text:p text:style-name="P19">Marca</text:p>
+      <text:p text:style-name="P57">Marca</text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tabla1.A1" office:value-type="string">
-      <text:p text:style-name="P19">Modelo</text:p>
+      <text:p text:style-name="P57">Modelo</text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tabla1.A1" office:value-type="string">
-      <text:p text:style-name="P19">Serial</text:p>
+      <text:p text:style-name="P57">Serial</text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tabla1.F1" office:value-type="string">
-      <text:p text:style-name="P19">Cant</text:p>
+      <text:p text:style-name="P57">Cant</text:p>
      </table:table-cell>
     </table:table-row>
     <table:table-row>
      <table:table-cell table:style-name="Tabla1.A2" table:number-columns-spanned="6" office:value-type="string">
-      <text:p text:style-name="P39"><text:placeholder text:placeholder-type="text" text:description="for each=&quot;move in shipment.inventory_moves&quot;">&lt;for each=&quot;move in shipment.inventory_moves&quot;&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P42"><text:placeholder text:placeholder-type="text" text:description="for each=&quot;move in shipment.inventory_moves&quot;">&lt;for each=&quot;move in shipment.inventory_moves&quot;&gt;</text:placeholder></text:p>
      </table:table-cell>
      <table:covered-table-cell/>
      <table:covered-table-cell/>
@@ -1588,31 +1590,31 @@
     </table:table-row>
     <table:table-row>
      <table:table-cell table:style-name="Tabla1.A3" office:value-type="string">
-      <text:p text:style-name="P33"><text:placeholder text:placeholder-type="text">&lt;move.product.code&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P36"><text:placeholder text:placeholder-type="text">&lt;move.product.code&gt;</text:placeholder></text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tabla1.B3" office:value-type="string">
-      <text:p text:style-name="P24"><text:placeholder text:placeholder-type="text">&lt;move.product.name&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P27"><text:placeholder text:placeholder-type="text">&lt;move.product.name&gt;</text:placeholder></text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tabla1.C3" office:value-type="string">
-      <text:p text:style-name="P46"><text:placeholder text:placeholder-type="text">&lt;if test=&quot;move.product.mark_category&quot;&gt;</text:placeholder></text:p>
-      <text:p text:style-name="P34"><text:placeholder text:placeholder-type="text">&lt;move.product.mark_category.name&gt;</text:placeholder></text:p>
-      <text:p text:style-name="P46"><text:placeholder text:placeholder-type="text">&lt;/if&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P21"><text:placeholder text:placeholder-type="text">&lt;if test=&quot;move.product.mark_category&quot;&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P37"><text:placeholder text:placeholder-type="text">&lt;move.product.mark_category.name&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P21"><text:placeholder text:placeholder-type="text">&lt;/if&gt;</text:placeholder></text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tabla1.D3" office:value-type="string">
-      <text:p text:style-name="P46"><text:placeholder text:placeholder-type="text">&lt;if test=&quot;move.product.model_category&quot;&gt;</text:placeholder></text:p>
-      <text:p text:style-name="P36"><text:placeholder text:placeholder-type="text">&lt;move.product.model_category.name&gt;</text:placeholder></text:p>
-      <text:p text:style-name="P58"><text:placeholder text:placeholder-type="text">&lt;/if&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P21"><text:placeholder text:placeholder-type="text">&lt;if test=&quot;move.product.model_category&quot;&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P39"><text:placeholder text:placeholder-type="text">&lt;move.product.model_category.name&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P22"><text:placeholder text:placeholder-type="text">&lt;/if&gt;</text:placeholder></text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tabla1.E3" office:value-type="string">
-      <text:p text:style-name="P34"><text:placeholder text:placeholder-type="text">&lt;move.equipment_serial&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P37"><text:placeholder text:placeholder-type="text">&lt;move.equipment_serial&gt;</text:placeholder></text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tabla1.F3" office:value-type="string">
-      <text:p text:style-name="P35"><text:placeholder text:placeholder-type="text">&lt;format_number_symbol(move.quantity, user.language, move.uom, digits=move.uom.digits)&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P38"><text:placeholder text:placeholder-type="text">&lt;format_number_symbol(move.quantity, user.language, move.uom, digits=move.uom.digits)&gt;</text:placeholder></text:p>
      </table:table-cell>
     </table:table-row>
     <table:table-row>
      <table:table-cell table:style-name="Tabla1.A4" table:number-columns-spanned="6" office:value-type="string">
-      <text:p text:style-name="P40"><text:placeholder text:placeholder-type="text">&lt;/for&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P43"><text:placeholder text:placeholder-type="text">&lt;/for&gt;</text:placeholder></text:p>
      </table:table-cell>
      <table:covered-table-cell/>
      <table:covered-table-cell/>
@@ -1621,25 +1623,25 @@
      <table:covered-table-cell/>
     </table:table-row>
    </table:table>
-   <text:p text:style-name="P20"/>
-   <text:p text:style-name="P31">En mi calidad de Supervisor y/o Representante legal de la entidad contratante y /o comprador, una vez verificados las especificaciones técnicas y funcionamiento de los equipos descritos en el cuadro anterior, me permito hacer la recepción a satisfacción.</text:p>
-   <text:p text:style-name="P31"/>
-   <text:p text:style-name="P31">La entrega de los equipos se realiza con los manuales de usuario, manifiestos de importación y hojas de vida.</text:p>
-   <text:p text:style-name="P31"/>
+   <text:p text:style-name="P23"/>
+   <text:p text:style-name="P34">En mi calidad de Supervisor y/o Representante legal de la entidad contratante y /o comprador, una vez verificados las especificaciones técnicas y funcionamiento de los equipos descritos en el cuadro anterior, me permito hacer la recepción a satisfacción.</text:p>
+   <text:p text:style-name="P34"/>
+   <text:p text:style-name="P34">La entrega de los equipos se realiza con los manuales de usuario, manifiestos de importación y hojas de vida.</text:p>
+   <text:p text:style-name="P34"/>
    <table:table table:name="Tabla2" table:style-name="Tabla2">
     <table:table-column table:style-name="Tabla2.A"/>
     <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">Cordialmente</text:p>
+      <text:p text:style-name="P46">Cordialmente</text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tabla2.A1" office:value-type="string">
-      <text:p text:style-name="P43">Cordialmente Recibido a satisfacción.</text:p>
+      <text:p text:style-name="P46">Cordialmente Recibido a satisfacción.</text:p>
      </table:table-cell>
     </table:table-row>
     <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="fr2" draw:name="Image1" text:anchor-type="char" svg:x="0.1854in" svg:y="0.0571in" svg:width="1.3909in" svg:height="0.7693in" draw:z-index="1"><draw:image draw:mime-type="image/png">
+      <text:p text:style-name="P46"><draw:frame draw:style-name="fr2" draw:name="Image1" text:anchor-type="char" svg:x="0.1854in" svg:y="0.0571in" svg:width="1.3909in" svg:height="0.7693in" draw:z-index="1"><draw:image draw:mime-type="image/png">
          <office:binary-data>iVBORw0KGgoAAAANSUhEUgAABA4AAAI+CAYAAAA8dEjXAAKLKElEQVR4nOz9B4Bd13UeCn97
           n3PvnV4ADHolwQawgypUBWXKsmRZcgMSx3qOXCIlTpzELY5f/j+Did9L3OTYUiyHcpEtK3YC
           qFik1QtAkaIosYoEwAIQvc8Mps9t55z91lp7n5kLYFBIAkRbH3lw5557et3ft9f6Vuycg0Kh
@@ -4732,28 +4734,28 @@
          </office:binary-data>
         </draw:image>
        </draw:frame></text:p>
-      <text:p text:style-name="P43"/>
-      <text:p text:style-name="P43"/>
-      <text:p text:style-name="P43"/>
-      <text:p text:style-name="P43">_______________________________________</text:p>
-      <text:p text:style-name="P43">JESUS ANTONIO GIRALDO GRACIA</text:p>
-      <text:p text:style-name="P43">C.E.O. (Gerente General)<text:tab/></text:p>
+      <text:p text:style-name="P46"/>
+      <text:p text:style-name="P46"/>
+      <text:p text:style-name="P46"/>
+      <text:p text:style-name="P46">_______________________________________</text:p>
+      <text:p text:style-name="P46">JESUS ANTONIO GIRALDO GRACIA</text:p>
+      <text:p text:style-name="P46">C.E.O. (Gerente General)<text:tab/></text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tabla2.A1" office:value-type="string">
-      <text:p text:style-name="P43"/>
-      <text:p text:style-name="P43"/>
-      <text:p text:style-name="P43"/>
-      <text:p text:style-name="P43"/>
-      <text:p text:style-name="P43">_________________________________________</text:p>
-      <text:p text:style-name="P45">NOMBRE</text:p>
-      <text:p text:style-name="P43">C.C</text:p>
-      <text:p text:style-name="P43">CARGO</text:p>
-      <text:p text:style-name="P43">TEL/CEL</text:p>
+      <text:p text:style-name="P46"/>
+      <text:p text:style-name="P46"/>
+      <text:p text:style-name="P46"/>
+      <text:p text:style-name="P46"/>
+      <text:p text:style-name="P46">_________________________________________</text:p>
+      <text:p text:style-name="P48">NOMBRE</text:p>
+      <text:p text:style-name="P46">C.C</text:p>
+      <text:p text:style-name="P46">CARGO</text:p>
+      <text:p text:style-name="P46">TEL/CEL</text:p>
      </table:table-cell>
     </table:table-row>
    </table:table>
-   <text:p text:style-name="P44"/>
-   <text:p text:style-name="P22"><text:placeholder text:placeholder-type="text">&lt;/for&gt;</text:placeholder></text:p>
+   <text:p text:style-name="P47"/>
+   <text:p text:style-name="P25"><text:placeholder text:placeholder-type="text">&lt;/for&gt;</text:placeholder></text:p>
   </office:text>
  </office:body>
 </office:document>

report/Maintenance_History.fodt

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <office:document xmlns:css3t="http://www.w3.org/TR/css3-text/" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:drawooo="http://openoffice.org/2010/draw" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:rpt="http://openoffice.org/2005/report" xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:officeooo="http://openoffice.org/2009/office" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" office:version="1.3" office:mimetype="application/vnd.oasis.opendocument.text">
- <office:meta><meta:creation-date>2022-10-11T16:28:51.101948480</meta:creation-date><dc:date>2023-03-21T02:26:18.989442323</dc:date><meta:editing-duration>PT3H45M49S</meta:editing-duration><meta:editing-cycles>53</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="4" meta:image-count="1" meta:object-count="0" meta:page-count="2" meta:paragraph-count="72" meta:word-count="247" meta:character-count="2832" meta:non-whitespace-character-count="2654"/></office:meta>
+ <office:meta><meta:creation-date>2022-10-11T16:28:51.101948480</meta:creation-date><dc:date>2023-04-10T01:18:25.767368426</dc:date><meta:editing-duration>PT3H46M8S</meta:editing-duration><meta:editing-cycles>54</meta:editing-cycles><meta:generator>LibreOffice/7.4.6.2$Linux_X86_64 LibreOffice_project/40$Build-2</meta:generator><meta:document-statistic meta:table-count="4" meta:image-count="1" meta:object-count="0" meta:page-count="2" meta:paragraph-count="72" meta:word-count="247" meta:character-count="2832" meta:non-whitespace-character-count="2654"/></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>
@@ -13,8 +13,8 @@
    <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">20971</config:config-item>
-     <config:config-item config:name="ViewTop" config:type="long">7163</config:config-item>
+     <config:config-item config:name="ViewLeft" config:type="long">19865</config:config-item>
+     <config:config-item config:name="ViewTop" config:type="long">6840</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="VisibleRight" config:type="long">35001</config:config-item>
@@ -91,7 +91,7 @@
    <config:config-item config:name="ChartAutoUpdate" config:type="boolean">true</config:config-item>
    <config:config-item config:name="PrinterSetup" config:type="base64Binary"/>
    <config:config-item config:name="AddParaTableSpacingAtStart" config:type="boolean">true</config:config-item>
-   <config:config-item config:name="Rsid" config:type="int">4157692</config:config-item>
+   <config:config-item config:name="Rsid" config:type="int">4264415</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>
@@ -146,7 +146,6 @@
  </office:scripts>
  <office:font-face-decls>
   <style:font-face style:name="Arial" svg:font-family="Arial" style:font-family-generic="system" style:font-pitch="variable"/>
-  <style:font-face style:name="Calibri" svg:font-family="Calibri" style:font-family-generic="system" style:font-pitch="variable"/>
   <style:font-face style:name="Droid Sans" svg:font-family="&apos;Droid Sans&apos;" style:font-family-generic="swiss" style:font-pitch="variable"/>
   <style:font-face style:name="Droid Sans Devanagari" svg:font-family="&apos;Droid Sans Devanagari&apos;" style:font-family-generic="swiss"/>
   <style:font-face style:name="Droid Sans Devanagari1" svg:font-family="&apos;Droid Sans Devanagari&apos;" style:font-family-generic="system" style:font-pitch="variable"/>
@@ -154,7 +153,6 @@
   <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-family-generic="swiss" style:font-pitch="variable"/>
   <style:font-face style:name="Liberation Serif" svg:font-family="&apos;Liberation Serif&apos;" style:font-family-generic="roman" 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"/>
@@ -162,7 +160,7 @@
  <office:styles>
   <style:default-style style:family="graphic">
    <style:graphic-properties svg:stroke-color="#3465a4" draw:fill-color="#729fcf" fo:wrap-option="no-wrap" draw:shadow-offset-x="0.1181in" draw:shadow-offset-y="0.1181in" draw:start-line-spacing-horizontal="0.1114in" draw:start-line-spacing-vertical="0.1114in" draw:end-line-spacing-horizontal="0.1114in" draw:end-line-spacing-vertical="0.1114in" style:flow-with-text="false"/>
-   <style:paragraph-properties style:text-autospace="ideograph-alpha" style:line-break="strict" style:font-independent-line-spacing="false">
+   <style:paragraph-properties style:text-autospace="ideograph-alpha" style:line-break="strict" style:writing-mode="lr-tb" style:font-independent-line-spacing="false">
     <style:tab-stops/>
    </style:paragraph-properties>
    <style:text-properties style:use-window-font-color="true" loext:opacity="0%" loext:color-lum-mod="100%" loext:color-lum-off="0%" style:font-name="Liberation Serif" fo:font-size="12pt" fo:language="es" fo:country="CO" style:letter-kerning="true" style:font-name-asian="Droid Sans Fallback" style:font-size-asian="10.5pt" style:language-asian="zh" style:country-asian="CN" style:font-name-complex="Droid Sans Devanagari1" style:font-size-complex="12pt" style:language-complex="hi" style:country-complex="IN"/>
@@ -476,40 +474,88 @@
   </style:style>
   <style:style style:name="P9" style:family="paragraph" style:parent-style-name="Header">
    <style:paragraph-properties fo:margin-left="0in" fo:margin-right="0in" fo:text-align="center" style:justify-single-word="false" fo:text-indent="0in" style:auto-text-indent="false"/>
-   <style:text-properties fo:color="#666666" loext:opacity="100%" style:font-name="Droid Sans Japanese" fo:font-size="7pt" fo:font-style="normal" style:text-underline-style="none" fo:font-weight="normal" officeooo:paragraph-rsid="0049dca0" 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-properties fo:color="#666666" loext:opacity="100%" style:font-name="Droid Sans Japanese" fo:font-size="7pt" fo:font-style="normal" style:text-underline-style="none" fo:font-weight="normal" officeooo:paragraph-rsid="0049dca0" style:font-size-asian="7pt" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-size-complex="7pt" style:font-style-complex="normal" style:font-weight-complex="normal"/>
   </style:style>
-  <style:style style:name="P10" style:family="paragraph" style:parent-style-name="Standard">
+  <style:style style:name="P10" style:family="paragraph" style:parent-style-name="Header">
    <style:paragraph-properties fo:text-align="center" style:justify-single-word="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="10pt" fo:font-style="normal" fo:text-shadow="none" style:text-underline-style="none" fo:font-weight="bold" officeooo:rsid="000cde7f" officeooo:paragraph-rsid="0039bf19" style:font-size-asian="10pt" style:font-style-asian="normal" style:font-weight-asian="bold" style:font-size-complex="10pt" style:font-weight-complex="bold" style:text-emphasize="none"/>
+   <style:text-properties style:font-name="Droid Sans Japanese" fo:font-size="7pt" officeooo:paragraph-rsid="00066dfa" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
   </style:style>
-  <style:style style:name="P11" style:family="paragraph" style:parent-style-name="Standard">
-   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false" style:writing-mode="lr-tb"/>
-   <style:text-properties style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" style:font-name="Droid Sans Japanese" fo:font-size="8pt" fo:font-style="normal" fo:text-shadow="none" style:text-underline-style="none" fo:font-weight="bold" officeooo:rsid="00061322" officeooo:paragraph-rsid="0039bf19" style:font-size-asian="8pt" style:font-style-asian="normal" style:font-weight-asian="bold" style:font-size-complex="8pt" style:font-weight-complex="bold" style:text-emphasize="none"/>
+  <style:style style:name="P11" style:family="paragraph" style:parent-style-name="Footer">
+   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
+   <style:text-properties style:font-name="Droid Sans Japanese" fo:font-size="7pt" officeooo:paragraph-rsid="00066dfa" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
   </style:style>
-  <style:style style:name="P12" style:family="paragraph" style:parent-style-name="Standard">
-   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false" style:writing-mode="lr-tb"/>
-   <style:text-properties style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" style:font-name="Droid Sans 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="0039bf19" style:font-size-asian="8pt" style:font-style-asian="normal" style:font-weight-asian="bold" style:font-size-complex="8pt" style:font-weight-complex="bold" style:text-emphasize="none"/>
+  <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 style:font-name="Droid Sans Japanese" fo:font-size="7pt" officeooo:paragraph-rsid="0049dca0" 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:text-align="start" style:justify-single-word="false" style:writing-mode="lr-tb"/>
-   <style:text-properties style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" style:font-name="Droid Sans Japanese" fo:font-size="7pt" fo:font-style="normal" fo:text-shadow="none" style:text-underline-style="none" fo:font-weight="normal" officeooo:rsid="000cde7f" officeooo:paragraph-rsid="0039bf19" 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:paragraph-properties fo:margin-left="0in" fo:margin-right="0in" fo:text-align="center" style:justify-single-word="false" 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="0049dca0" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
   </style:style>
-  <style:style style:name="P14" style:family="paragraph" style:parent-style-name="Frame_20_contents">
+  <style:style style:name="P14" style:family="paragraph" style:parent-style-name="Table_20_Contents">
+   <style:paragraph-properties fo:line-height="100%" fo:text-align="center" style:justify-single-word="false"/>
+   <style:text-properties style:font-name="Droid Sans Japanese" fo:font-size="7pt" 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 style:writing-mode="lr-tb"/>
+   <style:text-properties style:font-name="Droid Sans Japanese" fo:font-size="7pt" officeooo:rsid="003df071" officeooo:paragraph-rsid="003df071" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
+  </style:style>
+  <style:style style:name="P16" style:family="paragraph" style:parent-style-name="Text_20_body">
+   <style:paragraph-properties style:writing-mode="lr-tb"/>
+   <style:text-properties style:font-name="Droid Sans Japanese" fo:font-size="7pt" officeooo:rsid="003df071" officeooo:paragraph-rsid="003df071" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
+  </style:style>
+  <style:style style:name="P17" style:family="paragraph" style:parent-style-name="Text_20_body">
+   <style:paragraph-properties style:writing-mode="lr-tb"/>
+   <style:text-properties style:font-name="Droid Sans Japanese" fo:font-size="7pt" officeooo:paragraph-rsid="003df071" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
+  </style:style>
+  <style:style style:name="P18" style:family="paragraph" style:parent-style-name="Text_20_body">
+   <style:text-properties style:font-name="Droid Sans Japanese" fo:font-size="7pt" officeooo:paragraph-rsid="003df071" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
+  </style:style>
+  <style:style style:name="P19" style:family="paragraph" style:parent-style-name="Table_20_Contents">
    <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
+   <style:text-properties style:font-name="Droid Sans Japanese" fo:font-size="7pt" officeooo:paragraph-rsid="003df071" style:font-size-asian="7pt" style:font-name-complex="Arial" style:font-size-complex="7pt"/>
   </style:style>
-  <style:style style:name="P15" style:family="paragraph" style:parent-style-name="Heading_20_1">
+  <style:style style:name="P20" style:family="paragraph" style:parent-style-name="Table_20_Contents">
+   <style:paragraph-properties fo:text-align="start" style:justify-single-word="false"/>
+   <style:text-properties style:font-name="Droid Sans Japanese" fo:font-size="7pt" officeooo:paragraph-rsid="003df071" style:font-size-asian="7pt" style:font-name-complex="Arial" style:font-size-complex="7pt"/>
+  </style:style>
+  <style:style style:name="P21" style:family="paragraph" style:parent-style-name="Header">
+   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
+   <style:text-properties style:font-name="Droid Sans Japanese" fo:font-size="7pt" style:text-underline-style="solid" style:text-underline-type="double" style:text-underline-width="auto" style:text-underline-color="font-color" officeooo:rsid="026544ec" officeooo:paragraph-rsid="0049dca0" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
+  </style:style>
+  <style:style style:name="P22" style:family="paragraph" style:parent-style-name="Header">
+   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
+   <style:text-properties style:font-name="Droid Sans Japanese" fo:font-size="7pt" style:text-underline-style="solid" style:text-underline-type="double" style:text-underline-width="auto" style:text-underline-color="font-color" officeooo:rsid="0266c2a9" officeooo:paragraph-rsid="0049dca0" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
+  </style:style>
+  <style:style style:name="P23" style:family="paragraph" style:parent-style-name="Standard">
+   <style:paragraph-properties fo:line-height="100%" fo:text-align="start" style:justify-single-word="false" style:writing-mode="lr-tb"/>
+   <style:text-properties style:font-name="Droid Sans Japanese" fo:font-size="7pt" fo:font-weight="bold" officeooo:rsid="00061322" officeooo:paragraph-rsid="0039bf19" 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="Table_20_Contents">
+   <style:paragraph-properties fo:text-align="start" style:justify-single-word="false"/>
+   <style:text-properties style:font-name="Droid Sans Japanese" fo:font-size="7pt" fo:font-weight="bold" officeooo:rsid="00064e04" officeooo:paragraph-rsid="0039bf19" 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:paragraph-properties fo:text-align="start" style:justify-single-word="false"/>
+   <style:text-properties style:font-name="Droid Sans Japanese" fo:font-size="7pt" fo:font-weight="bold" officeooo:rsid="001b9ac0" officeooo:paragraph-rsid="003df071" style:font-size-asian="7pt" style:font-weight-asian="bold" style:font-name-complex="Arial" style:font-size-complex="7pt" style:font-weight-complex="bold"/>
+  </style:style>
+  <style:style style:name="P26" style:family="paragraph" style:parent-style-name="Text_20_body">
+   <style:paragraph-properties style:writing-mode="lr-tb"/>
+   <style:text-properties style:font-name="Droid Sans Japanese" fo:font-size="7pt" fo:font-weight="normal" officeooo:rsid="003df071" officeooo:paragraph-rsid="003df071" style:font-size-asian="7pt" style:font-weight-asian="normal" style:font-size-complex="7pt" style:font-weight-complex="normal"/>
+  </style:style>
+  <style:style style:name="P27" style:family="paragraph" style:parent-style-name="Heading_20_1">
    <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
    <style:text-properties style:font-name="Droid Sans Japanese" fo:font-size="8pt" style:font-size-asian="8pt" style:font-size-complex="8pt"/>
   </style:style>
-  <style:style style:name="P16" style:family="paragraph" style:parent-style-name="Standard">
+  <style:style style:name="P28" 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="Droid Sans Japanese" fo:font-size="8pt" style:font-size-asian="8pt" style:font-size-complex="8pt"/>
   </style:style>
-  <style:style style:name="P17" style:family="paragraph" style:parent-style-name="Standard">
+  <style:style style:name="P29" 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 Japanese" fo:font-size="8pt" fo:font-weight="bold" officeooo:rsid="001b9ac0" officeooo:paragraph-rsid="001dfe2f" 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="Standard">
+  <style:style style:name="P30" style:family="paragraph" style:parent-style-name="Standard">
    <style:paragraph-properties>
     <style:tab-stops>
      <style:tab-stop style:position="3.6425in"/>
@@ -517,74 +563,11 @@
    </style:paragraph-properties>
    <style:text-properties style:font-name="Droid Sans Japanese" fo:font-size="8pt" fo:font-weight="bold" officeooo:paragraph-rsid="00391cc7" 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="P19" style:family="paragraph" style:parent-style-name="Standard">
+  <style:style style:name="P31" 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="Droid Sans Japanese" fo:font-size="8pt" fo:font-weight="normal" officeooo:rsid="001b9ac0" officeooo:paragraph-rsid="0039bf19" style:font-size-asian="7pt" 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="P20" style:family="paragraph" style:parent-style-name="Standard">
-   <style:paragraph-properties fo:line-height="100%" fo:text-align="start" style:justify-single-word="false" style:writing-mode="lr-tb"/>
-   <style:text-properties style:font-name="Droid Sans Japanese" fo:font-size="7pt" fo:font-weight="bold" officeooo:rsid="00061322" officeooo:paragraph-rsid="0039bf19" 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="P21" style:family="paragraph" style:parent-style-name="Table_20_Contents">
-   <style:paragraph-properties fo:text-align="start" style:justify-single-word="false"/>
-   <style:text-properties style:font-name="Droid Sans Japanese" fo:font-size="7pt" fo:font-weight="bold" officeooo:rsid="00064e04" officeooo:paragraph-rsid="0039bf19" 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="P22" 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 Japanese" fo:font-size="7pt" fo:font-weight="bold" officeooo:rsid="001b9ac0" officeooo:paragraph-rsid="003df071" style:font-size-asian="7pt" style:font-weight-asian="bold" style:font-name-complex="Arial" style:font-size-complex="7pt" style:font-weight-complex="bold"/>
-  </style:style>
-  <style:style style:name="P23" style:family="paragraph" style:parent-style-name="Table_20_Contents">
-   <style:paragraph-properties fo:line-height="100%" fo:text-align="center" style:justify-single-word="false"/>
-   <style:text-properties style:font-name="Droid Sans Japanese" fo:font-size="7pt" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
-  </style:style>
-  <style:style style:name="P24" style:family="paragraph" style:parent-style-name="Standard">
-   <style:paragraph-properties style:writing-mode="lr-tb"/>
-   <style:text-properties style:font-name="Droid Sans Japanese" fo:font-size="7pt" officeooo:rsid="003df071" officeooo:paragraph-rsid="003df071" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
-  </style:style>
-  <style:style style:name="P25" style:family="paragraph" style:parent-style-name="Text_20_body">
-   <style:paragraph-properties style:writing-mode="lr-tb"/>
-   <style:text-properties style:font-name="Droid Sans Japanese" fo:font-size="7pt" officeooo:rsid="003df071" officeooo:paragraph-rsid="003df071" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
-  </style:style>
-  <style:style style:name="P26" style:family="paragraph" style:parent-style-name="Text_20_body">
-   <style:paragraph-properties style:writing-mode="lr-tb"/>
-   <style:text-properties style:font-name="Droid Sans Japanese" fo:font-size="7pt" officeooo:paragraph-rsid="003df071" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
-  </style:style>
-  <style:style style:name="P27" style:family="paragraph" style:parent-style-name="Text_20_body">
-   <style:text-properties style:font-name="Droid Sans Japanese" fo:font-size="7pt" officeooo:paragraph-rsid="003df071" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
-  </style:style>
-  <style:style style:name="P28" style:family="paragraph" style:parent-style-name="Footer">
-   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
-   <style:text-properties style:font-name="Droid Sans Japanese" fo:font-size="7pt" officeooo:paragraph-rsid="00066dfa" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
-  </style:style>
-  <style:style style:name="P29" style:family="paragraph" style:parent-style-name="Header">
-   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
-   <style:text-properties style:font-name="Droid Sans Japanese" fo:font-size="7pt" officeooo:paragraph-rsid="00066dfa" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
-  </style:style>
-  <style:style style:name="P30" style:family="paragraph" style:parent-style-name="Header">
-   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
-   <style:text-properties style:font-name="Droid Sans Japanese" fo:font-size="7pt" officeooo:paragraph-rsid="0049dca0" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
-  </style:style>
-  <style:style style:name="P31" style:family="paragraph" style:parent-style-name="Standard">
-   <style:paragraph-properties fo:margin-left="0in" fo:margin-right="0in" fo:text-align="center" style:justify-single-word="false" 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="0049dca0" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
-  </style:style>
-  <style:style style:name="P32" style:family="paragraph" style:parent-style-name="Table_20_Contents">
-   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
-   <style:text-properties style:font-name="Droid Sans Japanese" fo:font-size="7pt" officeooo:paragraph-rsid="003df071" style:font-size-asian="7pt" style:font-name-complex="Arial" style:font-size-complex="7pt"/>
-  </style:style>
-  <style:style style:name="P33" style:family="paragraph" style:parent-style-name="Table_20_Contents">
-   <style:paragraph-properties fo:text-align="start" style:justify-single-word="false"/>
-   <style:text-properties style:font-name="Droid Sans Japanese" fo:font-size="7pt" officeooo:paragraph-rsid="003df071" style:font-size-asian="7pt" style:font-name-complex="Arial" style:font-size-complex="7pt"/>
-  </style:style>
-  <style:style style:name="P34" style:family="paragraph" style:parent-style-name="Header">
-   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
-   <style:text-properties style:font-name="Droid Sans Japanese" fo:font-size="7pt" style:text-underline-style="solid" style:text-underline-type="double" style:text-underline-width="auto" style:text-underline-color="font-color" officeooo:rsid="026544ec" officeooo:paragraph-rsid="0049dca0" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
-  </style:style>
-  <style:style style:name="P35" style:family="paragraph" style:parent-style-name="Header">
-   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
-   <style:text-properties style:font-name="Droid Sans Japanese" fo:font-size="7pt" style:text-underline-style="solid" style:text-underline-type="double" style:text-underline-width="auto" style:text-underline-color="font-color" officeooo:rsid="0266c2a9" officeooo:paragraph-rsid="0049dca0" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
-  </style:style>
-  <style:style style:name="P36" style:family="paragraph" style:parent-style-name="Standard">
+  <style:style style:name="P32" style:family="paragraph" style:parent-style-name="Standard">
    <style:paragraph-properties fo:text-align="start" style:justify-single-word="false">
     <style:tab-stops>
      <style:tab-stop style:position="3.6425in"/>
@@ -592,58 +575,73 @@
    </style:paragraph-properties>
    <style:text-properties style:font-name="Droid Sans Japanese" fo:font-size="10pt" fo:font-weight="bold" officeooo:rsid="000cde7f" officeooo:paragraph-rsid="0039bf19" style:font-size-asian="10pt" style:font-weight-asian="bold" style:font-name-complex="Arial" style:font-size-complex="10pt" style:font-weight-complex="bold"/>
   </style:style>
-  <style:style style:name="P37" style:family="paragraph" style:parent-style-name="Standard">
+  <style:style style:name="P33" 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 Japanese" fo:font-size="10pt" fo:font-weight="bold" officeooo:rsid="000cde7f" officeooo:paragraph-rsid="0039bf19" 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="P38" style:family="paragraph" style:parent-style-name="Standard">
+  <style:style style:name="P34" style:family="paragraph" style:parent-style-name="Standard">
    <style:paragraph-properties fo:text-align="start" style:justify-single-word="false" style:writing-mode="lr-tb"/>
    <style:text-properties style:font-name="Droid Sans Japanese" fo:font-size="10pt" fo:font-weight="bold" officeooo:rsid="000cde7f" officeooo:paragraph-rsid="0039bf19" 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="P39" style:family="paragraph" style:parent-style-name="Table_20_Contents">
-   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
-   <style:text-properties fo:color="#000000" loext:opacity="100%" style:font-name="Droid Sans Japanese" fo:font-size="8pt" fo:font-weight="bold" officeooo:rsid="003369d8" officeooo:paragraph-rsid="003df071" fo:background-color="transparent" 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="P40" style:family="paragraph" style:parent-style-name="Table_20_Contents">
-   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
-   <style:text-properties fo:color="#000000" loext:opacity="100%" style:font-name="Droid Sans Japanese" fo:font-size="8pt" fo:font-weight="bold" officeooo:rsid="0033a8e8" officeooo:paragraph-rsid="003df071" fo:background-color="transparent" 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="P41" style:family="paragraph" style:parent-style-name="Table_20_Contents">
-   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
-   <style:text-properties fo:color="#000000" loext:opacity="100%" style:font-name="Droid Sans Japanese" fo:font-size="8pt" fo:font-weight="bold" officeooo:rsid="0039bf19" officeooo:paragraph-rsid="003df071" fo:background-color="transparent" 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="P42" style:family="paragraph" style:parent-style-name="Header">
-   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
-   <style:text-properties fo:color="#666666" loext:opacity="100%" style:font-name="Droid Sans Japanese" fo:font-size="7pt" style:text-underline-style="solid" style:text-underline-type="double" style:text-underline-width="auto" style:text-underline-color="font-color" fo:font-weight="bold" officeooo:rsid="0266c2a9" officeooo:paragraph-rsid="0049dca0" 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="P43" style:family="paragraph" style:parent-style-name="Header">
+  <style:style style:name="P35" style:family="paragraph" style:parent-style-name="Header">
    <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
    <style:text-properties fo:color="#666666" loext:opacity="100%" style:font-name="Droid Sans Japanese" fo:font-size="8pt" fo:font-weight="normal" officeooo:paragraph-rsid="0049dca0" style:font-size-asian="8pt" style:font-weight-asian="normal" style:font-size-complex="8pt" style:font-weight-complex="normal"/>
   </style:style>
-  <style:style style:name="P44" style:family="paragraph" style:parent-style-name="Text_20_body">
-   <style:paragraph-properties style:writing-mode="lr-tb"/>
-   <style:text-properties style:font-name="Droid Sans Japanese" fo:font-size="7pt" fo:font-weight="normal" officeooo:rsid="003df071" officeooo:paragraph-rsid="003df071" style:font-size-asian="7pt" style:font-weight-asian="normal" style:font-size-complex="7pt" style:font-weight-complex="normal"/>
-  </style:style>
-  <style:style style:name="P45" style:family="paragraph" style:parent-style-name="Text_20_body">
-   <style:paragraph-properties fo:text-align="start" style:justify-single-word="false" style:writing-mode="lr-tb"/>
-   <style:text-properties style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" style:font-name="Droid Sans Japanese" fo:font-size="7pt" fo:font-style="normal" fo:text-shadow="none" style:text-underline-style="none" fo:font-weight="bold" officeooo:rsid="000cde7f" officeooo:paragraph-rsid="003df071" style:font-size-asian="7pt" style:font-style-asian="normal" style:font-weight-asian="bold" style:font-name-complex="Arial" style:font-size-complex="7pt" style:font-weight-complex="bold" style:text-emphasize="none"/>
-  </style:style>
-  <style:style style:name="P46" style:family="paragraph" style:parent-style-name="Header">
+  <style:style style:name="P36" style:family="paragraph" style:parent-style-name="Header">
    <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
-   <style:text-properties style:font-name="Droid Sans Japanese" fo:font-size="7pt" officeooo:paragraph-rsid="00066dfa" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
+   <style:text-properties fo:color="#666666" loext:opacity="100%" style:font-name="Droid Sans Japanese" fo:font-size="7pt" style:text-underline-style="solid" style:text-underline-type="double" style:text-underline-width="auto" style:text-underline-color="font-color" fo:font-weight="bold" officeooo:rsid="0266c2a9" officeooo:paragraph-rsid="0049dca0" 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="P47" style:family="paragraph" style:parent-style-name="Header">
+  <style:style style:name="P37" style:family="paragraph" style:parent-style-name="Header">
    <style:paragraph-properties fo:margin-left="0in" fo:margin-right="0in" fo:text-align="center" style:justify-single-word="false" fo:text-indent="0in" style:auto-text-indent="false"/>
    <style:text-properties fo:color="#666666" loext:opacity="100%" style:font-name="Droid Sans Japanese" fo:font-size="7pt" fo:font-style="normal" style:text-underline-style="none" fo:font-weight="normal" officeooo:paragraph-rsid="0049dca0" 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:style>
-  <style:style style:name="P48" style:family="paragraph" style:parent-style-name="Standard">
+  <style:style style:name="P38" style:family="paragraph" style:parent-style-name="Standard">
+   <style:paragraph-properties fo:text-align="center" style:justify-single-word="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="10pt" fo:font-style="normal" fo:text-shadow="none" style:text-underline-style="none" fo:font-weight="bold" officeooo:rsid="000cde7f" officeooo:paragraph-rsid="0039bf19" style:font-size-asian="10pt" style:font-style-asian="normal" style:font-weight-asian="bold" style:font-size-complex="10pt" style:font-weight-complex="bold" style:text-emphasize="none"/>
+  </style:style>
+  <style:style style:name="P39" style:family="paragraph" style:parent-style-name="Standard">
+   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false" style:writing-mode="lr-tb"/>
+   <style:text-properties style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" style:font-name="Droid Sans Japanese" fo:font-size="8pt" fo:font-style="normal" fo:text-shadow="none" style:text-underline-style="none" fo:font-weight="bold" officeooo:rsid="00061322" officeooo:paragraph-rsid="0039bf19" style:font-size-asian="8pt" style:font-style-asian="normal" style:font-weight-asian="bold" style:font-size-complex="8pt" style:font-weight-complex="bold" style:text-emphasize="none"/>
+  </style:style>
+  <style:style style:name="P40" style:family="paragraph" style:parent-style-name="Standard">
+   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false" style:writing-mode="lr-tb"/>
+   <style:text-properties style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" style:font-name="Droid Sans 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="0039bf19" style:font-size-asian="8pt" style:font-style-asian="normal" style:font-weight-asian="bold" style:font-size-complex="8pt" style:font-weight-complex="bold" style:text-emphasize="none"/>
+  </style:style>
+  <style:style style:name="P41" style:family="paragraph" style:parent-style-name="Standard">
+   <style:paragraph-properties fo:text-align="start" style:justify-single-word="false" style:writing-mode="lr-tb"/>
+   <style:text-properties style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" style:font-name="Droid Sans Japanese" fo:font-size="7pt" fo:font-style="normal" fo:text-shadow="none" style:text-underline-style="none" fo:font-weight="normal" officeooo:rsid="000cde7f" officeooo:paragraph-rsid="0039bf19" 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="P42" style:family="paragraph" style:parent-style-name="Text_20_body">
+   <style:paragraph-properties fo:text-align="start" style:justify-single-word="false" style:writing-mode="lr-tb"/>
+   <style:text-properties style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" style:font-name="Droid Sans Japanese" fo:font-size="7pt" fo:font-style="normal" fo:text-shadow="none" style:text-underline-style="none" fo:font-weight="bold" officeooo:rsid="000cde7f" officeooo:paragraph-rsid="003df071" style:font-size-asian="7pt" style:font-style-asian="normal" style:font-weight-asian="bold" style:font-name-complex="Arial" style:font-size-complex="7pt" style:font-weight-complex="bold" style:text-emphasize="none"/>
+  </style:style>
+  <style:style style:name="P43" style:family="paragraph" style:parent-style-name="Standard">
    <style:paragraph-properties fo:text-align="center" style:justify-single-word="false" style:writing-mode="lr-tb"/>
    <style:text-properties style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" style:font-name="Droid Sans" fo:font-size="7pt" fo:font-style="normal" fo:text-shadow="none" style:text-underline-style="none" fo:font-weight="normal" officeooo:paragraph-rsid="003c5fc5" style:font-size-asian="7pt" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-size-complex="7pt" style:text-emphasize="none"/>
   </style:style>
-  <style:style style:name="P49" style:family="paragraph" style:parent-style-name="Standard">
+  <style:style style:name="P44" style:family="paragraph" style:parent-style-name="Standard">
    <style:paragraph-properties fo:text-align="center" style:justify-single-word="false" style:writing-mode="lr-tb"/>
    <style:text-properties style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" style:font-name="Droid Sans" fo:font-size="7pt" fo:font-style="normal" fo:text-shadow="none" style:text-underline-style="none" fo:font-weight="normal" officeooo:rsid="0014ed01" officeooo:paragraph-rsid="003c5fc5" style:font-size-asian="7pt" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-size-complex="7pt" style:text-emphasize="none"/>
   </style:style>
+  <style:style style:name="P45" style:family="paragraph" style:parent-style-name="Frame_20_contents">
+   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
+  </style:style>
+  <style:style style:name="P46" style:family="paragraph" style:parent-style-name="Table_20_Contents">
+   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
+   <style:text-properties fo:color="#000000" loext:opacity="100%" style:font-name="Droid Sans Japanese" fo:font-size="8pt" fo:font-weight="bold" officeooo:rsid="003369d8" officeooo:paragraph-rsid="003df071" fo:background-color="transparent" 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="P47" style:family="paragraph" style:parent-style-name="Table_20_Contents">
+   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
+   <style:text-properties fo:color="#000000" loext:opacity="100%" style:font-name="Droid Sans Japanese" fo:font-size="8pt" fo:font-weight="bold" officeooo:rsid="0033a8e8" officeooo:paragraph-rsid="003df071" fo:background-color="transparent" 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="P48" style:family="paragraph" style:parent-style-name="Table_20_Contents">
+   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
+   <style:text-properties fo:color="#000000" loext:opacity="100%" style:font-name="Droid Sans Japanese" fo:font-size="8pt" fo:font-weight="bold" officeooo:rsid="0039bf19" officeooo:paragraph-rsid="003df071" fo:background-color="transparent" 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="P49" style:family="paragraph" style:parent-style-name="Header">
+   <style:paragraph-properties fo:margin-left="0in" fo:margin-right="0in" fo:text-align="center" style:justify-single-word="false" fo:text-indent="0in" style:auto-text-indent="false"/>
+   <style:text-properties fo:color="#666666" loext:opacity="100%" style:font-name="Droid Sans Japanese" fo:font-size="7pt" fo:font-style="normal" style:text-underline-style="none" fo:font-weight="normal" officeooo:paragraph-rsid="0049dca0" style:font-size-asian="7pt" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-size-complex="7pt" style:font-style-complex="normal" style:font-weight-complex="normal"/>
+  </style:style>
   <style:style style:name="T1" style:family="text">
    <style:text-properties fo:color="#333333" loext:opacity="100%" fo:font-weight="bold" officeooo:rsid="026544ec" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
   </style:style>
@@ -660,83 +658,89 @@
    <style:text-properties fo:color="#333333" loext:opacity="100%" style:text-underline-style="none" fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
   </style:style>
   <style:style style:name="T6" style:family="text">
-   <style:text-properties fo:color="#333333" loext:opacity="100%" style:text-underline-style="none" fo:font-weight="bold" officeooo:rsid="026544ec" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
+   <style:text-properties fo:color="#666666" loext:opacity="100%" style:text-underline-style="none" fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
   </style:style>
   <style:style style:name="T7" style:family="text">
-   <style:text-properties fo:color="#666666" loext:opacity="100%" style:text-underline-style="none" fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
-  </style:style>
-  <style:style style:name="T8" style:family="text">
-   <style:text-properties fo:color="#333333" loext:opacity="100%" style:text-underline-style="none" officeooo:rsid="026544ec"/>
-  </style:style>
-  <style:style style:name="T9" style:family="text">
-   <style:text-properties officeooo:rsid="026544ec"/>
-  </style:style>
-  <style:style style:name="T10" style:family="text">
-   <style:text-properties fo:color="#333333" loext:opacity="100%" style:text-underline-style="none" officeooo:rsid="0049dca0"/>
-  </style:style>
-  <style:style style:name="T11" style:family="text">
-   <style:text-properties style:font-style-complex="normal"/>
-  </style:style>
-  <style:style style:name="T12" style:family="text">
-   <style:text-properties officeooo:rsid="0014ed01"/>
-  </style:style>
-  <style:style style:name="T13" style:family="text">
-   <style:text-properties fo:font-weight="normal" style:font-weight-asian="normal" style:font-weight-complex="normal"/>
-  </style:style>
-  <style:style style:name="T14" style:family="text">
-   <style:text-properties fo:font-weight="normal" officeooo:rsid="001cde89" style:font-weight-asian="normal" style:font-weight-complex="normal"/>
-  </style:style>
-  <style:style style:name="T15" style:family="text">
-   <style:text-properties fo:font-weight="normal" officeooo:rsid="001e74c0" style:font-weight-asian="normal" style:font-weight-complex="normal"/>
-  </style:style>
-  <style:style style:name="T16" style:family="text">
-   <style:text-properties officeooo:rsid="003364b6"/>
-  </style:style>
-  <style:style style:name="T17" 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" style:font-style-asian="normal" style:text-emphasize="none"/>
-  </style:style>
-  <style:style style:name="T18" 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" officeooo:rsid="000cde7f" style:font-style-asian="normal" style:text-emphasize="none"/>
-  </style:style>
-  <style:style style:name="T19" 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="T20" style:family="text">
-   <style:text-properties officeooo:rsid="000669cd"/>
-  </style:style>
-  <style:style style:name="T21" style:family="text">
-   <style:text-properties fo:color="#333333" loext:opacity="100%" fo:font-weight="bold" officeooo:rsid="026544ec" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
-  </style:style>
-  <style:style style:name="T22" style:family="text">
-   <style:text-properties fo:color="#333333" loext:opacity="100%" style:text-underline-style="none" fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
-  </style:style>
-  <style:style style:name="T23" style:family="text">
    <style:text-properties fo:color="#333333" loext:opacity="100%" style:text-underline-style="none" fo:font-weight="bold" officeooo:rsid="026544ec" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
   </style:style>
-  <style:style style:name="T24" style:family="text">
+  <style:style style:name="T8" style:family="text">
+   <style:text-properties fo:color="#666666" loext:opacity="100%" style:text-underline-style="none" fo:font-weight="bold" officeooo:rsid="026544ec" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
+  </style:style>
+  <style:style style:name="T9" style:family="text">
    <style:text-properties fo:color="#333333" loext:opacity="100%" style:text-underline-style="none" officeooo:rsid="026544ec"/>
   </style:style>
-  <style:style style:name="T25" style:family="text">
+  <style:style style:name="T10" style:family="text">
+   <style:text-properties style:text-underline-style="none" officeooo:rsid="026544ec"/>
+  </style:style>
+  <style:style style:name="T11" style:family="text">
    <style:text-properties fo:color="#333333" loext:opacity="100%" style:text-underline-style="none" officeooo:rsid="0049dca0"/>
   </style:style>
-  <style:style style:name="T26" style:family="text">
+  <style:style style:name="T12" style:family="text">
+   <style:text-properties fo:color="#333333" loext:opacity="100%" fo:font-weight="bold" officeooo:rsid="026544ec" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
+  </style:style>
+  <style:style style:name="T13" style:family="text">
+   <style:text-properties fo:color="#333333" loext:opacity="100%" style:text-underline-style="none" 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 fo:color="#333333" loext:opacity="100%" style:text-underline-style="none" fo:font-weight="bold" officeooo:rsid="026544ec" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
+  </style:style>
+  <style:style style:name="T15" style:family="text">
+   <style:text-properties fo:color="#333333" loext:opacity="100%" style:text-underline-style="none" officeooo:rsid="026544ec"/>
+  </style:style>
+  <style:style style:name="T16" style:family="text">
+   <style:text-properties fo:color="#333333" loext:opacity="100%" style:text-underline-style="none" officeooo:rsid="0049dca0"/>
+  </style:style>
+  <style:style style:name="T17" style:family="text">
    <style:text-properties fo:color="#666666" loext:opacity="100%" fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
   </style:style>
-  <style:style style:name="T27" style:family="text">
+  <style:style style:name="T18" style:family="text">
    <style:text-properties fo:color="#666666" loext:opacity="100%" fo:font-weight="bold" officeooo:rsid="026544ec" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
   </style:style>
-  <style:style style:name="T28" style:family="text">
+  <style:style style:name="T19" style:family="text">
    <style:text-properties fo:color="#666666" loext:opacity="100%" fo:font-weight="bold" officeooo:rsid="001cd488" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
   </style:style>
-  <style:style style:name="T29" style:family="text">
+  <style:style style:name="T20" style:family="text">
    <style:text-properties fo:color="#666666" loext:opacity="100%" style:text-underline-style="none" fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
   </style:style>
-  <style:style style:name="T30" style:family="text">
+  <style:style style:name="T21" style:family="text">
+   <style:text-properties fo:color="#666666" loext:opacity="100%" style:text-underline-style="none" fo:font-weight="bold" officeooo:rsid="026544ec" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
+  </style:style>
+  <style:style style:name="T22" style:family="text">
    <style:text-properties officeooo:rsid="026544ec"/>
   </style:style>
-  <style:style style:name="T31" style:family="text">
+  <style:style style:name="T23" style:family="text">
    <style:text-properties style:font-style-complex="normal"/>
   </style:style>
+  <style:style style:name="T24" style:family="text">
+   <style:text-properties officeooo:rsid="0014ed01"/>
+  </style:style>
+  <style:style style:name="T25" style:family="text">
+   <style:text-properties fo:font-weight="normal" style:font-weight-asian="normal" style:font-weight-complex="normal"/>
+  </style:style>
+  <style:style style:name="T26" style:family="text">
+   <style:text-properties fo:font-weight="normal" officeooo:rsid="001cde89" style:font-weight-asian="normal" style:font-weight-complex="normal"/>
+  </style:style>
+  <style:style style:name="T27" style:family="text">
+   <style:text-properties fo:font-weight="normal" officeooo:rsid="001e74c0" style:font-weight-asian="normal" style:font-weight-complex="normal"/>
+  </style:style>
+  <style:style style:name="T28" style:family="text">
+   <style:text-properties officeooo:rsid="003364b6"/>
+  </style:style>
+  <style:style style:name="T29" 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" style:font-style-asian="normal" style:text-emphasize="none"/>
+  </style:style>
+  <style:style style:name="T30" 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" officeooo:rsid="000cde7f" style:font-style-asian="normal" style:text-emphasize="none"/>
+  </style:style>
+  <style:style style:name="T31" 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="T32" style:family="text">
+   <style:text-properties officeooo:rsid="000669cd"/>
+  </style:style>
+  <style:style style:name="T33" style:family="text">
+   <style:text-properties style:text-underline-style="none" officeooo:rsid="026544ec"/>
+  </style:style>
   <style:style style:name="fr1" style:family="graphic" style:parent-style-name="Graphics">
    <style:graphic-properties style:vertical-pos="from-top" style:horizontal-pos="from-left" style:horizontal-rel="paragraph" style:mirror="none" fo:clip="rect(0in, 0in, 0in, 0in)" draw:luminance="0%" draw:contrast="0%" draw:red="0%" draw:green="0%" draw:blue="0%" draw:gamma="100%" draw:color-inversion="false" draw:image-opacity="100%" draw:color-mode="standard"/>
   </style:style>
@@ -1431,11 +1435,11 @@
        <text:p text:style-name="P4"><text:span text:style-name="T1">NIT:</text:span><text:span text:style-name="T2"> </text:span><text:span text:style-name="T3"><text:placeholder text:placeholder-type="text">&lt;company.party.identifiers[0].code&gt;</text:placeholder></text:span></text:p>
        <text:p text:style-name="P5">Regimen Común</text:p>
        <text:p text:style-name="P5"><text:span text:style-name="T3">Actividad Economica 46</text:span><text:span text:style-name="T4">59</text:span></text:p>
-       <text:p text:style-name="P6"><text:span text:style-name="T5">Dirección: </text:span><text:span text:style-name="T3"><text:placeholder text:placeholder-type="text">&lt;company.party.addresses[0].street&gt;</text:placeholder></text:span><text:span text:style-name="T3"><text:s/></text:span><text:span text:style-name="T3"><text:placeholder text:placeholder-type="text">&lt;company.party.addresses[0].city&gt;</text:placeholder></text:span></text:p>
-       <text:p text:style-name="P7"><text:span text:style-name="T6">Teléfono:</text:span><text:span text:style-name="T7"> </text:span><text:span text:style-name="T2"><text:placeholder text:placeholder-type="text">&lt;company.party.phone&gt;</text:placeholder></text:span></text:p>
-       <text:p text:style-name="P8"><text:span text:style-name="T8">Celular: </text:span><text:span text:style-name="T9"><text:placeholder text:placeholder-type="text">&lt;company.party.mobile&gt;</text:placeholder></text:span></text:p>
-       <text:p text:style-name="P8"><text:span text:style-name="T10">E-mail</text:span><text:span text:style-name="T8">: </text:span><text:span text:style-name="T9"><text:placeholder text:placeholder-type="text">&lt;company.party.email&gt;</text:placeholder></text:span></text:p>
-       <text:p text:style-name="P9"><text:span text:style-name="T11"><text:placeholder text:placeholder-type="text">&lt;/if&gt;</text:placeholder></text:span></text:p>
+       <text:p text:style-name="P6"><text:span text:style-name="T5">Dirección: </text:span><text:span text:style-name="T6"><text:placeholder text:placeholder-type="text">&lt;company.party.addresses[0].street&gt;</text:placeholder></text:span><text:span text:style-name="T6"><text:s/></text:span><text:span text:style-name="T6"><text:placeholder text:placeholder-type="text">&lt;company.party.addresses[0].city&gt;</text:placeholder></text:span></text:p>
+       <text:p text:style-name="P7"><text:span text:style-name="T7">Teléfono:</text:span><text:span text:style-name="T6"> </text:span><text:span text:style-name="T8"><text:placeholder text:placeholder-type="text">&lt;company.party.phone&gt;</text:placeholder></text:span></text:p>
+       <text:p text:style-name="P8"><text:span text:style-name="T9">Celular: </text:span><text:span text:style-name="T10"><text:placeholder text:placeholder-type="text">&lt;company.party.mobile&gt;</text:placeholder></text:span></text:p>
+       <text:p text:style-name="P8"><text:span text:style-name="T11">E-mail</text:span><text:span text:style-name="T9">: </text:span><text:span text:style-name="T10"><text:placeholder text:placeholder-type="text">&lt;company.party.email&gt;</text:placeholder></text:span></text:p>
+       <text:p text:style-name="P9"><text:placeholder text:placeholder-type="text">&lt;/if&gt;</text:placeholder></text:p>
       </table:table-cell>
      </table:table-row>
     </table:table>
@@ -1452,173 +1456,173 @@
     <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="P17"><text:placeholder text:placeholder-type="text" text:description="for each=&quot;equipment in records&quot;">&lt;for each=&quot;equipment in records&quot;&gt;</text:placeholder></text:p>
-   <text:h text:style-name="P15" text:outline-level="1">R<text:span text:style-name="T16">EGISTRO HISTORICO DE MANTENIMIENTO</text:span></text:h>
-   <text:p text:style-name="P16"/>
-   <text:p text:style-name="P11">INFORMACIÓN DEL DISPOSITIVO</text:p>
+   <text:p text:style-name="P29"><text:placeholder text:placeholder-type="text" text:description="for each=&quot;equipment in records&quot;">&lt;for each=&quot;equipment in records&quot;&gt;</text:placeholder></text:p>
+   <text:h text:style-name="P27" text:outline-level="1">R<text:span text:style-name="T28">EGISTRO HISTORICO DE MANTENIMIENTO</text:span></text:h>
+   <text:p text:style-name="P28"/>
+   <text:p text:style-name="P39">INFORMACIÓN DEL DISPOSITIVO</text:p>
    <table:table table:name="Tabla5" table:style-name="Tabla5">
     <table:table-column table:style-name="Tabla5.A"/>
     <table:table-column table:style-name="Tabla5.B"/>
     <table:table-row table:style-name="Tabla5.1">
      <table:table-cell table:style-name="Tabla5.A1" office:value-type="string">
-      <text:p text:style-name="P20"><text:span text:style-name="T17">Nombre del Dispositivo: </text:span><text:span text:style-name="T19"><text:placeholder text:placeholder-type="text">&lt;equipment.product.name&gt;</text:placeholder></text:span></text:p>
+      <text:p text:style-name="P23"><text:span text:style-name="T29">Nombre del Dispositivo: </text:span><text:span text:style-name="T31"><text:placeholder text:placeholder-type="text">&lt;equipment.product.name&gt;</text:placeholder></text:span></text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tabla5.B1" office:value-type="string">
-      <text:p text:style-name="P20"><text:span text:style-name="T18">S</text:span><text:span text:style-name="T17">erial: </text:span><text:span text:style-name="T19"><text:placeholder text:placeholder-type="text">&lt;equipment.serial&gt;</text:placeholder></text:span></text:p>
+      <text:p text:style-name="P23"><text:span text:style-name="T30">S</text:span><text:span text:style-name="T29">erial: </text:span><text:span text:style-name="T31"><text:placeholder text:placeholder-type="text">&lt;equipment.serial&gt;</text:placeholder></text:span></text:p>
      </table:table-cell>
     </table:table-row>
     <table:table-row>
      <table:table-cell table:style-name="Tabla5.A2" office:value-type="string">
-      <text:p text:style-name="P20"><text:span text:style-name="T17">Restaurado: </text:span><text:span text:style-name="T19"><text:placeholder text:placeholder-type="text">&lt;&quot;SI&quot; if equipment.refurbish else &quot;NO&quot;&gt;</text:placeholder></text:span></text:p>
+      <text:p text:style-name="P23"><text:span text:style-name="T29">Restaurado: </text:span><text:span text:style-name="T31"><text:placeholder text:placeholder-type="text">&lt;&quot;SI&quot; if equipment.refurbish else &quot;NO&quot;&gt;</text:placeholder></text:span></text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tabla5.B2" office:value-type="string">
-      <text:p text:style-name="P20"><text:span text:style-name="T18">Clase de Riesgo:</text:span><text:span text:style-name="T19"> </text:span><text:span text:style-name="T19"><text:placeholder text:placeholder-type="text">&lt;equipment.product.risk&gt;</text:placeholder></text:span></text:p>
+      <text:p text:style-name="P23"><text:span text:style-name="T30">Clase de Riesgo:</text:span><text:span text:style-name="T31"> </text:span><text:span text:style-name="T31"><text:placeholder text:placeholder-type="text">&lt;equipment.product.risk&gt;</text:placeholder></text:span></text:p>
      </table:table-cell>
     </table:table-row>
     <table:table-row>
      <table:table-cell table:style-name="Tabla5.A2" office:value-type="string">
-      <text:p text:style-name="P20"><text:span text:style-name="T17">Marca: </text:span><text:span text:style-name="T19"><text:placeholder text:placeholder-type="text">&lt;equipment.mark_category.name&gt;</text:placeholder></text:span></text:p>
+      <text:p text:style-name="P23"><text:span text:style-name="T29">Marca: </text:span><text:span text:style-name="T31"><text:placeholder text:placeholder-type="text">&lt;equipment.mark_category.name&gt;</text:placeholder></text:span></text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tabla5.B2" office:value-type="string">
-      <text:p text:style-name="P20"><text:span text:style-name="T18">Clase Biomédica:</text:span><text:span text:style-name="T19"> </text:span><text:span text:style-name="T19"><text:placeholder text:placeholder-type="text">&lt;equipment.biomedical_class&gt;</text:placeholder></text:span></text:p>
+      <text:p text:style-name="P23"><text:span text:style-name="T30">Clase Biomédica:</text:span><text:span text:style-name="T31"> </text:span><text:span text:style-name="T31"><text:placeholder text:placeholder-type="text">&lt;equipment.biomedical_class&gt;</text:placeholder></text:span></text:p>
      </table:table-cell>
     </table:table-row>
     <table:table-row>
      <table:table-cell table:style-name="Tabla5.A2" office:value-type="string">
-      <text:p text:style-name="P20"><text:span text:style-name="T17">Marca: </text:span><text:span text:style-name="T19"><text:placeholder text:placeholder-type="text">&lt;equipment.mark_category.name&gt;</text:placeholder></text:span></text:p>
+      <text:p text:style-name="P23"><text:span text:style-name="T29">Marca: </text:span><text:span text:style-name="T31"><text:placeholder text:placeholder-type="text">&lt;equipment.mark_category.name&gt;</text:placeholder></text:span></text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tabla5.B2" office:value-type="string">
-      <text:p text:style-name="P20"><text:span text:style-name="T18">Tipo:</text:span><text:span text:style-name="T19"> </text:span><text:span text:style-name="T19"><text:placeholder text:placeholder-type="text">&lt;equipment.equipment_type&gt;</text:placeholder></text:span></text:p>
+      <text:p text:style-name="P23"><text:span text:style-name="T30">Tipo:</text:span><text:span text:style-name="T31"> </text:span><text:span text:style-name="T31"><text:placeholder text:placeholder-type="text">&lt;equipment.equipment_type&gt;</text:placeholder></text:span></text:p>
      </table:table-cell>
     </table:table-row>
     <table:table-row>
      <table:table-cell table:style-name="Tabla5.A2" office:value-type="string">
-      <text:p text:style-name="P20"><text:span text:style-name="T17">Referencia: </text:span><text:span text:style-name="T19"><text:placeholder text:placeholder-type="text">&lt;equipment.reference_category.name&gt;</text:placeholder></text:span></text:p>
+      <text:p text:style-name="P23"><text:span text:style-name="T29">Referencia: </text:span><text:span text:style-name="T31"><text:placeholder text:placeholder-type="text">&lt;equipment.reference_category.name&gt;</text:placeholder></text:span></text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tabla5.B2" office:value-type="string">
-      <text:p text:style-name="P20"><text:span text:style-name="T18">Uso:</text:span><text:span text:style-name="T19"> </text:span><text:span text:style-name="T19"><text:placeholder text:placeholder-type="text">&lt;equipment.use&gt;</text:placeholder></text:span></text:p>
+      <text:p text:style-name="P23"><text:span text:style-name="T30">Uso:</text:span><text:span text:style-name="T31"> </text:span><text:span text:style-name="T31"><text:placeholder text:placeholder-type="text">&lt;equipment.use&gt;</text:placeholder></text:span></text:p>
      </table:table-cell>
     </table:table-row>
     <table:table-row>
      <table:table-cell table:style-name="Tabla5.A2" office:value-type="string">
-      <text:p text:style-name="P20"><text:span text:style-name="T18">País de Origen:</text:span><text:span text:style-name="T19"> </text:span><text:span text:style-name="T19"><text:placeholder text:placeholder-type="text">&lt;equipment.origin_country.name&gt;</text:placeholder></text:span></text:p>
+      <text:p text:style-name="P23"><text:span text:style-name="T30">País de Origen:</text:span><text:span text:style-name="T31"> </text:span><text:span text:style-name="T31"><text:placeholder text:placeholder-type="text">&lt;equipment.origin_country.name&gt;</text:placeholder></text:span></text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tabla5.B2" office:value-type="string">
-      <text:p text:style-name="P20"><text:span text:style-name="T18">Registro Invima:</text:span><text:span text:style-name="T19"> </text:span><text:span text:style-name="T19"><text:placeholder text:placeholder-type="text">&lt;equipment.health_register&gt;</text:placeholder></text:span></text:p>
+      <text:p text:style-name="P23"><text:span text:style-name="T30">Registro Invima:</text:span><text:span text:style-name="T31"> </text:span><text:span text:style-name="T31"><text:placeholder text:placeholder-type="text">&lt;equipment.health_register&gt;</text:placeholder></text:span></text:p>
      </table:table-cell>
     </table:table-row>
     <table:table-row>
      <table:table-cell table:style-name="Tabla5.A2" office:value-type="string">
-      <text:p text:style-name="P20"><text:span text:style-name="T18">Software Versión:</text:span><text:span text:style-name="T19"> </text:span><text:span text:style-name="T19"><text:placeholder text:placeholder-type="text">&lt;equipment.software_version if equipment.software_version != &quot;&quot; else &quot;No Aplica&quot;&gt;</text:placeholder></text:span></text:p>
+      <text:p text:style-name="P23"><text:span text:style-name="T30">Software Versión:</text:span><text:span text:style-name="T31"> </text:span><text:span text:style-name="T31"><text:placeholder text:placeholder-type="text">&lt;equipment.software_version if equipment.software_version != &quot;&quot; else &quot;No Aplica&quot;&gt;</text:placeholder></text:span></text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tabla5.B2" office:value-type="string">
-      <text:p text:style-name="P23"/>
+      <text:p text:style-name="P14"/>
      </table:table-cell>
     </table:table-row>
    </table:table>
-   <text:p text:style-name="P11"/>
-   <text:p text:style-name="P12">CARACTERÍSTICAS TÉCNICAS</text:p>
+   <text:p text:style-name="P39"/>
+   <text:p text:style-name="P40">CARACTERÍSTICAS TÉCNICAS</text:p>
    <table:table table:name="Tabla4" table:style-name="Tabla4">
     <table:table-column table:style-name="Tabla4.A"/>
     <table:table-column table:style-name="Tabla4.B"/>
     <table:table-column table:style-name="Tabla4.C"/>
     <table:table-row>
      <table:table-cell table:style-name="Tabla4.A1" table:number-rows-spanned="2" office:value-type="string">
-      <text:p text:style-name="P21">Características Físicas</text:p>
+      <text:p text:style-name="P24">Características Físicas</text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tabla4.B1" office:value-type="string">
-      <text:p text:style-name="P21">Peso</text:p>
+      <text:p text:style-name="P24">Peso</text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tabla4.A1" office:value-type="string">
-      <text:p text:style-name="P13"><text:placeholder text:placeholder-type="text">&lt;str(equipment.product.weight) + &quot; &quot;+ equipment.product.weight_uom.symbol if equipment.product.weight else &quot;&quot;&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P41"><text:placeholder text:placeholder-type="text">&lt;str(equipment.product.weight) + &quot; &quot;+ equipment.product.weight_uom.symbol if equipment.product.weight else &quot;&quot;&gt;</text:placeholder></text:p>
      </table:table-cell>
     </table:table-row>
     <table:table-row table:style-name="Tabla4.2">
      <table:covered-table-cell table:style-name="Tabla4.A2"/>
      <table:table-cell table:style-name="Tabla4.B2" office:value-type="string">
-      <text:p text:style-name="P21">Medidas</text:p>
+      <text:p text:style-name="P24">Medidas</text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tabla4.C2" office:value-type="string">
-      <text:p text:style-name="P13"><text:placeholder text:placeholder-type="text">&lt;&quot;Longitud:&quot; +str(equipment.product.length) + &quot; &quot;+ equipment.product.length_uom.symbol+&quot;  Altura: &quot;+str(equipment.product.height) + &quot; &quot;+ equipment.product.height_uom.symbol + &quot; Ancho: &quot;+str(equipment.product.width) + &quot; &quot;+ equipment.product.width_uom.symbol if equipment.product.width else &quot;&quot;&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P41"><text:placeholder text:placeholder-type="text">&lt;&quot;Longitud:&quot; +str(equipment.product.length) + &quot; &quot;+ equipment.product.length_uom.symbol+&quot;  Altura: &quot;+str(equipment.product.height) + &quot; &quot;+ equipment.product.height_uom.symbol + &quot; Ancho: &quot;+str(equipment.product.width) + &quot; &quot;+ equipment.product.width_uom.symbol if equipment.product.width else &quot;&quot;&gt;</text:placeholder></text:p>
      </table:table-cell>
     </table:table-row>
     <table:table-row>
      <table:table-cell table:style-name="Tabla4.B2" table:number-rows-spanned="2" office:value-type="string">
-      <text:p text:style-name="P21">Características Eléctricas</text:p>
+      <text:p text:style-name="P24">Características Eléctricas</text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tabla4.B2" office:value-type="string">
-      <text:p text:style-name="P21">Voltaje (VAC)</text:p>
+      <text:p text:style-name="P24">Voltaje (VAC)</text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tabla4.A2" office:value-type="string">
-      <text:p text:style-name="P13"><text:placeholder text:placeholder-type="text">&lt;str(equipment.product.voltageAC) + &quot; &quot;+ equipment.product.voltageAC_uom.symbol if equipment.product.voltageAC else &quot;No Aplica&quot;&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P41"><text:placeholder text:placeholder-type="text">&lt;str(equipment.product.voltageAC) + &quot; &quot;+ equipment.product.voltageAC_uom.symbol if equipment.product.voltageAC else &quot;No Aplica&quot;&gt;</text:placeholder></text:p>
      </table:table-cell>
     </table:table-row>
     <table:table-row>
      <table:covered-table-cell table:style-name="Tabla4.B2"/>
      <table:table-cell table:style-name="Tabla4.B2" office:value-type="string">
-      <text:p text:style-name="P21">Voltaje (VDC)</text:p>
+      <text:p text:style-name="P24">Voltaje (VDC)</text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tabla4.A2" office:value-type="string">
-      <text:p text:style-name="P13"><text:placeholder text:placeholder-type="text">&lt;str(equipment.product.voltageDC) + &quot; &quot;+ equipment.product.voltageDC_uom.symbol if equipment.product.voltageDC else &quot;No Aplica&quot;&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P41"><text:placeholder text:placeholder-type="text">&lt;str(equipment.product.voltageDC) + &quot; &quot;+ equipment.product.voltageDC_uom.symbol if equipment.product.voltageDC else &quot;No Aplica&quot;&gt;</text:placeholder></text:p>
      </table:table-cell>
     </table:table-row>
     <table:table-row>
      <table:table-cell table:style-name="Tabla4.B2" table:number-rows-spanned="4" office:value-type="string">
-      <text:p text:style-name="P21">Condiciones Ambientales</text:p>
+      <text:p text:style-name="P24">Condiciones Ambientales</text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tabla4.B2" office:value-type="string">
-      <text:p text:style-name="P21">Te<text:span text:style-name="T20">m </text:span>Min Uso</text:p>
+      <text:p text:style-name="P24">Te<text:span text:style-name="T32">m </text:span>Min Uso</text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tabla4.A2" office:value-type="string">
-      <text:p text:style-name="P13"><text:placeholder text:placeholder-type="text">&lt;str(equipment.product.temperature_min) + &quot; &quot;+ equipment.product.temperature_uom.symbol if equipment.product.temperature_min else &quot;No Aplica&quot;&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P41"><text:placeholder text:placeholder-type="text">&lt;str(equipment.product.temperature_min) + &quot; &quot;+ equipment.product.temperature_uom.symbol if equipment.product.temperature_min else &quot;No Aplica&quot;&gt;</text:placeholder></text:p>
      </table:table-cell>
     </table:table-row>
     <table:table-row>
      <table:covered-table-cell table:style-name="Tabla4.B2"/>
      <table:table-cell table:style-name="Tabla4.B2" office:value-type="string">
-      <text:p text:style-name="P21">Tem Max Uso</text:p>
+      <text:p text:style-name="P24">Tem Max Uso</text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tabla4.A2" office:value-type="string">
-      <text:p text:style-name="P13"><text:placeholder text:placeholder-type="text">&lt;str(equipment.product.temperature_max) + &quot; &quot;+ equipment.product.temperature_uom.symbol if equipment.product.temperature_max else &quot;No Aplica&quot;&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P41"><text:placeholder text:placeholder-type="text">&lt;str(equipment.product.temperature_max) + &quot; &quot;+ equipment.product.temperature_uom.symbol if equipment.product.temperature_max else &quot;No Aplica&quot;&gt;</text:placeholder></text:p>
      </table:table-cell>
     </table:table-row>
     <table:table-row>
      <table:covered-table-cell table:style-name="Tabla4.B2"/>
      <table:table-cell table:style-name="Tabla4.B2" office:value-type="string">
-      <text:p text:style-name="P21">Hum Min Uso</text:p>
+      <text:p text:style-name="P24">Hum Min Uso</text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tabla4.A2" office:value-type="string">
-      <text:p text:style-name="P13"><text:placeholder text:placeholder-type="text">&lt;str(equipment.product.moisture_min) + &quot; &quot;+ equipment.product.moisture_uom.symbol if equipment.product.moisture_min else &quot;No Aplica&quot;&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P41"><text:placeholder text:placeholder-type="text">&lt;str(equipment.product.moisture_min) + &quot; &quot;+ equipment.product.moisture_uom.symbol if equipment.product.moisture_min else &quot;No Aplica&quot;&gt;</text:placeholder></text:p>
      </table:table-cell>
     </table:table-row>
     <table:table-row>
      <table:covered-table-cell table:style-name="Tabla4.B2"/>
      <table:table-cell table:style-name="Tabla4.B2" office:value-type="string">
-      <text:p text:style-name="P21">Hum Max Uso</text:p>
+      <text:p text:style-name="P24">Hum Max Uso</text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tabla4.A2" office:value-type="string">
-      <text:p text:style-name="P13"><text:placeholder text:placeholder-type="text">&lt;str(equipment.product.moisture_max) + &quot; &quot;+ equipment.product.moisture_uom.symbol if equipment.product.moisture_max else &quot;No Aplica&quot;&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P41"><text:placeholder text:placeholder-type="text">&lt;str(equipment.product.moisture_max) + &quot; &quot;+ equipment.product.moisture_uom.symbol if equipment.product.moisture_max else &quot;No Aplica&quot;&gt;</text:placeholder></text:p>
      </table:table-cell>
     </table:table-row>
    </table:table>
-   <text:p text:style-name="P19"/>
-   <text:p text:style-name="P19"/>
+   <text:p text:style-name="P31"/>
+   <text:p text:style-name="P31"/>
    <table:table table:name="Tabla1" table:style-name="Tabla1">
     <table:table-column table:style-name="Tabla1.A" table:number-columns-repeated="3"/>
     <table:table-row>
      <table:table-cell table:style-name="Tabla1.A1" office:value-type="string">
-      <text:p text:style-name="P39">Fecha</text:p>
+      <text:p text:style-name="P46">Fecha</text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tabla1.A1" office:value-type="string">
-      <text:p text:style-name="P40">Tipo de mantenimiento</text:p>
+      <text:p text:style-name="P47">Tipo de mantenimiento</text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tabla1.C1" office:value-type="string">
-      <text:p text:style-name="P41">N.º del Registro</text:p>
+      <text:p text:style-name="P48">N.º del Registro</text:p>
      </table:table-cell>
     </table:table-row>
     <table:table-row>
      <table:table-cell table:style-name="Tabla1.A2" table:number-columns-spanned="3" office:value-type="string">
-      <text:p text:style-name="P22"><text:placeholder text:placeholder-type="text" text:description="for each=&quot;line in equipment.maintenance_history&quot;">&lt;for each=&quot;line in equipment.maintenance_history&quot;&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P25"><text:placeholder text:placeholder-type="text" text:description="for each=&quot;line in equipment.maintenance_history&quot;">&lt;for each=&quot;line in equipment.maintenance_history&quot;&gt;</text:placeholder></text:p>
      </table:table-cell>
      <table:covered-table-cell/>
      <table:covered-table-cell/>
@@ -1626,51 +1630,51 @@
     <text:soft-page-break/>
     <table:table-row>
      <table:table-cell table:style-name="Tabla1.A3" office:value-type="string">
-      <text:p text:style-name="P32"><text:placeholder text:placeholder-type="text" text:description="line.service_maintenance.estimated_agended">&lt;line.service_maintenance.estimated_agended&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P19"><text:placeholder text:placeholder-type="text" text:description="line.service_maintenance.estimated_agended">&lt;line.service_maintenance.estimated_agended&gt;</text:placeholder></text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tabla1.A3" office:value-type="string">
-      <text:p text:style-name="P26"><text:placeholder text:placeholder-type="text">&lt;choose test=&quot;&quot;&gt;</text:placeholder></text:p>
-      <text:p text:style-name="P26"><text:placeholder text:placeholder-type="text">&lt;when test=&quot;line.maintenance_type == &apos;preventive&apos;&quot;&gt;</text:placeholder></text:p>
-      <text:p text:style-name="P25"><text:span text:style-name="T14">P</text:span><text:span text:style-name="T13">reventivo</text:span></text:p>
-      <text:p text:style-name="P27"><text:placeholder text:placeholder-type="text">&lt;/when&gt;</text:placeholder></text:p>
-      <text:p text:style-name="P26"><text:placeholder text:placeholder-type="text">&lt;when test=&quot;line.maintenance_type == &apos;corrective&apos;&quot;&gt;</text:placeholder></text:p>
-      <text:p text:style-name="P44">Correctivo</text:p>
-      <text:p text:style-name="P27"><text:placeholder text:placeholder-type="text">&lt;/when&gt;</text:placeholder></text:p>
-      <text:p text:style-name="P27"><text:placeholder text:placeholder-type="text">&lt;otherwise test=&quot;&quot;&gt;</text:placeholder></text:p>
-      <text:p text:style-name="P24"><text:span text:style-name="T15">I</text:span><text:span text:style-name="T13">nicial</text:span></text:p>
-      <text:p text:style-name="P27"><text:placeholder text:placeholder-type="text">&lt;/otherwise&gt;</text:placeholder></text:p>
-      <text:p text:style-name="P45"><text:placeholder text:placeholder-type="text">&lt;/choose&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P17"><text:placeholder text:placeholder-type="text">&lt;choose test=&quot;&quot;&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P17"><text:placeholder text:placeholder-type="text">&lt;when test=&quot;line.maintenance_type == &apos;preventive&apos;&quot;&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P16"><text:span text:style-name="T26">P</text:span><text:span text:style-name="T25">reventivo</text:span></text:p>
+      <text:p text:style-name="P18"><text:placeholder text:placeholder-type="text">&lt;/when&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P17"><text:placeholder text:placeholder-type="text">&lt;when test=&quot;line.maintenance_type == &apos;corrective&apos;&quot;&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P26">Correctivo</text:p>
+      <text:p text:style-name="P18"><text:placeholder text:placeholder-type="text">&lt;/when&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P18"><text:placeholder text:placeholder-type="text">&lt;otherwise test=&quot;&quot;&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P15"><text:span text:style-name="T27">I</text:span><text:span text:style-name="T25">nicial</text:span></text:p>
+      <text:p text:style-name="P18"><text:placeholder text:placeholder-type="text">&lt;/otherwise&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P42"><text:placeholder text:placeholder-type="text">&lt;/choose&gt;</text:placeholder></text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tabla1.A2" office:value-type="string">
-      <text:p text:style-name="P32"><text:placeholder text:placeholder-type="text" text:description="line.code">&lt;line.code&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P19"><text:placeholder text:placeholder-type="text" text:description="line.code">&lt;line.code&gt;</text:placeholder></text:p>
      </table:table-cell>
     </table:table-row>
     <table:table-row>
      <table:table-cell table:style-name="Tabla1.A2" table:number-columns-spanned="3" office:value-type="string">
-      <text:p text:style-name="P33"><text:placeholder text:placeholder-type="text" text:description="/for">&lt;/for&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P20"><text:placeholder text:placeholder-type="text" text:description="/for">&lt;/for&gt;</text:placeholder></text:p>
      </table:table-cell>
      <table:covered-table-cell/>
      <table:covered-table-cell/>
     </table:table-row>
    </table:table>
-   <text:p text:style-name="P10"/>
-   <text:p text:style-name="P38"><draw:frame draw:style-name="fr2" draw:name="image: (equipment.product.images[0].image,  &apos;image/jpg&apos;)" text:anchor-type="paragraph" svg:x="2.3173in" svg:y="0.0626in" svg:width="1.9402in" svg:height="1.9402in" draw:z-index="2">
+   <text:p text:style-name="P38"/>
+   <text:p text:style-name="P34"><draw:frame draw:style-name="fr2" draw:name="image: (equipment.product.images[0].image,  &apos;image/jpg&apos;)" text:anchor-type="paragraph" svg:x="2.3173in" svg:y="0.0626in" svg:width="1.9402in" svg:height="1.9402in" draw:z-index="2">
      <draw:text-box>
-      <text:p text:style-name="P14"/>
+      <text:p text:style-name="P45"/>
       <text:p text:style-name="Text">Texto <text:sequence text:ref-name="refText0" text:name="Text" text:formula="ooow:Text+1" style:num-format="1">1</text:sequence>: </text:p>
      </draw:text-box>
     </draw:frame></text:p>
-   <text:p text:style-name="P37"/>
-   <text:p text:style-name="P37"/>
-   <text:p text:style-name="P37"/>
-   <text:p text:style-name="P36"/>
-   <text:p text:style-name="P36"/>
-   <text:p text:style-name="P36"/>
-   <text:p text:style-name="P36"/>
-   <text:p text:style-name="P36"/>
-   <text:p text:style-name="P36"/>
-   <text:p text:style-name="P36"/>
-   <text:p text:style-name="P18"><text:placeholder text:placeholder-type="text">&lt;/for&gt;</text:placeholder></text:p>
+   <text:p text:style-name="P33"/>
+   <text:p text:style-name="P33"/>
+   <text:p text:style-name="P33"/>
+   <text:p text:style-name="P32"/>
+   <text:p text:style-name="P32"/>
+   <text:p text:style-name="P32"/>
+   <text:p text:style-name="P32"/>
+   <text:p text:style-name="P32"/>
+   <text:p text:style-name="P32"/>
+   <text:p text:style-name="P32"/>
+   <text:p text:style-name="P30"><text:placeholder text:placeholder-type="text">&lt;/for&gt;</text:placeholder></text:p>
   </office:text>
  </office:body>
 </office:document>

report/Maintenance_Timeline.fodt

@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <office:document xmlns:css3t="http://www.w3.org/TR/css3-text/" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:drawooo="http://openoffice.org/2010/draw" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:rpt="http://openoffice.org/2005/report" xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:officeooo="http://openoffice.org/2009/office" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" office:version="1.3" office:mimetype="application/vnd.oasis.opendocument.text">
- <office:meta><meta:creation-date>2022-11-03T17:09:30.500078764</meta:creation-date><dc:date>2023-03-21T02:27:52.983981518</dc:date><meta:editing-duration>PT1H44M16S</meta:editing-duration><meta:editing-cycles>30</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="3" meta:image-count="1" meta:object-count="0" meta:page-count="1" meta:paragraph-count="44" meta:word-count="110" meta:character-count="1390" meta:non-whitespace-character-count="1322"/></office:meta>
+ <office:meta><meta:creation-date>2022-11-03T17:09:30.500078764</meta:creation-date><dc:date>2023-05-25T14:08:20.082359739</dc:date><meta:editing-duration>PT1H45M28S</meta:editing-duration><meta:editing-cycles>33</meta:editing-cycles><meta:generator>LibreOffice/7.4.6.2$Linux_X86_64 LibreOffice_project/40$Build-2</meta:generator><meta:document-statistic meta:table-count="3" meta:image-count="1" meta:object-count="0" meta:page-count="1" meta:paragraph-count="44" meta:word-count="108" meta:character-count="1310" meta:non-whitespace-character-count="1244"/></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">4838</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">35003</config:config-item>
-   <config:config-item config:name="ViewAreaHeight" config:type="long">15688</config:config-item>
+   <config:config-item config:name="ViewAreaWidth" config:type="long">24343</config:config-item>
+   <config:config-item config:name="ViewAreaHeight" config:type="long">10869</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">22162</config:config-item>
-     <config:config-item config:name="ViewTop" config:type="long">7486</config:config-item>
+     <config:config-item config:name="ViewLeft" config:type="long">4524</config:config-item>
+     <config:config-item config:name="ViewTop" config:type="long">10135</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="VisibleRight" config:type="long">35001</config:config-item>
-     <config:config-item config:name="VisibleBottom" config:type="long">15686</config:config-item>
+     <config:config-item config:name="VisibleTop" config:type="long">4838</config:config-item>
+     <config:config-item config:name="VisibleRight" config:type="long">24342</config:config-item>
+     <config:config-item config:name="VisibleBottom" config:type="long">15706</config:config-item>
      <config:config-item config:name="ZoomType" config:type="short">0</config:config-item>
      <config:config-item config:name="ViewLayoutColumns" config:type="short">1</config:config-item>
      <config:config-item config:name="ViewLayoutBookMode" config:type="boolean">false</config:config-item>
@@ -91,7 +91,7 @@
    <config:config-item config:name="ChartAutoUpdate" config:type="boolean">true</config:config-item>
    <config:config-item config:name="PrinterSetup" config:type="base64Binary"/>
    <config:config-item config:name="AddParaTableSpacingAtStart" config:type="boolean">true</config:config-item>
-   <config:config-item config:name="Rsid" config:type="int">1566308</config:config-item>
+   <config:config-item config:name="Rsid" config:type="int">1743443</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>
@@ -157,14 +157,14 @@
  </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.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: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: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%" loext:color-lum-mod="100%" loext:color-lum-off="0%" style:font-name="DejaVu Serif" fo:font-size="12pt" fo:language="es" fo:country="CO" style:letter-kerning="true" style:font-name-asian="DejaVu Sans1" style:font-size-asian="10.5pt" style:language-asian="zh" style:country-asian="CN" style:font-name-complex="DejaVu Sans1" 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="0.4925in" style:writing-mode="lr-tb"/>
+   <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="lr-tb"/>
    <style:text-properties style:use-window-font-color="true" loext:opacity="0%" style:font-name="DejaVu Serif" fo:font-size="12pt" fo:language="es" fo:country="CO" style:letter-kerning="true" style:font-name-asian="DejaVu Sans1" style:font-size-asian="10.5pt" style:language-asian="zh" style:country-asian="CN" style:font-name-complex="DejaVu Sans1" 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">
@@ -175,17 +175,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.1665in" fo:margin-bottom="0.0835in" style:contextual-spacing="false" fo:keep-with-next="always"/>
+   <style:paragraph-properties fo:margin-top="0.423cm" fo:margin-bottom="0.212cm" style:contextual-spacing="false" fo:keep-with-next="always"/>
    <style:text-properties style:font-name="DejaVu Sans" fo:font-family="&apos;DejaVu Sans&apos;" style:font-family-generic="swiss" style:font-pitch="variable" fo:font-size="14pt" style:font-name-asian="DejaVu Sans1" 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 Sans1" 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="0in" fo:margin-bottom="0.0972in" style:contextual-spacing="false" fo:line-height="115%"/>
+   <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0.247cm" 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:style>
   <style:style style:name="Caption" style:family="paragraph" style:parent-style-name="Standard" style:class="extra">
-   <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: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: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">
@@ -195,16 +195,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="3.4626in" style:type="center"/>
-     <style:tab-stop style:position="6.9252in" style:type="right"/>
+     <style:tab-stop style:position="8.795cm" style:type="center"/>
+     <style:tab-stop style:position="17.59cm" 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="3.4626in" style:type="center"/>
-     <style:tab-stop style:position="6.9252in" style:type="right"/>
+     <style:tab-stop style:position="8.795cm" style:type="center"/>
+     <style:tab-stop style:position="17.59cm" style:type="right"/>
     </style:tab-stops>
    </style:paragraph-properties>
   </style:style>
@@ -223,8 +223,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="3.4626in" style:type="center"/>
-     <style:tab-stop style:position="6.9252in" style:type="right"/>
+     <style:tab-stop style:position="8.795cm" style:type="center"/>
+     <style:tab-stop style:position="17.59cm" style:type="right"/>
     </style:tab-stops>
    </style:paragraph-properties>
    <style:text-properties fo:font-size="9pt" style:font-size-asian="10.5pt"/>
@@ -233,7 +233,7 @@
    <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="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: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: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">
@@ -241,10 +241,10 @@
    <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: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: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:paragraph-properties fo:margin-left="0.499cm" fo:margin-right="0cm" fo:text-indent="0cm" 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"/>
@@ -259,10 +259,10 @@
    <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="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:graphic-properties text:anchor-type="paragraph" svg:x="0cm" svg:y="0cm" fo:margin-left="0.201cm" fo:margin-right="0.201cm" fo:margin-top="0.201cm" fo:margin-bottom="0.201cm" 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.15cm" fo:border="0.06pt solid #000000"/>
   </style:style>
   <style:style style:name="Graphics" style:family="graphic">
-   <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: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:style>
   <text:outline-style style:name="Outline">
    <text:outline-level-style text:level="1" loext:num-list-format="%1%" style:num-format="">
@@ -318,17 +318,17 @@
   </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.1965in" style:num-format="1" text:number-position="left" text:increment="5"/>
-  <number:currency-style style:name="N122P0" style:volatile="true">
+  <text:linenumbering-configuration text:number-lines="false" text:offset="0.499cm" style:num-format="1" text:number-position="left" text:increment="5"/>
+  <number:currency-style style:name="N108P0" 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">
+  <number:currency-style style:name="N108">
    <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"/>
+   <style:map style:condition="value()&gt;=0" style:apply-style-name="N108P0"/>
   </number:currency-style>
   <style:default-page-layout>
    <style:page-layout-properties style:writing-mode="lr-tb" style:layout-grid-standard-mode="true"/>
@@ -336,70 +336,70 @@
  </office:styles>
  <office:automatic-styles>
   <style:style style:name="Tabla6" style:family="table">
-   <style:table-properties style:width="6.925in" table:align="margins"/>
+   <style:table-properties style:width="17.59cm" table:align="margins"/>
   </style:style>
   <style:style style:name="Tabla6.A" style:family="table-column">
-   <style:table-column-properties style:column-width="3.4625in" style:rel-column-width="32767*"/>
+   <style:table-column-properties style:column-width="8.795cm" style:rel-column-width="32767*"/>
   </style:style>
   <style:style style:name="Tabla6.B" style:family="table-column">
-   <style:table-column-properties style:column-width="3.4625in" style:rel-column-width="32768*"/>
+   <style:table-column-properties style:column-width="8.795cm" style:rel-column-width="32768*"/>
   </style:style>
   <style:style style:name="Tabla6.A1" style:family="table-cell">
-   <style:table-cell-properties fo:padding="0.0382in" fo:border="none"/>
+   <style:table-cell-properties fo:padding="0.097cm" fo:border="none"/>
   </style:style>
   <style:style style:name="Tabla6" style:family="table">
-   <style:table-properties style:width="6.925in" table:align="margins"/>
+   <style:table-properties style:width="17.59cm" table:align="margins"/>
   </style:style>
   <style:style style:name="Tabla6.A" style:family="table-column">
-   <style:table-column-properties style:column-width="3.4625in" style:rel-column-width="32767*"/>
+   <style:table-column-properties style:column-width="8.795cm" style:rel-column-width="32767*"/>
   </style:style>
   <style:style style:name="Tabla6.B" style:family="table-column">
-   <style:table-column-properties style:column-width="3.4625in" style:rel-column-width="32768*"/>
+   <style:table-column-properties style:column-width="8.795cm" style:rel-column-width="32768*"/>
   </style:style>
   <style:style style:name="Tabla6.A1" style:family="table-cell">
-   <style:table-cell-properties fo:padding="0.0382in" fo:border="none"/>
+   <style:table-cell-properties fo:padding="0.097cm" fo:border="none"/>
   </style:style>
   <style:style style:name="Tabla4" style:family="table">
-   <style:table-properties style:width="6.925in" table:align="margins" style:writing-mode="lr-tb"/>
+   <style:table-properties style:width="17.59cm" table:align="margins" style:writing-mode="lr-tb"/>
   </style:style>
   <style:style style:name="Tabla4.A" style:family="table-column">
-   <style:table-column-properties style:column-width="3.4625in" style:rel-column-width="32767*"/>
+   <style:table-column-properties style:column-width="8.795cm" style:rel-column-width="32767*"/>
   </style:style>
   <style:style style:name="Tabla4.B" style:family="table-column">
-   <style:table-column-properties style:column-width="3.4625in" style:rel-column-width="32768*"/>
+   <style:table-column-properties style:column-width="8.795cm" style:rel-column-width="32768*"/>
   </style:style>
   <style:style style:name="Tabla4.A1" style:family="table-cell">
-   <style:table-cell-properties fo:padding="0.0382in" fo:border="none"/>
+   <style:table-cell-properties fo:padding="0.097cm" fo:border="none"/>
   </style:style>
   <style:style style:name="Tabla2" style:family="table">
-   <style:table-properties style:width="6.925in" table:align="margins" style:writing-mode="lr-tb"/>
+   <style:table-properties style:width="17.59cm" table:align="margins" style:writing-mode="lr-tb"/>
   </style:style>
   <style:style style:name="Tabla2.A" style:family="table-column">
-   <style:table-column-properties style:column-width="1.7333in" style:rel-column-width="16403*"/>
+   <style:table-column-properties style:column-width="4.403cm" style:rel-column-width="16403*"/>
   </style:style>
   <style:style style:name="Tabla2.B" style:family="table-column">
-   <style:table-column-properties style:column-width="1.4958in" style:rel-column-width="14155*"/>
+   <style:table-column-properties style:column-width="3.799cm" style:rel-column-width="14155*"/>
   </style:style>
   <style:style style:name="Tabla2.C" style:family="table-column">
-   <style:table-column-properties style:column-width="1.3764in" style:rel-column-width="13025*"/>
+   <style:table-column-properties style:column-width="3.496cm" style:rel-column-width="13025*"/>
   </style:style>
   <style:style style:name="Tabla2.D" style:family="table-column">
-   <style:table-column-properties style:column-width="0.9819in" style:rel-column-width="9292*"/>
+   <style:table-column-properties style:column-width="2.494cm" style:rel-column-width="9292*"/>
   </style:style>
   <style:style style:name="Tabla2.E" style:family="table-column">
-   <style:table-column-properties style:column-width="1.3375in" style:rel-column-width="12660*"/>
+   <style:table-column-properties style:column-width="3.397cm" style:rel-column-width="12660*"/>
   </style:style>
   <style:style style:name="Tabla2.A1" style:family="table-cell">
-   <style:table-cell-properties fo:padding="0.0382in" fo:border-left="0.5pt solid #000000" fo:border-right="none" fo:border-top="0.5pt solid #000000" fo:border-bottom="0.5pt solid #000000"/>
+   <style:table-cell-properties fo:padding="0.097cm" fo:border-left="0.5pt solid #000000" fo:border-right="none" fo:border-top="0.5pt solid #000000" fo:border-bottom="0.5pt solid #000000"/>
   </style:style>
   <style:style style:name="Tabla2.E1" style:family="table-cell">
-   <style:table-cell-properties fo:padding="0.0382in" fo:border="0.5pt solid #000000"/>
+   <style:table-cell-properties fo:padding="0.097cm" fo:border="0.5pt solid #000000"/>
   </style:style>
   <style:style style:name="Tabla2.A2" style:family="table-cell">
-   <style:table-cell-properties fo:padding="0.0382in" fo:border-left="0.5pt solid #000000" fo:border-right="0.5pt solid #000000" fo:border-top="none" fo:border-bottom="0.5pt solid #000000"/>
+   <style:table-cell-properties fo:padding="0.097cm" fo:border-left="0.5pt solid #000000" fo:border-right="0.5pt solid #000000" fo:border-top="none" fo:border-bottom="0.5pt solid #000000"/>
   </style:style>
   <style:style style:name="Tabla2.A3" style:family="table-cell">
-   <style:table-cell-properties fo:padding="0.0382in" fo:border-left="0.5pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.5pt solid #000000"/>
+   <style:table-cell-properties fo:padding="0.097cm" fo:border-left="0.5pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.5pt solid #000000"/>
   </style:style>
   <style:style style:name="P1" style:family="paragraph" style:parent-style-name="Header">
    <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
@@ -418,7 +418,7 @@
    <style:text-properties style:font-name="Droid Sans Japanese2" fo:font-size="7pt" officeooo:paragraph-rsid="0049dca0" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
   </style:style>
   <style:style style:name="P5" style:family="paragraph" style:parent-style-name="Standard">
-   <style:paragraph-properties fo:margin-left="0in" fo:margin-right="0in" fo:text-align="center" style:justify-single-word="false" fo:text-indent="0in" style:auto-text-indent="false"/>
+   <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:text-align="center" style:justify-single-word="false" fo:text-indent="0cm" style:auto-text-indent="false"/>
    <style:text-properties style:font-name="Droid Sans Japanese2" fo:font-size="7pt" officeooo:paragraph-rsid="0049dca0" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
   </style:style>
   <style:style style:name="P6" style:family="paragraph" style:parent-style-name="Header">
@@ -434,139 +434,138 @@
    <style:text-properties fo:color="#666666" loext:opacity="100%" style:font-name="Droid Sans Japanese2" fo:font-size="7pt" style:text-underline-style="solid" style:text-underline-type="double" style:text-underline-width="auto" style:text-underline-color="font-color" fo:font-weight="bold" officeooo:rsid="0266c2a9" officeooo:paragraph-rsid="0049dca0" 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="P9" style:family="paragraph" style:parent-style-name="Header">
-   <style:paragraph-properties fo:margin-left="0in" fo:margin-right="0in" fo:text-align="center" style:justify-single-word="false" fo:text-indent="0in" style:auto-text-indent="false"/>
+   <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:text-align="center" style:justify-single-word="false" fo:text-indent="0cm" style:auto-text-indent="false"/>
    <style:text-properties fo:color="#666666" loext:opacity="100%" style:font-name="Droid Sans Japanese2" fo:font-size="7pt" fo:font-style="normal" style:text-underline-style="none" fo:font-weight="normal" officeooo:paragraph-rsid="0049dca0" style:font-size-asian="7pt" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-size-complex="7pt" style:font-style-complex="normal" style:font-weight-complex="normal"/>
   </style:style>
-  <style:style style:name="P10" style:family="paragraph" style:parent-style-name="Standard">
-   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false" style:writing-mode="lr-tb"/>
-   <style:text-properties style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" style:font-name="Droid Sans Japanese1" fo:font-size="9pt" fo:font-style="normal" fo:text-shadow="none" style:text-underline-style="none" fo:font-weight="normal" officeooo:paragraph-rsid="00111685" style:font-size-asian="9pt" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-size-complex="9pt" style:text-emphasize="none"/>
+  <style:style style:name="P10" style:family="paragraph" style:parent-style-name="Header">
+   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
+   <style:text-properties style:font-name="Droid Sans Japanese2" fo:font-size="7pt" officeooo:paragraph-rsid="00066dfa" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
   </style:style>
-  <style:style style:name="P11" style:family="paragraph" style:parent-style-name="Standard">
-   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false" style:writing-mode="lr-tb"/>
-   <style:text-properties style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" style:font-name="Droid Sans Japanese1" fo:font-size="9pt" fo:font-style="normal" fo:text-shadow="none" style:text-underline-style="none" fo:font-weight="normal" officeooo:paragraph-rsid="00154ed8" style:font-size-asian="9pt" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-size-complex="9pt" style:text-emphasize="none"/>
+  <style:style style:name="P11" style:family="paragraph" style:parent-style-name="Footer">
+   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
+   <style:text-properties style:font-name="Droid Sans Japanese2" fo:font-size="7pt" officeooo:paragraph-rsid="00066dfa" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
   </style:style>
-  <style:style style:name="P12" style:family="paragraph" style:parent-style-name="Standard">
-   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false" style:writing-mode="lr-tb"/>
-   <style:text-properties style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" style:font-name="Droid Sans Japanese1" fo:font-size="9pt" fo:font-style="normal" fo:text-shadow="none" style:text-underline-style="none" fo:font-weight="normal" officeooo:rsid="0014ed01" officeooo:paragraph-rsid="00111685" style:font-size-asian="9pt" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-size-complex="9pt" style:text-emphasize="none"/>
+  <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 style:font-name="Droid Sans Japanese2" fo:font-size="7pt" officeooo:paragraph-rsid="0049dca0" 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:text-align="center" style:justify-single-word="false" style:writing-mode="lr-tb"/>
-   <style:text-properties style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" style:font-name="Droid Sans Japanese1" fo:font-size="9.5pt" fo:font-style="normal" fo:text-shadow="none" style:text-underline-style="none" fo:font-weight="bold" officeooo:rsid="000cde7f" officeooo:paragraph-rsid="00061322" style:font-size-asian="9.5pt" style:font-style-asian="normal" style:font-weight-asian="bold" style:font-size-complex="10pt" style:font-weight-complex="bold" style:text-emphasize="none"/>
-  </style:style>
-  <style:style style:name="P14" style:family="paragraph" style:parent-style-name="Standard">
-   <style:paragraph-properties fo:text-align="start" style:justify-single-word="false" style:writing-mode="lr-tb"/>
-   <style:text-properties style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" style:font-name="Droid Sans Japanese" fo:font-size="11pt" fo:font-style="normal" fo:text-shadow="none" style:text-underline-style="none" fo:font-weight="normal" officeooo:rsid="000cde7f" officeooo:paragraph-rsid="00111685" style:font-size-asian="11pt" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-size-complex="10pt" style:font-weight-complex="bold" style:text-emphasize="none"/>
-  </style:style>
-  <style:style style:name="P15" style:family="paragraph" style:parent-style-name="Standard">
-   <style:paragraph-properties fo:text-align="start" style:justify-single-word="false" style:writing-mode="lr-tb"/>
-   <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="9pt" fo:font-weight="bold" officeooo:rsid="000cde7f" officeooo:paragraph-rsid="000f983e" 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="P16" style:family="paragraph" style:parent-style-name="Standard">
-   <style:paragraph-properties fo:text-align="start" style:justify-single-word="false" style:writing-mode="lr-tb"/>
-   <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="9pt" fo:font-weight="bold" officeooo:rsid="00061322" officeooo:paragraph-rsid="000f983e" 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="P17" style:family="paragraph" style:parent-style-name="Standard">
-   <style:paragraph-properties fo:text-align="start" style:justify-single-word="false" style:writing-mode="lr-tb"/>
-   <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="9pt" fo:font-weight="bold" officeooo:rsid="00061322" officeooo:paragraph-rsid="0014ed01" 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="P18" style:family="paragraph" style:parent-style-name="Standard">
-   <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="9pt" officeooo:paragraph-rsid="0012f95a" style:font-size-asian="9pt" style:font-size-complex="9pt"/>
-  </style:style>
-  <style:style style:name="P19" style:family="paragraph" style:parent-style-name="Table_20_Contents">
-   <style:paragraph-properties fo:text-align="start" style:justify-single-word="false"/>
-   <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="9pt" officeooo:paragraph-rsid="00159ce9" style:font-size-asian="9pt" style:font-size-complex="9pt"/>
-  </style:style>
-  <style:style style:name="P20" style:family="paragraph" style:parent-style-name="Table_20_Contents">
-   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
-   <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="9pt" officeooo:rsid="00136089" officeooo:paragraph-rsid="00159ce9" style:font-size-asian="9pt" style:font-size-complex="9pt"/>
-  </style:style>
-  <style:style style:name="P21" style:family="paragraph" style:parent-style-name="Standard">
-   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false" style:writing-mode="lr-tb"/>
-   <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="10pt" fo:font-weight="bold" officeooo:rsid="000cde7f" officeooo:paragraph-rsid="00061322" 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="Table_20_Contents">
-   <style:paragraph-properties fo:text-align="start" style:justify-single-word="false"/>
-   <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="10pt" fo:font-weight="bold" officeooo:rsid="00136089" officeooo:paragraph-rsid="00159ce9" 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="Text_20_body">
-   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
-   <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="10pt" fo:font-weight="bold" officeooo:rsid="00136089" officeooo:paragraph-rsid="00136089" 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="P24" style:family="paragraph" style:parent-style-name="Table_20_Contents">
-   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
-   <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="10pt" fo:font-weight="bold" officeooo:rsid="00136089" officeooo:paragraph-rsid="00159ce9" 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="P25" style:family="paragraph" style:parent-style-name="Table_20_Contents">
-   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
-   <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="10pt" fo:font-weight="bold" officeooo:rsid="00159ce9" officeooo:paragraph-rsid="00159ce9" 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="P26" 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="Droid Sans Japanese1" fo:font-size="10pt" officeooo:paragraph-rsid="00129398" style:font-size-asian="10pt" style:font-size-complex="10pt"/>
-  </style:style>
-  <style:style style:name="P27" style:family="paragraph" style:parent-style-name="Table_20_Contents">
-   <style:paragraph-properties fo:text-align="start" style:justify-single-word="false"/>
-   <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="10pt" officeooo:paragraph-rsid="00159ce9" style:font-size-asian="10pt" style:font-size-complex="10pt"/>
-  </style:style>
-  <style:style style:name="P28" 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 Japanese2" fo:font-size="9pt" fo:font-weight="bold" officeooo:rsid="000cde7f" officeooo:paragraph-rsid="00061322" 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="P29" 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 Japanese2" fo:font-size="10pt" fo:font-weight="bold" officeooo:rsid="000d0c4f" officeooo:paragraph-rsid="00111685" 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="P30" style:family="paragraph" style:parent-style-name="Standard">
-   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false" style:writing-mode="lr-tb"/>
-   <style:text-properties style:font-name="Droid Sans Japanese2" fo:font-size="10pt" fo:font-weight="bold" officeooo:rsid="000d0c4f" officeooo:paragraph-rsid="00061322" 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="P31" 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 Japanese2" fo:font-size="10pt" fo:font-weight="bold" officeooo:rsid="000cde7f" officeooo:paragraph-rsid="00111685" 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="P32" style:family="paragraph" style:parent-style-name="Footer">
-   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
-   <style:text-properties style:font-name="Droid Sans Japanese2" fo:font-size="7pt" officeooo:paragraph-rsid="00066dfa" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
-  </style:style>
-  <style:style style:name="P33" style:family="paragraph" style:parent-style-name="Header">
-   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
-   <style:text-properties style:font-name="Droid Sans Japanese2" fo:font-size="7pt" officeooo:paragraph-rsid="00066dfa" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
-  </style:style>
-  <style:style style:name="P34" style:family="paragraph" style:parent-style-name="Header">
-   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
+   <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:text-align="center" style:justify-single-word="false" fo:text-indent="0cm" style:auto-text-indent="false"/>
    <style:text-properties style:font-name="Droid Sans Japanese2" fo:font-size="7pt" officeooo:paragraph-rsid="0049dca0" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
   </style:style>
-  <style:style style:name="P35" style:family="paragraph" style:parent-style-name="Standard">
-   <style:paragraph-properties fo:margin-left="0in" fo:margin-right="0in" fo:text-align="center" style:justify-single-word="false" fo:text-indent="0in" style:auto-text-indent="false"/>
-   <style:text-properties style:font-name="Droid Sans Japanese2" fo:font-size="7pt" officeooo:paragraph-rsid="0049dca0" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
-  </style:style>
-  <style:style style:name="P36" style:family="paragraph" style:parent-style-name="Header">
+  <style:style style:name="P14" style:family="paragraph" style:parent-style-name="Header">
    <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
    <style:text-properties style:font-name="Droid Sans Japanese2" fo:font-size="7pt" style:text-underline-style="solid" style:text-underline-type="double" style:text-underline-width="auto" style:text-underline-color="font-color" officeooo:rsid="026544ec" officeooo:paragraph-rsid="0049dca0" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
   </style:style>
-  <style:style style:name="P37" style:family="paragraph" style:parent-style-name="Header">
+  <style:style style:name="P15" style:family="paragraph" style:parent-style-name="Header">
    <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
    <style:text-properties style:font-name="Droid Sans Japanese2" fo:font-size="7pt" style:text-underline-style="solid" style:text-underline-type="double" style:text-underline-width="auto" style:text-underline-color="font-color" officeooo:rsid="0266c2a9" officeooo:paragraph-rsid="0049dca0" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
   </style:style>
-  <style:style style:name="P38" style:family="paragraph" style:parent-style-name="Standard">
-   <style:text-properties officeooo:rsid="000a7d47" officeooo:paragraph-rsid="000a7d47"/>
+  <style:style style:name="P16" 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 Japanese2" fo:font-size="9pt" fo:font-weight="bold" officeooo:rsid="000cde7f" officeooo:paragraph-rsid="00061322" 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="P39" style:family="paragraph" style:parent-style-name="Header">
-   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
-   <style:text-properties fo:color="#666666" loext:opacity="100%" style:font-name="Droid Sans Japanese2" fo:font-size="7pt" style:text-underline-style="solid" style:text-underline-type="double" style:text-underline-width="auto" style:text-underline-color="font-color" fo:font-weight="bold" officeooo:rsid="0266c2a9" officeooo:paragraph-rsid="0049dca0" style:font-size-asian="7pt" style:font-weight-asian="bold" style:font-size-complex="7pt" style:font-weight-complex="bold"/>
+  <style:style style:name="P17" 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 Japanese2" fo:font-size="10pt" fo:font-weight="bold" officeooo:rsid="000d0c4f" officeooo:paragraph-rsid="00111685" 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="P40" style:family="paragraph" style:parent-style-name="Header">
+  <style:style style:name="P18" style:family="paragraph" style:parent-style-name="Standard">
+   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false" style:writing-mode="lr-tb"/>
+   <style:text-properties style:font-name="Droid Sans Japanese2" fo:font-size="10pt" fo:font-weight="bold" officeooo:rsid="000d0c4f" officeooo:paragraph-rsid="00061322" 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="P19" 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 Japanese2" fo:font-size="10pt" fo:font-weight="bold" officeooo:rsid="000cde7f" officeooo:paragraph-rsid="00111685" 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="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:color="#666666" loext:opacity="100%" style:font-name="Droid Sans Japanese2" fo:font-size="8pt" fo:font-weight="normal" officeooo:paragraph-rsid="0049dca0" style:font-size-asian="8pt" style:font-weight-asian="normal" style:font-size-complex="8pt" style:font-weight-complex="normal"/>
   </style:style>
-  <style:style style:name="P41" style:family="paragraph" style:parent-style-name="Header">
+  <style:style style:name="P21" style:family="paragraph" style:parent-style-name="Header">
    <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
-   <style:text-properties style:font-name="Droid Sans Japanese2" fo:font-size="7pt" officeooo:paragraph-rsid="00066dfa" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
+   <style:text-properties fo:color="#666666" loext:opacity="100%" style:font-name="Droid Sans Japanese2" fo:font-size="7pt" style:text-underline-style="solid" style:text-underline-type="double" style:text-underline-width="auto" style:text-underline-color="font-color" fo:font-weight="bold" officeooo:rsid="0266c2a9" officeooo:paragraph-rsid="0049dca0" 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="P42" style:family="paragraph" style:parent-style-name="Header">
-   <style:paragraph-properties fo:margin-left="0in" fo:margin-right="0in" fo:text-align="center" style:justify-single-word="false" fo:text-indent="0in" style:auto-text-indent="false"/>
+  <style:style style:name="P22" style:family="paragraph" style:parent-style-name="Header">
+   <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:text-align="center" style:justify-single-word="false" fo:text-indent="0cm" style:auto-text-indent="false"/>
    <style:text-properties fo:color="#666666" loext:opacity="100%" style:font-name="Droid Sans Japanese2" fo:font-size="7pt" fo:font-style="normal" style:text-underline-style="none" fo:font-weight="normal" officeooo:paragraph-rsid="0049dca0" style:font-size-asian="7pt" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-size-complex="7pt" style:font-style-complex="normal" style:font-weight-complex="normal"/>
   </style:style>
+  <style:style style:name="P23" style:family="paragraph" style:parent-style-name="Standard">
+   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false" style:writing-mode="lr-tb"/>
+   <style:text-properties style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" style:font-name="Droid Sans Japanese1" fo:font-size="9pt" fo:font-style="normal" fo:text-shadow="none" style:text-underline-style="none" fo:font-weight="normal" officeooo:paragraph-rsid="00111685" style:font-size-asian="9pt" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-size-complex="9pt" style:text-emphasize="none"/>
+  </style:style>
+  <style:style style:name="P24" style:family="paragraph" style:parent-style-name="Standard">
+   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false" style:writing-mode="lr-tb"/>
+   <style:text-properties style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" style:font-name="Droid Sans Japanese1" fo:font-size="9pt" fo:font-style="normal" fo:text-shadow="none" style:text-underline-style="none" fo:font-weight="normal" officeooo:paragraph-rsid="00154ed8" style:font-size-asian="9pt" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-size-complex="9pt" style:text-emphasize="none"/>
+  </style:style>
+  <style:style style:name="P25" style:family="paragraph" style:parent-style-name="Standard">
+   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false" style:writing-mode="lr-tb"/>
+   <style:text-properties style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" style:font-name="Droid Sans Japanese1" fo:font-size="9pt" fo:font-style="normal" fo:text-shadow="none" style:text-underline-style="none" fo:font-weight="normal" officeooo:rsid="0014ed01" officeooo:paragraph-rsid="00111685" style:font-size-asian="9pt" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-size-complex="9pt" style:text-emphasize="none"/>
+  </style:style>
+  <style:style style:name="P26" style:family="paragraph" style:parent-style-name="Standard">
+   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false" style:writing-mode="lr-tb"/>
+   <style:text-properties style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" style:font-name="Droid Sans Japanese1" fo:font-size="9.5pt" fo:font-style="normal" fo:text-shadow="none" style:text-underline-style="none" fo:font-weight="bold" officeooo:rsid="000cde7f" officeooo:paragraph-rsid="00061322" style:font-size-asian="9.5pt" style:font-style-asian="normal" style:font-weight-asian="bold" style:font-size-complex="10pt" style:font-weight-complex="bold" style:text-emphasize="none"/>
+  </style:style>
+  <style:style style:name="P27" style:family="paragraph" style:parent-style-name="Standard">
+   <style:paragraph-properties fo:text-align="start" style:justify-single-word="false" style:writing-mode="lr-tb"/>
+   <style:text-properties style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" style:font-name="Droid Sans Japanese" fo:font-size="11pt" fo:font-style="normal" fo:text-shadow="none" style:text-underline-style="none" fo:font-weight="normal" officeooo:rsid="000cde7f" officeooo:paragraph-rsid="00111685" style:font-size-asian="11pt" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-size-complex="10pt" style:font-weight-complex="bold" style:text-emphasize="none"/>
+  </style:style>
+  <style:style style:name="P28" style:family="paragraph" style:parent-style-name="Standard">
+   <style:paragraph-properties fo:text-align="start" style:justify-single-word="false" style:writing-mode="lr-tb"/>
+   <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="9pt" fo:font-weight="bold" officeooo:rsid="000cde7f" officeooo:paragraph-rsid="000f983e" 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="P29" style:family="paragraph" style:parent-style-name="Standard">
+   <style:paragraph-properties fo:text-align="start" style:justify-single-word="false" style:writing-mode="lr-tb"/>
+   <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="9pt" fo:font-weight="bold" officeooo:rsid="00061322" officeooo:paragraph-rsid="000f983e" 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="P30" style:family="paragraph" style:parent-style-name="Standard">
+   <style:paragraph-properties fo:text-align="start" style:justify-single-word="false" style:writing-mode="lr-tb"/>
+   <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="9pt" fo:font-weight="bold" officeooo:rsid="00061322" officeooo:paragraph-rsid="0014ed01" 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="P31" style:family="paragraph" style:parent-style-name="Standard">
+   <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="9pt" officeooo:paragraph-rsid="0012f95a" style:font-size-asian="9pt" style:font-size-complex="9pt"/>
+  </style:style>
+  <style:style style:name="P32" style:family="paragraph" style:parent-style-name="Table_20_Contents">
+   <style:paragraph-properties fo:text-align="start" style:justify-single-word="false"/>
+   <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="9pt" officeooo:paragraph-rsid="00159ce9" style:font-size-asian="9pt" style:font-size-complex="9pt"/>
+  </style:style>
+  <style:style style:name="P33" style:family="paragraph" style:parent-style-name="Table_20_Contents">
+   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
+   <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="9pt" officeooo:rsid="00136089" officeooo:paragraph-rsid="00159ce9" style:font-size-asian="9pt" style:font-size-complex="9pt"/>
+  </style:style>
+  <style:style style:name="P34" style:family="paragraph" style:parent-style-name="Standard">
+   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false" style:writing-mode="lr-tb"/>
+   <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="10pt" fo:font-weight="bold" officeooo:rsid="000cde7f" officeooo:paragraph-rsid="00061322" 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="P35" style:family="paragraph" style:parent-style-name="Table_20_Contents">
+   <style:paragraph-properties fo:text-align="start" style:justify-single-word="false"/>
+   <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="10pt" fo:font-weight="bold" officeooo:rsid="00136089" officeooo:paragraph-rsid="00159ce9" 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="P36" style:family="paragraph" style:parent-style-name="Text_20_body">
+   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
+   <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="10pt" fo:font-weight="bold" officeooo:rsid="00136089" officeooo:paragraph-rsid="00136089" 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="P37" style:family="paragraph" style:parent-style-name="Table_20_Contents">
+   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
+   <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="10pt" fo:font-weight="bold" officeooo:rsid="00136089" officeooo:paragraph-rsid="00159ce9" 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="P38" style:family="paragraph" style:parent-style-name="Table_20_Contents">
+   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
+   <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="10pt" fo:font-weight="bold" officeooo:rsid="00159ce9" officeooo:paragraph-rsid="00159ce9" 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="P39" 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="Droid Sans Japanese1" fo:font-size="10pt" officeooo:paragraph-rsid="00129398" style:font-size-asian="10pt" style:font-size-complex="10pt"/>
+  </style:style>
+  <style:style style:name="P40" style:family="paragraph" style:parent-style-name="Table_20_Contents">
+   <style:paragraph-properties fo:text-align="start" style:justify-single-word="false"/>
+   <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="10pt" officeooo:paragraph-rsid="00159ce9" style:font-size-asian="10pt" style:font-size-complex="10pt"/>
+  </style:style>
+  <style:style style:name="P41" style:family="paragraph" style:parent-style-name="Standard">
+   <style:text-properties officeooo:rsid="000a7d47" officeooo:paragraph-rsid="000a7d47"/>
+  </style:style>
+  <style:style style:name="P42" style:family="paragraph" style:parent-style-name="Standard">
+   <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="9pt" officeooo:paragraph-rsid="001a9a53" style:font-size-asian="9pt" style:font-size-complex="9pt"/>
+  </style:style>
   <style:style style:name="T1" style:family="text">
    <style:text-properties fo:color="#333333" loext:opacity="100%" fo:font-weight="bold" officeooo:rsid="026544ec" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
   </style:style>
@@ -583,95 +582,104 @@
    <style:text-properties fo:color="#333333" loext:opacity="100%" style:text-underline-style="none" fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
   </style:style>
   <style:style style:name="T6" style:family="text">
-   <style:text-properties fo:color="#333333" loext:opacity="100%" style:text-underline-style="none" fo:font-weight="bold" officeooo:rsid="026544ec" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
+   <style:text-properties fo:color="#666666" loext:opacity="100%" style:text-underline-style="none" fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
   </style:style>
   <style:style style:name="T7" style:family="text">
-   <style:text-properties fo:color="#666666" loext:opacity="100%" style:text-underline-style="none" fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
-  </style:style>
-  <style:style style:name="T8" style:family="text">
-   <style:text-properties fo:color="#333333" loext:opacity="100%" style:text-underline-style="none" officeooo:rsid="026544ec"/>
-  </style:style>
-  <style:style style:name="T9" style:family="text">
-   <style:text-properties officeooo:rsid="026544ec"/>
-  </style:style>
-  <style:style style:name="T10" style:family="text">
-   <style:text-properties fo:color="#333333" loext:opacity="100%" style:text-underline-style="none" officeooo:rsid="0049dca0"/>
-  </style:style>
-  <style:style style:name="T11" style:family="text">
-   <style:text-properties officeooo:rsid="0014ed01"/>
-  </style:style>
-  <style:style style:name="T12" style:family="text">
-   <style:text-properties officeooo:rsid="000a7d47"/>
-  </style:style>
-  <style:style style:name="T13" 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" style:font-style-asian="normal" style:text-emphasize="none"/>
-  </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-style="normal" fo:text-shadow="none" style:text-underline-style="none" officeooo:rsid="0014ed01" style:font-style-asian="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" officeooo:rsid="000cde7f" style:font-style-asian="normal" style:text-emphasize="none"/>
-  </style:style>
-  <style:style style:name="T16" 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" 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="T17" 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="T18" style:family="text">
-   <style:text-properties style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" fo:letter-spacing="-0.0075in" fo:font-style="normal" fo:text-shadow="none" style:text-underline-style="none" style:font-style-asian="normal" style:text-emphasize="none"/>
-  </style:style>
-  <style:style style:name="T19" style:family="text">
-   <style:text-properties style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" fo:letter-spacing="-0.0071in" fo:font-style="normal" fo:text-shadow="none" style:text-underline-style="none" style:font-style-asian="normal" style:text-emphasize="none"/>
-  </style:style>
-  <style:style style:name="T20" 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="T21" style:family="text">
-   <style:text-properties fo:font-weight="bold" officeooo:rsid="000a7d47" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
-  </style:style>
-  <style:style style:name="T22" style:family="text">
-   <style:text-properties fo:font-weight="bold" officeooo:rsid="000cde7f" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
-  </style:style>
-  <style:style style:name="T23" style:family="text">
-   <style:text-properties fo:color="#333333" loext:opacity="100%" fo:font-weight="bold" officeooo:rsid="026544ec" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
-  </style:style>
-  <style:style style:name="T24" style:family="text">
-   <style:text-properties fo:color="#333333" loext:opacity="100%" style:text-underline-style="none" fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
-  </style:style>
-  <style:style style:name="T25" style:family="text">
    <style:text-properties fo:color="#333333" loext:opacity="100%" style:text-underline-style="none" fo:font-weight="bold" officeooo:rsid="026544ec" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
   </style:style>
-  <style:style style:name="T26" style:family="text">
+  <style:style style:name="T8" style:family="text">
+   <style:text-properties fo:color="#666666" loext:opacity="100%" style:text-underline-style="none" fo:font-weight="bold" officeooo:rsid="026544ec" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
+  </style:style>
+  <style:style style:name="T9" style:family="text">
    <style:text-properties fo:color="#333333" loext:opacity="100%" style:text-underline-style="none" officeooo:rsid="026544ec"/>
   </style:style>
-  <style:style style:name="T27" style:family="text">
+  <style:style style:name="T10" style:family="text">
+   <style:text-properties style:text-underline-style="none" officeooo:rsid="026544ec"/>
+  </style:style>
+  <style:style style:name="T11" style:family="text">
    <style:text-properties fo:color="#333333" loext:opacity="100%" style:text-underline-style="none" officeooo:rsid="0049dca0"/>
   </style:style>
-  <style:style style:name="T28" style:family="text">
+  <style:style style:name="T12" style:family="text">
+   <style:text-properties fo:color="#333333" loext:opacity="100%" fo:font-weight="bold" officeooo:rsid="026544ec" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
+  </style:style>
+  <style:style style:name="T13" style:family="text">
+   <style:text-properties fo:color="#333333" loext:opacity="100%" style:text-underline-style="none" 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 fo:color="#333333" loext:opacity="100%" style:text-underline-style="none" fo:font-weight="bold" officeooo:rsid="026544ec" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
+  </style:style>
+  <style:style style:name="T15" style:family="text">
+   <style:text-properties fo:color="#333333" loext:opacity="100%" style:text-underline-style="none" officeooo:rsid="026544ec"/>
+  </style:style>
+  <style:style style:name="T16" style:family="text">
+   <style:text-properties fo:color="#333333" loext:opacity="100%" style:text-underline-style="none" officeooo:rsid="0049dca0"/>
+  </style:style>
+  <style:style style:name="T17" style:family="text">
    <style:text-properties fo:color="#666666" loext:opacity="100%" fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
   </style:style>
-  <style:style style:name="T29" style:family="text">
+  <style:style style:name="T18" style:family="text">
    <style:text-properties fo:color="#666666" loext:opacity="100%" fo:font-weight="bold" officeooo:rsid="026544ec" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
   </style:style>
-  <style:style style:name="T30" style:family="text">
+  <style:style style:name="T19" style:family="text">
    <style:text-properties fo:color="#666666" loext:opacity="100%" fo:font-weight="bold" officeooo:rsid="001cd488" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
   </style:style>
-  <style:style style:name="T31" style:family="text">
+  <style:style style:name="T20" style:family="text">
    <style:text-properties fo:color="#666666" loext:opacity="100%" style:text-underline-style="none" fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
   </style:style>
-  <style:style style:name="T32" style:family="text">
+  <style:style style:name="T21" style:family="text">
+   <style:text-properties fo:color="#666666" loext:opacity="100%" style:text-underline-style="none" fo:font-weight="bold" officeooo:rsid="026544ec" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
+  </style:style>
+  <style:style style:name="T22" style:family="text">
+   <style:text-properties style:text-underline-style="none" officeooo:rsid="026544ec"/>
+  </style:style>
+  <style:style style:name="T23" style:family="text">
    <style:text-properties officeooo:rsid="026544ec"/>
   </style:style>
+  <style:style style:name="T24" style:family="text">
+   <style:text-properties officeooo:rsid="0014ed01"/>
+  </style:style>
+  <style:style style:name="T25" style:family="text">
+   <style:text-properties officeooo:rsid="000a7d47"/>
+  </style:style>
+  <style:style style:name="T26" 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" style:font-style-asian="normal" style:text-emphasize="none"/>
+  </style:style>
+  <style:style style:name="T27" 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" officeooo:rsid="0014ed01" style:font-style-asian="normal" style:text-emphasize="none"/>
+  </style:style>
+  <style:style style:name="T28" 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" officeooo:rsid="000cde7f" style:font-style-asian="normal" style:text-emphasize="none"/>
+  </style:style>
+  <style:style style:name="T29" 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" 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="T30" 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="T31" style:family="text">
+   <style:text-properties style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" fo:letter-spacing="-0.019cm" fo:font-style="normal" fo:text-shadow="none" style:text-underline-style="none" style:font-style-asian="normal" style:text-emphasize="none"/>
+  </style:style>
+  <style:style style:name="T32" style:family="text">
+   <style:text-properties style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" fo:letter-spacing="-0.018cm" fo:font-style="normal" fo:text-shadow="none" style:text-underline-style="none" style:font-style-asian="normal" style:text-emphasize="none"/>
+  </style:style>
+  <style:style style:name="T33" 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="T34" style:family="text">
+   <style:text-properties fo:font-weight="bold" officeooo:rsid="000a7d47" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
+  </style:style>
+  <style:style style:name="T35" style:family="text">
+   <style:text-properties fo:font-weight="bold" officeooo:rsid="000cde7f" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
+  </style:style>
   <style:style style:name="fr1" style:family="graphic" style:parent-style-name="Graphics">
-   <style:graphic-properties style:vertical-pos="middle" style:vertical-rel="baseline" 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" draw:wrap-influence-on-position="once-concurrent" loext:allow-overlap="true"/>
+   <style:graphic-properties style:vertical-pos="middle" style:vertical-rel="baseline" 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" draw:wrap-influence-on-position="once-concurrent" loext:allow-overlap="true"/>
   </style:style>
   <style:page-layout style:name="pm1">
-   <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="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:layout-grid-base-width="0.1457in" style:layout-grid-snap-to="true" style:footnote-max-height="0in" loext:margin-gutter="0in">
-    <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 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="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:layout-grid-base-width="0.37cm" style:layout-grid-snap-to="true" style:footnote-max-height="0cm" loext:margin-gutter="0cm">
+    <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:page-layout-properties>
    <style:header-style>
-    <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-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-style>
    <style:footer-style/>
   </style:page-layout>
@@ -687,7 +695,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="Table_20_Contents"><draw:frame draw:style-name="fr1" draw:name="Imagen2" text:anchor-type="as-char" svg:width="2.7102in" svg:height="0.6055in" draw:z-index="0"><draw:image draw:mime-type="image/jpeg">
+       <text:p text:style-name="Table_20_Contents"><draw:frame draw:style-name="fr1" draw:name="Imagen2" text:anchor-type="as-char" svg:width="6.884cm" svg:height="1.538cm" draw:z-index="0"><draw:image draw:mime-type="image/jpeg">
           <office:binary-data>/9j/4AAQSkZJRgABAQEAYABgAAD/2wBDAAMCAgMCAgMDAwMEAwMEBQgFBQQEBQoHBwYIDAoM
            DAsKCwsNDhIQDQ4RDgsLEBYQERMUFRUVDA8XGBYUGBIUFRT/2wBDAQMEBAUEBQkFBQkUDQsN
            FBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBT/wAAR
@@ -1227,10 +1235,10 @@
        <text:p text:style-name="P4"><text:span text:style-name="T1">NIT:</text:span><text:span text:style-name="T2"> </text:span><text:span text:style-name="T3"><text:placeholder text:placeholder-type="text">&lt;company.party.identifiers[0].code&gt;</text:placeholder></text:span></text:p>
        <text:p text:style-name="P5">Regimen Común</text:p>
        <text:p text:style-name="P5"><text:span text:style-name="T3">Actividad Economica 46</text:span><text:span text:style-name="T4">59</text:span></text:p>
-       <text:p text:style-name="P6"><text:span text:style-name="T5">Dirección: </text:span><text:span text:style-name="T3"><text:placeholder text:placeholder-type="text">&lt;company.party.addresses[0].street&gt;</text:placeholder></text:span><text:span text:style-name="T3"><text:s/></text:span><text:span text:style-name="T3"><text:placeholder text:placeholder-type="text">&lt;company.party.addresses[0].city&gt;</text:placeholder></text:span></text:p>
-       <text:p text:style-name="P7"><text:span text:style-name="T6">Teléfono:</text:span><text:span text:style-name="T7"> </text:span><text:span text:style-name="T2"><text:placeholder text:placeholder-type="text">&lt;company.party.phone&gt;</text:placeholder></text:span></text:p>
-       <text:p text:style-name="P8"><text:span text:style-name="T8">Celular: </text:span><text:span text:style-name="T9"><text:placeholder text:placeholder-type="text">&lt;company.party.mobile&gt;</text:placeholder></text:span></text:p>
-       <text:p text:style-name="P8"><text:span text:style-name="T10">E-mail</text:span><text:span text:style-name="T8">: </text:span><text:span text:style-name="T9"><text:placeholder text:placeholder-type="text">&lt;company.party.email&gt;</text:placeholder></text:span></text:p>
+       <text:p text:style-name="P6"><text:span text:style-name="T5">Dirección: </text:span><text:span text:style-name="T6"><text:placeholder text:placeholder-type="text">&lt;company.party.addresses[0].street&gt;</text:placeholder></text:span><text:span text:style-name="T3"><text:s/></text:span><text:span text:style-name="T6"><text:placeholder text:placeholder-type="text">&lt;company.party.addresses[0].city&gt;</text:placeholder></text:span></text:p>
+       <text:p text:style-name="P7"><text:span text:style-name="T7">Teléfono:</text:span><text:span text:style-name="T6"> </text:span><text:span text:style-name="T8"><text:placeholder text:placeholder-type="text">&lt;company.party.phone&gt;</text:placeholder></text:span></text:p>
+       <text:p text:style-name="P8"><text:span text:style-name="T9">Celular: </text:span><text:span text:style-name="T10"><text:placeholder text:placeholder-type="text">&lt;company.party.mobile&gt;</text:placeholder></text:span></text:p>
+       <text:p text:style-name="P8"><text:span text:style-name="T11">E-mail</text:span><text:span text:style-name="T9">: </text:span><text:span text:style-name="T10"><text:placeholder text:placeholder-type="text">&lt;company.party.email&gt;</text:placeholder></text:span></text:p>
        <text:p text:style-name="P9"><text:placeholder text:placeholder-type="text">&lt;/if&gt;</text:placeholder></text:p>
       </table:table-cell>
      </table:table-row>
@@ -1248,32 +1256,32 @@
     <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="P28"><text:placeholder text:placeholder-type="text">&lt;for each=&quot;maintenance in records&quot;&gt;</text:placeholder></text:p>
-   <text:p text:style-name="P26"/>
-   <text:p text:style-name="P23">CRONOGRAMA DE MANTENIMIENTO PREVENTIVO Y CALIBRACIÓN DE EQUIPOS</text:p>
-   <text:p text:style-name="P18"><text:span text:style-name="T21">Fecha</text:span><text:span text:style-name="T12"> </text:span><text:span text:style-name="T17"><text:placeholder text:placeholder-type="text" text:description="format_datetime(datetime.datetime.now(),user.language, &apos;%25B %25d ,%25Y %25H:%25M%25p&apos;, maintenance.company.timezone)">&lt;format_datetime(datetime.datetime.now(),user.language, &apos;%b/%d/%Y&apos;, maintenance.company.timezone)&gt;</text:placeholder></text:span></text:p>
-   <text:p text:style-name="P18"><text:span text:style-name="T20">Consecutivo</text:span> <text:span text:style-name="T22"><text:placeholder text:placeholder-type="text">&lt;maintenance.code&gt;</text:placeholder></text:span></text:p>
-   <text:p text:style-name="P38"/>
-   <text:p text:style-name="P21"><text:span text:style-name="T13">INFORMACIÓN</text:span><text:span text:style-name="T18"> </text:span><text:span text:style-name="T13">DEL</text:span><text:span text:style-name="T19"> </text:span><text:span text:style-name="T13">PROPIETARIO</text:span></text:p>
+   <text:p text:style-name="P16"><text:placeholder text:placeholder-type="text">&lt;for each=&quot;maintenance in records&quot;&gt;</text:placeholder></text:p>
+   <text:p text:style-name="P39"/>
+   <text:p text:style-name="P36">CRONOGRAMA DE MANTENIMIENTO PREVENTIVO Y CALIBRACIÓN DE EQUIPOS</text:p>
+   <text:p text:style-name="P42"><text:span text:style-name="T34">Fecha</text:span><text:span text:style-name="T25"> </text:span><text:span text:style-name="T35"><text:placeholder text:placeholder-type="text">&lt;maintenance.estimated_agended.date()&gt;</text:placeholder></text:span></text:p>
+   <text:p text:style-name="P31"><text:span text:style-name="T33">Consecutivo</text:span> <text:span text:style-name="T35"><text:placeholder text:placeholder-type="text">&lt;maintenance.code&gt;</text:placeholder></text:span></text:p>
+   <text:p text:style-name="P41"/>
+   <text:p text:style-name="P34"><text:span text:style-name="T26">INFORMACIÓN</text:span><text:span text:style-name="T31"> </text:span><text:span text:style-name="T26">DEL</text:span><text:span text:style-name="T32"> </text:span><text:span text:style-name="T26">PROPIETARIO</text:span></text:p>
    <table:table table:name="Tabla4" table:style-name="Tabla4">
     <table:table-column table:style-name="Tabla4.A"/>
     <table:table-column table:style-name="Tabla4.B"/>
     <table:table-row>
      <table:table-cell table:style-name="Tabla4.A1" office:value-type="string">
-      <text:p text:style-name="P15"><text:span text:style-name="T13">Nombre / Razón Social: </text:span><text:span text:style-name="T16"><text:placeholder text:placeholder-type="text">&lt;maintenance.propietary.name&gt;</text:placeholder></text:span></text:p>
-      <text:p text:style-name="P15"><text:span text:style-name="T13">Ciudad: </text:span><text:span text:style-name="T16"><text:placeholder text:placeholder-type="text">&lt;maintenance.propietary_address.subdivision_municipality.name&gt;</text:placeholder></text:span></text:p>
-      <text:p text:style-name="P16"><text:span text:style-name="T13">Teléfono:</text:span><text:span text:style-name="T16"> </text:span><text:span text:style-name="T17"><text:placeholder text:placeholder-type="text">&lt;maintenance.propietary.phone&gt;</text:placeholder></text:span></text:p>
-      <text:p text:style-name="P17"><text:span text:style-name="T14">Movil</text:span><text:span text:style-name="T15">:</text:span><text:span text:style-name="T17"> </text:span><text:span text:style-name="T17"><text:placeholder text:placeholder-type="text">&lt;maintenance.propietary.mobile&gt;</text:placeholder></text:span></text:p>
+      <text:p text:style-name="P28"><text:span text:style-name="T26">Nombre / Razón Social: </text:span><text:span text:style-name="T29"><text:placeholder text:placeholder-type="text">&lt;maintenance.propietary.name&gt;</text:placeholder></text:span></text:p>
+      <text:p text:style-name="P28"><text:span text:style-name="T26">Ciudad: </text:span><text:span text:style-name="T29"><text:placeholder text:placeholder-type="text">&lt;maintenance.propietary_address.subdivision_municipality.name&gt;</text:placeholder></text:span></text:p>
+      <text:p text:style-name="P29"><text:span text:style-name="T26">Teléfono:</text:span><text:span text:style-name="T29"> </text:span><text:span text:style-name="T30"><text:placeholder text:placeholder-type="text">&lt;maintenance.propietary.phone&gt;</text:placeholder></text:span></text:p>
+      <text:p text:style-name="P30"><text:span text:style-name="T27">Movil</text:span><text:span text:style-name="T28">:</text:span><text:span text:style-name="T30"> </text:span><text:span text:style-name="T30"><text:placeholder text:placeholder-type="text">&lt;maintenance.propietary.mobile&gt;</text:placeholder></text:span></text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tabla4.A1" office:value-type="string">
-      <text:p text:style-name="P15"><text:span text:style-name="T13">Tipo Documento: </text:span><text:span text:style-name="T16"><text:placeholder text:placeholder-type="text">&lt;&quot;NIT&quot; if maintenance.propietary.tax_identifier.type==&quot;31&quot; else &quot;CC&quot;&gt;</text:placeholder></text:span></text:p>
-      <text:p text:style-name="P15"><text:span text:style-name="T13">Documento:</text:span><text:span text:style-name="T16"> </text:span><text:span text:style-name="T16"><text:placeholder text:placeholder-type="text">&lt;maintenance.propietary.tax_identifier.code&gt;</text:placeholder></text:span></text:p>
-      <text:p text:style-name="P15"><text:span text:style-name="T13">Dirección:</text:span><text:span text:style-name="T16"> </text:span><text:span text:style-name="T16"><text:placeholder text:placeholder-type="text">&lt;maintenance.propietary_address.street&gt;</text:placeholder></text:span></text:p>
+      <text:p text:style-name="P28"><text:span text:style-name="T26">Tipo Documento: </text:span><text:span text:style-name="T29"><text:placeholder text:placeholder-type="text">&lt;&quot;NIT&quot; if maintenance.propietary.tax_identifier.type==&quot;31&quot; else &quot;CC&quot;&gt;</text:placeholder></text:span></text:p>
+      <text:p text:style-name="P28"><text:span text:style-name="T26">Documento:</text:span><text:span text:style-name="T29"> </text:span><text:span text:style-name="T29"><text:placeholder text:placeholder-type="text">&lt;maintenance.propietary.tax_identifier.code&gt;</text:placeholder></text:span></text:p>
+      <text:p text:style-name="P28"><text:span text:style-name="T26">Dirección:</text:span><text:span text:style-name="T29"> </text:span><text:span text:style-name="T29"><text:placeholder text:placeholder-type="text">&lt;maintenance.propietary_address.street&gt;</text:placeholder></text:span></text:p>
      </table:table-cell>
     </table:table-row>
    </table:table>
-   <text:p text:style-name="P13"/>
-   <text:p text:style-name="P13"/>
+   <text:p text:style-name="P26"/>
+   <text:p text:style-name="P26"/>
    <table:table table:name="Tabla2" table:style-name="Tabla2">
     <table:table-column table:style-name="Tabla2.A"/>
     <table:table-column table:style-name="Tabla2.B"/>
@@ -1282,25 +1290,25 @@
     <table:table-column table:style-name="Tabla2.E"/>
     <table:table-row>
      <table:table-cell table:style-name="Tabla2.A1" office:value-type="string">
-      <text:p text:style-name="P22">Equipo</text:p>
+      <text:p text:style-name="P35">Equipo</text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tabla2.A1" office:value-type="string">
-      <text:p text:style-name="P25">Serial</text:p>
+      <text:p text:style-name="P38">Serial</text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tabla2.A1" office:value-type="string">
-      <text:p text:style-name="P24">Mantenimiento</text:p>
-      <text:p text:style-name="P24">Preventivo</text:p>
+      <text:p text:style-name="P37">Mantenimiento</text:p>
+      <text:p text:style-name="P37">Preventivo</text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tabla2.A1" office:value-type="string">
-      <text:p text:style-name="P24">Calibración</text:p>
+      <text:p text:style-name="P37">Calibración</text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tabla2.E1" office:value-type="string">
-      <text:p text:style-name="P24">Fecha de Próximo mantenimiento</text:p>
+      <text:p text:style-name="P37">Fecha de Próximo mantenimiento</text:p>
      </table:table-cell>
     </table:table-row>
     <table:table-row>
      <table:table-cell table:style-name="Tabla2.A2" table:number-columns-spanned="5" office:value-type="string">
-      <text:p text:style-name="P27"><text:placeholder text:placeholder-type="text">&lt;for each=&quot;line in maintenance.lines&quot;&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P40"><text:placeholder text:placeholder-type="text">&lt;for each=&quot;line in maintenance.lines&quot;&gt;</text:placeholder></text:p>
      </table:table-cell>
      <table:covered-table-cell/>
      <table:covered-table-cell/>
@@ -1309,24 +1317,24 @@
     </table:table-row>
     <table:table-row>
      <table:table-cell table:style-name="Tabla2.A3" office:value-type="string">
-      <text:p text:style-name="P19"><text:placeholder text:placeholder-type="text">&lt;line.equipment.product.name&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P32"><text:placeholder text:placeholder-type="text">&lt;line.equipment.product.name&gt;</text:placeholder></text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tabla2.A3" office:value-type="string">
-      <text:p text:style-name="P19"><text:placeholder text:placeholder-type="text">&lt;line.equipment.serial&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P32"><text:placeholder text:placeholder-type="text">&lt;line.equipment.serial&gt;</text:placeholder></text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tabla2.A3" office:value-type="string">
-      <text:p text:style-name="P20">X</text:p>
+      <text:p text:style-name="P33">X</text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tabla2.A3" office:value-type="string">
-      <text:p text:style-name="P19"><text:placeholder text:placeholder-type="text">&lt;&quot;X&quot; if line.equipment.product.calibration else &quot;No Aplica&quot;&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P32"><text:placeholder text:placeholder-type="text">&lt;&quot;X&quot; if line.equipment.product.calibration else &quot;No Aplica&quot;&gt;</text:placeholder></text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tabla2.A2" office:value-type="string">
-      <text:p text:style-name="P19"><text:placeholder text:placeholder-type="text">&lt;str(line.next_maintenance)[0:11]&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P32"><text:placeholder text:placeholder-type="text">&lt;str(line.next_maintenance)[0:11]&gt;</text:placeholder></text:p>
      </table:table-cell>
     </table:table-row>
     <table:table-row>
      <table:table-cell table:style-name="Tabla2.A2" table:number-columns-spanned="5" office:value-type="string">
-      <text:p text:style-name="P27"><text:placeholder text:placeholder-type="text">&lt;/for&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P40"><text:placeholder text:placeholder-type="text">&lt;/for&gt;</text:placeholder></text:p>
      </table:table-cell>
      <table:covered-table-cell/>
      <table:covered-table-cell/>
@@ -1334,14 +1342,13 @@
      <table:covered-table-cell/>
     </table:table-row>
    </table:table>
-   <text:p text:style-name="P30"/>
-   <text:p text:style-name="P30"/>
-   <text:p text:style-name="P30"/>
-   <text:p text:style-name="P29">ANTHONY STIVEN RODRIGUEZ FONSECA </text:p>
-   <text:p text:style-name="P29">INVIMA : RH-202208-01301</text:p>
-   <text:p text:style-name="P31"><text:placeholder text:placeholder-type="text">&lt;/for&gt;</text:placeholder></text:p>
-   <text:p text:style-name="P14"/>
-   <text:p text:style-name="P31"/>
+   <text:p text:style-name="P18"/>
+   <text:p text:style-name="P18"/>
+   <text:p text:style-name="P17">ANTHONY STIVEN RODRIGUEZ FONSECA </text:p>
+   <text:p text:style-name="P17">INVIMA : RH-202208-01301</text:p>
+   <text:p text:style-name="P19"><text:placeholder text:placeholder-type="text">&lt;/for&gt;</text:placeholder></text:p>
+   <text:p text:style-name="P27"/>
+   <text:p text:style-name="P19"/>
   </office:text>
  </office:body>
 </office:document>

report/Purchase.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: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: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:generator>LibreOffice/7.4.6.2$Linux_X86_64 LibreOffice_project/40$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="88" meta:word-count="206" meta:character-count="2679" meta:non-whitespace-character-count="2560"/><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">38336</config:config-item>
+   <config:config-item config:name="ViewAreaTop" config:type="long">11950</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">20048</config:config-item>
-   <config:config-item config:name="ViewAreaHeight" config:type="long">8733</config:config-item>
+   <config:config-item config:name="ViewAreaWidth" config:type="long">28825</config:config-item>
+   <config:config-item config:name="ViewAreaHeight" config:type="long">12920</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">1711</config:config-item>
-     <config:config-item config:name="ViewTop" config:type="long">4852</config:config-item>
+     <config:config-item config:name="ViewLeft" config:type="long">4925</config:config-item>
+     <config:config-item config:name="ViewTop" config:type="long">15117</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">38336</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">47068</config:config-item>
+     <config:config-item config:name="VisibleTop" config:type="long">11950</config:config-item>
+     <config:config-item config:name="VisibleRight" config:type="long">28824</config:config-item>
+     <config:config-item config:name="VisibleBottom" config:type="long">24869</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">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="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">4897608</config:config-item>
+   <config:config-item config:name="Rsid" config:type="int">4987782</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">false</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>
@@ -159,11 +164,11 @@
    <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:text-properties style:use-window-font-color="true" loext:opacity="0%" loext:color-lum-mod="100%" loext:color-lum-off="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="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: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" 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"/>
@@ -683,6 +688,38 @@
    <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="P50" style:family="paragraph" style:parent-style-name="Header">
+   <style:paragraph-properties fo:text-align="start" style:justify-single-word="false"/>
+   <style:text-properties style:font-name="Droid Sans Japanese" fo:font-size="8pt" officeooo:paragraph-rsid="004b7ff9" style:font-size-asian="8pt" style:font-size-complex="8pt"/>
+  </style:style>
+  <style:style style:name="P51" 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="8pt" officeooo:paragraph-rsid="004b7ff9" style:font-size-asian="8pt" style:font-size-complex="8pt"/>
+  </style:style>
+  <style:style style:name="P52" style:family="paragraph" style:parent-style-name="Header">
+   <style:paragraph-properties fo:text-align="start" style:justify-single-word="false"/>
+   <style:text-properties style:font-name="Droid Sans Japanese" fo:font-size="8pt" style:text-underline-style="none" officeooo:rsid="026544ec" officeooo:paragraph-rsid="004b7ff9" style:font-size-asian="8pt" style:font-size-complex="8pt"/>
+  </style:style>
+  <style:style style:name="P53" style:family="paragraph" style:parent-style-name="Header">
+   <style:paragraph-properties fo:text-align="start" style:justify-single-word="false"/>
+   <style:text-properties style:font-name="Droid Sans Japanese" fo:font-size="8pt" style:text-underline-style="none" officeooo:rsid="0266c2a9" officeooo:paragraph-rsid="004b7ff9" style:font-size-asian="8pt" style:font-size-complex="8pt"/>
+  </style:style>
+  <style:style style:name="P54" style:family="paragraph" style:parent-style-name="Header">
+   <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 fo:color="#666666" loext:opacity="100%" style:font-name="Droid Sans Japanese" fo:font-size="8pt" fo:font-style="normal" style:text-underline-style="none" fo:font-weight="normal" officeooo:paragraph-rsid="004b7ff9" style:font-size-asian="8pt" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-size-complex="8pt" style:font-style-complex="normal" style:font-weight-complex="normal"/>
+  </style:style>
+  <style:style style:name="P55" style:family="paragraph" style:parent-style-name="Header">
+   <style:paragraph-properties fo:text-align="start" style:justify-single-word="false"/>
+   <style:text-properties fo:color="#666666" loext:opacity="100%" style:font-name="Droid Sans Japanese" fo:font-size="8pt" fo:font-weight="normal" officeooo:paragraph-rsid="004b7ff9" style:font-size-asian="8pt" style:font-weight-asian="normal" style:font-size-complex="8pt" style:font-weight-complex="normal"/>
+  </style:style>
+  <style:style style:name="P56" style:family="paragraph" style:parent-style-name="Header">
+   <style:paragraph-properties fo:text-align="start" style:justify-single-word="false"/>
+   <style:text-properties fo:color="#666666" loext:opacity="100%" style:font-name="Droid Sans Japanese" fo:font-size="8pt" fo:font-weight="bold" officeooo:paragraph-rsid="004b7ff9" 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="P57" style:family="paragraph" style:parent-style-name="Header">
+   <style:paragraph-properties fo:text-align="start" style:justify-single-word="false"/>
+   <style:text-properties fo:color="#666666" loext:opacity="100%" style:font-name="Droid Sans Japanese" fo:font-size="8pt" style:text-underline-style="none" fo:font-weight="bold" officeooo:rsid="0266c2a9" officeooo:paragraph-rsid="004b7ff9" 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="T1" style:family="text">
    <style:text-properties fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
   </style:style>
@@ -704,6 +741,30 @@
   <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="T8" style:family="text">
+   <style:text-properties fo:color="#333333" loext:opacity="100%" fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
+  </style:style>
+  <style:style style:name="T9" style:family="text">
+   <style:text-properties fo:color="#333333" loext:opacity="100%" fo:font-weight="bold" officeooo:rsid="026544ec" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
+  </style:style>
+  <style:style style:name="T10" style:family="text">
+   <style:text-properties fo:color="#333333" loext:opacity="100%" officeooo:rsid="026544ec"/>
+  </style:style>
+  <style:style style:name="T11" style:family="text">
+   <style:text-properties fo:color="#333333" loext:opacity="100%" officeooo:rsid="0030ce45"/>
+  </style:style>
+  <style:style style:name="T12" style:family="text">
+   <style:text-properties fo:color="#666666" loext:opacity="100%" fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
+  </style:style>
+  <style:style style:name="T13" style:family="text">
+   <style:text-properties fo:color="#666666" loext:opacity="100%" fo:font-weight="bold" officeooo:rsid="026544ec" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
+  </style:style>
+  <style:style style:name="T14" style:family="text">
+   <style:text-properties fo:color="#666666" loext:opacity="100%" fo:font-weight="bold" officeooo:rsid="001cd488" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
+  </style:style>
+  <style:style style:name="T15" style:family="text">
+   <style:text-properties officeooo:rsid="026544ec"/>
+  </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(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>
@@ -1268,11 +1329,16 @@
     <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="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="P28"><text:span text:style-name="T1">NIT:</text:span> 901091201-1</text:p>
-      <text:p text:style-name="P28">Regimen Común</text:p>
-      <text:p text:style-name="P28">Actividad Economica 4690</text:p>
-      <text:p text:style-name="P28">CARRERA 16 No 52-85 PISO 4</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>
+      <text:p text:style-name="P55"><text:placeholder text:placeholder-type="text" text:description="if test=&quot;purchase.company&quot;">&lt;if test=&quot;purchase.company&quot;&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P56"><text:placeholder text:placeholder-type="text" text:description="purchase.company and purchase.company.rec_name">&lt;purchase.company and purchase.company.rec_name&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P50"><text:span text:style-name="T9">NIT:</text:span><text:span text:style-name="T13"> </text:span><text:span text:style-name="T12"><text:placeholder text:placeholder-type="text" text:description="purchase.company.party.identifiers[0].code">&lt;purchase.company.party.identifiers[0].code&gt;</text:placeholder></text:span></text:p>
+      <text:p text:style-name="P51">Regimen Común</text:p>
+      <text:p text:style-name="P51"><text:span text:style-name="T12">Actividad Economica 46</text:span><text:span text:style-name="T14">59</text:span></text:p>
+      <text:p text:style-name="P52"><text:span text:style-name="T8">Dirección: </text:span><text:span text:style-name="T12"><text:placeholder text:placeholder-type="text" text:description="purchase.company.party.addresses[0].street">&lt;purchase.company.party.addresses[0].street&gt;</text:placeholder></text:span><text:span text:style-name="T12"><text:s/></text:span><text:span text:style-name="T12"><text:placeholder text:placeholder-type="text" text:description="purchase.company.party.addresses[0].city">&lt;purchase.company.party.addresses[0].city&gt;</text:placeholder></text:span></text:p>
+      <text:p text:style-name="P53"><text:span text:style-name="T9">Teléfono:</text:span><text:span text:style-name="T12"> </text:span><text:span text:style-name="T13"><text:placeholder text:placeholder-type="text" text:description="purchase.company.party.phone">&lt;purchase.company.party.phone&gt;</text:placeholder></text:span></text:p>
+      <text:p text:style-name="P57"><text:span text:style-name="T10">Celular: </text:span><text:span text:style-name="T15"><text:placeholder text:placeholder-type="text" text:description="purchase.company.party.mobile">&lt;purchase.company.party.mobile&gt;</text:placeholder></text:span></text:p>
+      <text:p text:style-name="P57"><text:span text:style-name="T11">E-mail</text:span><text:span text:style-name="T10">: </text:span><text:span text:style-name="T15"><text:placeholder text:placeholder-type="text" text:description="purchase.company.party.email">&lt;purchase.company.party.email&gt;</text:placeholder></text:span></text:p>
+      <text:p text:style-name="P54"><text:placeholder text:placeholder-type="text">&lt;/if&gt;</text:placeholder></text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tabla1.A1" office:value-type="string">
       <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>
@@ -1349,7 +1415,7 @@
       <text:p text:style-name="P49"><text:placeholder text:placeholder-type="text">&lt;/if&gt;</text:placeholder><text:tab/></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: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:soft-page-break/></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>
@@ -1363,7 +1429,6 @@
       <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="P23"><text:placeholder text:placeholder-type="text">&lt;/when&gt;</text:placeholder></text:p>

report/Sale.fodt

@@ -1,31 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <office:document xmlns:css3t="http://www.w3.org/TR/css3-text/" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:drawooo="http://openoffice.org/2010/draw" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:rpt="http://openoffice.org/2005/report" xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:officeooo="http://openoffice.org/2009/office" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" office:version="1.3" office:mimetype="application/vnd.oasis.opendocument.text">
- <office:meta><meta:generator>LibreOffice/7.4.5.1$Linux_X86_64 LibreOffice_project/40$Build-1</meta:generator><meta:creation-date>2008-06-07T15:28:22</meta:creation-date><dc:date>2009-01-10T16:03:33</dc:date><meta:editing-cycles>1</meta:editing-cycles><meta:editing-duration>PT0S</meta:editing-duration><meta:document-statistic meta:table-count="4" meta:image-count="2" meta:object-count="0" meta:page-count="4" meta:paragraph-count="146" meta:word-count="462" meta:character-count="4424" meta:non-whitespace-character-count="4078"/><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.4.7.2$Linux_X86_64 LibreOffice_project/40$Build-2</meta:generator><meta:creation-date>2008-06-07T15:28:22</meta:creation-date><dc:date>2009-01-10T16:03:33</dc:date><meta:editing-cycles>1</meta:editing-cycles><meta:editing-duration>PT0S</meta:editing-duration><meta:document-statistic meta:table-count="4" meta:image-count="2" meta:object-count="0" meta:page-count="4" meta:paragraph-count="147" meta:word-count="462" meta:character-count="4423" meta:non-whitespace-character-count="4077"/><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">9169</config:config-item>
+   <config:config-item config:name="ViewAreaTop" config:type="long">68703</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">27224</config:config-item>
-   <config:config-item config:name="ViewAreaHeight" config:type="long">11643</config:config-item>
+   <config:config-item config:name="ViewAreaWidth" config:type="long">30628</config:config-item>
+   <config:config-item config:name="ViewAreaHeight" config:type="long">13744</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">15392</config:config-item>
-     <config:config-item config:name="ViewTop" config:type="long">17563</config:config-item>
+     <config:config-item config:name="ViewLeft" config:type="long">5383</config:config-item>
+     <config:config-item config:name="ViewTop" config:type="long">77264</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">9169</config:config-item>
-     <config:config-item config:name="VisibleRight" config:type="long">27222</config:config-item>
-     <config:config-item config:name="VisibleBottom" config:type="long">20810</config:config-item>
+     <config:config-item config:name="VisibleTop" config:type="long">68703</config:config-item>
+     <config:config-item config:name="VisibleRight" config:type="long">30626</config:config-item>
+     <config:config-item config:name="VisibleBottom" config:type="long">82446</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">180</config:config-item>
+     <config:config-item config:name="ZoomFactor" config:type="short">160</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>
@@ -91,7 +90,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">3198533</config:config-item>
+   <config:config-item config:name="Rsid" config:type="int">3302942</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>
@@ -652,175 +651,191 @@
    <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 Japanese1" fo:font-size="8pt" officeooo:paragraph-rsid="003077b6" 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="P34" style:family="paragraph" style:parent-style-name="Header">
+   <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" style:text-underline-style="none" officeooo:rsid="026544ec" officeooo:paragraph-rsid="02b1d5d8" style:font-size-asian="8pt" style:font-size-complex="8pt"/>
+  </style:style>
+  <style:style style:name="P35" style:family="paragraph" style:parent-style-name="Header">
+   <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" style:text-underline-style="none" officeooo:rsid="0266c2a9" officeooo:paragraph-rsid="02b1d5d8" 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:paragraph-properties fo:margin-top="0in" fo:margin-bottom="0.0043in" style:contextual-spacing="false"/>
    <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="7pt" fo:font-weight="bold" officeooo:paragraph-rsid="001ae359" 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="P35" 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: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="Droid Sans Japanese1" fo:font-size="7pt" officeooo:paragraph-rsid="00244514" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
   </style:style>
-  <style:style style:name="P36" 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-top="0in" fo:margin-bottom="0.0043in" style:contextual-spacing="false" fo:line-height="100%"/>
    <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="7pt" officeooo:paragraph-rsid="0027ed94" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
   </style:style>
-  <style:style style:name="P37" 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:paragraph-properties fo:margin-top="0in" fo:margin-bottom="0.0043in" style:contextual-spacing="false"/>
    <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="7pt" officeooo:paragraph-rsid="001ae359" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
   </style:style>
-  <style:style style:name="P38" style:family="paragraph" style:parent-style-name="Table_20_Contents">
+  <style:style style:name="P40" style:family="paragraph" style:parent-style-name="Table_20_Contents">
    <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="7pt" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
   </style:style>
-  <style:style style:name="P39" style:family="paragraph" style:parent-style-name="Table_20_Contents">
+  <style:style style:name="P41" style:family="paragraph" style:parent-style-name="Table_20_Contents">
    <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
    <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="7pt" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
   </style:style>
-  <style:style style:name="P40" style:family="paragraph" style:parent-style-name="Standard">
+  <style:style style:name="P42" style:family="paragraph" style:parent-style-name="Standard">
    <style:paragraph-properties fo:margin-left="0in" fo:margin-right="0in" fo:text-align="center" style:justify-single-word="false" fo:text-indent="0in" style:auto-text-indent="false"/>
    <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="7pt" officeooo:paragraph-rsid="0021bfc5" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
   </style:style>
-  <style:style style:name="P41" style:family="paragraph" style:parent-style-name="Standard">
+  <style:style style:name="P43" style:family="paragraph" style:parent-style-name="Standard">
    <style:paragraph-properties fo:margin-left="0in" fo:margin-right="0in" fo:text-align="center" style:justify-single-word="false" fo:text-indent="0in" style:auto-text-indent="false"/>
    <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="7pt" officeooo:paragraph-rsid="00203939" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
   </style:style>
-  <style:style style:name="P42" style:family="paragraph" style:parent-style-name="Standard">
+  <style:style style:name="P44" style:family="paragraph" style:parent-style-name="Standard">
    <style:paragraph-properties fo:margin-left="0in" fo:margin-right="0in" fo:text-align="center" style:justify-single-word="false" fo:text-indent="0in" style:auto-text-indent="false"/>
    <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="7pt" officeooo:paragraph-rsid="002db4b9" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
   </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="Table_20_Contents">
    <style:paragraph-properties fo:text-align="end" style:justify-single-word="false"/>
    <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="7pt" officeooo:paragraph-rsid="0008048e" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
   </style:style>
-  <style:style style:name="P44" style:family="paragraph" style:parent-style-name="Table_20_Contents">
+  <style:style style:name="P46" 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="Droid Sans Japanese1" fo:font-size="7pt" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
   </style:style>
-  <style:style style:name="P45" style:family="paragraph" style:parent-style-name="Heading_20_2">
+  <style:style style:name="P47" style:family="paragraph" style:parent-style-name="Heading_20_2">
    <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="7pt" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
   </style:style>
-  <style:style style:name="P46" style:family="paragraph" style:parent-style-name="Heading_20_2">
+  <style:style style:name="P48" style:family="paragraph" style:parent-style-name="Heading_20_2">
    <style:paragraph-properties fo:text-align="start" style:justify-single-word="false"/>
    <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="7pt" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
   </style:style>
-  <style:style style:name="P47" style:family="paragraph" style:parent-style-name="Standard">
+  <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-align="start" style:justify-single-word="false" fo:text-indent="0in" style:auto-text-indent="false"/>
    <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="7pt" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
   </style:style>
-  <style:style style:name="P48" style:family="paragraph" style:parent-style-name="Standard">
+  <style:style style:name="P50" 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 Japanese1" fo:font-size="7pt" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
   </style:style>
-  <style:style style:name="P49" style:family="paragraph" style:parent-style-name="Standard">
+  <style:style style:name="P51" 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 Japanese1" fo:font-size="7pt" officeooo:paragraph-rsid="0014b27d" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
   </style:style>
-  <style:style style:name="P50" style:family="paragraph" style:parent-style-name="Standard">
+  <style:style style:name="P52" style:family="paragraph" style:parent-style-name="Standard">
    <style:text-properties officeooo:paragraph-rsid="0023d589"/>
   </style:style>
-  <style:style style:name="P51" style:family="paragraph" style:parent-style-name="Normal_20__28_Web_29_">
+  <style:style style:name="P53" style:family="paragraph" style:parent-style-name="Normal_20__28_Web_29_">
    <loext:graphic-properties draw:fill="solid" draw:fill-color="#ffffff"/>
    <style:paragraph-properties fo:margin-top="0in" fo:margin-bottom="0.0874in" style:contextual-spacing="false" fo:line-height="100%" fo:text-align="center" style:justify-single-word="false" fo:background-color="#ffffff"/>
    <style:text-properties fo:color="#000000" loext:opacity="100%" style:font-name="Droid Sans Japanese1" fo:font-size="8pt" officeooo:paragraph-rsid="001cd488" style:font-size-asian="8pt" style:font-name-complex="Segoe UI" style:font-size-complex="8pt"/>
   </style:style>
-  <style:style style:name="P52" style:family="paragraph" style:parent-style-name="Normal_20__28_Web_29_">
+  <style:style style:name="P54" style:family="paragraph" style:parent-style-name="Normal_20__28_Web_29_">
    <loext:graphic-properties draw:fill="solid" draw:fill-color="#ffffff"/>
    <style:paragraph-properties fo:margin-top="0in" fo:margin-bottom="0.0083in" style:contextual-spacing="false" fo:line-height="100%" fo:text-align="center" style:justify-single-word="false" fo:background-color="#ffffff"/>
    <style:text-properties fo:color="#000000" loext:opacity="100%" style:font-name="Droid Sans Japanese1" fo:font-size="8pt" officeooo:paragraph-rsid="0023d589" style:font-size-asian="8pt" style:font-size-complex="8pt"/>
   </style:style>
-  <style:style style:name="P53" style:family="paragraph" style:parent-style-name="Normal_20__28_Web_29_">
+  <style:style style:name="P55" style:family="paragraph" style:parent-style-name="Normal_20__28_Web_29_">
    <loext:graphic-properties draw:fill="solid" draw:fill-color="#ffffff"/>
    <style:paragraph-properties fo:margin-top="0in" fo:margin-bottom="0.0083in" style:contextual-spacing="false" fo:line-height="100%" fo:text-align="center" style:justify-single-word="false" fo:background-color="#ffffff"/>
    <style:text-properties fo:color="#000000" loext:opacity="100%" style:font-name="Droid Sans Japanese1" fo:font-size="8pt" fo:font-style="italic" fo:font-weight="bold" officeooo:paragraph-rsid="0023d589" style:font-size-asian="8pt" style:font-style-asian="italic" style:font-weight-asian="bold" style:font-name-complex="Segoe UI" style:font-size-complex="8pt"/>
   </style:style>
-  <style:style style:name="P54" style:family="paragraph" style:parent-style-name="Table_20_Heading">
+  <style:style style:name="P56" style:family="paragraph" style:parent-style-name="Table_20_Heading">
    <style:text-properties fo:color="#000000" loext:opacity="100%" style:font-name="Droid Sans Japanese1" 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="P55" style:family="paragraph" style:parent-style-name="Table_20_Heading">
+  <style:style style:name="P57" style:family="paragraph" style:parent-style-name="Table_20_Heading">
    <style:text-properties fo:color="#000000" loext:opacity="100%" style:font-name="Droid Sans Japanese1" fo:font-size="8pt" fo:font-weight="bold" officeooo:rsid="00203939" officeooo:paragraph-rsid="00203939" 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="P56" style:family="paragraph" style:parent-style-name="Table_20_Heading">
+  <style:style style:name="P58" style:family="paragraph" style:parent-style-name="Table_20_Heading">
    <style:text-properties fo:color="#000000" loext:opacity="100%" style:font-name="Droid Sans Japanese1" fo:font-size="8pt" fo:font-weight="bold" officeooo:rsid="003bba97" 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="P57" style:family="paragraph" style:parent-style-name="Text_20_body_20__28_user_29_">
+  <style:style style:name="P59" style:family="paragraph" style:parent-style-name="Text_20_body_20__28_user_29_">
    <style:paragraph-properties fo:margin-top="0in" fo:margin-bottom="0.0043in" style:contextual-spacing="false"/>
    <style:text-properties fo:color="#000000" loext:opacity="100%" style:font-name="Droid Sans Japanese1" fo:font-size="7pt" fo:font-weight="bold" officeooo:paragraph-rsid="001cd488" style:font-size-asian="7pt" style:font-weight-asian="bold" style:font-name-complex="Cantarell1" style:font-size-complex="7pt" style:font-weight-complex="bold"/>
   </style:style>
-  <style:style style:name="P58" style:family="paragraph" style:parent-style-name="Text_20_body_20__28_user_29_">
+  <style:style style:name="P60" style:family="paragraph" style:parent-style-name="Text_20_body_20__28_user_29_">
    <style:text-properties fo:color="#000000" loext:opacity="100%" style:font-name="Droid Sans Japanese1" fo:font-size="7pt" fo:font-weight="bold" officeooo:paragraph-rsid="00244514" style:font-size-asian="7pt" style:font-weight-asian="bold" style:font-name-complex="Cantarell1" style:font-size-complex="7pt" style:font-weight-complex="bold"/>
   </style:style>
-  <style:style style:name="P59" style:family="paragraph" style:parent-style-name="Text_20_body">
+  <style:style style:name="P61" 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" fo:line-height="100%"/>
    <style:text-properties fo:color="#000000" loext:opacity="100%" style:font-name="Droid Sans Japanese1" fo:font-size="7pt" fo:font-weight="bold" officeooo:paragraph-rsid="0027ed94" style:font-size-asian="7pt" style:font-weight-asian="bold" style:font-name-complex="Cantarell1" style:font-size-complex="7pt" style:font-weight-complex="bold"/>
   </style:style>
-  <style:style style:name="P60" style:family="paragraph" style:parent-style-name="Text_20_body">
+  <style:style style:name="P62" style:family="paragraph" style:parent-style-name="Text_20_body">
    <style:paragraph-properties fo:line-height="100%" fo:text-align="start" style:justify-single-word="false"/>
    <style:text-properties fo:color="#000000" loext:opacity="100%" style:font-name="Droid Sans Japanese1" fo:font-size="9pt" fo:language="en" fo:country="US" style:text-underline-style="none" fo:font-weight="bold" officeooo:rsid="002a4c57" officeooo:paragraph-rsid="002ee59e" style:letter-kerning="true" style:font-name-asian="Liberation Sans1" style:font-size-asian="9pt" style:font-weight-asian="bold" style:font-name-complex="Cantarell1" style:font-size-complex="9pt" style:language-complex="ar" style:country-complex="SA" style:font-weight-complex="bold"/>
   </style:style>
-  <style:style style:name="P61" style:family="paragraph" style:parent-style-name="Text_20_body">
+  <style:style style:name="P63" style:family="paragraph" style:parent-style-name="Text_20_body">
    <style:text-properties fo:color="#000000" loext:opacity="100%" style:font-name="Droid Sans Japanese1" fo:font-size="9pt" fo:language="en" fo:country="US" fo:font-weight="bold" officeooo:rsid="002a4c57" officeooo:paragraph-rsid="002ee59e" style:letter-kerning="true" style:font-name-asian="Liberation Sans1" style:font-size-asian="9pt" style:font-weight-asian="bold" style:font-name-complex="Cantarell1" style:font-size-complex="9pt" style:language-complex="ar" style:country-complex="SA" style:font-weight-complex="bold"/>
   </style:style>
-  <style:style style:name="P62" style:family="paragraph" style:parent-style-name="Text_20_body_20__28_user_29_">
+  <style:style style:name="P64" style:family="paragraph" style:parent-style-name="Text_20_body_20__28_user_29_">
    <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="Cantarell1" fo:font-size="7pt" fo:font-weight="bold" officeooo:rsid="001dc758" officeooo:paragraph-rsid="002706d3" style:font-size-asian="7pt" style:font-weight-asian="bold" style:font-name-complex="Cantarell1" style:font-size-complex="7pt" style:font-weight-complex="bold"/>
   </style:style>
-  <style:style style:name="P63" style:family="paragraph" style:parent-style-name="Text_20_body_20__28_user_29_">
+  <style:style style:name="P65" style:family="paragraph" style:parent-style-name="Text_20_body_20__28_user_29_">
    <style:paragraph-properties fo:margin-top="0in" fo:margin-bottom="0.0043in" style:contextual-spacing="false"/>
    <style:text-properties style:font-name="Cantarell1" fo:font-size="7pt" officeooo:paragraph-rsid="002706d3" style:font-size-asian="7pt" style:font-name-complex="Cantarell1" style:font-size-complex="7pt"/>
   </style:style>
-  <style:style style:name="P64" style:family="paragraph" style:parent-style-name="Text_20_body_20__28_user_29_">
+  <style:style style:name="P66" style:family="paragraph" style:parent-style-name="Text_20_body_20__28_user_29_">
    <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" officeooo:paragraph-rsid="0027ed94" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
   </style:style>
-  <style:style style:name="P65" style:family="paragraph" style:parent-style-name="Text_20_body">
+  <style:style style:name="P67" 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:font-name="Droid Sans Japanese" fo:font-size="8pt" fo:font-weight="bold" officeooo:rsid="001cd488" officeooo:paragraph-rsid="001dc758" 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="P66" style:family="paragraph" style:parent-style-name="Text_20_body">
+  <style:style style:name="P68" 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:font-name="Droid Sans Japanese" fo:font-size="8pt" fo:font-weight="bold" officeooo:rsid="001dc758" officeooo:paragraph-rsid="0023d589" 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="P67" style:family="paragraph" style:parent-style-name="Text_20_body">
+  <style:style style:name="P69" 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:font-name="Droid Sans Japanese" fo:font-size="8pt" fo:font-weight="bold" officeooo:rsid="001dc758" officeooo:paragraph-rsid="001dc758" 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="P68" 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="8pt" officeooo:paragraph-rsid="001cd488" style:font-size-asian="8pt" style:font-size-complex="8pt"/>
-  </style:style>
-  <style:style style:name="P69" style:family="paragraph" style:parent-style-name="Text_20_body">
-   <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="8pt" officeooo:paragraph-rsid="001cd488" style:font-size-asian="8pt" style:font-size-complex="8pt"/>
-  </style:style>
   <style:style style:name="P70" 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="8pt" officeooo:paragraph-rsid="001cd488" style:font-size-asian="8pt" style:font-size-complex="8pt"/>
+  </style:style>
+  <style:style style:name="P71" style:family="paragraph" style:parent-style-name="Text_20_body">
+   <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="8pt" officeooo:paragraph-rsid="001cd488" style:font-size-asian="8pt" style:font-size-complex="8pt"/>
+  </style:style>
+  <style:style style:name="P72" style:family="paragraph" style:parent-style-name="Standard">
    <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="normal" officeooo:rsid="001cd488" officeooo:paragraph-rsid="001cd488" style:font-size-asian="8pt" style:font-weight-asian="normal" style:font-size-complex="8pt" style:font-weight-complex="normal"/>
   </style:style>
-  <style:style style:name="P71" style:family="paragraph" style:parent-style-name="Text_20_body">
+  <style:style style:name="P73" style:family="paragraph" style:parent-style-name="Text_20_body">
    <style:text-properties officeooo:paragraph-rsid="002ee59e"/>
   </style:style>
-  <style:style style:name="P72" style:family="paragraph" style:parent-style-name="Header">
-   <style:paragraph-properties fo:text-align="start" style:justify-single-word="false"/>
-   <style:text-properties fo:color="#666666" loext:opacity="100%" style:font-name="Droid Sans Japanese1" fo:font-size="8pt" style:text-underline-style="solid" style:text-underline-type="double" style:text-underline-width="auto" style:text-underline-color="font-color" fo:font-weight="bold" officeooo:rsid="0266c2a9" officeooo:paragraph-rsid="02b1d5d8" 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="P73" style:family="paragraph" style:parent-style-name="Header">
-   <style:paragraph-properties fo:text-align="start" style:justify-single-word="false"/>
-   <style:text-properties fo:color="#666666" loext:opacity="100%" style:font-name="Droid Sans Japanese1" fo:font-size="8pt" fo:font-weight="normal" officeooo:paragraph-rsid="02b1d5d8" style:font-size-asian="8pt" style:font-weight-asian="normal" style:font-size-complex="8pt" style:font-weight-complex="normal"/>
-  </style:style>
   <style:style style:name="P74" style:family="paragraph" style:parent-style-name="Header">
    <style:paragraph-properties fo:text-align="start" style:justify-single-word="false"/>
-   <style:text-properties fo:color="#666666" loext:opacity="100%" style:font-name="Droid Sans Japanese1" fo:font-size="8pt" fo:font-weight="bold" officeooo:paragraph-rsid="02b1d5d8" style:font-size-asian="8pt" style:font-weight-asian="bold" style:font-size-complex="8pt" style:font-weight-complex="bold"/>
+   <style:text-properties fo:color="#666666" loext:opacity="100%" style:font-name="Droid Sans Japanese1" fo:font-size="8pt" style:text-underline-style="solid" style:text-underline-type="double" style:text-underline-width="auto" style:text-underline-color="font-color" fo:font-weight="bold" officeooo:rsid="0266c2a9" officeooo:paragraph-rsid="02b1d5d8" 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="P75" style:family="paragraph" style:parent-style-name="Header">
-   <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 fo:color="#666666" loext:opacity="100%" style:font-name="Droid Sans Japanese1" fo:font-size="8pt" fo:font-style="normal" style:text-underline-style="none" fo:font-weight="normal" officeooo:paragraph-rsid="02b1d5d8" style:font-size-asian="8pt" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-size-complex="8pt" style:font-style-complex="normal" style:font-weight-complex="normal"/>
+   <style:paragraph-properties fo:text-align="start" style:justify-single-word="false"/>
+   <style:text-properties fo:color="#666666" loext:opacity="100%" style:font-name="Droid Sans Japanese1" fo:font-size="8pt" style:text-underline-style="solid" style:text-underline-type="double" style:text-underline-width="auto" style:text-underline-color="font-color" fo:font-weight="bold" officeooo:rsid="0266c2a9" officeooo:paragraph-rsid="0030ce45" 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="P76" style:family="paragraph" style:parent-style-name="Header">
    <style:paragraph-properties fo:text-align="start" style:justify-single-word="false"/>
-   <style:text-properties fo:color="#666666" loext:opacity="100%" style:font-name="Droid Sans Japanese1" fo:font-size="8pt" style:text-underline-style="solid" style:text-underline-type="double" style:text-underline-width="auto" style:text-underline-color="font-color" fo:font-weight="bold" officeooo:rsid="0266c2a9" officeooo:paragraph-rsid="02b1d5d8" style:font-size-asian="8pt" style:font-weight-asian="bold" style:font-size-complex="8pt" style:font-weight-complex="bold"/>
+   <style:text-properties fo:color="#666666" loext:opacity="100%" style:font-name="Droid Sans Japanese1" fo:font-size="8pt" fo:font-weight="normal" officeooo:paragraph-rsid="02b1d5d8" style:font-size-asian="8pt" style:font-weight-asian="normal" style:font-size-complex="8pt" style:font-weight-complex="normal"/>
   </style:style>
   <style:style style:name="P77" style:family="paragraph" style:parent-style-name="Header">
    <style:paragraph-properties fo:text-align="start" style:justify-single-word="false"/>
-   <style:text-properties fo:color="#666666" loext:opacity="100%" style:font-name="Droid Sans Japanese1" fo:font-size="8pt" style:text-underline-style="solid" style:text-underline-type="double" style:text-underline-width="auto" style:text-underline-color="font-color" fo:font-weight="bold" officeooo:rsid="0266c2a9" officeooo:paragraph-rsid="0030ce45" style:font-size-asian="8pt" style:font-weight-asian="bold" style:font-size-complex="8pt" style:font-weight-complex="bold"/>
+   <style:text-properties fo:color="#666666" loext:opacity="100%" style:font-name="Droid Sans Japanese1" fo:font-size="8pt" fo:font-weight="bold" officeooo:paragraph-rsid="02b1d5d8" 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="P78" style:family="paragraph" style:parent-style-name="Header">
+   <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 fo:color="#666666" loext:opacity="100%" style:font-name="Droid Sans Japanese1" fo:font-size="8pt" fo:font-style="normal" style:text-underline-style="none" fo:font-weight="normal" officeooo:paragraph-rsid="02b1d5d8" style:font-size-asian="8pt" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-size-complex="8pt" style:font-style-complex="normal" style:font-weight-complex="normal"/>
+  </style:style>
+  <style:style style:name="P79" style:family="paragraph" style:parent-style-name="Header">
+   <style:paragraph-properties fo:text-align="start" style:justify-single-word="false"/>
+   <style:text-properties fo:color="#666666" loext:opacity="100%" style:font-name="Droid Sans Japanese1" fo:font-size="8pt" style:text-underline-style="none" fo:font-weight="bold" officeooo:rsid="0266c2a9" officeooo:paragraph-rsid="02b1d5d8" 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="P80" style:family="paragraph" style:parent-style-name="Header">
+   <style:paragraph-properties fo:text-align="start" style:justify-single-word="false"/>
+   <style:text-properties fo:color="#666666" loext:opacity="100%" style:font-name="Droid Sans Japanese1" fo:font-size="8pt" style:text-underline-style="none" fo:font-weight="bold" officeooo:rsid="0266c2a9" officeooo:paragraph-rsid="0030ce45" 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="P81" 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" fo:line-height="100%"/>
+   <style:text-properties style:font-name="Droid Sans Japanese1" fo:font-size="7pt" officeooo:paragraph-rsid="0032661e" style:font-size-asian="7pt" style:font-size-complex="7pt"/>
   </style:style>
   <style:style style:name="T1" style:family="text">
    <style:text-properties style:text-underline-style="solid" style:text-underline-width="auto" style:text-underline-color="font-color" fo:font-weight="bold" officeooo:rsid="00203939" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
@@ -1680,45 +1695,45 @@
     <text:sequence-decl text:display-outline-level="0" text:name="Figure"/>
    </text:sequence-decls>
    <text:p text:style-name="P16"><text:placeholder text:placeholder-type="text">&lt;for each=&quot;sale in records&quot;&gt;</text:placeholder></text:p>
-   <text:p text:style-name="P71"><text:placeholder text:placeholder-type="text">&lt;choose test=&quot;&quot;&gt;</text:placeholder></text:p>
+   <text:p text:style-name="P73"><text:placeholder text:placeholder-type="text">&lt;choose test=&quot;&quot;&gt;</text:placeholder></text:p>
    <text:p text:style-name="P17"><text:placeholder text:placeholder-type="text">&lt;when test=&quot;sale.quote_number != None or sale.number != None&quot;&gt;</text:placeholder></text:p>
    <table:table table:name="Tabla2" table:style-name="Tabla2">
     <table:table-column table:style-name="Tabla2.A"/>
     <table:table-column table:style-name="Tabla2.B"/>
     <table:table-row table:style-name="Tabla2.1">
      <table:table-cell table:style-name="Tabla2.A1" office:value-type="string">
-      <text:p text:style-name="P69"><text:span text:style-name="T12">Fecha</text:span><text:span text:style-name="T11">: </text:span><text:span text:style-name="T11"><text:placeholder text:placeholder-type="text">&lt;format_date(sale.sale_date or today, sale.party.lang)&gt;</text:placeholder></text:span></text:p>
+      <text:p text:style-name="P71"><text:span text:style-name="T12">Fecha</text:span><text:span text:style-name="T11">: </text:span><text:span text:style-name="T11"><text:placeholder text:placeholder-type="text">&lt;format_date(sale.sale_date or today, sale.party.lang)&gt;</text:placeholder></text:span></text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tabla2.A1" table:number-rows-spanned="2" office:value-type="string">
-      <text:p text:style-name="P73"><text:placeholder text:placeholder-type="text" text:description="if test=&quot;sale.company&quot;">&lt;if test=&quot;sale.company&quot;&gt;</text:placeholder></text:p>
-      <text:p text:style-name="P74"><text:placeholder text:placeholder-type="text" text:description="sale.company and sale.company.rec_name">&lt;sale.company and sale.company.rec_name&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P76"><text:placeholder text:placeholder-type="text" text:description="if test=&quot;sale.company&quot;">&lt;if test=&quot;sale.company&quot;&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P77"><text:placeholder text:placeholder-type="text" text:description="sale.company and sale.company.rec_name">&lt;sale.company and sale.company.rec_name&gt;</text:placeholder></text:p>
       <text:p text:style-name="P31"><text:span text:style-name="T33">NIT:</text:span><text:span text:style-name="T41"> </text:span><text:span text:style-name="T40"><text:placeholder text:placeholder-type="text">&lt;sale.company.party.identifiers[0].code&gt;</text:placeholder></text:span></text:p>
       <text:p text:style-name="P33">Regimen Común</text:p>
       <text:p text:style-name="P33"><text:span text:style-name="T40">Actividad Economica 46</text:span><text:span text:style-name="T42">59</text:span></text:p>
-      <text:p text:style-name="P29"><text:span text:style-name="T32">Dirección: </text:span><text:span text:style-name="T40"><text:placeholder text:placeholder-type="text">&lt;sale.company.party.addresses[0].street&gt;</text:placeholder></text:span><text:span text:style-name="T40"><text:s/></text:span><text:span text:style-name="T40"><text:placeholder text:placeholder-type="text">&lt;sale.company.party.addresses[0].city&gt;</text:placeholder></text:span></text:p>
-      <text:p text:style-name="P30"><text:span text:style-name="T33">Teléfono:</text:span><text:span text:style-name="T40"> </text:span><text:span text:style-name="T41"><text:placeholder text:placeholder-type="text">&lt;sale.company.party.phone&gt;</text:placeholder></text:span></text:p>
-      <text:p text:style-name="P72"><text:span text:style-name="T34">Celular: </text:span><text:span text:style-name="T43"><text:placeholder text:placeholder-type="text">&lt;sale.company.party.mobile&gt;</text:placeholder></text:span></text:p>
-      <text:p text:style-name="P77"><text:span text:style-name="T35">E-mail</text:span><text:span text:style-name="T34">: </text:span><text:span text:style-name="T43"><text:placeholder text:placeholder-type="text">&lt;sale.company.party.email&gt;</text:placeholder></text:span></text:p>
-      <text:p text:style-name="P75"><text:placeholder text:placeholder-type="text">&lt;/if&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P34"><text:span text:style-name="T32">Dirección: </text:span><text:span text:style-name="T40"><text:placeholder text:placeholder-type="text">&lt;sale.company.party.addresses[0].street&gt;</text:placeholder></text:span><text:span text:style-name="T40"><text:s/></text:span><text:span text:style-name="T40"><text:placeholder text:placeholder-type="text">&lt;sale.company.party.addresses[0].city&gt;</text:placeholder></text:span></text:p>
+      <text:p text:style-name="P35"><text:span text:style-name="T33">Teléfono:</text:span><text:span text:style-name="T40"> </text:span><text:span text:style-name="T41"><text:placeholder text:placeholder-type="text">&lt;sale.company.party.phone&gt;</text:placeholder></text:span></text:p>
+      <text:p text:style-name="P79"><text:span text:style-name="T34">Celular: </text:span><text:span text:style-name="T43"><text:placeholder text:placeholder-type="text">&lt;sale.company.party.mobile&gt;</text:placeholder></text:span></text:p>
+      <text:p text:style-name="P80"><text:span text:style-name="T35">E-mail</text:span><text:span text:style-name="T34">: </text:span><text:span text:style-name="T43"><text:placeholder text:placeholder-type="text">&lt;sale.company.party.email&gt;</text:placeholder></text:span></text:p>
+      <text:p text:style-name="P78"><text:placeholder text:placeholder-type="text">&lt;/if&gt;</text:placeholder></text:p>
      </table:table-cell>
     </table:table-row>
     <table:table-row table:style-name="Tabla2.2">
      <table:table-cell table:style-name="Tabla2.A1" office:value-type="string">
-      <text:p text:style-name="P65">Cotizado a: <text:span text:style-name="T17"><text:placeholder text:placeholder-type="text" text:description="sale.propietary.name">&lt;sale.party.name&gt;</text:placeholder></text:span></text:p>
-      <text:p text:style-name="P68"><text:placeholder text:placeholder-type="text">&lt;if test=&quot;sale.party.tax_identifier&quot;&gt;</text:placeholder></text:p>
-      <text:p text:style-name="P68"><text:span text:style-name="T13">Nit o Cedula</text:span><text:span text:style-name="T11">:</text:span> <text:placeholder text:placeholder-type="text">&lt;sale.party.tax_identifier.code&gt;</text:placeholder></text:p>
-      <text:p text:style-name="P70"><text:placeholder text:placeholder-type="text">&lt;/if&gt;</text:placeholder></text:p>
-      <text:p text:style-name="P66">Dirección: <text:span text:style-name="T17"><text:placeholder text:placeholder-type="text" text:description="sale.invoice_address.street">&lt;sale.invoice_address.street&gt;</text:placeholder></text:span></text:p>
-      <text:p text:style-name="P67">Ciudad: <text:span text:style-name="T17"><text:placeholder text:placeholder-type="text" text:description="sale.invoice_address.subdivision_municipality">&lt;sale.invoice_address.subdivision_municipality.name&gt;</text:placeholder></text:span></text:p>
-      <text:p text:style-name="P67"><text:span text:style-name="T20">T</text:span><text:span text:style-name="T19">elefono: </text:span><text:span text:style-name="T17"><text:placeholder text:placeholder-type="text" text:description="sale.contact.value">&lt;sale.contact.value&gt;</text:placeholder></text:span></text:p>
+      <text:p text:style-name="P67">Cotizado a: <text:span text:style-name="T17"><text:placeholder text:placeholder-type="text" text:description="sale.propietary.name">&lt;sale.party.name&gt;</text:placeholder></text:span></text:p>
+      <text:p text:style-name="P70"><text:placeholder text:placeholder-type="text">&lt;if test=&quot;sale.party.tax_identifier&quot;&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P70"><text:span text:style-name="T13">Nit o Cedula</text:span><text:span text:style-name="T11">:</text:span> <text:placeholder text:placeholder-type="text">&lt;sale.party.tax_identifier.code&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P72"><text:placeholder text:placeholder-type="text">&lt;/if&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P68">Dirección: <text:span text:style-name="T17"><text:placeholder text:placeholder-type="text" text:description="sale.invoice_address.street">&lt;sale.invoice_address.street&gt;</text:placeholder></text:span></text:p>
+      <text:p text:style-name="P69">Ciudad: <text:span text:style-name="T17"><text:placeholder text:placeholder-type="text" text:description="sale.invoice_address.subdivision_municipality">&lt;sale.invoice_address.subdivision_municipality.name&gt;</text:placeholder></text:span></text:p>
+      <text:p text:style-name="P69"><text:span text:style-name="T20">T</text:span><text:span text:style-name="T19">elefono: </text:span><text:span text:style-name="T17"><text:placeholder text:placeholder-type="text" text:description="sale.contact.value">&lt;sale.contact.value&gt;</text:placeholder></text:span></text:p>
      </table:table-cell>
      <table:covered-table-cell table:style-name="Tabla2.A1"/>
     </table:table-row>
    </table:table>
-   <text:p text:style-name="P51"/>
-   <text:p text:style-name="P51">Somos SMART VISION, la compañía que está revolucionando el mercado óptico en Colombia, ofrecemos productos y servicios ópticos con la mejor calidad y tecnología de punta. Nuestra mayor prioridad es satisfacer las necesidades de nuestros clientes</text:p>
-   <text:p text:style-name="P53">Agradecemos sinceramente el habernos elegido como opción; a continuación, relacionamos los productos solicitados.</text:p>
-   <text:p text:style-name="P52"><text:span text:style-name="T16">&quot; SMART VISION cambia tu forma de ver el mundo</text:span><text:span text:style-name="T15">&quot;</text:span></text:p>
+   <text:p text:style-name="P53"/>
+   <text:p text:style-name="P53">Somos SMART VISION, la compañía que está revolucionando el mercado óptico en Colombia, ofrecemos productos y servicios ópticos con la mejor calidad y tecnología de punta. Nuestra mayor prioridad es satisfacer las necesidades de nuestros clientes</text:p>
+   <text:p text:style-name="P55">Agradecemos sinceramente el habernos elegido como opción; a continuación, relacionamos los productos solicitados.</text:p>
+   <text:p text:style-name="P54"><text:span text:style-name="T16">&quot; SMART VISION cambia tu forma de ver el mundo</text:span><text:span text:style-name="T15">&quot;</text:span></text:p>
    <table:table table:name="Tabla4" table:style-name="Tabla4">
     <table:table-column table:style-name="Tabla4.A"/>
     <table:table-column table:style-name="Tabla4.B"/>
@@ -1732,37 +1747,37 @@
     <table:table-header-rows>
      <table:table-row>
       <table:table-cell table:style-name="Tabla4.A1" office:value-type="string">
-       <text:p text:style-name="P54">Descrip<text:span text:style-name="T3">c</text:span>ión</text:p>
+       <text:p text:style-name="P56">Descrip<text:span text:style-name="T3">c</text:span>ión</text:p>
       </table:table-cell>
       <table:table-cell table:style-name="Tabla4.A1" office:value-type="string">
-       <text:p text:style-name="P55">Modelo</text:p>
+       <text:p text:style-name="P57">Modelo</text:p>
       </table:table-cell>
       <table:table-cell table:style-name="Tabla4.A1" office:value-type="string">
-       <text:p text:style-name="P55">Marca</text:p>
+       <text:p text:style-name="P57">Marca</text:p>
       </table:table-cell>
       <table:table-cell table:style-name="Tabla4.A1" office:value-type="string">
-       <text:p text:style-name="P55">Origen</text:p>
+       <text:p text:style-name="P57">Origen</text:p>
       </table:table-cell>
       <table:table-cell table:style-name="Tabla4.A1" office:value-type="string">
-       <text:p text:style-name="P55">Garantia</text:p>
+       <text:p text:style-name="P57">Garantia</text:p>
       </table:table-cell>
       <table:table-cell table:style-name="Tabla4.A1" office:value-type="string">
-       <text:p text:style-name="P56">Cantidad</text:p>
+       <text:p text:style-name="P58">Cantidad</text:p>
       </table:table-cell>
       <table:table-cell table:style-name="Tabla4.A1" office:value-type="string">
-       <text:p text:style-name="P56">Precio u/n</text:p>
+       <text:p text:style-name="P58">Precio u/n</text:p>
       </table:table-cell>
       <table:table-cell table:style-name="Tabla4.A1" office:value-type="string">
-       <text:p text:style-name="P55">IVA</text:p>
+       <text:p text:style-name="P57">IVA</text:p>
       </table:table-cell>
       <table:table-cell table:style-name="Tabla4.I1" office:value-type="string">
-       <text:p text:style-name="P56">Total</text:p>
+       <text:p text:style-name="P58">Total</text:p>
       </table:table-cell>
      </table:table-row>
     </table:table-header-rows>
     <table:table-row>
      <table:table-cell table:style-name="Tabla4.A2" table:number-columns-spanned="9" office:value-type="string">
-      <text:p text:style-name="P38"><text:placeholder text:placeholder-type="text">&lt;for each=&quot;line in sale.lines&quot;&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P40"><text:placeholder text:placeholder-type="text">&lt;for each=&quot;line in sale.lines&quot;&gt;</text:placeholder></text:p>
      </table:table-cell>
      <table:covered-table-cell/>
      <table:covered-table-cell/>
@@ -1775,7 +1790,7 @@
     </table:table-row>
     <table:table-row>
      <table:table-cell table:style-name="Tabla4.A3" table:number-columns-spanned="9" office:value-type="string">
-      <text:p text:style-name="P38"><text:placeholder text:placeholder-type="text">&lt;choose test=&quot;&quot;&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P40"><text:placeholder text:placeholder-type="text">&lt;choose test=&quot;&quot;&gt;</text:placeholder></text:p>
      </table:table-cell>
      <table:covered-table-cell/>
      <table:covered-table-cell/>
@@ -1788,7 +1803,7 @@
     </table:table-row>
     <table:table-row>
      <table:table-cell table:style-name="Tabla4.A4" table:number-columns-spanned="9" office:value-type="string">
-      <text:p text:style-name="P38"><text:placeholder text:placeholder-type="text">&lt;when test=&quot;line.type == &apos;line&apos;&quot;&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P40"><text:placeholder text:placeholder-type="text">&lt;when test=&quot;line.type == &apos;line&apos;&quot;&gt;</text:placeholder></text:p>
      </table:table-cell>
      <table:covered-table-cell/>
      <table:covered-table-cell/>
@@ -1801,61 +1816,61 @@
     </table:table-row>
     <table:table-row>
      <table:table-cell table:style-name="Tabla4.A5" office:value-type="string">
-      <text:p text:style-name="P48"><text:placeholder text:placeholder-type="text">&lt;if test=&quot;line.product&quot;&gt;</text:placeholder></text:p>
-      <text:p text:style-name="P48"><text:placeholder text:placeholder-type="text">&lt;line.product.rec_name&gt;</text:placeholder></text:p>
-      <text:p text:style-name="P48"><text:placeholder text:placeholder-type="text">&lt;/if&gt;</text:placeholder></text:p>
-      <text:p text:style-name="P48"><text:placeholder text:placeholder-type="text">&lt;if test=&quot;line.description&quot;&gt;</text:placeholder></text:p>
-      <text:p text:style-name="P48"><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="P49"><text:placeholder text:placeholder-type="text">&lt;description&gt;</text:placeholder></text:p>
-      <text:p text:style-name="P49"><text:soft-page-break/><text:placeholder text:placeholder-type="text">&lt;/for&gt;</text:placeholder></text:p>
-      <text:p text:style-name="P49"><text:placeholder text:placeholder-type="text">&lt;/if&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P50"><text:placeholder text:placeholder-type="text">&lt;if test=&quot;line.product&quot;&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P50"><text:placeholder text:placeholder-type="text">&lt;line.product.rec_name&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P50"><text:placeholder text:placeholder-type="text">&lt;/if&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P50"><text:placeholder text:placeholder-type="text">&lt;if test=&quot;line.description&quot;&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P50"><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="P51"><text:placeholder text:placeholder-type="text">&lt;description&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P51"><text:soft-page-break/><text:placeholder text:placeholder-type="text">&lt;/for&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P51"><text:placeholder text:placeholder-type="text">&lt;/if&gt;</text:placeholder></text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tabla4.B5" office:value-type="string">
-      <text:p text:style-name="P42"><text:placeholder text:placeholder-type="text">&lt;if test=&quot;line.product&quot;&gt;</text:placeholder></text:p>
-      <text:p text:style-name="P40"><text:placeholder text:placeholder-type="text">&lt;if test=&quot;line.product.model_category&quot;&gt;</text:placeholder></text:p>
-      <text:p text:style-name="P41"><text:placeholder text:placeholder-type="text">&lt;line.product.model_category.name&gt;</text:placeholder><text:soft-page-break/></text:p>
-      <text:p text:style-name="P40"><text:placeholder text:placeholder-type="text">&lt;/if&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P44"><text:placeholder text:placeholder-type="text">&lt;if test=&quot;line.product&quot;&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P42"><text:placeholder text:placeholder-type="text">&lt;if test=&quot;line.product.model_category&quot;&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P43"><text:placeholder text:placeholder-type="text">&lt;line.product.model_category.name&gt;</text:placeholder><text:soft-page-break/></text:p>
       <text:p text:style-name="P42"><text:placeholder text:placeholder-type="text">&lt;/if&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P44"><text:placeholder text:placeholder-type="text">&lt;/if&gt;</text:placeholder></text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tabla4.C5" office:value-type="string">
-      <text:p text:style-name="P42"><text:placeholder text:placeholder-type="text">&lt;if test=&quot;line.product&quot;&gt;</text:placeholder></text:p>
-      <text:p text:style-name="P40"><text:placeholder text:placeholder-type="text">&lt;if test=&quot;line.product.mark_category&quot;&gt;</text:placeholder></text:p>
-      <text:p text:style-name="P40"><text:soft-page-break/><text:placeholder text:placeholder-type="text">&lt;line.product.mark_category.name&gt;</text:placeholder></text:p>
-      <text:p text:style-name="P40"><text:placeholder text:placeholder-type="text">&lt;/if&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P44"><text:placeholder text:placeholder-type="text">&lt;if test=&quot;line.product&quot;&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P42"><text:placeholder text:placeholder-type="text">&lt;if test=&quot;line.product.mark_category&quot;&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P42"><text:soft-page-break/><text:placeholder text:placeholder-type="text">&lt;line.product.mark_category.name&gt;</text:placeholder></text:p>
       <text:p text:style-name="P42"><text:placeholder text:placeholder-type="text">&lt;/if&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P44"><text:placeholder text:placeholder-type="text">&lt;/if&gt;</text:placeholder></text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tabla4.D5" office:value-type="string">
-      <text:p text:style-name="P42"><text:placeholder text:placeholder-type="text">&lt;if test=&quot;line.product&quot;&gt;</text:placeholder></text:p>
-      <text:p text:style-name="P40"><text:placeholder text:placeholder-type="text">&lt;if test=&quot;line.product.origin_country&quot;&gt;</text:placeholder></text:p>
-      <text:p text:style-name="P40"><text:placeholder text:placeholder-type="text">&lt;line.product.origin_country.name&gt;</text:placeholder><text:soft-page-break/></text:p>
-      <text:p text:style-name="P40"><text:placeholder text:placeholder-type="text">&lt;/if&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P44"><text:placeholder text:placeholder-type="text">&lt;if test=&quot;line.product&quot;&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P42"><text:placeholder text:placeholder-type="text">&lt;if test=&quot;line.product.origin_country&quot;&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P42"><text:placeholder text:placeholder-type="text">&lt;line.product.origin_country.name&gt;</text:placeholder><text:soft-page-break/></text:p>
       <text:p text:style-name="P42"><text:placeholder text:placeholder-type="text">&lt;/if&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P44"><text:placeholder text:placeholder-type="text">&lt;/if&gt;</text:placeholder></text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tabla4.E5" office:value-type="string">
-      <text:p text:style-name="P42"><text:placeholder text:placeholder-type="text">&lt;if test=&quot;line.product&quot;&gt;</text:placeholder></text:p>
-      <text:p text:style-name="P40"><text:placeholder text:placeholder-type="text">&lt;if test=&quot;line.product.warranty&quot;&gt;</text:placeholder></text:p>
-      <text:p text:style-name="P40"><text:placeholder text:placeholder-type="text">&lt;line.product.warranty&gt;</text:placeholder><text:soft-page-break/><text:s/><text:span text:style-name="T21">Meses</text:span></text:p>
-      <text:p text:style-name="P40"><text:placeholder text:placeholder-type="text">&lt;/if&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P44"><text:placeholder text:placeholder-type="text">&lt;if test=&quot;line.product&quot;&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P42"><text:placeholder text:placeholder-type="text">&lt;if test=&quot;line.product.warranty&quot;&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P42"><text:placeholder text:placeholder-type="text">&lt;line.product.warranty&gt;</text:placeholder><text:soft-page-break/><text:s/><text:span text:style-name="T21">Meses</text:span></text:p>
       <text:p text:style-name="P42"><text:placeholder text:placeholder-type="text">&lt;/if&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P44"><text:placeholder text:placeholder-type="text">&lt;/if&gt;</text:placeholder></text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tabla4.F5" office:value-type="string">
-      <text:p text:style-name="P39"><text:placeholder text:placeholder-type="text">&lt;format_number_symbol(line.quantity, sale.party.lang, line.unit, digits=line.unit.digits) if line.unit else format_number(line.quantity, sale.party.lang)&gt;</text:placeholder><text:soft-page-break/></text:p>
+      <text:p text:style-name="P41"><text:placeholder text:placeholder-type="text">&lt;format_number_symbol(line.quantity, sale.party.lang, line.unit, digits=line.unit.digits) if line.unit else format_number(line.quantity, sale.party.lang)&gt;</text:placeholder><text:soft-page-break/></text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tabla4.G5" office:value-type="string">
-      <text:p text:style-name="P43"><text:placeholder text:placeholder-type="text">&lt;format_currency(line.unit_price, sale.party.lang, sale.currency)&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P45"><text:placeholder text:placeholder-type="text">&lt;format_currency(line.unit_price, sale.party.lang, sale.currency)&gt;</text:placeholder></text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tabla4.H5" office:value-type="string">
-      <text:p text:style-name="P39"><text:placeholder text:placeholder-type="text">&lt;for each=&quot;tax in line.taxes&quot;&gt;</text:placeholder></text:p>
-      <text:p text:style-name="P39"><text:placeholder text:placeholder-type="text">&lt;tax.description&gt;</text:placeholder></text:p>
-      <text:p text:style-name="P39"><text:placeholder text:placeholder-type="text">&lt;/for&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P41"><text:placeholder text:placeholder-type="text">&lt;for each=&quot;tax in line.taxes&quot;&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P41"><text:placeholder text:placeholder-type="text">&lt;tax.description&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P41"><text:placeholder text:placeholder-type="text">&lt;/for&gt;</text:placeholder></text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tabla4.I5" office:value-type="string">
-      <text:p text:style-name="P44"><text:placeholder text:placeholder-type="text">&lt;format_currency(line.amount, sale.party.lang, sale.currency)&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P46"><text:placeholder text:placeholder-type="text">&lt;format_currency(line.amount, sale.party.lang, sale.currency)&gt;</text:placeholder></text:p>
      </table:table-cell>
     </table:table-row>
     <table:table-row>
      <table:table-cell table:style-name="Tabla4.A6" table:number-columns-spanned="9" office:value-type="string">
-      <text:p text:style-name="P38"><text:placeholder text:placeholder-type="text">&lt;/when&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P40"><text:placeholder text:placeholder-type="text">&lt;/when&gt;</text:placeholder></text:p>
      </table:table-cell>
      <table:covered-table-cell/>
      <table:covered-table-cell/>
@@ -1868,7 +1883,7 @@
     </table:table-row>
     <table:table-row>
      <table:table-cell table:style-name="Tabla4.A7" table:number-columns-spanned="9" office:value-type="string">
-      <text:p text:style-name="P38"><text:placeholder text:placeholder-type="text">&lt;when test=&quot;line.type == &apos;subtotal&apos;&quot;&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P40"><text:placeholder text:placeholder-type="text">&lt;when test=&quot;line.type == &apos;subtotal&apos;&quot;&gt;</text:placeholder></text:p>
      </table:table-cell>
      <table:covered-table-cell/>
      <table:covered-table-cell/>
@@ -1881,10 +1896,10 @@
     </table:table-row>
     <table:table-row>
      <table:table-cell table:style-name="Tabla4.A8" table:number-columns-spanned="9" office:value-type="string">
-      <text:p text:style-name="P45"><text:placeholder text:placeholder-type="text">&lt;for each=&quot;description in (line.description or &apos;&apos;).split(&apos;\n&apos;)&quot;&gt;</text:placeholder></text:p>
-      <text:p text:style-name="P45"><text:placeholder text:placeholder-type="text">&lt;description&gt;</text:placeholder></text:p>
-      <text:p text:style-name="P46"><text:placeholder text:placeholder-type="text">&lt;/for&gt;</text:placeholder></text:p>
-      <text:p text:style-name="P44"><text:placeholder text:placeholder-type="text">&lt;format_currency(line.amount, sale.party.lang, sale.currency)&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P47"><text:placeholder text:placeholder-type="text">&lt;for each=&quot;description in (line.description or &apos;&apos;).split(&apos;\n&apos;)&quot;&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P47"><text:placeholder text:placeholder-type="text">&lt;description&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P48"><text:placeholder text:placeholder-type="text">&lt;/for&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P46"><text:placeholder text:placeholder-type="text">&lt;format_currency(line.amount, sale.party.lang, sale.currency)&gt;</text:placeholder></text:p>
      </table:table-cell>
      <table:covered-table-cell/>
      <table:covered-table-cell/>
@@ -1897,7 +1912,7 @@
     </table:table-row>
     <table:table-row>
      <table:table-cell table:style-name="Tabla4.A9" table:number-columns-spanned="9" office:value-type="string">
-      <text:p text:style-name="P38"><text:placeholder text:placeholder-type="text">&lt;/when&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P40"><text:placeholder text:placeholder-type="text">&lt;/when&gt;</text:placeholder></text:p>
      </table:table-cell>
      <table:covered-table-cell/>
      <table:covered-table-cell/>
@@ -1910,7 +1925,7 @@
     </table:table-row>
     <table:table-row>
      <table:table-cell table:style-name="Tabla4.A10" table:number-columns-spanned="9" office:value-type="string">
-      <text:p text:style-name="P38"><text:placeholder text:placeholder-type="text">&lt;when test=&quot;line.type == &apos;title&apos;&quot;&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P40"><text:placeholder text:placeholder-type="text">&lt;when test=&quot;line.type == &apos;title&apos;&quot;&gt;</text:placeholder></text:p>
      </table:table-cell>
      <table:covered-table-cell/>
      <table:covered-table-cell/>
@@ -1923,9 +1938,9 @@
     </table:table-row>
     <table:table-row>
      <table:table-cell table:style-name="Tabla4.A11" table:number-columns-spanned="9" office:value-type="string">
-      <text:p text:style-name="P45"><text:placeholder text:placeholder-type="text">&lt;for each=&quot;description in (line.description or &apos;&apos;).split(&apos;\n&apos;)&quot;&gt;</text:placeholder></text:p>
-      <text:p text:style-name="P45"><text:placeholder text:placeholder-type="text">&lt;description&gt;</text:placeholder></text:p>
-      <text:p text:style-name="P45"><text:placeholder text:placeholder-type="text">&lt;/for&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P47"><text:placeholder text:placeholder-type="text">&lt;for each=&quot;description in (line.description or &apos;&apos;).split(&apos;\n&apos;)&quot;&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P47"><text:placeholder text:placeholder-type="text">&lt;description&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P47"><text:placeholder text:placeholder-type="text">&lt;/for&gt;</text:placeholder></text:p>
      </table:table-cell>
      <table:covered-table-cell/>
      <table:covered-table-cell/>
@@ -1938,7 +1953,7 @@
     </table:table-row>
     <table:table-row>
      <table:table-cell table:style-name="Tabla4.A11" table:number-columns-spanned="9" office:value-type="string">
-      <text:p text:style-name="P38"><text:placeholder text:placeholder-type="text">&lt;/when&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P40"><text:placeholder text:placeholder-type="text">&lt;/when&gt;</text:placeholder></text:p>
      </table:table-cell>
      <table:covered-table-cell/>
      <table:covered-table-cell/>
@@ -1951,7 +1966,7 @@
     </table:table-row>
     <table:table-row>
      <table:table-cell table:style-name="Tabla4.A11" table:number-columns-spanned="9" office:value-type="string">
-      <text:p text:style-name="P38"><text:placeholder text:placeholder-type="text">&lt;otherwise test=&quot;&quot;&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P40"><text:placeholder text:placeholder-type="text">&lt;otherwise test=&quot;&quot;&gt;</text:placeholder></text:p>
      </table:table-cell>
      <table:covered-table-cell/>
      <table:covered-table-cell/>
@@ -1964,9 +1979,9 @@
     </table:table-row>
     <table:table-row>
      <table:table-cell table:style-name="Tabla4.A11" table:number-columns-spanned="9" office:value-type="string">
-      <text:p text:style-name="P48"><text:placeholder text:placeholder-type="text">&lt;for each=&quot;description in (line.description or &apos;&apos;).split(&apos;\n&apos;)&quot;&gt;</text:placeholder></text:p>
-      <text:p text:style-name="P48"><text:placeholder text:placeholder-type="text">&lt;description&gt;</text:placeholder></text:p>
-      <text:p text:style-name="P47"><text:soft-page-break/><text:placeholder text:placeholder-type="text">&lt;/for&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P50"><text:placeholder text:placeholder-type="text">&lt;for each=&quot;description in (line.description or &apos;&apos;).split(&apos;\n&apos;)&quot;&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P50"><text:placeholder text:placeholder-type="text">&lt;description&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P49"><text:soft-page-break/><text:placeholder text:placeholder-type="text">&lt;/for&gt;</text:placeholder></text:p>
      </table:table-cell>
      <table:covered-table-cell/>
      <table:covered-table-cell/>
@@ -2064,28 +2079,29 @@
    </table:table>
    <text:p text:style-name="P14"><text:placeholder text:placeholder-type="text">&lt;for each=&quot;comment in (sale.comment or &apos;&apos;).split(&apos;\n&apos;)&quot;&gt;</text:placeholder></text:p>
    <text:p text:style-name="P14"><text:placeholder text:placeholder-type="text">&lt;/for&gt;</text:placeholder></text:p>
-   <text:p text:style-name="P34">CONDICIONES DE NEGOCIACION Y PAGO:</text:p>
-   <text:p text:style-name="P35"><text:s text:c="2"/>Tiempo de entrega: <text:span text:style-name="T17"><text:placeholder text:placeholder-type="text" text:description="sale.description">&lt;sale.description&gt;</text:placeholder></text:span></text:p>
-   <text:p text:style-name="P36"><text:s text:c="2"/>Forma de pago: <text:span text:style-name="T17"><text:placeholder text:placeholder-type="text" text:description="sale.payment_term.name if sale.payment_term else &quot;&quot;">&lt;sale.payment_term.name if sale.payment_term else &quot;&quot;&gt;</text:placeholder></text:span></text:p>
-   <text:p text:style-name="P34">Medios de pago:</text:p>
-   <text:p text:style-name="P63"><text:span text:style-name="T23"><text:s text:c="2"/></text:span>Efectivo, Consignación o transferencia a la cuenta corriente Bancolombia # 053813599-86 a nombre de SMART VISION SAS</text:p>
-   <text:p text:style-name="P34">DOCUMENTACIÓN ENTREGADA CON LOS EQUIPOS</text:p>
-   <text:p text:style-name="P37"><text:s text:c="2"/>- Factura</text:p>
-   <text:p text:style-name="P64"><text:s text:c="2"/>- Certificado de capacitación</text:p>
-   <text:p text:style-name="P64"><text:s text:c="2"/>- Manifiesto de importación (si aplica)</text:p>
-   <text:p text:style-name="P64"><text:s text:c="2"/>- Hoja de vida de cada equipo </text:p>
-   <text:p text:style-name="P64"><text:s text:c="2"/>- Certificado de calibración (Para equipos usados)</text:p>
-   <text:p text:style-name="P34">Otras condiciones:</text:p>
-   <text:p text:style-name="P63"><text:span text:style-name="T23"><text:s text:c="2"/></text:span>- El costo del envío es responsabilidad del comprador (para otras ciudades diferentes a <text:s text:c="2"/>Bogotá).</text:p>
-   <text:p text:style-name="P63"><text:span text:style-name="T23"><text:s text:c="2"/></text:span>- Garantía no incluye bombillos o piezas de desgaste por uso.</text:p>
-   <text:p text:style-name="P63"><text:span text:style-name="T23"><text:s text:c="2"/></text:span>- Con el envío de los equipos se entregarán las hojas de vida.</text:p>
-   <text:p text:style-name="P62"><text:span text:style-name="T18"><text:s text:c="2"/></text:span><text:span text:style-name="T17">- La Factura de venta definitiva será entregada al confirmar el pago total.</text:span></text:p>
-   <text:p text:style-name="P57"/>
-   <text:p text:style-name="P57">OBSERVACIONES ADICIONALES</text:p>
-   <text:p text:style-name="P59"><text:soft-page-break/><text:span text:style-name="T22"><text:s text:c="2"/>- </text:span><text:span text:style-name="T22"><text:placeholder text:placeholder-type="text" text:description="sale.comment">&lt;sale.comment&gt;</text:placeholder></text:span></text:p>
-   <text:p text:style-name="P34"/>
-   <text:p text:style-name="P58">VIGENCIA DE LA COTIZACIÓN: <text:span text:style-name="T24">30 D</text:span><text:span text:style-name="T25">ías</text:span></text:p>
-   <text:p text:style-name="P61">Cordialmente</text:p>
+   <text:p text:style-name="P36">CONDICIONES DE NEGOCIACION Y PAGO:</text:p>
+   <text:p text:style-name="P37"><text:s text:c="2"/>Tiempo de entrega: <text:span text:style-name="T17"><text:placeholder text:placeholder-type="text" text:description="sale.description">&lt;sale.description&gt;</text:placeholder></text:span></text:p>
+   <text:p text:style-name="P81"><text:s text:c="2"/>Forma de pago:</text:p>
+   <text:p text:style-name="P81"><text:s/><text:span text:style-name="T17"><text:placeholder text:placeholder-type="text" text:description="sale.payment_term.name if sale.payment_term else &quot;&quot;">&lt;sale.payment_term_description if sale.payment_term_description else &quot;&quot;&gt;</text:placeholder></text:span></text:p>
+   <text:p text:style-name="P36">Medios de pago:</text:p>
+   <text:p text:style-name="P65"><text:span text:style-name="T23"><text:s text:c="2"/></text:span>Efectivo, Consignación o transferencia a la cuenta corriente Bancolombia # 053813599-86 a nombre de SMART VISION SAS</text:p>
+   <text:p text:style-name="P36">DOCUMENTACIÓN ENTREGADA CON LOS EQUIPOS</text:p>
+   <text:p text:style-name="P39"><text:s text:c="2"/>- Factura</text:p>
+   <text:p text:style-name="P66"><text:s text:c="2"/>- Certificado de capacitación</text:p>
+   <text:p text:style-name="P66"><text:s text:c="2"/>- Manifiesto de importación (si aplica)</text:p>
+   <text:p text:style-name="P66"><text:s text:c="2"/>- Hoja de vida de cada equipo </text:p>
+   <text:p text:style-name="P66"><text:s text:c="2"/>- Certificado de calibración (Para equipos usados)</text:p>
+   <text:p text:style-name="P36">Otras condiciones:</text:p>
+   <text:p text:style-name="P65"><text:span text:style-name="T23"><text:s text:c="2"/></text:span>- El costo del envío es responsabilidad del comprador (para otras ciudades diferentes a <text:s text:c="2"/>Bogotá).</text:p>
+   <text:p text:style-name="P65"><text:span text:style-name="T23"><text:s text:c="2"/></text:span>- Garantía no incluye bombillos o piezas de desgaste por uso.</text:p>
+   <text:p text:style-name="P65"><text:span text:style-name="T23"><text:s text:c="2"/></text:span>- Con el envío de los equipos se entregarán las hojas de vida.</text:p>
+   <text:p text:style-name="P64"><text:span text:style-name="T18"><text:s text:c="2"/></text:span><text:span text:style-name="T17">- La Factura de venta definitiva será entregada al confirmar el pago total.</text:span></text:p>
+   <text:p text:style-name="P59"/>
+   <text:p text:style-name="P59"><text:soft-page-break/>OBSERVACIONES ADICIONALES</text:p>
+   <text:p text:style-name="P61"><text:span text:style-name="T22"><text:s text:c="2"/>- </text:span><text:span text:style-name="T22"><text:placeholder text:placeholder-type="text" text:description="sale.comment">&lt;sale.comment&gt;</text:placeholder></text:span></text:p>
+   <text:p text:style-name="P36"/>
+   <text:p text:style-name="P60">VIGENCIA DE LA COTIZACIÓN: <text:span text:style-name="T24">30 D</text:span><text:span text:style-name="T25">ías</text:span></text:p>
+   <text:p text:style-name="P63">Cordialmente</text:p>
    <table:table table:name="Tabla3" table:style-name="Tabla3">
     <table:table-column table:style-name="Tabla3.A"/>
     <table:table-column table:style-name="Tabla3.B"/>
@@ -5195,8 +5211,8 @@
      </table:table-cell>
     </table:table-row>
    </table:table>
-   <text:p text:style-name="P60"><text:placeholder text:placeholder-type="text">&lt;/when&gt;</text:placeholder></text:p>
-   <text:p text:style-name="P60"><text:placeholder text:placeholder-type="text">&lt;/choose&gt;</text:placeholder></text:p>
+   <text:p text:style-name="P62"><text:placeholder text:placeholder-type="text">&lt;/when&gt;</text:placeholder></text:p>
+   <text:p text:style-name="P62"><text:placeholder text:placeholder-type="text">&lt;/choose&gt;</text:placeholder></text:p>
    <text:p text:style-name="P23"><text:placeholder text:placeholder-type="text">&lt;/for&gt;</text:placeholder></text:p>
    <text:p text:style-name="P20"/>
    <text:p text:style-name="P20"/>

sale.py

@@ -28,56 +28,61 @@ class Sale(metaclass=PoolMeta):
                                          ('preventive', 'Preventive'),
                                          ('corrective', 'Corrective')
                                          ], "Maintenance Type",
-                                         states={
-                                             'invisible': Eval('sale_type') != "maintenance",
-                                             'required': Eval('sale_type') == "maintenance",
-                                             'readonly': Eval('state') != 'draft'},
-                                         depends=['sale_type'])
+                                        states={
+        'invisible': Eval('sale_type') != "maintenance",
+        'required': Eval('sale_type') == "maintenance",
+        'readonly': Eval('state') != 'draft'},
+        depends=['sale_type'])
 
     contract_ref = fields.Reference("Contract Base", selection='get_origin_contract',
-                                    domain=[('party', '=', Eval('party')),
-                                            ('state', '=', 'closed')],
+                                    domain={'optical_equipment.contract': [
+                                        ('party', '=', Eval('party')),
+                                        ('state', '=', 'closed'),
+                                    ]},
                                     states={'invisible': (Eval('sale_type') != 'maintenance')},
                                     search_context={
                                         'related_party': Eval('party'),
                                     },)
-    agended = fields.Boolean("Scheduling",states={
-        'invisible': (Eval('sale_type') != 'maintenance'),
-        'readonly': True})
-
+    agended = fields.Boolean("Scheduling", states={
+        'invisible': (Eval('sale_type') != 'maintenance')})
+    payment_term_description = fields.Char("Payment Term", states={
+        'readonly': Eval('state') != 'draft',
+    }, depends=['state'])
 
     @classmethod
     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.contact.states['required'] = True
+        cls.description.states['required'] = True
+        cls.sale_date.states['required'] = True
         cls._buttons.update({
             'draft': {
                 'invisible': (Eval('state').in_(
-                    ['cancelled', 'draft'])) | (Eval('shipment_state') == 'sent')}})
+                    ['cancelled', 'draft']))},
+            'report': {}})
 
         cls._transitions |= set((
-                ('draft', 'quotation'),
-                ('quotation', 'confirmed'),
-                ('confirmed', 'processing'),
-                ('confirmed', 'draft'),
-                ('processing', 'processing'),
-                ('processing', 'done'),
-                ('done', 'processing'),
-                ('draft', 'cancelled'),
-                ('quotation', 'cancelled'),
-                ('quotation', 'draft'),
-                ('cancelled', 'draft'),
-                ('processing', 'draft')
-                ))
+            ('draft', 'quotation'),
+            ('quotation', 'confirmed'),
+            ('confirmed', 'processing'),
+            ('confirmed', 'draft'),
+            ('processing', 'processing'),
+            ('processing', 'done'),
+            ('done', 'processing'),
+            ('draft', 'cancelled'),
+            ('quotation', 'cancelled'),
+            ('quotation', 'draft'),
+            ('cancelled', 'draft'),
+            ('processing', 'draft')
+        ))
 
     @fields.depends('lines', 'sale_type', 'agended')
     def on_chage_sale_type(self):
-        self.lines= []
+        self.lines = []
         if self.sale_type != "maintenance":
             self.agended = False
+        elif self.sale_type == "maintenance":
+            self.invoice_method = 'order'
 
     @classmethod
     def default_agended(self):
@@ -88,8 +93,8 @@ class Sale(metaclass=PoolMeta):
         'Return list of Model names for origin Reference'
         pool = Pool()
         Contract = pool.get('optical_equipment.contract')
-        return [Contract.__name__]
 
+        return [Contract.__name__]
 
     @classmethod
     def get_origin_contract(cls):
@@ -106,13 +111,11 @@ class Sale(metaclass=PoolMeta):
             '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):
         '''
@@ -122,7 +125,7 @@ class Sale(metaclass=PoolMeta):
         Config = pool.get('optical_equipment.configuration')
         config = Config(1)
         for sale in sales:
-            if config.equipment_sequence != None:
+            if config.equipment_sequence is not None:
                 if not sale.quote_number:
                     try:
                         sale.quote_number = config.sale_quote_number.get()
@@ -149,6 +152,12 @@ class Sale(metaclass=PoolMeta):
 
         return super(Sale, cls).copy(sales, default=default)
 
+    @classmethod
+    @ModelView.button_action(
+        'optical_equipment.wizard_print_balance_sale_party')
+    def report(cls, sales):
+        pass
+
     @classmethod
     @ModelView.button
     @Workflow.transition('quotation')
@@ -164,7 +173,8 @@ class Sale(metaclass=PoolMeta):
         cls.save(sales)
 
     @classmethod
-    @ModelView.button
+    @ModelView.button_action(
+        'optical_equipment.wizard_confirm_sale_date')
     @Workflow.transition('confirmed')
     @set_employee('confirmed_by')
     def confirm(cls, sales):
@@ -176,10 +186,9 @@ class Sale(metaclass=PoolMeta):
         cls.store_cache(sales)
         config = Configuration(1)
 
-
         MaintenanceService = pool.get('optical_equipment_maintenance.service')
         for sale in sales:
-            if sale.sale_type == 'maintenance':
+            if sale.sale_type == 'maintenance' and not sale.agended:
                 for line in sale.lines:
                     maintenanceService = MaintenanceService(
                         description=sale.description,
@@ -188,18 +197,19 @@ class Sale(metaclass=PoolMeta):
                         propietary=sale.party,
                         propietary_address=sale.shipment_address,
                         contract_origin=sale.contract_ref if sale.contract_ref else None,
-                        sale_origin=line,
+                        sale_origin=sale,
                         sale_date=sale.sale_date,
                         state="draft"
                     )
                     maintenanceService.save()
                 sale.agended = True
+                sale.state = "confirmed"
                 sale.save()
 
         cls.set_number(sales)
-        with transaction.set_context(
-                queue_scheduled_at=config.sale_process_after,
-                queue_batch=context.get('queue_batch', True)):
+        with Transaction().set_context(
+                queue_name='sale',
+                queue_scheduled_at=config.sale_process_after):
             cls.__queue__.process(sales)
 
 
@@ -208,14 +218,8 @@ class SaleLine(metaclass=PoolMeta):
     __name__ = 'sale.line'
 
     product_equipment = fields.Boolean("Product Equipment")
-    equipment = fields.Many2One('optical_equipment.equipment', "Equipment",
-                                domain=[('state', '=', 'registred'),
-                                        ('product','=', Eval('product'))
-                                        ],
-                                states={'invisible': If(~Eval('product_equipment'), True)},)
     unit_digits = fields.Function(fields.Integer('Unit Digits'),
-        'on_change_with_unit_digits')
-
+                                  'on_change_with_unit_digits')
 
     @classmethod
     def __setup__(cls):
@@ -225,18 +229,16 @@ class SaleLine(metaclass=PoolMeta):
                [('type', '=', 'service'),
                 ('maintenance_activity', '=', True)], []))
         cls.product.domain.append(If(Eval('_parent_sale.sale_type') == 'replaces',
-               [('replacement', '=', True)], []))
-
+                                     [('replacement', '=', True)], []))
 
     def on_change_with_unit_digits(self, name=None):
         if self.unit:
             return self.unit.digits
         return 2
 
-
     @fields.depends('product', 'unit', 'quantity', 'sale',
                     '_parent_sale.party', '_parent_sale.sale_type', methods=['_get_tax_rule_pattern',
-    '_get_context_sale_price','on_change_with_amount'])
+                                                                             '_get_context_sale_price', 'on_change_with_amount'])
     def on_change_product(self):
         Product = Pool().get('product.product')
         if not self.product:
@@ -279,7 +281,7 @@ class SaleLine(metaclass=PoolMeta):
 
             with Transaction().set_context(self._get_context_sale_price()):
                 self.unit_price = Product.get_sale_price([self.product],
-                        self.quantity or 0)[self.product.id]
+                                                         self.quantity or 0)[self.product.id]
 
                 if self.unit_price:
                     self.unit_price = self.unit_price.quantize(
@@ -311,9 +313,8 @@ class SaleLine(metaclass=PoolMeta):
         if (shipment_type == 'out') != (self.quantity >= 0):
             return
 
-
         quantity = (self._get_move_quantity(shipment_type)
-            - self._get_shipped_quantity(shipment_type))
+                    - self._get_shipped_quantity(shipment_type))
 
         quantity = self.unit.round(quantity)
 
@@ -323,8 +324,8 @@ class SaleLine(metaclass=PoolMeta):
         if not self.sale.party.customer_location:
             raise PartyLocationError(
                 gettext('sale.msg_sale_customer_location_required',
-                    sale=self.sale.rec_name,
-                    party=self.sale.party.rec_name))
+                        sale=self.sale.rec_name,
+                        party=self.sale.party.rec_name))
 
         move = Move()
         move.quantity = quantity
@@ -344,3 +345,31 @@ class SaleLine(metaclass=PoolMeta):
         move.origin = self
 
         return move
+
+
+class SaleDate(ModelView):
+    'Confirmacíon Fecha de Venta'
+    __name__ = 'optical_equipment.confirm_sale_date.form'
+
+    sale_date = fields.Date("Fecha Venta", required=True)
+
+
+class ConfirmSaleDate(Wizard):
+    'Confirmacíon Fecha de Venta'
+    __name__ = 'optical_equipment.confirm_sale_date'
+
+    start = StateView('optical_equipment.confirm_sale_date.form',
+                      'optical_equipment.confirm_sale_date_view_form', [
+                          Button('Confirmar', 'confirm_date', 'tryton-ok', default=True),
+                      ])
+
+    confirm_date = StateAction('sale.act_sale_form')
+
+    def default_start(self, fields):
+        if self.record:
+            return {'sale_date': self.record.sale_date}
+
+    def do_confirm_date(self, action):
+        self.record.sale_date = self.start.sale_date
+        self.record.state = 'processing'
+        self.record.save()

sale.xml

@@ -1,5 +1,6 @@
 <?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. -->
+<!--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>
@@ -20,6 +21,23 @@
         <field name="name">Sale Quote</field>
         <field name="sequence_type" ref="sale.sequence_type_sale"/>
     </record>
+    <record model="ir.action.report" id="sale.report_sale">
+        <field name="active" eval="False"/>
+    </record>
+    <record model="ir.model.button" id="report_balance_party_sale">
+	<field name="name">report</field>
+	<field name="string">Estado de Cuenta</field>
+	<field name="model" search="[('model', '=', 'sale.sale')]"/>
+    </record>
+    <record model="ir.ui.view" id="confirm_sale_date_view_form">
+      <field name="model">optical_equipment.confirm_sale_date.form</field>
+      <field name="type">form</field>
+      <field name="name">confirm_sale_date_form</field>
+    </record>
+    <record model="ir.action.wizard" id="wizard_confirm_sale_date">
+      <field name="name">Confirm Sale Date</field>
+      <field name="wiz_name">optical_equipment.confirm_sale_date</field>
+    </record>
     <record model="ir.action.report" id="report_sale">
         <field name="name">Sale Equipments</field>
         <field name="model">sale.sale</field>
@@ -44,4 +62,16 @@
         <field name="model">sale.sale,-1</field>
         <field name="action" ref="report_sale_internal"/>
     </record>
+        <record model="ir.action.report" id="report_payment">
+        <field name="name">Payment</field>
+        <field name="model">account.statement.line</field>
+        <field name="report_name">account.statement.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.statement.line,-1</field>
+        <field name="action" ref="report_payment"/>
+    </record>
 </tryton>

setup.py

@@ -69,20 +69,20 @@ if minor_version % 2:
 
 setup(name=name,
     version=version,
-    description='Modúlo a medida para optica',
+    description='',
     long_description=read('README.rst'),
-    author='OneTeam',
-    author_email='info@onecluster.org',
+    author='Tryton',
+    author_email='bugs@tryton.org',
     url='http://www.tryton.org/',
     keywords='',
-    package_dir={'trytond.modules.smart_vision': '.'},
+    package_dir={'trytond.modules.optical_equipment': '.'},
     packages=(
-        ['trytond.modules.smart_vision']
-        + ['trytond.modules.smart_vision.%s' % p
+        ['trytond.modules.optical_equipment']
+        + ['trytond.modules.optical_equipment.%s' % p
             for p in find_packages()]
         ),
     package_data={
-        'trytond.modules.smart_vision': (info.get('xml', [])
+        'trytond.modules.optical_equipment': (info.get('xml', [])
             + ['tryton.cfg', 'view/*.xml', 'locale/*.po', '*.fodt',
                 'icons/*.svg', 'tests/*.rst']),
         },
@@ -115,6 +115,7 @@ setup(name=name,
         'Natural Language :: Slovenian',
         'Natural Language :: Spanish',
         'Natural Language :: Turkish',
+        'Natural Language :: Ukrainian',
         'Operating System :: OS Independent',
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.7',
@@ -134,6 +135,6 @@ setup(name=name,
     zip_safe=False,
     entry_points="""
     [trytond.modules]
-    smart_vision = trytond.modules.smart_vision
+    optical_equipment = trytond.modules.optical_equipment
     """,  # noqa: E501
     )

tests/test_module.py

@@ -2,9 +2,9 @@
 from trytond.tests.test_tryton import ModuleTestCase
 
 
-class SmartVisionTestCase(ModuleTestCase):
-    "Test Smart Vision module"
-    module = 'smart_vision'
+class OpticalEquipmentTestCase(ModuleTestCase):
+    "Test Optical Equipment module"
+    module = 'optical_equipment'
 
 
 del ModuleTestCase

tox.ini

@@ -4,8 +4,8 @@ envlist = {py37,py38,py39,py310}-{sqlite,postgresql}
 [testenv]
 extras = test
 commands =
-    coverage run --include=.*/smart_vision/* -m unittest discover -s tests
-    coverage report --include=.*/smart_vision/* --omit=*/tests/*
+    coverage run --include=./**/optical_equipment/* -m unittest discover -s tests
+    coverage report --include=./**/optical_equipment/* --omit=*/tests/*
 deps =
     coverage
     postgresql: psycopg2 >= 2.7.0

tryton.cfg

@@ -1,35 +1,30 @@
 [tryton]
-version=6.2
+version=6.4
 depends:
     ir
-    party
     company
-    account_co_co
-    account_co_pyme
-    account_invoice
-    account_stock_continental
+    account_product
+    party
     product
+    product_attribute
+    product_image
     product_measurements
     purchase
     sale
-    stock
-    country
-    sale_history
-    sale_advance_payment
-    sale_amendment
 xml:
-    address.xml
-    party.xml
-    account.xml
-    product.xml
-    equipment.xml
-    contract.xml
-    configuration_equipment.xml
-    sale.xml
-    purchase.xml
-    uom.xml
-    move.xml
-    message.xml
-    diary.xml
-    maintenance.xml
-    shipment.xml
+   company.xml
+   equipment.xml	
+   calibration.xml
+   contract.xml
+   diary.xml
+   agended.xml
+   configuration.xml
+   maintenance.xml
+   move.xml
+   party.xml
+   uom.xml	
+   product.xml
+   purchase.xml
+   sale.xml
+   balance_sale_party.xml
+   shipment.xml

view/address_form.xml

@@ -7,7 +7,7 @@ this repository contains the full copyright notices and license terms. -->
     	<label name="party_related"/>
 	<field name="party_related"/>
     </xpath>
-    <xpath expr="/form/group[@id='checkboxes']/field[@name='delivery']" position="after">
+    <xpath expr="/form/group[@id='checkboxes']/field[@name='active']" position="after">
 	<label name="campus"/>
 	<field name="campus"/>
     </xpath>

view/address_tree.xml

@@ -2,7 +2,7 @@
 <!-- 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">
+    <xpath expr="//field[@name='street']" position="replace">
 	<field name="street" expand="1"/>
     </xpath>
 </data>

view/configuration_form.xml

@@ -4,6 +4,7 @@ this repository contains the full copyright notices and license terms. -->
 
 <form>
     <separator id="sequences" string="Sequences" colspan="4"/>
+    <newline/>
     <label name="equipment_sequence"/>
     <field name="equipment_sequence"/>
     <newline/>
@@ -19,7 +20,9 @@ this repository contains the full copyright notices and license terms. -->
     <label name="sale_quote_number"/>
     <field name="sale_quote_number"/>
     <newline/>
+    
     <separator id="environmental_conditions" string="Environmental Conditions" colspan="4"/>
+    <newline/>
     <label name="temperature_min"/>
     <field name="temperature_min"/>
     <newline/>
@@ -38,4 +41,11 @@ this repository contains the full copyright notices and license terms. -->
     <label name="moisture_uom"/>
     <field name="moisture_uom"/>
     <newline/>
+    
+    <separator id="technician_responsible" string="Technician Responsible" colspan="4"/>
+    <label name="technician_responsible"/>
+    <field name="technician_responsible"/>
+
+    <label name="invima"/>
+    <field name="invima"/>
 </form>

view/confirm_sale_date_form.xml

@@ -1,7 +1,7 @@
 <?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. -->
-<calendar
-    dtstart="date_expected"
-    dtend="date_expected">
-</calendar>
+<form>
+    <label name="sale_date"/>
+    <field name="sale_date"/>
+</form>

view/contract_form.xml

@@ -27,7 +27,10 @@ this repository contains the full copyright notices and license terms. -->
 	    <field name="maintenance_services"/>
 	</page>
 	<page string="Equipments" id="equipments">
-	    <field name="equipments"/>
+	    <field name="current_equipments"/>
+	</page>
+	<page string="History Equipments" id="history_equipments">
+	    <field name="history_equipments"/>
 	</page>
 	<page string="Other Info" id="other">
 	    <label name="company"/>
@@ -39,8 +42,9 @@ this repository contains the full copyright notices and license terms. -->
     <newline/>
     <label name="state"/>
     <field name="state"/>
-    <group col="2" colspan="2" id="button">
+    <group col="6" id="button">
 	<button name="draft"/>
+	<button name="closed"/>
 	<button name="cancelled"/>
 	<button name="running"/>
     </group>

view/contract_tree.xml

@@ -1,9 +0,0 @@
-<?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. -->
-<tree>
-    <field name="number"/>
-    <field name="reference"/>
-    <field name="party"/>
-    <field name="start_date"/>
-    <field name="end_date"/>
-</tree>

view/create_contract_form.xml

@@ -2,16 +2,22 @@
 <!-- This file is part of Tryton.  The COPYRIGHT file at the top level 
 this repository contains the full copyright notices and license terms. -->
 <form>
-    <group id="create_contract">
+    <group id="create_contract" col="2">
  	<label name="party"/>
 	<field name="party"/>
-	<label name="contact"/>
-	<field name="contact"/>
+	<newline/>
 	<label name="invoice_address"/>
 	<field name="invoice_address"/>
+	<newline/>
+	<label name="contact"/>
+	<field name="contact"/>
+	<newline/>
         <label name="start_date"/>
 	<field name="start_date"/>
 	<label name="end_date"/>
         <field name="end_date"/>
+	<newline/>
+	<label name="unit_price"/>
+        <field name="unit_price"/>
     </group>
 </form>

view/create_invoice_contract_form.xml

@@ -1,10 +0,0 @@
-<?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. -->
-<form col="2">
-    <image name="tryton-question" xexpand="0" xfill="0"/>
-    <group col="2" xexpand="1" id="create_date">
-        <label string="Create Subscription Invoices for date" id="create"/>
-        <field name="date"/>
-    </group>
-</form>

view/create_prorogue_form.xml

@@ -1,36 +0,0 @@
-<?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>
-    <group id="create_prorogue">
-	<label name="party"/>
-	<field name="party"/>
-	<label name="contact"/>
-	<field name="contact"/>
-	<newline/>
-	<label name="initial_contract"/>
-	<field name="initial_contract" colspan="3"/>
-	<label name="invoice_address"/>
-	<field name="invoice_address"/>
-	<label name="payment_term"/>
-	<field name="payment_term"/>
-	<newline/>
-	<label name="invoice_recurrence"/>
-        <field name="invoice_recurrence"/>
-	<newline/>
-        <label name="start_date"/>
-	<field name="start_date"/>
-	<label name="end_date"/>
-        <field name="end_date"/>
-	<label name="invoice_start_date"/>
-        <field name="invoice_start_date"/>
-	<label name="service"/>
-	<field name="service"/>
-	<label name="quantity"/>
-        <field name="quantity"/>
-	<label name="unit_price"/>
-        <field name="unit_price"/>
-    </group>
-    <newline/>
-    <field name="equipments"/>
-</form>

view/create_subscription_form.xml

@@ -1,31 +0,0 @@
-<?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>
-    <group id="create_subscription">
- 	<label name="party"/>
-	<field name="party"/>
-	<label name="contact"/>
-	<field name="contact"/>
-	<label name="invoice_address"/>
-	<field name="invoice_address"/>
-	<label name="invoice_recurrence"/>
-        <field name="invoice_recurrence"/>
-        <label name="start_date"/>
-	<field name="start_date"/>
-	<label name="end_date"/>
-        <field name="end_date"/>
-	<label name="invoice_start_date"/>
-        <field name="invoice_start_date"/>
-	<label name="service"/>
-        <field name="service"/>
-	<label name="quantity"/>
-        <field name="quantity"/>
-	<label name="unit_price"/>
-        <field name="unit_price"/>
-	<label name="payment_term"/>
-        <field name="payment_term"/>
-    </group>
-    <newline/>
-    <field name="equipments"/>
-</form>

view/employee_form.xml

@@ -0,0 +1,10 @@
+<?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='supervisor']" position="after">
+	<label name="invima"/>
+	<field name="invima"/>
+	<newline/>
+    </xpath>
+</data>

view/maintenance_calibracion_tree.xml

@@ -0,0 +1,9 @@
+<?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.-->
+<tree>
+    <field name="value_patterns" expand="1"/>
+    <field name="value_equipment" expand="1"/>
+    <field name="mistake" expand="1"/>
+    <field name="mistake_rate" expand="1"/>
+</tree>

view/maintenance_form.xml

@@ -17,7 +17,7 @@
     <label name="service_maintenance"/>
     <field name="service_maintenance"/>
     <label name="equipment_calibrate"/>
-    <field name="equipment_calibrate" invisible="1"/>    
+    <field name="equipment_calibrate"/>    
     <newline/>
     <label name="description_activity"/>
     <field name="description_activity" colspan="3"/>
@@ -73,6 +73,12 @@
 	</page>
     </notebook>
     <newline/>
+    <label name="technician_responsible"/>
+    <field name="technician_responsible"/>
+
+    <label name="invima"/>
+    <field name="invima"/>
+
     <label name="state"/>
     <field name="state"/>
     <group id="button">

view/maintenance_line_form.xml

@@ -14,9 +14,11 @@
     <label name="maintenance_activity"/>
     <field name="maintenance_activity"/>
     <newline/>
+    <label name="quantity"/>
+    <field name="quantity"/>
     <label name="unit"/>
     <field name="unit"/>
     <newline/>
-    <label name="quantity"/>
-    <field name="quantity"/> 
+    <label name="description"/>
+    <field name="description" xexpand="1"/>
 </form>

view/maintenance_service_form.xml

@@ -34,13 +34,16 @@
     <label name="moisture_uom"/>
     <field name="moisture_uom"/>
     <notebook colspan="6">
-	<page string="General" id="general">
-	    <label name="state_agended"/>
-	    <field name="state_agended"/>
+	<page string="General" id="general" col="2">
 	    <label name="technical"/>
 	    <field name="technical"/>
+	    <newline/>
 	    <label name="estimated_agended"/>
-	    <field name="estimated_agended"/>
+	    <field name="estimated_agended" widget="date"/>
+	    <label name="estimated_agended" string="Hora"/>
+	    <field name="estimated_agended" widget="time"/>
+	    <label name="state_agended"/>
+	    <field name="state_agended"/>
 	</page>
 	<page string="Lines Of Mantenaince" id="lines_maintenance">
 	    <field name="lines"/>
@@ -62,7 +65,9 @@
     <label name="state"/>
     <field name="state"/>
     <group id="button">
-      <button name="in_progress"/>
-      <button name="finished"/>
+	<button name="reassing_agended" string="Reassing Agended"/>
+	<button name="assing_agended" string="Assing Agended"/>
+	<button name="in_progress"/>
+	<button name="finished"/>
     </group>
 </form>

view/move_form.xml

@@ -3,6 +3,9 @@
 this repository contains the full copyright notices and license terms. -->
 <data>
     <xpath expr="/form/field[@name='product']" position="after">
+	<newline/>
+	<label name="return_equipment"/>
+	<field name="return_equipment"/>
 	<newline/>
 	<label name="equipment"/>
 	<field name="equipment"/>	

view/move_list_shipment.xml

@@ -1,5 +1,6 @@
 <?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. -->
+<!-- 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='product']" position="after">

view/party_form.xml

@@ -3,11 +3,7 @@
 this repository contains the full copyright notices and license terms. -->
 <data>
     <xpath expr="/form/group[@id='header']" position="inside">
-	<label name="client_type"/>
-	<field name="client_type"/>
-    </xpath>
-    <xpath expr="/form/notebook/page[@id='general']" position="after">
-	<page string="Equipments Party" id="equipments_party">
-	</page>
+	<label name="customer_type"/>
+	<field name="customer_type"/>
     </xpath>
 </data>

view/party_tree.xml

@@ -1,10 +1,9 @@
 <?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. -->
+this repository contains the full copyright notices and license terms. -->
 <data>
     <xpath
-	expr="/tree/field[@name='name']"
-	position="before">
-	 <field name="client_type"/>
+	expr="/tree/field[@name='name']" position="before">
+	<field name="customer_type" optional="1"/>
      </xpath>
 </data>

view/pattern_tree.xml

@@ -1,6 +1,6 @@
 <?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. -->
+this repository contains the full copyright notices and license terms. -->
 <tree>
     <field name="pattern"/>
 </tree>

view/print_balance_sale_party_start_form.xml

@@ -0,0 +1,15 @@
+<?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. -->
+<form>
+    <label name="party"/>
+    <field name="party"/>
+    <label name="company"/>
+    <field name="company"/>
+    <label name="start_period"/>
+    <field name="start_period"/>
+    <label name="end_period"/>
+    <field name="end_period"/>
+    <label name="party_type"/>
+    <field name="party_type"/>
+</form>

view/sale_form.xml

@@ -2,6 +2,13 @@
 <!-- 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='warehouse']" position="after">
+	<label name="payment_term_description"/>
+	<field name="payment_term_description" colspan="5"/>
+	<newline/>
+    </xpath>
+    <xpath expr="//label[@name='payment_term']" position="replace"></xpath>
+    <xpath expr="//field[@name='payment_term']" position="replace"></xpath>
     <xpath expr="//label[@name='number']" position="before">
 	<label name="quote_number"/>
 	<field name="quote_number"/>
@@ -17,4 +24,7 @@
 	<label name="contract_ref"/>
 	<field name="contract_ref"/>
     </xpath>
+    <xpath expr="//group[@id='buttons']/button[@name='draft']" position="after">
+	<button name="report" icon="tryton-print"/>
+    </xpath>
 </data>

view/sale_line_form.xml

@@ -1,22 +0,0 @@
-<?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. -->
-<data>
-    <!--
-    <xpath
-	expr="/form/notebook/page[@id='notes']" position="before">
-	<page string="Equipment" id="equipment">
-	</page>
-    </xpath>
-    <xpath
-        expr="/form/notebook/page[@id='general']/label[@name='product']" position="before">
-        <label name="product_equipment"/>
-        <field name="product_equipment"/>
-    </xpath>
-    <xpath
-        expr="/form/notebook/page[@id='general']/field[@name='product']" position="after">
-	<label name="equipment"/>
-        <field name="equipment"/>
-	<label name="equipment_serial"/>
-        <field name="equipment_serial"/>
-	</xpath>-->
-</data>

view/sale_line_tree.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0"?>
-<data>
-    <xpath expr="//field[@name='summary']" position="replace">
-        <field name="equipment"/>
-    </xpath>
-</data>

view/sale_line_tree_sequence.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0"?>
-<data>
-    <xpath expr="//field[@name='summary']" position="replace">
-        <field name="equipment_serial"/>
-    </xpath>
-</data>

view/sale_tree.xml

@@ -8,4 +8,7 @@
     <xpath expr="//field[@name='number']" position="replace">
 	<field name="number"/>
     </xpath>
+    <xpath expr="//field[@name='untaxed_amount']" position="after">
+	<field name="residual_amount"/>
+    </xpath>
 </data>

view/subscription_form.xml

@@ -1,16 +0,0 @@
-<?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. -->
-<data>
-    <xpath
-	expr="//label[@name='party']" position="before">
-	<label name="type"/>
-	<field name="type"/>
-	<newline/>
-    </xpath>
-    <xpath
-	expr="/form/notebook/page[@id='subscription']" position="after">
-	<page string="Equipments" id="equipments_subscription">
-	    <field name="equipments" colspan="4"/>
-	</page>
-    </xpath>
-</data>

view/template_form.xml

@@ -3,47 +3,60 @@
 this repository contains the full copyright notices and license terms. -->
 <data>
     <xpath expr="/form/notebook/page[@id='general']/group[@id='checkboxes']" position="inside">
+	<newline/>
 	<label name="equipment"/>
 	<field name="equipment"/>
 	<label name="replacement"/>
 	<field name="replacement"/>
+	<newline/>
 	<label name="maintenance_activity"/>
 	<field name="maintenance_activity"/>
     </xpath>
     <xpath expr="/form/notebook/page[@id='general']" position="after">
-	<page string="Features" id="features">
+	<page string="Features" id="features" col="4">
 	    <newline/>
 	    <label name="mark_category"/>
 	    <field name="mark_category"/>
 	    <label name="model_category"/>
 	    <field name="model_category"/>
+	    <newline/>
 	    <label name="reference_category"/>
 	    <field name="reference_category"/>
 	    <label name="equipment_type"/>
 	    <field name="equipment_type"/>
+	    <newline/>
+	    <label name="maintenance_required"/>
+	    <field name="maintenance_required"/>
 	    <label name="calibration"/>
 	    <field name="calibration"/>
+	    <newline/>
 	    <label name="risk"/>
 	    <field name="risk"/>
 	    <label name="use"/>
 	    <field name="use"/>
+	    <newline/>
 	    <label name="biomedical_class"/>
 	    <field name="biomedical_class"/>
 	    <label name="origin_country"/>
 	    <field name="origin_country"/>
+	    <newline/>
 	    <label name="main_tecnology"/>
 	    <field name="main_tecnology"/>
 	    <label name="software_required"/>
 	    <field name="software_required"/>
 	    <label name="software_version"/>
 	    <field name="software_version"/>
+	    <newline/>
 	    <label name="useful_life"/>
-	    <field name="useful_life"/>
+	    <field name="useful_life" xexpand="0"/>
+	    <label name="useful_life" string="Months"/>
+	    <newline/>
 	    <label name="warranty"/>
-	    <field name="warranty"/>
+	    <field name="warranty" xexpand="0"/>
+	    <label name="warranty" string="Months"/>
 	    <newline/>
 	    <label name="observation"/>
-	    <field name="observation"/>
+	    <field name="observation" xexpand="1"/>
 	</page>
     </xpath>
     <xpath expr="/form/notebook/page[@id='features']" position="after">
@@ -55,11 +68,12 @@ 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/>
+	    <label name="use_pattern"/>
+	    <field name="use_pattern"/>
+	    <newline/>
 	    <label name="k_pattern_list"/>
 	    <field name="k_pattern_list"/>
 	    <newline/>
@@ -100,12 +114,12 @@ this repository contains the full copyright notices and license terms. -->
 	</page>
     </xpath>
     <xpath expr="/form/notebook/page[@id='measurements']/label[@name='length']" position="before">
+	<newline/>
 	<separator id="measurements_equipment" string="Measurements of Equipment" colspan="4"/> 
     </xpath>
     <xpath
 	expr="/form/notebook/page[@id='measurements']" position="inside">
 	<separator id="enviromental_working_conditions" string="Enviromental Working Conditions" colspan="4"/> 
-
 	<label name="temperature_min"/>
 	<field name="temperature_min"/>
 	<newline/>
@@ -121,18 +135,15 @@ this repository contains the full copyright notices and license terms. -->
 	<field name="moisture_uom"/>
 
 	<separator id="electrical_conditions" string="Electrical Conditions" colspan="4"/> 
-
 	<label name="electrical_equipment"/>
 	<field name="electrical_equipment"/>
 	<newline/>
 	<label name="frequency"/>
 	<field name="frequency"/>
 	<field name="frequency_uom"/>
-
 	<label name="voltageAC"/>
 	<field name="voltageAC"/>
 	<field name="voltageAC_uom"/>
-
 	<label name="voltageDC"/>
 	<field name="voltageDC"/>
 	<field name="voltageDC_uom"/>	

view/use_pattern_form.xml

@@ -0,0 +1,7 @@
+<?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. -->
+<form>
+    <label name="name_pattern"/>
+    <field name="name_pattern"/>
+</form>

view/use_pattern_tree.xml

@@ -1,5 +1,6 @@
 <?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>
-</data>
+<tree editable="1">
+    <field name="name_pattern" expand="1"/>
+</tree>