diff --git a/pms_hr_property/__manifest__.py b/pms_hr_property/__manifest__.py index 842831c9a..8ae1f1c90 100644 --- a/pms_hr_property/__manifest__.py +++ b/pms_hr_property/__manifest__.py @@ -5,7 +5,7 @@ "name": "PMS Hr Property", "summary": """ Adds to the employee the property on which he works.""", - "version": "14.0.1.0.0", + "version": "14.0.2.0.0", "license": "AGPL-3", "author": "OsoTranquilo,Odoo Community Association (OCA)", "website": "https://github.com/OCA/pms", diff --git a/pms_hr_property/migrations/14.0.2.0.0/pre_migration.py b/pms_hr_property/migrations/14.0.2.0.0/pre_migration.py new file mode 100644 index 000000000..778b291cd --- /dev/null +++ b/pms_hr_property/migrations/14.0.2.0.0/pre_migration.py @@ -0,0 +1,24 @@ +from openupgradelib import openupgrade + + +@openupgrade.migrate() +def migrate(env, version): + openupgrade.logged_query( + env.cr, + """ + UPDATE pms_ rl + SET sale_channel_id = r.sale_channel_origin_id + FROM pms_reservation r + WHERE r.id = rl.reservation_id + """, + ) + + openupgrade.logged_query( + env.cr, + """ + UPDATE pms_service ser + SET sale_channel_origin_id = fol.sale_channel_origin_id + FROM pms_folio fol + WHERE fol.id = ser.folio_id + """, + ) diff --git a/pms_hr_property/models/__init__.py b/pms_hr_property/models/__init__.py index 8a3d3ba90..89372ccd3 100644 --- a/pms_hr_property/models/__init__.py +++ b/pms_hr_property/models/__init__.py @@ -1,2 +1,2 @@ from . import hr_employee -from . import pms_hr_property +from . import pms_property diff --git a/pms_hr_property/models/hr_employee.py b/pms_hr_property/models/hr_employee.py index 3478af16a..af758277a 100644 --- a/pms_hr_property/models/hr_employee.py +++ b/pms_hr_property/models/hr_employee.py @@ -9,4 +9,10 @@ class HrEmployeeBase(models.AbstractModel): _inherit = "hr.employee.base" - property_ids = fields.Many2many("pms.property", string="Workplaces asigned") + property_ids = fields.Many2many( + comodel_name="pms.property", + string="Workplaces asigned", + relation="hr_employee_pms_property_rel", + column1="hr_employee_id", + column2="pms_property_id", + ) diff --git a/pms_hr_property/models/pms_hr_property.py b/pms_hr_property/models/pms_property.py similarity index 53% rename from pms_hr_property/models/pms_hr_property.py rename to pms_hr_property/models/pms_property.py index e82abdfcc..75ff1817a 100644 --- a/pms_hr_property/models/pms_hr_property.py +++ b/pms_hr_property/models/pms_property.py @@ -2,7 +2,7 @@ # Copyright 2024 Irlui Ramírez # From Consultores Hoteleros Integrales (ALDA Hotels) - 2024 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -from odoo import api, fields, models +from odoo import fields, models class PmsHrProperty(models.Model): @@ -11,13 +11,7 @@ class PmsHrProperty(models.Model): employee_ids = fields.Many2many( comodel_name="hr.employee", string="Assigned Employees", - compute="_compute_employee_ids", + relation="hr_employee_pms_property_rel", + column1="pms_property_id", + column2="hr_employee_id", ) - - @api.depends("employee_ids") - def _compute_employee_ids(self): - for record in self: - employees = self.env["hr.employee"].search( - [("property_ids", "in", record.id)] - ) - record.employee_ids = employees