diff --git a/hotel/i18n/hotel.pot b/hotel/i18n/hotel.pot
index 762a01959..09db4d14a 100644
--- a/hotel/i18n/hotel.pot
+++ b/hotel/i18n/hotel.pot
@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 15.0\n"
+"Project-Id-Version: Odoo Server 16.0\n"
 "Report-Msgid-Bugs-To: \n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -27,6 +27,13 @@ msgstr ""
 msgid "# Products"
 msgstr ""
 
+#. module: hotel
+#: model_terms:ir.ui.view,arch_db:hotel.view_hotel_folio_wizard
+msgid ""
+"<i class=\"fa fa-long-arrow-right mx-2 oe_edit_only\" aria-label=\"Arrow icon\" title=\"Arrow\"/>\n"
+"                    <i class=\"fa fa-long-arrow-right mx-2 oe_read_only\" aria-label=\"Arrow icon\" title=\"Arrow\"/>"
+msgstr ""
+
 #. module: hotel
 #: model_terms:ir.ui.view,arch_db:hotel.view_hotel_room_kanban
 msgid "<span title=\"fa_icon\" class=\"fa fa-bars fa-lg\"/>"
@@ -72,6 +79,24 @@ msgstr ""
 msgid "<strong>Total</strong>"
 msgstr ""
 
+#. module: hotel
+#. odoo-python
+#: code:addons/hotel/models/hotel_room.py:0
+#, python-format
+msgid ""
+"A amenities type with the name '%s' already exists.Please choose a different"
+" amenities type."
+msgstr ""
+
+#. module: hotel
+#. odoo-python
+#: code:addons/hotel/models/hotel_room.py:0
+#, python-format
+msgid ""
+"A amenities with the name '%s' already exists.Please choose a different "
+"amenities type."
+msgstr ""
+
 #. module: hotel
 #: model:ir.model.fields,help:hotel.field_hotel_room__description_sale
 #: model:ir.model.fields,help:hotel.field_hotel_room_amenities__description_sale
@@ -82,12 +107,55 @@ msgid ""
 "Customer Invoice/Credit Note"
 msgstr ""
 
+#. module: hotel
+#. odoo-python
+#: code:addons/hotel/models/hotel_room.py:0
+#, python-format
+msgid ""
+"A floor with the name '%s' already exists.Please choose a different floor."
+msgstr ""
+
+#. module: hotel
+#. odoo-python
+#: code:addons/hotel/models/hotel_room.py:0
+#, python-format
+msgid ""
+"A room type with the name '%s' already exists.Please choose a different room"
+" type."
+msgstr ""
+
+#. module: hotel
+#. odoo-python
+#: code:addons/hotel/models/hotel_room.py:0
+#, python-format
+msgid ""
+"A room with the name '%s' already exists.Please choose a different name."
+msgstr ""
+
+#. module: hotel
+#. odoo-python
+#: code:addons/hotel/models/hotel_services.py:0
+#, python-format
+msgid ""
+"A service type with the name '%s' already exists.Please choose a different "
+"service type."
+msgstr ""
+
+#. module: hotel
+#. odoo-python
+#: code:addons/hotel/models/hotel_services.py:0
+#, python-format
+msgid ""
+"A service with the name '%s' already exists.Please choose a different "
+"service."
+msgstr ""
+
 #. module: hotel
 #: model:ir.model.fields,help:hotel.field_sale_advance_payment_inv__advance_payment_method
 msgid ""
 "A standard invoice is issued with all the order lines ready for\n"
-"        invoicing, according to their invoicing policy\n"
-"        (based on ordered or delivered quantity)."
+"            invoicing, according to their invoicing policy\n"
+"            (based on ordered or delivered quantity)."
 msgstr ""
 
 #. module: hotel
@@ -177,6 +245,20 @@ msgstr ""
 msgid "Additional Hours"
 msgstr ""
 
+#. module: hotel
+#: model:ir.model.fields,field_description:hotel.field_hotel_room__additional_product_tag_ids
+#: model:ir.model.fields,field_description:hotel.field_hotel_room_amenities__additional_product_tag_ids
+#: model:ir.model.fields,field_description:hotel.field_hotel_services__additional_product_tag_ids
+msgid "Additional Product Tag"
+msgstr ""
+
+#. module: hotel
+#: model:ir.model.fields,field_description:hotel.field_hotel_room__all_product_tag_ids
+#: model:ir.model.fields,field_description:hotel.field_hotel_room_amenities__all_product_tag_ids
+#: model:ir.model.fields,field_description:hotel.field_hotel_services__all_product_tag_ids
+msgid "All Product Tag"
+msgstr ""
+
 #. module: hotel
 #: model:ir.model,name:hotel.model_folio_report_wizard
 msgid "Allow print folio report by date"
@@ -242,15 +324,27 @@ msgstr ""
 msgid "Amount Before Discount"
 msgstr ""
 
+#. module: hotel
+#: model:ir.model.fields,field_description:hotel.field_hotel_folio_line__analytic_distribution
+#: model:ir.model.fields,field_description:hotel.field_hotel_service_line__analytic_distribution
+msgid "Analytic"
+msgstr ""
+
 #. module: hotel
 #: model:ir.model.fields,field_description:hotel.field_hotel_folio__analytic_account_id
 msgid "Analytic Account"
 msgstr ""
 
 #. module: hotel
