From b3186b70e997809c82bdf8043f938b7d2314a939 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dar=C3=ADo=20Lodeiros?= Date: Sat, 22 May 2021 09:50:31 +0200 Subject: [PATCH] [RFC] Models descriptions and other fixes --- pms/i18n/es.po | 2 +- pms/models/account_bank_statement.py | 3 --- pms/models/account_bank_statement_line.py | 18 +++++++++--------- pms/models/account_journal.py | 2 -- pms/models/pms_folio.py | 6 +++--- pms/models/pms_reservation_line.py | 1 + pms/wizards/wizard_folio.py | 7 ++----- pms/wizards/wizard_folio_availability.py | 4 +++- pms/wizards/wizard_payment_folio.py | 2 +- .../wizard_split_join_swap_reservation.py | 2 ++ 10 files changed, 22 insertions(+), 25 deletions(-) diff --git a/pms/i18n/es.po b/pms/i18n/es.po index fcef529b4..7c5aba43a 100644 --- a/pms/i18n/es.po +++ b/pms/i18n/es.po @@ -2207,7 +2207,7 @@ msgstr "Asistente del Folio" #. module: pms #: model:ir.actions.act_window,name:pms.pms_partner_folios -#: model:ir.model.fields,field_description:pms.field_account_bank_statement_line__statement_folio_ids +#: model:ir.model.fields,field_description:pms.field_account_bank_statement_line_folio_ids #: model:ir.model.fields,field_description:pms.field_account_move_line__folio_ids #: model:ir.model.fields,field_description:pms.field_pms_property__folios_count #: model:ir.model.fields,field_description:pms.field_res_partner__folios_count diff --git a/pms/models/account_bank_statement.py b/pms/models/account_bank_statement.py index ffd9205a1..b01042797 100644 --- a/pms/models/account_bank_statement.py +++ b/pms/models/account_bank_statement.py @@ -3,17 +3,14 @@ from odoo import fields, models class AccountBankStatement(models.Model): _inherit = "account.bank.statement" - _check_pms_properties_auto = True pms_property_id = fields.Many2one( string="Property", help="Properties with access to the element", copy=False, comodel_name="pms.property", - check_pms_properties=True, ) company_id = fields.Many2one( string="Company", help="The company for Account Bank Statement", - check_pms_properties=True, ) diff --git a/pms/models/account_bank_statement_line.py b/pms/models/account_bank_statement_line.py index e0ae8d426..3a4c76050 100644 --- a/pms/models/account_bank_statement_line.py +++ b/pms/models/account_bank_statement_line.py @@ -4,31 +4,31 @@ from odoo import api, fields, models class AccountBankStatementLine(models.Model): _inherit = "account.bank.statement.line" - statement_folio_ids = fields.Many2many( + folio_ids = fields.Many2many( string="Folios", comodel_name="pms.folio", ondelete="cascade", - relation="account_bank_statement_statement_folio_ids_rel", + relation="account_bank_statement_folio_rel", column1="account_journal_id", - column2="statement_folio_ids_id", + column2="folio_id", ) reservation_ids = fields.Many2many( string="Reservations", help="Reservations in which the Account Bank Statement Lines are included", comodel_name="pms.reservation", ondelete="cascade", - relation="account_bank_statement_reservation_ids_rel", + relation="account_bank_statement_reservation_rel", column1="account_bank_statement_id", - column2="reservation_ids_id", + column2="reservation_id", ) service_ids = fields.Many2many( string="Services", help="Services in which the Account Bank Statement Lines are included", comodel_name="pms.service", ondelete="cascade", - relation="account_bank_statement_service_ids_rel", + relation="account_bank_statement_service_rel", column1="account_bank_statement_id", - column2="service_ids_id", + column2="service_id", ) @api.model @@ -36,11 +36,11 @@ class AccountBankStatementLine(models.Model): line_vals_list = super( AccountBankStatementLine, self )._prepare_move_line_default_vals(counterpart_account_id) - if self.statement_folio_ids: + if self.folio_ids: for line in line_vals_list: line.update( { - "folio_ids": [(6, 0, self.statement_folio_ids.ids)], + "folio_ids": [(6, 0, self.folio_ids.ids)], } ) return line_vals_list diff --git a/pms/models/account_journal.py b/pms/models/account_journal.py index 3c9d3470d..ca1266390 100644 --- a/pms/models/account_journal.py +++ b/pms/models/account_journal.py @@ -3,7 +3,6 @@ from odoo import fields, models class AccountJournal(models.Model): _inherit = "account.journal" - _check_pms_properties_auto = True pms_property_ids = fields.Many2many( string="Properties", @@ -14,7 +13,6 @@ class AccountJournal(models.Model): relation="account_journal_pms_property_rel", column1="account_journal_id", column2="pms_property_id", - check_pms_properties=True, ) company_id = fields.Many2one( string="Company", diff --git a/pms/models/pms_folio.py b/pms/models/pms_folio.py index 0d66da77b..1899af850 100644 --- a/pms/models/pms_folio.py +++ b/pms/models/pms_folio.py @@ -1326,7 +1326,7 @@ class PmsFolio(models.Model): .search( [ ("journal_id", "=", journal.id), - ("property_id", "=", property_folio_id[0]), + ("pms_property_id", "=", property_folio_id[0]), ("state", "=", "open"), ] ) @@ -1338,7 +1338,7 @@ class PmsFolio(models.Model): st_values = { "journal_id": journal.id, "user_id": self.env.user.id, - "property_id": property_folio_id[0], + "pms_property_id": property_folio_id[0], "name": str(fields.Datetime.now()), } statement = ( @@ -1351,7 +1351,7 @@ class PmsFolio(models.Model): "date": date, "amount": amount, "partner_id": partner.id if partner else False, - "statement_folio_ids": [(6, 0, folios.ids)], + "folio_ids": [(6, 0, folios.ids)], "reservation_ids": [(6, 0, reservation_ids)], "service_ids": [(6, 0, service_ids)], "payment_ref": folios.mapped("name"), diff --git a/pms/models/pms_reservation_line.py b/pms/models/pms_reservation_line.py index 5f21b7067..23e09782a 100644 --- a/pms/models/pms_reservation_line.py +++ b/pms/models/pms_reservation_line.py @@ -64,6 +64,7 @@ class PmsReservationLine(models.Model): string="State", help="State of the reservation line.", related="reservation_id.state", + store=True, ) price = fields.Float( string="Price", diff --git a/pms/wizards/wizard_folio.py b/pms/wizards/wizard_folio.py index 29649f178..fcbaf461a 100644 --- a/pms/wizards/wizard_folio.py +++ b/pms/wizards/wizard_folio.py @@ -5,10 +5,7 @@ from odoo import api, fields, models class FolioWizard(models.TransientModel): _name = "pms.folio.wizard" - _description = ( - "Wizard to check availability by room type and pricelist &" - " creation of folios with its reservations" - ) + _description = "Booking engine" _check_pms_properties_auto = True start_date = fields.Date( @@ -56,7 +53,7 @@ class FolioWizard(models.TransientModel): check_pms_properties=True, ) availability_results = fields.One2many( - strign="Availability Results", + string="Availability Results", help="Availability Results", readonly=False, store=True, diff --git a/pms/wizards/wizard_folio_availability.py b/pms/wizards/wizard_folio_availability.py index e821ed3bd..698f2dba1 100644 --- a/pms/wizards/wizard_folio_availability.py +++ b/pms/wizards/wizard_folio_availability.py @@ -5,7 +5,9 @@ from odoo import api, fields, models class NumRoomsSelectionModel(models.TransientModel): _name = "pms.num.rooms.selection" + _description = "Dinamic Selection based on avails room" _rec_name = "value" + value = fields.Integer() room_type_id = fields.Char() folio_wizard_id = fields.One2many( @@ -16,6 +18,7 @@ class NumRoomsSelectionModel(models.TransientModel): class AvailabilityWizard(models.TransientModel): _name = "pms.folio.availability.wizard" + _description = "Room type line in Booking Engine" _check_pms_properties_auto = True folio_wizard_id = fields.Many2one( @@ -50,7 +53,6 @@ class AvailabilityWizard(models.TransientModel): readonly=False, store=True, comodel_name="pms.num.rooms.selection", - inverse_name="folio_wizard_id", domain="[('value', '<=', num_rooms_available), " "('room_type_id', '=', room_type_id)]", compute="_compute_num_rooms_selected", diff --git a/pms/wizards/wizard_payment_folio.py b/pms/wizards/wizard_payment_folio.py index 15ad88fd4..2e54f150d 100644 --- a/pms/wizards/wizard_payment_folio.py +++ b/pms/wizards/wizard_payment_folio.py @@ -38,7 +38,7 @@ class WizardPaymentFolio(models.TransientModel): compute="_compute_allowed_method_ids", ) amount = fields.Float(string="Amount", digits=("Product Price")) - date = fields.Date(String="Date", required=True, default=fields.Date.context_today) + date = fields.Date(string="Date", required=True, default=fields.Date.context_today) partner_id = fields.Many2one(string="Partner", comodel_name="res.partner") @api.depends("folio_id") diff --git a/pms/wizards/wizard_split_join_swap_reservation.py b/pms/wizards/wizard_split_join_swap_reservation.py index a55d8a435..0ad4cde19 100644 --- a/pms/wizards/wizard_split_join_swap_reservation.py +++ b/pms/wizards/wizard_split_join_swap_reservation.py @@ -6,6 +6,7 @@ from odoo.exceptions import UserError class ReservationSplitJoinSwapWizard(models.TransientModel): _name = "pms.reservation.split.join.swap.wizard" + _description = "Operations in reservations" operation = fields.Selection( string="Operation", @@ -308,6 +309,7 @@ class ReservationSplitJoinSwapWizard(models.TransientModel): class ReservationLinesToSplit(models.TransientModel): _name = "pms.wizard.reservation.lines.split" + _decription = "Lines available to split" reservation_wizard_id = fields.Many2one( string="Reservation Wizard",