Kalenis
/
kalenislims
mirror of https://github.com/Kalenis/kalenislims.git
2
1
Fork 1
Code Issues Projects Releases Wiki Activity

lims_industry: results report: avoid choosing annulled samples as precedents

This commit is contained in:
Adrián Bernardi 2021-08-06 17:13:36 -03:00
parent 667e54bde9
commit f30eb72468
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lims_industry/results_report.py
View File

@ -501,15 +501,21 @@ class ResultsReportVersionDetailSample(metaclass=PoolMeta):
'lims.comercial.product', 'Comercial Product'), 'get_notebook_field')
precedent1 = fields.Many2One('lims.notebook', 'Precedent 1',
domain=[If(~Eval('free_precedents'),
('component', '=', Eval('component')), ())],
[('component', '=', Eval('component')),
('fraction.sample.state', '!=', 'annulled')],
[('fraction.sample.state', '!=', 'annulled')])],
depends=['free_precedents', 'component'])
precedent2 = fields.Many2One('lims.notebook', 'Precedent 2',
domain=[If(~Eval('free_precedents'),
('component', '=', Eval('component')), ())],
[('component', '=', Eval('component')),
('fraction.sample.state', '!=', 'annulled')],
[('fraction.sample.state', '!=', 'annulled')])],
depends=['free_precedents', 'component'])
precedent3 = fields.Many2One('lims.notebook', 'Precedent 3',
domain=[If(~Eval('free_precedents'),
('component', '=', Eval('component')), ())],
[('component', '=', Eval('component')),
('fraction.sample.state', '!=', 'annulled')],
[('fraction.sample.state', '!=', 'annulled')])],
depends=['free_precedents', 'component'])
precedent4 = fields.Many2One('lims.notebook', 'Precedent 4',
domain=[('component', '=', Eval('component'))],