From 9568f6cff8101d57b6b2f19324244d0e80b964f5 Mon Sep 17 00:00:00 2001
From: ilo <dev@nomadiplus.com>
Date: Tue, 10 Sep 2024 08:32:35 -0300
Subject: [PATCH] [17.0][MIG] agreement_legal: Migration to 17.0

---
 agreement_legal/README.rst                    |   1 +
 agreement_legal/readme/CONTRIBUTORS.md        |   1 +
 agreement_legal/static/description/index.html |   1 +
 .../static/src/js/form_view.esm.js            |   2 +-
 .../static/src/js/kanban_view.esm.js          |   2 +-
 .../static/src/js/list_view.esm.js            |   2 +-
 agreement_legal/static/src/xml/agreement.xml  |   4 +-
 agreement_legal/views/agreement.xml           |  86 +++---
 agreement_legal/views/agreement_appendix.xml  |  10 +-
 agreement_legal/views/agreement_clause.xml    |  10 +-
 agreement_legal/views/agreement_recital.xml   |  10 +-
 agreement_legal/views/agreement_section.xml   |  12 +-
 agreement_legal/views/agreement_stages.xml    |   2 +-
 agreement_legal/views/agreement_subtype.xml   |   2 +-
 agreement_legal/views/agreement_type.xml      |   2 +-
 agreement_legal/views/res_config_settings.xml | 267 +++++++-----------
 16 files changed, 177 insertions(+), 237 deletions(-)

diff --git a/agreement_legal/README.rst b/agreement_legal/README.rst
index 1d1c55df..77af9e8f 100644
--- a/agreement_legal/README.rst
+++ b/agreement_legal/README.rst
@@ -103,6 +103,7 @@ Contributors
 -  Sandip Mangukiya <smangukiya@opensourceintegrators.com>
 -  Yves Goldberg <yves@ygol.com>
 -  Tharathip Chaweewongphan <tharathipc@ecosoft.co.th>
+-  Italo LOPES <italo.lopes@camptocamp.com>
 
 Other credits
 -------------
diff --git a/agreement_legal/readme/CONTRIBUTORS.md b/agreement_legal/readme/CONTRIBUTORS.md
index 3d6bc2d8..114aafda 100644
--- a/agreement_legal/readme/CONTRIBUTORS.md
+++ b/agreement_legal/readme/CONTRIBUTORS.md
@@ -5,3 +5,4 @@
 - Sandip Mangukiya \<<smangukiya@opensourceintegrators.com>\>
 - Yves Goldberg \<<yves@ygol.com>\>
 - Tharathip Chaweewongphan \<<tharathipc@ecosoft.co.th>\>
+- Italo LOPES \<<italo.lopes@camptocamp.com>\>
diff --git a/agreement_legal/static/description/index.html b/agreement_legal/static/description/index.html
index f07cdbae..087e72bb 100644
--- a/agreement_legal/static/description/index.html
+++ b/agreement_legal/static/description/index.html
@@ -451,6 +451,7 @@ <h2><a class="toc-backref" href="#toc-entry-7">Contributors</a></h2>
 <li>Sandip Mangukiya &lt;<a class="reference external" href="mailto:smangukiya&#64;opensourceintegrators.com">smangukiya&#64;opensourceintegrators.com</a>&gt;</li>
 <li>Yves Goldberg &lt;<a class="reference external" href="mailto:yves&#64;ygol.com">yves&#64;ygol.com</a>&gt;</li>
 <li>Tharathip Chaweewongphan &lt;<a class="reference external" href="mailto:tharathipc&#64;ecosoft.co.th">tharathipc&#64;ecosoft.co.th</a>&gt;</li>
+<li>Italo LOPES &lt;<a class="reference external" href="mailto:italo.lopes&#64;camptocamp.com">italo.lopes&#64;camptocamp.com</a>&gt;</li>
 </ul>
 </div>
 <div class="section" id="other-credits">
diff --git a/agreement_legal/static/src/js/form_view.esm.js b/agreement_legal/static/src/js/form_view.esm.js
index ee4dc264..7504e495 100644
--- a/agreement_legal/static/src/js/form_view.esm.js
+++ b/agreement_legal/static/src/js/form_view.esm.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import {registry} from "@web/core/registry";
 import {FormController} from "@web/views/form/form_controller";
 import {formView} from "@web/views/form/form_view";
