diff --git a/ao_rma/__manifest__.py b/ao_rma/__manifest__.py
index f2750d22..dc152adb 100644
--- a/ao_rma/__manifest__.py
+++ b/ao_rma/__manifest__.py
@@ -12,12 +12,15 @@
                 "repair_account", "repair_refurbish", "rma_kanban_stage",
                 "base_automation",
                 ],
-    "data": ["data/account_data.xml",
-             "data/rma_stage.xml",
-             "data/stock_data.xml",
-             "data/repair_data.xml",
-             "data/rma_operation.xml",
-             "data/base_automation_data.xml",
+    "data": ["data/rma_stage.xml",
+             "views/rma_operation_view.xml",
+             "views/rma_order_line_view.xml",
+             "wizards/rma_order_line_make_repair_view.xml",
+             ],
+    "demo": ["demo/account_data.xml",
+             "demo/stock_data.xml",
+             "demo/repair_data.xml",
+             "demo/rma_operation.xml",
              "views/rma_operation_view.xml",
              "views/rma_order_line_view.xml",
              "wizards/rma_order_line_make_repair_view.xml",
diff --git a/ao_rma/data/base_automation_data.xml b/ao_rma/data/base_automation_data.xml
deleted file mode 100644
index 5411a8bd..00000000
--- a/ao_rma/data/base_automation_data.xml
+++ /dev/null
@@ -1,261 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--TODO: no update to 1-->
-<odoo noupdate="0">
-
-    <!--FROM NEW TO ANOTHER-->
-
-    <record id="new_awaiting_return" model="base.automation">
-        <field name="name">New > Awaiting Return</field>
-        <field name="model_id" ref="rma.model_rma_order_line"/>
-        <field name="state">object_write</field>
-        <field name="trigger">on_write</field>
-        <field name="action">object_write</field>
-        <field name="active" eval="True"/>
-        <field name="filter_pre_domain">['|', ('state', '=', 'draft'), ('state', '=', 'to_approve')]</field>
-        <field name="filter_domain">[('state', '=', 'approved'), ('operation_id.repair_type_id.under_warranty', '=', True)]</field>
-    </record>
-
-    <record id="new_awaiting_return_action" model="ir.server.object.lines">
-        <field name="server_id" ref="ao_rma.new_awaiting_return_ir_actions_server"/>
-        <field name="type">reference</field>
-        <field name="value">5</field>
-        <field name="col1" search="[('name','=','stage_id'), ('model_id', '=', ref('rma.model_rma_order_line'))]" model="ir.model.fields"/>
-        <field name="resource_ref" eval="'base.kanban.stage,%s' %ref('ao_rma.awaiting_return') "/>
-    </record>
-
-    <!---->
-    <record id="new_awaiting_payment" model="base.automation">
-        <field name="name">New > Awaiting Payment</field>
-        <field name="model_id" ref="rma.model_rma_order_line"/>
-        <field name="state">object_write</field>
-        <field name="trigger">on_write</field>
-        <field name="action">object_write</field>
-        <field name="active" eval="True"/>
-        <field name="filter_pre_domain">['|', ('state', '=', 'draft'), ('state', '=', 'to_approve')]</field>
-        <field name="filter_domain">[('state', '=', 'approved'), ('operation_id.repair_type_id.under_warranty', '=', False), ('sale_policy', '=', 'ordered')]</field>
-    </record>
-
-    <record id="new_awaiting_payment_action" model="ir.server.object.lines">
-        <field name="server_id" ref="ao_rma.new_awaiting_payment_ir_actions_server"/>
-        <field name="type">reference</field>
-        <field name="value">5</field>
-        <field name="col1" search="[('name','=','stage_id'), ('model_id', '=', ref('rma.model_rma_order_line'))]" model="ir.model.fields"/>
-        <field name="resource_ref" eval="'base.kanban.stage,%s' %ref('ao_rma.awaiting_payment') "/>
-    </record>
-
-    <!--FROM AWAITING RETURN TO ANOTHER-->
-
-    <record id="awaiting_return_new" model="base.automation">
-        <field name="name">Awaiting Return > New</field>
-        <field name="model_id" ref="rma.model_rma_order_line"/>
-        <field name="state">object_write</field>
-        <field name="trigger">on_write</field>
-        <field name="action">object_write</field>
-        <field name="active" eval="True"/>
-        <field name="filter_pre_domain">[('state', '=', 'approved')]</field>
-        <field name="filter_domain">[('state', '=', 'draft')]</field>
-    </record>
-
-    <record id="awaiting_return_new_action" model="ir.server.object.lines">
-        <field name="server_id" ref="ao_rma.awaiting_return_new_ir_actions_server"/>
-        <field name="type">reference</field>
-        <field name="value">5</field>
-        <field name="col1" search="[('name','=','stage_id'), ('model_id', '=', ref('rma.model_rma_order_line'))]" model="ir.model.fields"/>
-        <field name="resource_ref" eval="'base.kanban.stage,%s' %ref('ao_rma.rma_new') "/>
-    </record>
-
-    <!---->
-    <record id="awaiting_return_awaiting_eval" model="base.automation">
-        <field name="name">Awaiting return > Awaiting Eval/Repair</field>
-        <field name="model_id" ref="rma.model_rma_order_line"/>
-        <field name="state">object_write</field>
-        <field name="trigger">on_write</field>
-        <field name="action">object_write</field>
-        <field name="active" eval="True"/>
-        <field name="filter_pre_domain">[('qty_to_repair', '>', 0)]</field>
-        <field name="filter_domain">[('qty_to_repair', '=', '0'), ('qty_to_receive', '=', 0), ('qty_repaired', '=', '0')]</field>
-    </record>
-
-    <record id="awaiting_return_awaiting_eval_action" model="ir.server.object.lines">
-        <field name="server_id" ref="ao_rma.awaiting_return_awaiting_eval_ir_actions_server"/>
-        <field name="type">reference</field>
-        <field name="value">5</field>
-        <field name="col1" search="[('name','=','stage_id'), ('model_id', '=', ref('rma.model_rma_order_line'))]" model="ir.model.fields"/>
-        <field name="resource_ref" eval="'base.kanban.stage,%s' %ref('ao_rma.awaiting_eval') "/>
-    </record>
-
-    <!--FROM AWAITING EVAL/REPAIR TO ANOTHER-->
-    <record id="awaiting_eval_under_repair" model="base.automation">
-        <field name="name">Awaiting Eval/Repair > Under Repair/Being evaluated</field>
-        <field name="model_id" ref="rma.model_rma_order_line"/>
-        <field name="state">object_write</field>
-        <field name="trigger">on_write</field>
-        <field name="action">object_write</field>
-        <field name="active" eval="True"/>
-        <field name="filter_pre_domain">[('state', '=', 'approved'), ('operation_id.repair_type_id.under_warranty', '=', True), ('qty_under_repair', '=', 0)]</field>
-        <field name="filter_domain">['&amp;','&amp;', ('state', '=', 'approved'), ('operation_id.repair_type_id.under_warranty', '=', True), '|', ('qty_under_repair', '>', 0)]</field>
-    </record>
-
-    <record id="awaiting_eval_under_repair_action" model="ir.server.object.lines">
-        <field name="server_id" ref="ao_rma.awaiting_eval_under_repair_ir_actions_server"/>
-        <field name="type">reference</field>
-        <field name="value">5</field>
-        <field name="col1" search="[('name','=','stage_id'), ('model_id', '=', ref('rma.model_rma_order_line'))]" model="ir.model.fields"/>
-        <field name="resource_ref" eval="'base.kanban.stage,%s' %ref('ao_rma.under_repair') "/>
-    </record>
-    <!---->
-    <record id="awaiting_eval_awaiting_payment" model="base.automation">
-        <field name="name">Awaiting Eval/Repair > Awaiting Payment</field>
-        <field name="model_id" ref="rma.model_rma_order_line"/>
-        <field name="state">object_write</field>
-        <field name="trigger">on_write</field>
-        <field name="action">object_write</field>
-        <field name="active" eval="True"/>
-        <field name="filter_pre_domain">[('state', '=', 'approved'), ('operation_id.repair_type_id.under_warranty', '=', False), ('qty_under_repair', '=', 0)]</field>
-        <field name="filter_domain">['&amp;','&amp;', ('state', '=', 'approved'), ('operation_id.repair_type_id.under_warranty', '=', False), '|', ('repair_ids.state', '=', 'confirmed'), ('qty_under_repair', '>', 0)]</field>
-    </record>
-
-    <record id="awaiting_eval_awaiting_payment_action" model="ir.server.object.lines">
-        <field name="server_id" ref="ao_rma.awaiting_eval_awaiting_payment_ir_actions_server"/>
-        <field name="type">reference</field>
-        <field name="value">5</field>
-        <field name="col1" search="[('name','=','stage_id'), ('model_id', '=', ref('rma.model_rma_order_line'))]" model="ir.model.fields"/>
-        <field name="resource_ref" eval="'base.kanban.stage,%s' %ref('ao_rma.awaiting_payment') "/>
-    </record>
-
-    <!--FROM Under Repair/Being Evaluated TO ANOTHER-->
-    <record id="under_repair_ready_to_ship" model="base.automation">
-        <field name="name">Under Repair/Being Evaluated > Ready To Be Shipped</field>
-        <field name="model_id" ref="rma.model_rma_order_line"/>
-        <field name="state">object_write</field>
-        <field name="trigger">on_write</field>
-        <field name="action">object_write</field>
-        <field name="active" eval="True"/>
-        <field name="filter_pre_domain">[('state', '=', 'approved'), ('operation_id.repair_type_id.to_refurbish', '=', False), ('qty_under_repair', '>', 0)]</field>
-        <field name="filter_domain">[('state', '=', 'approved'), ('qty_under_repair', '=', 0), ('qty_to_repair', '=', 0), ('qty_repaired', '>', 0)]</field>
-    </record>
-
-    <record id="under_repair_ready_to_ship_action" model="ir.server.object.lines">
-        <field name="server_id" ref="ao_rma.under_repair_ready_to_ship_ir_actions_server"/>
-        <field name="type">reference</field>
-        <field name="value">5</field>
-        <field name="col1" search="[('name','=','stage_id'), ('model_id', '=', ref('rma.model_rma_order_line'))]" model="ir.model.fields"/>
-        <field name="resource_ref" eval="'base.kanban.stage,%s' %ref('ao_rma.rma_to_ship') "/>
-    </record>
-    <!---->
-    <record id="under_repair_ready_to_refurbed" model="base.automation">
-        <field name="name">Under Repair/Being Evaluated > To Be Refurbed</field>
-        <field name="model_id" ref="rma.model_rma_order_line"/>
-        <field name="state">object_write</field>
-        <field name="trigger">on_write</field>
-        <field name="action">object_write</field>
-        <field name="active" eval="True"/>
-        <field name="filter_pre_domain">[('state', '=', 'approved'), ('operation_id.repair_type_id.to_refurbish', '=', True), ('qty_under_repair', '>', 0)]</field>
-        <field name="filter_domain">[('state', '=', 'approved'), ('qty_repaired', '>', 0), ('qty_under_repair', '=', 0)]</field>
-    </record>
-
-    <record id="under_repair_ready_to_refurbed_action" model="ir.server.object.lines">
-        <field name="server_id" ref="ao_rma.under_repair_ready_to_refurbed_ir_actions_server"/>
-        <field name="type">reference</field>
-        <field name="value">5</field>
-        <field name="col1" search="[('name','=','stage_id'), ('model_id', '=', ref('rma.model_rma_order_line'))]" model="ir.model.fields"/>
-        <field name="resource_ref" eval="'base.kanban.stage,%s' %ref('ao_rma.to_refurbed') "/>
-    </record>
-
-    <!--FROM Awaiting Payment TO ANOTHER-->
-    <record id="awaiting_payment_to_awaiting_return" model="base.automation">
-        <field name="name">Awaiting Payment > Awaiting Return</field>
-        <field name="model_id" ref="rma.model_rma_order_line"/>
-        <field name="state">object_write</field>
-        <field name="trigger">on_write</field>
-        <field name="action">object_write</field>
-        <field name="active" eval="True"/>
-        <field name="filter_pre_domain">[('state', '=', 'approved'), ('operation_id.repair_type_id.under_warranty', '=', False), ('sale_line_ids.invoice_status', '=', 'open'), ('repair_ids', '=', False)]</field>
-        <field name="filter_domain">[('state', '=', 'approved'), ('operation_id.repair_type_id.under_warranty', '=', False), ('sale_line_ids.invoice_status', '=', 'paid')]</field>
-    </record>
-
-    <record id="awaiting_payment_to_awaiting_return_action" model="ir.server.object.lines">
-        <field name="server_id" ref="ao_rma.awaiting_payment_to_awaiting_return_ir_actions_server"/>
-        <field name="type">reference</field>
-        <field name="value">5</field>
-        <field name="col1" search="[('name','=','stage_id'), ('model_id', '=', ref('rma.model_rma_order_line'))]" model="ir.model.fields"/>
-        <field name="resource_ref" eval="'base.kanban.stage,%s' %ref('ao_rma.awaiting_return') "/>
-    </record>
-    <!---->
-    <record id="awaiting_payment_to_under_repair" model="base.automation">
-        <field name="name">Awaiting Payment > Under Repair/Being Evaluated</field>
-        <field name="model_id" ref="rma.model_rma_order_line"/>
-        <field name="state">object_write</field>
-        <field name="trigger">on_write</field>
-        <field name="action">object_write</field>
-        <field name="active" eval="True"/>
-        <field name="filter_pre_domain">[('state', '=', 'approved'), ('operation_id.repair_type_id.under_warranty', '=', False), ('repair_ids.invoice_id.state', '=', 'open')]</field>
-        <field name="filter_domain">[('state', '=', 'approved'), ('operation_id.repair_type_id.under_warranty', '=', False), ('repair_ids.invoice_id.state', '=', 'paid')]</field>
-    </record>
-
-    <record id="awaiting_payment_to_under_repair_action" model="ir.server.object.lines">
-        <field name="server_id" ref="ao_rma.awaiting_payment_to_under_repair_ir_actions_server"/>
-        <field name="type">reference</field>
-        <field name="value">5</field>
-        <field name="col1" search="[('name','=','stage_id'), ('model_id', '=', ref('rma.model_rma_order_line'))]" model="ir.model.fields"/>
-        <field name="resource_ref" eval="'base.kanban.stage,%s' %ref('ao_rma.under_repair') "/>
-    </record>
-    <!--FROM To Be Refurbed TO ANOTHER-->
-
-    <record id="to_refurb_to_close" model="base.automation">
-        <field name="name">To be Refurbed > Closed</field>
-        <field name="model_id" ref="rma.model_rma_order_line"/>
-        <field name="state">object_write</field>
-        <field name="trigger">on_write</field>
-        <field name="action">object_write</field>
-        <field name="active" eval="True"/>
-        <field name="filter_pre_domain">[('state', '=', 'approved'), ('operation_id.repair_type_id.to_refurbish', '=', True), ('qty_to_deliver', '>', 0)]</field>
-        <field name="filter_domain">[('state', '=', 'approved'), ('operation_id.repair_type_id.to_refurbish', '=', True), ('qty_to_deliver', '=', 0)]</field>
-    </record>
-
-    <record id="to_refurb_to_close_action" model="ir.server.object.lines">
-        <field name="server_id" ref="ao_rma.to_refurb_to_close_ir_actions_server"/>
-        <field name="type">reference</field>
-        <field name="value">5</field>
-        <field name="col1" search="[('name','=','stage_id'), ('model_id', '=', ref('rma.model_rma_order_line'))]" model="ir.model.fields"/>
-        <field name="resource_ref" eval="'base.kanban.stage,%s' %ref('ao_rma.rma_closed') "/>
-    </record>
-    <!--FROM Ready to be shipped TO ANOTHER-->
-    <record id="ready_ship_to_csr_follow" model="base.automation">
-        <field name="name">Ready to be Shipped > CSR Followup</field>
-        <field name="model_id" ref="rma.model_rma_order_line"/>
-        <field name="state">object_write</field>
-        <field name="trigger">on_write</field>
-        <field name="action">object_write</field>
-        <field name="active" eval="True"/>
-        <field name="filter_pre_domain">[('state', '=', 'approved'), ('operation_id.repair_type_id.under_warranty', '=', False), ('qty_to_deliver', '>', 0)]</field>
-        <field name="filter_domain">[('state', '=', 'approved'), ('operation_id.repair_type_id.under_warranty', '=', False), ('qty_to_deliver', '=', 0)]</field>
-    </record>
-
-    <record id="ready_ship_to_csr_follow_action" model="ir.server.object.lines">
-        <field name="server_id" ref="ao_rma.ready_ship_to_csr_follow_ir_actions_server"/>
-        <field name="type">reference</field>
-        <field name="value">5</field>
-        <field name="col1" search="[('name','=','stage_id'), ('model_id', '=', ref('rma.model_rma_order_line'))]" model="ir.model.fields"/>
-        <field name="resource_ref" eval="'base.kanban.stage,%s' %ref('ao_rma.csr_needed') "/>
-    </record>
-    <!---->
-    <record id="ready_ship_to_closed" model="base.automation">
-        <field name="name">Ready to be Shipped > Closed</field>
-        <field name="model_id" ref="rma.model_rma_order_line"/>
-        <field name="state">object_write</field>
-        <field name="trigger">on_write</field>
-        <field name="action">object_write</field>
-        <field name="active" eval="True"/>
-        <field name="filter_pre_domain">[('state', '=', 'approved'), ('operation_id.repair_type_id.under_warranty', '=', True), ('qty_to_deliver', '>', 0)]</field>
-        <field name="filter_domain">[('state', '=', 'approved'), ('operation_id.repair_type_id.under_warranty', '=', True), ('qty_to_deliver', '=', 0)]</field>
-    </record>
-
-    <record id="ready_ship_to_closed_action" model="ir.server.object.lines">
-        <field name="server_id" ref="ao_rma.ready_ship_to_closed_ir_actions_server"/>
-        <field name="type">reference</field>
-        <field name="value">5</field>
-        <field name="col1" search="[('name','=','stage_id'), ('model_id', '=', ref('rma.model_rma_order_line'))]" model="ir.model.fields"/>
-        <field name="resource_ref" eval="'base.kanban.stage,%s' %ref('ao_rma.csr_needed') "/>
-    </record>
-</odoo>
diff --git a/ao_rma/data/account_data.xml b/ao_rma/demo/account_data.xml
similarity index 100%
rename from ao_rma/data/account_data.xml
rename to ao_rma/demo/account_data.xml
diff --git a/ao_rma/data/repair_data.xml b/ao_rma/demo/repair_data.xml
similarity index 99%
rename from ao_rma/data/repair_data.xml
rename to ao_rma/demo/repair_data.xml
index 65e9c1fb..461bf3a5 100644
--- a/ao_rma/data/repair_data.xml
+++ b/ao_rma/demo/repair_data.xml
@@ -56,6 +56,7 @@
         <field name="default_raw_material_prod_location_id"
                ref="ao_rma.stock_location_repair_warranty"/>
         <field name="force_repair_location" ref="ao_rma.rma_external_location"/>
+        <field name="invoice_method">none</field>
         <field name="under_warranty" eval="True"/>
         <field name="wip_account_id" search="[('code','=','14370')]" model="account.account"/>
     </record>
diff --git a/ao_rma/data/rma_operation.xml b/ao_rma/demo/rma_operation.xml
similarity index 100%
rename from ao_rma/data/rma_operation.xml
rename to ao_rma/demo/rma_operation.xml
diff --git a/ao_rma/data/stock_data.xml b/ao_rma/demo/stock_data.xml
similarity index 73%
rename from ao_rma/data/stock_data.xml
rename to ao_rma/demo/stock_data.xml
index 354ed20c..b43b7779 100644
--- a/ao_rma/data/stock_data.xml
+++ b/ao_rma/demo/stock_data.xml
@@ -25,48 +25,6 @@
         <field name="rma_selectable" eval="True"/>
     </record>
 
-    <record id="picking_type_rma_sup_out" model="stock.picking.type">
-        <field name="name">RMA -> Supplier</field>
-        <field name="sequence_id" ref="rma.seq_picking_type_rma_sup_out"/>
-        <field name="default_location_src_id" ref="__export__.stock_location_2483_8a8fa034"/>
-        <field name="default_location_dest_id"
-               ref="stock.stock_location_suppliers"/>
-        <field name="warehouse_id" eval="False"/>
-        <field name="code">outgoing</field>
-    </record>
-
-    <record id="picking_type_rma_sup_in" model="stock.picking.type">
-        <field name="name">Supplier -> RMA</field>
-        <field name="sequence_id" ref="rma.seq_picking_type_rma_sup_in"/>
-        <field name="default_location_src_id" ref="stock.stock_location_suppliers"/>
-        <field name="default_location_dest_id"
-               ref="__export__.stock_location_874"/>
-        <field name="warehouse_id" eval="False"/>
-        <field name="code">incoming</field>
-    </record>
-
-    <record id="rule_rma_supplier_out_pull" model="stock.rule">
-        <field name="name">RMA → Supplier</field>
-        <field name="action">pull</field>
-        <field name="warehouse_id" ref="stock.warehouse0"/>
-        <field name="location_id" ref="stock.stock_location_suppliers"/>
-        <field name="location_src_id" ref="__export__.stock_location_2483_8a8fa034"/>
-        <field name="procure_method">make_to_stock</field>
-        <field name="route_id" ref="route_rma_supplier"/>
-        <field name="picking_type_id" ref="ao_rma.picking_type_rma_sup_out"/>
-    </record>
-
-    <record id="rule_rma_supplier_in_pull" model="stock.rule">
-        <field name="name">Supplier → RMA</field>
-        <field name="action">pull</field>
-        <field name="warehouse_id" ref="stock.warehouse0"/>
-        <field name="location_id" ref="__export__.stock_location_874"/>
-        <field name="location_src_id" ref="stock.stock_location_suppliers"/>
-        <field name="procure_method">make_to_stock</field>
-        <field name="route_id" ref="route_rma_supplier"/>
-        <field name="picking_type_id" ref="ao_rma.picking_type_rma_sup_in"/>
-    </record>
-
     <!--    LOCATION-->
     <record id="rma_external_location" model="stock.location">
         <field name="name">RMA External Location</field>
diff --git a/ao_rma/tests/test_ao_rma.py b/ao_rma/tests/test_ao_rma.py
index e372b3b2..34b896fc 100644
--- a/ao_rma/tests/test_ao_rma.py
+++ b/ao_rma/tests/test_ao_rma.py
@@ -15,6 +15,7 @@ def setUpClass(cls):
         cls.rma = cls.env['rma.order']
         cls.rma_line = cls.env['rma.order.line']
         cls.rma_op = cls.env['rma.operation']
+        cls.RepairMakeInvoice = cls.env['repair.order.make_invoice']
         cls.product_id = cls.env.ref('product.product_product_4')
         cls.uom_unit = cls.env.ref('uom.product_uom_unit')
         cls.partner_id = cls.env.ref('base.res_partner_2')
@@ -255,6 +256,15 @@ def test_11_repair_no_warranty(cls):
         repair.action_repair_ready()
         repair.action_repair_start()
         repair.action_repair_end()
+        make_invoice = cls.RepairMakeInvoice.create({
+            'group': True})
+        # I click on "Create Invoice" button of this wizard to make invoice.
+        context = {
+            "active_model": 'repair_order',
+            "active_ids": [repair.id],
+            "active_id": repair.id
+        }
+        make_invoice.with_context(context).make_invoices()
         # deliver
         cls.assertEqual(rma.qty_to_deliver, 1.0)
         wizard = cls.rma_make_picking.with_context({
@@ -280,7 +290,7 @@ def test_12_repair_under_warranty(cls):
 
         # create rma and receive in external location
         rma = cls.create_customer_rma(cls.partner_id, cls.product_id,
-                                      cls.operation_nw)
+                                      cls.operation_warranty)
         rma._onchange_operation_id()
         cls.assertEqual(rma.repair_type, 'received')
         rma.action_rma_approve()
@@ -331,8 +341,8 @@ def test_12_repair_under_warranty(cls):
         repair.action_repair_ready()
         repair.action_repair_start()
         repair.action_repair_end()
-
         # deliver
+        cls.assertEqual(rma.qty_repaired, 1.0)
         cls.assertEqual(rma.qty_to_deliver, 1.0)
         wizard = cls.rma_make_picking.with_context({
             'active_ids': rma.id,