From 4eb6a4bd4d839c41754d4b03757269aecbfb487c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Fri, 2 Sep 2016 17:01:33 +0200 Subject: [PATCH 1/5] [CLEAN] project_issue: clean view files and organization New API migration of project issue was not correctly done considering module organization. This commit reorder files according to the guidelines. --- addons/project_issue/__openerp__.py | 13 ++-- ...iew.xml => project_issue_report_views.xml} | 0 ...xml => account_analytic_account_views.xml} | 0 .../views/project_config_settings_views.xml | 6 ++ .../project_issue_config_settings_views.xml | 18 ------ .../views/project_issue_menu.xml | 61 ------------------- ...issue_view.xml => project_issue_views.xml} | 56 +++++++++++++++++ .../views/project_project_view.xml | 28 --------- ...ashboard.xml => project_project_views.xml} | 25 ++++++++ ...partner_view.xml => res_partner_views.xml} | 0 10 files changed, 92 insertions(+), 115 deletions(-) rename addons/project_issue/report/{project_issue_report_view.xml => project_issue_report_views.xml} (100%) rename addons/project_issue/views/{account_analytic_account_view.xml => account_analytic_account_views.xml} (100%) delete mode 100644 addons/project_issue/views/project_issue_config_settings_views.xml delete mode 100644 addons/project_issue/views/project_issue_menu.xml rename addons/project_issue/views/{project_issue_view.xml => project_issue_views.xml} (84%) delete mode 100644 addons/project_issue/views/project_project_view.xml rename addons/project_issue/views/{project_dashboard.xml => project_project_views.xml} (54%) rename addons/project_issue/views/{res_partner_view.xml => res_partner_views.xml} (100%) diff --git a/addons/project_issue/__openerp__.py b/addons/project_issue/__openerp__.py index 999e91888ed..3552bfb77c1 100644 --- a/addons/project_issue/__openerp__.py +++ b/addons/project_issue/__openerp__.py @@ -20,16 +20,13 @@ It allows the manager to quickly check the issues, assign them and decide on the ], 'data': [ 'data/mail_message_subtype_data.xml', - 'report/project_issue_report_view.xml', + 'report/project_issue_report_views.xml', 'security/project_issue_security.xml', 'security/ir.model.access.csv', - 'views/project_issue_view.xml', - 'views/project_issue_config_settings_views.xml', - 'views/account_analytic_account_view.xml', - 'views/project_project_view.xml', - 'views/res_partner_view.xml', - 'views/project_issue_menu.xml', - 'views/project_dashboard.xml', + 'views/project_issue_views.xml', + 'views/account_analytic_account_views.xml', + 'views/project_project_views.xml', + 'views/res_partner_views.xml', 'views/project_config_settings_views.xml', ], 'demo': ['data/project_issue_demo.xml'], diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_views.xml similarity index 100% rename from addons/project_issue/report/project_issue_report_view.xml rename to addons/project_issue/report/project_issue_report_views.xml diff --git a/addons/project_issue/views/account_analytic_account_view.xml b/addons/project_issue/views/account_analytic_account_views.xml similarity index 100% rename from addons/project_issue/views/account_analytic_account_view.xml rename to addons/project_issue/views/account_analytic_account_views.xml diff --git a/addons/project_issue/views/project_config_settings_views.xml b/addons/project_issue/views/project_config_settings_views.xml index 3880f7235b1..220707950d2 100644 --- a/addons/project_issue/views/project_config_settings_views.xml +++ b/addons/project_issue/views/project_config_settings_views.xml @@ -6,6 +6,12 @@ project.config.settings + + Timesheets + + + + diff --git a/addons/project_issue/views/project_issue_config_settings_views.xml b/addons/project_issue/views/project_issue_config_settings_views.xml deleted file mode 100644 index 7555571ec83..00000000000 --- a/addons/project_issue/views/project_issue_config_settings_views.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - project issue settings - project.config.settings - - - - Timesheets - - - - - - - - diff --git a/addons/project_issue/views/project_issue_menu.xml b/addons/project_issue/views/project_issue_menu.xml deleted file mode 100644 index 675b5061af4..00000000000 --- a/addons/project_issue/views/project_issue_menu.xml +++ /dev/null @@ -1,61 +0,0 @@ - - - - - Issues - project.issue - form - kanban,tree,calendar,form,pivot,graph - - - {'search_default_my_issues': 1} - - -

