From db5bcd7d036ac15e5db8b044756c124c65742cab Mon Sep 17 00:00:00 2001
From: HviorForgeFlow <hector.villarreal@forgeflow.com>
Date: Fri, 29 May 2020 12:27:01 +0200
Subject: [PATCH] [IMP] Update pre-commit lints according with OCA ones

---
 rma_account/data/rma_operation.xml           |  10 +-
 rma_account/views/account_move_view.xml      |  61 ++++---
 rma_account/views/rma_account_menu.xml       |  43 +++--
 rma_account/views/rma_operation_view.xml     |  10 +-
 rma_account/views/rma_order_line_view.xml    | 126 +++++++++------
 rma_account/views/rma_order_view.xml         |  84 ++++++----
 rma_account/wizards/rma_add_account_move.xml | 158 ++++++++++++-------
 rma_account/wizards/rma_refund.xml           |  69 +++++---
 8 files changed, 349 insertions(+), 212 deletions(-)

diff --git a/rma_account/data/rma_operation.xml b/rma_account/data/rma_operation.xml
index 139981df..2c320f3b 100644
--- a/rma_account/data/rma_operation.xml
+++ b/rma_account/data/rma_operation.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" ?>
 <odoo noupdate="1">
 
     <record id="rma.rma_operation_customer_replace" model="rma.operation">
@@ -16,8 +16,8 @@
         <field name="receipt_policy">ordered</field>
         <field name="delivery_policy">no</field>
         <field name="type">customer</field>
-        <field name="in_route_id" ref="rma.route_rma_customer"/>
-        <field name="out_route_id" ref="rma.route_rma_customer"/>
+        <field name="in_route_id" ref="rma.route_rma_customer" />
+        <field name="out_route_id" ref="rma.route_rma_customer" />
     </record>
 
     <record id="rma_operation_supplier_refund" model="rma.operation">
@@ -27,8 +27,8 @@
         <field name="receipt_policy">no</field>
         <field name="delivery_policy">ordered</field>
         <field name="type">supplier</field>
-        <field name="in_route_id" ref="rma.route_rma_supplier"/>
-        <field name="out_route_id" ref="rma.route_rma_supplier"/>
+        <field name="in_route_id" ref="rma.route_rma_supplier" />
+        <field name="out_route_id" ref="rma.route_rma_supplier" />
     </record>
 
     <record id="rma.rma_operation_ds_replace" model="rma.operation">
diff --git a/rma_account/views/account_move_view.xml b/rma_account/views/account_move_view.xml
index 8c927540..b1a9e47f 100644
--- a/rma_account/views/account_move_view.xml
+++ b/rma_account/views/account_move_view.xml
@@ -1,18 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" ?>
 <odoo>
     <record id="invoice_form" model="ir.ui.view">
         <field name="name">account.move.form</field>
         <field name="model">account.move</field>
-        <field name="inherit_id" ref="account.view_move_form"/>
+        <field name="inherit_id" ref="account.view_move_form" />
         <field name="arch" type="xml">
             <field name="name" position="before">
-                <div class="oe_button_box" attrs="{'invisible': [('rma_count', '=', 0)]}">
-                    <button type="object"  name="action_view_rma_customer"
-                            class="oe_stat_button"
-                            icon="fa-eject"
-                            groups="rma.group_rma_customer_user,rma.group_rma_supplier_user">
-                        <field name="rma_count" widget="statinfo"
-                               string="RMA"/>
+                <div
+                    class="oe_button_box"
+                    attrs="{'invisible': [('rma_count', '=', 0)]}"
+                >
+                    <button
+                        type="object"
+                        name="action_view_rma_customer"
+                        class="oe_stat_button"
+                        icon="fa-eject"
+                        groups="rma.group_rma_customer_user,rma.group_rma_supplier_user"
+                    >
+                        <field
+                            name="rma_count"
+                            widget="statinfo"
+                            string="RMA"
+                        />
                     </button>
                 </div>
             </field>
@@ -23,17 +32,18 @@
     <record id="view_invoice_line_form" model="ir.ui.view">
         <field name="name">rma.invoice.line.form</field>
         <field name="model">account.move.line</field>