-#: model:ir.model.fields,field_description:hotel.field_hotel_folio_line__analytic_tag_ids
-#: model:ir.model.fields,field_description:hotel.field_hotel_service_line__analytic_tag_ids
-msgid "Analytic Tags"
+#: model:ir.model.fields,field_description:hotel.field_hotel_folio_line__analytic_distribution_search
+#: model:ir.model.fields,field_description:hotel.field_hotel_service_line__analytic_distribution_search
+msgid "Analytic Distribution Search"
+msgstr ""
+
+#. module: hotel
+#: model:ir.model.fields,field_description:hotel.field_hotel_folio_line__analytic_precision
+#: model:ir.model.fields,field_description:hotel.field_hotel_service_line__analytic_precision
+msgid "Analytic Precision"
 msgstr ""
 
 #. module: hotel
@@ -273,8 +367,10 @@ msgid "Attachment Count"
 msgstr ""
 
 #. module: hotel
+#: model:ir.model.fields,field_description:hotel.field_hotel_folio_line__product_template_attribute_value_ids
 #: model:ir.model.fields,field_description:hotel.field_hotel_room__product_template_attribute_value_ids
 #: model:ir.model.fields,field_description:hotel.field_hotel_room_amenities__product_template_attribute_value_ids
+#: model:ir.model.fields,field_description:hotel.field_hotel_service_line__product_template_attribute_value_ids
 #: model:ir.model.fields,field_description:hotel.field_hotel_services__product_template_attribute_value_ids
 msgid "Attribute Values"
 msgstr ""
@@ -296,6 +392,13 @@ msgstr ""
 msgid "Available"
 msgstr ""
 
+#. module: hotel
+#: model:ir.model.fields,field_description:hotel.field_hotel_room__avg_cost
+#: model:ir.model.fields,field_description:hotel.field_hotel_room_amenities__avg_cost
+#: model:ir.model.fields,field_description:hotel.field_hotel_services__avg_cost
+msgid "Average Cost"
+msgstr ""
+
 #. module: hotel
 #: model:ir.model.fields,field_description:hotel.field_hotel_room__barcode
 #: model:ir.model.fields,field_description:hotel.field_hotel_room_amenities__barcode
@@ -303,6 +406,13 @@ msgstr ""
 msgid "Barcode"
 msgstr ""
 
+#. module: hotel
+#: model:ir.model.fields,field_description:hotel.field_hotel_room__valid_ean
+#: model:ir.model.fields,field_description:hotel.field_hotel_room_amenities__valid_ean
+#: model:ir.model.fields,field_description:hotel.field_hotel_services__valid_ean
+msgid "Barcode is valid EAN"
+msgstr ""
+
 #. module: hotel
 #: model_terms:ir.ui.view,arch_db:hotel.view_hotel_folio_form
 msgid "Branch"
@@ -401,6 +511,7 @@ msgid "Check Out Date"
 msgstr ""
 
 #. module: hotel
+#. odoo-python
 #: code:addons/hotel/models/hotel_folio.py:0
 #, python-format
 msgid "Checkout must be greater or equal checkin date"
@@ -512,6 +623,11 @@ msgid ""
 "                set on the source location. This is the default value for all products in this category. It can also directly be set on each product."
 msgstr ""
 
+#. module: hotel
+#: model:ir.model.fields,field_description:hotel.field_hotel_folio__country_code
+msgid "Country code"
+msgstr ""
+
 #. module: hotel
 #: model:ir.model.fields,field_description:hotel.field_sale_advance_payment_inv__advance_payment_method
 #: model_terms:ir.ui.view,arch_db:hotel.view_hotel_folio_form
@@ -637,11 +753,6 @@ msgstr ""
 msgid "Customer Taxes"
 msgstr ""
 
-#. module: hotel
-#: model:ir.model.fields,help:hotel.field_hotel_folio__signed_on
-msgid "Date of the signature."
-msgstr ""
-
 #. module: hotel
 #: model:ir.model.fields,help:hotel.field_hotel_room__supplier_taxes_id
 #: model:ir.model.fields,help:hotel.field_hotel_room_amenities__supplier_taxes_id
@@ -672,30 +783,11 @@ msgid ""
 "category as the default unit of measure."
 msgstr ""
 
-#. module: hotel
-#: model:ir.model.fields,help:hotel.field_hotel_room__seller_ids
-#: model:ir.model.fields,help:hotel.field_hotel_room_amenities__seller_ids
-#: model:ir.model.fields,help:hotel.field_hotel_services__seller_ids
-msgid "Define vendor pricelists."
-msgstr ""
-
 #. module: hotel
 #: model_terms:ir.ui.view,arch_db:hotel.view_hotel_room_kanban
 msgid "Delete"
 msgstr ""
 
-#. module: hotel
-#: model:ir.model.fields,field_description:hotel.field_hotel_folio_line__qty_delivered_manual
-#: model:ir.model.fields,field_description:hotel.field_hotel_service_line__qty_delivered_manual
-msgid "Delivered Manually"
-msgstr ""
-
-#. module: hotel
-#: model:ir.model.fields,field_description:hotel.field_hotel_folio_line__qty_delivered
-#: model:ir.model.fields,field_description:hotel.field_hotel_service_line__qty_delivered
-msgid "Delivered Quantity"
-msgstr ""
-
 #. module: hotel
 #: model:ir.model.fields,field_description:hotel.field_hotel_folio__partner_shipping_id
 msgid "Delivery Address"
