update optical_equipment
This commit is contained in:
parent
4e24263784
commit
0d4621eddf
@ -234,7 +234,8 @@ class Maintenance(Workflow, ModelSQL, ModelView):
|
|||||||
domain=[('party', '=', Eval('propietary'))],
|
domain=[('party', '=', Eval('propietary'))],
|
||||||
depends=['service_maintenance'])
|
depends=['service_maintenance'])
|
||||||
equipment = fields.Many2One('optical_equipment.equipment', "Equipment",
|
equipment = fields.Many2One('optical_equipment.equipment', "Equipment",
|
||||||
domain=[('propietary', '=', Eval('propietary'))],
|
domain=[('propietary', '=', Eval('propietary')),
|
||||||
|
('propietary_address', '=', Eval('propietary_address'))],
|
||||||
states=_states,
|
states=_states,
|
||||||
depends=['service_maintenance'])
|
depends=['service_maintenance'])
|
||||||
#when the maintenance is in agended status
|
#when the maintenance is in agended status
|
||||||
@ -685,9 +686,11 @@ class CalibrationSample(sequence_ordered(), ModelView, ModelSQL):
|
|||||||
|
|
||||||
maintenance = fields.Many2One('optical_equipment.maintenance', 'Maintenance',
|
maintenance = fields.Many2One('optical_equipment.maintenance', 'Maintenance',
|
||||||
ondelete='CASCADE')
|
ondelete='CASCADE')
|
||||||
|
product = fields.Function(fields.Integer("Product ID"), 'get_product_id')
|
||||||
number_sample = fields.Float("Sample #", _digits)
|
number_sample = fields.Float("Sample #", _digits)
|
||||||
value_patterns = fields.Many2One('optical_equipment.product_pattern', "Value Pattern", required=True,
|
value_patterns = fields.Many2One('optical_equipment.product_pattern', "Value Pattern", required=True,
|
||||||
ondelete='RESTRICT')
|
domain=[('product', '=', Eval('product'))],
|
||||||
|
ondelete='RESTRICT')
|
||||||
value_equipment = fields.Float("Value in Equipment", _digits, required=True,
|
value_equipment = fields.Float("Value in Equipment", _digits, required=True,
|
||||||
states={'readonly': Eval('value_patterns') == None})
|
states={'readonly': Eval('value_patterns') == None})
|
||||||
mistake = fields.Float("Mistake", _digits)
|
mistake = fields.Float("Mistake", _digits)
|
||||||
@ -695,7 +698,15 @@ class CalibrationSample(sequence_ordered(), ModelView, ModelSQL):
|
|||||||
states={'readonly': True},
|
states={'readonly': True},
|
||||||
depends=['mistake'])
|
depends=['mistake'])
|
||||||
|
|
||||||
|
|
||||||
|
@fields.depends('maintenance', 'product')
|
||||||
|
def get_product_id(self, name):
|
||||||
|
product = None
|
||||||
|
if self.maintenance and self.maintenance.equipment:
|
||||||
|
product = self.maintenance.equipment.product.id
|
||||||
|
|
||||||
|
return product
|
||||||
|
|
||||||
@fields.depends('value_patterns', 'value_equipment',
|
@fields.depends('value_patterns', 'value_equipment',
|
||||||
'mistake', 'mistake_rate')
|
'mistake', 'mistake_rate')
|
||||||
def on_change_value_equipment(self):
|
def on_change_value_equipment(self):
|
||||||
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user