diff --git a/pms/README.rst b/pms/README.rst index 1adfcffe86c..747f49fa5ab 100644 --- a/pms/README.rst +++ b/pms/README.rst @@ -2,12 +2,12 @@ PMS (Property Management System) ================================ -.. +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - !! source digest: sha256:4f0393d5fcb9c4849b44b6dc0a699e103b2bacebc46eec3b9c8cccbc3030a628 + !! source digest: sha256:084d2899cbc7b06f7ece70261b11256045c44b256ebff405d42812f6f32dd1fc !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png diff --git a/pms/__manifest__.py b/pms/__manifest__.py index 6dc9d76241d..4706655c081 100644 --- a/pms/__manifest__.py +++ b/pms/__manifest__.py @@ -4,7 +4,7 @@ { "name": "PMS (Property Management System)", "summary": "A property management system", - "version": "14.0.2.37.0", + "version": "16.0.1.0.0", "development_status": "Beta", "category": "Generic Modules/Property Management System", "website": "https://github.com/OCA/pms", @@ -20,16 +20,15 @@ # "email_template_qweb", "sale", "multi_pms_properties", + "partner_identification", "partner_firstname", "partner_second_lastname", "partner_contact_gender", "partner_contact_birthdate", "partner_contact_nationality", - "account_reconciliation_widget", # "partner_identification_unique_by_category", "queue_job", "web_timeline", - "partner_identification", ], "data": [ "security/pms_security.xml", @@ -71,9 +70,9 @@ "views/pms_room_type_views.xml", "views/pms_room_views.xml", "views/pms_room_closure_reason_views.xml", - "views/account_payment_views.xml", + # "views/account_payment_views.xml", # TODO Check how is called this views now or if they are used "views/account_move_views.xml", - "views/account_bank_statement_views.xml", + # "views/account_bank_statement_views.xml", # TODO Check how is called this views now or if they are used "views/res_users_views.xml", "views/pms_room_type_class_views.xml", "views/pms_availability_plan_views.xml", @@ -83,24 +82,22 @@ "views/product_pricelist_item_views.xml", "views/pms_sale_channel.xml", "views/product_template_views.xml", - "views/webclient_templates.xml", "views/account_journal_views.xml", "views/folio_portal_templates.xml", "views/reservation_portal_templates.xml", "views/res_company_views.xml", "views/traveller_report_template.xml", - "views/assets.xml", "wizards/wizard_split_join_swap_reservation.xml", "views/precheckin_portal_templates.xml", "wizards/wizard_massive_changes.xml", "wizards/wizard_advanced_filters.xml", - "views/payment_transaction_views.xml", + # "views/payment_transaction_views.xml", # TODO Check how is called this views now or if they are used "views/account_move_line_views.xml", "report/proforma_report_templates.xml", "report/proforma_report.xml", "views/account_portal_templates.xml", - "views/payment_acquirer_views.xml", - "views/account_analytic_distribution_views.xml", + # "views/payment_acquirer_views.xml", # TODO Check how is called this views now or if they are used + # "views/account_analytic_distribution_views.xml", # TODO check how would work (was with analytic_tags) "views/account_analytic_line_views.xml", "views/res_partner_category.xml", "views/res_partner_id_category_views.xml", @@ -108,15 +105,24 @@ "views/res_country_views.xml", ], "demo": [ - "demo/pms_master_data_no_update.xml", - "demo/pms_master_data.xml", - "demo/pms_folio.xml", - "demo/pms_reservation.xml", - ], - "qweb": [ - "static/src/xml/pms_base_templates.xml", - "static/src/xml/reservation_group_button_views.xml", - "static/src/xml/account_reconciliation.xml", + # "demo/pms_master_data_no_update.xml", + # "demo/pms_master_data.xml", + # "demo/pms_folio.xml", + # "demo/pms_reservation.xml", ], + "assets": { + 'portal.assets_frontend': [ + # "/pms/static/src/js/send_invitation_data.js", + # "/pms/static/src/js/folio_portal_sidebar.js", + # "pms/static/src/xml/pms_base_templates.xml", + # "pms/static/src/xml/reservation_group_button_views.xml", + # "pms/static/src/xml/account_reconciliation.xml", + ], + "web.assets_backend": [ + # "/pms/static/src/js/inherited_abstract_web_client.js", + # "/pms/static/src/js/widgets/switch_property_menu.js", + # "/pms/static/src/js/pms_list_controller.js", + # "/pms/static/src/js/reconciliation_widget.js", + ]}, "pre_init_hook": "pre_init_hook", } diff --git a/pms/controllers/pms_portal.py b/pms/controllers/pms_portal.py index e47e860be3b..ff699a254f9 100644 --- a/pms/controllers/pms_portal.py +++ b/pms/controllers/pms_portal.py @@ -3,7 +3,7 @@ from odoo.http import request from odoo.addons.account.controllers.portal import PortalAccount -from odoo.addons.payment.controllers.portal import PaymentProcessing +from odoo.addons.account_payment.controllers.portal import PaymentPortal from odoo.addons.portal.controllers.portal import CustomerPortal, pager as portal_pager from odoo.addons.portal.models.portal_mixin import PortalMixin @@ -105,7 +105,7 @@ def folio_pay_form( if save_token: vals["type"] = "form_save" transaction = folio_sudo._create_payment_transaction(vals) - PaymentProcessing.add_payment_transaction(transaction) + PaymentPortal._create_transaction(transaction) if not transaction: return False tx_ids_list = set(request.session.get("__payment_tx_ids__", [])) | set( diff --git a/pms/data/pms_cancelled_reservation_email_template.xml b/pms/data/pms_cancelled_reservation_email_template.xml index 4989e0f6d22..3be769a711b 100644 --- a/pms/data/pms_cancelled_reservation_email_template.xml +++ b/pms/data/pms_cancelled_reservation_email_template.xml @@ -5,13 +5,13 @@ Your reservation in ${object.pms_property_id.name} has been cancelled + >Your reservation in {{object.pms_property_id.name}} has been cancelled ${object.pms_property_id.partner_id.email | safe} + >{{object.pms_property_id.partner_id.email | safe}} ${(object.email and '"%s" <%s>' % (object.name, object.email) or object.partner_id.email_formatted or '') | safe} + >{{(object.email and '"%s" <%s>' % (object.name, object.email) or object.partner_id.email_formatted or '') | safe}} % if object.pms_property_id.partner_id.street

${object.pms_property_id.partner_id.street}

+ >{{object.pms_property_id.partner_id.street}}

% endif % if object.pms_property_id.partner_id.street2

${object.pms_property_id.partner_id.street2}

+ >{{object.pms_property_id.partner_id.street2}}

% endif

${object.pms_property_id.partner_id.zip}

+ >{{object.pms_property_id.partner_id.zip}}

${object.pms_property_id.partner_id.city}

+ >{{object.pms_property_id.partner_id.city}}

${object.pms_property_id.partner_id.country_id.name}

+ >{{object.pms_property_id.partner_id.country_id.name}}

@@ -62,9 +62,9 @@ style="background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin: 16px 0px 16px 0px;" />
- Hello ${object.partner_id.name or ''},
- Your reservation at ${object.pms_property_id.name} has been cancelled. + Your reservation at {{object.pms_property_id.name}} has been cancelled.
@@ -91,20 +91,20 @@ >If you have questions please contact with us: @@ -126,7 +126,7 @@ style="min-width: 590px; background-color: #F1F1F1; color: #454748; padding: 8px; border-collapse:separate;" > - ${object.pms_property_id.privacy_policy} + {{object.pms_property_id.privacy_policy}} % endif @@ -143,9 +143,9 @@ Sent by ${object.company_id.name} + >{{object.company_id.name}}
@@ -153,6 +153,6 @@
- ${object.partner_id.lang} + {{object.partner_id.lang}} diff --git a/pms/data/pms_confirmed_reservation_email_template.xml b/pms/data/pms_confirmed_reservation_email_template.xml index 185b79d18ea..8dfd0307f99 100644 --- a/pms/data/pms_confirmed_reservation_email_template.xml +++ b/pms/data/pms_confirmed_reservation_email_template.xml @@ -5,13 +5,13 @@ ${object.company_id.name} has confirmed your reservation in ${object.pms_property_id.name} + >{{object.company_id.name}} has confirmed your reservation in {{object.pms_property_id.name}} ${object.pms_property_id.partner_id.email | safe} + >{{object.pms_property_id.partner_id.email | safe}} ${(object.email and '"%s" <%s>' % (object.name, object.email) or object.partner_id.email_formatted or '') | safe} + >{{(object.email and '"%s" <%s>' % (object.name, object.email) or object.partner_id.email_formatted or '') | safe}} % if object.pms_property_id.partner_id.street

${object.pms_property_id.partner_id.street}

+ >{{object.pms_property_id.partner_id.street}}

% endif % if object.pms_property_id.partner_id.street2

${object.pms_property_id.partner_id.street2}

+ >{{object.pms_property_id.partner_id.street2}}

% endif

${object.pms_property_id.partner_id.zip}

+ >{{object.pms_property_id.partner_id.zip}}

${object.pms_property_id.partner_id.city}

+ >{{object.pms_property_id.partner_id.city}}

${object.pms_property_id.partner_id.country_id.name}

+ >{{object.pms_property_id.partner_id.country_id.name}}

@@ -115,13 +115,13 @@ style="margin: 16px 0px 16px 0px; font-size: 14px;" >
From ${object.first_checkin}
+ >From {{object.first_checkin}}
To ${object.last_checkout}
+ >To {{object.last_checkout}}
TZ ${object.pms_property_id.tz}
+ >TZ {{object.pms_property_id.tz}} @@ -140,7 +140,7 @@ >Rooms:
% for reservation in object.reservation_ids: - ${reservation.room_type_id.name}
% endfor @@ -160,7 +160,7 @@ >
Price: ${object.amount_total} ${object.pms_property_id.country_id.currency_id.symbol}
+ >Price: {{object.amount_total}} {{object.pms_property_id.country_id.currency_id.symbol}}
@@ -69,15 +69,15 @@ style="background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin: 16px 0px 16px 0px;" />
- Hello ${object.partner_id.name or ''},
- We are happy to confirm your reservation in ${object.pms_property_id.name} + We are happy to confirm your reservation in {{object.pms_property_id.name}}
See you soon,

- ${object.company_id.name} + {{object.company_id.name}}
@@ -178,7 +178,7 @@ style="margin: 16px 0px 16px 0px;" >Additional Information - ${object.pms_property_id.mail_information|safe} + {{object.pms_property_id.mail_information|safe}} % endif @@ -207,7 +207,7 @@ @@ -220,7 +220,7 @@ alt="Hacer check-in" width="80px" height="80px" - href="${object.url}" + href="{{object.url}}" /> @@ -241,20 +241,20 @@
Please contact with us:
@@ -276,7 +276,7 @@ style="min-width: 590px; background-color: #F1F1F1; color: #454748; padding: 8px; border-collapse:separate;" > - ${object.pms_property_id.privacy_policy|safe} + {{object.pms_property_id.privacy_policy|safe}} % endif @@ -293,9 +293,9 @@ Sent by ${object.company_id.name} + >{{object.company_id.name}}
@@ -303,6 +303,6 @@
- ${object.partner_id.lang} + {{object.partner_id.lang}} diff --git a/pms/data/pms_modified_reservation_email_template.xml b/pms/data/pms_modified_reservation_email_template.xml index e13e9d745f7..6d0903feacb 100644 --- a/pms/data/pms_modified_reservation_email_template.xml +++ b/pms/data/pms_modified_reservation_email_template.xml @@ -5,13 +5,13 @@ Your reservation in ${object.pms_property_id.name} has been modified + >Your reservation in {{object.pms_property_id.name}} has been modified ${object.pms_property_id.partner_id.email | safe} + >{{object.pms_property_id.partner_id.email | safe}} ${(object.email and '"%s" <%s>' % (object.name, object.email) or object.partner_id.email_formatted or '') | safe} + >{{(object.email and '"%s" <%s>' % (object.name, object.email) or object.partner_id.email_formatted or '') | safe}} % if object.pms_property_id.partner_id.street

${object.pms_property_id.partner_id.street}

+ >{{object.pms_property_id.partner_id.street}}

% endif % if object.pms_property_id.partner_id.street2

${object.pms_property_id.partner_id.street2}

+ >{{object.pms_property_id.partner_id.street2}}

% endif

${object.pms_property_id.partner_id.zip}

+ >{{object.pms_property_id.partner_id.zip}}

${object.pms_property_id.partner_id.city}

+ >{{object.pms_property_id.partner_id.city}}

${object.pms_property_id.partner_id.country_id.name}

+ >{{object.pms_property_id.partner_id.country_id.name}}

@@ -116,13 +116,13 @@ style="margin: 16px 0px 16px 0px; font-size: 14px;" >
From ${object.first_checkin}
+ >From {{object.first_checkin}}
To ${object.last_checkout}
+ >To {{object.last_checkout}}
TZ ${object.pms_property_id.tz}
+ >TZ {{object.pms_property_id.tz}} @@ -141,7 +141,7 @@ >Rooms:
% for reservation in object.reservation_ids: - ${reservation.room_type_id.name}
% endfor @@ -161,7 +161,7 @@ >
Price: ${object.amount_total} ${object.pms_property_id.country_id.currency_id.symbol}
+ >Price: {{object.amount_total}} {{object.pms_property_id.country_id.currency_id.symbol}}
@@ -70,15 +70,15 @@ style="background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin: 16px 0px 16px 0px;" />
- Hello ${object.partner_id.name or ''},
- Your reservation in ${object.pms_property_id.name} has been modified + Your reservation in {{object.pms_property_id.name}} has been modified
See you soon,

- ${object.company_id.name} + {{object.company_id.name}}
@@ -179,7 +179,7 @@ >Additional Information

${object.pms_property_id.mail_information|safe}

+ >{{object.pms_property_id.mail_information|safe}

% endif @@ -196,20 +196,20 @@
Please contact with us:
@@ -231,7 +231,7 @@ style="min-width: 590px; background-color: #F1F1F1; color: #454748; padding: 8px; border-collapse:separate;" > - ${object.pms_property_id.privacy_policy|safe} + {{object.pms_property_id.privacy_policy|safe}} % endif @@ -248,9 +248,9 @@ Sent by ${object.company_id.name} + >{{object.company_id.name}}
@@ -258,6 +258,6 @@
- ${object.partner_id.lang} + {{object.partner_id.lang}} diff --git a/pms/data/pms_precheckin_invitation_email_template.xml b/pms/data/pms_precheckin_invitation_email_template.xml index cb6a5feda68..6d0897a2456 100644 --- a/pms/data/pms_precheckin_invitation_email_template.xml +++ b/pms/data/pms_precheckin_invitation_email_template.xml @@ -5,13 +5,13 @@ Hi ${object.firstname}, do your check-in now in ${object.pms_property_id.name} + >Hi {{object.firstname}}, do your check-in now in {{object.pms_property_id.name}} ${object.pms_property_id.partner_id.email | safe} + >{{object.pms_property_id.partner_id.email | safe}} ${(object.email and '"%s" <%s>' % (object.name, object.email) or object.partner_id.email_formatted or '') | safe} + >{{(object.email and '"%s" <%s>' % (object.name, object.email) or object.partner_id.email_formatted or '') | safe}}
Do your check-in now and save time. @@ -28,7 +28,7 @@ @@ -41,7 +41,7 @@ alt="Hacer check-in" width="80px" height="80px" - href="${object.get_portal_url()}" + href="{{object.get_portal_url()}}" /> diff --git a/pms/demo/pms_folio.xml b/pms/demo/pms_folio.xml index 7f07f2951f2..3ce5008f8f8 100644 --- a/pms/demo/pms_folio.xml +++ b/pms/demo/pms_folio.xml @@ -15,6 +15,7 @@ 'checkin': (DateTime.today() + timedelta(days=14)), 'checkout': (DateTime.today() + timedelta(days=16)), 'adults': 2, + 'state': 'confirm', 'board_service_room_id': ref('pms_board_service_room_eco_half_board'), 'partner_requests': 'Vegan breakfast', })]" @@ -22,12 +23,6 @@ - - - @@ -46,6 +41,7 @@ 'checkin': (DateTime.today() + timedelta(days=14)), 'checkout': (DateTime.today() + timedelta(days=16)), 'adults': 1, + 'state': 'confirm', 'partner_requests': 'Quite room.' }), (0, 0, { @@ -54,6 +50,7 @@ 'checkin': (DateTime.today() + timedelta(days=14)), 'checkout': (DateTime.today() + timedelta(days=16)), 'adults': 1, + 'state': 'confirm', 'partner_requests': 'Quite room.' }), (0, 0, { @@ -66,12 +63,6 @@ })]" /> - - - @@ -187,18 +178,13 @@ 'checkout': (DateTime.today() + timedelta(days=16)), 'adults': 1, 'children':1, + 'state': 'confirm', 'board_service_room_id': ref('pms_board_service_room_double_half_board'), 'partner_requests': 'Vegan food.' })]" /> - - - @@ -212,16 +198,11 @@ 'checkin': (DateTime.today() + timedelta(days=15)), 'checkout': (DateTime.today() + timedelta(days=16)), 'adults': 1, + 'state': 'confirm', 'board_service_room_id': ref('pms_board_service_room_triple_full_board'), })]" /> - - - @@ -239,16 +220,11 @@ 'checkin': (DateTime.today() + timedelta(days=15)), 'checkout': (DateTime.today() + timedelta(days=16)), 'adults': 10, + 'state': 'confirm', 'partner_requests': '10 bottles of water, 10 notebooks and 10 pens.' })]" /> - - - @@ -266,18 +242,13 @@ 'checkin': (DateTime.today() + timedelta(days=16)), 'checkout': (DateTime.today() + timedelta(days=17)), 'adults': 1, + 'state': 'confirm', 'reservation_type': 'out', 'closure_reason_id': ref('pms_room_closure_reason_maintenance'), 'out_service_description': 'Change of lighting', })]" /> - - - @@ -318,6 +289,7 @@ 'checkin': (DateTime.today() + timedelta(days=17)), 'checkout': (DateTime.today() + timedelta(days=18)), 'adults': 2, + 'state': 'confirm', }), (0, 0, { 'pricelist_id': ref('product.list0'), @@ -325,6 +297,7 @@ 'checkin': (DateTime.today() + timedelta(days=17)), 'checkout': (DateTime.today() + timedelta(days=18)), 'adults': 1, + 'state': 'confirm', 'sale_channel_origin_id': ref('pms.main_pms_sale_channel_door') }), (0, 0, { @@ -333,6 +306,7 @@ 'checkin': (DateTime.today() + timedelta(days=17)), 'checkout': (DateTime.today() + timedelta(days=18)), 'adults': 1, + 'state': 'confirm', }), (0, 0, { 'pricelist_id': ref('product.list0'), @@ -340,6 +314,7 @@ 'checkin': (DateTime.today() + timedelta(days=17)), 'checkout': (DateTime.today() + timedelta(days=18)), 'adults': 1, + 'state': 'confirm', 'sale_channel_origin_id': ref('pms.main_pms_sale_channel_mail') }), (0, 0, { @@ -348,6 +323,7 @@ 'checkin': (DateTime.today() + timedelta(days=17)), 'checkout': (DateTime.today() + timedelta(days=18)), 'adults': 2, + 'state': 'confirm', }), (0, 0, { 'pricelist_id': ref('product.list0'), @@ -355,6 +331,7 @@ 'checkin': (DateTime.today() + timedelta(days=17)), 'checkout': (DateTime.today() + timedelta(days=18)), 'adults': 2, + 'state': 'confirm', }), (0, 0, { 'pricelist_id': ref('product.list0'), @@ -362,6 +339,7 @@ 'checkin': (DateTime.today() + timedelta(days=17)), 'checkout': (DateTime.today() + timedelta(days=18)), 'adults': 3, + 'state': 'confirm', 'sale_channel_origin_id': ref('pms.main_pms_sale_channel_mail') }), (0, 0, { @@ -370,15 +348,10 @@ 'checkin': (DateTime.today() + timedelta(days=17)), 'checkout': (DateTime.today() + timedelta(days=18)), 'adults': 1, + 'state': 'confirm', })]" /> - - - @@ -397,6 +370,7 @@ 'checkin': (DateTime.today() + timedelta(days=19)), 'checkout': (DateTime.today() + timedelta(days=20)), 'adults': 2, + 'state': 'confirm', 'partner_requests': '2 extra towels needed.' }), (0, 0, { 'pricelist_id': ref('product.list0'), @@ -404,21 +378,17 @@ 'checkin': (DateTime.today() + timedelta(days=19)), 'checkout': (DateTime.today() + timedelta(days=20)), 'adults': 2, + 'state': 'confirm', }), (0, 0, { 'pricelist_id': ref('product.list0'), 'preferred_room_id': ref('pms_room_parking_01'), 'checkin': (DateTime.today() + timedelta(days=19)), 'checkout': (DateTime.today() + timedelta(days=20)), 'adults': 1, + 'state': 'confirm', })]" /> - - - @@ -433,18 +403,13 @@ 'checkin': (DateTime.today() + timedelta(days=19)), 'checkout': (DateTime.today() + timedelta(days=20)), 'adults': 1, + 'state': 'confirm', 'reservation_type': 'out', 'closure_reason_id': ref('pms_room_closure_reason_vip_privacy'), 'out_service_description': 'Room next to noisy guests.', })]" /> - - - @@ -463,6 +428,7 @@ 'checkin': (DateTime.today() + timedelta(days=19)), 'checkout': (DateTime.today() + timedelta(days=20)), 'adults': 1, + 'state': 'confirm', }), (0, 0, { 'pricelist_id': ref('product.list0'), @@ -470,6 +436,7 @@ 'checkin': (DateTime.today() + timedelta(days=19)), 'checkout': (DateTime.today() + timedelta(days=20)), 'adults': 1, + 'state': 'confirm', 'sale_channel_origin_id': ref('pms.main_pms_sale_channel_door'), }), (0, 0, { @@ -478,16 +445,11 @@ 'checkin': (DateTime.today() + timedelta(days=19)), 'checkout': (DateTime.today() + timedelta(days=20)), 'adults': 3, + 'state': 'confirm', 'partner_requests': '1 extra towel.' })]" /> - - - @@ -506,6 +468,7 @@ 'checkin': (DateTime.today() + timedelta(days=19)), 'checkout': (DateTime.today() + timedelta(days=20)), 'adults': 2, + 'state': 'confirm', }), (0, 0, { 'pricelist_id': ref('product.list0'), @@ -516,13 +479,8 @@ 'sale_channel_origin_id': ref('pms.main_pms_sale_channel_door'), })]" /> + - - - @@ -536,16 +494,11 @@ 'checkin': (DateTime.today() + timedelta(days=19)), 'checkout': (DateTime.today() + timedelta(days=21)), 'adults': 1, + 'state': 'confirm', 'partner_requests': 'Smart screen, projector and sound system.' })]" /> - - - @@ -579,6 +532,7 @@ 'checkout': (DateTime.today() + timedelta(days=22)), 'adults': 1, 'children': 1, + 'state': 'confirm', 'arrival_hour': '12:00', 'departure_hour': '12:30', 'board_service_room_id': ref('pms_board_service_room_double_half_board'), @@ -586,12 +540,6 @@ })]" /> - - - @@ -610,16 +558,11 @@ 'checkin': (DateTime.today() + timedelta(days=21)), 'checkout': (DateTime.today() + timedelta(days=22)), 'adults': 1, + 'state': 'confirm', 'closure_reason_id': ref('pms_room_closure_reason_vip_privacy'), })]" /> - - - @@ -659,6 +602,7 @@ 'checkin': (DateTime.today() + timedelta(days=23)), 'checkout': (DateTime.today() + timedelta(days=24)), 'adults': 1, + 'state': 'confirm', }), (0, 0, { 'pricelist_id': ref('product.list0'), @@ -666,6 +610,7 @@ 'checkin': (DateTime.today() + timedelta(days=23)), 'checkout': (DateTime.today() + timedelta(days=24)), 'adults': 1, + 'state': 'confirm', 'board_service_room_id': ref('pms_board_service_room_single_half_board'), }), (0, 0, { @@ -674,6 +619,7 @@ 'checkin': (DateTime.today() + timedelta(days=23)), 'checkout': (DateTime.today() + timedelta(days=24)), 'adults': 1, + 'state': 'confirm', 'board_service_room_id': ref('pms_board_service_room_single_breakfast'), 'sale_channel_origin_id': ref('pms.main_pms_sale_channel_phone') }), @@ -683,17 +629,12 @@ 'checkin': (DateTime.today() + timedelta(days=23)), 'checkout': (DateTime.today() + timedelta(days=24)), 'adults': 1, + 'state': 'confirm', 'board_service_room_id': ref('pms_board_service_room_single_full_board'), 'sale_channel_origin_id': ref('pms.main_pms_sale_channel_phone') })]" /> - - - @@ -710,6 +651,7 @@ 'checkout': (DateTime.today() + timedelta(days=24)), 'adults': 1, 'children': 1, + 'state': 'confirm', 'partner_requests': '1 extra towel needed.' }), (0, 0, { @@ -719,6 +661,7 @@ 'checkout': (DateTime.today() + timedelta(days=24)), 'adults': 1, 'children': 1, + 'state': 'confirm', }), (0, 0, { 'pricelist_id': ref('product.list0'), @@ -727,17 +670,12 @@ 'checkout': (DateTime.today() + timedelta(days=24)), 'adults': 2, 'children': 1, + 'state': 'confirm', 'board_service_room_id': ref('pms_board_service_room_triple_full_board'), 'sale_channel_origin_id': ref('main_pms_sale_channel_mail') })]" /> - - - @@ -753,6 +691,7 @@ 'checkin': (DateTime.today() + timedelta(days=24)), 'checkout': (DateTime.today() + timedelta(days=25)), 'adults': 1, + 'state': 'confirm', 'arrival_hour': '17:00', 'departure_hour': '12:15', 'board_service_room_id': ref('pms_board_service_room_single_full_board'), @@ -763,18 +702,13 @@ 'checkin': (DateTime.today() + timedelta(days=24)), 'checkout': (DateTime.today() + timedelta(days=25)), 'adults': 1, + 'state': 'confirm', 'arrival_hour': '16:00', 'departure_hour': '11:15', 'board_service_room_id': ref('pms_board_service_room_single_full_board'), })]" /> - - - @@ -794,6 +728,7 @@ 'checkin': (DateTime.today() + timedelta(days=24)), 'checkout': (DateTime.today() + timedelta(days=25)), 'adults': 1, + 'state': 'confirm', 'arrival_hour': '17:00', 'departure_hour': '12:15', 'board_service_room_id': ref('pms_board_service_room_double_half_board'), @@ -805,17 +740,12 @@ 'checkin': (DateTime.today() + timedelta(days=24)), 'checkout': (DateTime.today() + timedelta(days=25)), 'adults': 1, + 'state': 'confirm', 'arrival_hour': '16:00', 'departure_hour': '11:15', })]" /> - - - @@ -833,17 +763,12 @@ 'checkin': (DateTime.today() + timedelta(days=24)), 'checkout': (DateTime.today() + timedelta(days=25)), 'adults': 1, + 'state': 'confirm', 'arrival_hour': '09:00', 'departure_hour': '12:00', })]" /> - - - @@ -858,17 +783,12 @@ 'checkin': (DateTime.today() + timedelta(days=25)), 'checkout': (DateTime.today() + timedelta(days=32)), 'adults': 1, + 'state': 'confirm', 'board_service_room_id': ref('pms_board_service_room_eco_full_board'), 'partner_requests': 'Vegan food.' })]" /> - - - @@ -887,16 +807,11 @@ 'checkin': (DateTime.today() + timedelta(days=25)), 'checkout': (DateTime.today() + timedelta(days=32)), 'adults': 1, + 'state': 'confirm', 'board_service_room_id': ref('pms_board_service_room_single_half_board'), })]" /> - - - @@ -914,17 +829,12 @@ 'checkin': (DateTime.today() + timedelta(days=25)), 'checkout': (DateTime.today() + timedelta(days=32)), 'adults': 1, + 'state': 'confirm', 'board_service_room_id': ref('pms_board_service_room_single_full_board'), 'partner_requests': 'picnic for 1st lunch' })]" /> - - - @@ -943,6 +853,7 @@ 'checkin': (DateTime.today() + timedelta(days=25)), 'checkout': (DateTime.today() + timedelta(days=31)), 'adults': 2, + 'state': 'confirm', 'board_service_room_id': ref('pms_board_service_room_double_half_board'), }), (0, 0, { @@ -951,16 +862,11 @@ 'checkin': (DateTime.today() + timedelta(days=25)), 'checkout': (DateTime.today() + timedelta(days=32)), 'adults': 2, + 'state': 'confirm', 'board_service_room_id': ref('pms_board_service_room_double_half_board'), })]" /> - - - @@ -996,16 +902,11 @@ 'checkin': (DateTime.today() + timedelta(days=25)), 'checkout': (DateTime.today() + timedelta(days=26)), 'adults': 1, + 'state': 'confirm', 'closure_reason_id': ref('pms_room_closure_reason_vip_privacy'), })]" /> - - - @@ -1046,13 +947,8 @@ 'checkout': (DateTime.today() + timedelta(days=30)), 'adults': 1, 'children':1, + 'state': 'confirm', })]" /> - - - diff --git a/pms/i18n/es.po b/pms/i18n/es.po index 6af909d9844..a6e7af9b97f 100644 --- a/pms/i18n/es.po +++ b/pms/i18n/es.po @@ -202,14 +202,6 @@ msgstr "" "
\n" " Haga su check-in ahora y ahorre tiempo." -#. module: pms -#: model_terms:ir.ui.view,arch_db:pms.traveller_report -msgid "" -"\n" -"
\n" -" Categoría:" -msgstr "" - #. module: pms #: model_terms:ir.ui.view,arch_db:pms.massive_changes_wizard msgid "Days:" @@ -312,10 +304,10 @@ msgstr "" "right-style: solid;border-top-style: solid;-webkit-border-radius: 10; -moz-" "border-radius: 10; border-radius: 10px;font-size: 12px;\">Check-in\n" "
\n" -"
\"Hacer\n" +"
\"Hacer
\n" " \n" " \n" " \n" @@ -364,6 +356,11 @@ msgstr " Paga Ahora" msgid " Paid" msgstr " Pagado" +#. module: pms +#: model_terms:ir.ui.view,arch_db:pms.portal_folio_page_payment +msgid " Pending" +msgstr " Pendiente" + #. module: pms #: model_terms:ir.ui.view,arch_db:pms.folio_portal_template msgid "Send message" @@ -388,16 +385,6 @@ msgstr " Imprimir" msgid " OverBooking" msgstr " OverBooking" -#. module: pms -#: model_terms:ir.ui.view,arch_db:pms.pms_reservation_view_form -msgid " Reselling" -msgstr "" - -#. module: pms -#: model_terms:ir.ui.view,arch_db:pms.portal_my_precheckin_detail -msgid "" -msgstr "" - #. module: pms #: model_terms:ir.ui.view,arch_db:pms.portal_my_reservation_detail msgid "Status:" @@ -455,13 +442,6 @@ msgstr "" "will be automatically calculated and entered depending on the document type." "\"/>" -#. module: pms -#: model_terms:ir.ui.view,arch_db:pms.portal_my_reservation_precheckin -msgid "" -"\n" -" Send Invitations" -msgstr "" - #. module: pms #: model_terms:ir.ui.view,arch_db:pms.portal_my_folio_invitations msgid "" @@ -550,101 +530,6 @@ msgstr "" " Precio total" -#. module: pms -#: model_terms:ir.ui.view,arch_db:pms.portal_my_precheckin_detail -msgid "" -"Birthdate cannot " -"be older than today" -msgstr "" - -#. module: pms -#: model_terms:ir.ui.view,arch_db:pms.portal_my_precheckin_detail -msgid "" -"Residence City is a " -"required field" -msgstr "" - -#. module: pms -#: model_terms:ir.ui.view,arch_db:pms.portal_my_precheckin_detail -msgid "" -"Doc. Expedition " -"or Validate date is a required field" -msgstr "" - -#. module: pms -#: model_terms:ir.ui.view,arch_db:pms.portal_my_precheckin_detail -msgid "" -"Doc. Number is a " -"required field\n" -" Doc. Number Format is wrong" -msgstr "" - -#. module: pms -#: model_terms:ir.ui.view,arch_db:pms.portal_my_precheckin_detail -msgid "" -"Doc. Type is a " -"required field" -msgstr "" - -#. module: pms -#: model_terms:ir.ui.view,arch_db:pms.portal_my_precheckin_detail -msgid "" -"Email format is " -"incorrect" -msgstr "" - -#. module: pms -#: model_terms:ir.ui.view,arch_db:pms.portal_my_precheckin_detail -msgid "" -"Gender is a required " -"field" -msgstr "" - -#. module: pms -#: model_terms:ir.ui.view,arch_db:pms.portal_my_precheckin_detail -msgid "" -"Lastname is a " -"required field" -msgstr "" - -#. module: pms -#: model_terms:ir.ui.view,arch_db:pms.portal_my_precheckin_detail -msgid "" -"Firstname is a required " -"field" -msgstr "" - -#. module: pms -#: model_terms:ir.ui.view,arch_db:pms.portal_my_precheckin_detail -msgid "" -"If the " -"nationality is Spanish, a second lastname must be provided\n" -" Nationality is a required field" -msgstr "" - -#. module: pms -#: model_terms:ir.ui.view,arch_db:pms.portal_my_precheckin_detail -msgid "" -"If the " -"nationality is Spanish, a second lastname must be provided" -msgstr "" - -#. module: pms -#: model_terms:ir.ui.view,arch_db:pms.portal_my_precheckin_detail -msgid "" -"Residence Address is " -"a required field" -msgstr "" - -#. module: pms -#: model_terms:ir.ui.view,arch_db:pms.portal_my_precheckin_detail -msgid "" -"Zip is a required field" -msgstr "" - #. module: pms #: model_terms:ir.ui.view,arch_db:pms.portal_my_folio_invitations msgid "" @@ -654,16 +539,6 @@ msgstr "" "Correo " "electrónico obligatorio" -#. module: pms -#: model_terms:ir.ui.view,arch_db:pms.portal_my_prechekin_reservation -msgid " Complete data" -msgstr "" - -#. module: pms -#: model_terms:ir.ui.view,arch_db:pms.portal_my_prechekin_reservation -msgid " Incomplete data" -msgstr "" - #. module: pms #: model_terms:ir.ui.view,arch_db:pms.booking_duplicate msgid "" @@ -1524,13 +1399,13 @@ msgstr "" "color: #454748; width: 100%; border-collapse:separate;\">\n" " \n" +"width=\"590\" style=\"padding: 16px; background-color: white; color: #454748;" +" border-collapse:separate;\">\n" " \n" " \n" +"fontawesome.com/releases/v5.8.1/css/all.css\" integrity=\"sha384" +"-50oBUHEmvpQ+1lW4y57PTFmhCaXp0ML5d60M1M7uH2+nqUivzIebhndOJK28anvf\" " +"crossorigin=\"anonymous\"/>\n" " \n" " \n" " \n" @@ -1562,13 +1437,13 @@ msgstr "" " \n" " \n" @@ -1612,8 +1487,8 @@ msgstr "" "
Hasta ${object.last_checkout}
\n" "
TZ ${object.pms_property_id.tz}" -"
\n" +"size:12px;color:#9e9e9e\">TZ ${object.pms_property_id." +"tz}\n" " \n" " \n" "
\n" @@ -1626,8 +1501,8 @@ msgstr "" " \n" " \n" "
\n" -"
\n" +"
\n" "
\n" -" Hola ${object.partner_id." -"name or ''},
\n" +" Hola ${" +"object.partner_id.name or ''},
\n" " Estamos muy felicoes de " "confirmar su registro en ${object.pms_property_id.name}\n" "
\n" @@ -1577,8 +1452,8 @@ msgstr "" " \n" "
\n" -" ${object.company_id." -"name}\n" +" ${object.company_id.name}" +"\n" "
\n" " \n" "
\n" "
\n" -"
Habitaciones: " -"
\n" +" " +"
Habitaciones:
\n" " % para reserva " "en object.reservation_ids:\n" " ${reservation." @@ -1658,10 +1533,10 @@ msgstr "" "
\n" " % if object.pms_property_id." "mail_information\n" -"
\n" +"
\n" "
Información Adicional
\n" " ${object.pms_property_id." @@ -1673,10 +1548,10 @@ msgstr "" "
\n" "
\n" -"
\n" +"
\n" " Haga su registro ahora y " "ahorre tiempo.\n" "
\n" @@ -1702,10 +1577,10 @@ msgstr "" "border-radius: 10; -moz-border-radius: 10; border-radius: 10px;font-size: " "12px;\">Check-in\n" "
\n" -"

-\n" +" " +"
\"Hacer
\n" "
\n" @@ -1714,14 +1589,14 @@ msgstr "" " \n" " \n" -"
\n" +"
\n" " \n" "
\n" -"¿Preguntas sobre la reserva?" -"\n" +"¿Preguntas sobre la " +"reserva?\n" "
Por favor, póngase en " "contacto con nosotros:
\n" "
diff --git a/pms/views/pms_availability_plan_views.xml b/pms/views/pms_availability_plan_views.xml index 9d005dd6663..34d7214169f 100644 --- a/pms/views/pms_availability_plan_views.xml +++ b/pms/views/pms_availability_plan_views.xml @@ -40,7 +40,7 @@ - + - - diff --git a/pms/views/pms_folio_views.xml b/pms/views/pms_folio_views.xml index 187b9bc281e..f31aa30329c 100644 --- a/pms/views/pms_folio_views.xml +++ b/pms/views/pms_folio_views.xml @@ -333,6 +333,7 @@ name="pricelist_id" attrs="{'invisible': [('reservation_type', 'not in', 'normal')]}" /> + + + + + + + @@ -798,7 +799,7 @@
-
+
@@ -879,6 +880,7 @@ optional="hide" readonly="1" /> + / completed
@@ -80,7 +80,7 @@ @@ -224,7 +224,7 @@ for="gender" >Gender *

@@ -396,7 +396,7 @@ > - +
@@ -512,10 +512,10 @@ t-att-state_id="zip_id.state_id.id" t-att-city_name="zip_id.city_id.name" > -
@@ -566,7 +566,7 @@ t-att-id="country.id" t-attf-onclick="selectCountry(this)" > - + @@ -601,7 +601,7 @@ t-attf-onclick="selectState(this)" t-att-country-id="state.country_id.id" > - + @@ -1136,7 +1136,7 @@ t-att-title="reservation.sudo().room_type_id.name" > @@ -1161,7 +1161,7 @@ t-att-id="'host_name'+str(checkin_partner.id)" name="guest_name" > - + @@ -1169,7 +1169,7 @@ t-att-id="'host_name'+str(checkin_partner.id)" name="guest_name" > - Guest + Guest @@ -1210,7 +1210,7 @@ Resend Email Invitation Send Whatsapp Invitation @@ -1286,7 +1286,7 @@ style="color:#fff; height:36px;" > Send Invitation @@ -1456,8 +1456,8 @@ The quick registration system is not available for this reservation.
If you have any questions, you can contact us:

Phone:
Email: + />Phone:
Email:
diff --git a/pms/views/res_partner_views.xml b/pms/views/res_partner_views.xml index 5bbe305ebb5..a1e119b13bf 100644 --- a/pms/views/res_partner_views.xml +++ b/pms/views/res_partner_views.xml @@ -34,7 +34,6 @@ res.partner.view.form res.partner - - + + - + - +