diff --git a/locale/ca_ES.po b/locale/ca_ES.po
index be41926478..3114d2b91e 100644
--- a/locale/ca_ES.po
+++ b/locale/ca_ES.po
@@ -4,7 +4,7 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
 
 msgctxt "error:account.invoice:"
 msgid "You can not delete invoices that come from a purchase!"
-msgstr "No pot esborrar factures que vénen d'una compra"
+msgstr "No pot esborrar factures que vénen d'una compra."
 
 msgctxt "error:account.invoice:"
 msgid "You cannot reset to draft an invoice generated by a purchase."
@@ -18,32 +18,36 @@ msgstr ""
 
 msgctxt "error:purchase.line:"
 msgid "It misses an \"Account Expense\" on product \"%s\"!"
-msgstr "Fa falta un «Compte de despeses» del producte «%s»"
+msgstr "Fa falta un \"Compte de despeses\" del producte \"%s\"."
 
 msgctxt "error:purchase.line:"
 msgid "It misses an \"account expense\" default property!"
-msgstr "Fa falta la propietat predeterminada de «Compte de despeses»"
+msgstr "Fa falta la propietat predeterminada de \"Compte de despeses\"."
 
 msgctxt "error:purchase.line:"
 msgid "The supplier location is required!"
-msgstr "Es necessita la ubicació del proveïdor"
+msgstr "Es necessita la ubicació del proveïdor."
 
 msgctxt "error:purchase.purchase:"
 msgid "A warehouse must be defined for the quotation."
-msgstr "Al tercer \"%s\" li falta un \"Compte a pagar\"."
+msgstr "Ha d'indicar un magatzem en el pressupost."
 
 msgctxt "error:purchase.purchase:"
 msgid "Invoice addresses must be defined for the quotation."
-msgstr "Ha de definir les adreces per a la cotització."
+msgstr "Ha de definir les adreces de facturació."
 
 msgctxt "error:purchase.purchase:"
 msgid "It misses an \"Account Payable\" on the party \"%s\"!"
-msgstr "Al tercer «%s» li fa falta un «Compte de pagaments»"
+msgstr "Al tercer \"%s\" li fa falta un \"Compte de pagaments\"."
 
 msgctxt "error:purchase.purchase:"
 msgid "Purchase \"%s\" must be cancelled before deletion!"
 msgstr "Al tercer \"%s\" li falta un \"Compte a pagar\"."
 
+msgctxt "error:stock.shipment.in.return:"
+msgid "You cannot reset to draft a move generated by a purchase."
+msgstr "No pot restablir a esborrany un moviment generat per una compra."
+
 msgctxt "error:stock.shipment.in:"
 msgid "You cannot reset to draft a move generated by a purchase."
 msgstr "No pot restablir a esborrany un moviment generat per una compra."
@@ -52,12 +56,10 @@ msgctxt "field:account.invoice,purchase_exception_state:"
 msgid "Exception State"
 msgstr "Estat excepció"
 
-#, fuzzy
 msgctxt "field:account.invoice,purchases:"
 msgid "Purchases"
 msgstr "Compres"
 
-#, fuzzy
 msgctxt "field:account.invoice.line,purchase_lines:"
 msgid "Purchase Lines"
 msgstr "Línies de compra"
@@ -68,7 +70,7 @@ msgstr "Proveïdors"
 
 msgctxt "field:product.template,purchasable:"
 msgid "Purchasable"
-msgstr "Comprable"
+msgstr "Es pot comprar"
 
 msgctxt "field:product.template,purchase_uom:"
 msgid "Purchase UOM"
@@ -78,28 +80,25 @@ msgctxt "field:purchase.configuration,create_date:"
 msgid "Create Date"
 msgstr "Data creació"
 
-#, fuzzy
 msgctxt "field:purchase.configuration,create_uid:"
 msgid "Create User"
-msgstr "Crear usuari"
+msgstr "Usuari creació"
 
 msgctxt "field:purchase.configuration,id:"
 msgid "ID"
 msgstr "ID"
 