@@ -711,6 +803,17 @@ msgstr ""
 msgid "Delivery Orders"
 msgstr ""
 
+#. module: hotel
+#: model:ir.model.fields,field_description:hotel.field_hotel_folio_line__qty_delivered
+#: model:ir.model.fields,field_description:hotel.field_hotel_service_line__qty_delivered
+msgid "Delivery Quantity"
+msgstr ""
+
+#. module: hotel
+#: model:ir.model.fields,field_description:hotel.field_hotel_folio__delivery_status
+msgid "Delivery Status"
+msgstr ""
+
 #. module: hotel
 #: model:ir.model.fields,help:hotel.field_hotel_folio__expected_date
 msgid ""
@@ -813,24 +916,6 @@ msgstr ""
 msgid "Display Type"
 msgstr ""
 
-#. module: hotel
-#: model:hotel.room,name:hotel.hotel_room_3
-#: model:product.product,name:hotel.hotel_room_3_product_product
-msgid "Double-201"
-msgstr ""
-
-#. module: hotel
-#: model:hotel.room,name:hotel.hotel_room_4
-#: model:product.product,name:hotel.hotel_room_4_product_product
-msgid "Double-202"
-msgstr ""
-
-#. module: hotel
-#: model:hotel.room,name:hotel.hotel_room_5
-#: model:product.product,name:hotel.hotel_room_5_product_product
-msgid "Double-203"
-msgstr ""
-
 #. module: hotel
 #: model:ir.model.fields.selection,name:hotel.selection__sale_advance_payment_inv__advance_payment_method__fixed
 msgid "Down payment (fixed amount)"
@@ -876,6 +961,7 @@ msgstr ""
 
 #. module: hotel
 #: model:ir.model.fields,field_description:hotel.field_folio_report_wizard__date_end
+#: model_terms:ir.ui.view,arch_db:hotel.view_hotel_folio_wizard
 msgid "End Date"
 msgstr ""
 
@@ -1109,6 +1195,11 @@ msgstr ""
 msgid "Guest Name"
 msgstr ""
 
+#. module: hotel
+#: model:ir.model.fields,field_description:hotel.field_hotel_folio__show_update_fpos
+msgid "Has Fiscal Position Changed"
+msgstr ""
+
 #. module: hotel
 #: model:ir.model.fields,field_description:hotel.field_hotel_folio__has_message
 #: model:ir.model.fields,field_description:hotel.field_hotel_room__has_message
@@ -1273,25 +1364,17 @@ msgstr ""
 
 #. module: hotel
 #: model:ir.model.fields,help:hotel.field_hotel_folio__message_needaction
-#: model:ir.model.fields,help:hotel.field_hotel_folio__message_unread
 #: model:ir.model.fields,help:hotel.field_hotel_room__message_needaction
-#: model:ir.model.fields,help:hotel.field_hotel_room__message_unread
 #: model:ir.model.fields,help:hotel.field_hotel_room_amenities__message_needaction
-#: model:ir.model.fields,help:hotel.field_hotel_room_amenities__message_unread
 #: model:ir.model.fields,help:hotel.field_hotel_services__message_needaction
-#: model:ir.model.fields,help:hotel.field_hotel_services__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: hotel
 #: model:ir.model.fields,help:hotel.field_hotel_folio__message_has_error
-#: model:ir.model.fields,help:hotel.field_hotel_folio__message_has_sms_error
 #: model:ir.model.fields,help:hotel.field_hotel_room__message_has_error
-#: model:ir.model.fields,help:hotel.field_hotel_room__message_has_sms_error
 #: model:ir.model.fields,help:hotel.field_hotel_room_amenities__message_has_error
-#: model:ir.model.fields,help:hotel.field_hotel_room_amenities__message_has_sms_error
 #: model:ir.model.fields,help:hotel.field_hotel_services__message_has_error
-#: model:ir.model.fields,help:hotel.field_hotel_services__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
@@ -1384,6 +1467,11 @@ msgstr ""
 msgid "Incoterm"
 msgstr ""
 
+#. module: hotel
+#: model:ir.model.fields,field_description:hotel.field_hotel_folio__incoterm_location
+msgid "Incoterm Location"
+msgstr ""
+
 #. module: hotel
 #: model_terms:ir.ui.view,arch_db:hotel.view_hotel_room_amenities_form
 #: model_terms:ir.ui.view,arch_db:hotel.view_hotel_room_form
@@ -1412,12 +1500,6 @@ msgid ""
 "used in international transactions."
 msgstr ""
 
-#. module: hotel
-#: model:hotel.services,name:hotel.hotel_service_6
-#: model:product.product,name:hotel.hotel_service_6_product_product
-msgid "Internet"
-msgstr ""
-
 #. module: hotel
 #: model:ir.model.fields,field_description:hotel.field_hotel_room__property_stock_inventory
 #: model:ir.model.fields,field_description:hotel.field_hotel_room_amenities__property_stock_inventory
