diff --git a/bemade_fsm/__manifest__.py b/bemade_fsm/__manifest__.py
index cb73ae3..b870d1c 100644
--- a/bemade_fsm/__manifest__.py
+++ b/bemade_fsm/__manifest__.py
@@ -52,7 +52,8 @@
         'views/menus.xml',
         'views/task_views.xml',
         'views/sale_order_views.xml',
-        'reports/worksheet_custom_report_templates.xml',
+        # BV: need to readd this file
+        # 'reports/worksheet_custom_report_templates.xml',
         'reports/worksheet_custom_reports.xml',
         'wizard/new_task_from_template.xml',
     ],
@@ -66,8 +67,9 @@
             'bemade_fsm/static/src/scss/bemade_fsm.scss'
         ],
         'web.assets_backend': [
-            'bemade_fsm/static/src/js/kanban_view.js',
-            'bemade_fsm/static/src/js/list_view.js',
+            #  BV: need to readd these files
+            # 'bemade_fsm/static/src/js/kanban_view.js',
+            # 'bemade_fsm/static/src/js/list_view.js',
         ],
         'web.assets_qweb': [
             'bemade_fsm/static/src/xml/project_view_buttons.xml',
diff --git a/bemade_fsm/data/fsm_data.xml b/bemade_fsm/data/fsm_data.xml
index 34612a5..5a5967b 100644
--- a/bemade_fsm/data/fsm_data.xml
+++ b/bemade_fsm/data/fsm_data.xml
@@ -4,7 +4,8 @@
         <record id="planning_project_stage_waiting_parts" model="project.task.type">
             <field name="sequence">2</field>
             <field name="name">Waiting on Parts</field>
-            <field name="legend_blocked">Blocked</field>
+<!-- BV: legend_blocked n'existe plus -->
+<!-- BV:            <field name="legend_blocked">Blocked</field>-->
             <field name="fold" eval="False"/>
 <!--            <field name="is_closed" eval="False"/>-->
             <field name="project_ids" eval="[(4,ref('industry_fsm.fsm_project'))]"/>
@@ -12,7 +13,7 @@
         <record id="planning_project_stage_work_completed" model="project.task.type">
             <field name="sequence">15</field>
             <field name="name">Work Executed</field>
-            <field name="legend_blocked">Blocked</field>
+<!-- BV:           <field name="legend_blocked">Blocked</field>-->
             <field name="fold" eval="False"/>
 <!--            <field name="is_closed" eval="False"/>-->
             <field name="project_ids" eval="[(4,ref('industry_fsm.fsm_project'))]"/>
@@ -20,7 +21,7 @@
         <record id="planning_project_stage_exception" model="project.task.type">
             <field name="sequence">19</field>
             <field name="name">Exception</field>
-            <field name="legend_blocked">Blocked</field>
+<!-- BV:           <field name="legend_blocked">Blocked</field>-->
             <field name="fold" eval="False"/>
 <!--            <field name="is_closed" eval="False"/>-->
             <field name="project_ids" eval="[(4,ref('industry_fsm.fsm_project'))]"/>
@@ -35,8 +36,9 @@
         <record id="industry_fsm.fsm_project" model="project.project">
             <field name="type_ids"
                    eval="[(4, ref('industry_fsm.planning_project_stage_0')), (4, ref('industry_fsm.planning_project_stage_1')), (4, ref('industry_fsm.planning_project_stage_2')), (4, ref('planning_project_stage_work_completed')), (4, ref('industry_fsm.planning_project_stage_3')), (4, ref('industry_fsm.planning_project_stage_4'))]"/>
-            <field name="allow_subtasks"
-                   eval="True"/>
+<!-- BV: allow_subtask n'existe plus-->
+<!--            <field name="allow_subtasks"-->
+<!--                   eval="True"/>-->
         </record>
         <function model="ir.model.data" name="write">
             <function name="search" model="ir.model.data">
diff --git a/bemade_fsm/views/product_views.xml b/bemade_fsm/views/product_views.xml
index a580f43..a63261e 100644
--- a/bemade_fsm/views/product_views.xml
+++ b/bemade_fsm/views/product_views.xml
@@ -8,24 +8,26 @@
             <field name="inherit_id" ref="sale_project.product_template_form_view_invoice_policy_inherit_sale_project"/>
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='project_id']" position="after">
-                    <field name="task_template_id"
-                           attrs="{'invisible': [('service_tracking', 'not in', ('task_global_project', 'task_in_project'))]}"
-                           domain="[('parent', '=', False)]"/>
+                    <field  name="task_template_id"
+                            invisible="service_tracking not in ('task_global_project', 'task_in_project')"
+                            domain="[('parent', '=', False)]"/>
                 </xpath>
                 <xpath expr="//field[@name='planning_enabled']" position="after">
                     <field name="is_field_service"/>
                 </xpath>
             </field>
         </record>
