diff --git a/locale/es_AR.po b/locale/es_AR.po
index e74b8e8dbf..c2dbd397df 100644
--- a/locale/es_AR.po
+++ b/locale/es_AR.po
@@ -7,44 +7,38 @@ msgid ""
 "You cannot change the default uom for a product which is associated to stock"
 " moves."
 msgstr ""
-"No puede cambiar la UdM predeterminada de un producto que está asociado con "
+"No puede cambiar la UdM por defecto de un producto que está asociado con "
 "movimientos de existencias."
 
 msgctxt "error:stock.inventory.line:"
-msgid "Line quantity must be positive!"
-msgstr "¡La cantidad de la línea debe ser positiva!"
+msgid "Line quantity must be positive."
+msgstr "La cantidad de la línea debe ser positiva."
 
 msgctxt "error:stock.inventory.line:"
-msgid "Product must be unique by inventory!"
-msgstr "¡El producto debe ser único por inventario!"
+msgid "Product must be unique by inventory."
+msgstr "El producto debe ser único por inventario."
 
 msgctxt "error:stock.inventory:"
-msgid "Inventory \"%s\" must be cancelled before deletion!"
-msgstr "¡Inventario «%s» debe ser cancelado antes de eliminar!"
+msgid "Inventory \"%s\" must be cancelled before deletion."
+msgstr "Debe cancelar el inventario «%s» antes de eliminar."
+
+msgctxt "error:stock.location:"
+msgid "Location \"%(location)s\" must be a child of warehouse \"%(warehouse)s\"."
+msgstr ""
+"La ubicación «%(location)s» debe estar relacionada con almacén "
+"«%(warehouse)s»."
 
 msgctxt "error:stock.location:"
 msgid ""
-"A location with existing moves cannot be changed to a type that does not "
-"support moves."
+"Location \"%s\" with existing moves cannot be changed to a type that does "
+"not support moves."
 msgstr ""
-"Una ubicación con movimientos no puede ser cambiado a un tipo que no soporte"
-" movimientos."
-
-msgctxt "error:stock.location:"
-msgid "Location \"%s\" must be a child of warehouse \"%s\"!"
-msgstr "¡La ubicación «%s» debe ser hijo del almacén «%s»!"
-
-msgctxt "error:stock.location:"
-msgid "You can not create recursive locations!"
-msgstr "¡No puede crear ubicaciones recursivas!"
+"No puede cambiar la ubicación «%s» con movimientos a otra ubicación que no "
+"soporte movimientos."
 
 msgctxt "error:stock.move:"
 msgid "Internal move quantity must be positive"
-msgstr "Cantidad interna del movimiento debe ser positiva"
-
-msgctxt "error:stock.move:"
-msgid "Move can be on only one Shipment"
-msgstr "Un movimiento solo puede hacerse con un envío."
+msgstr "La cantidad del movimiento interno debe ser positiva."
 
 msgctxt "error:stock.move:"
 msgid "Move quantity must be positive"
@@ -52,85 +46,95 @@ msgstr "La cantidad a mover tiene que ser positiva"
 
 msgctxt "error:stock.move:"
 msgid "Source and destination location must be different"
-msgstr "Los lugares origen y destino deben ser distintos"
+msgstr "Las ubicaciones origen y destino deben ser distintas."
 
 msgctxt "error:stock.move:"
-msgid "You can not modify a move in the state: \"Assigned\", \"Done\" or \"Cancel\""
+msgid ""
+"You can not delete stock move \"%s\" because it is not in draft or cancelled"
+" state."
 msgstr ""
-"¡No puede modificar un movimiento en estado: «Asignado», «Terminado» o "
-"«Cancelado»!"
+"No puede eliminar el movimiento de stock «%s» porque no está en estado "
+"borrador o cancelado."
 
 msgctxt "error:stock.move:"
-msgid "You can not modify move in closed period!"
-msgstr "¡No puede modificar un movimiento en un período cerrado!"
+msgid "You can not modify move \"%(move)s\" because period \"%(period)s\" is closed."
+msgstr ""
+"No puede modificar el movimiento «%(move)s» porque el período «%(period)s» "
+"está cerrado."
 
 msgctxt "error:stock.move:"
-msgid "You can not set state to assigned!"
-msgstr "¡No puede establecer el estado como asignado!"
+msgid ""
+"You can not modify stock move \"%s\"because it is in \"Assigned\", \"Done\" "
+"or \"Cancel\" state."
+msgstr ""
+"No puede modificar el movimiento de stock «%s» porque está en estado "
+"«Asignado», «Realizado» o «Cancelado»."
 
 msgctxt "error:stock.move:"
-msgid "You can not set state to done!"
-msgstr "¡No puede establecer el estado como terminado!"
+msgid "You can not set stock move \"%s\" to assigned state."
+msgstr "No puede establecer el movimiento de stock «%s» a estado asignado."
 
 msgctxt "error:stock.move:"
-msgid "You can not set state to draft!"
-msgstr "¡No puede establecer el estado como borrador!"
+msgid "You can not set stock move \"%s\" to done state."
+msgstr "No puede establecer el movimiento de stock «%s» a estado realizado."
 
 msgctxt "error:stock.move:"
-msgid "You can only delete draft or cancelled moves!"
-msgstr "¡Solamente puede borrar movimientos en borrador o cancelados!"
+msgid "You can not set stock move \"%s\" to draft state."
+msgstr "No puede establecer el movimiento de stock «%s» al estado borrador."
 
 msgctxt "error:stock.period:"
