From a635af77ad378bf607b90704997717bbe04a0412 Mon Sep 17 00:00:00 2001 From: HamedHamed-cs Date: Mon, 9 Dec 2024 08:57:39 +0200 Subject: [PATCH] project notes task --- odex25_project/project_base/models/project.py | 1 + odex25_project/project_base/views/project_views.xml | 4 +++- .../models/project_variation_order.py | 6 ++++++ .../views/project_variation_order_view.xml | 2 ++ .../web_gantt_native/static/src/css/gantt_native.css | 5 +++-- 5 files changed, 15 insertions(+), 3 deletions(-) diff --git a/odex25_project/project_base/models/project.py b/odex25_project/project_base/models/project.py index b152611dd..af9549422 100644 --- a/odex25_project/project_base/models/project.py +++ b/odex25_project/project_base/models/project.py @@ -97,6 +97,7 @@ class Project(models.Model): task_count_new = fields.Integer(compute='_compute_task_count_new', string="New Task Count") task_count_inprogress = fields.Integer(compute='_compute_task_count_inprogress', string="In progress Task Count") user_id = fields.Many2one('res.users', string='Project Manager', default=lambda self: self.env.user, tracking=True,domain=lambda self: [("groups_id", "in", self.env.ref("project.group_project_manager").id)]) + project_owner = fields.Many2one('res.users', string='Project Owner', tracking=True) privacy_visibility = fields.Selection([ ('followers', 'Invited internal users'), diff --git a/odex25_project/project_base/views/project_views.xml b/odex25_project/project_base/views/project_views.xml index bd9ef660c..6d3d12c5b 100644 --- a/odex25_project/project_base/views/project_views.xml +++ b/odex25_project/project_base/views/project_views.xml @@ -189,6 +189,8 @@ + + @@ -271,7 +273,7 @@ {} - + diff --git a/odex25_project/project_variation_order/models/project_variation_order.py b/odex25_project/project_variation_order/models/project_variation_order.py index 554b74b38..c257be786 100644 --- a/odex25_project/project_variation_order/models/project_variation_order.py +++ b/odex25_project/project_variation_order/models/project_variation_order.py @@ -83,6 +83,7 @@ class ProjectVariationOrder(models.Model): rec.project_phase_ids = False rec.project_invoice_ids = False rec.project_manager = False + rec.project_owner = False rec.start = False rec.date = False rec.total_invoiced_amount = 0.0 @@ -95,6 +96,8 @@ class ProjectVariationOrder(models.Model): rec.project_phase_ids = rec.project_id.project_phase_ids.ids if rec.project_id and rec.project_id.user_id: rec.project_manager = rec.project_id.user_id.id + if rec.project_id and rec.project_id.project_owner: + rec.project_owner = rec.project_id.project_owner.id if rec.project_id and rec.project_id.invoice_ids: rec.total_invoiced_amount = rec.project_id.total_invoiced_amount @@ -149,6 +152,9 @@ class ProjectVariationOrder(models.Model): self.write({'state': 'draft'}) + def action_return_implement(self): + self.write({'state': 'implement'}) + def action_confirm(self): self.write({'state': 'confirm'}) diff --git a/odex25_project/project_variation_order/views/project_variation_order_view.xml b/odex25_project/project_variation_order/views/project_variation_order_view.xml index 225e86d22..bc3bdf7b2 100644 --- a/odex25_project/project_variation_order/views/project_variation_order_view.xml +++ b/odex25_project/project_variation_order/views/project_variation_order_view.xml @@ -45,6 +45,8 @@