@@ -1481,18 +1563,6 @@ msgstr ""
 msgid "Invoicing Policy"
 msgstr ""
 
-#. module: hotel
-#: model:hotel.room.amenities,name:hotel.hotel_room_amenities_2
-#: model:product.product,name:hotel.hotel_room_amenities_2_product_product
-msgid "Iron"
-msgstr ""
-
-#. module: hotel
-#: model:hotel.room.amenities,name:hotel.hotel_room_amenities_3
-#: model:product.product,name:hotel.hotel_room_amenities_3_product_product
-msgid "Irons Boards"
-msgstr ""
-
 #. module: hotel
 #: model:ir.model.fields,field_description:hotel.field_hotel_room__iscategid
 #: model:ir.model.fields,field_description:hotel.field_hotel_room_amenities__iscategid
@@ -1501,6 +1571,11 @@ msgstr ""
 msgid "Is Categ"
 msgstr ""
 
+#. module: hotel
+#: model:ir.model.fields,field_description:hotel.field_hotel_folio__is_expired
+msgid "Is Expired"
+msgstr ""
+
 #. module: hotel
 #: model:ir.model.fields,field_description:hotel.field_hotel_folio__message_is_follower
 #: model:ir.model.fields,field_description:hotel.field_hotel_room__message_is_follower
@@ -1563,8 +1638,9 @@ msgid "Is expense"
 msgstr ""
 
 #. module: hotel
-#: model:ir.model.fields,field_description:hotel.field_hotel_folio__is_expired
-msgid "Is expired"
+#: model:ir.model.fields,field_description:hotel.field_hotel_folio_line__is_configurable_product
+#: model:ir.model.fields,field_description:hotel.field_hotel_service_line__is_configurable_product
+msgid "Is the product configurable?"
 msgstr ""
 
 #. module: hotel
@@ -1650,12 +1726,6 @@ msgstr ""
 msgid "Last Updated on"
 msgstr ""
 
-#. module: hotel
-#: model:hotel.services,name:hotel.hotel_service_1
-#: model:product.product,name:hotel.hotel_service_1_product_product
-msgid "Laundry"
-msgstr ""
-
 #. module: hotel
 #: model:ir.model.fields,field_description:hotel.field_hotel_folio_line__customer_lead
 #: model:ir.model.fields,field_description:hotel.field_hotel_service_line__customer_lead
@@ -1777,11 +1847,6 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
-#. module: hotel
-#: model:ir.model.fields,help:hotel.field_hotel_folio__signed_by
-msgid "Name of the person that signed the SO."
-msgstr ""
-
 #. module: hotel
 #: model:ir.model.fields,field_description:hotel.field_hotel_room__nbr_moves_in
 #: model:ir.model.fields,field_description:hotel.field_hotel_room_amenities__nbr_moves_in
@@ -1863,7 +1928,7 @@ msgstr ""
 #: model:ir.model.fields,help:hotel.field_hotel_room__message_needaction_counter
 #: model:ir.model.fields,help:hotel.field_hotel_room_amenities__message_needaction_counter
 #: model:ir.model.fields,help:hotel.field_hotel_services__message_needaction_counter
-msgid "Number of messages which requires an action"
+msgid "Number of messages requiring action"
 msgstr ""
 
 #. module: hotel
@@ -1888,14 +1953,6 @@ msgstr ""
 msgid "Number of price rules"
 msgstr ""
 
-#. module: hotel
-#: model:ir.model.fields,help:hotel.field_hotel_folio__message_unread_counter
-#: model:ir.model.fields,help:hotel.field_hotel_room__message_unread_counter
-#: model:ir.model.fields,help:hotel.field_hotel_room_amenities__message_unread_counter
-#: model:ir.model.fields,help:hotel.field_hotel_services__message_unread_counter
-msgid "Number of unread messages"
-msgstr ""
-
 #. module: hotel
 #: model:ir.model.fields.selection,name:hotel.selection__hotel_room__status__occupied
 msgid "Occupied"
@@ -1926,6 +1983,22 @@ msgstr ""
 msgid "Online Signature"
 msgstr ""
 
+#. module: hotel
+#: model:ir.model.fields,field_description:hotel.field_hotel_room__optional_product_ids
+#: model:ir.model.fields,field_description:hotel.field_hotel_room_amenities__optional_product_ids
+#: model:ir.model.fields,field_description:hotel.field_hotel_services__optional_product_ids
+msgid "Optional Products"
+msgstr ""
+
+#. module: hotel
+#: model:ir.model.fields,help:hotel.field_hotel_room__optional_product_ids
+#: model:ir.model.fields,help:hotel.field_hotel_room_amenities__optional_product_ids
+#: model:ir.model.fields,help:hotel.field_hotel_services__optional_product_ids
+msgid ""
+"Optional Products are suggested whenever the customer hits *Add to Cart* "
+"(cross-sell strategy, e.g. for computers: warranty, software, etc.)."
+msgstr ""
+
 #. module: hotel
 #: model:ir.model.fields,field_description:hotel.field_hotel_folio__order_id
 msgid "Order"
@@ -1964,6 +2037,7 @@ msgid "Order Status"
 msgstr ""
 
 #. module: hotel
