[ADD] fitness: upgrade to 18 + small fix

Author: dhrs-odoo

fitness/__manifest__.py

@@ -66,7 +66,6 @@
         'demo/website_theme_apply.xml',
         'demo/website_page.xml',
         'demo/website_menu.xml',
-        'demo/pos_config.xml',
         'demo/payment_provider_demo_post.xml',
     ],
     'license': 'OPL-1',

fitness/data/appointment_type.xml

@@ -11,7 +11,7 @@
         <field name="has_payment_step" eval="True"/>
         <field name="product_id" ref="default_booking_product"/>
         <field name="resource_manage_capacity" eval="True"/>
-        <field name="user_assign_method">resource_time</field>
+        <field name="assign_method">resource_time</field>
         <field name="slot_ids" eval="[(0, 0, {'weekday': '3', 'start_hour': 8.0, 'end_hour': 9.0})]"/>
     </record>
     <record id="appointment_type_2" model="appointment.type">
@@ -25,7 +25,7 @@
         <field name="has_payment_step" eval="True"/>
         <field name="product_id" ref="product_product_6"/>
         <field name="resource_manage_capacity" eval="True"/>
-        <field name="user_assign_method">resource_time</field>
+        <field name="assign_method">resource_time</field>
         <field name="slot_ids" eval="[(0, 0, {'weekday': '2', 'start_hour': 14.0, 'end_hour': 16.0})]"/>
     </record>
 </odoo>

fitness/data/appointment_view.xml

@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <odoo>
     <template id="custom_appointment_info_view" inherit_id="appointment.appointment_info">
-        <xpath expr="//div[@t-if=&quot;appointment_type.category in ['punctual', 'recurring']&quot;]" position="replace">
-            <div t-if="slots and not based_on_users and appointment_type.resource_manage_capacity and max_capacity" class="mb-4">
+        <xpath expr="//div[@t-if=&quot;not based_on_users and appointment_type.resource_manage_capacity&quot;]" position="replace">
+            <div t-if="slots and max_capacity" class="mb-4">
                 <input type="hidden" name="resourceCapacity" value="1"/>
             </div>
-            <div t-if="not based_on_users and appointment_type.resource_manage_capacity" class="o_appointment_no_capacity d-flex mt-2 pb-0 text-center"/>
+            <div class="o_appointment_no_capacity d-flex mt-2 pb-0 text-center"/>
         </xpath>
     </template>
 </odoo>

fitness/data/knowledge_article.xml

@@ -68,13 +68,13 @@
                     Once confirmed, the quotation becomes a sales order. All quotations and sales orders are centralized in the <strong><font class="text-o-color-1">Sales</font></strong> app.
                 </p>
                 <p style="margin-bottom: 0px;"><br /></p>
-                <p style="margin-bottom: 0px;"><a href="https://www.odoo.com/documentation/master/applications/sales/sales.html" class="btn btn-primary">🎓 Sales</a></p>
+                <p style="margin-bottom: 0px;"><a href="https://www.odoo.com/documentation/latest/applications/sales/sales.html" class="btn btn-primary">🎓 Sales</a></p>
                 <p><br /></p>
                 <div class="o_editor_banner o_not_editable lh-1 d-flex align-items-center alert alert-info pb-0 pt-3" data-oe-protected="true">
                     <i class="o_editor_banner_icon mb-3 fst-normal">🚀</i>
                     <div class="w-100 ms-3" data-oe-protected="false">
                         <p>Manage the prices applied by your subscription on every product using the Pricelists. Assign a specific pricelist to a reccuring product (subscription) and edit your pricelist rule in Sales &gt; Products &gt; Pricelists.</p>
-                        <p><a href="https://www.odoo.com/documentation/17.0/applications/sales/point_of_sale/pricing/pricelists.html" class="btn btn-secondary" target="_blank">🎓 Pricelists</a></p>
+                        <p><a href="https://www.odoo.com/documentation/latest/applications/sales/point_of_sale/pricing/pricelists.html" class="btn btn-secondary" target="_blank">🎓 Pricelists</a></p>
                     </div>
                 </div>
 
@@ -87,7 +87,7 @@
                 <p>
                     You can then use the power of the <strong><font class="text-o-color-1">Project App</font></strong> to ensure a great follow up, with automations, feedbacks, stages...
                 </p>
-                <p><a class="btn btn-primary" href="https://www.odoo.com/documentation/17.0/applications/services/project.html" target="_blank">🎓 Project</a></p>
+                <p><a class="btn btn-primary" href="https://www.odoo.com/documentation/latest/applications/services/project.html" target="_blank">🎓 Project</a></p>
                 <p><br /></p>
                 <h2>Inventory 📦</h2>
                 <hr />
@@ -119,7 +119,7 @@
                         </ul>
                     </li>
                 </ul>