-msgid "You can not close a period in the future or today!"
-msgstr "¡No se puede cerrar un período en el futuro o hoy mismo!"
+msgid "You can not close a period in the future or today."
+msgstr "No puede cerrar un período con fecha de hoy o proximamente."
 
 msgctxt "error:stock.period:"
-msgid "You can not close a period when there is still assigned moves!"
-msgstr "¡No se puede cerrar un período cuando existen movimientos asignados!"
+msgid "You can not close a period when there still are assigned moves."
+msgstr ""
+"No puede cerrar un período cuando todavía dispone de movimientos asignados."
 
 msgctxt "error:stock.shipment.in.return:"
-msgid "Supplier Return Shipment \"%s\" must be cancelled before deletion!"
-msgstr "¡Envío de devolución de proveedor «%s» debe ser cancelado antes de eliminar!"
+msgid "Supplier Return Shipment \"%s\" must be cancelled before deletion."
+msgstr ""
+"Debe cancelar el envío de devolución a proveedor «%s» antes de eliminar."
 
 msgctxt "error:stock.shipment.in:"
 msgid ""
 "Incoming Moves must have the warehouse input location as destination "
-"location!"
+"location."
 msgstr ""
-"¡Los movimientos de entrada deben tener la ubicación del almacén de entrada "
-"como la ubicación de destino!"
+"Movimientos de entrada deben disponer de un almacén de entrada como "
+"ubicación de destino."
 
 msgctxt "error:stock.shipment.in:"
 msgid ""
-"Inventory Moves must have the warehouse input location as source location!"
+"Inventory Moves must have the warehouse input location as source location."
 msgstr ""
-"¡Los movimientos de inventario deben tener la ubicación del almacén de "
-"entrada como la ubicación de origen!"
+"Los movimientos del inventario deben disponer de un almacén de entrada como "
+"ubicación inicial."
 
 msgctxt "error:stock.shipment.in:"
-msgid "Supplier Shipment \"%s\" must be cancelled before deletion!"
-msgstr "¡Envío de proveedor «%s» debe ser cancelado antes de eliminar!"
+msgid "Supplier Shipment \"%s\" must be cancelled before deletion."
+msgstr "Debe cancelar el envío de proveedor «%s» antes de eliminar."
 
 msgctxt "error:stock.shipment.internal:"
-msgid "Internal Shipment \"%s\" must be cancelled before deletion!"
-msgstr "¡Envío interno «%s» debe ser cancelado antes de eliminar!"
+msgid "Internal Shipment \"%s\" must be cancelled before deletion."
+msgstr "Debe cancelar el envío interno «%s» antes de eliminar."
 
 msgctxt "error:stock.shipment.out.return.create:"
-msgid "The shipment with code %s is not yet sent."
-msgstr "El paquete con código %s no ha sido enviado aún."
+msgid "The shipment with code \"%s\" is not yet sent."
+msgstr "El envío con código «%s» todavía no se ha enviado."
 
 msgctxt "error:stock.shipment.out.return.create:"
 msgid "You can not create return shipment"
 msgstr "No puede crear paquetes de retorno"
 
 msgctxt "error:stock.shipment.out.return:"
-msgid "Customer Return Shipment \"%s\" must be cancelled before deletion!"
+msgid "Customer Return Shipment \"%s\" must be cancelled before deletion."
 msgstr ""
-"¡Envío de devolución de cliente «%s» debe ser cancelado antes de eliminar!"
+"Debe cancelar el envío de devolución de cliente «%s» antes de eliminar."
 
 msgctxt "error:stock.shipment.out:"
-msgid "Customer Shipment \"%s\" must be cancelled before deletion!"
-msgstr "¡Envío de cliente «%s» debe ser cancelado antes de eliminar!"
+msgid "Customer Shipment \"%s\" must be cancelled before deletion."
+msgstr "Debe cancelar el envío de cliente «%s» antes de eliminar."
 
 msgctxt "field:party.address,delivery:"
 msgid "Delivery"
@@ -146,7 +150,7 @@ msgstr "Ubicación del proveedor"
 
 msgctxt "field:product.by_location.start,forecast_date:"
 msgid "At Date"
-msgstr "En la fecha"
+msgstr "A fecha"
 
 msgctxt "field:product.by_location.start,id:"
 msgid "ID"
@@ -278,7 +282,7 @@ msgstr "Usuario creación"
 
 msgctxt "field:stock.inventory.line,expected_quantity:"
 msgid "Expected Quantity"
-msgstr "Cantidad esperada"
+msgstr "Cantidad estimada"
 
 msgctxt "field:stock.inventory.line,id:"
 msgid "ID"
@@ -306,7 +310,7 @@ msgstr "Nombre"
 
 msgctxt "field:stock.inventory.line,unit_digits:"
 msgid "Unit Digits"
-msgstr "Dígitos de la unidad"
+msgstr "Dígitos de unidad"
 
 msgctxt "field:stock.inventory.line,uom:"
 msgid "UOM"
@@ -390,7 +394,7 @@ msgstr "Derecha"
 
 msgctxt "field:stock.location,storage_location:"
 msgid "Storage"
-msgstr "Almacén"
+msgstr "Depósito"
 
 msgctxt "field:stock.location,type:"
 msgid "Location type"
@@ -440,6 +444,10 @@ msgctxt "field:stock.move,internal_quantity:"
 msgid "Internal Quantity"
 msgstr "Cantidad interna"
 
