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

Merge PR #792 into 14.0

Browse Source 
Signed-off-by pedrobaeza
This commit is contained in:
OCA-git-bot
2022-03-08 17:00:02 +00:00
parent e4ce28578c 20b538e9e9
commit c8496efa03
5 changed files with 83 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
contract/models/contract_line.py
View File

@@ -611,19 +611,12 @@ class ContractLine(models.Model):
return name
def _update_recurring_next_date(self):
# FIXME: Change method name according to real updated field
# e.g.: _update_last_date_invoiced()
for rec in self:
last_date_invoiced = rec.next_period_date_end
recurring_next_date = rec.get_next_invoice_date(
last_date_invoiced + relativedelta(days=1),
rec.recurring_invoicing_type,
rec.recurring_invoicing_offset,
rec.recurring_rule_type,
rec.recurring_interval,
max_date_end=rec.date_end,
)
rec.write(
{
"recurring_next_date": recurring_next_date,
"last_date_invoiced": last_date_invoiced,
}
)

2
contract/models/contract_recurrency_mixin.py
View File

@@ -95,7 +95,7 @@ class ContractRecurrencyMixin(models.AbstractModel):
@api.depends("next_period_date_start")
def _compute_recurring_next_date(self):
for rec in self.filtered("next_period_date_start"):
for rec in self:
rec.recurring_next_date = self.get_next_invoice_date(
rec.next_period_date_start,
rec.recurring_invoicing_type,