From 8ba9033903509ae77738317f6d8a3008cfd5c15f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul=20=28ACSONE=29?= Date: Mon, 9 Dec 2019 10:31:17 +0100 Subject: [PATCH] [REF] contract: rename _get_recurring_next_date as get_next_invoice_date It is easier to understand. Also make it public. --- contract/models/contract_line.py | 12 ++++++------ contract/tests/test_contract.py | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/contract/models/contract_line.py b/contract/models/contract_line.py index cd321c40..e8b79bfa 100644 --- a/contract/models/contract_line.py +++ b/contract/models/contract_line.py @@ -372,7 +372,7 @@ class ContractLine(models.Model): recurring_interval ): # deprecated method for backward compatibility - return self._get_recurring_next_date( + return self.get_next_invoice_date( date_start, recurring_invoicing_type, self._get_default_recurring_invoicing_offset( @@ -384,7 +384,7 @@ class ContractLine(models.Model): ) @api.model - def _get_recurring_next_date( + def get_next_invoice_date( self, next_period_date_start, recurring_invoicing_type, @@ -539,7 +539,7 @@ class ContractLine(models.Model): ) def _onchange_date_start(self): for rec in self.filtered('date_start'): - rec.recurring_next_date = self._get_recurring_next_date( + rec.recurring_next_date = self.get_next_invoice_date( rec.date_start, rec.recurring_invoicing_type, rec.recurring_invoicing_offset, @@ -705,7 +705,7 @@ class ContractLine(models.Model): def _update_recurring_next_date(self): for rec in self: last_date_invoiced = rec.next_period_date_end - recurring_next_date = rec._get_recurring_next_date( + recurring_next_date = rec.get_next_invoice_date( last_date_invoiced + relativedelta(days=1), rec.recurring_invoicing_type, rec.recurring_invoicing_offset, @@ -782,7 +782,7 @@ class ContractLine(models.Model): new_date_end = rec.date_end + delay_delta else: new_date_end = False - new_recurring_next_date = self._get_recurring_next_date( + new_recurring_next_date = self.get_next_invoice_date( new_date_start, rec.recurring_invoicing_type, rec.recurring_invoicing_offset, @@ -847,7 +847,7 @@ class ContractLine(models.Model): ): self.ensure_one() if not recurring_next_date: - recurring_next_date = self._get_recurring_next_date( + recurring_next_date = self.get_next_invoice_date( date_start, self.recurring_invoicing_type, self.recurring_invoicing_offset, diff --git a/contract/tests/test_contract.py b/contract/tests/test_contract.py index e8c49b6f..fd669ea4 100644 --- a/contract/tests/test_contract.py +++ b/contract/tests/test_contract.py @@ -564,7 +564,7 @@ class TestContract(TestContractBase): 0 ) - def test_get_recurring_next_date(self): + def test_get_next_invoice_date(self): """Test different combination to compute recurring_next_date Combination format { @@ -675,7 +675,7 @@ class TestContract(TestContractBase): for recurring_next_date, combination in combinations: self.assertEqual( recurring_next_date, - contract_line_env._get_recurring_next_date( + contract_line_env.get_next_invoice_date( *combination ), error_message(*combination),