-#, fuzzy
 msgctxt "field:purchase.configuration,purchase_invoice_method:"
 msgid "Invoice Method"
 msgstr "Mètode de facturació"
 
 msgctxt "field:purchase.configuration,purchase_sequence:"
 msgid "Purchase Reference Sequence"
-msgstr "Seqüència demanats de compra"
+msgstr "Seqüència comanda de compra"
 
-#, fuzzy
 msgctxt "field:purchase.configuration,rec_name:"
 msgid "Name"
-msgstr "Nom del camp"
+msgstr "Nom"
 
 msgctxt "field:purchase.configuration,write_date:"
 msgid "Write Date"
@@ -111,7 +110,7 @@ msgstr "Usuari modificació"
 
 msgctxt "field:purchase.handle.invoice.exception.ask,domain_invoices:"
 msgid "Domain Invoices"
-msgstr "Factures de domini"
+msgstr "Domini de les factures"
 
 msgctxt "field:purchase.handle.invoice.exception.ask,id:"
 msgid "ID"
@@ -123,7 +122,7 @@ msgstr "Refer factures"
 
 msgctxt "field:purchase.handle.shipment.exception.ask,domain_moves:"
 msgid "Domain Moves"
-msgstr "Moviments de domini"
+msgstr "Domini dels moviments"
 
 msgctxt "field:purchase.handle.shipment.exception.ask,id:"
 msgid "ID"
@@ -141,10 +140,9 @@ msgctxt "field:purchase.line,create_date:"
 msgid "Create Date"
 msgstr "Data creació"
 
-#, fuzzy
 msgctxt "field:purchase.line,create_uid:"
 msgid "Create User"
-msgstr "Crear usuari"
+msgstr "Usuari creació"
 
 msgctxt "field:purchase.line,delivery_date:"
 msgid "Delivery Date"
@@ -154,7 +152,6 @@ msgctxt "field:purchase.line,description:"
 msgid "Description"
 msgstr "Descripció"
 
-#, fuzzy
 msgctxt "field:purchase.line,from_location:"
 msgid "From Location"
 msgstr "Des de la ubicació"
@@ -169,7 +166,7 @@ msgstr "Línies de factura"
 
 msgctxt "field:purchase.line,move_done:"
 msgid "Moves Done"
-msgstr "Moviments acabats"
+msgstr "Moviments finalitzats"
 
 msgctxt "field:purchase.line,move_exception:"
 msgid "Moves Exception"
@@ -219,7 +216,6 @@ msgctxt "field:purchase.line,taxes:"
 msgid "Taxes"
 msgstr "Impostos"
 
-#, fuzzy
 msgctxt "field:purchase.line,to_location:"
 msgid "To Location"
 msgstr "A la ubicació"
@@ -234,7 +230,7 @@ msgstr "Unitat"
 
 msgctxt "field:purchase.line,unit_digits:"
 msgid "Unit Digits"
-msgstr "Dígits unitaris"
+msgstr "Decimals unitaris"
 
 msgctxt "field:purchase.line,unit_price:"
 msgid "Unit Price"
@@ -252,10 +248,9 @@ msgctxt "field:purchase.line-account.invoice.line,create_date:"
 msgid "Create Date"
 msgstr "Data creació"
 
-#, fuzzy
 msgctxt "field:purchase.line-account.invoice.line,create_uid:"
 msgid "Create User"
-msgstr "Crear usuari"
+msgstr "Usuari creació"
 
 msgctxt "field:purchase.line-account.invoice.line,id:"
 msgid "ID"
@@ -285,10 +280,9 @@ msgctxt "field:purchase.line-account.tax,create_date:"
 msgid "Create Date"
 msgstr "Data creació"
 
-#, fuzzy
 msgctxt "field:purchase.line-account.tax,create_uid:"
 msgid "Create User"
-msgstr "Crear usuari"
+msgstr "Usuari creació"
 
 msgctxt "field:purchase.line-account.tax,id:"
 msgid "ID"
