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

[FIX] - filter by termination_notice for contract line to renew

Browse Source
This commit is contained in:
sbejaoui
2019-01-04 14:16:08 +01:00
committed by Francisco Ivan Anton Prieto
parent 5ffb2cffd8
commit 24027f0918
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
contract/models/contract_line.py
View File

@@ -843,12 +843,8 @@ class AccountAnalyticInvoiceLine(models.Model):
@api.model @api.model
def _contract_line_to_renew_domain(self): def _contract_line_to_renew_domain(self):
date_ref = fields.Date.context_today(self) + self.get_relative_delta(
self.termination_notice_rule_type, self.termination_notice_interval
)
return [ return [
('is_auto_renew', '=', True), ('is_auto_renew', '=', True),
('date_end', '<=', date_ref),
('is_canceled', '=', False), ('is_canceled', '=', False),
('contract_id.recurring_invoices', '=', True), ('contract_id.recurring_invoices', '=', True),
] ]
@@ -856,7 +852,16 @@ class AccountAnalyticInvoiceLine(models.Model):
@api.model @api.model
def cron_renew_contract_line(self): def cron_renew_contract_line(self):
domain = self._contract_line_to_renew_domain() domain = self._contract_line_to_renew_domain()
to_renew = self.search(domain) to_renew = self
for contract_line in self.search(domain):
date_ref = fields.Date.context_today(
self
) + self.get_relative_delta(
contract_line.termination_notice_rule_type,
contract_line.termination_notice_interval,
)
if contract_line.date_end <= date_ref:
to_renew |= contract_line
to_renew.renew() to_renew.renew()
@api.model @api.model

5
contract/tests/test_contract.py
View File

@@ -1256,7 +1256,10 @@ class TestContract(TestContractBase):
{'date_end': fields.Date.today() - relativedelta(months=2)} {'date_end': fields.Date.today() - relativedelta(months=2)}
) )
self.acct_line.copy( self.acct_line.copy(
{'date_end': fields.Date.today() + relativedelta(months=2)} {
'date_end': fields.Date.today() + relativedelta(months=2),
'is_auto_renew': False,
}
) )
to_renew = self.acct_line.search( to_renew = self.acct_line.search(
self.acct_line._contract_line_to_renew_domain() self.acct_line._contract_line_to_renew_domain()