+#. odoo-python
 #: code:addons/hotel/models/hotel_folio.py:0
 #, python-format
 msgid "Order id is not available"
@@ -2016,6 +2090,11 @@ msgstr ""
 msgid "Parent Path"
 msgstr ""
 
+#. module: hotel
+#: model:ir.model.fields,field_description:hotel.field_hotel_folio__partner_credit_warning
+msgid "Partner Credit Warning"
+msgstr ""
+
 #. module: hotel
 #: model:ir.model.fields,field_description:hotel.field_hotel_folio__reference
 msgid "Payment Ref."
@@ -2032,15 +2111,24 @@ msgid "Pdf Reports"
 msgstr ""
 
 #. module: hotel
-#: model:ir.model.fields,field_description:hotel.field_hotel_folio__access_url
-msgid "Portal Access URL"
+#. odoo-python
+#: code:addons/hotel/models/hotel_folio.py:0
+#: code:addons/hotel/models/hotel_folio.py:0
+#, python-format
+msgid "Please select Guest Name"
 msgstr ""
 
 #. module: hotel
-#: model:ir.model.fields,field_description:hotel.field_hotel_room__price
-#: model:ir.model.fields,field_description:hotel.field_hotel_room_amenities__price
-#: model:ir.model.fields,field_description:hotel.field_hotel_services__price
-msgid "Price"
+#. odoo-python
+#: code:addons/hotel/models/hotel_folio.py:0
+#: code:addons/hotel/models/hotel_folio.py:0
+#, python-format
+msgid "Please select Pricelist"
+msgstr ""
+
+#. module: hotel
+#: model:ir.model.fields,field_description:hotel.field_hotel_folio__access_url
+msgid "Portal Access URL"
 msgstr ""
 
 #. module: hotel
@@ -2058,7 +2146,7 @@ msgstr ""
 #. module: hotel
 #: model:ir.model.fields,field_description:hotel.field_hotel_folio_line__price_reduce_taxinc
 #: model:ir.model.fields,field_description:hotel.field_hotel_service_line__price_reduce_taxinc
-msgid "Price Reduce Tax inc"
+msgid "Price Reduce Tax incl"
 msgstr ""
 
 #. module: hotel
@@ -2070,12 +2158,15 @@ msgstr ""
 
 #. module: hotel
 #: model:ir.model.fields,field_description:hotel.field_hotel_folio__pricelist_id
-#: model:ir.model.fields,field_description:hotel.field_hotel_room__pricelist_id
-#: model:ir.model.fields,field_description:hotel.field_hotel_room_amenities__pricelist_id
-#: model:ir.model.fields,field_description:hotel.field_hotel_services__pricelist_id
 msgid "Pricelist"
 msgstr ""
 
+#. module: hotel
+#: model:ir.model.fields,field_description:hotel.field_hotel_folio_line__pricelist_item_id
+#: model:ir.model.fields,field_description:hotel.field_hotel_service_line__pricelist_item_id
+msgid "Pricelist Item"
+msgstr ""
+
 #. module: hotel
 #: model_terms:ir.ui.view,arch_db:hotel.view_hotel_folio_wizard
 msgid "Print Folio"
@@ -2094,7 +2185,6 @@ msgid "Procurement Group"
 msgstr ""
 
 #. module: hotel
-#: model:ir.model,name:hotel.model_product_product
 #: model:ir.model.fields,field_description:hotel.field_hotel_folio_line__product_id
 #: model:ir.model.fields,field_description:hotel.field_hotel_room__product_variant_id
 #: model:ir.model.fields,field_description:hotel.field_hotel_room_amenities__product_variant_id
@@ -2134,6 +2224,13 @@ msgstr ""
 msgid "Product Packages"
 msgstr ""
 
+#. module: hotel
+#: model:ir.model.fields,field_description:hotel.field_hotel_room__product_tag_ids
+#: model:ir.model.fields,field_description:hotel.field_hotel_room_amenities__product_tag_ids
+#: model:ir.model.fields,field_description:hotel.field_hotel_services__product_tag_ids
+msgid "Product Tags"
+msgstr ""
+
 #. module: hotel
 #: model:ir.model.fields,field_description:hotel.field_hotel_folio_line__product_template_id
 #: model:ir.model.fields,field_description:hotel.field_hotel_room__product_tmpl_id
@@ -2165,6 +2262,11 @@ msgstr ""
 msgid "Product Uom Readonly"
 msgstr ""
 
+#. module: hotel
+#: model:ir.model,name:hotel.model_product_product
+msgid "Product Variant"
+msgstr ""
+
 #. module: hotel
 #: model:ir.model.fields,field_description:hotel.field_hotel_room__product_id
 msgid "Product_id"
@@ -2251,6 +2353,12 @@ msgstr ""
 msgid "Quantity Svl"
 msgstr ""
 
+#. module: hotel
+#: model:ir.model.fields,field_description:hotel.field_hotel_folio_line__qty_to_invoice
+#: model:ir.model.fields,field_description:hotel.field_hotel_service_line__qty_to_invoice
+msgid "Quantity To Invoice"
+msgstr ""
+
 #. module: hotel
 #: model:ir.model.fields,help:hotel.field_hotel_room__incoming_qty
 #: model:ir.model.fields,help:hotel.field_hotel_room_amenities__incoming_qty