@@ -318,10 +312,9 @@ msgctxt "field:purchase.line-ignored-stock.move,create_date:"
 msgid "Create Date"
 msgstr "Data creació"
 
-#, fuzzy
 msgctxt "field:purchase.line-ignored-stock.move,create_uid:"
 msgid "Create User"
-msgstr "Crear usuari"
+msgstr "Usuari creació"
 
 msgctxt "field:purchase.line-ignored-stock.move,id:"
 msgid "ID"
@@ -351,10 +344,9 @@ msgctxt "field:purchase.line-recreated-stock.move,create_date:"
 msgid "Create Date"
 msgstr "Data creació"
 
-#, fuzzy
 msgctxt "field:purchase.line-recreated-stock.move,create_uid:"
 msgid "Create User"
-msgstr "Crear usuari"
+msgstr "Usuari creació"
 
 msgctxt "field:purchase.line-recreated-stock.move,id:"
 msgid "ID"
@@ -392,15 +384,13 @@ msgctxt "field:purchase.product_supplier,create_date:"
 msgid "Create Date"
 msgstr "Data creació"
 
-#, fuzzy
 msgctxt "field:purchase.product_supplier,create_uid:"
 msgid "Create User"
-msgstr "Crear usuari"
+msgstr "Usuari creació"
 
-#, fuzzy
 msgctxt "field:purchase.product_supplier,currency:"
 msgid "Currency"
-msgstr "Gestió de divises"
+msgstr "Moneda"
 
 msgctxt "field:purchase.product_supplier,delivery_time:"
 msgid "Delivery Time"
@@ -446,10 +436,9 @@ msgctxt "field:purchase.product_supplier.price,create_date:"
 msgid "Create Date"
 msgstr "Data creació"
 
-#, fuzzy
 msgctxt "field:purchase.product_supplier.price,create_uid:"
 msgid "Create User"
-msgstr "Crear usuari"
+msgstr "Usuari creació"
 
 msgctxt "field:purchase.product_supplier.price,id:"
 msgid "ID"
@@ -491,18 +480,17 @@ msgctxt "field:purchase.purchase,create_date:"
 msgid "Create Date"
 msgstr "Data creació"
 
-#, fuzzy
 msgctxt "field:purchase.purchase,create_uid:"
 msgid "Create User"
-msgstr "Crear usuari"
+msgstr "Usuari creació"
 
 msgctxt "field:purchase.purchase,currency:"
 msgid "Currency"
-msgstr "Divisa"
+msgstr "Moneda"
 
 msgctxt "field:purchase.purchase,currency_digits:"
 msgid "Currency Digits"
-msgstr "Dígits de la divisa"
+msgstr "Decimals de la moneda"
 
 msgctxt "field:purchase.purchase,description:"
 msgid "Description"
@@ -546,7 +534,7 @@ msgstr "Moviments"
 
 msgctxt "field:purchase.purchase,party:"
 msgid "Party"
-msgstr "Tercers"
+msgstr "Tercer"
 
 msgctxt "field:purchase.purchase,party_lang:"
 msgid "Party Language"
@@ -554,7 +542,7 @@ msgstr "Idioma del tercer"
 
 msgctxt "field:purchase.purchase,payment_term:"
 msgid "Payment Term"
-msgstr "Terme de pagament"
+msgstr "Termini de pagament"
 
 msgctxt "field:purchase.purchase,purchase_date:"
 msgid "Purchase Date"
@@ -568,6 +556,10 @@ msgctxt "field:purchase.purchase,reference:"
 msgid "Reference"
 msgstr "Referència"
 
+msgctxt "field:purchase.purchase,shipment_returns:"
+msgid "Shipment Returns"
+msgstr "Albarans de devolució"
+
 msgctxt "field:purchase.purchase,shipment_state:"
 msgid "Shipment State"
 msgstr "Estat d'enviament"
@@ -606,7 +598,7 @@ msgstr "Sense impost"
 
 msgctxt "field:purchase.purchase,untaxed_amount_cache:"
 msgid "Untaxed Cache"
