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

[FIX] - contract recurring_next_date ignore canceled lines

Browse Source 
[FIX] - fix _get_invoiced_period if recurring_next_date manually updated
This commit is contained in:
sbejaoui
2018-12-13 16:09:50 +01:00
parent 6b96172fb9
commit d1d6500452
3 changed files with 66 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
contract/models/contract.py
View File

@@ -56,11 +56,14 @@ class AccountAnalyticAccount(models.Model):
if date_end and all(date_end):
contract.date_end = max(date_end)
@api.depends('recurring_invoice_line_ids.recurring_next_date')
@api.depends(
'recurring_invoice_line_ids.recurring_next_date',
'recurring_invoice_line_ids.is_canceled',
)
def _compute_recurring_next_date(self):
for contract in self:
recurring_next_date = contract.recurring_invoice_line_ids.filtered(
'recurring_next_date'
lambda l: l.recurring_next_date and not l.is_canceled
).mapped('recurring_next_date')
if recurring_next_date:
contract.recurring_next_date = min(recurring_next_date)

23
contract/models/contract_line.py
View File

@@ -29,7 +29,7 @@ class AccountAnalyticInvoiceLine(models.Model):
date_end = fields.Date(string='Date End', index=True)
recurring_next_date = fields.Date(string='Date of Next Invoice')
last_date_invoiced = fields.Date(
string='Last Date Invoiced', readonly=True
string='Last Date Invoiced', readonly=True, copy=False
)
create_invoice_visibility = fields.Boolean(
compute='_compute_create_invoice_visibility'
@@ -403,17 +403,20 @@ class AccountAnalyticInvoiceLine(models.Model):
else self.date_start
)
if self.recurring_rule_type == 'monthlylastday':
last_date_invoiced = first_date_invoiced + self.get_relative_delta(
self.recurring_rule_type, self.recurring_interval - 1
)
last_date_invoiced = self.recurring_next_date
else:
last_date_invoiced = (
first_date_invoiced
+ self.get_relative_delta(
self.recurring_rule_type, self.recurring_interval
if self.recurring_invoicing_type == 'pre-paid':
last_date_invoiced = (
self.recurring_next_date
+ self.get_relative_delta(
self.recurring_rule_type, self.recurring_interval
)
- relativedelta(days=1)
)
else:
last_date_invoiced = self.recurring_next_date - relativedelta(
days=1
)
- relativedelta(days=1)
)
if self.date_end and self.date_end < last_date_invoiced:
last_date_invoiced = self.date_end
return first_date_invoiced, last_date_invoiced