@@ -2308,7 +2416,7 @@ msgstr ""
 
 #. module: hotel
 #: model:ir.model.fields,help:hotel.field_hotel_folio__origin
-msgid "Reference of the document that generated this sales order request."
+msgid "Reference of the document that generated this sales order request"
 msgstr ""
 
 #. module: hotel
@@ -2350,15 +2458,8 @@ msgstr ""
 #. module: hotel
 #: model:ir.model.fields,help:hotel.field_hotel_folio__require_signature
 msgid ""
-"Request a online signature to the customer in order to confirm orders "
-"automatically."
-msgstr ""
-
-#. module: hotel
-#: model:ir.model.fields,help:hotel.field_hotel_folio__require_payment
-msgid ""
-"Request an online payment to the customer in order to confirm orders "
-"automatically."
+"Request a online signature and/or payment to the customer in order to "
+"confirm orders automatically."
 msgstr ""
 
 #. module: hotel
@@ -2426,6 +2527,7 @@ msgid "Room Child Categories"
 msgstr ""
 
 #. module: hotel
+#. odoo-python
 #: code:addons/hotel/models/hotel_folio.py:0
 #, python-format
 msgid "Room Duplicate Exceeded!, You Cannot Take Same %s Room Twice!"
@@ -2474,6 +2576,7 @@ msgid "Room amenities"
 msgstr ""
 
 #. module: hotel
+#. odoo-python
 #: code:addons/hotel/models/hotel_room.py:0
 #, python-format
 msgid "Room capacity must be more than 0"
@@ -2485,12 +2588,14 @@ msgid "Room line"
 msgstr ""
 
 #. module: hotel
+#. odoo-python
 #: code:addons/hotel/models/hotel_folio.py:0
 #, python-format
 msgid "Room line Check In Date Should be less than the Check Out Date!"
 msgstr ""
 
 #. module: hotel
+#. odoo-python
 #: code:addons/hotel/models/hotel_folio.py:0
 #, python-format
 msgid "Room line check in date should be greater than the current date."
@@ -2530,14 +2635,6 @@ msgstr ""
 msgid "Routes can be selected on this product"
 msgstr ""
 
-#. module: hotel
-#: model:ir.model.fields,field_description:hotel.field_hotel_folio__message_has_sms_error
-#: model:ir.model.fields,field_description:hotel.field_hotel_room__message_has_sms_error
-#: model:ir.model.fields,field_description:hotel.field_hotel_room_amenities__message_has_sms_error
-#: model:ir.model.fields,field_description:hotel.field_hotel_services__message_has_sms_error
-msgid "SMS Delivery error"
-msgstr ""
-
 #. module: hotel
 #: model_terms:ir.ui.view,arch_db:hotel.view_hotel_room_amenities_form
 #: model_terms:ir.ui.view,arch_db:hotel.view_hotel_services_form
@@ -2600,13 +2697,6 @@ msgstr ""
 msgid "Security Token"
 msgstr ""
 
-#. module: hotel
-#: model:ir.model.fields,help:hotel.field_hotel_room__categ_id
-#: model:ir.model.fields,help:hotel.field_hotel_room_amenities__categ_id
-#: model:ir.model.fields,help:hotel.field_hotel_services__categ_id
-msgid "Select category for the current product"
-msgstr ""
-
 #. module: hotel
 #: model:ir.model.fields,help:hotel.field_hotel_room__sale_line_warn
 #: model:ir.model.fields,help:hotel.field_hotel_room_amenities__sale_line_warn
@@ -2740,11 +2830,6 @@ msgstr ""
 msgid "Signature"
 msgstr ""
 
-#. module: hotel
-#: model:ir.model.fields,help:hotel.field_hotel_folio__signature
-msgid "Signature received through the portal."
-msgstr ""
-
 #. module: hotel
 #: model:ir.model.fields,field_description:hotel.field_hotel_folio__signed_by
 msgid "Signed By"
@@ -2755,24 +2840,6 @@ msgstr ""
 msgid "Signed On"
 msgstr ""
 
-#. module: hotel
-#: model:hotel.room,name:hotel.hotel_room_0
-#: model:product.product,name:hotel.hotel_room_0_product_product
-msgid "Single-101"
-msgstr ""
-
-#. module: hotel
-#: model:hotel.room,name:hotel.hotel_room_1
-#: model:product.product,name:hotel.hotel_room_1_product_product
-msgid "Single-102"
-msgstr ""
-
-#. module: hotel
-#: model:hotel.room,name:hotel.hotel_room_2
-#: model:product.product,name:hotel.hotel_room_2_product_product
-msgid "Single-103"
-msgstr ""
-
 #. module: hotel
 #: model:ir.model.fields,field_description:hotel.field_hotel_room__sales_count
 #: model:ir.model.fields,field_description:hotel.field_hotel_room_amenities__sales_count
@@ -2951,8 +3018,8 @@ msgid "Tax String"
 msgstr ""
 
 #. module: hotel
-#: model:ir.model.fields,field_description:hotel.field_hotel_folio__tax_totals_json
-msgid "Tax Totals Json"
+#: model:ir.model.fields,field_description:hotel.field_hotel_folio__tax_totals
+msgid "Tax Totals"
 msgstr ""
 
 #. module: hotel