-msgstr "Base imposable precalculado"
+msgstr "Base imposable precalculada"
 
 msgctxt "field:purchase.purchase,warehouse:"
 msgid "Warehouse"
@@ -624,10 +616,9 @@ msgctxt "field:purchase.purchase-account.invoice,create_date:"
 msgid "Create Date"
 msgstr "Data creació"
 
-#, fuzzy
 msgctxt "field:purchase.purchase-account.invoice,create_uid:"
 msgid "Create User"
-msgstr "Crear usuari"
+msgstr "Usuari creació"
 
 msgctxt "field:purchase.purchase-account.invoice,id:"
 msgid "ID"
@@ -657,10 +648,9 @@ msgctxt "field:purchase.purchase-ignored-account.invoice,create_date:"
 msgid "Create Date"
 msgstr "Data creació"
 
-#, fuzzy
 msgctxt "field:purchase.purchase-ignored-account.invoice,create_uid:"
 msgid "Create User"
-msgstr "Crear usuari"
+msgstr "Usuari creació"
 
 msgctxt "field:purchase.purchase-ignored-account.invoice,id:"
 msgid "ID"
@@ -690,10 +680,9 @@ msgctxt "field:purchase.purchase-recreated-account.invoice,create_date:"
 msgid "Create Date"
 msgstr "Data creació"
 
-#, fuzzy
 msgctxt "field:purchase.purchase-recreated-account.invoice,create_uid:"
 msgid "Create User"
-msgstr "Crear usuari"
+msgstr "Usuari creació"
 
 msgctxt "field:purchase.purchase-recreated-account.invoice,id:"
 msgid "ID"
@@ -725,13 +714,12 @@ msgstr "Compra"
 
 msgctxt "field:stock.move,purchase_currency:"
 msgid "Purchase Currency"
-msgstr "Divisa de compra"
+msgstr "Moneda de compra"
 
 msgctxt "field:stock.move,purchase_exception_state:"
 msgid "Exception State"
 msgstr "Estat excepció"
 
-#, fuzzy
 msgctxt "field:stock.move,purchase_line:"
 msgid "Purchase Line"
 msgstr "Línia de compra"
@@ -787,7 +775,7 @@ msgstr "Tercers associats amb compres"
 
 msgctxt "model:ir.action,name:act_purchase_configuration_form"
 msgid "Purchase Configuration"
-msgstr ""
+msgstr "Configuració compres"
 
 msgctxt "model:ir.action,name:act_purchase_form"
 msgid "Purchases"
@@ -807,7 +795,11 @@ msgstr "Compres en esborrany"
 
 msgctxt "model:ir.action,name:act_purchase_form_quotation"
 msgid "Purchases in Quotation"
-msgstr "Compres en cotització"
+msgstr "Compres en pressupost"
+
+msgctxt "model:ir.action,name:act_return_form"
+msgid "Returns"
+msgstr "Retorna"
 
 msgctxt "model:ir.action,name:act_shipment_form"
 msgid "Shipments"
@@ -837,14 +829,13 @@ msgctxt "model:ir.ui.menu,name:menu_configuration"
 msgid "Configuration"
 msgstr "Configuració"
 
-#, fuzzy
 msgctxt "model:ir.ui.menu,name:menu_purchase"
 msgid "Purchase"
-msgstr "Gestió de compres"
+msgstr "Compres"
 
 msgctxt "model:ir.ui.menu,name:menu_purchase_configuration"
 msgid "Purchase Configuration"
-msgstr ""
+msgstr "Configuració compres"
 
 msgctxt "model:ir.ui.menu,name:menu_purchase_form"
 msgid "Purchases"
@@ -852,15 +843,15 @@ msgstr "Compres"
 
 msgctxt "model:ir.ui.menu,name:menu_purchase_form_confirmed"
 msgid "Confirmed Purchases"
-msgstr "Compres confirmades"
+msgstr "Confirmades"
 
 msgctxt "model:ir.ui.menu,name:menu_purchase_form_draft"
 msgid "Draft Purchases"
