NaNtic
/
trytond-quality_control
mirror of https://github.com/NaN-tic/trytond-quality_control.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use digits mixin 

issue10677
This commit is contained in:
Raimon Esteve 2021-08-26 11:13:31 +02:00
parent 5e223811c5
commit acd4275d97
3 changed files with 11 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
locale/ca.po
View File

@ -398,10 +398,6 @@ msgctxt "field:quality.quantitative.template.line,unit:"
msgid "Unit"
msgstr "Unitat"
msgctxt "field:quality.quantitative.template.line,unit_digits:"
msgid "Unit Digits"
msgstr "Dígits de la unitat"
msgctxt "field:quality.quantitative.template.line,write_date:"
msgid "Write Date"
msgstr "Data modificació"
@ -478,10 +474,6 @@ msgctxt "field:quality.quantitative.test.line,unit:"
msgid "Unit"
msgstr "Unitat"
msgctxt "field:quality.quantitative.test.line,unit_digits:"
msgid "Unit Digits"
msgstr "Dígits de la unitat"
msgctxt "field:quality.quantitative.test.line,unit_range:"
msgid "Unit Range"
msgstr "Unitat del rang"
@ -630,10 +622,6 @@ msgctxt "field:quality.template.line,unit:"
msgid "Unit"
msgstr "Unitat"
msgctxt "field:quality.template.line,unit_digits:"
msgid "Unit Digits"
msgstr "Dígits de la unitat"
msgctxt "field:quality.template.line,valid_value:"
msgid "Valid Value"
msgstr "Valor Vàlid"
@ -834,10 +822,6 @@ msgctxt "field:quality.test.line,unit:"
msgid "Unit"
msgstr "Unitat"
msgctxt "field:quality.test.line,unit_digits:"
msgid "Unit Digits"
msgstr "Dígits de la unitat"
msgctxt "field:quality.test.line,value:"
msgid "Value"
msgstr "Valor"

16
locale/es.po
View File

@ -398,10 +398,6 @@ msgctxt "field:quality.quantitative.template.line,unit:"
msgid "Unit"
msgstr "Unidad"
msgctxt "field:quality.quantitative.template.line,unit_digits:"
msgid "Unit Digits"
msgstr "Decimales de la unidad"
msgctxt "field:quality.quantitative.template.line,write_date:"
msgid "Write Date"
msgstr "Fecha modificación"
@ -478,10 +474,6 @@ msgctxt "field:quality.quantitative.test.line,unit:"
msgid "Unit"
msgstr "Unidad"
msgctxt "field:quality.quantitative.test.line,unit_digits:"
msgid "Unit Digits"
msgstr "Decimales de la unidad"
msgctxt "field:quality.quantitative.test.line,unit_range:"
msgid "Unit Range"
msgstr "Unidad del rango"
@ -630,10 +622,6 @@ msgctxt "field:quality.template.line,unit:"
msgid "Unit"
msgstr "Unidad"
msgctxt "field:quality.template.line,unit_digits:"
msgid "Unit Digits"
msgstr "Dígitos unidad"
msgctxt "field:quality.template.line,valid_value:"
msgid "Valid Value"
msgstr "Valor Válido"
@ -834,10 +822,6 @@ msgctxt "field:quality.test.line,unit:"
msgid "Unit"
msgstr "Unidad"
msgctxt "field:quality.test.line,unit_digits:"
msgid "Unit Digits"
msgstr "Dígitos unidad"
msgctxt "field:quality.test.line,value:"
msgid "Value"
msgstr "Valor"

60
quality.py
View File