-                <p><a href="https://www.odoo.com/documentation/17.0/applications/inventory_and_mrp/inventory.html" class="btn btn-primary">🎓Inventory</a></p>
+                <p><a href="https://www.odoo.com/documentation/latest/applications/inventory_and_mrp/inventory.html" class="btn btn-primary">🎓Inventory</a></p>
                 <p><br /></p>
                 <h2 style="margin-bottom: 0px;">Point of Sale and eCommerce 📈</h2>
 
@@ -162,13 +162,13 @@
                     app. Then, schedule one or several "Invoicing Schedule" activities on the sales order with the aim to never forget to send an intermediary invoice in order to sustain your cash flow
                 </p>
                 <p><strong>Thanks</strong> to the invoicing policy that you can modify, the generated invoice is always the reflect of the reality on the field and it is fair for the customer.</p>
-                <p><a class="btn btn-primary" href="https://www.odoo.com/documentation/master/applications/finance/accounting/customer_invoices.html">🎓 Invoicing</a></p>
+                <p><a class="btn btn-primary" href="https://www.odoo.com/documentation/latest/applications/finance/accounting/customer_invoices.html">🎓 Invoicing</a></p>
                 <p><br /></p>
                 <div data-oe-protected="true" class="o_editor_banner o_not_editable lh-1 d-flex align-items-center alert alert-info pb-0 pt-3">
                     <i class="o_editor_banner_icon mb-3 fst-normal">🚀</i>
                     <div data-oe-protected="false" class="w-100 ms-3">
                         <p>Odoo can also manage your accounting entirely, integrated with every other apps. Check out more about the Accounting App</p>
-                        <p><a class="btn btn-secondary" href="https://www.odoo.com/documentation/17.0/applications/finance/accounting.html">🎓 Accounting</a></p>
+                        <p><a class="btn btn-secondary" href="https://www.odoo.com/documentation/latest/applications/finance/accounting.html">🎓 Accounting</a></p>
                     </div>
                 </div>
                 <p><br /></p>
@@ -211,7 +211,7 @@
                 <p style="margin-bottom: 0px;"><br /></p>
                 <p style="margin-bottom: 0px;">Manage in the Planning App the schedule of your teachers, the booking of your rooms and equipments.</p>
                 <p style="margin-bottom: 0px;"><br /></p>
-                <p style="margin-bottom: 0px;"><a class="btn btn-primary" href="https://www.odoo.com/documentation/17.0/applications/services/planning.html" target="_blank">🎓Planning</a></p>
+                <p style="margin-bottom: 0px;"><a class="btn btn-primary" href="https://www.odoo.com/documentation/latest/applications/services/planning.html" target="_blank">🎓Planning</a></p>
                 <p><br /></p>
                 <h2>Maintenance of your equipments</h2>
 
@@ -240,7 +240,7 @@
                     <div data-oe-protected="false" class="w-100 ms-3">
                         <p>You completed that industry tour! There are millions of other ways to adapt your Odoo setup to fit your business needs.&nbsp;</p>
                         <p>
-                            Discover more about Odoo by diving into our&nbsp;<a href="https://www.odoo.com/documentation/17.0/">documentation</a>&nbsp;and&nbsp;<a href="https://www.odoo.com/fr_FR/slides/getting-started-15">academy</a>&nbsp;, and feel free
+                            Discover more about Odoo by diving into our&nbsp;<a href="https://www.odoo.com/documentation/latest/">documentation</a>&nbsp;and&nbsp;<a href="https://www.odoo.com/fr_FR/slides/getting-started-15">academy</a>&nbsp;, and feel free
                             to&nbsp;<a href="https://www.odoo.com/contactus" target="_blank">request a demo</a>&nbsp;if you need help!<br />
                         </p>
                     </div>

fitness/data/pos_config.xml

@@ -3,10 +3,9 @@
     <record id="pos_config_fitness_center" model="pos.config">
         <field name="name">Fitness Center</field>
         <field name="iface_tipproduct" eval="True"/>
-        <field name="iface_customer_facing_display_local" eval="True"/>
         <field name="iface_print_auto" eval="True"/>
-        <field name="iface_customer_facing_display" eval="True"/>
         <field name="ship_later" eval="True"/>
+        <field name="customer_display_type">local</field>
         <field name="limit_categories">True</field>
         <field name="down_payment_product_id" ref="pos_sale.default_downpayment_product"/>
     </record>

fitness/data/product_product.xml

@@ -7,7 +7,7 @@
         <field name="image_1920" type="base64" file="fitness/static/src/binary/product_template/10-image_1920"/>
         <field name="available_in_pos" eval="True"/>
         <field name="service_type">manual</field>
-        <field name="detailed_type">product</field>
+        <field name="is_storable" eval="True"/>
         <field name="list_price">11.0</field>
     </record>
     <record id="product_product_12" model="product.product">
@@ -17,7 +17,7 @@
         <field name="image_1920" type="base64" file="fitness/static/src/binary/product_template/12-image_1920"/>
         <field name="available_in_pos" eval="True"/>
         <field name="service_type">manual</field>