+msgctxt "field:stock.move,origin:"
+msgid "Origin"
+msgstr "Origen"
+
 msgctxt "field:stock.move,planned_date:"
 msgid "Planned Date"
 msgstr "Fecha estimada"
@@ -460,25 +468,9 @@ msgctxt "field:stock.move,rec_name:"
 msgid "Name"
 msgstr "Nombre"
 
-msgctxt "field:stock.move,shipment_in:"
-msgid "Supplier Shipment"
-msgstr "Envío del proveedor"
-
-msgctxt "field:stock.move,shipment_in_return:"
-msgid "Supplier Return Shipment"
-msgstr "Envío de devolución a proveedor"
-
-msgctxt "field:stock.move,shipment_internal:"
-msgid "Internal Shipment"
-msgstr "Envío interno"
-
-msgctxt "field:stock.move,shipment_out:"
-msgid "Customer Shipment"
-msgstr "Envío a cliente"
-
-msgctxt "field:stock.move,shipment_out_return:"
-msgid "Customer Return Shipment"
-msgstr "Envío de devolución de cliente"
+msgctxt "field:stock.move,shipment:"
+msgid "Shipment"
+msgstr "Envío"
 
 msgctxt "field:stock.move,state:"
 msgid "State"
@@ -498,7 +490,7 @@ msgstr "Precio unitario"
 
 msgctxt "field:stock.move,unit_price_required:"
 msgid "Unit Price Required"
-msgstr "Requiere precio unitario"
+msgstr "Precio unitario requerido"
 
 msgctxt "field:stock.move,uom:"
 msgid "Uom"
@@ -514,7 +506,7 @@ msgstr "Usuario modificación"
 
 msgctxt "field:stock.period,caches:"
 msgid "Caches"
-msgstr "Cachés"
+msgstr "Precalculado"
 
 msgctxt "field:stock.period,company:"
 msgid "Company"
@@ -630,11 +622,11 @@ msgstr "ID"
 
 msgctxt "field:stock.product_quantities_warehouse.start,warehouse:"
 msgid "Warehouse"
-msgstr "Depósito"
+msgstr "Almacén"
 
 msgctxt "field:stock.products_by_locations.start,forecast_date:"
 msgid "At Date"
-msgstr "En la fecha"
+msgstr "A fecha"
 
 msgctxt "field:stock.products_by_locations.start,id:"
 msgid "ID"
@@ -1039,12 +1031,12 @@ msgstr "Usuario modificación"
 msgctxt "help:party.party,customer_location:"
 msgid "The default destination location when sending products to the party."
 msgstr ""
-"El lugar de destino predeterminado cuando se envian productos a la entidad."
+"El lugar de destino por defecto cuando se envían productos a la entidad."
 
 msgctxt "help:party.party,supplier_location:"
 msgid "The default source location when receiving products from the party."
 msgstr ""
-"La ubicación de origen predeterminado cuando se reciben productos de la "
+"La ubicación de origen por defecto cuando se reciben productos de la "
 "entidad."
 
 msgctxt "help:product.by_location.start,forecast_date:"
@@ -1071,10 +1063,6 @@ msgctxt "model:ir.action,name:act_inventory_form"
 msgid "Inventories"
 msgstr "Inventarios"
 
-msgctxt "model:ir.action,name:act_inventory_form_draft"
-msgid "Draft Inventories"
-msgstr "Inventarios en borrador"
-
 msgctxt "model:ir.action,name:act_location_form"
 msgid "Locations"
 msgstr "Editar ubicaciones"
@@ -1091,85 +1079,41 @@ msgctxt "model:ir.action,name:act_move_form"
 msgid "Moves"
 msgstr "Movimientos"
 
-msgctxt "model:ir.action,name:act_move_form_cust"
-msgid "Moves to Customers"
-msgstr "Movimientos hacia clientes"
-
-msgctxt "model:ir.action,name:act_move_form_supp"
-msgid "Moves from Suppliers"
-msgstr "Movimientos de proveedores"
-
-msgctxt "model:ir.action,name:act_move_form_supp_proceed"
-msgid "Moves from Suppliers Waiting Arrival"
-msgstr "Movimientos de proveedores en espera de llegada"
-
 msgctxt "model:ir.action,name:act_period_list"
 msgid "Periods"
 msgstr "Períodos"
 
 msgctxt "model:ir.action,name:act_product_quantities_warehouse"
 msgid "Product Quantities By Warehouse"
-msgstr "Cantidad de Productos por Almacén"
+msgstr "Unidades de producto por almacén"
 
 msgctxt "model:ir.action,name:act_products_by_locations"
 msgid "Products"
 msgstr "Productos"
 
-msgctxt "model:ir.action,name:act_shipment_in_draft"
-msgid "Draft Supplier Shipment"
-msgstr "Envío de proveedor en borrador"
-
 msgctxt "model:ir.action,name:act_shipment_in_form"
 msgid "Supplier Shipments"
-msgstr "Envíos del proveedor"
-
-msgctxt "model:ir.action,name:act_shipment_in_form_received"
-msgid "Received Supplier shipments"
-msgstr "Paquetes recibidos de proveedores"
+msgstr "Envíos de proveedor"
 
 msgctxt "model:ir.action,name:act_shipment_in_return_form"
 msgid "Supplier Return Shipments"
 msgstr "Envíos de devolución a proveedor"
 
