add filter contract diferent canceled

This commit is contained in:
Wilson Gomez 2023-10-28 12:50:24 -05:00
parent 7d12a5cfac
commit b859ed8963

View file

@ -25,31 +25,38 @@ _ZERO = Decimal('0.0')
def get_dom_contract_period(start, end): def get_dom_contract_period(start, end):
dom = [ dom = [
'OR', ("state", "!=", "canceled"),
[ [
('start_date', '>=', start), "OR",
('finished_date', '<=', end), [
('finished_date', '!=', None), ("start_date", ">=", start),
], [ ("finished_date", "<=", end),
('start_date', '<=', start), ("finished_date", "!=", None),
('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", "<=", start),
('start_date', '<=', end), ("finished_date", ">=", start),
('finished_date', '=', None), ("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 return dom