@ -181,24 +181,16 @@ class QuantitativeTemplateLine(sequence_ordered(), ModelSQL, ModelView):
], depends=['proof'])
internal_description = fields.Text('Internal Description')
external_description = fields.Text('External Description')
min_value = fields.Float('Min Value', digits=(16, Eval('unit_digits', 2)),
required=True, depends=['unit_digits'])
max_value = fields.Float('Max Value', digits=(16, Eval('unit_digits', 2)),
required=True, depends=['unit_digits'])
min_value = fields.Float('Min Value', digits='unit',
required=True)
max_value = fields.Float('Max Value', digits='unit',
required=True)
unit = fields.Many2One('product.uom', 'Unit', required=True)
unit_digits = fields.Function(fields.Integer('Unit Digits'),
'on_change_with_unit_digits')
@staticmethod
def default_active():
return True
@fields.depends('unit')
def on_change_with_unit_digits(self, name=None):
if not self.unit:
return 2
return self.unit.digits
@fields.depends('proof')
def on_change_proof(self):
if not self.proof:
@ -225,13 +217,9 @@ class TemplateLine(UnionMixin, sequence_ordered(), ModelSQL, ModelView):
required=True, domain=[
('method', '=', Eval('method')),
], depends=['method'])
min_value = fields.Float('Min Value', digits=(16, Eval('unit_digits', 2)),
depends=['unit_digits'])
max_value = fields.Float('Max Value', digits=(16, Eval('unit_digits', 2)),
depends=['unit_digits'])
min_value = fields.Float('Min Value', digits='unit')
max_value = fields.Float('Max Value', digits='unit')
unit = fields.Many2One('product.uom', 'Unit')
unit_digits = fields.Function(fields.Integer('Unit Digits'),
'on_change_with_unit_digits')
@staticmethod
def union_models():
@ -247,12 +235,6 @@ class TemplateLine(UnionMixin, sequence_ordered(), ModelSQL, ModelView):
])
return [(m.model, m.name) for m in models]
@fields.depends('unit')
def on_change_with_unit_digits(self, name=None):
if not self.unit:
return 2
return self.unit.digits
@classmethod
def union_column(cls, name, field, table, Model):
if name == 'type':
@ -602,8 +584,8 @@ class QuantitativeTestLine(sequence_ordered(), ModelSQL, ModelView):
'readonly': Bool(Eval('template_line', 0)),
},
depends=['unit_range_digits', 'template_line'])
value = fields.Float('Value', digits=(16, Eval('unit_digits', 2)),
depends=['unit_digits', 'test_state'])
value = fields.Float('Value', digits='unit',
depends=['test_state'])
unit = fields.Many2One('product.uom', 'Unit',
domain=[
If(Bool(Eval('unit_range_category')),
@ -614,8 +596,6 @@ class QuantitativeTestLine(sequence_ordered(), ModelSQL, ModelView):
'required': Bool(Eval('value')),
},
depends=['unit_range_category', 'value'])
unit_digits = fields.Function(fields.Integer('Unit Digits'),
'on_change_with_unit_digits')
success = fields.Function(fields.Boolean('Success'), 'get_success')
@classmethod
@ -636,12 +616,6 @@ class QuantitativeTestLine(sequence_ordered(), ModelSQL, ModelView):
if self.unit_range:
return self.unit_range.category.id
@fields.depends('unit')
def on_change_with_unit_digits(self, name=None):
if not self.unit:
return 2
return self.unit.digits
@classmethod
def get_success(self, lines, name):
res = {}
@ -696,17 +670,11 @@ class TestLine(UnionMixin, sequence_ordered(), ModelSQL, ModelView):
domain=[
('method', '=', Eval('method')),
], depends=['method'])
quantitative_value = fields.Float('Quantitative Value',
digits=(16, Eval('unit_digits', 2)),
depends=['unit_digits'])
quantitative_value = fields.Float('Quantitative Value', digits='unit')
value = fields.Function(fields.Char('Value'), 'get_value')
min_value = fields.Float('Min Value', digits=(16, Eval('unit_digits', 2)),
depends=['unit_digits'])
max_value = fields.Float('Max Value', digits=(16, Eval('unit_digits', 2)),
depends=['unit_digits'])
min_value = fields.Float('Min Value', digits='unit')
max_value = fields.Float('Max Value', digits='unit')
unit = fields.Many2One('product.uom', 'Unit')
unit_digits = fields.Function(fields.Integer('Unit Digits'),
'on_change_with_unit_digits')
success = fields.Function(fields.Boolean('Success'), 'get_success')
@staticmethod
@ -738,12 +706,6 @@ class TestLine(UnionMixin, sequence_ordered(), ModelSQL, ModelView):
return value
return super(TestLine, cls).union_column(name, field, table, Model)
@fields.depends('unit')
def on_change_with_unit_digits(self, name=None):
if not self.unit:
return 2
return self.unit.digits
def get_value(self, name):
value = ''
if self.qualitative_value: