diff --git a/crm_claim_rma/__manifest__.py b/crm_claim_rma/__manifest__.py
index 6b6f60af..9695d8e7 100644
--- a/crm_claim_rma/__manifest__.py
+++ b/crm_claim_rma/__manifest__.py
@@ -38,9 +38,9 @@
         'security/ir.model.access.csv',
     ],
     'demo': [],
-    'test': [
-        'test/test_invoice_refund.yml'
-    ],
+    # 'test': [
+    #     'test/test_invoice_refund.yml'
+    # ],
     'installable': True,
     'auto_install': False,
 }
diff --git a/crm_claim_rma/i18n/crm_claim_rma.pot b/crm_claim_rma/i18n/crm_claim_rma.pot
deleted file mode 100644
index b962f68f..00000000
--- a/crm_claim_rma/i18n/crm_claim_rma.pot
+++ /dev/null
@@ -1,911 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* crm_claim_rma
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 7.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-12-20 18:21+0000\n"
-"PO-Revision-Date: 2013-12-20 18:21+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: crm_claim_rma
-#: view:claim.line:0
-msgid "Returned good"
-msgstr ""
-
-#. module: crm_claim_rma
-#: view:claim_make_picking.wizard:0
-msgid "Locations"
-msgstr ""
-
-#. module: crm_claim_rma
-#: view:claim.line:0
-msgid "Draft and Open Claims"
-msgstr ""
-
-#. module: crm_claim_rma
-#: view:claim.line:0
-msgid "Group By..."
-msgstr ""
-
-#. module: crm_claim_rma
-#: help:claim.line,claim_descr:0
-msgid "More precise description of the problem"
-msgstr ""
-
-#. module: crm_claim_rma
-#: field:claim.line,guarantee_limit:0
-#: model:ir.model.fields,field_description:crm_claim_rma.field_claim_line_guarantee_limit
-msgid "Warranty limit"
-msgstr ""
-
-#. module: crm_claim_rma
-#: selection:claim.line,applicable_guarantee:0
-#: selection:crm.claim,claim_type:0
-msgid "Supplier"
-msgstr ""
-
-#. module: crm_claim_rma
-#: selection:claim.line,state:0
-msgid "Refused"
-msgstr ""
-
-#. module: crm_claim_rma
-#: view:stock.picking.in:0
-#: view:stock.picking.out:0
-msgid "To Invoice"
-msgstr ""
-
-#. module: crm_claim_rma
-#: field:claim.line,refund_line_id:0
-#: model:ir.model.fields,field_description:crm_claim_rma.field_claim_line_refund_line_id
-msgid "Refund Line"
-msgstr ""
-
-#. module: crm_claim_rma
-#: selection:claim.line,applicable_guarantee:0
-msgid "Company"
-msgstr ""
-
-#. module: crm_claim_rma
-#: selection:claim.line,claim_origin:0
-msgid "Order cancellation"
-msgstr ""
-
-#. module: crm_claim_rma
-#: field:claim_make_picking.wizard,claim_line_dest_location:0
-#: model:ir.model.fields,field_description:crm_claim_rma.field_claim_make_picking_wizard_claim_line_dest_location
-msgid "Dest. Location"
-msgstr ""
-
-#. module: crm_claim_rma
-#: code:addons/crm_claim_rma/crm_claim_rma.py:224
-#, python-format
-msgid "Cannot find any date for invoice. Must be a validated invoice."
-msgstr ""
-
-#. module: crm_claim_rma
-#: field:claim.line,last_state_change:0
-#: model:ir.model.fields,field_description:crm_claim_rma.field_claim_line_last_state_change
-msgid "Last change"
-msgstr ""
-
-#. module: crm_claim_rma
-#: help:claim.line,product_id:0
-msgid "Returned product"
-msgstr ""
-
-#. module: crm_claim_rma
-#: view:claim_make_picking.wizard:0
-msgid "Create picking"
-msgstr ""
-
-#. module: crm_claim_rma
-#: view:claim.line:0
-msgid "Claim Line"
-msgstr ""
-
-#. module: crm_claim_rma
-#: view:crm.claim:0
-msgid "New Delivery"
-msgstr ""
-
-#. module: crm_claim_rma
-#: view:claim.line:0
-msgid "Calculate warranty state"
-msgstr ""
-
-#. module: crm_claim_rma
-#: code:addons/crm_claim_rma/account_invoice.py:77
-#, python-format
-msgid "A refund has already been created for this claim !"
-msgstr ""
-
-#. module: crm_claim_rma
-#: view:claim.line:0
-msgid "Compute Warranty"
-msgstr ""
-
-#. module: crm_claim_rma
-#: field:account.invoice,claim_id:0
-#: model:ir.model,name:crm_claim_rma.model_crm_claim
-#: model:ir.model.fields,field_description:crm_claim_rma.field_account_invoice_claim_id
-#: model:ir.model.fields,field_description:crm_claim_rma.field_stock_picking_claim_id
-#: model:ir.model.fields,field_description:crm_claim_rma.field_stock_picking_claim_id_4030
-#: model:ir.model.fields,field_description:crm_claim_rma.field_stock_picking_claim_id_4031
-#: field:stock.picking,claim_id:0
-#: field:stock.picking.in,claim_id:0
-#: field:stock.picking.out,claim_id:0
-msgid "Claim"
-msgstr ""
-
-#. module: crm_claim_rma
-#: model:crm.case.categ,name:crm_claim_rma.categ_claim13
-msgid "General Adjustement"
-msgstr ""
-
-#. module: crm_claim_rma
-#: code:addons/crm_claim_rma/wizard/claim_make_picking.py:204
-#, python-format
-msgid "A product return cannot be created for various destination addresses, please choose line with a same address."
-msgstr ""
-
-#. module: crm_claim_rma
-#: model:ir.actions.act_window,name:crm_claim_rma.action_claim_picking_out
-msgid "Create Outgoing Shipments"
-msgstr ""
-
-#. module: crm_claim_rma
-#: view:claim.line:0
-#: field:claim.line,warning:0
-#: model:ir.model.fields,field_description:crm_claim_rma.field_claim_line_warning
-msgid "Warranty"
-msgstr ""
-
-#. module: crm_claim_rma
-#: model:crm.case.categ,name:crm_claim_rma.categ_claim11
-msgid "Customer Return"
-msgstr ""
-
-#. module: crm_claim_rma
-#: model:ir.model,name:crm_claim_rma.model_stock_move
-msgid "Stock Move"
-msgstr ""
-
-#. module: crm_claim_rma
-#: help:claim.line,product_returned_quantity:0
-msgid "Quantity of product returned"
-msgstr ""
-
-#. module: crm_claim_rma
-#: field:crm.claim,planned_cost:0
-#: model:ir.model.fields,field_description:crm_claim_rma.field_crm_claim_planned_cost
-msgid "Expected cost"
-msgstr ""
-
-#. module: crm_claim_rma
-#: view:crm.claim:0
-msgid "Receptions / Deliveries"
-msgstr ""
-
-#. module: crm_claim_rma
-#: help:claim.line,warranty_type:0
-msgid "Who is in charge of the warranty return treatment towards the end customer. Company will use the current company delivery or default address and so on for supplier and brand manufacturer. Does not necessarily mean that the warranty to be applied is the one of the return partner (ie: can be returned to the company and be under the brand warranty"
-msgstr ""
-
-#. module: crm_claim_rma
-#: model:ir.model,name:crm_claim_rma.model_stock_picking_out
-msgid "Delivery Orders"
-msgstr ""
-
-#. module: crm_claim_rma
-#: help:claim.line,last_state_change:0
-msgid "To set the last state / substate change"
-msgstr ""
-
-#. module: crm_claim_rma
-#: selection:claim.line,claim_origin:0
-msgid "Not specified"
-msgstr ""
-
-#. module: crm_claim_rma
-#: view:claim.line:0
-msgid "Returned lines"
-msgstr ""
-
-#. module: crm_claim_rma
-#: view:claim.line:0
-msgid "Claim n°"
-msgstr ""
-
-#. module: crm_claim_rma
-#: view:claim.line:0
-#: field:claim.line,state:0
-#: model:ir.model.fields,field_description:crm_claim_rma.field_claim_line_state
-msgid "State"
-msgstr ""
-
-#. module: crm_claim_rma
-#: field:claim.line,applicable_guarantee:0
-#: field:claim.line,warranty_type:0
-#: model:ir.model.fields,field_description:crm_claim_rma.field_claim_line_applicable_guarantee
-#: model:ir.model.fields,field_description:crm_claim_rma.field_claim_line_warranty_type
-msgid "Warranty type"
-msgstr ""
-
-#. module: crm_claim_rma
-#: model:ir.model,name:crm_claim_rma.model_stock_picking
-msgid "Picking List"
-msgstr ""
-
-#. module: crm_claim_rma
-#: field:crm.claim,warehouse_id:0
-#: model:ir.model.fields,field_description:crm_claim_rma.field_crm_claim_warehouse_id
-msgid "Warehouse"
-msgstr ""
-
-#. module: crm_claim_rma
-#: help:claim.line,claim_origin:0
-msgid "To describe the line product problem"
-msgstr ""
-
-#. module: crm_claim_rma
-#: help:claim_make_picking.wizard,claim_line_dest_location:0
-msgid "Location where the system will stock the returned products."
-msgstr ""
-
-#. module: crm_claim_rma
-#: view:claim.line:0
-msgid "More"
-msgstr ""
-
-#. module: crm_claim_rma
-#: selection:claim.line,claim_origin:0
-msgid "Legal retractation"
-msgstr ""
-
-#. module: crm_claim_rma
-#: code:addons/crm_claim_rma/account_invoice.py:76
-#: code:addons/crm_claim_rma/crm_claim_rma.py:312
-#: code:addons/crm_claim_rma/wizard/claim_make_picking.py:195
-#: code:addons/crm_claim_rma/wizard/claim_make_picking.py:203
-#, python-format
-msgid "Error !"
-msgstr ""
-
-#. module: crm_claim_rma
-#: help:claim.line,guarantee_limit:0
-msgid "The warranty limit is computed as: invoice date + warranty defined on selected product."
-msgstr ""
-
-#. module: crm_claim_rma
-#: field:claim.line,claim_origin:0
-#: model:ir.model.fields,field_description:crm_claim_rma.field_claim_line_claim_origin
-msgid "Claim Subject"
-msgstr ""
-
-#. module: crm_claim_rma
-#: field:crm.claim,real_cost:0
-#: model:ir.model.fields,field_description:crm_claim_rma.field_crm_claim_real_cost
-msgid "Real cost"
-msgstr ""
-
-#. module: crm_claim_rma
-#: help:claim.line,claim_id:0
-msgid "To link to the case.claim object"
-msgstr ""
-
-#. module: crm_claim_rma
-#: code:addons/crm_claim_rma/wizard/claim_make_picking.py:73
-#, python-format
-msgid "A picking has already been created for this claim."
-msgstr ""
-
-#. module: crm_claim_rma
-#: model:crm.case.categ,name:crm_claim_rma.categ_claim18
-msgid "Pricing Error"
-msgstr ""
-
-#. module: crm_claim_rma
-#: field:claim.line,product_returned_quantity:0
-#: model:ir.model.fields,field_description:crm_claim_rma.field_claim_line_product_returned_quantity
-msgid "Quantity"
-msgstr ""
-
-#. module: crm_claim_rma
-#: selection:claim.line,state:0
-msgid "Confirmed, waiting for product"
-msgstr ""
-
-#. module: crm_claim_rma
-#: field:crm.claim,claim_line_ids:0
-#: model:ir.model.fields,field_description:crm_claim_rma.field_crm_claim_claim_line_ids
-#: model:ir.ui.menu,name:crm_claim_rma.menu_crm_case_claims_claim_lines
-msgid "Return lines"
-msgstr ""
-
-#. module: crm_claim_rma
-#: view:crm.claim:0
-msgid "Stage"
-msgstr ""
-
-#. module: crm_claim_rma
-#: field:crm.claim,planned_revenue:0
-#: model:ir.model.fields,field_description:crm_claim_rma.field_crm_claim_planned_revenue
-msgid "Expected revenue"
-msgstr ""
-
-#. module: crm_claim_rma
-#: selection:claim.line,state:0
-msgid "Controlled, to treate"
-msgstr ""
-
-#. module: crm_claim_rma
-#: view:crm.claim:0
-#: model:ir.actions.act_window,name:crm_claim_rma.act_crm_claim_rma_refunds_out
-msgid "Customer Refunds"
-msgstr ""
-
-#. module: crm_claim_rma
-#: field:claim.line,location_dest_id:0
-#: model:ir.model.fields,field_description:crm_claim_rma.field_claim_line_location_dest_id
-msgid "Return Stock Location"
-msgstr ""
-
-#. module: crm_claim_rma
-#: view:crm.claim:0
-#: model:ir.actions.act_window,name:crm_claim_rma.act_crm_claim_rma_sale_orders
-msgid "Quotations and Sales"
-msgstr ""
-
-#. module: crm_claim_rma
-#: selection:claim.line,claim_origin:0
-msgid "Lost during transport"
-msgstr ""
-
-#. module: crm_claim_rma
-#: selection:claim.line,claim_origin:0
-msgid "Shipping error"
-msgstr ""
-
-#. module: crm_claim_rma
-#: field:claim.line,warranty_return_partner:0
-#: model:ir.model.fields,field_description:crm_claim_rma.field_claim_line_warranty_return_partner
-msgid "Warranty Address"
-msgstr ""
-
-#. module: crm_claim_rma
-#: help:crm.claim,invoice_id:0
-msgid "Related original Cusotmer invoice"
-msgstr ""
-
-#. module: crm_claim_rma
-#: model:crm.case.categ,name:crm_claim_rma.categ_claim12
-msgid "Buyer Cancelled"
-msgstr ""
-
-#. module: crm_claim_rma
-#: field:claim.line,claim_id:0
-#: model:ir.model.fields,field_description:crm_claim_rma.field_claim_line_claim_id
-msgid "Related claim"
-msgstr ""
-
-#. module: crm_claim_rma
-#: field:claim.line,invoice_line_id:0
-#: model:ir.model,name:crm_claim_rma.model_account_invoice_line
-#: model:ir.model.fields,field_description:crm_claim_rma.field_claim_line_invoice_line_id
-msgid "Invoice Line"
-msgstr ""
-
-#. module: crm_claim_rma
-#: view:claim.line:0
-msgid "Linked Document"
-msgstr ""
-
-#. module: crm_claim_rma
-#: field:claim.line,move_in_id:0
-#: model:ir.model.fields,field_description:crm_claim_rma.field_claim_line_move_in_id
-msgid "Move Line from picking in"
-msgstr ""
-
-#. module: crm_claim_rma
-#: model:crm.case.categ,name:crm_claim_rma.categ_claim20
-msgid "Delivered Late by Carrier"
-msgstr ""
-
-#. module: crm_claim_rma
-#: view:crm.claim:0
-msgid "Product Return"
-msgstr ""
-
-#. module: crm_claim_rma
-#: view:crm.claim:0
-msgid "Generated Documents"
-msgstr ""
-
-#. module: crm_claim_rma
-#: help:claim.line,prodlot_id:0
-msgid "The serial/lot of the returned product"
-msgstr ""
-
-#. module: crm_claim_rma
-#: view:crm.claim:0
-msgid "New Refund"
-msgstr ""
-
-#. module: crm_claim_rma
-#: field:claim.line,substate_id:0
-#: model:ir.model.fields,field_description:crm_claim_rma.field_claim_line_substate_id
-#: model:ir.model.fields,field_description:crm_claim_rma.field_substate_substate_name
-#: field:substate.substate,name:0
-msgid "Sub state"
-msgstr ""
-
-#. module: crm_claim_rma
-#: view:crm.claim:0
-#: model:ir.actions.act_window,name:crm_claim_rma.act_crm_claim_rma_refunds_in
-msgid "Supplier Refunds"
-msgstr ""
-
-#. module: crm_claim_rma
-#: field:claim.line,claim_descr:0
-#: model:ir.model.fields,field_description:crm_claim_rma.field_claim_line_claim_descr
-msgid "Claim description"
-msgstr ""
-
-#. module: crm_claim_rma
-#: field:crm.claim,real_revenue:0
-#: model:ir.model.fields,field_description:crm_claim_rma.field_crm_claim_real_revenue
-msgid "Real revenue"
-msgstr ""
-
-#. module: crm_claim_rma
-#: view:claim_make_picking.wizard:0
-msgid "Select lines for picking"
-msgstr ""
-
-#. module: crm_claim_rma
-#: help:claim.line,substate_id:0
-msgid "Select a sub state to precise the standard state. Example 1: state = refused; substate could be warranty over, not in warranty, no problem,... . Example 2: state = to treate; substate could be to refund, to exchange, to repair,..."
-msgstr ""
-
-#. module: crm_claim_rma
-#: view:claim_make_picking.wizard:0
-msgid "Select exchange lines to add in picking"
-msgstr ""
-
-#. module: crm_claim_rma
-#: selection:claim.line,state:0
-msgid "Draft"
-msgstr ""
-
-#. module: crm_claim_rma
-#: model:crm.case.categ,name:crm_claim_rma.categ_claim14
-msgid "Could Not Ship"
-msgstr ""
-
-#. module: crm_claim_rma
-#: model:ir.model,name:crm_claim_rma.model_claim_line
-msgid "List of product to return"
-msgstr ""
-
-#. module: crm_claim_rma
-#: model:crm.case.categ,name:crm_claim_rma.categ_claim10
-msgid "No Inventory"
-msgstr ""
-
-#. module: crm_claim_rma
-#: field:claim.line,unit_sale_price:0
-#: model:ir.model.fields,field_description:crm_claim_rma.field_claim_line_unit_sale_price
-msgid "Unit sale price"
-msgstr ""
-
-#. module: crm_claim_rma
-#: help:claim.line,refund_line_id:0
-msgid "The refund line related to the returned product"
-msgstr ""
-
-#. module: crm_claim_rma
-#: code:addons/crm_claim_rma/crm_claim_rma.py:245
-#, python-format
-msgid "expired"
-msgstr ""
-
-#. module: crm_claim_rma
-#: model:ir.model,name:crm_claim_rma.model_stock_picking_in
-msgid "Incoming Shipments"
-msgstr ""
-
-#. module: crm_claim_rma
-#: help:substate.substate,substate_descr:0
-msgid "To give more information about the sub state"
-msgstr ""
-
-#. module: crm_claim_rma
-#: model:ir.actions.act_window,name:crm_claim_rma.act_crm_claim_substates
-msgid "Claim line substates"
-msgstr ""
-
-#. module: crm_claim_rma
-#: help:claim_make_picking.wizard,claim_line_source_location:0
-msgid "Location where the returned products are from."
-msgstr ""
-
-#. module: crm_claim_rma
-#: field:crm.claim,picking_ids:0
-#: model:ir.model.fields,field_description:crm_claim_rma.field_crm_claim_picking_ids
-#: view:stock.picking.in:0
-#: view:stock.picking.out:0
-msgid "RMA"
-msgstr ""
-
-#. module: crm_claim_rma
-#: selection:claim.line,applicable_guarantee:0
-msgid "Brand manufacturer"
-msgstr ""
-
-#. module: crm_claim_rma
-#: field:claim.line,prodlot_id:0
-#: model:ir.model.fields,field_description:crm_claim_rma.field_claim_line_prodlot_id
-msgid "Serial/Lot n°"
-msgstr ""
-
-#. module: crm_claim_rma
-#: help:claim.line,unit_sale_price:0
-msgid "Unit sale price of the product. Auto filled if retrun done by invoice selection. Be careful and check the automatic value as don't take into account previous refunds, invoice discount, can be for 0 if product for free,..."
-msgstr ""
-
-#. module: crm_claim_rma
-#: code:addons/crm_claim_rma/crm_claim_rma.py:473
-#, python-format
-msgid "Please set invoice first"
-msgstr ""
-
-#. module: crm_claim_rma
-#: code:addons/crm_claim_rma/crm_claim_rma.py:470
-#, python-format
-msgid "Please set product first"
-msgstr ""
-
-#. module: crm_claim_rma
-#: selection:claim.line,claim_origin:0
-msgid "Damaged delivered product"
-msgstr ""
-
-#. module: crm_claim_rma
-#: field:claim_make_picking.wizard,claim_line_ids:0
-#: model:ir.actions.act_window,name:crm_claim_rma.act_crm_case_claim_lines
-#: model:ir.model.fields,field_description:crm_claim_rma.field_claim_make_picking_wizard_claim_line_ids
-msgid "Claim lines"
-msgstr ""
-
-#. module: crm_claim_rma
-#: code:addons/crm_claim_rma/crm_claim_rma.py:341
-#, python-format
-msgid "There is no warehouse for the current user's company."
-msgstr ""
-
-#. module: crm_claim_rma
-#: code:addons/crm_claim_rma/crm_claim_rma.py:223
-#: code:addons/crm_claim_rma/crm_claim_rma.py:233
-#: code:addons/crm_claim_rma/wizard/claim_make_picking.py:72
-#, python-format
-msgid "Error"
-msgstr ""
-
-#. module: crm_claim_rma
-#: view:crm.claim:0
-msgid "Action"
-msgstr ""
-
-#. module: crm_claim_rma
-#: view:claim.line:0
-#: view:crm.claim:0
-msgid "Claims"
-msgstr ""
-
-#. module: crm_claim_rma
-#: view:claim.line:0
-msgid "Problem"
-msgstr ""
-
-#. module: crm_claim_rma
-#: selection:claim.line,state:0
-msgid "Treated"
-msgstr ""
-
-#. module: crm_claim_rma
-#: model:crm.case.categ,name:crm_claim_rma.categ_claim16
-msgid "Merchandise Not Received"
-msgstr ""
-
-#. module: crm_claim_rma
-#: model:ir.ui.menu,name:crm_claim_rma.menu_crm_case_claims_claim_line_substates
-msgid "Returned line substates"
-msgstr ""
-
-#. module: crm_claim_rma
-#: view:claim.line:0
-msgid "Substate"
-msgstr ""
-
-#. module: crm_claim_rma
-#: view:crm.claim:0
-#: model:ir.actions.act_window,name:crm_claim_rma.act_crm_claim_rma_invoice_out
-msgid "Customer Invoices"
-msgstr ""
-
-#. module: crm_claim_rma
-#: field:claim_make_picking.wizard,claim_line_source_location:0
-#: model:ir.model.fields,field_description:crm_claim_rma.field_claim_make_picking_wizard_claim_line_source_location
-msgid "Source Location"
-msgstr ""
-
-#. module: crm_claim_rma
-#: model:ir.actions.act_window,name:crm_claim_rma.act_crm_claim_rma_picking_out
-msgid "Deliveries"
-msgstr ""
-
-#. module: crm_claim_rma
-#: view:claim.line:0
-#: field:crm.claim,invoice_id:0
-#: model:ir.model,name:crm_claim_rma.model_account_invoice
-#: model:ir.model.fields,field_description:crm_claim_rma.field_crm_claim_invoice_id
-msgid "Invoice"
-msgstr ""
-
-#. module: crm_claim_rma
-#: help:claim.line,invoice_line_id:0
-msgid "The invoice line related to the returned product"
-msgstr ""
-
-#. module: crm_claim_rma
-#: view:claim_make_picking.wizard:0
-msgid "Cancel"
-msgstr ""
-
-#. module: crm_claim_rma
-#: model:crm.case.categ,name:crm_claim_rma.categ_claim21
-msgid "Missed Fulfilment Promise"
-msgstr ""
-
-#. module: crm_claim_rma
-#: view:claim.line:0
-msgid "In Progress"
-msgstr ""
-
-#. module: crm_claim_rma
-#: model:crm.case.section,name:crm_claim_rma.section_after_sales_service
-msgid "After Sales Service"
-msgstr ""
-
-#. module: crm_claim_rma
-#: selection:claim.line,state:0
-msgid "Received, to control"
-msgstr ""
-
-#. module: crm_claim_rma
-#: model:crm.case.categ,name:crm_claim_rma.categ_claim17
-msgid "Merchandise Not As Described"
-msgstr ""
-
-#. module: crm_claim_rma
-#: selection:claim.line,claim_origin:0
-msgid "Exchange request"
-msgstr ""
-
-#. module: crm_claim_rma
-#: model:ir.model,name:crm_claim_rma.model_substate_substate
-msgid "substate that precise a given state"
-msgstr ""
-
-#. module: crm_claim_rma
-#: code:addons/crm_claim_rma/crm_claim_rma.py:226
-#, python-format
-msgid "not_define"
-msgstr ""
-
-#. module: crm_claim_rma
-#: model:ir.actions.act_window,name:crm_claim_rma.action_claim_picking_in
-msgid "Return Products"
-msgstr ""
-
-#. module: crm_claim_rma
-#: view:claim.line:0
-msgid "Current"
-msgstr ""
-
-#. module: crm_claim_rma
-#: selection:claim.line,claim_origin:0
-#: selection:crm.claim,claim_type:0
-msgid "Other"
-msgstr ""
-
-#. module: crm_claim_rma
-#: view:crm.claim:0
-msgid "New Products Return"
-msgstr ""
-
-#. module: crm_claim_rma
-#: view:crm.claim:0
-#: model:ir.actions.act_window,name:crm_claim_rma.act_crm_claim_rma_invoice_in
-msgid "Supplier Invoices"
-msgstr ""
-
-#. module: crm_claim_rma
-#: view:claim.line:0
-#: field:claim.line,product_id:0
-#: model:ir.model.fields,field_description:crm_claim_rma.field_claim_line_product_id
-msgid "Product"
-msgstr ""
-
-#. module: crm_claim_rma
-#: field:claim.line,name:0
-#: model:ir.model.fields,field_description:crm_claim_rma.field_claim_line_name
-#: model:ir.model.fields,field_description:crm_claim_rma.field_substate_substate_substate_descr
-#: field:substate.substate,substate_descr:0
-msgid "Description"
-msgstr ""
-
-#. module: crm_claim_rma
-#: view:claim.line:0
-msgid "Search Claims"
-msgstr ""
-
-#. module: crm_claim_rma
-#: field:crm.claim,claim_type:0
-#: model:ir.model.fields,field_description:crm_claim_rma.field_crm_claim_claim_type
-msgid "Claim type"
-msgstr ""
-
-#. module: crm_claim_rma
-#: code:addons/crm_claim_rma/wizard/claim_make_picking.py:196
-#, python-format
-msgid "A product return cannot be created for various destination locations, please choose line with a same destination location."
-msgstr ""
-
-#. module: crm_claim_rma
-#: code:addons/crm_claim_rma/crm_claim_rma.py:247
-#, python-format
-msgid "valid"
-msgstr ""
-
-#. module: crm_claim_rma
-#: code:addons/crm_claim_rma/crm_claim_rma.py:340
-#, python-format
-msgid "Error!"
-msgstr ""
-
-#. module: crm_claim_rma
-#: help:claim.line,location_dest_id:0
-msgid "The return stock location of the returned product"
-msgstr ""
-
-#. module: crm_claim_rma
-#: help:claim.line,warning:0
-msgid "If warranty has expired"
-msgstr ""
-
-#. module: crm_claim_rma
-#: help:claim.line,warranty_return_partner:0
-msgid "Where the customer has to send back the product(s)"
-msgstr ""
-
-#. module: crm_claim_rma
-#: view:crm.claim:0
-msgid "Follow Up"
-msgstr ""
-
-#. module: crm_claim_rma
-#: selection:crm.claim,claim_type:0
-msgid "Customer"
-msgstr ""
-
-#. module: crm_claim_rma
-#: field:claim.line,move_out_id:0
-#: model:ir.model.fields,field_description:crm_claim_rma.field_claim_line_move_out_id
-msgid "Move Line from picking out"
-msgstr ""
-
-#. module: crm_claim_rma
-#: view:crm.claim:0
-#: field:crm.claim,invoice_ids:0
-#: model:ir.model.fields,field_description:crm_claim_rma.field_crm_claim_invoice_ids
-msgid "Refunds"
-msgstr ""
-
-#. module: crm_claim_rma
-#: model:ir.model,name:crm_claim_rma.model_account_invoice_refund
-msgid "Invoice Refund"
-msgstr ""
-
-#. module: crm_claim_rma
-#: field:claim.line,return_value:0
-#: model:ir.model.fields,field_description:crm_claim_rma.field_claim_line_return_value
-msgid "Total return"
-msgstr ""
-
-#. module: crm_claim_rma
-#: help:claim.line,return_value:0
-msgid "Quantity returned * Unit sold price"
-msgstr ""
-
-#. module: crm_claim_rma
-#: model:crm.case.categ,name:crm_claim_rma.categ_claim19
-msgid "Shipping Address Undeliverable"
-msgstr ""
-
-#. module: crm_claim_rma
-#: model:ir.actions.act_window,name:crm_claim_rma.act_crm_claim_rma_picking_in
-msgid "Incoming Shipment and Returns"
-msgstr ""
-
-#. module: crm_claim_rma
-#: view:stock.picking.out:0
-msgid "Delivery orders to invoice"
-msgstr ""
-
-#. module: crm_claim_rma
-#: help:claim.line,move_in_id:0
-#: help:claim.line,move_out_id:0
-msgid "The move line related to the returned product"
-msgstr ""
-
-#. module: crm_claim_rma
-#: view:claim_make_picking.wizard:0
-msgid "or"
-msgstr ""
-
-#. module: crm_claim_rma
-#: view:crm.claim:0
-msgid "Sales Team"
-msgstr ""
-
-#. module: crm_claim_rma
-#: model:crm.case.categ,name:crm_claim_rma.categ_claim15
-msgid "Different Item"
-msgstr ""
-
-#. module: crm_claim_rma
-#: model:ir.model,name:crm_claim_rma.model_claim_make_picking_wizard
-msgid "Wizard to create pickings from claim lines"
-msgstr ""
-
-#. module: crm_claim_rma
-#: help:crm.claim,claim_type:0
-msgid "Customer: from customer to company.\n"
-" Supplier: from company to supplier."
-msgstr ""
-
-#. module: crm_claim_rma
-#: view:claim.line:0
-msgid "In Progress Claims"
-msgstr ""
-
-#. module: crm_claim_rma
-#: code:addons/crm_claim_rma/crm_claim_rma.py:234
-#, python-format
-msgid "The product has no supplier configured."
-msgstr ""
-
-#. module: crm_claim_rma
-#: help:claim.line,number:0
-msgid "Claim Line Identification Number"
-msgstr "Número de idetifiación de la línea de reclamo"
-
-#. module: crm_claim_rma
-#: field:crm.claim,rma_number:0
-msgid "RMA Number"
-msgstr "Número RMA"
-
-#. module: crm_claim_rma
-#: help:crm.claim,rma_number:0
-msgid "RMA Number provided by supplier"
-msgstr "Número RMA asignado por el proveedor"
diff --git a/crm_claim_rma/models/account_invoice.py b/crm_claim_rma/models/account_invoice.py
index d3b936ac..33092f4f 100644
--- a/crm_claim_rma/models/account_invoice.py
+++ b/crm_claim_rma/models/account_invoice.py
@@ -9,7 +9,6 @@ from odoo import _, api, exceptions, fields, models
 
 
 class AccountInvoice(models.Model):