-msgctxt "model:ir.action,name:act_shipment_internal_assigned_form"
-msgid "Assigned Internal Shipments"
-msgstr "Envíos internos asignados"
-
-msgctxt "model:ir.action,name:act_shipment_internal_draft_form"
-msgid "Draft Internal Shipments"
-msgstr "Envíos internos en borrador"
-
 msgctxt "model:ir.action,name:act_shipment_internal_form"
 msgid "Internal Shipments"
 msgstr "Envíos internos"
 
-msgctxt "model:ir.action,name:act_shipment_internal_waiting_form"
-msgid "Internal Shipments Waiting Assignation"
-msgstr "Envíos internos esperando asignación"
-
 msgctxt "model:ir.action,name:act_shipment_out_form"
 msgid "Customer Shipments"
 msgstr "Envíos a cliente"
 
 msgctxt "model:ir.action,name:act_shipment_out_form2"
 msgid "Customer Shipments"
-msgstr "Envíos de cliente"
+msgstr "Envíos a cliente"
 
 msgctxt "model:ir.action,name:act_shipment_out_form3"
 msgid "Supplier Shipments"
-msgstr "Envíos a proveedor"
-
-msgctxt "model:ir.action,name:act_shipment_out_form_assigned"
-msgid "Assigned Customer Shipments"
-msgstr "Envíos a clientes asignados"
-
-msgctxt "model:ir.action,name:act_shipment_out_form_ready"
-msgid "Customer Shipments Ready for Shipping"
-msgstr "Envíos a cliente listos para ser enviados"
-
-msgctxt "model:ir.action,name:act_shipment_out_form_waiting"
-msgid "Customer Shipments Waiting Assignation"
-msgstr "Envíos a cliente esperando asignación"
+msgstr "Envíos de proveedor"
 
 msgctxt "model:ir.action,name:act_shipment_out_return_form"
 msgid "Customer Return Shipments"
@@ -1177,7 +1121,7 @@ msgstr "Envíos de devoluciones de cliente"
 
 msgctxt "model:ir.action,name:act_stock_configuration_form"
 msgid "Stock Configuration"
-msgstr "Configuración de Stock"
+msgstr "Configuración de stock"
 
 msgctxt "model:ir.action,name:create_shipment_out_return"
 msgid "Create Return Shipment"
@@ -1185,7 +1129,7 @@ msgstr "Crear envío de devolución"
 
 msgctxt "model:ir.action,name:report_shipment_in_restocking_list"
 msgid "Restocking List"
-msgstr "Lista de renovación de inventario"
+msgstr "Lista reabastecimiento"
 
 msgctxt "model:ir.action,name:report_shipment_internal"
 msgid "Internal Shipment"
@@ -1193,7 +1137,7 @@ msgstr "Envío interno"
 
 msgctxt "model:ir.action,name:report_shipment_out_delivery_note"
 msgid "Delivery Note"
-msgstr "Remito de envío"
+msgstr "Nota de envío"
 
 msgctxt "model:ir.action,name:report_shipment_out_picking_list"
 msgid "Picking List"
@@ -1201,19 +1145,19 @@ msgstr "Lista de selección"
 
 msgctxt "model:ir.action,name:report_shipment_out_return_restocking_list"
 msgid "Restocking List"
-msgstr "Lista de renovación de inventario"
+msgstr "Lista reabastecimiento"
 
 msgctxt "model:ir.action,name:wizard_product_by_location"
 msgid "Product by Locations"
-msgstr "Producto por Ubicaciones"
+msgstr "Producto por ubicaciones"
 
 msgctxt "model:ir.action,name:wizard_product_quantities_warehouse"
 msgid "Product Quantities By Warehouse"
-msgstr "Cantidad de Productos por Almacén"
+msgstr "Unidades de producto por almacén"
 
 msgctxt "model:ir.action,name:wizard_products_by_locations"
 msgid "Products by Locations"
-msgstr "Productos por Ubicaciones"
+msgstr "Productos por ubicaciones"
 
 msgctxt "model:ir.action,name:wizard_shipment_in_return_assign"
 msgid "Assign Purchase Return Shipment"
@@ -1225,7 +1169,130 @@ msgstr "Asignar envío interno"
 
 msgctxt "model:ir.action,name:wizard_shipment_out_assign"
 msgid "Assign Shipment Out"