-        <field name="inherit_id" ref="account.view_move_line_form"/>
-        <field eval="16" name="priority"/>
+        <field name="inherit_id" ref="account.view_move_line_form" />
+        <field eval="16" name="priority" />
         <field name="arch" type="xml">
             <data>
                 <field name="name" position="after">
-                    <field name="rma_line_count" invisible="1"/>
-                    <field name="rma_line_id"
-                           string="RMA line originated"/>
-                    <notebook attrs="{'invisible': [('rma_line_count', '=', 0)]}">
+                    <field name="rma_line_count" invisible="1" />
+                    <field name="rma_line_id" string="RMA line originated" />
+                    <notebook
+                        attrs="{'invisible': [('rma_line_count', '=', 0)]}"
+                    >
                         <page string="RMA Lines">
-                            <field name="rma_line_ids"/>
+                            <field name="rma_line_ids" />
                         </page>
                     </notebook>
                 </field>
@@ -45,17 +55,20 @@
     <record id="view_invoice_customer_rma_form" model="ir.ui.view">
         <field name="name">account.move.customer.rma</field>
         <field name="model">account.move</field>
-        <field name="inherit_id" ref="account.view_move_form"/>
+        <field name="inherit_id" ref="account.view_move_form" />
         <field name="arch" type="xml">
             <field name="invoice_vendor_bill_id" position="after">
-                 <field name="add_rma_line_id"
-                        context="{'rma': True}"
-                        domain="[('type', '=', 'customer'),
+                 <field
+                    name="add_rma_line_id"
+                    context="{'rma': True}"
+                    domain="[('type', '=', 'customer'),
                                  ('partner_id', '=', partner_id)]"
-                        attrs="{'readonly': [('state','not in',['draft'])],
+                    attrs="{'readonly': [('state','not in',['draft'])],
                          'invisible': ['|', ('state', '=', 'paid'),
-                          ('type', '=', 'in_invoice')]}" class="oe_edit_only"
-                        options="{'no_create': True}"/>
+                          ('type', '=', 'in_invoice')]}"
+                    class="oe_edit_only"
+                    options="{'no_create': True}"
+                />
             </field>
         </field>
     </record>
@@ -64,6 +77,6 @@
         <field name="name">Invoice Line</field>
         <field name="res_model">account.move.line</field>
         <field name="view_mode">form</field>
-        <field name="view_id" ref="account.view_move_line_form"/>
+        <field name="view_id" ref="account.view_move_line_form" />
     </record>
 </odoo>
diff --git a/rma_account/views/rma_account_menu.xml b/rma_account/views/rma_account_menu.xml
index 6f552638..b5cb1ef3 100644
--- a/rma_account/views/rma_account_menu.xml
+++ b/rma_account/views/rma_account_menu.xml
@@ -1,9 +1,12 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!-- Copyright 2018 ForgeFlow S.L.
      License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl-3.0) -->
 <odoo>
 
-    <record id="action_rma_account_customer_lines" model="ir.actions.act_window">
+    <record
+        id="action_rma_account_customer_lines"
+        model="ir.actions.act_window"
+    >
         <field name="name">Customer RMA</field>
         <field name="res_model">rma.order.line</field>
         <field name="domain">[('type','=', 'customer')]</field>
@@ -15,45 +18,57 @@
         <field name="name">Supplier RMA</field>
         <field name="res_model">rma.order.line</field>
         <field name="domain">[('type','=', 'supplier')]</field>
-        <field name="context">{"search_default_to_refund":1, "supplier":1}</field>
+        <field
+            name="context"
+        >{"search_default_to_refund":1, "supplier":1}</field>
         <field name="view_mode">tree,form</field>
-        <field name="view_id" ref="rma.view_rma_line_supplier_tree"/>
+        <field name="view_id" ref="rma.view_rma_line_supplier_tree" />
     </record>
 
     <!-- Accountants menu RMA -->
-    <menuitem id="menu_rma_account"
+    <menuitem
+        id="menu_rma_account"
         name="Accounting"
         groups="account.group_account_user"
         sequence="32"
-        parent="rma.menu_rma_root"/>
+        parent="rma.menu_rma_root"
+    />
 
-    <menuitem id="menu_rma_customer_refunds"
+    <menuitem
+        id="menu_rma_customer_refunds"
         name="Customer RMA to Refund"
         sequence="20"
         parent="rma_account.menu_rma_account"
         groups="rma.group_rma_customer_user"