-
     _inherit = "account.invoice"
 
     claim_id = fields.Many2one('crm.claim', string='Claim')
@@ -34,14 +33,13 @@ class AccountInvoice(models.Model):
                 # For each lines replace quantity and add claim_line_id
                 inv_line = claim_line.invoice_line_id
                 clean_line = {}
-                for field_name, field in inv_line._all_columns.iteritems():
-                    column_type = field.column._type
-                    if column_type == 'many2one':
+                for field_name, field in inv_line._fields.iteritems():
+                    if isinstance(field, fields.Many2one):
                         clean_line[field_name] = inv_line[field_name].id
-                    elif column_type not in ('many2many', 'one2many'):
+                    elif not isinstance(field, (fields.Many2many,
+                                                fields.One2many)):
                         clean_line[field_name] = inv_line[field_name]
                     elif field_name == 'invoice_line_tax_id':
-
                         tax_ids = inv_line[field_name].ids
                         clean_line[field_name] = [(6, 0, tax_ids)]
                 clean_line['quantity'] = claim_line.product_returned_quantity
diff --git a/crm_claim_rma/models/claim_line.py b/crm_claim_rma/models/claim_line.py
index 15cf9e0d..26b3ac21 100644
--- a/crm_claim_rma/models/claim_line.py
+++ b/crm_claim_rma/models/claim_line.py
@@ -25,7 +25,7 @@ class ClaimLine(models.Model):
 
     _inherit = 'mail.thread'
     _description = "List of product to return"