+import {registry} from "@web/core/registry";
 import {useService} from "@web/core/utils/hooks";
 
 export class AgreementFormController extends FormController {
diff --git a/agreement_legal/static/src/js/kanban_view.esm.js b/agreement_legal/static/src/js/kanban_view.esm.js
index ade31a32..32f95261 100644
--- a/agreement_legal/static/src/js/kanban_view.esm.js
+++ b/agreement_legal/static/src/js/kanban_view.esm.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import {registry} from "@web/core/registry";
 import {KanbanController} from "@web/views/kanban/kanban_controller";
 import {kanbanView} from "@web/views/kanban/kanban_view";
+import {registry} from "@web/core/registry";
 import {useService} from "@web/core/utils/hooks";
 
 export class AgreementKanbanController extends KanbanController {
diff --git a/agreement_legal/static/src/js/list_view.esm.js b/agreement_legal/static/src/js/list_view.esm.js
index 99b9dd22..8601ecc5 100644
--- a/agreement_legal/static/src/js/list_view.esm.js
+++ b/agreement_legal/static/src/js/list_view.esm.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import {registry} from "@web/core/registry";
 import {ListController} from "@web/views/list/list_controller";
 import {listView} from "@web/views/list/list_view";
+import {registry} from "@web/core/registry";
 import {useService} from "@web/core/utils/hooks";
 
 export class AgreementListController extends ListController {
diff --git a/agreement_legal/static/src/xml/agreement.xml b/agreement_legal/static/src/xml/agreement.xml
index 130ec37c..da7465ab 100644
--- a/agreement_legal/static/src/xml/agreement.xml
+++ b/agreement_legal/static/src/xml/agreement.xml
@@ -4,7 +4,6 @@
         t-name="agreement.ListView.Buttons"
         t-inherit="web.ListView.Buttons"
         t-inherit-mode="primary"
-        owl="1"
     >
         <xpath
             expr="//*[@class='btn btn-primary o_list_button_add']"
@@ -36,7 +35,6 @@
         t-name="agreement.KanbanView.Buttons"
         t-inherit="web.KanbanView.Buttons"
         t-inherit-mode="primary"
-        owl="1"
     >
         <xpath
             expr="//*[@class='btn btn-primary o-kanban-button-new']"
@@ -51,7 +49,7 @@
             <attribute name="t-if">!noCreate and canCreateTemplate</attribute>
         </xpath>
     </t>
-    <t t-name="agreement.TemplateButton" owl="1">
+    <t t-name="agreement.TemplateButton">
         <button
             type="button"
             t-if="!canCreateTemplate"
diff --git a/agreement_legal/views/agreement.xml b/agreement_legal/views/agreement.xml
index 02217cb5..40e19488 100644
--- a/agreement_legal/views/agreement.xml
+++ b/agreement_legal/views/agreement.xml
@@ -6,7 +6,7 @@
         <field name="model">agreement</field>
         <field name="arch" type="xml">
             <tree js_class="agreement_template_tree" default_order="code desc, name">
-                <field name="code" invisible="context.get('default_model')" />
+                <field name="code" column_invisible="context.get('default_model')" />
                 <field name="name" />
                 <field name="partner_id" />
                 <field name="company_id" />
@@ -14,7 +14,7 @@
                 <field name="agreement_type_id" />
                 <field name="agreement_subtype_id" />
                 <field name="stage_id" />
-                <field name="active" invisible="1" />
+                <field name="active" column_invisible="1" />
             </tree>
         </field>
     </record>
@@ -32,14 +32,14 @@
                         type="object"
                         name="create_new_version"
                         class="oe_highlight"
-                        attrs="{'invisible': [('state', '=', 'active')]}"
+                        invisible="state == active"
                     />
                     <button
                         string="New Agreement"
                         type="object"
                         name="create_new_agreement"
                         class="oe_highlight"
-                        attrs="{'invisible': [('is_template', '=', False)]}"
+                        invisible="is_template == False"
                     />
                     <field
                         name="stage_id"
@@ -55,7 +55,7 @@
                         name="web_ribbon"
                         title="Template"
                         bg_color="bg-info"
-                        attrs="{'invisible': [('is_template', '=', False)]}"
+                        invisible="is_template == False"
                     />
                     <div class="oe_title">
                         <label
@@ -75,10 +75,7 @@
                                 domain="[('partner_id', '=', partner_id)]"
                             />
                             <field name="is_template" invisible="1" />
-                            <field
-                                name="template_id"
-                                attrs="{'invisible': [('is_template', '=', True)]}"
-                            />
+                            <field name="template_id" invisible="is_template == True" />
                         </group>
                         <group>
                             <field
@@ -93,7 +90,8 @@
                             />
                             <field
                                 name="assigned_user_id"
-                                attrs="{'invisible': [('is_template', '=', True)], 'readonly':[('is_template', '=', True)]}"
+                                invisible="is_template == True"
+                                readonly="is_template == True"
                             />
                             <field name="active" invisible="1" />
                             <field name="state" invisible="1" />
@@ -115,14 +113,15 @@
                                 domain="[('model_id', '=', sub_object_id),
                                             ('ttype', '!=', 'one2many'),
                                             ('ttype', '!=', 'many2many')]"
-                                attrs="{'readonly':[('sub_object_id', '=', False)],
-                                           'required':[('sub_object_id', '!=', False)]}"
+                                required="sub_object_id != False"
+                                readonly="sub_object_id == False"
                             />
                             <field name="default_value" />
                             <field name="copyvalue" />
                         </group>
                         <p>
-                            This section (on the left) allows you to add dynamic fields inside the description and special terms.
+                            This section (on the left) allows you to add dynamic fields inside the description and
+                            special terms.
                             <ol>
                                 <li>Select the agreement field</li>
                                 <li>Select the sub-field</li>
@@ -139,11 +138,12 @@
                                 string="Use custom content"
                             />
                         </group>
-<!--                        <group name="cust_parties">-->
-                            <p>
-                                This section (on the left) allows you to replace the default listing of the parties with custom dynamic content.
-                            </p>
-<!--                        </group>-->
+                        <!--                        <group name="cust_parties">-->
+                        <p>
+                            This section (on the left) allows you to replace the default listing of the parties with
+                            custom dynamic content.
+                        </p>
+                        <!--                        </group>-->
                         <group name="partner" string="Partner">
                             <field
                                 name="partner_id"
@@ -155,8 +155,8 @@
                             />
                         </group>
                         <group name="company" string="Company">
-<!--                            <div class="o_address_format">-->
-                                <field
+                            <!--                            <div class="o_address_format">-->
+                            <field
                                 name="company_id"
                                 readonly="1"
                                 context="{'show_address': 1}"
@@ -165,7 +165,7 @@
                                 colspan="2"
                                 class="o_address_format"
                             />
-<!--                            </div>-->
+                            <!--                            </div>-->
                             <field name="company_partner_id" invisible="1" />
                         </group>
                         <group name="partner_left" string="Primary Contact">
@@ -216,7 +216,7 @@
                     <group
                         name="parties_content"
                         string="Parties Content"
-                        attrs="{'invisible':[('use_parties_content', '=', False)]}"
+                        invisible="use_parties_content == False"
                     >
                         <field name="parties" nolabel="1" />
                     </group>
@@ -224,19 +224,22 @@
                         <group name="termdates_left" string="Term Dates">
                             <field
                                 name="signature_date"
-                                attrs="{'invisible': [('is_template', '=', True)]}"
+                                invisible="is_template == True"
                             />
                             <field
                                 name="start_date"
-                                attrs="{'required': [('is_template', '=', False)], 'invisible': [('is_template', '=', True)]}"
+                                required="is_template == False"
+                                invisible="is_template == True"
                             />
                             <field
                                 name="end_date"
-                                attrs="{'required': [('is_template', '=', False)], 'invisible': [('is_template', '=', True)]}"
+                                required="is_template == False"
+                                invisible="is_template == True"
                             />
                             <field
                                 name="to_review_date"
-                                attrs="{'required': [('is_template', '=', False), ('end_date', '!=', False)], 'invisible': [('is_template', '=', True)]}"
+                                required="is_template == False and end_date != False"
+                                invisible="is_template == True"
                             />
                             <field name="expiration_notice" />
                             <field name="change_notice" />
@@ -283,7 +286,7 @@
                             <field
                                 name="clauses_ids"
                                 nolabel="1"
-                                context="{'tree_view_ref': 'agreement_legal.partner_agreement_clause_list_view2', 'form_view_ref': 'agreement_legal.partner_agreement_clause_form_view2', 'default_temp_agreement_id': active_id}"
+                                context="{'tree_view_ref': 'agreement_legal.partner_agreement_clause_list_view2', 'form_view_ref': 'agreement_legal.partner_agreement_clause_form_view2', 'default_temp_agreement_id': id}"
                             />
                             <separator string="Appendices" />
                             <field
@@ -349,48 +352,49 @@
                         </page>
                         <page name="performance" string="Performance">
                             <p
-                            >This section is a place where financial records will show the current performance of this agreement.</p>
+                            >This section is a place where financial records will show the current performance of this
+                                agreement.</p>
                             <p>Perhaps include invoices with total vs costs? </p>
                         </page>
                     </notebook>
-                        <separator string="Administration" />
-<!--                    <group string="Administration">-->
-                        <div name="Administration">
-                            <p class="oe_inline">Reviewed by <field
+                    <separator string="Administration" />
+                    <!--                    <group string="Administration">-->
+                    <div name="Administration">
+                        <p class="oe_inline">Reviewed by <field
                                 name="reviewed_user_id"
                                 class="oe_inline"
                             /> on <field name="reviewed_date" class="oe_inline" />.</p>
-                            <p>Approved by <field
+                        <p>Approved by <field
                                 name="approved_user_id"
                                 class="oe_inline"
                             /> on <field name="approved_date" class="oe_inline" />.</p>
-                        </div>
-<!--                    </group>-->
+                    </div>
+                    <!--                    </group>-->
                     <p name="footer">
                         Version: <field name="version" readonly="True" />.<field
                             name="revision"
                             readonly="True"
                         />
-                        |  Created By:
+                        | Created By:
                         <field
                             name="create_uid"
                             readonly="True"
-                            attrs="{'invisible': [('parent_agreement_id', '!=', False)]}"
+                            invisible="parent_agreement_id != False"
                         />
                         <field
                             name="create_uid_parent"
-                            attrs="{'invisible': [('parent_agreement_id', '=', False)]}"
+                            invisible="parent_agreement_id == False"
                         />
-                        |  Created On:
+                        | Created On:
                         <field
                             name="create_date"
                             readonly="True"
-                            attrs="{'invisible': [('parent_agreement_id', '!=', False)]}"
+                            invisible="parent_agreement_id != False"
                         />
                         <field
                             name="create_date_parent"
                             readonly="True"
-                            attrs="{'invisible': [('parent_agreement_id', '=', False)]}"
+                            invisible="parent_agreement_id == False"
                         />
                     </p>
                 </sheet>
diff --git a/agreement_legal/views/agreement_appendix.xml b/agreement_legal/views/agreement_appendix.xml
index 9b12d3c5..04f626a9 100644
--- a/agreement_legal/views/agreement_appendix.xml
+++ b/agreement_legal/views/agreement_appendix.xml
@@ -10,7 +10,7 @@
                 <field name="name" />
                 <field name="title" />
                 <field name="agreement_id" />
-                <field name="active" invisible="1" />
+                <field name="active" column_invisible="1" />
             </tree>
         </field>
     </record>
@@ -27,7 +27,7 @@
                         name="web_ribbon"
                         title="Archived"
                         bg_color="bg-danger"
-                        attrs="{'invisible': [('active', '=', True)]}"
+                        invisible="active == True"
                     />
                     <field name="active" invisible="1" />
                     <div class="oe_title">
@@ -58,8 +58,8 @@
                                 domain="[('model_id', '=', sub_object_id),
                                             ('ttype', '!=', 'one2many'),
                                             ('ttype', '!=', 'many2many')]"
