diff --git a/contract.py b/contract.py index 0553ffd..44ce3f1 100644 --- a/contract.py +++ b/contract.py @@ -100,9 +100,9 @@ class Contract(Workflow, ModelSQL, ModelView): config = Config(4) if config.contract_sequence != None: - if not contracts.number: + if not contracts[0].number: try: - contracts.number = config.contract_sequence.get() + contracts[0].number = config.contract_sequence.get() cls.save(contracts) except UserError: raise UserError(str('Validation Error')) diff --git a/contract.xml b/contract.xml index 59f5a10..6dbac98 100644 --- a/contract.xml +++ b/contract.xml @@ -120,6 +120,18 @@ Contract + + Contract + optical_equipment.contract + optical_equipment.contract + report/contracts.fodt + + + + form_print + optical_equipment.contract,-1 + + Create Equipments + + Purchase + purchase.purchase + purchase.purchase + report/Compras.odt + + + + form_print + purchase.purchase,-1 + + diff --git a/report/cv.fods b/report/cv.fods index 8adc2dc..883ebb2 100644 --- a/report/cv.fods +++ b/report/cv.fods @@ -1,29 +1,25 @@ - 2022-08-10T10:58:31.2601834272022-08-19T13:56:37.618632316PT6H17M10S80LibreOffice/7.2.7.2$Linux_X86_64 LibreOffice_project/20$Build-2 + 2022-08-10T10:58:31.2601834272022-10-11T13:11:54.268555987PT6H37M58S87LibreOffice/7.3.6.2$Linux_X86_64 LibreOffice_project/30$Build-2 199 199 23677 - 28792 + 28722 view1 - 1 - 26 - 0 - 0 - 0 - 0 + 5 + 2 2 0 0 0 - 19 + 0 0 180 180 @@ -131,12 +127,14 @@ - + + - - + + + @@ -154,210 +152,210 @@ - + $ - + -$ - + $ - - + - - - + + + - + - + ( ) - + - + - + ( ) - + - + - + ( ) - + - + - + ( ) - + - + - - - + - - + - - + - + ( ) - + - + - + ( ) - + - + - + ( ) - + - + - + ( ) - + - + - + ( ) - + - - + - - - + + + - + - + ( ) - + - - + - - - + + + - + - + @@ -365,7 +363,7 @@ ) - + @@ -373,50 +371,50 @@ - + - - - + + + - + : - + : : - + : - + - + $ - + $ - + - + @@ -424,93 +422,93 @@ ) - + - - + - - - + + + - + - + - - + - + - + - - + - + - + - - + - + ( ) - + - + ( ) - + - + $ - + - $ - + - + $ - + ( $ ) - + - + % - + @@ -614,13 +612,13 @@ - + - + - + @@ -631,9 +629,6 @@ - - - $ @@ -656,7 +651,7 @@ - + @@ -673,30 +668,30 @@ - + - + - + - + - + - + @@ -711,7 +706,7 @@ - + @@ -729,31 +724,31 @@ - + - + - + - + - + - + - + @@ -766,58 +761,58 @@ - + - + - + - + - + - + - + - + - + - + - + - + @@ -827,17 +822,22 @@ - + - + - + + + + + + @@ -845,129 +845,125 @@ - - - - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - + - - - - - - + - + - + + + + + + + + + + + - + - + @@ -977,87 +973,87 @@ - + - + - + - + - + - + - + + + + + + - + - + - - - - - - + - + - + - + - + - + - + - + @@ -1072,19 +1068,6 @@ - - - - - - - - - - - - - @@ -1105,16 +1088,19 @@ - + - + - + - + + + + @@ -1130,23 +1116,6 @@ - - - - ???(???) - - - 00/00/0000, 00:00:00 - - - - - - Página 1/ 99 - - - - @@ -1717,38 +1686,46 @@ - + - + Smart Vision S.A.SNIT 901091201DIRECCIÓN Carrera 16 # 52-85 piso 4 TELÉFONOS +57 320 8197664 E – MAIL smartvisioncolombia@gmail.com + - + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + HOJA DE VIDA DISPOSITIVOS BIOMEDICOS @@ -1765,7 +1742,7 @@ - + Código Equipo @@ -1777,9 +1754,10 @@ Salida de Equipo - - - + equipment.shipment_destination.number if equipment.shipment_destination else "" + + + @@ -1789,7 +1767,7 @@ - + INFORMACION DEL PROPIETARIO @@ -1798,7 +1776,7 @@ - + Nombre / Razón Social: @@ -1809,12 +1787,12 @@ - + Tipo Documento: - equipment.propietary.tax_identifier.type + "NIT" if equipment.propietary.tax_identifier.type=="31" else "CC" @@ -1826,22 +1804,22 @@ - + Ciudad: - equipment.propietary_address.subdivision_municipality.name + equipment.propietary_address.subdivision_municipality.name Localidad: - equipment.propietary_address.subdivision_localities.name + equipment.propietary_address.subdivision_localities.name if equipment.propietary_address.subdivision_localities else "" - + @@ -1850,7 +1828,7 @@ Dirección: - equipment.propietary_address.street + equipment.propietary_address.street @@ -1864,13 +1842,13 @@ equipment.propietary.phone - + - + choose test="" @@ -1881,10 +1859,10 @@ - + - + when test="equipment.propietary_address.party_related" @@ -1895,25 +1873,25 @@ - + - + Tercero Relacionado: equipment.propietary_address.party_related.name - - + + - + /when @@ -1961,7 +1939,7 @@ equipment.product.name - + @@ -1972,49 +1950,49 @@ Restaurado: - "SI" if equipment.refurbish else "NO" + "SI" if equipment.refurbish else "NO" - + - + - + Marca: equipment.mark_category.name - - + + Modelo: - equipment.model_category.name + equipment.model_category.name - + - + Referencia: - equipment.reference_category.name + equipment.reference_category.name - + País Origen: - equipment.origin_country.name + equipment.origin_country.name - + @@ -2023,16 +2001,16 @@ Registro Invima - equipment.health_register + equipment.health_register - + Software Version - equipment.software_version if equipment.software_version != "" else "No Aplica" + equipment.software_version if equipment.software_version != "" else "No Aplica" - - + + @@ -2042,15 +2020,15 @@ equipment.serial - + - + Clase de Riesgo: - equipment.product.risk + equipment.product.risk - + @@ -2059,14 +2037,14 @@ Tipo: - equipment.equipment_type + equipment.equipment_type - + Clase Biomedica: - equipment.biomedical_class + equipment.biomedical_class @@ -2078,22 +2056,22 @@ Uso: - equipment.use + equipment.use - + - + Garantía: - equipment.warranty Meses + equipment.warranty Meses @@ -2101,7 +2079,7 @@ Vida útil: - equipment.useful_life Meses + equipment.useful_life Meses @@ -2110,8 +2088,8 @@ - - + + @@ -2139,26 +2117,26 @@ Peso - str(equipment.product.weight) + " "+ equipment.product.weight_uom.symbol + str(equipment.product.weight) + " "+ equipment.product.weight_uom.symbol if equipment.product.weight else "" - + Medidas - "Longitud:" +str(equipment.product.length) + " "+ equipment.product.length_uom.symbol+" Altura: "+str(equipment.product.height) + " "+ equipment.product.height_uom.symbol + " Ancho: "+str(equipment.product.width) + " "+ equipment.product.width_uom.symbol + "Longitud:" +str(equipment.product.length) + " "+ equipment.product.length_uom.symbol+" Altura: "+str(equipment.product.height) + " "+ equipment.product.height_uom.symbol + " Ancho: "+str(equipment.product.width) + " "+ equipment.product.width_uom.symbol if equipment.product.width else "" - + Caracteristica Electricas @@ -2167,26 +2145,26 @@ Voltaje (VAC) - str(equipment.product.voltageAC) + " "+ equipment.product.voltageAC_uom.symbol + str(equipment.product.voltageAC) + " "+ equipment.product.voltageAC_uom.symbol if equipment.product.voltageAC else "" - + Voltaje (VDC) - str(equipment.product.voltageDC) + " "+ equipment.product.voltageDC_uom.symbol + str(equipment.product.voltageDC) + " "+ equipment.product.voltageDC_uom.symbol if equipment.product.voltageDC else "" - + Condiciones Ambientales @@ -2195,46 +2173,46 @@ Temperatura Min Uso - str(equipment.product.temperature_min) + " "+ equipment.product.temperature_uom.symbol + str(equipment.product.temperature_min) + " "+ equipment.product.temperature_uom.symbol if equipment.product.temperature_min else "" - + Temperatura Max Uso - str(equipment.product.temperature_max) + " "+ equipment.product.temperature_uom.symbol + str(equipment.product.temperature_max) + " "+ equipment.product.temperature_uom.symbol if equipment.product.temperature_max else "" - + Humedad Min Uso - str(equipment.product.moisture_min) + " "+ equipment.product.moisture_uom.symbol + str(equipment.product.moisture_min) + " "+ equipment.product.moisture_uom.symbol if equipment.product.moisture_min else "" - + Humedad Max Uso - str(equipment.product.moisture_max) + " "+ equipment.product.moisture_uom.symbol + str(equipment.product.moisture_max) + " "+ equipment.product.moisture_uom.symbol if equipment.product.moisture_max else "" @@ -2254,15 +2232,15 @@ - + Requiere Calibración: - "SI" if equipment.calibration else "NO" + "SI" if equipment.calibration else "NO" - + @@ -2273,11 +2251,11 @@ Frecuencia de Mantenimiento Preventivo: - equipment.maintenance_frequency Meses + equipment.maintenance_frequency Meses - + - + @@ -2302,10 +2280,10 @@ - + - - + + @@ -2407,7 +2385,7 @@ - + /for