From 34ba8a5e076fd18de237765b495fffb407bd74ec Mon Sep 17 00:00:00 2001 From: Pawan Kumar Date: Mon, 15 Feb 2021 22:02:56 +0530 Subject: [PATCH 1/4] add done button in task list view --- cor_custom/data/mail_data.xml | 0 cor_custom/models/project.py | 3 +++ cor_custom/views/project_view.xml | 12 ++++++++++++ 3 files changed, 15 insertions(+) mode change 100644 => 100755 cor_custom/data/mail_data.xml diff --git a/cor_custom/data/mail_data.xml b/cor_custom/data/mail_data.xml old mode 100644 new mode 100755 diff --git a/cor_custom/models/project.py b/cor_custom/models/project.py index 5079f94..c015cb3 100755 --- a/cor_custom/models/project.py +++ b/cor_custom/models/project.py @@ -330,3 +330,6 @@ class InheritProjectTask(models.Model): start_date = fields.Date(string='Start Date') + def action_done_task(self): + print('9999999999999999') + diff --git a/cor_custom/views/project_view.xml b/cor_custom/views/project_view.xml index 8a27226..4777664 100755 --- a/cor_custom/views/project_view.xml +++ b/cor_custom/views/project_view.xml @@ -218,6 +218,18 @@ + + + Done + + + code + + if records: + action = records.action_done_task() + + + Tags From 42bdde0364fdc06ad422910835001878a8988e18 Mon Sep 17 00:00:00 2001 From: Pawan Kumar Date: Mon, 15 Feb 2021 22:50:01 +0530 Subject: [PATCH 2/4] add calendat for timesheet --- cor_custom/views/analytic_view.xml | 91 ++++++++++++++++++++++++++---- 1 file changed, 79 insertions(+), 12 deletions(-) diff --git a/cor_custom/views/analytic_view.xml b/cor_custom/views/analytic_view.xml index 101f44e..8160eb9 100755 --- a/cor_custom/views/analytic_view.xml +++ b/cor_custom/views/analytic_view.xml @@ -21,8 +21,8 @@ - - + + + + All Timesheets + account.analytic.line + tree,form,pivot,kanban,calendar + + [('project_id', '!=', False)] + { + 'search_default_week':1, + } - --> + +

+ No activities found. Let's start a new one! +

+

+ Track your working hours by projects every day and invoice this time to your customers. +

+
+
+ + + account.analytic.line.calendar + account.analytic.line + + + + + + + + + + + calendar + + + + + + + + My Timesheets + account.analytic.line + tree,form,kanban,calendar + [('project_id', '!=', False), ('user_id', '=', uid)] + { + "search_default_week":1, + } + + + +

+ No activities found. Let's start a new one! +

+

+ Track your working hours by projects every day and invoice this time to your customers. +

+
+
+ + + account.analytic.line.calendar + account.analytic.line + + + + + + + + + + + calendar + + + From 1b2c2ce7e947b8d7f7cd4aa5daf22595ade3aabf Mon Sep 17 00:00:00 2001 From: Pawan Kumar Date: Mon, 15 Feb 2021 22:52:25 +0530 Subject: [PATCH 3/4] add calendat for timesheet --- cor_custom/models/project.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cor_custom/models/project.py b/cor_custom/models/project.py index c015cb3..736ad91 100755 --- a/cor_custom/models/project.py +++ b/cor_custom/models/project.py @@ -331,5 +331,5 @@ class InheritProjectTask(models.Model): start_date = fields.Date(string='Start Date') def action_done_task(self): - print('9999999999999999') + print('88888888888888') From 84b61a7b3dfad444337d0156280ec19c09c56270 Mon Sep 17 00:00:00 2001 From: Pawan Kumar Date: Tue, 16 Feb 2021 11:28:29 +0530 Subject: [PATCH 4/4] add sub-project column in list view --- cor_custom/views/project_view.xml | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/cor_custom/views/project_view.xml b/cor_custom/views/project_view.xml index 4777664..d5579ee 100755 --- a/cor_custom/views/project_view.xml +++ b/cor_custom/views/project_view.xml @@ -170,6 +170,18 @@ + + project.project.tree.inherit + project.project + + + + + + + + + Projects project.project @@ -211,7 +223,8 @@ 1 - + @@ -226,7 +239,7 @@ code if records: - action = records.action_done_task() + action = records.action_done_task()