-        action="action_rma_account_customer_lines"/>
+        action="action_rma_account_customer_lines"
+    />
 
-    <menuitem id="menu_rma_line_supplier_refunds"
+    <menuitem
+        id="menu_rma_line_supplier_refunds"
         name="Supplier RMA to Refund"
         sequence="20"
         parent="rma_account.menu_rma_account"
         groups="rma.group_rma_customer_user"
-        action="action_rma_supplier_lines"/>
+        action="action_rma_supplier_lines"
+    />
 
 
-    <menuitem id="menu_rma_line_account_customer"
+    <menuitem
+        id="menu_rma_line_account_customer"
         name="Customer RMA to Refund"
         sequence="20"
         parent="account.menu_finance_receivables"
         groups="rma.group_rma_customer_user"
-        action="action_rma_account_customer_lines"/>
+        action="action_rma_account_customer_lines"
+    />
 
-    <menuitem id="menu_rma_line_account_supplier"
+    <menuitem
+        id="menu_rma_line_account_supplier"
         name="Supplier RMA to Refund"
         sequence="20"
         parent="account.menu_finance_payables"
         groups="rma.group_rma_supplier_user"
-        action="action_rma_supplier_lines"/>
+        action="action_rma_supplier_lines"
+    />
 
 </odoo>
diff --git a/rma_account/views/rma_operation_view.xml b/rma_account/views/rma_operation_view.xml
index 6f9c4062..58695947 100644
--- a/rma_account/views/rma_operation_view.xml
+++ b/rma_account/views/rma_operation_view.xml
@@ -1,12 +1,12 @@
-<?xml version="1.0"?>
+<?xml version="1.0" ?>
 <odoo>
     <record id="rma_operation_tree" model="ir.ui.view">
         <field name="name">rma.operation.tree</field>
         <field name="model">rma.operation</field>
-        <field name="inherit_id" ref="rma.rma_operation_tree"/>
+        <field name="inherit_id" ref="rma.rma_operation_tree" />
         <field name="arch" type="xml">
             <field name="name" position="after">
-                <field name="refund_policy"/>
+                <field name="refund_policy" />
             </field>
         </field>
     </record>
@@ -14,10 +14,10 @@
     <record id="rma_operation_form" model="ir.ui.view">
         <field name="name">rma.operation.form</field>
         <field name="model">rma.operation</field>
-        <field name="inherit_id" ref="rma.rma_operation_form"/>
+        <field name="inherit_id" ref="rma.rma_operation_form" />
         <field name="arch" type="xml">
             <field name="receipt_policy" position="before">
-                <field name="refund_policy"/>
+                <field name="refund_policy" />
             </field>
         </field>
     </record>
diff --git a/rma_account/views/rma_order_line_view.xml b/rma_account/views/rma_order_line_view.xml
index 7accc439..47fa18ef 100644
--- a/rma_account/views/rma_order_line_view.xml
+++ b/rma_account/views/rma_order_line_view.xml
@@ -1,48 +1,61 @@
-<?xml version="1.0"?>
+<?xml version="1.0" ?>
 <odoo>
     <record id="view_rma_line_supplier_form" model="ir.ui.view">
         <field name="name">rma.order.line.supplier.form</field>
         <field name="model">rma.order.line</field>
-        <field name="inherit_id" ref="rma.view_rma_line_supplier_form"/>
+        <field name="inherit_id" ref="rma.view_rma_line_supplier_form" />
         <field name="arch" type="xml">
             <button name="action_view_out_shipments" position="after">
-                <button type="object"  name="action_view_invoice"
-                                    class="oe_stat_button"
-                                    icon="fa-pencil-square-o"
-                                    string="Origin Inv">
+                <button
+                    type="object"
+                    name="action_view_invoice"
+                    class="oe_stat_button"
+                    icon="fa-pencil-square-o"
+                    string="Origin Inv"
+                >
                 </button>
-                <button type="object"  name="action_view_refunds"
-                            class="oe_stat_button"
-                            icon="fa-pencil-square-o"
-                            groups="account.group_account_user">
-                        <field name="refund_count" widget="statinfo"
-                               string="Refunds"/>
+                <button
+                    type="object"
+                    name="action_view_refunds"
+                    class="oe_stat_button"
+                    icon="fa-pencil-square-o"
+                    groups="account.group_account_user"
+                >
+                        <field
+                        name="refund_count"
+                        widget="statinfo"
+                        string="Refunds"
+                    />
                     </button>
             </button>
             <group name="main_info" position="inside">