-                                attrs="{'readonly':[('sub_object_id', '=', False)],
-                                           'required':[('sub_object_id', '!=', False)]}"
+                                readonly="sub_object_id == False"
+                                required="sub_object_id != False"
                             />
                             <field name="default_value" />
                             <field name="copyvalue" />
@@ -115,7 +115,7 @@
                 <attribute name="default_order">sequence</attribute>
             </tree>
             <field name="agreement_id" position="attributes">
-                <attribute name="invisible">1</attribute>
+                <attribute name="column_invisible">1</attribute>
             </field>
         </field>
     </record>
diff --git a/agreement_legal/views/agreement_clause.xml b/agreement_legal/views/agreement_clause.xml
index 0ee4ca84..e37034cb 100644
--- a/agreement_legal/views/agreement_clause.xml
+++ b/agreement_legal/views/agreement_clause.xml
@@ -11,7 +11,7 @@
                 <field name="title" />
                 <field name="agreement_id" />
                 <field name="section_id" />
-                <field name="active" invisible="1" />
+                <field name="active" column_invisible="1" />
             </tree>
         </field>
     </record>
@@ -28,7 +28,7 @@
                         name="web_ribbon"
                         title="Archived"
                         bg_color="bg-danger"
-                        attrs="{'invisible': [('active', '=', True)]}"
+                        invisible="active == True"
                     />
                     <field name="active" invisible="1" />
                     <div class="oe_title">
