From ced12ea414502fabe780381c964960ac68cdd1d2 Mon Sep 17 00:00:00 2001 From: Sagar Ahirrao Date: Fri, 1 Dec 2017 12:24:29 +0100 Subject: [PATCH 1/5] [IMP] hr_timesheet,rating_project: Remove report from kanban dropdown Purpose ======= People don't understand that this is some reporting --- addons/hr_timesheet/views/project_views.xml | 5 ----- addons/project/report/project_report_views.xml | 16 ---------------- addons/project/views/project_views.xml | 5 +---- addons/rating_project/views/project_view.xml | 7 ------- 4 files changed, 1 insertion(+), 32 deletions(-) diff --git a/addons/hr_timesheet/views/project_views.xml b/addons/hr_timesheet/views/project_views.xml index 50afd40a4d1..246ce6125e5 100644 --- a/addons/hr_timesheet/views/project_views.xml +++ b/addons/hr_timesheet/views/project_views.xml @@ -117,11 +117,6 @@ - -
- Timesheets -
-
diff --git a/addons/project/report/project_report_views.xml b/addons/project/report/project_report_views.xml index d24a61ee48c..e7ebe788ca6 100644 --- a/addons/project/report/project_report_views.xml +++ b/addons/project/report/project_report_views.xml @@ -92,20 +92,4 @@ This report allows you to analyse the performance of your projects and users. You can analyse the quantities of tasks, the hours spent compared to the planned hours, the average number of days to open or close a task, etc. - - Tasks Analysis - report.project.task.user - form - graph,pivot - - { - 'group_by_no_leaf':1, - 'group_by':[], - 'search_default_project_id': [active_id], - 'default_project_id': active_id, - } - - This report allows you to analyse the performance of your projects and users. You can analyse the quantities of tasks, the hours spent compared to the planned hours, the average number of days to open or close a task, etc. - - diff --git a/addons/project/views/project_views.xml b/addons/project/views/project_views.xml index b4b32662cb4..f646595838a 100644 --- a/addons/project/views/project_views.xml +++ b/addons/project/views/project_views.xml @@ -310,10 +310,7 @@
-
- Tasks + Edit
diff --git a/addons/rating_project/views/project_view.xml b/addons/rating_project/views/project_view.xml index 7c28f194b9f..8e29ead22d8 100644 --- a/addons/rating_project/views/project_view.xml +++ b/addons/rating_project/views/project_view.xml @@ -162,13 +162,6 @@
- - - From c140387f06adc501f40153c63e9633792205c3f9 Mon Sep 17 00:00:00 2001 From: Sagar Ahirrao Date: Fri, 1 Dec 2017 12:26:03 +0100 Subject: [PATCH 2/5] [IMP] project: Update tour --- addons/project/static/src/js/tour.js | 33 +++++++++++++++++++------- addons/project/views/project_views.xml | 2 +- 2 files changed, 25 insertions(+), 10 deletions(-) diff --git a/addons/project/static/src/js/tour.js b/addons/project/static/src/js/tour.js index d191c2b96cf..5458f6983fb 100644 --- a/addons/project/static/src/js/tour.js +++ b/addons/project/static/src/js/tour.js @@ -24,14 +24,13 @@ tour.register('project_tour', { position: 'right', run: function (actions) { actions.auto(); - actions.auto(".modal:visible .btn.btn-primary"); }, }, { - trigger: '.o_project_kanban .o_kanban_record:first-child', - content: _t('Click on the card to go to your project and start organizing tasks.'), + trigger: '.o_open_tasks', + content: _t('This will create new project and redirect us to its tasks.'), position: 'right', run: function (actions) { - actions.auto(this.$anchor.find(".o_project_kanban_box:first")); + actions.auto(".modal:visible .btn.btn-primary"); }, }, { trigger: ".o_kanban_project_tasks .o_column_quick_create", @@ -39,15 +38,31 @@ tour.register('project_tour', { position: "right" }, { trigger: ".o-kanban-button-new", - extra_trigger: '.o_kanban_project_tasks .o_kanban_group:eq(2)', + extra_trigger: '.o_kanban_project_tasks', content: _t("Now that the project is set up, create a few tasks."), position: "right" }, { - trigger: ".o_kanban_group:first-child .o_kanban_record:last-child", + trigger: '.o-kanban-button-new', extra_trigger: '.o_kanban_project_tasks', - content: _t("Drag & drop tasks between columns as you work on them."), - position: "right", - run: "drag_and_drop .o_kanban_group:eq(2) ", + content: _t('Let\'s create your first task.'), + position: 'right', + width: 200, +}, { + trigger: 'input.o_task_name', + content: _t('Choose a task name. (e.g. Website Design, Purchase Goods etc.)'), + position: 'right', + run: function (actions) { + actions.auto(); + }, +}, { + trigger: '.o_form_button_save', + content: _t("

Once your task is ready, you can save it.

"), + position: 'bottom', +}, { + trigger: ".breadcrumb li:not(.active):last", + extra_trigger: '.o_form_project_tasks.o_form_readonly', + content: _t("Use the breadcrumbs to go back to your tasks pipeline."), + position: "bottom" }, { trigger: ".o_kanban_record .o_priority_star", extra_trigger: '.o_kanban_project_tasks', diff --git a/addons/project/views/project_views.xml b/addons/project/views/project_views.xml index f646595838a..fc61c28d919 100644 --- a/addons/project/views/project_views.xml +++ b/addons/project/views/project_views.xml @@ -415,7 +415,7 @@

- +

From e6f1fd4218f0e413c26de30572e8a4f2aaf47098 Mon Sep 17 00:00:00 2001 From: Sagar Ahirrao Date: Fri, 1 Dec 2017 13:38:03 +0100 Subject: [PATCH 3/5] [IMP] project: Remove kanban_state help Purpose ======= It makes it more complex than what it is. --- addons/project/models/project.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/addons/project/models/project.py b/addons/project/models/project.py index 27752165eaa..1b34c602777 100644 --- a/addons/project/models/project.py +++ b/addons/project/models/project.py @@ -398,11 +398,7 @@ class Task(models.Model): ('normal', 'Grey'), ('done', 'Green'), ('blocked', 'Red')], string='Kanban State', - copy=False, default='normal', required=True, - help="A task's kanban state indicates special situations affecting it:\n" - " * Grey is the default situation\n" - " * Red indicates something is preventing the progress of this task\n" - " * Green indicates the task is ready to be pulled to the next stage") + copy=False, default='normal', required=True) kanban_state_label = fields.Char(compute='_compute_kanban_state_label', string='Kanban State', track_visibility='onchange') create_date = fields.Datetime(index=True) write_date = fields.Datetime(index=True) #not displayed in the view but it might be useful with base_automation module (and it needs to be defined first for that) From 2b575e97b0d227fdc27681b6683d852875751791 Mon Sep 17 00:00:00 2001 From: Sagar Ahirrao Date: Fri, 1 Dec 2017 13:43:06 +0100 Subject: [PATCH 4/5] [IMP] web_editor: Reduce interline in web editor html lists --- addons/web_editor/static/src/less/web_editor.backend.less | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/addons/web_editor/static/src/less/web_editor.backend.less b/addons/web_editor/static/src/less/web_editor.backend.less index 3d222e1fa94..76da07437a5 100644 --- a/addons/web_editor/static/src/less/web_editor.backend.less +++ b/addons/web_editor/static/src/less/web_editor.backend.less @@ -12,6 +12,9 @@ a, a:hover { color: initial; } + ul > li > p { + margin: 0px; + } } .o_readonly { min-height: 1em; @@ -19,6 +22,9 @@ margin: 0; padding: 0; border: 0; + ul > li > p { + margin: 0px; + } } } .oe_form_field_html iframe { From 41f941a7e049279463109ec4c57dea26d577af7b Mon Sep 17 00:00:00 2001 From: Sagar Ahirrao Date: Fri, 1 Dec 2017 13:47:23 +0100 Subject: [PATCH 5/5] [IMP] project: Improve project quick create modal 1/ Make it smaller 2/ Remove the Create&Edit 3/ Align the text 4/ Open the tasks kanban for this project instead of the project form view --- addons/project/models/project.py | 22 +++++++++---------- addons/project/views/project_views.xml | 30 +++++++++++--------------- 2 files changed, 24 insertions(+), 28 deletions(-) diff --git a/addons/project/models/project.py b/addons/project/models/project.py index 1b34c602777..1b17a1176fa 100644 --- a/addons/project/models/project.py +++ b/addons/project/models/project.py @@ -336,19 +336,19 @@ class Project(models.Model): favorite_projects.write({'favorite_user_ids': [(3, self.env.uid)]}) @api.multi - def close_dialog(self): - return {'type': 'ir.actions.act_window_close'} - - @api.multi - def edit_dialog(self): - form_view = self.env.ref('project.edit_project') + def open_tasks(self): + ctx = dict(self._context) + ctx.update({'search_default_project_id': self.id}) + kanban_view_id = self.env.ref('project.view_task_kanban') return { - 'name': _('Project'), - 'res_model': 'project.project', - 'res_id': self.id, - 'views': [(form_view.id, 'form'),], + 'name': _('Tasks'), + 'res_model': 'project.task', 'type': 'ir.actions.act_window', - 'target': 'inline' + 'view_id': kanban_view_id.id, + 'views': [(kanban_view_id.id, 'kanban'), (False, 'form')], + 'view_mode': 'kanban,tree,form', + 'view_type': 'form', + 'context': ctx } diff --git a/addons/project/views/project_views.xml b/addons/project/views/project_views.xml index fc61c28d919..3656f306383 100644 --- a/addons/project/views/project_views.xml +++ b/addons/project/views/project_views.xml @@ -244,25 +244,21 @@ project.project
- + - - - + + + -
-
- - + +