From b859ed8963bbee0b4723663ba3114ca821ef223a Mon Sep 17 00:00:00 2001 From: Wilson Gomez Date: Sat, 28 Oct 2023 12:50:24 -0500 Subject: [PATCH] add filter contract diferent canceled --- payroll.py | 55 ++++++++++++++++++++++++++++++------------------------ 1 file changed, 31 insertions(+), 24 deletions(-) diff --git a/payroll.py b/payroll.py index 223f755..ecd2cc1 100644 --- a/payroll.py +++ b/payroll.py @@ -25,31 +25,38 @@ _ZERO = Decimal('0.0') def get_dom_contract_period(start, end): dom = [ - 'OR', + ("state", "!=", "canceled"), [ - ('start_date', '>=', start), - ('finished_date', '<=', end), - ('finished_date', '!=', None), - ], [ - ('start_date', '<=', start), - ('finished_date', '>=', start), - ('finished_date', '!=', None), - ], [ - ('start_date', '<=', end), - ('finished_date', '>=', end), - ('finished_date', '!=', None), - ], [ - ('start_date', '<=', start), - ('finished_date', '>=', end), - ('finished_date', '!=', None), - ], [ - ('start_date', '<=', start), - ('finished_date', '=', None), - ], - [ - ('start_date', '>=', start), - ('start_date', '<=', end), - ('finished_date', '=', None), + "OR", + [ + ("start_date", ">=", start), + ("finished_date", "<=", end), + ("finished_date", "!=", None), + ], + [ + ("start_date", "<=", start), + ("finished_date", ">=", start), + ("finished_date", "!=", None), + ], + [ + ("start_date", "<=", end), + ("finished_date", ">=", end), + ("finished_date", "!=", None), + ], + [ + ("start_date", "<=", start), + ("finished_date", ">=", end), + ("finished_date", "!=", None), + ], + [ + ("start_date", "<=", start), + ("finished_date", "=", None), + ], + [ + ("start_date", ">=", start), + ("start_date", "<=", end), + ("finished_date", "=", None), + ], ], ] return dom