[ADD] - Add more value for auto_renew_rule_type

[REF] - refactoring for compute_first_date_end

[RMV] - remove auto_renew_rule_type option monthlylastday

[IMP] - rename manual_renew_needed label

[IMP] - use get_product_multiline_description_sale to get contract line description
This commit is contained in:
sbejaoui
2019-01-24 12:09:13 +01:00
committed by Francisco Ivan Anton Prieto
parent 62e1a7fd79
commit 0af00f2d6d
5 changed files with 28 additions and 25 deletions

View File

@@ -365,6 +365,18 @@ class AccountAnalyticInvoiceLine(models.Model):
recurring_rule_type, recurring_interval
)
@api.model
def compute_first_date_end(
self, date_start, auto_renew_rule_type, auto_renew_interval
):
return (
date_start
+ self.get_relative_delta(
auto_renew_rule_type, auto_renew_interval
)
- relativedelta(days=1)
)
@api.onchange(
'date_start',
'is_auto_renew',
@@ -376,12 +388,10 @@ class AccountAnalyticInvoiceLine(models.Model):
auto_renew"""
for rec in self.filtered('is_auto_renew'):
if rec.date_start:
rec.date_end = (
self.date_start
+ self.get_relative_delta(
rec.auto_renew_rule_type, rec.auto_renew_interval
)
- relativedelta(days=1)
rec.date_end = self.compute_first_date_end(
rec.date_start,
rec.auto_renew_rule_type,
rec.auto_renew_interval,
)
@api.onchange(
@@ -986,12 +996,8 @@ class AccountAnalyticInvoiceLine(models.Model):
def _get_renewal_dates(self):
self.ensure_one()
date_start = self.date_end + relativedelta(days=1)
date_end = (
date_start
+ self.get_relative_delta(
self.auto_renew_rule_type, self.auto_renew_interval
)
- relativedelta(days=1)
date_end = self.compute_first_date_end(
date_start, self.auto_renew_rule_type, self.auto_renew_interval
)
return date_start, date_end