diff --git a/booking_engine/__manifest__.py b/booking_engine/__manifest__.py
index eacdefa6ec..78c5c184d7 100644
--- a/booking_engine/__manifest__.py
+++ b/booking_engine/__manifest__.py
@@ -1,6 +1,6 @@
 {
     'name': 'Booking Engine',
-    'version': '1.0',
+    'version': '1.1',
     'category': 'Hidden/Tools',
     'author': 'Odoo S.A.',
     'depends': [
@@ -15,6 +15,8 @@
     ],
     'data': [
         'data/res_config_settings.xml',
+        'data/ir_model.xml',
+        'data/ir_model_access.xml',
         'data/ir_model_fields.xml',
         'data/account_tax.xml',
         'data/product_template.xml',
diff --git a/booking_engine/data/base_automation.xml b/booking_engine/data/base_automation.xml
index dd888aa686..02d3124af2 100644
--- a/booking_engine/data/base_automation.xml
+++ b/booking_engine/data/base_automation.xml
@@ -1,17 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <odoo>
-  <record id="industry_on_so_line" model="base.automation">
-    <field name="model_id" ref="sale.model_sale_order"/>
-    <field name="action_server_ids" eval="[(6, 0, [ref('industry_add_update')])]"/>
-    <field name="trigger">on_create_or_write</field>
-    <field name="name">On SO line edit, add/edit city tax</field>
-    <field name="trigger_field_ids" eval="[(6, 0, [ref('sale_model_sale_order_x_picked_up')])]"/>
-    <field name="filter_pre_domain">[('x_picked_up', '=', False)]</field>
-    <field name="filter_domain">[('x_picked_up', '=', True)]</field>
-  </record>
   <record id="industry_on_slot_fix_times" model="base.automation">
     <field name="model_id" ref="planning.model_planning_slot"/>
-    <field name="action_server_ids" eval="[(6, 0, [ref('industry_fix_slot_times'), ref('industry_trigger_so_update_from_slot')])]"/>
+    <field name="action_server_ids" eval="[(6, 0, [ref('industry_fix_slot_times')])]"/>
     <field name="trigger">on_create_or_write</field>
     <field name="name">Fix Slot Times</field>
     <field name="trigger_field_ids" eval="[(6, 0, [ref('planning.field_planning_slot__end_datetime'), ref('planning.field_planning_slot__start_datetime'), ref('sale_planning.field_planning_slot__sale_line_id')])]"/>
diff --git a/booking_engine/data/ir_actions_server.xml b/booking_engine/data/ir_actions_server.xml
index 20bc223681..5fc926cf15 100644
--- a/booking_engine/data/ir_actions_server.xml
+++ b/booking_engine/data/ir_actions_server.xml
@@ -1,59 +1,52 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <odoo>
-    <record id="industry_add_update" model="ir.actions.server">
+    <record id="update_city_tax_action" model="ir.actions.server">
         <field name="name">Add/Update City Tax</field>
-        <field name="model_id" ref="sale.model_sale_order"/>
-        <field name="usage">base_automation</field>
+        <field name="model_id" ref="x_model_city_tax"/>
         <field name="state">code</field>
-        <field name="code"><![CDATA[for record in records:
-    stay_taxes = 0
-    stay_tax_line = False
-    for so_line in record.order_line:
-        if so_line.product_id.x_is_a_room_offer:
-            if so_line.x_nights > 0: stay_taxes += so_line.x_nights
-        if so_line.product_id.x_is_stay_tax: stay_tax_line = so_line
-    if stay_taxes > 0:
-        if stay_tax_line: stay_tax_line['product_uom_qty'] = stay_taxes
-        else: # Add stay tax product
-            product = env['product.product'].search([('x_is_stay_tax', '=', True)], limit=1)
-            env['sale.order.line'].create({'order_id': record.id, 'product_id': product.id, 'product_uom_qty': stay_taxes})
+        <field name="code"><![CDATA[
+stay_tax_line = False
+sequence = 0
+for so_line in record.x_sale_order_id.order_line:
+    if so_line.product_id.x_is_stay_tax: stay_tax_line = so_line
+    sequence = max(sequence, so_line.sequence)
+if stay_tax_line: stay_tax_line.write({'product_uom_qty': record.x_total, 'qty_delivered': record.x_total, 'sequence': 1 + sequence})
+elif record.x_total > 0:
+    product = env['product.product'].search([('x_is_stay_tax', '=', True)], limit=1)
+    env['sale.order.line'].create({'order_id': record.x_sale_order_id.id, 'product_id': product.id, 'product_uom_qty': record.x_total, 'qty_delivered': record.x_total})
         ]]></field>
     </record>
-    <record id="industry_trigger_so_update_from_slot" model="ir.actions.server">
-        <field name="name">Trigger SO Update from Slot</field>
-        <field name="model_id" ref="planning.model_planning_slot"/>
-        <field name="usage">base_automation</field>
+    <record id="open_x_city_tax_action" model="ir.actions.server">
+        <field name="name">Open City Tax</field>
+        <field name="model_id" ref="sale.model_sale_order"/>
         <field name="state">code</field>
         <field name="code"><![CDATA[
-sale_order = record.sale_order_id
-if sale_order:
-    stay_taxes = 0
-    stay_tax_line = False
-    for so_line in sale_order.order_line:
-        if so_line.product_id.x_is_a_room_offer:
-            if so_line.x_nights > 0:
-                stay_taxes += so_line.x_nights
-        if so_line.product_id.x_is_stay_tax:
-            stay_tax_line = so_line
-    if stay_taxes > 0:
-        if stay_tax_line:
-            stay_tax_line['product_uom_qty'] = stay_taxes
+record.order_line.planning_slot_ids['x_guests'] = len(record.x_guests) // (len(record.order_line.planning_slot_ids) or 1) or 1
+action = {
+    'type': 'ir.actions.act_window',
+    'name': 'City tax',
+    'res_model': 'x_city_tax',
+    'view_mode': 'form',
+    'target': 'new',
+    'context': {'search_default_x_sale_order_id': record.id, 'default_x_sale_order_id': record.id},
+    'domain': [('x_sale_order_id', '=', record.id)],
+}   
 ]]></field>
     </record>
-  <record id="industry_fix_slot_times" model="ir.actions.server">
-    <field name="binding_model_id" ref="planning.model_planning_slot"/>
-    <field name="model_id" ref="planning.model_planning_slot"/>
-    <field name="usage">base_automation</field>
-    <field name="state">code</field>
-    <field name="name">Fix Slot Times</field>
-    <field name="code"><![CDATA[def ceil(x):
-    return int(x) if x == int(x) else int(x) + 1
+    <record id="industry_fix_slot_times" model="ir.actions.server">
+        <field name="binding_model_id" ref="planning.model_planning_slot"/>
+        <field name="model_id" ref="planning.model_planning_slot"/>
+        <field name="usage">base_automation</field>
+        <field name="state">code</field>
+        <field name="name">Fix Slot Times</field>
+        <field name="code"><![CDATA[
 pickup_time = env.ref('sale_renting.recurrence_nightly').pickup_time
 return_time = env.ref('sale_renting.recurrence_nightly').return_time
-start_datetime = record.start_datetime.astimezone(tz=dateutil.tz.UTC)
-end_datetime = record.end_datetime.astimezone(tz=dateutil.tz.UTC)
 tz = env.ref('website.default_website').tz
-if record.role_id.x_is_a_room_offer:
+for record in records:
+    if not record.role_id.x_is_a_room_offer: continue
+    start_datetime = record.start_datetime.astimezone(tz=dateutil.tz.UTC)
+    end_datetime = record.end_datetime.astimezone(tz=dateutil.tz.UTC)
     if record.start_datetime and str(record.start_datetime.time()) != f"{int(pickup_time):02d}:{int(pickup_time % 1 * 60):02d}:00":
         start = timezone(tz).localize(datetime.datetime(year=start_datetime.year, month=start_datetime.month, day=start_datetime.day, hour=int(pickup_time), minute=int(pickup_time % 1 * 60), second=0))
         start_datetime = start.astimezone(tz=dateutil.tz.UTC)
@@ -66,12 +59,10 @@ if record.role_id.x_is_a_room_offer:
             end_datetime = end_datetime + datetime.timedelta(days=1)
     record['start_datetime'] = start_datetime.replace(tzinfo=None)
     record['end_datetime'] = end_datetime.replace(tzinfo=None)
-if record.sale_line_id:
+for record in records:
     nights = 0
     if record.sale_line_id.planning_slot_ids:
-        for slot in record.sale_line_id.planning_slot_ids:
-            if slot.start_datetime and slot.end_datetime:
-                nights += ceil((slot.end_datetime - slot.start_datetime).total_seconds() / (24 * 3600))
+        nights = sum(record.sale_line_id.planning_slot_ids.mapped('x_nights'))
     record.sale_line_id.update({
         'start_date': record.start_datetime,
         'return_date': record.end_datetime,
@@ -91,14 +82,24 @@ return_time = env.ref('sale_renting.recurrence_nightly').return_time
 for record in records:
     tz = env.ref('website.default_website').tz
     rental_start_date = record.rental_start_date.astimezone(tz=dateutil.tz.gettz(tz))
+    start = rental_start_date.replace(hour=int(pickup_time), minute=int(pickup_time % 1 * 60), second=0)
+    record['rental_start_date'] = start.astimezone(tz=dateutil.tz.UTC).replace(tzinfo=None)
+
     rental_return_date = record.rental_return_date.astimezone(tz=dateutil.tz.gettz(tz))
-    start = rental_start_date.replace(hour=int(pickup_time), minute=int(pickup_time % 1 * 60), second=0, microsecond=0)
-    start_datetime = start.astimezone(tz=dateutil.tz.UTC)
-    record['rental_start_date'] = start_datetime.replace(tzinfo=None)
-    end = rental_return_date.replace(hour=int(return_time), minute=int(return_time % 1 * 60), second=0, microsecond=0)
-    end_datetime = end.astimezone(tz=dateutil.tz.UTC)
-    record['rental_return_date'] = end_datetime.replace(tzinfo=None)
+    end = rental_return_date.replace(hour=int(return_time), minute=int(return_time % 1 * 60), second=0)
+    record['rental_return_date'] = end.astimezone(tz=dateutil.tz.UTC).replace(tzinfo=None)
     record.action_update_rental_prices()
+]]></field>
+    </record>
+    <record id="apply_rental_check_out" model="ir.actions.server">
+        <field name="name">Apply Rental Checkout</field>
+        <field name="model_id" ref="sale_renting.model_rental_order_wizard"/>
+        <field name="state">code</field>
+        <field name="code"><![CDATA[
+record.apply()
+if record.order_id.rental_status == "returned":
+    server_action = record.env['ir.actions.server'].browse(record.env.ref('booking_engine.open_x_city_tax_action').id)
+    action = server_action.with_context(active_id=record.order_id.id, active_model="sale.order").sudo().run()
 ]]></field>
     </record>
 </odoo>
diff --git a/booking_engine/data/ir_model.xml b/booking_engine/data/ir_model.xml
new file mode 100644
index 0000000000..b75198f17f
--- /dev/null
+++ b/booking_engine/data/ir_model.xml
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<odoo>
+    <record id="x_model_city_tax" model="ir.model">
+        <field name="name">City tax</field>
+        <field name="model">x_city_tax</field>
+        <field name="transient" eval="True" />
+    </record>
+</odoo>
diff --git a/booking_engine/data/ir_model_access.xml b/booking_engine/data/ir_model_access.xml
new file mode 100644
index 0000000000..29ddc61237
--- /dev/null
+++ b/booking_engine/data/ir_model_access.xml
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<odoo>
+    <record id="city_tax_access" model="ir.model.access">
+        <field name="group_id" ref="base.group_user"/>
+        <field name="model_id" ref="x_model_city_tax"/>
+        <field name="name">x_city_tax_user_access</field>
+        <field name="perm_create" eval="True"/>
+        <field name="perm_read" eval="True"/>
+        <field name="perm_unlink" eval="True"/>
+        <field name="perm_write" eval="True"/>
+    </record>
+</odoo>
diff --git a/booking_engine/data/ir_model_fields.xml b/booking_engine/data/ir_model_fields.xml
index 8ea072c2b6..adee2cd1d2 100644
--- a/booking_engine/data/ir_model_fields.xml
+++ b/booking_engine/data/ir_model_fields.xml
@@ -84,8 +84,7 @@
         record['x_identity_check'] = 'na'
     elif record.x_nationality and record.x_document_type and record.x_document_number:
         record['x_identity_check'] = 'ok'
-    else:
-        record['x_identity_check'] = 'invalid'
+    else: record['x_identity_check'] = 'invalid'
 ]]></field>
   </record>
   <record id="product_model_product_template_x_is_a_room_offer_field" model="ir.model.fields">
@@ -115,8 +114,8 @@
     <field name="field_description">Order Involves Room</field>
     <field name="model_id" ref="sale.model_sale_order"/>
     <field name="name">x_order_involves_room</field>
-    <field name="compute"><![CDATA[for record in self:
-    record['x_order_involves_room'] = any(line.product_id.x_is_a_room_offer for line in record.order_line)
+    <field name="compute"><![CDATA[
+for record in self: record['x_order_involves_room'] = any(line.product_id.x_is_a_room_offer for line in record.order_line)
 ]]></field>
     <field name="depends">order_line</field>
   </record>
@@ -135,8 +134,8 @@
     <field name="depends">order_line.qty_delivered</field>
   </record>
   <record id="res_partner_x_guests_count" model="ir.model.fields">
-    <field name="compute"><![CDATA[for record in self: 
-    record['x_guests_count'] = self.env['sale.order'].search_count([('x_guests', '=', record.id)])
+    <field name="compute"><![CDATA[
+for record in self: record['x_guests_count'] = self.env['sale.order'].search_count([('x_guests', '=', record.id)])
 ]]></field>
     <field name="ttype">integer</field>
     <field name="field_description">Guests count</field>
@@ -162,9 +161,8 @@
     <field name="relation">res.partner</field>
     <field name="readonly" eval="True"/>
     <field name="depends">x_ongoing_booking.partner_id</field>
-    <field name="compute"><![CDATA[for record in self:
-    booking = record.x_ongoing_booking
-    record['x_occupant'] = booking[:1].partner_id.id
+    <field name="compute"><![CDATA[
+for record in self: record['x_occupant'] = record.x_ongoing_booking[:1].partner_id.id
 ]]></field>
   </record>
   <record id="res_partner_x_ongoing_bookings" model="ir.model.fields">
@@ -176,4 +174,63 @@
     <field name="readonly" eval="True"/>
     <field name="name">x_ongoing_bookings</field>
   </record>
+  <record id="model_planning_slot_x_nights" model="ir.model.fields">
+    <field name="ttype">integer</field>
+    <field name="field_description">Nights</field>
+    <field name="model_id" ref="planning.model_planning_slot"/>
+    <field name="depends">start_datetime, end_datetime</field>
+    <field name="name">x_nights</field>
+    <field name="compute"><![CDATA[
+for record in self: record['x_nights'] = ((record.end_datetime - record.start_datetime).total_seconds() + 86399) // 86400
+]]></field>
+  </record>
+  <record id="model_planning_slot_x_guests" model="ir.model.fields">
+    <field name="ttype">integer</field>
+    <field name="field_description">Guests</field>
+    <field name="model_id" ref="planning.model_planning_slot"/>
+    <field name="name">x_guests</field>
+  </record>
+  <record id="model_planning_slot_x_city_tax" model="ir.model.fields">
+    <field name="ttype">integer</field>
+    <field name="field_description">City tax count</field>
+    <field name="model_id" ref="planning.model_planning_slot"/>
+    <field name="depends">x_nights, x_guests</field>
+    <field name="name">x_city_tax</field>
+    <field name="compute"><![CDATA[
+for record in self: record['x_city_tax'] = record.x_nights * record.x_guests
+]]></field>
+  </record>
+  <record id="x_model_city_tax_x_sale_order_id" model="ir.model.fields">
+    <field name="ttype">many2one</field>
+    <field name="field_description">Sale order</field>
+    <field name="model_id" ref="x_model_city_tax"/>
+    <field name="relation">sale.order</field>
+    <field name="name">x_sale_order_id</field>
+    <field name="readonly" eval="True"/>
+  </record>
+  <record id="x_model_city_tax_x_slot_ids" model="ir.model.fields">
+    <field name="ttype">many2many</field>
+    <field name="field_description">Slots</field>
+    <field name="model_id" ref="x_model_city_tax"/>
+    <field name="relation">planning.slot</field>
+    <field name="depends">x_sale_order_id.order_line.planning_slot_ids</field>
+    <field name="name">x_slot_ids</field>
+    <field name="compute"><![CDATA[
+for record in self: record['x_slot_ids'] = record.x_sale_order_id.order_line.planning_slot_ids
+]]></field>
+    <field name="store" eval="False"/>
+  </record>
+  <record id="x_model_city_tax_x_total" model="ir.model.fields">
+    <field name="ttype">integer</field>
+    <field name="field_description">Total</field>
+    <field name="model_id" ref="x_model_city_tax"/>
+    <field name="relation_field">planning_total</field>
+    <field name="name">x_total</field>
+    <field name="depends">x_slot_ids, x_slot_ids.x_city_tax</field>
+    <field name="compute"><![CDATA[
+for record in self: record['x_total'] = sum(record.x_slot_ids.mapped('x_city_tax'))
+]]></field>
+    <field name="readonly" eval="True"/>
+    <field name="store" eval="False"/>
+  </record>
 </odoo>
diff --git a/booking_engine/data/ir_ui_view.xml b/booking_engine/data/ir_ui_view.xml
index b054a45c76..66bacbb607 100644
--- a/booking_engine/data/ir_ui_view.xml
+++ b/booking_engine/data/ir_ui_view.xml
@@ -1,5 +1,47 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <odoo>
+  <record id="x_city_tax_form_view" model="ir.ui.view">
+    <field name="arch" type="xml">
+      <form>
+        <field name="x_slot_ids">
+          <list string="City tax" editable="bottom" multi_edit="1" class="d-flex">
+            <field name="role_id" string="Room" readonly="True" width="92px"/>
+            <field name="start_datetime" string="Slot" readonly="True" widget="daterange" options="{'end_date_field': 'end_datetime'}"/>
+            <field name="x_nights"/>
+            <field name="x_guests"/>
+            <field name="x_city_tax"/>
+          </list>
+        </field>
+        <group class="d-flex justify-content-end">
+          <field name="x_total" class="text-center"/>
+        </group>
+        <footer>
+          <button string="Save" class="btn btn-primary" type="action" name="%(update_city_tax_action)d"/>
+          <button special="cancel" string="Cancel" class="btn btn-secondary"/>
+        </footer>
+      </form>
+    </field>
+    <field name="mode">primary</field>
+    <field name="model">x_city_tax</field>
+    <field name="name">x_city_tax.form.booking_engine</field>
+    <field name="priority">200</field>
+    <field name="type">form</field>
+    <field name="active" eval="True"/>
+  </record>
+  <record id="rental_order_view_inherit" model="ir.ui.view">
+    <field name="arch" type="xml">
+      <xpath expr="//button[@name='apply']" position="replace">
+        <button string="Validate" class="btn btn-primary" type="action" name="%(apply_rental_check_out)d" data-hotkey="q"/>
+      </xpath>
+    </field>
+    <field name="inherit_id" ref="sale_renting.rental_order_wizard_view_form"/>
+    <field name="mode">extension</field>
+    <field name="model">rental.order.wizard</field>
+    <field name="name">rental.order.wizard.form.booking_engine</field>
+    <field name="priority">200</field>
+    <field name="type">form</field>
+    <field name="active" eval="True"/>
+  </record>
   <record id="rental_order_view" model="ir.ui.view">
     <field name="arch" type="xml">
         <xpath expr="//button[@name='action_open_pickup']" position="attributes">
@@ -9,7 +51,7 @@
           <attribute name="string">Check Out</attribute>
         </xpath>
         <xpath expr="//field[@name='is_rental_order']" position="after">
-          <button string="City Tax" name="%(industry_add_update)d" type="action"/>
+          <button string="City Tax" type="action" name="%(open_x_city_tax_action)d"/>
         </xpath>
         <xpath expr="//form[1]/sheet[1]/notebook[1]" position="inside">
           <page string="Guests">
diff --git a/booking_engine/i18n/booking_engine.pot b/booking_engine/i18n/booking_engine.pot
index 948a6e014a..10d8e89e62 100644
--- a/booking_engine/i18n/booking_engine.pot
+++ b/booking_engine/i18n/booking_engine.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 19.0+e\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-10-10 11:23+0000\n"
-"PO-Revision-Date: 2025-10-10 11:23+0000\n"
+"POT-Creation-Date: 2025-10-24 12:01+0000\n"
+"PO-Revision-Date: 2025-10-24 12:01+0000\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -56,7 +56,7 @@ msgid "<i class=\"fa fa-shopping-cart me-2\"/>&amp;nbsp;Book"
 msgstr ""
 
 #. module: booking_engine
-#: model:ir.actions.server,name:booking_engine.industry_add_update
+#: model:ir.actions.server,name:booking_engine.update_city_tax_action
 msgid "Add/Update City Tax"
 msgstr ""
 
@@ -70,6 +70,11 @@ msgstr ""
 msgid "All rooms"
 msgstr ""
 
+#. module: booking_engine
+#: model:ir.actions.server,name:booking_engine.apply_rental_check_out
+msgid "Apply Rental Checkout"
+msgstr ""
+
 #. module: booking_engine
 #: model_terms:ir.ui.view,arch_db:booking_engine.booking_engine_offers_search
 msgid "Archived"
@@ -102,11 +107,6 @@ msgstr ""
 msgid "Beds"
 msgstr ""
 
-#. module: booking_engine
-#: model:ir.ui.menu,name:booking_engine.booking_engine_menu_root
-msgid "Booking"
-msgstr ""
-
 #. module: booking_engine
 #: model_terms:ir.ui.view,arch_db:booking_engine.booking_engine_offers_search
 msgid "Booking Engine Offers"
@@ -117,6 +117,11 @@ msgstr ""
 msgid "Breakfast"
 msgstr ""
 
+#. module: booking_engine
+#: model_terms:ir.ui.view,arch_db:booking_engine.x_city_tax_form_view
+msgid "Cancel"
+msgstr ""
+
 #. module: booking_engine
 #: model_terms:ir.ui.view,arch_db:booking_engine.rental_order_view
 msgid "Check In"
@@ -139,6 +144,17 @@ msgstr ""
 msgid "City Taxes"
 msgstr ""
 
+#. module: booking_engine
+#: model:ir.model,name:booking_engine.x_model_city_tax
+#: model_terms:ir.ui.view,arch_db:booking_engine.x_city_tax_form_view
+msgid "City tax"
+msgstr ""
+
+#. module: booking_engine
+#: model:ir.model.fields,field_description:booking_engine.model_planning_slot_x_city_tax
+msgid "City tax count"
+msgstr ""
+
 #. module: booking_engine
 #: model:product.attribute,name:booking_engine.product_attribute_14
 msgid "Coffe Machine"
@@ -196,6 +212,7 @@ msgid "Free Wifi"
 msgstr ""
 
 #. module: booking_engine
+#: model:ir.model.fields,field_description:booking_engine.model_planning_slot_x_guests
 #: model:ir.model.fields,field_description:booking_engine.sale_model_sale_order_x_guests_field
 #: model:product.attribute,name:booking_engine.product_attribute_22
 #: model_terms:ir.ui.view,arch_db:booking_engine.rental_order_view
@@ -212,6 +229,11 @@ msgstr ""
 msgid "Hairdryer"
 msgstr ""
 
+#. module: booking_engine
+#: model:ir.ui.menu,name:booking_engine.booking_engine_menu_root
+msgid "Hotel"
+msgstr ""
+
 #. module: booking_engine
 #: model:ir.model.fields.selection,name:booking_engine.base_model_res_partner_x_document_type_field_selection_id_card
 msgid "ID card"
@@ -277,6 +299,7 @@ msgid "Nationality"
 msgstr ""
 
 #. module: booking_engine
+#: model:ir.model.fields,field_description:booking_engine.model_planning_slot_x_nights
 #: model:ir.model.fields,field_description:booking_engine.sale_model_sale_order_x_nights_field
 msgid "Nights"
 msgstr ""
@@ -301,11 +324,6 @@ msgstr ""
 msgid "Offers"
 msgstr ""
 
-#. module: booking_engine
-#: model:base.automation,name:booking_engine.industry_on_so_line
-msgid "On SO line edit, add/edit city tax"
-msgstr ""
-
 #. module: booking_engine
 #: model:ir.model.fields,field_description:booking_engine.resource_x_on_going_booking
 msgid "Ongoing Booking"
@@ -316,6 +334,11 @@ msgstr ""
 msgid "Ongoing Bookings"
 msgstr ""
 
+#. module: booking_engine
+#: model:ir.actions.server,name:booking_engine.open_x_city_tax_action
+msgid "Open City Tax"
+msgstr ""
+
 #. module: booking_engine
 #: model:ir.model.fields,field_description:booking_engine.sale_order_x_order_involves_room
 msgid "Order Involves Room"
@@ -382,6 +405,11 @@ msgstr ""
 msgid "Roles"
 msgstr ""
 
+#. module: booking_engine
+#: model_terms:ir.ui.view,arch_db:booking_engine.x_city_tax_form_view
+msgid "Room"
+msgstr ""
+
 #. module: booking_engine
 #: model:ir.actions.act_window,name:booking_engine.booking_engine_rooms_offers_action
 msgid "Room Offers"
@@ -402,6 +430,16 @@ msgstr ""
 msgid "Rooms"
 msgstr ""
 
+#. module: booking_engine
+#: model:ir.model.fields,field_description:booking_engine.x_model_city_tax_x_sale_order_id
+msgid "Sale order"
+msgstr ""
+
+#. module: booking_engine
+#: model_terms:ir.ui.view,arch_db:booking_engine.x_city_tax_form_view
+msgid "Save"
+msgstr ""
+
 #. module: booking_engine
 #: model:ir.actions.act_window,name:booking_engine.booking_engine_rooms_schedule_action
 #: model:ir.ui.menu,name:booking_engine.booking_engine_schedule_menu
@@ -428,6 +466,16 @@ msgstr ""
 msgid "Single beds"
 msgstr ""
 
+#. module: booking_engine
+#: model_terms:ir.ui.view,arch_db:booking_engine.x_city_tax_form_view
+msgid "Slot"
+msgstr ""
+
+#. module: booking_engine
+#: model:ir.model.fields,field_description:booking_engine.x_model_city_tax_x_slot_ids
+msgid "Slots"
+msgstr ""
+
 #. module: booking_engine
 #: model_terms:ir.ui.view,arch_db:booking_engine.booking_engine_order_search
 msgid "Status"
@@ -459,12 +507,17 @@ msgstr ""
 msgid "Today"
 msgstr ""
 
+#. module: booking_engine
+#: model:ir.model.fields,field_description:booking_engine.x_model_city_tax_x_total
+msgid "Total"
+msgstr ""
+
 #. module: booking_engine
 #: model:product.attribute,name:booking_engine.product_attribute_17
 msgid "Towels"
 msgstr ""
 
 #. module: booking_engine
-#: model:ir.actions.server,name:booking_engine.industry_trigger_so_update_from_slot
-msgid "Trigger SO Update from Slot"
+#: model_terms:ir.ui.view,arch_db:booking_engine.rental_order_view_inherit
+msgid "Validate"
 msgstr ""
diff --git a/guest_house/__manifest__.py b/guest_house/__manifest__.py
index dbaa406bbc..9f3f0f5cd1 100644
--- a/guest_house/__manifest__.py
+++ b/guest_house/__manifest__.py
@@ -1,6 +1,6 @@
 {
     'name': 'Guest House',
-    'version': '1.1',
+    'version': '1.2',
     'category': 'Hospitality',
     'author': 'Odoo S.A.',
     'depends': [
diff --git a/guest_house/data/knowledge_article.xml b/guest_house/data/knowledge_article.xml
index bc386c59bb..f0349d9b1f 100644
--- a/guest_house/data/knowledge_article.xml
+++ b/guest_house/data/knowledge_article.xml
@@ -229,26 +229,16 @@
         <ul>
             <li>Open your guest order from the Guest House App.</li>
             <li>Click the Check out button to capture they return you the keys.</li>
+            <li>Check and adjust if needed the number of guests who stayed in each room. Then confirm the number of city taxes to be charged, which updates the delivered city tax count.</li>
         </ul>
-        <h4>Manage the city tax</h4>
-        <p>You may have noticed the city tax were added to the guest order from the moment they
-            checked in.<br />This is because city taxes are to be billed to spent nights in practice
-            and not in theory.<br />Let's adjust them now.</p>
-        <ul>
-            <li>On the City Tax line, adjust the number of guest x nights delivered.</li>
-        </ul>
-        <div
-            class="o_editor_banner user-select-none o-contenteditable-false lh-1 d-flex align-items-center alert alert-info pb-0 pt-3"
-            data-oe-role="status">
-            <i class="o_editor_banner_icon mb-3 fst-normal" data-oe-aria-label="Banner Info">💡</i>
+        <div class="o_editor_banner user-select-none o-contenteditable-false lh-1 d-flex align-items-center alert alert-info pb-0 pt-3" data-oe-role="status" contenteditable="false" role="status">
+            <i class="o_editor_banner_icon mb-3 fst-normal" data-oe-aria-label="Banner Info" aria-label="Banner Info">💡</i>
             <div class="o_editor_banner_content o-contenteditable-true w-100 px-3">
-                <p>Example: A room for 2 is booked for 4 nights, two guest were here for the first
-                    three night but onlu one stayed the last night. Then the guest x nights is
-                    2x3+1x1=7.</p>
+                <div class="o-paragraph">City Taxes are to be billed to spent nights in practice and not in theory and are counted as the sum of nights each guest stayed.</div>
+                <div class="o-paragraph">Example: A room for 2 is booked for 4 nights, two guests were here for the first three nights but only one stayed the last night. Then the guests x nights is 2x3+1x1=7.</div>
             </div>
         </div>
-        <p>Those city tax are now due as well as any other additional services consumed during the
-            stay.</p>
+        <p>At any time you can adjust the city tax count delivered by re-opening the city tax widget clicking the City Tax button on the guest order.</p>
         <h4>Charge your guests</h4>
         <ul>
             <li>Open the guest order.</li>
@@ -256,7 +246,6 @@
             <li>Check the invoice data and confirm it.</li>
             <li>Charge your customer for the resulting amount and you're all set!</li>
         </ul>
-            <br />
         <p>
             <em>Don't forget to thank your guests with a warm goodbye!</em>
         </p>
@@ -340,13 +329,6 @@
         <p>
             <br />
         </p>
-        <div class="oe-hint"
-            style="box-sizing: border-box; color: rgb(55, 65, 81); font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Ubuntu, 'Noto Sans', Arial, 'Odoo Unicode Support Noto', sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji'; font-size: 14px; font-style: normal; font-variant-ligatures: normal; font-variant-caps: normal; font-weight: 400; letter-spacing: normal; orphans: 2; text-align: start; text-indent: 0px; text-transform: none; widows: 2; word-spacing: 0px; -webkit-text-stroke-width: 0px; white-space: normal; background-color: rgb(255, 255, 255); text-decoration-thickness: initial; text-decoration-style: initial; text-decoration-color: initial;">
-            <br />
-        </div>
-        <p>
-            <br />
-        </p>
     </template>
     <record id="welcome_article" model="knowledge.article">
         <field name="name">Guest House - Start here!</field>
diff --git a/guest_house/i18n/guest_house.pot b/guest_house/i18n/guest_house.pot
index 444b563795..6fcb519db7 100644
--- a/guest_house/i18n/guest_house.pot
+++ b/guest_house/i18n/guest_house.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 19.0+e\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-10-10 10:00+0000\n"
-"PO-Revision-Date: 2025-10-10 10:00+0000\n"
+"POT-Creation-Date: 2025-10-24 12:14+0000\n"
+"PO-Revision-Date: 2025-10-24 12:14+0000\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -46,6 +46,13 @@ msgstr ""
 msgid "<em>Don't forget to thank your guests with a warm goodbye!</em>"
 msgstr ""
 
+#. module: guest_house
+#: model_terms:ir.ui.view,arch_db:guest_house.welcome_article_body
+msgid ""
+"<i class=\"o_editor_banner_icon mb-3 fst-normal\" data-oe-aria-"
+"label=\"Banner Info\" aria-label=\"Banner Info\">💡</i>"
+msgstr ""
+
 #. module: guest_house
 #: model_terms:ir.ui.view,arch_db:guest_house.welcome_article_body
 msgid ""
@@ -216,6 +223,13 @@ msgid ""
 "                    to exchange with your guest."
 msgstr ""
 
+#. module: guest_house
+#: model_terms:ir.ui.view,arch_db:guest_house.welcome_article_body
+msgid ""
+"At any time you can adjust the city tax count delivered by re-opening the "
+"city tax widget clicking the City Tax button on the guest order."
+msgstr ""
+
 #. module: guest_house
 #: model_terms:ir.ui.view,arch_db:guest_house.welcome_article_body
 msgid "At the end of their stay, they'll be able to pay for all those extras."
@@ -258,6 +272,14 @@ msgstr ""
 msgid "Charming double room with a fireplace and scenic views."
 msgstr ""
 
+#. module: guest_house
+#: model_terms:ir.ui.view,arch_db:guest_house.welcome_article_body
+msgid ""
+"Check and adjust if needed the number of guests who stayed in each room. "
+"Then confirm the number of city taxes to be charged, which updates the "
+"delivered city tax count."
+msgstr ""
+
 #. module: guest_house
 #: model_terms:ir.ui.view,arch_db:guest_house.welcome_article_body
 msgid "Check guests in"
@@ -278,6 +300,13 @@ msgstr ""
 msgid "Check the invoice data and confirm it."
 msgstr ""
 
+#. module: guest_house
+#: model_terms:ir.ui.view,arch_db:guest_house.welcome_article_body
+msgid ""
+"City Taxes are to be billed to spent nights in practice and not in theory "
+"and are counted as the sum of nights each guest stayed."
+msgstr ""
+
 #. module: guest_house
 #: model_terms:ir.ui.view,arch_db:guest_house.welcome_article_body
 msgid "Click one of the room to book."
@@ -371,9 +400,9 @@ msgstr ""
 #. module: guest_house
 #: model_terms:ir.ui.view,arch_db:guest_house.welcome_article_body
 msgid ""
-"Example: A room for 2 is booked for 4 nights, two guest were here for the first\n"
-"                    three night but onlu one stayed the last night. Then the guest x nights is\n"
-"                    2x3+1x1=7."
+"Example: A room for 2 is booked for 4 nights, two guests were here for the "
+"first three nights but only one stayed the last night. Then the guests x "
+"nights is 2x3+1x1=7."
 msgstr ""
 
 #. module: guest_house
@@ -435,11 +464,6 @@ msgstr ""
 msgid "Garden Room (2 guests)"
 msgstr ""
 
-#. module: guest_house
-#: model:ir.ui.menu,name:booking_engine.booking_engine_menu_root
-msgid "Guest House"
-msgstr ""
-
 #. module: guest_house
 #: model_terms:ir.ui.view,arch_db:guest_house.welcome_article_body
 msgid "Hello there!"
@@ -488,11 +512,6 @@ msgstr ""
 msgid "Let's book a room!"
 msgstr ""
 
-#. module: guest_house
-#: model_terms:ir.ui.view,arch_db:guest_house.welcome_article_body
-msgid "Manage the city tax"
-msgstr ""
-
 #. module: guest_house
 #: model_terms:ir.ui.view,arch_db:guest_house.welcome_article_body
 msgid ""
@@ -535,11 +554,6 @@ msgid ""
 "            to add new apps, delete/modify demo data, and test everything around!"
 msgstr ""
 
-#. module: guest_house
-#: model_terms:ir.ui.view,arch_db:guest_house.welcome_article_body
-msgid "On the City Tax line, adjust the number of guest x nights delivered."
-msgstr ""
-
 #. module: guest_house
 #: model_terms:ir.ui.view,arch_db:guest_house.welcome_article_body
 msgid "On the room to block line, click, drag and drop to create a slot."
@@ -797,13 +811,6 @@ msgid ""
 "slot."
 msgstr ""
 
-#. module: guest_house
-#: model_terms:ir.ui.view,arch_db:guest_house.welcome_article_body
-msgid ""
-"Those city tax are now due as well as any other additional services consumed during the\n"
-"            stay."
-msgstr ""
-
 #. module: guest_house
 #: model_terms:ir.ui.view,arch_db:guest_house.welcome_article_body
 msgid "Trace guest attendance"
@@ -896,14 +903,6 @@ msgid ""
 "            bunch of necessary apps to run your bar efficiently."
 msgstr ""
 
-#. module: guest_house
-#: model_terms:ir.ui.view,arch_db:guest_house.welcome_article_body
-msgid ""
-"You may have noticed the city tax were added to the guest order from the moment they\n"
-"            checked in.<br/>This is because city taxes are to be billed to spent nights in practice\n"
-"            and not in theory.<br/>Let's adjust them now."
-msgstr ""
-
 #. module: guest_house
 #: model_terms:ir.ui.view,arch_db:guest_house.welcome_article_body
 msgid "You might have tested this package with or without demo data."
diff --git a/holiday_house/__manifest__.py b/holiday_house/__manifest__.py
index 40556787ab..a7f95f413e 100644
--- a/holiday_house/__manifest__.py
+++ b/holiday_house/__manifest__.py
@@ -1,6 +1,6 @@
 {
     'name': 'Holiday House',
-    'version': '1.0',
+    'version': '1.1',
     'category': 'Hospitality',
     'author': 'Odoo S.A.',
     'depends': [
diff --git a/holiday_house/data/knowledge_article.xml b/holiday_house/data/knowledge_article.xml
index 5bd54d9bc4..c9d59dd7bf 100644
--- a/holiday_house/data/knowledge_article.xml
+++ b/holiday_house/data/knowledge_article.xml
@@ -171,21 +171,16 @@ The Holiday House App relies on the Rental and Planning Apps binding, with a few
         <ul>
             <li>Open your guest order from the Holiday House App.</li>
             <li>Click the Check out button to capture they return you the keys.</li>
+            <li>Check and adjust if needed the number of guest who stayed in each room. Then confirm the number of city tax to be charged, which updated the delivered city tax count.</li>
         </ul>
-        <h4>Manage the city tax</h4>
-        <p>You may have noticed the city tax were added to the guest order from the moment they checked in.<br/>
-This is because city taxes are to be billed to spent nights in practice and not in theory.<br/>
-Let's adjust them now.</p>
-    <ul>
-        <li>On the City Tax line, adjust the number of guest x nights delivered.</li>
-    </ul>
-    <div data-oe-role="status" class="o_editor_banner user-select-none o-contenteditable-false lh-1 d-flex align-items-center alert alert-info pb-0 pt-3">
-        <i data-oe-aria-label="Banner Info" class="o_editor_banner_icon mb-3 fst-normal">💡</i>
-        <div class="o_editor_banner_content o-contenteditable-true w-100 px-3">
-            <p>Example: A house is booked for 4 nights, five guest were here for the first three night but only four stayed the last night. Then the guest x nights is 5x3+4x1=19.</p>
+        <div class="o_editor_banner user-select-none o-contenteditable-false lh-1 d-flex align-items-center alert alert-info pb-0 pt-3" data-oe-role="status" contenteditable="false" role="status">
+            <i class="o_editor_banner_icon mb-3 fst-normal" data-oe-aria-label="Banner Info" aria-label="Banner Info">💡</i>
+            <div class="o_editor_banner_content o-contenteditable-true w-100 px-3">
+                <div class="o-paragraph">City Taxes are to be billed to spent nights in practice and not in theory and are counted as the sum of nights each guest stayed.</div>
+                <div class="o-paragraph">Example: A room for 2 is booked for 4 nights, two guests were here for the first three nights but only one stayed the last night. Then the guests x nights is 2x3+1x1=7.</div>
+            </div>
         </div>
-    </div>
-    <p>Those city tax are now due as well as any other additional services consumed during the stay.</p>
+        <p>At any time you can adjust the city tax count delivered by re-opening the city tax widget clicking the City Tax button on the guest order.</p>
     <h4>Charge your guests</h4>
     <ul>
         <li>Open the guest order.</li>
@@ -264,12 +259,6 @@ Let's adjust them now.</p>
     <p>
         <br/>
     </p>
-    <div style="box-sizing: border-box;               color: rgb(55, 65, 81);               font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Ubuntu, 'Noto Sans', Arial, 'Odoo Unicode Support Noto', sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji';               font-size: 14px;               font-style: normal;               font-variant-ligatures: normal;               font-variant-caps: normal;               font-weight: 400;               letter-spacing: normal;               orphans: 2;               text-align: start;               text-indent: 0px;               text-transform: none;               widows: 2;               word-spacing: 0px;               -webkit-text-stroke-width: 0px;               white-space: normal;               background-color: rgb(255, 255, 255);               text-decoration-thickness: initial;               text-decoration-style: initial;               text-decoration-color: initial;" class="oe-hint">
-        <br/>
-    </div>
-    <p>
-        <br/>
-    </p>
 </template>
 <record id="welcome_article" model="knowledge.article">
     <field name="name">Holiday House - Start here!</field>
diff --git a/holiday_house/i18n/holiday_house.pot b/holiday_house/i18n/holiday_house.pot
index eb6caf99a6..37a9dd6290 100644
--- a/holiday_house/i18n/holiday_house.pot
+++ b/holiday_house/i18n/holiday_house.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 19.0+e\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-10-10 14:49+0000\n"
-"PO-Revision-Date: 2025-10-10 14:49+0000\n"
+"POT-Creation-Date: 2025-10-24 12:18+0000\n"
+"PO-Revision-Date: 2025-10-24 12:18+0000\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -39,6 +39,13 @@ msgid ""
 "holiday"
 msgstr ""
 
+#. module: holiday_house
+#: model_terms:ir.ui.view,arch_db:holiday_house.welcome_article_body
+msgid ""
+"<i class=\"o_editor_banner_icon mb-3 fst-normal\" data-oe-aria-"
+"label=\"Banner Info\" aria-label=\"Banner Info\">💡</i>"
+msgstr ""
+
 #. module: holiday_house
 #: model_terms:ir.ui.view,arch_db:holiday_house.welcome_article_body
 msgid ""
@@ -244,6 +251,13 @@ msgid ""
 "chatter to exchange with your guest."
 msgstr ""
 
+#. module: holiday_house
+#: model_terms:ir.ui.view,arch_db:holiday_house.welcome_article_body
+msgid ""
+"At any time you can adjust the city tax count delivered by re-opening the "
+"city tax widget clicking the City Tax button on the guest order."
+msgstr ""
+
 #. module: holiday_house
 #: model:planning.role,name:holiday_house.planning_role_1
 #: model:product.template,name:holiday_house.product_template_14
@@ -277,6 +291,14 @@ msgstr ""
 msgid "Charge your guests"
 msgstr ""
 
+#. module: holiday_house
+#: model_terms:ir.ui.view,arch_db:holiday_house.welcome_article_body
+msgid ""
+"Check and adjust if needed the number of guest who stayed in each room. Then"
+" confirm the number of city tax to be charged, which updated the delivered "
+"city tax count."
+msgstr ""
+
 #. module: holiday_house
 #: model_terms:ir.ui.view,arch_db:holiday_house.welcome_article_body
 msgid "Check guests in"
@@ -292,6 +314,13 @@ msgstr ""
 msgid "Check the invoice data and confirm it."
 msgstr ""
 
+#. module: holiday_house
+#: model_terms:ir.ui.view,arch_db:holiday_house.welcome_article_body
+msgid ""
+"City Taxes are to be billed to spent nights in practice and not in theory "
+"and are counted as the sum of nights each guest stayed."
+msgstr ""
+
 #. module: holiday_house
 #: model_terms:ir.ui.view,arch_db:holiday_house.welcome_article_body
 msgid "Click one of the house to book."
@@ -353,9 +382,9 @@ msgstr ""
 #. module: holiday_house
 #: model_terms:ir.ui.view,arch_db:holiday_house.welcome_article_body
 msgid ""
-"Example: A house is booked for 4 nights, five guest were here for the first "
-"three night but only four stayed the last night. Then the guest x nights is "
-"5x3+4x1=19."
+"Example: A room for 2 is booked for 4 nights, two guests were here for the "
+"first three nights but only one stayed the last night. Then the guests x "
+"nights is 2x3+1x1=7."
 msgstr ""
 
 #. module: holiday_house
@@ -414,16 +443,6 @@ msgstr ""
 msgid "Hobbit House"
 msgstr ""
 
-#. module: holiday_house
-#: model:ir.ui.menu,name:booking_engine.booking_engine_menu_root
-msgid "Holiday House"
-msgstr ""
-
-#. module: holiday_house
-#: model:ir.ui.menu,name:booking_engine.booking_engine_rooms_menu
-msgid "Houses"
-msgstr ""
-
 #. module: holiday_house
 #: model_terms:ir.ui.view,arch_db:holiday_house.welcome_article_body
 msgid ""
@@ -457,12 +476,6 @@ msgid ""
 "<strong>Purchase App</strong> will help you to manage those aspects."
 msgstr ""
 
-#. module: holiday_house
-#: model:ir.model.fields,field_description:booking_engine.planning_model_planning_role_x_is_a_room_offer_field
-#: model:ir.model.fields,field_description:booking_engine.product_model_product_template_x_is_a_room_offer_field
-msgid "Is House Offer"
-msgstr ""
-
 #. module: holiday_house
 #: model_terms:ir.ui.view,arch_db:holiday_house.welcome_article_body
 msgid "Leaving a review"
@@ -473,11 +486,6 @@ msgstr ""
 msgid "Let's book a house!"
 msgstr ""
 
-#. module: holiday_house
-#: model_terms:ir.ui.view,arch_db:holiday_house.welcome_article_body
-msgid "Manage the city tax"
-msgstr ""
-
 #. module: holiday_house
 #: model_terms:ir.ui.view,arch_db:holiday_house.welcome_article_body
 msgid ""
@@ -532,11 +540,6 @@ msgid ""
 "everything around!"
 msgstr ""
 
-#. module: holiday_house
-#: model_terms:ir.ui.view,arch_db:holiday_house.welcome_article_body
-msgid "On the City Tax line, adjust the number of guest x nights delivered."
-msgstr ""
-
 #. module: holiday_house
 #: model_terms:ir.ui.view,arch_db:holiday_house.welcome_article_body
 msgid "On the house to block line, click, drag and drop to create a slot."
@@ -697,13 +700,6 @@ msgid ""
 "slot."
 msgstr ""
 
-#. module: holiday_house
-#: model_terms:ir.ui.view,arch_db:holiday_house.welcome_article_body
-msgid ""
-"Those city tax are now due as well as any other additional services consumed"
-" during the stay."
-msgstr ""
-
 #. module: holiday_house
 #: model_terms:ir.ui.view,arch_db:holiday_house.welcome_article_body
 msgid "Trace guest attendance"
@@ -788,14 +784,6 @@ msgid ""
 "installed a bunch of necessary apps to run your bar efficiently."
 msgstr ""
 
-#. module: holiday_house
-#: model_terms:ir.ui.view,arch_db:holiday_house.welcome_article_body
-msgid ""
-"You may have noticed the city tax were added to the guest order from the moment they checked in.<br/>\n"
-"This is because city taxes are to be billed to spent nights in practice and not in theory.<br/>\n"
-"Let's adjust them now."
-msgstr ""
-
 #. module: holiday_house
 #: model_terms:ir.ui.view,arch_db:holiday_house.welcome_article_body
 msgid "You might have tested this package with or without demo data."
diff --git a/hotel/__manifest__.py b/hotel/__manifest__.py
index fc63d5a21e..3029cc24f2 100644
--- a/hotel/__manifest__.py
+++ b/hotel/__manifest__.py
@@ -1,6 +1,6 @@
 {
     'name': 'Hotel',
-    'version': '1.0',
+    'version': '1.1',
     'category': 'Hospitality',
     'author': 'Odoo S.A.',
     'depends': [
diff --git a/hotel/data/knowledge_article.xml b/hotel/data/knowledge_article.xml
index 4c6dfe15d6..1c0c4d32d7 100644
--- a/hotel/data/knowledge_article.xml
+++ b/hotel/data/knowledge_article.xml
@@ -279,25 +279,16 @@
         <ul>
             <li>Open your guest order from the Hotel App.</li>
             <li>Click the Check out button to capture they return you the keys.</li>
+            <li>Check and adjust if needed the number of guest who stayed in each room. Then confirm the number of city tax to be charged, which updated the delivered city tax count.</li>
         </ul>
-        <h4>Manage the city tax</h4>
-        <p>You may have noticed the city tax were added to the guest order from the moment they
-            checked in.<br/>This is because city taxes are to be billed to spent nights in practice
-            and not in theory.<br/>Let's adjust them now.</p>
-        <ul>
-            <li>On the City Tax line, adjust the number of guest x nights delivered.</li>
-        </ul>
-        <div data-oe-role="status"
-            class="o_editor_banner user-select-none o-contenteditable-false lh-1 d-flex align-items-center alert alert-info pb-0 pt-3">
-            <i data-oe-aria-label="Banner Info" class="o_editor_banner_icon mb-3 fst-normal">💡</i>
+        <div class="o_editor_banner user-select-none o-contenteditable-false lh-1 d-flex align-items-center alert alert-info pb-0 pt-3" data-oe-role="status" contenteditable="false" role="status">
+            <i class="o_editor_banner_icon mb-3 fst-normal" data-oe-aria-label="Banner Info" aria-label="Banner Info">💡</i>
             <div class="o_editor_banner_content o-contenteditable-true w-100 px-3">
-                <p>Example: A room for 2 is booked for 4 nights, two guest were here for the first
-                    three night but onlu one stayed the last night. Then the guest x nights is
-                    2x3+1x1=7.</p>
+                <div class="o-paragraph">City Taxes are to be billed to spent nights in practice and not in theory and are counted as the sum of nights each guest stayed.</div>
+                <div class="o-paragraph">Example: A room for 2 is booked for 4 nights, two guests were here for the first three nights but only one stayed the last night. Then the guests x nights is 2x3+1x1=7.</div>
             </div>
         </div>
-        <p>Those city tax are now due as well as any other additional services consumed during the
-            stay.</p>
+        <p>At any time you can adjust the city tax count delivered by re-opening the city tax widget clicking the City Tax button on the guest order.</p>
         <h4>Charge your guests</h4>
         <ul>
             <li>Once your guest order is all set after check out, open the Front Desk from the POS
@@ -317,9 +308,6 @@
                 this payment.</li>
             <li>You're now done, the invoice downloaded as well as sent to your customer!</li>
         </ul>
-        <div>
-            <br/>
-        </div>
         <p>
             <em>Don't forget to thank your guests with a warm goodbye!</em>
         </p>
@@ -411,14 +399,6 @@
         <p>
             <br/>
         </p>
-        <div
-            style="box-sizing: border-box; color: rgb(55, 65, 81); font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Ubuntu, 'Noto Sans', Arial, 'Odoo Unicode Support Noto', sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji'; font-size: 14px; font-style: normal; font-variant-ligatures: normal; font-variant-caps: normal; font-weight: 400; letter-spacing: normal; orphans: 2; text-align: start; text-indent: 0px; text-transform: none; widows: 2; word-spacing: 0px; -webkit-text-stroke-width: 0px; white-space: normal; background-color: rgb(255, 255, 255); text-decoration-thickness: initial; text-decoration-style: initial; text-decoration-color: initial;"
-            class="oe-hint">
-            <br/>
-        </div>
-        <p>
-            <br/>
-        </p>
     </template>
     <record id="welcome_article" model="knowledge.article">
         <field name="name">Hotel - Start here!</field>
diff --git a/hotel/i18n/hotel.pot b/hotel/i18n/hotel.pot
index 570bbe3b20..0ef993b072 100644
--- a/hotel/i18n/hotel.pot
+++ b/hotel/i18n/hotel.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 19.0+e\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-10-10 14:14+0000\n"
-"PO-Revision-Date: 2025-10-10 14:14+0000\n"
+"POT-Creation-Date: 2025-10-24 12:00+0000\n"
+"PO-Revision-Date: 2025-10-24 12:00+0000\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -54,6 +54,13 @@ msgstr ""
 msgid "<em>Don't forget to thank your guests with a warm goodbye!</em>"
 msgstr ""
 
+#. module: hotel
+#: model_terms:ir.ui.view,arch_db:hotel.welcome_article_body
+msgid ""
+"<i class=\"o_editor_banner_icon mb-3 fst-normal\" data-oe-aria-"
+"label=\"Banner Info\" aria-label=\"Banner Info\">💡</i>"
+msgstr ""
+
 #. module: hotel
 #: model_terms:ir.ui.view,arch_db:hotel.welcome_article_body
 msgid ""
@@ -345,6 +352,13 @@ msgid ""
 "                    to exchange with your guest."
 msgstr ""
 
+#. module: hotel
+#: model_terms:ir.ui.view,arch_db:hotel.welcome_article_body
+msgid ""
+"At any time you can adjust the city tax count delivered by re-opening the "
+"city tax widget clicking the City Tax button on the guest order."
+msgstr ""
+
 #. module: hotel
 #: model_terms:ir.ui.view,arch_db:hotel.welcome_article_body
 msgid "At the end of their stay, your guests will pay for all those extras."
@@ -397,6 +411,14 @@ msgstr ""
 msgid "Charge your guests"
 msgstr ""
 
+#. module: hotel
+#: model_terms:ir.ui.view,arch_db:hotel.welcome_article_body
+msgid ""
+"Check and adjust if needed the number of guest who stayed in each room. Then"
+" confirm the number of city tax to be charged, which updated the delivered "
+"city tax count."
+msgstr ""
+
 #. module: hotel
 #: model_terms:ir.ui.view,arch_db:hotel.welcome_article_body
 msgid "Check guests in"
@@ -412,6 +434,13 @@ msgstr ""
 msgid "Check information and then confirm the booking."
 msgstr ""
 
+#. module: hotel
+#: model_terms:ir.ui.view,arch_db:hotel.welcome_article_body
+msgid ""
+"City Taxes are to be billed to spent nights in practice and not in theory "
+"and are counted as the sum of nights each guest stayed."
+msgstr ""
+
 #. module: hotel
 #: model_terms:ir.ui.view,arch_db:hotel.welcome_article_body
 msgid "Click one of the room to book."
@@ -544,9 +573,9 @@ msgstr ""
 #. module: hotel
 #: model_terms:ir.ui.view,arch_db:hotel.welcome_article_body
 msgid ""
-"Example: A room for 2 is booked for 4 nights, two guest were here for the first\n"
-"                    three night but onlu one stayed the last night. Then the guest x nights is\n"
-"                    2x3+1x1=7."
+"Example: A room for 2 is booked for 4 nights, two guests were here for the "
+"first three nights but only one stayed the last night. Then the guests x "
+"nights is 2x3+1x1=7."
 msgstr ""
 
 #. module: hotel
@@ -591,11 +620,6 @@ msgstr ""
 msgid "Hello there!"
 msgstr ""
 
-#. module: hotel
-#: model:ir.ui.menu,name:booking_engine.booking_engine_menu_root
-msgid "Hotel"
-msgstr ""
-
 #. module: hotel
 #: model_terms:ir.ui.view,arch_db:hotel.welcome_article_body
 msgid ""
@@ -670,11 +694,6 @@ msgstr ""
 msgid "Let's book a room!"
 msgstr ""
 
-#. module: hotel
-#: model_terms:ir.ui.view,arch_db:hotel.welcome_article_body
-msgid "Manage the city tax"
-msgstr ""
-
 #. module: hotel
 #: model_terms:ir.ui.view,arch_db:hotel.welcome_article_body
 msgid ""
@@ -717,11 +736,6 @@ msgid ""
 "            to add new apps, delete/modify demo data, and test everything around!"
 msgstr ""
 
-#. module: hotel
-#: model_terms:ir.ui.view,arch_db:hotel.welcome_article_body
-msgid "On the City Tax line, adjust the number of guest x nights delivered."
-msgstr ""
-
 #. module: hotel
 #: model_terms:ir.ui.view,arch_db:hotel.welcome_article_body
 msgid "On the room to block line, click, drag and drop to create a slot."
@@ -974,13 +988,6 @@ msgid ""
 "slot."
 msgstr ""
 
-#. module: hotel
-#: model_terms:ir.ui.view,arch_db:hotel.welcome_article_body
-msgid ""
-"Those city tax are now due as well as any other additional services consumed during the\n"
-"            stay."
-msgstr ""
-
 #. module: hotel
 #: model_terms:ir.ui.view,arch_db:hotel.welcome_article_body
 msgid "Trace guest attendance"
@@ -1084,14 +1091,6 @@ msgid ""
 "            bunch of necessary apps to run your Hotel efficiently."
 msgstr ""
 
-#. module: hotel
-#: model_terms:ir.ui.view,arch_db:hotel.welcome_article_body
-msgid ""
-"You may have noticed the city tax were added to the guest order from the moment they\n"
-"            checked in.<br/>This is because city taxes are to be billed to spent nights in practice\n"
-"            and not in theory.<br/>Let's adjust them now."
-msgstr ""
-
 #. module: hotel
 #: model_terms:ir.ui.view,arch_db:hotel.welcome_article_body
 msgid "You might have tested this package with or without demo data."