audrius/contract
1
0
Fork 1
mirror of https://github.com/OCA/contract.git synced 2025-02-13 17:57:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

[14.0][FIX] contract: Get correct domain for In Progress contract lines

Browse Source 
As termination_notice_date field is void on not finished contract lines,
domain to search for In Progress ones should take into account void values
This commit is contained in:
Denis Roussel
2022-06-28 19:23:41 +02:00
parent d4350344e6
commit 921bcaf1f2
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
contract/models/contract_line.py
View File

@@ -199,12 +199,16 @@ class ContractLine(models.Model):
today = fields.Date.context_today(self)
if state == "upcoming":
return [
"&",
("display_type", "=", False),
"&",
("date_start", ">", today),
("is_canceled", "=", False),
]
if state == "in-progress":
return [
"&",
("display_type", "=", False),
"&",
"&",
"&",
@@ -217,10 +221,14 @@ class ContractLine(models.Model):
("is_auto_renew", "=", True),
"&",
("is_auto_renew", "=", False),
"|",
("termination_notice_date", "=", False),
("termination_notice_date", ">", today),
]
if state == "to-renew":
return [
"&",
("display_type", "=", False),
"&",
"&",
("is_canceled", "=", False),
@@ -233,6 +241,8 @@ class ContractLine(models.Model):
]
if state == "upcoming-close":
return [
"&",
("display_type", "=", False),
"&",
"&",
"&",
@@ -247,6 +257,8 @@ class ContractLine(models.Model):
]
if state == "closed":
return [
"&",
("display_type", "=", False),
"&",
"&",
"&",
@@ -260,7 +272,7 @@ class ContractLine(models.Model):
("manual_renew_needed", "=", False),
]
if state == "canceled":
return [("is_canceled", "=", True)]
return ["&", ("display_type", "=", False), ("is_canceled", "=", True)]
if not state:
return [("display_type", "!=", False)]