audrius/pms
1
0
Fork 1
mirror of https://github.com/OCA/pms.git synced 2025-01-29 00:17:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

[REF]pms: Refactor test pms reservation

Browse Source
This commit is contained in:
braisab
2021-06-28 14:54:38 +02:00
committed by Dario Lodeiros
parent 5abbba98d5
commit 197f4f8ed1
3 changed files with 457 additions and 421 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
pms/models/pms_folio.py
View File

@@ -764,62 +764,17 @@ class PmsFolio(models.Model):
@api.depends("partner_id", "partner_id.name", "reservation_ids.partner_name") @api.depends("partner_id", "partner_id.name", "reservation_ids.partner_name")
def _compute_partner_name(self): def _compute_partner_name(self):
for record in self: for record in self:
<<<<<<< HEAD
if record.partner_id and not record.partner_name:
record.partner_name = record.partner_id.name
# if there is only one customer name in the folio reservations
# we update the partner name of the folio when the partner name of
# the reservations is modified
elif (
len(record.reservation_ids.mapped("partner_name")) == 1
and not record.partner_name
):
record.partner_name = record.reservation_ids[0].partner_name
elif not record.partner_name:
record.partner_name = False
=======
self._apply_partner_name(record) self._apply_partner_name(record)
>>>>>>> [REF]pms: Refactor computes of partner_id, partner_name, email and mobile in folio and reservation
@api.depends("partner_id", "partner_id.email", "reservation_ids.partner_email") @api.depends("partner_id", "partner_id.email", "reservation_ids.partner_email")
def _compute_email(self): def _compute_email(self):
for record in self: for record in self:
<<<<<<< HEAD
if record.partner_id and not record.email:
record.email = record.partner_id.email
# if there is only one customer email in the folio reservations
# we update the partner email of the folio when the partner email of
# the reservations is modified
elif (
len(record.reservation_ids.mapped("partner_email")) == 1
and not record.email
):
record.email = record.reservation_ids[0].partner_email
elif not record.email:
record.email = False
=======
self._apply_email(record) self._apply_email(record)
>>>>>>> [REF]pms: Refactor computes of partner_id, partner_name, email and mobile in folio and reservation
@api.depends("partner_id", "partner_id.mobile", "reservation_ids.partner_mobile") @api.depends("partner_id", "partner_id.mobile", "reservation_ids.partner_mobile")
def _compute_mobile(self): def _compute_mobile(self):
for record in self: for record in self:
<<<<<<< HEAD
if record.partner_id and not record.mobile:
record.mobile = record.partner_id.mobile
# if there is only one customer mobile in the folio reservations
# we update the partner mobile of the folio when the partner mobile of
# the reservations is modified
elif (
len(record.reservation_ids.mapped("partner_mobile")) == 1
and not record.mobile
):
record.mobile = record.reservation_ids[0].partner_mobile
elif not record.mobile:
record.mobile = False
=======
self._apply_mobile(record) self._apply_mobile(record)
>>>>>>> [REF]pms: Refactor computes of partner_id, partner_name, email and mobile in folio and reservation
@api.depends( @api.depends(
"partner_name", "partner_name",

27
pms/models/pms_reservation.py
View File

@@ -1215,44 +1215,17 @@ class PmsReservation(models.Model):
@api.depends("partner_id", "partner_id.name", "folio_id.partner_name") @api.depends("partner_id", "partner_id.name", "folio_id.partner_name")
def _compute_partner_name(self): def _compute_partner_name(self):
for record in self: for record in self:
<<<<<<< HEAD
if record.partner_id and not record.partner_name:
record.partner_name = record.partner_id.name
elif record.folio_id.partner_name and not record.partner_name:
record.partner_name = record.folio_id.partner_name
elif not record.partner_name:
record.partner_name = False
=======
self.folio_id._apply_partner_name(record) self.folio_id._apply_partner_name(record)
>>>>>>> [REF]pms: Refactor computes of partner_id, partner_name, email and mobile in folio and reservation
@api.depends("partner_id", "partner_id.email") @api.depends("partner_id", "partner_id.email")
def _compute_email(self): def _compute_email(self):
for record in self: for record in self:
<<<<<<< HEAD
if record.partner_id and not record.partner_email:
record.partner_email = record.partner_id.email
elif record.folio_id.email and not record.partner_email:
record.partner_email = record.folio_id.partner_email
elif not record.partner_email:
record.partner_email = False
=======
self.folio_id._apply_email(record) self.folio_id._apply_email(record)
>>>>>>> [REF]pms: Refactor computes of partner_id, partner_name, email and mobile in folio and reservation
@api.depends("partner_id", "partner_id.mobile") @api.depends("partner_id", "partner_id.mobile")
def _compute_mobile(self): def _compute_mobile(self):
for record in self: for record in self:
<<<<<<< HEAD
if record.partner_id and not record.partner_mobile:
record.partner_mobile = record.partner_id.mobile
elif record.folio_id.mobile and not record.partner_mobile:
record.partner_mobile = record.folio_id.partner_mobile
elif not record.partner_mobile:
record.partner_mobile = False
=======
self.folio_id._apply_mobile(record) self.folio_id._apply_mobile(record)
>>>>>>> [REF]pms: Refactor computes of partner_id, partner_name, email and mobile in folio and reservation
@api.depends( @api.depends(
"partner_name", "partner_name",

806
pms/tests/test_pms_reservation.py
View File

File diff suppressed because it is too large Load Diff