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] - add _get_next_invoiced_period method

Browse Source
This commit is contained in:
sbejaoui
2019-03-06 10:19:26 +01:00
committed by Francisco Ivan Anton Prieto
parent 4dd60400fd
commit c7a34a7dc6
1 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
contract/models/contract_line.py
View File

@@ -513,28 +513,42 @@ class AccountAnalyticInvoiceLine(models.Model):
return invoice_line_vals return invoice_line_vals
@api.multi @api.multi
def _get_invoiced_period(self): def _get_next_invoiced_period(
self, last_date_invoiced, recurring_next_date
):
self.ensure_one() self.ensure_one()
first_date_invoiced = ( first_date_invoiced = (
self.last_date_invoiced + relativedelta(days=1) last_date_invoiced + relativedelta(days=1)
if self.last_date_invoiced if last_date_invoiced
else self.date_start else self.date_start
) )
if self.recurring_rule_type == 'monthlylastday': if self.recurring_rule_type == 'monthlylastday':
last_date_invoiced = self.recurring_next_date last_date_invoiced = recurring_next_date
else: else:
if self.recurring_invoicing_type == 'pre-paid': if self.recurring_invoicing_type == 'pre-paid':
last_date_invoiced = ( last_date_invoiced = (
self.recurring_next_date recurring_next_date
+ self.get_relative_delta( + self.get_relative_delta(
self.recurring_rule_type, self.recurring_interval self.recurring_rule_type, self.recurring_interval
) )
- relativedelta(days=1) - relativedelta(days=1)
) )
else: else:
last_date_invoiced = self.recurring_next_date - relativedelta( last_date_invoiced = recurring_next_date - relativedelta(
days=1 days=1
) )
recurring_next_date = recurring_next_date + self.get_relative_delta(
self.recurring_rule_type, self.recurring_interval
)
return first_date_invoiced, last_date_invoiced, recurring_next_date
@api.multi
def _get_invoiced_period(self):
self.ensure_one()
dates = self._get_next_invoiced_period(
self.last_date_invoiced, self.recurring_next_date
)
first_date_invoiced, last_date_invoiced, recurring_next_date = dates
if self.date_end and self.date_end < last_date_invoiced: if self.date_end and self.date_end < last_date_invoiced:
last_date_invoiced = self.date_end last_date_invoiced = self.date_end
return first_date_invoiced, last_date_invoiced return first_date_invoiced, last_date_invoiced