- The Odoo issues tracker allows you to efficiently manage things - like internal requests, software development bugs, customer - complaints, project troubles, material breakdowns, etc. -

- - - - - - kanban - - - - - - - tree - - - - - - - calendar - - - - - - - form - - - - - - - graph - - - - - - diff --git a/addons/project_issue/views/project_issue_view.xml b/addons/project_issue/views/project_issue_views.xml similarity index 84% rename from addons/project_issue/views/project_issue_view.xml rename to addons/project_issue/views/project_issue_views.xml index ed29e2db2e8..f1d8f636c3a 100644 --- a/addons/project_issue/views/project_issue_view.xml +++ b/addons/project_issue/views/project_issue_views.xml @@ -267,4 +267,60 @@

+ + + Issues + project.issue + form + kanban,tree,calendar,form,pivot,graph + + + {'search_default_my_issues': 1} + + +

+ The Odoo issues tracker allows you to efficiently manage things + like internal requests, software development bugs, customer + complaints, project troubles, material breakdowns, etc. +

+ + + + + + kanban + + + + + + + tree + + + + + + + calendar + + + + + + + form + + + + + + + graph + + + + + diff --git a/addons/project_issue/views/project_project_view.xml b/addons/project_issue/views/project_project_view.xml deleted file mode 100644 index 76bce706a8f..00000000000 --- a/addons/project_issue/views/project_project_view.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - project.project.form.inherited - project.project - - - - 0 - - -
- -
- -
- -
- - - diff --git a/addons/project_issue/views/project_dashboard.xml b/addons/project_issue/views/project_project_views.xml similarity index 54% rename from addons/project_issue/views/project_dashboard.xml rename to addons/project_issue/views/project_project_views.xml index 0138a09f382..3b5fd6e34bd 100644 --- a/addons/project_issue/views/project_dashboard.xml +++ b/addons/project_issue/views/project_project_views.xml @@ -28,4 +28,29 @@ + + + project.project.form.inherited + project.project + + + + 0 + + +
+ +
+ +
+ +
+ + diff --git a/addons/project_issue/views/res_partner_view.xml b/addons/project_issue/views/res_partner_views.xml similarity index 100% rename from addons/project_issue/views/res_partner_view.xml rename to addons/project_issue/views/res_partner_views.xml From c76c1f98f8e5b9087322fb948c08c20c6b3b86ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Fri, 2 Sep 2016 17:30:14 +0200 Subject: [PATCH 2/5] [IMP] project_issue: display choice of task and issues in quick create of forms in kanban --- addons/project/views/project_views.xml | 6 +++--- .../project_issue/views/project_project_views.xml | 13 +++++++++++++ 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/addons/project/views/project_views.xml b/addons/project/views/project_views.xml index 0ed16dcaf4b..0ba7c57f886 100644 --- a/addons/project/views/project_views.xml +++ b/addons/project/views/project_views.xml @@ -179,8 +179,8 @@ - - project.project.form.popup + + project.project.view.form.simplified project.project
@@ -208,7 +208,7 @@ project.project form form - + new diff --git a/addons/project_issue/views/project_project_views.xml b/addons/project_issue/views/project_project_views.xml index 3b5fd6e34bd..574dd7b6a41 100644 --- a/addons/project_issue/views/project_project_views.xml +++ b/addons/project_issue/views/project_project_views.xml @@ -1,5 +1,18 @@ + + + project.project.view.form.simplified.inherit.issue + project.project + + +
+ + +
+ + + project.project.kanban.inherited project.project From d3bbcd64743ccb484768ec4c133c54358685b807 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Mon, 5 Sep 2016 11:37:48 +0200 Subject: [PATCH 3/5] [IMP] project_issue: hide Add new Column through Search / Issues action A new view is dedicated for that kanban view. It is based on the standard issue kanban view but using the group_create=false attribute to disable the ability to create new columns. It is done using a different view because standard issue kanban view requires this ability. However it is not possible to achieve that goal using conditional attributes. --- .../views/project_issue_views.xml | 56 +++++++------------ 1 file changed, 21 insertions(+), 35 deletions(-) diff --git a/addons/project_issue/views/project_issue_views.xml b/addons/project_issue/views/project_issue_views.xml index f1d8f636c3a..97fd873770a 100644 --- a/addons/project_issue/views/project_issue_views.xml +++ b/addons/project_issue/views/project_issue_views.xml @@ -195,6 +195,19 @@ + + project.issue.view.kanban.inherit.no.group.create + project.issue + + primary + 32 + + + false + + + + project.issue.pivot.view project.issue @@ -277,6 +290,14 @@ {'search_default_my_issues': 1} +