@@ -63,8 +63,8 @@
                                 domain="[('model_id', '=', sub_object_id),
                                             ('ttype', '!=', 'one2many'),
                                             ('ttype', '!=', 'many2many')]"
-                                attrs="{'readonly':[('sub_object_id', '=', False)],
-                                           'required':[('sub_object_id', '!=', False)]}"
+                                readonly="sub_object_id == False"
+                                required="sub_object_id != False"
                             />
                             <field name="default_value" />
                             <field name="copyvalue" />
@@ -125,7 +125,7 @@
                 <attribute name="default_order">sequence</attribute>
             </tree>
             <field name="agreement_id" position="attributes">
-                <attribute name="invisible">1</attribute>
+                <attribute name="column_invisible">1</attribute>
             </field>
         </field>
     </record>
diff --git a/agreement_legal/views/agreement_recital.xml b/agreement_legal/views/agreement_recital.xml
index 69dfd5af..23af1215 100644
--- a/agreement_legal/views/agreement_recital.xml
+++ b/agreement_legal/views/agreement_recital.xml
@@ -10,7 +10,7 @@
                 <field name="name" />
                 <field name="title" />
                 <field name="agreement_id" />
-                <field name="active" invisible="1" />
+                <field name="active" column_invisible="1" />
             </tree>
         </field>
     </record>