@@ -2963,54 +3030,12 @@ msgid "Taxes"
 msgstr ""
 
 #. module: hotel
-#: model:hotel.services,name:hotel.hotel_service_0
-#: model:product.product,name:hotel.hotel_service_0_product_product
-msgid "Taxi"
-msgstr ""
-
-#. module: hotel
-#: model:ir.model.fields,help:hotel.field_hotel_folio__show_update_pricelist
-msgid ""
-"Technical Field, True if the pricelist was changed;\n"
-" this will then display a recomputation button"
-msgstr ""
-
-#. module: hotel
-#: model:ir.model.fields,help:hotel.field_hotel_room__valid_product_template_attribute_line_ids
-#: model:ir.model.fields,help:hotel.field_hotel_room_amenities__valid_product_template_attribute_line_ids
-#: model:ir.model.fields,help:hotel.field_hotel_services__valid_product_template_attribute_line_ids
-msgid "Technical compute"
-msgstr ""
-
-#. module: hotel
-#: model:ir.model.fields,help:hotel.field_hotel_folio_line__display_type
-#: model:ir.model.fields,help:hotel.field_hotel_service_line__display_type
-msgid "Technical field for UX purpose."
-msgstr ""
-
-#. module: hotel
-#: model:ir.model.fields,help:hotel.field_hotel_folio__tax_country_id
-msgid ""
-"Technical field to filter the available taxes depending on the fiscal "
-"country and fiscal position."
-msgstr ""
-
-#. module: hotel
-#: model:ir.model.fields,help:hotel.field_hotel_room__pricelist_id
-#: model:ir.model.fields,help:hotel.field_hotel_room_amenities__pricelist_id
-#: model:ir.model.fields,help:hotel.field_hotel_services__pricelist_id
+#: model:ir.model.fields,help:hotel.field_hotel_room__company_currency_id
+#: model:ir.model.fields,help:hotel.field_hotel_room_amenities__company_currency_id
+#: model:ir.model.fields,help:hotel.field_hotel_services__company_currency_id
 msgid ""
-"Technical field. Used for searching on pricelists, not stored in database."
-msgstr ""
-
-#. module: hotel
-#: model:ir.model.fields,help:hotel.field_hotel_room__stock_move_ids
-#: model:ir.model.fields,help:hotel.field_hotel_room__stock_quant_ids
-#: model:ir.model.fields,help:hotel.field_hotel_room_amenities__stock_move_ids
-#: model:ir.model.fields,help:hotel.field_hotel_room_amenities__stock_quant_ids
-#: model:ir.model.fields,help:hotel.field_hotel_services__stock_move_ids
-#: model:ir.model.fields,help:hotel.field_hotel_services__stock_quant_ids
-msgid "Technical: used to compute quantities."
+"Technical field to correctly show the currently selected company's currency "
+"that corresponds to the totaled value of the product's valuation layers"
 msgstr ""
 
 #. module: hotel
@@ -3024,8 +3049,10 @@ msgid "Terms and conditions"
 msgstr ""
 
 #. module: hotel
-#: model:ir.model.fields,help:hotel.field_hotel_folio__analytic_account_id
-msgid "The analytic account related to a sales order."
+#: model:ir.model.fields,help:hotel.field_hotel_folio__country_code
+msgid ""
+"The ISO country code in two chars. \n"
+"You can use this field for quick search."
 msgstr ""
 
 #. module: hotel
@@ -3053,13 +3080,6 @@ msgstr ""
 msgid "The payment communication of this sale order."
 msgstr ""
 
-#. module: hotel
-#: model:ir.model.fields,help:hotel.field_hotel_folio__currency_rate
-msgid ""
-"The rate of the currency to the currency of rate 1 applicable at the date of"
-" the order"
-msgstr ""
-
 #. module: hotel
 #: model:ir.model.fields,help:hotel.field_hotel_room__lst_price
 #: model:ir.model.fields,help:hotel.field_hotel_room_amenities__lst_price
@@ -3141,18 +3161,6 @@ msgstr ""
 msgid "To Date"
 msgstr ""
 
-#. module: hotel
-#: model:ir.model.fields,field_description:hotel.field_hotel_folio_line__qty_to_invoice
-#: model:ir.model.fields,field_description:hotel.field_hotel_service_line__qty_to_invoice
-msgid "To Invoice Quantity"
-msgstr ""
-
-#. module: hotel
-#: model:hotel.room.amenities,name:hotel.hotel_room_amenities_1
-#: model:product.product,name:hotel.hotel_room_amenities_1_product_product
-msgid "Toiletries"
-msgstr ""
-
 #. module: hotel
 #: model:ir.model.fields,field_description:hotel.field_hotel_folio__amount_total
 #: model:ir.model.fields,field_description:hotel.field_hotel_folio_line__price_total
@@ -3171,6 +3179,13 @@ msgstr ""
 msgid "Total Tax"
 msgstr ""
 
+#. module: hotel
+#: model:ir.model.fields,field_description:hotel.field_hotel_room__total_value
+#: model:ir.model.fields,field_description:hotel.field_hotel_room_amenities__total_value
+#: model:ir.model.fields,field_description:hotel.field_hotel_services__total_value
+msgid "Total Value"
+msgstr ""
+
 #. module: hotel
 #: model_terms:ir.ui.view,arch_db:hotel.view_hotel_folio_form
 #: model_terms:ir.ui.view,arch_db:hotel.view_hotel_folio_tree
