From c37ef70045eeeffd54323fde9e2674415ca6e27c Mon Sep 17 00:00:00 2001 From: Pawan Kumar Date: Thu, 25 Feb 2021 10:36:04 +0530 Subject: [PATCH] add parent project field --- cor_custom/models/analytic.py | 22 +++++++++++----------- cor_custom/views/analytic_view.xml | 2 +- sub_project/models/sub_project.py | 2 +- sub_project/views/sub_project.xml | 4 ++-- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/cor_custom/models/analytic.py b/cor_custom/models/analytic.py index a142200..dc79a27 100755 --- a/cor_custom/models/analytic.py +++ b/cor_custom/models/analytic.py @@ -17,7 +17,7 @@ class AccountAnalyticLine(models.Model): start_time = fields.Float(string='Start Time', digits=(16, 2)) end_time = fields.Float(string='End Time', digits=(16, 2)) unit_amount = fields.Float('Duration', default=0.0) - parent_project = fields.Many2one('project.project', string='Parent Project') + parent_project = fields.Many2one('project.project', related='project_id.parent_project', string='Parent Project') def _default_start_datetime(self): @@ -30,16 +30,16 @@ class AccountAnalyticLine(models.Model): end_datetime = fields.Datetime("End Time", required=True) - @api.onchange('project_id') - def _onchange_parent_project_id(self): - if self.project_id: - parent_project = self.env['project.project'].search([('sub_project', '=', self.project_id.id)], limit=1) - if parent_project: - self.parent_project = parent_project.id - else: - self.parent_project = False - else: - self.parent_project = False + # @api.onchange('project_id') + # def _onchange_parent_project_id(self): + # if self.project_id: + # parent_project = self.env['project.project'].search([('sub_project', '=', self.project_id.id)], limit=1) + # if parent_project: + # self.parent_project = parent_project.id + # else: + # self.parent_project = False + # else: + # self.parent_project = False @api.onchange('employee_id') diff --git a/cor_custom/views/analytic_view.xml b/cor_custom/views/analytic_view.xml index c6c60c7..0bf90cd 100755 --- a/cor_custom/views/analytic_view.xml +++ b/cor_custom/views/analytic_view.xml @@ -79,7 +79,7 @@ - + diff --git a/sub_project/models/sub_project.py b/sub_project/models/sub_project.py index 19964f4..6e3e72f 100755 --- a/sub_project/models/sub_project.py +++ b/sub_project/models/sub_project.py @@ -8,7 +8,7 @@ class SubProject(models.Model): is_sub_project = fields.Boolean("Is Sub Project") sub_project = fields.Many2many('project.project', 'project_subproject_rel', 'project_id', 'id', domain="[('is_sub_project', '=', True)]", string='Sub Project') - parent_project = fields.Many2one('project.project', string='Parent Project') + parent_project = fields.Many2one('project.project', domain="[('is_sub_project', '=', False)]", string='Parent Project') @api.depends('sub_project') def onchange_parent_project_sub_project(self): diff --git a/sub_project/views/sub_project.xml b/sub_project/views/sub_project.xml index aa352ca..5f8b66a 100755 --- a/sub_project/views/sub_project.xml +++ b/sub_project/views/sub_project.xml @@ -9,10 +9,10 @@ - + - +