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

[IMP] - use next period computed fields to init forecast

Browse Source
This commit is contained in:
sbejaoui
2020-08-26 11:30:20 +02:00
parent 56835cec66
commit ae4d22d115
2 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
contract_forecast/models/contract_line.py
View File

@@ -58,8 +58,8 @@ class ContractLine(models.Model):
if not self.date_end or self.is_auto_renew: if not self.date_end or self.is_auto_renew:
return period_date_end < contract_forecast_end_date return period_date_end < contract_forecast_end_date
return ( return (
period_date_end < self.date_end period_date_end <= self.date_end
and period_date_end < contract_forecast_end_date and period_date_end <= contract_forecast_end_date
) )
@api.multi @api.multi
@@ -69,11 +69,9 @@ class ContractLine(models.Model):
for rec in self: for rec in self:
rec.forecast_period_ids.unlink() rec.forecast_period_ids.unlink()
if rec.recurring_next_date: if rec.recurring_next_date:
period_date_end = ( period_date_start = rec.next_period_date_start
rec.last_date_invoiced period_date_end = rec.next_period_date_end
if rec.last_date_invoiced recurring_next_date = rec.recurring_next_date
else rec.date_start - relativedelta(days=1)
)
max_date_end = rec.date_end if not rec.is_auto_renew else False max_date_end = rec.date_end if not rec.is_auto_renew else False
while ( while (
period_date_end period_date_end
@@ -81,6 +79,13 @@ class ContractLine(models.Model):
period_date_end period_date_end
) )
): ):
if period_date_end and recurring_next_date:
new_vals = rec._prepare_contract_line_forecast_period(
period_date_start,
period_date_end,
recurring_next_date,
)
values.append(new_vals)
period_date_start = period_date_end + relativedelta(days=1) period_date_start = period_date_end + relativedelta(days=1)
period_date_end = self.get_next_period_date_end( period_date_end = self.get_next_period_date_end(
period_date_start, period_date_start,
@@ -96,14 +101,6 @@ class ContractLine(models.Model):
rec.recurring_interval, rec.recurring_interval,
max_date_end=max_date_end, max_date_end=max_date_end,
) )
if period_date_end and recurring_next_date:
values.append(
rec._prepare_contract_line_forecast_period(
period_date_start,
period_date_end,
recurring_next_date,
)
)
return self.env["contract.line.forecast.period"].create(values) return self.env["contract.line.forecast.period"].create(values)

6
contract_forecast/tests/test_contract_line_forecast_period.py
View File

@@ -143,7 +143,7 @@ class TestContractLineForecastPeriod(TestContractBase):
self.assertEqual(len(self.acct_line.forecast_period_ids), 4) self.assertEqual(len(self.acct_line.forecast_period_ids), 4)
self.acct_line.write({'is_auto_renew': True}) self.acct_line.write({'is_auto_renew': True})
self.assertTrue(self.acct_line.forecast_period_ids) self.assertTrue(self.acct_line.forecast_period_ids)
self.assertEqual(len(self.acct_line.forecast_period_ids), 13) self.assertEqual(len(self.acct_line.forecast_period_ids), 12)
@mute_logger("odoo.addons.queue_job.models.base") @mute_logger("odoo.addons.queue_job.models.base")
def test_forecast_period_on_contract_line_update_8(self): def test_forecast_period_on_contract_line_update_8(self):
@@ -286,7 +286,7 @@ class TestContractLineForecastPeriod(TestContractBase):
self.acct_line.write({'is_auto_renew': True}) self.acct_line.write({'is_auto_renew': True})
self.assertTrue(self.acct_line.forecast_period_ids) self.assertTrue(self.acct_line.forecast_period_ids)
self.assertEqual(len(self.acct_line.forecast_period_ids), 37) self.assertEqual(len(self.acct_line.forecast_period_ids), 36)
@mute_logger("odoo.addons.queue_job.models.base") @mute_logger("odoo.addons.queue_job.models.base")
def test_forecast_period_for_undefined_date_end_contract(self): def test_forecast_period_for_undefined_date_end_contract(self):
@@ -309,4 +309,4 @@ class TestContractLineForecastPeriod(TestContractBase):
self.acct_line.write({'date_end': False}) self.acct_line.write({'date_end': False})
self.assertTrue(self.acct_line.forecast_period_ids) self.assertTrue(self.acct_line.forecast_period_ids)
self.assertEqual(len(self.acct_line.forecast_period_ids), 37) self.assertEqual(len(self.acct_line.forecast_period_ids), 36)