[IMP] project_exception, project_acceptance: improve exception rule definition, add field requires_acceptance to task_type_edit view.

H11043
This commit is contained in:
percyhibou
2022-10-11 17:13:16 +00:00
parent bda3d6b5bc
commit 6f87dc4ac5
4 changed files with 18 additions and 13 deletions

View File

@@ -6,7 +6,7 @@
<field name="description">When task stage changes and requires acceptance and task acceptance is blank</field>
<field name="sequence">50</field>
<field name="model">project.task</field>
<field name="code">if not task.task_acceptance and task.stage_id.requires_acceptance: failed=True</field>
<field name="code">failed = (self.stage_id.id != self._context.get('newVals', {}).get('stage_id')) and not self.task_acceptance and self.stage_id.requires_acceptance</field>
<field name="active" eval="False"/>
</record>

View File

@@ -12,7 +12,7 @@
</field>
</record>
<record id="view_task_type_tree" model="ir.ui.view">
<record id="view_task_type_inherit_tree" model="ir.ui.view">
<field name="name">project.task.type.tree.inherit.exception</field>
<field name="model">project.task.type</field>
<field name="inherit_id" ref="project.task_type_tree"/>
@@ -23,4 +23,15 @@
</field>
</record>
<record id="task_type_inherit_edit" model="ir.ui.view">
<field name="name">project.task.type.inherit.form</field>
<field name="model">project.task.type</field>
<field name="inherit_id" ref="project.task_type_edit"/>
<field name="arch" type="xml">
<field name="is_closed" position="after">
<field name="requires_acceptance"/>
</field>
</field>
</record>
</odoo>

View File

@@ -6,8 +6,8 @@
<field name="description">No Project Id on task</field>
<field name="sequence">50</field>
<field name="model">project.task</field>
<field name="code">if not task.project_id.name: failed=True</field>
<field name="active" eval="False"/>
<field name="code">failed = (self.stage_id.id != self._context.get('newVals', {}).get('stage_id')) and not self.project_id</field>
<field name="active" eval="True"/>
</record>
</odoo>

View File

@@ -31,12 +31,6 @@ class Task(models.Model):
res.detect_exceptions()
return res
@api.model
def _exception_rule_eval_context(self, rec):
res = super(Task, self)._exception_rule_eval_context(rec)
res['task'] = rec
return res
@api.model
def _reverse_field(self):
return 'task_ids'
@@ -44,7 +38,7 @@ class Task(models.Model):
def write(self, vals):
if not vals.get('ignore_exception') and 'stage_id' in vals and 'project_id' not in vals:
for task in self:
if task.detect_exceptions():
if task.with_context(newVals=vals).detect_exceptions():
raise UserError(_('Exceptions were detected.'))
res = super().write(vals)
self.detect_exceptions()
@@ -56,7 +50,7 @@ class Task(models.Model):
def detect_exceptions(self):
res = False
if not self._context.get("detect_exceptions"):
self = self.with_context(detect_exceptions=True)
if not self._context.get("skip_detect_exceptions"):
self = self.with_context(skip_detect_exceptions=True)
res = super(Task, self).detect_exceptions()
return res