diff --git a/locale/es.po b/locale/es.po index c73efb0..3379d77 100644 --- a/locale/es.po +++ b/locale/es.po @@ -16,7 +16,7 @@ msgstr "Medidas del Equipo" msgctxt "view:product.template:" msgid "Enviromental Conditions" -msgstr "Condciones Ambientales" +msgstr "Condciones Ambientales de Trabajo" msgctxt "view:product.template:" msgid "Electrical Conditions" @@ -82,13 +82,21 @@ msgctxt "field:product.template,origin_country:" msgid "Origin Country" msgstr "País de origen" -msgctxt "field:product.template,temperature:" -msgid "Temperature" -msgstr "Temperatura" +msgctxt "field:product.template,temperature_min:" +msgid "Temp Min" +msgstr "Temp Min" -msgctxt "field:product.template,moisture:" -msgid "Moisture" -msgstr "Humedad" +msgctxt "field:product.template,temperature_max:" +msgid "Temp Max" +msgstr "Temp Max" + +msgctxt "field:product.template,moisture_min:" +msgid "Moisture Min" +msgstr "Humedad Min" + +msgctxt "field:product.template,moisture_max:" +msgid "Moisture Max" +msgstr "Humedad Max" msgctxt "field:product.template,frequency:" msgid "Frequency" @@ -112,12 +120,16 @@ msgstr "Garantía" msgctxt "field:product.template,uncertainy_pattern:" msgid "Uncertainy Pattern" -msgstr "Patrón de Incertidumbre" +msgstr "Incertidumbre Patrón" msgctxt "field:product.template,k_pattern:" msgid "K Pattern" msgstr "Patrón K" +msgctxt "field:product.template,resolution_type:" +msgid "Resolution Type" +msgstr "Tipo de Resolución" + msgctxt "field:product.template,d_resolution:" msgid "Resolution d" msgstr "Resolución (d)" diff --git a/product.py b/product.py index 3fd04f5..53d94d2 100644 --- a/product.py +++ b/product.py @@ -7,7 +7,7 @@ from trytond.pyson import Bool, If, Eval, Id from trytond.exceptions import UserError -_RISK = [('', ""), +_RISK = [('N/A', "No aplíca"), ('uno', 'I'), ('dosA', 'IIA'), ('dosB', 'IIB')] @@ -18,7 +18,7 @@ _USE = [('', ""), ('apoyo', 'Apoyo')] _BIOMEDICAL_CLASS = [ - ('', ""), + ('N/A', "No aplíca"), ('diagnostico', 'Diagnóstico'), ('rehabilitación', 'Rehabilitación')] @@ -96,17 +96,18 @@ class Template(metaclass=PoolMeta): ) origin_country = fields.Many2One('country.country',"Origin Country") refurbish = fields.Boolean('Refurbish') + software_version = fields.Char("Software version") #These are measurements required for the equipments, are in this place # for manage of class 'product.template' - temperature_init = fields.Float("Ti") - temperature_end = fields.Float("Tf") + 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"))], - states={'invisible' : If(Eval('temperature_init') == None, True)}, - depends=['itemperature_init'] + states={'invisible' : If(Eval('temperature_min') == None, True)}, + depends=['itemperature_min'] ) frequency = fields.Float("Frequency") frequency_uom = fields.Many2One('product.uom', "Frequency UOM", @@ -114,12 +115,12 @@ class Template(metaclass=PoolMeta): states={'invisible' : If(Eval('frequency') == None, True)}, depends=['frequency'] ) - moisture_init = fields.Float("Mi") - moisture_end = fields.Float("Mf") + 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_init') == None, True)}, - depends=['moisture_init'] + states={'invisible' : If(Eval('moisture_min') == None, True)}, + depends=['moisture_min'] ) electrical_equipment = fields.Boolean("Electrical Equipment") frequency = fields.Float("Frequency", @@ -148,12 +149,22 @@ class Template(metaclass=PoolMeta): #### calibration parameters - uncertainy_pattern = fields.Char("Uncertainy Pattern", + uncertainy_pattern = fields.Float("Uncertainy Pattern", help="Agregar valores separados por ',' Ej:-5,+5,-10,+10") k_pattern = fields.Char("K Pattern", help="Agregar valores separados por ',' Ej:-5,+5,-10,+10") - d_resolution = fields.Integer("Resolution d") - analog_resolution = fields.Integer("Analog resolution") + + resolution_type = fields.Selection([('',""), + ('analoga', "Analoga"), + ('digital', "Digital")], "Resolution Type", required=True, + states={'required': Eval('calibration', False)}, + depends=['calibration']) + d_resolution = fields.Float("Resolution d", + states={'invisible': If(Eval('resolution_type') != 'digital', True)}, + depends=['resolution_type']) + analog_resolution = fields.Float("Analog resolution", + states={'invisible': If(Eval('resolution_type') != 'analoga', True)}, + depends=['resolution_type']) Usubi = fields.Integer("Usub i") @classmethod diff --git a/purchase.py b/purchase.py index a9a33eb..b28ef17 100644 --- a/purchase.py +++ b/purchase.py @@ -84,6 +84,7 @@ class Line(metaclass=PoolMeta): states={'readonly': True}) software_version = fields.Char("Software version") health_register = fields.Char("Registro Medico") + @classmethod def default_address_equipment(cls): diff --git a/view/template_form.xml b/view/template_form.xml index 8b8294c..72e22a8 100644 --- a/view/template_form.xml +++ b/view/template_form.xml @@ -33,6 +33,8 @@ this repository contains the full copyright notices and license terms. -->