-                <field name="account_move_line_id"
-                       options="{'no_create': True}"
-                       context="{'rma': True}"
-                       domain="['|',
+                <field
+                    name="account_move_line_id"
+                    options="{'no_create': True}"
+                    context="{'rma': True}"
+                    domain="['|',
                                 ('move_id.partner_id', '=', partner_id),
-                                ('move_id.partner_id', 'child_of', partner_id)]"/>
+                                ('move_id.partner_id', 'child_of', partner_id)]"
+                />
             </group>
             <field name="operation_id" position="after">
-                <field name="refund_policy"/>
+                <field name="refund_policy" />
             </field>
             <page name="stock" position="after">
                 <page name="refunds" string="Refunds">
-                    <field name="refund_line_ids" nolabel="1"/>
+                    <field name="refund_line_ids" nolabel="1" />
                 </page>
             </page>
             <field name="delivery_address_id" position="after">
-                <field name="invoice_address_id"
-                       groups='rma.group_rma_delivery_invoice_address'/>
+                <field
+                    name="invoice_address_id"
+                    groups='rma.group_rma_delivery_invoice_address'
+                />
             </field>
             <group name="deliver" position="after">
                 <group name="refund">
-                    <field name="qty_to_refund"/>
-                    <field name="qty_refunded"/>
+                    <field name="qty_to_refund" />
+                    <field name="qty_refunded" />
                 </group>
             </group>
         </field>
@@ -51,46 +64,59 @@
     <record id="view_rma_line_form" model="ir.ui.view">
         <field name="name">rma.order.line.form</field>
         <field name="model">rma.order.line</field>
-        <field name="inherit_id" ref="rma.view_rma_line_form"/>
+        <field name="inherit_id" ref="rma.view_rma_line_form" />
         <field name="arch" type="xml">
             <button name="action_view_out_shipments" position="after">
-                <button type="object"  name="action_view_invoice"
-                                    class="oe_stat_button"
-                                    icon="fa-pencil-square-o"
-                                    string="Origin Inv">
+                <button
+                    type="object"
+                    name="action_view_invoice"
+                    class="oe_stat_button"
+                    icon="fa-pencil-square-o"
+                    string="Origin Inv"
+                >
                 </button>
-                 <button type="object"  name="action_view_refunds"
-                            class="oe_stat_button"
-                            icon="fa-pencil-square-o"
-                            groups="account.group_account_user">
-                        <field name="refund_count" widget="statinfo"
-                               string="Refunds"/>
+                 <button
+                    type="object"
+                    name="action_view_refunds"
+                    class="oe_stat_button"
+                    icon="fa-pencil-square-o"
+                    groups="account.group_account_user"
+                >
+                        <field
+                        name="refund_count"
+                        widget="statinfo"
+                        string="Refunds"
+                    />
                     </button>
             </button>
             <group name="main_info" position="inside">
-                <field name="account_move_line_id"
-                       options="{'no_create': True}"
-                       context="{'rma': True}"
-                       domain="['|',
+                <field
+                    name="account_move_line_id"
+                    options="{'no_create': True}"
+                    context="{'rma': True}"
+                    domain="['|',
                                 ('move_id.partner_id', '=', partner_id),
-                                ('move_id.partner_id', 'child_of', partner_id)]"/>
+                                ('move_id.partner_id', 'child_of', partner_id)]"
+                />
             </group>
             <field name="operation_id" position="after">
-                <field name="refund_policy"/>
+                <field name="refund_policy" />
             </field>
             <page name="stock" position="after">
                 <page name="refunds" string="Refunds">
-                    <field name="refund_line_ids" nolabel="1"/>
+                    <field name="refund_line_ids" nolabel="1" />
                 </page>
             </page>
             <field name="delivery_address_id" position="after">
-                <field name="invoice_address_id"
-                       groups='rma.group_rma_delivery_invoice_address'/>
+                <field
+                    name="invoice_address_id"
+                    groups='rma.group_rma_delivery_invoice_address'
+                />
             </field>
             <group name="supplier_rma" position="after">
                 <group name="refund">