@@ -27,7 +27,7 @@
                         name="web_ribbon"
                         title="Archived"
                         bg_color="bg-danger"
-                        attrs="{'invisible': [('active', '=', True)]}"
+                        invisible="active == True"
                     />
                     <field name="active" invisible="1" />
                     <div class="oe_title">
@@ -58,8 +58,8 @@
                                 domain="[('model_id', '=', sub_object_id),
                                             ('ttype', '!=', 'one2many'),
                                             ('ttype', '!=', 'many2many')]"
-                                attrs="{'readonly':[('sub_object_id', '=', False)],
-                                           'required':[('sub_object_id', '!=', False)]}"
+                                readonly="sub_object_id == False"
+                                required="sub_object_id != False"
                             />
                             <field name="default_value" />
                             <field name="copyvalue" />
@@ -115,7 +115,7 @@
                 <attribute name="default_order">sequence</attribute>
             </tree>
             <field name="agreement_id" position="attributes">
-                <attribute name="invisible">1</attribute>
+                <attribute name="column_invisible">1</attribute>
             </field>
         </field>
     </record>
diff --git a/agreement_legal/views/agreement_section.xml b/agreement_legal/views/agreement_section.xml
index 51b4c767..d879fc0d 100644
--- a/agreement_legal/views/agreement_section.xml
+++ b/agreement_legal/views/agreement_section.xml
@@ -10,7 +10,7 @@
                 <field name="name" />
                 <field name="title" />
                 <field name="agreement_id" />
-                <field name="active" invisible="1" />
+                <field name="active" column_invisible="1" />
             </tree>
         </field>
     </record>
@@ -27,7 +27,7 @@
                         name="web_ribbon"
                         title="Archived"
                         bg_color="bg-danger"
-                        attrs="{'invisible': [('active', '=', True)]}"
+                        invisible="active == True"
                     />
                     <field name="active" invisible="1" />
                     <div class="oe_title">
