diff --git a/pos_order_return/i18n/pos_order_return.pot b/pos_order_return/i18n/pos_order_return.pot
index b4f802c4..5374431a 100644
--- a/pos_order_return/i18n/pos_order_return.pot
+++ b/pos_order_return/i18n/pos_order_return.pot
@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 11.0\n"
+"Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
@@ -14,41 +14,41 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: pos_order_return
-#: model:ir.model.fields,field_description:pos_order_return.field_product_product_pos_allow_negative_qty
-#: model:ir.model.fields,field_description:pos_order_return.field_product_template_pos_allow_negative_qty
+#: model:ir.model.fields,field_description:pos_order_return.field_product_product__pos_allow_negative_qty
+#: model:ir.model.fields,field_description:pos_order_return.field_product_template__pos_allow_negative_qty
 msgid "Allow Negative Quantity on PoS"
 msgstr ""
 
 #. module: pos_order_return
-#: model:ir.ui.view,arch_db:pos_order_return.view_partial_return_wizard_form
+#: model_terms:ir.ui.view,arch_db:pos_order_return.view_partial_return_wizard_form
 msgid "Cancel"
 msgstr ""
 
 #. module: pos_order_return
-#: model:ir.model.fields,help:pos_order_return.field_pos_partial_return_wizard_line_max_returnable_qty
+#: model:ir.model.fields,help:pos_order_return.field_pos_partial_return_wizard_line__max_returnable_qty
 msgid "Compute maximum quantity that can be returned for this line, depending of the quantity of the line and other possible refunds."
 msgstr ""
 
 #. module: pos_order_return
-#: model:ir.ui.view,arch_db:pos_order_return.view_partial_return_wizard_form
+#: model_terms:ir.ui.view,arch_db:pos_order_return.view_partial_return_wizard_form
 msgid "Confirm"
 msgstr ""
 
 #. module: pos_order_return
-#: model:ir.model.fields,field_description:pos_order_return.field_pos_partial_return_wizard_create_uid
-#: model:ir.model.fields,field_description:pos_order_return.field_pos_partial_return_wizard_line_create_uid
+#: model:ir.model.fields,field_description:pos_order_return.field_pos_partial_return_wizard__create_uid
+#: model:ir.model.fields,field_description:pos_order_return.field_pos_partial_return_wizard_line__create_uid
 msgid "Created by"
 msgstr ""
 
 #. module: pos_order_return
-#: model:ir.model.fields,field_description:pos_order_return.field_pos_partial_return_wizard_create_date
-#: model:ir.model.fields,field_description:pos_order_return.field_pos_partial_return_wizard_line_create_date
+#: model:ir.model.fields,field_description:pos_order_return.field_pos_partial_return_wizard__create_date
+#: model:ir.model.fields,field_description:pos_order_return.field_pos_partial_return_wizard_line__create_date
 msgid "Created on"
 msgstr ""
 
 #. module: pos_order_return
-#: model:ir.model.fields,field_description:pos_order_return.field_pos_partial_return_wizard_display_name
-#: model:ir.model.fields,field_description:pos_order_return.field_pos_partial_return_wizard_line_display_name
+#: model:ir.model.fields,field_description:pos_order_return.field_pos_partial_return_wizard__display_name
+#: model:ir.model.fields,field_description:pos_order_return.field_pos_partial_return_wizard_line__display_name
 msgid "Display Name"
 msgstr ""
 
@@ -59,66 +59,72 @@ msgid "For legal and traceability reasons, you can not set a negative quantity (
 msgstr ""
 
 #. module: pos_order_return
-#: model:ir.model.fields,field_description:pos_order_return.field_pos_partial_return_wizard_id
-#: model:ir.model.fields,field_description:pos_order_return.field_pos_partial_return_wizard_line_id
+#: model:ir.model.fields,field_description:pos_order_return.field_pos_partial_return_wizard__id
+#: model:ir.model.fields,field_description:pos_order_return.field_pos_partial_return_wizard_line__id
 msgid "ID"
 msgstr ""
 
 #. module: pos_order_return
