From 1635abb3c8a4cb82ad579db4c865857e84893f9f Mon Sep 17 00:00:00 2001 From: Marc Durepos Date: Mon, 19 Jun 2023 11:52:13 -0400 Subject: [PATCH] bemade_fsm: Updated to require bemade_partner_root_ancestor, refactored out call to Partner.get_root_ancestor(). --- __manifest__.py | 1 + models/equipment.py | 2 +- models/res_partner.py | 10 ---------- tests/test_task_template.py | 1 - 4 files changed, 2 insertions(+), 12 deletions(-) diff --git a/__manifest__.py b/__manifest__.py index 3632f50..0a0e459 100644 --- a/__manifest__.py +++ b/__manifest__.py @@ -34,6 +34,7 @@ 'sale_stock', 'industry_fsm', 'industry_fsm_sale', + 'bemade_partner_root_ancestor', ], 'data': ['views/task_template_views.xml', 'views/equipment.xml', diff --git a/models/equipment.py b/models/equipment.py index 203037e..b82c143 100644 --- a/models/equipment.py +++ b/models/equipment.py @@ -56,7 +56,7 @@ class Equipment(models.Model): @api.depends('partner_location_id') def _compute_partner(self): for rec in self: - rec.partner_id = rec.partner_location_id and rec.partner_location_id.get_root_ancestor() + rec.partner_id = rec.partner_location_id and rec.partner_location_id.root_ancestor @api.depends('pid_tag', 'name') def _compute_complete_name(self): diff --git a/models/res_partner.py b/models/res_partner.py index 574a0f2..c9f1877 100644 --- a/models/res_partner.py +++ b/models/res_partner.py @@ -43,13 +43,3 @@ class Partner(models.Model): for rec in self: all_equipmemt_ids = self.env['bemade_fsm.equipment'].search([('partner_id', '=', rec.id)]) rec.equipment_count = len(all_equipmemt_ids) - - def get_root_ancestor(self): - """ Returns the partner at the top of the parent-child hierarchy. """ - self.ensure_one() - return self.parent_id and self.parent_id.get_root_ancestor() or self - - def get_first_company_ancestor(self): - """ Returns the first ancestor that is a company """ - self.ensure_one() - return self.is_company and self or self.parent_id and self.parent_id.get_first_company_ancestor() diff --git a/tests/test_task_template.py b/tests/test_task_template.py index 2857b6c..bd46e0a 100644 --- a/tests/test_task_template.py +++ b/tests/test_task_template.py @@ -1,6 +1,5 @@ from .test_bemade_fsm_common import FSMManagerUserTransactionCase from odoo.tests.common import HttpCase, tagged -from odoo.tools import mute_logger from odoo.exceptions import MissingError from odoo import Command from psycopg2.errors import ForeignKeyViolation