-                    <field name="qty_to_refund"/>
-                    <field name="qty_refunded"/>
+                    <field name="qty_to_refund" />
+                    <field name="qty_refunded" />
                 </group>
             </group>
         </field>
@@ -99,11 +125,15 @@
     <record id="view_rma_rma_line_filter" model="ir.ui.view">
         <field name="name">rma.order.line.select</field>
         <field name="model">rma.order.line</field>
-        <field name="inherit_id" ref="rma.view_rma_rma_line_filter"/>
+        <field name="inherit_id" ref="rma.view_rma_rma_line_filter" />
         <field name="arch" type="xml">
             <field name="product_id" position="after">
-                <filter name="to_refund" string="To Refund" domain="[('qty_to_refund', '>', 0)]"
-context="{'group_by':'partner_id'}"/>
+                <filter
+                    name="to_refund"
+                    string="To Refund"
+                    domain="[('qty_to_refund', '>', 0)]"
+                    context="{'group_by':'partner_id'}"
+                />
             </field>
         </field>
     </record>
diff --git a/rma_account/views/rma_order_view.xml b/rma_account/views/rma_order_view.xml
index 5c6b0e82..4378e3eb 100644
--- a/rma_account/views/rma_order_view.xml
+++ b/rma_account/views/rma_order_view.xml
@@ -1,25 +1,36 @@
-<?xml version="1.0"?>
+<?xml version="1.0" ?>
 <odoo>
     <record id="view_rma_form" model="ir.ui.view">
         <field name="name">rma.order.form - rma_account</field>
         <field name="model">rma.order</field>
-        <field name="inherit_id" ref="rma.view_rma_form"/>
+        <field name="inherit_id" ref="rma.view_rma_form" />
         <field name="arch" type="xml">
-            <button name="action_view_out_shipments"
-                    position="after">
-                <button type="object"  name="action_view_invoice_refund"
-                        class="oe_stat_button"
-                        icon="fa-pencil-square-o"
-                        groups="account.group_account_user">
-                    <field name="invoice_refund_count" widget="statinfo"
-                           string="Refunds"/>
+            <button name="action_view_out_shipments" position="after">
+                <button
+                    type="object"
+                    name="action_view_invoice_refund"
+                    class="oe_stat_button"
+                    icon="fa-pencil-square-o"
+                    groups="account.group_account_user"
+                >
+                    <field
+                        name="invoice_refund_count"
+                        widget="statinfo"
+                        string="Refunds"
+                    />
                 </button>
-                <button type="object"  name="action_view_invoice"
-                        class="oe_stat_button"
-                        icon="fa-pencil-square-o"
-                        groups="account.group_account_user">
-                    <field name="invoice_count" widget="statinfo"
-                           string="Origin Inv"/>
+                <button
+                    type="object"
+                    name="action_view_invoice"
+                    class="oe_stat_button"
+                    icon="fa-pencil-square-o"
+                    groups="account.group_account_user"
+                >
+                    <field
+                        name="invoice_count"
+                        widget="statinfo"
+                        string="Origin Inv"
+                    />
                 </button>
             </button>
             <!--
@@ -34,23 +45,34 @@
     <record id="view_rma_supplier_form" model="ir.ui.view">
         <field name="name">rma.order.supplier.form</field>
         <field name="model">rma.order</field>
-        <field name="inherit_id" ref="rma.view_rma_supplier_form"/>
+        <field name="inherit_id" ref="rma.view_rma_supplier_form" />
         <field name="arch" type="xml">
-             <button name="action_view_out_shipments"
-                    position="after">
-                 <button type="object"  name="action_view_invoice_refund"
-                         class="oe_stat_button"
-                         icon="fa-pencil-square-o"
-                         groups="account.group_account_user">
-                     <field name="invoice_refund_count" widget="statinfo"
-                            string="Refunds"/>
+             <button name="action_view_out_shipments" position="after">
+                 <button
+                    type="object"
+                    name="action_view_invoice_refund"
+                    class="oe_stat_button"
+                    icon="fa-pencil-square-o"
+                    groups="account.group_account_user"
+                >
+                     <field
+                        name="invoice_refund_count"
+                        widget="statinfo"
+                        string="Refunds"
+                    />
                  </button>
