From a70dafc3c6d4da20d8693804c55bf64b794dd060 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dar=C3=ADo=20Lodeiros?= Date: Sun, 27 Sep 2020 09:18:07 +0200 Subject: [PATCH] [WIP] Mig 14.0 sintax --- pms/models/pms_checkin_partner.py | 2 +- pms/models/pms_folio.py | 16 +++++++--------- pms/models/pms_reservation.py | 22 +++++++++------------- pms/models/pms_room_type_availability.py | 12 ++++++++---- 4 files changed, 25 insertions(+), 27 deletions(-) diff --git a/pms/models/pms_checkin_partner.py b/pms/models/pms_checkin_partner.py index a7e325a6d..eed942e5f 100644 --- a/pms/models/pms_checkin_partner.py +++ b/pms/models/pms_checkin_partner.py @@ -105,7 +105,7 @@ class PmsCheckinPartner(models.Model): string="State", readonly=True, default=lambda *a: "draft", - track_visibility="onchange", + tracking=True, ) # Constraints and onchanges diff --git a/pms/models/pms_folio.py b/pms/models/pms_folio.py index 1032e96e3..2a955f888 100644 --- a/pms/models/pms_folio.py +++ b/pms/models/pms_folio.py @@ -45,14 +45,12 @@ class PmsFolio(models.Model): # Fields declaration name = fields.Char( - String="Folio Number", readonly=True, index=True, default=lambda self: _("New") + string="Folio Number", readonly=True, index=True, default=lambda self: _("New") ) pms_property_id = fields.Many2one( "pms.property", default=_get_default_pms_property, required=True ) - partner_id = fields.Many2one( - "res.partner", track_visibility="onchange", ondelete="restrict" - ) + partner_id = fields.Many2one("res.partner", tracking=True, ondelete="restrict") reservation_ids = fields.One2many( "pms.reservation", "folio_id", @@ -109,7 +107,7 @@ class PmsFolio(models.Model): string="Salesperson", index=True, ondelete="restrict", - track_visibility="onchange", + tracking=True, compute="_compute_user_id", store=True, readonly=False, @@ -201,7 +199,7 @@ class PmsFolio(models.Model): readonly=True, copy=False, index=True, - track_visibility="onchange", + tracking=True, default="draft", ) # Partner fields for being used directly in the Folio views--------- @@ -224,7 +222,7 @@ class PmsFolio(models.Model): invoices_paid = fields.Monetary( compute="_compute_amount", store=True, - track_visibility="onchange", + tracking=True, string="Payments", ) amount_untaxed = fields.Monetary( @@ -232,7 +230,7 @@ class PmsFolio(models.Model): store=True, readonly=True, compute="_compute_amount_all", - track_visibility="onchange", + tracking=True, ) amount_tax = fields.Monetary( string="Taxes", store=True, readonly=True, compute="_compute_amount_all" @@ -242,7 +240,7 @@ class PmsFolio(models.Model): store=True, readonly=True, compute="_compute_amount_all", - track_visibility="always", + tracking=True, ) # Checkin Fields----------------------------------------------------- booking_pending = fields.Integer( diff --git a/pms/models/pms_reservation.py b/pms/models/pms_reservation.py index 5ecdf67ae..b4c934d13 100644 --- a/pms/models/pms_reservation.py +++ b/pms/models/pms_reservation.py @@ -109,7 +109,7 @@ class PmsReservation(models.Model): room_id = fields.Many2one( "pms.room", string="Room", - track_visibility="onchange", + tracking=True, ondelete="restrict", compute="_compute_room_id", store=True, @@ -125,7 +125,7 @@ class PmsReservation(models.Model): folio_id = fields.Many2one( "pms.folio", string="Folio", - track_visibility="onchange", + tracking=True, ondelete="restrict", ) board_service_room_id = fields.Many2one( @@ -135,7 +135,7 @@ class PmsReservation(models.Model): room_type_id = fields.Many2one( "pms.room.type", string="Room Type", - track_visibility="onchange", + tracking=True, # required=True, compute="_compute_room_type_id", store=True, @@ -143,7 +143,7 @@ class PmsReservation(models.Model): ) partner_id = fields.Many2one( "res.partner", - track_visibility="onchange", + tracking=True, ondelete="restrict", compute="_compute_partner_id", store=True, @@ -223,7 +223,7 @@ class PmsReservation(models.Model): adults = fields.Integer( "Adults", size=64, - track_visibility="onchange", + tracking=True, help="List of adults there in guest list. ", compute="_compute_adults", store=True, @@ -233,10 +233,10 @@ class PmsReservation(models.Model): "Children", size=64, readonly=False, - track_visibility="onchange", + tracking=True, help="Number of children there in guest list.", ) - to_assign = fields.Boolean("To Assign", track_visibility="onchange") + to_assign = fields.Boolean("To Assign", tracking=True) state = fields.Selection( [ ("draft", "Pre-reservation"), @@ -248,7 +248,7 @@ class PmsReservation(models.Model): string="Status", default=lambda *a: "draft", copy=False, - track_visibility="onchange", + tracking=True, readonly=True, ) reservation_type = fields.Selection( @@ -264,7 +264,7 @@ class PmsReservation(models.Model): cancelled_reason = fields.Selection( [("late", "Late"), ("intime", "In time"), ("noshow", "No Show")], string="Cause of cancelled", - track_visibility="onchange", + tracking=True, ) out_service_description = fields.Text("Cause of out of service") checkin = fields.Date("Check In", required=True, default=_get_default_checkin) @@ -358,14 +358,12 @@ class PmsReservation(models.Model): string="Subtotal", readonly=True, store=True, - digits=("Product Price"), compute="_compute_amount_reservation", ) price_total = fields.Monetary( string="Total", readonly=True, store=True, - digits=("Product Price"), compute="_compute_amount_reservation", ) price_tax = fields.Float( @@ -378,14 +376,12 @@ class PmsReservation(models.Model): string="Services Total", readonly=True, store=True, - digits=("Product Price"), compute="_compute_amount_room_services", ) price_room_services_set = fields.Monetary( string="Room Services Total", readonly=True, store=True, - digits=("Product Price"), compute="_compute_amount_set", ) discount = fields.Float( diff --git a/pms/models/pms_room_type_availability.py b/pms/models/pms_room_type_availability.py index e4e16f332..4b62ae422 100644 --- a/pms/models/pms_room_type_availability.py +++ b/pms/models/pms_room_type_availability.py @@ -24,24 +24,28 @@ class PmsRoomTypeAvailability(models.Model): room_type_id = fields.Many2one( "pms.room.type", "Room Type", required=True, ondelete="cascade" ) - date = fields.Date("Date", required=True, track_visibility="always") + date = fields.Date( + "Date", + required=True, + tracking=True, + ) quota = fields.Integer( "Quota", default=_default_quota, - track_visibility="always", + tracking=True, help="Generic Quota assigned.", ) max_avail = fields.Integer( "Max. Availability", default=-1, readonly=True, - track_visibility="always", + tracking=True, help="Maximum simultaneous availability on own Booking Engine.", ) no_web = fields.Boolean( "No Web", default=False, - track_visibility="onchange", + tracking=True, help="Set zero availability to the own Booking Engine " "even when the availability is positive,", )