fucking merge

bemade_sethy_configuration/data/company_data.xml

@@ -13,8 +13,8 @@
             <field name="zip">J2G 3V3</field>
             <field name="country_id" ref="base.ca"/>
             <field name="phone">450 994-3173</field>
-            <field name="account_sale_tax_id" ref="l10n_ca.1_gstqst_sale_en"/>
+            <field name="account_sale_tax_id" ref="account.1_gstqst_sale_tax_14975"/>
-            <field name="account_purchase_tax_id" ref="l10n_ca.1_gstqst_purc_en"/>
+            <field name="account_purchase_tax_id" ref="account.1_gstqst_purchase_tax_14975"/>
         </record>
     </data>
 </odoo>

bemade_sethy_configuration/views/res_partner_views.xml

@@ -14,50 +14,50 @@
             <xpath expr="//field[@name='name' and @id='company']" position="replace">
                 <field id="company" class="text-break" name="name" default_focus="1"
                        placeholder="e.g. Lumber Inc"
-                       attrs="{'required' : [('type', '=', 'contact')], 'invisible': ['|', ('is_company','=', False),
+                       required="type == 'contact'"
-                       ('is_property','=', True)]}"/>
+                       invisible="not is_company or is_property"/>
                 <field id="lot_number" class="text-break" name="lot_number" placeholder="123456789"
-                       attrs="{'invisible': [('is_property','=', False)]}"/>
+                       invisible="not is_property"/>
             </xpath>
 
             <button name="schedule_meeting" position="attributes">
-                <attribute name="attrs">{'invisible': [('is_property', '=', True)]}</attribute>
+                <attribute name="invisible">is_property == True</attribute>
             </button>
 
             <button name="action_view_opportunity" position="attributes">
-                <attribute name="attrs">{'invisible': [('is_property', '=', True)]}</attribute>
+                <attribute name="invisible">is_property == True</attribute>
             </button>
 
             <button name="action_view_partner_invoices" position="attributes">
-                <attribute name="attrs">{'invisible': [('is_property', '=', True)]}</attribute>
+                <attribute name="invisible">is_property == True</attribute>
             </button>
 
             <button name="%(payment.action_payment_token)d" position="attributes">
-                <attribute name="attrs">{'invisible': ['|', ('payment_token_count', '=', 0), ('is_property', '=', True)]}</attribute>
+                <attribute name="invisible">payment_token_count == 0 or is_property</attribute>
             </button>
 
             <xpath expr="//page[@name='contact_addresses']" position="attributes">
-                <attribute name="attrs">{'invisible': [('is_property','=', True)]}</attribute>
+                <attribute name="invisible">is_property</attribute>
             </xpath>
 
             <xpath expr="//page[@name='sales_purchases']" position="attributes">
-                <attribute name="attrs">{'invisible': [('is_property','=', True)]}</attribute>
+                <attribute name="invisible">is_property == True</attribute>
             </xpath>
 
             <xpath expr="//page[@name='membership']" position="attributes">
-                <attribute name="attrs">{'invisible': [('is_property','=', True)]}</attribute>
+                <attribute name="invisible">is_property == True</attribute>
             </xpath>
 
             <xpath expr="//page[@name='accounting']" position="attributes">
-                <attribute name="attrs">{'invisible': [('is_property','=', True)]}</attribute>
+                <attribute name="invisible">is_property == True</attribute>
             </xpath>
 
             <xpath expr="//field[@name='function']/ancestor::group[1]" position="attributes">
-                <attribute name="attrs">{'invisible': [('is_property','=', True)]}</attribute>
+                <attribute name="invisible">is_property  == True</attribute>
             </xpath>
 
             <xpath expr="//field[@name='function']/ancestor::group[1]" position="after">
-                <group attrs="{'invisible': [('is_property','=', False)]}">
+                <group invisible="is_property ==  False">
                     <field name="surface"/>
                     <field name="category_id" widget="many2many_tags"
                            options="{'color_field': 'color', 'no_create_edit': True}"/>
@@ -66,11 +66,11 @@
 
             <xpath expr="//page[@name='contact_addresses']" position="after">
                 <page string="Property" name="bemade_sethy_configuration.res_partner.defaults.form">
-                    <group string="All Owners" attrs="{'invisible': [['is_property','=',False]]}">
+                    <group string="All Owners" invisible="is_property == False">
                         <field name="relation_property_ids" string="">
                             <tree editable="top">
                                 <field name="this_partner_id" required="True" options="{'no_create': True}"
-                                       attrs="{}" invisible="1"/>
+                                       invisible="1"/>
                                 <field name="type_selection_id" required="True" options="{'no_create': True}"
                                        invisible="1"/>
                                 <field name="other_partner_id" required="True" options="{'no_create': True}"
@@ -81,12 +81,12 @@
                             </tree>
                         </field>
                     </group>
-                    <group string="All Properties" attrs="{'invisible': [['is_property','=',True]]}">
+                    <group string="All Properties" invisible="is_property == True">
                         <field name="relation_owner_ids" string="">
                             <tree editable="top">
                                 <field name="this_partner_id" required="True"
                                        options="{'no_create': True}"
-                                       attrs="{}" invisible="1"
+                                       invisible="1"
                                 />
                                 <field name="type_selection_id" required="True" options="{'no_create': True}"
                                        invisible="1"/>