summaryrefslogtreecommitdiff
path: root/addons/pad_project
diff options
context:
space:
mode:
authorBarad Mahendra <mba@openerp.com>2019-11-25 11:24:45 +0000
committerYannick Tivisse <yti@odoo.com>2020-01-16 10:56:05 +0000
commitd16aa4cd396e13749d12fa8e55f80f0fcc62f686 (patch)
tree2c1cd4e89f6c789f3fe7f6c2bebe20955014876f /addons/pad_project
parentde4d7e14f8186fd19cd6cb8924957a0a508b0dfb (diff)
[IMP] (hr, sale)_timesheet, pad(_project): improve project general UX
Purpose fo the task is to improve the UX of timesheet, project and task. Done the chages for below point: - improve the stage demo data to unified the project stage - on the task timesheet 'sub-tasks hours spent' should be clickable and on click, it will display the list of subtask timesheet. - display in warning tasks for which Remaining Hours < 0 if Planned Hours > 0 in task list view - improve the settings of collabrative pad and planning and project form view Task-2129052 closes odoo/odoo#41092 Closes: #41092 Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>
Diffstat (limited to 'addons/pad_project')
-rw-r--r--addons/pad_project/models/project.py2
-rw-r--r--addons/pad_project/views/project_views.xml16
-rw-r--r--addons/pad_project/views/res_config_settings_views.xml7
3 files changed, 17 insertions, 8 deletions
diff --git a/addons/pad_project/models/project.py b/addons/pad_project/models/project.py
index d569106378c..40cfbfdbf10 100644
--- a/addons/pad_project/models/project.py
+++ b/addons/pad_project/models/project.py
@@ -24,4 +24,4 @@ class ProjectTask(models.Model):
class ProjectProject(models.Model):
_inherit = "project.project"
- use_pads = fields.Boolean("Use collaborative pads", help="Use collaborative pad for the tasks on this project.")
+ use_pads = fields.Boolean("Use collaborative pads", default=True, help="Use collaborative pad for the tasks on this project.")
diff --git a/addons/pad_project/views/project_views.xml b/addons/pad_project/views/project_views.xml
index e97514a9859..50320a42831 100644
--- a/addons/pad_project/views/project_views.xml
+++ b/addons/pad_project/views/project_views.xml
@@ -20,9 +20,19 @@
<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>
+ <xpath expr="//div[@id='rating_settings']" position="after">
+ <div class="col-lg-6 o_setting_box" id="pad_settings">
+ <div class="o_setting_left_pane">
+ <field name="use_pads"/>
+ </div>
+ <div class="o_setting_right_pane">
+ <label for="use_pads" string="Collaborative Pads"/>
+ <div class="text-muted">
+ Use collaborative rich text pads on tasks
+ </div>
+ </div>
+ </div>
+ </xpath>
</field>
</record>
diff --git a/addons/pad_project/views/res_config_settings_views.xml b/addons/pad_project/views/res_config_settings_views.xml
index 3efc7af4687..755d1c4d34b 100644
--- a/addons/pad_project/views/res_config_settings_views.xml
+++ b/addons/pad_project/views/res_config_settings_views.xml
@@ -6,15 +6,14 @@
<field name="inherit_id" ref="project.res_config_settings_view_form"/>
<field name="arch" type="xml">
<div name="pad_project_right_pane" position="inside">
- <div class="content-group">
- <field name='company_id' invisible="1"/>
+ <div class="content-group" attrs="{'invisible': [('module_pad', '=', False)]}">
<div class="row mt16">
<label for="pad_server" class="col-lg-3 o_light_label"/>
- <field name="pad_server"/>
+ <field name="pad_server" attrs="{'required': [('module_pad', '!=', False)]}"/>
</div>
<div class="row">
<label for="pad_key" class="col-lg-3 o_light_label"/>
- <field name="pad_key"/>
+ <field name="pad_key" attrs="{'required': [('module_pad', '!=', False)]}"/>
</div>
</div>
</div>