-msgstr "Asignación de salida de envío"
+msgstr "Asignación de envío de salida"
+
+msgctxt "model:ir.action.act_window.domain,name:act_inventory_form_domain_all"
+msgid "All"
+msgstr "Todo"
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_inventory_form_domain_draft"
+msgid "Draft"
+msgstr "Borrador"
+
+msgctxt "model:ir.action.act_window.domain,name:act_move_form_domain_all"
+msgid "All"
+msgstr "Todo"
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_move_form_domain_from_supplier"
+msgid "From Suppliers"
+msgstr "Desde proveedor"
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_move_form_domain_from_supplier_waiting"
+msgid "From Suppliers Waiting"
+msgstr "En espera desde proveedor"
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_move_form_domain_to_customer"
+msgid "To Customers"
+msgstr "Hacia clientes"
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_shipment_in_form_domain_all"
+msgid "All"
+msgstr "Todo"
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_shipment_in_form_domain_draft"
+msgid "Draft"
+msgstr "Borrador"
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_shipment_in_form_domain_received"
+msgid "Received"
+msgstr "Recibido"
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_shipment_in_return_form_domain_all"
+msgid "All"
+msgstr "Todo"
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_shipment_in_return_form_domain_assigned"
+msgid "Assigned"
+msgstr "Asignado"
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_shipment_in_return_form_domain_draft"
+msgid "Draft"
+msgstr "Borrador"
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_shipment_in_return_form_domain_waiting"
+msgid "Waiting"
+msgstr "En espera"
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_shipment_internal_form_domain_all"
+msgid "All"
+msgstr "Todo"
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_shipment_internal_form_domain_assigned"
+msgid "Assigned"
+msgstr "Asignado"
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_shipment_internal_form_domain_draft"
+msgid "Draft"
+msgstr "Borrador"
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_shipment_internal_form_domain_waiting"
+msgid "Waiting"
+msgstr "En espera"
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_shipment_out_form_domain_all"
+msgid "All"
+msgstr "Todo"
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_shipment_out_form_domain_assigned"
+msgid "Assigned"
+msgstr "Asignado"
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_shipment_out_form_domain_draft"
+msgid "Draft"
+msgstr "Borrador"
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_shipment_out_form_domain_packed"
+msgid "Packed"
+msgstr "Empaquetado"
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_shipment_out_form_domain_waiting"
+msgid "Waiting"
+msgstr "En espera"
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_shipment_out_return_form_domain_all"
+msgid "All"
+msgstr "Todo"
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_shipment_out_return_form_domain_draft"
+msgid "Draft"
+msgstr "Borrador"
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_shipment_out_return_form_domain_received"
+msgid "Received"
+msgstr "Recibido"
 
 msgctxt "model:ir.sequence,name:sequence_shipment_in"
 msgid "Supplier Shipment"
@@ -1275,13 +1342,9 @@ msgctxt "model:ir.ui.menu,name:menu_inventory_form"
 msgid "Inventories"
 msgstr "Inventarios"
 
-msgctxt "model:ir.ui.menu,name:menu_inventory_form_draft"
-msgid "Draft Inventories"
-msgstr "Inventarios en borrador"
-
 msgctxt "model:ir.ui.menu,name:menu_location_form"
 msgid "Locations"
-msgstr "Editar ubicaciones"
+msgstr "Ubicaciones"
 
 msgctxt "model:ir.ui.menu,name:menu_location_tree"
 msgid "Locations"
@@ -1291,18 +1354,6 @@ msgctxt "model:ir.ui.menu,name:menu_move_form"
 msgid "Moves"
 msgstr "Movimientos"
 
-msgctxt "model:ir.ui.menu,name:menu_move_form_cust"
-msgid "Moves to Customers"
-msgstr "Movimientos hacia clientes"
-
-msgctxt "model:ir.ui.menu,name:menu_move_form_supp"
-msgid "Moves from Suppliers"
-msgstr "Movimientos de proveedores"
-
-msgctxt "model:ir.ui.menu,name:menu_move_form_supp_proceed"
-msgid "Moves from Suppliers Waiting Arrival"
-msgstr "Movimientos de proveedores en espera de llegada"
-
 msgctxt "model:ir.ui.menu,name:menu_period_list"
 msgid "Periods"
 msgstr "Períodos"
@@ -1311,69 +1362,37 @@ msgctxt "model:ir.ui.menu,name:menu_reporting"
 msgid "Reporting"
 msgstr "Informes"
 
-msgctxt "model:ir.ui.menu,name:menu_shipment_in_draft"
-msgid "Draft Supplier Shipment"
-msgstr "Envío de proveedor en borrador"
-
 msgctxt "model:ir.ui.menu,name:menu_shipment_in_form"
 msgid "Supplier Shipments"
-msgstr "Envíos del proveedor"
-
-msgctxt "model:ir.ui.menu,name:menu_shipment_in_received"
-msgid "Received Supplier shipments"
-msgstr "Paquetes de proveedores recibidos"
+msgstr "Envíos de proveedor"
 
 msgctxt "model:ir.ui.menu,name:menu_shipment_in_return_form"
 msgid "Supplier Return Shipments"
 msgstr "Envíos de devolución a proveedor"
 
-msgctxt "model:ir.ui.menu,name:menu_shipment_internal_assigned_form"
-msgid "Assigned Internal Shipments"
-msgstr "Envíos internos asignados"
-
-msgctxt "model:ir.ui.menu,name:menu_shipment_internal_draft_form"
-msgid "Draft Internal Shipments"
-msgstr "Envíos Internos en borrador"
-
 msgctxt "model:ir.ui.menu,name:menu_shipment_internal_form"
 msgid "Internal Shipments"
 msgstr "Envíos internos"
 
-msgctxt "model:ir.ui.menu,name:menu_shipment_internal_waiting_form"
-msgid "Internal Shipments Waiting Assignation"
-msgstr "Envío internos esperando asignación"
-
-msgctxt "model:ir.ui.menu,name:menu_shipment_out_assigned"
-msgid "Assigned Customer Shipments"
-msgstr "Envíos a clientes asignados"
-
 msgctxt "model:ir.ui.menu,name:menu_shipment_out_form"
 msgid "Customer Shipments"
-msgstr "Envíos al cliente"
-
-msgctxt "model:ir.ui.menu,name:menu_shipment_out_ready"
-msgid "Customer Shipments Ready for Shipping"
-msgstr "Envíos al cliente listos para su transporte"
+msgstr "Envíos a cliente"
 
 msgctxt "model:ir.ui.menu,name:menu_shipment_out_return_form"
 msgid "Customer Return Shipments"
 msgstr "Envíos de devolución de cliente"
 