-        <field name="detailed_type">product</field>
+        <field name="is_storable" eval="True"/>
         <field name="list_price">55.0</field>
     </record>
     <record id="product_product_13" model="product.product">
@@ -27,13 +27,13 @@
         <field name="image_1920" type="base64" file="fitness/static/src/binary/product_template/12-image_1920"/>
         <field name="available_in_pos" eval="True"/>
         <field name="service_type">manual</field>
-        <field name="detailed_type">product</field>
+        <field name="is_storable" eval="True"/>
         <field name="list_price">55.0</field>
     </record>
     <record id="product_product_14" model="product.product">
         <field name="name">20-Day Beginner Fitness Program</field>
         <field name="categ_id" ref="product.product_category_all"/>
-        <field name="detailed_type">service</field>
+        <field name="type">service</field>
         <field name="service_tracking">project_only</field>
         <field name="service_type">manual</field>
         <field name="project_template_id" ref="project_project_1"/>
@@ -48,14 +48,14 @@
         <field name="image_1920" type="base64" file="fitness/static/src/binary/product_template/11-image_1920"/>
         <field name="available_in_pos" eval="True"/>
         <field name="service_type">manual</field>
-        <field name="detailed_type">product</field>
+        <field name="is_storable" eval="True"/>
         <field name="list_price">2.5</field>
     </record>
     <record id="product_product_6" model="product.product">
         <field name="name">Yoga Course</field>
         <field name="categ_id" ref="product_category_9"/>
         <field name="service_type">manual</field>
-        <field name="detailed_type">booking_fees</field>
+        <field name="type">service</field>
         <field name="list_price">15.0</field>
     </record>
     <record id="product_product_7" model="product.product">
@@ -66,7 +66,7 @@
         <field name="product_subscription_pricing_ids" eval="[(6,0,[ref('subscription_pricing_1')])]"/>
         <field name="image_1920" type="base64" file="fitness/static/src/binary/product_template/7-image_1920"/>
         <field name="service_type">manual</field>
-        <field name="detailed_type">service</field>
+        <field name="type">service</field>
         <field name="purchase_method">purchase</field>
     </record>
     <record id="product_product_8" model="product.product">
@@ -77,7 +77,7 @@
         <field name="product_subscription_pricing_ids" eval="[(6,0,[ref('subscription_pricing_2')])]"/>
         <field name="image_1920" type="base64" file="fitness/static/src/binary/product_template/8-image_1920"/>
         <field name="service_type">manual</field>
-        <field name="detailed_type">service</field>
+        <field name="type">service</field>
     </record>
     <record id="product_product_9" model="product.product">
         <field name="name">Diamond membership</field>
@@ -87,7 +87,7 @@
         <field name="product_subscription_pricing_ids" eval="[(6,0,[ref('subscription_pricing_3')])]"/>
         <field name="image_1920" type="base64" file="fitness/static/src/binary/product_template/9-image_1920"/>
         <field name="service_type">manual</field>
-        <field name="detailed_type">service</field>
+        <field name="type">service</field>
     </record>
     <record id="default_booking_product" model="product.product">
         <field name="name">Hit Course</field>
@@ -96,7 +96,7 @@
         <field name="image_1920" type="base64" file="fitness/static/src/binary/product_template/1-image_1920"/>
         <field name="service_type">manual</field>
         <field name="purchase_ok" eval="False"/>
-        <field name="detailed_type">booking_fees</field>
+        <field name="type">service</field>
         <field name="list_price">50.0</field>
     </record>
 </odoo>

fitness/data/res_config_settings.xml

@@ -4,10 +4,8 @@
         <field name="group_product_variant" eval="1"/>
         <field name="group_discount_per_so_line" eval="1"/>
         <field name="group_product_pricelist" eval="True"/>
-        <field name="group_sale_pricelist" eval="True"/>
-        <field name="product_pricelist_setting" eval="'advanced'"/>
         <field name="pos_use_pricelist" eval="True"/>
     </record>
 
-    <function model="res.config.settings" name="execute" eval="[ref('res_config_settings_enable')]"/>
+    <function name="execute" model="res.config.settings" eval="[ref('res_config_settings_enable')]"/>
 </odoo>

fitness/demo/calendar_event.xml

@@ -3,7 +3,6 @@
     <record id="calendar_event_1" model="calendar.event">
         <field name="name">Hit Course Appointment</field>
         <field name="appointment_type_id" ref="appointment_type_1"/>
-        <field name="categ_ids" eval="[(6, 0, [ref('appointment.calendar_event_type_data_online_appointment')])]"/>
         <field name="start" model="appointment.type" eval="
             pytz.timezone(obj().env.ref('fitness.appointment_type_1').appointment_tz).localize(
                 DateTime.today().date() + relativedelta(weekday=0, hour=9)

fitness/demo/hr_employee.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<odoo>
+<odoo noupdate="1">
     <record id="hr_employee_2" model="hr.employee">
         <field name="name">Jhon Jhon</field>
         <field name="address_id" ref="base.main_partner"/>