@@ -60,8 +60,8 @@
                                         domain="[('model_id', '=', sub_object_id),
                                             ('ttype', '!=', 'one2many'),
                                             ('ttype', '!=', 'many2many')]"
-                                        attrs="{'readonly':[('sub_object_id', '=', False)],
-                                           'required':[('sub_object_id', '!=', False)]}"
+                                        readonly="sub_object_id == False"
+                                        required="sub_object_id != False"
                                     />
                                     <field name="default_value" />
                                     <field name="copyvalue" />
@@ -83,7 +83,7 @@
                             <field
                                 name="clauses_ids"
                                 nolabel="1"
-                                context="{'default_section_id': active_id, 'default_agreement_id': agreement_id}"
+                                context="{'default_section_id': id, 'default_agreement_id': agreement_id}"
                             >
                                 <tree>
                                     <field name="sequence" widget="handle" />
@@ -134,7 +134,7 @@
                 <attribute name="default_order">sequence</attribute>
             </tree>
             <field name="agreement_id" position="attributes">
-                <attribute name="invisible">1</attribute>
+                <attribute name="column_invisible">1</attribute>
             </field>
         </field>
     </record>
diff --git a/agreement_legal/views/agreement_stages.xml b/agreement_legal/views/agreement_stages.xml
index 99cd400b..4674d43e 100644
--- a/agreement_legal/views/agreement_stages.xml
+++ b/agreement_legal/views/agreement_stages.xml
@@ -25,7 +25,7 @@
                         name="web_ribbon"
                         title="Archived"
                         bg_color="bg-danger"
-                        attrs="{'invisible': [('active', '=', True)]}"
+                        invisible="active == True"
                     />
                     <div class="oe_title">
                         <label for="name" class="oe_edit_only" />
diff --git a/agreement_legal/views/agreement_subtype.xml b/agreement_legal/views/agreement_subtype.xml
index 5c14b045..4a88f98c 100644
--- a/agreement_legal/views/agreement_subtype.xml
+++ b/agreement_legal/views/agreement_subtype.xml
@@ -24,7 +24,7 @@
                         name="web_ribbon"
                         title="Archived"
                         bg_color="bg-danger"
-                        attrs="{'invisible': [('active', '=', True)]}"
+                        invisible="active == True"
                     />
                     <div class="oe_title">
                         <label for="name" class="oe_edit_only" />
diff --git a/agreement_legal/views/agreement_type.xml b/agreement_legal/views/agreement_type.xml
index 2f5b1fbc..06ab2149 100644
--- a/agreement_legal/views/agreement_type.xml
+++ b/agreement_legal/views/agreement_type.xml
@@ -9,7 +9,7 @@
             <field name="name" position="after">
                 <field name="agreement_subtypes_ids" widget="many2many_tags" />
             </field>
-       </field>
+        </field>
     </record>
 
     <!-- Agreement Type Form View -->
diff --git a/agreement_legal/views/res_config_settings.xml b/agreement_legal/views/res_config_settings.xml
index 67baae37..0361c026 100644
--- a/agreement_legal/views/res_config_settings.xml
+++ b/agreement_legal/views/res_config_settings.xml
@@ -7,179 +7,114 @@
         <field name="inherit_id" ref="base.res_config_settings_view_form" />
         <field name="arch" type="xml">
             <xpath expr="//div[hasclass('settings')]" position="inside">
-                <div
-                    class="app_settings_block"
+                <app
                     data-string="Agreements"
                     string="Agreements"
                     data-key="agreement_legal"
                     groups="agreement_legal.group_agreement_manager"
                 >
