[ADD] fitness: master conflict solved

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/pos_config.xml

@@ -3,9 +3,7 @@
     <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="limit_categories">True</field>
         <field name="down_payment_product_id" ref="pos_sale.default_downpayment_product"/>

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="type">consu</field>
         <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="type">consu</field>
         <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="type">consu</field>
         <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="type">consu</field>
         <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"/>

fitness/demo/res_partner.xml

@@ -7,7 +7,6 @@
         <field name="name">Jim Nas</field>
         <field name="email">[email protected]</field>
         <field name="is_company" eval="True"/>
-        <field name="team_id" ref="sales_team.team_sales_department"/>
     </record>
     <record id="res_partner_7" model="res.partner">
         <field name="name">Jhon Jhon</field>