summaryrefslogtreecommitdiff
path: root/addons
diff options
context:
space:
mode:
authorGeoffroy Larue <gla@odoo.com>2019-01-24 10:38:28 +0000
committerGeoffroy Larue <gla@odoo.com>2019-02-15 08:48:55 +0000
commit400f76979696eecc39a4dc8648cd1d24b5dcd382 (patch)
treed74dc11650b80ffe74b2092f7595fcf2086ebad8 /addons
parent872c11dda46d4246daceb5a899122e3a58ee140f (diff)
[REM] project, hr_timesheet: remove date_start
Remove date_start in project.task model, because it is not useful. Now using date_assign instead for reporting. Add two ids in settings views to refer from enterprise modules. closes odoo/odoo#31101
Diffstat (limited to 'addons')
-rw-r--r--addons/hr_timesheet/views/res_config_settings_views.xml2
-rw-r--r--addons/project/models/project.py10
-rw-r--r--addons/project/report/project_report.py6
-rw-r--r--addons/project/report/project_report_views.xml4
-rw-r--r--addons/project/views/res_config_settings_views.xml2
5 files changed, 8 insertions, 16 deletions
diff --git a/addons/hr_timesheet/views/res_config_settings_views.xml b/addons/hr_timesheet/views/res_config_settings_views.xml
index 66d0f647285..6588b0b2d14 100644
--- a/addons/hr_timesheet/views/res_config_settings_views.xml
+++ b/addons/hr_timesheet/views/res_config_settings_views.xml
@@ -10,7 +10,7 @@
<field name="inherit_id" ref="base.res_config_settings_view_form"/>
<field name="arch" type="xml">
<xpath expr="//div[hasclass('settings')]" position="inside">
- <div class="app_settings_block" data-string="Timesheets" string="Timesheets" data-key="hr_timesheet" groups="hr_timesheet.group_timesheet_manager">
+ <div class="app_settings_block" data-string="Timesheets" string="Timesheets" data-key="hr_timesheet" groups="hr_timesheet.group_timesheet_manager" id="timesheets">
<h2>Time Encoding</h2>
<div class="row mt16 o_settings_container">
<div class="col-12 col-lg-6 o_setting_box" attrs="{'invisible':[('project_time_mode_id', '!=', False)]}">
diff --git a/addons/project/models/project.py b/addons/project/models/project.py
index d8f697261e1..f2943b533a2 100644
--- a/addons/project/models/project.py
+++ b/addons/project/models/project.py
@@ -389,7 +389,7 @@ class Project(models.Model):
class Task(models.Model):
_name = "project.task"
_description = "Task"
- _date_name = "date_start"
+ _date_name = "date_assign"
_inherit = ['portal.mixin', 'mail.thread', 'mail.activity.mixin', 'rating.mixin']
_mail_post_access = 'read'
_order = "priority desc, sequence, id desc"
@@ -445,9 +445,6 @@ class Task(models.Model):
kanban_state_label = fields.Char(compute='_compute_kanban_state_label', string='Kanban State Label', tracking=True)
create_date = fields.Datetime("Created On", readonly=True, index=True)
write_date = fields.Datetime("Last Updated On", readonly=True, index=True)
- date_start = fields.Datetime(string='Starting Date',
- default=fields.Datetime.now,
- index=True, copy=False)
date_end = fields.Datetime(string='Ending Date', index=True, copy=False)
date_assign = fields.Datetime(string='Assigning Date', index=True, copy=False, readonly=True)
date_deadline = fields.Date(string='Deadline', index=True, copy=False, tracking=True)
@@ -586,11 +583,6 @@ class Task(models.Model):
else:
self.stage_id = False
- @api.onchange('user_id')
- def _onchange_user(self):
- if self.user_id:
- self.date_start = fields.Datetime.now()
-
@api.constrains('parent_id', 'child_ids')
def _check_subtask_level(self):
for task in self:
diff --git a/addons/project/report/project_report.py b/addons/project/report/project_report.py
index 54a8d061038..c1cf00c71e7 100644
--- a/addons/project/report/project_report.py
+++ b/addons/project/report/project_report.py
@@ -12,7 +12,7 @@ class ReportProjectTaskUser(models.Model):
name = fields.Char(string='Task Title', readonly=True)
user_id = fields.Many2one('res.users', string='Assigned To', readonly=True)
- date_start = fields.Datetime(string='Assignation Date', readonly=True)
+ date_assign = fields.Datetime(string='Assignation Date', readonly=True)
date_end = fields.Datetime(string='Ending Date', readonly=True)
date_deadline = fields.Date(string='Deadline', readonly=True)
date_last_stage_update = fields.Datetime(string='Last Stage Update', readonly=True)
@@ -44,7 +44,7 @@ class ReportProjectTaskUser(models.Model):
SELECT
(select 1 ) AS nbr,
t.id as id,
- t.date_start as date_start,
+ t.date_assign as date_assign,
t.date_end as date_end,
t.date_last_stage_update as date_last_stage_update,
t.date_deadline as date_deadline,
@@ -68,7 +68,7 @@ class ReportProjectTaskUser(models.Model):
t.id,
create_date,
write_date,
- date_start,
+ date_assign,
date_end,
date_deadline,
date_last_stage_update,
diff --git a/addons/project/report/project_report_views.xml b/addons/project/report/project_report_views.xml
index 08b2c4c4f0a..d04ce364139 100644
--- a/addons/project/report/project_report_views.xml
+++ b/addons/project/report/project_report_views.xml
@@ -54,7 +54,7 @@
<field name="model">report.project.task.user</field>
<field name="arch" type="xml">
<search string="Tasks Analysis">
- <field name="date_start"/>
+ <field name="date_assign"/>
<field name="date_end"/>
<field name="date_deadline"/>
<field name="date_last_stage_update"/>
@@ -76,7 +76,7 @@
<filter string="Stage" name="Stage" context="{'group_by':'stage_id'}"/>
<filter string="Company" name="company" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
<separator/>
- <filter string="Assignation Date" name="assignation_month" context="{'group_by':'date_start:month'}"/>
+ <filter string="Assignation Date" name="assignation_month" context="{'group_by':'date_assign:month'}"/>
</group>
</search>
</field>
diff --git a/addons/project/views/res_config_settings_views.xml b/addons/project/views/res_config_settings_views.xml
index 97ceecb6b5b..c2177fbdc30 100644
--- a/addons/project/views/res_config_settings_views.xml
+++ b/addons/project/views/res_config_settings_views.xml
@@ -9,7 +9,7 @@
<xpath expr="//div[hasclass('settings')]" position="inside">
<div class="app_settings_block" data-string="Project" string="Project" data-key="project" groups="project.group_project_manager">
<h2>Tasks Management</h2>
- <div class="row mt16 o_settings_container">
+ <div class="row mt16 o_settings_container" id="tasks_management">
<div id="use_collaborative_pad" class="col-12 col-lg-6 o_setting_box" title="Lets the company customize which Pad installation should be used to link to new pads (for example: http://etherpad.com/).">
<div class="o_setting_left_pane">
<field name="module_pad"/>