-                    <h2>Operations</h2>
-                    <div class="row mt16 o_settings_container">
-                        <div class="col-xs-12 col-md-6 o_setting_box">
-                            <div class="o_setting_left_pane">
-                                <field name="group_uom" />
-                            </div>
-                            <div class="o_setting_right_pane">
-                                <label for="group_uom" />
-                                <div class="text-muted">
-                                    Sell and purchase products in different units of measure
-                                </div>
-                                <div class="content-group">
-                                    <div
-                                        class="mt16"
-                                        attrs="{'invisible': [('group_uom', '=', False)]}"
-                                    >
-                                        <button
-                                            name="%(uom.product_uom_form_action)d"
-                                            icon="fa-arrow-right"
-                                            type="action"
-                                            string="Units Of Measure"
-                                            class="btn-link"
-                                        />
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    <h2>Advanced Features</h2>
-                    <div class="row mt16 o_settings_container">
-                        <div class="col-xs-12 col-md-6 o_setting_box">
-                            <div class="o_setting_left_pane">
-                                <field name="module_agreement_sale" />
-                            </div>
-                            <div class="o_setting_right_pane">
-                                <label for="module_agreement_sale" string="Sales" />
-                                <div class="text-muted">
-                                    Create an agreement when the sales order is confirmed
-                                </div>
-                            </div>
-                        </div>
-                        <div
-                            class="col-xs-12 col-md-6 o_setting_box"
-                            attrs="{'invisible': [('module_agreement_sale', '!=', True)]}"
-                        >
-                            <div class="o_setting_left_pane">
-                                <field name="module_agreement_sale_subscription" />
-                            </div>
-                            <div class="o_setting_right_pane">
-                                <label
-                                    for="module_agreement_sale_subscription"
-                                    string="Sale Subscriptions"
-                                />
-                                <div class="text-muted">
-                                    Link your subscriptions to an agreement
-                                </div>
-                            </div>
-                        </div>
-                        <div class="col-xs-12 col-md-6 o_setting_box">
-                            <div class="o_setting_left_pane">
-                                <field name="module_fieldservice_agreement" />
-                            </div>
-                            <div class="o_setting_right_pane">
-                                <label
-                                    for="module_fieldservice_agreement"
-                                    string="Field Service"
-                                />
-                                <div class="text-muted">
-                                    Link your Field Service orders and equipments to an agreement
-                                </div>
-                            </div>
-                        </div>
-                        <div class="col-xs-12 col-md-6 o_setting_box">
-                            <div class="o_setting_left_pane">
-                                <field name="module_agreement_stock" />
-                            </div>
-                            <div class="o_setting_right_pane">
-                                <label
-                                    for="module_agreement_stock"
-                                    string="Inventory"
-                                />
-                                <div class="text-muted">
-                                    Link your transfers to an agreement
-                                </div>
-                            </div>
-                        </div>
-                        <div class="col-xs-12 col-md-6 o_setting_box">
-                            <div class="o_setting_left_pane">
-                                <field name="module_agreement_rma" />
-                            </div>
-                            <div class="o_setting_right_pane">
-                                <label for="module_agreement_rma" string="Returns" />
-                                <div class="text-muted">
-                                    Link your returns to an agreement
-                                </div>
-                            </div>
-                        </div>
-                        <div class="col-xs-12 col-md-6 o_setting_box">
-                            <div class="o_setting_left_pane">
-                                <field name="module_agreement_maintenance" />
-                            </div>
-                            <div class="o_setting_right_pane">
-                                <label
-                                    for="module_agreement_maintenance"
-                                    string="Maintenance"
-                                />
-                                <div class="text-muted">
-                                    Manage maintenance agreements and contracts
-                                </div>
-                            </div>
-                        </div>
-                        <div class="col-xs-12 col-md-6 o_setting_box">
-                            <div class="o_setting_left_pane">
-                                <field name="module_agreement_mrp" />
-                            </div>
-                            <div class="o_setting_right_pane">
-                                <label
-                                    for="module_agreement_mrp"
-                                    string="Manufacturing"
-                                />
-                                <div class="text-muted">
-                                    Link your manufacturing orders to an agreement
-                                </div>
-                            </div>
-                        </div>
-                        <div class="col-xs-12 col-md-6 o_setting_box">
-                            <div class="o_setting_left_pane">
-                                <field name="module_agreement_repair" />
-                            </div>
-                            <div class="o_setting_right_pane">
-                                <label for="module_agreement_repair" string="Repair" />
-                                <div class="text-muted">
-                                    Link your repair orders to an agreement
-                                </div>
-                            </div>
-                        </div>
-                        <div class="col-xs-12 col-md-6 o_setting_box">
-                            <div class="o_setting_left_pane">
-                                <field name="module_agreement_project" />
-                            </div>
-                            <div class="o_setting_right_pane">
-                                <label
-                                    for="module_agreement_project"
-                                    string="Project"
-                                />
-                                <div class="text-muted">
-                                    Link your projects and tasks to an agreement
-                                </div>
-                            </div>
-                        </div>
-                        <div class="col-xs-12 col-md-6 o_setting_box">
-                            <div class="o_setting_left_pane">
-                                <field name="module_agreement_helpdesk" />
-                            </div>
-                            <div class="o_setting_right_pane">
-                                <label
-                                    for="module_agreement_helpdesk"
-                                    string="Helpdesk"
-                                />
-                                <div class="text-muted">
-                                    Link your Helpdesk tickets to an agreement
+                    <block title="Operations">
+                        <setting>
+                            <field name="group_uom" />
+                            <label for="group_uom" />
+                            <div class="text-muted">
+                                Sell and purchase products in different units of measure
+                            </div>
+                            <div class="content-group">
+                                <div class="mt16" invisible="group_uom == False">
+                                    <button
+                                        name="%(uom.product_uom_form_action)d"
+                                        icon="fa-arrow-right"
+                                        type="action"
+                                        string="Units Of Measure"
+                                        class="btn-link"
+                                    />
                                 </div>
                             </div>