-#: model:ir.model.fields,field_description:pos_order_return.field_pos_partial_return_wizard_line_initial_qty
+#: model:ir.model.fields,field_description:pos_order_return.field_pos_partial_return_wizard_line__initial_qty
 msgid "Initial Quantity"
 msgstr ""
 
 #. module: pos_order_return
-#: model:ir.model.fields,field_description:pos_order_return.field_pos_partial_return_wizard___last_update
-#: model:ir.model.fields,field_description:pos_order_return.field_pos_partial_return_wizard_line___last_update
+#: model:ir.model.fields,field_description:pos_order_return.field_pos_partial_return_wizard____last_update
+#: model:ir.model.fields,field_description:pos_order_return.field_pos_partial_return_wizard_line____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: pos_order_return
-#: model:ir.model.fields,field_description:pos_order_return.field_pos_partial_return_wizard_line_write_uid
-#: model:ir.model.fields,field_description:pos_order_return.field_pos_partial_return_wizard_write_uid
+#: model:ir.model.fields,field_description:pos_order_return.field_pos_partial_return_wizard__write_uid
+#: model:ir.model.fields,field_description:pos_order_return.field_pos_partial_return_wizard_line__write_uid
 msgid "Last Updated by"
 msgstr ""
 
 #. module: pos_order_return
-#: model:ir.model.fields,field_description:pos_order_return.field_pos_partial_return_wizard_line_write_date
-#: model:ir.model.fields,field_description:pos_order_return.field_pos_partial_return_wizard_write_date
+#: model:ir.model.fields,field_description:pos_order_return.field_pos_partial_return_wizard__write_date
+#: model:ir.model.fields,field_description:pos_order_return.field_pos_partial_return_wizard_line__write_date
 msgid "Last Updated on"
 msgstr ""
 
 #. module: pos_order_return
-#: model:ir.model.fields,field_description:pos_order_return.field_pos_partial_return_wizard_line_pos_order_line_id
+#: model:ir.model.fields,field_description:pos_order_return.field_pos_partial_return_wizard_line__pos_order_line_id
 msgid "Line To Return"
 msgstr ""
 
 #. module: pos_order_return
-#: model:ir.model,name:pos_order_return.model_pos_order_line
-msgid "Lines of Point of Sale Orders"
-msgstr ""
-
-#. module: pos_order_return
-#: model:ir.model.fields,field_description:pos_order_return.field_pos_partial_return_wizard_line_ids
-#: model:ir.ui.view,arch_db:pos_order_return.view_partial_return_wizard_form
+#: model:ir.model.fields,field_description:pos_order_return.field_pos_partial_return_wizard__line_ids
+#: model_terms:ir.ui.view,arch_db:pos_order_return.view_partial_return_wizard_form
 msgid "Lines to Return"
 msgstr ""
 
 #. module: pos_order_return
-#: model:ir.model.fields,field_description:pos_order_return.field_pos_partial_return_wizard_order_id
+#: model:ir.model.fields,field_description:pos_order_return.field_pos_partial_return_wizard__order_id
 msgid "Order to Return"
 msgstr ""
 
 #. module: pos_order_return
-#: model:ir.ui.view,arch_db:pos_order_return.view_partial_return_wizard_form
-#: model:ir.ui.view,arch_db:pos_order_return.view_pos_order_form
+#: model_terms:ir.ui.view,arch_db:pos_order_return.view_partial_return_wizard_form
+#: model_terms:ir.ui.view,arch_db:pos_order_return.view_pos_order_form
 msgid "Partial Return"
 msgstr ""
 
 #. module: pos_order_return
 #: model:ir.actions.act_window,name:pos_order_return.action_pos_partial_return_wizard
+#: model:ir.model,name:pos_order_return.model_pos_partial_return_wizard
 msgid "Partial Return Wizard"
 msgstr ""
 
+#. module: pos_order_return
+#: model:ir.model,name:pos_order_return.model_pos_partial_return_wizard_line
+msgid "Partial Return Wizard Line"
+msgstr ""
+
+#. module: pos_order_return
+#: model:ir.model,name:pos_order_return.model_pos_order_line
+msgid "Point of Sale Order Lines"
+msgstr ""
+
 #. module: pos_order_return
 #: model:ir.model,name:pos_order_return.model_pos_order
 msgid "Point of Sale Orders"
