diff options
| author | Yannick Tivisse <yti@odoo.com> | 2017-07-26 10:36:41 +0200 |
|---|---|---|
| committer | Yannick Tivisse <yti@odoo.com> | 2017-08-07 12:21:26 +0200 |
| commit | f8a1e9f6e7090a36b58b5e9a10950d8b6dcc80b2 (patch) | |
| tree | f97d9b9281ddbdc0fdcd94b1635c08264e64ea6e | |
| parent | 6b49f7b1948ab94631c79304c91f8d5590d03e40 (diff) | |
[IMP] pad_project: Allow to activate or not pads on a project
| -rw-r--r-- | addons/pad_project/__manifest__.py | 2 | ||||
| -rw-r--r-- | addons/pad_project/models/__init__.py | 2 | ||||
| -rw-r--r-- | addons/pad_project/models/project.py (renamed from addons/pad_project/models/project_task.py) | 7 | ||||
| -rw-r--r-- | addons/pad_project/views/project_task.xml | 13 | ||||
| -rw-r--r-- | addons/pad_project/views/project_views.xml | 29 |
5 files changed, 38 insertions, 15 deletions
diff --git a/addons/pad_project/__manifest__.py b/addons/pad_project/__manifest__.py index 71f042df6ee..85b1da9aa98 100644 --- a/addons/pad_project/__manifest__.py +++ b/addons/pad_project/__manifest__.py @@ -15,7 +15,7 @@ This module adds a PAD in all project form views. ], 'data': [ 'views/project_config_settings_views.xml', - 'views/project_task.xml' + 'views/project_views.xml' ], 'auto_install': True, } diff --git a/addons/pad_project/models/__init__.py b/addons/pad_project/models/__init__.py index 70a1000c2b4..66c35af5995 100644 --- a/addons/pad_project/models/__init__.py +++ b/addons/pad_project/models/__init__.py @@ -2,4 +2,4 @@ # Part of Odoo. See LICENSE file for full copyright and licensing details. from . import project_config_settings -from . import project_task +from . import project diff --git a/addons/pad_project/models/project_task.py b/addons/pad_project/models/project.py index 47fb1eb72a0..113a32b9b68 100644 --- a/addons/pad_project/models/project_task.py +++ b/addons/pad_project/models/project.py @@ -9,3 +9,10 @@ class ProjectTask(models.Model): _inherit = ["project.task", 'pad.common'] description_pad = fields.Char('Pad URL', pad_content_field='description') + use_pad = fields.Boolean(related="project_id.use_pads", string="Use collaborative pad") + + +class ProjectProject(models.Model): + _inherit = "project.project" + + use_pads = fields.Boolean("Use collaborative pads", help="Use collaborative pad for the tasks on this project.") diff --git a/addons/pad_project/views/project_task.xml b/addons/pad_project/views/project_task.xml deleted file mode 100644 index 17ccd54a36b..00000000000 --- a/addons/pad_project/views/project_task.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<odoo> - <record id="view_task_form2_inherit_pad_project" model="ir.ui.view"> - <field name="name">project.task.form.inherit</field> - <field name="model">project.task</field> - <field name="inherit_id" ref="project.view_task_form2" /> - <field name="arch" type="xml"> - <field name="description" position="replace"> - <field name="description_pad" widget="pad" /> - </field> - </field> - </record> -</odoo> diff --git a/addons/pad_project/views/project_views.xml b/addons/pad_project/views/project_views.xml new file mode 100644 index 00000000000..63d5f61084b --- /dev/null +++ b/addons/pad_project/views/project_views.xml @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="utf-8"?> +<odoo> + <record id="view_task_form2_inherit_pad_project" model="ir.ui.view"> + <field name="name">project.task.form.inherit</field> + <field name="model">project.task</field> + <field name="inherit_id" ref="project.view_task_form2"/> + <field name="arch" type="xml"> + <xpath expr="//field[@name='description']" position="attributes"> + <attribute name="attrs">{'invisible': [('use_pad', '=', True)]}</attribute> + </xpath> + <field name="description" position="after"> + <field name="use_pad" invisible="1"/> + <field name="description_pad" widget="pad" attrs="{'invisible': [('use_pad', '=', False)]}"/> + </field> + </field> + </record> + + <record id="project_project_view_form" model="ir.ui.view"> + <field name="name">project.project.view.form</field> + <field name="model">project.project</field> + <field name="inherit_id" ref="project.edit_project"/> + <field name="arch" type="xml"> + <field name="partner_id" position="after"> + <field name="use_pads"/> + </field> + </field> + </record> + +</odoo> |