-                        </div>
-                    </div>
-                </div>
+                        </setting>
+                    </block>
+                    <block title="Advanced Features">
+                        <setting>
+                            <field name="module_agreement_sale" />
+                            <label for="module_agreement_sale" string="Sales" />
+                            <div class="text-muted">
+                                Create an agreement when the sales order is confirmed
+                            </div>
+                        </setting>
+                        <setting invisible="module_agreement_sale != True">
+                            <field name="module_agreement_sale_subscription" />
+                            <label
+                                for="module_agreement_sale_subscription"
+                                string="Sale Subscriptions"
+                            />
+                            <div class="text-muted">
+                                Link your subscriptions to an agreement
+                            </div>
+                        </setting>
+                        <setting class="col-xs-12 col-md-6 o_setting_box">
+                            <field name="module_fieldservice_agreement" />
+                            <label
+                                for="module_fieldservice_agreement"
+                                string="Field Service"
+                            />
+                            <div class="text-muted">
+                                Link your Field Service orders and equipments to an agreement
+                            </div>
+                        </setting>
+                        <setting class="col-xs-12 col-md-6 o_setting_box">
+                            <field name="module_agreement_stock" />
+                            <label for="module_agreement_stock" string="Inventory" />
+                            <div class="text-muted">
+                                Link your transfers to an agreement
+                            </div>
+                        </setting>
+                        <setting class="col-xs-12 col-md-6 o_setting_box">
+                            <field name="module_agreement_rma" />
+                            <label for="module_agreement_rma" string="Returns" />
+                            <div class="text-muted">
+                                Link your returns to an agreement
+                            </div>
+                        </setting>
+                        <setting class="col-xs-12 col-md-6 o_setting_box">
+                            <field name="module_agreement_maintenance" />
+                            <label
+                                for="module_agreement_maintenance"
+                                string="Maintenance"
+                            />
+                            <div class="text-muted">
+                                Manage maintenance agreements and contracts
+                            </div>
+                        </setting>
+                        <setting class="col-xs-12 col-md-6 o_setting_box">
+                            <field name="module_agreement_mrp" />
+                            <label for="module_agreement_mrp" string="Manufacturing" />
+                            <div class="text-muted">
+                                Link your manufacturing orders to an agreement
+                            </div>
+                        </setting>
+                        <setting class="col-xs-12 col-md-6 o_setting_box">
+                            <field name="module_agreement_repair" />
+                            <label for="module_agreement_repair" string="Repair" />
+                            <div class="text-muted">
+                                Link your repair orders to an agreement
+                            </div>
+                        </setting>
+                        <setting class="col-xs-12 col-md-6 o_setting_box">
+                            <field name="module_agreement_project" />
+                            <label for="module_agreement_project" string="Project" />
+                            <div class="text-muted">
+                                Link your projects and tasks to an agreement
+                            </div>
+                        </setting>
+                        <setting class="col-xs-12 col-md-6 o_setting_box">
+                            <field name="module_agreement_helpdesk" />
+                            <label for="module_agreement_helpdesk" string="Helpdesk" />
+                            <div class="text-muted">
+                                Link your Helpdesk tickets to an agreement
+                            </div>
+                        </setting>
+                    </block>
+                </app>
             </xpath>
         </field>
     </record>