-                 <button type="object"  name="action_view_invoice"
-                         class="oe_stat_button"
-                         icon="fa-pencil-square-o"
-                         groups="account.group_account_user">
-                     <field name="invoice_count" widget="statinfo"
-                            string="Origin Inv"/>
+                 <button
+                    type="object"
+                    name="action_view_invoice"
+                    class="oe_stat_button"
+                    icon="fa-pencil-square-o"
+                    groups="account.group_account_user"
+                >
+                     <field
+                        name="invoice_count"
+                        widget="statinfo"
+                        string="Origin Inv"
+                    />
                  </button>
             </button>
             <!--
diff --git a/rma_account/wizards/rma_add_account_move.xml b/rma_account/wizards/rma_add_account_move.xml
index 4e4efea7..2b383dd7 100644
--- a/rma_account/wizards/rma_add_account_move.xml
+++ b/rma_account/wizards/rma_add_account_move.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0"?>
-
+<?xml version="1.0" ?>
 <odoo>
 
     <record id="view_rma_add_account_move" model="ir.ui.view">
@@ -8,35 +7,48 @@
         <field name="arch" type="xml">
             <form string="Select Invoice from customer">
                 <group>
-                    <field name="partner_id"
-                           domain="[('customer','=',True)]"
-                           string="Customer"/>
+                    <field
+                        name="partner_id"
+                        domain="[('customer','=',True)]"
+                        string="Customer"
+                    />
                 </group>
-                <separator string="Select Invoices lines to add"/>
-                <field name="line_ids"
-                       domain="[('move_id.partner_id', '=', partner_id),
-                       ('move_id.type', '=', 'out_invoice')]">
+                <separator string="Select Invoices lines to add" />
+                <field
+                    name="line_ids"
+                    domain="[('move_id.partner_id', '=', partner_id),
+                       ('move_id.type', '=', 'out_invoice')]"
+                >
                     <tree string="Invoice Lines">
-                        <field name="move_id"/>
-                        <field name="name"/>
-                        <field name="account_id" groups="account.group_account_user"/>
-                        <field name="quantity"/>
-                        <field name="product_id"/>
-                        <field name="product_uom_id"/>
-                        <field name="price_unit"/>
-                        <field name="discount" groups="base.group_no_one"/>
-                        <field name="price_subtotal"/>
-                        <field name="currency_id" invisible="1"/>
+                        <field name="move_id" />
+                        <field name="name" />
+                        <field
+                            name="account_id"
+                            groups="account.group_account_user"
+                        />
+                        <field name="quantity" />
+                        <field name="product_id" />
+                        <field name="product_uom_id" />
+                        <field name="price_unit" />
+                        <field name="discount" groups="base.group_no_one" />
+                        <field name="price_subtotal" />
+                        <field name="currency_id" invisible="1" />
                     </tree>
                 </field>
                 <footer>
                     <button
-                            string="Confirm"
-                            name="add_lines" type="object"
-                            class="oe_highlight"/>
+                        string="Confirm"
+                        name="add_lines"
+                        type="object"
+                        class="oe_highlight"
+                    />
                     or
-                    <button name="action_cancel"
-                            string="Cancel" class="oe_link" special="cancel"/>
+                    <button
+                        name="action_cancel"
+                        string="Cancel"
+                        class="oe_link"
+                        special="cancel"
+                    />
                 </footer>
             </form>
         </field>
@@ -48,35 +60,48 @@
         <field name="arch" type="xml">
             <form string="Select Invoice from supplier">
                 <group>
-                    <field name="partner_id"
-                           domain="[('supplier','=',True)]"
-                           string="Supplier"/>
+                    <field
+                        name="partner_id"
+                        domain="[('supplier','=',True)]"
+                        string="Supplier"
+                    />
                 </group>
-                <separator string="Select Invoices lines to add"/>
-                <field name="line_ids"
-                       domain="[('move_id.partner_id', '=', partner_id),
-                       ('move_id.type', '=', 'in_invoice')]">
+                <separator string="Select Invoices lines to add" />
+                <field
+                    name="line_ids"
+                    domain="[('move_id.partner_id', '=', partner_id),
+                       ('move_id.type', '=', 'in_invoice')]"
+                >
                     <tree string="Invoice Lines">
