From 11c93fc6b61efa24a48ce2a27f217b70dd09e6ef Mon Sep 17 00:00:00 2001 From: raskolnikov Date: Fri, 27 Jan 2023 15:09:16 -0500 Subject: [PATCH] update optical_equipment --- product.py | 20 +++++++++++++++++--- sale.py | 6 +----- view/maintenance_form.xml | 2 +- view/maintenance_sample_form.xml | 2 +- 4 files changed, 20 insertions(+), 10 deletions(-) diff --git a/product.py b/product.py index 787b5de..330f39a 100644 --- a/product.py +++ b/product.py @@ -227,11 +227,23 @@ class Template(metaclass=PoolMeta): @fields.depends('temperature') def default_temperature_uom(self): pool = Pool() + measurement = None Measurements = pool.get('product.uom') - measurement = Measurements.search(['name', '=', 'Celsius'])[0].id + if Measurements.search(['name', '=', 'Celsius']) != []: + measurement = Measurements.search(['name', '=', 'Celsius'])[0].id return measurement + @staticmethod + def default_frequency_uom(): + pool = Pool() + measurement = None + Measurements = pool.get('product.uom') + if Measurements.search(['name', '=', 'Hertz']) != []: + measurement = Measurements.search(['name', '=', 'Hertz'])[0].id + + return measurement + @staticmethod def default_frequency(): return 0 @@ -253,10 +265,12 @@ class Template(metaclass=PoolMeta): return 0 @staticmethod - def default_moisture_uom(): + def default_voltageAC_uom(): pool = Pool() + measurement = None Measurements = pool.get('product.uom') - measurement = Measurements.search(['name', '=', 'Relative Humedity'])[0].id + if Measurements.search(['name', '=', 'Volt']) != []: + measurement = Measurements.search(['name', '=', 'Volt'])[0].id return measurement diff --git a/sale.py b/sale.py index 808a382..e3b7ee6 100644 --- a/sale.py +++ b/sale.py @@ -184,11 +184,7 @@ class SaleLine(metaclass=PoolMeta): If(Eval('_parent_sale.sale_type') == 'maintenance', [('type', '=', 'service'), ('maintenance_activity', '=', True)], [])) - cls.product.domain.append(If(Eval('_parent_sale.sale_type') == 'equipments', - [('equipment', '=', True)], [])) - cls.product.domain.append(If(Eval('_parent_sale.sale_type') == 'replaces', - [('replacement', '=', True)], [])) - cls.quantity.states['readonly'] = Eval('_parent_sale.sale_type') == 'equipments' + def on_change_with_unit_digits(self, name=None): if self.unit: diff --git a/view/maintenance_form.xml b/view/maintenance_form.xml index 632d7e4..6148d94 100644 --- a/view/maintenance_form.xml +++ b/view/maintenance_form.xml @@ -16,7 +16,7 @@