From f30eb72468cb31b984123f7f35588bda026bac07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Bernardi?= Date: Fri, 6 Aug 2021 17:13:36 -0300 Subject: [PATCH] lims_industry: results report: avoid choosing annulled samples as precedents --- lims_industry/results_report.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/lims_industry/results_report.py b/lims_industry/results_report.py index 94a7ac0e..ed5b55ae 100644 --- a/lims_industry/results_report.py +++ b/lims_industry/results_report.py @@ -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'))],