-                        <field name="move_id"/>
-                        <field name="name"/>
-                        <field name="account_id" groups="account.group_account_user"/>
-                        <field name="quantity"/>
-                        <field name="product_id"/>
-                        <field name="product_uom_id"/>
-                        <field name="price_unit"/>
-                        <field name="discount" groups="base.group_no_one"/>
-                        <field name="price_subtotal"/>
-                        <field name="currency_id" invisible="1"/>
+                        <field name="move_id" />
+                        <field name="name" />
+                        <field
+                            name="account_id"
+                            groups="account.group_account_user"
+                        />
+                        <field name="quantity" />
+                        <field name="product_id" />
+                        <field name="product_uom_id" />
+                        <field name="price_unit" />
+                        <field name="discount" groups="base.group_no_one" />
+                        <field name="price_subtotal" />
+                        <field name="currency_id" invisible="1" />
                     </tree>
                 </field>
                 <footer>
                     <button
-                            string="Confirm"
-                            name="add_lines" type="object"
-                            class="oe_highlight"/>
+                        string="Confirm"
+                        name="add_lines"
+                        type="object"
+                        class="oe_highlight"
+                    />
                     or
-                    <button name="action_cancel"
-                            string="Cancel" class="oe_link" special="cancel"/>
+                    <button
+                        name="action_cancel"
+                        string="Cancel"
+                        class="oe_link"
+                        special="cancel"
+                    />
                 </footer>
             </form>
         </field>
@@ -88,30 +113,41 @@
         <field name="res_model">rma_add_account_move</field>
         <field name="view_mode">form</field>
         <field name="target">new</field>
-        <field name="view_id" ref="view_rma_add_account_move"/>
-        <field name="groups_id" eval="[(4, ref('rma.group_rma_customer_user'))]"/>
+        <field name="view_id" ref="view_rma_add_account_move" />
+        <field
+            name="groups_id"
+            eval="[(4, ref('rma.group_rma_customer_user'))]"
+        />
     </record>
 
-    <record id="action_rma_add_account_move_supplier" model="ir.actions.act_window">
+    <record
+        id="action_rma_add_account_move_supplier"
+        model="ir.actions.act_window"
+    >
         <field name="name">Add Invoice</field>
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">rma_add_account_move</field>
-        <field name="binding_model_id" ref="rma.model_rma_order_line"/>
+        <field name="binding_model_id" ref="rma.model_rma_order_line" />
         <field name="view_mode">form</field>
         <field name="target">new</field>
-        <field name="view_id" ref="view_rma_add_account_move_supplier"/>
-        <field name="groups_id" eval="[(4, ref('rma.group_rma_supplier_user'))]"/>
+        <field name="view_id" ref="view_rma_add_account_move_supplier" />
+        <field
+            name="groups_id"
+            eval="[(4, ref('rma.group_rma_supplier_user'))]"
+        />
     </record>
 
     <record id="view_rma_add_account_move_form" model="ir.ui.view">
         <field name="name">rma.order.form - invoice wizard</field>
         <field name="model">rma.order</field>
-        <field name="inherit_id" ref="rma.view_rma_form"/>
+        <field name="inherit_id" ref="rma.view_rma_form" />
         <field name="arch" type="xml">
             <xpath expr="//header" position="inside">
-                <button name="%(action_rma_add_account_move)d"
-                        string="Add From Invoice"
-                        type="action"/>
+                <button
+                    name="%(action_rma_add_account_move)d"
+                    string="Add From Invoice"
+                    type="action"
+                />
             </xpath>
         </field>
     </record>
@@ -119,12 +155,14 @@
     <record id="view_rma_add_account_move_button_form" model="ir.ui.view">
         <field name="name">rma.order.supplier.form - invoice wizard</field>
         <field name="model">rma.order</field>
-        <field name="inherit_id" ref="rma.view_rma_supplier_form"/>
+        <field name="inherit_id" ref="rma.view_rma_supplier_form" />
         <field name="arch" type="xml">
             <xpath expr="//header" position="inside">
-                <button name="%(action_rma_add_account_move_supplier)d"
-                        string="Add From Invoice"
-                        type="action"/>
+                <button
+                    name="%(action_rma_add_account_move_supplier)d"
+                    string="Add From Invoice"
+                    type="action"
+                />
             </xpath>
         </field>
     </record>