-msgctxt "model:ir.ui.menu,name:menu_shipment_out_waiting"
-msgid "Customer Shipments Waiting Assignation"
-msgstr "Envíos a cliente esperando asignación"
-
 msgctxt "model:ir.ui.menu,name:menu_stock"
 msgid "Inventory & Stock"
-msgstr "Gestión de Inventarios"
+msgstr "Inventarios"
 
 msgctxt "model:ir.ui.menu,name:menu_stock_configuration"
 msgid "Stock Configuration"
-msgstr "Configuración de Stock"
+msgstr "Stock"
 
 msgctxt "model:product.by_location.start,name:"
 msgid "Product by Location"
-msgstr "Producto por Ubicación"
+msgstr "Producto por ubicación"
 
 msgctxt "model:res.group,name:group_stock"
 msgid "Stock"
@@ -1389,7 +1408,7 @@ msgstr "Asignación forzada de existencias"
 
 msgctxt "model:stock.configuration,name:"
 msgid "Stock Configuration"
-msgstr "Configuración de Stock"
+msgstr "Configuración de stock"
 
 msgctxt "model:stock.inventory,name:"
 msgid "Stock Inventory"
@@ -1397,7 +1416,7 @@ msgstr "Inventario de existencia"
 
 msgctxt "model:stock.inventory.line,name:"
 msgid "Stock Inventory Line"
-msgstr "Línea de existencia en Inventario "
+msgstr "Línea inventario de existencia"
 
 msgctxt "model:stock.location,name:"
 msgid "Stock Location"
@@ -1437,23 +1456,23 @@ msgstr "Movimiento de existencias"
 
 msgctxt "model:stock.period,name:"
 msgid "Stock Period"
-msgstr "Período de stock"
+msgstr "Período de existencia"
 
 msgctxt "model:stock.period.cache,name:"
 msgid "Stock Period Cache"
-msgstr "Caché de período de existencia"
+msgstr "Período de existencia precalculado"
 
 msgctxt "model:stock.product_quantities_warehouse,name:"
 msgid "Product Quantities By Warehouse"
-msgstr "Cantidad de Productos por Almacén"
+msgstr "Unidades de producto por almacén"
 
 msgctxt "model:stock.product_quantities_warehouse.start,name:"
 msgid "Product Quantities By Warehouse"
-msgstr "Cantidad de Productos por Almacén"
+msgstr "Unidades de producto por almacén"
 
 msgctxt "model:stock.products_by_locations.start,name:"
 msgid "Products by Locations"
-msgstr "Productos por Ubicaciones"
+msgstr "Productos por ubicaciones"
 
 msgctxt "model:stock.shipment.in,name:"
 msgid "Supplier Shipment"
@@ -1481,7 +1500,7 @@ msgstr "Envío a cliente"
 
 msgctxt "model:stock.shipment.out.assign.failed,name:"
 msgid "Assign Shipment Out"
-msgstr "Asignación de salida de envío"
+msgstr "Asignación de envío de salida"
 
 msgctxt "model:stock.shipment.out.return,name:"
 msgid "Customer Return Shipment"
@@ -1509,7 +1528,7 @@ msgstr "Teléfono:"
 
 msgctxt "odt:stock.shipment.in.restocking_list:"
 msgid "Planned Date:"
-msgstr "Fecha planeada:"
+msgstr "Fecha estimada:"
 
 msgctxt "odt:stock.shipment.in.restocking_list:"
 msgid "Product"
@@ -1525,7 +1544,7 @@ msgstr "Referencia:"
 
 msgctxt "odt:stock.shipment.in.restocking_list:"
 msgid "Restocking List"
-msgstr "Lista de renovación de existencias"
+msgstr "Lista reabastecimiento"
 
 msgctxt "odt:stock.shipment.in.restocking_list:"
 msgid "Supplier:"
@@ -1613,7 +1632,7 @@ msgstr "Fecha:"
 
 msgctxt "odt:stock.shipment.out.delivery_note:"
 msgid "Delivery Note"
-msgstr "Remito de envío"
+msgstr "Nota de envío"
 
 msgctxt "odt:stock.shipment.out.delivery_note:"
 msgid "E-Mail:"
@@ -1737,7 +1756,7 @@ msgstr "Referencia:"
 
 msgctxt "odt:stock.shipment.out.return.restocking_list:"
 msgid "Restocking List"
-msgstr "Lista de renovación de existencias"
+msgstr "Lista reabastecimiento"
 
 msgctxt "odt:stock.shipment.out.return.restocking_list:"
 msgid "Supplier:"
@@ -1761,7 +1780,7 @@ msgstr "Cancelado"
 
 msgctxt "selection:stock.inventory,state:"
 msgid "Done"
-msgstr "Terminado"
+msgstr "Realizado"
 
 msgctxt "selection:stock.inventory,state:"
 msgid "Draft"
@@ -1781,7 +1800,7 @@ msgstr "Producción"
 
 msgctxt "selection:stock.location,type:"
 msgid "Storage"
-msgstr "Almacén"
+msgstr "Depósito"
 
 msgctxt "selection:stock.location,type:"
 msgid "Supplier"
@@ -1805,7 +1824,7 @@ msgstr "Cancelado"
 
 msgctxt "selection:stock.move,state:"
 msgid "Done"
-msgstr "Terminado"
+msgstr "Realizado"
 
 msgctxt "selection:stock.move,state:"
 msgid "Draft"
@@ -1825,7 +1844,7 @@ msgstr "Cancelado"
 
 msgctxt "selection:stock.shipment.in,state:"
 msgid "Done"