The Odoo issues tracker allows you to efficiently manage things @@ -286,41 +307,6 @@ - - - kanban - - - - - - - tree - - - - - - - calendar - - - - - - - form - - - - - - - graph - - - - From 0194365e0c7cedf941f2d5261ff537fd161d8b97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Mon, 5 Sep 2016 10:48:03 +0200 Subject: [PATCH 4/5] [IMP] project_issue: slightly improve issue reporting * Number of emails should not take into account internal notifications * Remove Channel and Tasks from issue report as those are not really used anymore * Remove New filter as it can be done through stage filtering instead of using a not obvious heuristic based on stage sequence --- addons/project_issue/models/project_issue.py | 2 +- addons/project_issue/report/project_issue_report.py | 6 +----- addons/project_issue/report/project_issue_report_views.xml | 2 -- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/addons/project_issue/models/project_issue.py b/addons/project_issue/models/project_issue.py index 64e027d6b35..f2d667a4a50 100644 --- a/addons/project_issue/models/project_issue.py +++ b/addons/project_issue/models/project_issue.py @@ -41,7 +41,7 @@ class ProjectIssue(models.Model): date_closed = fields.Datetime(string='Closed', readonly=True, index=True) date = fields.Datetime('Date') date_last_stage_update = fields.Datetime(string='Last Stage Update', index=True, default=fields.Datetime.now) - channel = fields.Char(string='Channel', help="Communication channel.") + channel = fields.Char(string='Channel', help="Communication channel.") # TDE note: is it still used somewhere ? tag_ids = fields.Many2many('project.tags', string='Tags') priority = fields.Selection([('0', 'Low'), ('1', 'Normal'), ('2', 'High')], 'Priority', index=True, default='0') stage_id = fields.Many2one('project.task.type', string='Stage', track_visibility='onchange', index=True, diff --git a/addons/project_issue/report/project_issue_report.py b/addons/project_issue/report/project_issue_report.py index 2fd80ed6485..c81f5ccc23c 100644 --- a/addons/project_issue/report/project_issue_report.py +++ b/addons/project_issue/report/project_issue_report.py @@ -25,8 +25,6 @@ class ProjectIssueReport(models.Model): project_id = fields.Many2one('project.project', 'Project', readonly=True) user_id = fields.Many2one('res.users', 'Assigned to', readonly=True) partner_id = fields.Many2one('res.partner', 'Contact') - channel = fields.Char('Channel', readonly=True, help="Communication Channel.") - task_id = fields.Many2one('project.task', 'Task') email = fields.Integer('# Emails', readonly=True) @api.model_cr @@ -49,11 +47,9 @@ class ProjectIssueReport(models.Model): c.project_id as project_id, 1 as nbr_issues, c.partner_id, - c.channel, - c.task_id, c.day_open as delay_open, c.day_close as delay_close, - (SELECT count(id) FROM mail_message WHERE model='project.issue' AND res_id=c.id) AS email + (SELECT count(id) FROM mail_message WHERE model='project.issue' AND message_type IN ('email', 'comment') AND res_id=c.id) AS email FROM project_issue c diff --git a/addons/project_issue/report/project_issue_report_views.xml b/addons/project_issue/report/project_issue_report_views.xml index 5f2d2260fdb..e5aeefedfc4 100644 --- a/addons/project_issue/report/project_issue_report_views.xml +++ b/addons/project_issue/report/project_issue_report_views.xml @@ -48,8 +48,6 @@ - - From e89fdf77883266dc74519d7d342429fa9dfc3b56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Mon, 5 Sep 2016 12:17:07 +0200 Subject: [PATCH 5/5] [IMP] project_issue: make visible choice of tasks and/or issues on project form view Indeed currently it is only visible in edit mode. However we noticed people did not trigger the edit mode to find fields they do not expect to find. Making them visible helps understanding projects can be used notably for tasks and issues. --- addons/project_issue/views/project_project_views.xml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/addons/project_issue/views/project_project_views.xml b/addons/project_issue/views/project_project_views.xml index 574dd7b6a41..cd907e715d5 100644 --- a/addons/project_issue/views/project_project_views.xml +++ b/addons/project_issue/views/project_project_views.xml @@ -32,7 +32,6 @@ -

Issues @@ -47,9 +46,9 @@ project.project - - 0 - +
+ +