diff --git a/rma_account/wizards/rma_refund.xml b/rma_account/wizards/rma_refund.xml
index 30c45b27..7adbe282 100644
--- a/rma_account/wizards/rma_refund.xml
+++ b/rma_account/wizards/rma_refund.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" ?>
 <odoo>
     <record id="view_rma_refund" model="ir.ui.view">
         <field name="name">rma.refund.form</field>
@@ -7,27 +7,36 @@
             <form string="Credit Note">
                 <group>
                      <group>
-                         <field name="description"/>
+                         <field name="description" />
                      </group>
                      <group>
-                         <field name="date_invoice"/>
-                         <field name="date"/>
+                         <field name="date_invoice" />
+                         <field name="date" />
                      </group>
                 </group>
                 <field name="item_ids">
                     <tree string="RMA Lines" editable="bottom">
-                        <field name="rma_id" invisible="1"/>
-                        <field name="product_id" invisible="1"/>
-                        <field name="product"/>
-                        <field name="name"/>
-                        <field name="product_qty"/>
-                        <field name="uom_id" groups="uom.group_uom"/>
-                        <field name="qty_to_refund" readonly="0"/>
+                        <field name="rma_id" invisible="1" />
+                        <field name="product_id" invisible="1" />
+                        <field name="product" />
+                        <field name="name" />
+                        <field name="product_qty" />
+                        <field name="uom_id" groups="uom.group_uom" />
+                        <field name="qty_to_refund" readonly="0" />
                     </tree>
                 </field>
                 <footer>
-                    <button string='Create Refund' name="invoice_refund" type="object" class="btn-primary"/>
-                    <button string="Cancel" class="btn-default" special="cancel"/>
+                    <button
+                        string='Create Refund'
+                        name="invoice_refund"
+                        type="object"
+                        class="btn-primary"
+                    />
+                    <button
+                        string="Cancel"
+                        class="btn-default"
+                        special="cancel"
+                    />
                 </footer>
            </form>
         </field>
@@ -37,22 +46,28 @@
         <field name="name">Create Refund</field>
         <field name="res_model">rma.refund</field>
         <field name="view_mode">tree,form</field>
-        <field name="view_id" ref="view_rma_refund"/>
-        <field name="binding_model_id" ref="rma.model_rma_order_line"/>
-        <field name="groups_id"
-               eval="[(4, ref('account.group_account_invoice'))]"/>
+        <field name="view_id" ref="view_rma_refund" />
+        <field name="binding_model_id" ref="rma.model_rma_order_line" />
+        <field
+            name="groups_id"
+            eval="[(4, ref('account.group_account_invoice'))]"
+        />
         <field name="target">new</field>
     </record>
 
     <record id="view_rma_line_button_refund_form" model="ir.ui.view">
         <field name="name">rma.order.line.form</field>
         <field name="model">rma.order.line</field>
-        <field name="inherit_id" ref="rma.view_rma_line_form"/>
+        <field name="inherit_id" ref="rma.view_rma_line_form" />
         <field name="arch" type="xml">
             <xpath expr="//header" position="inside">
-                <button name="%(action_rma_refund)d" states="approved"
-                        string="Create Refund" class="oe_highlight"
-                        type="action"/>
+                <button
+                    name="%(action_rma_refund)d"
+                    states="approved"
+                    string="Create Refund"
+                    class="oe_highlight"
+                    type="action"
+                />
             </xpath>
         </field>
     </record>
@@ -60,12 +75,16 @@
     <record id="view_rma_line_supplier_button_refund_form" model="ir.ui.view">
         <field name="name">rma.order.line.supplier.form</field>
         <field name="model">rma.order.line</field>
-        <field name="inherit_id" ref="rma.view_rma_line_supplier_button_form"/>
+        <field name="inherit_id" ref="rma.view_rma_line_supplier_button_form" />
         <field name="arch" type="xml">
             <xpath expr="//header" position="inside">
-                <button name="%(action_rma_refund)d" states="approved"
-                        string="Create Refund" class="oe_highlight"
-                        type="action"/>
+                <button
+                    name="%(action_rma_refund)d"
+                    states="approved"
+                    string="Create Refund"
+                    class="oe_highlight"
+                    type="action"
+                />
             </xpath>
         </field>
     </record>