Audric Onockx (auon)
85e9290711
*=hr_timesheet,project,sale_project,sale_timesheet Currently, the configuration of the recurrence is quite complete and allows a lot of flexibility, but it is costly in terms of implementation as it requires a lot of fields. The goal of this task is thus to simplify this implementation. In addition, a lot of people are complaining that tasks are only generated when the recurrence date is reached, as it doesn't allow to anticipate the planning of field service tasks. In this task, we are thus going to immediately generate a new task once the previous one is marked as done. Concretely, we: - describe a recurrence in terms of "once every n day/week/month/year for ever/until a date" and delete all fields that don't fit into it. - remove the cron. The new occurrence is created when marking the last task as done, and copied from the latter. Deleting the last task deletes the recurrence. The recurrence fields stay useful, as they form a delta t that will be added to deadline/planned dates fields to get the new values. - use an boolean icon button to activate recurrence, and place it at the end of deadline field's line. The recurrence fields appear on the next line. - delete in the form: the div explaining when the next tasks will be created and the header to choose how to save the changes in the recurrence. task-3084945 closes odoo/odoo#112764 Related: odoo/upgrade#4343 Related: odoo/enterprise#37114 Signed-off-by: Xavier Bol (xbo) <xbo@odoo.com>
102 lines
4.2 KiB
Python
102 lines
4.2 KiB
Python
# -*- coding: utf-8 -*-
|
|
|
|
from odoo import fields
|
|
from odoo.tests.common import Form, TransactionCase
|
|
|
|
from datetime import datetime, time
|
|
from dateutil.relativedelta import relativedelta
|
|
from freezegun import freeze_time
|
|
|
|
|
|
class TestProjectRecurrence(TransactionCase):
|
|
@classmethod
|
|
def setUpClass(cls):
|
|
super(TestProjectRecurrence, cls).setUpClass()
|
|
|
|
cls.env.user.groups_id += cls.env.ref('project.group_project_recurring_tasks')
|
|
|
|
cls.stage_a = cls.env['project.task.type'].create({'name': 'a'})
|
|
cls.stage_b = cls.env['project.task.type'].create({'name': 'b'})
|
|
cls.project_recurring = cls.env['project.project'].with_context({'mail_create_nolog': True}).create({
|
|
'name': 'Recurring',
|
|
'allow_recurring_tasks': True,
|
|
'type_ids': [
|
|
(4, cls.stage_a.id),
|
|
(4, cls.stage_b.id),
|
|
]
|
|
})
|
|
|
|
cls.classPatch(cls.env.cr, 'now', fields.Datetime.now)
|
|
|
|
cls.date_01_01 = datetime.combine(datetime.now() + relativedelta(years=-1, month=1, day=1), time(0, 0))
|
|
|
|
def test_recurrence_simple(self):
|
|
with freeze_time(self.date_01_01):
|
|
form = Form(self.env['project.task'])
|
|
form.name = 'test recurring task'
|
|
form.project_id = self.project_recurring
|
|
form.recurring_task = True
|
|
form.repeat_interval = 5
|
|
form.repeat_unit = 'month'
|
|
form.repeat_type = 'forever'
|
|
task = form.save()
|
|
|
|
self.assertTrue(bool(task.recurrence_id), 'should create a recurrence')
|
|
|
|
task.write(dict(repeat_interval=2))
|
|
self.assertEqual(task.recurrence_id.repeat_interval, 2, 'recurrence should be updated')
|
|
|
|
task.recurring_task = False
|
|
self.assertFalse(bool(task.recurrence_id), 'the recurrence should be deleted')
|
|
|
|
def test_recurrent_tasks_fields(self):
|
|
with freeze_time(self.date_01_01):
|
|
form = Form(self.env['project.task'])
|
|
form.project_id = self.project_recurring
|
|
form.name = 'name'
|
|
form.description = 'description'
|
|
form.priority = '1'
|
|
form.stage_id = self.stage_b
|
|
form.tag_ids.add(self.env['project.tags'].search([], limit=1))
|
|
form.date_deadline = self.date_01_01 + relativedelta(weeks=1)
|
|
|
|
form.recurring_task = True
|
|
form.repeat_interval = 2
|
|
form.repeat_unit = 'month'
|
|
form.repeat_type = 'forever'
|
|
task = form.save()
|
|
|
|
with freeze_time(self.date_01_01 + relativedelta(months=1)):
|
|
task.state = '1_done'
|
|
other_task = task.recurrence_id.task_ids - task
|
|
|
|
self.assertEqual(
|
|
other_task.date_deadline, task.date_deadline + relativedelta(months=2),
|
|
"Next occurrence should have previous deadline + interval * unit",
|
|
)
|
|
for copied_field in ['project_id', 'name', 'description', 'tag_ids']:
|
|
self.assertEqual(other_task[copied_field], task[copied_field], f"Next occurrence's {copied_field} should have been copied")
|
|
|
|
for reset_field in ['priority', 'stage_id', 'state']:
|
|
self.assertNotEqual(other_task[reset_field], task[reset_field], f"Next occurrence's {reset_field} should have been reset")
|
|
|
|
def test_recurrence_until(self):
|
|
with freeze_time(self.date_01_01):
|
|
form = Form(self.env['project.task'])
|
|
form.name = 'test recurring task'
|
|
form.project_id = self.project_recurring
|
|
form.recurring_task = True
|
|
form.repeat_interval = 5
|
|
form.repeat_unit = 'month'
|
|
form.repeat_type = 'until'
|
|
form.repeat_until = self.date_01_01 + relativedelta(months=1)
|
|
task = form.save()
|
|
|
|
with freeze_time(self.date_01_01 + relativedelta(days=30)):
|
|
task.state = '1_done'
|
|
self.assertEqual(len(task.recurrence_id.task_ids), 2, "Since this is before repeat_until, next occurrence should have been created")
|
|
|
|
with freeze_time(self.date_01_01 + relativedelta(days=32)):
|
|
task.state = '1_done'
|
|
self.assertEqual(len(task.recurrence_id.task_ids), 2, "Since this is after repeat_until, next occurrence shouldn't have been created")
|