-msgstr "Compres en esborrany"
+msgstr "Esborrany"
 
 msgctxt "model:ir.ui.menu,name:menu_purchase_form_quotation"
 msgid "Purchases in Quotation"
-msgstr "Compres en cotització"
+msgstr "Pressupost"
 
 msgctxt "model:ir.ui.menu,name:menu_reporting"
 msgid "Reporting"
@@ -874,15 +865,13 @@ msgctxt "model:purchase.configuration,name:"
 msgid "Purchase Configuration"
 msgstr "Configuració compres"
 
-#, fuzzy
 msgctxt "model:purchase.handle.invoice.exception.ask,name:"
 msgid "Handle Invoice Exception"
-msgstr "Excepció de factura - Petició"
+msgstr "Gestiona excepció de factura"
 
-#, fuzzy
 msgctxt "model:purchase.handle.shipment.exception.ask,name:"
 msgid "Handle Shipment Exception"
-msgstr "Excepció d'enviament - Petició"
+msgstr "Gestiona excepció d'enviament"
 
 msgctxt "model:purchase.line,name:"
 msgid "Purchase Line"
@@ -898,7 +887,7 @@ msgstr "Línia de compra - Impost"
 
 msgctxt "model:purchase.line-ignored-stock.move,name:"
 msgid "Purchase Line - Ignored Move"
-msgstr "Línia de compra - Moviment Ignorat"
+msgstr "Línia de compra - Moviment ignorat"
 
 msgctxt "model:purchase.line-recreated-stock.move,name:"
 msgid "Purchase Line - Ignored Move"
@@ -966,7 +955,7 @@ msgstr "Telèfon:"
 
 msgctxt "odt:purchase.purchase:"
 msgid "Purchase Order N°:"
-msgstr "Nº de comanda de compra:"
+msgstr "Comanda de compra Nº:"
 
 msgctxt "odt:purchase.purchase:"
 msgid "Quantity"
@@ -974,7 +963,7 @@ msgstr "Quantitat"
 
 msgctxt "odt:purchase.purchase:"
 msgid "Request for Quotation N°:"
-msgstr "Sol·licitud de pressupost nº:"
+msgstr "Sol·licitud de pressupost Nº:"
 
 msgctxt "odt:purchase.purchase:"
 msgid "Taxes"
@@ -986,7 +975,7 @@ msgstr "Impostos:"
 
 msgctxt "odt:purchase.purchase:"
 msgid "Total (excl. taxes):"
-msgstr "Total (sense impostos):"
+msgstr "Base imposable:"
 
 msgctxt "odt:purchase.purchase:"
 msgid "Total:"
@@ -1006,7 +995,7 @@ msgstr "IVA:"
 
 msgctxt "selection:account.invoice,purchase_exception_state:"
 msgid ""
-msgstr "Recreada"
+msgstr ""
 
 msgctxt "selection:account.invoice,purchase_exception_state:"
 msgid "Ignored"
@@ -1016,17 +1005,14 @@ msgctxt "selection:account.invoice,purchase_exception_state:"
 msgid "Recreated"
 msgstr "Refet"
 
-#, fuzzy
 msgctxt "selection:purchase.configuration,purchase_invoice_method:"
 msgid "Based On Order"
-msgstr "Basat en l'ordre"
+msgstr "Basat en la comanda"
 
-#, fuzzy
 msgctxt "selection:purchase.configuration,purchase_invoice_method:"
 msgid "Based On Shipment"
 msgstr "Basat en l'enviament"
 
-#, fuzzy
 msgctxt "selection:purchase.configuration,purchase_invoice_method:"
 msgid "Manual"
 msgstr "Manual"
@@ -1049,11 +1035,11 @@ msgstr "Títol"
 
 msgctxt "selection:purchase.purchase,invoice_method:"
 msgid "Based On Order"
-msgstr "Basat en comandes"
+msgstr "Basat en la comanda"
 
 msgctxt "selection:purchase.purchase,invoice_method:"
 msgid "Based On Shipment"