-msgstr "Terminado"
+msgstr "Realizado"
 
 msgctxt "selection:stock.shipment.in,state:"
 msgid "Draft"
@@ -1845,7 +1864,7 @@ msgstr "Cancelado"
 
 msgctxt "selection:stock.shipment.in.return,state:"
 msgid "Done"
-msgstr "Terminado"
+msgstr "Realizado"
 
 msgctxt "selection:stock.shipment.in.return,state:"
 msgid "Draft"
@@ -1865,7 +1884,7 @@ msgstr "Cancelado"
 
 msgctxt "selection:stock.shipment.internal,state:"
 msgid "Done"
-msgstr "Terminado"
+msgstr "Realizado"
 
 msgctxt "selection:stock.shipment.internal,state:"
 msgid "Draft"
@@ -1885,7 +1904,7 @@ msgstr "Cancelado"
 
 msgctxt "selection:stock.shipment.out,state:"
 msgid "Done"
-msgstr "Terminado"
+msgstr "Realizado"
 
 msgctxt "selection:stock.shipment.out,state:"
 msgid "Draft"
@@ -1905,7 +1924,7 @@ msgstr "Cancelado"
 
 msgctxt "selection:stock.shipment.out.return,state:"
 msgid "Done"
-msgstr "Terminado"
+msgstr "Realizado"
 
 msgctxt "selection:stock.shipment.out.return,state:"
 msgid "Draft"
@@ -1919,13 +1938,9 @@ msgctxt "view:party.party:"
 msgid "Stock"
 msgstr "Existencias"
 
-msgctxt "view:party.party:"
-msgid "_Stock"
-msgstr "_Existencias"
-
 msgctxt "view:product.by_location.start:"
 msgid "Product by Location"
-msgstr "Producto por Ubicación"
+msgstr "Producto por ubicación"
 
 msgctxt "view:product.product:"
 msgid "Products"
@@ -1933,7 +1948,7 @@ msgstr "Productos"
 
 msgctxt "view:stock.configuration:"
 msgid "Stock Configuration"
-msgstr "Configuración de Stock"
+msgstr "Configuración de stock"
 
 msgctxt "view:stock.inventory.line:"
 msgid "Inventory Line"
@@ -1947,10 +1962,6 @@ msgctxt "view:stock.inventory:"
 msgid "Add an inventory line for each missing products"
 msgstr "Añadir una línea de inventario por cada producto que falta"
 
-msgctxt "view:stock.inventory:"
-msgid "All generated moves will be cancelled!"
-msgstr "¡Se cancelarán todos los movimientos generados!"
-
 msgctxt "view:stock.inventory:"
 msgid "Cancel"
 msgstr "Cancelar"
@@ -1971,30 +1982,18 @@ msgctxt "view:stock.inventory:"
 msgid "Inventory"
 msgstr "Inventario"
 
-msgctxt "view:stock.inventory:"
-msgid "Re-Open"
-msgstr "Reabrir"
-
 msgctxt "view:stock.location:"
 msgid "Location"
 msgstr "Ubicación"
 
 msgctxt "view:stock.location:"
 msgid "Location Quantity"
-msgstr "Existencias en la ubicación"
+msgstr "Existencias en ubicación"
 
 msgctxt "view:stock.location:"
 msgid "Locations"
 msgstr "Ubicaciones"
 
-msgctxt "view:stock.location:"
-msgid "Product Stock"
-msgstr "Existencias del producto"
-
-msgctxt "view:stock.move:"
-msgid "Cancel"
-msgstr "Cancelar"
-
 msgctxt "view:stock.move:"
 msgid "Move"
 msgstr "Movimiento"
@@ -2003,21 +2002,13 @@ msgctxt "view:stock.move:"
 msgid "Moves"
 msgstr "Movimientos"
 
-msgctxt "view:stock.move:"
-msgid "Set Done"
-msgstr "Marcar como terminado"
-
-msgctxt "view:stock.move:"
-msgid "Set Draft"
-msgstr "Marcar como borrador"
-
 msgctxt "view:stock.period.cache:"
 msgid "Period Cache"
-msgstr "Caché de período"
+msgstr "Período precalculado"
 
 msgctxt "view:stock.period.cache:"
 msgid "Period Caches"
-msgstr "Cachés de periodo"
+msgstr "Período precalculado"
 
 msgctxt "view:stock.period:"
 msgid "Close"
@@ -2037,15 +2028,15 @@ msgstr "Períodos"
 
 msgctxt "view:stock.product_quantities_warehouse.start:"
 msgid "Product Quantities By Warehouse"
-msgstr "Cantidad de Productos por Almacén"
+msgstr "Unidades de producto por almacén"
 
 msgctxt "view:stock.product_quantities_warehouse:"
 msgid "Product Quantities By Warehouse"
-msgstr "Cantidad de Productos por Almacén"
+msgstr "Unidades de producto por almacén"
 
 msgctxt "view:stock.products_by_locations.start:"
 msgid "Products by Locations"
-msgstr "Productos por Ubicaciones"
+msgstr "Productos por ubicaciones"
 
 msgctxt "view:stock.shipment.in.return.assign.failed:"
 msgid "Unable to Assign"
@@ -2065,16 +2056,12 @@ msgstr "Cancelar"
 
 msgctxt "view:stock.shipment.in.return:"
 msgid "Done"
-msgstr "Terminado"
+msgstr "Realizado"
 
 msgctxt "view:stock.shipment.in.return:"
 msgid "Draft"
 msgstr "Borrador"
 
