From d1fb0f45176c6805aecd42fcd8864389ff4609d3 Mon Sep 17 00:00:00 2001
From: Osval Reyes <osval@vauxoo.com>
Date: Thu, 19 Nov 2015 15:00:13 -0430
Subject: [PATCH 01/19] [ADD] crm_rma_lot_mass_return module

---
 crm_rma_lot_mass_return/README.rst            |  86 +++
 crm_rma_lot_mass_return/__init__.py           |  10 +-
 crm_rma_lot_mass_return/__openerp__.py        |  59 +-
 crm_rma_lot_mass_return/crm_rma_view.xml      |  16 -
 .../demo/purchase_order.xml                   |  69 +++
 crm_rma_lot_mass_return/demo/sale_order.xml   |  67 ++
 .../demo/stock_production_lot.xml             |  37 ++
 .../demo/transfer_details.xml                 | 196 ++++++
 .../i18n/crm_rma_lot_mass_return.pot          | 154 ++++-
 crm_rma_lot_mass_return/i18n/es.po            | 181 ++++++
 crm_rma_lot_mass_return/i18n/es_MX.po         |  16 +
 crm_rma_lot_mass_return/i18n/es_PA.po         |  16 +
 crm_rma_lot_mass_return/i18n/es_VE.po         |  16 +
 crm_rma_lot_mass_return/models/__init__.py    |  22 +
 crm_rma_lot_mass_return/models/crm_claim.py   |  58 ++
 .../static/src/js/barcode_text.js             | 115 ++++
 .../templates/search_view.xml                 |  11 +
 crm_rma_lot_mass_return/tests/__init__.py     |  25 +
 .../tests/test_constrains.py                  |  48 ++
 .../tests/test_crm_rma_lot_mass_return.py     | 157 +++++
 .../tests/test_crm_rma_lot_mass_return_2.py   | 209 +++++++
 crm_rma_lot_mass_return/views/crm_claim.xml   |  19 +
 .../wizard/returned_lines_from_serial.py      | 267 --------
 ...returned_lines_from_serial_wizard_view.xml |  73 ---
 .../{wizard => wizards}/__init__.py           |   8 +-
 .../wizards/returned_lines_from_serial.py     | 586 ++++++++++++++++++
 .../returned_lines_from_serial_wizard.xml     | 104 ++++
 27 files changed, 2212 insertions(+), 413 deletions(-)
 create mode 100644 crm_rma_lot_mass_return/README.rst
 delete mode 100644 crm_rma_lot_mass_return/crm_rma_view.xml
 create mode 100644 crm_rma_lot_mass_return/demo/purchase_order.xml
 create mode 100644 crm_rma_lot_mass_return/demo/sale_order.xml
 create mode 100644 crm_rma_lot_mass_return/demo/stock_production_lot.xml
 create mode 100644 crm_rma_lot_mass_return/demo/transfer_details.xml
 create mode 100644 crm_rma_lot_mass_return/i18n/es.po
 create mode 100644 crm_rma_lot_mass_return/i18n/es_MX.po
 create mode 100644 crm_rma_lot_mass_return/i18n/es_PA.po
 create mode 100644 crm_rma_lot_mass_return/i18n/es_VE.po
 create mode 100644 crm_rma_lot_mass_return/models/__init__.py
 create mode 100644 crm_rma_lot_mass_return/models/crm_claim.py
 create mode 100644 crm_rma_lot_mass_return/static/src/js/barcode_text.js
 create mode 100644 crm_rma_lot_mass_return/templates/search_view.xml
 create mode 100644 crm_rma_lot_mass_return/tests/__init__.py
 create mode 100644 crm_rma_lot_mass_return/tests/test_constrains.py
 create mode 100644 crm_rma_lot_mass_return/tests/test_crm_rma_lot_mass_return.py
 create mode 100644 crm_rma_lot_mass_return/tests/test_crm_rma_lot_mass_return_2.py
 create mode 100644 crm_rma_lot_mass_return/views/crm_claim.xml
 delete mode 100644 crm_rma_lot_mass_return/wizard/returned_lines_from_serial.py
 delete mode 100644 crm_rma_lot_mass_return/wizard/returned_lines_from_serial_wizard_view.xml
 rename crm_rma_lot_mass_return/{wizard => wizards}/__init__.py (82%)
 create mode 100644 crm_rma_lot_mass_return/wizards/returned_lines_from_serial.py
 create mode 100644 crm_rma_lot_mass_return/wizards/returned_lines_from_serial_wizard.xml

diff --git a/crm_rma_lot_mass_return/README.rst b/crm_rma_lot_mass_return/README.rst
new file mode 100644
index 00000000..4a05587f
--- /dev/null
+++ b/crm_rma_lot_mass_return/README.rst
@@ -0,0 +1,86 @@
+.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg
+    :alt: License: AGPL-3
+
+============================
+RMA Claim Mass Return by Lot
+============================
+
+This module adds possibility to return a whole lot of product from an invoice
+and create a incoming shipment for them based on serial/lot for a product or
+invoice number.
+
+Installation
+============
+
+To install this module, just select it from availables modules
+
+Configuration
+=============
+
+No configuration is need for this module
+
+Usage
+=====
+
+To use this module, you need to:
+
+* Go into Sales > After-Sale services > Claims
+
+* A button named "Mass return from serial/lot or invoice" will appear in the
+  form view when creating or editing an existing claim.
+
+* Enter into the wizard and introduce serial/lot for an invoiced product or
+  invoice number and press enter.
+
+* A list of selectable items it will show below or next to the input box
+  depending upon is introduced either invoice number or serial/lot number
+  respectively. When finish adding, click on Validate button and then Ok
+  to exit of wizard and continue editing the claim.
+
+
+.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas
+   :alt: Try me on Runbot
+   :target: https://runbot.odoo-community.org/runbot/145/8.0
+
+
+For further information, please visit:
+
+* https://www.odoo.com/forum/help-1
+
+Known issues / Roadmap
+======================
+
+* No issues are registered
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues <https://github.com/OCA/rma/issues>`_.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us smashing it by providing a detailed and welcomed feedback
+`here <https://github.com/OCA/rma/issues/new?body=module:%20crm_rma_lot_mass_return%0Aversion:%208.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+
+
+Credits
+=======
+
+Contributors
+------------
+
+* Yanina Aular <yanina.aular@vauxoo.com>
+* Osval Reyes <osval@vauxoo.com>
+
+Maintainer
+----------
+
+.. image:: https://odoo-community.org/logo.png
+   :alt: Odoo Community Association
+   :target: https://odoo-community.org
+
+This module is maintained by the OCA.
+
+OCA, or the Odoo Community Association, is a nonprofit organization whose
+mission is to support the collaborative development of Odoo features and
+promote its widespread use.
+
+To contribute to this module, please visit http://odoo-community.org.
diff --git a/crm_rma_lot_mass_return/__init__.py b/crm_rma_lot_mass_return/__init__.py
index c4de8d31..c8229dc7 100644
--- a/crm_rma_lot_mass_return/__init__.py
+++ b/crm_rma_lot_mass_return/__init__.py
@@ -1,9 +1,11 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
+#    Copyright 2015 Vauxoo
 #    Copyright 2013 Camptocamp
-#    Copyright 2009-2013 Akretion, 
-#    Author: Emmanuel Samyn, Raphaël Valyi, Sébastien Beau, Joel Grand-Guillaume
+#    Copyright 2009-2013 Akretion,
+#    Author: Emmanuel Samyn, Raphaël Valyi, Sébastien Beau,
+#            Joel Grand-Guillaume
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -19,4 +21,6 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-from . import wizard
+
+from . import models
+from . import wizards
diff --git a/crm_rma_lot_mass_return/__openerp__.py b/crm_rma_lot_mass_return/__openerp__.py
index fae33b73..c0bf52b9 100644
--- a/crm_rma_lot_mass_return/__openerp__.py
+++ b/crm_rma_lot_mass_return/__openerp__.py
@@ -1,9 +1,12 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
+#    Copyright 2015 Vauxoo
 #    Copyright 2013 Camptocamp
-#    Copyright 2009-2013 Akretion, 
-#    Author: Emmanuel Samyn, Raphaël Valyi, Sébastien Beau, Joel Grand-Guillaume
+#    Copyright 2009-2013 Akretion,
+#    Author: Emmanuel Samyn, Raphaël Valyi, Sébastien Beau,
+#            Joel Grand-Guillaume,
+#            Yanina Aular, Osval Reyes
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -20,31 +23,29 @@
 #
 ##############################################################################
 
-{'name': 'RMA Claims Mass Return by Lot',
- 'version': '1.0',
- 'category': 'Generic Modules/CRM & SRM',
- 'depends': ['crm_claim_rma'
-             ],
- 'author': "Akretion,Odoo Community Association (OCA)",
- 'license': 'AGPL-3',
- 'website': 'http://www.akretion.com',
- 'description': """
-RMA Claim Mass Return by Lot
-============================
-
-This module adds possibility to return a whole lot of product from a Claim
-and create a incoming shipment for them.
-
-
-WARNING: This module is currently not yet completely debugged and is waiting his author to be.
-
-""",
- 'images': [],
- 'demo': [],
- 'data': [
-        'wizard/returned_lines_from_serial_wizard_view.xml',
-        'crm_rma_view.xml',
- ],
- 'installable': False,
- 'application': True,
+{
+    'name': 'RMA Claims Mass Return by Lot',
+    'version': '8.0.1.0.0',
+    'category': 'Generic Modules/CRM & SRM',
+    'author': 'Vauxoo,Akretion,Odoo Community Association (OCA)',
+    'license': 'AGPL-3',
+    'website': 'http://www.vauxoo.com, http://www.akretion.com',
+    'depends': [
+        'crm_claim_rma',
+        'crm_rma_prodlot_invoice',
+        'crm_rma_prodlot_supplier',
+    ],
+    'data': [
+        'wizards/returned_lines_from_serial_wizard.xml',
+        'views/crm_claim.xml',
+        'templates/search_view.xml'
+    ],
+    'demo': [
+        'demo/stock_production_lot.xml',
+        'demo/purchase_order.xml',
+        # 'demo/sale_order.xml',
+        'demo/transfer_details.xml',
+    ],
+    'installable': True,
+    'auto_install': False
 }
diff --git a/crm_rma_lot_mass_return/crm_rma_view.xml b/crm_rma_lot_mass_return/crm_rma_view.xml
deleted file mode 100644
index b71614e0..00000000
--- a/crm_rma_lot_mass_return/crm_rma_view.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-    <data>
-    <record model="ir.ui.view" id="crm_claim_rma_form_view">
-        <field name="name">CRM - Claim product return Form</field>
-        <field name="model">crm.claim</field>
-        <field name="inherit_id" ref="crm_claim_rma.crm_claim_rma_form_view"/>
-        <field name="arch" type="xml">
-            <xpath expr="//page[@string='Product Return']/group/group[2]" position="inside">
-                <button name="%(action_create_return_serial)d" string="Mass return from serial/lot" states="draft,open" type="action" target="new"/>
-            </xpath>
-        </field>
-    </record>
-
-     </data>
-</openerp>
diff --git a/crm_rma_lot_mass_return/demo/purchase_order.xml b/crm_rma_lot_mass_return/demo/purchase_order.xml
new file mode 100644
index 00000000..34008801
--- /dev/null
+++ b/crm_rma_lot_mass_return/demo/purchase_order.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0"?>
+<openerp>
+    <data noupdate="1">
+
+        <!-- Purchase Order -->
+
+        <record id="po_wizard_rma_1" model="purchase.order">
+            <field name="name">POWIZARDCLAIM001</field>
+            <field name="date_order">2015-05-08 18:17:05</field>
+            <field name="invoice_method">order</field>
+            <field name="partner_id" ref="base.res_partner_21"/>
+            <field name="currency_id" ref="base.EUR"/>
+            <field name="pricelist_id" ref="purchase.list0"/>
+            <field name="location_id" ref="stock.stock_location_stock"/>
+        </record>
+
+        <!-- Purchase Order Lines-->
+
+        <record id="po_wizard_rma_1_line_1" model="purchase.order.line">
+            <field name="name">POWIZARDCLAIM001 Line 1</field>
+            <field name="order_id" ref="po_wizard_rma_1"/>
+            <field name="product_id" ref="product.product_product_38"/>
+            <field name="product_qty">10</field>
+            <field name="price_unit">60.0</field>
+            <field name="date_planned">2015-05-08</field>
+        </record>
+
+        <record id="po_wizard_rma_1_line_2" model="purchase.order.line">
+            <field name="name">POWIZARDCLAIM001 Line 2</field>
+            <field name="order_id" ref="po_wizard_rma_1"/>
+            <field name="product_id" ref="product.product_product_39"/>
+            <field name="product_qty">10</field>
+            <field name="price_unit">66.0</field>
+            <field name="date_planned">2015-05-08</field>
+        </record>
+
+        <record id="po_wizard_rma_1_line_3" model="purchase.order.line">
+            <field name="name">POWIZARDCLAIM001 Line 3</field>
+            <field name="order_id" ref="po_wizard_rma_1"/>
+            <field name="product_id" ref="product.product_product_6"/>
+            <field name="product_qty">10</field>
+            <field name="price_unit">800.0</field>
+            <field name="date_planned">2015-05-08</field>
+        </record>
+
+        <record id="po_wizard_rma_1_line_4" model="purchase.order.line">
+            <field name="name">POWIZARDCLAIM001 Line 4</field>
+            <field name="order_id" ref="po_wizard_rma_1"/>
+            <field name="product_id" ref="product.product_product_8"/>
+            <field name="product_qty">7</field>
+            <field name="price_unit">1299.0</field>
+            <field name="date_planned">2015-05-08</field>
+        </record>
+
+        <!-- Confirm Purchase Order, (Invoice and Picking is created automatically) -->
+
+        <workflow action="purchase_confirm"
+            model="purchase.order"
+            ref="po_wizard_rma_1"/>
+
+        <workflow action="purchase_approve"
+            model="purchase.order"
+            ref="po_wizard_rma_1"/>
+
+        <workflow action="invoice_open" model="account.invoice">
+            <value eval="obj(ref('po_wizard_rma_1')).invoice_ids[0].id" model="purchase.order"/>
+        </workflow>
+    </data>
+</openerp>
diff --git a/crm_rma_lot_mass_return/demo/sale_order.xml b/crm_rma_lot_mass_return/demo/sale_order.xml
new file mode 100644
index 00000000..596117af
--- /dev/null
+++ b/crm_rma_lot_mass_return/demo/sale_order.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0"?>
+<openerp>
+    <data noupdate="1">
+
+        <record id="so_wizard_rma_1" model="sale.order">
+            <field name="name">SOWIZARDCLAIM001</field>
+            <field name="date_order">2015-05-08 18:17:05</field>
+            <field name="partner_id" ref="base.res_partner_12"/>
+            <field name="currency_id" ref="base.EUR"/>
+            <field name="pricelist_id" ref="product.list0"/>
+        </record>
+
+        <record id="so_wizard_rma_1_line_1" model="sale.order.line">
+            <field name="name">SOWIZARDCLAIM001 Line 1</field>
+            <field name="order_id" ref="so_wizard_rma_1"/>
+            <field name="product_id" ref="product.product_product_38"/>
+            <field name="product_uom_qty">1</field>
+            <field name="price_unit">65.0</field>
+        </record>
+
+        <record id="so_wizard_rma_1_line_2" model="sale.order.line">
+            <field name="name">SOWIZARDCLAIM001 Line 2</field>
+            <field name="order_id" ref="so_wizard_rma_1"/>
+            <field name="product_id" ref="product.product_product_39"/>
+            <field name="product_uom_qty">2</field>
+            <field name="price_unit">66.0</field>
+        </record>
+
+        <record id="so_wizard_rma_1_line_3" model="sale.order.line">
+            <field name="name">SOWIZARDCLAIM001 Line 3</field>
+            <field name="order_id" ref="so_wizard_rma_1"/>
+            <field name="product_id" ref="product.product_product_6"/>
+            <field name="product_uom_qty">1</field>
+            <field name="price_unit">800.0</field>
+        </record>
+
+        <record id="so_wizard_rma_1_line_4" model="sale.order.line">
+            <field name="name">SOWIZARDCLAIM001 Line 4</field>
+            <field name="order_id" ref="so_wizard_rma_1"/>
+            <field name="product_id" ref="product.product_product_8"/>
+            <field name="product_uom_qty">5</field>
+            <field name="price_unit">1299.0</field>
+        </record>
+
+        <workflow action="order_confirm" model="sale.order" ref="so_wizard_rma_1"/>
+
+        <workflow action="manual_invoice" model="sale.order" ref="so_wizard_rma_1" uid="base.user_root"/>
+
+        <workflow action="invoice_open" model="account.invoice">
+            <value eval="obj(ref('so_wizard_rma_1')).invoice_ids[0].id" model="sale.order"/>
+        </workflow>
+
+        <function model="account.invoice" name="pay_and_reconcile">
+            <!-- ids = -->  <value eval="obj(ref('so_wizard_rma_1')).invoice_ids[0].id" model="sale.order"/>
+            <!-- amount = -->            <value eval="30000"/>
+            <!-- account_id = -->        <value eval="ref('account.cash')"/>
+            <!-- period_id = -->            <value eval="ref('account.period_10')"/>
+            <!-- journal_id = -->        <value eval="ref('account.bank_journal')"/>
+            <!-- writeoff_acc_id = -->        <value eval="ref('account.cash')"/>
+            <!-- writeoff_period_id = -->    <value eval="ref('account.period_10')"/>
+            <!-- writeoff_journal_id = -->    <value eval="ref('account.bank_journal')"/>
+            <!-- context = -->              <value eval="{}"/>
+            <!-- name = -->                 <value eval="str('Payment WIzard RMA')"/>
+        </function>
+
+    </data>
+</openerp>
diff --git a/crm_rma_lot_mass_return/demo/stock_production_lot.xml b/crm_rma_lot_mass_return/demo/stock_production_lot.xml
new file mode 100644
index 00000000..f0748198
--- /dev/null
+++ b/crm_rma_lot_mass_return/demo/stock_production_lot.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0"?>
+<openerp>
+    <data noupdate="1">
+
+        <record id="lot_purchase_wizard_rma_item_1" model="stock.production.lot">
+            <field name="name">MAC0001</field>
+            <field name="ref">MAC0001</field>
+            <field name="product_id" ref="product.product_product_8"/>
+        </record>
+
+        <record id="lot_purchase_wizard_rma_item_2" model="stock.production.lot">
+            <field name="name">MAC0002</field>
+            <field name="ref">MAC0002</field>
+            <field name="product_id" ref="product.product_product_8"/>
+        </record>
+
+        <record id="lot_purchase_wizard_rma_item_3" model="stock.production.lot">
+            <field name="name">MAC0003</field>
+            <field name="ref">MAC0003</field>
+            <field name="product_id" ref="product.product_product_8"/>
+        </record>
+
+        <record id="lot_purchase_wizard_rma_item_4" model="stock.production.lot">
+            <field name="name">MAC0004</field>
+            <field name="ref">MAC0004</field>
+            <field name="product_id" ref="product.product_product_8"/>
+        </record>
+
+        <record id="lot_purchase_wizard_rma_item_5" model="stock.production.lot">
+            <field name="name">IPAD0001</field>
+            <field name="ref">IPAD0001</field>
+            <field name="product_id" ref="product.product_product_6"/>
+        </record>
+
+
+    </data>
+</openerp>
diff --git a/crm_rma_lot_mass_return/demo/transfer_details.xml b/crm_rma_lot_mass_return/demo/transfer_details.xml
new file mode 100644
index 00000000..91970fbf
--- /dev/null
+++ b/crm_rma_lot_mass_return/demo/transfer_details.xml
@@ -0,0 +1,196 @@
+<?xml version="1.0"?>
+<openerp>
+    <data noupdate="1">
+        <!--Transfer of Products in the Picking of Purchase Order -->
+
+        <record id="transfer_purchase_wizard_rma" model="stock.transfer_details">
+            <field name="picking_id" model="stock.picking" search="[('origin', '=', 'POWIZARDCLAIM001')]"/>
+            <field name="picking_source_location_id" ref="stock.stock_location_suppliers"/>
+            <field name="picking_destination_location_id" ref="stock.stock_location_stock"/>
+        </record>
+
+
+        <!-- Transfer Detail Items of Product Transfer -->
+
+        <record id="transfer_purchase_wizard_rma_item_1" model="stock.transfer_details_items">
+            <field name="transfer_id" ref="transfer_purchase_wizard_rma"/>
+            <field name="product_id" ref="product.product_product_8"/>
+            <field name="product_uom_id" ref="product.product_uom_unit"/>
+            <field name="quantity">1</field>
+            <field name="sourceloc_id" ref="stock.stock_location_suppliers"/>
+            <field name="destinationloc_id"  ref="stock.stock_location_stock"/>
+            <field name="lot_id" ref="lot_purchase_wizard_rma_item_1"/>
+        </record>
+
+        <record id="transfer_purchase_wizard_rma_item_2" model="stock.transfer_details_items">
+            <field name="transfer_id" ref="transfer_purchase_wizard_rma"/>
+            <field name="product_id" ref="product.product_product_8"/>
+            <field name="product_uom_id" ref="product.product_uom_unit"/>
+            <field name="quantity">1</field>
+            <field name="sourceloc_id" ref="stock.stock_location_suppliers"/>
+            <field name="destinationloc_id"  ref="stock.stock_location_stock"/>
+            <field name="lot_id" ref="lot_purchase_wizard_rma_item_2"/>
+        </record>
+
+        <record id="transfer_purchase_wizard_rma_item_3" model="stock.transfer_details_items">
+            <field name="transfer_id" ref="transfer_purchase_wizard_rma"/>
+            <field name="product_id" ref="product.product_product_8"/>
+            <field name="product_uom_id" ref="product.product_uom_unit"/>
+            <field name="quantity">1</field>
+            <field name="sourceloc_id" ref="stock.stock_location_suppliers"/>
+            <field name="destinationloc_id"  ref="stock.stock_location_stock"/>
+            <field name="lot_id" ref="lot_purchase_wizard_rma_item_3"/>
+        </record>
+
+        <record id="transfer_purchase_wizard_rma_item_4" model="stock.transfer_details_items">
+            <field name="transfer_id" ref="transfer_purchase_wizard_rma"/>
+            <field name="product_id" ref="product.product_product_8"/>
+            <field name="product_uom_id" ref="product.product_uom_unit"/>
+            <field name="quantity">1</field>
+            <field name="sourceloc_id" ref="stock.stock_location_suppliers"/>
+            <field name="destinationloc_id"  ref="stock.stock_location_stock"/>
+            <field name="lot_id" ref="lot_purchase_wizard_rma_item_4"/>
+        </record>
+
+        <record id="transfer_purchase_wizard_rma_item_5" model="stock.transfer_details_items">
+            <field name="transfer_id" ref="transfer_purchase_wizard_rma"/>
+            <field name="product_id" ref="product.product_product_6"/>
+            <field name="product_uom_id" ref="product.product_uom_unit"/>
+            <field name="quantity">1</field>
+            <field name="sourceloc_id" ref="stock.stock_location_suppliers"/>
+            <field name="destinationloc_id"  ref="stock.stock_location_stock"/>
+            <field name="lot_id" ref="lot_purchase_wizard_rma_item_5"/>
+        </record>
+
+        <!-- two MAC without lot -->
+        <record id="transfer_purchase_wizard_rma_item_6" model="stock.transfer_details_items">
+            <field name="transfer_id" ref="transfer_purchase_wizard_rma"/>
+            <field name="product_id" ref="product.product_product_8"/>
+            <field name="product_uom_id" ref="product.product_uom_unit"/>
+            <field name="quantity">2</field>
+            <field name="sourceloc_id" ref="stock.stock_location_suppliers"/>
+            <field name="destinationloc_id"  ref="stock.stock_location_stock"/>
+        </record>
+
+
+        <record id="transfer_purchase_wizard_rma_item_7" model="stock.transfer_details_items">
+            <field name="transfer_id" ref="transfer_purchase_wizard_rma"/>
+            <field name="product_id" ref="product.product_product_39"/>
+            <field name="product_uom_id" ref="product.product_uom_unit"/>
+            <field name="quantity">1</field>
+            <field name="sourceloc_id" ref="stock.stock_location_suppliers"/>
+            <field name="destinationloc_id"  ref="stock.stock_location_stock"/>
+        </record>
+
+
+        <record id="transfer_purchase_wizard_rma_item_8" model="stock.transfer_details_items">
+            <field name="transfer_id" ref="transfer_purchase_wizard_rma"/>
+            <field name="product_id" ref="product.product_product_39"/>
+            <field name="product_uom_id" ref="product.product_uom_unit"/>
+            <field name="quantity">1</field>
+            <field name="sourceloc_id" ref="stock.stock_location_suppliers"/>
+            <field name="destinationloc_id"  ref="stock.stock_location_stock"/>
+        </record>
+
+
+        <record id="transfer_purchase_wizard_rma_item_9" model="stock.transfer_details_items">
+            <field name="transfer_id" ref="transfer_purchase_wizard_rma"/>
+            <field name="product_id" ref="product.product_product_38"/>
+            <field name="product_uom_id" ref="product.product_uom_unit"/>
+            <field name="quantity">1</field>
+            <field name="sourceloc_id" ref="stock.stock_location_suppliers"/>
+            <field name="destinationloc_id"  ref="stock.stock_location_stock"/>
+        </record>
+
+        <!-- Make transfer of product -->
+
+        <function model="stock.transfer_details"
+            name="do_detailed_transfer" eval="[ref('transfer_purchase_wizard_rma')]"/>
+
+
+
+        <!-- Transfer of Products in the Picking of Purchase Order 2 -->
+
+        <record id="transfer_sale_wizard_rma" model="stock.transfer_details">
+            <field name="picking_id" model="stock.picking" search="[('origin', '=', 'SOWIZARDCLAIM001')]"/>
+            <field name="picking_source_location_id" ref="stock.stock_location_stock"/>
+            <field name="picking_destination_location_id" ref="stock.stock_location_customers"/>
+        </record>
+
+        <!-- Transfer Detail Items Part 2 of Product Transfer -->
+
+        <record id="transfer_sale_wizard_rma_item_1" model="stock.transfer_details_items">
+            <field name="transfer_id" ref="transfer_sale_wizard_rma"/>
+            <field name="product_id" ref="product.product_product_38"/>
+            <field name="product_uom_id" ref="product.product_uom_unit"/>
+            <field name="quantity">1</field>
+            <field name="sourceloc_id"  ref="stock.stock_location_stock"/>
+            <field name="destinationloc_id" ref="stock.stock_location_customers"/>
+        </record>
+
+        <record id="transfer_sale_wizard_rma_item_2" model="stock.transfer_details_items">
+            <field name="transfer_id" ref="transfer_sale_wizard_rma"/>
+            <field name="product_id" ref="product.product_product_39"/>
+            <field name="product_uom_id" ref="product.product_uom_unit"/>
+            <field name="quantity">2</field>
+            <field name="sourceloc_id"  ref="stock.stock_location_stock"/>
+            <field name="destinationloc_id" ref="stock.stock_location_customers"/>
+        </record>
+
+        <record id="transfer_sale_wizard_rma_item_3" model="stock.transfer_details_items">
+            <field name="transfer_id" ref="transfer_sale_wizard_rma"/>
+            <field name="product_id" ref="product.product_product_6"/>
+            <field name="product_uom_id" ref="product.product_uom_unit"/>
+            <field name="quantity">1</field>
+            <field name="sourceloc_id"  ref="stock.stock_location_stock"/>
+            <field name="destinationloc_id" ref="stock.stock_location_customers"/>
+            <field name="lot_id" ref="lot_purchase_wizard_rma_item_5"/>
+        </record>
+
+        <record id="transfer_sale_wizard_rma_item_4" model="stock.transfer_details_items">
+            <field name="transfer_id" ref="transfer_sale_wizard_rma"/>
+            <field name="product_id" ref="product.product_product_8"/>
+            <field name="product_uom_id" ref="product.product_uom_unit"/>
+            <field name="quantity">1</field>
+            <field name="sourceloc_id"  ref="stock.stock_location_stock"/>
+            <field name="destinationloc_id" ref="stock.stock_location_customers"/>
+            <field name="lot_id" ref="lot_purchase_wizard_rma_item_1"/>
+        </record>
+
+        <record id="transfer_sale_wizard_rma_item_5" model="stock.transfer_details_items">
+            <field name="transfer_id" ref="transfer_sale_wizard_rma"/>
+            <field name="product_id" ref="product.product_product_8"/>
+            <field name="product_uom_id" ref="product.product_uom_unit"/>
+            <field name="quantity">1</field>
+            <field name="sourceloc_id"  ref="stock.stock_location_stock"/>
+            <field name="destinationloc_id" ref="stock.stock_location_customers"/>
+            <field name="lot_id" ref="lot_purchase_wizard_rma_item_2"/>
+        </record>
+
+        <record id="transfer_sale_wizard_rma_item_6" model="stock.transfer_details_items">
+            <field name="transfer_id" ref="transfer_sale_wizard_rma"/>
+            <field name="product_id" ref="product.product_product_8"/>
+            <field name="product_uom_id" ref="product.product_uom_unit"/>
+            <field name="quantity">1</field>
+            <field name="sourceloc_id"  ref="stock.stock_location_stock"/>
+            <field name="destinationloc_id" ref="stock.stock_location_customers"/>
+            <field name="lot_id" ref="lot_purchase_wizard_rma_item_3"/>
+        </record>
+
+        <record id="transfer_sale_wizard_rma_item_7" model="stock.transfer_details_items">
+            <field name="transfer_id" ref="transfer_sale_wizard_rma"/>
+            <field name="product_id" ref="product.product_product_8"/>
+            <field name="product_uom_id" ref="product.product_uom_unit"/>
+            <field name="quantity">1</field>
+            <field name="sourceloc_id"  ref="stock.stock_location_stock"/>
+            <field name="destinationloc_id" ref="stock.stock_location_customers"/>
+            <field name="lot_id" ref="lot_purchase_wizard_rma_item_4"/>
+        </record>
+
+        <!-- Make transfer of product -->
+
+        <function model="stock.transfer_details"
+            name="do_detailed_transfer" eval="[ref('transfer_sale_wizard_rma')]"/>
+
+    </data>
+</openerp>
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
index 11c60937..8b91b666 100644
--- 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
@@ -1,13 +1,13 @@
-# Translation of OpenERP Server.
+# Translation of Odoo 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"
+"Project-Id-Version: Odoo Server 8.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"
+"POT-Creation-Date: 2015-10-16 03:32+0000\n"
+"PO-Revision-Date: 2015-10-16 03:32+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,52 +16,160 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: crm_rma_lot_mass_return
-#: view:crm.claim:0
-msgid "Mass return from serial/lot"
+#. openerp-web
+#: code:addons/crm_rma_lot_mass_return/static/src/js/barcode_text.js:90
+#, python-format
+msgid "-->"
 msgstr ""
 
 #. module: crm_rma_lot_mass_return
-#: view:returned_lines_from_serial.wizard:0
-msgid "Claim short description"
+#: model:ir.model,name:crm_rma_lot_mass_return.model_crm_claim
+msgid "Claim"
 msgstr ""
 
 #. module: crm_rma_lot_mass_return
-#: view:returned_lines_from_serial.wizard:0
-msgid "Select serial numbers to create"
+#: field:returned.lines.from.serial.wizard,create_uid:0
+msgid "Created by"
 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"
+#: field:returned.lines.from.serial.wizard,create_date:0
+msgid "Created on"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: help:returned.lines.from.serial.wizard,scan_data:0
+msgid "Field used to load and show the products"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: help:returned.lines.from.serial.wizard,lines_id:0
+msgid "Field used to load the ids of invoice lines in invoices writed"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: help:returned.lines.from.serial.wizard,scaned_data:0
+msgid "Field used to load the ids of products loaded"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: help:returned.lines.from.serial.wizard,lines_list_id:0
+msgid "Field used to show the current status of the lots loaded"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: help:returned.lines.from.serial.wizard,current_status:0
+msgid "Field used to show the current status of the product loaded(Name and quantity)"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: field:returned.lines.from.serial.wizard,id:0
+msgid "ID"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: field:returned.lines.from.serial.wizard,lines_id:0
+msgid "Invoice Lines to Select"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: field:returned.lines.from.serial.wizard,write_uid:0
+msgid "Last Updated by"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: field:returned.lines.from.serial.wizard,write_date:0
+msgid "Last Updated on"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: field:returned.lines.from.serial.wizard,lines_list_id:0
+msgid "Lots selected"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: view:crm.claim:crm_rma_lot_mass_return.crm_claim_rma_form_view_meta
+msgid "Mass return from serial/lot or invoice"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#. openerp-web
+#: code:addons/crm_rma_lot_mass_return/static/src/js/barcode_text.js:93
+#, python-format
+msgid "Ok"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: field:returned.lines.from.serial.wizard,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: field:returned.lines.from.serial.wizard,scan_data:0
+#: field:returned.lines.from.serial.wizard,scaned_data:0
+msgid "Products"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: code:addons/crm_rma_lot_mass_return/wizards/returned_lines_from_serial.py:141
+#, python-format
+msgid "Search Product"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: field:returned.lines.from.serial.wizard,current_status:0
+msgid "Status"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: code:addons/crm_rma_lot_mass_return/wizards/returned_lines_from_serial.py:299
+#, python-format
+msgid "The following Serial/Lot numbers were not added, because all of them (listed below) are currently in use:\n"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: code:addons/crm_rma_lot_mass_return/wizards/returned_lines_from_serial.py:221
+#, python-format
+msgid "The product or invoice %s was not found"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: view:crm.claim:crm_rma_lot_mass_return.crm_claim_rma_form_view_meta
+msgid "True"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Validate the actual picking, it will execute all the validations and the inventory will be affected"
 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"
+msgid "Wizard to create product return lines"
 msgstr ""
 
 #. module: crm_rma_lot_mass_return
-#: view:returned_lines_from_serial.wizard:0
-msgid "Quantity returned"
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Write the Invoice Number to search the products in lines"
 msgstr ""
 
 #. module: crm_rma_lot_mass_return
-#: view:returned_lines_from_serial.wizard:0
-msgid "Save and close"
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Write the Serial/Lot Number to search the product"
 msgstr ""
 
 #. module: crm_rma_lot_mass_return
-#: view:returned_lines_from_serial.wizard:0
-msgid "Save and new"
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "You add new returns in claim, are you sure?."
 msgstr ""
 
 #. module: crm_rma_lot_mass_return
-#: view:returned_lines_from_serial.wizard:0
-msgid "Cancel"
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "You should use this windows on this way."
 msgstr ""
 
 #. module: crm_rma_lot_mass_return
-#: view:returned_lines_from_serial.wizard:0
-msgid "Serial / Lot Number"
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "_Validate"
 msgstr ""
 
diff --git a/crm_rma_lot_mass_return/i18n/es.po b/crm_rma_lot_mass_return/i18n/es.po
new file mode 100644
index 00000000..bdc345ff
--- /dev/null
+++ b/crm_rma_lot_mass_return/i18n/es.po
@@ -0,0 +1,181 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* crm_rma_lot_mass_return
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 8.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-07-21 01:59+0000\n"
+"PO-Revision-Date: 2015-07-21 01:59+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
+#. openerp-web
+#: code:addons/crm_rma_lot_mass_return/static/src/js/barcode_text.js:89
+#, python-format
+msgid "-->"
+msgstr "-->"
+
+#. module: crm_rma_lot_mass_return
+#: model:ir.model,name:crm_rma_lot_mass_return.model_crm_claim
+msgid "Claim"
+msgstr "Reclamo"
+
+#. module: crm_rma_lot_mass_return
+#: field:returned.lines.from.serial.wizard,create_uid:0
+msgid "Created by"
+msgstr "Creado por"
+
+#. module: crm_rma_lot_mass_return
+#: field:returned.lines.from.serial.wizard,create_date:0
+msgid "Created on"
+msgstr "Creado en"
+
+#. module: crm_rma_lot_mass_return
+#: code:addons/crm_rma_lot_mass_return/wizards/returned_lines_from_serial.py:111
+#, python-format
+msgid "Error!"
+msgstr "Error!"
+
+#. module: crm_rma_lot_mass_return
+#: help:returned.lines.from.serial.wizard,scan_data:0
+msgid "Field used to load and show the products"
+msgstr "Campo usado para cargar y ver los productos"
+
+#. module: crm_rma_lot_mass_return
+#: help:returned.lines.from.serial.wizard,lines_id:0
+msgid "Field used to load the ids of invoice lines in invoices writed"
+msgstr "Campo usado para cargar los ids de las líneas de factura en facturas editadas"
+
+#. module: crm_rma_lot_mass_return
+#: help:returned.lines.from.serial.wizard,scaned_data:0
+msgid "Field used to load the ids of products loaded"
+msgstr "Campo usado para cargar los ids de los productos cargados"
+
+#. module: crm_rma_lot_mass_return
+#: help:returned.lines.from.serial.wizard,lines_list_id:0
+msgid "Field used to show the current status of the invoice lines loaded"
+msgstr "Campo usado para visualizar el estado actual de las línea de factura cargadas"
+
+#. module: crm_rma_lot_mass_return
+#: help:returned.lines.from.serial.wizard,current_status:0
+msgid "Field used to show the current status of the product loaded(Name and quantity)"
+msgstr "Campo usado para visualizar el estado actual de los productos cargados (Nombre y cantidad)"
+
+#. module: crm_rma_lot_mass_return
+#: field:returned.lines.from.serial.wizard,id:0
+msgid "ID"
+msgstr "ID"
+
+#. module: crm_rma_lot_mass_return
+#: field:returned.lines.from.serial.wizard,lines_list_id:0
+msgid "Invoice Lines selected"
+msgstr "Líneas de factura seleccionadas"
+
+#. module: crm_rma_lot_mass_return
+#: field:returned.lines.from.serial.wizard,lines_id:0
+msgid "Invoice Lines to Select"
+msgstr "Líneas de factura a seleccionar"
+
+#. module: crm_rma_lot_mass_return
+#: field:returned.lines.from.serial.wizard,write_uid:0
+msgid "Last Updated by"
+msgstr "Última actualización hecha por"
+
+#. module: crm_rma_lot_mass_return
+#: field:returned.lines.from.serial.wizard,write_date:0
+msgid "Last Updated on"
+msgstr "Última actualización hecha en"
+
+#. module: crm_rma_lot_mass_return
+#: view:crm.claim:crm_rma_lot_mass_return.crm_claim_rma_form_view_meta
+msgid "Add claim lines using serial or invoice number"
+msgstr "Agregar devoluciones usando número de serial o de factura"
+
+#. module: crm_rma_lot_mass_return
+#. openerp-web
+#: code:addons/crm_rma_lot_mass_return/static/src/js/barcode_text.js:90
+#, python-format
+msgid "Ok"
+msgstr "Ok"
+
+#. module: crm_rma_lot_mass_return
+#: field:returned.lines.from.serial.wizard,partner_id:0
+msgid "Partner"
+msgstr "Socio"
+
+#. module: crm_rma_lot_mass_return
+#: field:returned.lines.from.serial.wizard,scan_data:0
+#: field:returned.lines.from.serial.wizard,scaned_data:0
+msgid "Products"
+msgstr "Productos"
+
+#. module: crm_rma_lot_mass_return
+#: code:addons/crm_rma_lot_mass_return/wizard/returned_lines_from_serial.py:213
+#, python-format
+msgid "Search Product"
+msgstr "Buscar producto"
+
+#. module: crm_rma_lot_mass_return
+#: field:returned.lines.from.serial.wizard,current_status:0
+msgid "Status"
+msgstr "Estado"
+
+#. module: crm_rma_lot_mass_return
+#: code:addons/crm_rma_lot_mass_return/wizard/returned_lines_from_serial.py:285
+#, python-format
+msgid "The product or invoice %s was not found"
+msgstr "El producto o factura %s no fué encontrado"
+
+#. module: crm_rma_lot_mass_return
+#: code:addons/crm_rma_lot_mass_return/wizard/returned_lines_from_serial.py:112
+#, python-format
+msgid "There is no warehouse for the current user's company."
+msgstr "No existe un almacén para la compañia del usuario actual"
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Validate the actual picking, it will execute all the validations and the inventory will be affected"
+msgstr "Validar el albarán actual, ejecutará todas las validaciones y el inventario será afectado."
+
+#. 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 "Wizard para crear líneas de devolución de productos usando el número de serie o lote"
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Write the Invoice Number to search the products in lines"
+msgstr "Escribir el número de factura para buscar los productos en las líneas"
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Write the Serial/Lot Number to search the product"
+msgstr "Escribir el número de serie o lote para buscar el producto."
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "You add new returns in claim, are you sure?."
+msgstr "Agregarás nuevas devoluciones en el reclamo, ¿Estás seguro?"
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "You should use this windows on this way."
+msgstr "Deberías usar ésta ventana"
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "_Validate"
+msgstr "_Validar"
+
+#. module: crm_rma_lot_mass_return
+#: code:addons/crm_rma_lot_mass_return/wizards/returned_lines_from_serial.py:585
+#, python-format
+msgid "The following Serial/Lot numbers won't be added, because all of them (listed below) are currently in use:\n\n %s"
+msgstr "los siguientes números de seriales no pueden ser agregados, porque todos ellos (listados abajo) están actualmente en uso:\n\n %s"
diff --git a/crm_rma_lot_mass_return/i18n/es_MX.po b/crm_rma_lot_mass_return/i18n/es_MX.po
new file mode 100644
index 00000000..431f0cc2
--- /dev/null
+++ b/crm_rma_lot_mass_return/i18n/es_MX.po
@@ -0,0 +1,16 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* crm_rma_lot_mass_return
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 8.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-07-17 19:54+0000\n"
+"PO-Revision-Date: 2015-07-17 19:54+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"
diff --git a/crm_rma_lot_mass_return/i18n/es_PA.po b/crm_rma_lot_mass_return/i18n/es_PA.po
new file mode 100644
index 00000000..431f0cc2
--- /dev/null
+++ b/crm_rma_lot_mass_return/i18n/es_PA.po
@@ -0,0 +1,16 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* crm_rma_lot_mass_return
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 8.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-07-17 19:54+0000\n"
+"PO-Revision-Date: 2015-07-17 19:54+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"
diff --git a/crm_rma_lot_mass_return/i18n/es_VE.po b/crm_rma_lot_mass_return/i18n/es_VE.po
new file mode 100644
index 00000000..431f0cc2
--- /dev/null
+++ b/crm_rma_lot_mass_return/i18n/es_VE.po
@@ -0,0 +1,16 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* crm_rma_lot_mass_return
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 8.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-07-17 19:54+0000\n"
+"PO-Revision-Date: 2015-07-17 19:54+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"
diff --git a/crm_rma_lot_mass_return/models/__init__.py b/crm_rma_lot_mass_return/models/__init__.py
new file mode 100644
index 00000000..a50e5165
--- /dev/null
+++ b/crm_rma_lot_mass_return/models/__init__.py
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Copyright 2015 Vauxoo
+#    Author: Osval Reyes, Yanina Aular
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from . import crm_claim
diff --git a/crm_rma_lot_mass_return/models/crm_claim.py b/crm_rma_lot_mass_return/models/crm_claim.py
new file mode 100644
index 00000000..19b4aa87
--- /dev/null
+++ b/crm_rma_lot_mass_return/models/crm_claim.py
@@ -0,0 +1,58 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Copyright 2015 Vauxoo
+#    Author: Osval Reyes, Yanina Aular
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp import api, models
+
+
+class CrmClaim(models.Model):
+
+    _inherit = 'crm.claim'
+
+    @api.model
+    def _get_stock_moves_with_code(self, code='incoming'):
+        """
+        @code: Type of operation code.
+        Returns all stock_move with filtered by type of
+        operation.
+        """
+        stockmove = self.env['stock.move']
+        receipts = self.env['stock.picking.type']
+
+        spt_receipts = receipts.search([('code',
+                                         '=',
+                                         code)])
+        spt_receipts = [spt.id for spt in spt_receipts]
+        sm_receipts = stockmove.search([('picking_type_id',
+                                         'in',
+                                         spt_receipts)])
+        return sm_receipts
+
+    @api.multi
+    def render_metasearch_view(self):
+        context = self._context.copy()
+        context.update({
+            'active_model': self._name,
+            'active_ids': self.ids,
+            'active_id': self.id or False,
+        })
+        wizard = self.env['returned.lines.from.serial.wizard'].\
+            with_context(context).create({})
+        return wizard.render_metasearch_view()
diff --git a/crm_rma_lot_mass_return/static/src/js/barcode_text.js b/crm_rma_lot_mass_return/static/src/js/barcode_text.js
new file mode 100644
index 00000000..e4d3f9eb
--- /dev/null
+++ b/crm_rma_lot_mass_return/static/src/js/barcode_text.js
@@ -0,0 +1,115 @@
+openerp.crm_rma_lot_mass_return = function(openerp) {
+    var _t = openerp.web._t,
+        _lt = openerp.web._lt;
+    var QWeb = openerp.web.qweb;
+    /*
+    This widget is suposed to be used only in places where you need to load several
+    barcodes at same time. In order to save locally information and trigger save
+    data "ala onchange" but without lose the focus.
+    */
+    openerp.web.form.BarcodeText = openerp.web.form.FieldText.extend({
+        events: {
+            'keyup': function(e) {
+                if (e.which === $.ui.keyCode.ENTER) {
+                    this.store_dom_value();
+                    e.stopPropagation();
+
+                }
+            },
+            'keypress': function(e) {
+                if (e.which === $.ui.keyCode.ENTER) {
+                    this.store_dom_value();
+                    e.stopPropagation();
+                }
+            },
+            'change textarea': function(e) {
+                this.store_dom_value();
+                e.stopPropagation();
+                $('textarea[name="scan_data"]').focus();
+                $('textarea[name="scan_data"]').trigger('focus');
+
+
+            },
+        },
+    });
+
+    openerp.web.form.ChangeFocus = openerp.web.form.FieldChar.extend({
+
+        events: {
+            'keyup': function(e) {
+                if (e.which === $.ui.keyCode.ENTER) {
+                    $('textarea[name="scan_data"]').focus();
+                    this.store_dom_value();
+                    e.stopPropagation();
+
+                }
+            },
+            'keypress': function(e) {
+                if (e.which === 0 || e.which === $.ui.keyCode.TAB) {
+                    $('textarea[name="scan_data"]').focus();
+                    this.store_dom_value();
+                    e.stopPropagation();
+                }
+            },
+            'change input': function(e) {
+                this.store_dom_value();
+                e.stopPropagation();
+                $('.packing_cache_button').click(function(e) {
+                    $('body').off("keypress");
+                });
+                $('body').keypress(function(p) {
+                    if ($._data($('body')[0], 'events').keypress.length > 1) {
+                        $._data($('body')[0], 'events').keypress.pop();
+
+                    }
+                    var search = p.target.parentElement.className.search('pack_search');
+                    if (p.target.name != 'scan_data' && search < 0 && p.keyCode === $.ui.keyCode.ENTER){
+                        playAlert.volume(0.9);
+                        playAlert('purr');
+                    }
+                });
+                $('textarea[name="scan_data"]').focus();
+                $('textarea[name="scan_data"]').trigger('focus');
+
+
+            },
+        },
+
+    });
+    openerp.web.FormView.include({
+        on_processed_onchange: function(result){
+            try {
+                var result2 = result;
+                if (!_.isEmpty(result2.warning) && this.model == 'returned.lines.from.serial.wizard') {
+                    playAlert.volume(0.9);
+                    playAlert('purr');
+                    new openerp.web.Dialog(this, {
+                        size: 'medium',
+                        title: result2.warning.title,
+                        buttons: [{
+                            text: _t("-->"),
+                            click: function() {}
+                        }, {
+                            text: _t("Ok"),
+                            click: function() {
+                                this.parents('.modal').modal('hide');
+                            }
+                        }]
+                    }, QWeb.render("CrashManager.warning", result2.warning)).open();
+
+                    $("span:contains('-->')").focus();
+                } else {
+                    this._super.apply(this, arguments);
+                }
+            } catch (e) {
+                console.error(e);
+                openerp.webclient.crashmanager.show_message(e);
+                return $.Deferred().reject();
+            }
+
+
+        },
+    });
+    openerp.web.form.widgets.add('barcode_text', 'openerp.web.form.BarcodeText');
+    openerp.web.form.widgets.add('change_focus', 'openerp.web.form.ChangeFocus');
+};
diff --git a/crm_rma_lot_mass_return/templates/search_view.xml b/crm_rma_lot_mass_return/templates/search_view.xml
new file mode 100644
index 00000000..c3e747e0
--- /dev/null
+++ b/crm_rma_lot_mass_return/templates/search_view.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <template id="assets_backend" name="search_product assets" inherit_id="web.assets_backend">
+            <xpath expr="." position="inside">
+                <script type="text/javascript" src="/crm_rma_lot_mass_return/static/lib/alert.js"></script>
+                <script type="text/javascript" src="/crm_rma_lot_mass_return/static/src/js/barcode_text.js"></script>
+            </xpath>
+        </template>
+    </data>
+</openerp>
diff --git a/crm_rma_lot_mass_return/tests/__init__.py b/crm_rma_lot_mass_return/tests/__init__.py
new file mode 100644
index 00000000..44c35c67
--- /dev/null
+++ b/crm_rma_lot_mass_return/tests/__init__.py
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Copyright 2015 Vauxoo
+#    Author: Osval Reyes,
+#          Yanina Aular
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from . import test_crm_rma_lot_mass_return
+from . import test_crm_rma_lot_mass_return_2
+from . import test_constrains
diff --git a/crm_rma_lot_mass_return/tests/test_constrains.py b/crm_rma_lot_mass_return/tests/test_constrains.py
new file mode 100644
index 00000000..7d14dcd6
--- /dev/null
+++ b/crm_rma_lot_mass_return/tests/test_constrains.py
@@ -0,0 +1,48 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Copyright 2015 Vauxoo
+#    Author: Yanina Aular
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp.tests.common import TransactionCase
+from openerp.exceptions import ValidationError
+
+
+class TestConstrains(TransactionCase):
+
+    """
+    - The product in claim.line.wizard must be the same
+      that product of invoice line
+    """
+
+    def setUp(self):
+        super(TestConstrains, self).setUp()
+        self.claim_line_wizard = self.env['claim.line.wizard']
+
+    def test_product_constrain(self):
+
+        msg = "The product of the invoice .* is not same that product .*"
+        with self.assertRaisesRegexp(ValidationError, msg):
+            self.claim_line_wizard.\
+                create({
+                    'product_id': self.env.ref('product.'
+                                               'product_product_8').id,
+                    'invoice_line_id':
+                    self.env.ref('account.demo_invoice_0_'
+                                 'line_rpanrearpanelshe0').id,
+                })
diff --git a/crm_rma_lot_mass_return/tests/test_crm_rma_lot_mass_return.py b/crm_rma_lot_mass_return/tests/test_crm_rma_lot_mass_return.py
new file mode 100644
index 00000000..c8783802
--- /dev/null
+++ b/crm_rma_lot_mass_return/tests/test_crm_rma_lot_mass_return.py
@@ -0,0 +1,157 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Copyright 2015 Vauxoo
+#    Author: Osval Reyes,
+#            Yanina Aular
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp.tests.common import TransactionCase
+
+
+class TestCrmRmaLotMassReturn(TransactionCase):
+
+    """
+    Test cases for CRM RMA Lot Mass Return Module
+    """
+
+    def setUp(self):
+        super(TestCrmRmaLotMassReturn, self).setUp()
+        self.metasearch_wizard = self.env['returned.lines.from.serial.wizard']
+        self.partner_id = self.env['res.partner'].browse(
+            self.ref('base.res_partner_2'))
+        self.invoice_id, self.lot_ids = self.create_sale_invoice()
+        self.claim_id = self.env['crm.claim'].\
+            create({
+                'name': 'Test',
+                'claim_type': self.ref('crm_claim_type.'
+                                       'crm_claim_type_customer'),
+                'partner_id': self.invoice_id.partner_id.id,
+                'pick': True
+            })
+
+    def create_sale_order(self, order_policy='manual'):
+        sale_order_id = self.env['sale.order'].create({
+            'partner_id': self.partner_id.id,
+            'note': 'Sale Order Test',
+            'order_policy': order_policy,
+            'payment_term': self.ref('account.account_payment_term'),
+            'order_line': [(0, 0, {
+                    'name': 'Test',
+                    'product_id': self.ref('product.product_product_8'),
+                'product_uom_qty': 2
+            })]
+        })
+
+        sale_order_id.action_button_confirm()
+
+        return sale_order_id
+
+    def test_01_render_metasearch_view(self):
+        res = self.claim_id.render_metasearch_view()
+        self.assertEqual(res['res_model'], self.metasearch_wizard._name)
+
+    def test_02_load_products(self):
+        self.invoice_id.signal_workflow('invoice_open')
+
+        # Before continue, invoice must be open to get a number value
+        # and this is needed by the wizard
+        self.assertEqual(self.invoice_id.state, 'open')
+
+        wizard_id = self.metasearch_wizard.with_context({
+            'active_model': self.claim_id._name,
+            'active_id': self.claim_id.id,
+            'active_ids': [self.claim_id.id]
+        }).create({})
+
+        # Get ids for invoice lines
+        lines_list_id = wizard_id.onchange_load_products(
+            self.invoice_id.number +
+            '*5*description here' + '\n' + self.lot_ids[0].name,
+            [(6, 0, [])])['domain']['lines_list_id'][0][2]
+        option_ids = wizard_id.onchange_load_products(
+            self.invoice_id.number, [(6, 0, [])])['value']['option_ids'][0][2]
+
+        wizard_id.option_ids = option_ids
+        wizard_id.lines_list_id = [(6, 0, lines_list_id)]
+
+        # the invoice lines are two
+        self.assertEqual(len(lines_list_id), 2)
+
+        # Validate it has exactly as much records as the taken invoice has
+        self.assertEqual(len(lines_list_id),
+                         int(self.invoice_id.invoice_line.quantity))
+
+        wizard_id._set_message()
+
+        wizard_id.add_claim_lines()
+
+        # Claim record it must have same line count as the invoice
+        qty = 0
+        for inv_line in self.invoice_id.invoice_line:
+            qty += inv_line.quantity
+        self.assertEqual(len(self.claim_id.claim_line_ids),
+                         int(qty))
+
+    def create_sale_invoice(self):
+        sale_order_id = self.create_sale_order('manual')
+
+        lot_ids = []
+        for picking_id in sale_order_id.picking_ids:
+
+            picking_id.force_assign()
+
+            # create wizard
+            wizard_id = self.env['stock.transfer_details'].create({
+                'picking_id': picking_id.id,
+            })
+
+            # make the transfers
+            for move_id in picking_id.move_lines:
+
+                wizard_item_id = self.env['stock.transfer_details_items'].\
+                    create({
+                        'transfer_id': wizard_id.id,
+                        'product_id': move_id.product_id.id,
+                        'quantity': move_id.product_qty,
+                        'sourceloc_id': move_id.location_id.id,
+                        'destinationloc_id':
+                        self.ref('stock.stock_location_stock'),
+                        'lot_id': False,
+                        'product_uom_id': move_id.product_uom.id,
+                    })
+
+                lot_id = self.env['stock.production.lot'].create({
+                    'product_id': move_id.product_id.id,
+                    'name': 'Test Lot %s%s' % (move_id.id,
+                                               move_id.product_id.id)
+                })
+
+                # keep lot_id for later check
+                lot_ids.append(lot_id)
+
+                wizard_item_id.write({
+                    'lot_id': lot_id.id
+                })
+
+            wizard_id.do_detailed_transfer()
+
+        sale_order_id.action_invoice_create()
+        invoice_id = sale_order_id.invoice_ids[0]
+        invoice_id.signal_workflow('invoice_open')
+
+        return invoice_id, lot_ids
diff --git a/crm_rma_lot_mass_return/tests/test_crm_rma_lot_mass_return_2.py b/crm_rma_lot_mass_return/tests/test_crm_rma_lot_mass_return_2.py
new file mode 100644
index 00000000..e43562ba
--- /dev/null
+++ b/crm_rma_lot_mass_return/tests/test_crm_rma_lot_mass_return_2.py
@@ -0,0 +1,209 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Copyright 2015 Vauxoo
+#    Author: Osval Reyes,
+#            Yanina Aular
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp.tests.common import TransactionCase
+import re
+
+
+class TestCrmRmaLotMassReturn2(TransactionCase):
+
+    """
+    Test cases for CRM RMA Lot Mass Return Module
+    """
+
+    def setUp(self):
+        super(TestCrmRmaLotMassReturn2, self).setUp()
+        self.metasearch_wizard = self.env['returned.lines.from.serial.wizard']
+        self.sale_order = self.env.ref('crm_rma_lot_mass_return.'
+                                       'so_wizard_rma_1')
+        self.lot_ids_mac0001 = self.env.ref('crm_rma_lot_mass_return.'
+                                            'lot_purchase_wizard_rma_item_1')
+        self.lot_ids_mac0003 = self.env.ref('crm_rma_lot_mass_return.'
+                                            'lot_purchase_wizard_rma_item_3')
+        self.claim_id_1 = self.env['crm.claim'].\
+            create({
+                'name': 'CLAIM001',
+                'claim_type': self.ref('crm_claim_type.'
+                                       'crm_claim_type_customer'),
+                'partner_id': self.sale_order.partner_id.id,
+                'pick': True
+            })
+
+        self.claim_id_2 = self.env['crm.claim'].\
+            create({
+                'name': 'CLAIM002',
+                'claim_type': self.ref('crm_claim_type.'
+                                       'crm_claim_type_customer'),
+                'partner_id': self.sale_order.partner_id.id,
+                'pick': True
+            })
+
+    def test_01_load_products(self):
+        wizard_id = self.metasearch_wizard.with_context({
+            'active_model': self.claim_id_1._name,
+            'active_id': self.claim_id_1.id,
+            'active_ids': [self.claim_id_1.id]
+        }).create({})
+
+        # Get ids for invoice lines
+        lines_list_id = wizard_id.onchange_load_products(
+            self.sale_order.invoice_ids[0].number +
+            '*5*description here' + '\n' + self.lot_ids_mac0001.name,
+            [(6, 0, [])])['domain']['lines_list_id'][0][2]
+
+        option_ids = wizard_id.onchange_load_products(
+            self.sale_order.invoice_ids[0].number +
+            '*5*description here' + '\n' + self.lot_ids_mac0001.name,
+            [(6, 0, [])])['value']['option_ids'][0][2]
+
+        wizard_id.option_ids = option_ids
+
+        items_to_select = self.env['claim.line.wizard'].browse(lines_list_id)
+
+        mac0001 = items_to_select.search([('lot_id.name', '=', 'MAC0001')])
+        mac0002 = items_to_select.search([('lot_id.name', '=', 'MAC0002')])
+        wizard_id.lines_list_id = [(6, 0, [mac0001.id, mac0002.id])]
+
+        # 1 Ink Cartridge, 2 Toner Cartridge, 1 iPad, 5 iMac
+        self.assertEqual(len(lines_list_id), 9)
+
+        qty = 0
+        for inv_line in self.sale_order.invoice_ids[0].invoice_line:
+            qty += inv_line.quantity
+        # Validate it has exactly as much records as the taken invoice has
+        self.assertEqual(len(lines_list_id), int(qty))
+
+        wizard_id._set_message()
+        wizard_id.add_claim_lines()
+
+        # 2 Macs
+        self.assertEqual(len(self.claim_id_1.claim_line_ids), 2)
+
+    def test_02_load_products(self):
+        wizard_id = self.metasearch_wizard.with_context({
+            'active_model': self.claim_id_2._name,
+            'active_id': self.claim_id_2.id,
+            'active_ids': [self.claim_id_2.id]
+        }).create({})
+
+        line_str = self.sale_order.invoice_ids[0].number + '*5*A description\n'
+        # Get ids for invoice lines
+        lines_list_id = wizard_id.onchange_load_products(
+            line_str, [(6, 0, [])])['domain']['lines_list_id'][0][2]
+
+        option_ids = wizard_id.onchange_load_products(
+            line_str, [(6, 0, [])])['value']['option_ids'][0][2]
+
+        wizard_id.option_ids = option_ids
+        cl_wizard = self.env['claim.line.wizard'].browse(lines_list_id)
+
+        mac0001 = cl_wizard.search([('lot_id.name', '=', 'MAC0001')])
+        mac0003 = cl_wizard.search([('lot_id.name', '=', 'MAC0003')])
+        toner0001 = cl_wizard.search([('product_id.name',
+                                       '=', 'Toner Cartridge')])
+        toner0002 = toner0001[1]
+        toner0001 = toner0001[0]
+        ink0001 = cl_wizard.search([('product_id.name', '=', 'Ink Cartridge')])
+
+        wizard_id.lines_list_id = [(6, 0, [mac0001.id, mac0003.id,
+                                           toner0001.id, toner0002.id,
+                                           ink0001.id])]
+        # 1 Ink Cartridge, 2 Toner Cartridge, 1 iPad, 5 iMac
+        self.assertEqual(len(lines_list_id), 9)
+
+        qty = 0
+        for inv_line in self.sale_order.invoice_ids[0].invoice_line:
+            qty += inv_line.quantity
+        # Validate it has exactly as much records as the taken invoice has
+        self.assertEqual(len(lines_list_id), int(qty))
+        wizard_id.add_claim_lines()
+        # 2 Macs
+        self.assertEqual(len(self.claim_id_2.claim_line_ids), 5)
+
+    def test_03_claim_line_creation_and_error_message(self):
+        """
+        Challenge the wizard when a claim line is created, to set claim_origin
+        and the name correctly in a claim line itself, and also it tests the
+        message displayed to the user when is introduced an Serial/Lot numbers
+        that already is part of another claim.
+        """
+
+        subject_list = self.env['claim.line'].SUBJECT_LIST
+        lot_name = "MAC0001"
+        subject_index = 3
+        scanned_data = lot_name + '*' + \
+            str(subject_index) + '*A short description to test\n'
+        wizard_id = self.metasearch_wizard.with_context({
+            'active_model': self.claim_id_2._name,
+            'active_id': self.claim_id_2.id,
+            'active_ids': [self.claim_id_2.id]
+        }).create({})
+        wizard_id.scan_data = scanned_data
+
+        # Get ids for invoice lines
+        lines_list_id = wizard_id.onchange_load_products(
+            scanned_data, [(6, 0, [])])['domain']['lines_list_id'][0][2]
+
+        wizard_id.option_id = wizard_id.onchange_load_products(
+            scanned_data, [(6, 0, [])])['value']['option_ids'][0][2]
+
+        items_to_select = self.env['claim.line.wizard'].browse(lines_list_id)
+        mac0001 = items_to_select.search([('lot_id.name', '=', lot_name)])
+        wizard_id.lines_list_id = [(6, 0, [mac0001.id])]
+        self.assertEqual(len(lines_list_id), 1)
+
+        wizard_id.add_claim_lines()
+        self.assertEqual(len(self.claim_id_2.claim_line_ids), 1)
+
+        line_id = self.claim_id_2.claim_line_ids
+        self.assertEqual(
+            subject_list[subject_index-1][0], line_id.claim_origin)
+        self.assertEqual(scanned_data, line_id.prodlot_id.name + '*'
+                         + str(subject_index) + '*' + line_id.name + '\n')
+
+        # create again the wizard
+        wizard_id = self.metasearch_wizard.with_context({
+            'active_model': self.claim_id_2._name,
+            'active_id': self.claim_id_2.id,
+            'active_ids': [self.claim_id_2.id]
+        }).create({})
+        wizard_id.scan_data = scanned_data
+
+        # Get ids for invoice lines
+        lines_list_id = wizard_id.onchange_load_products(
+            scanned_data, [(6, 0, [])])['domain']['lines_list_id'][0][2]
+
+        wizard_id.option_id = wizard_id.onchange_load_products(
+            scanned_data, [(6, 0, [])])['value']['option_ids'][0][2]
+
+        cl_wizard = self.env['claim.line.wizard'].browse(lines_list_id)
+        clw_id = cl_wizard.search([('lot_id.name', '=', lot_name)])
+        wizard_id.lines_list_id = [(6, 0, [clw_id.id])]
+        self.assertEqual(len(lines_list_id), 1)
+
+        wizard_id._set_message()
+        wizard_id.add_claim_lines()
+        self.assertEqual(len(self.claim_id_2.claim_line_ids), 1)
+
+        # if the message exists, then it's being displayed
+        regex = re.compile(".*" + lot_name + ".*")
+        self.assertTrue(regex.search(wizard_id.message))
diff --git a/crm_rma_lot_mass_return/views/crm_claim.xml b/crm_rma_lot_mass_return/views/crm_claim.xml
new file mode 100644
index 00000000..70b547cd
--- /dev/null
+++ b/crm_rma_lot_mass_return/views/crm_claim.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+        <record id="crm_claim_rma_form_view_meta" model="ir.ui.view">
+            <field name="name">CRM - Claim product return Form</field>
+            <field name="model">crm.claim</field>
+            <field name="inherit_id" ref="crm_claim_rma.crm_claim_rma_form_view"/>
+            <field name="arch" type="xml">
+                <xpath expr="//page[@string='Claim Description']//div[@name='serial']" position="inside">
+                    <button name="render_metasearch_view"
+                        string="Add claim lines using serial or invoice number" type="object"/>
+                </xpath>
+                <xpath expr="//field[@name='invoice_id']" position="attributes">
+                    <attribute name="invisible">True</attribute>
+                </xpath>
+            </field>
+        </record>
+     </data>
+</openerp>
diff --git a/crm_rma_lot_mass_return/wizard/returned_lines_from_serial.py b/crm_rma_lot_mass_return/wizard/returned_lines_from_serial.py
deleted file mode 100644
index 52c8cbe6..00000000
--- a/crm_rma_lot_mass_return/wizard/returned_lines_from_serial.py
+++ /dev/null
@@ -1,267 +0,0 @@
-# -*- coding: utf-8 -*-
-#########################################################################
-#                                                                       #
-#                                                                       #
-#########################################################################
-#                                                                       #
-# Copyright (C) 2009-2011  Akretion, Emmanuel Samyn                     #
-#                                                                       #
-#This program is free software: you can redistribute it and/or modify   #
-#it under the terms of the GNU General Public License as published by   #
-#the Free Software Foundation, either version 3 of the License, or      #
-#(at your option) any later version.                                    #
-#                                                                       #
-#This program is distributed in the hope that it will be useful,        #
-#but WITHOUT ANY WARRANTY; without even the implied warranty of         #
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the          #
-#GNU General Public License for more details.                           #
-#                                                                       #
-#You should have received a copy of the GNU General Public License      #
-#along with this program.  If not, see <http://www.gnu.org/licenses/>.  #
-#########################################################################
-from openerp.osv import fields, orm
-
-
-class returned_lines_from_serial(orm.TransientModel):
-
-    _name = 'returned_lines_from_serial.wizard'
-    _description = 'Wizard to create product return lines from serial numbers'
-    _columns = {
-        'prodlot_id_1': fields.many2one('stock.production.lot',
-            'Serial / Lot Number 1', required=True),
-        'prodlot_id_2': fields.many2one('stock.production.lot',
-            'Serial / Lot Number 2'),
-        'prodlot_id_3': fields.many2one('stock.production.lot',
-            'Serial / Lot Number 3'),
-        'prodlot_id_4': fields.many2one('stock.production.lot',
-            'Serial / Lot Number 4'),
-        'prodlot_id_5': fields.many2one('stock.production.lot',
-            'Serial / Lot Number 5'),
-        'qty_1' : fields.float('Quantity 1', digits=(12,2), required=True),
-        'qty_2' : fields.float('Quantity 2', digits=(12,2)),
-        'qty_3' : fields.float('Quantity 3', digits=(12,2)),
-        'qty_4' : fields.float('Quantity 4', digits=(12,2)),
-        'qty_5' : fields.float('Quantity 5', digits=(12,2)),
-        'claim_1': fields.selection([('none','Not specified'),
-                                    ('legal','Legal retractation'),
-                                    ('cancellation','Order cancellation'),
-                                    ('damaged','Damaged delivered product'),                                    
-                                    ('error','Shipping error'),
-                                    ('exchange','Exchange request'),
-                                    ('lost','Lost during transport'),
-                                    ('other','Other')], 'Claim Subject',
-                                    required=True,
-                                    help="To describe the product problem"),  
-        'claim_2': fields.selection([('none','Not specified'),
-                                    ('legal','Legal retractation'),
-                                    ('cancellation','Order cancellation'),
-                                    ('damaged','Damaged delivered product'),                                    
-                                    ('error','Shipping error'),
-                                    ('exchange','Exchange request'),
-                                    ('lost','Lost during transport'),
-                                    ('other','Other')], 'Claim Subject',
-                                    required=True,
-                                    help="To describe the line product problem"),
-        'claim_3': fields.selection([('none','Not specified'),
-                                    ('legal','Legal retractation'),
-                                    ('cancellation','Order cancellation'),
-                                    ('damaged','Damaged delivered product'),                                    
-                                    ('error','Shipping error'),
-                                    ('exchange','Exchange request'),
-                                    ('lost','Lost during transport'),
-                                    ('other','Other')], 'Claim Subject',
-                                    required=True,
-                                    help="To describe the line product problem"),
-        'claim_4': fields.selection([('none','Not specified'),
-                                    ('legal','Legal retractation'),
-                                    ('cancellation','Order cancellation'),
-                                    ('damaged','Damaged delivered product'),                                    
-                                    ('error','Shipping error'),
-                                    ('exchange','Exchange request'),
-                                    ('lost','Lost during transport'),
-                                    ('other','Other')], 'Claim Subject',
-                                    required=True,
-                                    help="To describe the line product problem"),
-        'claim_5': fields.selection([('none','Not specified'),
-                                    ('legal','Legal retractation'),
-                                    ('cancellation','Order cancellation'),
-                                    ('damaged','Damaged delivered product'),                                    
-                                    ('error','Shipping error'),
-                                    ('exchange','Exchange request'),
-                                    ('lost','Lost during transport'),
-                                    ('other','Other')], 'Claim Subject',
-                                    required=True,
-                                    help="To describe the line product problem"),
-        'partner_id': fields.many2one('res.partner', 'Partner'),
-    }
-    
-    # Get partner from case is set to filter serials
-    def _get_default_partner_id(self, cr, uid, context):
-        return self.pool.get('crm.claim').read(cr, uid,
-            context['active_id'], ['partner_id'])['partner_id'][0]    
-
-    _defaults = {
-        'qty_1': lambda *a: 1.0,
-        'qty_2': lambda *a: 1.0,
-        'qty_3': lambda *a: 1.0,
-        'qty_4': lambda *a: 1.0,
-        'qty_5': lambda *a: 1.0,
-        'claim_1': lambda *a: "none",
-        'claim_2': lambda *a: "none",
-        'claim_3': lambda *a: "none",
-        'claim_4': lambda *a: "none",
-        'claim_5': lambda *a: "none",
-        'partner_id': _get_default_partner_id,
-    }
-    
-    # If "Cancel" button pressed
-    def action_cancel(self,cr,uid,ids,conect=None):
-        return {'type': 'ir.actions.act_window_close',}
-    
-    # If "Add & close" button pressed
-    def action_add_and_close(self, cr, uid, ids, context=None):
-        self.add_return_lines(cr, uid, ids, context)    
-        return {'type': 'ir.actions.act_window_close',}
-    
-    # If "Add & new" button pressed    
-    def action_add_and_new(self, cr, uid, ids, context=None):
-        self.add_return_lines(cr, uid, ids, context)
-        return {
-            'context': context,
-            'view_type': 'form',
-            'view_mode': 'form',
-            'res_model': 'returned_lines_from_serial.wizard',
-            'view_id': False,
-            'type': 'ir.actions.act_window',
-            'target': 'new',
-        }
-    
-    # Method to get the product id from set
-    def get_product_id(self, cr, uid,ids,product_set, context=None):
-        product_id = False
-        for product in self.prodlot_2_product(cr, uid,[product_set]):
-            product_id = product
-        return product_id
-
-    # Method to create return lines
-    def add_return_lines(self, cr, uid, ids, context=None):
-        result = self.browse(cr,uid,ids)[0]
-        return_line = self.pool.get('claim.line')
-        # Refactor code : create 1 "createmethode" called by each if with values as parameters    
-        return_line.create(cr, uid, {
-                    'claim_id': context['active_id'],
-                    'claim_origine': result.claim_1,
-                    'product_id' : self.get_product_id(cr, uid, ids,
-                        result.prodlot_id_1.id, context=context),
-                    #'invoice_id' : self.prodlot_2_invoice(cr, uid,[result.prodlot_id_1.id],[result.prodlot_id_1.product_id.id]), #PRODLOT_ID can be in many invoice !!
-                    'product_returned_quantity' : result.qty_1,
-                    'prodlot_id' : result.prodlot_id_1.id,
-					'selected' : False,		
-					'state' : 'draft',                    
-					#'guarantee_limit' : warranty['value']['guarantee_limit'],
-					#'warning' : warranty['value']['warning'],
-               }) 
-        if result.prodlot_id_2.id : 
-            return_line.create(cr, uid, {
-                    'claim_id': context['active_id'],
-                    'claim_origine': result.claim_2,
-                    'product_id' : self.get_product_id(cr, uid, ids,
-                        result.prodlot_id_2.id, context=context),
-#                    'invoice_id' : self.prodlot_2_invoice(cr, uid,[result.prodlot_id_1.id]),
-                    'product_returned_quantity' : result.qty_2,
-                    'prodlot_id' : result.prodlot_id_2.id,
-					'selected' : False,		
-					'state' : 'draft',                    
-					#'guarantee_limit' : warranty['value']['guarantee_limit'],
-					#'warning' : warranty['value']['warning'],
-               })
-        if result.prodlot_id_3.id : 
-            return_line.create(cr, uid, {
-                    'claim_id': context['active_id'],
-                    'claim_origine': result.claim_3,
-                    'product_id' : self.get_product_id(cr, uid, ids,
-                        result.prodlot_id_3.id, context=context),
-#                    'invoice_id' : self.prodlot_2_invoice(cr, uid,[result.prodlot_id_1.id]),
-                    'product_returned_quantity' : result.qty_3,
-                    'prodlot_id' : result.prodlot_id_3.id,
-                    'selected' : False,		
-					'state' : 'draft', 
-					#'guarantee_limit' : warranty['value']['guarantee_limit'],
-					#'warning' : warranty['value']['warning'],
-               })
-        if result.prodlot_id_4.id : 
-            return_line.create(cr, uid, {
-                    'claim_id': context['active_id'],
-                    'claim_origine': result.claim_4,
-                    'product_id' : self.get_product_id(cr, uid, ids,
-                        result.prodlot_id_4.id, context=context),
-#                    'invoice_id' : self.prodlot_2_invoice(cr, uid,[result.prodlot_id_1.id]),
-                    'product_returned_quantity' : result.qty_4,
-                    'prodlot_id' : result.prodlot_id_4.id,
-                    'selected' : False,		
-					'state' : 'draft', 
-					#'guarantee_limit' : warranty['value']['guarantee_limit'],
-					#'warning' : warranty['value']['warning'],
-               })
-        if result.prodlot_id_5.id : 
-            return_line.create(cr, uid, {
-                    'claim_id': context['active_id'],
-                    'claim_origine': result.claim_5,
-                    'product_id' : self.get_product_id(cr, uid, ids,
-                        result.prodlot_id_5.id, context=context),
-#                    'invoice_id' : self.prodlot_2_invoice(cr, uid,[result.prodlot_id_1.id],[result.prodlot_id_1.product_id.id]),
-                    'product_returned_quantity' : result.qty_5,
-                    'prodlot_id' : result.prodlot_id_5.id,
-                    'selected' : False,		
-					'state' : 'draft', 
-					#'guarantee_type':
-					#'guarantee_limit' : warranty['value']['guarantee_limit'],
-					#'warning' : warranty['value']['warning'],					
-               })  					
-					                 
-        return True
-        
-    def prodlot_2_product(self,cr, uid, prodlot_ids):          
-        stock_move_ids = self.pool.get('stock.move').search(cr, uid, 
-            [('prodlot_id', 'in', prodlot_ids)])
-        res = self.pool.get('stock.move').read(cr, uid, 
-            stock_move_ids, ['product_id'])
-        return set([x['product_id'][0] for x in res if x['product_id']])
-        
-    def prodlot_2_invoice(self,cr, uid, prodlot_id,product_id):
-        # get stock_move_ids
-        stock_move_ids = self.pool.get('stock.move').search(cr, uid,
-            [('prodlot_id', 'in', prodlot_id)])
-        # if 1 id
-            # (get stock picking (filter on out ?))
-            # get invoice_ids from stock_move_id where invoice.line.product = prodlot_product and invoice customer = claim_partner
-            # if 1 id
-                # return invoice_id
-            # else
-        # else : move_in / move_out ; 1 move per order line so if many order lines with same lot, ...
-        
-        
-        #
-        #return set(self.stock_move_2_invoice(cr, uid, stock_move_ids))
-        return True
-
-    def stock_move_2_invoice(self, cr, uid, stock_move_ids):
-        inv_line_ids = []
-        res = self.pool.get('stock.move').read(cr, uid,
-            stock_move_ids, ['sale_line_id'])
-        sale_line_ids = [x['sale_line_id'][0] for x in res if x['sale_line_id']]
-        if not sale_line_ids:
-            return []
-        sql_base = "select invoice_id from sale_order_line_invoice_rel where \
-         order_line_id in ("
-        cr.execute(sql_base + ','.join(map(lambda x: str(x),sale_line_ids))+')')
-        res = cr.fetchall()     
-        for i in res:
-            for j in i:
-                inv_line_ids.append(j)
-
-        res = self.pool.get('account.invoice.line').read(cr, uid,
-            inv_line_ids,['invoice_id'])
-        return [x['invoice_id'][0] for x in res if x['invoice_id']]  
-
-             
\ No newline at end of file
diff --git a/crm_rma_lot_mass_return/wizard/returned_lines_from_serial_wizard_view.xml b/crm_rma_lot_mass_return/wizard/returned_lines_from_serial_wizard_view.xml
deleted file mode 100644
index 0acd515e..00000000
--- a/crm_rma_lot_mass_return/wizard/returned_lines_from_serial_wizard_view.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-#########################################################################
-#                                                                       #
-#                                                                       #
-#########################################################################
-#                                                                       #
-# Copyright (C) 2009-2011  Akretion, Emmanuel Samyn                     #
-#                                                                       #
-#This program is free software: you can redistribute it and/or modify   #
-#it under the terms of the GNU General Public License as published by   #
-#the Free Software Foundation, either version 3 of the License, or      #
-#(at your option) any later version.                                    #
-#                                                                       #
-#This program is distributed in the hope that it will be useful,        #
-#but WITHOUT ANY WARRANTY; without even the implied warranty of         #
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the          #
-#GNU General Public License for more details.                           #
-#                                                                       #
-#You should have received a copy of the GNU General Public License      #
-#along with this program.  If not, see <http://www.gnu.org/licenses/>.  #
-#########################################################################
--->
-<openerp>
-    <data>
-<!-- SELECT FORM VIEW -->
-        <record id="view_create_return_serial_form" model="ir.ui.view">
-            <field name="name">returned_lines_from_serial_wiew</field>
-            <field name="model">returned_lines_from_serial.wizard</field>
-            <field name="arch" type="xml">
-                <form string="Select serial numbers to create">
-					<group col="3" colspan="4">
-					<separator string="Serial / Lot Number" colspan="1"/>
-					<separator string="Quantity returned" colspan="1"/>
-					<separator string="Claim short description" colspan="1"/>
-					<field name="prodlot_id_1" nolabel="1"/>
-					<field name="qty_1" nolabel="1"/>
-					<field name="claim_1" nolabel="1"/>
-					<field name="prodlot_id_2" nolabel="1"/>
-					<field name="qty_2" nolabel="1"/>
-					<field name="claim_2" nolabel="1"/>
-					<field name="prodlot_id_3" nolabel="1"/>
-					<field name="qty_3" nolabel="1"/>
-					<field name="claim_3" nolabel="1"/>
-					<field name="prodlot_id_4" nolabel="1"/>
-					<field name="qty_4" nolabel="1"/>
-					<field name="claim_4" nolabel="1"/>
-					<field name="prodlot_id_5" nolabel="1"/>
-					<field name="qty_5" nolabel="1"/>
-					<field name="claim_5" nolabel="1"/>
-					</group>
-                    <group col="4" colspan="2">
-                        <button special="cancel" string="Cancel" name="action_cancel" type="object" icon='gtk-cancel'/>
-                        <button name="action_add_and_close" string="Save and close" icon='gtk-ok' type="object"/>
-                        <button name="action_add_and_new" string="Save and new" icon='gtk-add' type="object"/>
-                    </group>
-                </form>
-            </field>
-        </record> 
-		
-<!-- SELECT ACTION -->
-        <record id="action_create_return_serial" model="ir.actions.act_window">
-            <field name="name">action_create_return_serial</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">returned_lines_from_serial.wizard</field>
-			<field name="src_model">crm.claim</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="target">new</field> 
-        </record>	  
-		
-    </data>
-</openerp>
diff --git a/crm_rma_lot_mass_return/wizard/__init__.py b/crm_rma_lot_mass_return/wizards/__init__.py
similarity index 82%
rename from crm_rma_lot_mass_return/wizard/__init__.py
rename to crm_rma_lot_mass_return/wizards/__init__.py
index fa2ee244..83aa8878 100644
--- a/crm_rma_lot_mass_return/wizard/__init__.py
+++ b/crm_rma_lot_mass_return/wizards/__init__.py
@@ -1,9 +1,12 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
+#    Copyright 2015 Vauxoo
 #    Copyright 2013 Camptocamp
-#    Copyright 2009-2013 Akretion, 
-#    Author: Emmanuel Samyn, Raphaël Valyi, Sébastien Beau, Joel Grand-Guillaume
+#    Copyright 2009-2013 Akretion,
+#    Author: Emmanuel Samyn, Raphaël Valyi, Sébastien Beau,
+#            Joel Grand-Guillaume,
+#            Yanina Aular, Osval Reyes
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -19,4 +22,5 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+
 from . import returned_lines_from_serial
diff --git a/crm_rma_lot_mass_return/wizards/returned_lines_from_serial.py b/crm_rma_lot_mass_return/wizards/returned_lines_from_serial.py
new file mode 100644
index 00000000..0d6fcee4
--- /dev/null
+++ b/crm_rma_lot_mass_return/wizards/returned_lines_from_serial.py
@@ -0,0 +1,586 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Copyright 2015 Vauxoo
+#    Copyright (C) 2009-2011 Akretion
+#    Author: Emmanuel Samyn,
+#            Yanina Aular,
+#            Osval Reyes
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+from openerp import _, api, fields, models
+from openerp.exceptions import ValidationError
+
+
+class ClaimLineWizard(models.TransientModel):
+
+    _name = "claim.line.wizard"
+
+    product_id = fields.Many2one("product.product",
+                                 string="Product",
+                                 help="Product to claim")
+    lot_id = fields.Many2one("stock.production.lot",
+                             string="Lot",
+                             help="Product to claim")
+    invoice_line_id = fields.Many2one("account.invoice.line",
+                                      required=True,
+                                      string="Invoice Line",
+                                      help="Invoice Line")
+    name = fields.Char(compute="_get_complete_name",
+                       string="Complete Lot Name",)
+
+    @api.constrains('product_id', 'invoice_line_id')
+    def _check_product_id(self):
+        for record in self:
+            if record.product_id != \
+                    record.invoice_line_id.product_id:
+                raise ValidationError("The product of the"
+                                      " invoice %s is not same"
+                                      " that product %s" %
+                                      (record.invoice_line_id.product_id.name,
+                                       record.product_id.name))
+
+    @api.depends('invoice_line_id', 'lot_id', 'product_id')
+    def _get_complete_name(self):
+        for wizard in self:
+            invoice_number = wizard.invoice_line_id.invoice_id.number
+            product_name = wizard.product_id.name
+
+            lot_name = False
+            if wizard.lot_id:
+                lot_name = wizard.lot_id.name
+
+            if not lot_name:
+                name = _("(ID: %s) - %s - %s") % \
+                    (wizard.id,
+                     product_name,
+                     invoice_number)
+            else:
+                name = _("(ID: %s) - %s - %s - %s") % \
+                    (wizard.id,
+                     product_name,
+                     invoice_number,
+                     lot_name)
+
+            wizard.name = name
+
+
+class ReturnedLinesFromSerial(models.TransientModel):
+
+    _name = 'returned.lines.from.serial.wizard'
+    _description = 'Wizard to create product return lines'
+    ' from serial numbers or invoices'
+
+    # Get partner from case is set to filter serials
+    @api.model
+    def _get_default_partner_id(self):
+        """
+        Obtain partner from the claim
+        """
+        crm_claim_model = self.env['crm.claim']
+        claim_id = self.env.context.get('active_id')
+        partner_record = crm_claim_model.browse(claim_id).\
+            partner_id
+        return partner_record and partner_record[0] or \
+            self.env['res.partner']
+
+    @api.model
+    def create_claim_line(self, claim_id, claim_origin,
+                          product_record, claim_line_wizard,
+                          qty, name):
+        clima_line = self.env['claim.line']
+        if claim_line_wizard.lot_id:
+            inv_line = self.prodlot_2_invoice_line(
+                claim_line_wizard.lot_id.name)
+            lot_id = claim_line_wizard.lot_id.id
+        else:
+            inv_line = claim_line_wizard.invoice_line_id
+            lot_id = False
+        line_rec = clima_line.create({
+            'claim_id': claim_id,
+            'claim_origin': claim_origin,
+            'product_id': product_record and product_record.id or False,
+            'name': name and name or (product_record and
+                                      product_record.name or
+                                      inv_line.name),
+            'invoice_line_id': inv_line.id,
+            'product_returned_quantity': qty,
+            'prodlot_id': lot_id,
+        })
+        line_rec.set_warranty()
+
+    # If "Cancel" button pressed
+    @api.multi
+    def action_cancel(self):
+        return {'type': 'ir.actions.act_window_close'}
+
+    partner_id = fields.Many2one('res.partner',
+                                 'Partner',
+                                 default=_get_default_partner_id)
+
+    def _get_claim_type(self):
+        claim_id = self.env.context.get('active_id')
+        claim_record = self.env['crm.claim'].browse(claim_id)
+        current_claim_type = claim_record.claim_type
+        customer_claim_type = \
+            self.env.ref('crm_claim_type.crm_claim_type_customer')
+        supplier_claim_type = \
+            self.env.ref('crm_claim_type.crm_claim_type_supplier')
+        return current_claim_type, customer_claim_type, supplier_claim_type
+
+    @api.model
+    def prodlot_2_invoice_line(self, prodlot):
+        """
+        Return the last line of customer invoice
+        based in serial/lot number
+        """
+        lot_obj = self.env['stock.production.lot']
+        current_claim_type, customer_claim_type, supplier_claim_type = \
+            self._get_claim_type()
+
+        prodlot = lot_obj.search([('name', '=', str(prodlot))])
+
+        if supplier_claim_type == current_claim_type:
+            if prodlot.supplier_invoice_line_id:
+                return prodlot.supplier_invoice_line_id
+        elif customer_claim_type == current_claim_type:
+            if prodlot.invoice_line_id:
+                return prodlot.invoice_line_id
+        else:
+            if prodlot.invoice_line_id:
+                return prodlot.invoice_line_id
+            elif prodlot.supplier_invoice_line_id:
+                return prodlot.supplier_invoice_line_id
+
+        return False
+
+    lines_list_id = fields.Many2many('claim.line.wizard',
+                                     'claim_line_wizard_returned',
+                                     'wizard_id',
+                                     'claim_line_wizard_id',
+                                     string='Products selected',
+                                     help='Field used to show the current '
+                                          'status of the lots '
+                                          'loaded')
+    option_ids = fields.Many2many('claim.line.wizard',
+                                  string='Invoice Lines to Select',
+                                  help='Field used to load the ids of '
+                                       'invoice lines in invoices writed')
+    scan_data = fields.Text('Products',
+                            help='Field used to load and show the '
+                            'products')
+    scaned_data = fields.Text('Products',
+                              help='Field used to load the ids of '
+                              'products loaded')
+    current_status = fields.Text('Status',
+                                 help='Field used to show the current '
+                                 'status of the product '
+                                 'loaded(Name and quantity)')
+
+    @api.multi
+    def get_metasearch_view_brw(self):
+        """
+        @return: view with metasearch field
+        """
+        view_id = self.env.\
+            ref('crm_rma_lot_mass_return.view_enter_product')
+        return view_id
+
+    @api.multi
+    def render_metasearch_view(self):
+        """
+        Render wizard view with metasearch field
+        """
+        view = self.get_metasearch_view_brw()
+        if view:
+            return {
+                'name': _('Search Product'),
+                'type': 'ir.actions.act_window',
+                'view_type': 'form',
+                'view_mode': 'form',
+                'res_model': 'returned.lines.from.serial.wizard',
+                'view_id': view.id,
+                'views': [(view.id, 'form')],
+                'target': 'new',
+                'res_id': self.id,
+            }
+
+    @api.model
+    def get_data_of_products(self, input_data):
+        data_line = []
+        for item in input_data and input_data.split('\n') or []:
+            if '*' in item:
+
+                comput = item.split('*')
+                data_it_1 = '0'
+                data_it_2 = ''
+                if len(comput) >= 2:
+                    data_it_1 = comput[1]
+                if len(comput) >= 3:
+                    data_it_2 = comput[2]
+                if comput[0]:
+                    data_line.append((comput[0], (data_it_1, data_it_2)))
+            else:
+                if item.strip():
+                    data_line.append((item.strip(), ('0', '')))
+        return data_line
+
+    def _get_lots_from_scan_data(self, input_data):
+
+        input_lines = self.get_data_of_products(input_data)
+        invoice = self.env['account.invoice']
+        lot = self.env['stock.production.lot']
+
+        prodlot_set_ids = set()
+        lot_set_ids = []
+        lots_lot_set_ids = []
+
+        if not input_lines:
+            return False, False, False
+
+        current_claim_type, customer_claim_type, supplier_claim_type = \
+            self._get_claim_type()
+
+        claim_line_wizard = self.env['claim.line.wizard']
+
+        for line in input_lines:
+            # if there is no invoice/serial in it
+            if not line[0]:
+                continue
+
+            number_serial = line[0].encode('utf8')
+            # search invoices first
+            invoice_ids = invoice.search([('number', '=', number_serial)])
+            element_searched = False
+            if invoice_ids:
+
+                if supplier_claim_type == current_claim_type:
+                    invoice_field = 'supplier_invoice_line_id'
+                elif customer_claim_type == current_claim_type:
+                    invoice_field = 'invoice_line_id'
+
+                for inv in invoice_ids:
+                    for inv_line in inv.invoice_line:
+                        clw = claim_line_wizard.\
+                            search([('invoice_line_id', '=', inv_line.id)])
+                        enter = False
+                        lot_ids = lot.\
+                            search([(invoice_field, '=',
+                                     inv_line.id)])
+                        if len(clw) < int(inv_line.quantity):
+                            for asd in clw:
+                                if asd not in lot_set_ids:
+                                    lot_set_ids.append(asd)
+                                    lot_ids = lot_ids - asd.lot_id
+                            num_to_create = int(inv_line.quantity) - len(clw)
+                            for num in xrange(0, num_to_create):
+                                clw = \
+                                    claim_line_wizard.\
+                                    create({
+                                        'product_id':
+                                        inv_line.product_id.id,
+                                        'invoice_line_id': inv_line.id,
+                                    })
+                                if lot_ids:
+                                    lot = lot_ids[0]
+                                    clw.write({'lot_id': lot.id})
+                                    lot_ids = lot_ids - lot
+                                for asd in clw:
+                                    if asd not in lot_set_ids:
+                                        lot_set_ids.append(asd)
+                            enter = True
+                        if not enter:
+                            for asd in clw:
+                                if asd not in lot_set_ids:
+                                    if lot_ids:
+                                        lot = lot_ids[0]
+                                        asd.write({'lot_id': lot.id})
+                                        lot_ids = lot_ids - lot
+                                    lot_set_ids.append(asd)
+
+                element_searched = lot_set_ids
+            else:
+                # if not, it must be a serial lot number
+                prodlot_ids = lot
+                if supplier_claim_type == current_claim_type:
+                    prodlot_ids = \
+                        lot.search([('name', '=', number_serial),
+                                    ('supplier_invoice_line_id', '!=', False)])
+                    invoice_line = prodlot_ids.supplier_invoice_line_id
+                elif customer_claim_type == current_claim_type:
+                    prodlot_ids = \
+                        lot.search([('name', '=', number_serial),
+                                    ('invoice_line_id', '!=', False)])
+                    invoice_line = prodlot_ids.invoice_line_id
+                else:
+                    prodlot_ids = \
+                        lot.search([('name', '=', number_serial), '|',
+                                    ('supplier_invoice_line_id', '!=', False),
+                                    ('invoice_line_id', '!=', False),
+                                    ])
+                    if prodlot_ids.invoice_line_id:
+                        invoice_line = prodlot_ids.invoice_line_id
+                    else:
+                        invoice_line = prodlot_ids.supplier_invoice_line_id
+                if prodlot_ids:
+                    for lot_id in prodlot_ids:
+                        clw = claim_line_wizard.\
+                            search([('lot_id', '=', lot_id.id)])
+                        if not clw:
+                            clw = \
+                                claim_line_wizard.\
+                                create({
+                                    'product_id': lot_id.product_id.id,
+                                    'lot_id': lot_id.id,
+                                    'invoice_line_id': invoice_line.id,
+                                })
+                        for asd in clw:
+                            if asd not in lot_set_ids:
+                                lot_set_ids.append(asd)
+                    element_searched = True
+
+                for item in prodlot_ids:
+                    item_name = item.product_id \
+                        and item.product_id.name.encode('utf8') or False
+                    prodlot_set_ids |= {'%s+%s' % (item.id, item_name)}
+
+                for asd in lot_set_ids:
+                    if asd not in lots_lot_set_ids:
+                        lots_lot_set_ids.append(asd)
+
+            # if at least one line is not found, then return error
+            if not element_searched:
+                return False, line[0], False
+
+        # all lines were found, then return those lots
+        return lot_set_ids, prodlot_set_ids, lots_lot_set_ids
+
+    @api.multi
+    def onchange_load_products(self, input_data, lines_list_id):
+        """
+        Load claim lines from partner invoices or related production lots
+        into the current claim massively
+        """
+        lot_lots_ids = []
+        prodlot_set_ids = set()
+        lines_set_ids = []
+        current_status = scaned_data = ''
+
+        elements_searched, line_found, lot_lots_ids = \
+            self._get_lots_from_scan_data(input_data)
+
+        if not elements_searched and not line_found:
+            return {
+                'value': {
+                    'option_ids': [],
+                    'current_status': current_status,
+                    'scaned_data': scaned_data,
+                },
+                'domain': {
+                    'lines_list_id': [('id', 'in', [])]
+                }
+            }
+        if not elements_searched and not lot_lots_ids and line_found:
+            return {
+                'warning': {
+                    'message': (_('The product or invoice %s'
+                                  ' was not found') % line_found)},
+            }
+        else:
+            lines_set_ids = elements_searched
+            prodlot_set_ids = line_found
+
+        for line in prodlot_set_ids:
+            name = line.split('+')
+            current_status += name[1] + '\n'
+            scaned_data += name[0] + '\n'
+
+        lines_set_ids = [asd.id for asd in lines_set_ids]
+        return {
+            'value': {
+                'option_ids': [(6, 0, lines_set_ids)],
+                'current_status': current_status,
+                'scaned_data': scaned_data,
+            },
+            'domain': {
+                'lines_list_id': [('id', 'in', lines_set_ids)]
+            }
+        }
+
+    def _get_lot_ids(self):
+        lot = self.env['stock.production.lot']
+        lot_ids = set()
+        if self.scaned_data:
+            lot_ids |= {lot_id
+                        for lid in self.scaned_data.strip().split('\n')
+                        for lot_id in lot.browse(int(lid))}
+
+        claim_line_wizard = self.env['claim.line.wizard']
+
+        lot_ids_2 = []
+        for wizard_id in lot_ids:
+            clws = claim_line_wizard.search([('lot_id', '=', wizard_id.id)])
+            for clw in clws:
+                lot_ids_2.append(clw)
+
+        lot_ids = set(lot_ids_2)
+
+        if self.lines_list_id:
+            lot_ids |= {lid for lid in self.lines_list_id}
+
+        return lot_ids
+
+    @api.model
+    def _get_invalid_lots_set(self, claim_line_wizard_ids, add=False):
+        """
+        Return only those lots are related to claim lines
+        """
+        claim_line_wizard = self.env['claim.line.wizard']
+        valid = claim_line_wizard.browse(claim_line_wizard_ids)
+        invalid_lots = []
+        for clw in claim_line_wizard.browse(claim_line_wizard_ids):
+            if clw.lot_id:
+                invalid_lot = self.env['claim.line'].search([
+                    ('invoice_line_id', '=', clw.invoice_line_id.id),
+                    ('product_id', '=', clw.product_id.id),
+                    ('prodlot_id', '=', clw.lot_id.id),
+                ])
+                if not invalid_lot:
+                    valid = valid - clw
+                if invalid_lot:
+                    invalid_lots.append(clw)
+
+        for clw in valid.mapped('invoice_line_id'):
+
+            # mac1, None -> claim.line
+            invalid_lot = self.env['claim.line'].search([
+                ('invoice_line_id', '=', clw.id),
+                ('product_id', '=', clw.product_id.id),
+            ])
+
+            # mac1, mac2, mac3, mac4, None -> breaked down
+            clws = self.env['claim.line.wizard'].\
+                search([('invoice_line_id', '=', clw.id),
+                        ])
+
+            if invalid_lot:
+                for item in invalid_lot:
+                    if item.prodlot_id:
+                        add = clws.search([
+                            ('lot_id', '=', item.prodlot_id.id),
+                            ('id', 'in', clws.mapped('id')),
+                            ('id', 'not in', [rdy.id for rdy in invalid_lots]),
+                        ])
+                    else:
+                        add = clws.search([
+                            ('lot_id', '=', False),
+                            ('id', 'in', clws.mapped('id')),
+                            ('id', 'not in', [rdy.id for rdy in invalid_lots]),
+                        ])
+                    if add:
+                        invalid_lots.append(add[0])
+
+        # mac1, None -> like claim.line.wizard
+        return invalid_lots and invalid_lots or []
+
+    @api.multi
+    def add_claim_lines(self):
+        info = self.get_data_of_products(self.scan_data)
+        lot_ids = self._get_lot_ids()
+        lot_ids = [lid.id for lid in lot_ids]
+        clw_ids = set(self._get_lot_ids()) - \
+            set(self._get_invalid_lots_set(lot_ids, True))
+        clw_ids = list(clw_ids)
+        # It creates only those claim lines that have a valid production lot,
+        # i. e. not using in others claims
+        info = dict(info)
+
+        if clw_ids:
+            for clw_id in clw_ids:
+                product_id = clw_id.product_id
+
+                claim_line_info = False
+                if clw_id.lot_id.name in info:
+                    claim_line_info = info.get(clw_id.lot_id.name, False)
+                elif clw_id.invoice_line_id.invoice_id.number in info:
+                    claim_line_info = \
+                        info.get(clw_id.invoice_line_id.invoice_id.number,
+                                 False)
+
+                num = claim_line_info and claim_line_info[0] or '0'
+                name = claim_line_info and claim_line_info[1] or ''
+                if num.isdigit():
+                    num = int(num)
+                else:
+                    num = 0
+
+                current_claim_type, customer_claim_type, \
+                    supplier_claim_type = \
+                    self._get_claim_type()
+                self.create_claim_line(self.env.context.get('active_id'),
+                                       self.env[
+                                           'claim.line']._get_subject(num),
+                                       product_id, clw_id, 1, name)
+        # normal execution
+        self.action_cancel()
+
+    @api.multi
+    def change_list(self, lines):
+        return {
+            'value': {
+                'lines_list_id': lines,
+            }
+        }
+
+    message = fields.Text(string='Message',
+                          compute='_set_message'
+                          )
+
+    @api.depends('current_status', 'lines_list_id', 'scan_data')
+    def _set_message(self):
+        """
+        Notify for missing (not added) claim lines that are in use in others
+        claims
+        """
+        for wizard in self:
+            msg = ''
+            all_lots = wizard._get_lots_from_scan_data(wizard.scan_data)
+            not_valid_lot_ids = set()
+            if all_lots[0]:
+                all_lots_0 = [item for item in all_lots[0]]
+                not_valid_lot_ids = set(all_lots_0)
+            if all_lots[2]:
+                all_lots_2 = [item for item in all_lots[2]]
+                not_valid_lot_ids |= set(all_lots_2)
+
+            if not_valid_lot_ids:
+                not_valid_lot_ids = [item.id for
+                                     item in list(not_valid_lot_ids)]
+                not_valid_lot_ids = wizard.\
+                    _get_invalid_lots_set(not_valid_lot_ids)
+                not_valid_lot_ids = list(set(not_valid_lot_ids))
+                claim_with_lots_msg = ""
+
+                for line_id in not_valid_lot_ids:
+                    claim_with_lots_msg += "\t- %s\n" % \
+                        line_id.name
+                if claim_with_lots_msg:
+                    msg = _("The following Serial/Lot numbers won't be added,"
+                            " because all of them (listed below)"
+                            " are currently in"
+                            " use:\n\n %s") % (claim_with_lots_msg) or ''
+
+            wizard.message = msg
diff --git a/crm_rma_lot_mass_return/wizards/returned_lines_from_serial_wizard.xml b/crm_rma_lot_mass_return/wizards/returned_lines_from_serial_wizard.xml
new file mode 100644
index 00000000..d1a4d107
--- /dev/null
+++ b/crm_rma_lot_mass_return/wizards/returned_lines_from_serial_wizard.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="view_enter_product" model="ir.ui.view">
+            <field name="name">returned_lines_from_serial_wiew</field>
+            <field name="model">returned.lines.from.serial.wizard</field>
+            <field name="arch" type="xml">
+                <form>
+                    <div class='row'>
+                        <div class="col-md-10 col-sm-10 col-lg-10">
+                            <div class="panel panel-default">
+                                <div class="panel-heading">
+                                    <h2><field name="partner_id" readonly="1"/></h2>
+                                    <field class="oe_form_box_info oe_text_center"
+                                        name='message'
+                                        readonly="1"
+                                        attrs="{'invisible':[('message', '=', '')]}"/>
+                                    <group>
+                                        <field name="scaned_data" invisible="1"/>
+                                    </group>
+                                </div>
+                            </div>
+                            <table class="table table-hover">
+                                <tbody>
+                                    <td>
+                                        <field name="current_status" readonly="1" widget="barcode_text"  nolabel='1'/>
+                                    </td>
+                                    <td>
+                                        <field name="scan_data"
+                                               widget='barcode_text'
+                                               on_change="onchange_load_products(scan_data, option_ids)"
+                                               nolabel='1'/>
+                                    </td>
+                                </tbody>
+                            </table>
+                        </div>
+                        <div class="col-md-10 col-sm-10 col-lg-10">
+                            <div class="row">
+                                <div class="pull-right" name="buttons">
+                                <button name="add_claim_lines"
+                                    help="Validate the actual picking, it will execute all the validations and the inventory will be affected"
+                                    confirm="You add new returns in claim, are you sure?."
+                                    string="_Validate" colspan="1" type="object" class="oe_highlight"/>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class='col-md-4 col-sm-4 col-lg-4'>
+                            <div class="row">
+                                <field name="option_ids" invisible="1"/>
+                                <field name="lines_list_id"
+                                    domain="[('id', 'in', [])]"
+                                    widget="many2many_checkboxes" on_change="change_list(lines_list_id)"/>
+                            </div>
+                        </div>
+                        <div class='col-md-16 col-sm-16 col-lg-16'>
+                            <div class="row">
+                                <!-- Invoice lines list -->
+                            </div>
+                        </div>
+                        <div class='col-md-4 col-sm-4 col-lg-4'>
+                            <div class="row">
+                            </div>
+                        </div>
+                    </div>
+                    <footer>
+                        <p class="oe_help">
+                            You should use this windows on this way.
+                            <ol>
+                                <li>Write the Serial/Lot Number to search the product</li>
+                                or
+                                <li>Write the Invoice Number to search the products in lines</li>
+                                <li>Example: A4JD6JHS</li>
+                            </ol>
+                            The format for writing the reason for the claim and
+                            the description is:
+                            <ol>
+                                <li>Serial/Lot Number*reason number*Description here</li>
+                                <li>Example: A4JD6JHS*4*The display is break</li>
+                            </ol>
+
+                            The reasons for the claim can be
+                            <ol>
+                               <li>Not specified</li>
+                               <li>Legal retractation</li>
+                               <li>Order Cancellation</li>
+                               <li>Damaged Delivered Product</li>
+                               <li>Shipping error</li>
+                               <li>Exchange request</li>
+                               <li>Lost during transport</li>
+                               <li>Perfect Conditions</li>
+                               <li>Imperfection</li>
+                               <li>Physical Damage by Client</li>
+                               <li>Physical Damage by Company</li>
+                               <li>Other</li>
+                            </ol>
+                        </p>
+                    </footer>
+                </form>
+            </field>
+        </record>
+    </data>
+</openerp>

From b09e77dc77c811f973a4c78772a88dc81ab70372 Mon Sep 17 00:00:00 2001
From: Osval Reyes <osval@vauxoo.com>
Date: Thu, 19 Nov 2015 15:33:16 -0430
Subject: [PATCH 02/19] [REF] crm_rma_lot_mass_return: reverse some changes

---
 crm_rma_lot_mass_return/__openerp__.py        |   2 +-
 crm_rma_lot_mass_return/tests/__init__.py     |   2 +-
 .../tests/test_crm_rma_lot_mass_return_2.py   | 124 ++++++------------
 .../wizards/returned_lines_from_serial.py     |  21 +--
 4 files changed, 53 insertions(+), 96 deletions(-)

diff --git a/crm_rma_lot_mass_return/__openerp__.py b/crm_rma_lot_mass_return/__openerp__.py
index c0bf52b9..6792605a 100644
--- a/crm_rma_lot_mass_return/__openerp__.py
+++ b/crm_rma_lot_mass_return/__openerp__.py
@@ -43,7 +43,7 @@
     'demo': [
         'demo/stock_production_lot.xml',
         'demo/purchase_order.xml',
-        # 'demo/sale_order.xml',
+        'demo/sale_order.xml',
         'demo/transfer_details.xml',
     ],
     'installable': True,
diff --git a/crm_rma_lot_mass_return/tests/__init__.py b/crm_rma_lot_mass_return/tests/__init__.py
index 44c35c67..5d0a4480 100644
--- a/crm_rma_lot_mass_return/tests/__init__.py
+++ b/crm_rma_lot_mass_return/tests/__init__.py
@@ -3,7 +3,7 @@
 #
 #    Copyright 2015 Vauxoo
 #    Author: Osval Reyes,
-#          Yanina Aular
+#            Yanina Aular
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
diff --git a/crm_rma_lot_mass_return/tests/test_crm_rma_lot_mass_return_2.py b/crm_rma_lot_mass_return/tests/test_crm_rma_lot_mass_return_2.py
index e43562ba..b65e3883 100644
--- a/crm_rma_lot_mass_return/tests/test_crm_rma_lot_mass_return_2.py
+++ b/crm_rma_lot_mass_return/tests/test_crm_rma_lot_mass_return_2.py
@@ -21,7 +21,6 @@
 ##############################################################################
 
 from openerp.tests.common import TransactionCase
-import re
 
 
 class TestCrmRmaLotMassReturn2(TransactionCase):
@@ -58,6 +57,10 @@ class TestCrmRmaLotMassReturn2(TransactionCase):
             })
 
     def test_01_load_products(self):
+
+        # Before continue, invoice must be open to get a number value
+        # and this is needed by the wizard
+
         wizard_id = self.metasearch_wizard.with_context({
             'active_model': self.claim_id_1._name,
             'active_id': self.claim_id_1.id,
@@ -90,43 +93,56 @@ class TestCrmRmaLotMassReturn2(TransactionCase):
         for inv_line in self.sale_order.invoice_ids[0].invoice_line:
             qty += inv_line.quantity
         # Validate it has exactly as much records as the taken invoice has
-        self.assertEqual(len(lines_list_id), int(qty))
+        self.assertEqual(len(lines_list_id),
+                         int(qty))
 
         wizard_id._set_message()
         wizard_id.add_claim_lines()
 
         # 2 Macs
-        self.assertEqual(len(self.claim_id_1.claim_line_ids), 2)
+        self.assertEqual(len(self.claim_id_1.claim_line_ids),
+                         2)
 
     def test_02_load_products(self):
+
+        # Before continue, invoice must be open to get a number value
+        # and this is needed by the wizard
+
         wizard_id = self.metasearch_wizard.with_context({
             'active_model': self.claim_id_2._name,
             'active_id': self.claim_id_2.id,
             'active_ids': [self.claim_id_2.id]
         }).create({})
 
-        line_str = self.sale_order.invoice_ids[0].number + '*5*A description\n'
         # Get ids for invoice lines
         lines_list_id = wizard_id.onchange_load_products(
-            line_str, [(6, 0, [])])['domain']['lines_list_id'][0][2]
+            self.sale_order.invoice_ids[0].number +
+            '*5*description here' + '\n',
+            [(6, 0, [])])['domain']['lines_list_id'][0][2]
 
         option_ids = wizard_id.onchange_load_products(
-            line_str, [(6, 0, [])])['value']['option_ids'][0][2]
+            self.sale_order.invoice_ids[0].number +
+            '*5*description here' + '\n',
+            [(6, 0, [])])['value']['option_ids'][0][2]
 
         wizard_id.option_ids = option_ids
-        cl_wizard = self.env['claim.line.wizard'].browse(lines_list_id)
 
-        mac0001 = cl_wizard.search([('lot_id.name', '=', 'MAC0001')])
-        mac0003 = cl_wizard.search([('lot_id.name', '=', 'MAC0003')])
-        toner0001 = cl_wizard.search([('product_id.name',
-                                       '=', 'Toner Cartridge')])
+        items_to_select = self.env['claim.line.wizard'].browse(lines_list_id)
+
+        mac0001 = items_to_select.search([('lot_id.name', '=', 'MAC0001')])
+        mac0003 = items_to_select.search([('lot_id.name', '=', 'MAC0003')])
+        toner0001 = items_to_select.search([('product_id.name',
+                                             '=', 'Toner Cartridge')])
         toner0002 = toner0001[1]
         toner0001 = toner0001[0]
-        ink0001 = cl_wizard.search([('product_id.name', '=', 'Ink Cartridge')])
+        ink0001 = items_to_select.search([('product_id.name',
+                                           '=', 'Ink Cartridge')])
 
         wizard_id.lines_list_id = [(6, 0, [mac0001.id, mac0003.id,
-                                           toner0001.id, toner0002.id,
+                                           toner0001.id,
+                                           toner0002.id,
                                            ink0001.id])]
+
         # 1 Ink Cartridge, 2 Toner Cartridge, 1 iPad, 5 iMac
         self.assertEqual(len(lines_list_id), 9)
 
@@ -134,76 +150,16 @@ class TestCrmRmaLotMassReturn2(TransactionCase):
         for inv_line in self.sale_order.invoice_ids[0].invoice_line:
             qty += inv_line.quantity
         # Validate it has exactly as much records as the taken invoice has
-        self.assertEqual(len(lines_list_id), int(qty))
+        self.assertEqual(len(lines_list_id),
+                         int(qty))
+
+        # wizard_id._set_message()
+        # regex = re.compile("The following Serial/Lot numbers"
+        #                    " won't be added.*MAC0001.*")
+        # self.assertTrue(regex.match(wizard_id.message))
+
         wizard_id.add_claim_lines()
+
         # 2 Macs
-        self.assertEqual(len(self.claim_id_2.claim_line_ids), 5)
-
-    def test_03_claim_line_creation_and_error_message(self):
-        """
-        Challenge the wizard when a claim line is created, to set claim_origin
-        and the name correctly in a claim line itself, and also it tests the
-        message displayed to the user when is introduced an Serial/Lot numbers
-        that already is part of another claim.
-        """
-
-        subject_list = self.env['claim.line'].SUBJECT_LIST
-        lot_name = "MAC0001"
-        subject_index = 3
-        scanned_data = lot_name + '*' + \
-            str(subject_index) + '*A short description to test\n'
-        wizard_id = self.metasearch_wizard.with_context({
-            'active_model': self.claim_id_2._name,
-            'active_id': self.claim_id_2.id,
-            'active_ids': [self.claim_id_2.id]
-        }).create({})
-        wizard_id.scan_data = scanned_data
-
-        # Get ids for invoice lines
-        lines_list_id = wizard_id.onchange_load_products(
-            scanned_data, [(6, 0, [])])['domain']['lines_list_id'][0][2]
-
-        wizard_id.option_id = wizard_id.onchange_load_products(
-            scanned_data, [(6, 0, [])])['value']['option_ids'][0][2]
-
-        items_to_select = self.env['claim.line.wizard'].browse(lines_list_id)
-        mac0001 = items_to_select.search([('lot_id.name', '=', lot_name)])
-        wizard_id.lines_list_id = [(6, 0, [mac0001.id])]
-        self.assertEqual(len(lines_list_id), 1)
-
-        wizard_id.add_claim_lines()
-        self.assertEqual(len(self.claim_id_2.claim_line_ids), 1)
-
-        line_id = self.claim_id_2.claim_line_ids
-        self.assertEqual(
-            subject_list[subject_index-1][0], line_id.claim_origin)
-        self.assertEqual(scanned_data, line_id.prodlot_id.name + '*'
-                         + str(subject_index) + '*' + line_id.name + '\n')
-
-        # create again the wizard
-        wizard_id = self.metasearch_wizard.with_context({
-            'active_model': self.claim_id_2._name,
-            'active_id': self.claim_id_2.id,
-            'active_ids': [self.claim_id_2.id]
-        }).create({})
-        wizard_id.scan_data = scanned_data
-
-        # Get ids for invoice lines
-        lines_list_id = wizard_id.onchange_load_products(
-            scanned_data, [(6, 0, [])])['domain']['lines_list_id'][0][2]
-
-        wizard_id.option_id = wizard_id.onchange_load_products(
-            scanned_data, [(6, 0, [])])['value']['option_ids'][0][2]
-
-        cl_wizard = self.env['claim.line.wizard'].browse(lines_list_id)
-        clw_id = cl_wizard.search([('lot_id.name', '=', lot_name)])
-        wizard_id.lines_list_id = [(6, 0, [clw_id.id])]
-        self.assertEqual(len(lines_list_id), 1)
-
-        wizard_id._set_message()
-        wizard_id.add_claim_lines()
-        self.assertEqual(len(self.claim_id_2.claim_line_ids), 1)
-
-        # if the message exists, then it's being displayed
-        regex = re.compile(".*" + lot_name + ".*")
-        self.assertTrue(regex.search(wizard_id.message))
+        self.assertEqual(len(self.claim_id_2.claim_line_ids),
+                         5)
diff --git a/crm_rma_lot_mass_return/wizards/returned_lines_from_serial.py b/crm_rma_lot_mass_return/wizards/returned_lines_from_serial.py
index 0d6fcee4..a902e595 100644
--- a/crm_rma_lot_mass_return/wizards/returned_lines_from_serial.py
+++ b/crm_rma_lot_mass_return/wizards/returned_lines_from_serial.py
@@ -109,6 +109,7 @@ class ReturnedLinesFromSerial(models.TransientModel):
         else:
             inv_line = claim_line_wizard.invoice_line_id
             lot_id = False
+
         line_rec = clima_line.create({
             'claim_id': claim_id,
             'claim_origin': claim_origin,
@@ -501,23 +502,23 @@ class ReturnedLinesFromSerial(models.TransientModel):
         info = self.get_data_of_products(self.scan_data)
         lot_ids = self._get_lot_ids()
         lot_ids = [lid.id for lid in lot_ids]
-        clw_ids = set(self._get_lot_ids()) - \
+        valid_lot_ids = set(self._get_lot_ids()) - \
             set(self._get_invalid_lots_set(lot_ids, True))
-        clw_ids = list(clw_ids)
+        valid_lot_ids = list(valid_lot_ids)
         # It creates only those claim lines that have a valid production lot,
         # i. e. not using in others claims
         info = dict(info)
 
-        if clw_ids:
-            for clw_id in clw_ids:
-                product_id = clw_id.product_id
+        if valid_lot_ids:
+            for lot_id in valid_lot_ids:
+                product_id = lot_id.product_id
 
                 claim_line_info = False
-                if clw_id.lot_id.name in info:
-                    claim_line_info = info.get(clw_id.lot_id.name, False)
-                elif clw_id.invoice_line_id.invoice_id.number in info:
+                if lot_id.name in info:
+                    claim_line_info = info.get(lot_id.name, False)
+                elif lot_id.invoice_line_id.invoice_id.number in info:
                     claim_line_info = \
-                        info.get(clw_id.invoice_line_id.invoice_id.number,
+                        info.get(lot_id.invoice_line_id.invoice_id.number,
                                  False)
 
                 num = claim_line_info and claim_line_info[0] or '0'
@@ -533,7 +534,7 @@ class ReturnedLinesFromSerial(models.TransientModel):
                 self.create_claim_line(self.env.context.get('active_id'),
                                        self.env[
                                            'claim.line']._get_subject(num),
-                                       product_id, clw_id, 1, name)
+                                       product_id, lot_id, 1, name)
         # normal execution
         self.action_cancel()
 

From 0b92f3ff5e50beaa3b47a90e423cdb0df226807d Mon Sep 17 00:00:00 2001
From: Osval Reyes <osval@vauxoo.com>
Date: Thu, 19 Nov 2015 15:43:35 -0430
Subject: [PATCH 03/19] [REF] crm_rma_lot_mass_return: make improvements for
 the wizard, add tests to validate changes

---
 crm_rma_lot_mass_return/i18n/es.po            |   8 +-
 .../tests/test_crm_rma_lot_mass_return.py     |  60 +++++++--
 .../tests/test_crm_rma_lot_mass_return_2.py   | 120 ++++++++++++------
 .../wizards/returned_lines_from_serial.py     |  30 +++--
 .../returned_lines_from_serial_wizard.xml     |   6 +-
 5 files changed, 159 insertions(+), 65 deletions(-)

diff --git a/crm_rma_lot_mass_return/i18n/es.po b/crm_rma_lot_mass_return/i18n/es.po
index bdc345ff..1da58818 100644
--- a/crm_rma_lot_mass_return/i18n/es.po
+++ b/crm_rma_lot_mass_return/i18n/es.po
@@ -161,8 +161,8 @@ msgstr "Escribir el número de serie o lote para buscar el producto."
 
 #. module: crm_rma_lot_mass_return
 #: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
-msgid "You add new returns in claim, are you sure?."
-msgstr "Agregarás nuevas devoluciones en el reclamo, ¿Estás seguro?"
+msgid "You are about to add new lines to the claim, Do you want to continue?."
+msgstr "Se agregarán nuevas líneas a la reclamación, ¿Desea continuar?"
 
 #. module: crm_rma_lot_mass_return
 #: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
@@ -171,8 +171,8 @@ msgstr "Deberías usar ésta ventana"
 
 #. module: crm_rma_lot_mass_return
 #: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
-msgid "_Validate"
-msgstr "_Validar"
+msgid "Add items to the claim"
+msgstr "Añadir productos a la reclamación"
 
 #. module: crm_rma_lot_mass_return
 #: code:addons/crm_rma_lot_mass_return/wizards/returned_lines_from_serial.py:585
diff --git a/crm_rma_lot_mass_return/tests/test_crm_rma_lot_mass_return.py b/crm_rma_lot_mass_return/tests/test_crm_rma_lot_mass_return.py
index c8783802..4edfd2cc 100644
--- a/crm_rma_lot_mass_return/tests/test_crm_rma_lot_mass_return.py
+++ b/crm_rma_lot_mass_return/tests/test_crm_rma_lot_mass_return.py
@@ -20,6 +20,7 @@
 #
 ##############################################################################
 
+from datetime import date
 from openerp.tests.common import TransactionCase
 
 
@@ -66,11 +67,6 @@ class TestCrmRmaLotMassReturn(TransactionCase):
         self.assertEqual(res['res_model'], self.metasearch_wizard._name)
 
     def test_02_load_products(self):
-        self.invoice_id.signal_workflow('invoice_open')
-
-        # Before continue, invoice must be open to get a number value
-        # and this is needed by the wizard
-        self.assertEqual(self.invoice_id.state, 'open')
 
         wizard_id = self.metasearch_wizard.with_context({
             'active_model': self.claim_id._name,
@@ -82,7 +78,10 @@ class TestCrmRmaLotMassReturn(TransactionCase):
         lines_list_id = wizard_id.onchange_load_products(
             self.invoice_id.number +
             '*5*description here' + '\n' + self.lot_ids[0].name,
-            [(6, 0, [])])['domain']['lines_list_id'][0][2]
+            [(6, 0, [])])
+
+        lines_list_id = lines_list_id['domain']['lines_list_id'][0][2]
+
         option_ids = wizard_id.onchange_load_products(
             self.invoice_id.number, [(6, 0, [])])['value']['option_ids'][0][2]
 
@@ -107,6 +106,49 @@ class TestCrmRmaLotMassReturn(TransactionCase):
         self.assertEqual(len(self.claim_id.claim_line_ids),
                          int(qty))
 
+    def sale_validate_invoice(self, sale):
+
+        sale_advance_obj = self.env['sale.advance.payment.inv']
+
+        context = {
+            'active_model': 'sale.order',
+            'active_ids': [sale.id],
+            'active_id': sale.id,
+        }
+
+        wizard_invoice_id = sale_advance_obj.with_context(context).create({
+            'advance_payment_method': 'all',
+        })
+
+        wizard_invoice_id.with_context(context).create_invoices()
+
+        invoice_id = sale.invoice_ids[0]
+        invoice_id.signal_workflow('invoice_open')
+
+        # check if invoice is open
+        self.assertEqual(invoice_id.state, 'open')
+
+        pay_account_id = self.env['account.account'].\
+            browse(self.ref("account.cash"))
+        journal_id = self.env['account.journal'].\
+            browse(self.ref("account.bank_journal"))
+        date_start = date.today().replace(day=1, month=1).strftime('%Y-%m-%d')
+        period_id = self.env['account.fiscalyear'].search(
+            [('date_start', '=', date_start)]).period_ids[8]
+
+        invoice_id.pay_and_reconcile(
+            invoice_id.amount_total, pay_account_id.id,
+            period_id.id, journal_id.id, pay_account_id.id,
+            period_id.id, journal_id.id,
+            name="Payment for Invoice")
+
+        # in order to proceed is necessary to get the sale order invoiced
+        # and the invoice paid as well
+        self.assertTrue(sale.invoiced)
+        self.assertEqual(invoice_id.state, 'paid')
+
+        return invoice_id
+
     def create_sale_invoice(self):
         sale_order_id = self.create_sale_order('manual')
 
@@ -150,8 +192,8 @@ class TestCrmRmaLotMassReturn(TransactionCase):
 
             wizard_id.do_detailed_transfer()
 
-        sale_order_id.action_invoice_create()
-        invoice_id = sale_order_id.invoice_ids[0]
-        invoice_id.signal_workflow('invoice_open')
+        # Before continue, invoice must be open to get a number value
+        # and this is needed by the wizard
+        invoice_id = self.sale_validate_invoice(sale_order_id)
 
         return invoice_id, lot_ids
diff --git a/crm_rma_lot_mass_return/tests/test_crm_rma_lot_mass_return_2.py b/crm_rma_lot_mass_return/tests/test_crm_rma_lot_mass_return_2.py
index b65e3883..22e40f3f 100644
--- a/crm_rma_lot_mass_return/tests/test_crm_rma_lot_mass_return_2.py
+++ b/crm_rma_lot_mass_return/tests/test_crm_rma_lot_mass_return_2.py
@@ -21,6 +21,7 @@
 ##############################################################################
 
 from openerp.tests.common import TransactionCase
+import re
 
 
 class TestCrmRmaLotMassReturn2(TransactionCase):
@@ -57,10 +58,6 @@ class TestCrmRmaLotMassReturn2(TransactionCase):
             })
 
     def test_01_load_products(self):
-
-        # Before continue, invoice must be open to get a number value
-        # and this is needed by the wizard
-
         wizard_id = self.metasearch_wizard.with_context({
             'active_model': self.claim_id_1._name,
             'active_id': self.claim_id_1.id,
@@ -93,56 +90,43 @@ class TestCrmRmaLotMassReturn2(TransactionCase):
         for inv_line in self.sale_order.invoice_ids[0].invoice_line:
             qty += inv_line.quantity
         # Validate it has exactly as much records as the taken invoice has
-        self.assertEqual(len(lines_list_id),
-                         int(qty))
+        self.assertEqual(len(lines_list_id), int(qty))
 
         wizard_id._set_message()
         wizard_id.add_claim_lines()
 
         # 2 Macs
-        self.assertEqual(len(self.claim_id_1.claim_line_ids),
-                         2)
+        self.assertEqual(len(self.claim_id_1.claim_line_ids), 2)
 
     def test_02_load_products(self):
-
-        # Before continue, invoice must be open to get a number value
-        # and this is needed by the wizard
-
         wizard_id = self.metasearch_wizard.with_context({
             'active_model': self.claim_id_2._name,
             'active_id': self.claim_id_2.id,
             'active_ids': [self.claim_id_2.id]
         }).create({})
 
+        line_str = self.sale_order.invoice_ids[0].number + '*5*A description\n'
         # Get ids for invoice lines
         lines_list_id = wizard_id.onchange_load_products(
-            self.sale_order.invoice_ids[0].number +
-            '*5*description here' + '\n',
-            [(6, 0, [])])['domain']['lines_list_id'][0][2]
+            line_str, [(6, 0, [])])['domain']['lines_list_id'][0][2]
 
         option_ids = wizard_id.onchange_load_products(
-            self.sale_order.invoice_ids[0].number +
-            '*5*description here' + '\n',
-            [(6, 0, [])])['value']['option_ids'][0][2]
+            line_str, [(6, 0, [])])['value']['option_ids'][0][2]
 
         wizard_id.option_ids = option_ids
+        cl_wizard = self.env['claim.line.wizard'].browse(lines_list_id)
 
-        items_to_select = self.env['claim.line.wizard'].browse(lines_list_id)
-
-        mac0001 = items_to_select.search([('lot_id.name', '=', 'MAC0001')])
-        mac0003 = items_to_select.search([('lot_id.name', '=', 'MAC0003')])
-        toner0001 = items_to_select.search([('product_id.name',
-                                             '=', 'Toner Cartridge')])
+        mac0001 = cl_wizard.search([('lot_id.name', '=', 'MAC0001')])
+        mac0003 = cl_wizard.search([('lot_id.name', '=', 'MAC0003')])
+        toner0001 = cl_wizard.search([('product_id.name',
+                                       '=', 'Toner Cartridge')])
         toner0002 = toner0001[1]
         toner0001 = toner0001[0]
-        ink0001 = items_to_select.search([('product_id.name',
-                                           '=', 'Ink Cartridge')])
+        ink0001 = cl_wizard.search([('product_id.name', '=', 'Ink Cartridge')])
 
         wizard_id.lines_list_id = [(6, 0, [mac0001.id, mac0003.id,
-                                           toner0001.id,
-                                           toner0002.id,
+                                           toner0001.id, toner0002.id,
                                            ink0001.id])]
-
         # 1 Ink Cartridge, 2 Toner Cartridge, 1 iPad, 5 iMac
         self.assertEqual(len(lines_list_id), 9)
 
@@ -150,16 +134,76 @@ class TestCrmRmaLotMassReturn2(TransactionCase):
         for inv_line in self.sale_order.invoice_ids[0].invoice_line:
             qty += inv_line.quantity
         # Validate it has exactly as much records as the taken invoice has
-        self.assertEqual(len(lines_list_id),
-                         int(qty))
+        self.assertEqual(len(lines_list_id), int(qty))
+        wizard_id.add_claim_lines()
+        # 2 Macs
+        self.assertEqual(len(self.claim_id_2.claim_line_ids), 5)
 
-        # wizard_id._set_message()
-        # regex = re.compile("The following Serial/Lot numbers"
-        #                    " won't be added.*MAC0001.*")
-        # self.assertTrue(regex.match(wizard_id.message))
+    def test_03_claim_line_creation_and_error_message(self):
+        """
+        Challenge the wizard when a claim line is created, to set claim_origin
+        and the name correctly in a claim line itself, and also it tests the
+        message displayed to the user when is introduced an Serial/Lot numbers
+        that already is part of another claim.
+        """
+
+        subject_list = self.env['claim.line'].SUBJECT_LIST
+        lot_name = "MAC0001"
+        subject_index = 3
+        scanned_data = lot_name + '*' + \
+            str(subject_index) + '*A short description to test\n'
+        wizard_id = self.metasearch_wizard.with_context({
+            'active_model': self.claim_id_2._name,
+            'active_id': self.claim_id_2.id,
+            'active_ids': [self.claim_id_2.id]
+        }).create({})
+        wizard_id.scan_data = scanned_data
+
+        # Get ids for invoice lines
+        lines_list_id = wizard_id.onchange_load_products(
+            scanned_data, [(6, 0, [])])['domain']['lines_list_id'][0][2]
+
+        wizard_id.option_id = wizard_id.onchange_load_products(
+            scanned_data, [(6, 0, [])])['value']['option_ids'][0][2]
+
+        items_to_select = self.env['claim.line.wizard'].browse(lines_list_id)
+        mac0001 = items_to_select.search([('lot_id.name', '=', lot_name)])
+        wizard_id.lines_list_id = [(6, 0, [mac0001.id])]
+        self.assertEqual(len(lines_list_id), 1)
 
         wizard_id.add_claim_lines()
+        self.assertEqual(len(self.claim_id_2.claim_line_ids), 1)
 
-        # 2 Macs
-        self.assertEqual(len(self.claim_id_2.claim_line_ids),
-                         5)
+        line_id = self.claim_id_2.claim_line_ids
+        self.assertEqual(
+            subject_list[subject_index - 1][0], line_id.claim_origin)
+        self.assertEqual(scanned_data, line_id.prodlot_id.name + '*' +
+                         str(subject_index) + '*' + line_id.name + '\n')
+
+        # create again the wizard
+        wizard_id = self.metasearch_wizard.with_context({
+            'active_model': self.claim_id_2._name,
+            'active_id': self.claim_id_2.id,
+            'active_ids': [self.claim_id_2.id]
+        }).create({})
+        wizard_id.scan_data = scanned_data
+
+        # Get ids for invoice lines
+        lines_list_id = wizard_id.onchange_load_products(
+            scanned_data, [(6, 0, [])])['domain']['lines_list_id'][0][2]
+
+        wizard_id.option_id = wizard_id.onchange_load_products(
+            scanned_data, [(6, 0, [])])['value']['option_ids'][0][2]
+
+        cl_wizard = self.env['claim.line.wizard'].browse(lines_list_id)
+        clw_id = cl_wizard.search([('lot_id.name', '=', lot_name)])
+        wizard_id.lines_list_id = [(6, 0, [clw_id.id])]
+        self.assertEqual(len(lines_list_id), 1)
+
+        wizard_id._set_message()
+        wizard_id.add_claim_lines()
+        self.assertEqual(len(self.claim_id_2.claim_line_ids), 1)
+
+        # if the message exists, then it's being displayed
+        regex = re.compile(".*" + lot_name + ".*")
+        self.assertTrue(regex.search(wizard_id.message))
diff --git a/crm_rma_lot_mass_return/wizards/returned_lines_from_serial.py b/crm_rma_lot_mass_return/wizards/returned_lines_from_serial.py
index a902e595..9d972fb0 100644
--- a/crm_rma_lot_mass_return/wizards/returned_lines_from_serial.py
+++ b/crm_rma_lot_mass_return/wizards/returned_lines_from_serial.py
@@ -109,7 +109,6 @@ class ReturnedLinesFromSerial(models.TransientModel):
         else:
             inv_line = claim_line_wizard.invoice_line_id
             lot_id = False
-
         line_rec = clima_line.create({
             'claim_id': claim_id,
             'claim_origin': claim_origin,
@@ -502,23 +501,23 @@ class ReturnedLinesFromSerial(models.TransientModel):
         info = self.get_data_of_products(self.scan_data)
         lot_ids = self._get_lot_ids()
         lot_ids = [lid.id for lid in lot_ids]
-        valid_lot_ids = set(self._get_lot_ids()) - \
+        clw_ids = set(self._get_lot_ids()) - \
             set(self._get_invalid_lots_set(lot_ids, True))
-        valid_lot_ids = list(valid_lot_ids)
+        clw_ids = list(clw_ids)
         # It creates only those claim lines that have a valid production lot,
         # i. e. not using in others claims
         info = dict(info)
 
-        if valid_lot_ids:
-            for lot_id in valid_lot_ids:
-                product_id = lot_id.product_id
+        if clw_ids:
+            for clw_id in clw_ids:
+                product_id = clw_id.product_id
 
                 claim_line_info = False
-                if lot_id.name in info:
-                    claim_line_info = info.get(lot_id.name, False)
-                elif lot_id.invoice_line_id.invoice_id.number in info:
+                if clw_id.lot_id.name in info:
+                    claim_line_info = info.get(clw_id.lot_id.name, False)
+                elif clw_id.invoice_line_id.invoice_id.number in info:
                     claim_line_info = \
-                        info.get(lot_id.invoice_line_id.invoice_id.number,
+                        info.get(clw_id.invoice_line_id.invoice_id.number,
                                  False)
 
                 num = claim_line_info and claim_line_info[0] or '0'
@@ -534,7 +533,16 @@ class ReturnedLinesFromSerial(models.TransientModel):
                 self.create_claim_line(self.env.context.get('active_id'),
                                        self.env[
                                            'claim.line']._get_subject(num),
-                                       product_id, lot_id, 1, name)
+                                       product_id, clw_id, 1, name)
+
+            # Clean items in wizard model
+            if len(clw_ids) == 1:
+                ids_to_delete = "(%s)" % str(clw_ids[0].id)
+            else:
+                ids_to_delete = "%s" % str(tuple([clw.id for clw in clw_ids]))
+            self._cr.execute("DELETE FROM claim_line_wizard where id IN %s"
+                             % ids_to_delete)
+
         # normal execution
         self.action_cancel()
 
diff --git a/crm_rma_lot_mass_return/wizards/returned_lines_from_serial_wizard.xml b/crm_rma_lot_mass_return/wizards/returned_lines_from_serial_wizard.xml
index d1a4d107..3bbbf0fb 100644
--- a/crm_rma_lot_mass_return/wizards/returned_lines_from_serial_wizard.xml
+++ b/crm_rma_lot_mass_return/wizards/returned_lines_from_serial_wizard.xml
@@ -38,9 +38,9 @@
                             <div class="row">
                                 <div class="pull-right" name="buttons">
                                 <button name="add_claim_lines"
-                                    help="Validate the actual picking, it will execute all the validations and the inventory will be affected"
-                                    confirm="You add new returns in claim, are you sure?."
-                                    string="_Validate" colspan="1" type="object" class="oe_highlight"/>
+                                    help="All the valid lines will be added to the claim"
+                                    confirm="You are about to add new lines to the claim, Do you want to continue?."
+                                    string="Add items to the claim" colspan="1" type="object" class="oe_highlight"/>
                                 </div>
                             </div>
                         </div>

From 1e18ef22de6652d1548607405779a74c43a6ece2 Mon Sep 17 00:00:00 2001
From: Osval Reyes <osval@vauxoo.com>
Date: Thu, 19 Nov 2015 18:55:53 -0430
Subject: [PATCH 04/19] [ADD] new module crm_claim_product_supplier

---
 crm_claim_product_supplier/README.rst         | 75 +++++++++++++++++++
 crm_claim_product_supplier/__init__.py        | 22 ++++++
 crm_claim_product_supplier/__openerp__.py     | 34 +++++++++
 .../i18n/crm_claim_product_supplier.pot       | 42 +++++++++++
 crm_claim_product_supplier/i18n/es.po         | 42 +++++++++++
 crm_claim_product_supplier/i18n/es_MX.po      | 21 ++++++
 crm_claim_product_supplier/i18n/es_PA.po      | 16 ++++
 crm_claim_product_supplier/i18n/es_VE.po      | 21 ++++++
 crm_claim_product_supplier/models/__init__.py | 21 ++++++
 .../models/claim_line.py                      | 46 ++++++++++++
 10 files changed, 340 insertions(+)
 create mode 100644 crm_claim_product_supplier/README.rst
 create mode 100644 crm_claim_product_supplier/__init__.py
 create mode 100644 crm_claim_product_supplier/__openerp__.py
 create mode 100644 crm_claim_product_supplier/i18n/crm_claim_product_supplier.pot
 create mode 100644 crm_claim_product_supplier/i18n/es.po
 create mode 100644 crm_claim_product_supplier/i18n/es_MX.po
 create mode 100644 crm_claim_product_supplier/i18n/es_PA.po
 create mode 100644 crm_claim_product_supplier/i18n/es_VE.po
 create mode 100644 crm_claim_product_supplier/models/__init__.py
 create mode 100644 crm_claim_product_supplier/models/claim_line.py

diff --git a/crm_claim_product_supplier/README.rst b/crm_claim_product_supplier/README.rst
new file mode 100644
index 00000000..d02af3f1
--- /dev/null
+++ b/crm_claim_product_supplier/README.rst
@@ -0,0 +1,75 @@
+.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg
+   :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+   :alt: License: AGPL-3
+
+==========================
+CRM Claim Product Supplier
+==========================
+
+This module adds information in claim lines to keep supplier and supplier
+invoice when creating/editing a claim.
+
+As this module shows, this is not used directly be the end user, it may be used
+as complementary for another modules to explode information stored by this one.
+
+Installation
+============
+
+To install this module, just select it from available modules
+
+Configuration
+=============
+
+Aditional configuration is not needed
+
+Usage
+=====
+
+* End-user direct usage is not possible, all the functionality contained in this
+  module is done under the hood and no view is included
+
+.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas
+   :alt: Try me on Runbot
+   :target: https://runbot.odoo-community.org/runbot/145/8.0
+
+For further information, please visit:
+
+* https://www.odoo.com/forum/help-1
+
+Known issues / Roadmap
+======================
+
+No issues exists yet
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues <https://github.com/OCA/rma/issues>`_.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us smashing it by providing a detailed and welcomed feedback
+`here <https://github.com/OCA/rma/issues/new?body=module:%20crm_claim_product_supplier%0Aversion:%208.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+
+
+Credits
+=======
+
+Contributors
+------------
+
+* Yanina Aular <yanina.aular@vauxoo.com>
+* Osval Reyes <osval@vauxoo.com>
+
+Maintainer
+----------
+
+.. image:: https://odoo-community.org/logo.png
+   :alt: Odoo Community Association
+   :target: https://odoo-community.org
+
+This module is maintained by the OCA.
+
+OCA, or the Odoo Community Association, is a nonprofit organization whose
+mission is to support the collaborative development of Odoo features and
+promote its widespread use.
+
+To contribute to this module, please visit http://odoo-community.org.
diff --git a/crm_claim_product_supplier/__init__.py b/crm_claim_product_supplier/__init__.py
new file mode 100644
index 00000000..8fdccbce
--- /dev/null
+++ b/crm_claim_product_supplier/__init__.py
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Copyright 2015 Vauxoo
+#    Author: Yanina Aular
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from . import models
diff --git a/crm_claim_product_supplier/__openerp__.py b/crm_claim_product_supplier/__openerp__.py
new file mode 100644
index 00000000..a548cbd4
--- /dev/null
+++ b/crm_claim_product_supplier/__openerp__.py
@@ -0,0 +1,34 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Copyright 2015 Vauxoo
+#    Author: Yanina Aular
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+{
+    'name': 'CRM Claim Product Supplier',
+    'version': '8.0.1.0.0',
+    'author': 'Vauxoo, Odoo Community Association (OCA)',
+    'website': 'http://www.vauxoo.com/',
+    'license': 'AGPL-3',
+    'category': 'Generic Modules/CRM & SRM',
+    'depends': [
+        'crm_rma_lot_mass_return',
+    ],
+    'installable': True,
+    'auto_install': False,
+}
diff --git a/crm_claim_product_supplier/i18n/crm_claim_product_supplier.pot b/crm_claim_product_supplier/i18n/crm_claim_product_supplier.pot
new file mode 100644
index 00000000..67981deb
--- /dev/null
+++ b/crm_claim_product_supplier/i18n/crm_claim_product_supplier.pot
@@ -0,0 +1,42 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* crm_claim_product_supplier
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 8.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-08-14 19:24+0000\n"
+"PO-Revision-Date: 2015-08-14 19:24+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_product_supplier
+#: model:ir.model,name:crm_claim_product_supplier.model_claim_line
+msgid "List of product to return"
+msgstr ""
+
+#. module: crm_claim_product_supplier
+#: field:claim.line,supplier_id:0
+msgid "Supplier"
+msgstr ""
+
+#. module: crm_claim_product_supplier
+#: field:claim.line,supplier_invoice_id:0
+msgid "Supplier Invoice"
+msgstr ""
+
+#. module: crm_claim_product_supplier
+#: help:claim.line,supplier_invoice_id:0
+msgid "Supplier invoice with the purchase of goods sold to customer"
+msgstr ""
+
+#. module: crm_claim_product_supplier
+#: help:claim.line,supplier_id:0
+msgid "Supplier of good in claim"
+msgstr ""
+
diff --git a/crm_claim_product_supplier/i18n/es.po b/crm_claim_product_supplier/i18n/es.po
new file mode 100644
index 00000000..6e4d3fee
--- /dev/null
+++ b/crm_claim_product_supplier/i18n/es.po
@@ -0,0 +1,42 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* crm_claim_product_supplier
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 8.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-07-17 18:01+0000\n"
+"PO-Revision-Date: 2015-07-17 18:01+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_product_supplier
+#: model:ir.model,name:crm_claim_product_supplier.model_claim_line
+msgid "List of product to return"
+msgstr "Lista de productos a retornar"
+
+#. module: crm_claim_product_supplier
+#: field:claim.line,supplier_id:0
+msgid "Supplier"
+msgstr "Proveedor"
+
+#. module: crm_claim_product_supplier
+#: field:claim.line,supplier_invoice_id:0
+msgid "Supplier Invoice"
+msgstr "Factura de proveedor"
+
+#. module: crm_claim_product_supplier
+#: help:claim.line,supplier_invoice_id:0
+msgid "Supplier invoice with the purchase of goods sold to customer"
+msgstr "Factura de proveedor con la orden de compra de materiales vendidos al cliente"
+
+#. module: crm_claim_product_supplier
+#: help:claim.line,supplier_id:0
+msgid "Supplier of good in claim"
+msgstr "Proveedor de productos en el reclamación"
+
diff --git a/crm_claim_product_supplier/i18n/es_MX.po b/crm_claim_product_supplier/i18n/es_MX.po
new file mode 100644
index 00000000..51c41d0f
--- /dev/null
+++ b/crm_claim_product_supplier/i18n/es_MX.po
@@ -0,0 +1,21 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* crm_claim_product_supplier
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 8.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-07-17 18:01+0000\n"
+"PO-Revision-Date: 2015-07-17 18:01+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_product_supplier
+#: help:claim.line,supplier_id:0
+msgid "Supplier of good in claim"
+msgstr "Proveedor de productos en el reclamo"
\ No newline at end of file
diff --git a/crm_claim_product_supplier/i18n/es_PA.po b/crm_claim_product_supplier/i18n/es_PA.po
new file mode 100644
index 00000000..56a95d2e
--- /dev/null
+++ b/crm_claim_product_supplier/i18n/es_PA.po
@@ -0,0 +1,16 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* crm_claim_product_supplier
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 8.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-07-17 18:01+0000\n"
+"PO-Revision-Date: 2015-07-17 18:01+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"
diff --git a/crm_claim_product_supplier/i18n/es_VE.po b/crm_claim_product_supplier/i18n/es_VE.po
new file mode 100644
index 00000000..51c41d0f
--- /dev/null
+++ b/crm_claim_product_supplier/i18n/es_VE.po
@@ -0,0 +1,21 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* crm_claim_product_supplier
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 8.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-07-17 18:01+0000\n"
+"PO-Revision-Date: 2015-07-17 18:01+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_product_supplier
+#: help:claim.line,supplier_id:0
+msgid "Supplier of good in claim"
+msgstr "Proveedor de productos en el reclamo"
\ No newline at end of file
diff --git a/crm_claim_product_supplier/models/__init__.py b/crm_claim_product_supplier/models/__init__.py
new file mode 100644
index 00000000..7ee9cd84
--- /dev/null
+++ b/crm_claim_product_supplier/models/__init__.py
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Copyright 2015 Vauxoo
+#    Author: Yanina Aular
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+from . import claim_line
diff --git a/crm_claim_product_supplier/models/claim_line.py b/crm_claim_product_supplier/models/claim_line.py
new file mode 100644
index 00000000..6f917a79
--- /dev/null
+++ b/crm_claim_product_supplier/models/claim_line.py
@@ -0,0 +1,46 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Copyright 2015 Vauxoo
+#    Author: Yanina Aular
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+from openerp import api, fields, models
+
+
+class ClaimLine(models.Model):
+
+    _inherit = 'claim.line'
+
+    supplier_id = \
+        fields.Many2one('res.partner', string='Supplier', store=True,
+                        compute='_compute_supplier_and_supplier_invoice',
+                        help="Supplier of good in claim")
+    supplier_invoice_id = \
+        fields.Many2one('account.invoice',
+                        string='Supplier Invoice', store=True,
+                        compute='_compute_supplier_and_supplier_invoice',
+                        help="Supplier invoice with the "
+                             "purchase of goods sold to "
+                             "customer")
+
+    @api.depends('prodlot_id')
+    def _compute_supplier_and_supplier_invoice(self):
+        for claim_line in self:
+            if claim_line.prodlot_id:
+                claim_line.supplier_id = claim_line.prodlot_id.supplier_id.id
+                claim_line.supplier_invoice_id = claim_line.prodlot_id.\
+                    supplier_invoice_line_id.invoice_id.id

From 542109b02551d82e6f4ab29ab96cae34139e2fbe Mon Sep 17 00:00:00 2001
From: OCA Git Bot <oca-git-bot@odoo-community.org>
Date: Fri, 20 Nov 2015 02:33:25 +0100
Subject: [PATCH 05/19] [UPD] addons table in README.md

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index df6c072c..dff8c8f2 100644
--- a/README.md
+++ b/README.md
@@ -44,9 +44,10 @@ Available addons
 ----------------
 addon | version | summary
 --- | --- | ---
-[crm_claim_rma](crm_claim_rma/) | 8.0.1.2.0 | RMA Claim (Product Return Management)
+[crm_claim_rma](crm_claim_rma/) | 8.0.1.1.1 | RMA Claim (Product Return Management)
 [crm_claim_rma_code](crm_claim_rma_code/) | 8.0.1.0.0 | CRM Claim RMA Code
 [crm_rma_location](crm_rma_location/) | 8.0.1.0.0 | RMA Location
+[crm_rma_lot_mass_return](crm_rma_lot_mass_return/) | 8.0.1.0.0 | RMA Claims Mass Return by Lot
 [crm_rma_prodlot_invoice](crm_rma_prodlot_invoice/) | 8.0.1.0.0 | CRM Claim Prodlot Invoice
 [crm_rma_prodlot_supplier](crm_rma_prodlot_supplier/) | 8.0.1.0.0 | Claim Prodlot Supplier
 [product_warranty](product_warranty/) | 8.0.1.0.0 | Product warranty
@@ -59,7 +60,6 @@ addon | version | summary
 [crm_claim_ext](crm_claim_ext/) | 1.0 (unported) | CRM claim extension
 [crm_rma_advance_location](crm_rma_advance_location/) | 1.0 (unported) | RMA Claims Advance Location
 [crm_rma_by_shop](crm_rma_by_shop/) | 1.0 (unported) | RMA Claims by shop
-[crm_rma_lot_mass_return](crm_rma_lot_mass_return/) | 1.0 (unported) | RMA Claims Mass Return by Lot
 [crm_rma_stock_location](crm_rma_stock_location/) | 1.0 (unported) | RMA Stock Location
 
 [//]: # (end addons)

From b4da3057a3880c2a79cbd7ac70b0cd83c9452920 Mon Sep 17 00:00:00 2001
From: Osval Reyes <osval@vauxoo.com>
Date: Mon, 23 Nov 2015 15:19:25 -0430
Subject: [PATCH 06/19] [REF] crm_claim_product_supplier: add unittest

---
 crm_claim_product_supplier/tests/__init__.py  | 22 ++++++
 .../tests/test_crm_claim_product_supplier.py  | 67 +++++++++++++++++++
 2 files changed, 89 insertions(+)
 create mode 100644 crm_claim_product_supplier/tests/__init__.py
 create mode 100644 crm_claim_product_supplier/tests/test_crm_claim_product_supplier.py

diff --git a/crm_claim_product_supplier/tests/__init__.py b/crm_claim_product_supplier/tests/__init__.py
new file mode 100644
index 00000000..7f6e2fcc
--- /dev/null
+++ b/crm_claim_product_supplier/tests/__init__.py
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Copyright 2015 Vauxoo
+#    Author: Osval Reyes
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from . import test_crm_claim_product_supplier
diff --git a/crm_claim_product_supplier/tests/test_crm_claim_product_supplier.py b/crm_claim_product_supplier/tests/test_crm_claim_product_supplier.py
new file mode 100644
index 00000000..7925c207
--- /dev/null
+++ b/crm_claim_product_supplier/tests/test_crm_claim_product_supplier.py
@@ -0,0 +1,67 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Copyright 2015 Vauxoo
+#    Author: Osval Reyes
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp.tests.common import TransactionCase
+
+
+class TestCrmClaimProductSupplier(TransactionCase):
+
+    def setUp(self):
+        super(TestCrmClaimProductSupplier, self).setUp()
+        self.sale_order_id = self.env.ref(
+            'crm_rma_lot_mass_return.so_wizard_rma_1')
+        self.invoice_id = self.sale_order_id.invoice_ids[0]
+        self.metasearch_wizard = self.env['returned.lines.from.serial.wizard']
+        self.lot_id = self.env.ref(
+            'crm_rma_lot_mass_return.lot_purchase_wizard_rma_item_5')
+
+        # Create the claim with a claim line
+        self.claim_id = self.env['crm.claim'].create({
+            'name': 'TEST CLAIM',
+            'claim_type': self.ref('crm_claim_type.'
+                                   'crm_claim_type_customer'),
+            'partner_id': self.sale_order_id.partner_id.id,
+        })
+
+        wizard_id = self.metasearch_wizard.with_context({
+            'active_model': self.claim_id._name,
+            'active_id': self.claim_id.id,
+            'active_ids': [self.claim_id.id]
+        }).create({})
+
+        # Get ids for invoice lines
+        lines_list_id = wizard_id.onchange_load_products(
+            self.lot_id.name + '\n', [(6, 0, [])]
+        )['domain']['lines_list_id'][0][2]
+
+        # Get ids for invoice lines
+        lines_list_id = self.env['claim.line.wizard'].search(
+            [('lot_id.name', '=', 'IPAD0001')]).mapped('id')
+
+        wizard_id.option_ids = lines_list_id
+        wizard_id.lines_list_id = [(6, 0, lines_list_id)]
+
+        wizard_id.add_claim_lines()
+
+    def test_01_product_supplier(self):
+        claim_line_id = self.claim_id.claim_line_ids[0]
+        self.assertTrue(claim_line_id.supplier_id)
+        self.assertTrue(claim_line_id.supplier_invoice_id)

From 229f7a5fb51a77945abf39dcdd205a493fd15a92 Mon Sep 17 00:00:00 2001
From: Osval Reyes <osval@vauxoo.com>
Date: Mon, 23 Nov 2015 15:49:04 -0430
Subject: [PATCH 07/19] [REF] crm_claim_product_supplier: change compute fields
 for related ones

---
 .../models/claim_line.py                      | 26 +++++--------------
 1 file changed, 7 insertions(+), 19 deletions(-)

diff --git a/crm_claim_product_supplier/models/claim_line.py b/crm_claim_product_supplier/models/claim_line.py
index 6f917a79..fb9a0047 100644
--- a/crm_claim_product_supplier/models/claim_line.py
+++ b/crm_claim_product_supplier/models/claim_line.py
@@ -25,22 +25,10 @@ class ClaimLine(models.Model):
 
     _inherit = 'claim.line'
 
-    supplier_id = \
-        fields.Many2one('res.partner', string='Supplier', store=True,
-                        compute='_compute_supplier_and_supplier_invoice',
-                        help="Supplier of good in claim")
-    supplier_invoice_id = \
-        fields.Many2one('account.invoice',
-                        string='Supplier Invoice', store=True,
-                        compute='_compute_supplier_and_supplier_invoice',
-                        help="Supplier invoice with the "
-                             "purchase of goods sold to "
-                             "customer")
-
-    @api.depends('prodlot_id')
-    def _compute_supplier_and_supplier_invoice(self):
-        for claim_line in self:
-            if claim_line.prodlot_id:
-                claim_line.supplier_id = claim_line.prodlot_id.supplier_id.id
-                claim_line.supplier_invoice_id = claim_line.prodlot_id.\
-                    supplier_invoice_line_id.invoice_id.id
+    supplier_id = fields.Many2one(comodel_name='res.partner',
+                                  related='prodlot_id.supplier_id',
+                                  help="Supplier of good in claim")
+    supplier_invoice_id = fields.Many2one(
+        comodel_name='account.invoice',
+        related="prodlot_id.supplier_invoice_line_id.invoice_id",
+        help="Supplier invoice with the purchase of goods sold to customer")

From 658f3662cbe8c3b7dcaddd5002418af882e68fcb Mon Sep 17 00:00:00 2001
From: Osval Reyes <osval@vauxoo.com>
Date: Mon, 23 Nov 2015 16:02:10 -0430
Subject: [PATCH 08/19] [FIX] crm_claim_product_supplier: fix F401 'api'

---
 crm_claim_product_supplier/models/claim_line.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crm_claim_product_supplier/models/claim_line.py b/crm_claim_product_supplier/models/claim_line.py
index fb9a0047..132ddaf7 100644
--- a/crm_claim_product_supplier/models/claim_line.py
+++ b/crm_claim_product_supplier/models/claim_line.py
@@ -18,7 +18,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-from openerp import api, fields, models
+from openerp import fields, models
 
 
 class ClaimLine(models.Model):

From 4215703bde6df1c617b6923202b4d8ee093d7f03 Mon Sep 17 00:00:00 2001
From: Osval Reyes <osval@vauxoo.com>
Date: Tue, 24 Nov 2015 11:12:41 -0430
Subject: [PATCH 09/19] [REF] readme: add contributor

---
 crm_claim_rma/README.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/crm_claim_rma/README.rst b/crm_claim_rma/README.rst
index 69a81a3a..744e83e8 100644
--- a/crm_claim_rma/README.rst
+++ b/crm_claim_rma/README.rst
@@ -71,6 +71,7 @@ Contributors:
 * Joel Grand-Guillaume <joel.grandguillaume@camptocamp.com>
 * Guewen Baconnier <guewen.baconnier@camptocamp.com>
 * Yannick Vaucher <yannick.vaucher@camptocamp.com>
+* Javier Carrasco <javier.carrasco@eezee-it.com>
 * Yanina Aular <yanina.aular@vauxoo.com>
 * Osval Reyes <osval@vauxoo.com>
 

From d9f473ee9bef676519680d1d25b20af4a3fcf252 Mon Sep 17 00:00:00 2001
From: Osval Reyes <osval@vauxoo.com>
Date: Tue, 24 Nov 2015 13:27:55 -0430
Subject: [PATCH 10/19] [REF] crm_claim_product_supplier: update i18n

---
 .../i18n/crm_claim_product_supplier.pot       | 21 ---------------
 crm_claim_product_supplier/i18n/es.po         | 26 -------------------
 crm_claim_product_supplier/i18n/es_MX.po      | 21 ---------------
 crm_claim_product_supplier/i18n/es_PA.po      | 16 ------------
 crm_claim_product_supplier/i18n/es_VE.po      | 21 ---------------
 .../models/claim_line.py                      |  6 ++---
 6 files changed, 2 insertions(+), 109 deletions(-)
 delete mode 100644 crm_claim_product_supplier/i18n/es_MX.po
 delete mode 100644 crm_claim_product_supplier/i18n/es_PA.po
 delete mode 100644 crm_claim_product_supplier/i18n/es_VE.po

diff --git a/crm_claim_product_supplier/i18n/crm_claim_product_supplier.pot b/crm_claim_product_supplier/i18n/crm_claim_product_supplier.pot
index 67981deb..bf1d708a 100644
--- a/crm_claim_product_supplier/i18n/crm_claim_product_supplier.pot
+++ b/crm_claim_product_supplier/i18n/crm_claim_product_supplier.pot
@@ -19,24 +19,3 @@ msgstr ""
 #: model:ir.model,name:crm_claim_product_supplier.model_claim_line
 msgid "List of product to return"
 msgstr ""
-
-#. module: crm_claim_product_supplier
-#: field:claim.line,supplier_id:0
-msgid "Supplier"
-msgstr ""
-
-#. module: crm_claim_product_supplier
-#: field:claim.line,supplier_invoice_id:0
-msgid "Supplier Invoice"
-msgstr ""
-
-#. module: crm_claim_product_supplier
-#: help:claim.line,supplier_invoice_id:0
-msgid "Supplier invoice with the purchase of goods sold to customer"
-msgstr ""
-
-#. module: crm_claim_product_supplier
-#: help:claim.line,supplier_id:0
-msgid "Supplier of good in claim"
-msgstr ""
-
diff --git a/crm_claim_product_supplier/i18n/es.po b/crm_claim_product_supplier/i18n/es.po
index 6e4d3fee..56a95d2e 100644
--- a/crm_claim_product_supplier/i18n/es.po
+++ b/crm_claim_product_supplier/i18n/es.po
@@ -14,29 +14,3 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: \n"
-
-#. module: crm_claim_product_supplier
-#: model:ir.model,name:crm_claim_product_supplier.model_claim_line
-msgid "List of product to return"
-msgstr "Lista de productos a retornar"
-
-#. module: crm_claim_product_supplier
-#: field:claim.line,supplier_id:0
-msgid "Supplier"
-msgstr "Proveedor"
-
-#. module: crm_claim_product_supplier
-#: field:claim.line,supplier_invoice_id:0
-msgid "Supplier Invoice"
-msgstr "Factura de proveedor"
-
-#. module: crm_claim_product_supplier
-#: help:claim.line,supplier_invoice_id:0
-msgid "Supplier invoice with the purchase of goods sold to customer"
-msgstr "Factura de proveedor con la orden de compra de materiales vendidos al cliente"
-
-#. module: crm_claim_product_supplier
-#: help:claim.line,supplier_id:0
-msgid "Supplier of good in claim"
-msgstr "Proveedor de productos en el reclamación"
-
diff --git a/crm_claim_product_supplier/i18n/es_MX.po b/crm_claim_product_supplier/i18n/es_MX.po
deleted file mode 100644
index 51c41d0f..00000000
--- a/crm_claim_product_supplier/i18n/es_MX.po
+++ /dev/null
@@ -1,21 +0,0 @@
-# Translation of Odoo Server.
-# This file contains the translation of the following modules:
-#	* crm_claim_product_supplier
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Odoo Server 8.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-07-17 18:01+0000\n"
-"PO-Revision-Date: 2015-07-17 18:01+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_product_supplier
-#: help:claim.line,supplier_id:0
-msgid "Supplier of good in claim"
-msgstr "Proveedor de productos en el reclamo"
\ No newline at end of file
diff --git a/crm_claim_product_supplier/i18n/es_PA.po b/crm_claim_product_supplier/i18n/es_PA.po
deleted file mode 100644
index 56a95d2e..00000000
--- a/crm_claim_product_supplier/i18n/es_PA.po
+++ /dev/null
@@ -1,16 +0,0 @@
-# Translation of Odoo Server.
-# This file contains the translation of the following modules:
-#	* crm_claim_product_supplier
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Odoo Server 8.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-07-17 18:01+0000\n"
-"PO-Revision-Date: 2015-07-17 18:01+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"
diff --git a/crm_claim_product_supplier/i18n/es_VE.po b/crm_claim_product_supplier/i18n/es_VE.po
deleted file mode 100644
index 51c41d0f..00000000
--- a/crm_claim_product_supplier/i18n/es_VE.po
+++ /dev/null
@@ -1,21 +0,0 @@
-# Translation of Odoo Server.
-# This file contains the translation of the following modules:
-#	* crm_claim_product_supplier
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Odoo Server 8.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-07-17 18:01+0000\n"
-"PO-Revision-Date: 2015-07-17 18:01+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_product_supplier
-#: help:claim.line,supplier_id:0
-msgid "Supplier of good in claim"
-msgstr "Proveedor de productos en el reclamo"
\ No newline at end of file
diff --git a/crm_claim_product_supplier/models/claim_line.py b/crm_claim_product_supplier/models/claim_line.py
index 132ddaf7..6f0b3a28 100644
--- a/crm_claim_product_supplier/models/claim_line.py
+++ b/crm_claim_product_supplier/models/claim_line.py
@@ -26,9 +26,7 @@ class ClaimLine(models.Model):
     _inherit = 'claim.line'
 
     supplier_id = fields.Many2one(comodel_name='res.partner',
-                                  related='prodlot_id.supplier_id',
-                                  help="Supplier of good in claim")
+                                  related='prodlot_id.supplier_id')
     supplier_invoice_id = fields.Many2one(
         comodel_name='account.invoice',
-        related="prodlot_id.supplier_invoice_line_id.invoice_id",
-        help="Supplier invoice with the purchase of goods sold to customer")
+        related="prodlot_id.supplier_invoice_line_id.invoice_id")

From 72ec97c461524588526a1ae7ea9a9823a03d606a Mon Sep 17 00:00:00 2001
From: Osval Reyes <osval@vauxoo.com>
Date: Thu, 26 Nov 2015 14:39:52 -0430
Subject: [PATCH 11/19] [IMP] crm_rma_stock_location: adapt to Odoo v8.0,
 include view section for product quantities on hand and forecasted, add
 unittest, add i18n terms

---
 crm_rma_stock_location/README.rst             |  96 +++++++
 crm_rma_stock_location/__init__.py            |  17 +-
 crm_rma_stock_location/__openerp__.py         |  69 ++---
 .../demo/stock_inventory.xml                  |  28 ++
 .../demo/stock_location.xml                   |  37 +++
 .../i18n/crm_rma_stock_location.pot           | 218 ++++++++++++++--
 crm_rma_stock_location/i18n/es.po             | 239 ++++++++++++++++++
 crm_rma_stock_location/i18n/es_MX.po          |  16 ++
 crm_rma_stock_location/i18n/es_PA.po          |  16 ++
 crm_rma_stock_location/i18n/es_VE.po          |  16 ++
 crm_rma_stock_location/models/__init__.py     |  29 +++
 .../models/product_product.py                 | 131 ++++++++++
 .../models/product_template.py                |  49 ++++
 .../models/stock_warehouse.py                 |  68 +++++
 crm_rma_stock_location/product.py             | 106 --------
 crm_rma_stock_location/product_view.xml       |  28 --
 crm_rma_stock_location/stock_data.xml         |  15 --
 .../stock_warehouse_view.xml                  |  17 --
 crm_rma_stock_location/test/quantity.yml      |  72 ------
 .../{stock_warehouse.py => tests/__init__.py} |  15 +-
 .../tests/test_crm_rma_stock_location.py      |  78 ++++++
 .../tests/test_make_picking_from_picking.py   | 159 ++++++++++++
 crm_rma_stock_location/views/crm_claim.xml    |  19 ++
 .../views/product_product.xml                 |  46 ++++
 .../views/product_template.xml                |  17 ++
 .../views/stock_picking.xml                   |  30 +++
 .../views/stock_warehouse.xml                 |  16 ++
 crm_rma_stock_location/wizards/__init__.py    |  24 ++
 .../wizards/claim_make_picking.py             |  63 +++++
 .../claim_make_picking_from_picking.py        | 178 +++++++++++++
 .../claim_make_picking_from_picking_view.xml  |  68 +++++
 .../wizards/claim_make_picking_view.xml       |  20 ++
 32 files changed, 1700 insertions(+), 300 deletions(-)
 create mode 100644 crm_rma_stock_location/README.rst
 create mode 100644 crm_rma_stock_location/demo/stock_inventory.xml
 create mode 100644 crm_rma_stock_location/demo/stock_location.xml
 create mode 100644 crm_rma_stock_location/i18n/es.po
 create mode 100644 crm_rma_stock_location/i18n/es_MX.po
 create mode 100644 crm_rma_stock_location/i18n/es_PA.po
 create mode 100644 crm_rma_stock_location/i18n/es_VE.po
 create mode 100644 crm_rma_stock_location/models/__init__.py
 create mode 100644 crm_rma_stock_location/models/product_product.py
 create mode 100644 crm_rma_stock_location/models/product_template.py
 create mode 100644 crm_rma_stock_location/models/stock_warehouse.py
 delete mode 100644 crm_rma_stock_location/product.py
 delete mode 100644 crm_rma_stock_location/product_view.xml
 delete mode 100644 crm_rma_stock_location/stock_data.xml
 delete mode 100644 crm_rma_stock_location/stock_warehouse_view.xml
 delete mode 100644 crm_rma_stock_location/test/quantity.yml
 rename crm_rma_stock_location/{stock_warehouse.py => tests/__init__.py} (76%)
 create mode 100644 crm_rma_stock_location/tests/test_crm_rma_stock_location.py
 create mode 100644 crm_rma_stock_location/tests/test_make_picking_from_picking.py
 create mode 100644 crm_rma_stock_location/views/crm_claim.xml
 create mode 100644 crm_rma_stock_location/views/product_product.xml
 create mode 100644 crm_rma_stock_location/views/product_template.xml
 create mode 100644 crm_rma_stock_location/views/stock_picking.xml
 create mode 100644 crm_rma_stock_location/views/stock_warehouse.xml
 create mode 100644 crm_rma_stock_location/wizards/__init__.py
 create mode 100644 crm_rma_stock_location/wizards/claim_make_picking.py
 create mode 100644 crm_rma_stock_location/wizards/claim_make_picking_from_picking.py
 create mode 100644 crm_rma_stock_location/wizards/claim_make_picking_from_picking_view.xml
 create mode 100644 crm_rma_stock_location/wizards/claim_make_picking_view.xml

diff --git a/crm_rma_stock_location/README.rst b/crm_rma_stock_location/README.rst
new file mode 100644
index 00000000..db575389
--- /dev/null
+++ b/crm_rma_stock_location/README.rst
@@ -0,0 +1,96 @@
+.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg
+   :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+   :alt: License: AGPL-3
+
+==================
+RMA Stock Location
+==================
+
+Allow the user to know how much for a product is available 'On Hand' and how much
+is virtually (expected to be) available for RMA locations. Adding for the
+different product views (Tree, Form and Kanban) information about it.
+
+Both quantities are computed and includes its children locations.
+
+It is useful use it as a quick snapshot for RMA from product perspective.
+
+It also adds the following location on warehouses :
+
+ * Loss
+ * Refurbish
+
+Various wizards on incoming deliveries that allow you to move your
+goods easily in those new locations from a done reception.
+
+Using this module make the logistic flow of return a bit more complex:
+
+ * Returning product goes into RMA location with a incoming shipment
+ * From the incoming shipment, forward them to another places (stock, loss, refurbish)
+
+Installation
+============
+
+To install this module, just select it from availables modules.
+
+Configuration
+=============
+
+No configuration is needed
+
+Usage
+=====
+
+* Go to Sales > After-sale Services and note that 'RMA Quantity On Hand' and
+  'RMA Forecasted Quantity' had been included and it'll be shown when at least
+  a product has either a on hand or forecasted quantities available.
+
+* In the other hand, it provides three wizards to make stock moves (transfers)
+  allowing to do product returns (incoming), send a product to loss or, to a refurbish
+  location.
+
+.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas
+   :alt: Try me on Runbot
+   :target: https://runbot.odoo-community.org/runbot/8.0/145
+
+For further information, please visit:
+
+* https://www.odoo.com/forum/help-1
+
+Known issues / Roadmap
+======================
+
+* Optimization is possible when searching virtual quantities in the search function
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues <https://github.com/OCA/rma/issues>`_.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us smashing it by providing a detailed and welcomed feedback
+`here <https://github.com/OCA/rma/issues/new?body=module:%20crm_rma_stock_location%0Aversion:%208.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+
+
+Credits
+=======
+
+Contributors
+------------
+
+* Guewen Baconnier <guewen.baconnier@camptocamp.com>
+* Yanina Aular <yanina.aular@vauxoo.com>
+* Osval Reyes <osval@vauxoo.com>
+
+Maintainer
+----------
+
+.. image:: https://odoo-community.org/logo.png
+   :alt: Odoo Community Association
+   :target: https://odoo-community.org
+
+This module is maintained by the OCA.
+
+OCA, or the Odoo Community Association, is a nonprofit organization whose
+mission is to support the collaborative development of Odoo features and
+promote its widespread use.
+
+To contribute to this module, please visit http://odoo-community.org.
diff --git a/crm_rma_stock_location/__init__.py b/crm_rma_stock_location/__init__.py
index 997253d6..9f9433ff 100644
--- a/crm_rma_stock_location/__init__.py
+++ b/crm_rma_stock_location/__init__.py
@@ -1,8 +1,10 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
-#    Author: Guewen Baconnier
+#    Copyright 2015 Vauxoo
 #    Copyright 2014 Camptocamp SA
+#    Author: Guewen Baconnier,
+#            Osval Reyes
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -19,5 +21,14 @@
 #
 ##############################################################################
 
-from . import stock_warehouse
-from . import product
+from . import models
+from . import wizards
+from openerp import SUPERUSER_ID
+
+
+def post_init_hook(cr, registry):
+    stock_wh = registry['stock.warehouse']
+    for wh_id in stock_wh.browse(cr, SUPERUSER_ID,
+                                 stock_wh.search(cr, SUPERUSER_ID, [])):
+        vals = stock_wh.create_locations_rma(cr, SUPERUSER_ID, wh_id)
+        stock_wh.write(cr, SUPERUSER_ID, wh_id.id, vals)
diff --git a/crm_rma_stock_location/__openerp__.py b/crm_rma_stock_location/__openerp__.py
index 08318cbb..3f98a80b 100644
--- a/crm_rma_stock_location/__openerp__.py
+++ b/crm_rma_stock_location/__openerp__.py
@@ -1,8 +1,13 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
-#    Author: Guewen Baconnier
-#    Copyright 2014 Camptocamp SA
+#    Copyright 2015 Vauxoo
+#    Copyright 2013-2014 Camptocamp SA
+#    Copyright 2009-2013 Akretion,
+#    Author: Guewen Baconnier,
+#            Emmanuel Samyn, Raphaël Valyi, Sébastien Beau,
+#            Joel Grand-Guillaume,
+#            Yanina Aular, Osval Reyes
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -19,31 +24,35 @@
 #
 ##############################################################################
 
-{'name': 'RMA Stock Location',
- 'version': '1.0',
- 'author': "Camptocamp,Odoo Community Association (OCA)",
- 'maintainer': 'Camptocamp',
- 'license': 'AGPL-3',
- 'category': 'Generic Modules/CRM & SRM',
- 'depends': ['stock',
-             'procurement',
-             ],
- 'description': """
-RMA Stock Location
-==================
-
-A RMA location can be selected on the warehouses.
-The product views displays the quantity available and virtual in this
- RMA location (including the children locations).
-
- """,
- 'website': 'http://www.camptocamp.com',
- 'data': ['stock_data.xml',
-          'stock_warehouse_view.xml',
-          'product_view.xml',
-          ],
- 'test': ['test/quantity.yml',
-          ],
- 'installable': False,
- 'auto_install': False,
- }
+{
+    'name': 'RMA Stock Location',
+    'version': '8.0.1.0.0',
+    'author': "Akretion,Vauxoo,Camptocamp,Odoo Community Association (OCA)",
+    'maintainer': 'Camptocamp',
+    'website': 'http://www.camptocamp.com,http://www.vauxoo.com',
+    'license': 'AGPL-3',
+    'category': 'Generic Modules/CRM & SRM',
+    'depends': [
+        'crm_claim_rma',
+        'crm_claim',
+        'stock_account',
+        'procurement',
+        'crm_rma_location',
+    ],
+    'data': [
+        'wizards/claim_make_picking_from_picking_view.xml',
+        'wizards/claim_make_picking_view.xml',
+        'views/product_product.xml',
+        'views/product_template.xml',
+        'views/crm_claim.xml',
+        'views/stock_picking.xml',
+        'views/stock_warehouse.xml',
+    ],
+    'demo': [
+        'demo/stock_location.xml',
+        'demo/stock_inventory.xml',
+    ],
+    'post_init_hook': 'post_init_hook',
+    'installable': True,
+    'auto_install': False,
+}
diff --git a/crm_rma_stock_location/demo/stock_inventory.xml b/crm_rma_stock_location/demo/stock_inventory.xml
new file mode 100644
index 00000000..729a9d35
--- /dev/null
+++ b/crm_rma_stock_location/demo/stock_inventory.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+        <record id="rma_stock_location_move_01" model="stock.move">
+            <field name="name">Demo Stock Move: Customer > RMA</field>
+            <field name="product_id" ref="product.product_product_24"/>
+            <field name="product_uom">1</field>
+            <field name="product_uom_qty">1000</field>
+            <field name="company_id" ref="base.main_company"/>
+            <field name="priority">1</field> <!-- Normal -->
+            <field name="picking_type_id" ref="stock.picking_type_in"/>
+            <field name="location_id" ref="stock.stock_location_customers"/>
+            <field name="location_dest_id" search="[('name', '=', 'RMA'), ('location_id.name', '=', 'WH')]"/>
+        </record>
+        <record id="rma_stock_location_move_03" model="stock.move">
+            <field name="name">Demo Stock Move: RMA > Loss</field>
+            <field name="product_id" ref="product.product_product_24"/>
+            <field name="product_uom">1</field>
+            <field name="product_uom_qty">1000</field>
+            <field name="company_id" ref="base.main_company"/>
+            <field name="priority">1</field> <!-- Normal -->
+            <field name="picking_type_id" ref="stock.picking_type_internal"/>
+            <field name="location_id" search="[('name', '=', 'RMA'), ('location_id.name', '=', 'WH')]"/>
+            <field name="location_dest_id" ref="stock.stock_location_stock"/>
+        </record>
+    </data>
+</openerp>
+
diff --git a/crm_rma_stock_location/demo/stock_location.xml b/crm_rma_stock_location/demo/stock_location.xml
new file mode 100644
index 00000000..19d2ded1
--- /dev/null
+++ b/crm_rma_stock_location/demo/stock_location.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+
+        <record id="location_rma" model="stock.location">
+            <field name="name">RMA Demo</field>
+            <field name="usage">internal</field>
+        </record>
+
+        <record id="stock.stock_warehouse_shop0" model="stock.warehouse">
+            <field name="lot_rma_id" ref="location_rma"/>
+        </record>
+
+        <record id="location_rma_a" model="stock.location">
+            <field name="name">RMA - Box A</field>
+            <field name="location_id" ref="location_rma"/>
+            <field name="usage">internal</field>
+        </record>
+        <record id="location_rma_b" model="stock.location">
+            <field name="name">RMA - Box B</field>
+            <field name="location_id" ref="location_rma"/>
+            <field name="usage">internal</field>
+        </record>
+
+        <record id="product_socket" model="product.product">
+            <field name="name">Socket</field>
+            <field name="categ_id" ref="product.product_category_1"/>
+            <field name="standard_price">70.0</field>
+            <field name="list_price">100.0</field>
+            <field name="type">product</field>
+            <field name="uom_id" ref="product.product_uom_unit"/>
+            <field name="uom_po_id" ref="product.product_uom_unit"/>
+        </record>
+
+    </data>
+</openerp>
+
diff --git a/crm_rma_stock_location/i18n/crm_rma_stock_location.pot b/crm_rma_stock_location/i18n/crm_rma_stock_location.pot
index a9c52f83..444f0d7e 100644
--- a/crm_rma_stock_location/i18n/crm_rma_stock_location.pot
+++ b/crm_rma_stock_location/i18n/crm_rma_stock_location.pot
@@ -1,13 +1,13 @@
-# Translation of OpenERP Server.
+# Translation of Odoo Server.
 # This file contains the translation of the following modules:
-#	* crm_rma_stock_location
+#   * crm_rma_stock_location
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 7.0\n"
+"Project-Id-Version: Odoo Server 8.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-12 11:27+0000\n"
-"PO-Revision-Date: 2014-09-12 11:27+0000\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"
@@ -16,39 +16,221 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: crm_rma_stock_location
-#: model:ir.model.fields,field_description:crm_rma_stock_location.field_stock_warehouse_lot_rma_id
-#: field:stock.warehouse,lot_rma_id:0
-msgid "Location RMA"
+#: view:claim.make.picking.from.picking.wizard:crm_rma_stock_location.view_claim_picking_from_picking
+msgid "Cancel"
 msgstr ""
 
 #. module: crm_rma_stock_location
-#: code:_description:0
-#: model:ir.model,name:crm_rma_stock_location.model_product_product
+#: 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:stock.location,name:crm_rma_stock_location.stock_location_rma
-msgid "RMA"
+#: model:ir.model,name:crm_rma_stock_location.model_product_template
+msgid "Product Template"
 msgstr ""
 
 #. module: crm_rma_stock_location
-#: model:ir.model.fields,field_description:crm_rma_stock_location.field_product_product_rma_virtual_available
-#: field:product.product,rma_virtual_available:0
+#: 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
-#: model:ir.model.fields,field_description:crm_rma_stock_location.field_product_product_rma_qty_available
-#: field:product.product,rma_qty_available:0
+#: 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:_description:0
-#: model:ir.model,name:crm_rma_stock_location.model_stock_warehouse
+#: 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/crm_rma_stock_location/i18n/es.po b/crm_rma_stock_location/i18n/es.po
new file mode 100644
index 00000000..e173f387
--- /dev/null
+++ b/crm_rma_stock_location/i18n/es.po
@@ -0,0 +1,239 @@
+# 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 "Cancelar"
+
+#. 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 "Crear un envío de entrada hacia la ubicación de pérdida de productos dañados"
+
+#. 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 "Crear un envío de entrada hacia la ubicación de productos restaurados"
+
+#. 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 "Crear un envío de entrada a Existencias"
+
+#. 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 "Registrar una pérdida de producto"
+
+
+#. 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 "Crear un albarán"
+
+#. module: crm_rma_stock_location
+#: field:claim.make.picking.from.picking.wizard,create_uid:0
+msgid "Created by"
+msgstr "Creado por"
+
+#. module: crm_rma_stock_location
+#: field:claim.make.picking.from.picking.wizard,create_date:0
+msgid "Created on"
+msgstr "Creado el"
+
+#. 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 "Ubicación destino"
+
+#. 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 "Actualizado por"
+
+#. module: crm_rma_stock_location
+#: field:claim.make.picking.from.picking.wizard,write_date:0
+msgid "Last Updated on"
+msgstr "Actualizado el"
+
+#. 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 "Ubicación origen de los productos devueltos"
+
+#. 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 "Ubicación destino de los productos devueltos"
+
+#. module: crm_rma_stock_location
+#: view:claim.make.picking.from.picking.wizard:crm_rma_stock_location.view_claim_picking_from_picking
+msgid "Locations"
+msgstr "Ubicaciones"
+
+#. module: crm_rma_stock_location
+#: code:addons/crm_rma_stock_location/models/stock_warehouse.py:62
+#, python-format
+msgid "Loss"
+msgstr "Pérdida"
+
+#. module: crm_rma_stock_location
+#: field:stock.warehouse,loss_loc_id:0
+msgid "Loss Location"
+msgstr "Ubicación de Pérdida"
+
+#. module: crm_rma_stock_location
+#: view:crm.claim:crm_rma_stock_location.crm_claim_rma_form_view_loss
+msgid "New Product Loss"
+msgstr "Nueva Pérdida de Producto"
+
+#. module: crm_rma_stock_location
+#: field:claim.make.picking.from.picking.wizard,picking_line_ids:0
+msgid "Picking lines"
+msgstr "Líneas de albarán"
+
+#. module: crm_rma_stock_location
+#: model:ir.model,name:crm_rma_stock_location.model_product_product
+msgid "Product"
+msgstr "Producto"
+
+#. module: crm_rma_stock_location
+#: model:ir.model,name:crm_rma_stock_location.model_product_template
+msgid "Product Template"
+msgstr "Producto Plantilla"
+
+#. module: crm_rma_stock_location
+#: view:product.product:crm_rma_stock_location.rma_product_product_tree_view
+msgid "Product Variants"
+msgstr "Variantes del Producto"
+
+#. module: crm_rma_stock_location
+#: view:stock.picking:crm_rma_stock_location.picking_in_form
+msgid "Product to Loss"
+msgstr "Producto a Pérdida"
+
+#. module: crm_rma_stock_location
+#: view:stock.picking:crm_rma_stock_location.picking_in_form
+msgid "Product to refurbish stock"
+msgstr "Producto a Existencias de restaurados"
+
+
+#. module: crm_rma_stock_location
+#: view:stock.picking:crm_rma_stock_location.picking_in_form
+msgid "Product to stock"
+msgstr "Producto a Existencias"
+
+#. module: crm_rma_stock_location
+#: model:stock.location,name:crm_rma_stock_location.location_rma_a
+msgid "RMA - Box A"
+msgstr "RMA - Caja A"
+
+#. module: crm_rma_stock_location
+#: model:stock.location,name:crm_rma_stock_location.location_rma_b
+msgid "RMA - Box B"
+msgstr "RMA - Caja B"
+
+#. module: crm_rma_stock_location
+#: view:product.product:crm_rma_stock_location.rma_product_search_view
+msgid "RMA Available Products"
+msgstr "Productos disponibles en RMA"
+
+#. module: crm_rma_stock_location
+#: model:stock.location,name:crm_rma_stock_location.location_rma
+msgid "RMA Demo"
+msgstr "Demostración RMA"
+
+#. module: crm_rma_stock_location
+#: code:addons/crm_rma_stock_location/models/product_product.py:42
+#: code:addons/crm_rma_stock_location/models/product_template.py:42
+#, python-format
+msgid "RMA Forecasted Quantity"
+msgstr "Pronóstico de Cantidades en RMA"
+
+#. module: crm_rma_stock_location
+#: view:product.product:crm_rma_stock_location.rma_product_search_view
+msgid "RMA Products"
+msgstr "Productos en RMA"
+
+#. module: crm_rma_stock_location
+#: code:addons/crm_rma_stock_location/models/product_product.py:36
+#: code:addons/crm_rma_stock_location/models/product_template.py:36
+#, python-format
+msgid "RMA Quantity On Hand"
+msgstr "Cantidades Disponibles en RMA"
+
+#. module: crm_rma_stock_location
+#: code:addons/crm_rma_stock_location/models/stock_warehouse.py:56
+#, python-format
+msgid "Refurbish"
+msgstr "Restaurar"
+
+#. module: crm_rma_stock_location
+#: field:stock.warehouse,lot_refurbish_id:0
+msgid "Refurbish Location"
+msgstr "Ubicación de Restaurados"
+
+#. 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 "Seleccionar lineas para albarán"
+
+#. 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 "Seleccionar lineas a agregar en albarán"
+
+#. module: crm_rma_stock_location
+#: model:product.template,name:crm_rma_stock_location.product_socket_product_template
+msgid "Socket"
+msgstr "Sócate"
+
+#. 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 "Ubicación origen"
+
+#. 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 "Existencias en RMA"
+
+#. module: crm_rma_stock_location
+#: model:ir.model,name:crm_rma_stock_location.model_stock_warehouse
+msgid "Warehouse"
+msgstr "Almacén"
+
+#. 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 "Asistente para create albaranes desde lineas de reclamo"
+
+#. 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 "Asistente para create albaranes desde lineas de albaranes"
diff --git a/crm_rma_stock_location/i18n/es_MX.po b/crm_rma_stock_location/i18n/es_MX.po
new file mode 100644
index 00000000..c9158d37
--- /dev/null
+++ b/crm_rma_stock_location/i18n/es_MX.po
@@ -0,0 +1,16 @@
+# 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-07-18 00:48+0000\n"
+"PO-Revision-Date: 2015-07-18 00: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"
diff --git a/crm_rma_stock_location/i18n/es_PA.po b/crm_rma_stock_location/i18n/es_PA.po
new file mode 100644
index 00000000..c9158d37
--- /dev/null
+++ b/crm_rma_stock_location/i18n/es_PA.po
@@ -0,0 +1,16 @@
+# 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-07-18 00:48+0000\n"
+"PO-Revision-Date: 2015-07-18 00: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"
diff --git a/crm_rma_stock_location/i18n/es_VE.po b/crm_rma_stock_location/i18n/es_VE.po
new file mode 100644
index 00000000..c9158d37
--- /dev/null
+++ b/crm_rma_stock_location/i18n/es_VE.po
@@ -0,0 +1,16 @@
+# 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-07-18 00:48+0000\n"
+"PO-Revision-Date: 2015-07-18 00: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"
diff --git a/crm_rma_stock_location/models/__init__.py b/crm_rma_stock_location/models/__init__.py
new file mode 100644
index 00000000..cbce7ada
--- /dev/null
+++ b/crm_rma_stock_location/models/__init__.py
@@ -0,0 +1,29 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Copyright 2015 Vauxoo
+#    Copyright 2013-2014 Camptocamp SA
+#    Copyright 2009-2013 Akretion,
+#    Author: Guewen Baconnier,
+#            Emmanuel Samyn, Raphaël Valyi, Sébastien Beau,
+#            Joel Grand-Guillaume,
+#            Osval Reyes
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from . import product_product
+from . import product_template
+from . import stock_warehouse
diff --git a/crm_rma_stock_location/models/product_product.py b/crm_rma_stock_location/models/product_product.py
new file mode 100644
index 00000000..8e950ddb
--- /dev/null
+++ b/crm_rma_stock_location/models/product_product.py
@@ -0,0 +1,131 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Author: Guewen Baconnier
+#    Copyright 2014 Camptocamp SA
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp import _, models, fields
+import openerp.addons.decimal_precision as dp
+from openerp.tools.float_utils import float_round
+from openerp.tools.safe_eval import safe_eval as eval
+
+
+class ProductProduct(models.Model):
+
+    _inherit = 'product.product'
+
+    rma_qty_available = fields.Float(
+        compute='_rma_product_available',
+        digits_compute=dp.get_precision('Product Unit of Measure'),
+        search='_search_rma_product_quantity',
+        string=_('RMA Quantity On Hand'))
+
+    rma_virtual_available = fields.Float(
+        compute='_rma_product_available',
+        digits_compute=dp.get_precision('Product Unit of Measure'),
+        search='_search_rma_product_quantity',
+        string=_('RMA Forecasted Quantity'))
+
+    def _search_rma_product_quantity(self, operator, value):
+        res = []
+        # to prevent sql injections
+        assert operator in ('<', '>', '=', '!=',
+                            '<=', '>='), 'Invalid domain operator'
+        assert isinstance(value, (float, int)), 'Invalid domain right operand'
+
+        if operator == '=':
+            operator = '=='
+
+        ids = []
+        product_ids = self.search([])
+        if product_ids:
+            for element in product_ids:
+                localdict = {'virtual': element.rma_virtual_available,
+                             'qty': element.rma_qty_available,
+                             'value': value}
+                if eval('qty %s value or virtual %s value' %
+                        (operator, operator), localdict):
+                    ids.append(element.id)
+            res.append(('id', 'in', ids))
+        return res
+
+    def _rma_product_available(self):
+        """
+        Finds the incoming and outgoing quantity of product for the RMA
+        locations.
+        """
+        context = self.env.context
+        warehouse_id = context.get('warehouse_id')
+        ctx = context.copy()
+        location_ids = set()
+        for product in self:
+            if warehouse_id and warehouse_id.lot_rma_id:
+                location_ids.add(warehouse_id.lot_rma_id.id)
+            else:
+                warehouse_ids = self.env['stock.warehouse'].search([])
+                if not warehouse_ids:
+                    return
+                for warehouse_id in warehouse_ids:
+                    if warehouse_id.lot_rma_id:
+                        location_ids.add(warehouse_id.lot_rma_id.id)
+
+            if not location_ids:
+                return
+            ctx['location'] = list(location_ids)
+
+            domain_products = [('product_id', 'in', [product.id])]
+            domain_quant, domain_move_in, domain_move_out = \
+                product.with_context(ctx)._get_domain_locations()
+            domain_move_in += product.with_context(ctx)._get_domain_dates() + \
+                [('state', 'not in', ('done', 'cancel', 'draft'))] + \
+                domain_products
+            domain_move_out += product.with_context(ctx).\
+                _get_domain_dates() + \
+                [('state', 'not in', ('done', 'cancel', 'draft'))] + \
+                domain_products
+            domain_quant += domain_products
+            moves_in = []
+            moves_out = []
+            lot_id = context.get('lot_id')
+            if lot_id:
+                domain_quant.append(('lot_id', '=', lot_id))
+            else:
+                moves_in = self.env['stock.move'].\
+                    with_context(ctx).read_group(domain_move_in,
+                                                 ['product_id', 'product_qty'],
+                                                 ['product_id'])
+                moves_out = self.env['stock.move'].\
+                    with_context(ctx).read_group(domain_move_out,
+                                                 ['product_id', 'product_qty'],
+                                                 ['product_id'])
+            quants = self.env['stock.quant'].with_context(ctx).read_group(
+                domain_quant, ['product_id', 'qty'], ['product_id'])
+            quants = dict([(item.get('product_id')[0],
+                            item.get('qty')) for item in quants])
+            moves_in = dict([(item.get('product_id')[0],
+                              item.get('product_qty')) for item in moves_in])
+            moves_out = dict([(item.get('product_id')[0],
+                               item.get('product_qty')) for item in moves_out])
+            product.rma_qty_available = \
+                float_round(quants.get(product.id, 0.0),
+                            precision_rounding=product.uom_id.rounding)
+            product.rma_virtual_available = \
+                float_round(quants.get(product.id, 0.0) +
+                            moves_in.get(product.id, 0.0) -
+                            moves_out.get(product.id, 0.0),
+                            precision_rounding=product.uom_id.rounding)
diff --git a/crm_rma_stock_location/models/product_template.py b/crm_rma_stock_location/models/product_template.py
new file mode 100644
index 00000000..7bf733c4
--- /dev/null
+++ b/crm_rma_stock_location/models/product_template.py
@@ -0,0 +1,49 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Copyright 2015 Vauxoo
+#    Copyright 2014 Camptocamp SA
+#    Author: Guewen Baconnier,
+#            Osval Reyes
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp import _, models, fields
+import openerp.addons.decimal_precision as dp
+
+
+class ProductTemplate(models.Model):
+
+    _inherit = 'product.template'
+
+    rma_qty_available = fields.Float(compute='_rma_product_available',
+                                     digits_compute=dp.
+                                     get_precision('Product Unit '
+                                                   'of Measure'),
+                                     string=_('RMA Quantity On Hand'))
+
+    rma_virtual_available = fields.Float(compute='_rma_product_available',
+                                         digits_compute=dp.
+                                         get_precision('Product Unit'
+                                                       ' of Measure'),
+                                         string=_('RMA Forecasted Quantity'))
+
+    def _rma_product_available(self):
+        for product in self:
+            product.rma_qty_available = sum(
+                [p.rma_qty_available for p in product.product_variant_ids])
+            product.rma_virtual_available = sum(
+                [p.rma_virtual_available for p in product.product_variant_ids])
diff --git a/crm_rma_stock_location/models/stock_warehouse.py b/crm_rma_stock_location/models/stock_warehouse.py
new file mode 100644
index 00000000..88a63625
--- /dev/null
+++ b/crm_rma_stock_location/models/stock_warehouse.py
@@ -0,0 +1,68 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Copyright 2013 Camptocamp
+#    Copyright 2009-2013 Akretion,
+#    Author: Emmanuel Samyn, Raphaël Valyi, Sébastien Beau,
+#            Joel Grand-Guillaume
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp import _, api, fields, models
+
+
+class StockWarehouse(models.Model):
+
+    _inherit = "stock.warehouse"
+
+    loss_loc_id = fields.Many2one('stock.location', 'Loss Location')
+
+    lot_refurbish_id = fields.Many2one('stock.location', 'Refurbish Location')
+
+    @api.model
+    def create_locations_rma(self, wh_id):
+        vals = {}
+
+        location_obj = self.env['stock.location']
+        context_with_inactive = self.env.context.copy()
+        context_with_inactive['active_test'] = False
+        wh_loc_id = wh_id.view_location_id.id
+
+        vals_new = super(StockWarehouse, self).create_locations_rma(wh_id)
+
+        loc_vals = {
+            'usage': 'internal',
+            'location_id': wh_loc_id,
+            'active': True,
+        }
+
+        if vals.get('company_id'):
+            loc_vals['company_id'] = vals.get('company_id')
+
+        if not wh_id.lot_refurbish_id:
+            loc_vals.update({'name': _('Refurbish')})
+            location_id = location_obj.with_context(context_with_inactive).\
+                create(loc_vals)
+            vals['lot_refurbish_id'] = location_id.id
+
+        if not wh_id.loss_loc_id:
+            loc_vals.update({'name': _('Loss')})
+            location_id = location_obj.with_context(context_with_inactive).\
+                create(loc_vals)
+            vals['loss_loc_id'] = location_id.id
+
+        vals.update(vals_new)
+        return vals
diff --git a/crm_rma_stock_location/product.py b/crm_rma_stock_location/product.py
deleted file mode 100644
index 114bbaf4..00000000
--- a/crm_rma_stock_location/product.py
+++ /dev/null
@@ -1,106 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    Author: Guewen Baconnier
-#    Copyright 2014 Camptocamp SA
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from openerp.osv import orm, fields
-import openerp.addons.decimal_precision as dp
-
-
-class ProductProduct(orm.Model):
-    _inherit = 'product.product'
-
-    def _rma_product_available(self, cr, uid, ids, field_names=None, arg=False,
-                               context=None):
-        """ Finds the incoming and outgoing quantity of product for the RMA
-        locations.
-        """
-        if field_names is None:
-            field_names = []
-        if context is None:
-            context = {}
-        warehouse_obj = self.pool['stock.warehouse']
-        res = {}
-        for id in ids:
-            res[id] = {}.fromkeys(field_names, 0.0)
-
-        for field in field_names:
-            ctx = context.copy()
-
-            warehouse_id = ctx.get('warehouse_id')
-            # no dependency on 'sale', the same oddness is done in
-            # 'stock' so I kept it here
-            if ctx.get('shop') and self.pool.get('sale.shop'):
-                shop_obj = self.pool['sale.shop']
-                shop_id = ctx['shop']
-                warehouse = shop_obj.read(cr, uid, shop_id,
-                                          ['warehouse_id'],
-                                          context=ctx)
-                warehouse_id = warehouse['warehouse_id'][0]
-
-            if warehouse_id:
-                rma_id = warehouse_obj.read(cr, uid,
-                                            warehouse_id,
-                                            ['lot_rma_id'],
-                                            context=ctx)['lot_rma_id'][0]
-                if rma_id:
-                    ctx['location'] = rma_id
-            else:
-                location_ids = set()
-                wids = warehouse_obj.search(cr, uid, [], context=context)
-                if not wids:
-                    return res
-                for wh in warehouse_obj.browse(cr, uid, wids, context=context):
-                    if wh.lot_rma_id:
-                        location_ids.add(wh.lot_rma_id.id)
-                if not location_ids:
-                    return res
-                ctx['location'] = list(location_ids)
-
-            ctx['compute_child'] = True
-            compute = {
-                'rma_qty_available': {
-                    'states': ('done', ),
-                    'what': ('in', 'out')
-                },
-                'rma_virtual_available': {
-                    'states': ('confirmed', 'waiting', 'assigned', 'done'),
-                    'what': ('in', 'out')
-                }
-            }
-            ctx.update(compute[field])
-            stock = self.get_product_available(cr, uid, ids, context=ctx)
-            for id in ids:
-                res[id][field] = stock.get(id, 0.0)
-        return res
-
-    _columns = {
-        'rma_qty_available': fields.function(
-            _rma_product_available,
-            type='float',
-            multi='rma_qty',
-            digits_compute=dp.get_precision('Product Unit of Measure'),
-            string='RMA Quantity On Hand'),
-        'rma_virtual_available': fields.function(
-            _rma_product_available,
-            type='float',
-            multi='rma_qty',
-            digits_compute=dp.get_precision('Product Unit of Measure'),
-            string='RMA Forecasted Quantity'),
-    }
diff --git a/crm_rma_stock_location/product_view.xml b/crm_rma_stock_location/product_view.xml
deleted file mode 100644
index c371eead..00000000
--- a/crm_rma_stock_location/product_view.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-  <data noupdate="0">
-    <record id="product_product_tree_view" model="ir.ui.view">
-      <field name="name">product.product.tree</field>
-      <field name="model">product.product</field>
-      <field name="inherit_id" ref="product.product_product_tree_view"/>
-      <field name="arch" type="xml">
-        <field name="virtual_available" position="after">
-          <field name="rma_qty_available"/>
-          <field name="rma_virtual_available"/>
-        </field>
-      </field>
-    </record>
-
-    <record id="view_normal_procurement_locations_form" model="ir.ui.view">
-      <field name="name">product.normal.procurement.locations.inherit</field>
-      <field name="model">product.product</field>
-      <field name="inherit_id" ref="stock.view_normal_procurement_locations_form"/>
-      <field name="arch" type="xml">
-        <field name="virtual_available" position="after">
-          <field name="rma_qty_available" class="oe_inline"/>
-          <field name="rma_virtual_available" class="oe_inline"/>
-        </field>
-      </field>
-    </record>
-  </data>
-</openerp>
diff --git a/crm_rma_stock_location/stock_data.xml b/crm_rma_stock_location/stock_data.xml
deleted file mode 100644
index d50b3f38..00000000
--- a/crm_rma_stock_location/stock_data.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-  <data noupdate="1">
-
-    <record id="stock_location_rma" model="stock.location">
-      <field name="name">RMA</field>
-      <field name="usage">internal</field>
-      <field name="location_id" ref="stock.stock_location_company"/>
-    </record>
-
-    <record id="stock.warehouse0" model="stock.warehouse">
-      <field name="lot_rma_id" ref="stock_location_rma"/>
-    </record>
-  </data>
-</openerp>
diff --git a/crm_rma_stock_location/stock_warehouse_view.xml b/crm_rma_stock_location/stock_warehouse_view.xml
deleted file mode 100644
index 82c72292..00000000
--- a/crm_rma_stock_location/stock_warehouse_view.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-  <data noupdate="0">
-
-    <record id="view_warehouse_form" model="ir.ui.view">
-      <field name="name">view_warehouse_form</field>
-      <field name="model">stock.warehouse</field>
-      <field name="inherit_id" ref="stock.view_warehouse" />
-      <field name="arch" type="xml">
-        <xpath expr="/form/group/group/field[@name='lot_output_id']" position="after">
-          <field name="lot_rma_id"/>
-        </xpath>
-      </field>
-    </record>
-  </data>
-</openerp>
-
diff --git a/crm_rma_stock_location/test/quantity.yml b/crm_rma_stock_location/test/quantity.yml
deleted file mode 100644
index 96a77e7b..00000000
--- a/crm_rma_stock_location/test/quantity.yml
+++ /dev/null
@@ -1,72 +0,0 @@
--
-  I create RMA locations
--
- !record {model: stock.location, id: location_rma}:
-    name: RMA
-    usage: view
--
- !record {model: stock.location, id: location_rma_a}:
-    name: RMA - Box A
-    usage: internal
-    location_id: location_rma
--
- !record {model: stock.location, id: location_rma_b}:
-    name: RMA - Box B
-    usage: internal
-    location_id: location_rma
--
-  I set the RMA location on the warehouse
--
- !record {model: stock.warehouse, id: stock.warehouse0}:
-    lot_rma_id: location_rma
--
-  I create a product
--
- !record {model: product.product, id: product_socket}:
-    default_code: 002
-    name: Sockets
-    type: product
-    categ_id: product.product_category_1
-    list_price: 100.0
-    standard_price: 70.0
-    uom_id: product.product_uom_unit
-    uom_po_id: product.product_uom_unit
--
-  I create a physical inventory with 50 units in Box A and 30 in Box B
--
- !record {model: stock.inventory, id: stock_inventory_socket}:
-    name: Inventory for Sockets
--
- !record {model: stock.inventory.line, id: stock_inventory_line_socket_1}:
-    product_id: product_socket
-    product_uom: product.product_uom_unit
-    inventory_id: stock_inventory_socket
-    product_qty: 50.0
-    location_id: location_rma_a
--
- !record {model: stock.inventory.line, id: stock_inventory_line_socket_2}:
-    product_id: product_socket
-    product_uom: product.product_uom_unit
-    inventory_id: stock_inventory_socket
-    product_qty: 30.0
-    location_id: location_rma_b
--
-  I confirm the physical inventory
--
-  !python {model: stock.inventory}: |
-    self.action_confirm(cr, uid, [ref('stock_inventory_socket')], context=context)
--
-  I confirm the move in Box A
--
-  !python {model: stock.inventory}: |
-    inventory = self.browse(cr, uid, ref('stock_inventory_socket'), context=context)
-    assert len(inventory.move_ids) == len(inventory.inventory_line_id), "moves are not correspond."
-    for move in inventory.move_ids:
-      if move.location_dest_id.id == ref('location_rma_a'):
-        move.action_done()
--
-  I check my RMA quantities, I should have 50 on hands and 80 forecasted
--
-  !assert {model: product.product, id: product_socket, string: RMA quantity is wrong}:
-    - rma_qty_available == 50
-    - rma_virtual_available == 80
diff --git a/crm_rma_stock_location/stock_warehouse.py b/crm_rma_stock_location/tests/__init__.py
similarity index 76%
rename from crm_rma_stock_location/stock_warehouse.py
rename to crm_rma_stock_location/tests/__init__.py
index 13f32c31..38cc02d5 100644
--- a/crm_rma_stock_location/stock_warehouse.py
+++ b/crm_rma_stock_location/tests/__init__.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
-#    Author: Guewen Baconnier
-#    Copyright 2014 Camptocamp SA
+#    Copyright 2015 Vauxoo
+#    Author: Yanina Aular, Osval Reyes
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -19,12 +19,5 @@
 #
 ##############################################################################
 
-from openerp.osv import orm, fields
-
-
-class StockWarehouse(orm.Model):
-    _inherit = 'stock.warehouse'
-
-    _columns = {
-        'lot_rma_id': fields.many2one('stock.location', 'Location RMA'),
-    }
+from . import test_crm_rma_stock_location
+from . import test_make_picking_from_picking
diff --git a/crm_rma_stock_location/tests/test_crm_rma_stock_location.py b/crm_rma_stock_location/tests/test_crm_rma_stock_location.py
new file mode 100644
index 00000000..f743eff3
--- /dev/null
+++ b/crm_rma_stock_location/tests/test_crm_rma_stock_location.py
@@ -0,0 +1,78 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Copyright 2015 Vauxoo
+#    Author: Osval Reyes
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp.tests.common import TransactionCase
+
+
+class TestCrmRmaStockLocation(TransactionCase):
+
+    def setUp(self):
+        super(TestCrmRmaStockLocation, self).setUp()
+        self.inventory = self.env['stock.inventory']
+        self.inventory_line = self.env['stock.inventory.line']
+        self.location_id = self.env['stock.location'].search(
+            [('name', '=', 'RMA'), ('location_id.name', '=', 'WH')])
+        self.warehouse_id = self.env['stock.warehouse'].browse(
+            self.ref('stock.warehouse0'))
+        self.lot_rma_id = self.warehouse_id.lot_rma_id
+        self.product_uom_id = self.ref('product.product_uom_unit')
+        self.product_socket_id = self.env['product.product'].browse(
+            self.ref('crm_rma_stock_location.product_socket'))
+
+    def test_01_test(self):
+        inventory_id = self.inventory.create({
+            'name': 'Test Inventory 001',
+            'location_id': self.location_id.id,
+            'filter': 'product',
+            'product_id': self.product_socket_id.id,
+        })
+
+        inventory_line_id_a = self.inventory_line.create({
+            'inventory_id': inventory_id.id,
+            'product_id': self.product_socket_id.id,
+            'product_uom_id': self.product_uom_id,
+            'product_qty': 100,
+            'location_id': self.lot_rma_id.id
+        })
+
+        inventory_line_id_b = self.inventory_line.create({
+            'inventory_id': inventory_id.id,
+            'product_id': self.product_socket_id.id,
+            'product_uom_id': self.product_uom_id,
+            'product_qty': 10,
+            'location_id': self.lot_rma_id.id
+        })
+
+        inventory_id.prepare_inventory()
+        inventory_id.action_done()
+        qty = inventory_line_id_a.product_qty + inventory_line_id_b.product_qty
+        self.assertEquals(self.product_socket_id.rma_qty_available, qty)
+        self.assertEquals(self.product_socket_id.rma_virtual_available, qty)
+
+        self.assertEquals(
+            self.product_socket_id.product_tmpl_id.rma_qty_available, qty)
+        self.assertEquals(
+            self.product_socket_id.product_tmpl_id.rma_virtual_available, qty)
+
+        res = self.product_socket_id._search_rma_product_quantity(
+            '=',
+            inventory_line_id_a.product_qty + inventory_line_id_b.product_qty)
+        self.assertEquals(self.product_socket_id.id, res[0][2][0])
diff --git a/crm_rma_stock_location/tests/test_make_picking_from_picking.py b/crm_rma_stock_location/tests/test_make_picking_from_picking.py
new file mode 100644
index 00000000..c39ebbe4
--- /dev/null
+++ b/crm_rma_stock_location/tests/test_make_picking_from_picking.py
@@ -0,0 +1,159 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Author: Yanina Aular
+#    Copyright 2015 Vauxoo
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp.tests.common import TransactionCase
+
+
+class TestPickingFromPicking(TransactionCase):
+
+    def setUp(self):
+        super(TestPickingFromPicking, self).setUp()
+        self.stock_warehouse = self.env['stock.warehouse']
+        self.claim_id = self.create_claim()
+        self.wizardmakepicking = self.env['claim_make_picking.wizard']
+        self.claim_picking_wizard = \
+            self.env['claim.make.picking.from.picking.wizard']
+        self.get_default_locations()
+
+    def create_claim(self):
+        claim_id = self.env['crm.claim'].browse(
+            self.ref("crm_claim.crm_claim_6"))
+
+        claim_id.write({
+            'claim_line_ids': [(0, 0, {
+                'name': str(claim_id.id) + 'test 1',
+                'claim_origin': u'damaged',
+                'product_id': self.ref('product.product_product_8')
+            }), (0, 0, {
+                'name': str(claim_id.id) + 'test 2',
+                'claim_origin': u'none',
+                'product_id': self.ref('product.product_product_6')
+            })]
+        })
+
+        return claim_id
+
+    def get_default_locations(self):
+        """
+        Return locations for RMA, Loss and Refurbish
+        """
+        self.main_warehouse_id = self.stock_warehouse.browse(
+            self.ref("stock.warehouse0"))
+
+        self.loc_rma = self.main_warehouse_id.lot_rma_id
+        self.loss_loc = self.main_warehouse_id.loss_loc_id
+        self.loc_refurbish = self.main_warehouse_id.lot_refurbish_id
+
+    def test_01_get_dest_loc(self):
+
+        # Create Picking from Customers to RMA
+        # with button New Products Return
+
+        wiz_context = {
+            'active_id': self.claim_id.id,
+            'warehouse_id': self.claim_id.warehouse_id.id,
+            'partner_id': self.claim_id.partner_id.id,
+            'picking_type': self.claim_id.warehouse_id.rma_in_type_id.id,
+        }
+        wizard_id = self.wizardmakepicking.with_context(wiz_context).create({})
+
+        res = wizard_id.action_create_picking()
+
+        stock_picking_id = res.get('res_id')
+
+        # Create Picking 'Product to stock'
+        context = {
+            'active_id': stock_picking_id,
+            'picking_type': 'picking_stock',
+        }
+
+        claim_wizard = self.claim_picking_wizard.\
+            with_context(context).create({})
+
+        self.assertEquals(claim_wizard.picking_line_source_location.id,
+                          self.loc_rma.id)
+
+        self.assertEquals(claim_wizard.picking_line_dest_location.id,
+                          self.main_warehouse_id.lot_stock_id.id)
+
+        self.assertEquals(len(claim_wizard.picking_line_ids),
+                          len(self.claim_id.claim_line_ids))
+
+        # Review number of picking lines with claim lines
+        picking_lines = claim_wizard.picking_line_ids
+        claim_lines = self.claim_id.claim_line_ids
+
+        for num in xrange(0, len(picking_lines)):
+            band = False
+            for num2 in xrange(0, len(claim_lines)):
+                if claim_lines[num].product_id.id == \
+                        picking_lines[num2].product_id.id:
+                    band = True
+            self.assertEquals(True, band)
+
+        claim_wizard.with_context(context).action_create_picking_from_picking()
+
+        # Create Picking 'Product to Loss'
+        claim_wizard = self.claim_picking_wizard.\
+            with_context({
+                'active_id': stock_picking_id,
+                'picking_type': 'picking_loss',
+            }).create({})
+
+        self.assertEquals(claim_wizard.picking_line_source_location.id,
+                          self.loc_rma.id)
+
+        self.assertEquals(claim_wizard.picking_line_dest_location.id,
+                          self.loss_loc.id)
+
+    def assert_picking_type(self, picking_type_str=''):
+        new_context = {
+            'active_id': self.claim_id.id,
+            'warehouse_id': self.claim_id.warehouse_id.id,
+            'partner_id': self.claim_id.partner_id.id,
+            'picking_type': picking_type_str,
+        }
+        wizard_id = self.wizardmakepicking.with_context(new_context).create({})
+
+        default_location_dest_id = eval(
+            'self.claim_id.warehouse_id.'
+            'rma_%s_type_id.default_location_dest_id' % picking_type_str)
+        self.assertEquals(
+            wizard_id.claim_line_dest_location_id, default_location_dest_id)
+
+    def test_02_picking_types_in_out_int(self):
+        self.assert_picking_type('in')
+        self.assert_picking_type('out')
+        self.assert_picking_type('int')
+
+    def test_03_picking_type_loss(self):
+        new_context = {
+            'active_id': self.claim_id.id,
+            'warehouse_id': self.claim_id.warehouse_id.id,
+            'partner_id': self.claim_id.partner_id.id,
+            'picking_type': 'loss',
+        }
+        wizard_id = self.wizardmakepicking.with_context(new_context).create({})
+
+        default_location_dest_id = eval(
+            'self.claim_id.warehouse_id.loss_loc_id')
+        self.assertEquals(
+            wizard_id.claim_line_dest_location_id, default_location_dest_id)
diff --git a/crm_rma_stock_location/views/crm_claim.xml b/crm_rma_stock_location/views/crm_claim.xml
new file mode 100644
index 00000000..f9a5f099
--- /dev/null
+++ b/crm_rma_stock_location/views/crm_claim.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+        <record model="ir.ui.view" id="crm_claim_rma_form_view_loss">
+            <field name="name">CRM - Claim product return Form</field>
+            <field name="model">crm.claim</field>
+            <field name="inherit_id" ref="crm_claim_rma.crm_claim_rma_form_view"/>
+            <field name="arch" type="xml">
+                <xpath expr="//button[@string='New Delivery']" position="after">
+                    <button name="%(action_claim_picking_loss)d"
+                                    string="New Product Loss"
+                                    type="action" target="new"
+                                    context="{'warehouse_id': warehouse_id,
+                                        'partner_id': partner_id}"/>
+                </xpath>
+            </field>
+        </record>
+    </data>
+</openerp>
diff --git a/crm_rma_stock_location/views/product_product.xml b/crm_rma_stock_location/views/product_product.xml
new file mode 100644
index 00000000..54fc3c26
--- /dev/null
+++ b/crm_rma_stock_location/views/product_product.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="rma_product_product_tree_view" model="ir.ui.view">
+            <field name="name">product.stock.tree.inherit</field>
+            <field name="model">product.product</field>
+            <field name="arch" type="xml">
+                <tree string="Product Variants" create="false">
+                    <field name="default_code"/>
+                    <field name="name"/>
+                    <field name="attribute_value_ids" widget="many2many_tags"/>
+                    <field name="rma_qty_available"/>
+                    <field name="rma_virtual_available"/>
+                </tree>
+            </field>
+        </record>
+
+        <record id="rma_product_search_view" model="ir.ui.view">
+            <field name="name">product.product.search</field>
+            <field name="model">product.product</field>
+            <field name="arch" type="xml">
+                <search string="RMA Products">
+                    <separator/>
+                    <filter name="rma_available" string="RMA Available Products"
+                        domain="['|', ('rma_qty_available','&gt;',0), ('rma_virtual_available','&gt;',0)]"/>
+                </search>
+            </field>
+        </record>
+
+        <record id="rma_product_variant_action" model="ir.actions.act_window">
+            <field name="name">RMA Stock</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">product.product</field>
+            <field name="view_mode">tree</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="rma_product_product_tree_view"/>
+            <field name="search_view_id" ref="rma_product_search_view"/>
+            <field name="context">{'search_default_rma_available': 1}</field>
+        </record>
+
+        <menuitem action="rma_product_variant_action"
+            id="menu_stock_rma" parent="base.menu_aftersale"
+            name="RMA Stock"
+            sequence="100"/>
+    </data>
+</openerp>
diff --git a/crm_rma_stock_location/views/product_template.xml b/crm_rma_stock_location/views/product_template.xml
new file mode 100644
index 00000000..44fe71cb
--- /dev/null
+++ b/crm_rma_stock_location/views/product_template.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record id="view_template_property_form" model="ir.ui.view">
+            <field name="name">product.normal.procurement.locations.inherit</field>
+            <field name="model">product.template</field>
+            <field name="inherit_id" ref="stock.view_template_property_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='virtual_available']" position="after">
+                    <field name="rma_qty_available"/>
+                    <field name="rma_virtual_available"/>
+                </xpath>
+            </field>
+        </record>
+    </data>
+</openerp>
diff --git a/crm_rma_stock_location/views/stock_picking.xml b/crm_rma_stock_location/views/stock_picking.xml
new file mode 100644
index 00000000..6da49f08
--- /dev/null
+++ b/crm_rma_stock_location/views/stock_picking.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <!-- INHERITED VIEW FOR THE OBJECT : stock_picking -->
+        <record id="picking_in_form" model="ir.ui.view">
+            <field name="name">crm_claim_rma.picking_in_form</field>
+            <field name="model">stock.picking</field>
+            <field name="inherit_id" ref="stock.view_picking_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='state']" position="before">
+                        <button name="%(action_stock_picking_from_claim_picking)d"
+                                string="Product to stock" type="action"
+                                attrs="{'invisible':['|',
+                                                    ('state','&lt;&gt;','done'),
+                                                    ('claim_id', '=', False)]}"/>
+                        <button name="%(action_loss_picking_from_claim_picking)d"
+                                string="Product to Loss" type="action"
+                                attrs="{'invisible':['|',
+                                                    ('state','&lt;&gt;','done'),
+                                                    ('claim_id', '=', False)]}"/>
+                        <button name="%(action_used_picking_from_claim_picking)d"
+                                string="Product to refurbish stock" type="action"
+                                attrs="{'invisible':['|',
+                                                    ('state','&lt;&gt;','done'),
+                                                    ('claim_id', '=', False)]}"/>
+                </xpath>
+            </field>
+        </record>
+    </data>
+</openerp>
diff --git a/crm_rma_stock_location/views/stock_warehouse.xml b/crm_rma_stock_location/views/stock_warehouse.xml
new file mode 100644
index 00000000..9490eee7
--- /dev/null
+++ b/crm_rma_stock_location/views/stock_warehouse.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="warehouse_form" model="ir.ui.view">
+            <field name="name">crm_claim_rma.warehouse_form</field>
+            <field name="model">stock.warehouse</field>
+            <field name="inherit_id" ref="crm_rma_location.view_warehouse_form" />
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='lot_rma_id']" position="after">
+                    <field name="loss_loc_id"/>
+                    <field name="lot_refurbish_id"/>
+                </xpath>
+            </field>
+        </record>
+    </data>
+</openerp>
diff --git a/crm_rma_stock_location/wizards/__init__.py b/crm_rma_stock_location/wizards/__init__.py
new file mode 100644
index 00000000..bc5bbb05
--- /dev/null
+++ b/crm_rma_stock_location/wizards/__init__.py
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Copyright 2013 Camptocamp
+#    Copyright 2009-2013 Akretion,
+#    Author: Emmanuel Samyn, Raphaël Valyi, Sébastien Beau,
+#            Joel Grand-Guillaume
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+from . import claim_make_picking_from_picking
+from . import claim_make_picking
diff --git a/crm_rma_stock_location/wizards/claim_make_picking.py b/crm_rma_stock_location/wizards/claim_make_picking.py
new file mode 100644
index 00000000..0251cfaa
--- /dev/null
+++ b/crm_rma_stock_location/wizards/claim_make_picking.py
@@ -0,0 +1,63 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Copyright 2015 Vauxoo
+#    Copyright (C) 2009-2012  Akretion
+#    Author: Emmanuel Samyn, Benoît GUILLOT <benoit.guillot@akretion.com>,
+#            Osval Reyes
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp import models, fields
+
+
+class ClaimMakePicking(models.TransientModel):
+
+    _inherit = 'claim_make_picking.wizard'
+    _description = 'Wizard to create pickings from claim lines'
+
+    def _default_claim_line_dest_location_id(self):
+        """Return the location_id to use as destination.
+
+        If it's an outgoing shipment: take the customer stock property
+        If it's an incoming shipment take the location_dest_id common to all
+        lines, or if different, return None.
+        """
+        picking_type = self.env.context.get('picking_type')
+        claim_id = self.env.context.get('active_id')
+        claim_record = self.env['crm.claim'].browse(claim_id)
+
+        if isinstance(picking_type, int):
+            picking_obj = self.env['stock.picking.type']
+            return picking_obj.browse(picking_type)\
+                .default_location_dest_id
+
+        if picking_type == 'out':
+            return claim_record.warehouse_id.rma_out_type_id.\
+                default_location_dest_id
+        elif picking_type == 'in':
+            return claim_record.warehouse_id.rma_in_type_id.\
+                default_location_dest_id
+        elif picking_type == 'int':
+            return claim_record.warehouse_id.rma_int_type_id.\
+                default_location_dest_id
+        elif picking_type == 'loss':
+            return claim_record.warehouse_id.loss_loc_id
+
+        return self.env['stock.location']
+
+    claim_line_dest_location_id = fields.Many2one(
+        default=_default_claim_line_dest_location_id)
diff --git a/crm_rma_stock_location/wizards/claim_make_picking_from_picking.py b/crm_rma_stock_location/wizards/claim_make_picking_from_picking.py
new file mode 100644
index 00000000..d33c0ac8
--- /dev/null
+++ b/crm_rma_stock_location/wizards/claim_make_picking_from_picking.py
@@ -0,0 +1,178 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Copyright 2015 Vauxoo
+#    Copyright (C) 2009-2012  Akretion
+#    Author: Emmanuel Samyn, Benoît GUILLOT <benoit.guillot@akretion.com>,
+#            Osval Reyes
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp import _, models, fields, api
+from openerp.tools import DEFAULT_SERVER_DATETIME_FORMAT
+from openerp import workflow
+import time
+
+
+class ClaimMakePickingFromPicking(models.TransientModel):
+
+    _name = 'claim.make.picking.from.picking.wizard'
+    _description = 'Wizard to create pickings from picking lines'
+
+    @api.model
+    def _get_default_warehouse(self):
+        warehouse_id = self.env['crm.claim']._get_default_warehouse()
+        return warehouse_id
+
+    @api.model
+    def _get_picking_lines(self):
+        move_lines = self.env['stock.picking'].\
+            browse(self.env.context.get('active_id')).move_lines
+        return [mov.id for mov in move_lines]
+
+    @api.model
+    def _get_source_loc(self):
+        """
+        Get default source location
+        """
+        warehouse_id = self._get_default_warehouse()
+        picking_obj = self.env['stock.picking']
+        picking_id = self.env.context.get('active_id')
+        picking_rec = picking_obj.browse(picking_id)
+        if picking_rec.location_dest_id:
+            return picking_rec.location_dest_id.id
+        else:
+            return warehouse_id.lot_rma_id.id
+
+    @api.model
+    def _get_dest_loc(self):
+        """
+        Get default destination location
+        """
+        warehouse_id = self._get_default_warehouse()
+        loc_id = self.env['stock.location']
+        picking_type = self.env.context.get('picking_type')
+        picking_type_obj = self.env['stock.picking.type']
+
+        if isinstance(picking_type, int):
+            pick_t = picking_type_obj.browse(picking_type)
+            loc_id = pick_t.default_location_dest_id
+        else:
+            if picking_type == 'picking_stock':
+                loc_id = warehouse_id.lot_stock_id.id
+
+            if picking_type == 'picking_loss':
+                loc_id = warehouse_id.loss_loc_id.id
+
+            if picking_type == 'picking_refurbish':
+                loc_id = warehouse_id.lot_refurbish_id.id
+        return loc_id
+
+    picking_line_source_location = fields.Many2one(
+        'stock.location', _('Source Location'),
+        help=_("Source location where the returned products are"),
+        required=True, default=_get_source_loc)
+    picking_line_dest_location = fields.Many2one(
+        'stock.location', _('Dest. Location'),
+        help=_("Target location to send returned products"),
+        required=True, default=_get_dest_loc)
+    picking_line_ids = fields.Many2many(
+        'stock.move', 'claim_picking_line_picking', 'claim_picking_id',
+        'picking_line_id', 'Picking lines', default=_get_picking_lines)
+
+    @api.multi
+    def action_cancel(self):
+        return {'type': 'ir.actions.act_window_close'}
+
+    @api.multi
+    def action_create_picking_from_picking(self):
+        """
+        If "Create" button pressed
+        """
+        picking_obj = self.env['stock.picking']
+        move_obj = self.env['stock.move']
+        view_obj = self.env['ir.ui.view']
+
+        if self.env.context.get('picking_type'):
+            context_type = self.env.context.get('picking_type')[8:]
+            note = 'Internal picking from RMA to %s' % context_type
+            name = 'Internal picking to %s' % context_type
+        view_id = view_obj.search([
+            ('model', '=', 'stock.picking'),
+            ('type', '=', 'form'),
+            ('name', '=', 'stock.picking.form')
+        ])[0]
+        prev_picking = picking_obj.browse(self.env.context.get('active_id'))
+        partner_id = prev_picking.partner_id.id
+        # create picking
+        picking_id = picking_obj.create({
+            'origin': prev_picking.origin,
+            'move_type': 'one',
+            'state': 'draft',
+            'date': time.strftime(DEFAULT_SERVER_DATETIME_FORMAT),
+            'partner_id': prev_picking.partner_id.id,
+            'invoice_state': "none",
+            'company_id': prev_picking.company_id.id,
+            'location_id': self.picking_line_source_location.id,
+            'location_dest_id': self.picking_line_dest_location.id,
+            'note': note,
+            'claim_id': prev_picking.claim_id.id,
+            'picking_type_id': prev_picking.claim_id.warehouse_id.id,
+        })
+
+        # Create picking lines
+        for wizard_picking_line in self.picking_line_ids:
+            move_id = move_obj.create({
+                'name': wizard_picking_line.product_id.name_template,
+                'priority': '0',
+                'date': time.strftime(DEFAULT_SERVER_DATETIME_FORMAT),
+                'date_expected': time.strftime(
+                    DEFAULT_SERVER_DATETIME_FORMAT),
+                'product_id': wizard_picking_line.product_id.id,
+                'product_uom_qty': wizard_picking_line.product_uom_qty,
+                'product_uom': wizard_picking_line.product_uom.id,
+                'partner_id': prev_picking.partner_id.id,
+                'picking_id': picking_id.id,
+                'state': 'draft',
+                'price_unit': wizard_picking_line.price_unit,
+                'company_id': prev_picking.company_id.id,
+                'location_id': self.picking_line_source_location.id,
+                'location_dest_id': self.picking_line_dest_location.id,
+                'note': note,
+                'invoice_state': 'none',
+            })
+            wizard_picking_line.write(
+                {'move_dest_id': move_id.id})
+        wf_service = workflow
+        if picking_id:
+            wf_service.trg_validate(
+                self._uid, 'stock.picking',
+                picking_id.id,
+                'button_confirm',
+                self._cr)
+            picking_id.action_assign()
+        domain = "[('picking_type_id','=','%s'),('partner_id','=',%s)]" % (
+            prev_picking.claim_id.warehouse_id.rma_int_type_id.id, partner_id)
+        return {
+            'name': '%s' % name,
+            'view_type': 'form',
+            'view_mode': 'form',
+            'view_id': view_id.id,
+            'domain': domain,
+            'res_model': 'stock.picking',
+            'res_id': picking_id.id,
+            'type': 'ir.actions.act_window',
+        }
diff --git a/crm_rma_stock_location/wizards/claim_make_picking_from_picking_view.xml b/crm_rma_stock_location/wizards/claim_make_picking_from_picking_view.xml
new file mode 100644
index 00000000..6c3c01af
--- /dev/null
+++ b/crm_rma_stock_location/wizards/claim_make_picking_from_picking_view.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  crm_claim_rma for OpenERP
+  Copyright (C) 2011 Akretion Benoît GUILLOT <benoit.guillot@akretion.com>
+  The licence is in the file __openerp__.py
+-->
+<openerp>
+    <data>
+        <record id="view_claim_picking_from_picking" model="ir.ui.view">
+            <field name="name">claim_picking</field>
+            <field name="model">claim.make.picking.from.picking.wizard</field>
+            <field name="arch" type="xml">
+                <form string="Select lines to add in picking">
+                    <separator string="Locations" colspan="4"/>
+                    <field name="picking_line_source_location" nolabel="1" />
+                    <field name="picking_line_dest_location" nolabel="1" />
+                    <separator string="Select lines for picking" colspan="4"/>
+                    <field name="picking_line_ids" nolabel="1" colspan="4"/>
+                    <group col="4" colspan="2">
+                        <button special="cancel" string="Cancel"
+                            name="action_cancel" type="object"
+                            icon='gtk-cancel'/>
+                        <button name="action_create_picking_from_picking"
+                            string="Create picking"
+                            icon='gtk-ok' type="object"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_stock_picking_from_claim_picking"
+            model="ir.actions.act_window">
+            <field name="name">Create Incoming Shipment to Stock</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">claim.make.picking.from.picking.wizard</field>
+            <field name="src_model">stock.picking</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+            <field name="context">{'picking_type': 'picking_stock'}</field>
+        </record>
+
+        <record id="action_loss_picking_from_claim_picking"
+            model="ir.actions.act_window">
+            <field name="name">Create Incoming Shipment to Breakage Loss Location</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">claim.make.picking.from.picking.wizard</field>
+            <field name="src_model">stock.picking</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+            <field name="context">{'picking_type': 'picking_loss'}
+            </field>
+        </record>
+
+        <record id="action_used_picking_from_claim_picking"
+            model="ir.actions.act_window">
+            <field name="name">Create Incoming Shipment to Refurbish Location</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">claim.make.picking.from.picking.wizard</field>
+            <field name="src_model">stock.picking</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+            <field name="context">{'picking_type': 'picking_refurbish'}</field>
+        </record>
+    </data>
+</openerp>
diff --git a/crm_rma_stock_location/wizards/claim_make_picking_view.xml b/crm_rma_stock_location/wizards/claim_make_picking_view.xml
new file mode 100644
index 00000000..950936a8
--- /dev/null
+++ b/crm_rma_stock_location/wizards/claim_make_picking_view.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  crm_claim_rma for OpenERP
+  Copyright (C) 2011 Akretion Benoît GUILLOT <benoit.guillot@akretion.com>
+  The licence is in the file __openerp__.py
+-->
+<openerp>
+    <data>
+        <record id="action_claim_picking_loss" model="ir.actions.act_window">
+            <field name="name">Create a Product Loss</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">claim_make_picking.wizard</field>
+            <field name="src_model">crm.claim</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+            <field name="context">{'picking_type': 'loss'}</field>
+        </record>
+    </data>
+</openerp>

From bdc11ae77a847a4a680e2d869fd13f36057fad4c Mon Sep 17 00:00:00 2001
From: Osval Reyes <osval@vauxoo.com>
Date: Fri, 27 Nov 2015 18:58:54 -0430
Subject: [PATCH 12/19] [REF] crm_rma_stock_location: add init_hooks file for
 post_init_hook, correct typos in readme, change usage for created locations
 loss and refurbished, rename compute method _rma_product_available ->
 _rma_template_available and get defined with @api.multi decorator

---
 crm_rma_stock_location/README.rst             | 14 ++++-----
 crm_rma_stock_location/__init__.py            | 10 +-----
 crm_rma_stock_location/init_hooks.py          | 31 +++++++++++++++++++
 .../models/product_product.py                 |  3 +-
 .../models/product_template.py                |  9 +++---
 .../models/stock_warehouse.py                 | 11 +++++--
 6 files changed, 54 insertions(+), 24 deletions(-)
 create mode 100644 crm_rma_stock_location/init_hooks.py

diff --git a/crm_rma_stock_location/README.rst b/crm_rma_stock_location/README.rst
index db575389..d4e8a113 100644
--- a/crm_rma_stock_location/README.rst
+++ b/crm_rma_stock_location/README.rst
@@ -10,16 +10,16 @@ Allow the user to know how much for a product is available 'On Hand' and how muc
 is virtually (expected to be) available for RMA locations. Adding for the
 different product views (Tree, Form and Kanban) information about it.
 
-Both quantities are computed and includes its children locations.
+Both quantities are computed and include its children locations.
 
-It is useful use it as a quick snapshot for RMA from product perspective.
+It is useful to use it as a quick snapshot for RMA from product perspective.
 
 It also adds the following location on warehouses :
 
  * Loss
- * Refurbish
+ * Refurbished
 
-Various wizards on incoming deliveries that allow you to move your
+Several wizards on incoming deliveries that allow you to move your
 goods easily in those new locations from a done reception.
 
 Using this module make the logistic flow of return a bit more complex:
@@ -41,11 +41,11 @@ Usage
 =====
 
 * Go to Sales > After-sale Services and note that 'RMA Quantity On Hand' and
-  'RMA Forecasted Quantity' had been included and it'll be shown when at least
-  a product has either a on hand or forecasted quantities available.
+  'RMA Forecasted Quantity' has been included and they'll be shown when at least
+  when a product has either on hand or forecasted quantities available.
 
 * In the other hand, it provides three wizards to make stock moves (transfers)
-  allowing to do product returns (incoming), send a product to loss or, to a refurbish
+  allowing to do product returns (incoming), send a product to loss or, to a refurbished
   location.
 
 .. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas
diff --git a/crm_rma_stock_location/__init__.py b/crm_rma_stock_location/__init__.py
index 9f9433ff..d59c3ae6 100644
--- a/crm_rma_stock_location/__init__.py
+++ b/crm_rma_stock_location/__init__.py
@@ -23,12 +23,4 @@
 
 from . import models
 from . import wizards
-from openerp import SUPERUSER_ID
-
-
-def post_init_hook(cr, registry):
-    stock_wh = registry['stock.warehouse']
-    for wh_id in stock_wh.browse(cr, SUPERUSER_ID,
-                                 stock_wh.search(cr, SUPERUSER_ID, [])):
-        vals = stock_wh.create_locations_rma(cr, SUPERUSER_ID, wh_id)
-        stock_wh.write(cr, SUPERUSER_ID, wh_id.id, vals)
+from .init_hooks import post_init_hook
diff --git a/crm_rma_stock_location/init_hooks.py b/crm_rma_stock_location/init_hooks.py
new file mode 100644
index 00000000..9b97870c
--- /dev/null
+++ b/crm_rma_stock_location/init_hooks.py
@@ -0,0 +1,31 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Copyright 2015 Vauxoo
+#    Copyright 2014 Camptocamp SA
+#    Author: Guewen Baconnier,
+#            Osval Reyes
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+from openerp import SUPERUSER_ID
+
+
+def post_init_hook(cr, registry):
+    stock_wh = registry['stock.warehouse']
+    for wh_id in stock_wh.browse(cr, SUPERUSER_ID,
+                                 stock_wh.search(cr, SUPERUSER_ID, [])):
+        vals = stock_wh.create_locations_rma(cr, SUPERUSER_ID, wh_id)
+        stock_wh.write(cr, SUPERUSER_ID, wh_id.id, vals)
diff --git a/crm_rma_stock_location/models/product_product.py b/crm_rma_stock_location/models/product_product.py
index 8e950ddb..719606cf 100644
--- a/crm_rma_stock_location/models/product_product.py
+++ b/crm_rma_stock_location/models/product_product.py
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-from openerp import _, models, fields
+from openerp import _, api, fields, models
 import openerp.addons.decimal_precision as dp
 from openerp.tools.float_utils import float_round
 from openerp.tools.safe_eval import safe_eval as eval
@@ -64,6 +64,7 @@ class ProductProduct(models.Model):
             res.append(('id', 'in', ids))
         return res
 
+    @api.multi
     def _rma_product_available(self):
         """
         Finds the incoming and outgoing quantity of product for the RMA
diff --git a/crm_rma_stock_location/models/product_template.py b/crm_rma_stock_location/models/product_template.py
index 7bf733c4..8059e33b 100644
--- a/crm_rma_stock_location/models/product_template.py
+++ b/crm_rma_stock_location/models/product_template.py
@@ -21,7 +21,7 @@
 #
 ##############################################################################
 
-from openerp import _, models, fields
+from openerp import _, api, fields, models
 import openerp.addons.decimal_precision as dp
 
 
@@ -29,19 +29,20 @@ class ProductTemplate(models.Model):
 
     _inherit = 'product.template'
 
-    rma_qty_available = fields.Float(compute='_rma_product_available',
+    rma_qty_available = fields.Float(compute='_rma_template_available',
                                      digits_compute=dp.
                                      get_precision('Product Unit '
                                                    'of Measure'),
                                      string=_('RMA Quantity On Hand'))
 
-    rma_virtual_available = fields.Float(compute='_rma_product_available',
+    rma_virtual_available = fields.Float(compute='_rma_template_available',
                                          digits_compute=dp.
                                          get_precision('Product Unit'
                                                        ' of Measure'),
                                          string=_('RMA Forecasted Quantity'))
 
-    def _rma_product_available(self):
+    @api.multi
+    def _rma_template_available(self):
         for product in self:
             product.rma_qty_available = sum(
                 [p.rma_qty_available for p in product.product_variant_ids])
diff --git a/crm_rma_stock_location/models/stock_warehouse.py b/crm_rma_stock_location/models/stock_warehouse.py
index 88a63625..ab919f57 100644
--- a/crm_rma_stock_location/models/stock_warehouse.py
+++ b/crm_rma_stock_location/models/stock_warehouse.py
@@ -44,7 +44,6 @@ class StockWarehouse(models.Model):
         vals_new = super(StockWarehouse, self).create_locations_rma(wh_id)
 
         loc_vals = {
-            'usage': 'internal',
             'location_id': wh_loc_id,
             'active': True,
         }
@@ -53,13 +52,19 @@ class StockWarehouse(models.Model):
             loc_vals['company_id'] = vals.get('company_id')
 
         if not wh_id.lot_refurbish_id:
-            loc_vals.update({'name': _('Refurbish')})
+            loc_vals.update({
+                'name': _('Refurbish'),
+                'usage': 'production'
+            })
             location_id = location_obj.with_context(context_with_inactive).\
                 create(loc_vals)
             vals['lot_refurbish_id'] = location_id.id
 
         if not wh_id.loss_loc_id:
-            loc_vals.update({'name': _('Loss')})
+            loc_vals.update({
+                'name': _('Loss'),
+                'usage': 'inventory'
+            })
             location_id = location_obj.with_context(context_with_inactive).\
                 create(loc_vals)
             vals['loss_loc_id'] = location_id.id

From ebb56a42b1b7f2828553a67b79232bbc80533a55 Mon Sep 17 00:00:00 2001
From: OCA Transbot <transbot@odoo-community.org>
Date: Mon, 30 Nov 2015 13:05:46 -0500
Subject: [PATCH 13/19] OCA Transbot updated translations from Transifex

---
 crm_claim_rma/i18n/en.po              | 1049 ++++++++++++++
 crm_claim_rma/i18n/es.po              | 1844 ++++++++++++-------------
 crm_claim_rma/i18n/fr.po              | 1686 +++++++++++-----------
 crm_claim_rma/i18n/pt_BR.po           | 1583 +++++++++++----------
 crm_claim_rma/i18n/ro.po              | 1049 ++++++++++++++
 crm_claim_rma_code/i18n/en.po         |   23 +
 crm_rma_location/i18n/es.po           |   33 +-
 crm_rma_location/i18n/fr.po           |   85 ++
 crm_rma_lot_mass_return/i18n/en.po    |  310 +++++
 crm_rma_lot_mass_return/i18n/es.po    |  219 ++-
 crm_rma_lot_mass_return/i18n/fr.po    |  310 +++++
 crm_rma_lot_mass_return/i18n/pt_BR.po |  310 +++++
 crm_rma_lot_mass_return/i18n/ro.po    |  310 +++++
 crm_rma_prodlot_invoice/i18n/es.po    |   55 +-
 crm_rma_prodlot_invoice/i18n/fr.po    |   65 +
 crm_rma_prodlot_supplier/i18n/es.po   |   40 +-
 crm_rma_prodlot_supplier/i18n/fr.po   |   60 +
 product_warranty/i18n/en.po           |  164 +++
 product_warranty/i18n/es.po           |  238 +---
 product_warranty/i18n/fr.po           |  225 +--
 product_warranty/i18n/ro.po           |  165 +++
 21 files changed, 7018 insertions(+), 2805 deletions(-)
 create mode 100644 crm_claim_rma/i18n/en.po
 create mode 100644 crm_claim_rma/i18n/ro.po
 create mode 100644 crm_claim_rma_code/i18n/en.po
 create mode 100644 crm_rma_location/i18n/fr.po
 create mode 100644 crm_rma_lot_mass_return/i18n/en.po
 create mode 100644 crm_rma_lot_mass_return/i18n/fr.po
 create mode 100644 crm_rma_lot_mass_return/i18n/pt_BR.po
 create mode 100644 crm_rma_lot_mass_return/i18n/ro.po
 create mode 100644 crm_rma_prodlot_invoice/i18n/fr.po
 mode change 100755 => 100644 crm_rma_prodlot_supplier/i18n/es.po
 create mode 100644 crm_rma_prodlot_supplier/i18n/fr.po
 create mode 100644 product_warranty/i18n/en.po
 create mode 100644 product_warranty/i18n/ro.po

diff --git a/crm_claim_rma/i18n/en.po b/crm_claim_rma/i18n/en.po
new file mode 100644
index 00000000..28c840a5
--- /dev/null
+++ b/crm_claim_rma/i18n/en.po
@@ -0,0 +1,1049 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * crm_claim_rma
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: rma (8.0)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-11-24 16:07+0000\n"
+"PO-Revision-Date: 2015-11-19 19:00+0000\n"
+"Last-Translator: OCA Transbot <transbot@odoo-community.org>\n"
+"Language-Team: English (http://www.transifex.com/oca/OCA-rma-8-0/language/en/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: en\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. module: crm_claim_rma
+#: code:addons/crm_claim_rma/wizards/claim_make_picking.py:121
+#, python-format
+msgid "A picking has already been created for this claim."
+msgstr "A picking has already been created for this claim."
+
+#. module: crm_claim_rma
+#: code:addons/crm_claim_rma/wizards/claim_make_picking.py:233
+#, python-format
+msgid ""
+"A product return cannot be created for various destination addresses, please"
+" choose line with a same address."
+msgstr "A product return cannot be created for various destination addresses, please choose line with a same address."
+
+#. module: crm_claim_rma
+#: code:addons/crm_claim_rma/wizards/claim_make_picking.py:223
+#, python-format
+msgid ""
+"A product return cannot be created for various destination locations, please"
+" choose line with a same destination location."
+msgstr "A product return cannot be created for various destination locations, please choose line with a same destination location."
+
+#. module: crm_claim_rma
+#: code:addons/crm_claim_rma/models/account_invoice.py:75
+#, python-format
+msgid "A refund has already been created for this claim !"
+msgstr "A refund has already been created for this claim !"
+
+#. module: crm_claim_rma
+#: model:crm.case.section,name:crm_claim_rma.section_after_sales_service
+msgid "After Sales Service"
+msgstr "After Sales Service"
+
+#. module: crm_claim_rma
+#: selection:claim.line,applicable_guarantee:0
+msgid "Brand manufacturer"
+msgstr "Brand manufacturer"
+
+#. module: crm_claim_rma
+#: model:crm.case.categ,name:crm_claim_rma.categ_claim12
+msgid "Buyer Cancelled"
+msgstr "Buyer Cancelled"
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.crm_claim_line_form_view
+msgid "Calculate warranty state"
+msgstr "Calculate warranty state"
+
+#. module: crm_claim_rma
+#: view:claim_make_picking.wizard:crm_claim_rma.view_claim_picking
+msgid "Cancel"
+msgstr "Cancel"
+
+#. module: crm_claim_rma
+#: code:addons/crm_claim_rma/models/claim_line.py:308
+#, python-format
+msgid "Cannot find any date for invoice. Must be a validated invoice."
+msgstr "Cannot find any date for invoice. Must be a validated invoice."
+
+#. module: crm_claim_rma
+#: field:account.invoice,claim_id:0
+#: model:ir.model,name:crm_claim_rma.model_crm_claim
+#: field:stock.picking,claim_id:0
+msgid "Claim"
+msgstr "Claim"
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.crm_claim_line_form_view
+msgid "Claim Line"
+msgstr "Claim Line"
+
+#. module: crm_claim_rma
+#: field:claim.line,date:0
+msgid "Claim Line Date"
+msgstr "Claim Line Date"
+
+#. module: crm_claim_rma
+#: help:claim.line,number:0
+msgid "Claim Line Identification Number"
+msgstr "Claim Line Identification Number"
+
+#. module: crm_claim_rma
+#: field:claim.line,claim_type:0
+msgid "Claim Line Type"
+msgstr "Claim Line Type"
+
+#. module: crm_claim_rma
+#: field:claim.line,claim_origin:0
+msgid "Claim Subject"
+msgstr "Claim Subject"
+
+#. module: crm_claim_rma
+#: help:claim.line,claim_type:0
+msgid "Claim classification"
+msgstr "Claim classification"
+
+#. module: crm_claim_rma
+#: field:claim.line,claim_diagnosis:0
+msgid "Claim diagnosis"
+msgstr "Claim diagnosis"
+
+#. module: crm_claim_rma
+#: model:ir.actions.act_window,name:crm_claim_rma.act_crm_claim_substates
+#: model:ir.ui.menu,name:crm_claim_rma.menu_crm_case_claims_claim_line_substates
+msgid "Claim line substates"
+msgstr "Claim line substates"
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.crm_claim_line_tree_view
+#: 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.ui.menu,name:crm_claim_rma.menu_crm_case_claims_claim_lines
+msgid "Claim lines"
+msgstr "Claim lines"
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.view_crm_claim_lines_filter
+msgid "Claim n°"
+msgstr "Claim n°"
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.crm_claim_line_form_view
+msgid "Claims"
+msgstr "Claims"
+
+#. module: crm_claim_rma
+#: selection:claim.line,applicable_guarantee:0 field:claim.line,company_id:0
+msgid "Company"
+msgstr "Company"
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.crm_claim_line_tree_view
+#: view:crm.claim:crm_claim_rma.crm_claim_rma_form_view
+msgid "Compute Warranty"
+msgstr "Compute Warranty"
+
+#. module: crm_claim_rma
+#: selection:claim.line,state:0
+msgid "Confirmed, waiting for product"
+msgstr "Confirmed, waiting for product"
+
+#. module: crm_claim_rma
+#: view:res.partner:crm_claim_rma.view_partner_contact_tree
+msgid "Contacts"
+msgstr "Contacts"
+
+#. module: crm_claim_rma
+#: selection:claim.line,state:0
+msgid "Controlled, to treate"
+msgstr "Controlled, to treate"
+
+#. module: crm_claim_rma
+#: model:crm.case.categ,name:crm_claim_rma.categ_claim14
+msgid "Could Not Ship"
+msgstr "Could Not Ship"
+
+#. module: crm_claim_rma
+#: model:ir.actions.act_window,name:crm_claim_rma.action_claim_picking_out
+msgid "Create Outgoing Shipments"
+msgstr "Create Outgoing Shipments"
+
+#. module: crm_claim_rma
+#: view:claim_make_picking.wizard:crm_claim_rma.view_claim_picking
+msgid "Create picking"
+msgstr "Create picking"
+
+#. module: crm_claim_rma
+#: field:claim.line,create_uid:0 field:claim_make_picking.wizard,create_uid:0
+#: field:substate.substate,create_uid:0
+msgid "Created by"
+msgstr "Created by"
+
+#. module: crm_claim_rma
+#: field:claim.line,create_date:0
+#: field:claim_make_picking.wizard,create_date:0
+#: field:substate.substate,create_date:0
+msgid "Created on"
+msgstr "Created on"
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.view_crm_claim_lines_filter
+msgid "Current"
+msgstr "Current"
+
+#. module: crm_claim_rma
+#: code:addons/crm_claim_rma/models/crm_claim.py:161
+#, python-format
+msgid "Customer"
+msgstr "Customer"
+
+#. module: crm_claim_rma
+#: code:addons/crm_claim_rma/models/crm_claim.py:165
+#, python-format
+msgid "Customer Email"
+msgstr "Customer Email"
+
+#. module: crm_claim_rma
+#: model:crm.case.categ,name:crm_claim_rma.categ_claim11
+msgid "Customer Return"
+msgstr "Customer Return"
+
+#. module: crm_claim_rma
+#: selection:claim.line,claim_origin:0
+msgid "Damaged delivered product"
+msgstr "Damaged delivered product"
+
+#. module: crm_claim_rma
+#: help:claim.line,message_last_post:0 help:stock.move,message_last_post:0
+msgid "Date of the last message posted on the record."
+msgstr "Date of the last message posted on the record."
+
+#. module: crm_claim_rma
+#: model:crm.case.categ,name:crm_claim_rma.categ_claim20
+msgid "Delivered Late by Carrier"
+msgstr "Delivered Late by Carrier"
+
+#. module: crm_claim_rma
+#: field:claim.line,name:0 field:substate.substate,substate_descr:0
+msgid "Description"
+msgstr "Description"
+
+#. module: crm_claim_rma
+#: field:claim_make_picking.wizard,claim_line_dest_location_id:0
+msgid "Dest. Location"
+msgstr "Dest. Location"
+
+#. module: crm_claim_rma
+#: model:crm.case.categ,name:crm_claim_rma.categ_claim15
+msgid "Different Item"
+msgstr "Different Item"
+
+#. module: crm_claim_rma
+#: selection:claim.line,state:0
+msgid "Draft"
+msgstr "Draft"
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.view_crm_claim_lines_filter
+msgid "Draft and Open Claims"
+msgstr "Draft and Open Claims"
+
+#. module: crm_claim_rma
+#: code:addons/crm_claim_rma/models/claim_line.py:308
+#: code:addons/crm_claim_rma/models/claim_line.py:312
+#: code:addons/crm_claim_rma/models/claim_line.py:395
+#: code:addons/crm_claim_rma/models/claim_line.py:399
+#: code:addons/crm_claim_rma/wizards/claim_make_picking.py:120
+#: code:addons/crm_claim_rma/wizards/claim_make_picking.py:222
+#: code:addons/crm_claim_rma/wizards/claim_make_picking.py:232
+#, python-format
+msgid "Error"
+msgstr "Error"
+
+#. module: crm_claim_rma
+#: selection:claim.line,claim_origin:0
+msgid "Exchange request"
+msgstr "Exchange request"
+
+#. module: crm_claim_rma
+#: field:crm.claim,planned_cost:0
+msgid "Expected cost"
+msgstr "Expected cost"
+
+#. module: crm_claim_rma
+#: field:crm.claim,planned_revenue:0
+msgid "Expected revenue"
+msgstr "Expected revenue"
+
+#. module: crm_claim_rma
+#: code:addons/crm_claim_rma/models/claim_line.py:64
+#: selection:claim.line,warning:0
+#, python-format
+msgid "Expired"
+msgstr "Expired"
+
+#. module: crm_claim_rma
+#: view:crm.claim:crm_claim_rma.crm_claim_rma_form_view
+msgid "Follow Up"
+msgstr "Follow Up"
+
+#. module: crm_claim_rma
+#: field:claim.line,message_follower_ids:0
+#: field:stock.move,message_follower_ids:0
+msgid "Followers"
+msgstr "Followers"
+
+#. module: crm_claim_rma
+#: model:crm.case.categ,name:crm_claim_rma.categ_claim13
+msgid "General Adjustement"
+msgstr "General Adjustement"
+
+#. module: crm_claim_rma
+#: view:crm.claim:crm_claim_rma.crm_claim_rma_form_view
+msgid "Generated Documents"
+msgstr "Generated Documents"
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.view_crm_claim_lines_filter
+msgid "Group By..."
+msgstr "Group By..."
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.view_crm_claim_lines_filter
+msgid "Grouping by state"
+msgstr "Grouping by state"
+
+#. module: crm_claim_rma
+#: selection:claim.line,priority:0
+msgid "High"
+msgstr "High"
+
+#. module: crm_claim_rma
+#: help:claim.line,message_summary:0 help:stock.move,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr "Holds the Chatter summary (number of messages, ...). This summary is directly in html format in order to be inserted in kanban views."
+
+#. module: crm_claim_rma
+#: field:claim.line,id:0 field:claim_make_picking.wizard,id:0
+#: field:substate.substate,id:0
+msgid "ID"
+msgstr "ID"
+
+#. module: crm_claim_rma
+#: help:claim.line,message_unread:0 help:stock.move,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr "If checked new messages require your attention."
+
+#. module: crm_claim_rma
+#: help:claim.line,warning:0
+msgid "If warranty has expired"
+msgstr "If warranty has expired"
+
+#. module: crm_claim_rma
+#: selection:claim.line,claim_origin:0
+msgid "Imperfection"
+msgstr "Imperfection"
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.view_crm_claim_lines_filter
+msgid "In Progress"
+msgstr "In Progress"
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.view_crm_claim_lines_filter
+msgid "In Progress Claims"
+msgstr "In Progress Claims"
+
+#. 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 "Incoming Shipment and Returns"
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.view_crm_claim_lines_filter
+#: field:crm.claim,invoice_id:0
+#: model:ir.model,name:crm_claim_rma.model_account_invoice
+msgid "Invoice"
+msgstr "Invoice"
+
+#. module: crm_claim_rma
+#: field:claim.line,invoice_line_id:0
+#: model:ir.model,name:crm_claim_rma.model_account_invoice_line
+msgid "Invoice Line"
+msgstr "Invoice Line"
+
+#. module: crm_claim_rma
+#: model:ir.model,name:crm_claim_rma.model_account_invoice_refund
+msgid "Invoice Refund"
+msgstr "Invoice Refund"
+
+#. module: crm_claim_rma
+#: view:crm.claim:crm_claim_rma.crm_claim_rma_form_view
+#: model:ir.actions.act_window,name:crm_claim_rma.act_crm_claim_rma_invoice
+msgid "Invoices"
+msgstr "Invoices"
+
+#. module: crm_claim_rma
+#: field:claim.line,message_is_follower:0
+#: field:stock.move,message_is_follower:0
+msgid "Is a Follower"
+msgstr "Is a Follower"
+
+#. module: crm_claim_rma
+#: field:claim.line,message_last_post:0 field:stock.move,message_last_post:0
+msgid "Last Message Date"
+msgstr "Last Message Date"
+
+#. module: crm_claim_rma
+#: field:claim.line,write_uid:0 field:claim_make_picking.wizard,write_uid:0
+#: field:substate.substate,write_uid:0
+msgid "Last Updated by"
+msgstr "Last Updated by"
+
+#. module: crm_claim_rma
+#: field:claim.line,write_date:0 field:claim_make_picking.wizard,write_date:0
+#: field:substate.substate,write_date:0
+msgid "Last Updated on"
+msgstr "Last Updated on"
+
+#. module: crm_claim_rma
+#: field:claim.line,last_state_change:0
+msgid "Last change"
+msgstr "Last change"
+
+#. module: crm_claim_rma
+#: selection:claim.line,claim_origin:0
+msgid "Legal retractation"
+msgstr "Legal retractation"
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.crm_claim_line_form_view
+msgid "Linked Document"
+msgstr "Linked Document"
+
+#. module: crm_claim_rma
+#: model:ir.model,name:crm_claim_rma.model_claim_line
+msgid "List of product to return"
+msgstr "List of product to return"
+
+#. module: crm_claim_rma
+#: help:claim_make_picking.wizard,claim_line_source_location_id:0
+msgid "Location where the returned products are from."
+msgstr "Location where the returned products are from."
+
+#. module: crm_claim_rma
+#: help:claim_make_picking.wizard,claim_line_dest_location_id:0
+msgid "Location where the system will stock the returned products."
+msgstr "Location where the system will stock the returned products."
+
+#. module: crm_claim_rma
+#: view:claim_make_picking.wizard:crm_claim_rma.view_claim_picking
+msgid "Locations"
+msgstr "Locations"
+
+#. module: crm_claim_rma
+#: selection:claim.line,claim_origin:0
+msgid "Lost during transport"
+msgstr "Lost during transport"
+
+#. module: crm_claim_rma
+#: model:crm.case.categ,name:crm_claim_rma.categ_claim17
+msgid "Merchandise Not As Described"
+msgstr "Merchandise Not As Described"
+
+#. module: crm_claim_rma
+#: model:crm.case.categ,name:crm_claim_rma.categ_claim16
+msgid "Merchandise Not Received"
+msgstr "Merchandise Not Received"
+
+#. module: crm_claim_rma
+#: field:claim.line,message_ids:0 field:stock.move,message_ids:0
+msgid "Messages"
+msgstr "Messages"
+
+#. module: crm_claim_rma
+#: help:claim.line,message_ids:0 help:stock.move,message_ids:0
+msgid "Messages and communication history"
+msgstr "Messages and communication history"
+
+#. module: crm_claim_rma
+#: model:crm.case.categ,name:crm_claim_rma.categ_claim21
+msgid "Missed Fulfilment Promise"
+msgstr "Missed Fulfilment Promise"
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.view_crm_claim_lines_filter
+msgid "More"
+msgstr "More"
+
+#. module: crm_claim_rma
+#: help:claim.line,name:0
+msgid "More precise description of the problem"
+msgstr "More precise description of the problem"
+
+#. module: crm_claim_rma
+#: field:claim.line,move_in_id:0
+msgid "Move Line from picking in"
+msgstr "Move Line from picking in"
+
+#. module: crm_claim_rma
+#: field:claim.line,move_out_id:0
+msgid "Move Line from picking out"
+msgstr "Move Line from picking out"
+
+#. module: crm_claim_rma
+#: view:stock.picking:crm_claim_rma.view_picking_internal_search_claim_id
+msgid "Moves created from claims"
+msgstr "Moves created from claims"
+
+#. module: crm_claim_rma
+#: view:crm.claim:crm_claim_rma.crm_claim_rma_form_view
+msgid "New Delivery"
+msgstr "New Delivery"
+
+#. module: crm_claim_rma
+#: view:crm.claim:crm_claim_rma.crm_claim_rma_form_view
+msgid "New Products Return"
+msgstr "New Products Return"
+
+#. module: crm_claim_rma
+#: view:crm.claim:crm_claim_rma.crm_claim_rma_form_view
+msgid "New Refund"
+msgstr "New Refund"
+
+#. module: crm_claim_rma
+#: model:crm.case.categ,name:crm_claim_rma.categ_claim10
+msgid "No Inventory"
+msgstr "No Inventory"
+
+#. module: crm_claim_rma
+#: selection:claim.line,priority:0
+msgid "Normal"
+msgstr "Normal"
+
+#. module: crm_claim_rma
+#: selection:claim.line,priority:0
+msgid "Not Define"
+msgstr "Not Define"
+
+#. module: crm_claim_rma
+#: code:addons/crm_claim_rma/models/claim_line.py:65
+#: selection:claim.line,warning:0
+#, python-format
+msgid "Not Defined"
+msgstr "Not Defined"
+
+#. module: crm_claim_rma
+#: selection:claim.line,claim_origin:0
+msgid "Not specified"
+msgstr "Not specified"
+
+#. module: crm_claim_rma
+#: field:claim.line,number:0
+msgid "Number"
+msgstr "Number"
+
+#. module: crm_claim_rma
+#: selection:claim.line,claim_origin:0
+msgid "Order cancellation"
+msgstr "Order cancellation"
+
+#. module: crm_claim_rma
+#: selection:claim.line,claim_origin:0
+msgid "Other"
+msgstr "Other"
+
+#. module: crm_claim_rma
+#: view:crm.claim:crm_claim_rma.crm_claim_rma_form_view
+#: field:crm.claim,delivery_address_id:0
+msgid "Partner delivery address"
+msgstr "Partner delivery address"
+
+#. module: crm_claim_rma
+#: selection:claim.line,claim_origin:0
+msgid "Perfect Conditions"
+msgstr "Perfect Conditions"
+
+#. module: crm_claim_rma
+#: selection:claim.line,claim_origin:0
+msgid "Physical Damage by Client"
+msgstr "Physical Damage by Client"
+
+#. module: crm_claim_rma
+#: selection:claim.line,claim_origin:0
+msgid "Physical Damage by Company"
+msgstr "Physical Damage by Company"
+
+#. module: crm_claim_rma
+#: view:crm.claim:crm_claim_rma.crm_claim_rma_form_view field:crm.claim,pick:0
+msgid "Pick the product in the store"
+msgstr "Pick the product in the store"
+
+#. module: crm_claim_rma
+#: model:ir.model,name:crm_claim_rma.model_stock_picking
+msgid "Picking List"
+msgstr "Picking List"
+
+#. module: crm_claim_rma
+#: code:addons/crm_claim_rma/models/claim_line.py:399
+#, python-format
+msgid "Please set invoice first"
+msgstr "Please set invoice first"
+
+#. module: crm_claim_rma
+#: code:addons/crm_claim_rma/models/claim_line.py:395
+#, python-format
+msgid "Please set product first"
+msgstr "Please set product first"
+
+#. module: crm_claim_rma
+#: model:crm.case.categ,name:crm_claim_rma.categ_claim18
+msgid "Pricing Error"
+msgstr "Pricing Error"
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.view_crm_claim_lines_filter
+#: field:claim.line,priority:0
+msgid "Priority"
+msgstr "Priority"
+
+#. module: crm_claim_rma
+#: help:claim.line,priority:0
+msgid "Priority attention of claim line"
+msgstr "Priority attention of claim line"
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.crm_claim_line_form_view
+msgid "Problem"
+msgstr "Problem"
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.view_crm_claim_lines_filter
+#: field:claim.line,product_id:0
+msgid "Product"
+msgstr "Product"
+
+#. module: crm_claim_rma
+#: selection:claim.line,claim_diagnosis:0
+msgid "Product Damaged"
+msgstr "Product Damaged"
+
+#. module: crm_claim_rma
+#: selection:claim.line,claim_diagnosis:0
+msgid "Product Repaired"
+msgstr "Product Repaired"
+
+#. module: crm_claim_rma
+#: view:crm.claim:crm_claim_rma.crm_claim_rma_form_view
+msgid "Product Returns"
+msgstr "Product Returns"
+
+#. module: crm_claim_rma
+#: selection:claim.line,claim_diagnosis:0
+msgid "Product in good condition"
+msgstr "Product in good condition"
+
+#. module: crm_claim_rma
+#: selection:claim.line,claim_diagnosis:0
+msgid "Product with hidden physical damage"
+msgstr "Product with hidden physical damage"
+
+#. module: crm_claim_rma
+#: view:crm.claim:crm_claim_rma.crm_claim_rma_form_view
+#: model:ir.actions.act_window,name:crm_claim_rma.act_crm_claim_rma_purchase_orders
+msgid "Purchases"
+msgstr "Purchases"
+
+#. module: crm_claim_rma
+#: field:claim.line,product_returned_quantity:0
+msgid "Quantity"
+msgstr "Quantity"
+
+#. module: crm_claim_rma
+#: help:claim.line,product_returned_quantity:0
+msgid "Quantity of product returned"
+msgstr "Quantity of product returned"
+
+#. module: crm_claim_rma
+#: model:ir.actions.act_window,name:crm_claim_rma.act_crm_claim_rma_sale_orders
+msgid "Quotations and Sales"
+msgstr "Quotations and Sales"
+
+#. module: crm_claim_rma
+#: field:crm.claim,picking_ids:0
+msgid "RMA"
+msgstr "RMA"
+
+#. module: crm_claim_rma
+#: help:crm.claim,rma_number:0
+msgid "RMA Number provided by supplier"
+msgstr "RMA Number provided by supplier"
+
+#. module: crm_claim_rma
+#: field:crm.claim,real_cost:0
+msgid "Real cost"
+msgstr "Real cost"
+
+#. module: crm_claim_rma
+#: field:crm.claim,real_revenue:0
+msgid "Real revenue"
+msgstr "Real revenue"
+
+#. module: crm_claim_rma
+#: selection:claim.line,state:0
+msgid "Received, to control"
+msgstr "Received, to control"
+
+#. module: crm_claim_rma
+#: view:crm.claim:crm_claim_rma.crm_claim_rma_form_view
+msgid "Receptions / Deliveries"
+msgstr "Receptions / Deliveries"
+
+#. module: crm_claim_rma
+#: field:claim.line,refund_line_id:0
+msgid "Refund Line"
+msgstr "Refund Line"
+
+#. module: crm_claim_rma
+#: view:crm.claim:crm_claim_rma.crm_claim_rma_form_view
+#: field:crm.claim,invoice_ids:0
+#: model:ir.actions.act_window,name:crm_claim_rma.act_crm_claim_rma_refunds
+msgid "Refunds"
+msgstr "Refunds"
+
+#. module: crm_claim_rma
+#: selection:claim.line,state:0
+msgid "Refused"
+msgstr "Refused"
+
+#. module: crm_claim_rma
+#: field:claim.line,claim_id:0
+msgid "Related claim"
+msgstr "Related claim"
+
+#. module: crm_claim_rma
+#: help:crm.claim,invoice_id:0
+msgid "Related original Cusotmer invoice"
+msgstr "Related original Cusotmer invoice"
+
+#. module: crm_claim_rma
+#: model:ir.actions.act_window,name:crm_claim_rma.action_claim_picking_in
+msgid "Return Products"
+msgstr "Return Products"
+
+#. module: crm_claim_rma
+#: field:claim.line,location_dest_id:0
+msgid "Return Stock Location"
+msgstr "Return Stock Location"
+
+#. module: crm_claim_rma
+#: field:crm.claim,claim_line_ids:0
+msgid "Return lines"
+msgstr "Return lines"
+
+#. module: crm_claim_rma
+#: view:crm.claim:crm_claim_rma.crm_claim_rma_form_view
+msgid "Returned lines"
+msgstr "Returned lines"
+
+#. module: crm_claim_rma
+#: help:claim.line,product_id:0
+msgid "Returned product"
+msgstr "Returned product"
+
+#. module: crm_claim_rma
+#: view:crm.claim:crm_claim_rma.crm_claim_rma_form_view
+msgid "Returns"
+msgstr "Returns"
+
+#. module: crm_claim_rma
+#: field:crm.claim,rma_number:0
+msgid "Rma number"
+msgstr "Rma number"
+
+#. module: crm_claim_rma
+#: view:crm.claim:crm_claim_rma.crm_claim_rma_form_view
+msgid "Sales"
+msgstr "Sales"
+
+#. module: crm_claim_rma
+#: view:crm.claim:crm_claim_rma.view_crm_case_claims_filter
+msgid "Sales Team"
+msgstr "Sales Team"
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.view_crm_claim_lines_filter
+msgid "Search Claims"
+msgstr "Search Claims"
+
+#. 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 "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,..."
+
+#. module: crm_claim_rma
+#: view:claim_make_picking.wizard:crm_claim_rma.view_claim_picking
+msgid "Select exchange lines to add in picking"
+msgstr "Select exchange lines to add in picking"
+
+#. module: crm_claim_rma
+#: view:claim_make_picking.wizard:crm_claim_rma.view_claim_picking
+msgid "Select lines for picking"
+msgstr "Select lines for picking"
+
+#. module: crm_claim_rma
+#: field:crm.claim,sequence:0
+msgid "Sequence"
+msgstr "Sequence"
+
+#. module: crm_claim_rma
+#: field:claim.line,prodlot_id:0
+msgid "Serial/Lot number"
+msgstr "Serial/Lot number"
+
+#. module: crm_claim_rma
+#: model:crm.case.categ,name:crm_claim_rma.categ_claim19
+msgid "Shipping Address Undeliverable"
+msgstr "Shipping Address Undeliverable"
+
+#. module: crm_claim_rma
+#: selection:claim.line,claim_origin:0
+msgid "Shipping error"
+msgstr "Shipping error"
+
+#. module: crm_claim_rma
+#: field:claim_make_picking.wizard,claim_line_source_location_id:0
+msgid "Source Location"
+msgstr "Source Location"
+
+#. module: crm_claim_rma
+#: view:crm.claim:crm_claim_rma.view_crm_case_claims_filter
+msgid "Stage"
+msgstr "Stage"
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.crm_claim_line_form_view
+#: view:claim.line:crm_claim_rma.view_crm_claim_lines_filter
+#: field:claim.line,state:0
+msgid "State"
+msgstr "State"
+
+#. module: crm_claim_rma
+#: model:ir.model,name:crm_claim_rma.model_stock_move
+msgid "Stock Move"
+msgstr "Stock Move"
+
+#. module: crm_claim_rma
+#: field:claim.line,substate_id:0 field:substate.substate,name:0
+msgid "Sub state"
+msgstr "Sub state"
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.view_crm_claim_lines_filter
+msgid "Substate"
+msgstr "Substate"
+
+#. module: crm_claim_rma
+#: field:claim.line,message_summary:0 field:stock.move,message_summary:0
+msgid "Summary"
+msgstr "Summary"
+
+#. module: crm_claim_rma
+#: selection:claim.line,applicable_guarantee:0
+msgid "Supplier"
+msgstr "Supplier"
+
+#. module: crm_claim_rma
+#: help:claim.line,invoice_line_id:0
+msgid "The invoice line related to the returned product"
+msgstr "The invoice line related to the returned product"
+
+#. 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 "The move line related to the returned product"
+
+#. module: crm_claim_rma
+#: code:addons/crm_claim_rma/models/claim_line.py:312
+#, python-format
+msgid "The product has no supplier configured."
+msgstr "The product has no supplier configured."
+
+#. module: crm_claim_rma
+#: help:claim.line,refund_line_id:0
+msgid "The refund line related to the returned product"
+msgstr "The refund line related to the returned product"
+
+#. module: crm_claim_rma
+#: help:claim.line,location_dest_id:0
+msgid "The return stock location of the returned product"
+msgstr "The return stock location of the returned product"
+
+#. module: crm_claim_rma
+#: help:claim.line,prodlot_id:0
+msgid "The serial/lot of the returned product"
+msgstr "The serial/lot of the returned product"
+
+#. 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 "The warranty limit is computed as: invoice date + warranty defined on selected product."
+
+#. module: crm_claim_rma
+#: code:addons/crm_claim_rma/models/crm_claim.py:40
+#, python-format
+msgid "There is no warehouse for the current user's company."
+msgstr "There is no warehouse for the current user's company."
+
+#. module: crm_claim_rma
+#: help:crm.claim,delivery_address_id:0
+msgid "This address will be used to deliver repaired or replacement products."
+msgstr "This address will be used to deliver repaired or replacement products."
+
+#. module: crm_claim_rma
+#: help:claim.line,claim_diagnosis:0
+msgid "To describe the line product diagnosis"
+msgstr "To describe the line product diagnosis"
+
+#. module: crm_claim_rma
+#: help:claim.line,claim_origin:0
+msgid "To describe the line product problem"
+msgstr "To describe the line product problem"
+
+#. module: crm_claim_rma
+#: help:substate.substate,substate_descr:0
+msgid "To give more information about the sub state"
+msgstr "To give more information about the sub state"
+
+#. module: crm_claim_rma
+#: help:claim.line,claim_id:0
+msgid "To link to the case.claim object"
+msgstr "To link to the case.claim object"
+
+#. module: crm_claim_rma
+#: help:claim.line,last_state_change:0
+msgid "To set thelast state / substate change"
+msgstr "To set thelast state / substate change"
+
+#. module: crm_claim_rma
+#: selection:claim.line,state:0
+msgid "Treated"
+msgstr "Treated"
+
+#. module: crm_claim_rma
+#: field:claim.line,unit_sale_price:0
+msgid "Unit sale price"
+msgstr "Unit sale price"
+
+#. 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 "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,..."
+
+#. module: crm_claim_rma
+#: field:claim.line,message_unread:0 field:stock.move,message_unread:0
+msgid "Unread Messages"
+msgstr "Unread Messages"
+
+#. module: crm_claim_rma
+#: code:addons/crm_claim_rma/models/claim_line.py:63
+#: selection:claim.line,warning:0
+#, python-format
+msgid "Valid"
+msgstr "Valid"
+
+#. module: crm_claim_rma
+#: selection:claim.line,priority:0
+msgid "Very High"
+msgstr "Very High"
+
+#. module: crm_claim_rma
+#: field:crm.claim,warehouse_id:0
+msgid "Warehouse"
+msgstr "Warehouse"
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.crm_claim_line_form_view
+#: field:claim.line,warning:0
+msgid "Warranty"
+msgstr "Warranty"
+
+#. module: crm_claim_rma
+#: field:claim.line,warranty_return_partner:0
+msgid "Warranty Address"
+msgstr "Warranty Address"
+
+#. module: crm_claim_rma
+#: field:claim.line,guarantee_limit:0
+msgid "Warranty limit"
+msgstr "Warranty limit"
+
+#. module: crm_claim_rma
+#: field:claim.line,applicable_guarantee:0 field:claim.line,warranty_type:0
+msgid "Warranty type"
+msgstr "Warranty type"
+
+#. module: crm_claim_rma
+#: help:claim.line,warranty_return_partner:0
+msgid "Where the customer has to send back the product(s)"
+msgstr "Where the customer has to send back the product(s)"
+
+#. 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 "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"
+
+#. 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 "Wizard to create pickings from claim lines"
+
+#. module: crm_claim_rma
+#: view:claim_make_picking.wizard:crm_claim_rma.view_claim_picking
+msgid "or"
+msgstr "or"
+
+#. module: crm_claim_rma
+#: model:ir.model,name:crm_claim_rma.model_substate_substate
+msgid "substate that precise a given state"
+msgstr "substate that precise a given state"
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.crm_claim_line_view_form_embedded
+msgid ""
+"{'claim_id': parent.id, 'company_id': parent.company_id, 'warehouse_id': "
+"parent.warehouse_id, 'claim_type': parent.claim_type, 'claim_date': "
+"parent.date}"
+msgstr "{'claim_id': parent.id, 'company_id': parent.company_id, 'warehouse_id': parent.warehouse_id, 'claim_type': parent.claim_type, 'claim_date': parent.date}"
+
+#. module: crm_claim_rma
+#: view:crm.claim:crm_claim_rma.crm_case_claims_form_view
+msgid "{'create_lines': False}"
+msgstr "{'create_lines': False}"
diff --git a/crm_claim_rma/i18n/es.po b/crm_claim_rma/i18n/es.po
index 6cad68f8..e8430c35 100644
--- a/crm_claim_rma/i18n/es.po
+++ b/crm_claim_rma/i18n/es.po
@@ -1,721 +1,50 @@
-# Translation of OpenERP Server.
+# Translation of Odoo Server.
 # This file contains the translation of the following modules:
-#   * crm_claim_rma
-#
+# * crm_claim_rma
+# 
+# Translators:
+# Jesús Ventosinos Mayor <jesus@comunitea.com>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 7.0\n"
+"Project-Id-Version: rma (8.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"
+"POT-Creation-Date: 2015-11-24 16:07+0000\n"
+"PO-Revision-Date: 2015-11-19 22:20+0000\n"
+"Last-Translator: OCA Transbot <transbot@odoo-community.org>\n"
+"Language-Team: Spanish (http://www.transifex.com/oca/OCA-rma-8-0/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: crm_claim_rma
-#: view:claim.line:0
-msgid "Returned good"
-msgstr "Mercancía devuelta"
-
-#. module: crm_claim_rma
-#: view:claim_make_picking.wizard:0
-msgid "Locations"
-msgstr "Localizaciones"
-
-#. module: crm_claim_rma
-#: view:claim.line:0
-msgid "Draft and Open Claims"
-msgstr "Reclamaciones abiertas o en borrador"
-
-#. module: crm_claim_rma
-#: view:claim.line:0
-msgid "Group By..."
-msgstr "Agrupar por..."
-
-#. module: crm_claim_rma
-#: help:claim.line,claim_descr:0
-msgid "More precise description of the problem"
-msgstr "Descripción detallada del problema"
-
-#. 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 "Límite de la garantía"
-
-#. module: crm_claim_rma
-#: selection:claim.line,applicable_guarantee:0
-#: selection:crm.claim,claim_type:0
-msgid "Supplier"
-msgstr "Proveedor"
-
-#. module: crm_claim_rma
-#: selection:claim.line,state:0
-msgid "Refused"
-msgstr "Rechazado"
-
-#. module: crm_claim_rma
-#: view:stock.picking.in:0
-#: view:stock.picking.out:0
-msgid "To Invoice"
-msgstr "A facturar"
-
-#. 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 "Linea de Abono"
-
-#. module: crm_claim_rma
-#: selection:claim.line,applicable_guarantee:0
-msgid "Company"
-msgstr "Compañía"
-
-#. module: crm_claim_rma
-#: selection:claim.line,claim_origin:0
-msgid "Order cancellation"
-msgstr "Cancelación de orden"
-
-#. 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 "Localización de destino"
-
-#. 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 ""
-"No se puede encontrar una fecha para la factura. Debe ser una fecha validada."
-
-#. 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 "Última modificación"
-
-#. module: crm_claim_rma
-#: help:claim.line,product_id:0
-msgid "Returned product"
-msgstr "Productos devueltos"
-
-#. module: crm_claim_rma
-#: view:claim_make_picking.wizard:0
-msgid "Create picking"
-msgstr "Crear envío/recepción"
-
-#. module: crm_claim_rma
-#: view:claim.line:0
-msgid "Claim Line"
-msgstr "Línea de reclamación"
-
-#. module: crm_claim_rma
-#: view:crm.claim:0
-msgid "New Delivery"
-msgstr "Nueva entrega"
-
-#. module: crm_claim_rma
-#: view:claim.line:0
-msgid "Calculate warranty state"
-msgstr "Calcular el estado de la garantía"
-
-#. 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 "¡Ya se ha creado un abono para esta reclamación!"
-
-#. module: crm_claim_rma
-#: view:claim.line:0
-msgid "Compute Warranty"
-msgstr "Calcular garantía"
-
-#. 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 "Reclamación"
-
-#. module: crm_claim_rma
-#: model:crm.case.categ,name:crm_claim_rma.categ_claim13
-msgid "General Adjustement"
-msgstr "Ajuste General"
-
-#. 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 ""
-"No se puede crear una devolución de producto para varias direcciones de "
-"destino. Escoja por favor una línea con la misma dirección."
-
-#. module: crm_claim_rma
-#: model:ir.actions.act_window,name:crm_claim_rma.action_claim_picking_out
-msgid "Create Outgoing Shipments"
-msgstr "Crear envíos salientes"
-
-#. 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 "Garantía"
-
-#. module: crm_claim_rma
-#: model:crm.case.categ,name:crm_claim_rma.categ_claim11
-msgid "Customer Return"
-msgstr "Devolución de cliente"
-
-#. module: crm_claim_rma
-#: model:ir.model,name:crm_claim_rma.model_stock_move
-msgid "Stock Move"
-msgstr "Movimientos de Inventario"
-
-#. module: crm_claim_rma
-#: help:claim.line,product_returned_quantity:0
-msgid "Quantity of product returned"
-msgstr "Cantidad de producto devuelto"
-
-#. 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 "Coste estimado"
-
-#. module: crm_claim_rma
-#: view:crm.claim:0
-msgid "Receptions / Deliveries"
-msgstr "Recepciones / Entregas"
-
-#. 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 ""
-"Especifica quién es el responsable del tratamiento de la devolución de "
-"garantía para el cliente final. La compañía utilizará la dirección por "
-"defecto o la dirección de envío de la compañía, y así sucesivamente por "
-"proveedor y marca del fabricante. No significa necesariamente que la "
-"garantía que se aplica es el de la empresa que hace la devolución (es decir: "
-"se puede devolver a la empresa y estar bajo la garantía de la marca)"
-
-#. module: crm_claim_rma
-#: model:ir.model,name:crm_claim_rma.model_stock_picking_out
-msgid "Delivery Orders"
-msgstr "Órdenes de entrega"
-
-#. module: crm_claim_rma
-#: help:claim.line,last_state_change:0
-msgid "To set the last state / substate change"
-msgstr "Para definir el último cambio de estado / sub-estado"
-
-#. module: crm_claim_rma
-#: selection:claim.line,claim_origin:0
-msgid "Not specified"
-msgstr "No especificado"
-
-#. module: crm_claim_rma
-#: view:claim.line:0
-msgid "Returned lines"
-msgstr "Líneas devueltas"
-
-#. module: crm_claim_rma
-#: view:claim.line:0
-msgid "Claim n°"
-msgstr "Reclamación nº"
-
-#. 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 "Estado"
-
-#. 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 "Tipo de garantía"
-
-#. module: crm_claim_rma
-#: model:ir.model,name:crm_claim_rma.model_stock_picking
-msgid "Picking List"
-msgstr "Listado de recogida"
-
-#. 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 "Almacén"
-
-#. module: crm_claim_rma
-#: help:claim.line,claim_origin:0
-msgid "To describe the line product problem"
-msgstr "Para describir el problema de la línea de producto"
-
-#. 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 ""
-"Localización en la que el sistema almacenará los productos devueltos."
-
-#. module: crm_claim_rma
-#: view:claim.line:0
-msgid "More"
-msgstr "Más"
-
-#. module: crm_claim_rma
-#: selection:claim.line,claim_origin:0
-msgid "Legal retractation"
-msgstr "Retractación legal"
-
-#. 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 "¡Error!"
-
-#. 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 ""
-"El límite de la garantía se calcula como: fecha de factura + garantía "
-"seleccionada en el producto seleccionado."
-
-#. 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 "Motivo de la reclamación"
-
-#. 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 "Coste real"
-
-#. module: crm_claim_rma
-#: help:claim.line,claim_id:0
-msgid "To link to the case.claim object"
-msgstr "Para enlazar con el objeto case.claim"
-
-#. module: crm_claim_rma
-#: code:addons/crm_claim_rma/wizard/claim_make_picking.py:73
+#: code:addons/crm_claim_rma/wizards/claim_make_picking.py:121
 #, python-format
 msgid "A picking has already been created for this claim."
 msgstr "Ya se ha creado un albarán para esta reclamación."
 
 #. module: crm_claim_rma
-#: model:crm.case.categ,name:crm_claim_rma.categ_claim18
-msgid "Pricing Error"
-msgstr "Error de precio"
-
-#. 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 "Cantidad"
-
-#. module: crm_claim_rma
-#: selection:claim.line,state:0
-msgid "Confirmed, waiting for product"
-msgstr "Confirmado, esperando el producto"
-
-#. 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 "Líneas de devolución"
-
-#. module: crm_claim_rma
-#: view:crm.claim:0
-msgid "Stage"
-msgstr "Etapa"
-
-#. 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 "Expectativa de ingreso"
-
-#. module: crm_claim_rma
-#: selection:claim.line,state:0
-msgid "Controlled, to treate"
-msgstr "Controlado, para procesar"
-
-#. 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 "Facturas rectificativas de cliente"
-
-#. 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 "Ubicación de existencias para devolución"
-
-#. 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 "Presupuestos y pedidos"
-
-#. module: crm_claim_rma
-#: selection:claim.line,claim_origin:0
-msgid "Lost during transport"
-msgstr "Perdido durante el transporte"
-
-#. module: crm_claim_rma
-#: selection:claim.line,claim_origin:0
-msgid "Shipping error"
-msgstr "Error de envío"
-
-#. 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 "Dirección de garantía"
-
-#. module: crm_claim_rma
-#: help:crm.claim,invoice_id:0
-msgid "Related original Cusotmer invoice"
-msgstr "Factura de cliente original relacionada"
-
-#. module: crm_claim_rma
-#: model:crm.case.categ,name:crm_claim_rma.categ_claim12
-msgid "Buyer Cancelled"
-msgstr "Cancelado por el comprador"
-
-#. 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 "Reclamación relacionada"
-
-#. 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 "Línea de factura"
-
-#. module: crm_claim_rma
-#: view:claim.line:0
-msgid "Linked Document"
-msgstr "Documento relacionado"
-
-#. 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 "Ubicación de producto recepcionado"
-
-#. module: crm_claim_rma
-#: model:crm.case.categ,name:crm_claim_rma.categ_claim20
-msgid "Delivered Late by Carrier"
-msgstr "Entregado con retraso por el transportista"
-
-#. module: crm_claim_rma
-#: view:crm.claim:0
-msgid "Product Return"
-msgstr "Devolución de producto"
-
-#. module: crm_claim_rma
-#: view:crm.claim:0
-msgid "Generated Documents"
-msgstr "Documentos generados"
-
-#. module: crm_claim_rma
-#: help:claim.line,prodlot_id:0
-msgid "The serial/lot of the returned product"
-msgstr "No de Serie/Lote del producto devuelto"
-
-#. module: crm_claim_rma
-#: view:crm.claim:0
-msgid "New Refund"
-msgstr "Nuevo abono"
-
-#. 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 "Sub-estado"
-
-#. 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 "Facturas rectificativas de proveedor"
-
-#. 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 "Descripción de la reclamación"
-
-#. 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 "Ingreso real"
-
-#. module: crm_claim_rma
-#: view:claim_make_picking.wizard:0
-msgid "Select lines for picking"
-msgstr "Seleccionar líneas para recogida/envío"
-
-#. module: crm_claim_rma
-#: help:claim.line,substate_id:0
+#: code:addons/crm_claim_rma/wizards/claim_make_picking.py:233
+#, python-format
 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 ""
-"Seleccione un sub-estado para detallar el estado estandar. Por ejemplo: "
-"Estado = rechazado; Sub-estado, garantía agotada, fuera de garantía, sin "
-"problema..."
+"A product return cannot be created for various destination addresses, please"
+" choose line with a same address."
+msgstr "No se puede crear una devolución de producto para varias direcciones de destino. Escoja por favor una línea con la misma dirección."
 
 #. module: crm_claim_rma
-#: view:claim_make_picking.wizard:0
-msgid "Select exchange lines to add in picking"
-msgstr "Seleccionar las líneas de cambio para añadir envío"
-
-#. module: crm_claim_rma
-#: selection:claim.line,state:0
-msgid "Draft"
-msgstr "Borrador"
-
-#. module: crm_claim_rma
-#: model:crm.case.categ,name:crm_claim_rma.categ_claim14
-msgid "Could Not Ship"
-msgstr "No pudo enviarse"
-
-#. module: crm_claim_rma
-#: model:ir.model,name:crm_claim_rma.model_claim_line
-msgid "List of product to return"
-msgstr "Listado de productos a devolver"
-
-#. module: crm_claim_rma
-#: model:crm.case.categ,name:crm_claim_rma.categ_claim10
-msgid "No Inventory"
-msgstr "Sin Stock"
-
-#. 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 "Precio de venta unitario"
-
-#. module: crm_claim_rma
-#: help:claim.line,refund_line_id:0
-msgid "The refund line related to the returned product"
-msgstr "La línea de abono relacionada con el producto devuelto"
-
-#. module: crm_claim_rma
-#: code:addons/crm_claim_rma/crm_claim_rma.py:245
+#: code:addons/crm_claim_rma/wizards/claim_make_picking.py:223
 #, python-format
-msgid "expired"
-msgstr "expirado"
-
-#. module: crm_claim_rma
-#: model:ir.model,name:crm_claim_rma.model_stock_picking_in
-msgid "Incoming Shipments"
-msgstr "Albaranes de entrada"
-
-#. module: crm_claim_rma
-#: help:substate.substate,substate_descr:0
-msgid "To give more information about the sub state"
-msgstr "Permite ampliar la información del sub-estado"
-
-#. module: crm_claim_rma
-#: model:ir.actions.act_window,name:crm_claim_rma.act_crm_claim_substates
-msgid "Claim line substates"
-msgstr "Sub-estados de la reclamación"
-
-#. module: crm_claim_rma
-#: help:claim_make_picking.wizard,claim_line_source_location:0
-msgid "Location where the returned products are from."
-msgstr "Localización desde la que vienen los productos devueltos."
-
-#. 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 "RMA"
-
-#. module: crm_claim_rma
-#: selection:claim.line,applicable_guarantee:0
-msgid "Brand manufacturer"
-msgstr "Fabricante"
-
-#. 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 number"
-msgstr "No. de Serial/Lote"
-
-#. 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 ""
-"Precio de venta unitario del producto. Auto-completado si la devolución se "
-"realizó por selección de factura. Tenga cuidado y compruebe el valor "
-"automático, ya que no tiene en cuenta facturas rectificativas previas, "
-"descuento de facturas, puede ser 0 si el producto es gratuito, etc..."
+"A product return cannot be created for various destination locations, please"
+" choose line with a same destination location."
+msgstr "No se puede crear una devolución de productos para múltiples ubicación destino. Escoja por favor una línea con la misma ubicación destino."
 
 #. module: crm_claim_rma
-#: code:addons/crm_claim_rma/crm_claim_rma.py:473
+#: code:addons/crm_claim_rma/models/account_invoice.py:75
 #, python-format
-msgid "Please set invoice first"
-msgstr "Por favor, establezca la factura primero"
-
-#. module: crm_claim_rma
-#: code:addons/crm_claim_rma/crm_claim_rma.py:470
-#, python-format
-msgid "Please set product first"
-msgstr "Por favor, establezca el producto primero"
-
-#. module: crm_claim_rma
-#: selection:claim.line,claim_origin:0
-msgid "Damaged delivered product"
-msgstr "Producto enviado dañado"
-
-#. 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 "Líneas de reclamación"
-
-#. 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 "No hay almacén definido para la compañía del usuario actual"
-
-#. 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 "Error"
-
-#. module: crm_claim_rma
-#: view:crm.claim:0
-msgid "Action"
-msgstr "Acción"
-
-#. module: crm_claim_rma
-#: view:claim.line:0
-#: view:crm.claim:0
-msgid "Claims"
-msgstr "Reclamaciones"
-
-#. module: crm_claim_rma
-#: view:claim.line:0
-msgid "Problem"
-msgstr "Problema"
-
-#. module: crm_claim_rma
-#: selection:claim.line,state:0
-msgid "Treated"
-msgstr "Tratado"
-
-#. module: crm_claim_rma
-#: model:crm.case.categ,name:crm_claim_rma.categ_claim16
-msgid "Merchandise Not Received"
-msgstr "Mercancía no recibida"
-
-#. module: crm_claim_rma
-#: model:ir.ui.menu,name:crm_claim_rma.menu_crm_case_claims_claim_line_substates
-msgid "Returned line substates"
-msgstr "Sub-estados para lineas devueltas"
-
-#. module: crm_claim_rma
-#: view:claim.line:0
-msgid "Substate"
-msgstr "Sub-estado"
-
-#. 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 "Facturas de cliente"
-
-#. 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 "Localización de origen"
-
-#. module: crm_claim_rma
-#: model:ir.actions.act_window,name:crm_claim_rma.act_crm_claim_rma_picking_out
-msgid "Deliveries"
-msgstr "Entregas"
-
-#. 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 "Factura"
-
-#. module: crm_claim_rma
-#: help:claim.line,invoice_line_id:0
-msgid "The invoice line related to the returned product"
-msgstr "La línea de factura relacionada con el producto devuelto"
-
-#. module: crm_claim_rma
-#: view:claim_make_picking.wizard:0
-msgid "Cancel"
-msgstr "Cancelar"
-
-#. module: crm_claim_rma
-#: model:crm.case.categ,name:crm_claim_rma.categ_claim21
-msgid "Missed Fulfilment Promise"
-msgstr "Incumplimiento de la respuesta"
-
-#. module: crm_claim_rma
-#: view:claim.line:0
-msgid "In Progress"
-msgstr "En progreso"
+msgid "A refund has already been created for this claim !"
+msgstr "¡Ya se ha creado un abono para esta reclamación!"
 
 #. module: crm_claim_rma
 #: model:crm.case.section,name:crm_claim_rma.section_after_sales_service
@@ -723,190 +52,197 @@ msgid "After Sales Service"
 msgstr "Servicio Post-venta"
 
 #. module: crm_claim_rma
-#: selection:claim.line,state:0
-msgid "Received, to control"
-msgstr "Recibido, para control"
+#: selection:claim.line,applicable_guarantee:0
+msgid "Brand manufacturer"
+msgstr "Fabricante"
 
 #. module: crm_claim_rma
-#: model:crm.case.categ,name:crm_claim_rma.categ_claim17
-msgid "Merchandise Not As Described"
-msgstr "El producto no se corresponde con la descripción"
+#: model:crm.case.categ,name:crm_claim_rma.categ_claim12
+msgid "Buyer Cancelled"
+msgstr "Cancelado por el comprador"
 
 #. module: crm_claim_rma
-#: selection:claim.line,claim_origin:0
-msgid "Exchange request"
-msgstr "Solicitar cambio"
+#: view:claim.line:crm_claim_rma.crm_claim_line_form_view
+msgid "Calculate warranty state"
+msgstr "Calcular el estado de la garantía"
 
 #. module: crm_claim_rma
-#: model:ir.model,name:crm_claim_rma.model_substate_substate
-msgid "substate that precise a given state"
-msgstr "Los sub-estados necesitan un estado padre"
+#: view:claim_make_picking.wizard:crm_claim_rma.view_claim_picking
+msgid "Cancel"
+msgstr "Cancelar"
 
 #. module: crm_claim_rma
-#: code:addons/crm_claim_rma/crm_claim_rma.py:226
+#: code:addons/crm_claim_rma/models/claim_line.py:308
 #, python-format
-msgid "not_define"
-msgstr "sin_definir"
+msgid "Cannot find any date for invoice. Must be a validated invoice."
+msgstr "No se puede encontrar una fecha para la factura. Debe ser una fecha validada."
 
 #. module: crm_claim_rma
-#: model:ir.actions.act_window,name:crm_claim_rma.action_claim_picking_in
-msgid "Return Products"
-msgstr "Productos devueltos"
+#: field:account.invoice,claim_id:0
+#: model:ir.model,name:crm_claim_rma.model_crm_claim
+#: field:stock.picking,claim_id:0
+msgid "Claim"
+msgstr "Reclamación"
 
 #. module: crm_claim_rma
-#: view:claim.line:0
+#: view:claim.line:crm_claim_rma.crm_claim_line_form_view
+msgid "Claim Line"
+msgstr "Línea de reclamación"
+
+#. module: crm_claim_rma
+#: field:claim.line,date:0
+msgid "Claim Line Date"
+msgstr ""
+
+#. module: crm_claim_rma
+#: help:claim.line,number:0
+msgid "Claim Line Identification Number"
+msgstr ""
+
+#. module: crm_claim_rma
+#: field:claim.line,claim_type:0
+msgid "Claim Line Type"
+msgstr ""
+
+#. module: crm_claim_rma
+#: field:claim.line,claim_origin:0
+msgid "Claim Subject"
+msgstr "Objeto de la reclamación"
+
+#. module: crm_claim_rma
+#: help:claim.line,claim_type:0
+msgid "Claim classification"
+msgstr ""
+
+#. module: crm_claim_rma
+#: field:claim.line,claim_diagnosis:0
+msgid "Claim diagnosis"
+msgstr ""
+
+#. module: crm_claim_rma
+#: model:ir.actions.act_window,name:crm_claim_rma.act_crm_claim_substates
+#: model:ir.ui.menu,name:crm_claim_rma.menu_crm_case_claims_claim_line_substates
+msgid "Claim line substates"
+msgstr "Sub-estados de la reclamación"
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.crm_claim_line_tree_view
+#: 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.ui.menu,name:crm_claim_rma.menu_crm_case_claims_claim_lines
+msgid "Claim lines"
+msgstr "Líneas de reclamación"
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.view_crm_claim_lines_filter
+msgid "Claim n°"
+msgstr "Reclamación nº"
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.crm_claim_line_form_view
+msgid "Claims"
+msgstr "Reclamaciones"
+
+#. module: crm_claim_rma
+#: selection:claim.line,applicable_guarantee:0 field:claim.line,company_id:0
+msgid "Company"
+msgstr "Compañia"
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.crm_claim_line_tree_view
+#: view:crm.claim:crm_claim_rma.crm_claim_rma_form_view
+msgid "Compute Warranty"
+msgstr ""
+
+#. module: crm_claim_rma
+#: selection:claim.line,state:0
+msgid "Confirmed, waiting for product"
+msgstr "Confirmado, esperando el producto"
+
+#. module: crm_claim_rma
+#: view:res.partner:crm_claim_rma.view_partner_contact_tree
+msgid "Contacts"
+msgstr ""
+
+#. module: crm_claim_rma
+#: selection:claim.line,state:0
+msgid "Controlled, to treate"
+msgstr "Controlado, para procesar"
+
+#. module: crm_claim_rma
+#: model:crm.case.categ,name:crm_claim_rma.categ_claim14
+msgid "Could Not Ship"
+msgstr "No pudo enviarse"
+
+#. module: crm_claim_rma
+#: model:ir.actions.act_window,name:crm_claim_rma.action_claim_picking_out
+msgid "Create Outgoing Shipments"
+msgstr "Crear envíos salientes"
+
+#. module: crm_claim_rma
+#: view:claim_make_picking.wizard:crm_claim_rma.view_claim_picking
+msgid "Create picking"
+msgstr "Crear envío/recepción"
+
+#. module: crm_claim_rma
+#: field:claim.line,create_uid:0 field:claim_make_picking.wizard,create_uid:0
+#: field:substate.substate,create_uid:0
+msgid "Created by"
+msgstr "Creado por"
+
+#. module: crm_claim_rma
+#: field:claim.line,create_date:0
+#: field:claim_make_picking.wizard,create_date:0
+#: field:substate.substate,create_date:0
+msgid "Created on"
+msgstr "Creado en"
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.view_crm_claim_lines_filter
 msgid "Current"
 msgstr "Actual"
 
 #. module: crm_claim_rma
-#: selection:claim.line,claim_origin:0
-#: selection:crm.claim,claim_type:0
-msgid "Other"
-msgstr "Otro"
-
-#. module: crm_claim_rma
-#: view:crm.claim:0
-msgid "New Products Return"
-msgstr "Nueva devolución de productos"
-
-#. 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 "Facturas de proveedor"
-
-#. 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 "Producto"
-
-#. 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 "Descripción"
-
-#. module: crm_claim_rma
-#: view:claim.line:0
-msgid "Search Claims"
-msgstr "Buscar reclamaciones"
-
-#. 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 "Tipo de reclamación"
-
-#. module: crm_claim_rma
-#: code:addons/crm_claim_rma/wizard/claim_make_picking.py:196
+#: code:addons/crm_claim_rma/models/crm_claim.py:161
 #, python-format
-msgid ""
-"A product return cannot be created for various destination locations, please "
-"choose line with a same destination location."
-msgstr ""
-"No se puede crear una devolución de productos para múltiples ubicación "
-"destino. Escoja por favor una línea con la misma ubicación destino."
-
-#. module: crm_claim_rma
-#: code:addons/crm_claim_rma/crm_claim_rma.py:247
-#, python-format
-msgid "valid"
-msgstr "válido"
-
-#. module: crm_claim_rma
-#: code:addons/crm_claim_rma/crm_claim_rma.py:340
-#, python-format
-msgid "Error!"
-msgstr "Error"
-
-#. module: crm_claim_rma
-#: help:claim.line,location_dest_id:0
-msgid "The return stock location of the returned product"
-msgstr "La ubicación de existencias para el producto devuelto"
-
-#. module: crm_claim_rma
-#: help:claim.line,warning:0
-msgid "If warranty has expired"
-msgstr "Si la garantía ha vencido"
-
-#. module: crm_claim_rma
-#: help:claim.line,warranty_return_partner:0
-msgid "Where the customer has to send back the product(s)"
-msgstr "Dirección a la que el cliente debe remitir el producto"
-
-#. module: crm_claim_rma
-#: view:crm.claim:0
-msgid "Follow Up"
-msgstr "Seguimiento"
-
-#. module: crm_claim_rma
-#: selection:crm.claim,claim_type:0
 msgid "Customer"
 msgstr "Cliente"
 
 #. 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 "Ubicación para envío"
-
-#. 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 "Abonos"
-
-#. module: crm_claim_rma
-#: model:ir.model,name:crm_claim_rma.model_account_invoice_refund
-msgid "Invoice Refund"
-msgstr "Abono de factura"
-
-#. 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 "Total devuelto"
-
-#. module: crm_claim_rma
-#: help:claim.line,return_value:0
-msgid "Quantity returned * Unit sold price"
-msgstr "Cantidad devuelta * precio de venta unitario"
-
-#. module: crm_claim_rma
-#: model:crm.case.categ,name:crm_claim_rma.categ_claim19
-msgid "Shipping Address Undeliverable"
-msgstr "Dirección de envío inexistente"
-
-#. module: crm_claim_rma
-#: model:ir.actions.act_window,name:crm_claim_rma.act_crm_claim_rma_picking_in
-msgid "Incoming Shipment and Returns"
+#: code:addons/crm_claim_rma/models/crm_claim.py:165
+#, python-format
+msgid "Customer Email"
 msgstr ""
 
 #. module: crm_claim_rma
-#: view:stock.picking.out:0
-msgid "Delivery orders to invoice"
-msgstr "Ordenes de entrega a facturar"
+#: model:crm.case.categ,name:crm_claim_rma.categ_claim11
+msgid "Customer Return"
+msgstr "Devolución de cliente"
 
 #. 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 "Línea de traslado relacionada con el producto devuelto"
+#: selection:claim.line,claim_origin:0
+msgid "Damaged delivered product"
+msgstr "Producto enviado dañado"
 
 #. module: crm_claim_rma
-#: view:claim_make_picking.wizard:0
-msgid "or"
-msgstr "o"
+#: help:claim.line,message_last_post:0 help:stock.move,message_last_post:0
+msgid "Date of the last message posted on the record."
+msgstr ""
 
 #. module: crm_claim_rma
-#: view:crm.claim:0
-msgid "Sales Team"
-msgstr "Equipo de ventas"
+#: model:crm.case.categ,name:crm_claim_rma.categ_claim20
+msgid "Delivered Late by Carrier"
+msgstr "Entregado con retraso por el transportista"
+
+#. module: crm_claim_rma
+#: field:claim.line,name:0 field:substate.substate,substate_descr:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: crm_claim_rma
+#: field:claim_make_picking.wizard,claim_line_dest_location_id:0
+msgid "Dest. Location"
+msgstr "Localizalización de destino"
 
 #. module: crm_claim_rma
 #: model:crm.case.categ,name:crm_claim_rma.categ_claim15
@@ -914,47 +250,145 @@ msgid "Different Item"
 msgstr "Artículo diferente"
 
 #. 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 "Asistente para crear envíos desde la línea de reclamación"
+#: selection:claim.line,state:0
+msgid "Draft"
+msgstr "Borrador"
 
 #. module: crm_claim_rma
-#: help:crm.claim,claim_type:0
-msgid ""
-"Customer: from customer to company.\n"
-" Supplier: from company to supplier."
+#: view:claim.line:crm_claim_rma.view_crm_claim_lines_filter
+msgid "Draft and Open Claims"
+msgstr "Reclamaciones abiertas o en borrador"
+
+#. module: crm_claim_rma
+#: code:addons/crm_claim_rma/models/claim_line.py:308
+#: code:addons/crm_claim_rma/models/claim_line.py:312
+#: code:addons/crm_claim_rma/models/claim_line.py:395
+#: code:addons/crm_claim_rma/models/claim_line.py:399
+#: code:addons/crm_claim_rma/wizards/claim_make_picking.py:120
+#: code:addons/crm_claim_rma/wizards/claim_make_picking.py:222
+#: code:addons/crm_claim_rma/wizards/claim_make_picking.py:232
+#, python-format
+msgid "Error"
+msgstr "Error"
+
+#. module: crm_claim_rma
+#: selection:claim.line,claim_origin:0
+msgid "Exchange request"
+msgstr "Solicitar cambio"
+
+#. module: crm_claim_rma
+#: field:crm.claim,planned_cost:0
+msgid "Expected cost"
+msgstr "Coste estimado"
+
+#. module: crm_claim_rma
+#: field:crm.claim,planned_revenue:0
+msgid "Expected revenue"
+msgstr "Expectativa de ingreso"
+
+#. module: crm_claim_rma
+#: code:addons/crm_claim_rma/models/claim_line.py:64
+#: selection:claim.line,warning:0
+#, python-format
+msgid "Expired"
 msgstr ""
-"Cliente: del cliente a la compañía.\n"
-"Proveedor: de la compañía al proveedor."
 
 #. module: crm_claim_rma
-#: view:claim.line:0
+#: view:crm.claim:crm_claim_rma.crm_claim_rma_form_view
+msgid "Follow Up"
+msgstr "Seguimiento"
+
+#. module: crm_claim_rma
+#: field:claim.line,message_follower_ids:0
+#: field:stock.move,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: crm_claim_rma
+#: model:crm.case.categ,name:crm_claim_rma.categ_claim13
+msgid "General Adjustement"
+msgstr "Ajuste General"
+
+#. module: crm_claim_rma
+#: view:crm.claim:crm_claim_rma.crm_claim_rma_form_view
+msgid "Generated Documents"
+msgstr "Documentos generados"
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.view_crm_claim_lines_filter
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.view_crm_claim_lines_filter
+msgid "Grouping by state"
+msgstr ""
+
+#. module: crm_claim_rma
+#: selection:claim.line,priority:0
+msgid "High"
+msgstr ""
+
+#. module: crm_claim_rma
+#: help:claim.line,message_summary:0 help:stock.move,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
+
+#. module: crm_claim_rma
+#: field:claim.line,id:0 field:claim_make_picking.wizard,id:0
+#: field:substate.substate,id:0
+msgid "ID"
+msgstr "ID"
+
+#. module: crm_claim_rma
+#: help:claim.line,message_unread:0 help:stock.move,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: crm_claim_rma
+#: help:claim.line,warning:0
+msgid "If warranty has expired"
+msgstr "Si la garantía ha vencido"
+
+#. module: crm_claim_rma
+#: selection:claim.line,claim_origin:0
+msgid "Imperfection"
+msgstr ""
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.view_crm_claim_lines_filter
+msgid "In Progress"
+msgstr "En progreso"
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.view_crm_claim_lines_filter
 msgid "In Progress Claims"
 msgstr "Reclamaciones en proceso"
 
 #. module: crm_claim_rma
-#: code:addons/crm_claim_rma/crm_claim_rma.py:234
-#, python-format
-msgid "The product has no supplier configured."
-msgstr "El producto no tiene proveedor configurado."
+#: 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:crm.claim:0
-#: field:crm.claim,pick:0
-msgid "Pick the product in store"
-msgstr "Buscar el producto en la tienda"
+#: view:claim.line:crm_claim_rma.view_crm_claim_lines_filter
+#: field:crm.claim,invoice_id:0
+#: model:ir.model,name:crm_claim_rma.model_account_invoice
+msgid "Invoice"
+msgstr "Factura"
 
 #. module: crm_claim_rma
-#: view:crm.claim:0
-#: field:crm.claim,delivery_address_id:0
-msgid "Partner delivery address"
-msgstr "Dirección de envío"
+#: field:claim.line,invoice_line_id:0
+#: model:ir.model,name:crm_claim_rma.model_account_invoice_line
+msgid "Invoice Line"
+msgstr "Línea de factura"
 
 #. module: crm_claim_rma
-#: view:crm.claim:crm_claim_rma.crm_claim_rma_form_view
-#: model:ir.actions.act_window,name:crm_claim_rma.act_crm_claim_rma_purchase_orders
-msgid "Purchases"
-msgstr "Compras"
+#: model:ir.model,name:crm_claim_rma.model_account_invoice_refund
+msgid "Invoice Refund"
+msgstr "Abono de factura"
 
 #. module: crm_claim_rma
 #: view:crm.claim:crm_claim_rma.crm_claim_rma_form_view
@@ -963,106 +397,654 @@ msgid "Invoices"
 msgstr "Facturas"
 
 #. module: crm_claim_rma
-#: view:crm.claim:crm_claim_rma.crm_claim_rma_form_view
-#: model:ir.actions.act_window,name:crm_claim_rma.act_crm_claim_rma_picking_in
-msgid "Returns"
-msgstr "Devoluciones"
+#: field:claim.line,message_is_follower:0
+#: field:stock.move,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: crm_claim_rma
+#: field:claim.line,message_last_post:0 field:stock.move,message_last_post:0
+msgid "Last Message Date"
+msgstr ""
+
+#. module: crm_claim_rma
+#: field:claim.line,write_uid:0 field:claim_make_picking.wizard,write_uid:0
+#: field:substate.substate,write_uid:0
+msgid "Last Updated by"
+msgstr "Última actualización hecha por"
+
+#. module: crm_claim_rma
+#: field:claim.line,write_date:0 field:claim_make_picking.wizard,write_date:0
+#: field:substate.substate,write_date:0
+msgid "Last Updated on"
+msgstr "Última actualización hecha en"
+
+#. module: crm_claim_rma
+#: field:claim.line,last_state_change:0
+msgid "Last change"
+msgstr "Última modificación"
+
+#. module: crm_claim_rma
+#: selection:claim.line,claim_origin:0
+msgid "Legal retractation"
+msgstr "Retractación legal"
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.crm_claim_line_form_view
+msgid "Linked Document"
+msgstr "Documento relacionado"
+
+#. module: crm_claim_rma
+#: model:ir.model,name:crm_claim_rma.model_claim_line
+msgid "List of product to return"
+msgstr "Listado de productos a devolver"
+
+#. module: crm_claim_rma
+#: help:claim_make_picking.wizard,claim_line_source_location_id:0
+msgid "Location where the returned products are from."
+msgstr "Localización desde la que vienen los productos devueltos."
+
+#. module: crm_claim_rma
+#: help:claim_make_picking.wizard,claim_line_dest_location_id:0
+msgid "Location where the system will stock the returned products."
+msgstr "Localización en la que el sistema almacenará los productos devueltos."
+
+#. module: crm_claim_rma
+#: view:claim_make_picking.wizard:crm_claim_rma.view_claim_picking
+msgid "Locations"
+msgstr "Localizaciones"
+
+#. module: crm_claim_rma
+#: selection:claim.line,claim_origin:0
+msgid "Lost during transport"
+msgstr "Perdido durante el transporte"
+
+#. module: crm_claim_rma
+#: model:crm.case.categ,name:crm_claim_rma.categ_claim17
+msgid "Merchandise Not As Described"
+msgstr "El producto no se corresponde con la descripción"
+
+#. module: crm_claim_rma
+#: model:crm.case.categ,name:crm_claim_rma.categ_claim16
+msgid "Merchandise Not Received"
+msgstr "Mercancía no recibida"
+
+#. module: crm_claim_rma
+#: field:claim.line,message_ids:0 field:stock.move,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: crm_claim_rma
+#: help:claim.line,message_ids:0 help:stock.move,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: crm_claim_rma
+#: model:crm.case.categ,name:crm_claim_rma.categ_claim21
+msgid "Missed Fulfilment Promise"
+msgstr "Incumplimiento de la respuesta"
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.view_crm_claim_lines_filter
+msgid "More"
+msgstr "Más"
+
+#. module: crm_claim_rma
+#: help:claim.line,name:0
+msgid "More precise description of the problem"
+msgstr "Descripción detallada del problema"
+
+#. module: crm_claim_rma
+#: field:claim.line,move_in_id:0
+msgid "Move Line from picking in"
+msgstr "Ubicación de producto recepcionado"
+
+#. module: crm_claim_rma
+#: field:claim.line,move_out_id:0
+msgid "Move Line from picking out"
+msgstr "Ubicación para envío"
+
+#. module: crm_claim_rma
+#: view:stock.picking:crm_claim_rma.view_picking_internal_search_claim_id
+msgid "Moves created from claims"
+msgstr ""
 
 #. module: crm_claim_rma
 #: view:crm.claim:crm_claim_rma.crm_claim_rma_form_view
-#: model:ir.actions.act_window,name:crm_claim_rma.act_crm_claim_rma_sale_orders
-msgid "Sales"
-msgstr "Ventas"
+msgid "New Delivery"
+msgstr "Nueva entrega"
+
+#. module: crm_claim_rma
+#: view:crm.claim:crm_claim_rma.crm_claim_rma_form_view
+msgid "New Products Return"
+msgstr "Nueva devolución de productos"
+
+#. module: crm_claim_rma
+#: view:crm.claim:crm_claim_rma.crm_claim_rma_form_view
+msgid "New Refund"
+msgstr "Nuevo abono"
+
+#. module: crm_claim_rma
+#: model:crm.case.categ,name:crm_claim_rma.categ_claim10
+msgid "No Inventory"
+msgstr "Sin Stock"
+
+#. module: crm_claim_rma
+#: selection:claim.line,priority:0
+msgid "Normal"
+msgstr ""
+
+#. module: crm_claim_rma
+#: selection:claim.line,priority:0
+msgid "Not Define"
+msgstr ""
+
+#. module: crm_claim_rma
+#: code:addons/crm_claim_rma/models/claim_line.py:65
+#: selection:claim.line,warning:0
+#, python-format
+msgid "Not Defined"
+msgstr ""
+
+#. module: crm_claim_rma
+#: selection:claim.line,claim_origin:0
+msgid "Not specified"
+msgstr "No especificado"
+
+#. module: crm_claim_rma
+#: field:claim.line,number:0
+msgid "Number"
+msgstr ""
+
+#. module: crm_claim_rma
+#: selection:claim.line,claim_origin:0
+msgid "Order cancellation"
+msgstr "Cancelación de orden"
+
+#. module: crm_claim_rma
+#: selection:claim.line,claim_origin:0
+msgid "Other"
+msgstr "Otro"
+
+#. module: crm_claim_rma
+#: view:crm.claim:crm_claim_rma.crm_claim_rma_form_view
+#: field:crm.claim,delivery_address_id:0
+msgid "Partner delivery address"
+msgstr ""
+
+#. module: crm_claim_rma
+#: selection:claim.line,claim_origin:0
+msgid "Perfect Conditions"
+msgstr ""
+
+#. module: crm_claim_rma
+#: selection:claim.line,claim_origin:0
+msgid "Physical Damage by Client"
+msgstr ""
+
+#. module: crm_claim_rma
+#: selection:claim.line,claim_origin:0
+msgid "Physical Damage by Company"
+msgstr ""
+
+#. module: crm_claim_rma
+#: view:crm.claim:crm_claim_rma.crm_claim_rma_form_view field:crm.claim,pick:0
+msgid "Pick the product in the store"
+msgstr ""
+
+#. module: crm_claim_rma
+#: model:ir.model,name:crm_claim_rma.model_stock_picking
+msgid "Picking List"
+msgstr "Listado de recogida"
+
+#. module: crm_claim_rma
+#: code:addons/crm_claim_rma/models/claim_line.py:399
+#, python-format
+msgid "Please set invoice first"
+msgstr ""
+
+#. module: crm_claim_rma
+#: code:addons/crm_claim_rma/models/claim_line.py:395
+#, python-format
+msgid "Please set product first"
+msgstr ""
+
+#. module: crm_claim_rma
+#: model:crm.case.categ,name:crm_claim_rma.categ_claim18
+msgid "Pricing Error"
+msgstr "Error de precio"
 
 #. module: crm_claim_rma
 #: view:claim.line:crm_claim_rma.view_crm_claim_lines_filter
 #: field:claim.line,priority:0
 msgid "Priority"
-msgstr "Prioridad"
+msgstr ""
+
+#. module: crm_claim_rma
+#: help:claim.line,priority:0
+msgid "Priority attention of claim line"
+msgstr ""
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.crm_claim_line_form_view
+msgid "Problem"
+msgstr "Problema"
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.view_crm_claim_lines_filter
+#: field:claim.line,product_id:0
+msgid "Product"
+msgstr "Producto"
+
+#. module: crm_claim_rma
+#: selection:claim.line,claim_diagnosis:0
+msgid "Product Damaged"
+msgstr ""
+
+#. module: crm_claim_rma
+#: selection:claim.line,claim_diagnosis:0
+msgid "Product Repaired"
+msgstr ""
 
 #. module: crm_claim_rma
 #: view:crm.claim:crm_claim_rma.crm_claim_rma_form_view
 msgid "Product Returns"
-msgstr "Productos Devueltos"
+msgstr ""
 
 #. module: crm_claim_rma
-#: view:crm.claim:0
-#: field:crm.claim,pick:0
-msgid "Pick the product in the store"
-msgstr "Retirar el producto en recepción"
+#: selection:claim.line,claim_diagnosis:0
+msgid "Product in good condition"
+msgstr ""
 
 #. module: crm_claim_rma
-#: field:claim.line,number:0
-msgid "Number"
-msgstr "Número"
+#: selection:claim.line,claim_diagnosis:0
+msgid "Product with hidden physical damage"
+msgstr ""
 
 #. module: crm_claim_rma
-#: selection:claim.line,warning:0
-msgid "Valid"
-msgstr "Válida"
+#: view:crm.claim:crm_claim_rma.crm_claim_rma_form_view
+#: model:ir.actions.act_window,name:crm_claim_rma.act_crm_claim_rma_purchase_orders
+msgid "Purchases"
+msgstr ""
 
 #. module: crm_claim_rma
-#: selection:claim.line,warning:0
-msgid "Expired"
-msgstr "Expirada"
+#: field:claim.line,product_returned_quantity:0
+msgid "Quantity"
+msgstr "Cantidad"
 
 #. module: crm_claim_rma
-#: selection:claim.line,warning:0
-msgid "Not Defined"
-msgstr "No Definida"
+#: help:claim.line,product_returned_quantity:0
+msgid "Quantity of product returned"
+msgstr "Cantidad de producto devuelto"
 
 #. module: crm_claim_rma
-#: selection:claim.line,warranty_type:0
-msgid "Company"
-msgstr "Compañía"
+#: model:ir.actions.act_window,name:crm_claim_rma.act_crm_claim_rma_sale_orders
+msgid "Quotations and Sales"
+msgstr "Presupuestos y pedidos"
 
 #. module: crm_claim_rma
-#: selection:claim.line,warranty_type:0
-msgid "Supplier"
-msgstr "Proveedor"
+#: field:crm.claim,picking_ids:0
+msgid "RMA"
+msgstr "RMA"
 
 #. module: crm_claim_rma
-#: selection:claim.line,warranty_type:0
-msgid "Other"
-msgstr "Otro"
+#: help:crm.claim,rma_number:0
+msgid "RMA Number provided by supplier"
+msgstr ""
 
 #. module: crm_claim_rma
-#: field:crm.claim,pick:0
-msgid "Pick the product in the store"
-msgstr "Retirar el producto en recepción"
+#: field:crm.claim,real_cost:0
+msgid "Real cost"
+msgstr "Coste real"
 
 #. module: crm_claim_rma
-#: field:crm.claim,name:0
-msgid "Name"
-msgstr "Reclamo"
+#: field:crm.claim,real_revenue:0
+msgid "Real revenue"
+msgstr "Ingreso real"
+
+#. module: crm_claim_rma
+#: selection:claim.line,state:0
+msgid "Received, to control"
+msgstr "Recibido, para control"
+
+#. module: crm_claim_rma
+#: view:crm.claim:crm_claim_rma.crm_claim_rma_form_view
+msgid "Receptions / Deliveries"
+msgstr "Recepciones / Entregas"
+
+#. module: crm_claim_rma
+#: field:claim.line,refund_line_id:0
+msgid "Refund Line"
+msgstr "Linea de Abono"
+
+#. module: crm_claim_rma
+#: view:crm.claim:crm_claim_rma.crm_claim_rma_form_view
+#: field:crm.claim,invoice_ids:0
+#: model:ir.actions.act_window,name:crm_claim_rma.act_crm_claim_rma_refunds
+msgid "Refunds"
+msgstr "Abonos"
+
+#. module: crm_claim_rma
+#: selection:claim.line,state:0
+msgid "Refused"
+msgstr "Rechazado"
+
+#. module: crm_claim_rma
+#: field:claim.line,claim_id:0
+msgid "Related claim"
+msgstr "Reclamación relacionada"
+
+#. module: crm_claim_rma
+#: help:crm.claim,invoice_id:0
+msgid "Related original Cusotmer invoice"
+msgstr ""
+
+#. module: crm_claim_rma
+#: model:ir.actions.act_window,name:crm_claim_rma.action_claim_picking_in
+msgid "Return Products"
+msgstr "Productos devueltos"
+
+#. module: crm_claim_rma
+#: field:claim.line,location_dest_id:0
+msgid "Return Stock Location"
+msgstr "Ubicación de existencias para devolución"
+
+#. module: crm_claim_rma
+#: field:crm.claim,claim_line_ids:0
+msgid "Return lines"
+msgstr ""
+
+#. module: crm_claim_rma
+#: view:crm.claim:crm_claim_rma.crm_claim_rma_form_view
+msgid "Returned lines"
+msgstr ""
+
+#. module: crm_claim_rma
+#: help:claim.line,product_id:0
+msgid "Returned product"
+msgstr "Productos devueltos"
+
+#. module: crm_claim_rma
+#: view:crm.claim:crm_claim_rma.crm_claim_rma_form_view
+msgid "Returns"
+msgstr ""
 
 #. module: crm_claim_rma
 #: field:crm.claim,rma_number:0
 msgid "Rma number"
-msgstr "Número RMA"
+msgstr ""
+
+#. module: crm_claim_rma
+#: view:crm.claim:crm_claim_rma.crm_claim_rma_form_view
+msgid "Sales"
+msgstr ""
+
+#. module: crm_claim_rma
+#: view:crm.claim:crm_claim_rma.view_crm_case_claims_filter
+msgid "Sales Team"
+msgstr "Equipo de ventas"
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.view_crm_claim_lines_filter
+msgid "Search Claims"
+msgstr "Buscar reclamaciones"
+
+#. 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 "Seleccione un sub-estado para detallar el estado estandar. Por ejemplo: Estado = rechazado; Sub-estado, garantía agotada, fuera de garantía, sin problema..."
+
+#. module: crm_claim_rma
+#: view:claim_make_picking.wizard:crm_claim_rma.view_claim_picking
+msgid "Select exchange lines to add in picking"
+msgstr "Seleccionar las líneas de cambio para añadir envío"
+
+#. module: crm_claim_rma
+#: view:claim_make_picking.wizard:crm_claim_rma.view_claim_picking
+msgid "Select lines for picking"
+msgstr "Seleccionar líneas para recogida/envío"
+
+#. module: crm_claim_rma
+#: field:crm.claim,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: crm_claim_rma
+#: field:claim.line,prodlot_id:0
+msgid "Serial/Lot number"
+msgstr ""
+
+#. module: crm_claim_rma
+#: model:crm.case.categ,name:crm_claim_rma.categ_claim19
+msgid "Shipping Address Undeliverable"
+msgstr "Dirección de envío inexistente"
 
 #. module: crm_claim_rma
 #: selection:claim.line,claim_origin:0
-msgid "Imperfection"
-msgstr "Imperfección"
+msgid "Shipping error"
+msgstr "Error de envío"
 
 #. module: crm_claim_rma
-#: selection:claim.line,claim_origin:0
-msgid "Physical Damage by Client"
-msgstr "Daño físico por el cliente"
+#: field:claim_make_picking.wizard,claim_line_source_location_id:0
+msgid "Source Location"
+msgstr "Localización de origen"
 
 #. module: crm_claim_rma
-#: selection:claim.line,claim_origin:0
-msgid "Physical Damage by Company"
-msgstr "Daño físico por la compañía"
+#: view:crm.claim:crm_claim_rma.view_crm_case_claims_filter
+msgid "Stage"
+msgstr "Etapa"
 
 #. module: crm_claim_rma
-#: selection:claim.line,claim_origin:0
-msgid "Perfect Conditions"
-msgstr "Perfectas condiciones"
+#: view:claim.line:crm_claim_rma.crm_claim_line_form_view
+#: view:claim.line:crm_claim_rma.view_crm_claim_lines_filter
+#: field:claim.line,state:0
+msgid "State"
+msgstr "Estado"
 
-#. module: yoytec_customer_rma_workflow
-#: field:claim.line,claim_diagnosis:0
-msgid "Claim diagnosis"
-msgstr "Diagnóstico del reclamo"
+#. module: crm_claim_rma
+#: model:ir.model,name:crm_claim_rma.model_stock_move
+msgid "Stock Move"
+msgstr "Movimientos de stock"
 
+#. module: crm_claim_rma
+#: field:claim.line,substate_id:0 field:substate.substate,name:0
+msgid "Sub state"
+msgstr "Sub-estado"
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.view_crm_claim_lines_filter
+msgid "Substate"
+msgstr "Sub-estado"
+
+#. module: crm_claim_rma
+#: field:claim.line,message_summary:0 field:stock.move,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: crm_claim_rma
+#: selection:claim.line,applicable_guarantee:0
+msgid "Supplier"
+msgstr "Proveedor"
+
+#. module: crm_claim_rma
+#: help:claim.line,invoice_line_id:0
+msgid "The invoice line related to the returned product"
+msgstr "La línea de factura relacionada con el producto devuelto"
+
+#. 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 "Línea de traslado relacionada con el producto devuelto"
+
+#. module: crm_claim_rma
+#: code:addons/crm_claim_rma/models/claim_line.py:312
+#, python-format
+msgid "The product has no supplier configured."
+msgstr "El producto no tiene proveedor configurado."
+
+#. module: crm_claim_rma
+#: help:claim.line,refund_line_id:0
+msgid "The refund line related to the returned product"
+msgstr "La línea de abono relacionada con el producto devuelto"
+
+#. module: crm_claim_rma
+#: help:claim.line,location_dest_id:0
+msgid "The return stock location of the returned product"
+msgstr "La ubicación de existencias para el producto devuelto"
+
+#. module: crm_claim_rma
+#: help:claim.line,prodlot_id:0
+msgid "The serial/lot of the returned product"
+msgstr "Nº de serie/lote del producto devuelto"
+
+#. 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 "El límite de la garantía se calcula como: fecha de factura + garantía seleccionada en el producto seleccionado."
+
+#. module: crm_claim_rma
+#: code:addons/crm_claim_rma/models/crm_claim.py:40
+#, python-format
+msgid "There is no warehouse for the current user's company."
+msgstr "No hay almacén definido para la compañía del usuario actual"
+
+#. module: crm_claim_rma
+#: help:crm.claim,delivery_address_id:0
+msgid "This address will be used to deliver repaired or replacement products."
+msgstr ""
+
+#. module: crm_claim_rma
+#: help:claim.line,claim_diagnosis:0
+msgid "To describe the line product diagnosis"
+msgstr ""
+
+#. module: crm_claim_rma
+#: help:claim.line,claim_origin:0
+msgid "To describe the line product problem"
+msgstr "Para describir el problema de la línea de producto"
+
+#. module: crm_claim_rma
+#: help:substate.substate,substate_descr:0
+msgid "To give more information about the sub state"
+msgstr "Permite ampliar la información del sub-estado"
+
+#. module: crm_claim_rma
+#: help:claim.line,claim_id:0
+msgid "To link to the case.claim object"
+msgstr "Para enlazar con el objeto case.claim"
+
+#. module: crm_claim_rma
+#: help:claim.line,last_state_change:0
+msgid "To set thelast state / substate change"
+msgstr ""
+
+#. module: crm_claim_rma
+#: selection:claim.line,state:0
+msgid "Treated"
+msgstr "Tratado"
+
+#. module: crm_claim_rma
+#: field:claim.line,unit_sale_price:0
+msgid "Unit sale price"
+msgstr "Precio de venta unitario"
+
+#. 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 "Precio de venta unitario del producto. Auto-completado si la devolución se realizó por selección de factura. Tenga cuidado y compruebe el valor automático, ya que no tiene en cuenta facturas rectificativas previas, descuento de facturas, puede ser 0 si el producto es gratuito, etc..."
+
+#. module: crm_claim_rma
+#: field:claim.line,message_unread:0 field:stock.move,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: crm_claim_rma
+#: code:addons/crm_claim_rma/models/claim_line.py:63
+#: selection:claim.line,warning:0
+#, python-format
+msgid "Valid"
+msgstr ""
+
+#. module: crm_claim_rma
+#: selection:claim.line,priority:0
+msgid "Very High"
+msgstr ""
+
+#. module: crm_claim_rma
+#: field:crm.claim,warehouse_id:0
+msgid "Warehouse"
+msgstr "Almacén"
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.crm_claim_line_form_view
+#: field:claim.line,warning:0
+msgid "Warranty"
+msgstr "Garantía"
+
+#. module: crm_claim_rma
+#: field:claim.line,warranty_return_partner:0
+msgid "Warranty Address"
+msgstr "Dirección de garantía"
+
+#. module: crm_claim_rma
+#: field:claim.line,guarantee_limit:0
+msgid "Warranty limit"
+msgstr "Límite de la garantía"
+
+#. module: crm_claim_rma
+#: field:claim.line,applicable_guarantee:0 field:claim.line,warranty_type:0
+msgid "Warranty type"
+msgstr "Tipo de garantía"
+
+#. module: crm_claim_rma
+#: help:claim.line,warranty_return_partner:0
+msgid "Where the customer has to send back the product(s)"
+msgstr "Dirección a la que el cliente debe remitir el producto"
+
+#. 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 "Especifica quién es el responsable del tratamiento de la devolución de garantía para el cliente final. La compañía utilizará la dirección por defecto o la dirección de envío de la compañía, y así sucesivamente por proveedor y marca del fabricante. No significa necesariamente que la garantía que se aplica es el de la empresa que hace la devolución (es decir: se puede devolver a la empresa y estar bajo la garantía de la marca)"
+
+#. 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 "Asistente para crear envíos desde la línea de reclamación"
+
+#. module: crm_claim_rma
+#: view:claim_make_picking.wizard:crm_claim_rma.view_claim_picking
+msgid "or"
+msgstr "o"
+
+#. module: crm_claim_rma
+#: model:ir.model,name:crm_claim_rma.model_substate_substate
+msgid "substate that precise a given state"
+msgstr "Los sub-estados necesitan un estado padre"
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.crm_claim_line_view_form_embedded
+msgid ""
+"{'claim_id': parent.id, 'company_id': parent.company_id, 'warehouse_id': "
+"parent.warehouse_id, 'claim_type': parent.claim_type, 'claim_date': "
+"parent.date}"
+msgstr ""
+
+#. module: crm_claim_rma
+#: view:crm.claim:crm_claim_rma.crm_case_claims_form_view
+msgid "{'create_lines': False}"
+msgstr ""
diff --git a/crm_claim_rma/i18n/fr.po b/crm_claim_rma/i18n/fr.po
index 36a1f4fa..891aebcc 100644
--- a/crm_claim_rma/i18n/fr.po
+++ b/crm_claim_rma/i18n/fr.po
@@ -1,164 +1,176 @@
-# Translation of OpenERP Server.
+# Translation of Odoo Server.
 # This file contains the translation of the following modules:
-# 	* crm_claim_rma
-#
+# * crm_claim_rma
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.1\n"
+"Project-Id-Version: rma (8.0)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-12-20 18:21+0000\n"
-"PO-Revision-Date: 2014-04-19 04:31+0000\n"
-"Last-Translator: Yannickvaucher <Unknown>\n"
-"Language-Team: \n"
+"POT-Creation-Date: 2015-11-24 16:07+0000\n"
+"PO-Revision-Date: 2015-11-19 19:00+0000\n"
+"Last-Translator: OCA Transbot <transbot@odoo-community.org>\n"
+"Language-Team: French (http://www.transifex.com/oca/OCA-rma-8-0/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-24 06:50+0000\n"
-"X-Generator: Launchpad (build 17017)\n"
-"Language: \n"
+"Content-Transfer-Encoding: \n"
+"Language: fr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. module: crm_claim_rma
-#: view:claim.line:0
-msgid "Returned good"
-msgstr "Marchandise retournée"
-
-#. module: crm_claim_rma
-#: view:claim_make_picking.wizard:0
-msgid "Locations"
-msgstr "Emplacements"
-
-#. module: crm_claim_rma
-#: view:claim.line:0
-msgid "Draft and Open Claims"
-msgstr "Crée et ouvre réclamations"
-
-#. module: crm_claim_rma
-#: view:claim.line:0
-msgid "Group By..."
-msgstr "Regrouper Par..."
-
-#. module: crm_claim_rma
-#: help:claim.line,claim_descr:0
-msgid "More precise description of the problem"
-msgstr "Description plus précise du problème"
-
-#. 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 "Limite de la garantie"
-
-#. module: crm_claim_rma
-#: selection:claim.line,applicable_guarantee:0
-#: selection:crm.claim,claim_type:0
-msgid "Supplier"
-msgstr "Fournisseur"
-
-#. module: crm_claim_rma
-#: selection:claim.line,state:0
-msgid "Refused"
-msgstr "Refusé"
-
-#. module: crm_claim_rma
-#: view:stock.picking.in:0
-#: view:stock.picking.out:0
-msgid "To Invoice"
-msgstr "Vers facturation"
-
-#. 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 "Ligne d'avoir"
-
-#. module: crm_claim_rma
-#: selection:claim.line,applicable_guarantee:0
-msgid "Company"
-msgstr "Société"
-
-#. module: crm_claim_rma
-#: selection:claim.line,claim_origin:0
-msgid "Order cancellation"
-msgstr "Annulation de la commande"
-
-#. 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 "Emplacement de destination"
-
-#. module: crm_claim_rma
-#: code:addons/crm_claim_rma/crm_claim_rma.py:224
+#: code:addons/crm_claim_rma/wizards/claim_make_picking.py:121
 #, python-format
-msgid "Cannot find any date for invoice. Must be a validated invoice."
-msgstr "Pas de dates pour la facture ! La facture doit être valide !"
+msgid "A picking has already been created for this claim."
+msgstr "Une expédition/réception à déjà été créée pour cette réclamation !"
 
 #. 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 "Dernière modification"
+#: code:addons/crm_claim_rma/wizards/claim_make_picking.py:233
+#, 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
-#: help:claim.line,product_id:0
-msgid "Returned product"
-msgstr "Produit retourné"
+#: code:addons/crm_claim_rma/wizards/claim_make_picking.py:223
+#, 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
-#: view:claim_make_picking.wizard:0
-msgid "Create picking"
-msgstr "Créer expédition/réception"
-
-#. module: crm_claim_rma
-#: view:claim.line:0
-msgid "Claim Line"
-msgstr "Lignes de réclamations"
-
-#. module: crm_claim_rma
-#: view:crm.claim:0
-msgid "New Delivery"
-msgstr "Nouvelle livraison"
-
-#. module: crm_claim_rma
-#: view:claim.line:0
-msgid "Calculate warranty state"
-msgstr "Calcul de l'état de la garantie"
-
-#. module: crm_claim_rma
-#: code:addons/crm_claim_rma/account_invoice.py:77
+#: code:addons/crm_claim_rma/models/account_invoice.py:75
 #, python-format
 msgid "A refund has already been created for this claim !"
 msgstr "Un avoir a déjà été créé pour cette réclamation !"
 
 #. module: crm_claim_rma
-#: view:claim.line:0
-msgid "Compute Warranty"
-msgstr ""
+#: model:crm.case.section,name:crm_claim_rma.section_after_sales_service
+msgid "After Sales Service"
+msgstr "Service-après-vente"
+
+#. module: crm_claim_rma
+#: selection:claim.line,applicable_guarantee:0
+msgid "Brand manufacturer"
+msgstr "Marque du fabricant"
+
+#. module: crm_claim_rma
+#: model:crm.case.categ,name:crm_claim_rma.categ_claim12
+msgid "Buyer Cancelled"
+msgstr "Annulation de l'acheteur"
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.crm_claim_line_form_view
+msgid "Calculate warranty state"
+msgstr "Calcul de l'état de la garantie"
+
+#. module: crm_claim_rma
+#: view:claim_make_picking.wizard:crm_claim_rma.view_claim_picking
+msgid "Cancel"
+msgstr "Annuler"
+
+#. module: crm_claim_rma
+#: code:addons/crm_claim_rma/models/claim_line.py:308
+#, python-format
+msgid "Cannot find any date for invoice. Must be a validated invoice."
+msgstr "Pas de dates pour la facture ! La facture doit être valide !"
 
 #. 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 "Réclamation"
 
 #. module: crm_claim_rma
-#: model:crm.case.categ,name:crm_claim_rma.categ_claim13
-msgid "General Adjustement"
-msgstr "Ajustement général"
+#: view:claim.line:crm_claim_rma.crm_claim_line_form_view
+msgid "Claim Line"
+msgstr "Lignes de réclamations"
 
 #. 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."
+#: field:claim.line,date:0
+msgid "Claim Line Date"
+msgstr ""
+
+#. module: crm_claim_rma
+#: help:claim.line,number:0
+msgid "Claim Line Identification Number"
+msgstr ""
+
+#. module: crm_claim_rma
+#: field:claim.line,claim_type:0
+msgid "Claim Line Type"
+msgstr ""
+
+#. module: crm_claim_rma
+#: field:claim.line,claim_origin:0
+msgid "Claim Subject"
+msgstr "Sujet de la réclamation"
+
+#. module: crm_claim_rma
+#: help:claim.line,claim_type:0
+msgid "Claim classification"
+msgstr ""
+
+#. module: crm_claim_rma
+#: field:claim.line,claim_diagnosis:0
+msgid "Claim diagnosis"
+msgstr ""
+
+#. module: crm_claim_rma
+#: model:ir.actions.act_window,name:crm_claim_rma.act_crm_claim_substates
+#: model:ir.ui.menu,name:crm_claim_rma.menu_crm_case_claims_claim_line_substates
+msgid "Claim line substates"
+msgstr "Sous-états des lignes de réclamations"
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.crm_claim_line_tree_view
+#: 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.ui.menu,name:crm_claim_rma.menu_crm_case_claims_claim_lines
+msgid "Claim lines"
+msgstr "Lignes de réclamations"
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.view_crm_claim_lines_filter
+msgid "Claim n°"
+msgstr "Réclamation n°"
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.crm_claim_line_form_view
+msgid "Claims"
+msgstr "Réclamation"
+
+#. module: crm_claim_rma
+#: selection:claim.line,applicable_guarantee:0 field:claim.line,company_id:0
+msgid "Company"
+msgstr "Société"
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.crm_claim_line_tree_view
+#: view:crm.claim:crm_claim_rma.crm_claim_rma_form_view
+msgid "Compute Warranty"
+msgstr ""
+
+#. module: crm_claim_rma
+#: selection:claim.line,state:0
+msgid "Confirmed, waiting for product"
+msgstr "Confirmé, attente du produit"
+
+#. module: crm_claim_rma
+#: view:res.partner:crm_claim_rma.view_partner_contact_tree
+msgid "Contacts"
+msgstr ""
+
+#. module: crm_claim_rma
+#: selection:claim.line,state:0
+msgid "Controlled, to treate"
+msgstr "Contrôlé, à traiter"
+
+#. module: crm_claim_rma
+#: model:crm.case.categ,name:crm_claim_rma.categ_claim14
+msgid "Could Not Ship"
 msgstr ""
 
 #. module: crm_claim_rma
@@ -167,267 +179,54 @@ 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 "Garantie"
+#: view:claim_make_picking.wizard:crm_claim_rma.view_claim_picking
+msgid "Create picking"
+msgstr "Créer expédition/réception"
+
+#. module: crm_claim_rma
+#: field:claim.line,create_uid:0 field:claim_make_picking.wizard,create_uid:0
+#: field:substate.substate,create_uid:0
+msgid "Created by"
+msgstr ""
+
+#. module: crm_claim_rma
+#: field:claim.line,create_date:0
+#: field:claim_make_picking.wizard,create_date:0
+#: field:substate.substate,create_date:0
+msgid "Created on"
+msgstr ""
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.view_crm_claim_lines_filter
+msgid "Current"
+msgstr "Actuel"
+
+#. module: crm_claim_rma
+#: code:addons/crm_claim_rma/models/crm_claim.py:161
+#, python-format
+msgid "Customer"
+msgstr "Client"
+
+#. module: crm_claim_rma
+#: code:addons/crm_claim_rma/models/crm_claim.py:165
+#, python-format
+msgid "Customer Email"
+msgstr ""
 
 #. module: crm_claim_rma
 #: model:crm.case.categ,name:crm_claim_rma.categ_claim11
 msgid "Customer Return"
 msgstr "Retour client"
 
-#. module: crm_claim_rma
-#: model:ir.model,name:crm_claim_rma.model_stock_move
-msgid "Stock Move"
-msgstr "Mouvement de stock"
-
-#. module: crm_claim_rma
-#: help:claim.line,product_returned_quantity:0
-msgid "Quantity of product returned"
-msgstr "Quantité de produit retournés"
-
-#. 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 "Coût prévisionnel"
-
-#. 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 "Pour définir le derniere changement d'état ou de sous-état"
-
 #. module: crm_claim_rma
 #: selection:claim.line,claim_origin:0
-msgid "Not specified"
-msgstr "Non spécifié"
+msgid "Damaged delivered product"
+msgstr "Produit livré endommagé"
 
 #. module: crm_claim_rma
-#: view:claim.line:0
-msgid "Returned lines"
-msgstr "Lignes retournées"
-
-#. module: crm_claim_rma
-#: view:claim.line:0
-msgid "Claim n°"
-msgstr "Réclamation n°"
-
-#. 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 "Etat"
-
-#. 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 "Type de garantie"
-
-#. module: crm_claim_rma
-#: model:ir.model,name:crm_claim_rma.model_stock_picking
-msgid "Picking List"
-msgstr "Opération de manutention"
-
-#. 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 "Entrepôt"
-
-#. module: crm_claim_rma
-#: help:claim.line,claim_origin:0
-msgid "To describe the line product problem"
-msgstr "Pour décrire le problème de la ligne de produit"
-
-#. module: crm_claim_rma
-#: help:claim_make_picking.wizard,claim_line_dest_location:0
-msgid "Location where the system will stock the returned products."
+#: help:claim.line,message_last_post:0 help:stock.move,message_last_post:0
+msgid "Date of the last message posted on the record."
 msgstr ""
-"Emplacement vers lequel le système va stocker les produits retournés."
-
-#. module: crm_claim_rma
-#: view:claim.line:0
-msgid "More"
-msgstr "Plus"
-
-#. module: crm_claim_rma
-#: selection:claim.line,claim_origin:0
-msgid "Legal retractation"
-msgstr "Rétracation légale"
-
-#. 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 "Erreur !"
-
-#. 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 ""
-"La limite de garantie est calculé comme: date de facture + garantie définie "
-"dans le produit sélectionné."
-
-#. 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 "Sujet de la réclamation"
-
-#. 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 "Coût réél"
-
-#. module: crm_claim_rma
-#: help:claim.line,claim_id:0
-msgid "To link to the case.claim object"
-msgstr "A relier à l'objet case.claim"
-
-#. 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 "Une expédition/réception à déjà été créée pour cette réclamation !"
-
-#. module: crm_claim_rma
-#: model:crm.case.categ,name:crm_claim_rma.categ_claim18
-msgid "Pricing Error"
-msgstr "Erreur d'établissement des prix"
-
-#. 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 "Quantité"
-
-#. module: crm_claim_rma
-#: selection:claim.line,state:0
-msgid "Confirmed, waiting for product"
-msgstr "Confirmé, attente du produit"
-
-#. 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 "Lignes de retour"
-
-#. 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 "Revenu attendu"
-
-#. module: crm_claim_rma
-#: selection:claim.line,state:0
-msgid "Controlled, to treate"
-msgstr "Contrôlé, à traiter"
-
-#. 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 "Remboursements client"
-
-#. 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 "Emplacement stock de retour"
-
-#. 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 "Perte pendant le transport"
-
-#. module: crm_claim_rma
-#: selection:claim.line,claim_origin:0
-msgid "Shipping error"
-msgstr "Erreur d'expédition"
-
-#. 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 "Adresse de garantie"
-
-#. module: crm_claim_rma
-#: help:crm.claim,invoice_id:0
-msgid "Related original Cusotmer invoice"
-msgstr "Facture client d’origine liée"
-
-#. module: crm_claim_rma
-#: model:crm.case.categ,name:crm_claim_rma.categ_claim12
-msgid "Buyer Cancelled"
-msgstr "Annulation de l'acheteur"
-
-#. 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 "Réclamation liée"
-
-#. 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 "Ligne de facture"
-
-#. 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 "Ligne de mouvement d'une réception"
 
 #. module: crm_claim_rma
 #: model:crm.case.categ,name:crm_claim_rma.categ_claim20
@@ -435,73 +234,19 @@ msgid "Delivered Late by Carrier"
 msgstr "Livré en retard par le transporteur"
 
 #. module: crm_claim_rma
-#: view:crm.claim:0
-msgid "Product Return"
-msgstr "Retour produit"
+#: field:claim.line,name:0 field:substate.substate,substate_descr:0
+msgid "Description"
+msgstr "Description"
 
 #. module: crm_claim_rma
-#: view:crm.claim:0
-msgid "Generated Documents"
-msgstr ""
+#: field:claim_make_picking.wizard,claim_line_dest_location_id:0
+msgid "Dest. Location"
+msgstr "Emplacement de destination"
 
 #. module: crm_claim_rma
-#: help:claim.line,prodlot_id:0
-msgid "The serial/lot of the returned product"
-msgstr "N° de série/lot du produit retourné"
-
-#. module: crm_claim_rma
-#: view:crm.claim:0
-msgid "New Refund"
-msgstr "Nouvel avoir"
-
-#. 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 "Sous-état"
-
-#. 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 "Remboursements Fournisseur"
-
-#. 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 "Description de la réclamation"
-
-#. 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 "Revenu réél"
-
-#. module: crm_claim_rma
-#: view:claim_make_picking.wizard:0
-msgid "Select lines for picking"
-msgstr "Selectionner les lignes pour l'expédition/réception"
-
-#. 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 ""
-"Créer un sous-état pour préciser l'état standard. Exemple 1 : Etat = refusé; "
-"le sous-état peut être garantie expirée, pas de garantie, pas de "
-"problème,... . Exemple 2 : état = à créer; le sous-état peut être : à "
-"rembourser, à échanger, à réparer,..."
-
-#. module: crm_claim_rma
-#: view:claim_make_picking.wizard:0
-msgid "Select exchange lines to add in picking"
-msgstr "Selectionner les lignes à ajouter dans l'expédition/réception"
+#: model:crm.case.categ,name:crm_claim_rma.categ_claim15
+msgid "Different Item"
+msgstr "Article différent"
 
 #. module: crm_claim_rma
 #: selection:claim.line,state:0
@@ -509,315 +254,96 @@ msgid "Draft"
 msgstr "Brouillon"
 
 #. module: crm_claim_rma
-#: model:crm.case.categ,name:crm_claim_rma.categ_claim14
-msgid "Could Not Ship"
-msgstr ""
+#: view:claim.line:crm_claim_rma.view_crm_claim_lines_filter
+msgid "Draft and Open Claims"
+msgstr "Crée et ouvre réclamations"
 
 #. module: crm_claim_rma
-#: model:ir.model,name:crm_claim_rma.model_claim_line
-msgid "List of product to return"
-msgstr "Liste des produits à retourner"
-
-#. module: crm_claim_rma
-#: model:crm.case.categ,name:crm_claim_rma.categ_claim10
-msgid "No Inventory"
-msgstr "Plus de stock"
-
-#. 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 "Prix de vente unitaire"
-
-#. module: crm_claim_rma
-#: help:claim.line,refund_line_id:0
-msgid "The refund line related to the returned product"
-msgstr "Ligne d'avoir liée au produit retourné"
-
-#. 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 "Permet de donner plus d'information sur le sous état"
-
-#. module: crm_claim_rma
-#: model:ir.actions.act_window,name:crm_claim_rma.act_crm_claim_substates
-msgid "Claim line substates"
-msgstr "Sous-états des lignes de réclamations"
-
-#. module: crm_claim_rma
-#: help:claim_make_picking.wizard,claim_line_source_location:0
-msgid "Location where the returned products are from."
-msgstr "Emplacement d'ou les produits retournés proviennent."
-
-#. 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 "RMA"
-
-#. module: crm_claim_rma
-#: selection:claim.line,applicable_guarantee:0
-msgid "Brand manufacturer"
-msgstr "Marque du fabricant"
-
-#. 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 "N° de série/lot :"
-
-#. 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 ""
-"Prix de vente unitaire du produit. Remplis automatiquement si le retour est "
-"effectué avec la sélection de la facture. ETRE VIGILANT ET VERIFIER les "
-"valeurs automatiques récupérée différentes des précédents avoir, réductions "
-"sur la facture,..."
-
-#. module: crm_claim_rma
-#: code:addons/crm_claim_rma/crm_claim_rma.py:473
-#, python-format
-msgid "Please set invoice first"
-msgstr "S'il vous plaît d'abord définir le facture"
-
-#. module: crm_claim_rma
-#: code:addons/crm_claim_rma/crm_claim_rma.py:470
-#, python-format
-msgid "Please set product first"
-msgstr "S'il vous plaît d'abord définir le produit"
-
-#. module: crm_claim_rma
-#: selection:claim.line,claim_origin:0
-msgid "Damaged delivered product"
-msgstr "Produit livré endommagé"
-
-#. 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 "Lignes de réclamations"
-
-#. 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
+#: code:addons/crm_claim_rma/models/claim_line.py:308
+#: code:addons/crm_claim_rma/models/claim_line.py:312
+#: code:addons/crm_claim_rma/models/claim_line.py:395
+#: code:addons/crm_claim_rma/models/claim_line.py:399
+#: code:addons/crm_claim_rma/wizards/claim_make_picking.py:120
+#: code:addons/crm_claim_rma/wizards/claim_make_picking.py:222
+#: code:addons/crm_claim_rma/wizards/claim_make_picking.py:232
 #, python-format
 msgid "Error"
 msgstr "Erreur !"
 
-#. module: crm_claim_rma
-#: view:crm.claim:0
-msgid "Action"
-msgstr "Action"
-
-#. module: crm_claim_rma
-#: view:claim.line:0
-#: view:crm.claim:0
-msgid "Claims"
-msgstr "Réclamation"
-
-#. module: crm_claim_rma
-#: view:claim.line:0
-msgid "Problem"
-msgstr "Problème"
-
-#. module: crm_claim_rma
-#: selection:claim.line,state:0
-msgid "Treated"
-msgstr "Traité"
-
-#. module: crm_claim_rma
-#: model:crm.case.categ,name:crm_claim_rma.categ_claim16
-msgid "Merchandise Not Received"
-msgstr "Marchandise non reçue"
-
-#. module: crm_claim_rma
-#: model:ir.ui.menu,name:crm_claim_rma.menu_crm_case_claims_claim_line_substates
-msgid "Returned line substates"
-msgstr "Sous-états des lignes"
-
-#. module: crm_claim_rma
-#: view:claim.line:0
-msgid "Substate"
-msgstr "Sous-état"
-
-#. 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 "Factures client"
-
-#. 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 "Emplacement source"
-
-#. module: crm_claim_rma
-#: model:ir.actions.act_window,name:crm_claim_rma.act_crm_claim_rma_picking_out
-msgid "Deliveries"
-msgstr "Livraisons"
-
-#. 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 "Facture"
-
-#. module: crm_claim_rma
-#: help:claim.line,invoice_line_id:0
-msgid "The invoice line related to the returned product"
-msgstr "La ligne de facture reliée au produit retourné"
-
-#. module: crm_claim_rma
-#: view:claim_make_picking.wizard:0
-msgid "Cancel"
-msgstr "Annuler"
-
-#. module: crm_claim_rma
-#: model:crm.case.categ,name:crm_claim_rma.categ_claim21
-msgid "Missed Fulfilment Promise"
-msgstr "Promesse de traitement non tenue"
-
-#. module: crm_claim_rma
-#: view:claim.line:0
-msgid "In Progress"
-msgstr "En cours"
-
-#. module: crm_claim_rma
-#: model:crm.case.section,name:crm_claim_rma.section_after_sales_service
-msgid "After Sales Service"
-msgstr "Service-après-vente"
-
-#. module: crm_claim_rma
-#: selection:claim.line,state:0
-msgid "Received, to control"
-msgstr "Reçu, à contrôler"
-
-#. module: crm_claim_rma
-#: model:crm.case.categ,name:crm_claim_rma.categ_claim17
-msgid "Merchandise Not As Described"
-msgstr "Produit ne correspondant pas à sa description"
-
 #. module: crm_claim_rma
 #: selection:claim.line,claim_origin:0
 msgid "Exchange request"
 msgstr "Demande d'échange"
 
 #. module: crm_claim_rma
-#: model:ir.model,name:crm_claim_rma.model_substate_substate
-msgid "substate that precise a given state"
-msgstr "Sous état précisant l'état principal"
+#: field:crm.claim,planned_cost:0
+msgid "Expected cost"
+msgstr "Coût prévisionnel"
 
 #. module: crm_claim_rma
-#: code:addons/crm_claim_rma/crm_claim_rma.py:226
+#: field:crm.claim,planned_revenue:0
+msgid "Expected revenue"
+msgstr "Revenu attendu"
+
+#. module: crm_claim_rma
+#: code:addons/crm_claim_rma/models/claim_line.py:64
+#: selection:claim.line,warning:0
 #, python-format
-msgid "not_define"
+msgid "Expired"
 msgstr ""
 
 #. module: crm_claim_rma
-#: model:ir.actions.act_window,name:crm_claim_rma.action_claim_picking_in
-msgid "Return Products"
-msgstr "Produit retourné"
+#: view:crm.claim:crm_claim_rma.crm_claim_rma_form_view
+msgid "Follow Up"
+msgstr ""
 
 #. module: crm_claim_rma
-#: view:claim.line:0
-msgid "Current"
-msgstr "Actuel"
+#: field:claim.line,message_follower_ids:0
+#: field:stock.move,message_follower_ids:0
+msgid "Followers"
+msgstr ""
 
 #. module: crm_claim_rma
-#: selection:claim.line,claim_origin:0
-#: selection:crm.claim,claim_type:0
-msgid "Other"
-msgstr "Autre"
+#: model:crm.case.categ,name:crm_claim_rma.categ_claim13
+msgid "General Adjustement"
+msgstr "Ajustement général"
 
 #. module: crm_claim_rma
-#: view:crm.claim:0
-msgid "New Products Return"
-msgstr "Nouveau retour produit"
+#: view:crm.claim:crm_claim_rma.crm_claim_rma_form_view
+msgid "Generated Documents"
+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 "Factures fournisseurs"
+#: view:claim.line:crm_claim_rma.view_crm_claim_lines_filter
+msgid "Group By..."
+msgstr "Regrouper Par..."
 
 #. 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 "Produit"
+#: view:claim.line:crm_claim_rma.view_crm_claim_lines_filter
+msgid "Grouping by state"
+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 "Description"
+#: selection:claim.line,priority:0
+msgid "High"
+msgstr ""
 
 #. module: crm_claim_rma
-#: view:claim.line:0
-msgid "Search Claims"
-msgstr "Recherche réclamations"
-
-#. 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 "Type de réclamation"
-
-#. module: crm_claim_rma
-#: code:addons/crm_claim_rma/wizard/claim_make_picking.py:196
-#, python-format
+#: help:claim.line,message_summary:0 help:stock.move,message_summary:0
 msgid ""
-"A product return cannot be created for various destination locations, please "
-"choose line with a same destination location."
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
 msgstr ""
 
 #. module: crm_claim_rma
-#: code:addons/crm_claim_rma/crm_claim_rma.py:247
-#, python-format
-msgid "valid"
+#: field:claim.line,id:0 field:claim_make_picking.wizard,id:0
+#: field:substate.substate,id:0
+msgid "ID"
 msgstr ""
 
 #. module: crm_claim_rma
-#: code:addons/crm_claim_rma/crm_claim_rma.py:340
-#, python-format
-msgid "Error!"
-msgstr "Erreur !"
-
-#. module: crm_claim_rma
-#: help:claim.line,location_dest_id:0
-msgid "The return stock location of the returned product"
+#: help:claim.line,message_unread:0 help:stock.move,message_unread:0
+msgid "If checked new messages require your attention."
 msgstr ""
 
 #. module: crm_claim_rma
@@ -826,53 +352,19 @@ msgid "If warranty has expired"
 msgstr "Si la garantie a expirée"
 
 #. module: crm_claim_rma
-#: help:claim.line,warranty_return_partner:0
-msgid "Where the customer has to send back the product(s)"
-msgstr "Adresse vers laquelle le client doit renvoyer le(s) produit(s)"
-
-#. module: crm_claim_rma
-#: view:crm.claim:0
-msgid "Follow Up"
+#: selection:claim.line,claim_origin:0
+msgid "Imperfection"
 msgstr ""
 
 #. module: crm_claim_rma
-#: selection:crm.claim,claim_type:0
-msgid "Customer"
-msgstr "Client"
+#: view:claim.line:crm_claim_rma.view_crm_claim_lines_filter
+msgid "In Progress"
+msgstr "En cours"
 
 #. 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 "Ligne de mouvement à partir d'une expédition"
-
-#. 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 "Avoirs"
-
-#. module: crm_claim_rma
-#: model:ir.model,name:crm_claim_rma.model_account_invoice_refund
-msgid "Invoice Refund"
-msgstr "Avoir"
-
-#. 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 "Retour total"
-
-#. module: crm_claim_rma
-#: help:claim.line,return_value:0
-msgid "Quantity returned * Unit sold price"
-msgstr "Quantité retournée * Prix de vente unitaire"
-
-#. module: crm_claim_rma
-#: model:crm.case.categ,name:crm_claim_rma.categ_claim19
-msgid "Shipping Address Undeliverable"
-msgstr "Mauvaise adresse de livraison"
+#: view:claim.line:crm_claim_rma.view_crm_claim_lines_filter
+msgid "In Progress Claims"
+msgstr "Réclamations en cours"
 
 #. module: crm_claim_rma
 #: model:ir.actions.act_window,name:crm_claim_rma.act_crm_claim_rma_picking_in
@@ -880,54 +372,678 @@ msgid "Incoming Shipment and Returns"
 msgstr ""
 
 #. module: crm_claim_rma
-#: view:stock.picking.out:0
-msgid "Delivery orders to invoice"
+#: view:claim.line:crm_claim_rma.view_crm_claim_lines_filter
+#: field:crm.claim,invoice_id:0
+#: model:ir.model,name:crm_claim_rma.model_account_invoice
+msgid "Invoice"
+msgstr "Facture"
+
+#. module: crm_claim_rma
+#: field:claim.line,invoice_line_id:0
+#: model:ir.model,name:crm_claim_rma.model_account_invoice_line
+msgid "Invoice Line"
+msgstr "Ligne de facture"
+
+#. module: crm_claim_rma
+#: model:ir.model,name:crm_claim_rma.model_account_invoice_refund
+msgid "Invoice Refund"
+msgstr "Avoir"
+
+#. module: crm_claim_rma
+#: view:crm.claim:crm_claim_rma.crm_claim_rma_form_view
+#: model:ir.actions.act_window,name:crm_claim_rma.act_crm_claim_rma_invoice
+msgid "Invoices"
 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 "La ligne de mouvement liée au produit retourné"
+#: field:claim.line,message_is_follower:0
+#: field:stock.move,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
 
 #. module: crm_claim_rma
-#: view:claim_make_picking.wizard:0
-msgid "or"
-msgstr "ou"
+#: field:claim.line,message_last_post:0 field:stock.move,message_last_post:0
+msgid "Last Message Date"
+msgstr ""
 
 #. module: crm_claim_rma
-#: view:crm.claim:0
+#: field:claim.line,write_uid:0 field:claim_make_picking.wizard,write_uid:0
+#: field:substate.substate,write_uid:0
+msgid "Last Updated by"
+msgstr ""
+
+#. module: crm_claim_rma
+#: field:claim.line,write_date:0 field:claim_make_picking.wizard,write_date:0
+#: field:substate.substate,write_date:0
+msgid "Last Updated on"
+msgstr ""
+
+#. module: crm_claim_rma
+#: field:claim.line,last_state_change:0
+msgid "Last change"
+msgstr "Dernière modification"
+
+#. module: crm_claim_rma
+#: selection:claim.line,claim_origin:0
+msgid "Legal retractation"
+msgstr "Rétracation légale"
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.crm_claim_line_form_view
+msgid "Linked Document"
+msgstr ""
+
+#. module: crm_claim_rma
+#: model:ir.model,name:crm_claim_rma.model_claim_line
+msgid "List of product to return"
+msgstr "Liste des produits à retourner"
+
+#. module: crm_claim_rma
+#: help:claim_make_picking.wizard,claim_line_source_location_id:0
+msgid "Location where the returned products are from."
+msgstr "Emplacement d'ou les produits retournés proviennent."
+
+#. module: crm_claim_rma
+#: help:claim_make_picking.wizard,claim_line_dest_location_id:0
+msgid "Location where the system will stock the returned products."
+msgstr "Emplacement vers lequel le système va stocker les produits retournés."
+
+#. module: crm_claim_rma
+#: view:claim_make_picking.wizard:crm_claim_rma.view_claim_picking
+msgid "Locations"
+msgstr "Emplacements"
+
+#. module: crm_claim_rma
+#: selection:claim.line,claim_origin:0
+msgid "Lost during transport"
+msgstr "Perte pendant le transport"
+
+#. module: crm_claim_rma
+#: model:crm.case.categ,name:crm_claim_rma.categ_claim17
+msgid "Merchandise Not As Described"
+msgstr "Produit ne correspondant pas à sa description"
+
+#. module: crm_claim_rma
+#: model:crm.case.categ,name:crm_claim_rma.categ_claim16
+msgid "Merchandise Not Received"
+msgstr "Marchandise non reçue"
+
+#. module: crm_claim_rma
+#: field:claim.line,message_ids:0 field:stock.move,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: crm_claim_rma
+#: help:claim.line,message_ids:0 help:stock.move,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: crm_claim_rma
+#: model:crm.case.categ,name:crm_claim_rma.categ_claim21
+msgid "Missed Fulfilment Promise"
+msgstr "Promesse de traitement non tenue"
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.view_crm_claim_lines_filter
+msgid "More"
+msgstr "Plus"
+
+#. module: crm_claim_rma
+#: help:claim.line,name:0
+msgid "More precise description of the problem"
+msgstr "Description plus précise du problème"
+
+#. module: crm_claim_rma
+#: field:claim.line,move_in_id:0
+msgid "Move Line from picking in"
+msgstr "Ligne de mouvement d'une réception"
+
+#. module: crm_claim_rma
+#: field:claim.line,move_out_id:0
+msgid "Move Line from picking out"
+msgstr "Ligne de mouvement à partir d'une expédition"
+
+#. module: crm_claim_rma
+#: view:stock.picking:crm_claim_rma.view_picking_internal_search_claim_id
+msgid "Moves created from claims"
+msgstr ""
+
+#. module: crm_claim_rma
+#: view:crm.claim:crm_claim_rma.crm_claim_rma_form_view
+msgid "New Delivery"
+msgstr "Nouvelle livraison"
+
+#. module: crm_claim_rma
+#: view:crm.claim:crm_claim_rma.crm_claim_rma_form_view
+msgid "New Products Return"
+msgstr "Nouveau retour produit"
+
+#. module: crm_claim_rma
+#: view:crm.claim:crm_claim_rma.crm_claim_rma_form_view
+msgid "New Refund"
+msgstr "Nouvel avoir"
+
+#. module: crm_claim_rma
+#: model:crm.case.categ,name:crm_claim_rma.categ_claim10
+msgid "No Inventory"
+msgstr "Plus de stock"
+
+#. module: crm_claim_rma
+#: selection:claim.line,priority:0
+msgid "Normal"
+msgstr ""
+
+#. module: crm_claim_rma
+#: selection:claim.line,priority:0
+msgid "Not Define"
+msgstr ""
+
+#. module: crm_claim_rma
+#: code:addons/crm_claim_rma/models/claim_line.py:65
+#: selection:claim.line,warning:0
+#, python-format
+msgid "Not Defined"
+msgstr ""
+
+#. module: crm_claim_rma
+#: selection:claim.line,claim_origin:0
+msgid "Not specified"
+msgstr "Non spécifié"
+
+#. module: crm_claim_rma
+#: field:claim.line,number:0
+msgid "Number"
+msgstr ""
+
+#. module: crm_claim_rma
+#: selection:claim.line,claim_origin:0
+msgid "Order cancellation"
+msgstr "Annulation de la commande"
+
+#. module: crm_claim_rma
+#: selection:claim.line,claim_origin:0
+msgid "Other"
+msgstr "Autre"
+
+#. module: crm_claim_rma
+#: view:crm.claim:crm_claim_rma.crm_claim_rma_form_view
+#: field:crm.claim,delivery_address_id:0
+msgid "Partner delivery address"
+msgstr ""
+
+#. module: crm_claim_rma
+#: selection:claim.line,claim_origin:0
+msgid "Perfect Conditions"
+msgstr ""
+
+#. module: crm_claim_rma
+#: selection:claim.line,claim_origin:0
+msgid "Physical Damage by Client"
+msgstr ""
+
+#. module: crm_claim_rma
+#: selection:claim.line,claim_origin:0
+msgid "Physical Damage by Company"
+msgstr ""
+
+#. module: crm_claim_rma
+#: view:crm.claim:crm_claim_rma.crm_claim_rma_form_view field:crm.claim,pick:0
+msgid "Pick the product in the store"
+msgstr ""
+
+#. module: crm_claim_rma
+#: model:ir.model,name:crm_claim_rma.model_stock_picking
+msgid "Picking List"
+msgstr "Opération de manutention"
+
+#. module: crm_claim_rma
+#: code:addons/crm_claim_rma/models/claim_line.py:399
+#, python-format
+msgid "Please set invoice first"
+msgstr "S'il vous plaît d'abord définir le facture"
+
+#. module: crm_claim_rma
+#: code:addons/crm_claim_rma/models/claim_line.py:395
+#, python-format
+msgid "Please set product first"
+msgstr "S'il vous plaît d'abord définir le produit"
+
+#. module: crm_claim_rma
+#: model:crm.case.categ,name:crm_claim_rma.categ_claim18
+msgid "Pricing Error"
+msgstr "Erreur d'établissement des prix"
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.view_crm_claim_lines_filter
+#: field:claim.line,priority:0
+msgid "Priority"
+msgstr ""
+
+#. module: crm_claim_rma
+#: help:claim.line,priority:0
+msgid "Priority attention of claim line"
+msgstr ""
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.crm_claim_line_form_view
+msgid "Problem"
+msgstr "Problème"
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.view_crm_claim_lines_filter
+#: field:claim.line,product_id:0
+msgid "Product"
+msgstr "Produit"
+
+#. module: crm_claim_rma
+#: selection:claim.line,claim_diagnosis:0
+msgid "Product Damaged"
+msgstr ""
+
+#. module: crm_claim_rma
+#: selection:claim.line,claim_diagnosis:0
+msgid "Product Repaired"
+msgstr ""
+
+#. module: crm_claim_rma
+#: view:crm.claim:crm_claim_rma.crm_claim_rma_form_view
+msgid "Product Returns"
+msgstr ""
+
+#. module: crm_claim_rma
+#: selection:claim.line,claim_diagnosis:0
+msgid "Product in good condition"
+msgstr ""
+
+#. module: crm_claim_rma
+#: selection:claim.line,claim_diagnosis:0
+msgid "Product with hidden physical damage"
+msgstr ""
+
+#. module: crm_claim_rma
+#: view:crm.claim:crm_claim_rma.crm_claim_rma_form_view
+#: model:ir.actions.act_window,name:crm_claim_rma.act_crm_claim_rma_purchase_orders
+msgid "Purchases"
+msgstr ""
+
+#. module: crm_claim_rma
+#: field:claim.line,product_returned_quantity:0
+msgid "Quantity"
+msgstr "Quantité"
+
+#. module: crm_claim_rma
+#: help:claim.line,product_returned_quantity:0
+msgid "Quantity of product returned"
+msgstr "Quantité de produit retournés"
+
+#. module: crm_claim_rma
+#: model:ir.actions.act_window,name:crm_claim_rma.act_crm_claim_rma_sale_orders
+msgid "Quotations and Sales"
+msgstr ""
+
+#. module: crm_claim_rma
+#: field:crm.claim,picking_ids:0
+msgid "RMA"
+msgstr "RMA"
+
+#. module: crm_claim_rma
+#: help:crm.claim,rma_number:0
+msgid "RMA Number provided by supplier"
+msgstr ""
+
+#. module: crm_claim_rma
+#: field:crm.claim,real_cost:0
+msgid "Real cost"
+msgstr "Coût réél"
+
+#. module: crm_claim_rma
+#: field:crm.claim,real_revenue:0
+msgid "Real revenue"
+msgstr "Revenu réél"
+
+#. module: crm_claim_rma
+#: selection:claim.line,state:0
+msgid "Received, to control"
+msgstr "Reçu, à contrôler"
+
+#. module: crm_claim_rma
+#: view:crm.claim:crm_claim_rma.crm_claim_rma_form_view
+msgid "Receptions / Deliveries"
+msgstr ""
+
+#. module: crm_claim_rma
+#: field:claim.line,refund_line_id:0
+msgid "Refund Line"
+msgstr "Ligne d'avoir"
+
+#. module: crm_claim_rma
+#: view:crm.claim:crm_claim_rma.crm_claim_rma_form_view
+#: field:crm.claim,invoice_ids:0
+#: model:ir.actions.act_window,name:crm_claim_rma.act_crm_claim_rma_refunds
+msgid "Refunds"
+msgstr "Avoirs"
+
+#. module: crm_claim_rma
+#: selection:claim.line,state:0
+msgid "Refused"
+msgstr "Refusé"
+
+#. module: crm_claim_rma
+#: field:claim.line,claim_id:0
+msgid "Related claim"
+msgstr "Réclamation liée"
+
+#. module: crm_claim_rma
+#: help:crm.claim,invoice_id:0
+msgid "Related original Cusotmer invoice"
+msgstr "Facture client d’origine liée"
+
+#. module: crm_claim_rma
+#: model:ir.actions.act_window,name:crm_claim_rma.action_claim_picking_in
+msgid "Return Products"
+msgstr "Produit retourné"
+
+#. module: crm_claim_rma
+#: field:claim.line,location_dest_id:0
+msgid "Return Stock Location"
+msgstr "Emplacement stock de retour"
+
+#. module: crm_claim_rma
+#: field:crm.claim,claim_line_ids:0
+msgid "Return lines"
+msgstr "Lignes de retour"
+
+#. module: crm_claim_rma
+#: view:crm.claim:crm_claim_rma.crm_claim_rma_form_view
+msgid "Returned lines"
+msgstr "Lignes retournées"
+
+#. module: crm_claim_rma
+#: help:claim.line,product_id:0
+msgid "Returned product"
+msgstr "Produit retourné"
+
+#. module: crm_claim_rma
+#: view:crm.claim:crm_claim_rma.crm_claim_rma_form_view
+msgid "Returns"
+msgstr ""
+
+#. module: crm_claim_rma
+#: field:crm.claim,rma_number:0
+msgid "Rma number"
+msgstr ""
+
+#. module: crm_claim_rma
+#: view:crm.claim:crm_claim_rma.crm_claim_rma_form_view
+msgid "Sales"
+msgstr ""
+
+#. module: crm_claim_rma
+#: view:crm.claim:crm_claim_rma.view_crm_case_claims_filter
 msgid "Sales Team"
 msgstr "Équipe de vente"
 
 #. module: crm_claim_rma
-#: model:crm.case.categ,name:crm_claim_rma.categ_claim15
-msgid "Different Item"
-msgstr "Article différent"
+#: view:claim.line:crm_claim_rma.view_crm_claim_lines_filter
+msgid "Search Claims"
+msgstr "Recherche réclamations"
+
+#. 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 "Créer un sous-état pour préciser l'état standard. Exemple 1 : Etat = refusé; le sous-état peut être garantie expirée, pas de garantie, pas de problème,... . Exemple 2 : état = à créer; le sous-état peut être : à rembourser, à échanger, à réparer,..."
+
+#. module: crm_claim_rma
+#: view:claim_make_picking.wizard:crm_claim_rma.view_claim_picking
+msgid "Select exchange lines to add in picking"
+msgstr "Selectionner les lignes à ajouter dans l'expédition/réception"
+
+#. module: crm_claim_rma
+#: view:claim_make_picking.wizard:crm_claim_rma.view_claim_picking
+msgid "Select lines for picking"
+msgstr "Selectionner les lignes pour l'expédition/réception"
+
+#. module: crm_claim_rma
+#: field:crm.claim,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: crm_claim_rma
+#: field:claim.line,prodlot_id:0
+msgid "Serial/Lot number"
+msgstr ""
+
+#. module: crm_claim_rma
+#: model:crm.case.categ,name:crm_claim_rma.categ_claim19
+msgid "Shipping Address Undeliverable"
+msgstr "Mauvaise adresse de livraison"
+
+#. module: crm_claim_rma
+#: selection:claim.line,claim_origin:0
+msgid "Shipping error"
+msgstr "Erreur d'expédition"
+
+#. module: crm_claim_rma
+#: field:claim_make_picking.wizard,claim_line_source_location_id:0
+msgid "Source Location"
+msgstr "Emplacement source"
+
+#. module: crm_claim_rma
+#: view:crm.claim:crm_claim_rma.view_crm_case_claims_filter
+msgid "Stage"
+msgstr ""
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.crm_claim_line_form_view
+#: view:claim.line:crm_claim_rma.view_crm_claim_lines_filter
+#: field:claim.line,state:0
+msgid "State"
+msgstr "Etat"
+
+#. module: crm_claim_rma
+#: model:ir.model,name:crm_claim_rma.model_stock_move
+msgid "Stock Move"
+msgstr "Mouvement de stock"
+
+#. module: crm_claim_rma
+#: field:claim.line,substate_id:0 field:substate.substate,name:0
+msgid "Sub state"
+msgstr "Sous-état"
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.view_crm_claim_lines_filter
+msgid "Substate"
+msgstr "Sous-état"
+
+#. module: crm_claim_rma
+#: field:claim.line,message_summary:0 field:stock.move,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: crm_claim_rma
+#: selection:claim.line,applicable_guarantee:0
+msgid "Supplier"
+msgstr "Fournisseur"
+
+#. module: crm_claim_rma
+#: help:claim.line,invoice_line_id:0
+msgid "The invoice line related to the returned product"
+msgstr "La ligne de facture reliée au produit retourné"
+
+#. 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 "La ligne de mouvement liée au produit retourné"
+
+#. module: crm_claim_rma
+#: code:addons/crm_claim_rma/models/claim_line.py:312
+#, python-format
+msgid "The product has no supplier configured."
+msgstr "Le produit n'a pas de fournisseur défini."
+
+#. module: crm_claim_rma
+#: help:claim.line,refund_line_id:0
+msgid "The refund line related to the returned product"
+msgstr "Ligne d'avoir liée au produit retourné"
+
+#. 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,prodlot_id:0
+msgid "The serial/lot of the returned product"
+msgstr "N° de série/lot du produit retourné"
+
+#. 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 "La limite de garantie est calculé comme: date de facture + garantie définie dans le produit sélectionné."
+
+#. module: crm_claim_rma
+#: code:addons/crm_claim_rma/models/crm_claim.py:40
+#, python-format
+msgid "There is no warehouse for the current user's company."
+msgstr ""
+
+#. module: crm_claim_rma
+#: help:crm.claim,delivery_address_id:0
+msgid "This address will be used to deliver repaired or replacement products."
+msgstr ""
+
+#. module: crm_claim_rma
+#: help:claim.line,claim_diagnosis:0
+msgid "To describe the line product diagnosis"
+msgstr ""
+
+#. module: crm_claim_rma
+#: help:claim.line,claim_origin:0
+msgid "To describe the line product problem"
+msgstr "Pour décrire le problème de la ligne de produit"
+
+#. module: crm_claim_rma
+#: help:substate.substate,substate_descr:0
+msgid "To give more information about the sub state"
+msgstr "Permet de donner plus d'information sur le sous état"
+
+#. module: crm_claim_rma
+#: help:claim.line,claim_id:0
+msgid "To link to the case.claim object"
+msgstr "A relier à l'objet case.claim"
+
+#. module: crm_claim_rma
+#: help:claim.line,last_state_change:0
+msgid "To set thelast state / substate change"
+msgstr ""
+
+#. module: crm_claim_rma
+#: selection:claim.line,state:0
+msgid "Treated"
+msgstr "Traité"
+
+#. module: crm_claim_rma
+#: field:claim.line,unit_sale_price:0
+msgid "Unit sale price"
+msgstr "Prix de vente unitaire"
+
+#. 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 "Prix de vente unitaire du produit. Remplis automatiquement si le retour est effectué avec la sélection de la facture. ETRE VIGILANT ET VERIFIER les valeurs automatiques récupérée différentes des précédents avoir, réductions sur la facture,..."
+
+#. module: crm_claim_rma
+#: field:claim.line,message_unread:0 field:stock.move,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: crm_claim_rma
+#: code:addons/crm_claim_rma/models/claim_line.py:63
+#: selection:claim.line,warning:0
+#, python-format
+msgid "Valid"
+msgstr ""
+
+#. module: crm_claim_rma
+#: selection:claim.line,priority:0
+msgid "Very High"
+msgstr ""
+
+#. module: crm_claim_rma
+#: field:crm.claim,warehouse_id:0
+msgid "Warehouse"
+msgstr "Entrepôt"
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.crm_claim_line_form_view
+#: field:claim.line,warning:0
+msgid "Warranty"
+msgstr "Garantie"
+
+#. module: crm_claim_rma
+#: field:claim.line,warranty_return_partner:0
+msgid "Warranty Address"
+msgstr "Adresse de garantie"
+
+#. module: crm_claim_rma
+#: field:claim.line,guarantee_limit:0
+msgid "Warranty limit"
+msgstr "Limite de la garantie"
+
+#. module: crm_claim_rma
+#: field:claim.line,applicable_guarantee:0 field:claim.line,warranty_type:0
+msgid "Warranty type"
+msgstr "Type de garantie"
+
+#. module: crm_claim_rma
+#: help:claim.line,warranty_return_partner:0
+msgid "Where the customer has to send back the product(s)"
+msgstr "Adresse vers laquelle le client doit renvoyer le(s) produit(s)"
+
+#. 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_claim_make_picking_wizard
 msgid "Wizard to create pickings from claim lines"
-msgstr ""
-"Assistant pour créer des expédition/réceptions à partir des lignes de "
-"réclamation"
+msgstr "Assistant pour créer des expédition/réceptions à partir des lignes de réclamation"
 
 #. module: crm_claim_rma
-#: help:crm.claim,claim_type:0
+#: view:claim_make_picking.wizard:crm_claim_rma.view_claim_picking
+msgid "or"
+msgstr "ou"
+
+#. module: crm_claim_rma
+#: model:ir.model,name:crm_claim_rma.model_substate_substate
+msgid "substate that precise a given state"
+msgstr "Sous état précisant l'état principal"
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.crm_claim_line_view_form_embedded
 msgid ""
-"Customer: from customer to company.\n"
-" Supplier: from company to supplier."
+"{'claim_id': parent.id, 'company_id': parent.company_id, 'warehouse_id': "
+"parent.warehouse_id, 'claim_type': parent.claim_type, 'claim_date': "
+"parent.date}"
 msgstr ""
-"client : du client vers l'entreprise.\n"
-" fournisseur : de l'entreprise vers son fournisseur"
 
 #. module: crm_claim_rma
-#: view:claim.line:0
-msgid "In Progress Claims"
-msgstr "Réclamations en cours"
-
-#. module: crm_claim_rma
-#: code:addons/crm_claim_rma/crm_claim_rma.py:234
-#, python-format
-msgid "The product has no supplier configured."
-msgstr "Le produit n'a pas de fournisseur défini."
+#: view:crm.claim:crm_claim_rma.crm_case_claims_form_view
+msgid "{'create_lines': False}"
+msgstr ""
diff --git a/crm_claim_rma/i18n/pt_BR.po b/crm_claim_rma/i18n/pt_BR.po
index f63f7440..e308f4db 100644
--- a/crm_claim_rma/i18n/pt_BR.po
+++ b/crm_claim_rma/i18n/pt_BR.po
@@ -1,400 +1,58 @@
-# Translation of OpenERP Server.
+# Translation of Odoo Server.
 # This file contains the translation of the following modules:
-#	* crm_claim
-#
+# * crm_claim_rma
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 7.0\n"
+"Project-Id-Version: rma (8.0)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-12-20 18:21+0000\n"
-"PO-Revision-Date: 2014-01-22 19:16+0000\n"
-"Last-Translator: Joël Grand-Guillaume @ camptocamp "
-"<joel.grandguillaume@camptocamp.com>\n"
-"Language-Team: \n"
+"POT-Creation-Date: 2015-11-24 16:07+0000\n"
+"PO-Revision-Date: 2015-11-19 19:00+0000\n"
+"Last-Translator: OCA Transbot <transbot@odoo-community.org>\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/oca/OCA-rma-8-0/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-24 06:50+0000\n"
-"X-Generator: Launchpad (build 17017)\n"
+"Content-Transfer-Encoding: \n"
+"Language: pt_BR\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\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 "Agrupar por..."
-
-#. 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 "Empresa"
-
-#. 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 "Solicitação"
-
-#. 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 "Assunto da Solicitação"
-
-#. 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
+#: code:addons/crm_claim_rma/wizards/claim_make_picking.py:121
 #, 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"
+#: code:addons/crm_claim_rma/wizards/claim_make_picking.py:233
+#, 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
-#: field:claim.line,product_returned_quantity:0
-#: model:ir.model.fields,field_description:crm_claim_rma.field_claim_line_product_returned_quantity
-msgid "Quantity"
+#: code:addons/crm_claim_rma/wizards/claim_make_picking.py:223
+#, 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
-#: selection:claim.line,state:0
-msgid "Confirmed, waiting for product"
+#: code:addons/crm_claim_rma/models/account_invoice.py:75
+#, python-format
+msgid "A refund has already been created for this claim !"
 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"
+#: model:crm.case.section,name:crm_claim_rma.section_after_sales_service
+msgid "After Sales Service"
 msgstr ""
 
 #. module: crm_claim_rma
-#: view:crm.claim:0
-msgid "Stage"
-msgstr "Estágio"
-
-#. 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"
+#: selection:claim.line,applicable_guarantee:0
+msgid "Brand manufacturer"
 msgstr ""
 
 #. module: crm_claim_rma
@@ -403,27 +61,171 @@ 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"
+#: view:claim.line:crm_claim_rma.crm_claim_line_form_view
+msgid "Calculate warranty state"
 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"
+#: view:claim_make_picking.wizard:crm_claim_rma.view_claim_picking
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: crm_claim_rma
+#: code:addons/crm_claim_rma/models/claim_line.py:308
+#, python-format
+msgid "Cannot find any date for invoice. Must be a validated invoice."
 msgstr ""
 
 #. module: crm_claim_rma
-#: view:claim.line:0
-msgid "Linked Document"
+#: field:account.invoice,claim_id:0
+#: model:ir.model,name:crm_claim_rma.model_crm_claim
+#: field:stock.picking,claim_id:0
+msgid "Claim"
+msgstr "Solicitação"
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.crm_claim_line_form_view
+msgid "Claim Line"
 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"
+#: field:claim.line,date:0
+msgid "Claim Line Date"
+msgstr ""
+
+#. module: crm_claim_rma
+#: help:claim.line,number:0
+msgid "Claim Line Identification Number"
+msgstr ""
+
+#. module: crm_claim_rma
+#: field:claim.line,claim_type:0
+msgid "Claim Line Type"
+msgstr ""
+
+#. module: crm_claim_rma
+#: field:claim.line,claim_origin:0
+msgid "Claim Subject"
+msgstr "Assunto da Solicitação"
+
+#. module: crm_claim_rma
+#: help:claim.line,claim_type:0
+msgid "Claim classification"
+msgstr ""
+
+#. module: crm_claim_rma
+#: field:claim.line,claim_diagnosis:0
+msgid "Claim diagnosis"
+msgstr ""
+
+#. module: crm_claim_rma
+#: model:ir.actions.act_window,name:crm_claim_rma.act_crm_claim_substates
+#: model:ir.ui.menu,name:crm_claim_rma.menu_crm_case_claims_claim_line_substates
+msgid "Claim line substates"
+msgstr ""
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.crm_claim_line_tree_view
+#: 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.ui.menu,name:crm_claim_rma.menu_crm_case_claims_claim_lines
+msgid "Claim lines"
+msgstr ""
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.view_crm_claim_lines_filter
+msgid "Claim n°"
+msgstr ""
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.crm_claim_line_form_view
+msgid "Claims"
+msgstr "Solicitações"
+
+#. module: crm_claim_rma
+#: selection:claim.line,applicable_guarantee:0 field:claim.line,company_id:0
+msgid "Company"
+msgstr "Empresa"
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.crm_claim_line_tree_view
+#: view:crm.claim:crm_claim_rma.crm_claim_rma_form_view
+msgid "Compute Warranty"
+msgstr ""
+
+#. module: crm_claim_rma
+#: selection:claim.line,state:0
+msgid "Confirmed, waiting for product"
+msgstr ""
+
+#. module: crm_claim_rma
+#: view:res.partner:crm_claim_rma.view_partner_contact_tree
+msgid "Contacts"
+msgstr ""
+
+#. module: crm_claim_rma
+#: selection:claim.line,state:0
+msgid "Controlled, to treate"
+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.actions.act_window,name:crm_claim_rma.action_claim_picking_out
+msgid "Create Outgoing Shipments"
+msgstr ""
+
+#. module: crm_claim_rma
+#: view:claim_make_picking.wizard:crm_claim_rma.view_claim_picking
+msgid "Create picking"
+msgstr ""
+
+#. module: crm_claim_rma
+#: field:claim.line,create_uid:0 field:claim_make_picking.wizard,create_uid:0
+#: field:substate.substate,create_uid:0
+msgid "Created by"
+msgstr ""
+
+#. module: crm_claim_rma
+#: field:claim.line,create_date:0
+#: field:claim_make_picking.wizard,create_date:0
+#: field:substate.substate,create_date:0
+msgid "Created on"
+msgstr ""
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.view_crm_claim_lines_filter
+msgid "Current"
+msgstr ""
+
+#. module: crm_claim_rma
+#: code:addons/crm_claim_rma/models/crm_claim.py:161
+#, python-format
+msgid "Customer"
+msgstr ""
+
+#. module: crm_claim_rma
+#: code:addons/crm_claim_rma/models/crm_claim.py:165
+#, python-format
+msgid "Customer Email"
+msgstr ""
+
+#. module: crm_claim_rma
+#: model:crm.case.categ,name:crm_claim_rma.categ_claim11
+msgid "Customer Return"
+msgstr ""
+
+#. module: crm_claim_rma
+#: selection:claim.line,claim_origin:0
+msgid "Damaged delivered product"
+msgstr ""
+
+#. module: crm_claim_rma
+#: help:claim.line,message_last_post:0 help:stock.move,message_last_post:0
+msgid "Date of the last message posted on the record."
 msgstr ""
 
 #. module: crm_claim_rma
@@ -432,56 +234,560 @@ msgid "Delivered Late by Carrier"
 msgstr ""
 
 #. module: crm_claim_rma
-#: view:crm.claim:0
-msgid "Product Return"
+#: field:claim.line,name:0 field:substate.substate,substate_descr:0
+msgid "Description"
+msgstr "Descrição"
+
+#. module: crm_claim_rma
+#: field:claim_make_picking.wizard,claim_line_dest_location_id:0
+msgid "Dest. Location"
 msgstr ""
 
 #. module: crm_claim_rma
-#: view:crm.claim:0
+#: model:crm.case.categ,name:crm_claim_rma.categ_claim15
+msgid "Different Item"
+msgstr ""
+
+#. module: crm_claim_rma
+#: selection:claim.line,state:0
+msgid "Draft"
+msgstr "Provisório"
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.view_crm_claim_lines_filter
+msgid "Draft and Open Claims"
+msgstr ""
+
+#. module: crm_claim_rma
+#: code:addons/crm_claim_rma/models/claim_line.py:308
+#: code:addons/crm_claim_rma/models/claim_line.py:312
+#: code:addons/crm_claim_rma/models/claim_line.py:395
+#: code:addons/crm_claim_rma/models/claim_line.py:399
+#: code:addons/crm_claim_rma/wizards/claim_make_picking.py:120
+#: code:addons/crm_claim_rma/wizards/claim_make_picking.py:222
+#: code:addons/crm_claim_rma/wizards/claim_make_picking.py:232
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: crm_claim_rma
+#: selection:claim.line,claim_origin:0
+msgid "Exchange request"
+msgstr ""
+
+#. module: crm_claim_rma
+#: field:crm.claim,planned_cost:0
+msgid "Expected cost"
+msgstr ""
+
+#. module: crm_claim_rma
+#: field:crm.claim,planned_revenue:0
+msgid "Expected revenue"
+msgstr ""
+
+#. module: crm_claim_rma
+#: code:addons/crm_claim_rma/models/claim_line.py:64
+#: selection:claim.line,warning:0
+#, python-format
+msgid "Expired"
+msgstr ""
+
+#. module: crm_claim_rma
+#: view:crm.claim:crm_claim_rma.crm_claim_rma_form_view
+msgid "Follow Up"
+msgstr "Lembrete"
+
+#. module: crm_claim_rma
+#: field:claim.line,message_follower_ids:0
+#: field:stock.move,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: crm_claim_rma
+#: model:crm.case.categ,name:crm_claim_rma.categ_claim13
+msgid "General Adjustement"
+msgstr ""
+
+#. module: crm_claim_rma
+#: view:crm.claim:crm_claim_rma.crm_claim_rma_form_view
 msgid "Generated Documents"
 msgstr ""
 
 #. module: crm_claim_rma
-#: help:claim.line,prodlot_id:0
-msgid "The serial/lot of the returned product"
+#: view:claim.line:crm_claim_rma.view_crm_claim_lines_filter
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.view_crm_claim_lines_filter
+msgid "Grouping by state"
 msgstr ""
 
 #. module: crm_claim_rma
-#: view:crm.claim:0
+#: selection:claim.line,priority:0
+msgid "High"
+msgstr ""
+
+#. module: crm_claim_rma
+#: help:claim.line,message_summary:0 help:stock.move,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
+
+#. module: crm_claim_rma
+#: field:claim.line,id:0 field:claim_make_picking.wizard,id:0
+#: field:substate.substate,id:0
+msgid "ID"
+msgstr ""
+
+#. module: crm_claim_rma
+#: help:claim.line,message_unread:0 help:stock.move,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: crm_claim_rma
+#: help:claim.line,warning:0
+msgid "If warranty has expired"
+msgstr ""
+
+#. module: crm_claim_rma
+#: selection:claim.line,claim_origin:0
+msgid "Imperfection"
+msgstr ""
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.view_crm_claim_lines_filter
+msgid "In Progress"
+msgstr "Em Andamento"
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.view_crm_claim_lines_filter
+msgid "In Progress Claims"
+msgstr "Solicitações em Andamento"
+
+#. 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:claim.line:crm_claim_rma.view_crm_claim_lines_filter
+#: field:crm.claim,invoice_id:0
+#: model:ir.model,name:crm_claim_rma.model_account_invoice
+msgid "Invoice"
+msgstr ""
+
+#. module: crm_claim_rma
+#: field:claim.line,invoice_line_id:0
+#: model:ir.model,name:crm_claim_rma.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: crm_claim_rma
+#: model:ir.model,name:crm_claim_rma.model_account_invoice_refund
+msgid "Invoice Refund"
+msgstr ""
+
+#. module: crm_claim_rma
+#: view:crm.claim:crm_claim_rma.crm_claim_rma_form_view
+#: model:ir.actions.act_window,name:crm_claim_rma.act_crm_claim_rma_invoice
+msgid "Invoices"
+msgstr ""
+
+#. module: crm_claim_rma
+#: field:claim.line,message_is_follower:0
+#: field:stock.move,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: crm_claim_rma
+#: field:claim.line,message_last_post:0 field:stock.move,message_last_post:0
+msgid "Last Message Date"
+msgstr ""
+
+#. module: crm_claim_rma
+#: field:claim.line,write_uid:0 field:claim_make_picking.wizard,write_uid:0
+#: field:substate.substate,write_uid:0
+msgid "Last Updated by"
+msgstr ""
+
+#. module: crm_claim_rma
+#: field:claim.line,write_date:0 field:claim_make_picking.wizard,write_date:0
+#: field:substate.substate,write_date:0
+msgid "Last Updated on"
+msgstr ""
+
+#. module: crm_claim_rma
+#: field:claim.line,last_state_change:0
+msgid "Last change"
+msgstr ""
+
+#. module: crm_claim_rma
+#: selection:claim.line,claim_origin:0
+msgid "Legal retractation"
+msgstr ""
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.crm_claim_line_form_view
+msgid "Linked Document"
+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
+#: help:claim_make_picking.wizard,claim_line_source_location_id:0
+msgid "Location where the returned products are from."
+msgstr ""
+
+#. module: crm_claim_rma
+#: help:claim_make_picking.wizard,claim_line_dest_location_id:0
+msgid "Location where the system will stock the returned products."
+msgstr ""
+
+#. module: crm_claim_rma
+#: view:claim_make_picking.wizard:crm_claim_rma.view_claim_picking
+msgid "Locations"
+msgstr ""
+
+#. module: crm_claim_rma
+#: selection:claim.line,claim_origin:0
+msgid "Lost during transport"
+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
+#: model:crm.case.categ,name:crm_claim_rma.categ_claim16
+msgid "Merchandise Not Received"
+msgstr ""
+
+#. module: crm_claim_rma
+#: field:claim.line,message_ids:0 field:stock.move,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: crm_claim_rma
+#: help:claim.line,message_ids:0 help:stock.move,message_ids:0
+msgid "Messages and communication history"
+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:crm_claim_rma.view_crm_claim_lines_filter
+msgid "More"
+msgstr ""
+
+#. module: crm_claim_rma
+#: help:claim.line,name:0
+msgid "More precise description of the problem"
+msgstr ""
+
+#. module: crm_claim_rma
+#: field:claim.line,move_in_id:0
+msgid "Move Line from picking in"
+msgstr ""
+
+#. module: crm_claim_rma
+#: field:claim.line,move_out_id:0
+msgid "Move Line from picking out"
+msgstr ""
+
+#. module: crm_claim_rma
+#: view:stock.picking:crm_claim_rma.view_picking_internal_search_claim_id
+msgid "Moves created from claims"
+msgstr ""
+
+#. module: crm_claim_rma
+#: view:crm.claim:crm_claim_rma.crm_claim_rma_form_view
+msgid "New Delivery"
+msgstr ""
+
+#. module: crm_claim_rma
+#: view:crm.claim:crm_claim_rma.crm_claim_rma_form_view
+msgid "New Products Return"
+msgstr ""
+
+#. module: crm_claim_rma
+#: view:crm.claim:crm_claim_rma.crm_claim_rma_form_view
 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"
+#: model:crm.case.categ,name:crm_claim_rma.categ_claim10
+msgid "No Inventory"
 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"
+#: selection:claim.line,priority:0
+msgid "Normal"
 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"
+#: selection:claim.line,priority:0
+msgid "Not Define"
+msgstr ""
+
+#. module: crm_claim_rma
+#: code:addons/crm_claim_rma/models/claim_line.py:65
+#: selection:claim.line,warning:0
+#, python-format
+msgid "Not Defined"
+msgstr ""
+
+#. module: crm_claim_rma
+#: selection:claim.line,claim_origin:0
+msgid "Not specified"
+msgstr ""
+
+#. module: crm_claim_rma
+#: field:claim.line,number:0
+msgid "Number"
+msgstr ""
+
+#. module: crm_claim_rma
+#: selection:claim.line,claim_origin:0
+msgid "Order cancellation"
+msgstr ""
+
+#. module: crm_claim_rma
+#: selection:claim.line,claim_origin:0
+msgid "Other"
+msgstr ""
+
+#. module: crm_claim_rma
+#: view:crm.claim:crm_claim_rma.crm_claim_rma_form_view
+#: field:crm.claim,delivery_address_id:0
+msgid "Partner delivery address"
+msgstr ""
+
+#. module: crm_claim_rma
+#: selection:claim.line,claim_origin:0
+msgid "Perfect Conditions"
+msgstr ""
+
+#. module: crm_claim_rma
+#: selection:claim.line,claim_origin:0
+msgid "Physical Damage by Client"
+msgstr ""
+
+#. module: crm_claim_rma
+#: selection:claim.line,claim_origin:0
+msgid "Physical Damage by Company"
+msgstr ""
+
+#. module: crm_claim_rma
+#: view:crm.claim:crm_claim_rma.crm_claim_rma_form_view field:crm.claim,pick:0
+msgid "Pick the product in the store"
+msgstr ""
+
+#. module: crm_claim_rma
+#: model:ir.model,name:crm_claim_rma.model_stock_picking
+msgid "Picking List"
+msgstr ""
+
+#. module: crm_claim_rma
+#: code:addons/crm_claim_rma/models/claim_line.py:399
+#, python-format
+msgid "Please set invoice first"
+msgstr ""
+
+#. module: crm_claim_rma
+#: code:addons/crm_claim_rma/models/claim_line.py:395
+#, python-format
+msgid "Please set product first"
+msgstr ""
+
+#. module: crm_claim_rma
+#: model:crm.case.categ,name:crm_claim_rma.categ_claim18
+msgid "Pricing Error"
+msgstr ""
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.view_crm_claim_lines_filter
+#: field:claim.line,priority:0
+msgid "Priority"
+msgstr ""
+
+#. module: crm_claim_rma
+#: help:claim.line,priority:0
+msgid "Priority attention of claim line"
+msgstr ""
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.crm_claim_line_form_view
+msgid "Problem"
+msgstr ""
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.view_crm_claim_lines_filter
+#: field:claim.line,product_id:0
+msgid "Product"
+msgstr ""
+
+#. module: crm_claim_rma
+#: selection:claim.line,claim_diagnosis:0
+msgid "Product Damaged"
+msgstr ""
+
+#. module: crm_claim_rma
+#: selection:claim.line,claim_diagnosis:0
+msgid "Product Repaired"
+msgstr ""
+
+#. module: crm_claim_rma
+#: view:crm.claim:crm_claim_rma.crm_claim_rma_form_view
+msgid "Product Returns"
+msgstr ""
+
+#. module: crm_claim_rma
+#: selection:claim.line,claim_diagnosis:0
+msgid "Product in good condition"
+msgstr ""
+
+#. module: crm_claim_rma
+#: selection:claim.line,claim_diagnosis:0
+msgid "Product with hidden physical damage"
+msgstr ""
+
+#. module: crm_claim_rma
+#: view:crm.claim:crm_claim_rma.crm_claim_rma_form_view
+#: model:ir.actions.act_window,name:crm_claim_rma.act_crm_claim_rma_purchase_orders
+msgid "Purchases"
+msgstr ""
+
+#. module: crm_claim_rma
+#: field:claim.line,product_returned_quantity:0
+msgid "Quantity"
+msgstr ""
+
+#. module: crm_claim_rma
+#: help:claim.line,product_returned_quantity:0
+msgid "Quantity of product returned"
+msgstr ""
+
+#. module: crm_claim_rma
+#: model:ir.actions.act_window,name:crm_claim_rma.act_crm_claim_rma_sale_orders
+msgid "Quotations and Sales"
+msgstr ""
+
+#. module: crm_claim_rma
+#: field:crm.claim,picking_ids:0
+msgid "RMA"
+msgstr ""
+
+#. module: crm_claim_rma
+#: help:crm.claim,rma_number:0
+msgid "RMA Number provided by supplier"
+msgstr ""
+
+#. module: crm_claim_rma
+#: field:crm.claim,real_cost:0
+msgid "Real cost"
 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"
+#: selection:claim.line,state:0
+msgid "Received, to control"
 msgstr ""
 
+#. module: crm_claim_rma
+#: view:crm.claim:crm_claim_rma.crm_claim_rma_form_view
+msgid "Receptions / Deliveries"
+msgstr ""
+
+#. module: crm_claim_rma
+#: field:claim.line,refund_line_id:0
+msgid "Refund Line"
+msgstr ""
+
+#. module: crm_claim_rma
+#: view:crm.claim:crm_claim_rma.crm_claim_rma_form_view
+#: field:crm.claim,invoice_ids:0
+#: model:ir.actions.act_window,name:crm_claim_rma.act_crm_claim_rma_refunds
+msgid "Refunds"
+msgstr ""
+
+#. module: crm_claim_rma
+#: selection:claim.line,state:0
+msgid "Refused"
+msgstr ""
+
+#. module: crm_claim_rma
+#: field:claim.line,claim_id:0
+msgid "Related claim"
+msgstr ""
+
+#. module: crm_claim_rma
+#: help:crm.claim,invoice_id:0
+msgid "Related original Cusotmer invoice"
+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
+#: field:claim.line,location_dest_id:0
+msgid "Return Stock Location"
+msgstr ""
+
+#. module: crm_claim_rma
+#: field:crm.claim,claim_line_ids:0
+msgid "Return lines"
+msgstr ""
+
+#. module: crm_claim_rma
+#: view:crm.claim:crm_claim_rma.crm_claim_rma_form_view
+msgid "Returned lines"
+msgstr ""
+
+#. module: crm_claim_rma
+#: help:claim.line,product_id:0
+msgid "Returned product"
+msgstr ""
+
+#. module: crm_claim_rma
+#: view:crm.claim:crm_claim_rma.crm_claim_rma_form_view
+msgid "Returns"
+msgstr ""
+
+#. module: crm_claim_rma
+#: field:crm.claim,rma_number:0
+msgid "Rma number"
+msgstr ""
+
+#. module: crm_claim_rma
+#: view:crm.claim:crm_claim_rma.crm_claim_rma_form_view
+msgid "Sales"
+msgstr ""
+
+#. module: crm_claim_rma
+#: view:crm.claim:crm_claim_rma.view_crm_case_claims_filter
+msgid "Sales Team"
+msgstr "Equipe de Vendas"
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.view_crm_claim_lines_filter
+msgid "Search Claims"
+msgstr "Pesquisar Solicitações"
+
 #. module: crm_claim_rma
 #: help:claim.line,substate_id:0
 msgid ""
@@ -492,34 +798,91 @@ msgid ""
 msgstr ""
 
 #. module: crm_claim_rma
-#: view:claim_make_picking.wizard:0
+#: view:claim_make_picking.wizard:crm_claim_rma.view_claim_picking
 msgid "Select exchange lines to add in picking"
 msgstr ""
 
 #. module: crm_claim_rma
-#: selection:claim.line,state:0
-msgid "Draft"
-msgstr "Provisório"
-
-#. module: crm_claim_rma
-#: model:crm.case.categ,name:crm_claim_rma.categ_claim14
-msgid "Could Not Ship"
+#: view:claim_make_picking.wizard:crm_claim_rma.view_claim_picking
+msgid "Select lines for picking"
 msgstr ""
 
 #. module: crm_claim_rma
-#: model:ir.model,name:crm_claim_rma.model_claim_line
-msgid "List of product to return"
+#: field:crm.claim,sequence:0
+msgid "Sequence"
 msgstr ""
 
 #. module: crm_claim_rma
-#: model:crm.case.categ,name:crm_claim_rma.categ_claim10
-msgid "No Inventory"
+#: field:claim.line,prodlot_id:0
+msgid "Serial/Lot number"
 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"
+#: model:crm.case.categ,name:crm_claim_rma.categ_claim19
+msgid "Shipping Address Undeliverable"
+msgstr ""
+
+#. module: crm_claim_rma
+#: selection:claim.line,claim_origin:0
+msgid "Shipping error"
+msgstr ""
+
+#. module: crm_claim_rma
+#: field:claim_make_picking.wizard,claim_line_source_location_id:0
+msgid "Source Location"
+msgstr ""
+
+#. module: crm_claim_rma
+#: view:crm.claim:crm_claim_rma.view_crm_case_claims_filter
+msgid "Stage"
+msgstr "Estágio"
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.crm_claim_line_form_view
+#: view:claim.line:crm_claim_rma.view_crm_claim_lines_filter
+#: field:claim.line,state:0
+msgid "State"
+msgstr ""
+
+#. module: crm_claim_rma
+#: model:ir.model,name:crm_claim_rma.model_stock_move
+msgid "Stock Move"
+msgstr ""
+
+#. module: crm_claim_rma
+#: field:claim.line,substate_id:0 field:substate.substate,name:0
+msgid "Sub state"
+msgstr ""
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.view_crm_claim_lines_filter
+msgid "Substate"
+msgstr ""
+
+#. module: crm_claim_rma
+#: field:claim.line,message_summary:0 field:stock.move,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: crm_claim_rma
+#: selection:claim.line,applicable_guarantee:0
+msgid "Supplier"
+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
+#: 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
+#: code:addons/crm_claim_rma/models/claim_line.py:312
+#, python-format
+msgid "The product has no supplier configured."
 msgstr ""
 
 #. module: crm_claim_rma
@@ -528,14 +891,41 @@ 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"
+#: help:claim.line,location_dest_id:0
+msgid "The return stock location of the returned product"
 msgstr ""
 
 #. module: crm_claim_rma
-#: model:ir.model,name:crm_claim_rma.model_stock_picking_in
-msgid "Incoming Shipments"
+#: help:claim.line,prodlot_id:0
+msgid "The serial/lot of the returned product"
+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
+#: code:addons/crm_claim_rma/models/crm_claim.py:40
+#, python-format
+msgid "There is no warehouse for the current user's company."
+msgstr ""
+
+#. module: crm_claim_rma
+#: help:crm.claim,delivery_address_id:0
+msgid "This address will be used to deliver repaired or replacement products."
+msgstr ""
+
+#. module: crm_claim_rma
+#: help:claim.line,claim_diagnosis:0
+msgid "To describe the line product diagnosis"
+msgstr ""
+
+#. module: crm_claim_rma
+#: help:claim.line,claim_origin:0
+msgid "To describe the line product problem"
 msgstr ""
 
 #. module: crm_claim_rma
@@ -544,32 +934,23 @@ 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"
+#: help:claim.line,claim_id:0
+msgid "To link to the case.claim object"
 msgstr ""
 
 #. module: crm_claim_rma
-#: help:claim_make_picking.wizard,claim_line_source_location:0
-msgid "Location where the returned products are from."
+#: help:claim.line,last_state_change:0
+msgid "To set thelast state / substate change"
 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"
+#: selection:claim.line,state:0
+msgid "Treated"
 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°"
+#: field:claim.line,unit_sale_price:0
+msgid "Unit sale price"
 msgstr ""
 
 #. module: crm_claim_rma
@@ -582,224 +963,46 @@ msgid ""
 msgstr ""
 
 #. module: crm_claim_rma
-#: selection:claim.line,claim_origin:0
-msgid "Damaged delivered product"
+#: field:claim.line,message_unread:0 field:stock.move,message_unread:0
+msgid "Unread Messages"
 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
+#: code:addons/crm_claim_rma/models/claim_line.py:63
+#: selection:claim.line,warning:0
 #, python-format
-msgid "There is no warehouse for the current user's company."
+msgid "Valid"
 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"
+#: selection:claim.line,priority:0
+msgid "Very High"
 msgstr ""
 
 #. module: crm_claim_rma
-#: view:crm.claim:0
-msgid "Action"
+#: field:crm.claim,warehouse_id:0
+msgid "Warehouse"
 msgstr ""
 
 #. module: crm_claim_rma
-#: view:claim.line:0
-#: view:crm.claim:0
-msgid "Claims"
-msgstr "Solicitações"
-
-#. module: crm_claim_rma
-#: view:claim.line:0
-msgid "Problem"
+#: view:claim.line:crm_claim_rma.crm_claim_line_form_view
+#: field:claim.line,warning:0
+msgid "Warranty"
 msgstr ""
 
 #. module: crm_claim_rma
-#: selection:claim.line,state:0
-msgid "Treated"
+#: field:claim.line,warranty_return_partner:0
+msgid "Warranty Address"
 msgstr ""
 
 #. module: crm_claim_rma
-#: model:crm.case.categ,name:crm_claim_rma.categ_claim16
-msgid "Merchandise Not Received"
+#: field:claim.line,guarantee_limit:0
+msgid "Warranty limit"
 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 "Cancelar"
-
-#. 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 "Em Andamento"
-
-#. 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 "Descrição"
-
-#. module: crm_claim_rma
-#: view:claim.line:0
-msgid "Search Claims"
-msgstr "Pesquisar Solicitações"
-
-#. 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"
+#: field:claim.line,applicable_guarantee:0 field:claim.line,warranty_type:0
+msgid "Warranty type"
 msgstr ""
 
 #. module: crm_claim_rma
@@ -808,78 +1011,13 @@ msgid "Where the customer has to send back the product(s)"
 msgstr ""
 
 #. module: crm_claim_rma
-#: view:crm.claim:0
-msgid "Follow Up"
-msgstr "Lembrete"
-
-#. 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 "Equipe de Vendas"
-
-#. module: crm_claim_rma
-#: model:crm.case.categ,name:crm_claim_rma.categ_claim15
-msgid "Different Item"
+#: 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
@@ -888,19 +1026,24 @@ msgid "Wizard to create pickings from claim lines"
 msgstr ""
 
 #. module: crm_claim_rma
-#: help:crm.claim,claim_type:0
+#: view:claim_make_picking.wizard:crm_claim_rma.view_claim_picking
+msgid "or"
+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
+#: view:claim.line:crm_claim_rma.crm_claim_line_view_form_embedded
 msgid ""
-"Customer: from customer to company.\n"
-" Supplier: from company to supplier."
+"{'claim_id': parent.id, 'company_id': parent.company_id, 'warehouse_id': "
+"parent.warehouse_id, 'claim_type': parent.claim_type, 'claim_date': "
+"parent.date}"
 msgstr ""
 
 #. module: crm_claim_rma
-#: view:claim.line:0
-msgid "In Progress Claims"
-msgstr "Solicitações em Andamento"
-
-#. module: crm_claim_rma
-#: code:addons/crm_claim_rma/crm_claim_rma.py:234
-#, python-format
-msgid "The product has no supplier configured."
+#: view:crm.claim:crm_claim_rma.crm_case_claims_form_view
+msgid "{'create_lines': False}"
 msgstr ""
diff --git a/crm_claim_rma/i18n/ro.po b/crm_claim_rma/i18n/ro.po
new file mode 100644
index 00000000..7ee96ce4
--- /dev/null
+++ b/crm_claim_rma/i18n/ro.po
@@ -0,0 +1,1049 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * crm_claim_rma
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: rma (8.0)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-11-24 16:07+0000\n"
+"PO-Revision-Date: 2015-11-19 19:00+0000\n"
+"Last-Translator: OCA Transbot <transbot@odoo-community.org>\n"
+"Language-Team: Romanian (http://www.transifex.com/oca/OCA-rma-8-0/language/ro/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: ro\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
+
+#. module: crm_claim_rma
+#: code:addons/crm_claim_rma/wizards/claim_make_picking.py:121
+#, python-format
+msgid "A picking has already been created for this claim."
+msgstr ""
+
+#. module: crm_claim_rma
+#: code:addons/crm_claim_rma/wizards/claim_make_picking.py:233
+#, 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
+#: code:addons/crm_claim_rma/wizards/claim_make_picking.py:223
+#, 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/models/account_invoice.py:75
+#, python-format
+msgid "A refund has already been created for this claim !"
+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,applicable_guarantee:0
+msgid "Brand manufacturer"
+msgstr ""
+
+#. module: crm_claim_rma
+#: model:crm.case.categ,name:crm_claim_rma.categ_claim12
+msgid "Buyer Cancelled"
+msgstr ""
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.crm_claim_line_form_view
+msgid "Calculate warranty state"
+msgstr ""
+
+#. module: crm_claim_rma
+#: view:claim_make_picking.wizard:crm_claim_rma.view_claim_picking
+msgid "Cancel"
+msgstr ""
+
+#. module: crm_claim_rma
+#: code:addons/crm_claim_rma/models/claim_line.py:308
+#, python-format
+msgid "Cannot find any date for invoice. Must be a validated invoice."
+msgstr ""
+
+#. module: crm_claim_rma
+#: field:account.invoice,claim_id:0
+#: model:ir.model,name:crm_claim_rma.model_crm_claim
+#: field:stock.picking,claim_id:0
+msgid "Claim"
+msgstr ""
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.crm_claim_line_form_view
+msgid "Claim Line"
+msgstr ""
+
+#. module: crm_claim_rma
+#: field:claim.line,date:0
+msgid "Claim Line Date"
+msgstr ""
+
+#. module: crm_claim_rma
+#: help:claim.line,number:0
+msgid "Claim Line Identification Number"
+msgstr ""
+
+#. module: crm_claim_rma
+#: field:claim.line,claim_type:0
+msgid "Claim Line Type"
+msgstr ""
+
+#. module: crm_claim_rma
+#: field:claim.line,claim_origin:0
+msgid "Claim Subject"
+msgstr ""
+
+#. module: crm_claim_rma
+#: help:claim.line,claim_type:0
+msgid "Claim classification"
+msgstr ""
+
+#. module: crm_claim_rma
+#: field:claim.line,claim_diagnosis:0
+msgid "Claim diagnosis"
+msgstr ""
+
+#. module: crm_claim_rma
+#: model:ir.actions.act_window,name:crm_claim_rma.act_crm_claim_substates
+#: model:ir.ui.menu,name:crm_claim_rma.menu_crm_case_claims_claim_line_substates
+msgid "Claim line substates"
+msgstr ""
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.crm_claim_line_tree_view
+#: 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.ui.menu,name:crm_claim_rma.menu_crm_case_claims_claim_lines
+msgid "Claim lines"
+msgstr ""
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.view_crm_claim_lines_filter
+msgid "Claim n°"
+msgstr ""
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.crm_claim_line_form_view
+msgid "Claims"
+msgstr ""
+
+#. module: crm_claim_rma
+#: selection:claim.line,applicable_guarantee:0 field:claim.line,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.crm_claim_line_tree_view
+#: view:crm.claim:crm_claim_rma.crm_claim_rma_form_view
+msgid "Compute Warranty"
+msgstr ""
+
+#. module: crm_claim_rma
+#: selection:claim.line,state:0
+msgid "Confirmed, waiting for product"
+msgstr ""
+
+#. module: crm_claim_rma
+#: view:res.partner:crm_claim_rma.view_partner_contact_tree
+msgid "Contacts"
+msgstr ""
+
+#. module: crm_claim_rma
+#: selection:claim.line,state:0
+msgid "Controlled, to treate"
+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.actions.act_window,name:crm_claim_rma.action_claim_picking_out
+msgid "Create Outgoing Shipments"
+msgstr ""
+
+#. module: crm_claim_rma
+#: view:claim_make_picking.wizard:crm_claim_rma.view_claim_picking
+msgid "Create picking"
+msgstr ""
+
+#. module: crm_claim_rma
+#: field:claim.line,create_uid:0 field:claim_make_picking.wizard,create_uid:0
+#: field:substate.substate,create_uid:0
+msgid "Created by"
+msgstr ""
+
+#. module: crm_claim_rma
+#: field:claim.line,create_date:0
+#: field:claim_make_picking.wizard,create_date:0
+#: field:substate.substate,create_date:0
+msgid "Created on"
+msgstr ""
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.view_crm_claim_lines_filter
+msgid "Current"
+msgstr ""
+
+#. module: crm_claim_rma
+#: code:addons/crm_claim_rma/models/crm_claim.py:161
+#, python-format
+msgid "Customer"
+msgstr ""
+
+#. module: crm_claim_rma
+#: code:addons/crm_claim_rma/models/crm_claim.py:165
+#, python-format
+msgid "Customer Email"
+msgstr ""
+
+#. module: crm_claim_rma
+#: model:crm.case.categ,name:crm_claim_rma.categ_claim11
+msgid "Customer Return"
+msgstr ""
+
+#. module: crm_claim_rma
+#: selection:claim.line,claim_origin:0
+msgid "Damaged delivered product"
+msgstr ""
+
+#. module: crm_claim_rma
+#: help:claim.line,message_last_post:0 help:stock.move,message_last_post:0
+msgid "Date of the last message posted on the record."
+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
+#: field:claim.line,name:0 field:substate.substate,substate_descr:0
+msgid "Description"
+msgstr ""
+
+#. module: crm_claim_rma
+#: field:claim_make_picking.wizard,claim_line_dest_location_id:0
+msgid "Dest. Location"
+msgstr ""
+
+#. module: crm_claim_rma
+#: model:crm.case.categ,name:crm_claim_rma.categ_claim15
+msgid "Different Item"
+msgstr ""
+
+#. module: crm_claim_rma
+#: selection:claim.line,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.view_crm_claim_lines_filter
+msgid "Draft and Open Claims"
+msgstr ""
+
+#. module: crm_claim_rma
+#: code:addons/crm_claim_rma/models/claim_line.py:308
+#: code:addons/crm_claim_rma/models/claim_line.py:312
+#: code:addons/crm_claim_rma/models/claim_line.py:395
+#: code:addons/crm_claim_rma/models/claim_line.py:399
+#: code:addons/crm_claim_rma/wizards/claim_make_picking.py:120
+#: code:addons/crm_claim_rma/wizards/claim_make_picking.py:222
+#: code:addons/crm_claim_rma/wizards/claim_make_picking.py:232
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: crm_claim_rma
+#: selection:claim.line,claim_origin:0
+msgid "Exchange request"
+msgstr ""
+
+#. module: crm_claim_rma
+#: field:crm.claim,planned_cost:0
+msgid "Expected cost"
+msgstr ""
+
+#. module: crm_claim_rma
+#: field:crm.claim,planned_revenue:0
+msgid "Expected revenue"
+msgstr ""
+
+#. module: crm_claim_rma
+#: code:addons/crm_claim_rma/models/claim_line.py:64
+#: selection:claim.line,warning:0
+#, python-format
+msgid "Expired"
+msgstr ""
+
+#. module: crm_claim_rma
+#: view:crm.claim:crm_claim_rma.crm_claim_rma_form_view
+msgid "Follow Up"
+msgstr ""
+
+#. module: crm_claim_rma
+#: field:claim.line,message_follower_ids:0
+#: field:stock.move,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: crm_claim_rma
+#: model:crm.case.categ,name:crm_claim_rma.categ_claim13
+msgid "General Adjustement"
+msgstr ""
+
+#. module: crm_claim_rma
+#: view:crm.claim:crm_claim_rma.crm_claim_rma_form_view
+msgid "Generated Documents"
+msgstr ""
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.view_crm_claim_lines_filter
+msgid "Group By..."
+msgstr ""
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.view_crm_claim_lines_filter
+msgid "Grouping by state"
+msgstr ""
+
+#. module: crm_claim_rma
+#: selection:claim.line,priority:0
+msgid "High"
+msgstr ""
+
+#. module: crm_claim_rma
+#: help:claim.line,message_summary:0 help:stock.move,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
+
+#. module: crm_claim_rma
+#: field:claim.line,id:0 field:claim_make_picking.wizard,id:0
+#: field:substate.substate,id:0
+msgid "ID"
+msgstr "ID"
+
+#. module: crm_claim_rma
+#: help:claim.line,message_unread:0 help:stock.move,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: crm_claim_rma
+#: help:claim.line,warning:0
+msgid "If warranty has expired"
+msgstr ""
+
+#. module: crm_claim_rma
+#: selection:claim.line,claim_origin:0
+msgid "Imperfection"
+msgstr ""
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.view_crm_claim_lines_filter
+msgid "In Progress"
+msgstr ""
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.view_crm_claim_lines_filter
+msgid "In Progress Claims"
+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:claim.line:crm_claim_rma.view_crm_claim_lines_filter
+#: field:crm.claim,invoice_id:0
+#: model:ir.model,name:crm_claim_rma.model_account_invoice
+msgid "Invoice"
+msgstr ""
+
+#. module: crm_claim_rma
+#: field:claim.line,invoice_line_id:0
+#: model:ir.model,name:crm_claim_rma.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: crm_claim_rma
+#: model:ir.model,name:crm_claim_rma.model_account_invoice_refund
+msgid "Invoice Refund"
+msgstr ""
+
+#. module: crm_claim_rma
+#: view:crm.claim:crm_claim_rma.crm_claim_rma_form_view
+#: model:ir.actions.act_window,name:crm_claim_rma.act_crm_claim_rma_invoice
+msgid "Invoices"
+msgstr ""
+
+#. module: crm_claim_rma
+#: field:claim.line,message_is_follower:0
+#: field:stock.move,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: crm_claim_rma
+#: field:claim.line,message_last_post:0 field:stock.move,message_last_post:0
+msgid "Last Message Date"
+msgstr ""
+
+#. module: crm_claim_rma
+#: field:claim.line,write_uid:0 field:claim_make_picking.wizard,write_uid:0
+#: field:substate.substate,write_uid:0
+msgid "Last Updated by"
+msgstr ""
+
+#. module: crm_claim_rma
+#: field:claim.line,write_date:0 field:claim_make_picking.wizard,write_date:0
+#: field:substate.substate,write_date:0
+msgid "Last Updated on"
+msgstr ""
+
+#. module: crm_claim_rma
+#: field:claim.line,last_state_change:0
+msgid "Last change"
+msgstr ""
+
+#. module: crm_claim_rma
+#: selection:claim.line,claim_origin:0
+msgid "Legal retractation"
+msgstr ""
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.crm_claim_line_form_view
+msgid "Linked Document"
+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
+#: help:claim_make_picking.wizard,claim_line_source_location_id:0
+msgid "Location where the returned products are from."
+msgstr ""
+
+#. module: crm_claim_rma
+#: help:claim_make_picking.wizard,claim_line_dest_location_id:0
+msgid "Location where the system will stock the returned products."
+msgstr ""
+
+#. module: crm_claim_rma
+#: view:claim_make_picking.wizard:crm_claim_rma.view_claim_picking
+msgid "Locations"
+msgstr ""
+
+#. module: crm_claim_rma
+#: selection:claim.line,claim_origin:0
+msgid "Lost during transport"
+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
+#: model:crm.case.categ,name:crm_claim_rma.categ_claim16
+msgid "Merchandise Not Received"
+msgstr ""
+
+#. module: crm_claim_rma
+#: field:claim.line,message_ids:0 field:stock.move,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: crm_claim_rma
+#: help:claim.line,message_ids:0 help:stock.move,message_ids:0
+msgid "Messages and communication history"
+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:crm_claim_rma.view_crm_claim_lines_filter
+msgid "More"
+msgstr ""
+
+#. module: crm_claim_rma
+#: help:claim.line,name:0
+msgid "More precise description of the problem"
+msgstr ""
+
+#. module: crm_claim_rma
+#: field:claim.line,move_in_id:0
+msgid "Move Line from picking in"
+msgstr ""
+
+#. module: crm_claim_rma
+#: field:claim.line,move_out_id:0
+msgid "Move Line from picking out"
+msgstr ""
+
+#. module: crm_claim_rma
+#: view:stock.picking:crm_claim_rma.view_picking_internal_search_claim_id
+msgid "Moves created from claims"
+msgstr ""
+
+#. module: crm_claim_rma
+#: view:crm.claim:crm_claim_rma.crm_claim_rma_form_view
+msgid "New Delivery"
+msgstr ""
+
+#. module: crm_claim_rma
+#: view:crm.claim:crm_claim_rma.crm_claim_rma_form_view
+msgid "New Products Return"
+msgstr ""
+
+#. module: crm_claim_rma
+#: view:crm.claim:crm_claim_rma.crm_claim_rma_form_view
+msgid "New Refund"
+msgstr ""
+
+#. module: crm_claim_rma
+#: model:crm.case.categ,name:crm_claim_rma.categ_claim10
+msgid "No Inventory"
+msgstr ""
+
+#. module: crm_claim_rma
+#: selection:claim.line,priority:0
+msgid "Normal"
+msgstr ""
+
+#. module: crm_claim_rma
+#: selection:claim.line,priority:0
+msgid "Not Define"
+msgstr ""
+
+#. module: crm_claim_rma
+#: code:addons/crm_claim_rma/models/claim_line.py:65
+#: selection:claim.line,warning:0
+#, python-format
+msgid "Not Defined"
+msgstr ""
+
+#. module: crm_claim_rma
+#: selection:claim.line,claim_origin:0
+msgid "Not specified"
+msgstr ""
+
+#. module: crm_claim_rma
+#: field:claim.line,number:0
+msgid "Number"
+msgstr ""
+
+#. module: crm_claim_rma
+#: selection:claim.line,claim_origin:0
+msgid "Order cancellation"
+msgstr ""
+
+#. module: crm_claim_rma
+#: selection:claim.line,claim_origin:0
+msgid "Other"
+msgstr ""
+
+#. module: crm_claim_rma
+#: view:crm.claim:crm_claim_rma.crm_claim_rma_form_view
+#: field:crm.claim,delivery_address_id:0
+msgid "Partner delivery address"
+msgstr ""
+
+#. module: crm_claim_rma
+#: selection:claim.line,claim_origin:0
+msgid "Perfect Conditions"
+msgstr ""
+
+#. module: crm_claim_rma
+#: selection:claim.line,claim_origin:0
+msgid "Physical Damage by Client"
+msgstr ""
+
+#. module: crm_claim_rma
+#: selection:claim.line,claim_origin:0
+msgid "Physical Damage by Company"
+msgstr ""
+
+#. module: crm_claim_rma
+#: view:crm.claim:crm_claim_rma.crm_claim_rma_form_view field:crm.claim,pick:0
+msgid "Pick the product in the store"
+msgstr ""
+
+#. module: crm_claim_rma
+#: model:ir.model,name:crm_claim_rma.model_stock_picking
+msgid "Picking List"
+msgstr ""
+
+#. module: crm_claim_rma
+#: code:addons/crm_claim_rma/models/claim_line.py:399
+#, python-format
+msgid "Please set invoice first"
+msgstr ""
+
+#. module: crm_claim_rma
+#: code:addons/crm_claim_rma/models/claim_line.py:395
+#, python-format
+msgid "Please set product first"
+msgstr ""
+
+#. module: crm_claim_rma
+#: model:crm.case.categ,name:crm_claim_rma.categ_claim18
+msgid "Pricing Error"
+msgstr ""
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.view_crm_claim_lines_filter
+#: field:claim.line,priority:0
+msgid "Priority"
+msgstr ""
+
+#. module: crm_claim_rma
+#: help:claim.line,priority:0
+msgid "Priority attention of claim line"
+msgstr ""
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.crm_claim_line_form_view
+msgid "Problem"
+msgstr ""
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.view_crm_claim_lines_filter
+#: field:claim.line,product_id:0
+msgid "Product"
+msgstr ""
+
+#. module: crm_claim_rma
+#: selection:claim.line,claim_diagnosis:0
+msgid "Product Damaged"
+msgstr ""
+
+#. module: crm_claim_rma
+#: selection:claim.line,claim_diagnosis:0
+msgid "Product Repaired"
+msgstr ""
+
+#. module: crm_claim_rma
+#: view:crm.claim:crm_claim_rma.crm_claim_rma_form_view
+msgid "Product Returns"
+msgstr ""
+
+#. module: crm_claim_rma
+#: selection:claim.line,claim_diagnosis:0
+msgid "Product in good condition"
+msgstr ""
+
+#. module: crm_claim_rma
+#: selection:claim.line,claim_diagnosis:0
+msgid "Product with hidden physical damage"
+msgstr ""
+
+#. module: crm_claim_rma
+#: view:crm.claim:crm_claim_rma.crm_claim_rma_form_view
+#: model:ir.actions.act_window,name:crm_claim_rma.act_crm_claim_rma_purchase_orders
+msgid "Purchases"
+msgstr ""
+
+#. module: crm_claim_rma
+#: field:claim.line,product_returned_quantity:0
+msgid "Quantity"
+msgstr ""
+
+#. module: crm_claim_rma
+#: help:claim.line,product_returned_quantity:0
+msgid "Quantity of product returned"
+msgstr ""
+
+#. module: crm_claim_rma
+#: model:ir.actions.act_window,name:crm_claim_rma.act_crm_claim_rma_sale_orders
+msgid "Quotations and Sales"
+msgstr ""
+
+#. module: crm_claim_rma
+#: field:crm.claim,picking_ids:0
+msgid "RMA"
+msgstr ""
+
+#. module: crm_claim_rma
+#: help:crm.claim,rma_number:0
+msgid "RMA Number provided by supplier"
+msgstr ""
+
+#. module: crm_claim_rma
+#: field:crm.claim,real_cost:0
+msgid "Real cost"
+msgstr ""
+
+#. module: crm_claim_rma
+#: field:crm.claim,real_revenue:0
+msgid "Real revenue"
+msgstr ""
+
+#. module: crm_claim_rma
+#: selection:claim.line,state:0
+msgid "Received, to control"
+msgstr ""
+
+#. module: crm_claim_rma
+#: view:crm.claim:crm_claim_rma.crm_claim_rma_form_view
+msgid "Receptions / Deliveries"
+msgstr ""
+
+#. module: crm_claim_rma
+#: field:claim.line,refund_line_id:0
+msgid "Refund Line"
+msgstr ""
+
+#. module: crm_claim_rma
+#: view:crm.claim:crm_claim_rma.crm_claim_rma_form_view
+#: field:crm.claim,invoice_ids:0
+#: model:ir.actions.act_window,name:crm_claim_rma.act_crm_claim_rma_refunds
+msgid "Refunds"
+msgstr ""
+
+#. module: crm_claim_rma
+#: selection:claim.line,state:0
+msgid "Refused"
+msgstr ""
+
+#. module: crm_claim_rma
+#: field:claim.line,claim_id:0
+msgid "Related claim"
+msgstr ""
+
+#. module: crm_claim_rma
+#: help:crm.claim,invoice_id:0
+msgid "Related original Cusotmer invoice"
+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
+#: field:claim.line,location_dest_id:0
+msgid "Return Stock Location"
+msgstr ""
+
+#. module: crm_claim_rma
+#: field:crm.claim,claim_line_ids:0
+msgid "Return lines"
+msgstr ""
+
+#. module: crm_claim_rma
+#: view:crm.claim:crm_claim_rma.crm_claim_rma_form_view
+msgid "Returned lines"
+msgstr ""
+
+#. module: crm_claim_rma
+#: help:claim.line,product_id:0
+msgid "Returned product"
+msgstr ""
+
+#. module: crm_claim_rma
+#: view:crm.claim:crm_claim_rma.crm_claim_rma_form_view
+msgid "Returns"
+msgstr ""
+
+#. module: crm_claim_rma
+#: field:crm.claim,rma_number:0
+msgid "Rma number"
+msgstr ""
+
+#. module: crm_claim_rma
+#: view:crm.claim:crm_claim_rma.crm_claim_rma_form_view
+msgid "Sales"
+msgstr ""
+
+#. module: crm_claim_rma
+#: view:crm.claim:crm_claim_rma.view_crm_case_claims_filter
+msgid "Sales Team"
+msgstr ""
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.view_crm_claim_lines_filter
+msgid "Search Claims"
+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:crm_claim_rma.view_claim_picking
+msgid "Select exchange lines to add in picking"
+msgstr ""
+
+#. module: crm_claim_rma
+#: view:claim_make_picking.wizard:crm_claim_rma.view_claim_picking
+msgid "Select lines for picking"
+msgstr ""
+
+#. module: crm_claim_rma
+#: field:crm.claim,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: crm_claim_rma
+#: field:claim.line,prodlot_id:0
+msgid "Serial/Lot number"
+msgstr ""
+
+#. module: crm_claim_rma
+#: model:crm.case.categ,name:crm_claim_rma.categ_claim19
+msgid "Shipping Address Undeliverable"
+msgstr ""
+
+#. module: crm_claim_rma
+#: selection:claim.line,claim_origin:0
+msgid "Shipping error"
+msgstr ""
+
+#. module: crm_claim_rma
+#: field:claim_make_picking.wizard,claim_line_source_location_id:0
+msgid "Source Location"
+msgstr ""
+
+#. module: crm_claim_rma
+#: view:crm.claim:crm_claim_rma.view_crm_case_claims_filter
+msgid "Stage"
+msgstr ""
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.crm_claim_line_form_view
+#: view:claim.line:crm_claim_rma.view_crm_claim_lines_filter
+#: field:claim.line,state:0
+msgid "State"
+msgstr ""
+
+#. module: crm_claim_rma
+#: model:ir.model,name:crm_claim_rma.model_stock_move
+msgid "Stock Move"
+msgstr ""
+
+#. module: crm_claim_rma
+#: field:claim.line,substate_id:0 field:substate.substate,name:0
+msgid "Sub state"
+msgstr ""
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.view_crm_claim_lines_filter
+msgid "Substate"
+msgstr ""
+
+#. module: crm_claim_rma
+#: field:claim.line,message_summary:0 field:stock.move,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: crm_claim_rma
+#: selection:claim.line,applicable_guarantee:0
+msgid "Supplier"
+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
+#: 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
+#: code:addons/crm_claim_rma/models/claim_line.py:312
+#, python-format
+msgid "The product has no supplier configured."
+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
+#: help:claim.line,location_dest_id:0
+msgid "The return stock location of the returned product"
+msgstr ""
+
+#. module: crm_claim_rma
+#: help:claim.line,prodlot_id:0
+msgid "The serial/lot of the returned product"
+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
+#: code:addons/crm_claim_rma/models/crm_claim.py:40
+#, python-format
+msgid "There is no warehouse for the current user's company."
+msgstr ""
+
+#. module: crm_claim_rma
+#: help:crm.claim,delivery_address_id:0
+msgid "This address will be used to deliver repaired or replacement products."
+msgstr ""
+
+#. module: crm_claim_rma
+#: help:claim.line,claim_diagnosis:0
+msgid "To describe the line product diagnosis"
+msgstr ""
+
+#. module: crm_claim_rma
+#: help:claim.line,claim_origin:0
+msgid "To describe the line product problem"
+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
+#: help:claim.line,claim_id:0
+msgid "To link to the case.claim object"
+msgstr ""
+
+#. module: crm_claim_rma
+#: help:claim.line,last_state_change:0
+msgid "To set thelast state / substate change"
+msgstr ""
+
+#. module: crm_claim_rma
+#: selection:claim.line,state:0
+msgid "Treated"
+msgstr ""
+
+#. module: crm_claim_rma
+#: field:claim.line,unit_sale_price:0
+msgid "Unit sale price"
+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
+#: field:claim.line,message_unread:0 field:stock.move,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: crm_claim_rma
+#: code:addons/crm_claim_rma/models/claim_line.py:63
+#: selection:claim.line,warning:0
+#, python-format
+msgid "Valid"
+msgstr ""
+
+#. module: crm_claim_rma
+#: selection:claim.line,priority:0
+msgid "Very High"
+msgstr ""
+
+#. module: crm_claim_rma
+#: field:crm.claim,warehouse_id:0
+msgid "Warehouse"
+msgstr ""
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.crm_claim_line_form_view
+#: field:claim.line,warning:0
+msgid "Warranty"
+msgstr ""
+
+#. module: crm_claim_rma
+#: field:claim.line,warranty_return_partner:0
+msgid "Warranty Address"
+msgstr ""
+
+#. module: crm_claim_rma
+#: field:claim.line,guarantee_limit:0
+msgid "Warranty limit"
+msgstr ""
+
+#. module: crm_claim_rma
+#: field:claim.line,applicable_guarantee:0 field:claim.line,warranty_type:0
+msgid "Warranty type"
+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
+#: 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_claim_make_picking_wizard
+msgid "Wizard to create pickings from claim lines"
+msgstr ""
+
+#. module: crm_claim_rma
+#: view:claim_make_picking.wizard:crm_claim_rma.view_claim_picking
+msgid "or"
+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
+#: view:claim.line:crm_claim_rma.crm_claim_line_view_form_embedded
+msgid ""
+"{'claim_id': parent.id, 'company_id': parent.company_id, 'warehouse_id': "
+"parent.warehouse_id, 'claim_type': parent.claim_type, 'claim_date': "
+"parent.date}"
+msgstr ""
+
+#. module: crm_claim_rma
+#: view:crm.claim:crm_claim_rma.crm_case_claims_form_view
+msgid "{'create_lines': False}"
+msgstr ""
diff --git a/crm_claim_rma_code/i18n/en.po b/crm_claim_rma_code/i18n/en.po
new file mode 100644
index 00000000..950ea928
--- /dev/null
+++ b/crm_claim_rma_code/i18n/en.po
@@ -0,0 +1,23 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * crm_claim_rma_code
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: rma (8.0)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-11-24 16:07+0000\n"
+"PO-Revision-Date: 2015-11-03 17:05+0000\n"
+"Last-Translator: OCA Transbot <transbot@odoo-community.org>\n"
+"Language-Team: English (http://www.transifex.com/oca/OCA-rma-8-0/language/en/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: en\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. module: crm_claim_rma_code
+#: field:crm.claim.type,ir_sequence_id:0
+msgid "Sequence Code"
+msgstr "Sequence Code"
diff --git a/crm_rma_location/i18n/es.po b/crm_rma_location/i18n/es.po
index 27daafb3..2b4adfa4 100644
--- a/crm_rma_location/i18n/es.po
+++ b/crm_rma_location/i18n/es.po
@@ -1,46 +1,48 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
-#	* crm_rma_location
-#
+# * crm_rma_location
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 8.0\n"
+"Project-Id-Version: rma (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"
+"POT-Creation-Date: 2015-11-24 16:07+0000\n"
+"PO-Revision-Date: 2015-11-03 17:06+0000\n"
+"Last-Translator: OCA Transbot <transbot@odoo-community.org>\n"
+"Language-Team: Spanish (http://www.transifex.com/oca/OCA-rma-8-0/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: crm_rma_location
-#: code:addons/crm_rma_location/stock.py:60
+#: code:addons/crm_rma_location/models/stock_warehouse.py:73
 #, python-format
 msgid " Sequence in"
 msgstr "Secuencia de entrada"
 
 #. module: crm_rma_location
-#: code:addons/crm_rma_location/stock.py:72
+#: code:addons/crm_rma_location/models/stock_warehouse.py:83
 #, python-format
 msgid " Sequence internal"
 msgstr "Secuencia interna"
 
 #. module: crm_rma_location
-#: code:addons/crm_rma_location/stock.py:66
+#: code:addons/crm_rma_location/models/stock_warehouse.py:78
 #, python-format
 msgid " Sequence out"
 msgstr "Secuencia de salida"
 
 #. module: crm_rma_location
-#: code:addons/crm_rma_location/stock.py:166
+#: code:addons/crm_rma_location/models/stock_warehouse.py:161
 #, python-format
 msgid "RMA"
 msgstr "RMA"
 
 #. module: crm_rma_location
-#: code:addons/crm_rma_location/stock.py:120
+#: code:addons/crm_rma_location/models/stock_warehouse.py:115
 #, python-format
 msgid "RMA Delivery Orders"
 msgstr "Órdenes de envío de RMA"
@@ -51,7 +53,7 @@ msgid "RMA In Type"
 msgstr "Entradas en RMA"
 
 #. module: crm_rma_location
-#: code:addons/crm_rma_location/stock.py:134
+#: code:addons/crm_rma_location/models/stock_warehouse.py:129
 #, python-format
 msgid "RMA Internal Transfers"
 msgstr "Transferencias internas en RMA"
@@ -72,7 +74,7 @@ msgid "RMA Out Type"
 msgstr "Salidas en RMA"
 
 #. module: crm_rma_location
-#: code:addons/crm_rma_location/stock.py:108
+#: code:addons/crm_rma_location/models/stock_warehouse.py:103
 #, python-format
 msgid "RMA Receipts"
 msgstr "Recepciones de RMA"
@@ -81,4 +83,3 @@ msgstr "Recepciones de RMA"
 #: model:ir.model,name:crm_rma_location.model_stock_warehouse
 msgid "Warehouse"
 msgstr "Almacén"
-
diff --git a/crm_rma_location/i18n/fr.po b/crm_rma_location/i18n/fr.po
new file mode 100644
index 00000000..31f643e9
--- /dev/null
+++ b/crm_rma_location/i18n/fr.po
@@ -0,0 +1,85 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * crm_rma_location
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: rma (8.0)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-11-24 16:07+0000\n"
+"PO-Revision-Date: 2015-11-03 17:05+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: French (http://www.transifex.com/oca/OCA-rma-8-0/language/fr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: fr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#. module: crm_rma_location
+#: code:addons/crm_rma_location/models/stock_warehouse.py:73
+#, python-format
+msgid " Sequence in"
+msgstr ""
+
+#. module: crm_rma_location
+#: code:addons/crm_rma_location/models/stock_warehouse.py:83
+#, python-format
+msgid " Sequence internal"
+msgstr ""
+
+#. module: crm_rma_location
+#: code:addons/crm_rma_location/models/stock_warehouse.py:78
+#, python-format
+msgid " Sequence out"
+msgstr ""
+
+#. module: crm_rma_location
+#: code:addons/crm_rma_location/models/stock_warehouse.py:161
+#, python-format
+msgid "RMA"
+msgstr "RMA"
+
+#. module: crm_rma_location
+#: code:addons/crm_rma_location/models/stock_warehouse.py:115
+#, 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/models/stock_warehouse.py:129
+#, 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/models/stock_warehouse.py:103
+#, python-format
+msgid "RMA Receipts"
+msgstr ""
+
+#. module: crm_rma_location
+#: model:ir.model,name:crm_rma_location.model_stock_warehouse
+msgid "Warehouse"
+msgstr "Entrepôt"
diff --git a/crm_rma_lot_mass_return/i18n/en.po b/crm_rma_lot_mass_return/i18n/en.po
new file mode 100644
index 00000000..0be034d5
--- /dev/null
+++ b/crm_rma_lot_mass_return/i18n/en.po
@@ -0,0 +1,310 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * crm_rma_lot_mass_return
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: rma (8.0)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-11-24 16:07+0000\n"
+"PO-Revision-Date: 2015-11-19 22:20+0000\n"
+"Last-Translator: OCA Transbot <transbot@odoo-community.org>\n"
+"Language-Team: English (http://www.transifex.com/oca/OCA-rma-8-0/language/en/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: en\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. module: crm_rma_lot_mass_return
+#: code:addons/crm_rma_lot_mass_return/wizards/returned_lines_from_serial.py:67
+#, python-format
+msgid "(ID: %s) - %s - %s"
+msgstr "(ID: %s) - %s - %s"
+
+#. module: crm_rma_lot_mass_return
+#: code:addons/crm_rma_lot_mass_return/wizards/returned_lines_from_serial.py:72
+#, python-format
+msgid "(ID: %s) - %s - %s - %s"
+msgstr "(ID: %s) - %s - %s - %s"
+
+#. module: crm_rma_lot_mass_return
+#. openerp-web
+#: code:addons/crm_rma_lot_mass_return/static/src/js/barcode_text.js:90
+#, python-format
+msgid "-->"
+msgstr "-->"
+
+#. module: crm_rma_lot_mass_return
+#: view:crm.claim:crm_rma_lot_mass_return.crm_claim_rma_form_view_meta
+msgid "Add claim lines using serial or invoice number"
+msgstr "Add claim lines using serial or invoice number"
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Add items to the claim"
+msgstr "Add items to the claim"
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "All the valid lines will be added to the claim"
+msgstr "All the valid lines will be added to the claim"
+
+#. module: crm_rma_lot_mass_return
+#: model:ir.model,name:crm_rma_lot_mass_return.model_crm_claim
+msgid "Claim"
+msgstr "Claim"
+
+#. module: crm_rma_lot_mass_return
+#: field:claim.line.wizard,create_uid:0
+#: field:returned.lines.from.serial.wizard,create_uid:0
+msgid "Created by"
+msgstr "Created by"
+
+#. module: crm_rma_lot_mass_return
+#: field:claim.line.wizard,create_date:0
+#: field:returned.lines.from.serial.wizard,create_date:0
+msgid "Created on"
+msgstr "Created on"
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Damaged Delivered Product"
+msgstr "Damaged Delivered Product"
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Example: A4JD6JHS"
+msgstr "Example: A4JD6JHS"
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Example: A4JD6JHS*4*The display is break"
+msgstr "Example: A4JD6JHS*4*The display is break"
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Exchange request"
+msgstr "Exchange request"
+
+#. module: crm_rma_lot_mass_return
+#: help:returned.lines.from.serial.wizard,scan_data:0
+msgid "Field used to load and show the products"
+msgstr "Field used to load and show the products"
+
+#. module: crm_rma_lot_mass_return
+#: help:returned.lines.from.serial.wizard,option_ids:0
+msgid "Field used to load the ids of invoice lines in invoices writed"
+msgstr "Field used to load the ids of invoice lines in invoices writed"
+
+#. module: crm_rma_lot_mass_return
+#: help:returned.lines.from.serial.wizard,scaned_data:0
+msgid "Field used to load the ids of products loaded"
+msgstr "Field used to load the ids of products loaded"
+
+#. module: crm_rma_lot_mass_return
+#: help:returned.lines.from.serial.wizard,lines_list_id:0
+msgid "Field used to show the current status of the lots loaded"
+msgstr "Field used to show the current status of the lots loaded"
+
+#. module: crm_rma_lot_mass_return
+#: help:returned.lines.from.serial.wizard,current_status:0
+msgid ""
+"Field used to show the current status of the product loaded(Name and "
+"quantity)"
+msgstr "Field used to show the current status of the product loaded(Name and quantity)"
+
+#. module: crm_rma_lot_mass_return
+#: field:claim.line.wizard,id:0 field:returned.lines.from.serial.wizard,id:0
+msgid "ID"
+msgstr "ID"
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Imperfection"
+msgstr "Imperfection"
+
+#. module: crm_rma_lot_mass_return
+#: field:claim.line.wizard,invoice_line_id:0
+#: help:claim.line.wizard,invoice_line_id:0
+msgid "Invoice Line"
+msgstr "Invoice Line"
+
+#. module: crm_rma_lot_mass_return
+#: field:returned.lines.from.serial.wizard,option_ids:0
+msgid "Invoice Lines to Select"
+msgstr "Invoice Lines to Select"
+
+#. module: crm_rma_lot_mass_return
+#: field:claim.line.wizard,write_uid:0
+#: field:returned.lines.from.serial.wizard,write_uid:0
+msgid "Last Updated by"
+msgstr "Last Updated by"
+
+#. module: crm_rma_lot_mass_return
+#: field:claim.line.wizard,write_date:0
+#: field:returned.lines.from.serial.wizard,write_date:0
+msgid "Last Updated on"
+msgstr "Last Updated on"
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Legal retractation"
+msgstr "Legal retractation"
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Lost during transport"
+msgstr "Lost during transport"
+
+#. module: crm_rma_lot_mass_return
+#: field:claim.line.wizard,lot_id:0
+msgid "Lot"
+msgstr "Lot"
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Not specified"
+msgstr "Not specified"
+
+#. module: crm_rma_lot_mass_return
+#. openerp-web
+#: code:addons/crm_rma_lot_mass_return/static/src/js/barcode_text.js:93
+#, python-format
+msgid "Ok"
+msgstr "Ok"
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Order Cancellation"
+msgstr "Order Cancellation"
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Other"
+msgstr "Other"
+
+#. module: crm_rma_lot_mass_return
+#: field:returned.lines.from.serial.wizard,partner_id:0
+msgid "Partner"
+msgstr "Partner"
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Perfect Conditions"
+msgstr "Perfect Conditions"
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Physical Damage by Client"
+msgstr "Physical Damage by Client"
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Physical Damage by Company"
+msgstr "Physical Damage by Company"
+
+#. module: crm_rma_lot_mass_return
+#: field:claim.line.wizard,product_id:0
+msgid "Product"
+msgstr "Product"
+
+#. module: crm_rma_lot_mass_return
+#: help:claim.line.wizard,lot_id:0 help:claim.line.wizard,product_id:0
+msgid "Product to claim"
+msgstr "Product to claim"
+
+#. module: crm_rma_lot_mass_return
+#: field:returned.lines.from.serial.wizard,scan_data:0
+#: field:returned.lines.from.serial.wizard,scaned_data:0
+msgid "Products"
+msgstr "Products"
+
+#. module: crm_rma_lot_mass_return
+#: field:returned.lines.from.serial.wizard,lines_list_id:0
+msgid "Products selected"
+msgstr "Products selected"
+
+#. module: crm_rma_lot_mass_return
+#: code:addons/crm_rma_lot_mass_return/wizards/returned_lines_from_serial.py:210
+#, python-format
+msgid "Search Product"
+msgstr "Search Product"
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Serial/Lot Number*reason number*Description here"
+msgstr "Serial/Lot Number*reason number*Description here"
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Shipping error"
+msgstr "Shipping error"
+
+#. module: crm_rma_lot_mass_return
+#: field:returned.lines.from.serial.wizard,current_status:0
+msgid "Status"
+msgstr "Status"
+
+#. module: crm_rma_lot_mass_return
+#: code:addons/crm_rma_lot_mass_return/wizards/returned_lines_from_serial.py:590
+#, python-format
+msgid ""
+"The following Serial/Lot numbers won't be added, because all of them (listed below) are currently in use:\n"
+"\n"
+" %s"
+msgstr "The following Serial/Lot numbers won't be added, because all of them (listed below) are currently in use:\n\n %s"
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid ""
+"The format for writing the reason for the claim and\n"
+"                            the description is:"
+msgstr "The format for writing the reason for the claim and\n                            the description is:"
+
+#. module: crm_rma_lot_mass_return
+#: code:addons/crm_rma_lot_mass_return/wizards/returned_lines_from_serial.py:399
+#, python-format
+msgid "The product or invoice %s was not found"
+msgstr "The product or invoice %s was not found"
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "The reasons for the claim can be"
+msgstr "The reasons for the claim can be"
+
+#. module: crm_rma_lot_mass_return
+#: view:crm.claim:crm_rma_lot_mass_return.crm_claim_rma_form_view_meta
+msgid "True"
+msgstr "True"
+
+#. 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"
+msgstr "Wizard to create product return lines"
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Write the Invoice Number to search the products in lines"
+msgstr "Write the Invoice Number to search the products in lines"
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Write the Serial/Lot Number to search the product"
+msgstr "Write the Serial/Lot Number to search the product"
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "You are about to add new lines to the claim, Do you want to continue?."
+msgstr "You are about to add new lines to the claim, Do you want to continue?."
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "You should use this windows on this way."
+msgstr "You should use this windows on this way."
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "or"
+msgstr "or"
diff --git a/crm_rma_lot_mass_return/i18n/es.po b/crm_rma_lot_mass_return/i18n/es.po
index 1da58818..68026cca 100644
--- a/crm_rma_lot_mass_return/i18n/es.po
+++ b/crm_rma_lot_mass_return/i18n/es.po
@@ -1,47 +1,92 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
-#	* crm_rma_lot_mass_return
-#
+# * crm_rma_lot_mass_return
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 8.0\n"
+"Project-Id-Version: rma (8.0)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-07-21 01:59+0000\n"
-"PO-Revision-Date: 2015-07-21 01:59+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
+"POT-Creation-Date: 2015-11-24 16:07+0000\n"
+"PO-Revision-Date: 2015-11-19 22:20+0000\n"
+"Last-Translator: OCA Transbot <transbot@odoo-community.org>\n"
+"Language-Team: Spanish (http://www.transifex.com/oca/OCA-rma-8-0/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. module: crm_rma_lot_mass_return
+#: code:addons/crm_rma_lot_mass_return/wizards/returned_lines_from_serial.py:67
+#, python-format
+msgid "(ID: %s) - %s - %s"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: code:addons/crm_rma_lot_mass_return/wizards/returned_lines_from_serial.py:72
+#, python-format
+msgid "(ID: %s) - %s - %s - %s"
+msgstr ""
 
 #. module: crm_rma_lot_mass_return
 #. openerp-web
-#: code:addons/crm_rma_lot_mass_return/static/src/js/barcode_text.js:89
+#: code:addons/crm_rma_lot_mass_return/static/src/js/barcode_text.js:90
 #, python-format
 msgid "-->"
 msgstr "-->"
 
+#. module: crm_rma_lot_mass_return
+#: view:crm.claim:crm_rma_lot_mass_return.crm_claim_rma_form_view_meta
+msgid "Add claim lines using serial or invoice number"
+msgstr "Agregar devoluciones usando número de serial o de factura"
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Add items to the claim"
+msgstr "Añadir productos a la reclamación"
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "All the valid lines will be added to the claim"
+msgstr ""
+
 #. module: crm_rma_lot_mass_return
 #: model:ir.model,name:crm_rma_lot_mass_return.model_crm_claim
 msgid "Claim"
 msgstr "Reclamo"
 
 #. module: crm_rma_lot_mass_return
+#: field:claim.line.wizard,create_uid:0
 #: field:returned.lines.from.serial.wizard,create_uid:0
 msgid "Created by"
 msgstr "Creado por"
 
 #. module: crm_rma_lot_mass_return
+#: field:claim.line.wizard,create_date:0
 #: field:returned.lines.from.serial.wizard,create_date:0
 msgid "Created on"
 msgstr "Creado en"
 
 #. module: crm_rma_lot_mass_return
-#: code:addons/crm_rma_lot_mass_return/wizards/returned_lines_from_serial.py:111
-#, python-format
-msgid "Error!"
-msgstr "Error!"
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Damaged Delivered Product"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Example: A4JD6JHS"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Example: A4JD6JHS*4*The display is break"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Exchange request"
+msgstr "Solicitar cambio"
 
 #. module: crm_rma_lot_mass_return
 #: help:returned.lines.from.serial.wizard,scan_data:0
@@ -49,7 +94,7 @@ msgid "Field used to load and show the products"
 msgstr "Campo usado para cargar y ver los productos"
 
 #. module: crm_rma_lot_mass_return
-#: help:returned.lines.from.serial.wizard,lines_id:0
+#: help:returned.lines.from.serial.wizard,option_ids:0
 msgid "Field used to load the ids of invoice lines in invoices writed"
 msgstr "Campo usado para cargar los ids de las líneas de factura en facturas editadas"
 
@@ -60,56 +105,116 @@ msgstr "Campo usado para cargar los ids de los productos cargados"
 
 #. module: crm_rma_lot_mass_return
 #: help:returned.lines.from.serial.wizard,lines_list_id:0
-msgid "Field used to show the current status of the invoice lines loaded"
-msgstr "Campo usado para visualizar el estado actual de las línea de factura cargadas"
+msgid "Field used to show the current status of the lots loaded"
+msgstr ""
 
 #. module: crm_rma_lot_mass_return
 #: help:returned.lines.from.serial.wizard,current_status:0
-msgid "Field used to show the current status of the product loaded(Name and quantity)"
+msgid ""
+"Field used to show the current status of the product loaded(Name and "
+"quantity)"
 msgstr "Campo usado para visualizar el estado actual de los productos cargados (Nombre y cantidad)"
 
 #. module: crm_rma_lot_mass_return
-#: field:returned.lines.from.serial.wizard,id:0
+#: field:claim.line.wizard,id:0 field:returned.lines.from.serial.wizard,id:0
 msgid "ID"
 msgstr "ID"
 
 #. module: crm_rma_lot_mass_return
-#: field:returned.lines.from.serial.wizard,lines_list_id:0
-msgid "Invoice Lines selected"
-msgstr "Líneas de factura seleccionadas"
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Imperfection"
+msgstr ""
 
 #. module: crm_rma_lot_mass_return
-#: field:returned.lines.from.serial.wizard,lines_id:0
+#: field:claim.line.wizard,invoice_line_id:0
+#: help:claim.line.wizard,invoice_line_id:0
+msgid "Invoice Line"
+msgstr "Línea de factura"
+
+#. module: crm_rma_lot_mass_return
+#: field:returned.lines.from.serial.wizard,option_ids:0
 msgid "Invoice Lines to Select"
 msgstr "Líneas de factura a seleccionar"
 
 #. module: crm_rma_lot_mass_return
+#: field:claim.line.wizard,write_uid:0
 #: field:returned.lines.from.serial.wizard,write_uid:0
 msgid "Last Updated by"
 msgstr "Última actualización hecha por"
 
 #. module: crm_rma_lot_mass_return
+#: field:claim.line.wizard,write_date:0
 #: field:returned.lines.from.serial.wizard,write_date:0
 msgid "Last Updated on"
 msgstr "Última actualización hecha en"
 
 #. module: crm_rma_lot_mass_return
-#: view:crm.claim:crm_rma_lot_mass_return.crm_claim_rma_form_view_meta
-msgid "Add claim lines using serial or invoice number"
-msgstr "Agregar devoluciones usando número de serial o de factura"
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Legal retractation"
+msgstr "Retractación legal"
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Lost during transport"
+msgstr "Perdido durante el transporte"
+
+#. module: crm_rma_lot_mass_return
+#: field:claim.line.wizard,lot_id:0
+msgid "Lot"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Not specified"
+msgstr "No especificado"
 
 #. module: crm_rma_lot_mass_return
 #. openerp-web
-#: code:addons/crm_rma_lot_mass_return/static/src/js/barcode_text.js:90
+#: code:addons/crm_rma_lot_mass_return/static/src/js/barcode_text.js:93
 #, python-format
 msgid "Ok"
 msgstr "Ok"
 
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Order Cancellation"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Other"
+msgstr "Otro"
+
 #. module: crm_rma_lot_mass_return
 #: field:returned.lines.from.serial.wizard,partner_id:0
 msgid "Partner"
 msgstr "Socio"
 
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Perfect Conditions"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Physical Damage by Client"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Physical Damage by Company"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: field:claim.line.wizard,product_id:0
+msgid "Product"
+msgstr "Producto"
+
+#. module: crm_rma_lot_mass_return
+#: help:claim.line.wizard,lot_id:0 help:claim.line.wizard,product_id:0
+msgid "Product to claim"
+msgstr ""
+
 #. module: crm_rma_lot_mass_return
 #: field:returned.lines.from.serial.wizard,scan_data:0
 #: field:returned.lines.from.serial.wizard,scaned_data:0
@@ -117,37 +222,67 @@ msgid "Products"
 msgstr "Productos"
 
 #. module: crm_rma_lot_mass_return
-#: code:addons/crm_rma_lot_mass_return/wizard/returned_lines_from_serial.py:213
+#: field:returned.lines.from.serial.wizard,lines_list_id:0
+msgid "Products selected"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: code:addons/crm_rma_lot_mass_return/wizards/returned_lines_from_serial.py:210
 #, python-format
 msgid "Search Product"
 msgstr "Buscar producto"
 
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Serial/Lot Number*reason number*Description here"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Shipping error"
+msgstr "Error de envío"
+
 #. module: crm_rma_lot_mass_return
 #: field:returned.lines.from.serial.wizard,current_status:0
 msgid "Status"
 msgstr "Estado"
 
 #. module: crm_rma_lot_mass_return
-#: code:addons/crm_rma_lot_mass_return/wizard/returned_lines_from_serial.py:285
+#: code:addons/crm_rma_lot_mass_return/wizards/returned_lines_from_serial.py:590
+#, python-format
+msgid ""
+"The following Serial/Lot numbers won't be added, because all of them (listed below) are currently in use:\n"
+"\n"
+" %s"
+msgstr "los siguientes números de seriales no pueden ser agregados, porque todos ellos (listados abajo) están actualmente en uso:\n\n %s"
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid ""
+"The format for writing the reason for the claim and\n"
+"                            the description is:"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: code:addons/crm_rma_lot_mass_return/wizards/returned_lines_from_serial.py:399
 #, python-format
 msgid "The product or invoice %s was not found"
 msgstr "El producto o factura %s no fué encontrado"
 
 #. module: crm_rma_lot_mass_return
-#: code:addons/crm_rma_lot_mass_return/wizard/returned_lines_from_serial.py:112
-#, python-format
-msgid "There is no warehouse for the current user's company."
-msgstr "No existe un almacén para la compañia del usuario actual"
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "The reasons for the claim can be"
+msgstr ""
 
 #. module: crm_rma_lot_mass_return
-#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
-msgid "Validate the actual picking, it will execute all the validations and the inventory will be affected"
-msgstr "Validar el albarán actual, ejecutará todas las validaciones y el inventario será afectado."
+#: view:crm.claim:crm_rma_lot_mass_return.crm_claim_rma_form_view_meta
+msgid "True"
+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 "Wizard para crear líneas de devolución de productos usando el número de serie o lote"
+msgid "Wizard to create product return lines"
+msgstr ""
 
 #. module: crm_rma_lot_mass_return
 #: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
@@ -171,11 +306,5 @@ msgstr "Deberías usar ésta ventana"
 
 #. module: crm_rma_lot_mass_return
 #: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
-msgid "Add items to the claim"
-msgstr "Añadir productos a la reclamación"
-
-#. module: crm_rma_lot_mass_return
-#: code:addons/crm_rma_lot_mass_return/wizards/returned_lines_from_serial.py:585
-#, python-format
-msgid "The following Serial/Lot numbers won't be added, because all of them (listed below) are currently in use:\n\n %s"
-msgstr "los siguientes números de seriales no pueden ser agregados, porque todos ellos (listados abajo) están actualmente en uso:\n\n %s"
+msgid "or"
+msgstr "o"
diff --git a/crm_rma_lot_mass_return/i18n/fr.po b/crm_rma_lot_mass_return/i18n/fr.po
new file mode 100644
index 00000000..4dd86450
--- /dev/null
+++ b/crm_rma_lot_mass_return/i18n/fr.po
@@ -0,0 +1,310 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * crm_rma_lot_mass_return
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: rma (8.0)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-11-24 16:07+0000\n"
+"PO-Revision-Date: 2015-11-19 22:20+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: French (http://www.transifex.com/oca/OCA-rma-8-0/language/fr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: fr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#. module: crm_rma_lot_mass_return
+#: code:addons/crm_rma_lot_mass_return/wizards/returned_lines_from_serial.py:67
+#, python-format
+msgid "(ID: %s) - %s - %s"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: code:addons/crm_rma_lot_mass_return/wizards/returned_lines_from_serial.py:72
+#, python-format
+msgid "(ID: %s) - %s - %s - %s"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#. openerp-web
+#: code:addons/crm_rma_lot_mass_return/static/src/js/barcode_text.js:90
+#, python-format
+msgid "-->"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: view:crm.claim:crm_rma_lot_mass_return.crm_claim_rma_form_view_meta
+msgid "Add claim lines using serial or invoice number"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Add items to the claim"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "All the valid lines will be added to the claim"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: model:ir.model,name:crm_rma_lot_mass_return.model_crm_claim
+msgid "Claim"
+msgstr "Réclamation"
+
+#. module: crm_rma_lot_mass_return
+#: field:claim.line.wizard,create_uid:0
+#: field:returned.lines.from.serial.wizard,create_uid:0
+msgid "Created by"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: field:claim.line.wizard,create_date:0
+#: field:returned.lines.from.serial.wizard,create_date:0
+msgid "Created on"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Damaged Delivered Product"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Example: A4JD6JHS"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Example: A4JD6JHS*4*The display is break"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Exchange request"
+msgstr "Demande d'échange"
+
+#. module: crm_rma_lot_mass_return
+#: help:returned.lines.from.serial.wizard,scan_data:0
+msgid "Field used to load and show the products"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: help:returned.lines.from.serial.wizard,option_ids:0
+msgid "Field used to load the ids of invoice lines in invoices writed"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: help:returned.lines.from.serial.wizard,scaned_data:0
+msgid "Field used to load the ids of products loaded"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: help:returned.lines.from.serial.wizard,lines_list_id:0
+msgid "Field used to show the current status of the lots loaded"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: help:returned.lines.from.serial.wizard,current_status:0
+msgid ""
+"Field used to show the current status of the product loaded(Name and "
+"quantity)"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: field:claim.line.wizard,id:0 field:returned.lines.from.serial.wizard,id:0
+msgid "ID"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Imperfection"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: field:claim.line.wizard,invoice_line_id:0
+#: help:claim.line.wizard,invoice_line_id:0
+msgid "Invoice Line"
+msgstr "Ligne de facture"
+
+#. module: crm_rma_lot_mass_return
+#: field:returned.lines.from.serial.wizard,option_ids:0
+msgid "Invoice Lines to Select"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: field:claim.line.wizard,write_uid:0
+#: field:returned.lines.from.serial.wizard,write_uid:0
+msgid "Last Updated by"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: field:claim.line.wizard,write_date:0
+#: field:returned.lines.from.serial.wizard,write_date:0
+msgid "Last Updated on"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Legal retractation"
+msgstr "Rétracation légale"
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Lost during transport"
+msgstr "Perte pendant le transport"
+
+#. module: crm_rma_lot_mass_return
+#: field:claim.line.wizard,lot_id:0
+msgid "Lot"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Not specified"
+msgstr "Non spécifié"
+
+#. module: crm_rma_lot_mass_return
+#. openerp-web
+#: code:addons/crm_rma_lot_mass_return/static/src/js/barcode_text.js:93
+#, python-format
+msgid "Ok"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Order Cancellation"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Other"
+msgstr "Autre"
+
+#. module: crm_rma_lot_mass_return
+#: field:returned.lines.from.serial.wizard,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Perfect Conditions"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Physical Damage by Client"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Physical Damage by Company"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: field:claim.line.wizard,product_id:0
+msgid "Product"
+msgstr "Produit"
+
+#. module: crm_rma_lot_mass_return
+#: help:claim.line.wizard,lot_id:0 help:claim.line.wizard,product_id:0
+msgid "Product to claim"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: field:returned.lines.from.serial.wizard,scan_data:0
+#: field:returned.lines.from.serial.wizard,scaned_data:0
+msgid "Products"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: field:returned.lines.from.serial.wizard,lines_list_id:0
+msgid "Products selected"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: code:addons/crm_rma_lot_mass_return/wizards/returned_lines_from_serial.py:210
+#, python-format
+msgid "Search Product"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Serial/Lot Number*reason number*Description here"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Shipping error"
+msgstr "Erreur d'expédition"
+
+#. module: crm_rma_lot_mass_return
+#: field:returned.lines.from.serial.wizard,current_status:0
+msgid "Status"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: code:addons/crm_rma_lot_mass_return/wizards/returned_lines_from_serial.py:590
+#, python-format
+msgid ""
+"The following Serial/Lot numbers won't be added, because all of them (listed below) are currently in use:\n"
+"\n"
+" %s"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid ""
+"The format for writing the reason for the claim and\n"
+"                            the description is:"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: code:addons/crm_rma_lot_mass_return/wizards/returned_lines_from_serial.py:399
+#, python-format
+msgid "The product or invoice %s was not found"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "The reasons for the claim can be"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: view:crm.claim:crm_rma_lot_mass_return.crm_claim_rma_form_view_meta
+msgid "True"
+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"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Write the Invoice Number to search the products in lines"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Write the Serial/Lot Number to search the product"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "You are about to add new lines to the claim, Do you want to continue?."
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "You should use this windows on this way."
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "or"
+msgstr "ou"
diff --git a/crm_rma_lot_mass_return/i18n/pt_BR.po b/crm_rma_lot_mass_return/i18n/pt_BR.po
new file mode 100644
index 00000000..50457863
--- /dev/null
+++ b/crm_rma_lot_mass_return/i18n/pt_BR.po
@@ -0,0 +1,310 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * crm_rma_lot_mass_return
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: rma (8.0)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-11-24 16:07+0000\n"
+"PO-Revision-Date: 2015-11-19 22:20+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/oca/OCA-rma-8-0/language/pt_BR/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: pt_BR\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#. module: crm_rma_lot_mass_return
+#: code:addons/crm_rma_lot_mass_return/wizards/returned_lines_from_serial.py:67
+#, python-format
+msgid "(ID: %s) - %s - %s"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: code:addons/crm_rma_lot_mass_return/wizards/returned_lines_from_serial.py:72
+#, python-format
+msgid "(ID: %s) - %s - %s - %s"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#. openerp-web
+#: code:addons/crm_rma_lot_mass_return/static/src/js/barcode_text.js:90
+#, python-format
+msgid "-->"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: view:crm.claim:crm_rma_lot_mass_return.crm_claim_rma_form_view_meta
+msgid "Add claim lines using serial or invoice number"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Add items to the claim"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "All the valid lines will be added to the claim"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: model:ir.model,name:crm_rma_lot_mass_return.model_crm_claim
+msgid "Claim"
+msgstr "Solicitação"
+
+#. module: crm_rma_lot_mass_return
+#: field:claim.line.wizard,create_uid:0
+#: field:returned.lines.from.serial.wizard,create_uid:0
+msgid "Created by"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: field:claim.line.wizard,create_date:0
+#: field:returned.lines.from.serial.wizard,create_date:0
+msgid "Created on"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Damaged Delivered Product"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Example: A4JD6JHS"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Example: A4JD6JHS*4*The display is break"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Exchange request"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: help:returned.lines.from.serial.wizard,scan_data:0
+msgid "Field used to load and show the products"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: help:returned.lines.from.serial.wizard,option_ids:0
+msgid "Field used to load the ids of invoice lines in invoices writed"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: help:returned.lines.from.serial.wizard,scaned_data:0
+msgid "Field used to load the ids of products loaded"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: help:returned.lines.from.serial.wizard,lines_list_id:0
+msgid "Field used to show the current status of the lots loaded"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: help:returned.lines.from.serial.wizard,current_status:0
+msgid ""
+"Field used to show the current status of the product loaded(Name and "
+"quantity)"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: field:claim.line.wizard,id:0 field:returned.lines.from.serial.wizard,id:0
+msgid "ID"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Imperfection"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: field:claim.line.wizard,invoice_line_id:0
+#: help:claim.line.wizard,invoice_line_id:0
+msgid "Invoice Line"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: field:returned.lines.from.serial.wizard,option_ids:0
+msgid "Invoice Lines to Select"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: field:claim.line.wizard,write_uid:0
+#: field:returned.lines.from.serial.wizard,write_uid:0
+msgid "Last Updated by"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: field:claim.line.wizard,write_date:0
+#: field:returned.lines.from.serial.wizard,write_date:0
+msgid "Last Updated on"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Legal retractation"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Lost during transport"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: field:claim.line.wizard,lot_id:0
+msgid "Lot"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Not specified"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#. openerp-web
+#: code:addons/crm_rma_lot_mass_return/static/src/js/barcode_text.js:93
+#, python-format
+msgid "Ok"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Order Cancellation"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Other"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: field:returned.lines.from.serial.wizard,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Perfect Conditions"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Physical Damage by Client"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Physical Damage by Company"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: field:claim.line.wizard,product_id:0
+msgid "Product"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: help:claim.line.wizard,lot_id:0 help:claim.line.wizard,product_id:0
+msgid "Product to claim"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: field:returned.lines.from.serial.wizard,scan_data:0
+#: field:returned.lines.from.serial.wizard,scaned_data:0
+msgid "Products"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: field:returned.lines.from.serial.wizard,lines_list_id:0
+msgid "Products selected"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: code:addons/crm_rma_lot_mass_return/wizards/returned_lines_from_serial.py:210
+#, python-format
+msgid "Search Product"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Serial/Lot Number*reason number*Description here"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Shipping error"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: field:returned.lines.from.serial.wizard,current_status:0
+msgid "Status"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: code:addons/crm_rma_lot_mass_return/wizards/returned_lines_from_serial.py:590
+#, python-format
+msgid ""
+"The following Serial/Lot numbers won't be added, because all of them (listed below) are currently in use:\n"
+"\n"
+" %s"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid ""
+"The format for writing the reason for the claim and\n"
+"                            the description is:"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: code:addons/crm_rma_lot_mass_return/wizards/returned_lines_from_serial.py:399
+#, python-format
+msgid "The product or invoice %s was not found"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "The reasons for the claim can be"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: view:crm.claim:crm_rma_lot_mass_return.crm_claim_rma_form_view_meta
+msgid "True"
+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"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Write the Invoice Number to search the products in lines"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Write the Serial/Lot Number to search the product"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "You are about to add new lines to the claim, Do you want to continue?."
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "You should use this windows on this way."
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "or"
+msgstr ""
diff --git a/crm_rma_lot_mass_return/i18n/ro.po b/crm_rma_lot_mass_return/i18n/ro.po
new file mode 100644
index 00000000..4a3e8c45
--- /dev/null
+++ b/crm_rma_lot_mass_return/i18n/ro.po
@@ -0,0 +1,310 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * crm_rma_lot_mass_return
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: rma (8.0)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-11-24 16:07+0000\n"
+"PO-Revision-Date: 2015-11-19 22:20+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: Romanian (http://www.transifex.com/oca/OCA-rma-8-0/language/ro/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: ro\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
+
+#. module: crm_rma_lot_mass_return
+#: code:addons/crm_rma_lot_mass_return/wizards/returned_lines_from_serial.py:67
+#, python-format
+msgid "(ID: %s) - %s - %s"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: code:addons/crm_rma_lot_mass_return/wizards/returned_lines_from_serial.py:72
+#, python-format
+msgid "(ID: %s) - %s - %s - %s"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#. openerp-web
+#: code:addons/crm_rma_lot_mass_return/static/src/js/barcode_text.js:90
+#, python-format
+msgid "-->"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: view:crm.claim:crm_rma_lot_mass_return.crm_claim_rma_form_view_meta
+msgid "Add claim lines using serial or invoice number"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Add items to the claim"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "All the valid lines will be added to the claim"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: model:ir.model,name:crm_rma_lot_mass_return.model_crm_claim
+msgid "Claim"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: field:claim.line.wizard,create_uid:0
+#: field:returned.lines.from.serial.wizard,create_uid:0
+msgid "Created by"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: field:claim.line.wizard,create_date:0
+#: field:returned.lines.from.serial.wizard,create_date:0
+msgid "Created on"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Damaged Delivered Product"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Example: A4JD6JHS"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Example: A4JD6JHS*4*The display is break"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Exchange request"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: help:returned.lines.from.serial.wizard,scan_data:0
+msgid "Field used to load and show the products"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: help:returned.lines.from.serial.wizard,option_ids:0
+msgid "Field used to load the ids of invoice lines in invoices writed"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: help:returned.lines.from.serial.wizard,scaned_data:0
+msgid "Field used to load the ids of products loaded"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: help:returned.lines.from.serial.wizard,lines_list_id:0
+msgid "Field used to show the current status of the lots loaded"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: help:returned.lines.from.serial.wizard,current_status:0
+msgid ""
+"Field used to show the current status of the product loaded(Name and "
+"quantity)"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: field:claim.line.wizard,id:0 field:returned.lines.from.serial.wizard,id:0
+msgid "ID"
+msgstr "ID"
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Imperfection"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: field:claim.line.wizard,invoice_line_id:0
+#: help:claim.line.wizard,invoice_line_id:0
+msgid "Invoice Line"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: field:returned.lines.from.serial.wizard,option_ids:0
+msgid "Invoice Lines to Select"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: field:claim.line.wizard,write_uid:0
+#: field:returned.lines.from.serial.wizard,write_uid:0
+msgid "Last Updated by"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: field:claim.line.wizard,write_date:0
+#: field:returned.lines.from.serial.wizard,write_date:0
+msgid "Last Updated on"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Legal retractation"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Lost during transport"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: field:claim.line.wizard,lot_id:0
+msgid "Lot"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Not specified"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#. openerp-web
+#: code:addons/crm_rma_lot_mass_return/static/src/js/barcode_text.js:93
+#, python-format
+msgid "Ok"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Order Cancellation"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Other"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: field:returned.lines.from.serial.wizard,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Perfect Conditions"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Physical Damage by Client"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Physical Damage by Company"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: field:claim.line.wizard,product_id:0
+msgid "Product"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: help:claim.line.wizard,lot_id:0 help:claim.line.wizard,product_id:0
+msgid "Product to claim"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: field:returned.lines.from.serial.wizard,scan_data:0
+#: field:returned.lines.from.serial.wizard,scaned_data:0
+msgid "Products"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: field:returned.lines.from.serial.wizard,lines_list_id:0
+msgid "Products selected"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: code:addons/crm_rma_lot_mass_return/wizards/returned_lines_from_serial.py:210
+#, python-format
+msgid "Search Product"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Serial/Lot Number*reason number*Description here"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Shipping error"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: field:returned.lines.from.serial.wizard,current_status:0
+msgid "Status"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: code:addons/crm_rma_lot_mass_return/wizards/returned_lines_from_serial.py:590
+#, python-format
+msgid ""
+"The following Serial/Lot numbers won't be added, because all of them (listed below) are currently in use:\n"
+"\n"
+" %s"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid ""
+"The format for writing the reason for the claim and\n"
+"                            the description is:"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: code:addons/crm_rma_lot_mass_return/wizards/returned_lines_from_serial.py:399
+#, python-format
+msgid "The product or invoice %s was not found"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "The reasons for the claim can be"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: view:crm.claim:crm_rma_lot_mass_return.crm_claim_rma_form_view_meta
+msgid "True"
+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"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Write the Invoice Number to search the products in lines"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Write the Serial/Lot Number to search the product"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "You are about to add new lines to the claim, Do you want to continue?."
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "You should use this windows on this way."
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "or"
+msgstr ""
diff --git a/crm_rma_prodlot_invoice/i18n/es.po b/crm_rma_prodlot_invoice/i18n/es.po
index 4c967380..e0924a96 100644
--- a/crm_rma_prodlot_invoice/i18n/es.po
+++ b/crm_rma_prodlot_invoice/i18n/es.po
@@ -1,19 +1,58 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
-#	* crm_rma_prodlot_invoice
-#
+# * crm_rma_prodlot_invoice
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 8.0\n"
+"Project-Id-Version: rma (8.0)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-07-17 19:54+0000\n"
-"PO-Revision-Date: 2015-07-17 19:54+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
+"POT-Creation-Date: 2015-11-24 16:07+0000\n"
+"PO-Revision-Date: 2015-11-03 17:06+0000\n"
+"Last-Translator: OCA Transbot <transbot@odoo-community.org>\n"
+"Language-Team: Spanish (http://www.transifex.com/oca/OCA-rma-8-0/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. module: crm_rma_prodlot_invoice
+#: code:addons/crm_rma_prodlot_invoice/models/stock_production_lot.py:39
+#, python-format
+msgid "%s - Lot Number: %s - %s"
+msgstr ""
+
+#. module: crm_rma_prodlot_invoice
+#: field:stock.production.lot,invoice_line_id:0
+msgid "Customer Invoice Line"
+msgstr ""
+
+#. module: crm_rma_prodlot_invoice
+#: help:stock.production.lot,invoice_line_id:0
+msgid "Invoice Line Of Product to Customer Invoice"
+msgstr ""
+
+#. module: crm_rma_prodlot_invoice
+#: model:ir.model,name:crm_rma_prodlot_invoice.model_stock_production_lot
+msgid "Lot/Serial"
+msgstr "Lote/No. de Serie"
+
+#. module: crm_rma_prodlot_invoice
+#: code:addons/crm_rma_prodlot_invoice/models/stock_production_lot.py:41
+#, python-format
+msgid "No lot number"
+msgstr ""
+
+#. module: crm_rma_prodlot_invoice
+#: model:ir.model,name:crm_rma_prodlot_invoice.model_stock_picking
+msgid "Picking List"
+msgstr "Listado de recogida"
+
+#. module: crm_rma_prodlot_invoice
+#: model:ir.model,name:crm_rma_prodlot_invoice.model_stock_transfer_details
+msgid "Picking wizard"
+msgstr "Asistente de albarán"
 
 #. module: crm_rma_prodlot_invoice
 #: model:ir.model,name:crm_rma_prodlot_invoice.model_sale_order
diff --git a/crm_rma_prodlot_invoice/i18n/fr.po b/crm_rma_prodlot_invoice/i18n/fr.po
new file mode 100644
index 00000000..a438441c
--- /dev/null
+++ b/crm_rma_prodlot_invoice/i18n/fr.po
@@ -0,0 +1,65 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * crm_rma_prodlot_invoice
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: rma (8.0)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-11-24 16:07+0000\n"
+"PO-Revision-Date: 2015-11-03 17:06+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: French (http://www.transifex.com/oca/OCA-rma-8-0/language/fr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: fr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#. module: crm_rma_prodlot_invoice
+#: code:addons/crm_rma_prodlot_invoice/models/stock_production_lot.py:39
+#, python-format
+msgid "%s - Lot Number: %s - %s"
+msgstr ""
+
+#. module: crm_rma_prodlot_invoice
+#: field:stock.production.lot,invoice_line_id:0
+msgid "Customer Invoice Line"
+msgstr ""
+
+#. module: crm_rma_prodlot_invoice
+#: help:stock.production.lot,invoice_line_id:0
+msgid "Invoice Line Of Product to Customer Invoice"
+msgstr ""
+
+#. module: crm_rma_prodlot_invoice
+#: model:ir.model,name:crm_rma_prodlot_invoice.model_stock_production_lot
+msgid "Lot/Serial"
+msgstr ""
+
+#. module: crm_rma_prodlot_invoice
+#: code:addons/crm_rma_prodlot_invoice/models/stock_production_lot.py:41
+#, python-format
+msgid "No lot number"
+msgstr ""
+
+#. module: crm_rma_prodlot_invoice
+#: model:ir.model,name:crm_rma_prodlot_invoice.model_stock_picking
+msgid "Picking List"
+msgstr "Opération de manutention"
+
+#. module: crm_rma_prodlot_invoice
+#: model:ir.model,name:crm_rma_prodlot_invoice.model_stock_transfer_details
+msgid "Picking wizard"
+msgstr ""
+
+#. module: crm_rma_prodlot_invoice
+#: model:ir.model,name:crm_rma_prodlot_invoice.model_sale_order
+msgid "Sales Order"
+msgstr ""
+
+#. module: crm_rma_prodlot_invoice
+#: model:ir.model,name:crm_rma_prodlot_invoice.model_sale_order_line
+msgid "Sales Order Line"
+msgstr ""
diff --git a/crm_rma_prodlot_supplier/i18n/es.po b/crm_rma_prodlot_supplier/i18n/es.po
old mode 100755
new mode 100644
index 02e782f7..162fd4bb
--- a/crm_rma_prodlot_supplier/i18n/es.po
+++ b/crm_rma_prodlot_supplier/i18n/es.po
@@ -1,25 +1,32 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
-#	* crm_rma_prodlot_supplier
-#
+# * crm_rma_prodlot_supplier
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 8.0\n"
+"Project-Id-Version: rma (8.0)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-07-17 19:57+0000\n"
-"PO-Revision-Date: 2015-07-17 19:57+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
+"POT-Creation-Date: 2015-11-24 16:07+0000\n"
+"PO-Revision-Date: 2015-11-03 17:06+0000\n"
+"Last-Translator: OCA Transbot <transbot@odoo-community.org>\n"
+"Language-Team: Spanish (http://www.transifex.com/oca/OCA-rma-8-0/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: crm_rma_prodlot_supplier
 #: model:ir.model,name:crm_rma_prodlot_supplier.model_stock_production_lot
 msgid "Lot/Serial"
 msgstr "Lote/No. de Serie"
 
+#. module: crm_rma_prodlot_supplier
+#: model:ir.model,name:crm_rma_prodlot_supplier.model_stock_picking
+msgid "Picking List"
+msgstr "Listado de recogida"
+
 #. module: crm_rma_prodlot_supplier
 #: model:ir.model,name:crm_rma_prodlot_supplier.model_stock_transfer_details
 msgid "Picking wizard"
@@ -30,7 +37,24 @@ msgstr "Asistente de albarán"
 msgid "Supplier"
 msgstr "Proveedor"
 
+#. module: crm_rma_prodlot_supplier
+#: field:stock.production.lot,supplier_invoice_line_id:0
+msgid "Supplier Invoice Line"
+msgstr ""
+
+#. module: crm_rma_prodlot_supplier
+#: help:stock.production.lot,supplier_invoice_line_id:0
+msgid "Supplier invoice with the purchase of goods sold to customer"
+msgstr ""
+
 #. module: crm_rma_prodlot_supplier
 #: help:stock.production.lot,supplier_id:0
 msgid "Supplier of good in claim"
 msgstr "Proveedor del producto en la reclamación"
+
+#. module: crm_rma_prodlot_supplier
+#: view:stock.transfer_details:crm_rma_prodlot_supplier.view_lot_form_supplier_context
+msgid ""
+"{'product_id': product_id,\n"
+"                            'active_id': active_id}"
+msgstr ""
diff --git a/crm_rma_prodlot_supplier/i18n/fr.po b/crm_rma_prodlot_supplier/i18n/fr.po
new file mode 100644
index 00000000..6513bbae
--- /dev/null
+++ b/crm_rma_prodlot_supplier/i18n/fr.po
@@ -0,0 +1,60 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * crm_rma_prodlot_supplier
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: rma (8.0)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-11-24 16:07+0000\n"
+"PO-Revision-Date: 2015-11-03 17:06+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: French (http://www.transifex.com/oca/OCA-rma-8-0/language/fr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: fr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#. module: crm_rma_prodlot_supplier
+#: model:ir.model,name:crm_rma_prodlot_supplier.model_stock_production_lot
+msgid "Lot/Serial"
+msgstr ""
+
+#. module: crm_rma_prodlot_supplier
+#: model:ir.model,name:crm_rma_prodlot_supplier.model_stock_picking
+msgid "Picking List"
+msgstr "Opération de manutention"
+
+#. module: crm_rma_prodlot_supplier
+#: model:ir.model,name:crm_rma_prodlot_supplier.model_stock_transfer_details
+msgid "Picking wizard"
+msgstr ""
+
+#. module: crm_rma_prodlot_supplier
+#: field:stock.production.lot,supplier_id:0
+msgid "Supplier"
+msgstr "Fournisseur"
+
+#. module: crm_rma_prodlot_supplier
+#: field:stock.production.lot,supplier_invoice_line_id:0
+msgid "Supplier Invoice Line"
+msgstr ""
+
+#. module: crm_rma_prodlot_supplier
+#: help:stock.production.lot,supplier_invoice_line_id:0
+msgid "Supplier invoice with the purchase of goods sold to customer"
+msgstr ""
+
+#. module: crm_rma_prodlot_supplier
+#: help:stock.production.lot,supplier_id:0
+msgid "Supplier of good in claim"
+msgstr ""
+
+#. module: crm_rma_prodlot_supplier
+#: view:stock.transfer_details:crm_rma_prodlot_supplier.view_lot_form_supplier_context
+msgid ""
+"{'product_id': product_id,\n"
+"                            'active_id': active_id}"
+msgstr ""
diff --git a/product_warranty/i18n/en.po b/product_warranty/i18n/en.po
new file mode 100644
index 00000000..11075dea
--- /dev/null
+++ b/product_warranty/i18n/en.po
@@ -0,0 +1,164 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * product_warranty
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: rma (8.0)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-11-24 16:07+0000\n"
+"PO-Revision-Date: 2015-11-03 17:06+0000\n"
+"Last-Translator: OCA Transbot <transbot@odoo-community.org>\n"
+"Language-Team: English (http://www.transifex.com/oca/OCA-rma-8-0/language/en/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: en\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. module: product_warranty
+#: field:product.supplierinfo,active_supplier:0
+msgid "Active supplier"
+msgstr "Active supplier"
+
+#. module: product_warranty
+#: model:ir.model,name:product_warranty.model_res_company
+msgid "Companies"
+msgstr "Companies"
+
+#. module: product_warranty
+#: field:return.instruction,create_uid:0
+msgid "Created by"
+msgstr "Created by"
+
+#. module: product_warranty
+#: field:return.instruction,create_date:0
+msgid "Created on"
+msgstr "Created on"
+
+#. module: product_warranty
+#: view:res.company:product_warranty.company_form
+msgid "Crm product return address"
+msgstr "Crm product return address"
+
+#. 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 "Default address where the customers has to send back the returned product. If empty, the address is the company address"
+
+#. module: product_warranty
+#: field:return.instruction,id:0
+msgid "ID"
+msgstr "ID"
+
+#. 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 "If is default, will be use to set the default value in supplier infos. Be careful to have only one default"
+
+#. module: product_warranty
+#: model:ir.model,name:product_warranty.model_product_supplierinfo
+msgid "Information about a product supplier"
+msgstr "Information about a product supplier"
+
+#. 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 "Instructions"
+
+#. 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 "Instructions for product return"
+
+#. module: product_warranty
+#: field:return.instruction,is_default:0
+msgid "Is default"
+msgstr "Is default"
+
+#. module: product_warranty
+#: help:product.supplierinfo,active_supplier:0
+msgid "Is this supplier still active, only for information"
+msgstr "Is this supplier still active, only for information"
+
+#. module: product_warranty
+#: field:return.instruction,write_uid:0
+msgid "Last Updated by"
+msgstr "Last Updated by"
+
+#. module: product_warranty
+#: field:return.instruction,write_date:0
+msgid "Last Updated on"
+msgstr "Last Updated on"
+
+#. module: product_warranty
+#: field:product.supplierinfo,warranty_duration:0
+msgid "Period"
+msgstr "Period"
+
+#. 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 "Products Return Instructions"
+
+#. module: product_warranty
+#: field:product.supplierinfo,warranty_return_other_address:0
+#: field:res.company,crm_return_address_id:0
+msgid "Return address"
+msgstr "Return address"
+
+#. 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 "Return instructions"
+
+#. module: product_warranty
+#: field:product.supplierinfo,warranty_return_partner:0
+msgid "Return type"
+msgstr "Return type"
+
+#. module: product_warranty
+#: field:return.instruction,name:0
+msgid "Title"
+msgstr "Title"
+
+#. 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 "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"
+
+#. module: product_warranty
+#: view:product.supplierinfo:product_warranty.product_supplierinfo_warranty_form_view
+msgid "Warranty informations"
+msgstr "Warranty informations"
+
+#. 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 "Where the customer has to send back the product(s) if warranty return is set to 'other'."
+
+#. 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 "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"
diff --git a/product_warranty/i18n/es.po b/product_warranty/i18n/es.po
index b7902cd8..decd2d8a 100644
--- a/product_warranty/i18n/es.po
+++ b/product_warranty/i18n/es.po
@@ -1,174 +1,31 @@
-# Translation of OpenERP Server.
+# Translation of Odoo Server.
 # This file contains the translation of the following modules:
-# 	* product_warranty
-#
+# * product_warranty
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: product_warranty.es\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2013-11-21 15:06+0000\n"
-"PO-Revision-Date: 2014-01-22 19:43+0000\n"
-"Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\n"
-"Language-Team: Domatix Technologies\n"
+"Project-Id-Version: rma (8.0)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-11-24 16:07+0000\n"
+"PO-Revision-Date: 2015-11-03 17:06+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: Spanish (http://www.transifex.com/oca/OCA-rma-8-0/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-24 06:50+0000\n"
-"X-Generator: Launchpad (build 17017)\n"
-"Language: es_ES\n"
-"X-Poedit-SourceCharset: utf-8\n"
-
-#. module: product_warranty
-#: model:ir.model.fields,field_description:product_warranty.field_product_supplierinfo_warranty_return_address
-#: model:ir.model.fields,field_description:product_warranty.field_product_supplierinfo_warranty_return_other_address_id
-#: field:product.supplierinfo,warranty_return_address:0
-#: field:product.supplierinfo,warranty_return_other_address_id:0
-msgid "Return address"
-msgstr "Dirección de devolución"
-
-#. module: product_warranty
-#: view:product.supplierinfo:0
-msgid "Warranty informations"
-msgstr "Información de garantía"
-
-#. 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 company delivery or default address and so on "
-"for supplier and brand manufacturer. Doesn't necessarily mean that the "
-"warranty to be applied is the one of the return partner (i.e. can be returned "
-"to the company and be under the brand warranty"
-msgstr ""
-"Especifica quién es el responsable del tratamiento de la devolución de "
-"garantía para el cliente final. La compañía utilizará la dirección por "
-"defecto o la dirección de envío de la compañía, y así sucesivamente por "
-"proveedor y marca del fabricante. No significa necesariamente que la "
-"garantía que se aplica es el de la empresa que hace la devolución (es decir: "
-"se puede devolver a la empresa y estar bajo la garantía de la marca)"
-
-#. module: product_warranty
-#: help:product.supplierinfo,warranty_return_other_address_id:0
-msgid ""
-"Where the customer has to send back the product(s) if warranty return is "
-"set to 'other'."
-msgstr ""
-"Dónde debe enviar el cliente de vuelta el/los producto/s si la garantía de "
-"devolución se establece a  'otra'."
-
-#. 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 ""
-"Garantía en meses para este producto/proveedor. Únicamente para relaciones "
-"empresa/proveedor (Orden de compra); la relación cliente/proveedor (Orden de "
-"venta) usa siempre el campo garantía de la ficha de producto."
-
-#. module: product_warranty
-#: view:res.company:0
-msgid "Crm product return address"
-msgstr "Dirección de devolución del producto"
-
-#. 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 "Instrucciones para la devolución del producto"
-
-#. module: product_warranty
-#: model:ir.model.fields,field_description:product_warranty.field_product_supplierinfo_warranty_duration
-#: field:product.supplierinfo,warranty_duration:0
-msgid "Period"
-msgstr "Periodo"
-
-#. module: product_warranty
-#: model:ir.model.fields,field_description:product_warranty.field_return_instruction_name
-#: field:return.instruction,name:0
-msgid "Title"
-msgstr "Título"
-
-#. module: product_warranty
-#: model:ir.model,name:product_warranty.model_res_company
-msgid "Companies"
-msgstr "Compañías"
-
-#. module: product_warranty
-#: model:ir.model.fields,field_description:product_warranty.field_product_supplierinfo_active_supplier
-#: field:product.supplierinfo,active_supplier:0
-msgid "Active supplier"
-msgstr "Proveedor activo"
-
-#. module: product_warranty
-#: model:ir.model.fields,field_description:product_warranty.field_return_instruction_is_default
-#: field:return.instruction,is_default:0
-msgid "Is default"
-msgstr "Por defecto"
-
-#. module: product_warranty
-#: help:product.supplierinfo,warranty_return_address:0
-msgid ""
-"Where the goods should be returned (computed field based on other infos.)"
-msgstr ""
-"Dónde se devolverán los bienes (campo calculado basado en otra información)."
-
-#. 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 ""
-"Si es por defecto, se usará para establecer el valor por defecto en la "
-"información del proveedor. Tenga cuidado de tener sólo un por defecto."
-
-#. 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 "Instrucciones de devolución de los productos"
-
-#. module: product_warranty
-#: model:ir.model,name:product_warranty.model_product_supplierinfo
-msgid "Information about a product supplier"
-msgstr "Información sobre un proveedor de producto"
-
-#. module: product_warranty
-#: help:product.supplierinfo,active_supplier:0
-msgid "Is this supplier still active, only for information"
-msgstr "Indica si el proveedor todavía está activo. Sólo para información."
-
-#. module: product_warranty
-#: model:ir.model.fields,field_description:product_warranty.field_product_supplierinfo_warranty_return_partner
-#: field:product.supplierinfo,warranty_return_partner:0
-msgid "Return type"
-msgstr "Tipo de devolución"
-
-#. module: product_warranty
-#: view:return.instruction:0
-msgid "Return instructions"
-msgstr "Instrucciones de devolución"
-
-#. module: product_warranty
-#: model:ir.model.fields,field_description:product_warranty.field_product_supplierinfo_return_instructions
-#: model:ir.model.fields,field_description:product_warranty.field_return_instruction_instructions
-#: field:product.supplierinfo,return_instructions:0
-#: view:return.instruction:0
-#: field:return.instruction,instructions:0
-msgid "Instructions"
-msgstr "Instrucciones"
+"Content-Transfer-Encoding: \n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: product_warranty
 #: field:product.supplierinfo,active_supplier:0
 msgid "Active supplier"
-msgstr "Proveedor activo"
+msgstr ""
 
 #. module: product_warranty
 #: model:ir.model,name:product_warranty.model_res_company
 msgid "Companies"
-msgstr "Compañías"
+msgstr ""
 
 #. module: product_warranty
 #: field:return.instruction,create_uid:0
@@ -183,12 +40,14 @@ msgstr "Creado en"
 #. module: product_warranty
 #: view:res.company:product_warranty.company_form
 msgid "Crm product return address"
-msgstr "Dirección de devolución del producto"
+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 "Dirección por defecto donde los clientes deben enviar de regresa los productos devueltos. Si está vacío, la dirección es la dirección de la compañía"
+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
@@ -197,98 +56,109 @@ msgstr "ID"
 
 #. 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 "Si es por defecto, se usará para establecer el valor por defecto en la información del proveedor. Tenga cuidado de tener sólo un por defecto."
+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 "Información sobre un proveedor de producto"
+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 "Instrucciones"
+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 "Instrucciones para la devolución del producto"
+msgstr ""
 
 #. module: product_warranty
 #: field:return.instruction,is_default:0
 msgid "Is default"
-msgstr "Por defecto"
+msgstr ""
 
 #. module: product_warranty
 #: help:product.supplierinfo,active_supplier:0
 msgid "Is this supplier still active, only for information"
-msgstr "Indica si el proveedor todavía está activo. Sólo para información."
+msgstr ""
 
 #. module: product_warranty
 #: field:return.instruction,write_uid:0
 msgid "Last Updated by"
-msgstr "Last Updated by"
+msgstr "Última actualización hecha por"
 
 #. module: product_warranty
 #: field:return.instruction,write_date:0
 msgid "Last Updated on"
-msgstr "Last Updated on"
+msgstr "Última actualización hecha en"
 
 #. module: product_warranty
 #: field:product.supplierinfo,warranty_duration:0
 msgid "Period"
-msgstr "Periodo"
+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 "Intrucciones para devolución de productos"
+msgstr ""
 
 #. module: product_warranty
 #: field:product.supplierinfo,warranty_return_other_address:0
 #: field:res.company,crm_return_address_id:0
 msgid "Return address"
-msgstr "Dirección de retorno"
+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 "Instrucciones de devolución"
+msgstr ""
 
 #. module: product_warranty
 #: field:product.supplierinfo,warranty_return_partner:0
 msgid "Return type"
-msgstr "Tipo de devolución"
+msgstr ""
 
 #. module: product_warranty
 #: field:return.instruction,name:0
 msgid "Title"
-msgstr "Título"
+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 "Garantía en meses para la relación producto/proveedor. Sólo para la relación producto/compañía (orden de compra); la relación cliente/compañía (orden de venta) siempre usa el producto principal para el campo garantía"
+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 "Información de garantía"
+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 "Donde el cliente debe enviar el producto si la garantía es 'otros'"
+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 "Quién se encarga del tratamiento de retorno de garantía hacia el cliente final. Compañía utilizará la entrega compagny actual o la dirección por defecto y así sucesivamente para el proveedor y el fabricante de la marca. No significa necessarly que la garantía que se aplica es el de la pareja de retorno (es decir: pueden ser devueltos a la empresa y estar bajo la garantía de la marca"
-
+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/product_warranty/i18n/fr.po b/product_warranty/i18n/fr.po
index 60c3abc7..aee85d79 100644
--- a/product_warranty/i18n/fr.po
+++ b/product_warranty/i18n/fr.po
@@ -1,92 +1,26 @@
-# Translation of OpenERP Server.
+# Translation of Odoo Server.
 # This file contains the translation of the following modules:
-#	* product_warranty
-#
+# * product_warranty
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.2\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2013-11-21 15:06+0000\n"
-"PO-Revision-Date: 2014-01-22 19:17+0000\n"
-"Last-Translator: Joël Grand-Guillaume @ camptocamp "
-"<joel.grandguillaume@camptocamp.com>\n"
-"Language-Team: \n"
+"Project-Id-Version: rma (8.0)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-11-24 16:07+0000\n"
+"PO-Revision-Date: 2015-11-03 17:06+0000\n"
+"Last-Translator: OCA Transbot <transbot@odoo-community.org>\n"
+"Language-Team: French (http://www.transifex.com/oca/OCA-rma-8-0/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-24 06:50+0000\n"
-"X-Generator: Launchpad (build 17017)\n"
+"Content-Transfer-Encoding: \n"
+"Language: fr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. module: product_warranty
-#: model:ir.model.fields,field_description:product_warranty.field_product_supplierinfo_warranty_return_address
-#: model:ir.model.fields,field_description:product_warranty.field_product_supplierinfo_warranty_return_other_address_id
-#: field:product.supplierinfo,warranty_return_address:0
-#: field:product.supplierinfo,warranty_return_other_address_id:0
-msgid "Return address"
-msgstr ""
-
-#. module: product_warranty
-#: view:product.supplierinfo:0
-msgid "Warranty informations"
-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 company delivery or default address and so on "
-"for supplier and brand manufacturer. Doesn't necessarily mean that the "
-"warranty to be applied is the one of the return partner (i.e. can be returned "
-"to the company and be under the brand warranty"
-msgstr ""
-"Indique qui est en charge du traitement du retour garantie envers le client "
-"final. L'entreprise utilise l'adresse de livraison, et sinon l'adresse par "
-"défaut. Il en va de même pour les options fournisseur ou fabricant. Ce champ "
-"n'implique pas forcément que la garantie qui va s'appliquer est celle de "
-"celui qui gère le retour."
-
-#. module: product_warranty
-#: help:product.supplierinfo,warranty_return_other_address_id: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_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 ""
-"Garantie en nombre de mois pour ce fournisseur. Uniquement pour la relation "
-"entreprise/fournisseur (commandes d'achat) ; La relation entreprise/client "
-"(commandes de vente) utilise toujours le champ de garantie de la fiche "
-"produit"
-
-#. module: product_warranty
-#: view:res.company:0
-msgid "Crm product return address"
-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
-#: model:ir.model.fields,field_description:product_warranty.field_product_supplierinfo_warranty_duration
-#: field:product.supplierinfo,warranty_duration:0
-msgid "Period"
-msgstr ""
-
-#. module: product_warranty
-#: model:ir.model.fields,field_description:product_warranty.field_return_instruction_name
-#: field:return.instruction,name:0
-msgid "Title"
-msgstr ""
+#: field:product.supplierinfo,active_supplier:0
+msgid "Active supplier"
+msgstr "Fournisseur actif"
 
 #. module: product_warranty
 #: model:ir.model,name:product_warranty.model_res_company
@@ -94,21 +28,30 @@ msgid "Companies"
 msgstr ""
 
 #. module: product_warranty
-#: model:ir.model.fields,field_description:product_warranty.field_product_supplierinfo_active_supplier
-#: field:product.supplierinfo,active_supplier:0
-msgid "Active supplier"
-msgstr "Fournisseur actif"
-
-#. module: product_warranty
-#: model:ir.model.fields,field_description:product_warranty.field_return_instruction_is_default
-#: field:return.instruction,is_default:0
-msgid "Is default"
+#: field:return.instruction,create_uid:0
+msgid "Created by"
 msgstr ""
 
 #. module: product_warranty
-#: help:product.supplierinfo,warranty_return_address:0
+#: 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 ""
-"Where the goods should be returned (computed field based on other infos.)"
+"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
@@ -118,38 +61,104 @@ msgid ""
 "careful to have only one default"
 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
 #: model:ir.model,name:product_warranty.model_product_supplierinfo
 msgid "Information about a product supplier"
 msgstr "Information sur le fournisseur du produit"
 
+#. 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
-#: model:ir.model.fields,field_description:product_warranty.field_product_supplierinfo_warranty_return_partner
+#: 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
-#: view:return.instruction:0
-msgid "Return instructions"
+#: field:return.instruction,name:0
+msgid "Title"
 msgstr ""
 
 #. module: product_warranty
-#: model:ir.model.fields,field_description:product_warranty.field_product_supplierinfo_return_instructions
-#: model:ir.model.fields,field_description:product_warranty.field_return_instruction_instructions
-#: field:product.supplierinfo,return_instructions:0
-#: view:return.instruction:0
-#: field:return.instruction,instructions:0
-msgid "Instructions"
+#: 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/product_warranty/i18n/ro.po b/product_warranty/i18n/ro.po
new file mode 100644
index 00000000..82aa4446
--- /dev/null
+++ b/product_warranty/i18n/ro.po
@@ -0,0 +1,165 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * product_warranty
+# 
+# Translators:
+# Dorin Hongu <dhongu@gmail.com>, 2015
+msgid ""
+msgstr ""
+"Project-Id-Version: rma (8.0)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-11-24 16:07+0000\n"
+"PO-Revision-Date: 2015-11-03 17:23+0000\n"
+"Last-Translator: Dorin Hongu <dhongu@gmail.com>\n"
+"Language-Team: Romanian (http://www.transifex.com/oca/OCA-rma-8-0/language/ro/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: ro\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\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 "ID"
+
+#. 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 "Instrucțiuni"
+
+#. 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 "Perioadă"
+
+#. 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 "Adresă retur"
+
+#. 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 "Instrucțiuni retur"
+
+#. module: product_warranty
+#: field:product.supplierinfo,warranty_return_partner:0
+msgid "Return type"
+msgstr "Tip retur"
+
+#. 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 ""

From d19c2f8c544e02be4a2b5b23544e757a97da61f0 Mon Sep 17 00:00:00 2001
From: Osval Reyes <osval@vauxoo.com>
Date: Tue, 1 Dec 2015 11:55:43 -0430
Subject: [PATCH 14/19] [DEL] remove module crm_rma_advance_location

---
 crm_rma_advance_location/__init__.py          |  23 ---
 crm_rma_advance_location/__openerp__.py       |  65 -------
 crm_rma_advance_location/claim_rma_view.xml   |  20 ---
 .../i18n/crm_rma_advance_location.pot         | 122 -------------
 crm_rma_advance_location/stock.py             |  39 ----
 crm_rma_advance_location/stock_data.xml       |  36 ----
 crm_rma_advance_location/stock_view.xml       |  47 -----
 crm_rma_advance_location/wizard/__init__.py   |  23 ---
 .../wizard/claim_make_picking.py              |  53 ------
 .../wizard/claim_make_picking_from_picking.py | 169 ------------------
 .../claim_make_picking_from_picking_view.xml  |  63 -------
 .../wizard/claim_make_picking_view.xml        |  22 ---
 12 files changed, 682 deletions(-)
 delete mode 100644 crm_rma_advance_location/__init__.py
 delete mode 100644 crm_rma_advance_location/__openerp__.py
 delete mode 100644 crm_rma_advance_location/claim_rma_view.xml
 delete mode 100644 crm_rma_advance_location/i18n/crm_rma_advance_location.pot
 delete mode 100644 crm_rma_advance_location/stock.py
 delete mode 100644 crm_rma_advance_location/stock_data.xml
 delete mode 100644 crm_rma_advance_location/stock_view.xml
 delete mode 100644 crm_rma_advance_location/wizard/__init__.py
 delete mode 100644 crm_rma_advance_location/wizard/claim_make_picking.py
 delete mode 100644 crm_rma_advance_location/wizard/claim_make_picking_from_picking.py
 delete mode 100644 crm_rma_advance_location/wizard/claim_make_picking_from_picking_view.xml
 delete mode 100644 crm_rma_advance_location/wizard/claim_make_picking_view.xml

diff --git a/crm_rma_advance_location/__init__.py b/crm_rma_advance_location/__init__.py
deleted file mode 100644
index f8cc7f32..00000000
--- a/crm_rma_advance_location/__init__.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    Copyright 2013 Camptocamp
-#    Copyright 2009-2013 Akretion,
-#    Author: Emmanuel Samyn, Raphaël Valyi, Sébastien Beau, Joel Grand-Guillaume
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-from . import stock
-from . import wizard
\ No newline at end of file
diff --git a/crm_rma_advance_location/__openerp__.py b/crm_rma_advance_location/__openerp__.py
deleted file mode 100644
index a6ff5c6d..00000000
--- a/crm_rma_advance_location/__openerp__.py
+++ /dev/null
@@ -1,65 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    Copyright 2013 Camptocamp
-#    Copyright 2009-2013 Akretion,
-#    Author: Emmanuel Samyn, Raphaël Valyi, Sébastien Beau, Joel Grand-Guillaume
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-{'name': 'RMA Claims Advance Location',
- 'version': '1.0',
- 'category': 'Generic Modules/CRM & SRM',
- 'depends': ['crm_claim_rma',
-             'crm_rma_stock_location',
-             ],
- 'author': "Akretion,Odoo Community Association (OCA)",
- 'license': 'AGPL-3',
- 'website': 'http://www.akretion.com',
- 'description': """
-RMA Claim Advance Location
-==========================
-
-This module adds the following location on warehouses :
-
- * Carrier Loss
- * RMA
- * Breakage Loss
- * Refurbish
- * Mistake Loss
-
-And also various wizards on icoming deliveries that allow you to move your goods easily in those
-new locations from a done reception.
-
-Using this module make the logistic flow of return a bit more complexe:
-
- * Returning product goes into RMA location with a incoming shipment
- * From the incoming shipment, forward them to another places (stock, loss,...)
-
-WARNING: Use with caution, this module is currently not yet completely debugged and is waiting his author to be.
-
-""",
-    'images': [],
-    'demo': [],
-    'data': ['wizard/claim_make_picking_from_picking_view.xml',
-              'wizard/claim_make_picking_view.xml',
-              'stock_view.xml',
-              'stock_data.xml',
-              'claim_rma_view.xml',
-    ],
-    'installable': False,
-    'application': True,
-}
diff --git a/crm_rma_advance_location/claim_rma_view.xml b/crm_rma_advance_location/claim_rma_view.xml
deleted file mode 100644
index d4700f8c..00000000
--- a/crm_rma_advance_location/claim_rma_view.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-    <data>
-    <record model="ir.ui.view" id="crm_claim_rma_form_view">
-        <field name="name">CRM - Claim product return Form</field>
-        <field name="model">crm.claim</field>
-        <field name="inherit_id" ref="crm_claim_rma.crm_claim_rma_form_view"/>
-        <field name="arch" type="xml">
-            <xpath expr="//button[@string='New Delivery']" position="after">
-                <button name="%(action_claim_picking_loss)d"
-                                string="New Product Loss" states="open"
-                                type="action" target="new"
-                                context="{'warehouse_id': warehouse_id,
-                                    'partner_id': partner_id}"/>
-            </xpath>
-        </field>
-    </record>
-
-     </data>
-</openerp>
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_advance_location/stock.py b/crm_rma_advance_location/stock.py
deleted file mode 100644
index 6727855a..00000000
--- a/crm_rma_advance_location/stock.py
+++ /dev/null
@@ -1,39 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    Copyright 2013 Camptocamp
-#    Copyright 2009-2013 Akretion, 
-#    Author: Emmanuel Samyn, Raphaël Valyi, Sébastien Beau, Joel Grand-Guillaume
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-from openerp.osv import fields, orm
-
-
-class stock_warehouse(orm.Model):
-
-    _inherit = "stock.warehouse"
-
-    _columns = {
-        'lot_carrier_loss_id': fields.many2one(
-            'stock.location',
-            'Location Carrier Loss'),
-        'lot_breakage_loss_id': fields.many2one(
-            'stock.location',
-            'Location Breakage Loss'),
-        'lot_refurbish_id': fields.many2one(
-            'stock.location',
-            'Location Refurbish'),
-    }
diff --git a/crm_rma_advance_location/stock_data.xml b/crm_rma_advance_location/stock_data.xml
deleted file mode 100644
index 3d48a250..00000000
--- a/crm_rma_advance_location/stock_data.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-    <data noupdate="1">
-        <!--
-        Default Values for : Stock Location
-        -->
-        <record id="stock_location_carrier_loss" model="stock.location">
-            <field name="name">Carrier Loss</field>
-            <field name="usage">internal</field>
-            <field name="location_id" ref="stock.stock_location_company"/>
-        </record>
-        <record id="stock_location_breakage_loss" model="stock.location">
-            <field name="name">Breakage Loss</field>
-            <field name="usage">internal</field>
-            <field name="location_id" ref="stock.stock_location_company"/>
-        </record>
-        <record id="stock_location_refurbish" model="stock.location">
-            <field name="name">Refurbish</field>
-            <field name="usage">internal</field>
-            <field name="location_id" ref="stock.stock_location_company"/>
-        </record>
-        <record id="stock_location_mistake_loss" model="stock.location">
-            <field name="name">Mistake Loss</field>
-            <field name="usage">internal</field>
-            <field name="location_id" ref="stock.stock_location_company"/>
-        </record>
-        <!--
-        Default Values for : Stock Warehouse
-        -->
-        <record id="stock.warehouse0" model="stock.warehouse">
-            <field name="lot_breakage_loss_id" ref="stock_location_breakage_loss"/>
-            <field name="lot_carrier_loss_id" ref="stock_location_carrier_loss"/>
-            <field name="lot_refurbish_id" ref="stock_location_refurbish"/>
-        </record>
-    </data>
-</openerp>
diff --git a/crm_rma_advance_location/stock_view.xml b/crm_rma_advance_location/stock_view.xml
deleted file mode 100644
index fd5554fe..00000000
--- a/crm_rma_advance_location/stock_view.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-        <!-- INHERITED VIEW FOR THE OBJECT : stock_picking -->
-
-        <record id="picking_in_form" model="ir.ui.view">
-            <field name="name">crm_claim_rma.picking_in_form</field>
-            <field name="model">stock.picking.in</field>
-            <field name="inherit_id" ref="stock.view_picking_in_form" />
-            <field name="arch" type="xml">
-                <!-- Those wizard aren't working yet -->
-                <xpath expr="/form/header/button[@string='Return Products']" position="after">
-                        <button name="%(action_stock_picking_from_claim_picking)d" 
-                                string="Product to stock" type="action"
-                                attrs="{'invisible':['|',
-                                                    ('state','&lt;&gt;','done'),
-                                                    ('claim_id', '=', False)]}"/>
-                        <button name="%(action_loss_picking_from_claim_picking)d" 
-                                string="Product to Loss" type="action"
-                                attrs="{'invisible':['|',
-                                                    ('state','&lt;&gt;','done'),
-                                                    ('claim_id', '=', False)]}"/>
-                        <button name="%(action_used_picking_from_claim_picking)d" 
-                                string="Product to refurbish stock" type="action"
-                                attrs="{'invisible':['|',
-                                                    ('state','&lt;&gt;','done'),
-                                                    ('claim_id', '=', False)]}"/>
-                </xpath>
-            </field>
-        </record>
-
-        <record id="warehouse_form" model="ir.ui.view">
-            <field name="name">crm_claim_rma.warehouse_form</field>
-            <field name="model">stock.warehouse</field>
-            <field name="inherit_id" ref="crm_rma_stock_location.view_warehouse_form" />
-            <field name="arch" type="xml">
-                <xpath expr="/form/group/group/field[@name='lot_rma_id']" position="after">
-                    <field name="lot_carrier_loss_id"/>
-                    <field name="lot_breakage_loss_id"/>
-                    <field name="lot_refurbish_id"/>
-                </xpath>
-            </field>
-        </record>
-        
-
-    </data>
-</openerp>
diff --git a/crm_rma_advance_location/wizard/__init__.py b/crm_rma_advance_location/wizard/__init__.py
deleted file mode 100644
index 61d529db..00000000
--- a/crm_rma_advance_location/wizard/__init__.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    Copyright 2013 Camptocamp
-#    Copyright 2009-2013 Akretion, 
-#    Author: Emmanuel Samyn, Raphaël Valyi, Sébastien Beau, Joel Grand-Guillaume
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-from . import claim_make_picking_from_picking
-from . import claim_make_picking
\ No newline at end of file
diff --git a/crm_rma_advance_location/wizard/claim_make_picking.py b/crm_rma_advance_location/wizard/claim_make_picking.py
deleted file mode 100644
index 6228e1b0..00000000
--- a/crm_rma_advance_location/wizard/claim_make_picking.py
+++ /dev/null
@@ -1,53 +0,0 @@
-# -*- coding: utf-8 -*-
-#########################################################################
-#                                                                       #
-#                                                                       #
-#########################################################################
-#                                                                       #
-# crm_claim_rma for OpenERP                                             #
-# Copyright (C) 2009-2012  Akretion, Emmanuel Samyn,                    #
-#       Benoît GUILLOT <benoit.guillot@akretion.com>                    #
-#This program is free software: you can redistribute it and/or modify   #
-#it under the terms of the GNU General Public License as published by   #
-#the Free Software Foundation, either version 3 of the License, or      #
-#(at your option) any later version.                                    #
-#                                                                       #
-#This program is distributed in the hope that it will be useful,        #
-#but WITHOUT ANY WARRANTY; without even the implied warranty of         #
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the          #
-#GNU General Public License for more details.                           #
-#                                                                       #
-#You should have received a copy of the GNU General Public License      #
-#along with this program.  If not, see <http://www.gnu.org/licenses/>.  #
-#########################################################################
-from openerp.osv import orm
-
-
-class claim_make_picking(orm.TransientModel):
-
-    _inherit = 'claim_make_picking.wizard'
-
-    def _get_dest_loc(self, cr, uid, context=None):
-        """ Get default destination location """
-        loc_id = super(claim_make_picking, self)._get_dest_loc(cr, uid, context=context)
-        if context is None:
-            context = {}
-        warehouse_obj = self.pool.get('stock.warehouse')
-        warehouse_id = context.get('warehouse_id')
-        if context.get('picking_type') == 'in':
-            loc_id = warehouse_obj.read(
-                cr, uid,
-                warehouse_id,
-                ['lot_rma_id'],
-                context=context)['lot_rma_id'][0]
-        elif context.get('picking_type') == 'loss':
-            loc_id = warehouse_obj.read(
-                cr, uid,
-                warehouse_id,
-                ['lot_carrier_loss_id'],
-                context=context)['lot_carrier_loss_id'][0]
-        return loc_id
-
-    _defaults = {
-        'claim_line_dest_location': _get_dest_loc,
-    }
diff --git a/crm_rma_advance_location/wizard/claim_make_picking_from_picking.py b/crm_rma_advance_location/wizard/claim_make_picking_from_picking.py
deleted file mode 100644
index b8fd528e..00000000
--- a/crm_rma_advance_location/wizard/claim_make_picking_from_picking.py
+++ /dev/null
@@ -1,169 +0,0 @@
-# -*- coding: utf-8 -*-
-#########################################################################
-#                                                                       #
-#                                                                       #
-#########################################################################
-#                                                                       #
-# crm_claim_rma for OpenERP                                             #
-# Copyright (C) 2009-2012  Akretion, Emmanuel Samyn,                    #
-#       Benoît GUILLOT <benoit.guillot@akretion.com>                    #
-#This program is free software: you can redistribute it and/or modify   #
-#it under the terms of the GNU General Public License as published by   #
-#the Free Software Foundation, either version 3 of the License, or      #
-#(at your option) any later version.                                    #
-#                                                                       #
-#This program is distributed in the hope that it will be useful,        #
-#but WITHOUT ANY WARRANTY; without even the implied warranty of         #
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the          #
-#GNU General Public License for more details.                           #
-#                                                                       #
-#You should have received a copy of the GNU General Public License      #
-#along with this program.  If not, see <http://www.gnu.org/licenses/>.  #
-#########################################################################
-from openerp.osv import fields, orm
-from openerp.tools import DEFAULT_SERVER_DATETIME_FORMAT
-from openerp import netsvc
-import time
-
-
-class claim_make_picking_from_picking(orm.TransientModel):
-
-    _name = 'claim_make_picking_from_picking.wizard'
-    _description = 'Wizard to create pickings from picking lines'
-    _columns = {
-        'picking_line_source_location': fields.many2one('stock.location',
-            'Source Location',
-            help="Location where the returned products are from.",
-            required=True),
-        'picking_line_dest_location': fields.many2one('stock.location',
-            'Dest. Location',
-            help="Location where the system will stock the returned products.",
-            required=True),
-        'picking_line_ids': fields.many2many('stock.move',
-            'claim_picking_line_picking',
-            'claim_picking_id',
-            'picking_line_id',
-            'Picking lines'),
-    }
-
-    def _get_default_warehouse(self, cr, uid, context=None):
-        warehouse_id=self.pool.get('crm.claim')._get_default_warehouse(cr, uid, context=context)
-        return warehouse_id
-
-    def _get_picking_lines(self, cr, uid, context):
-        return self.pool.get('stock.picking').read(cr, uid,
-            context['active_id'], ['move_lines'], context=context)['move_lines']
-
-    # Get default source location
-    def _get_source_loc(self, cr, uid, context):
-        if context is None: 
-            context = {}
-        warehouse_obj = self.pool.get('stock.warehouse')
-        warehouse_id = self._get_default_warehouse(cr, uid, context=context)
-        return warehouse_obj.read(cr, uid,
-            warehouse_id, ['lot_rma_id'], context=context)['lot_rma_id'][0]
-
-    # Get default destination location
-    def _get_dest_loc(self, cr, uid, context):
-        if context is None: 
-            context = {}
-        warehouse_id = self._get_default_warehouse(cr, uid, context=context)
-        warehouse_obj = self.pool.get('stock.warehouse')
-        if context.get('picking_type'):
-            context_loc = context.get('picking_type')[8:]
-            loc_field = 'lot_%s_id' %context.get('picking_type')[8:]
-            loc_id = warehouse_obj.read(cr, uid,
-                warehouse_id, [loc_field], context=context)[loc_field][0]
-        return loc_id
-
-    _defaults = {
-        'picking_line_source_location': _get_source_loc,
-        'picking_line_dest_location': _get_dest_loc,
-        'picking_line_ids': _get_picking_lines,
-    }
-
-    def action_cancel(self,cr,uid,ids,conect=None):
-        return {'type': 'ir.actions.act_window_close',}
-
-    # If "Create" button pressed
-    def action_create_picking_from_picking(self, cr, uid, ids, context=None):
-        picking_obj = self.pool.get('stock.picking')
-        move_obj = self.pool.get('stock.move')
-        view_obj = self.pool.get('ir.ui.view')
-        if context is None: 
-            context = {}
-        p_type = 'internal'
-        if context.get('picking_type'):
-            context_type = context.get('picking_type')[8:]
-            note = 'Internal picking from RMA to %s' %context_type
-            name = 'Internal picking to %s' %context_type
-        view_id = view_obj.search(cr, uid, [
-                                            ('xml_id', '=', 'view_picking_form'),
-                                            ('model', '=', 'stock.picking'),
-                                            ('type', '=', 'form'),
-                                            ('name', '=', 'stock.picking.form')
-                                            ], context=context)[0]
-        wizard = self.browse(cr, uid, ids[0], context=context)
-        prev_picking = picking_obj.browse(cr, uid,
-            context['active_id'], context=context)
-        partner_id = prev_picking.partner_id.id
-        # create picking
-        picking_id = picking_obj.create(cr, uid, {
-                    'origin': prev_picking.origin,
-                    'type': p_type,
-                    'move_type': 'one', # direct
-                    'state': 'draft',
-                    'date': time.strftime(DEFAULT_SERVER_DATETIME_FORMAT),
-                    'partner_id': prev_picking.partner_id.id,
-                    'invoice_state': "none",
-                    'company_id': prev_picking.company_id.id,
-                    'location_id': wizard.picking_line_source_location.id,
-                    'location_dest_id': wizard.picking_line_dest_location.id,
-                    'note' : note,
-                    'claim_id': prev_picking.claim_id.id,
-                })
-        # Create picking lines
-        for wizard_picking_line in wizard.picking_line_ids:
-            move_id = move_obj.create(cr, uid, {
-                    'name' : wizard_picking_line.product_id.name_template, # Motif : crm id ? stock_picking_id ?
-                    'priority': '0',
-                    #'create_date':
-                    'date': time.strftime(DEFAULT_SERVER_DATETIME_FORMAT),
-                    'date_expected': time.strftime(DEFAULT_SERVER_DATETIME_FORMAT),
-                    'product_id': wizard_picking_line.product_id.id,
-                    'product_qty': wizard_picking_line.product_qty,
-                    'product_uom': wizard_picking_line.product_uom.id,
-                    'partner_id': prev_picking.partner_id.id,
-                    'prodlot_id': wizard_picking_line.prodlot_id.id,
-                    # 'tracking_id':
-                    'picking_id': picking_id,
-                    'state': 'draft',
-                    'price_unit': wizard_picking_line.price_unit,
-                    # 'price_currency_id': claim_id.company_id.currency_id.id, # from invoice ???
-                    'company_id': prev_picking.company_id.id,
-                    'location_id': wizard.picking_line_source_location.id,
-                    'location_dest_id': wizard.picking_line_dest_location.id,
-                    'note': note,
-                })
-            wizard_move = move_obj.write(cr, uid,
-                wizard_picking_line.id,
-                {'move_dest_id': move_id},
-                context=context)
-        wf_service = netsvc.LocalService("workflow")
-        if picking_id:
-            wf_service.trg_validate(uid, 
-                'stock.picking', picking_id,'button_confirm', cr)
-            picking_obj.action_assign(cr, uid, [picking_id])
-        domain = "[('type','=','%s'),('partner_id','=',%s)]"%(p_type, partner_id)
-        return {
-            'name': '%s' % name,
-            'view_type': 'form',
-            'view_mode': 'form',
-            'view_id': view_id,
-            'domain' : domain,
-            'res_model': 'stock.picking',
-            'res_id': picking_id,
-            'type': 'ir.actions.act_window',
-        }
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/crm_rma_advance_location/wizard/claim_make_picking_from_picking_view.xml b/crm_rma_advance_location/wizard/claim_make_picking_from_picking_view.xml
deleted file mode 100644
index 2f165f9e..00000000
--- a/crm_rma_advance_location/wizard/claim_make_picking_from_picking_view.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  crm_claim_rma for OpenERP
-  Copyright (C) 2011 Akretion Benoît GUILLOT <benoit.guillot@akretion.com>
-  The licence is in the file __openerp__.py
--->
-<openerp>
-    <data>
-
-        <record id="view_claim_picking_from_picking" model="ir.ui.view">
-            <field name="name">claim_picking</field>
-            <field name="model">claim_make_picking_from_picking.wizard</field>
-            <field name="arch" type="xml">
-                <form string="Select lines to add in picking">
-                    <separator string="Locations" colspan="4"/>
-                    <field name="picking_line_source_location" nolabel="1" />
-                    <field name="picking_line_dest_location" nolabel="1" />
-                    <separator string="Select lines for picking" colspan="4"/>
-                    <field name="picking_line_ids" nolabel="1" colspan="4"/>
-                    <group col="4" colspan="2">
-                        <button special="cancel" string="Cancel" name="action_cancel" type="object" icon='gtk-cancel'/>
-                        <button name="action_create_picking_from_picking" string="Create picking" 
-                                icon='gtk-ok' type="object"/>
-                    </group>
-                </form>
-            </field>
-        </record> 
-
-        <record id="action_stock_picking_from_claim_picking" model="ir.actions.act_window">
-            <field name="name">Create Incomming Shipment to Stock</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">claim_make_picking_from_picking.wizard</field>
-            <field name="src_model">stock.picking</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="target">new</field> 
-            <field name="context">{'picking_type': 'picking_stock'}</field>
-        </record>
-
-        <record id="action_loss_picking_from_claim_picking" model="ir.actions.act_window">
-            <field name="name">Create Incomming Shipment to Breakkage Loss Location</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">claim_make_picking_from_picking.wizard</field>
-            <field name="src_model">stock.picking</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="target">new</field> 
-            <field name="context">{'picking_type': 'picking_breakage_loss'}</field>
-        </record>
-
-        <record id="action_used_picking_from_claim_picking" model="ir.actions.act_window">
-            <field name="name">Create Incomming Shipment to Refurbish Location</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">claim_make_picking_from_picking.wizard</field>
-            <field name="src_model">stock.picking</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="target">new</field> 
-            <field name="context">{'picking_type': 'picking_refurbish'}</field>
-        </record>
-
-    </data>
-</openerp>
diff --git a/crm_rma_advance_location/wizard/claim_make_picking_view.xml b/crm_rma_advance_location/wizard/claim_make_picking_view.xml
deleted file mode 100644
index 1a97c52f..00000000
--- a/crm_rma_advance_location/wizard/claim_make_picking_view.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  crm_claim_rma for OpenERP
-  Copyright (C) 2011 Akretion Benoît GUILLOT <benoit.guillot@akretion.com>
-  The licence is in the file __openerp__.py
--->
-<openerp>
-    <data>
-
-        <record id="action_claim_picking_loss" model="ir.actions.act_window">
-            <field name="name">Create Products Loss</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">claim_make_picking.wizard</field>
-            <field name="src_model">crm.claim</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="target">new</field> 
-            <field name="context">{'picking_type': 'loss'}</field>
-        </record>
-
-    </data>
-</openerp>

From 52b6eb0146063c8785d41fc002cbd4f4b24ec26d Mon Sep 17 00:00:00 2001
From: Osval Reyes <osval@vauxoo.com>
Date: Wed, 2 Dec 2015 14:15:02 -0430
Subject: [PATCH 15/19] [REF] crm_rma_stock_location: simplify rma on hand and
 forecasted quantities calculation

---
 crm_rma_stock_location/models/product_template.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/crm_rma_stock_location/models/product_template.py b/crm_rma_stock_location/models/product_template.py
index 8059e33b..5b922747 100644
--- a/crm_rma_stock_location/models/product_template.py
+++ b/crm_rma_stock_location/models/product_template.py
@@ -45,6 +45,6 @@ class ProductTemplate(models.Model):
     def _rma_template_available(self):
         for product in self:
             product.rma_qty_available = sum(
-                [p.rma_qty_available for p in product.product_variant_ids])
+                product.mapped('product_variant_ids.rma_virtual_available'))
             product.rma_virtual_available = sum(
-                [p.rma_virtual_available for p in product.product_variant_ids])
+                product.mapped('product_variant_ids.rma_virtual_available'))

From 097cf5f8a8d9c2871753ebf42c4b296bd4853c94 Mon Sep 17 00:00:00 2001
From: OCA Git Bot <oca-git-bot@odoo-community.org>
Date: Thu, 3 Dec 2015 02:33:21 +0100
Subject: [PATCH 16/19] [UPD] addons table in README.md

---
 README.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/README.md b/README.md
index dff8c8f2..99904367 100644
--- a/README.md
+++ b/README.md
@@ -50,6 +50,7 @@ addon | version | summary
 [crm_rma_lot_mass_return](crm_rma_lot_mass_return/) | 8.0.1.0.0 | RMA Claims Mass Return by Lot
 [crm_rma_prodlot_invoice](crm_rma_prodlot_invoice/) | 8.0.1.0.0 | CRM Claim Prodlot Invoice
 [crm_rma_prodlot_supplier](crm_rma_prodlot_supplier/) | 8.0.1.0.0 | Claim Prodlot Supplier
+[crm_rma_stock_location](crm_rma_stock_location/) | 8.0.1.0.0 | RMA Stock Location
 [product_warranty](product_warranty/) | 8.0.1.0.0 | Product warranty
 
 Unported addons
@@ -58,9 +59,7 @@ addon | version | summary
 --- | --- | ---
 [crm_claim_categ_as_name](crm_claim_categ_as_name/) | 1.0 (unported) | crm_claim_categ_as_name
 [crm_claim_ext](crm_claim_ext/) | 1.0 (unported) | CRM claim extension
-[crm_rma_advance_location](crm_rma_advance_location/) | 1.0 (unported) | RMA Claims Advance Location
 [crm_rma_by_shop](crm_rma_by_shop/) | 1.0 (unported) | RMA Claims by shop
-[crm_rma_stock_location](crm_rma_stock_location/) | 1.0 (unported) | RMA Stock Location
 
 [//]: # (end addons)
 

From d4c55278ce2b4b7ec648c560f1c5f2baf2c1a6d9 Mon Sep 17 00:00:00 2001
From: OCA Transbot <transbot@odoo-community.org>
Date: Sat, 5 Dec 2015 17:23:12 -0500
Subject: [PATCH 17/19] OCA Transbot updated translations from Transifex

---
 crm_rma_stock_location/i18n/en.po    | 243 +++++++++++++++++++++++++++
 crm_rma_stock_location/i18n/es.po    |  56 +++---
 crm_rma_stock_location/i18n/fr.po    | 237 +++++++++++++++++++++++---
 crm_rma_stock_location/i18n/pt_BR.po | 243 +++++++++++++++++++++++++++
 crm_rma_stock_location/i18n/ro.po    | 243 +++++++++++++++++++++++++++
 5 files changed, 972 insertions(+), 50 deletions(-)
 create mode 100644 crm_rma_stock_location/i18n/en.po
 create mode 100644 crm_rma_stock_location/i18n/pt_BR.po
 create mode 100644 crm_rma_stock_location/i18n/ro.po

diff --git a/crm_rma_stock_location/i18n/en.po b/crm_rma_stock_location/i18n/en.po
new file mode 100644
index 00000000..9828d48c
--- /dev/null
+++ b/crm_rma_stock_location/i18n/en.po
@@ -0,0 +1,243 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * crm_rma_stock_location
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: rma (8.0)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-12-03 01:39+0000\n"
+"PO-Revision-Date: 2015-12-02 21:49+0000\n"
+"Last-Translator: OCA Transbot <transbot@odoo-community.org>\n"
+"Language-Team: English (http://www.transifex.com/oca/OCA-rma-8-0/language/en/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: en\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\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 "Cancel"
+
+#. 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 "Create Incoming Shipment to Breakage Loss Location"
+
+#. 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 "Create Incoming Shipment to Refurbish Location"
+
+#. 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 "Create Incoming Shipment to Stock"
+
+#. 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 "Create a Product Loss"
+
+#. 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 "Create picking"
+
+#. module: crm_rma_stock_location
+#: field:claim.make.picking.from.picking.wizard,create_uid:0
+msgid "Created by"
+msgstr "Created by"
+
+#. module: crm_rma_stock_location
+#: field:claim.make.picking.from.picking.wizard,create_date:0
+msgid "Created on"
+msgstr "Created on"
+
+#. 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 "Dest. Location"
+
+#. module: crm_rma_stock_location
+#: field:claim.make.picking.from.picking.wizard,id:0
+msgid "ID"
+msgstr "ID"
+
+#. module: crm_rma_stock_location
+#: field:claim.make.picking.from.picking.wizard,write_uid:0
+msgid "Last Updated by"
+msgstr "Last Updated by"
+
+#. module: crm_rma_stock_location
+#: field:claim.make.picking.from.picking.wizard,write_date:0
+msgid "Last Updated on"
+msgstr "Last Updated on"
+
+#. module: crm_rma_stock_location
+#: view:claim.make.picking.from.picking.wizard:crm_rma_stock_location.view_claim_picking_from_picking
+msgid "Locations"
+msgstr "Locations"
+
+#. module: crm_rma_stock_location
+#: code:addons/crm_rma_stock_location/models/stock_warehouse.py:65
+#, python-format
+msgid "Loss"
+msgstr "Loss"
+
+#. module: crm_rma_stock_location
+#: field:stock.warehouse,loss_loc_id:0
+msgid "Loss Location"
+msgstr "Loss Location"
+
+#. module: crm_rma_stock_location
+#: view:crm.claim:crm_rma_stock_location.crm_claim_rma_form_view_loss
+msgid "New Product Loss"
+msgstr "New Product Loss"
+
+#. module: crm_rma_stock_location
+#: field:claim.make.picking.from.picking.wizard,picking_line_ids:0
+msgid "Picking lines"
+msgstr "Picking lines"
+
+#. module: crm_rma_stock_location
+#: model:ir.model,name:crm_rma_stock_location.model_product_product
+msgid "Product"
+msgstr "Product"
+
+#. module: crm_rma_stock_location
+#: model:ir.model,name:crm_rma_stock_location.model_product_template
+msgid "Product Template"
+msgstr "Product Template"
+
+#. module: crm_rma_stock_location
+#: view:product.product:crm_rma_stock_location.rma_product_product_tree_view
+msgid "Product Variants"
+msgstr "Product Variants"
+
+#. module: crm_rma_stock_location
+#: view:stock.picking:crm_rma_stock_location.picking_in_form
+msgid "Product to Loss"
+msgstr "Product to Loss"
+
+#. module: crm_rma_stock_location
+#: view:stock.picking:crm_rma_stock_location.picking_in_form
+msgid "Product to refurbish stock"
+msgstr "Product to refurbish stock"
+
+#. module: crm_rma_stock_location
+#: view:stock.picking:crm_rma_stock_location.picking_in_form
+msgid "Product to stock"
+msgstr "Product to stock"
+
+#. module: crm_rma_stock_location
+#: model:stock.location,name:crm_rma_stock_location.location_rma_a
+msgid "RMA - Box A"
+msgstr "RMA - Box A"
+
+#. module: crm_rma_stock_location
+#: model:stock.location,name:crm_rma_stock_location.location_rma_b
+msgid "RMA - Box B"
+msgstr "RMA - Box B"
+
+#. module: crm_rma_stock_location
+#: view:product.product:crm_rma_stock_location.rma_product_search_view
+msgid "RMA Available Products"
+msgstr "RMA Available Products"
+
+#. module: crm_rma_stock_location
+#: model:stock.location,name:crm_rma_stock_location.location_rma
+msgid "RMA Demo"
+msgstr "RMA Demo"
+
+#. module: crm_rma_stock_location
+#: code:addons/crm_rma_stock_location/models/product_product.py:42
+#: code:addons/crm_rma_stock_location/models/product_template.py:42
+#, python-format
+msgid "RMA Forecasted Quantity"
+msgstr "RMA Forecasted Quantity"
+
+#. module: crm_rma_stock_location
+#: view:product.product:crm_rma_stock_location.rma_product_search_view
+msgid "RMA Products"
+msgstr "RMA Products"
+
+#. module: crm_rma_stock_location
+#: code:addons/crm_rma_stock_location/models/product_product.py:36
+#: code:addons/crm_rma_stock_location/models/product_template.py:36
+#, python-format
+msgid "RMA Quantity On Hand"
+msgstr "RMA Quantity On Hand"
+
+#. 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 "RMA Stock"
+
+#. module: crm_rma_stock_location
+#: code:addons/crm_rma_stock_location/models/stock_warehouse.py:56
+#, python-format
+msgid "Refurbish"
+msgstr "Refurbish"
+
+#. module: crm_rma_stock_location
+#: field:stock.warehouse,lot_refurbish_id:0
+msgid "Refurbish Location"
+msgstr "Refurbish Location"
+
+#. 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 "Select lines for picking"
+
+#. 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 "Select lines to add in picking"
+
+#. module: crm_rma_stock_location
+#: model:product.template,name:crm_rma_stock_location.product_socket_product_template
+msgid "Socket"
+msgstr "Socket"
+
+#. 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 "Source Location"
+
+#. module: crm_rma_stock_location
+#: code:addons/crm_rma_stock_location/wizards/claim_make_picking_from_picking.py:86
+#: help:claim.make.picking.from.picking.wizard,picking_line_source_location:0
+#, python-format
+msgid "Source location where the returned products are"
+msgstr "Source location where the returned products are"
+
+#. module: crm_rma_stock_location
+#: code:addons/crm_rma_stock_location/wizards/claim_make_picking_from_picking.py:90
+#: help:claim.make.picking.from.picking.wizard,picking_line_dest_location:0
+#, python-format
+msgid "Target location to send returned products"
+msgstr "Target location to send returned products"
+
+#. module: crm_rma_stock_location
+#: model:ir.model,name:crm_rma_stock_location.model_stock_warehouse
+msgid "Warehouse"
+msgstr "Warehouse"
+
+#. 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 "Wizard to create pickings from claim lines"
+
+#. 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 "Wizard to create pickings from picking lines"
diff --git a/crm_rma_stock_location/i18n/es.po b/crm_rma_stock_location/i18n/es.po
index e173f387..ef985061 100644
--- a/crm_rma_stock_location/i18n/es.po
+++ b/crm_rma_stock_location/i18n/es.po
@@ -1,19 +1,21 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
-#   * crm_rma_stock_location
-#
+# * crm_rma_stock_location
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 8.0\n"
+"Project-Id-Version: rma (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"
+"POT-Creation-Date: 2015-12-03 01:39+0000\n"
+"PO-Revision-Date: 2015-12-02 21:49+0000\n"
+"Last-Translator: OCA Transbot <transbot@odoo-community.org>\n"
+"Language-Team: Spanish (http://www.transifex.com/oca/OCA-rma-8-0/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: crm_rma_stock_location
 #: view:claim.make.picking.from.picking.wizard:crm_rma_stock_location.view_claim_picking_from_picking
@@ -40,7 +42,6 @@ msgstr "Crear un envío de entrada a Existencias"
 msgid "Create a Product Loss"
 msgstr "Registrar una pérdida de producto"
 
-
 #. module: crm_rma_stock_location
 #: view:claim.make.picking.from.picking.wizard:crm_rma_stock_location.view_claim_picking_from_picking
 msgid "Create picking"
@@ -66,7 +67,7 @@ msgstr "Ubicación destino"
 #. module: crm_rma_stock_location
 #: field:claim.make.picking.from.picking.wizard,id:0
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #. module: crm_rma_stock_location
 #: field:claim.make.picking.from.picking.wizard,write_uid:0
@@ -78,23 +79,13 @@ msgstr "Actualizado por"
 msgid "Last Updated on"
 msgstr "Actualizado el"
 
-#. 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 "Ubicación origen de los productos devueltos"
-
-#. 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 "Ubicación destino de los productos devueltos"
-
 #. module: crm_rma_stock_location
 #: view:claim.make.picking.from.picking.wizard:crm_rma_stock_location.view_claim_picking_from_picking
 msgid "Locations"
 msgstr "Ubicaciones"
 
 #. module: crm_rma_stock_location
-#: code:addons/crm_rma_stock_location/models/stock_warehouse.py:62
+#: code:addons/crm_rma_stock_location/models/stock_warehouse.py:65
 #, python-format
 msgid "Loss"
 msgstr "Pérdida"
@@ -139,7 +130,6 @@ msgstr "Producto a Pérdida"
 msgid "Product to refurbish stock"
 msgstr "Producto a Existencias de restaurados"
 
-
 #. module: crm_rma_stock_location
 #: view:stock.picking:crm_rma_stock_location.picking_in_form
 msgid "Product to stock"
@@ -184,6 +174,12 @@ msgstr "Productos en RMA"
 msgid "RMA Quantity On Hand"
 msgstr "Cantidades Disponibles en RMA"
 
+#. 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 "Existencias en RMA"
+
 #. module: crm_rma_stock_location
 #: code:addons/crm_rma_stock_location/models/stock_warehouse.py:56
 #, python-format
@@ -218,10 +214,18 @@ msgid "Source Location"
 msgstr "Ubicación origen"
 
 #. 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 "Existencias en RMA"
+#: code:addons/crm_rma_stock_location/wizards/claim_make_picking_from_picking.py:86
+#: help:claim.make.picking.from.picking.wizard,picking_line_source_location:0
+#, python-format
+msgid "Source location where the returned products are"
+msgstr "Ubicación origen de los productos devueltos"
+
+#. module: crm_rma_stock_location
+#: code:addons/crm_rma_stock_location/wizards/claim_make_picking_from_picking.py:90
+#: help:claim.make.picking.from.picking.wizard,picking_line_dest_location:0
+#, python-format
+msgid "Target location to send returned products"
+msgstr "Ubicación destino de los productos devueltos"
 
 #. module: crm_rma_stock_location
 #: model:ir.model,name:crm_rma_stock_location.model_stock_warehouse
diff --git a/crm_rma_stock_location/i18n/fr.po b/crm_rma_stock_location/i18n/fr.po
index b1dc3b9b..73db2c68 100644
--- a/crm_rma_stock_location/i18n/fr.po
+++ b/crm_rma_stock_location/i18n/fr.po
@@ -1,54 +1,243 @@
-# Translation of OpenERP Server.
+# Translation of Odoo Server.
 # This file contains the translation of the following modules:
-#	* crm_rma_stock_location
-#
+# * crm_rma_stock_location
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 7.0\n"
+"Project-Id-Version: rma (8.0)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-12 11:28+0000\n"
-"PO-Revision-Date: 2014-09-12 11:28+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
+"POT-Creation-Date: 2015-12-03 01:39+0000\n"
+"PO-Revision-Date: 2015-12-02 21:49+0000\n"
+"Last-Translator: OCA Transbot <transbot@odoo-community.org>\n"
+"Language-Team: French (http://www.transifex.com/oca/OCA-rma-8-0/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
+"Language: fr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. module: crm_rma_stock_location
-#: model:ir.model.fields,field_description:crm_rma_stock_location.field_stock_warehouse_lot_rma_id
-#: field:stock.warehouse,lot_rma_id:0
-msgid "Location RMA"
-msgstr "Emplacement RMA"
+#: view:claim.make.picking.from.picking.wizard:crm_rma_stock_location.view_claim_picking_from_picking
+msgid "Cancel"
+msgstr "Annuler"
 
 #. module: crm_rma_stock_location
-#: code:_description:0
-#: model:ir.model,name:crm_rma_stock_location.model_product_product
+#: 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 "Créer expédition/réception"
+
+#. 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 "Emplacement de destination"
+
+#. 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
+#: view:claim.make.picking.from.picking.wizard:crm_rma_stock_location.view_claim_picking_from_picking
+msgid "Locations"
+msgstr "Emplacements"
+
+#. module: crm_rma_stock_location
+#: code:addons/crm_rma_stock_location/models/stock_warehouse.py:65
+#, 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 "Article"
 
 #. module: crm_rma_stock_location
-#: model:stock.location,name:crm_rma_stock_location.stock_location_rma
-msgid "RMA"
-msgstr "RMA"
+#: model:ir.model,name:crm_rma_stock_location.model_product_template
+msgid "Product Template"
+msgstr ""
 
 #. module: crm_rma_stock_location
-#: model:ir.model.fields,field_description:crm_rma_stock_location.field_product_product_rma_virtual_available
-#: field:product.product,rma_virtual_available:0
+#: 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
+#: code:addons/crm_rma_stock_location/models/product_template.py:42
+#, python-format
 msgid "RMA Forecasted Quantity"
 msgstr "Quantité RMA prévue"
 
 #. module: crm_rma_stock_location
-#: model:ir.model.fields,field_description:crm_rma_stock_location.field_product_product_rma_qty_available
-#: field:product.product,rma_qty_available:0
+#: 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
+#: code:addons/crm_rma_stock_location/models/product_template.py:36
+#, python-format
 msgid "RMA Quantity On Hand"
 msgstr "Quantité RMA en stock"
 
 #. module: crm_rma_stock_location
-#: code:_description:0
-#: model:ir.model,name:crm_rma_stock_location.model_stock_warehouse
+#: 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
+#: 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 "Selectionner les lignes pour l'expédition/réception"
+
+#. 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 "Emplacement source"
+
+#. module: crm_rma_stock_location
+#: code:addons/crm_rma_stock_location/wizards/claim_make_picking_from_picking.py:86
+#: help:claim.make.picking.from.picking.wizard,picking_line_source_location:0
+#, python-format
+msgid "Source location where the returned products are"
+msgstr ""
+
+#. module: crm_rma_stock_location
+#: code:addons/crm_rma_stock_location/wizards/claim_make_picking_from_picking.py:90
+#: help:claim.make.picking.from.picking.wizard,picking_line_dest_location:0
+#, python-format
+msgid "Target location to send returned products"
+msgstr ""
+
+#. module: crm_rma_stock_location
+#: model:ir.model,name:crm_rma_stock_location.model_stock_warehouse
 msgid "Warehouse"
 msgstr "Entrepôt"
 
+#. 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 "Assistant pour créer des expédition/réceptions à partir des lignes de réclamation"
+
+#. 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/crm_rma_stock_location/i18n/pt_BR.po b/crm_rma_stock_location/i18n/pt_BR.po
new file mode 100644
index 00000000..519631e4
--- /dev/null
+++ b/crm_rma_stock_location/i18n/pt_BR.po
@@ -0,0 +1,243 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * crm_rma_stock_location
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: rma (8.0)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-12-03 01:39+0000\n"
+"PO-Revision-Date: 2015-12-02 21:49+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/oca/OCA-rma-8-0/language/pt_BR/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: pt_BR\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\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 "Cancelar"
+
+#. 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
+#: 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:65
+#, 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
+#: code:addons/crm_rma_stock_location/models/product_template.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
+#: code:addons/crm_rma_stock_location/models/product_template.py:36
+#, python-format
+msgid "RMA Quantity On Hand"
+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
+#: 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
+#: code:addons/crm_rma_stock_location/wizards/claim_make_picking_from_picking.py:86
+#: help:claim.make.picking.from.picking.wizard,picking_line_source_location:0
+#, python-format
+msgid "Source location where the returned products are"
+msgstr ""
+
+#. module: crm_rma_stock_location
+#: code:addons/crm_rma_stock_location/wizards/claim_make_picking_from_picking.py:90
+#: help:claim.make.picking.from.picking.wizard,picking_line_dest_location:0
+#, python-format
+msgid "Target location to send returned products"
+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/crm_rma_stock_location/i18n/ro.po b/crm_rma_stock_location/i18n/ro.po
new file mode 100644
index 00000000..37cee504
--- /dev/null
+++ b/crm_rma_stock_location/i18n/ro.po
@@ -0,0 +1,243 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * crm_rma_stock_location
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: rma (8.0)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-12-03 01:39+0000\n"
+"PO-Revision-Date: 2015-12-02 21:49+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: Romanian (http://www.transifex.com/oca/OCA-rma-8-0/language/ro/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: ro\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\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 "ID"
+
+#. 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
+#: 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:65
+#, 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
+#: code:addons/crm_rma_stock_location/models/product_template.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
+#: code:addons/crm_rma_stock_location/models/product_template.py:36
+#, python-format
+msgid "RMA Quantity On Hand"
+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
+#: 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
+#: code:addons/crm_rma_stock_location/wizards/claim_make_picking_from_picking.py:86
+#: help:claim.make.picking.from.picking.wizard,picking_line_source_location:0
+#, python-format
+msgid "Source location where the returned products are"
+msgstr ""
+
+#. module: crm_rma_stock_location
+#: code:addons/crm_rma_stock_location/wizards/claim_make_picking_from_picking.py:90
+#: help:claim.make.picking.from.picking.wizard,picking_line_dest_location:0
+#, python-format
+msgid "Target location to send returned products"
+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 ""

From 3870a2f746449bbd8d1c161902930e1e5076b8e3 Mon Sep 17 00:00:00 2001
From: OCA Transbot <transbot@odoo-community.org>
Date: Sat, 12 Dec 2015 17:51:26 -0500
Subject: [PATCH 18/19] OCA Transbot updated translations from Transifex

---
 crm_claim_rma/i18n/sl.po            | 1050 +++++++++++++++++++++++++++
 crm_claim_rma_code/i18n/sl.po       |   24 +
 crm_rma_location/i18n/sl.po         |   85 +++
 crm_rma_lot_mass_return/i18n/sl.po  |  310 ++++++++
 crm_rma_prodlot_invoice/i18n/sl.po  |   65 ++
 crm_rma_prodlot_supplier/i18n/sl.po |   60 ++
 crm_rma_stock_location/i18n/sl.po   |  243 +++++++
 product_warranty/i18n/sl.po         |  164 +++++
 8 files changed, 2001 insertions(+)
 create mode 100644 crm_claim_rma/i18n/sl.po
 create mode 100644 crm_claim_rma_code/i18n/sl.po
 create mode 100644 crm_rma_location/i18n/sl.po
 create mode 100644 crm_rma_lot_mass_return/i18n/sl.po
 create mode 100644 crm_rma_prodlot_invoice/i18n/sl.po
 create mode 100644 crm_rma_prodlot_supplier/i18n/sl.po
 create mode 100644 crm_rma_stock_location/i18n/sl.po
 create mode 100644 product_warranty/i18n/sl.po

diff --git a/crm_claim_rma/i18n/sl.po b/crm_claim_rma/i18n/sl.po
new file mode 100644
index 00000000..e148bc63
--- /dev/null
+++ b/crm_claim_rma/i18n/sl.po
@@ -0,0 +1,1050 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * crm_claim_rma
+# 
+# Translators:
+# Matjaž Mozetič <m.mozetic@matmoz.si>, 2015
+msgid ""
+msgstr ""
+"Project-Id-Version: rma (8.0)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-12-05 22:30+0000\n"
+"PO-Revision-Date: 2015-12-12 17:43+0000\n"
+"Last-Translator: Matjaž Mozetič <m.mozetic@matmoz.si>\n"
+"Language-Team: Slovenian (http://www.transifex.com/oca/OCA-rma-8-0/language/sl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: sl\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
+
+#. module: crm_claim_rma
+#: code:addons/crm_claim_rma/wizards/claim_make_picking.py:121
+#, python-format
+msgid "A picking has already been created for this claim."
+msgstr "Za ta zahtevek je že bil ustvarjen zbirnik."
+
+#. module: crm_claim_rma
+#: code:addons/crm_claim_rma/wizards/claim_make_picking.py:233
+#, python-format
+msgid ""
+"A product return cannot be created for various destination addresses, please"
+" choose line with a same address."
+msgstr "Vračila proizvoda ni mogoče ustvariti za različne ciljne naslove. Izberite postavke z istim naslovom."
+
+#. module: crm_claim_rma
+#: code:addons/crm_claim_rma/wizards/claim_make_picking.py:223
+#, python-format
+msgid ""
+"A product return cannot be created for various destination locations, please"
+" choose line with a same destination location."
+msgstr "Vračila proizvoda ni mogoče ustvariti za različne ciljne lokacije. Izberite postavke z isto ciljno lokacijo."
+
+#. module: crm_claim_rma
+#: code:addons/crm_claim_rma/models/account_invoice.py:75
+#, python-format
+msgid "A refund has already been created for this claim !"
+msgstr "Za ta zahtevek je že bil ustvarjen dobropis!"
+
+#. module: crm_claim_rma
+#: model:crm.case.section,name:crm_claim_rma.section_after_sales_service
+msgid "After Sales Service"
+msgstr "Po prodajna storitev"
+
+#. module: crm_claim_rma
+#: selection:claim.line,applicable_guarantee:0
+msgid "Brand manufacturer"
+msgstr "Blagovna znamka proizvajalca"
+
+#. module: crm_claim_rma
+#: model:crm.case.categ,name:crm_claim_rma.categ_claim12
+msgid "Buyer Cancelled"
+msgstr "Kupec preklican"
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.crm_claim_line_form_view
+msgid "Calculate warranty state"
+msgstr "Izračun stanja garancije"
+
+#. module: crm_claim_rma
+#: view:claim_make_picking.wizard:crm_claim_rma.view_claim_picking
+msgid "Cancel"
+msgstr "Preklic"
+
+#. module: crm_claim_rma
+#: code:addons/crm_claim_rma/models/claim_line.py:308
+#, python-format
+msgid "Cannot find any date for invoice. Must be a validated invoice."
+msgstr "Za račun ni najden noben datum. Biti mora potrjen račun."
+
+#. module: crm_claim_rma
+#: field:account.invoice,claim_id:0
+#: model:ir.model,name:crm_claim_rma.model_crm_claim
+#: field:stock.picking,claim_id:0
+msgid "Claim"
+msgstr "Zahtevek"
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.crm_claim_line_form_view
+msgid "Claim Line"
+msgstr "Postavka zahtevka"
+
+#. module: crm_claim_rma
+#: field:claim.line,date:0
+msgid "Claim Line Date"
+msgstr "Datum postavke zahtevka"
+
+#. module: crm_claim_rma
+#: help:claim.line,number:0
+msgid "Claim Line Identification Number"
+msgstr "Identifikacijska številka postavke zahtevka"
+
+#. module: crm_claim_rma
+#: field:claim.line,claim_type:0
+msgid "Claim Line Type"
+msgstr "Tip postavke zahtevka"
+
+#. module: crm_claim_rma
+#: field:claim.line,claim_origin:0
+msgid "Claim Subject"
+msgstr "Predmet zahtevka"
+
+#. module: crm_claim_rma
+#: help:claim.line,claim_type:0
+msgid "Claim classification"
+msgstr "Klasifikacija zahtevka"
+
+#. module: crm_claim_rma
+#: field:claim.line,claim_diagnosis:0
+msgid "Claim diagnosis"
+msgstr "Diagnoza zahtevka"
+
+#. module: crm_claim_rma
+#: model:ir.actions.act_window,name:crm_claim_rma.act_crm_claim_substates
+#: model:ir.ui.menu,name:crm_claim_rma.menu_crm_case_claims_claim_line_substates
+msgid "Claim line substates"
+msgstr "Pod stanja postavke zahtevka"
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.crm_claim_line_tree_view
+#: 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.ui.menu,name:crm_claim_rma.menu_crm_case_claims_claim_lines
+msgid "Claim lines"
+msgstr "Postavke zahtevka"
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.view_crm_claim_lines_filter
+msgid "Claim n°"
+msgstr "Zahtevek št."
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.crm_claim_line_form_view
+msgid "Claims"
+msgstr "Zahtevki"
+
+#. module: crm_claim_rma
+#: selection:claim.line,applicable_guarantee:0 field:claim.line,company_id:0
+msgid "Company"
+msgstr "Družba"
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.crm_claim_line_tree_view
+#: view:crm.claim:crm_claim_rma.crm_claim_rma_form_view
+msgid "Compute Warranty"
+msgstr "Izračun garancije"
+
+#. module: crm_claim_rma
+#: selection:claim.line,state:0
+msgid "Confirmed, waiting for product"
+msgstr "Potrjeno, čakanje na proizvod"
+
+#. module: crm_claim_rma
+#: view:res.partner:crm_claim_rma.view_partner_contact_tree
+msgid "Contacts"
+msgstr "Stiki"
+
+#. module: crm_claim_rma
+#: selection:claim.line,state:0
+msgid "Controlled, to treate"
+msgstr "Preverjeno, za obdelavo"
+
+#. module: crm_claim_rma
+#: model:crm.case.categ,name:crm_claim_rma.categ_claim14
+msgid "Could Not Ship"
+msgstr "Ni bilo mogoče odpremiti"
+
+#. module: crm_claim_rma
+#: model:ir.actions.act_window,name:crm_claim_rma.action_claim_picking_out
+msgid "Create Outgoing Shipments"
+msgstr "Ustvari izhodne odpreme"
+
+#. module: crm_claim_rma
+#: view:claim_make_picking.wizard:crm_claim_rma.view_claim_picking
+msgid "Create picking"
+msgstr "Ustvari zbirnik"
+
+#. module: crm_claim_rma
+#: field:claim.line,create_uid:0 field:claim_make_picking.wizard,create_uid:0
+#: field:substate.substate,create_uid:0
+msgid "Created by"
+msgstr "Ustvaril"
+
+#. module: crm_claim_rma
+#: field:claim.line,create_date:0
+#: field:claim_make_picking.wizard,create_date:0
+#: field:substate.substate,create_date:0
+msgid "Created on"
+msgstr "Ustvarjeno"
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.view_crm_claim_lines_filter
+msgid "Current"
+msgstr "Tekoči"
+
+#. module: crm_claim_rma
+#: code:addons/crm_claim_rma/models/crm_claim.py:161
+#, python-format
+msgid "Customer"
+msgstr "Kupec"
+
+#. module: crm_claim_rma
+#: code:addons/crm_claim_rma/models/crm_claim.py:165
+#, python-format
+msgid "Customer Email"
+msgstr "E-pošta kupca"
+
+#. module: crm_claim_rma
+#: model:crm.case.categ,name:crm_claim_rma.categ_claim11
+msgid "Customer Return"
+msgstr "Vračilo kupca"
+
+#. module: crm_claim_rma
+#: selection:claim.line,claim_origin:0
+msgid "Damaged delivered product"
+msgstr "Poškodovan dobavljeni proizvod"
+
+#. module: crm_claim_rma
+#: help:claim.line,message_last_post:0 help:stock.move,message_last_post:0
+msgid "Date of the last message posted on the record."
+msgstr "Datum zadnjega objavljenega sporočila na zapisu."
+
+#. module: crm_claim_rma
+#: model:crm.case.categ,name:crm_claim_rma.categ_claim20
+msgid "Delivered Late by Carrier"
+msgstr "Prevoznik pozno dostavil"
+
+#. module: crm_claim_rma
+#: field:claim.line,name:0 field:substate.substate,substate_descr:0
+msgid "Description"
+msgstr "Opis"
+
+#. module: crm_claim_rma
+#: field:claim_make_picking.wizard,claim_line_dest_location_id:0
+msgid "Dest. Location"
+msgstr "Ciljna lokacija"
+
+#. module: crm_claim_rma
+#: model:crm.case.categ,name:crm_claim_rma.categ_claim15
+msgid "Different Item"
+msgstr "Drugačen artikel"
+
+#. module: crm_claim_rma
+#: selection:claim.line,state:0
+msgid "Draft"
+msgstr "Osnutek"
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.view_crm_claim_lines_filter
+msgid "Draft and Open Claims"
+msgstr "Osnutki in odprti zahtevki"
+
+#. module: crm_claim_rma
+#: code:addons/crm_claim_rma/models/claim_line.py:308
+#: code:addons/crm_claim_rma/models/claim_line.py:312
+#: code:addons/crm_claim_rma/models/claim_line.py:395
+#: code:addons/crm_claim_rma/models/claim_line.py:399
+#: code:addons/crm_claim_rma/wizards/claim_make_picking.py:120
+#: code:addons/crm_claim_rma/wizards/claim_make_picking.py:222
+#: code:addons/crm_claim_rma/wizards/claim_make_picking.py:232
+#, python-format
+msgid "Error"
+msgstr "Napaka"
+
+#. module: crm_claim_rma
+#: selection:claim.line,claim_origin:0
+msgid "Exchange request"
+msgstr "Zahteva po zamenjavi"
+
+#. module: crm_claim_rma
+#: field:crm.claim,planned_cost:0
+msgid "Expected cost"
+msgstr "Pričakovani strošek"
+
+#. module: crm_claim_rma
+#: field:crm.claim,planned_revenue:0
+msgid "Expected revenue"
+msgstr "Pričakovani prihodek"
+
+#. module: crm_claim_rma
+#: code:addons/crm_claim_rma/models/claim_line.py:64
+#: selection:claim.line,warning:0
+#, python-format
+msgid "Expired"
+msgstr "Pretečeno"
+
+#. module: crm_claim_rma
+#: view:crm.claim:crm_claim_rma.crm_claim_rma_form_view
+msgid "Follow Up"
+msgstr "Sledenje"
+
+#. module: crm_claim_rma
+#: field:claim.line,message_follower_ids:0
+#: field:stock.move,message_follower_ids:0
+msgid "Followers"
+msgstr "Sledilci"
+
+#. module: crm_claim_rma
+#: model:crm.case.categ,name:crm_claim_rma.categ_claim13
+msgid "General Adjustement"
+msgstr "Splošni popravki"
+
+#. module: crm_claim_rma
+#: view:crm.claim:crm_claim_rma.crm_claim_rma_form_view
+msgid "Generated Documents"
+msgstr "Ustvarjeni dokumenti"
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.view_crm_claim_lines_filter
+msgid "Group By..."
+msgstr "Združi po..."
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.view_crm_claim_lines_filter
+msgid "Grouping by state"
+msgstr "Združevanje po stanju"
+
+#. module: crm_claim_rma
+#: selection:claim.line,priority:0
+msgid "High"
+msgstr "Visoka"
+
+#. module: crm_claim_rma
+#: help:claim.line,message_summary:0 help:stock.move,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr "Vsebuje povzetek komunikacij (število sporočil, ...) neposredno v html formatu, da se lahko neposredno vstavi v kanban prikaze."
+
+#. module: crm_claim_rma
+#: field:claim.line,id:0 field:claim_make_picking.wizard,id:0
+#: field:substate.substate,id:0
+msgid "ID"
+msgstr "ID"
+
+#. module: crm_claim_rma
+#: help:claim.line,message_unread:0 help:stock.move,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr "Če označeno, nova sporočila zahtevajo vašo pozornost."
+
+#. module: crm_claim_rma
+#: help:claim.line,warning:0
+msgid "If warranty has expired"
+msgstr "Če je garancija potekla"
+
+#. module: crm_claim_rma
+#: selection:claim.line,claim_origin:0
+msgid "Imperfection"
+msgstr "Nepopolnost"
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.view_crm_claim_lines_filter
+msgid "In Progress"
+msgstr "V teku"
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.view_crm_claim_lines_filter
+msgid "In Progress Claims"
+msgstr "Zahtevki v teku"
+
+#. 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 "Vstopne pošiljke in vračila"
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.view_crm_claim_lines_filter
+#: field:crm.claim,invoice_id:0
+#: model:ir.model,name:crm_claim_rma.model_account_invoice
+msgid "Invoice"
+msgstr "Račun"
+
+#. module: crm_claim_rma
+#: field:claim.line,invoice_line_id:0
+#: model:ir.model,name:crm_claim_rma.model_account_invoice_line
+msgid "Invoice Line"
+msgstr "Postavka računa"
+
+#. module: crm_claim_rma
+#: model:ir.model,name:crm_claim_rma.model_account_invoice_refund
+msgid "Invoice Refund"
+msgstr "Dobropis"
+
+#. module: crm_claim_rma
+#: view:crm.claim:crm_claim_rma.crm_claim_rma_form_view
+#: model:ir.actions.act_window,name:crm_claim_rma.act_crm_claim_rma_invoice
+msgid "Invoices"
+msgstr "Računi"
+
+#. module: crm_claim_rma
+#: field:claim.line,message_is_follower:0
+#: field:stock.move,message_is_follower:0
+msgid "Is a Follower"
+msgstr "Je sledilec"
+
+#. module: crm_claim_rma
+#: field:claim.line,message_last_post:0 field:stock.move,message_last_post:0
+msgid "Last Message Date"
+msgstr "Datum zadnjega sporočila"
+
+#. module: crm_claim_rma
+#: field:claim.line,write_uid:0 field:claim_make_picking.wizard,write_uid:0
+#: field:substate.substate,write_uid:0
+msgid "Last Updated by"
+msgstr "Zadnji posodobil"
+
+#. module: crm_claim_rma
+#: field:claim.line,write_date:0 field:claim_make_picking.wizard,write_date:0
+#: field:substate.substate,write_date:0
+msgid "Last Updated on"
+msgstr "Zadnjič posodobljeno"
+
+#. module: crm_claim_rma
+#: field:claim.line,last_state_change:0
+msgid "Last change"
+msgstr "Zadnja sprememba"
+
+#. module: crm_claim_rma
+#: selection:claim.line,claim_origin:0
+msgid "Legal retractation"
+msgstr "Pravni preklic"
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.crm_claim_line_form_view
+msgid "Linked Document"
+msgstr "Povezani dokument"
+
+#. module: crm_claim_rma
+#: model:ir.model,name:crm_claim_rma.model_claim_line
+msgid "List of product to return"
+msgstr "Seznam proizvodov za vračilo"
+
+#. module: crm_claim_rma
+#: help:claim_make_picking.wizard,claim_line_source_location_id:0
+msgid "Location where the returned products are from."
+msgstr "Lokacija, od koder prihajajo vrnjeni proizvodi"
+
+#. module: crm_claim_rma
+#: help:claim_make_picking.wizard,claim_line_dest_location_id:0
+msgid "Location where the system will stock the returned products."
+msgstr "Lokacija, kamor sistem skladišči vrnjene proizvode."
+
+#. module: crm_claim_rma
+#: view:claim_make_picking.wizard:crm_claim_rma.view_claim_picking
+msgid "Locations"
+msgstr "Lokacije"
+
+#. module: crm_claim_rma
+#: selection:claim.line,claim_origin:0
+msgid "Lost during transport"
+msgstr "Izgubljen med prevozom"
+
+#. module: crm_claim_rma
+#: model:crm.case.categ,name:crm_claim_rma.categ_claim17
+msgid "Merchandise Not As Described"
+msgstr "Blago ne ustreza opisu"
+
+#. module: crm_claim_rma
+#: model:crm.case.categ,name:crm_claim_rma.categ_claim16
+msgid "Merchandise Not Received"
+msgstr "Blago ni bilo prejeto"
+
+#. module: crm_claim_rma
+#: field:claim.line,message_ids:0 field:stock.move,message_ids:0
+msgid "Messages"
+msgstr "Sporočila"
+
+#. module: crm_claim_rma
+#: help:claim.line,message_ids:0 help:stock.move,message_ids:0
+msgid "Messages and communication history"
+msgstr "Sporočila in kronologija komunikacij"
+
+#. module: crm_claim_rma
+#: model:crm.case.categ,name:crm_claim_rma.categ_claim21
+msgid "Missed Fulfilment Promise"
+msgstr "Neizpolnjena obljuba"
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.view_crm_claim_lines_filter
+msgid "More"
+msgstr "Več"
+
+#. module: crm_claim_rma
+#: help:claim.line,name:0
+msgid "More precise description of the problem"
+msgstr "Natančnejši opis težave"
+
+#. module: crm_claim_rma
+#: field:claim.line,move_in_id:0
+msgid "Move Line from picking in"
+msgstr "Postavka premika iz vhodnega zbirnika"
+
+#. module: crm_claim_rma
+#: field:claim.line,move_out_id:0
+msgid "Move Line from picking out"
+msgstr "Postavka premika iz izhodnega zbirnika"
+
+#. module: crm_claim_rma
+#: view:stock.picking:crm_claim_rma.view_picking_internal_search_claim_id
+msgid "Moves created from claims"
+msgstr "Premiki nastali iz zahtevkov"
+
+#. module: crm_claim_rma
+#: view:crm.claim:crm_claim_rma.crm_claim_rma_form_view
+msgid "New Delivery"
+msgstr "Nova dostava"
+
+#. module: crm_claim_rma
+#: view:crm.claim:crm_claim_rma.crm_claim_rma_form_view
+msgid "New Products Return"
+msgstr "Novo vračilo proizvodov"
+
+#. module: crm_claim_rma
+#: view:crm.claim:crm_claim_rma.crm_claim_rma_form_view
+msgid "New Refund"
+msgstr "Nov dobropis"
+
+#. module: crm_claim_rma
+#: model:crm.case.categ,name:crm_claim_rma.categ_claim10
+msgid "No Inventory"
+msgstr "Ni inventarja"
+
+#. module: crm_claim_rma
+#: selection:claim.line,priority:0
+msgid "Normal"
+msgstr "Običajna"
+
+#. module: crm_claim_rma
+#: selection:claim.line,priority:0
+msgid "Not Define"
+msgstr "Ne definirana"
+
+#. module: crm_claim_rma
+#: code:addons/crm_claim_rma/models/claim_line.py:65
+#: selection:claim.line,warning:0
+#, python-format
+msgid "Not Defined"
+msgstr "Ni definirano"
+
+#. module: crm_claim_rma
+#: selection:claim.line,claim_origin:0
+msgid "Not specified"
+msgstr "Ni določeno"
+
+#. module: crm_claim_rma
+#: field:claim.line,number:0
+msgid "Number"
+msgstr "Številka"
+
+#. module: crm_claim_rma
+#: selection:claim.line,claim_origin:0
+msgid "Order cancellation"
+msgstr "Preklic naročila"
+
+#. module: crm_claim_rma
+#: selection:claim.line,claim_origin:0
+msgid "Other"
+msgstr "Drugo"
+
+#. module: crm_claim_rma
+#: view:crm.claim:crm_claim_rma.crm_claim_rma_form_view
+#: field:crm.claim,delivery_address_id:0
+msgid "Partner delivery address"
+msgstr "Partnerjev dostavni naslov"
+
+#. module: crm_claim_rma
+#: selection:claim.line,claim_origin:0
+msgid "Perfect Conditions"
+msgstr "Brezhibno stanje"
+
+#. module: crm_claim_rma
+#: selection:claim.line,claim_origin:0
+msgid "Physical Damage by Client"
+msgstr "Fizično poškodoval kupec"
+
+#. module: crm_claim_rma
+#: selection:claim.line,claim_origin:0
+msgid "Physical Damage by Company"
+msgstr "Fizično poškodovala družba"
+
+#. module: crm_claim_rma
+#: view:crm.claim:crm_claim_rma.crm_claim_rma_form_view field:crm.claim,pick:0
+msgid "Pick the product in the store"
+msgstr "Izbira proizvoda v trgovini"
+
+#. module: crm_claim_rma
+#: model:ir.model,name:crm_claim_rma.model_stock_picking
+msgid "Picking List"
+msgstr "Zbirni seznam"
+
+#. module: crm_claim_rma
+#: code:addons/crm_claim_rma/models/claim_line.py:399
+#, python-format
+msgid "Please set invoice first"
+msgstr "Najprej nastavite račun"
+
+#. module: crm_claim_rma
+#: code:addons/crm_claim_rma/models/claim_line.py:395
+#, python-format
+msgid "Please set product first"
+msgstr "Najprej nastavite proizvod"
+
+#. module: crm_claim_rma
+#: model:crm.case.categ,name:crm_claim_rma.categ_claim18
+msgid "Pricing Error"
+msgstr "Cenovna napaka"
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.view_crm_claim_lines_filter
+#: field:claim.line,priority:0
+msgid "Priority"
+msgstr "Prioriteta"
+
+#. module: crm_claim_rma
+#: help:claim.line,priority:0
+msgid "Priority attention of claim line"
+msgstr "Prioritetna pozornost na postavko zahtevka"
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.crm_claim_line_form_view
+msgid "Problem"
+msgstr "Težava"
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.view_crm_claim_lines_filter
+#: field:claim.line,product_id:0
+msgid "Product"
+msgstr "Proizvod"
+
+#. module: crm_claim_rma
+#: selection:claim.line,claim_diagnosis:0
+msgid "Product Damaged"
+msgstr "Proizvod poškodovan"
+
+#. module: crm_claim_rma
+#: selection:claim.line,claim_diagnosis:0
+msgid "Product Repaired"
+msgstr "Proizvod popravljen"
+
+#. module: crm_claim_rma
+#: view:crm.claim:crm_claim_rma.crm_claim_rma_form_view
+msgid "Product Returns"
+msgstr "Vračila proizvodov"
+
+#. module: crm_claim_rma
+#: selection:claim.line,claim_diagnosis:0
+msgid "Product in good condition"
+msgstr "Proizvod v dobrem stanju"
+
+#. module: crm_claim_rma
+#: selection:claim.line,claim_diagnosis:0
+msgid "Product with hidden physical damage"
+msgstr "Proizvod s skritimi poškodbami"
+
+#. module: crm_claim_rma
+#: view:crm.claim:crm_claim_rma.crm_claim_rma_form_view
+#: model:ir.actions.act_window,name:crm_claim_rma.act_crm_claim_rma_purchase_orders
+msgid "Purchases"
+msgstr "Nabave"
+
+#. module: crm_claim_rma
+#: field:claim.line,product_returned_quantity:0
+msgid "Quantity"
+msgstr "Količina"
+
+#. module: crm_claim_rma
+#: help:claim.line,product_returned_quantity:0
+msgid "Quantity of product returned"
+msgstr "Vrnjena količina artikla"
+
+#. module: crm_claim_rma
+#: model:ir.actions.act_window,name:crm_claim_rma.act_crm_claim_rma_sale_orders
+msgid "Quotations and Sales"
+msgstr "Predračuni in prodaja"
+
+#. module: crm_claim_rma
+#: field:crm.claim,picking_ids:0
+msgid "RMA"
+msgstr "Pooblastilo vračila blaga"
+
+#. module: crm_claim_rma
+#: help:crm.claim,rma_number:0
+msgid "RMA Number provided by supplier"
+msgstr "Dobaviteljeva številka vračila blaga"
+
+#. module: crm_claim_rma
+#: field:crm.claim,real_cost:0
+msgid "Real cost"
+msgstr "Dejanski strošek"
+
+#. module: crm_claim_rma
+#: field:crm.claim,real_revenue:0
+msgid "Real revenue"
+msgstr "Dejanski prihodek"
+
+#. module: crm_claim_rma
+#: selection:claim.line,state:0
+msgid "Received, to control"
+msgstr "Prejeto, za pregled"
+
+#. module: crm_claim_rma
+#: view:crm.claim:crm_claim_rma.crm_claim_rma_form_view
+msgid "Receptions / Deliveries"
+msgstr "Prejemi / Dobave"
+
+#. module: crm_claim_rma
+#: field:claim.line,refund_line_id:0
+msgid "Refund Line"
+msgstr "Postavka dobropisa"
+
+#. module: crm_claim_rma
+#: view:crm.claim:crm_claim_rma.crm_claim_rma_form_view
+#: field:crm.claim,invoice_ids:0
+#: model:ir.actions.act_window,name:crm_claim_rma.act_crm_claim_rma_refunds
+msgid "Refunds"
+msgstr "Dobropisi"
+
+#. module: crm_claim_rma
+#: selection:claim.line,state:0
+msgid "Refused"
+msgstr "Zavrnjeno"
+
+#. module: crm_claim_rma
+#: field:claim.line,claim_id:0
+msgid "Related claim"
+msgstr "Povezani zahtevek"
+
+#. module: crm_claim_rma
+#: help:crm.claim,invoice_id:0
+msgid "Related original Cusotmer invoice"
+msgstr "Povezani izvorni izdani račun"
+
+#. module: crm_claim_rma
+#: model:ir.actions.act_window,name:crm_claim_rma.action_claim_picking_in
+msgid "Return Products"
+msgstr "Vračilo proizvodov"
+
+#. module: crm_claim_rma
+#: field:claim.line,location_dest_id:0
+msgid "Return Stock Location"
+msgstr "Lokacija zaloge vračil"
+
+#. module: crm_claim_rma
+#: field:crm.claim,claim_line_ids:0
+msgid "Return lines"
+msgstr "Postavke vračila"
+
+#. module: crm_claim_rma
+#: view:crm.claim:crm_claim_rma.crm_claim_rma_form_view
+msgid "Returned lines"
+msgstr "Povrnjene postavke"
+
+#. module: crm_claim_rma
+#: help:claim.line,product_id:0
+msgid "Returned product"
+msgstr "Vrnjeni proizvod"
+
+#. module: crm_claim_rma
+#: view:crm.claim:crm_claim_rma.crm_claim_rma_form_view
+msgid "Returns"
+msgstr "Vračila"
+
+#. module: crm_claim_rma
+#: field:crm.claim,rma_number:0
+msgid "Rma number"
+msgstr "Številka pooblastila vračila blaga"
+
+#. module: crm_claim_rma
+#: view:crm.claim:crm_claim_rma.crm_claim_rma_form_view
+msgid "Sales"
+msgstr ""
+
+#. module: crm_claim_rma
+#: view:crm.claim:crm_claim_rma.view_crm_case_claims_filter
+msgid "Sales Team"
+msgstr ""
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.view_crm_claim_lines_filter
+msgid "Search Claims"
+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:crm_claim_rma.view_claim_picking
+msgid "Select exchange lines to add in picking"
+msgstr ""
+
+#. module: crm_claim_rma
+#: view:claim_make_picking.wizard:crm_claim_rma.view_claim_picking
+msgid "Select lines for picking"
+msgstr ""
+
+#. module: crm_claim_rma
+#: field:crm.claim,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: crm_claim_rma
+#: field:claim.line,prodlot_id:0
+msgid "Serial/Lot number"
+msgstr ""
+
+#. module: crm_claim_rma
+#: model:crm.case.categ,name:crm_claim_rma.categ_claim19
+msgid "Shipping Address Undeliverable"
+msgstr ""
+
+#. module: crm_claim_rma
+#: selection:claim.line,claim_origin:0
+msgid "Shipping error"
+msgstr ""
+
+#. module: crm_claim_rma
+#: field:claim_make_picking.wizard,claim_line_source_location_id:0
+msgid "Source Location"
+msgstr ""
+
+#. module: crm_claim_rma
+#: view:crm.claim:crm_claim_rma.view_crm_case_claims_filter
+msgid "Stage"
+msgstr ""
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.crm_claim_line_form_view
+#: view:claim.line:crm_claim_rma.view_crm_claim_lines_filter
+#: field:claim.line,state:0
+msgid "State"
+msgstr ""
+
+#. module: crm_claim_rma
+#: model:ir.model,name:crm_claim_rma.model_stock_move
+msgid "Stock Move"
+msgstr ""
+
+#. module: crm_claim_rma
+#: field:claim.line,substate_id:0 field:substate.substate,name:0
+msgid "Sub state"
+msgstr ""
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.view_crm_claim_lines_filter
+msgid "Substate"
+msgstr ""
+
+#. module: crm_claim_rma
+#: field:claim.line,message_summary:0 field:stock.move,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: crm_claim_rma
+#: selection:claim.line,applicable_guarantee:0
+msgid "Supplier"
+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
+#: 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
+#: code:addons/crm_claim_rma/models/claim_line.py:312
+#, python-format
+msgid "The product has no supplier configured."
+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
+#: help:claim.line,location_dest_id:0
+msgid "The return stock location of the returned product"
+msgstr ""
+
+#. module: crm_claim_rma
+#: help:claim.line,prodlot_id:0
+msgid "The serial/lot of the returned product"
+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
+#: code:addons/crm_claim_rma/models/crm_claim.py:40
+#, python-format
+msgid "There is no warehouse for the current user's company."
+msgstr ""
+
+#. module: crm_claim_rma
+#: help:crm.claim,delivery_address_id:0
+msgid "This address will be used to deliver repaired or replacement products."
+msgstr ""
+
+#. module: crm_claim_rma
+#: help:claim.line,claim_diagnosis:0
+msgid "To describe the line product diagnosis"
+msgstr ""
+
+#. module: crm_claim_rma
+#: help:claim.line,claim_origin:0
+msgid "To describe the line product problem"
+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
+#: help:claim.line,claim_id:0
+msgid "To link to the case.claim object"
+msgstr ""
+
+#. module: crm_claim_rma
+#: help:claim.line,last_state_change:0
+msgid "To set thelast state / substate change"
+msgstr ""
+
+#. module: crm_claim_rma
+#: selection:claim.line,state:0
+msgid "Treated"
+msgstr ""
+
+#. module: crm_claim_rma
+#: field:claim.line,unit_sale_price:0
+msgid "Unit sale price"
+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
+#: field:claim.line,message_unread:0 field:stock.move,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: crm_claim_rma
+#: code:addons/crm_claim_rma/models/claim_line.py:63
+#: selection:claim.line,warning:0
+#, python-format
+msgid "Valid"
+msgstr ""
+
+#. module: crm_claim_rma
+#: selection:claim.line,priority:0
+msgid "Very High"
+msgstr ""
+
+#. module: crm_claim_rma
+#: field:crm.claim,warehouse_id:0
+msgid "Warehouse"
+msgstr ""
+
+#. module: crm_claim_rma
+#: view:claim.line:crm_claim_rma.crm_claim_line_form_view
+#: field:claim.line,warning:0
+msgid "Warranty"
+msgstr ""
+
+#. module: crm_claim_rma
+#: field:claim.line,warranty_return_partner:0
+msgid "Warranty Address"
+msgstr ""
+
+#. module: crm_claim_rma
+#: field:claim.line,guarantee_limit:0
+msgid "Warranty limit"
+msgstr ""
+
+#. module: crm_claim_rma
+#: field:claim.line,applicable_guarantee:0 field:claim.line,warranty_type:0
+msgid "Warranty type"
+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
+#: 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_claim_make_picking_wizard
+msgid "Wizard to create pickings from claim lines"
+msgstr ""
+
+#. module: crm_claim_rma
+#: view:claim_make_picking.wizard:crm_claim_rma.view_claim_picking
+msgid "or"
+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
+#: view:claim.line:crm_claim_rma.crm_claim_line_view_form_embedded
+msgid ""
+"{'claim_id': parent.id, 'company_id': parent.company_id, 'warehouse_id': "
+"parent.warehouse_id, 'claim_type': parent.claim_type, 'claim_date': "
+"parent.date}"
+msgstr ""
+
+#. module: crm_claim_rma
+#: view:crm.claim:crm_claim_rma.crm_case_claims_form_view
+msgid "{'create_lines': False}"
+msgstr ""
diff --git a/crm_claim_rma_code/i18n/sl.po b/crm_claim_rma_code/i18n/sl.po
new file mode 100644
index 00000000..3b304722
--- /dev/null
+++ b/crm_claim_rma_code/i18n/sl.po
@@ -0,0 +1,24 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * crm_claim_rma_code
+# 
+# Translators:
+# Matjaž Mozetič <m.mozetic@matmoz.si>, 2015
+msgid ""
+msgstr ""
+"Project-Id-Version: rma (8.0)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-12-05 22:30+0000\n"
+"PO-Revision-Date: 2015-12-11 20:25+0000\n"
+"Last-Translator: Matjaž Mozetič <m.mozetic@matmoz.si>\n"
+"Language-Team: Slovenian (http://www.transifex.com/oca/OCA-rma-8-0/language/sl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: sl\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
+
+#. module: crm_claim_rma_code
+#: field:crm.claim.type,ir_sequence_id:0
+msgid "Sequence Code"
+msgstr "Zaporedna številka"
diff --git a/crm_rma_location/i18n/sl.po b/crm_rma_location/i18n/sl.po
new file mode 100644
index 00000000..93400b20
--- /dev/null
+++ b/crm_rma_location/i18n/sl.po
@@ -0,0 +1,85 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * crm_rma_location
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: rma (8.0)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-12-05 22:30+0000\n"
+"PO-Revision-Date: 2015-11-03 17:05+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: Slovenian (http://www.transifex.com/oca/OCA-rma-8-0/language/sl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: sl\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
+
+#. module: crm_rma_location
+#: code:addons/crm_rma_location/models/stock_warehouse.py:73
+#, python-format
+msgid " Sequence in"
+msgstr ""
+
+#. module: crm_rma_location
+#: code:addons/crm_rma_location/models/stock_warehouse.py:83
+#, python-format
+msgid " Sequence internal"
+msgstr ""
+
+#. module: crm_rma_location
+#: code:addons/crm_rma_location/models/stock_warehouse.py:78
+#, python-format
+msgid " Sequence out"
+msgstr ""
+
+#. module: crm_rma_location
+#: code:addons/crm_rma_location/models/stock_warehouse.py:161
+#, python-format
+msgid "RMA"
+msgstr "Pooblastilo vračila blaga"
+
+#. module: crm_rma_location
+#: code:addons/crm_rma_location/models/stock_warehouse.py:115
+#, 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/models/stock_warehouse.py:129
+#, 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/models/stock_warehouse.py:103
+#, 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/sl.po b/crm_rma_lot_mass_return/i18n/sl.po
new file mode 100644
index 00000000..7a617169
--- /dev/null
+++ b/crm_rma_lot_mass_return/i18n/sl.po
@@ -0,0 +1,310 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * crm_rma_lot_mass_return
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: rma (8.0)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-12-05 22:30+0000\n"
+"PO-Revision-Date: 2015-11-19 22:20+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: Slovenian (http://www.transifex.com/oca/OCA-rma-8-0/language/sl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: sl\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
+
+#. module: crm_rma_lot_mass_return
+#: code:addons/crm_rma_lot_mass_return/wizards/returned_lines_from_serial.py:67
+#, python-format
+msgid "(ID: %s) - %s - %s"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: code:addons/crm_rma_lot_mass_return/wizards/returned_lines_from_serial.py:72
+#, python-format
+msgid "(ID: %s) - %s - %s - %s"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#. openerp-web
+#: code:addons/crm_rma_lot_mass_return/static/src/js/barcode_text.js:90
+#, python-format
+msgid "-->"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: view:crm.claim:crm_rma_lot_mass_return.crm_claim_rma_form_view_meta
+msgid "Add claim lines using serial or invoice number"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Add items to the claim"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "All the valid lines will be added to the claim"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: model:ir.model,name:crm_rma_lot_mass_return.model_crm_claim
+msgid "Claim"
+msgstr "Zahtevek"
+
+#. module: crm_rma_lot_mass_return
+#: field:claim.line.wizard,create_uid:0
+#: field:returned.lines.from.serial.wizard,create_uid:0
+msgid "Created by"
+msgstr "Ustvaril"
+
+#. module: crm_rma_lot_mass_return
+#: field:claim.line.wizard,create_date:0
+#: field:returned.lines.from.serial.wizard,create_date:0
+msgid "Created on"
+msgstr "Ustvarjeno"
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Damaged Delivered Product"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Example: A4JD6JHS"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Example: A4JD6JHS*4*The display is break"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Exchange request"
+msgstr "Zahteva po zamenjavi"
+
+#. module: crm_rma_lot_mass_return
+#: help:returned.lines.from.serial.wizard,scan_data:0
+msgid "Field used to load and show the products"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: help:returned.lines.from.serial.wizard,option_ids:0
+msgid "Field used to load the ids of invoice lines in invoices writed"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: help:returned.lines.from.serial.wizard,scaned_data:0
+msgid "Field used to load the ids of products loaded"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: help:returned.lines.from.serial.wizard,lines_list_id:0
+msgid "Field used to show the current status of the lots loaded"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: help:returned.lines.from.serial.wizard,current_status:0
+msgid ""
+"Field used to show the current status of the product loaded(Name and "
+"quantity)"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: field:claim.line.wizard,id:0 field:returned.lines.from.serial.wizard,id:0
+msgid "ID"
+msgstr "ID"
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Imperfection"
+msgstr "Nepopolnost"
+
+#. module: crm_rma_lot_mass_return
+#: field:claim.line.wizard,invoice_line_id:0
+#: help:claim.line.wizard,invoice_line_id:0
+msgid "Invoice Line"
+msgstr "Postavka računa"
+
+#. module: crm_rma_lot_mass_return
+#: field:returned.lines.from.serial.wizard,option_ids:0
+msgid "Invoice Lines to Select"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: field:claim.line.wizard,write_uid:0
+#: field:returned.lines.from.serial.wizard,write_uid:0
+msgid "Last Updated by"
+msgstr "Zadnji posodobil"
+
+#. module: crm_rma_lot_mass_return
+#: field:claim.line.wizard,write_date:0
+#: field:returned.lines.from.serial.wizard,write_date:0
+msgid "Last Updated on"
+msgstr "Zadnjič posodobljeno"
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Legal retractation"
+msgstr "Pravni preklic"
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Lost during transport"
+msgstr "Izgubljen med prevozom"
+
+#. module: crm_rma_lot_mass_return
+#: field:claim.line.wizard,lot_id:0
+msgid "Lot"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Not specified"
+msgstr "Ni določeno"
+
+#. module: crm_rma_lot_mass_return
+#. openerp-web
+#: code:addons/crm_rma_lot_mass_return/static/src/js/barcode_text.js:93
+#, python-format
+msgid "Ok"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Order Cancellation"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Other"
+msgstr "Drugo"
+
+#. module: crm_rma_lot_mass_return
+#: field:returned.lines.from.serial.wizard,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Perfect Conditions"
+msgstr "Brezhibno stanje"
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Physical Damage by Client"
+msgstr "Fizično poškodoval kupec"
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Physical Damage by Company"
+msgstr "Fizično poškodovala družba"
+
+#. module: crm_rma_lot_mass_return
+#: field:claim.line.wizard,product_id:0
+msgid "Product"
+msgstr "Proizvod"
+
+#. module: crm_rma_lot_mass_return
+#: help:claim.line.wizard,lot_id:0 help:claim.line.wizard,product_id:0
+msgid "Product to claim"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: field:returned.lines.from.serial.wizard,scan_data:0
+#: field:returned.lines.from.serial.wizard,scaned_data:0
+msgid "Products"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: field:returned.lines.from.serial.wizard,lines_list_id:0
+msgid "Products selected"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: code:addons/crm_rma_lot_mass_return/wizards/returned_lines_from_serial.py:210
+#, python-format
+msgid "Search Product"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Serial/Lot Number*reason number*Description here"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Shipping error"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: field:returned.lines.from.serial.wizard,current_status:0
+msgid "Status"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: code:addons/crm_rma_lot_mass_return/wizards/returned_lines_from_serial.py:590
+#, python-format
+msgid ""
+"The following Serial/Lot numbers won't be added, because all of them (listed below) are currently in use:\n"
+"\n"
+" %s"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid ""
+"The format for writing the reason for the claim and\n"
+"                            the description is:"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: code:addons/crm_rma_lot_mass_return/wizards/returned_lines_from_serial.py:399
+#, python-format
+msgid "The product or invoice %s was not found"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "The reasons for the claim can be"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: view:crm.claim:crm_rma_lot_mass_return.crm_claim_rma_form_view_meta
+msgid "True"
+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"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Write the Invoice Number to search the products in lines"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "Write the Serial/Lot Number to search the product"
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "You are about to add new lines to the claim, Do you want to continue?."
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "You should use this windows on this way."
+msgstr ""
+
+#. module: crm_rma_lot_mass_return
+#: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
+msgid "or"
+msgstr ""
diff --git a/crm_rma_prodlot_invoice/i18n/sl.po b/crm_rma_prodlot_invoice/i18n/sl.po
new file mode 100644
index 00000000..10070cac
--- /dev/null
+++ b/crm_rma_prodlot_invoice/i18n/sl.po
@@ -0,0 +1,65 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * crm_rma_prodlot_invoice
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: rma (8.0)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-12-05 22:30+0000\n"
+"PO-Revision-Date: 2015-11-03 17:06+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: Slovenian (http://www.transifex.com/oca/OCA-rma-8-0/language/sl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: sl\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
+
+#. module: crm_rma_prodlot_invoice
+#: code:addons/crm_rma_prodlot_invoice/models/stock_production_lot.py:39
+#, python-format
+msgid "%s - Lot Number: %s - %s"
+msgstr ""
+
+#. module: crm_rma_prodlot_invoice
+#: field:stock.production.lot,invoice_line_id:0
+msgid "Customer Invoice Line"
+msgstr ""
+
+#. module: crm_rma_prodlot_invoice
+#: help:stock.production.lot,invoice_line_id:0
+msgid "Invoice Line Of Product to Customer Invoice"
+msgstr ""
+
+#. module: crm_rma_prodlot_invoice
+#: model:ir.model,name:crm_rma_prodlot_invoice.model_stock_production_lot
+msgid "Lot/Serial"
+msgstr ""
+
+#. module: crm_rma_prodlot_invoice
+#: code:addons/crm_rma_prodlot_invoice/models/stock_production_lot.py:41
+#, python-format
+msgid "No lot number"
+msgstr ""
+
+#. module: crm_rma_prodlot_invoice
+#: model:ir.model,name:crm_rma_prodlot_invoice.model_stock_picking
+msgid "Picking List"
+msgstr "Zbirni seznam"
+
+#. module: crm_rma_prodlot_invoice
+#: model:ir.model,name:crm_rma_prodlot_invoice.model_stock_transfer_details
+msgid "Picking wizard"
+msgstr ""
+
+#. module: crm_rma_prodlot_invoice
+#: model:ir.model,name:crm_rma_prodlot_invoice.model_sale_order
+msgid "Sales Order"
+msgstr ""
+
+#. module: crm_rma_prodlot_invoice
+#: model:ir.model,name:crm_rma_prodlot_invoice.model_sale_order_line
+msgid "Sales Order Line"
+msgstr ""
diff --git a/crm_rma_prodlot_supplier/i18n/sl.po b/crm_rma_prodlot_supplier/i18n/sl.po
new file mode 100644
index 00000000..2592a3ce
--- /dev/null
+++ b/crm_rma_prodlot_supplier/i18n/sl.po
@@ -0,0 +1,60 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * crm_rma_prodlot_supplier
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: rma (8.0)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-12-05 22:30+0000\n"
+"PO-Revision-Date: 2015-11-03 17:06+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: Slovenian (http://www.transifex.com/oca/OCA-rma-8-0/language/sl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: sl\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
+
+#. module: crm_rma_prodlot_supplier
+#: model:ir.model,name:crm_rma_prodlot_supplier.model_stock_production_lot
+msgid "Lot/Serial"
+msgstr ""
+
+#. module: crm_rma_prodlot_supplier
+#: model:ir.model,name:crm_rma_prodlot_supplier.model_stock_picking
+msgid "Picking List"
+msgstr "Zbirni seznam"
+
+#. module: crm_rma_prodlot_supplier
+#: model:ir.model,name:crm_rma_prodlot_supplier.model_stock_transfer_details
+msgid "Picking wizard"
+msgstr ""
+
+#. module: crm_rma_prodlot_supplier
+#: field:stock.production.lot,supplier_id:0
+msgid "Supplier"
+msgstr ""
+
+#. module: crm_rma_prodlot_supplier
+#: field:stock.production.lot,supplier_invoice_line_id:0
+msgid "Supplier Invoice Line"
+msgstr ""
+
+#. module: crm_rma_prodlot_supplier
+#: help:stock.production.lot,supplier_invoice_line_id:0
+msgid "Supplier invoice with the purchase of goods sold to customer"
+msgstr ""
+
+#. module: crm_rma_prodlot_supplier
+#: help:stock.production.lot,supplier_id:0
+msgid "Supplier of good in claim"
+msgstr ""
+
+#. module: crm_rma_prodlot_supplier
+#: view:stock.transfer_details:crm_rma_prodlot_supplier.view_lot_form_supplier_context
+msgid ""
+"{'product_id': product_id,\n"
+"                            'active_id': active_id}"
+msgstr ""
diff --git a/crm_rma_stock_location/i18n/sl.po b/crm_rma_stock_location/i18n/sl.po
new file mode 100644
index 00000000..5905382c
--- /dev/null
+++ b/crm_rma_stock_location/i18n/sl.po
@@ -0,0 +1,243 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * crm_rma_stock_location
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: rma (8.0)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-12-05 22:30+0000\n"
+"PO-Revision-Date: 2015-12-02 21:49+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: Slovenian (http://www.transifex.com/oca/OCA-rma-8-0/language/sl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: sl\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\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 "Preklic"
+
+#. 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 "Ustvari zbirnik"
+
+#. module: crm_rma_stock_location
+#: field:claim.make.picking.from.picking.wizard,create_uid:0
+msgid "Created by"
+msgstr "Ustvaril"
+
+#. module: crm_rma_stock_location
+#: field:claim.make.picking.from.picking.wizard,create_date:0
+msgid "Created on"
+msgstr "Ustvarjeno"
+
+#. 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 "Ciljna lokacija"
+
+#. module: crm_rma_stock_location
+#: field:claim.make.picking.from.picking.wizard,id:0
+msgid "ID"
+msgstr "ID"
+
+#. module: crm_rma_stock_location
+#: field:claim.make.picking.from.picking.wizard,write_uid:0
+msgid "Last Updated by"
+msgstr "Zadnji posodobil"
+
+#. module: crm_rma_stock_location
+#: field:claim.make.picking.from.picking.wizard,write_date:0
+msgid "Last Updated on"
+msgstr "Zadnjič posodobljeno"
+
+#. module: crm_rma_stock_location
+#: view:claim.make.picking.from.picking.wizard:crm_rma_stock_location.view_claim_picking_from_picking
+msgid "Locations"
+msgstr "Lokacije"
+
+#. module: crm_rma_stock_location
+#: code:addons/crm_rma_stock_location/models/stock_warehouse.py:65
+#, 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 "Proizvod"
+
+#. 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
+#: code:addons/crm_rma_stock_location/models/product_template.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
+#: code:addons/crm_rma_stock_location/models/product_template.py:36
+#, python-format
+msgid "RMA Quantity On Hand"
+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
+#: 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
+#: code:addons/crm_rma_stock_location/wizards/claim_make_picking_from_picking.py:86
+#: help:claim.make.picking.from.picking.wizard,picking_line_source_location:0
+#, python-format
+msgid "Source location where the returned products are"
+msgstr ""
+
+#. module: crm_rma_stock_location
+#: code:addons/crm_rma_stock_location/wizards/claim_make_picking_from_picking.py:90
+#: help:claim.make.picking.from.picking.wizard,picking_line_dest_location:0
+#, python-format
+msgid "Target location to send returned products"
+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/sl.po b/product_warranty/i18n/sl.po
new file mode 100644
index 00000000..40d1deae
--- /dev/null
+++ b/product_warranty/i18n/sl.po
@@ -0,0 +1,164 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * product_warranty
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: rma (8.0)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-12-05 22:30+0000\n"
+"PO-Revision-Date: 2015-11-03 17:06+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: Slovenian (http://www.transifex.com/oca/OCA-rma-8-0/language/sl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: sl\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\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 "Ustvaril"
+
+#. module: product_warranty
+#: field:return.instruction,create_date:0
+msgid "Created on"
+msgstr "Ustvarjeno"
+
+#. 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 "ID"
+
+#. 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 "Zadnji posodobil"
+
+#. module: product_warranty
+#: field:return.instruction,write_date:0
+msgid "Last Updated on"
+msgstr "Zadnjič posodobljeno"
+
+#. 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 ""

From 3ef126d24b14f52786709748896a5aa152857a44 Mon Sep 17 00:00:00 2001
From: OCA Transbot <transbot@odoo-community.org>
Date: Sat, 19 Dec 2015 18:04:30 -0500
Subject: [PATCH 19/19] OCA Transbot updated translations from Transifex

---
 crm_claim_rma/i18n/sl.po            | 104 ++++++++++++++--------------
 crm_rma_location/i18n/sl.po         |  31 +++++----
 crm_rma_lot_mass_return/i18n/sl.po  |  81 +++++++++++-----------
 crm_rma_prodlot_invoice/i18n/sl.po  |  23 +++---
 crm_rma_prodlot_supplier/i18n/sl.po |  21 +++---
 crm_rma_stock_location/i18n/sl.po   |  71 +++++++++----------
 product_warranty/i18n/sl.po         |  47 +++++++------
 7 files changed, 192 insertions(+), 186 deletions(-)

diff --git a/crm_claim_rma/i18n/sl.po b/crm_claim_rma/i18n/sl.po
index e148bc63..fdf1243a 100644
--- a/crm_claim_rma/i18n/sl.po
+++ b/crm_claim_rma/i18n/sl.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rma (8.0)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-05 22:30+0000\n"
-"PO-Revision-Date: 2015-12-12 17:43+0000\n"
+"POT-Creation-Date: 2015-12-12 22:57+0000\n"
+"PO-Revision-Date: 2015-12-13 06:19+0000\n"
 "Last-Translator: Matjaž Mozetič <m.mozetic@matmoz.si>\n"
 "Language-Team: Slovenian (http://www.transifex.com/oca/OCA-rma-8-0/language/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -777,17 +777,17 @@ msgstr "Številka pooblastila vračila blaga"
 #. module: crm_claim_rma
 #: view:crm.claim:crm_claim_rma.crm_claim_rma_form_view
 msgid "Sales"
-msgstr ""
+msgstr "Prodaja"
 
 #. module: crm_claim_rma
 #: view:crm.claim:crm_claim_rma.view_crm_case_claims_filter
 msgid "Sales Team"
-msgstr ""
+msgstr "Prodajna ekipa"
 
 #. module: crm_claim_rma
 #: view:claim.line:crm_claim_rma.view_crm_claim_lines_filter
 msgid "Search Claims"
-msgstr ""
+msgstr "Iskanje zahtevkov"
 
 #. module: crm_claim_rma
 #: help:claim.line,substate_id:0
@@ -796,163 +796,163 @@ msgid ""
 "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 ""
+msgstr "Izberite pod-stanje za določitev standardnega stanja. Primer 1: stanje = zavrnjeno; pod-stanje bi lahko bilo garancija potekla, ni v garanciji, ni težav, ... Primer 2: stanje = za obdelavo; pod-stanje bi lahko bilo za dobropis, za zamenjavo, za popravilo, ..."
 
 #. module: crm_claim_rma
 #: view:claim_make_picking.wizard:crm_claim_rma.view_claim_picking
 msgid "Select exchange lines to add in picking"
-msgstr ""
+msgstr "Izberite menjalne postavke za dodajanje v zbirnik"
 
 #. module: crm_claim_rma
 #: view:claim_make_picking.wizard:crm_claim_rma.view_claim_picking
 msgid "Select lines for picking"
-msgstr ""
+msgstr "Izberite postavke za zbirnik"
 
 #. module: crm_claim_rma
 #: field:crm.claim,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Zaporedje"
 
 #. module: crm_claim_rma
 #: field:claim.line,prodlot_id:0
 msgid "Serial/Lot number"
-msgstr ""
+msgstr "Številka serijska/lota"
 
 #. module: crm_claim_rma
 #: model:crm.case.categ,name:crm_claim_rma.categ_claim19
 msgid "Shipping Address Undeliverable"
-msgstr ""
+msgstr "Nedostavljiv naslov odpreme"
 
 #. module: crm_claim_rma
 #: selection:claim.line,claim_origin:0
 msgid "Shipping error"
-msgstr ""
+msgstr "Napaka odpreme"
 
 #. module: crm_claim_rma
 #: field:claim_make_picking.wizard,claim_line_source_location_id:0
 msgid "Source Location"
-msgstr ""
+msgstr "Izvorna lokacija"
 
 #. module: crm_claim_rma
 #: view:crm.claim:crm_claim_rma.view_crm_case_claims_filter
 msgid "Stage"
-msgstr ""
+msgstr "Stopnja"
 
 #. module: crm_claim_rma
 #: view:claim.line:crm_claim_rma.crm_claim_line_form_view
 #: view:claim.line:crm_claim_rma.view_crm_claim_lines_filter
 #: field:claim.line,state:0
 msgid "State"
-msgstr ""
+msgstr "Stanje"
 
 #. module: crm_claim_rma
 #: model:ir.model,name:crm_claim_rma.model_stock_move
 msgid "Stock Move"
-msgstr ""
+msgstr "Premik zaloge"
 
 #. module: crm_claim_rma
 #: field:claim.line,substate_id:0 field:substate.substate,name:0
 msgid "Sub state"
-msgstr ""
+msgstr "Pod stanje"
 
 #. module: crm_claim_rma
 #: view:claim.line:crm_claim_rma.view_crm_claim_lines_filter
 msgid "Substate"
-msgstr ""
+msgstr "Pod-stanje"
 
 #. module: crm_claim_rma
 #: field:claim.line,message_summary:0 field:stock.move,message_summary:0
 msgid "Summary"
-msgstr ""
+msgstr "Povzetek"
 
 #. module: crm_claim_rma
 #: selection:claim.line,applicable_guarantee:0
 msgid "Supplier"
-msgstr ""
+msgstr "Dobavitelj"
 
 #. module: crm_claim_rma
 #: help:claim.line,invoice_line_id:0
 msgid "The invoice line related to the returned product"
-msgstr ""
+msgstr "Postavka računa vezana na vrnjeni proizvod"
 
 #. 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 ""
+msgstr "Postavka premika vezana na vrnjeni proizvod"
 
 #. module: crm_claim_rma
 #: code:addons/crm_claim_rma/models/claim_line.py:312
 #, python-format
 msgid "The product has no supplier configured."
-msgstr ""
+msgstr "Proizvod nima nastavljenega dobavitelja."
 
 #. module: crm_claim_rma
 #: help:claim.line,refund_line_id:0
 msgid "The refund line related to the returned product"
-msgstr ""
+msgstr "Postavka dobropisa vezana na vrnjeni proizvod"
 
 #. module: crm_claim_rma
 #: help:claim.line,location_dest_id:0
 msgid "The return stock location of the returned product"
-msgstr ""
+msgstr "Lokacija zaloge vračil za vrnjeni proizvod"
 
 #. module: crm_claim_rma
 #: help:claim.line,prodlot_id:0
 msgid "The serial/lot of the returned product"
-msgstr ""
+msgstr "Serija/lot vrnjenega proizvoda"
 
 #. 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 ""
+msgstr "Garancijski limit izračunan kot: datum računa + garancija določena za izbrani proizvod."
 
 #. module: crm_claim_rma
 #: code:addons/crm_claim_rma/models/crm_claim.py:40
 #, python-format
 msgid "There is no warehouse for the current user's company."
-msgstr ""
+msgstr "Za trenutno družbo uporabnika ni skladišča."
 
 #. module: crm_claim_rma
 #: help:crm.claim,delivery_address_id:0
 msgid "This address will be used to deliver repaired or replacement products."
-msgstr ""
+msgstr "Ta naslov bo uporabljen za dobavo popravljenih proizvodov ali zamenjav proizvodov."
 
 #. module: crm_claim_rma
 #: help:claim.line,claim_diagnosis:0
 msgid "To describe the line product diagnosis"
-msgstr ""
+msgstr "Za opis postavke diagnoze proizvoda"
 
 #. module: crm_claim_rma
 #: help:claim.line,claim_origin:0
 msgid "To describe the line product problem"
-msgstr ""
+msgstr "Za opis postavke težave proizvoda"
 
 #. module: crm_claim_rma
 #: help:substate.substate,substate_descr:0
 msgid "To give more information about the sub state"
-msgstr ""
+msgstr "Ta podajanje več informacij glede pod-stanja"
 
 #. module: crm_claim_rma
 #: help:claim.line,claim_id:0
 msgid "To link to the case.claim object"
-msgstr ""
+msgstr "Za povezavo z objektom case.claim"
 
 #. module: crm_claim_rma
 #: help:claim.line,last_state_change:0
 msgid "To set thelast state / substate change"
-msgstr ""
+msgstr "Za nastavitev zadnje spremembe stanja / pod-stanja"
 
 #. module: crm_claim_rma
 #: selection:claim.line,state:0
 msgid "Treated"
-msgstr ""
+msgstr "Obdelano"
 
 #. module: crm_claim_rma
 #: field:claim.line,unit_sale_price:0
 msgid "Unit sale price"
-msgstr ""
+msgstr "Prodajna cena enote"
 
 #. module: crm_claim_rma
 #: help:claim.line,unit_sale_price:0
@@ -961,55 +961,55 @@ msgid ""
 "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 ""
+msgstr "Prodajna cena enote proizvoda. Samodejno izpolnjeno pri vračilu iz izbire računa. Bodite pozorni in preverite samodejno vrednost, saj ne upošteva predhodnih dobropisov in obračunskih popustov. V primeru, da je proizvod brezplačen je lahko 0."
 
 #. module: crm_claim_rma
 #: field:claim.line,message_unread:0 field:stock.move,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "Neprebrana sporočila"
 
 #. module: crm_claim_rma
 #: code:addons/crm_claim_rma/models/claim_line.py:63
 #: selection:claim.line,warning:0
 #, python-format
 msgid "Valid"
-msgstr ""
+msgstr "Veljavno"
 
 #. module: crm_claim_rma
 #: selection:claim.line,priority:0
 msgid "Very High"
-msgstr ""
+msgstr "Zelo visoka"
 
 #. module: crm_claim_rma
 #: field:crm.claim,warehouse_id:0
 msgid "Warehouse"
-msgstr ""
+msgstr "Skladišče"
 
 #. module: crm_claim_rma
 #: view:claim.line:crm_claim_rma.crm_claim_line_form_view
 #: field:claim.line,warning:0
 msgid "Warranty"
-msgstr ""
+msgstr "Garancija"
 
 #. module: crm_claim_rma
 #: field:claim.line,warranty_return_partner:0
 msgid "Warranty Address"
-msgstr ""
+msgstr "Garancijski naslov"
 
 #. module: crm_claim_rma
 #: field:claim.line,guarantee_limit:0
 msgid "Warranty limit"
-msgstr ""
+msgstr "Garancijski limit"
 
 #. module: crm_claim_rma
 #: field:claim.line,applicable_guarantee:0 field:claim.line,warranty_type:0
 msgid "Warranty type"
-msgstr ""
+msgstr "Tip garancije"
 
 #. module: crm_claim_rma
 #: help:claim.line,warranty_return_partner:0
 msgid "Where the customer has to send back the product(s)"
-msgstr ""
+msgstr "Kam naj kupec pošlje vrnjeni/e proizvod(e)"
 
 #. module: crm_claim_rma
 #: help:claim.line,warranty_type:0
@@ -1019,22 +1019,22 @@ msgid ""
 "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 ""
+msgstr "Kdo je zadolžen za obdelavo garancijskih vračil končnega kupca. Družba bo uporabila trenutni dostavni ali privzeti naslov dobavitelja in proizvajalca blagovne znamke. Ni nujno, da se uporabi garancije partnerja, ki mu vračamo (npr. lahko se vrne družbi, a je pod garancijo proizvajalca blagovne znamke)."
 
 #. 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 ""
+msgstr "Čarovnik za ustvarjanje zbirnikov iz postavk zahtevka"
 
 #. module: crm_claim_rma
 #: view:claim_make_picking.wizard:crm_claim_rma.view_claim_picking
 msgid "or"
-msgstr ""
+msgstr "ali"
 
 #. module: crm_claim_rma
 #: model:ir.model,name:crm_claim_rma.model_substate_substate
 msgid "substate that precise a given state"
-msgstr ""
+msgstr "pod-stanje, ki določa dano stanje"
 
 #. module: crm_claim_rma
 #: view:claim.line:crm_claim_rma.crm_claim_line_view_form_embedded
@@ -1042,9 +1042,9 @@ msgid ""
 "{'claim_id': parent.id, 'company_id': parent.company_id, 'warehouse_id': "
 "parent.warehouse_id, 'claim_type': parent.claim_type, 'claim_date': "
 "parent.date}"
-msgstr ""
+msgstr "{'claim_id': parent.id, 'company_id': parent.company_id, 'warehouse_id': parent.warehouse_id, 'claim_type': parent.claim_type, 'claim_date': parent.date}"
 
 #. module: crm_claim_rma
 #: view:crm.claim:crm_claim_rma.crm_case_claims_form_view
 msgid "{'create_lines': False}"
-msgstr ""
+msgstr "{'create_lines': False}"
diff --git a/crm_rma_location/i18n/sl.po b/crm_rma_location/i18n/sl.po
index 93400b20..79bce187 100644
--- a/crm_rma_location/i18n/sl.po
+++ b/crm_rma_location/i18n/sl.po
@@ -3,13 +3,14 @@
 # * crm_rma_location
 # 
 # Translators:
+# Matjaž Mozetič <m.mozetic@matmoz.si>, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: rma (8.0)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-05 22:30+0000\n"
-"PO-Revision-Date: 2015-11-03 17:05+0000\n"
-"Last-Translator: <>\n"
+"POT-Creation-Date: 2015-12-12 22:57+0000\n"
+"PO-Revision-Date: 2015-12-13 06:20+0000\n"
+"Last-Translator: Matjaž Mozetič <m.mozetic@matmoz.si>\n"
 "Language-Team: Slovenian (http://www.transifex.com/oca/OCA-rma-8-0/language/sl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,65 +22,65 @@ msgstr ""
 #: code:addons/crm_rma_location/models/stock_warehouse.py:73
 #, python-format
 msgid " Sequence in"
-msgstr ""
+msgstr "Vhodno zaporedje"
 
 #. module: crm_rma_location
 #: code:addons/crm_rma_location/models/stock_warehouse.py:83
 #, python-format
 msgid " Sequence internal"
-msgstr ""
+msgstr "Interno zaporedje"
 
 #. module: crm_rma_location
 #: code:addons/crm_rma_location/models/stock_warehouse.py:78
 #, python-format
 msgid " Sequence out"
-msgstr ""
+msgstr "Izhodno zaporedje"
 
 #. module: crm_rma_location
 #: code:addons/crm_rma_location/models/stock_warehouse.py:161
 #, python-format
 msgid "RMA"
-msgstr "Pooblastilo vračila blaga"
+msgstr "Pooblastilo vračila blaga - PVB"
 
 #. module: crm_rma_location
 #: code:addons/crm_rma_location/models/stock_warehouse.py:115
 #, python-format
 msgid "RMA Delivery Orders"
-msgstr ""
+msgstr "PVB dobavni nalogi"
 
 #. module: crm_rma_location
 #: field:stock.warehouse,rma_in_type_id:0
 msgid "RMA In Type"
-msgstr ""
+msgstr "PVB vhodni tip"
 
 #. module: crm_rma_location
 #: code:addons/crm_rma_location/models/stock_warehouse.py:129
 #, python-format
 msgid "RMA Internal Transfers"
-msgstr ""
+msgstr "PVB interni transferji"
 
 #. module: crm_rma_location
 #: field:stock.warehouse,rma_int_type_id:0
 msgid "RMA Internal Type"
-msgstr ""
+msgstr "PVB interni tip"
 
 #. module: crm_rma_location
 #: field:stock.warehouse,lot_rma_id:0
 msgid "RMA Location"
-msgstr ""
+msgstr "PVB lokacija"
 
 #. module: crm_rma_location
 #: field:stock.warehouse,rma_out_type_id:0
 msgid "RMA Out Type"
-msgstr ""
+msgstr "PVB izhodni tip"
 
 #. module: crm_rma_location
 #: code:addons/crm_rma_location/models/stock_warehouse.py:103
 #, python-format
 msgid "RMA Receipts"
-msgstr ""
+msgstr "PVB prejemi"
 
 #. module: crm_rma_location
 #: model:ir.model,name:crm_rma_location.model_stock_warehouse
 msgid "Warehouse"
-msgstr ""
+msgstr "Skladišče"
diff --git a/crm_rma_lot_mass_return/i18n/sl.po b/crm_rma_lot_mass_return/i18n/sl.po
index 7a617169..6bb4db17 100644
--- a/crm_rma_lot_mass_return/i18n/sl.po
+++ b/crm_rma_lot_mass_return/i18n/sl.po
@@ -3,13 +3,14 @@
 # * crm_rma_lot_mass_return
 # 
 # Translators:
+# Matjaž Mozetič <m.mozetic@matmoz.si>, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: rma (8.0)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-05 22:30+0000\n"
-"PO-Revision-Date: 2015-11-19 22:20+0000\n"
-"Last-Translator: <>\n"
+"POT-Creation-Date: 2015-12-12 22:57+0000\n"
+"PO-Revision-Date: 2015-12-13 06:18+0000\n"
+"Last-Translator: Matjaž Mozetič <m.mozetic@matmoz.si>\n"
 "Language-Team: Slovenian (http://www.transifex.com/oca/OCA-rma-8-0/language/sl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,35 +22,35 @@ msgstr ""
 #: code:addons/crm_rma_lot_mass_return/wizards/returned_lines_from_serial.py:67
 #, python-format
 msgid "(ID: %s) - %s - %s"
-msgstr ""
+msgstr "(ID: %s) - %s - %s"
 
 #. module: crm_rma_lot_mass_return
 #: code:addons/crm_rma_lot_mass_return/wizards/returned_lines_from_serial.py:72
 #, python-format
 msgid "(ID: %s) - %s - %s - %s"
-msgstr ""
+msgstr "(ID: %s) - %s - %s - %s"
 
 #. module: crm_rma_lot_mass_return
 #. openerp-web
 #: code:addons/crm_rma_lot_mass_return/static/src/js/barcode_text.js:90
 #, python-format
 msgid "-->"
-msgstr ""
+msgstr "-->"
 
 #. module: crm_rma_lot_mass_return
 #: view:crm.claim:crm_rma_lot_mass_return.crm_claim_rma_form_view_meta
 msgid "Add claim lines using serial or invoice number"
-msgstr ""
+msgstr "Dodajanje postavk zahtevka z uporabo serijske številke ali številke računa"
 
 #. module: crm_rma_lot_mass_return
 #: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
 msgid "Add items to the claim"
-msgstr ""
+msgstr "Dodajanje artiklov v zahtevek"
 
 #. module: crm_rma_lot_mass_return
 #: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
 msgid "All the valid lines will be added to the claim"
-msgstr ""
+msgstr "Vse veljavne postavke bodo dodane v zahtevek"
 
 #. module: crm_rma_lot_mass_return
 #: model:ir.model,name:crm_rma_lot_mass_return.model_crm_claim
@@ -71,17 +72,17 @@ msgstr "Ustvarjeno"
 #. module: crm_rma_lot_mass_return
 #: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
 msgid "Damaged Delivered Product"
-msgstr ""
+msgstr "Poškodovan dobavljeni proizvod"
 
 #. module: crm_rma_lot_mass_return
 #: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
 msgid "Example: A4JD6JHS"
-msgstr ""
+msgstr "Primer: A4JD6JHS"
 
 #. module: crm_rma_lot_mass_return
 #: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
 msgid "Example: A4JD6JHS*4*The display is break"
-msgstr ""
+msgstr "Primer: A4JD6JHS*4*Zaslon je okvarjen"
 
 #. module: crm_rma_lot_mass_return
 #: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
@@ -91,29 +92,29 @@ msgstr "Zahteva po zamenjavi"
 #. module: crm_rma_lot_mass_return
 #: help:returned.lines.from.serial.wizard,scan_data:0
 msgid "Field used to load and show the products"
-msgstr ""
+msgstr "Polje, ki se uporablja za nalaganje in prikaz proizvodov"
 
 #. module: crm_rma_lot_mass_return
 #: help:returned.lines.from.serial.wizard,option_ids:0
 msgid "Field used to load the ids of invoice lines in invoices writed"
-msgstr ""
+msgstr "Polje, ki se uporablja za id-je postavk računa pri zapisu"
 
 #. module: crm_rma_lot_mass_return
 #: help:returned.lines.from.serial.wizard,scaned_data:0
 msgid "Field used to load the ids of products loaded"
-msgstr ""
+msgstr "Polje, ki se uporablja za nalaganje id-jev naloženih proizvodov"
 
 #. module: crm_rma_lot_mass_return
 #: help:returned.lines.from.serial.wizard,lines_list_id:0
 msgid "Field used to show the current status of the lots loaded"
-msgstr ""
+msgstr "Polje, ki se uporablja za prikaz trenutnega statusa naloženih lotov"
 
 #. module: crm_rma_lot_mass_return
 #: help:returned.lines.from.serial.wizard,current_status:0
 msgid ""
 "Field used to show the current status of the product loaded(Name and "
 "quantity)"
-msgstr ""
+msgstr "Polje, ki se uporablja za prikaz trenutnega statusa naloženega proizvoda (naziv in količina)"
 
 #. module: crm_rma_lot_mass_return
 #: field:claim.line.wizard,id:0 field:returned.lines.from.serial.wizard,id:0
@@ -134,7 +135,7 @@ msgstr "Postavka računa"
 #. module: crm_rma_lot_mass_return
 #: field:returned.lines.from.serial.wizard,option_ids:0
 msgid "Invoice Lines to Select"
-msgstr ""
+msgstr "Postavke računa za izbor"
 
 #. module: crm_rma_lot_mass_return
 #: field:claim.line.wizard,write_uid:0
@@ -161,7 +162,7 @@ msgstr "Izgubljen med prevozom"
 #. module: crm_rma_lot_mass_return
 #: field:claim.line.wizard,lot_id:0
 msgid "Lot"
-msgstr ""
+msgstr "Lot"
 
 #. module: crm_rma_lot_mass_return
 #: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
@@ -173,12 +174,12 @@ msgstr "Ni določeno"
 #: code:addons/crm_rma_lot_mass_return/static/src/js/barcode_text.js:93
 #, python-format
 msgid "Ok"
-msgstr ""
+msgstr "V redu"
 
 #. module: crm_rma_lot_mass_return
 #: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
 msgid "Order Cancellation"
-msgstr ""
+msgstr "Preklic naročila"
 
 #. module: crm_rma_lot_mass_return
 #: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
@@ -188,7 +189,7 @@ msgstr "Drugo"
 #. module: crm_rma_lot_mass_return
 #: field:returned.lines.from.serial.wizard,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Partner"
 
 #. module: crm_rma_lot_mass_return
 #: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
@@ -213,39 +214,39 @@ msgstr "Proizvod"
 #. module: crm_rma_lot_mass_return
 #: help:claim.line.wizard,lot_id:0 help:claim.line.wizard,product_id:0
 msgid "Product to claim"
-msgstr ""
+msgstr "Proizvod za reklamacijo"
 
 #. module: crm_rma_lot_mass_return
 #: field:returned.lines.from.serial.wizard,scan_data:0
 #: field:returned.lines.from.serial.wizard,scaned_data:0
 msgid "Products"
-msgstr ""
+msgstr "Proizvodi"
 
 #. module: crm_rma_lot_mass_return
 #: field:returned.lines.from.serial.wizard,lines_list_id:0
 msgid "Products selected"
-msgstr ""
+msgstr "Izbrani proizvodi"
 
 #. module: crm_rma_lot_mass_return
 #: code:addons/crm_rma_lot_mass_return/wizards/returned_lines_from_serial.py:210
 #, python-format
 msgid "Search Product"
-msgstr ""
+msgstr "Iskanje proizvoda"
 
 #. module: crm_rma_lot_mass_return
 #: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
 msgid "Serial/Lot Number*reason number*Description here"
-msgstr ""
+msgstr "Serijska številka/št. lota*številka razloga*opis"
 
 #. module: crm_rma_lot_mass_return
 #: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
 msgid "Shipping error"
-msgstr ""
+msgstr "Napaka odpreme"
 
 #. module: crm_rma_lot_mass_return
 #: field:returned.lines.from.serial.wizard,current_status:0
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #. module: crm_rma_lot_mass_return
 #: code:addons/crm_rma_lot_mass_return/wizards/returned_lines_from_serial.py:590
@@ -254,57 +255,57 @@ msgid ""
 "The following Serial/Lot numbers won't be added, because all of them (listed below) are currently in use:\n"
 "\n"
 " %s"
-msgstr ""
+msgstr "Sledeče serijske številke/številke lotov ne bodo dodane, ker so vse (spodaj naštete) trenutno v uporabi:\n\n %s"
 
 #. module: crm_rma_lot_mass_return
 #: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
 msgid ""
 "The format for writing the reason for the claim and\n"
 "                            the description is:"
-msgstr ""
+msgstr "Format zapisa razloga za zahtevek in\n                            opis je:"
 
 #. module: crm_rma_lot_mass_return
 #: code:addons/crm_rma_lot_mass_return/wizards/returned_lines_from_serial.py:399
 #, python-format
 msgid "The product or invoice %s was not found"
-msgstr ""
+msgstr "Proizvod ali račun %s ni najden"
 
 #. module: crm_rma_lot_mass_return
 #: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
 msgid "The reasons for the claim can be"
-msgstr ""
+msgstr "Razlogi za zahtevek so lahko"
 
 #. module: crm_rma_lot_mass_return
 #: view:crm.claim:crm_rma_lot_mass_return.crm_claim_rma_form_view_meta
 msgid "True"
-msgstr ""
+msgstr "Pravilno"
 
 #. 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"
-msgstr ""
+msgstr "Čarovnik za ustvarjanje postavk vračila proizvoda"
 
 #. module: crm_rma_lot_mass_return
 #: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
 msgid "Write the Invoice Number to search the products in lines"
-msgstr ""
+msgstr "Zapišite številko računa za iskanje proizvodov v postavkah"
 
 #. module: crm_rma_lot_mass_return
 #: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
 msgid "Write the Serial/Lot Number to search the product"
-msgstr ""
+msgstr "Zapišite serijsko ali številko lota za iskanje proizvoda"
 
 #. module: crm_rma_lot_mass_return
 #: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
 msgid "You are about to add new lines to the claim, Do you want to continue?."
-msgstr ""
+msgstr "Dodali boste nove postavke v zahtevek. Želite nadaljevati?"
 
 #. module: crm_rma_lot_mass_return
 #: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
 msgid "You should use this windows on this way."
-msgstr ""
+msgstr "Ta okna bi morali uporabljati na tak način."
 
 #. module: crm_rma_lot_mass_return
 #: view:returned.lines.from.serial.wizard:crm_rma_lot_mass_return.view_enter_product
 msgid "or"
-msgstr ""
+msgstr "ali"
diff --git a/crm_rma_prodlot_invoice/i18n/sl.po b/crm_rma_prodlot_invoice/i18n/sl.po
index 10070cac..30cc984f 100644
--- a/crm_rma_prodlot_invoice/i18n/sl.po
+++ b/crm_rma_prodlot_invoice/i18n/sl.po
@@ -3,13 +3,14 @@
 # * crm_rma_prodlot_invoice
 # 
 # Translators:
+# Matjaž Mozetič <m.mozetic@matmoz.si>, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: rma (8.0)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-05 22:30+0000\n"
-"PO-Revision-Date: 2015-11-03 17:06+0000\n"
-"Last-Translator: <>\n"
+"POT-Creation-Date: 2015-12-12 22:57+0000\n"
+"PO-Revision-Date: 2015-12-14 06:38+0000\n"
+"Last-Translator: Matjaž Mozetič <m.mozetic@matmoz.si>\n"
 "Language-Team: Slovenian (http://www.transifex.com/oca/OCA-rma-8-0/language/sl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,28 +22,28 @@ msgstr ""
 #: code:addons/crm_rma_prodlot_invoice/models/stock_production_lot.py:39
 #, python-format
 msgid "%s - Lot Number: %s - %s"
-msgstr ""
+msgstr "%s - Lot številka: %s - %s"
 
 #. module: crm_rma_prodlot_invoice
 #: field:stock.production.lot,invoice_line_id:0
 msgid "Customer Invoice Line"
-msgstr ""
+msgstr "Postavka izdanega računa"
 
 #. module: crm_rma_prodlot_invoice
 #: help:stock.production.lot,invoice_line_id:0
 msgid "Invoice Line Of Product to Customer Invoice"
-msgstr ""
+msgstr "Postavka proizvoda v postavko izdanega računa"
 
 #. module: crm_rma_prodlot_invoice
 #: model:ir.model,name:crm_rma_prodlot_invoice.model_stock_production_lot
 msgid "Lot/Serial"
-msgstr ""
+msgstr "Lot/Serijska"
 
 #. module: crm_rma_prodlot_invoice
 #: code:addons/crm_rma_prodlot_invoice/models/stock_production_lot.py:41
 #, python-format
 msgid "No lot number"
-msgstr ""
+msgstr "Ni številke računa"
 
 #. module: crm_rma_prodlot_invoice
 #: model:ir.model,name:crm_rma_prodlot_invoice.model_stock_picking
@@ -52,14 +53,14 @@ msgstr "Zbirni seznam"
 #. module: crm_rma_prodlot_invoice
 #: model:ir.model,name:crm_rma_prodlot_invoice.model_stock_transfer_details
 msgid "Picking wizard"
-msgstr ""
+msgstr "Zbirni čarovnik"
 
 #. module: crm_rma_prodlot_invoice
 #: model:ir.model,name:crm_rma_prodlot_invoice.model_sale_order
 msgid "Sales Order"
-msgstr ""
+msgstr "Prodajni nalog"
 
 #. module: crm_rma_prodlot_invoice
 #: model:ir.model,name:crm_rma_prodlot_invoice.model_sale_order_line
 msgid "Sales Order Line"
-msgstr ""
+msgstr "Postavka prodajnega naloga"
diff --git a/crm_rma_prodlot_supplier/i18n/sl.po b/crm_rma_prodlot_supplier/i18n/sl.po
index 2592a3ce..282fbe3a 100644
--- a/crm_rma_prodlot_supplier/i18n/sl.po
+++ b/crm_rma_prodlot_supplier/i18n/sl.po
@@ -3,13 +3,14 @@
 # * crm_rma_prodlot_supplier
 # 
 # Translators:
+# Matjaž Mozetič <m.mozetic@matmoz.si>, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: rma (8.0)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-05 22:30+0000\n"
-"PO-Revision-Date: 2015-11-03 17:06+0000\n"
-"Last-Translator: <>\n"
+"POT-Creation-Date: 2015-12-12 22:57+0000\n"
+"PO-Revision-Date: 2015-12-14 06:37+0000\n"
+"Last-Translator: Matjaž Mozetič <m.mozetic@matmoz.si>\n"
 "Language-Team: Slovenian (http://www.transifex.com/oca/OCA-rma-8-0/language/sl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,7 +21,7 @@ msgstr ""
 #. module: crm_rma_prodlot_supplier
 #: model:ir.model,name:crm_rma_prodlot_supplier.model_stock_production_lot
 msgid "Lot/Serial"
-msgstr ""
+msgstr "Lot/Serijska"
 
 #. module: crm_rma_prodlot_supplier
 #: model:ir.model,name:crm_rma_prodlot_supplier.model_stock_picking
@@ -30,31 +31,31 @@ msgstr "Zbirni seznam"
 #. module: crm_rma_prodlot_supplier
 #: model:ir.model,name:crm_rma_prodlot_supplier.model_stock_transfer_details
 msgid "Picking wizard"
-msgstr ""
+msgstr "Zbirni čarovnik"
 
 #. module: crm_rma_prodlot_supplier
 #: field:stock.production.lot,supplier_id:0
 msgid "Supplier"
-msgstr ""
+msgstr "Dobavitelj"
 
 #. module: crm_rma_prodlot_supplier
 #: field:stock.production.lot,supplier_invoice_line_id:0
 msgid "Supplier Invoice Line"
-msgstr ""
+msgstr "Postavka prejetega računa"
 
 #. module: crm_rma_prodlot_supplier
 #: help:stock.production.lot,supplier_invoice_line_id:0
 msgid "Supplier invoice with the purchase of goods sold to customer"
-msgstr ""
+msgstr "Prejeti račun z nabavljenim blagom za nadaljnjo prodajo kupcu"
 
 #. module: crm_rma_prodlot_supplier
 #: help:stock.production.lot,supplier_id:0
 msgid "Supplier of good in claim"
-msgstr ""
+msgstr "Dobavitelj blaga v zahtevku"
 
 #. module: crm_rma_prodlot_supplier
 #: view:stock.transfer_details:crm_rma_prodlot_supplier.view_lot_form_supplier_context
 msgid ""
 "{'product_id': product_id,\n"
 "                            'active_id': active_id}"
-msgstr ""
+msgstr "{'product_id': product_id,\n                            'active_id': active_id}"
diff --git a/crm_rma_stock_location/i18n/sl.po b/crm_rma_stock_location/i18n/sl.po
index 5905382c..860c3f7b 100644
--- a/crm_rma_stock_location/i18n/sl.po
+++ b/crm_rma_stock_location/i18n/sl.po
@@ -3,13 +3,14 @@
 # * crm_rma_stock_location
 # 
 # Translators:
+# Matjaž Mozetič <m.mozetic@matmoz.si>, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: rma (8.0)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-05 22:30+0000\n"
-"PO-Revision-Date: 2015-12-02 21:49+0000\n"
-"Last-Translator: <>\n"
+"POT-Creation-Date: 2015-12-12 22:57+0000\n"
+"PO-Revision-Date: 2015-12-14 06:36+0000\n"
+"Last-Translator: Matjaž Mozetič <m.mozetic@matmoz.si>\n"
 "Language-Team: Slovenian (http://www.transifex.com/oca/OCA-rma-8-0/language/sl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,22 +26,22 @@ msgstr "Preklic"
 #. 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 ""
+msgstr "Ustvari vstopno pošiljko na lokacijo izgub iz okvar"
 
 #. 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 ""
+msgstr "Ustvari vstopno pošiljko na lokacijo prenovljenih zalog"
 
 #. 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 ""
+msgstr "Ustvari vstopno pošiljko med zaloge"
 
 #. 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 ""
+msgstr "Ustvari izgubo proizvoda"
 
 #. module: crm_rma_stock_location
 #: view:claim.make.picking.from.picking.wizard:crm_rma_stock_location.view_claim_picking_from_picking
@@ -88,22 +89,22 @@ msgstr "Lokacije"
 #: code:addons/crm_rma_stock_location/models/stock_warehouse.py:65
 #, python-format
 msgid "Loss"
-msgstr ""
+msgstr "Izguba"
 
 #. module: crm_rma_stock_location
 #: field:stock.warehouse,loss_loc_id:0
 msgid "Loss Location"
-msgstr ""
+msgstr "Lokacija izgub"
 
 #. module: crm_rma_stock_location
 #: view:crm.claim:crm_rma_stock_location.crm_claim_rma_form_view_loss
 msgid "New Product Loss"
-msgstr ""
+msgstr "Nova izguba proizvoda"
 
 #. module: crm_rma_stock_location
 #: field:claim.make.picking.from.picking.wizard,picking_line_ids:0
 msgid "Picking lines"
-msgstr ""
+msgstr "Postavke zbirnika"
 
 #. module: crm_rma_stock_location
 #: model:ir.model,name:crm_rma_stock_location.model_product_product
@@ -113,131 +114,131 @@ msgstr "Proizvod"
 #. module: crm_rma_stock_location
 #: model:ir.model,name:crm_rma_stock_location.model_product_template
 msgid "Product Template"
-msgstr ""
+msgstr "Predloga proizvoda"
 
 #. module: crm_rma_stock_location
 #: view:product.product:crm_rma_stock_location.rma_product_product_tree_view
 msgid "Product Variants"
-msgstr ""
+msgstr "Različice proizvoda"
 
 #. module: crm_rma_stock_location
 #: view:stock.picking:crm_rma_stock_location.picking_in_form
 msgid "Product to Loss"
-msgstr ""
+msgstr "Proizvod med izgube"
 
 #. module: crm_rma_stock_location
 #: view:stock.picking:crm_rma_stock_location.picking_in_form
 msgid "Product to refurbish stock"
-msgstr ""
+msgstr "Proizvod med prenovljene zaloge"
 
 #. module: crm_rma_stock_location
 #: view:stock.picking:crm_rma_stock_location.picking_in_form
 msgid "Product to stock"
-msgstr ""
+msgstr "Proizvod v zaloge"
 
 #. module: crm_rma_stock_location
 #: model:stock.location,name:crm_rma_stock_location.location_rma_a
 msgid "RMA - Box A"
-msgstr ""
+msgstr "PVB - zaboj A"
 
 #. module: crm_rma_stock_location
 #: model:stock.location,name:crm_rma_stock_location.location_rma_b
 msgid "RMA - Box B"
-msgstr ""
+msgstr "PVB - zaboj B"
 
 #. module: crm_rma_stock_location
 #: view:product.product:crm_rma_stock_location.rma_product_search_view
 msgid "RMA Available Products"
-msgstr ""
+msgstr "PVB proizvodi na voljo"
 
 #. module: crm_rma_stock_location
 #: model:stock.location,name:crm_rma_stock_location.location_rma
 msgid "RMA Demo"
-msgstr ""
+msgstr "PVB demonstracija"
 
 #. module: crm_rma_stock_location
 #: code:addons/crm_rma_stock_location/models/product_product.py:42
 #: code:addons/crm_rma_stock_location/models/product_template.py:42
 #, python-format
 msgid "RMA Forecasted Quantity"
-msgstr ""
+msgstr "PVB napovedana količina"
 
 #. module: crm_rma_stock_location
 #: view:product.product:crm_rma_stock_location.rma_product_search_view
 msgid "RMA Products"
-msgstr ""
+msgstr "PVB proizvodi"
 
 #. module: crm_rma_stock_location
 #: code:addons/crm_rma_stock_location/models/product_product.py:36
 #: code:addons/crm_rma_stock_location/models/product_template.py:36
 #, python-format
 msgid "RMA Quantity On Hand"
-msgstr ""
+msgstr "PVB količina pri roki"
 
 #. 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 ""
+msgstr "PVB zaloge"
 
 #. module: crm_rma_stock_location
 #: code:addons/crm_rma_stock_location/models/stock_warehouse.py:56
 #, python-format
 msgid "Refurbish"
-msgstr ""
+msgstr "Prenavljanje"
 
 #. module: crm_rma_stock_location
 #: field:stock.warehouse,lot_refurbish_id:0
 msgid "Refurbish Location"
-msgstr ""
+msgstr "Lokacija prenavljanja"
 
 #. 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 ""
+msgstr "Izberite postavke za zbirnik"
 
 #. 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 ""
+msgstr "Izberi postavke, ki se dodajo v zbirnik"
 
 #. module: crm_rma_stock_location
 #: model:product.template,name:crm_rma_stock_location.product_socket_product_template
 msgid "Socket"
-msgstr ""
+msgstr "Vtičnica"
 
 #. 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 ""
+msgstr "Izvorna lokacija"
 
 #. module: crm_rma_stock_location
 #: code:addons/crm_rma_stock_location/wizards/claim_make_picking_from_picking.py:86
 #: help:claim.make.picking.from.picking.wizard,picking_line_source_location:0
 #, python-format
 msgid "Source location where the returned products are"
-msgstr ""
+msgstr "Izvorna lokacija, kjer so vrnjeni proizvodi"
 
 #. module: crm_rma_stock_location
 #: code:addons/crm_rma_stock_location/wizards/claim_make_picking_from_picking.py:90
 #: help:claim.make.picking.from.picking.wizard,picking_line_dest_location:0
 #, python-format
 msgid "Target location to send returned products"
-msgstr ""
+msgstr "Ciljna lokacija, kamor se pošilja vrnjene proizvode"
 
 #. module: crm_rma_stock_location
 #: model:ir.model,name:crm_rma_stock_location.model_stock_warehouse
 msgid "Warehouse"
-msgstr ""
+msgstr "Skladišče"
 
 #. 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 ""
+msgstr "Čarovnik za ustvarjanje zbirnikov iz postavk zahtevka"
 
 #. 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 ""
+msgstr "Čarovnik za ustvarjanje zbirnikov iz zbirnih postavk"
diff --git a/product_warranty/i18n/sl.po b/product_warranty/i18n/sl.po
index 40d1deae..d76f749b 100644
--- a/product_warranty/i18n/sl.po
+++ b/product_warranty/i18n/sl.po
@@ -3,13 +3,14 @@
 # * product_warranty
 # 
 # Translators:
+# Matjaž Mozetič <m.mozetic@matmoz.si>, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: rma (8.0)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-05 22:30+0000\n"
-"PO-Revision-Date: 2015-11-03 17:06+0000\n"
-"Last-Translator: <>\n"
+"POT-Creation-Date: 2015-12-12 22:57+0000\n"
+"PO-Revision-Date: 2015-12-14 06:45+0000\n"
+"Last-Translator: Matjaž Mozetič <m.mozetic@matmoz.si>\n"
 "Language-Team: Slovenian (http://www.transifex.com/oca/OCA-rma-8-0/language/sl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,12 +21,12 @@ msgstr ""
 #. module: product_warranty
 #: field:product.supplierinfo,active_supplier:0
 msgid "Active supplier"
-msgstr ""
+msgstr "Aktivni dobavitelj"
 
 #. module: product_warranty
 #: model:ir.model,name:product_warranty.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "Družbe"
 
 #. module: product_warranty
 #: field:return.instruction,create_uid:0
@@ -40,14 +41,14 @@ msgstr "Ustvarjeno"
 #. module: product_warranty
 #: view:res.company:product_warranty.company_form
 msgid "Crm product return address"
-msgstr ""
+msgstr "CRM naslov vračila izdelka"
 
 #. 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 ""
+msgstr "Privzeti naslov kamor kupci pošiljajo vrnjeni izdelek. Če prazno, je naslov enak naslovu družbe."
 
 #. module: product_warranty
 #: field:return.instruction,id:0
@@ -59,36 +60,36 @@ msgstr "ID"
 msgid ""
 "If is default, will be use to set the default value in supplier infos. Be "
 "careful to have only one default"
-msgstr ""
+msgstr "Če je privzeto, bo uporabljeno za nastavitev privzete vrednosti med podatki o dobavitelju. Pazite, da boste imeli le eno privzeto vrednost."
 
 #. module: product_warranty
 #: model:ir.model,name:product_warranty.model_product_supplierinfo
 msgid "Information about a product supplier"
-msgstr ""
+msgstr "Informacije o dobavitelju izdelka"
 
 #. 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 ""
+msgstr "Navodila"
 
 #. 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 ""
+msgstr "Navodila za vračilo izdelka"
 
 #. module: product_warranty
 #: field:return.instruction,is_default:0
 msgid "Is default"
-msgstr ""
+msgstr "Je privzeto"
 
 #. module: product_warranty
 #: help:product.supplierinfo,active_supplier:0
 msgid "Is this supplier still active, only for information"
-msgstr ""
+msgstr "Je za dobavitelj še aktiven; le v vednost"
 
 #. module: product_warranty
 #: field:return.instruction,write_uid:0
@@ -103,35 +104,35 @@ msgstr "Zadnjič posodobljeno"
 #. module: product_warranty
 #: field:product.supplierinfo,warranty_duration:0
 msgid "Period"
-msgstr ""
+msgstr "Obdobje"
 
 #. 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 ""
+msgstr "Navodila vračanja izdelkov"
 
 #. module: product_warranty
 #: field:product.supplierinfo,warranty_return_other_address:0
 #: field:res.company,crm_return_address_id:0
 msgid "Return address"
-msgstr ""
+msgstr "Naslov vračila"
 
 #. 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 ""
+msgstr "Navodila vračanja"
 
 #. module: product_warranty
 #: field:product.supplierinfo,warranty_return_partner:0
 msgid "Return type"
-msgstr ""
+msgstr "Tip vračila"
 
 #. module: product_warranty
 #: field:return.instruction,name:0
 msgid "Title"
-msgstr ""
+msgstr "Titula"
 
 #. module: product_warranty
 #: help:product.supplierinfo,warranty_duration:0
@@ -139,19 +140,19 @@ 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 ""
+msgstr "Garancija v mesecih za to relacijo izdelek/dobavitelj. Le za relacijo družba/dobavitelj (nabavni nalog); relacija kupec/družba (prodajni nalog) vedno uporabi glavno garancijsko polje izdelka."
 
 #. module: product_warranty
 #: view:product.supplierinfo:product_warranty.product_supplierinfo_warranty_form_view
 msgid "Warranty informations"
-msgstr ""
+msgstr "Garancijski podatki"
 
 #. 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 ""
+msgstr "Kam naj kupec vrača izdelek(e), če je garancijsko vračilo nastavljeno kot 'ostalo'."
 
 #. module: product_warranty
 #: help:product.supplierinfo,warranty_return_partner:0
@@ -161,4 +162,4 @@ msgid ""
 " 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 ""
+msgstr "Kdo je zadolžen za obdelavo garancijskih vračil končnega kupca. Družba bo uporabila trenutni dostavni ali privzeti naslov dobavitelja in proizvajalca blagovne znamke. Ni nujno, da se uporabi garancije partnerja, ki mu vračamo (npr. lahko se vrne družbi, a je pod garancijo proizvajalca blagovne znamke."