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

Merge PR #852 into 14.0

Browse Source 
Signed-off-by max3903
This commit is contained in:
OCA-git-bot
2022-10-24 14:59:46 +00:00
parent b687ed84e7 921bcaf1f2
commit abd34f18f9
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) today = fields.Date.context_today(self)
if state == "upcoming": if state == "upcoming":
return [ return [
"&",
("display_type", "=", False),
"&", "&",
("date_start", ">", today), ("date_start", ">", today),
("is_canceled", "=", False), ("is_canceled", "=", False),
] ]
if state == "in-progress": if state == "in-progress":
return [ return [
"&",
("display_type", "=", False),
"&", "&",
"&", "&",
"&", "&",
@@ -217,10 +221,14 @@ class ContractLine(models.Model):
("is_auto_renew", "=", True), ("is_auto_renew", "=", True),
"&", "&",
("is_auto_renew", "=", False), ("is_auto_renew", "=", False),
"|",
("termination_notice_date", "=", False),
("termination_notice_date", ">", today), ("termination_notice_date", ">", today),
] ]
if state == "to-renew": if state == "to-renew":
return [ return [
"&",
("display_type", "=", False),
"&", "&",
"&", "&",
("is_canceled", "=", False), ("is_canceled", "=", False),
@@ -233,6 +241,8 @@ class ContractLine(models.Model):
] ]
if state == "upcoming-close": if state == "upcoming-close":
return [ return [
"&",
("display_type", "=", False),
"&", "&",
"&", "&",
"&", "&",
@@ -247,6 +257,8 @@ class ContractLine(models.Model):
] ]
if state == "closed": if state == "closed":
return [ return [
"&",
("display_type", "=", False),
"&", "&",
"&", "&",
"&", "&",
@@ -260,7 +272,7 @@ class ContractLine(models.Model):
("manual_renew_needed", "=", False), ("manual_renew_needed", "=", False),
] ]
if state == "canceled": if state == "canceled":
return [("is_canceled", "=", True)] return ["&", ("display_type", "=", False), ("is_canceled", "=", True)]
if not state: if not state:
return [("display_type", "!=", False)] return [("display_type", "!=", False)]