@@ -130,28 +136,28 @@ msgid "Product Template"
 msgstr ""
 
 #. module: pos_order_return
-#: model:ir.model.fields,help:pos_order_return.field_pos_partial_return_wizard_line_initial_qty
+#: model:ir.model.fields,help:pos_order_return.field_pos_partial_return_wizard_line__initial_qty
 msgid "Quantity of Product initially sold"
 msgstr ""
 
 #. module: pos_order_return
-#: model:ir.ui.view,arch_db:pos_order_return.view_pos_order_form
-#: model:ir.ui.view,arch_db:pos_order_return.view_pos_order_line_form
+#: model_terms:ir.ui.view,arch_db:pos_order_return.view_pos_order_form
+#: model_terms:ir.ui.view,arch_db:pos_order_return.view_pos_order_line_form
 msgid "Refund"
 msgstr ""
 
 #. module: pos_order_return
-#: model:ir.model.fields,field_description:pos_order_return.field_pos_order_line_refund_line_ids
+#: model:ir.model.fields,field_description:pos_order_return.field_pos_order_line__refund_line_ids
 msgid "Refund Lines"
 msgstr ""
 
 #. module: pos_order_return
-#: model:ir.model.fields,field_description:pos_order_return.field_pos_order_refund_order_ids
+#: model:ir.model.fields,field_description:pos_order_return.field_pos_order__refund_order_ids
 msgid "Refund Orders"
 msgstr ""
 
 #. module: pos_order_return
-#: model:ir.model.fields,field_description:pos_order_return.field_pos_order_refund_order_qty
+#: model:ir.model.fields,field_description:pos_order_return.field_pos_order__refund_order_qty
 msgid "Refund Orders Quantity"
 msgstr ""
 
@@ -168,23 +174,29 @@ msgid "Returnable Bottle"
 msgstr ""
 
 #. module: pos_order_return
-#: model:ir.model.fields,field_description:pos_order_return.field_pos_partial_return_wizard_line_max_returnable_qty
+#: model:ir.model.fields,field_description:pos_order_return.field_pos_partial_return_wizard_line__max_returnable_qty
 msgid "Returnable Quantity"
 msgstr ""
 
 #. module: pos_order_return
-#: model:ir.model.fields,field_description:pos_order_return.field_pos_order_line_returned_line_id
-#: model:ir.model.fields,field_description:pos_order_return.field_pos_order_returned_order_id
+#: model:ir.model.fields,field_description:pos_order_return.field_pos_order__returned_order_id
+#: model:ir.model.fields,field_description:pos_order_return.field_pos_order_line__returned_line_id
 msgid "Returned Order"
 msgstr ""
 
 #. module: pos_order_return
-#: model:ir.model.fields,field_description:pos_order_return.field_pos_partial_return_wizard_line_qty
+#: model:ir.model.fields,field_description:pos_order_return.field_pos_partial_return_wizard_line__qty
 msgid "Returned Quantity"
 msgstr ""
 
 #. module: pos_order_return
-#: model:ir.model.fields,field_description:pos_order_return.field_pos_partial_return_wizard_line_wizard_id
+#: model:product.product,uom_name:pos_order_return.product_product_returnable_bottle
+#: model:product.template,uom_name:pos_order_return.product_product_returnable_bottle_product_template
+msgid "Unit(s)"
+msgstr ""
+
+#. module: pos_order_return
+#: model:ir.model.fields,field_description:pos_order_return.field_pos_partial_return_wizard_line__wizard_id
 msgid "Wizard"
 msgstr ""
 
@@ -202,12 +214,8 @@ msgid "You can not return %d %s of %s because the original Order line only menti
 msgstr ""
 
 #. module: pos_order_return
-#: model:ir.model,name:pos_order_return.model_pos_partial_return_wizard
-msgid "pos.partial.return.wizard"
-msgstr ""
-
-#. module: pos_order_return
-#: model:ir.model,name:pos_order_return.model_pos_partial_return_wizard_line
-msgid "pos.partial.return.wizard.line"
+#: model:product.product,weight_uom_name:pos_order_return.product_product_returnable_bottle
+#: model:product.template,weight_uom_name:pos_order_return.product_product_returnable_bottle_product_template
+msgid "kg"
 msgstr ""