-msgstr "Basat en enviaments"
+msgstr "Basat en l'enviament"
 
 msgctxt "selection:purchase.purchase,invoice_method:"
 msgid "Manual"
@@ -1101,7 +1087,7 @@ msgstr "Confirmat"
 
 msgctxt "selection:purchase.purchase,state:"
 msgid "Done"
-msgstr "Acabada"
+msgstr "Finalitzat"
 
 msgctxt "selection:purchase.purchase,state:"
 msgid "Draft"
@@ -1113,7 +1099,7 @@ msgstr "Pressupost"
 
 msgctxt "selection:stock.move,purchase_exception_state:"
 msgid ""
-msgstr "Recreat"
+msgstr ""
 
 msgctxt "selection:stock.move,purchase_exception_state:"
 msgid "Ignored"
@@ -1149,9 +1135,8 @@ msgstr "Seleccioni les factures a recrear"
 
 msgctxt "view:purchase.handle.invoice.exception.ask:"
 msgid "Handle Invoice Exception"
-msgstr "Gestionar l'excepció de factura"
+msgstr "Gestiona l'excepció de factura"
 
-#, fuzzy
 msgctxt "view:purchase.handle.shipment.exception.ask:"
 msgid "Choose move to recreate"
 msgstr "Esculli un moviment a refer"
@@ -1162,17 +1147,16 @@ msgstr "Triar moviments a recrear"
 
 msgctxt "view:purchase.handle.shipment.exception.ask:"
 msgid "Handle shipment Exception"
-msgstr "Gestionar excepcions d'enviament"
+msgstr "Gestiona excepcions d'enviament"
 
 msgctxt "view:purchase.handle.shipment.exception.ask:"
 msgid "Recreated Moves"
-msgstr "Moviments recreats"
+msgstr "Refer moviments"
 
 msgctxt "view:purchase.line:"
 msgid "General"
 msgstr "General"
 
-#, fuzzy
 msgctxt "view:purchase.line:"
 msgid "Lines"
 msgstr "Línies"
@@ -1223,11 +1207,11 @@ msgstr "Esborrany"
 
 msgctxt "view:purchase.purchase:"
 msgid "Handle Invoice Exception"
-msgstr "Gestionar l'excepció de factura"
+msgstr "Gestiona l'excepció de factura"
 
 msgctxt "view:purchase.purchase:"
 msgid "Handle Shipment Exception"
-msgstr "Gestionar excepció d'enviament"
+msgstr "Gestiona excepció d'enviament"
 
 msgctxt "view:purchase.purchase:"
 msgid "Invoices"
@@ -1259,33 +1243,36 @@ msgstr "Pressupost"
 
 msgctxt "view:purchase.purchase:"
 msgid "Quote"
-msgstr "Albaranes"
+msgstr "Pressupost"
 
 msgctxt "view:purchase.purchase:"
 msgid "Shipments"
 msgstr "Enviaments"
 
-#, fuzzy
 msgctxt "view:stock.move:"
 msgid "Moves"
 msgstr "Moviments"
 
-#, fuzzy
 msgctxt "wizard_button:purchase.handle.invoice.exception,ask,end:"
 msgid "Cancel"
 msgstr "Cancel·la"
 
-#, fuzzy
 msgctxt "wizard_button:purchase.handle.invoice.exception,ask,handle:"
 msgid "Ok"
 msgstr "Accepta"
 
-#, fuzzy
 msgctxt "wizard_button:purchase.handle.shipment.exception,ask,end:"
 msgid "Cancel"
 msgstr "Cancel·la"
 
-#, fuzzy
 msgctxt "wizard_button:purchase.handle.shipment.exception,ask,handle:"
 msgid "Ok"
 msgstr "Accepta"
+
+msgctxt "wizard_button:stock.product_quantities_warehouse,start,end:"
+msgid "Cancel"
+msgstr "Cancel·la"
+
+msgctxt "wizard_button:stock.product_quantities_warehouse,start,open_:"
+msgid "Open"
+msgstr "Obrir"