@@ -3208,18 +3223,6 @@ msgstr ""
 msgid "Transfers"
 msgstr ""
 
-#. module: hotel
-#: model:hotel.room,name:hotel.hotel_room_6
-#: model:product.product,name:hotel.hotel_room_6_product_product
-msgid "Triple-101"
-msgstr ""
-
-#. module: hotel
-#: model:hotel.room,name:hotel.hotel_room_61
-#: model:product.product,name:hotel.hotel_room_61_product_product
-msgid "Triple-102"
-msgstr ""
-
 #. module: hotel
 #: model:ir.model.fields,help:hotel.field_hotel_folio_line__is_reserved
 msgid "True when folio line created from Reservation"
@@ -3267,54 +3270,6 @@ msgstr ""
 msgid "Unit of Measure Name"
 msgstr ""
 
-#. module: hotel
-#: model:hotel.room,uom_name:hotel.hotel_room_0
-#: model:hotel.room,uom_name:hotel.hotel_room_1
-#: model:hotel.room,uom_name:hotel.hotel_room_2
-#: model:hotel.room,uom_name:hotel.hotel_room_3
-#: model:hotel.room,uom_name:hotel.hotel_room_4
-#: model:hotel.room,uom_name:hotel.hotel_room_5
-#: model:hotel.room,uom_name:hotel.hotel_room_6
-#: model:hotel.room,uom_name:hotel.hotel_room_61
-#: model:hotel.room.amenities,uom_name:hotel.hotel_room_amenities_1
-#: model:hotel.room.amenities,uom_name:hotel.hotel_room_amenities_2
-#: model:hotel.room.amenities,uom_name:hotel.hotel_room_amenities_3
-#: model:hotel.services,uom_name:hotel.hotel_service_0
-#: model:hotel.services,uom_name:hotel.hotel_service_1
-#: model:hotel.services,uom_name:hotel.hotel_service_6
-#: model:product.product,uom_name:hotel.hotel_room_0_product_product
-#: model:product.product,uom_name:hotel.hotel_room_1_product_product
-#: model:product.product,uom_name:hotel.hotel_room_2_product_product
-#: model:product.product,uom_name:hotel.hotel_room_3_product_product
-#: model:product.product,uom_name:hotel.hotel_room_4_product_product
-#: model:product.product,uom_name:hotel.hotel_room_5_product_product
-#: model:product.product,uom_name:hotel.hotel_room_61_product_product
-#: model:product.product,uom_name:hotel.hotel_room_6_product_product
-#: model:product.product,uom_name:hotel.hotel_room_amenities_1_product_product
-#: model:product.product,uom_name:hotel.hotel_room_amenities_2_product_product
-#: model:product.product,uom_name:hotel.hotel_room_amenities_3_product_product
-#: model:product.product,uom_name:hotel.hotel_service_0_product_product
-#: model:product.product,uom_name:hotel.hotel_service_1_product_product
-#: model:product.product,uom_name:hotel.hotel_service_6_product_product
-msgid "Units"
-msgstr ""
-
-#. module: hotel
-#: model:ir.model.fields,field_description:hotel.field_hotel_folio__message_unread
-#: model:ir.model.fields,field_description:hotel.field_hotel_room__message_unread
-#: model:ir.model.fields,field_description:hotel.field_hotel_room_amenities__message_unread
-#: model:ir.model.fields,field_description:hotel.field_hotel_services__message_unread
-msgid "Unread Messages"
-msgstr ""
-
-#. module: hotel
-#: model:ir.model.fields,field_description:hotel.field_hotel_folio__message_unread_counter
-#: model:ir.model.fields,field_description:hotel.field_hotel_room__message_unread_counter
-#: model:ir.model.fields,field_description:hotel.field_hotel_room_amenities__message_unread_counter
-#: model:ir.model.fields,field_description:hotel.field_hotel_services__message_unread_counter
-msgid "Unread Messages Counter"
-msgstr ""
-
 #. module: hotel
 #: model:ir.model.fields,field_description:hotel.field_hotel_folio__amount_untaxed
 msgid "Untaxed Amount"
@@ -3344,6 +3299,13 @@ msgstr ""
 msgid "Valid Product Attribute Lines"
 msgstr ""
 
+#. module: hotel
+#: model:ir.model.fields,field_description:hotel.field_hotel_room__company_currency_id
+#: model:ir.model.fields,field_description:hotel.field_hotel_room_amenities__company_currency_id
+#: model:ir.model.fields,field_description:hotel.field_hotel_services__company_currency_id
+msgid "Valuation Currency"
+msgstr ""
+
 #. module: hotel
 #: model:ir.model.fields,field_description:hotel.field_hotel_room__value_svl
 #: model:ir.model.fields,field_description:hotel.field_hotel_room_amenities__value_svl
@@ -3452,6 +3414,7 @@ msgid "Warehouse"
 msgstr ""
 
 #. module: hotel
+#. odoo-python
 #: code:addons/hotel/models/hotel_folio.py:0
 #: code:addons/hotel/models/hotel_folio.py:0
 #, python-format