-msgctxt "view:stock.shipment.in.return:"
-msgid "Reset to Draft"
-msgstr "Restablecer a borrador"
-
 msgctxt "view:stock.shipment.in.return:"
 msgid "Supplier Return Shipment"
 msgstr "Envío de devolución a proveedor"
@@ -2087,21 +2074,13 @@ msgctxt "view:stock.shipment.in.return:"
 msgid "Wait"
 msgstr "Espera"
 
-msgctxt "view:stock.shipment.in.return:"
-msgid "Waiting"
-msgstr "En espera"
-
 msgctxt "view:stock.shipment.in:"
 msgid "Cancel"
 msgstr "Cancelar"
 
 msgctxt "view:stock.shipment.in:"
 msgid "Done"
-msgstr "Terminado"
-
-msgctxt "view:stock.shipment.in:"
-msgid "Draft"
-msgstr "Borrador"
+msgstr "Realizado"
 
 msgctxt "view:stock.shipment.in:"
 msgid "Incoming Moves"
@@ -2111,18 +2090,10 @@ msgctxt "view:stock.shipment.in:"
 msgid "Inventory Moves"
 msgstr "Movimientos de inventario"
 
-msgctxt "view:stock.shipment.in:"
-msgid "Moves"
-msgstr "Movimientos"
-
 msgctxt "view:stock.shipment.in:"
 msgid "Receive"
 msgstr "Recibe"
 
-msgctxt "view:stock.shipment.in:"
-msgid "Received"
-msgstr "Recibido"
-
 msgctxt "view:stock.shipment.in:"
 msgid "Reset to Draft"
 msgstr "Restablecer a borrador"
@@ -2153,16 +2124,12 @@ msgstr "Cancelar"
 
 msgctxt "view:stock.shipment.internal:"
 msgid "Done"
-msgstr "Terminado"
+msgstr "Realizado"
 
 msgctxt "view:stock.shipment.internal:"
 msgid "Draft"
 msgstr "Borrador"
 
-msgctxt "view:stock.shipment.internal:"
-msgid "Force Assign"
-msgstr "Forzar asignación"
-
 msgctxt "view:stock.shipment.internal:"
 msgid "Internal Shipment"
 msgstr "Envío interno"
@@ -2171,18 +2138,6 @@ msgctxt "view:stock.shipment.internal:"
 msgid "Internal Shipments"
 msgstr "Envíos internos"
 
-msgctxt "view:stock.shipment.internal:"
-msgid "Reset to Draft"
-msgstr "Restablecer a borrador"
-
-msgctxt "view:stock.shipment.internal:"
-msgid "Set Done"
-msgstr "Marcar como terminado"
-
-msgctxt "view:stock.shipment.internal:"
-msgid "Set Waiting"
-msgstr "Colocar en espera"
-
 msgctxt "view:stock.shipment.internal:"
 msgid "Waiting"
 msgstr "En espera"
@@ -2209,7 +2164,7 @@ msgstr "Envíos de devolución de cliente"
 
 msgctxt "view:stock.shipment.out.return:"
 msgid "Done"
-msgstr "Terminado"
+msgstr "Realizado"
 
 msgctxt "view:stock.shipment.out.return:"
 msgid "Draft"
@@ -2223,18 +2178,10 @@ msgctxt "view:stock.shipment.out.return:"
 msgid "Inventory Moves"
 msgstr "Movimientos de inventario"
 
-msgctxt "view:stock.shipment.out.return:"
-msgid "Moves"
-msgstr "Movimientos"
-
 msgctxt "view:stock.shipment.out.return:"
 msgid "Received"
 msgstr "Recibido"
 
-msgctxt "view:stock.shipment.out.return:"
-msgid "Reset to Draft"
-msgstr "Restablecer a borrador"
-
 msgctxt "view:stock.shipment.out:"
 msgid "Assign"
 msgstr "Asignar"
@@ -2249,20 +2196,16 @@ msgstr "Envío a cliente"
 
 msgctxt "view:stock.shipment.out:"
 msgid "Customer Shipments"
-msgstr "Envíos a clientes"
+msgstr "Envíos a cliente"
 
 msgctxt "view:stock.shipment.out:"
 msgid "Done"
-msgstr "Terminado"
+msgstr "Realizado"
 
 msgctxt "view:stock.shipment.out:"
 msgid "Draft"
 msgstr "Borrador"
 
-msgctxt "view:stock.shipment.out:"
-msgid "Force Assign"
-msgstr "Forzar asignación"
-
 msgctxt "view:stock.shipment.out:"
 msgid "Inventory Moves"
 msgstr "Movimientos de inventario"
@@ -2275,22 +2218,6 @@ msgctxt "view:stock.shipment.out:"
 msgid "Outgoing Moves"
 msgstr "Movimientos de salida"
 
-msgctxt "view:stock.shipment.out:"
-msgid "Reset to Draft"
-msgstr "Restablecer a borrador"
-
-msgctxt "view:stock.shipment.out:"
-msgid "Set Done"
-msgstr "Marcar como terminado"
-
-msgctxt "view:stock.shipment.out:"
-msgid "Set Waiting"
-msgstr "Colocar en espera"
-
-msgctxt "view:stock.shipment.out:"
-msgid "Unpack"
-msgstr "Desempaquetar"
-
 msgctxt "view:stock.shipment.out:"
 msgid "Waiting"
 msgstr "En espera"