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

[IMP] - improve code: unify methods argument _renew_create_line and _renew_extend_line

Browse Source
This commit is contained in:
sbejaoui
2019-12-20 14:14:20 +01:00
parent 61737ea920
commit 74d7f4202f
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
contract/models/contract_line.py
View File

@@ -1156,17 +1156,18 @@ class ContractLine(models.Model):
} }
@api.multi @api.multi
def _get_renewal_dates(self): def _get_renewal_new_date_end(self):
self.ensure_one() self.ensure_one()
date_start = self.date_end + relativedelta(days=1) date_start = self.date_end + relativedelta(days=1)
date_end = self._get_first_date_end( date_end = self._get_first_date_end(
date_start, self.auto_renew_rule_type, self.auto_renew_interval date_start, self.auto_renew_rule_type, self.auto_renew_interval
) )
return date_start, date_end return date_end
@api.multi @api.multi
def _renew_create_line(self, date_start, date_end): def _renew_create_line(self, date_end):
self.ensure_one() self.ensure_one()
date_start = self.date_end + relativedelta(days=1)
is_auto_renew = self.is_auto_renew is_auto_renew = self.is_auto_renew
self.stop(self.date_end, post_message=False) self.stop(self.date_end, post_message=False)
new_line = self.plan_successor( new_line = self.plan_successor(
@@ -1186,9 +1187,10 @@ class ContractLine(models.Model):
res = self.env['contract.line'] res = self.env['contract.line']
for rec in self: for rec in self:
company = rec.contract_id.company_id company = rec.contract_id.company_id
date_start, date_end = rec._get_renewal_dates() date_end = rec._get_renewal_new_date_end()
date_start = rec.date_end + relativedelta(days=1)
if company.create_new_line_at_contract_line_renew: if company.create_new_line_at_contract_line_renew:
new_line = rec._renew_create_line(date_start, date_end) new_line = rec._renew_create_line(date_end)
else: else:
new_line = rec._renew_extend_line(date_end) new_line = rec._renew_extend_line(date_end)
res |= new_line res |= new_line