From 798bc3cd0a11296514900a93ba5912b76633b96e Mon Sep 17 00:00:00 2001 From: Sara Lago Date: Thu, 17 Jun 2021 12:49:31 +0200 Subject: [PATCH] [FIX] pms: fix compute_valid_from in res_partner_id_number and fix indentations in res_partner --- pms/models/pms_checkin_partner.py | 4 +- pms/models/res_partner.py | 90 ++++++++++++++--------------- pms/models/res_partner_id_number.py | 4 +- 3 files changed, 48 insertions(+), 50 deletions(-) diff --git a/pms/models/pms_checkin_partner.py b/pms/models/pms_checkin_partner.py index a966d3a88..2e9e3e8f7 100644 --- a/pms/models/pms_checkin_partner.py +++ b/pms/models/pms_checkin_partner.py @@ -325,13 +325,13 @@ class PmsCheckinPartner(models.Model): if not record.name or record.partner_id.name: record.name = record.partner_id.name - @api.depends("partner_id", "partner_id.email") + @api.depends("partner_id") def _compute_email(self): for record in self: if not record.email or record.partner_id.email: record.email = record.partner_id.email - @api.depends("partner_id", "partner_id.mobile") + @api.depends("partner_id") def _compute_mobile(self): for record in self: if not record.mobile or record.partner_id.mobile: diff --git a/pms/models/res_partner.py b/pms/models/res_partner.py index d3328d1ad..d8608318b 100644 --- a/pms/models/res_partner.py +++ b/pms/models/res_partner.py @@ -160,77 +160,75 @@ class ResPartner(models.Model): def _compute_email(self): if hasattr(super(), "_compute_email"): super()._compute_field() - for record in self: - if not record.email and record.pms_checkin_partner_ids: - email = list(set(record.pms_checkin_partner_ids.mapped("email"))) - if len(email) == 1: - record.email = email[0] - else: - record.email = False - elif not record.email: + for record in self: + if not record.email and record.pms_checkin_partner_ids: + email = list(set(record.pms_checkin_partner_ids.mapped("email"))) + if len(email) == 1: + record.email = email[0] + else: record.email = False + elif not record.email: + record.email = False @api.depends("pms_checkin_partner_ids", "pms_checkin_partner_ids.mobile") def _compute_mobile(self): if hasattr(super(), "_compute_mobile"): super()._compute_field() - for record in self: - if not record.mobile and record.pms_checkin_partner_ids: - mobile = list(set(record.pms_checkin_partner_ids.mapped("mobile"))) - if len(mobile) == 1: - record.mobile = mobile[0] - else: - record.mobile = False - elif not record.mobile: + for record in self: + if not record.mobile and record.pms_checkin_partner_ids: + mobile = list(set(record.pms_checkin_partner_ids.mapped("mobile"))) + if len(mobile) == 1: + record.mobile = mobile[0] + else: record.mobile = False + elif not record.mobile: + record.mobile = False @api.depends("pms_checkin_partner_ids", "pms_checkin_partner_ids.firstname") def _compute_firstname(self): if hasattr(super(), "_compute_firstname"): super()._compute_field() - for record in self: - if not record.firstname and record.pms_checkin_partner_ids: - firstname = list( - set(record.pms_checkin_partner_ids.mapped("firstname")) - ) - if len(firstname) == 1: - record.firstname = firstname[0] - else: - record.firstname = False - elif not record.firstname: + for record in self: + if not record.firstname and record.pms_checkin_partner_ids: + firstname = list( + set(record.pms_checkin_partner_ids.mapped("firstname")) + ) + if len(firstname) == 1: + record.firstname = firstname[0] + else: record.firstname = False + elif not record.firstname: + record.firstname = False @api.depends("pms_checkin_partner_ids", "pms_checkin_partner_ids.lastname") def _compute_lastname(self): if hasattr(super(), "_compute_lastname"): super()._compute_field() - for record in self: - if not record.lastname and record.pms_checkin_partner_ids: - lastname = list( - set(record.pms_checkin_partner_ids.mapped("lastname")) - ) - if len(lastname) == 1: - record.lastname = lastname[0] - else: - record.lastname = False - elif not record.lastname: + for record in self: + if not record.lastname and record.pms_checkin_partner_ids: + lastname = list(set(record.pms_checkin_partner_ids.mapped("lastname"))) + if len(lastname) == 1: + record.lastname = lastname[0] + else: record.lastname = False + elif not record.lastname: + record.lastname = False @api.depends("pms_checkin_partner_ids", "pms_checkin_partner_ids.lastname2") def _compute_lastname2(self): if hasattr(super(), "_compute_lastname2"): super()._compute_field() - for record in self: - if not record.lastname2 and record.pms_checkin_partner_ids: - lastname2 = list( - set(record.pms_checkin_partner_ids.mapped("lastname2")) - ) - if len(lastname2) == 1: - record.lastname2 = lastname2[0] - else: - record.lastname2 = False - elif not record.lastname2: + for record in self: + if not record.lastname2 and record.pms_checkin_partner_ids: + lastname2 = list( + set(record.pms_checkin_partner_ids.mapped("lastname2")) + ) + if len(lastname2) == 1: + record.lastname2 = lastname2[0] + else: record.lastname2 = False + elif not record.lastname2: + record.lastname2 = False def _compute_reservations_count(self): # TODO: recuperar las reservas de los folios del partner diff --git a/pms/models/res_partner_id_number.py b/pms/models/res_partner_id_number.py index 707426860..74138810f 100644 --- a/pms/models/res_partner_id_number.py +++ b/pms/models/res_partner_id_number.py @@ -27,10 +27,10 @@ class ResPartnerIdNumber(models.Model): if hasattr(super(), "_compute_valid_from"): super()._compute_field() for record in self: - if not record.valid_from and record.pms_checkin_partner_ids: + if not record.valid_from and record.partner_id.pms_checkin_partner_ids: document_expedition_date = list( set( - record.pms_checkin_partner_ids.mapped( + record.partner_id.pms_checkin_partner_ids.mapped( "document_expedition_date" ) )