-        <record id="product_search_form_view_inherit_bemade_fsm" model="ir.ui.view">
-            <field name="name">bemade_fsm.product_search_form_view_inherit_bemade_fsm</field>
-            <field name="model">product.product</field>
-            <field name="inherit_id" ref="industry_fsm_sale.product_search_form_view_inherit_fsm_sale"/>
-            <field name="arch" type="xml">
-                <xpath expr="//searchpanel//field[@name='categ_id']" position="attributes">
-                    <attribute name="limit">0</attribute>
-                </xpath>
-            </field>
-        </record>
+
+<!--  BV: Did comment that one cause can not match inherit_id and don't understand it use      -->
+<!--        <record id="product_search_form_view_inherit_bemade_fsm" model="ir.ui.view">-->
+<!--            <field name="name">bemade_fsm.product_search_form_view_inherit_bemade_fsm</field>-->
+<!--            <field name="model">product.product</field>-->
+<!--            <field name="inherit_id" ref="industry_fsm_sale.product_search_form_view_inherit_fsm_sale"/>-->
+<!--            <field name="arch" type="xml">-->
+<!--                <xpath expr="//searchpanel//field[@name='categ_id']" position="attributes">-->
+<!--                    <attribute name="limit">0</attribute>-->
+<!--                </xpath>-->
+<!--            </field>-->
+<!--        </record>-->
     </data>
 </odoo>
\ No newline at end of file
diff --git a/bemade_fsm/views/res_partner.xml b/bemade_fsm/views/res_partner.xml
index 004311e..3061fb2 100644
--- a/bemade_fsm/views/res_partner.xml
+++ b/bemade_fsm/views/res_partner.xml
@@ -17,21 +17,22 @@
                 <page name="field_service" string="Field Service">
                     <field name="owned_equipment_ids" invisible="True"/>
                     <group>
-                        <field name="site_contacts"
-                               attrs="{'invisible': [('company_type','=','person')]}"
-                               context="{'tree_view_ref': 'bemade_fsm.fsm_contacts_view_tree'}"/>
-                        <field name="work_order_contacts"
-                               attrs="{'invisible': [('company_type','=','person')]}"
-                               context="{'tree_view_ref': 'bemade_fsm.fsm_contacts_view_tree'}"/>
-                        <field name="equipment_ids" attrs="{'invisible': [('company_type','=','person')]}"
-                               context="{'tree_view_ref': 'bemade_fsm.fsm_equipment_view_tree'}"
-                               readonly="False"/>
-                        <field attrs="{'invisible': ['|', ('company_type','=','person'), ('owned_equipment_ids','=',False)]}"
-                               context="{'tree_view_ref': 'bemade_fsm.fsm_equipment_view_tree'}"
-                               name="owned_equipment_ids"
-                               readonly="True"/>
-                        <field name="site_ids"
-                               attrs="{'invisible': [('company_type','=','company')]}">
+                        <field  name="site_contacts"
+                                invisible="company_type == 'person'"
+                                context="{'tree_view_ref': 'bemade_fsm.fsm_contacts_view_tree'}"/>
+                        <field  name="work_order_contacts"
+                                invisible="company_type == 'person'"
+                                context="{'tree_view_ref': 'bemade_fsm.fsm_contacts_view_tree'}"/>
+                        <field  name="equipment_ids"
+                                invisible="company_type == 'person'"
+                                context="{'tree_view_ref': 'bemade_fsm.fsm_equipment_view_tree'}"
+                                readonly="False"/>
+                        <field  name="owned_equipment_ids"
+                                invisible="company_type == 'person' or owned_equipment_ids == False"
+                                context="{'tree_view_ref': 'bemade_fsm.fsm_equipment_view_tree'}"
+                                readonly="True"/>
+                        <field  name="site_ids"
+                                invisible="company_type == 'company'">
                             <tree editable="bottom">
                                 <field name="name" widget="res_partner_many2one"/>
                             </tree>
diff --git a/bemade_fsm/views/task_views.xml b/bemade_fsm/views/task_views.xml
index 9d8d201..d8b9e62 100644
--- a/bemade_fsm/views/task_views.xml
+++ b/bemade_fsm/views/task_views.xml
@@ -9,8 +9,7 @@
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='name']/.." position="before">
                     <h1 class="d-flex flex-row justify-content-between">
-                        <field name="work_order_number"
-                               attrs="{'invisible': [('work_order_number', '=', False)]}"/>
+                        <field name="work_order_number" invisible="work_order_number == False"/>
                     </h1>
                 </xpath>
                 <xpath expr="//page[@name='extra_info']" position="after">