mirror of
https://gitlab.com/hibou-io/hibou-odoo/suite.git
synced 2025-01-20 12:37:31 +02:00
[ADD] project_exception: when new task is created and has no project_id then an exception is raised
H11045
This commit is contained in:
@@ -68,6 +68,26 @@
|
||||
"--test-enable", "--no-xmlrpc", "--stop-after-init"],
|
||||
"console": "integratedTerminal"
|
||||
},
|
||||
{
|
||||
"name": "Odoo: INIT 'project_exception'",
|
||||
"type": "python",
|
||||
"request": "launch",
|
||||
"program": "/opt/odoo/hibou-suite/odoo-run.py",
|
||||
"args": ["-i", "project_exception",
|
||||
"-u", "project_exception",
|
||||
"--stop-after-init"],
|
||||
"console": "integratedTerminal"
|
||||
},
|
||||
{
|
||||
"name": "Odoo: TEST 'project_exception'",
|
||||
"type": "python",
|
||||
"request": "launch",
|
||||
"program": "/opt/odoo/hibou-suite/odoo-run.py",
|
||||
"args": ["-i", "project_exception",
|
||||
"-u", "project_exception",
|
||||
"--test-enable", "--no-xmlrpc", "--stop-after-init"],
|
||||
"console": "integratedTerminal"
|
||||
},
|
||||
{
|
||||
"name": "Odoo: server",
|
||||
"type": "python",
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details.
|
||||
|
||||
from . import models
|
||||
from . import wizard
|
||||
from . import wizard
|
||||
|
||||
@@ -1,35 +1,26 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details.
|
||||
|
||||
{
|
||||
'name': "Project Exception Rule",
|
||||
|
||||
'version': '15.0.1.0.0',
|
||||
'author': "Hibou Corp.",
|
||||
'license': 'OPL-1',
|
||||
'category': 'Generic Modules',
|
||||
'summary': """
|
||||
Module for Project Exception Rule""",
|
||||
|
||||
'description': """
|
||||
The ability to run and trigger exceptions to block the moving of a task based on rules
|
||||
""",
|
||||
|
||||
'author': "Hibou Corp.",
|
||||
""",
|
||||
'website': "http://www.hibou.io/",
|
||||
|
||||
# Categories can be used to filter modules in modules listing
|
||||
# Check https://github.com/odoo/odoo/blob/15.0/odoo/addons/base/data/ir_module_category_data.xml
|
||||
# for the full list
|
||||
'category': 'Generic Modules',
|
||||
'version': '15.0.1.0.0',
|
||||
'license': 'OPL-1',
|
||||
|
||||
# any module necessary for this one to work correctly
|
||||
'depends': ['base_exception_user', 'project'],
|
||||
|
||||
# always loaded
|
||||
'depends': [
|
||||
'base_exception_user',
|
||||
'project'
|
||||
],
|
||||
'data': [
|
||||
'security/ir.model.access.csv',
|
||||
'views/project_views.xml',
|
||||
'wizard/project_exception_confirm_views.xml',
|
||||
],
|
||||
# only loaded in demonstration mode
|
||||
],
|
||||
'demo': [
|
||||
'demo/project_exception_demo.xml',
|
||||
],
|
||||
|
||||
@@ -2,11 +2,11 @@
|
||||
<odoo>
|
||||
|
||||
<record id="except_no_project_id" model="exception.rule">
|
||||
<field name="name">No Project Id</field>
|
||||
<field name="description">No Project Id</field>
|
||||
<field name="name">No Project Id on task</field>
|
||||
<field name="description">No Project Id on task</field>
|
||||
<field name="sequence">50</field>
|
||||
<field name="model">project</field>
|
||||
<field name="code">if not project_id: failed=True</field>
|
||||
<field name="model">project.task</field>
|
||||
<field name="code">if not task.project_id.name: failed=True</field>
|
||||
<field name="active" eval="False"/>
|
||||
</record>
|
||||
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details.
|
||||
|
||||
from . import models
|
||||
from . import project
|
||||
@@ -1,44 +0,0 @@
|
||||
# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details.
|
||||
|
||||
from odoo import api, models, fields
|
||||
|
||||
|
||||
class ExceptionRule(models.Model):
|
||||
_inherit = 'exception.rule'
|
||||
|
||||
model = fields.Selection(
|
||||
selection_add=[
|
||||
('stock.picking', 'Transfer'),
|
||||
],
|
||||
ondelete={
|
||||
'stock.picking': 'cascade',
|
||||
},
|
||||
)
|
||||
picking_ids = fields.Many2many(
|
||||
'stock.picking',
|
||||
string="Transfers")
|
||||
|
||||
class Picking(models.Model):
|
||||
_inherit = ['stock.picking', 'base.exception']
|
||||
_name = 'stock.picking'
|
||||
_order = 'main_exception_id asc, priority desc, date asc, id desc'
|
||||
|
||||
@api.model
|
||||
def _exception_rule_eval_context(self, rec):
|
||||
res = super(Picking, self)._exception_rule_eval_context(rec)
|
||||
res['picking'] = rec
|
||||
return res
|
||||
|
||||
@api.model
|
||||
def _reverse_field(self):
|
||||
return 'picking_ids'
|
||||
|
||||
def button_validate(self):
|
||||
self.ensure_one()
|
||||
if self.detect_exceptions():
|
||||
return self._popup_exceptions()
|
||||
return super().button_validate()
|
||||
|
||||
@api.model
|
||||
def _get_popup_action(self):
|
||||
return self.env.ref('stock_exception.action_stock_exception_confirm')
|
||||
59
project_exception/models/project.py
Normal file
59
project_exception/models/project.py
Normal file
@@ -0,0 +1,59 @@
|
||||
# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details.
|
||||
|
||||
from odoo import api, models, fields
|
||||
|
||||
|
||||
class ExceptionRule(models.Model):
|
||||
_inherit = 'exception.rule'
|
||||
|
||||
model = fields.Selection(
|
||||
selection_add=[
|
||||
('project.task', 'Task'),
|
||||
],
|
||||
ondelete={
|
||||
'project.task': 'cascade',
|
||||
},
|
||||
)
|
||||
task_ids = fields.Many2many(
|
||||
'project.task',
|
||||
string="Task")
|
||||
|
||||
|
||||
class Task(models.Model):
|
||||
_inherit = ['project.task', 'base.exception']
|
||||
_name = 'project.task'
|
||||
_order = 'main_exception_id asc, sequence, name, id'
|
||||
|
||||
@api.model
|
||||
def create(self, values):
|
||||
res = super().create(values)
|
||||
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'
|
||||
|
||||
def write(self, vals):
|
||||
if not vals.get('ignore_exception'):
|
||||
for task in self:
|
||||
if task.detect_exceptions():
|
||||
return self._popup_exceptions()
|
||||
return super().write(vals)
|
||||
|
||||
@api.model
|
||||
def _get_popup_action(self):
|
||||
return self.env.ref('project_exception.action_project_exception_confirm')
|
||||
|
||||
def detect_exceptions(self):
|
||||
res = False
|
||||
if not self._context.get("detect_exceptions"):
|
||||
self = self.with_context(detect_exceptions=True)
|
||||
res = super(Task, self).detect_exceptions()
|
||||
return res
|
||||
@@ -1,2 +1,2 @@
|
||||
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
|
||||
access_project_task_exception_confirm_project_task,project_task_exception.project_task_exception,model_project_task_exception_confirm,project.group_project_user,1,1,1,1
|
||||
access_project_task_exception_confirm_user,project.exception.confirm user,model_project_exception_confirm,project.group_project_user,1,1,1,1
|
||||
|
@@ -12,32 +12,24 @@ class TestProjectException(common.TransactionCase):
|
||||
def test_project_task_creation_exception(self):
|
||||
exception = self.env.ref('project_exception.except_no_project_id')
|
||||
exception.active = True
|
||||
# partner = self.env.ref('base.res_partner_12') # Azure Interior
|
||||
# partner.zip = False
|
||||
# p = self.env.ref('product.product_product_6')
|
||||
# stock_location = self.env.ref('stock.stock_location_stock')
|
||||
# customer_location = self.env.ref('stock.stock_location_customers')
|
||||
# self.env['stock.quant']._update_available_quantity(p, stock_location, 100)
|
||||
# delivery_order = self.env['stock.picking'].create({
|
||||
# 'partner_id': partner.id,
|
||||
# 'picking_type_id': self.ref('stock.picking_type_out'),
|
||||
# 'location_id': self.env.ref('stock.stock_location_stock').id,
|
||||
# 'location_dest_id': self.env.ref('stock.stock_location_customers').id,
|
||||
# 'move_line_ids': [(0, 0, {'product_id': p.id,
|
||||
# 'product_uom_id': p.uom_id.id,
|
||||
# 'qty_done': 3.0,
|
||||
# 'location_id': stock_location.id,
|
||||
# 'location_dest_id': customer_location.id})],
|
||||
# })
|
||||
|
||||
task = self.env['project.task'].create({
|
||||
'name': 'Test Task',
|
||||
})
|
||||
# Created exceptions on create.
|
||||
self.assertTrue(task.exception_ids)
|
||||
|
||||
# Will return action on write, which may or not be followed.
|
||||
action = task.write({
|
||||
'name': 'Test Task - Test Written',
|
||||
})
|
||||
self.assertTrue(task.exception_ids)
|
||||
self.assertTrue(action)
|
||||
self.assertEqual(action.get('res_model'), 'project.exception.confirm')
|
||||
|
||||
# validate delivery order
|
||||
# action = delivery_order.button_validate()
|
||||
# self.assertEqual(delivery_order.state, 'draft')
|
||||
|
||||
# Simulation the opening of the wizard sale_exception_confirm and
|
||||
# Simulation the opening of the wizard task_exception_confirm and
|
||||
# set ignore_exception to True
|
||||
# stock_exception_confirm = Form(self.env[action['res_model']].with_context(action['context'])).save()
|
||||
# stock_exception_confirm.ignore = True
|
||||
# stock_exception_confirm.action_confirm()
|
||||
# self.assertTrue(delivery_order.ignore_exception)
|
||||
# self.assertEqual(delivery_order.state, 'done')
|
||||
project_exception_confirm = Form(self.env[action['res_model']].with_context(action['context'])).save()
|
||||
project_exception_confirm.ignore = True
|
||||
project_exception_confirm.action_confirm()
|
||||
self.assertTrue(task.ignore_exception)
|
||||
|
||||
@@ -1,61 +1,62 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<odoo>
|
||||
|
||||
<record id="action_stock_test_tree" model="ir.actions.act_window">
|
||||
<field name="name">Stock Exception Rules</field>
|
||||
<record id="action_project_test_tree" model="ir.actions.act_window">
|
||||
<field name="name">Project Exception Rules</field>
|
||||
<field name="res_model">exception.rule</field>
|
||||
<!-- What about kanban view?, because kanban is the default view type for Project -->
|
||||
<field name="view_mode">tree,form</field>
|
||||
<field name="view_id" ref="base_exception.view_exception_rule_tree"/>
|
||||
<field name="domain">[('model', '=', 'stock.picking')]</field>
|
||||
<field name="context">{'active_test': False, 'default_model' : 'stock.picking'}</field>
|
||||
<field name="domain">[('model', '=', 'project.task')]</field>
|
||||
<field name="context">{'active_test': False, 'default_model' : 'project.task'}</field>
|
||||
</record>
|
||||
|
||||
<menuitem
|
||||
action="action_stock_test_tree"
|
||||
id="menu_stock_test"
|
||||
action="action_project_test_tree"
|
||||
id="menu_project_test"
|
||||
sequence="10"
|
||||
parent="stock.menu_stock_config_settings"
|
||||
parent="project.menu_project_config"
|
||||
groups="base_exception.group_exception_rule_manager"
|
||||
/>
|
||||
|
||||
<record id="view_picking_form" model="ir.ui.view">
|
||||
<field name="name">stock.picking.form.inherit.exception</field>
|
||||
<field name="model">stock.picking</field>
|
||||
<field name="inherit_id" ref="stock.view_picking_form"/>
|
||||
<record id="view_task_form2" model="ir.ui.view">
|
||||
<field name="name">project.task.form.inherit.exception</field>
|
||||
<field name="model">project.task</field>
|
||||
<field name="inherit_id" ref="project.view_task_form2"/>
|
||||
<field name="arch" type="xml">
|
||||
<sheet position="before">
|
||||
<div class="alert alert-danger" role="alert" style="margin-bottom:0px;"
|
||||
attrs="{'invisible': [('exceptions_summary','=',False)]}">
|
||||
<p><strong>There are exceptions blocking the confirmation of this Delivery Order:</strong></p>
|
||||
<p><strong>There are exceptions blocking the confirmation of this Task:</strong></p>
|
||||
<field name="exceptions_summary"/>
|
||||
<button name="action_ignore_exceptions" type="object" class="btn-danger"
|
||||
string="Ignore Exceptions" help="Click here to be able to confirm this Delivery Order regardless of the exceptions."
|
||||
string="Ignore Exceptions" help="Click here to be able to confirm this Task regardless of the exceptions."
|
||||
groups="base_exception.group_exception_rule_manager"/>
|
||||
</div>
|
||||
</sheet>
|
||||
<xpath expr="//field[@name='origin']/.." position="inside">
|
||||
<field name="ignore_exception" states="done" />
|
||||
<xpath expr="//field[@name='tag_ids']" position="after">
|
||||
<field name="ignore_exception" />
|
||||
</xpath>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record id="view_picking_tree" model="ir.ui.view">
|
||||
<field name="name">stock.picking.tree.inherit.exception</field>
|
||||
<field name="model">stock.picking</field>
|
||||
<field name="inherit_id" ref="stock.vpicktree"/>
|
||||
<record id="view_task_tree2" model="ir.ui.view">
|
||||
<field name="name">project.task.tree.inherit.exception</field>
|
||||
<field name="model">project.task</field>
|
||||
<field name="inherit_id" ref="project.view_task_tree2"/>
|
||||
<field name="arch" type="xml">
|
||||
<field name="state" position="after">
|
||||
<field name="stage_id" position="after">
|
||||
<field name="main_exception_id"/>
|
||||
</field>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record id="view_picking_internal_search" model="ir.ui.view">
|
||||
<field name="name">stock.picking.internal.search.inherit.exception</field>
|
||||
<field name="model">stock.picking</field>
|
||||
<field name="inherit_id" ref="stock.view_picking_internal_search" />
|
||||
<record id="view_task_search_form" model="ir.ui.view">
|
||||
<field name="name">project.task.search.form.inherit.exception</field>
|
||||
<field name="model">project.task</field>
|
||||
<field name="inherit_id" ref="project.view_task_search_form" />
|
||||
<field name="arch" type="xml">
|
||||
<filter name="backorder" position="after">
|
||||
<filter name="inactive" position="before">
|
||||
<separator orientation="vertical"/>
|
||||
<filter icon="terp-emblem-important" name="tofix" string="Blocked by exceptions" domain="[('main_exception_id','!=',False)]"/>
|
||||
</filter>
|
||||
|
||||
@@ -1 +1,3 @@
|
||||
from . import project_exception_confim
|
||||
# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details.
|
||||
|
||||
from . import project_exception_confim
|
||||
|
||||
@@ -0,0 +1,26 @@
|
||||
# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details.
|
||||
|
||||
from odoo import api, fields, models
|
||||
|
||||
|
||||
class ProjectExceptionConfirm(models.TransientModel):
|
||||
_name = 'project.exception.confirm'
|
||||
_inherit = ['exception.rule.confirm']
|
||||
_description = 'Project Exception Confirm Wizard'
|
||||
|
||||
related_model_id = fields.Many2one('project.task', 'Task')
|
||||
|
||||
def action_confirm(self):
|
||||
self.ensure_one()
|
||||
if self.ignore:
|
||||
self.related_model_id.ignore_exception = True
|
||||
res = super().action_confirm()
|
||||
if self.ignore:
|
||||
return True
|
||||
else:
|
||||
return res
|
||||
|
||||
def _action_ignore(self):
|
||||
self.related_model_id.ignore_exception = True
|
||||
super()._action_ignore()
|
||||
return True
|
||||
|
||||
@@ -0,0 +1,25 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<odoo>
|
||||
|
||||
<record id="view_project_exception_confirm" model="ir.ui.view">
|
||||
<field name="name">Project Exceptions Rules</field>
|
||||
<field name="model">project.exception.confirm</field>
|
||||
<field name="inherit_id" ref="base_exception.view_exception_rule_confirm"/>
|
||||
<field name="mode">primary</field>
|
||||
<field name="arch" type="xml">
|
||||
<xpath expr="//footer" position="inside">
|
||||
<button class="oe_link" special="cancel" string="Cancel"/>
|
||||
</xpath>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record id="action_project_exception_confirm" model="ir.actions.act_window">
|
||||
<field name="name">Blocked due to exceptions</field>
|
||||
<field name="type">ir.actions.act_window</field>
|
||||
<field name="res_model">project.exception.confirm</field>
|
||||
<field name="view_mode">form</field>
|
||||
<field name="view_id" ref="view_project_exception_confirm"/>
|
||||
<field name="target">new</field>
|
||||
</record>
|
||||
|
||||
</odoo>
|
||||
|
||||
Reference in New Issue
Block a user