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

[REF] contract: rename _get_recurring_next_date as get_next_invoice_date

Browse Source 
It is easier to understand. Also make it public.
This commit is contained in:
Stéphane Bidoul (ACSONE)
2019-12-09 10:31:17 +01:00
committed by Francisco Ivan Anton Prieto
parent 809c90c676
commit 8061e3f0cd
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
contract/models/contract_line.py
View File

@@ -372,7 +372,7 @@ class ContractLine(models.Model):
recurring_interval recurring_interval
): ):
# deprecated method for backward compatibility # deprecated method for backward compatibility
return self._get_recurring_next_date( return self.get_next_invoice_date(
date_start, date_start,
recurring_invoicing_type, recurring_invoicing_type,
self._get_default_recurring_invoicing_offset( self._get_default_recurring_invoicing_offset(
@@ -384,7 +384,7 @@ class ContractLine(models.Model):
) )
@api.model @api.model
def _get_recurring_next_date( def get_next_invoice_date(
self, self,
next_period_date_start, next_period_date_start,
recurring_invoicing_type, recurring_invoicing_type,
@@ -539,7 +539,7 @@ class ContractLine(models.Model):
) )
def _onchange_date_start(self): def _onchange_date_start(self):
for rec in self.filtered('date_start'): 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.date_start,
rec.recurring_invoicing_type, rec.recurring_invoicing_type,
rec.recurring_invoicing_offset, rec.recurring_invoicing_offset,
@@ -705,7 +705,7 @@ class ContractLine(models.Model):
def _update_recurring_next_date(self): def _update_recurring_next_date(self):
for rec in self: for rec in self:
last_date_invoiced = rec.next_period_date_end 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), last_date_invoiced + relativedelta(days=1),
rec.recurring_invoicing_type, rec.recurring_invoicing_type,
rec.recurring_invoicing_offset, rec.recurring_invoicing_offset,
@@ -782,7 +782,7 @@ class ContractLine(models.Model):
new_date_end = rec.date_end + delay_delta new_date_end = rec.date_end + delay_delta
else: else:
new_date_end = False 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, new_date_start,
rec.recurring_invoicing_type, rec.recurring_invoicing_type,
rec.recurring_invoicing_offset, rec.recurring_invoicing_offset,
@@ -847,7 +847,7 @@ class ContractLine(models.Model):
): ):
self.ensure_one() self.ensure_one()
if not recurring_next_date: if not recurring_next_date:
recurring_next_date = self._get_recurring_next_date( recurring_next_date = self.get_next_invoice_date(
date_start, date_start,
self.recurring_invoicing_type, self.recurring_invoicing_type,
self.recurring_invoicing_offset, self.recurring_invoicing_offset,

4
contract/tests/test_contract.py
View File

@@ -564,7 +564,7 @@ class TestContract(TestContractBase):
0 0
) )
def test_get_recurring_next_date(self): def test_get_next_invoice_date(self):
"""Test different combination to compute recurring_next_date """Test different combination to compute recurring_next_date
Combination format Combination format
{ {
@@ -675,7 +675,7 @@ class TestContract(TestContractBase):
for recurring_next_date, combination in combinations: for recurring_next_date, combination in combinations:
self.assertEqual( self.assertEqual(
recurring_next_date, recurring_next_date,
contract_line_env._get_recurring_next_date( contract_line_env.get_next_invoice_date(
*combination *combination
), ),
error_message(*combination), error_message(*combination),