-    _rec_name = "display_name"
+    # _rec_name = "display_name"
 
     SUBJECT_LIST = [('none', 'Not specified'),
                     ('legal', 'Legal retractation'),
@@ -47,6 +47,11 @@ class ClaimLine(models.Model):
         ('expired', _("Expired")),
         ('not_define', _("Not Defined"))]
 
+    @api.model
+    def get_warranty_return_partner(self):
+        return self.env['product.supplierinfo'].fields_get(
+            'warranty_return_partner')['warranty_return_partner']['selection']
+
     number = fields.Char(
         readonly=True,
         default='/',
@@ -57,7 +62,7 @@ class ClaimLine(models.Model):
         default=lambda self: self.env['res.company']._company_default_get(
             'claim.line'))
     date = fields.Date('Claim Line Date',
-                       select=True,
+                       index=True,
                        default=fields.date.today())
     name = fields.Char('Description', default='none', required=False,
                        help="More precise description of the problem")
@@ -114,11 +119,6 @@ class ClaimLine(models.Model):
                                help="If warranty has expired")
     display_name = fields.Char('Name', compute='_compute_display_name')
 
-    @api.model
-    def get_warranty_return_partner(self):
-        return self.env['product.supplierinfo'].fields_get(
-            'warranty_return_partner')['warranty_return_partner']['selection']
-
     warranty_type = fields.Selection(
         get_warranty_return_partner,
         help="Who is in charge of the warranty return treatment towards "
@@ -404,6 +404,7 @@ class ClaimLine(models.Model):
         return res
 
     @api.multi
+    @api.depends('claim_id.code', 'name')
     def _compute_display_name(self):
         for line_id in self:
             line_id.display_name = "%s - %s" % (
diff --git a/crm_claim_rma/test/test_invoice_refund.yml b/crm_claim_rma/test/test_invoice_refund.yml
index f15d7dc1..b0931dd7 100644
--- a/crm_claim_rma/test/test_invoice_refund.yml
+++ b/crm_claim_rma/test/test_invoice_refund.yml
@@ -30,7 +30,7 @@
   I prepare the wizard context.
 -
   !python {model: account.invoice.refund}: |
-    claim_lines = self.pool.get('claim.line').search(cr, uid, [('claim_id','=',ref('claim_refund'))])
+    claim_lines = self.env['claim.line'].search([('claim_id','=',ref('claim_refund'))])
     context.update({'active_model': 'crm_claim', 'active_id': ref('claim_refund'), 'claim_id': ref('claim_refund'), 'invoice_ids': [ref('account_invoice_claim_refund')]  })
 -
   I create a refund wizard
@@ -42,15 +42,15 @@
   I launch the refund wizard
 -
   !python {model: account.invoice.refund}: |
-    self.compute_refund(cr, uid, [ref('wizard_claim_refund')], 'refund', context=context)
+    self.compute_refund([ref('wizard_claim_refund')], 'refund', context=context)
 -
   I check that a refund linked to the claim has been created.
 -
   !python {model: account.invoice}: |
-    refund = self.search(cr, uid, [('type', '=', 'out_refund'),('claim_id', '=', ref('claim_refund'))])
+    refund = self.search([('type', '=', 'out_refund'),('claim_id', '=', ref('claim_refund'))])
     assert refund, "The refund is created"
-    refund_line_ids = self.pool.get('account.invoice.line').search(cr, uid, [('invoice_id','=',refund[0])])
+    refund_line_ids = self.env['account.invoice.line'].search([('invoice_id','=',refund[0])])
     assert len(refund_line_ids) == 2, "It contains 2 lines, as excepted"
-    refund_lines = self.pool.get('account.invoice.line').browse(cr, uid, refund_line_ids)
+    refund_lines = self.env['account.invoice.line'].browse(refund_line_ids)
     assert ref('product.product_product_4') in [refund_lines[0].product_id.id, refund_lines[1].product_id.id], "First line is checked"
     assert ref('product.product_product_5') in [refund_lines[0].product_id.id, refund_lines[1].product_id.id], "Second line is checked"
diff --git a/crm_claim_rma/tests/test_picking_creation.py b/crm_claim_rma/tests/test_picking_creation.py
index 5da2166a..643261cf 100644
--- a/crm_claim_rma/tests/test_picking_creation.py
+++ b/crm_claim_rma/tests/test_picking_creation.py
@@ -162,7 +162,7 @@ class TestPickingCreation(common.TransactionCase):
             self.ref('crm_claim.crm_claim_6')
         )
         self.invoice.action_invoice_open()
-        self.invoice.action_invoice_paid()
+        # self.invoice.action_invoice_paid()
         claim_id.write({
             'invoice_id': self.invoice.id
         })
diff --git a/crm_claim_rma/views/account_invoice.xml b/crm_claim_rma/views/account_invoice.xml
index c42ac025..7d79f373 100644
--- a/crm_claim_rma/views/account_invoice.xml
+++ b/crm_claim_rma/views/account_invoice.xml
@@ -8,14 +8,11 @@
         <field name="inherit_id" ref="account.invoice_form"/>
         <field name="priority" eval="16"/>
         <field name="arch" type="xml">
-            <field name='origin' position="after"/>
-
-            <xpath expr="//button[@name='action_invoice_cancel']"
-                   position="replace">
-                <field name="claim_id"
-                       attrs="{'invisible':[('type','!=','out_refund')]}"/>
-            </xpath>
-
+            <data>
+                <xpath expr="//page[@name='other_info']//field[@name='origin']" position="after">
+                    <field name="claim_id" attrs="{'invisible':[('type','!=','out_refund')]}"/>
+                </xpath>
+            </data>
         </field>
     </record>
 
diff --git a/crm_claim_rma_code/i18n/crm_claim_rma_code.pot b/crm_claim_rma_code/i18n/crm_claim_rma_code.pot
deleted file mode 100644
index e863f3a6..00000000
--- a/crm_claim_rma_code/i18n/crm_claim_rma_code.pot
+++ /dev/null
@@ -1,22 +0,0 @@
-# Translation of Odoo Server.
-# This file contains the translation of the following modules:
-#   * crm_claim_rma_number
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Odoo Server 8.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-07-17 19:13+0000\n"
-"PO-Revision-Date: 2015-07-17 19:13+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: crm_claim_rma_code
-#: field:crm.claim.type,ir_sequence_id:0
-msgid "Sequence Number"
-msgstr ""
-
diff --git a/crm_rma_advance_location/i18n/crm_rma_advance_location.pot b/crm_rma_advance_location/i18n/crm_rma_advance_location.pot
deleted file mode 100644
index 537f89e4..00000000
--- a/crm_rma_advance_location/i18n/crm_rma_advance_location.pot
+++ /dev/null
@@ -1,122 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* crm_rma_advance_location
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 7.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-11-15 13:27+0000\n"
-"PO-Revision-Date: 2013-11-15 13:27+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: crm_rma_advance_location
-#: model:ir.actions.act_window,name:crm_rma_advance_location.action_claim_picking_loss
-msgid "Create Products Loss"
-msgstr ""
-
-#. module: crm_rma_advance_location
-#: model:ir.actions.act_window,name:crm_rma_advance_location.action_used_picking_from_claim_picking
-msgid "Create Incomming Shipment to Refurbish Location"
-msgstr ""
-
-#. module: crm_rma_advance_location
-#: view:claim_make_picking_from_picking.wizard:0
-msgid "Locations"
-msgstr ""
-
-#. module: crm_rma_advance_location
-#: view:claim_make_picking_from_picking.wizard:0
-msgid "Select lines for picking"
-msgstr ""
-
-#. module: crm_rma_advance_location
-#: model:stock.location,name:crm_rma_advance_location.stock_location_breakage_loss
-msgid "Breakage Loss"
-msgstr ""
-
-#. module: crm_rma_advance_location
-#: model:ir.model,name:crm_rma_advance_location.model_claim_make_picking_wizard
-msgid "Wizard to create pickings from claim lines"
-msgstr ""
-
-#. module: crm_rma_advance_location
-#: model:stock.location,name:crm_rma_advance_location.stock_location_carrier_loss
-msgid "Carrier Loss"
-msgstr ""
-
-#. module: crm_rma_advance_location
-#: model:stock.location,name:crm_rma_advance_location.stock_location_mistake_loss
-msgid "Mistake Loss"
-msgstr ""
-
-#. module: crm_rma_advance_location
-#: model:ir.actions.act_window,name:crm_rma_advance_location.action_loss_picking_from_claim_picking
-msgid "Create Incomming Shipment to Breakkage Loss Location"
-msgstr ""
-
-#. module: crm_rma_advance_location
-#: view:stock.picking.in:0
-msgid "Product to refurbish stock"
-msgstr ""
-
-#. module: crm_rma_advance_location
-#: model:ir.model,name:crm_rma_advance_location.model_stock_warehouse
-msgid "Warehouse"
-msgstr ""
-
-#. module: crm_rma_advance_location
-#: model:stock.location,name:crm_rma_advance_location.stock_location_rma
-msgid "RMA"
-msgstr ""
-
-#. module: crm_rma_advance_location
-#: model:stock.location,name:crm_rma_advance_location.stock_location_refurbish
-msgid "Refurbish"
-msgstr ""
-
-#. module: crm_rma_advance_location
-#: view:stock.picking.in:0
-msgid "Product to stock"
-msgstr ""
-
-#. module: crm_rma_advance_location
-#: model:ir.actions.act_window,name:crm_rma_advance_location.action_stock_picking_from_claim_picking
-msgid "Create Incomming Shipment to Stock"
-msgstr ""
-
-#. module: crm_rma_advance_location
-#: view:claim_make_picking_from_picking.wizard:0
-msgid "Create picking"
-msgstr ""
-
-#. module: crm_rma_advance_location
-#: view:claim_make_picking_from_picking.wizard:0
-msgid "Cancel"
-msgstr ""
-
-#. module: crm_rma_advance_location
-#: view:crm.claim:0
-msgid "New Product Loss"
-msgstr ""
-
-#. module: crm_rma_advance_location
-#: model:ir.model,name:crm_rma_advance_location.model_claim_make_picking_from_picking_wizard
-msgid "Wizard to create pickings from picking lines"
-msgstr ""
-
-#. module: crm_rma_advance_location
-#: view:stock.picking.in:0
-msgid "Product to Loss"
-msgstr ""
-
-#. module: crm_rma_advance_location
-#: view:claim_make_picking_from_picking.wizard:0
-msgid "Select lines to add in picking"
-msgstr ""
-
diff --git a/crm_rma_by_shop/i18n/crm_rma_by_shop.pot b/crm_rma_by_shop/i18n/crm_rma_by_shop.pot
deleted file mode 100644
index 3bac4bc1..00000000
--- a/crm_rma_by_shop/i18n/crm_rma_by_shop.pot
+++ /dev/null
@@ -1,34 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* crm_rma_by_shop
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 7.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-11-15 13:29+0000\n"
-"PO-Revision-Date: 2013-11-15 13:29+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: crm_rma_by_shop
-#: view:crm.claim:0
-#: field:crm.claim,shop_id:0
-#: model:ir.model.fields,field_description:crm_rma_by_shop.field_crm_claim_shop_id
-msgid "Shop"
-msgstr ""
-
-#. module: crm_rma_by_shop
-#: model:ir.model,name:crm_rma_by_shop.model_crm_claim
-msgid "Claim"
-msgstr ""
-
-#. module: crm_rma_by_shop
-#: view:crm.claim:0
-msgid "Type"
-msgstr ""
-
diff --git a/crm_rma_location/i18n/crm_rma_location_rma.pot b/crm_rma_location/i18n/crm_rma_location_rma.pot
deleted file mode 100644
index 73baa75e..00000000
--- a/crm_rma_location/i18n/crm_rma_location_rma.pot
+++ /dev/null
@@ -1,84 +0,0 @@
-# Translation of Odoo Server.
-# This file contains the translation of the following modules:
-#	* crm_rma_location
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Odoo Server 8.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-07-17 19:39+0000\n"
-"PO-Revision-Date: 2015-07-17 19:39+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: crm_rma_location
-#: code:addons/crm_rma_location/stock.py:60
-#, python-format
-msgid " Sequence in"
-msgstr ""
-
-#. module: crm_rma_location
-#: code:addons/crm_rma_location/stock.py:72
-#, python-format
-msgid " Sequence internal"
-msgstr ""
-
-#. module: crm_rma_location
-#: code:addons/crm_rma_location/stock.py:66
-#, python-format
-msgid " Sequence out"
-msgstr ""
-
-#. module: crm_rma_location
-#: code:addons/crm_rma_location/stock.py:166
-#, python-format
-msgid "RMA"
-msgstr ""
-
-#. module: crm_rma_location
-#: code:addons/crm_rma_location/stock.py:120
-#, python-format
-msgid "RMA Delivery Orders"
-msgstr ""
-
-#. module: crm_rma_location
-#: field:stock.warehouse,rma_in_type_id:0
-msgid "RMA In Type"
-msgstr ""
-
-#. module: crm_rma_location
-#: code:addons/crm_rma_location/stock.py:134
-#, python-format
-msgid "RMA Internal Transfers"
-msgstr ""
-
-#. module: crm_rma_location
-#: field:stock.warehouse,rma_int_type_id:0
-msgid "RMA Internal Type"
-msgstr ""
-
-#. module: crm_rma_location
-#: field:stock.warehouse,lot_rma_id:0
-msgid "RMA Location"
-msgstr ""
-
-#. module: crm_rma_location
-#: field:stock.warehouse,rma_out_type_id:0
-msgid "RMA Out Type"
-msgstr ""
-
-#. module: crm_rma_location
-#: code:addons/crm_rma_location/stock.py:108
-#, python-format
-msgid "RMA Receipts"
-msgstr ""
-
-#. module: crm_rma_location
-#: model:ir.model,name:crm_rma_location.model_stock_warehouse
-msgid "Warehouse"
-msgstr ""
-
diff --git a/crm_rma_lot_mass_return/i18n/crm_rma_lot_mass_return.pot b/crm_rma_lot_mass_return/i18n/crm_rma_lot_mass_return.pot
deleted file mode 100644
index 11c60937..00000000
--- a/crm_rma_lot_mass_return/i18n/crm_rma_lot_mass_return.pot
+++ /dev/null
@@ -1,67 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* crm_rma_lot_mass_return
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 7.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-11-15 13:30+0000\n"
-"PO-Revision-Date: 2013-11-15 13:30+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: crm_rma_lot_mass_return
-#: view:crm.claim:0
-msgid "Mass return from serial/lot"
-msgstr ""
-
-#. module: crm_rma_lot_mass_return
-#: view:returned_lines_from_serial.wizard:0
-msgid "Claim short description"
-msgstr ""
-
-#. module: crm_rma_lot_mass_return
-#: view:returned_lines_from_serial.wizard:0
-msgid "Select serial numbers to create"
-msgstr ""
-
-#. module: crm_rma_lot_mass_return
-#: model:ir.actions.act_window,name:crm_rma_lot_mass_return.action_create_return_serial
-msgid "action_create_return_serial"
-msgstr ""
-
-#. module: crm_rma_lot_mass_return
-#: model:ir.model,name:crm_rma_lot_mass_return.model_returned_lines_from_serial_wizard
-msgid "Wizard to create product return lines from serial numbers"
-msgstr ""
-
-#. module: crm_rma_lot_mass_return
-#: view:returned_lines_from_serial.wizard:0
-msgid "Quantity returned"
-msgstr ""
-
-#. module: crm_rma_lot_mass_return
-#: view:returned_lines_from_serial.wizard:0
-msgid "Save and close"
-msgstr ""
-
-#. module: crm_rma_lot_mass_return
-#: view:returned_lines_from_serial.wizard:0
-msgid "Save and new"
-msgstr ""
-
-#. module: crm_rma_lot_mass_return
-#: view:returned_lines_from_serial.wizard:0
-msgid "Cancel"
-msgstr ""
-
-#. module: crm_rma_lot_mass_return
-#: view:returned_lines_from_serial.wizard:0
-msgid "Serial / Lot Number"
-msgstr ""
-
diff --git a/crm_rma_stock_location/i18n/crm_rma_stock_location.pot b/crm_rma_stock_location/i18n/crm_rma_stock_location.pot
deleted file mode 100644
index 444f0d7e..00000000
--- a/crm_rma_stock_location/i18n/crm_rma_stock_location.pot
+++ /dev/null
@@ -1,236 +0,0 @@
-# Translation of Odoo Server.
-# This file contains the translation of the following modules:
-#   * crm_rma_stock_location
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Odoo Server 8.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-11-25 21:48+0000\n"
-"PO-Revision-Date: 2015-11-25 21:48+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: crm_rma_stock_location
-#: view:claim.make.picking.from.picking.wizard:crm_rma_stock_location.view_claim_picking_from_picking
-msgid "Cancel"
-msgstr ""
-
-#. module: crm_rma_stock_location
-#: model:ir.actions.act_window,name:crm_rma_stock_location.action_loss_picking_from_claim_picking
-msgid "Create Incoming Shipment to Breakage Loss Location"
-msgstr ""
-
-#. module: crm_rma_stock_location
-#: model:ir.actions.act_window,name:crm_rma_stock_location.action_used_picking_from_claim_picking
-msgid "Create Incoming Shipment to Refurbish Location"
-msgstr ""
-
-#. module: crm_rma_stock_location
-#: model:ir.actions.act_window,name:crm_rma_stock_location.action_stock_picking_from_claim_picking
-msgid "Create Incoming Shipment to Stock"
-msgstr ""
-
-#. module: crm_rma_stock_location
-#: model:ir.actions.act_window,name:crm_rma_stock_location.action_claim_picking_loss
-msgid "Create a Product Loss"
-msgstr ""
-
-#. module: crm_rma_stock_location
-#: view:claim.make.picking.from.picking.wizard:crm_rma_stock_location.view_claim_picking_from_picking
-msgid "Create picking"
-msgstr ""
-
-#. module: crm_rma_stock_location
-#: field:claim.make.picking.from.picking.wizard,create_uid:0
-msgid "Created by"
-msgstr ""
-
-#. module: crm_rma_stock_location
-#: field:claim.make.picking.from.picking.wizard,create_date:0
-msgid "Created on"
-msgstr ""
-
-#. module: crm_rma_stock_location
-#: code:addons/crm_rma_stock_location/wizards/claim_make_picking_from_picking.py:89
-#: field:claim.make.picking.from.picking.wizard,picking_line_dest_location:0
-#, python-format
-msgid "Dest. Location"
-msgstr ""
-
-#. module: crm_rma_stock_location
-#: field:claim.make.picking.from.picking.wizard,id:0
-msgid "ID"
-msgstr ""
-
-#. module: crm_rma_stock_location
-#: field:claim.make.picking.from.picking.wizard,write_uid:0
-msgid "Last Updated by"
-msgstr ""
-
-#. module: crm_rma_stock_location
-#: field:claim.make.picking.from.picking.wizard,write_date:0
-msgid "Last Updated on"
-msgstr ""
-
-#. module: crm_rma_stock_location
-#: help:claim.make.picking.from.picking.wizard,picking_line_source_location:0
-msgid "Source location where the returned products are"
-msgstr ""
-
-#. module: crm_rma_stock_location
-#: help:claim.make.picking.from.picking.wizard,picking_line_dest_location:0
-msgid "Target location to send returned products"
-msgstr ""
-
-#. module: crm_rma_stock_location
-#: view:claim.make.picking.from.picking.wizard:crm_rma_stock_location.view_claim_picking_from_picking
-msgid "Locations"
-msgstr ""
-
-#. module: crm_rma_stock_location
-#: code:addons/crm_rma_stock_location/models/stock_warehouse.py:62
-#, python-format
-msgid "Loss"
-msgstr ""
-
-#. module: crm_rma_stock_location
-#: field:stock.warehouse,loss_loc_id:0
-msgid "Loss Location"
-msgstr ""
-
-#. module: crm_rma_stock_location
-#: view:crm.claim:crm_rma_stock_location.crm_claim_rma_form_view_loss
-msgid "New Product Loss"
-msgstr ""
-
-#. module: crm_rma_stock_location
-#: field:claim.make.picking.from.picking.wizard,picking_line_ids:0
-msgid "Picking lines"
-msgstr ""
-
-#. module: crm_rma_stock_location
-#: model:ir.model,name:crm_rma_stock_location.model_product_product
-msgid "Product"
-msgstr ""
-
-#. module: crm_rma_stock_location
-#: model:ir.model,name:crm_rma_stock_location.model_product_template
-msgid "Product Template"
-msgstr ""
-
-#. module: crm_rma_stock_location
-#: view:product.product:crm_rma_stock_location.rma_product_product_tree_view
-msgid "Product Variants"
-msgstr ""
-
-#. module: crm_rma_stock_location
-#: view:stock.picking:crm_rma_stock_location.picking_in_form
-msgid "Product to Loss"
-msgstr ""
-
-#. module: crm_rma_stock_location
-#: view:stock.picking:crm_rma_stock_location.picking_in_form
-msgid "Product to refurbish stock"
-msgstr ""
-
-
-#. module: crm_rma_stock_location
-#: view:stock.picking:crm_rma_stock_location.picking_in_form
-msgid "Product to stock"
-msgstr ""
-
-#. module: crm_rma_stock_location
-#: model:stock.location,name:crm_rma_stock_location.location_rma_a
-msgid "RMA - Box A"
-msgstr ""
-
-#. module: crm_rma_stock_location
-#: model:stock.location,name:crm_rma_stock_location.location_rma_b
-msgid "RMA - Box B"
-msgstr ""
-
-#. module: crm_rma_stock_location
-#: view:product.product:crm_rma_stock_location.rma_product_search_view
-msgid "RMA Available Products"
-msgstr ""
-
-#. module: crm_rma_stock_location
-#: model:stock.location,name:crm_rma_stock_location.location_rma
-msgid "RMA Demo"
-msgstr ""
-
-#. module: crm_rma_stock_location
-#: code:addons/crm_rma_stock_location/models/product_product.py:42
-#, python-format
-msgid "RMA Forecasted Quantity"
-msgstr ""
-
-#. module: crm_rma_stock_location
-#: view:product.product:crm_rma_stock_location.rma_product_search_view
-msgid "RMA Products"
-msgstr ""
-
-#. module: crm_rma_stock_location
-#: code:addons/crm_rma_stock_location/models/product_product.py:36
-#, python-format
-msgid "RMA Quantity On Hand"
-msgstr ""
-
-#. module: crm_rma_stock_location
-#: code:addons/crm_rma_stock_location/models/stock_warehouse.py:56
-#, python-format
-msgid "Refurbish"
-msgstr ""
-
-#. module: crm_rma_stock_location
-#: field:stock.warehouse,lot_refurbish_id:0
-msgid "Refurbish Location"
-msgstr ""
-
-#. module: crm_rma_stock_location
-#: view:claim.make.picking.from.picking.wizard:crm_rma_stock_location.view_claim_picking_from_picking
-msgid "Select lines for picking"
-msgstr ""
-
-#. module: crm_rma_stock_location
-#: view:claim.make.picking.from.picking.wizard:crm_rma_stock_location.view_claim_picking_from_picking
-msgid "Select lines to add in picking"
-msgstr ""
-
-#. module: crm_rma_stock_location
-#: model:product.template,name:crm_rma_stock_location.product_socket_product_template
-msgid "Socket"
-msgstr ""
-
-#. module: crm_rma_stock_location
-#: code:addons/crm_rma_stock_location/wizards/claim_make_picking_from_picking.py:85
-#: field:claim.make.picking.from.picking.wizard,picking_line_source_location:0
-#, python-format
-msgid "Source Location"
-msgstr ""
-
-#. module: crm_rma_stock_location
-#: model:ir.actions.act_window,name:crm_rma_stock_location.rma_product_variant_action
-#: model:ir.ui.menu,name:crm_rma_stock_location.menu_stock_rma
-msgid "RMA Stock"
-msgstr ""
-
-#. module: crm_rma_stock_location
-#: model:ir.model,name:crm_rma_stock_location.model_stock_warehouse
-msgid "Warehouse"
-msgstr ""
-
-#. module: crm_rma_stock_location
-#: model:ir.model,name:crm_rma_stock_location.model_claim_make_picking_wizard
-msgid "Wizard to create pickings from claim lines"
-msgstr ""
-
-#. module: crm_rma_stock_location
-#: model:ir.model,name:crm_rma_stock_location.model_claim_make_picking_from_picking_wizard
-msgid "Wizard to create pickings from picking lines"
-msgstr ""
diff --git a/product_warranty/i18n/product_warranty.pot b/product_warranty/i18n/product_warranty.pot
deleted file mode 100644
index 982757ab..00000000
--- a/product_warranty/i18n/product_warranty.pot
+++ /dev/null
@@ -1,148 +0,0 @@
-# Translation of Odoo Server.
-# This file contains the translation of the following modules:
-#	* product_warranty
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Odoo Server 8.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-07-18 02:03+0000\n"
-"PO-Revision-Date: 2015-07-18 02:03+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: product_warranty
-#: field:product.supplierinfo,active_supplier:0
-msgid "Active supplier"
-msgstr ""
-
-#. module: product_warranty
-#: model:ir.model,name:product_warranty.model_res_company
-msgid "Companies"
-msgstr ""
-
-#. module: product_warranty
-#: field:return.instruction,create_uid:0
-msgid "Created by"
-msgstr ""
-
-#. module: product_warranty
-#: field:return.instruction,create_date:0
-msgid "Created on"
-msgstr ""
-
-#. module: product_warranty
-#: view:res.company:product_warranty.company_form
-msgid "Crm product return address"
-msgstr ""
-
-#. module: product_warranty
-#: help:res.company,crm_return_address_id:0
-msgid "Default address where the customers has to send back the returned product. If empty, the address is the company address"
-msgstr ""
-
-#. module: product_warranty
-#: field:return.instruction,id:0
-msgid "ID"
-msgstr ""
-
-#. module: product_warranty
-#: help:return.instruction,is_default:0
-msgid "If is default, will be use to set the default value in supplier infos. Be careful to have only one default"
-msgstr ""
-
-#. module: product_warranty
-#: model:ir.model,name:product_warranty.model_product_supplierinfo
-msgid "Information about a product supplier"
-msgstr ""
-
-#. module: product_warranty
-#: field:product.supplierinfo,return_instructions:0
-#: view:return.instruction:product_warranty.product_return_instructions_form_view
-#: field:return.instruction,instructions:0
-msgid "Instructions"
-msgstr ""
-
-#. module: product_warranty
-#: model:ir.model,name:product_warranty.model_return_instruction
-#: help:product.supplierinfo,return_instructions:0
-#: help:return.instruction,instructions:0
-msgid "Instructions for product return"
-msgstr ""
-
-#. module: product_warranty
-#: field:return.instruction,is_default:0
-msgid "Is default"
-msgstr ""
-
-#. module: product_warranty
-#: help:product.supplierinfo,active_supplier:0
-msgid "Is this supplier still active, only for information"
-msgstr ""
-
-#. module: product_warranty
-#: field:return.instruction,write_uid:0
-msgid "Last Updated by"
-msgstr ""
-
-#. module: product_warranty
-#: field:return.instruction,write_date:0
-msgid "Last Updated on"
-msgstr ""
-
-#. module: product_warranty
-#: field:product.supplierinfo,warranty_duration:0
-msgid "Period"
-msgstr ""
-
-#. module: product_warranty
-#: model:ir.actions.act_window,name:product_warranty.product_return_instructions_action
-#: model:ir.ui.menu,name:product_warranty.menu_product_return_instructions_action
-msgid "Products Return Instructions"
-msgstr ""
-
-#. module: product_warranty
-#: field:product.supplierinfo,warranty_return_other_address:0
-#: field:res.company,crm_return_address_id:0
-msgid "Return address"
-msgstr ""
-
-#. module: product_warranty
-#: view:return.instruction:product_warranty.product_return_instructions_form_view
-#: view:return.instruction:product_warranty.product_return_instructions_tree_view
-msgid "Return instructions"
-msgstr ""
-
-#. module: product_warranty
-#: field:product.supplierinfo,warranty_return_partner:0
-msgid "Return type"
-msgstr ""
-
-#. module: product_warranty
-#: field:return.instruction,name:0
-msgid "Title"
-msgstr ""
-
-#. module: product_warranty
-#: help:product.supplierinfo,warranty_duration:0
-msgid "Warranty in month for this product/supplier relation. Only for company/supplier relation (purchase order) ; the  customer/company relation (sale order) always use the product main warranty field"
-msgstr ""
-
-#. module: product_warranty
-#: view:product.supplierinfo:product_warranty.product_supplierinfo_warranty_form_view
-msgid "Warranty informations"
-msgstr ""
-
-#. module: product_warranty
-#: help:product.supplierinfo,warranty_return_other_address:0
-msgid "Where the customer has to send back the product(s) if warranty return is set to 'other'."
-msgstr ""
-
-#. module: product_warranty
-#: help:product.supplierinfo,warranty_return_partner:0
-msgid "Who is in charge of the warranty return treatment toward the end customer. Company will use the current compagny  delivery or default address and so on for supplier and brand manufacturer. Doesn't necessarly mean that the warranty to be applied is the one of the return partner (ie: can be returned to the company and be under the brand warranty"
-msgstr ""
diff --git a/setup/_metapackage/VERSION.txt b/setup/_metapackage/VERSION.txt
new file mode 100644
index 00000000..bf6139d3
--- /dev/null
+++ b/setup/_metapackage/VERSION.txt
@@ -0,0 +1 @@
+10.0.20180419.0
\ No newline at end of file
diff --git a/setup/_metapackage/setup.py b/setup/_metapackage/setup.py
new file mode 100644
index 00000000..146cb13f
--- /dev/null
+++ b/setup/_metapackage/setup.py
@@ -0,0 +1,19 @@
+import setuptools
+
+with open('VERSION.txt', 'r') as f:
+    version = f.read().strip()
+
+setuptools.setup(
+    name="odoo10-addons-oca-rma",
+    description="Meta package for oca-rma Odoo addons",
+    version=version,
+    install_requires=[
+        'odoo10-addon-crm_claim_rma_code',
+        'odoo10-addon-crm_rma_location',
+        'odoo10-addon-product_warranty',
+    ],
+    classifiers=[
+        'Programming Language :: Python',
+        'Framework :: Odoo',
+    ]
+)