[tryton-debian-vcs] tryton-modules-stock branch upstream updated. upstream/3.8.1-2-gf27894c

Mathias Behrle tryton-debian-vcs at alioth.debian.org
Thu Jun 2 16:27:32 UTC 2016


The following commit has been merged in the upstream branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-stock.git;a=commitdiff;h=upstream/3.8.1-2-gf27894c

commit f27894c393a9cf1bcc24d9e611a06b2dcca68282
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Fri May 27 18:35:31 2016 +0200

    Adding upstream version 4.0.1.
    
    Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>

diff --git a/CHANGELOG b/CHANGELOG
index 1134473..e779da6 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 4.0.1 - 2016-05-11
+* Bug fixes (see mercurial logs for details)
+
 Version 4.0.0 - 2016-05-02
 * Bug fixes (see mercurial logs for details)
 * Rename Shipments code into number
diff --git a/PKG-INFO b/PKG-INFO
index 3f028a1..1f061f8 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_stock
-Version: 4.0.0
+Version: 4.0.1
 Summary: Tryton module for stock and inventory
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/locale/bg_BG.po b/locale/bg_BG.po
index 63c6d93..34040dc 100644
--- a/locale/bg_BG.po
+++ b/locale/bg_BG.po
@@ -1598,9 +1598,10 @@ msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "/"
 msgstr "/"
 
+#, fuzzy
 msgctxt "report:stock.shipment.in.restocking_list:"
 msgid ":"
-msgstr ""
+msgstr ":"
 
 msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "From Location"
@@ -1647,9 +1648,10 @@ msgctxt "report:stock.shipment.internal.report:"
 msgid "/"
 msgstr "/"
 
+#, fuzzy
 msgctxt "report:stock.shipment.internal.report:"
 msgid ":"
-msgstr ""
+msgstr ":"
 
 msgctxt "report:stock.shipment.internal.report:"
 msgid "From Location"
@@ -1728,9 +1730,10 @@ msgctxt "report:stock.shipment.out.picking_list:"
 msgid "/"
 msgstr "/"
 
+#, fuzzy
 msgctxt "report:stock.shipment.out.picking_list:"
 msgid ":"
-msgstr ""
+msgstr ":"
 
 msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Customer:"
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
index 481dd06..3b58f9c 100644
--- a/locale/ca_ES.po
+++ b/locale/ca_ES.po
@@ -204,7 +204,7 @@ msgstr "ID"
 
 msgctxt "field:stock.configuration,inventory_sequence:"
 msgid "Inventory Sequence"
-msgstr ""
+msgstr "Seqüència d'inventari"
 
 msgctxt "field:stock.configuration,rec_name:"
 msgid "Name"
@@ -272,7 +272,7 @@ msgstr "Perdut-trobat"
 
 msgctxt "field:stock.inventory,number:"
 msgid "Number"
-msgstr ""
+msgstr "Número"
 
 msgctxt "field:stock.inventory,rec_name:"
 msgid "Name"
@@ -422,7 +422,6 @@ msgctxt "field:stock.location,type:"
 msgid "Location type"
 msgstr "Tipus d'ubicació"
 
-#, fuzzy
 msgctxt "field:stock.location,warehouse:"
 msgid "Warehouse"
 msgstr "Magatzem"
@@ -437,7 +436,7 @@ msgstr "Usuari modificació"
 
 msgctxt "field:stock.move,assignation_required:"
 msgid "Assignation Required"
-msgstr ""
+msgstr "Reserva obligatòria"
 
 msgctxt "field:stock.move,company:"
 msgid "Company"
@@ -501,7 +500,7 @@ msgstr "Nom"
 
 msgctxt "field:stock.move,shipment:"
 msgid "Shipment"
-msgstr "Enviaments"
+msgstr "Albarà"
 
 msgctxt "field:stock.move,state:"
 msgid "State"
@@ -701,7 +700,7 @@ msgstr "Moviments"
 
 msgctxt "field:stock.shipment.in,number:"
 msgid "Numer"
-msgstr ""
+msgstr "Número"
 
 msgctxt "field:stock.shipment.in,origins:"
 msgid "Origins"
@@ -763,7 +762,6 @@ msgctxt "field:stock.shipment.in.return,create_uid:"
 msgid "Create User"
 msgstr "Usuari creació"
 
-#, fuzzy
 msgctxt "field:stock.shipment.in.return,delivery_address:"
 msgid "Delivery Address"
 msgstr "Adreça d'enviament"
@@ -786,7 +784,7 @@ msgstr "Moviments"
 
 msgctxt "field:stock.shipment.in.return,number:"
 msgid "Number"
-msgstr ""
+msgstr "Número"
 
 msgctxt "field:stock.shipment.in.return,origins:"
 msgid "Origins"
@@ -808,7 +806,6 @@ msgctxt "field:stock.shipment.in.return,state:"
 msgid "State"
 msgstr "Estat"
 
-#, fuzzy
 msgctxt "field:stock.shipment.in.return,supplier:"
 msgid "Supplier"
 msgstr "Proveïdor"
@@ -863,7 +860,7 @@ msgstr "Moviments"
 
 msgctxt "field:stock.shipment.internal,number:"
 msgid "Number"
-msgstr ""
+msgstr "Número"
 
 msgctxt "field:stock.shipment.internal,planned_date:"
 msgid "Planned Date"
@@ -943,7 +940,7 @@ msgstr "Moviments"
 
 msgctxt "field:stock.shipment.out,number:"
 msgid "Number"
-msgstr ""
+msgstr "Número"
 
 msgctxt "field:stock.shipment.out,origins:"
 msgid "Origins"
@@ -1043,7 +1040,7 @@ msgstr "Moviments"
 
 msgctxt "field:stock.shipment.out.return,number:"
 msgid "Number"
-msgstr ""
+msgstr "Número"
 
 msgctxt "field:stock.shipment.out.return,origins:"
 msgid "Origins"
@@ -1354,7 +1351,6 @@ msgctxt ""
 msgid "Received"
 msgstr "Rebut"
 
-#, fuzzy
 msgctxt "model:ir.sequence,name:sequence_inventory"
 msgid "Inventory"
 msgstr "Inventari"
@@ -1379,7 +1375,6 @@ msgctxt "model:ir.sequence,name:sequence_shipment_out_return"
 msgid "Customer Return Shipment"
 msgstr "Albarà devolució client"
 
-#, fuzzy
 msgctxt "model:ir.sequence.type,name:sequence_type_inventory"
 msgid "Inventory"
 msgstr "Inventari"
@@ -1582,7 +1577,7 @@ msgstr "/"
 
 msgctxt "report:stock.shipment.in.restocking_list:"
 msgid ":"
-msgstr ""
+msgstr ":"
 
 msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "From Location"
@@ -1608,10 +1603,9 @@ msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Restocking List"
 msgstr "Llista de proveïment"
 
-#, fuzzy
 msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Shipment Number"
-msgstr "Número d'albarà:"
+msgstr "Número d'albarà"
 
 msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Supplier:"
@@ -1631,7 +1625,7 @@ msgstr "/"
 
 msgctxt "report:stock.shipment.internal.report:"
 msgid ":"
-msgstr ""
+msgstr ":"
 
 msgctxt "report:stock.shipment.internal.report:"
 msgid "From Location"
@@ -1661,10 +1655,9 @@ msgctxt "report:stock.shipment.internal.report:"
 msgid "Reference:"
 msgstr "Referència:"
 
-#, fuzzy
 msgctxt "report:stock.shipment.internal.report:"
 msgid "Shipment Number"
-msgstr "Número d'albarà:"
+msgstr "Número d'albarà"
 
 msgctxt "report:stock.shipment.internal.report:"
 msgid "To Location"
@@ -1712,7 +1705,7 @@ msgstr "/"
 
 msgctxt "report:stock.shipment.out.picking_list:"
 msgid ":"
-msgstr ""
+msgstr ":"
 
 msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Customer:"
@@ -1742,10 +1735,9 @@ msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Reference:"
 msgstr "Referència:"
 
-#, fuzzy
 msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Shipment Number"
-msgstr "Número d'albarà:"
+msgstr "Número d'albarà"
 
 msgctxt "report:stock.shipment.out.picking_list:"
 msgid "To Location"
@@ -1773,7 +1765,7 @@ msgstr "D'ubicació"
 
 msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Number"
-msgstr ""
+msgstr "Número"
 
 msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Planned Date:"
@@ -1795,10 +1787,9 @@ msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Restocking List"
 msgstr "Llista de proveïment"
 
-#, fuzzy
 msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Shipment"
-msgstr "Enviaments"
+msgstr "Albarà"
 
 msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "To Location"
@@ -1992,15 +1983,13 @@ msgctxt "view:product.product:"
 msgid "Products"
 msgstr "Productes"
 
-#, fuzzy
 msgctxt "view:stock.configuration:"
 msgid "Inventory"
 msgstr "Inventari"
 
-#, fuzzy
 msgctxt "view:stock.configuration:"
 msgid "Shipments"
-msgstr "Enviaments"
+msgstr "Albarans"
 
 msgctxt "view:stock.configuration:"
 msgid "Stock Configuration"
@@ -2056,7 +2045,7 @@ msgstr "Cancel·la"
 
 msgctxt "view:stock.move:"
 msgid "Do"
-msgstr ""
+msgstr "Finalitza"
 
 msgctxt "view:stock.move:"
 msgid "Move"
diff --git a/locale/cs_CZ.po b/locale/cs_CZ.po
index 9265f16..e5e2438 100644
--- a/locale/cs_CZ.po
+++ b/locale/cs_CZ.po
@@ -1539,13 +1539,15 @@ msgctxt "model:stock.shipment.out.return,name:"
 msgid "Customer Return Shipment"
 msgstr ""
 
+#, fuzzy
 msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "/"
-msgstr ""
+msgstr "/"
 
+#, fuzzy
 msgctxt "report:stock.shipment.in.restocking_list:"
 msgid ":"
-msgstr ""
+msgstr ":"
 
 msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "From Location"
@@ -1587,13 +1589,15 @@ msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Warehouse:"
 msgstr ""
 
+#, fuzzy
 msgctxt "report:stock.shipment.internal.report:"
 msgid "/"
-msgstr ""
+msgstr "/"
 
+#, fuzzy
 msgctxt "report:stock.shipment.internal.report:"
 msgid ":"
-msgstr ""
+msgstr ":"
 
 msgctxt "report:stock.shipment.internal.report:"
 msgid "From Location"
@@ -1635,9 +1639,10 @@ msgctxt "report:stock.shipment.internal.report:"
 msgid "To Location:"
 msgstr ""
 
+#, fuzzy
 msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "/"
-msgstr ""
+msgstr "/"
 
 msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Customer Code:"
@@ -1667,13 +1672,15 @@ msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Shipment Number:"
 msgstr ""
 
+#, fuzzy
 msgctxt "report:stock.shipment.out.picking_list:"
 msgid "/"
-msgstr ""
+msgstr "/"
 
+#, fuzzy
 msgctxt "report:stock.shipment.out.picking_list:"
 msgid ":"
-msgstr ""
+msgstr ":"
 
 msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Customer:"
@@ -1715,13 +1722,15 @@ msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Warehouse:"
 msgstr ""
 
+#, fuzzy
 msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "/"
-msgstr ""
+msgstr "/"
 
+#, fuzzy
 msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid ":"
-msgstr ""
+msgstr ":"
 
 msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Customer"
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 9355f24..cb986b7 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -216,7 +216,7 @@ msgstr "ID"
 
 msgctxt "field:stock.configuration,inventory_sequence:"
 msgid "Inventory Sequence"
-msgstr ""
+msgstr "Nummernkreis Bestandskorrektur"
 
 msgctxt "field:stock.configuration,rec_name:"
 msgid "Name"
@@ -284,7 +284,7 @@ msgstr "Inventurdifferenz"
 
 msgctxt "field:stock.inventory,number:"
 msgid "Number"
-msgstr ""
+msgstr "Nummer"
 
 msgctxt "field:stock.inventory,rec_name:"
 msgid "Name"
@@ -434,7 +434,6 @@ msgctxt "field:stock.location,type:"
 msgid "Location type"
 msgstr "Lagertyp"
 
-#, fuzzy
 msgctxt "field:stock.location,warehouse:"
 msgid "Warehouse"
 msgstr "Warenlager"
@@ -449,7 +448,7 @@ msgstr "Letzte Änderung durch"
 
 msgctxt "field:stock.move,assignation_required:"
 msgid "Assignation Required"
-msgstr ""
+msgstr "Zuweisung erforderlich"
 
 msgctxt "field:stock.move,company:"
 msgid "Company"
@@ -713,7 +712,7 @@ msgstr "Bewegungen"
 
 msgctxt "field:stock.shipment.in,number:"
 msgid "Numer"
-msgstr ""
+msgstr "Nummer"
 
 msgctxt "field:stock.shipment.in,origins:"
 msgid "Origins"
@@ -775,7 +774,6 @@ msgctxt "field:stock.shipment.in.return,create_uid:"
 msgid "Create User"
 msgstr "Erstellt durch"
 
-#, fuzzy
 msgctxt "field:stock.shipment.in.return,delivery_address:"
 msgid "Delivery Address"
 msgstr "Lieferadresse"
@@ -798,7 +796,7 @@ msgstr "Bewegungen"
 
 msgctxt "field:stock.shipment.in.return,number:"
 msgid "Number"
-msgstr ""
+msgstr "Nummer"
 
 msgctxt "field:stock.shipment.in.return,origins:"
 msgid "Origins"
@@ -820,7 +818,6 @@ msgctxt "field:stock.shipment.in.return,state:"
 msgid "State"
 msgstr "Status"
 
-#, fuzzy
 msgctxt "field:stock.shipment.in.return,supplier:"
 msgid "Supplier"
 msgstr "Lieferant"
@@ -875,7 +872,7 @@ msgstr "Bewegungen"
 
 msgctxt "field:stock.shipment.internal,number:"
 msgid "Number"
-msgstr ""
+msgstr "Nummer"
 
 msgctxt "field:stock.shipment.internal,planned_date:"
 msgid "Planned Date"
@@ -955,7 +952,7 @@ msgstr "Bewegungen"
 
 msgctxt "field:stock.shipment.out,number:"
 msgid "Number"
-msgstr ""
+msgstr "Nummer"
 
 msgctxt "field:stock.shipment.out,origins:"
 msgid "Origins"
@@ -1055,7 +1052,7 @@ msgstr "Bewegungen"
 
 msgctxt "field:stock.shipment.out.return,number:"
 msgid "Number"
-msgstr ""
+msgstr "Nummer"
 
 msgctxt "field:stock.shipment.out.return,origins:"
 msgid "Origins"
@@ -1364,10 +1361,9 @@ msgctxt ""
 msgid "Received"
 msgstr "Erhalten"
 
-#, fuzzy
 msgctxt "model:ir.sequence,name:sequence_inventory"
 msgid "Inventory"
-msgstr "Lagerbestand"
+msgstr "Bestandskorrektur"
 
 msgctxt "model:ir.sequence,name:sequence_shipment_in"
 msgid "Supplier Shipment"
@@ -1389,10 +1385,9 @@ msgctxt "model:ir.sequence,name:sequence_shipment_out_return"
 msgid "Customer Return Shipment"
 msgstr "Warenrücknahme Kunde"
 
-#, fuzzy
 msgctxt "model:ir.sequence.type,name:sequence_type_inventory"
 msgid "Inventory"
-msgstr "Lagerbestand"
+msgstr "Bestandskorrektur"
 
 msgctxt "model:ir.sequence.type,name:sequence_type_shipment_in"
 msgid "Supplier Shipment"
@@ -1556,7 +1551,7 @@ msgstr "Varianten nach Lagerorten"
 
 msgctxt "model:stock.shipment.in,name:"
 msgid "Supplier Shipment"
-msgstr "Lieferant Lieferposten"
+msgstr "Lieferposten Lieferant"
 
 msgctxt "model:stock.shipment.in.return,name:"
 msgid "Supplier Return Shipment"
@@ -1592,7 +1587,7 @@ msgstr "/"
 
 msgctxt "report:stock.shipment.in.restocking_list:"
 msgid ":"
-msgstr ""
+msgstr ":"
 
 msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "From Location"
@@ -1618,10 +1613,9 @@ msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Restocking List"
 msgstr "Einlagerungsliste"
 
-#, fuzzy
 msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Shipment Number"
-msgstr "Lieferposten Nr.:"
+msgstr "Lieferposten Nr."
 
 msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Supplier:"
@@ -1641,7 +1635,7 @@ msgstr "/"
 
 msgctxt "report:stock.shipment.internal.report:"
 msgid ":"
-msgstr ""
+msgstr ":"
 
 msgctxt "report:stock.shipment.internal.report:"
 msgid "From Location"
@@ -1671,10 +1665,9 @@ msgctxt "report:stock.shipment.internal.report:"
 msgid "Reference:"
 msgstr "Beleg-Nr.:"
 
-#, fuzzy
 msgctxt "report:stock.shipment.internal.report:"
 msgid "Shipment Number"
-msgstr "Lieferposten Nr.:"
+msgstr "Lieferposten Nr."
 
 msgctxt "report:stock.shipment.internal.report:"
 msgid "To Location"
@@ -1722,7 +1715,7 @@ msgstr "/"
 
 msgctxt "report:stock.shipment.out.picking_list:"
 msgid ":"
-msgstr ""
+msgstr ":"
 
 msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Customer:"
@@ -1752,10 +1745,9 @@ msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Reference:"
 msgstr "Beleg-Nr.:"
 
-#, fuzzy
 msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Shipment Number"
-msgstr "Lieferposten Nr.:"
+msgstr "Lieferposten Nr."
 
 msgctxt "report:stock.shipment.out.picking_list:"
 msgid "To Location"
@@ -1783,7 +1775,7 @@ msgstr "Von Lagerort"
 
 msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Number"
-msgstr ""
+msgstr "Nummer"
 
 msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Planned Date:"
@@ -1805,7 +1797,6 @@ msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Restocking List"
 msgstr "Einlagerungsliste"
 
-#, fuzzy
 msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Shipment"
 msgstr "Lieferposten"
@@ -2002,12 +1993,10 @@ msgctxt "view:product.product:"
 msgid "Products"
 msgstr "Varianten"
 
-#, fuzzy
 msgctxt "view:stock.configuration:"
 msgid "Inventory"
 msgstr "Lagerbestand"
 
-#, fuzzy
 msgctxt "view:stock.configuration:"
 msgid "Shipments"
 msgstr "Lieferposten"
@@ -2066,7 +2055,7 @@ msgstr "Annullieren"
 
 msgctxt "view:stock.move:"
 msgid "Do"
-msgstr ""
+msgstr "Durchführen"
 
 msgctxt "view:stock.move:"
 msgid "Move"
diff --git a/locale/es_AR.po b/locale/es_AR.po
index 0e8a8b5..878a7bc 100644
--- a/locale/es_AR.po
+++ b/locale/es_AR.po
@@ -203,7 +203,7 @@ msgstr "ID"
 
 msgctxt "field:stock.configuration,inventory_sequence:"
 msgid "Inventory Sequence"
-msgstr ""
+msgstr "Secuencia de inventario"
 
 msgctxt "field:stock.configuration,rec_name:"
 msgid "Name"
@@ -271,7 +271,7 @@ msgstr "Perdido y encontrado"
 
 msgctxt "field:stock.inventory,number:"
 msgid "Number"
-msgstr ""
+msgstr "Número"
 
 msgctxt "field:stock.inventory,rec_name:"
 msgid "Name"
@@ -421,7 +421,6 @@ msgctxt "field:stock.location,type:"
 msgid "Location type"
 msgstr "Tipo de ubicación"
 
-#, fuzzy
 msgctxt "field:stock.location,warehouse:"
 msgid "Warehouse"
 msgstr "Almacén"
@@ -436,7 +435,7 @@ msgstr "Usuario modificación"
 
 msgctxt "field:stock.move,assignation_required:"
 msgid "Assignation Required"
-msgstr ""
+msgstr "Asignación requerida"
 
 msgctxt "field:stock.move,company:"
 msgid "Company"
@@ -700,7 +699,7 @@ msgstr "Movimientos"
 
 msgctxt "field:stock.shipment.in,number:"
 msgid "Numer"
-msgstr ""
+msgstr "Número"
 
 msgctxt "field:stock.shipment.in,origins:"
 msgid "Origins"
@@ -762,7 +761,6 @@ msgctxt "field:stock.shipment.in.return,create_uid:"
 msgid "Create User"
 msgstr "Usuario creación"
 
-#, fuzzy
 msgctxt "field:stock.shipment.in.return,delivery_address:"
 msgid "Delivery Address"
 msgstr "Dirección de envío"
@@ -785,7 +783,7 @@ msgstr "Movimientos"
 
 msgctxt "field:stock.shipment.in.return,number:"
 msgid "Number"
-msgstr ""
+msgstr "Número"
 
 msgctxt "field:stock.shipment.in.return,origins:"
 msgid "Origins"
@@ -807,7 +805,6 @@ msgctxt "field:stock.shipment.in.return,state:"
 msgid "State"
 msgstr "Estado"
 
-#, fuzzy
 msgctxt "field:stock.shipment.in.return,supplier:"
 msgid "Supplier"
 msgstr "Proveedor"
@@ -862,7 +859,7 @@ msgstr "Movimientos"
 
 msgctxt "field:stock.shipment.internal,number:"
 msgid "Number"
-msgstr ""
+msgstr "Número"
 
 msgctxt "field:stock.shipment.internal,planned_date:"
 msgid "Planned Date"
@@ -942,7 +939,7 @@ msgstr "Movimientos"
 
 msgctxt "field:stock.shipment.out,number:"
 msgid "Number"
-msgstr ""
+msgstr "Número"
 
 msgctxt "field:stock.shipment.out,origins:"
 msgid "Origins"
@@ -1042,7 +1039,7 @@ msgstr "Movimientos"
 
 msgctxt "field:stock.shipment.out.return,number:"
 msgid "Number"
-msgstr ""
+msgstr "Número"
 
 msgctxt "field:stock.shipment.out.return,origins:"
 msgid "Origins"
@@ -1354,7 +1351,6 @@ msgctxt ""
 msgid "Received"
 msgstr "Recibido"
 
-#, fuzzy
 msgctxt "model:ir.sequence,name:sequence_inventory"
 msgid "Inventory"
 msgstr "Inventario"
@@ -1379,7 +1375,6 @@ msgctxt "model:ir.sequence,name:sequence_shipment_out_return"
 msgid "Customer Return Shipment"
 msgstr "Remito de devolución de cliente"
 
-#, fuzzy
 msgctxt "model:ir.sequence.type,name:sequence_type_inventory"
 msgid "Inventory"
 msgstr "Inventario"
@@ -1582,7 +1577,7 @@ msgstr "/"
 
 msgctxt "report:stock.shipment.in.restocking_list:"
 msgid ":"
-msgstr ""
+msgstr ":"
 
 msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "From Location"
@@ -1608,10 +1603,9 @@ msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Restocking List"
 msgstr "Lista reabastecimiento"
 
-#, fuzzy
 msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Shipment Number"
-msgstr "Número de Remito:"
+msgstr "Número de Remito"
 
 msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Supplier:"
@@ -1631,7 +1625,7 @@ msgstr "/"
 
 msgctxt "report:stock.shipment.internal.report:"
 msgid ":"
-msgstr ""
+msgstr ":"
 
 msgctxt "report:stock.shipment.internal.report:"
 msgid "From Location"
@@ -1661,10 +1655,9 @@ msgctxt "report:stock.shipment.internal.report:"
 msgid "Reference:"
 msgstr "Referencia:"
 
-#, fuzzy
 msgctxt "report:stock.shipment.internal.report:"
 msgid "Shipment Number"
-msgstr "Número de Remito:"
+msgstr "Número de Remito"
 
 msgctxt "report:stock.shipment.internal.report:"
 msgid "To Location"
@@ -1704,7 +1697,7 @@ msgstr "Referencia:"
 
 msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Shipment Number:"
-msgstr "Número de Remito:"
+msgstr "Número de Remito"
 
 msgctxt "report:stock.shipment.out.picking_list:"
 msgid "/"
@@ -1712,7 +1705,7 @@ msgstr "/"
 
 msgctxt "report:stock.shipment.out.picking_list:"
 msgid ":"
-msgstr ""
+msgstr ":"
 
 msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Customer:"
@@ -1742,10 +1735,9 @@ msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Reference:"
 msgstr "Referencia:"
 
-#, fuzzy
 msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Shipment Number"
-msgstr "Número de Remito:"
+msgstr "Número de Remito"
 
 msgctxt "report:stock.shipment.out.picking_list:"
 msgid "To Location"
@@ -1773,7 +1765,7 @@ msgstr "De ubicación"
 
 msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Number"
-msgstr ""
+msgstr "Número"
 
 msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Planned Date:"
@@ -1795,7 +1787,6 @@ msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Restocking List"
 msgstr "Lista reabastecimiento"
 
-#, fuzzy
 msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Shipment"
 msgstr "Remito"
@@ -1992,15 +1983,13 @@ msgctxt "view:product.product:"
 msgid "Products"
 msgstr "Productos"
 
-#, fuzzy
 msgctxt "view:stock.configuration:"
 msgid "Inventory"
 msgstr "Inventario"
 
-#, fuzzy
 msgctxt "view:stock.configuration:"
 msgid "Shipments"
-msgstr "Remito"
+msgstr "Remitos"
 
 msgctxt "view:stock.configuration:"
 msgid "Stock Configuration"
@@ -2056,7 +2045,7 @@ msgstr "Cancelar"
 
 msgctxt "view:stock.move:"
 msgid "Do"
-msgstr ""
+msgstr "Realizar"
 
 msgctxt "view:stock.move:"
 msgid "Move"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index e9336fa..fe70122 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -205,7 +205,7 @@ msgstr "ID"
 
 msgctxt "field:stock.configuration,inventory_sequence:"
 msgid "Inventory Sequence"
-msgstr ""
+msgstr "Secuencia de Inventario"
 
 msgctxt "field:stock.configuration,rec_name:"
 msgid "Name"
@@ -273,7 +273,7 @@ msgstr "Perdido y Encontrado"
 
 msgctxt "field:stock.inventory,number:"
 msgid "Number"
-msgstr ""
+msgstr "Número"
 
 msgctxt "field:stock.inventory,rec_name:"
 msgid "Name"
@@ -401,7 +401,7 @@ msgstr "Padre"
 
 msgctxt "field:stock.location,picking_location:"
 msgid "Picking"
-msgstr ""
+msgstr "Recolección"
 
 msgctxt "field:stock.location,quantity:"
 msgid "Quantity"
@@ -423,7 +423,6 @@ msgctxt "field:stock.location,type:"
 msgid "Location type"
 msgstr "Tipo de Bodega"
 
-#, fuzzy
 msgctxt "field:stock.location,warehouse:"
 msgid "Warehouse"
 msgstr "Almacén"
@@ -438,7 +437,7 @@ msgstr "Modificado por Usuario"
 
 msgctxt "field:stock.move,assignation_required:"
 msgid "Assignation Required"
-msgstr ""
+msgstr "Asignación Requerida"
 
 msgctxt "field:stock.move,company:"
 msgid "Company"
@@ -702,7 +701,7 @@ msgstr "Movimientos"
 
 msgctxt "field:stock.shipment.in,number:"
 msgid "Numer"
-msgstr ""
+msgstr "Número"
 
 msgctxt "field:stock.shipment.in,origins:"
 msgid "Origins"
@@ -764,7 +763,6 @@ msgctxt "field:stock.shipment.in.return,create_uid:"
 msgid "Create User"
 msgstr "Creado por Usuario"
 
-#, fuzzy
 msgctxt "field:stock.shipment.in.return,delivery_address:"
 msgid "Delivery Address"
 msgstr "Dirección de Envío"
@@ -787,7 +785,7 @@ msgstr "Movimientos"
 
 msgctxt "field:stock.shipment.in.return,number:"
 msgid "Number"
-msgstr ""
+msgstr "Número"
 
 msgctxt "field:stock.shipment.in.return,origins:"
 msgid "Origins"
@@ -809,7 +807,6 @@ msgctxt "field:stock.shipment.in.return,state:"
 msgid "State"
 msgstr "Estado"
 
-#, fuzzy
 msgctxt "field:stock.shipment.in.return,supplier:"
 msgid "Supplier"
 msgstr "Proveedor"
@@ -864,7 +861,7 @@ msgstr "Movimientos"
 
 msgctxt "field:stock.shipment.internal,number:"
 msgid "Number"
-msgstr ""
+msgstr "Número"
 
 msgctxt "field:stock.shipment.internal,planned_date:"
 msgid "Planned Date"
@@ -944,7 +941,7 @@ msgstr "Movimientos"
 
 msgctxt "field:stock.shipment.out,number:"
 msgid "Number"
-msgstr ""
+msgstr "Número"
 
 msgctxt "field:stock.shipment.out,origins:"
 msgid "Origins"
@@ -1044,7 +1041,7 @@ msgstr "Movimientos"
 
 msgctxt "field:stock.shipment.out.return,number:"
 msgid "Number"
-msgstr ""
+msgstr "Número"
 
 msgctxt "field:stock.shipment.out.return,origins:"
 msgid "Origins"
@@ -1107,7 +1104,7 @@ msgstr ""
 
 msgctxt "help:stock.location,picking_location:"
 msgid "If empty the Storage is used"
-msgstr ""
+msgstr "Si se deja vacío la Zona de Almacenamiento es usada"
 
 msgctxt "help:stock.products_by_locations.start,forecast_date:"
 msgid ""
@@ -1217,7 +1214,7 @@ msgstr "Productos por Bodegas"
 
 msgctxt "model:ir.action,name:wizard_recompute_cost_price"
 msgid "Recompute Cost Price"
-msgstr ""
+msgstr "Recalcular el Costo"
 
 msgctxt "model:ir.action,name:wizard_shipment_in_return_assign"
 msgid "Assign Purchase Return Shipment"
@@ -1354,7 +1351,6 @@ msgctxt ""
 msgid "Received"
 msgstr "Recibido"
 
-#, fuzzy
 msgctxt "model:ir.sequence,name:sequence_inventory"
 msgid "Inventory"
 msgstr "Inventario"
@@ -1379,7 +1375,6 @@ msgctxt "model:ir.sequence,name:sequence_shipment_out_return"
 msgid "Customer Return Shipment"
 msgstr "Devolución de Cliente"
 
-#, fuzzy
 msgctxt "model:ir.sequence.type,name:sequence_type_inventory"
 msgid "Inventory"
 msgstr "Inventario"
@@ -1582,7 +1577,7 @@ msgstr "/"
 
 msgctxt "report:stock.shipment.in.restocking_list:"
 msgid ":"
-msgstr ""
+msgstr ":"
 
 msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "From Location"
@@ -1608,10 +1603,9 @@ msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Restocking List"
 msgstr "Lista de renovación de existencias"
 
-#, fuzzy
 msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Shipment Number"
-msgstr "Número de Envío:"
+msgstr "Número de Envío"
 
 msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Supplier:"
@@ -1631,7 +1625,7 @@ msgstr "/"
 
 msgctxt "report:stock.shipment.internal.report:"
 msgid ":"
-msgstr ""
+msgstr ":"
 
 msgctxt "report:stock.shipment.internal.report:"
 msgid "From Location"
@@ -1661,10 +1655,9 @@ msgctxt "report:stock.shipment.internal.report:"
 msgid "Reference:"
 msgstr "Referencia:"
 
-#, fuzzy
 msgctxt "report:stock.shipment.internal.report:"
 msgid "Shipment Number"
-msgstr "Número de Envío:"
+msgstr "Número de Envío"
 
 msgctxt "report:stock.shipment.internal.report:"
 msgid "To Location"
@@ -1712,7 +1705,7 @@ msgstr "/"
 
 msgctxt "report:stock.shipment.out.picking_list:"
 msgid ":"
-msgstr ""
+msgstr ":"
 
 msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Customer:"
@@ -1742,10 +1735,9 @@ msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Reference:"
 msgstr "Referencia:"
 
-#, fuzzy
 msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Shipment Number"
-msgstr "Número de Envío:"
+msgstr "Número de Envío"
 
 msgctxt "report:stock.shipment.out.picking_list:"
 msgid "To Location"
@@ -1773,7 +1765,7 @@ msgstr "Desde Bodega"
 
 msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Number"
-msgstr ""
+msgstr "Número"
 
 msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Planned Date:"
@@ -1795,7 +1787,6 @@ msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Restocking List"
 msgstr "Lista de renovación de existencias"
 
-#, fuzzy
 msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Shipment"
 msgstr "Envío"
@@ -1826,7 +1817,7 @@ msgstr "Cliente"
 
 msgctxt "selection:stock.location,type:"
 msgid "Drop"
-msgstr ""
+msgstr "Entrega"
 
 msgctxt "selection:stock.location,type:"
 msgid "Lost and Found"
@@ -1992,15 +1983,13 @@ msgctxt "view:product.product:"
 msgid "Products"
 msgstr "Productos"
 
-#, fuzzy
 msgctxt "view:stock.configuration:"
 msgid "Inventory"
 msgstr "Inventario"
 
-#, fuzzy
 msgctxt "view:stock.configuration:"
 msgid "Shipments"
-msgstr "Envío"
+msgstr "Envíos"
 
 msgctxt "view:stock.configuration:"
 msgid "Stock Configuration"
@@ -2056,7 +2045,7 @@ msgstr "Cancelar"
 
 msgctxt "view:stock.move:"
 msgid "Do"
-msgstr ""
+msgstr "Hecho"
 
 msgctxt "view:stock.move:"
 msgid "Move"
diff --git a/locale/es_EC.po b/locale/es_EC.po
index a99aa4e..4226d1c 100644
--- a/locale/es_EC.po
+++ b/locale/es_EC.po
@@ -204,7 +204,7 @@ msgstr "ID"
 
 msgctxt "field:stock.configuration,inventory_sequence:"
 msgid "Inventory Sequence"
-msgstr ""
+msgstr "Secuencia de inventario"
 
 msgctxt "field:stock.configuration,rec_name:"
 msgid "Name"
@@ -272,7 +272,7 @@ msgstr "Perdido y encontrado"
 
 msgctxt "field:stock.inventory,number:"
 msgid "Number"
-msgstr ""
+msgstr "Número"
 
 msgctxt "field:stock.inventory,rec_name:"
 msgid "Name"
@@ -422,7 +422,6 @@ msgctxt "field:stock.location,type:"
 msgid "Location type"
 msgstr "Tipo de ubicación"
 
-#, fuzzy
 msgctxt "field:stock.location,warehouse:"
 msgid "Warehouse"
 msgstr "Bodega"
@@ -437,7 +436,7 @@ msgstr "Modificado por usuario"
 
 msgctxt "field:stock.move,assignation_required:"
 msgid "Assignation Required"
-msgstr ""
+msgstr "Asignación requerida"
 
 msgctxt "field:stock.move,company:"
 msgid "Company"
@@ -701,7 +700,7 @@ msgstr "Movimientos"
 
 msgctxt "field:stock.shipment.in,number:"
 msgid "Numer"
-msgstr ""
+msgstr "Número"
 
 msgctxt "field:stock.shipment.in,origins:"
 msgid "Origins"
@@ -763,7 +762,6 @@ msgctxt "field:stock.shipment.in.return,create_uid:"
 msgid "Create User"
 msgstr "Creado por usuario"
 
-#, fuzzy
 msgctxt "field:stock.shipment.in.return,delivery_address:"
 msgid "Delivery Address"
 msgstr "Dirección de entrega"
@@ -786,7 +784,7 @@ msgstr "Movimientos"
 
 msgctxt "field:stock.shipment.in.return,number:"
 msgid "Number"
-msgstr ""
+msgstr "Número"
 
 msgctxt "field:stock.shipment.in.return,origins:"
 msgid "Origins"
@@ -808,7 +806,6 @@ msgctxt "field:stock.shipment.in.return,state:"
 msgid "State"
 msgstr "Estado"
 
-#, fuzzy
 msgctxt "field:stock.shipment.in.return,supplier:"
 msgid "Supplier"
 msgstr "Proveedor"
@@ -863,7 +860,7 @@ msgstr "Movimientos"
 
 msgctxt "field:stock.shipment.internal,number:"
 msgid "Number"
-msgstr ""
+msgstr "Número"
 
 msgctxt "field:stock.shipment.internal,planned_date:"
 msgid "Planned Date"
@@ -943,7 +940,7 @@ msgstr "Movimientos"
 
 msgctxt "field:stock.shipment.out,number:"
 msgid "Number"
-msgstr ""
+msgstr "Número"
 
 msgctxt "field:stock.shipment.out,origins:"
 msgid "Origins"
@@ -1043,7 +1040,7 @@ msgstr "Movimientos"
 
 msgctxt "field:stock.shipment.out.return,number:"
 msgid "Number"
-msgstr ""
+msgstr "Número"
 
 msgctxt "field:stock.shipment.out.return,origins:"
 msgid "Origins"
@@ -1354,7 +1351,6 @@ msgctxt ""
 msgid "Received"
 msgstr "Recibido"
 
-#, fuzzy
 msgctxt "model:ir.sequence,name:sequence_inventory"
 msgid "Inventory"
 msgstr "Inventario"
@@ -1379,7 +1375,6 @@ msgctxt "model:ir.sequence,name:sequence_shipment_out_return"
 msgid "Customer Return Shipment"
 msgstr "Guía de remisión de devolución de cliente"
 
-#, fuzzy
 msgctxt "model:ir.sequence.type,name:sequence_type_inventory"
 msgid "Inventory"
 msgstr "Inventario"
@@ -1582,7 +1577,7 @@ msgstr "/"
 
 msgctxt "report:stock.shipment.in.restocking_list:"
 msgid ":"
-msgstr ""
+msgstr ":"
 
 msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "From Location"
@@ -1608,10 +1603,9 @@ msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Restocking List"
 msgstr "Lista de reabastecimiento"
 
-#, fuzzy
 msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Shipment Number"
-msgstr "Número de guía de remisión:"
+msgstr "Número de guía de remisión"
 
 msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Supplier:"
@@ -1631,7 +1625,7 @@ msgstr "/"
 
 msgctxt "report:stock.shipment.internal.report:"
 msgid ":"
-msgstr ""
+msgstr ":"
 
 msgctxt "report:stock.shipment.internal.report:"
 msgid "From Location"
@@ -1661,10 +1655,9 @@ msgctxt "report:stock.shipment.internal.report:"
 msgid "Reference:"
 msgstr "Referencia:"
 
-#, fuzzy
 msgctxt "report:stock.shipment.internal.report:"
 msgid "Shipment Number"
-msgstr "Número de guía de remisión:"
+msgstr "Número de guía de remisión"
 
 msgctxt "report:stock.shipment.internal.report:"
 msgid "To Location"
@@ -1712,7 +1705,7 @@ msgstr "/"
 
 msgctxt "report:stock.shipment.out.picking_list:"
 msgid ":"
-msgstr ""
+msgstr ":"
 
 msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Customer:"
@@ -1742,10 +1735,9 @@ msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Reference:"
 msgstr "Referencia:"
 
-#, fuzzy
 msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Shipment Number"
-msgstr "Número de guía de remisión:"
+msgstr "Número de guía de remisión"
 
 msgctxt "report:stock.shipment.out.picking_list:"
 msgid "To Location"
@@ -1773,7 +1765,7 @@ msgstr "Desde ubicación"
 
 msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Number"
-msgstr ""
+msgstr "Número"
 
 msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Planned Date:"
@@ -1795,7 +1787,6 @@ msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Restocking List"
 msgstr "Lista de reabastecimiento"
 
-#, fuzzy
 msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Shipment"
 msgstr "Envío"
@@ -1992,15 +1983,13 @@ msgctxt "view:product.product:"
 msgid "Products"
 msgstr "Productos"
 
-#, fuzzy
 msgctxt "view:stock.configuration:"
 msgid "Inventory"
 msgstr "Inventario"
 
-#, fuzzy
 msgctxt "view:stock.configuration:"
 msgid "Shipments"
-msgstr "Envío"
+msgstr "Guías de remisión"
 
 msgctxt "view:stock.configuration:"
 msgid "Stock Configuration"
@@ -2056,7 +2045,7 @@ msgstr "Cancelar"
 
 msgctxt "view:stock.move:"
 msgid "Do"
-msgstr ""
+msgstr "Realizar"
 
 msgctxt "view:stock.move:"
 msgid "Move"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index 3e37bfe..1dc4f2d 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -197,7 +197,7 @@ msgstr "ID"
 
 msgctxt "field:stock.configuration,inventory_sequence:"
 msgid "Inventory Sequence"
-msgstr ""
+msgstr "Secuencia de inventario"
 
 msgctxt "field:stock.configuration,rec_name:"
 msgid "Name"
@@ -265,7 +265,7 @@ msgstr "Perdido-encontrado"
 
 msgctxt "field:stock.inventory,number:"
 msgid "Number"
-msgstr ""
+msgstr "Número"
 
 msgctxt "field:stock.inventory,rec_name:"
 msgid "Name"
@@ -415,7 +415,6 @@ msgctxt "field:stock.location,type:"
 msgid "Location type"
 msgstr "Tipo de ubicación"
 
-#, fuzzy
 msgctxt "field:stock.location,warehouse:"
 msgid "Warehouse"
 msgstr "Almacén"
@@ -430,7 +429,7 @@ msgstr "Usuario modificación"
 
 msgctxt "field:stock.move,assignation_required:"
 msgid "Assignation Required"
-msgstr ""
+msgstr "Reserva obligatoria"
 
 msgctxt "field:stock.move,company:"
 msgid "Company"
@@ -494,7 +493,7 @@ msgstr "Nombre"
 
 msgctxt "field:stock.move,shipment:"
 msgid "Shipment"
-msgstr "Envío"
+msgstr "Albarán"
 
 msgctxt "field:stock.move,state:"
 msgid "State"
@@ -694,7 +693,7 @@ msgstr "Movimientos"
 
 msgctxt "field:stock.shipment.in,number:"
 msgid "Numer"
-msgstr ""
+msgstr "Número"
 
 msgctxt "field:stock.shipment.in,origins:"
 msgid "Origins"
@@ -756,7 +755,6 @@ msgctxt "field:stock.shipment.in.return,create_uid:"
 msgid "Create User"
 msgstr "Usuario creación"
 
-#, fuzzy
 msgctxt "field:stock.shipment.in.return,delivery_address:"
 msgid "Delivery Address"
 msgstr "Dirección de envío"
@@ -779,7 +777,7 @@ msgstr "Movimientos"
 
 msgctxt "field:stock.shipment.in.return,number:"
 msgid "Number"
-msgstr ""
+msgstr "Número"
 
 msgctxt "field:stock.shipment.in.return,origins:"
 msgid "Origins"
@@ -801,7 +799,6 @@ msgctxt "field:stock.shipment.in.return,state:"
 msgid "State"
 msgstr "Estado"
 
-#, fuzzy
 msgctxt "field:stock.shipment.in.return,supplier:"
 msgid "Supplier"
 msgstr "Proveedor"
@@ -856,7 +853,7 @@ msgstr "Movimientos"
 
 msgctxt "field:stock.shipment.internal,number:"
 msgid "Number"
-msgstr ""
+msgstr "Número"
 
 msgctxt "field:stock.shipment.internal,planned_date:"
 msgid "Planned Date"
@@ -936,7 +933,7 @@ msgstr "Movimientos"
 
 msgctxt "field:stock.shipment.out,number:"
 msgid "Number"
-msgstr ""
+msgstr "Número"
 
 msgctxt "field:stock.shipment.out,origins:"
 msgid "Origins"
@@ -1036,7 +1033,7 @@ msgstr "Movimientos"
 
 msgctxt "field:stock.shipment.out.return,number:"
 msgid "Number"
-msgstr ""
+msgstr "Número"
 
 msgctxt "field:stock.shipment.out.return,origins:"
 msgid "Origins"
@@ -1170,7 +1167,7 @@ msgstr "Albaranes proveedor"
 
 msgctxt "model:ir.action,name:act_shipment_out_return_form"
 msgid "Customer Return Shipments"
-msgstr "Albaranes devolución cliente "
+msgstr "Albaranes devolución cliente"
 
 msgctxt "model:ir.action,name:act_stock_configuration_form"
 msgid "Stock Configuration"
@@ -1347,7 +1344,6 @@ msgctxt ""
 msgid "Received"
 msgstr "Recibido"
 
-#, fuzzy
 msgctxt "model:ir.sequence,name:sequence_inventory"
 msgid "Inventory"
 msgstr "Inventario"
@@ -1372,7 +1368,6 @@ msgctxt "model:ir.sequence,name:sequence_shipment_out_return"
 msgid "Customer Return Shipment"
 msgstr "Albarán devolución cliente"
 
-#, fuzzy
 msgctxt "model:ir.sequence.type,name:sequence_type_inventory"
 msgid "Inventory"
 msgstr "Inventario"
@@ -1575,7 +1570,7 @@ msgstr "/"
 
 msgctxt "report:stock.shipment.in.restocking_list:"
 msgid ":"
-msgstr ""
+msgstr ":"
 
 msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "From Location"
@@ -1601,10 +1596,9 @@ msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Restocking List"
 msgstr "Lista de reabastecimiento"
 
-#, fuzzy
 msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Shipment Number"
-msgstr "Número de albarán:"
+msgstr "Número de albarán"
 
 msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Supplier:"
@@ -1624,7 +1618,7 @@ msgstr "/"
 
 msgctxt "report:stock.shipment.internal.report:"
 msgid ":"
-msgstr ""
+msgstr ":"
 
 msgctxt "report:stock.shipment.internal.report:"
 msgid "From Location"
@@ -1654,10 +1648,9 @@ msgctxt "report:stock.shipment.internal.report:"
 msgid "Reference:"
 msgstr "Referencia:"
 
-#, fuzzy
 msgctxt "report:stock.shipment.internal.report:"
 msgid "Shipment Number"
-msgstr "Número de albarán:"
+msgstr "Número de albarán"
 
 msgctxt "report:stock.shipment.internal.report:"
 msgid "To Location"
@@ -1705,7 +1698,7 @@ msgstr "/"
 
 msgctxt "report:stock.shipment.out.picking_list:"
 msgid ":"
-msgstr ""
+msgstr ":"
 
 msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Customer:"
@@ -1735,10 +1728,9 @@ msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Reference:"
 msgstr "Referencia:"
 
-#, fuzzy
 msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Shipment Number"
-msgstr "Número de albarán:"
+msgstr "Número de albarán"
 
 msgctxt "report:stock.shipment.out.picking_list:"
 msgid "To Location"
@@ -1766,7 +1758,7 @@ msgstr "Desde ubicación"
 
 msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Number"
-msgstr ""
+msgstr "Número"
 
 msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Planned Date:"
@@ -1788,10 +1780,9 @@ msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Restocking List"
 msgstr "Lista de reabastecimiento"
 
-#, fuzzy
 msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Shipment"
-msgstr "Envío"
+msgstr "Albarán"
 
 msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "To Location"
@@ -1985,15 +1976,13 @@ msgctxt "view:product.product:"
 msgid "Products"
 msgstr "Productos"
 
-#, fuzzy
 msgctxt "view:stock.configuration:"
 msgid "Inventory"
 msgstr "Inventario"
 
-#, fuzzy
 msgctxt "view:stock.configuration:"
 msgid "Shipments"
-msgstr "Envío"
+msgstr "Albaranes"
 
 msgctxt "view:stock.configuration:"
 msgid "Stock Configuration"
@@ -2049,7 +2038,7 @@ msgstr "Cancelar"
 
 msgctxt "view:stock.move:"
 msgid "Do"
-msgstr ""
+msgstr "Finalizar"
 
 msgctxt "view:stock.move:"
 msgid "Move"
diff --git a/locale/es_MX.po b/locale/es_MX.po
index 6500f61..5946883 100644
--- a/locale/es_MX.po
+++ b/locale/es_MX.po
@@ -1571,13 +1571,15 @@ msgctxt "model:stock.shipment.out.return,name:"
 msgid "Customer Return Shipment"
 msgstr "Envío devolución cliente"
 
+#, fuzzy
 msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "/"
-msgstr ""
+msgstr "/"
 
+#, fuzzy
 msgctxt "report:stock.shipment.in.restocking_list:"
 msgid ":"
-msgstr ""
+msgstr ":"
 
 #, fuzzy
 msgctxt "report:stock.shipment.in.restocking_list:"
@@ -1628,13 +1630,15 @@ msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Warehouse:"
 msgstr "Almacén"
 
+#, fuzzy
 msgctxt "report:stock.shipment.internal.report:"
 msgid "/"
-msgstr ""
+msgstr "/"
 
+#, fuzzy
 msgctxt "report:stock.shipment.internal.report:"
 msgid ":"
-msgstr ""
+msgstr ":"
 
 #, fuzzy
 msgctxt "report:stock.shipment.internal.report:"
@@ -1685,9 +1689,10 @@ msgctxt "report:stock.shipment.internal.report:"
 msgid "To Location:"
 msgstr "A ubicación"
 
+#, fuzzy
 msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "/"
-msgstr ""
+msgstr "/"
 
 msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Customer Code:"
@@ -1722,13 +1727,15 @@ msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Shipment Number:"
 msgstr ""
 
+#, fuzzy
 msgctxt "report:stock.shipment.out.picking_list:"
 msgid "/"
-msgstr ""
+msgstr "/"
 
+#, fuzzy
 msgctxt "report:stock.shipment.out.picking_list:"
 msgid ":"
-msgstr ""
+msgstr ":"
 
 #, fuzzy
 msgctxt "report:stock.shipment.out.picking_list:"
@@ -1779,13 +1786,15 @@ msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Warehouse:"
 msgstr "Almacén"
 
+#, fuzzy
 msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "/"
-msgstr ""
+msgstr "/"
 
+#, fuzzy
 msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid ":"
-msgstr ""
+msgstr ":"
 
 #, fuzzy
 msgctxt "report:stock.shipment.out.return.restocking_list:"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index a02056f..7cd0b9c 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -208,7 +208,7 @@ msgstr "ID"
 
 msgctxt "field:stock.configuration,inventory_sequence:"
 msgid "Inventory Sequence"
-msgstr ""
+msgstr "Séquence d'inventaire"
 
 msgctxt "field:stock.configuration,rec_name:"
 msgid "Name"
@@ -276,7 +276,7 @@ msgstr "Pertes et surplus"
 
 msgctxt "field:stock.inventory,number:"
 msgid "Number"
-msgstr ""
+msgstr "Numéro"
 
 msgctxt "field:stock.inventory,rec_name:"
 msgid "Name"
@@ -426,7 +426,6 @@ msgctxt "field:stock.location,type:"
 msgid "Location type"
 msgstr "Type d'emplacement"
 
-#, fuzzy
 msgctxt "field:stock.location,warehouse:"
 msgid "Warehouse"
 msgstr "Entrepôt"
@@ -441,7 +440,7 @@ msgstr "Mis à jour par"
 
 msgctxt "field:stock.move,assignation_required:"
 msgid "Assignation Required"
-msgstr ""
+msgstr "Assignation requise"
 
 msgctxt "field:stock.move,company:"
 msgid "Company"
@@ -705,7 +704,7 @@ msgstr "Mouvements"
 
 msgctxt "field:stock.shipment.in,number:"
 msgid "Numer"
-msgstr ""
+msgstr "Numéro"
 
 msgctxt "field:stock.shipment.in,origins:"
 msgid "Origins"
@@ -767,7 +766,6 @@ msgctxt "field:stock.shipment.in.return,create_uid:"
 msgid "Create User"
 msgstr "Créé par"
 
-#, fuzzy
 msgctxt "field:stock.shipment.in.return,delivery_address:"
 msgid "Delivery Address"
 msgstr "Adresse de livraison"
@@ -790,7 +788,7 @@ msgstr "Mouvements"
 
 msgctxt "field:stock.shipment.in.return,number:"
 msgid "Number"
-msgstr ""
+msgstr "Numéro"
 
 msgctxt "field:stock.shipment.in.return,origins:"
 msgid "Origins"
@@ -812,7 +810,6 @@ msgctxt "field:stock.shipment.in.return,state:"
 msgid "State"
 msgstr "État"
 
-#, fuzzy
 msgctxt "field:stock.shipment.in.return,supplier:"
 msgid "Supplier"
 msgstr "Fournisseur"
@@ -867,7 +864,7 @@ msgstr "Mouvements"
 
 msgctxt "field:stock.shipment.internal,number:"
 msgid "Number"
-msgstr ""
+msgstr "Numéro"
 
 msgctxt "field:stock.shipment.internal,planned_date:"
 msgid "Planned Date"
@@ -947,7 +944,7 @@ msgstr "Mouvements"
 
 msgctxt "field:stock.shipment.out,number:"
 msgid "Number"
-msgstr ""
+msgstr "Numéro"
 
 msgctxt "field:stock.shipment.out,origins:"
 msgid "Origins"
@@ -1047,7 +1044,7 @@ msgstr "Mouvements"
 
 msgctxt "field:stock.shipment.out.return,number:"
 msgid "Number"
-msgstr ""
+msgstr "Numéro"
 
 msgctxt "field:stock.shipment.out.return,origins:"
 msgid "Origins"
@@ -1360,7 +1357,6 @@ msgctxt ""
 msgid "Received"
 msgstr "Reçu"
 
-#, fuzzy
 msgctxt "model:ir.sequence,name:sequence_inventory"
 msgid "Inventory"
 msgstr "Inventaire"
@@ -1385,7 +1381,6 @@ msgctxt "model:ir.sequence,name:sequence_shipment_out_return"
 msgid "Customer Return Shipment"
 msgstr "Retours d'expédition client"
 
-#, fuzzy
 msgctxt "model:ir.sequence.type,name:sequence_type_inventory"
 msgid "Inventory"
 msgstr "Inventaire"
@@ -1588,7 +1583,7 @@ msgstr "/"
 
 msgctxt "report:stock.shipment.in.restocking_list:"
 msgid ":"
-msgstr ""
+msgstr " :"
 
 msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "From Location"
@@ -1614,7 +1609,6 @@ msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Restocking List"
 msgstr "Liste de restockage"
 
-#, fuzzy
 msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Shipment Number"
 msgstr "Numéro d'expédition :"
@@ -1637,7 +1631,7 @@ msgstr "/"
 
 msgctxt "report:stock.shipment.internal.report:"
 msgid ":"
-msgstr ""
+msgstr " :"
 
 msgctxt "report:stock.shipment.internal.report:"
 msgid "From Location"
@@ -1667,7 +1661,6 @@ msgctxt "report:stock.shipment.internal.report:"
 msgid "Reference:"
 msgstr "Référence :"
 
-#, fuzzy
 msgctxt "report:stock.shipment.internal.report:"
 msgid "Shipment Number"
 msgstr "Numéro d'expédition :"
@@ -1718,7 +1711,7 @@ msgstr "/"
 
 msgctxt "report:stock.shipment.out.picking_list:"
 msgid ":"
-msgstr ""
+msgstr " :"
 
 msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Customer:"
@@ -1748,7 +1741,6 @@ msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Reference:"
 msgstr "Référence :"
 
-#, fuzzy
 msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Shipment Number"
 msgstr "Numéro d'expédition :"
@@ -1779,7 +1771,7 @@ msgstr "Emplacement d'origine"
 
 msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Number"
-msgstr ""
+msgstr "Numéro"
 
 msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Planned Date:"
@@ -1801,7 +1793,6 @@ msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Restocking List"
 msgstr "Liste de restockage"
 
-#, fuzzy
 msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Shipment"
 msgstr "Expédition"
@@ -1998,15 +1989,13 @@ msgctxt "view:product.product:"
 msgid "Products"
 msgstr "Produits"
 
-#, fuzzy
 msgctxt "view:stock.configuration:"
 msgid "Inventory"
 msgstr "Inventaire"
 
-#, fuzzy
 msgctxt "view:stock.configuration:"
 msgid "Shipments"
-msgstr "Expédition"
+msgstr "Expéditions"
 
 msgctxt "view:stock.configuration:"
 msgid "Stock Configuration"
@@ -2062,7 +2051,7 @@ msgstr "Annuler"
 
 msgctxt "view:stock.move:"
 msgid "Do"
-msgstr ""
+msgstr "Effectuer"
 
 msgctxt "view:stock.move:"
 msgid "Move"
diff --git a/locale/hu_HU.po b/locale/hu_HU.po
index baef5a8..31dda3e 100644
--- a/locale/hu_HU.po
+++ b/locale/hu_HU.po
@@ -1544,13 +1544,15 @@ msgctxt "model:stock.shipment.out.return,name:"
 msgid "Customer Return Shipment"
 msgstr ""
 
+#, fuzzy
 msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "/"
-msgstr ""
+msgstr "/"
 
+#, fuzzy
 msgctxt "report:stock.shipment.in.restocking_list:"
 msgid ":"
-msgstr ""
+msgstr ":"
 
 msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "From Location"
@@ -1592,13 +1594,15 @@ msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Warehouse:"
 msgstr ""
 
+#, fuzzy
 msgctxt "report:stock.shipment.internal.report:"
 msgid "/"
-msgstr ""
+msgstr "/"
 
+#, fuzzy
 msgctxt "report:stock.shipment.internal.report:"
 msgid ":"
-msgstr ""
+msgstr ":"
 
 msgctxt "report:stock.shipment.internal.report:"
 msgid "From Location"
@@ -1640,9 +1644,10 @@ msgctxt "report:stock.shipment.internal.report:"
 msgid "To Location:"
 msgstr ""
 
+#, fuzzy
 msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "/"
-msgstr ""
+msgstr "/"
 
 msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Customer Code:"
@@ -1672,13 +1677,15 @@ msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Shipment Number:"
 msgstr ""
 
+#, fuzzy
 msgctxt "report:stock.shipment.out.picking_list:"
 msgid "/"
-msgstr ""
+msgstr "/"
 
+#, fuzzy
 msgctxt "report:stock.shipment.out.picking_list:"
 msgid ":"
-msgstr ""
+msgstr ":"
 
 msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Customer:"
@@ -1720,13 +1727,15 @@ msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Warehouse:"
 msgstr ""
 
+#, fuzzy
 msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "/"
-msgstr ""
+msgstr "/"
 
+#, fuzzy
 msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid ":"
-msgstr ""
+msgstr ":"
 
 msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Customer"
diff --git a/locale/it_IT.po b/locale/it_IT.po
index 9265f16..e5e2438 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -1539,13 +1539,15 @@ msgctxt "model:stock.shipment.out.return,name:"
 msgid "Customer Return Shipment"
 msgstr ""
 
+#, fuzzy
 msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "/"
-msgstr ""
+msgstr "/"
 
+#, fuzzy
 msgctxt "report:stock.shipment.in.restocking_list:"
 msgid ":"
-msgstr ""
+msgstr ":"
 
 msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "From Location"
@@ -1587,13 +1589,15 @@ msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Warehouse:"
 msgstr ""
 
+#, fuzzy
 msgctxt "report:stock.shipment.internal.report:"
 msgid "/"
-msgstr ""
+msgstr "/"
 
+#, fuzzy
 msgctxt "report:stock.shipment.internal.report:"
 msgid ":"
-msgstr ""
+msgstr ":"
 
 msgctxt "report:stock.shipment.internal.report:"
 msgid "From Location"
@@ -1635,9 +1639,10 @@ msgctxt "report:stock.shipment.internal.report:"
 msgid "To Location:"
 msgstr ""
 
+#, fuzzy
 msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "/"
-msgstr ""
+msgstr "/"
 
 msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Customer Code:"
@@ -1667,13 +1672,15 @@ msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Shipment Number:"
 msgstr ""
 
+#, fuzzy
 msgctxt "report:stock.shipment.out.picking_list:"
 msgid "/"
-msgstr ""
+msgstr "/"
 
+#, fuzzy
 msgctxt "report:stock.shipment.out.picking_list:"
 msgid ":"
-msgstr ""
+msgstr ":"
 
 msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Customer:"
@@ -1715,13 +1722,15 @@ msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Warehouse:"
 msgstr ""
 
+#, fuzzy
 msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "/"
-msgstr ""
+msgstr "/"
 
+#, fuzzy
 msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid ":"
-msgstr ""
+msgstr ":"
 
 msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Customer"
diff --git a/locale/ja_JP.po b/locale/ja_JP.po
index 9265f16..e5e2438 100644
--- a/locale/ja_JP.po
+++ b/locale/ja_JP.po
@@ -1539,13 +1539,15 @@ msgctxt "model:stock.shipment.out.return,name:"
 msgid "Customer Return Shipment"
 msgstr ""
 
+#, fuzzy
 msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "/"
-msgstr ""
+msgstr "/"
 
+#, fuzzy
 msgctxt "report:stock.shipment.in.restocking_list:"
 msgid ":"
-msgstr ""
+msgstr ":"
 
 msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "From Location"
@@ -1587,13 +1589,15 @@ msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Warehouse:"
 msgstr ""
 
+#, fuzzy
 msgctxt "report:stock.shipment.internal.report:"
 msgid "/"
-msgstr ""
+msgstr "/"
 
+#, fuzzy
 msgctxt "report:stock.shipment.internal.report:"
 msgid ":"
-msgstr ""
+msgstr ":"
 
 msgctxt "report:stock.shipment.internal.report:"
 msgid "From Location"
@@ -1635,9 +1639,10 @@ msgctxt "report:stock.shipment.internal.report:"
 msgid "To Location:"
 msgstr ""
 
+#, fuzzy
 msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "/"
-msgstr ""
+msgstr "/"
 
 msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Customer Code:"
@@ -1667,13 +1672,15 @@ msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Shipment Number:"
 msgstr ""
 
+#, fuzzy
 msgctxt "report:stock.shipment.out.picking_list:"
 msgid "/"
-msgstr ""
+msgstr "/"
 
+#, fuzzy
 msgctxt "report:stock.shipment.out.picking_list:"
 msgid ":"
-msgstr ""
+msgstr ":"
 
 msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Customer:"
@@ -1715,13 +1722,15 @@ msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Warehouse:"
 msgstr ""
 
+#, fuzzy
 msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "/"
-msgstr ""
+msgstr "/"
 
+#, fuzzy
 msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid ":"
-msgstr ""
+msgstr ":"
 
 msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Customer"
diff --git a/locale/lo_LA.po b/locale/lo_LA.po
index a44c579..caf221f 100644
--- a/locale/lo_LA.po
+++ b/locale/lo_LA.po
@@ -1684,13 +1684,15 @@ msgctxt "model:stock.shipment.out.return,name:"
 msgid "Customer Return Shipment"
 msgstr "ການຈັດສົ່ງຄືນຂອງລູກຄ້າ"
 
+#, fuzzy
 msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "/"
-msgstr ""
+msgstr "/"
 
+#, fuzzy
 msgctxt "report:stock.shipment.in.restocking_list:"
 msgid ":"
-msgstr ""
+msgstr ":"
 
 msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "From Location"
@@ -1733,13 +1735,15 @@ msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Warehouse:"
 msgstr ""
 
+#, fuzzy
 msgctxt "report:stock.shipment.internal.report:"
 msgid "/"
-msgstr ""
+msgstr "/"
 
+#, fuzzy
 msgctxt "report:stock.shipment.internal.report:"
 msgid ":"
-msgstr ""
+msgstr ":"
 
 msgctxt "report:stock.shipment.internal.report:"
 msgid "From Location"
@@ -1782,9 +1786,10 @@ msgctxt "report:stock.shipment.internal.report:"
 msgid "To Location:"
 msgstr ""
 
+#, fuzzy
 msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "/"
-msgstr ""
+msgstr "/"
 
 msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Customer Code:"
@@ -1815,13 +1820,15 @@ msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Shipment Number:"
 msgstr ""
 
+#, fuzzy
 msgctxt "report:stock.shipment.out.picking_list:"
 msgid "/"
-msgstr ""
+msgstr "/"
 
+#, fuzzy
 msgctxt "report:stock.shipment.out.picking_list:"
 msgid ":"
-msgstr ""
+msgstr ":"
 
 msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Customer:"
@@ -1864,13 +1871,15 @@ msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Warehouse:"
 msgstr ""
 
+#, fuzzy
 msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "/"
-msgstr ""
+msgstr "/"
 
+#, fuzzy
 msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid ":"
-msgstr ""
+msgstr ":"
 
 msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Customer"
diff --git a/locale/lt_LT.po b/locale/lt_LT.po
index 9265f16..e5e2438 100644
--- a/locale/lt_LT.po
+++ b/locale/lt_LT.po
@@ -1539,13 +1539,15 @@ msgctxt "model:stock.shipment.out.return,name:"
 msgid "Customer Return Shipment"
 msgstr ""
 
+#, fuzzy
 msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "/"
-msgstr ""
+msgstr "/"
 
+#, fuzzy
 msgctxt "report:stock.shipment.in.restocking_list:"
 msgid ":"
-msgstr ""
+msgstr ":"
 
 msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "From Location"
@@ -1587,13 +1589,15 @@ msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Warehouse:"
 msgstr ""
 
+#, fuzzy
 msgctxt "report:stock.shipment.internal.report:"
 msgid "/"
-msgstr ""
+msgstr "/"
 
+#, fuzzy
 msgctxt "report:stock.shipment.internal.report:"
 msgid ":"
-msgstr ""
+msgstr ":"
 
 msgctxt "report:stock.shipment.internal.report:"
 msgid "From Location"
@@ -1635,9 +1639,10 @@ msgctxt "report:stock.shipment.internal.report:"
 msgid "To Location:"
 msgstr ""
 
+#, fuzzy
 msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "/"
-msgstr ""
+msgstr "/"
 
 msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Customer Code:"
@@ -1667,13 +1672,15 @@ msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Shipment Number:"
 msgstr ""
 
+#, fuzzy
 msgctxt "report:stock.shipment.out.picking_list:"
 msgid "/"
-msgstr ""
+msgstr "/"
 
+#, fuzzy
 msgctxt "report:stock.shipment.out.picking_list:"
 msgid ":"
-msgstr ""
+msgstr ":"
 
 msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Customer:"
@@ -1715,13 +1722,15 @@ msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Warehouse:"
 msgstr ""
 
+#, fuzzy
 msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "/"
-msgstr ""
+msgstr "/"
 
+#, fuzzy
 msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid ":"
-msgstr ""
+msgstr ":"
 
 msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Customer"
diff --git a/locale/nl_NL.po b/locale/nl_NL.po
index e19c00b..f8b04fe 100644
--- a/locale/nl_NL.po
+++ b/locale/nl_NL.po
@@ -1643,13 +1643,15 @@ msgctxt "model:stock.shipment.out.return,name:"
 msgid "Customer Return Shipment"
 msgstr ""
 
+#, fuzzy
 msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "/"
-msgstr ""
+msgstr "/"
 
+#, fuzzy
 msgctxt "report:stock.shipment.in.restocking_list:"
 msgid ":"
-msgstr ""
+msgstr ":"
 
 msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "From Location"
@@ -1696,13 +1698,15 @@ msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Warehouse:"
 msgstr "Magazijn"
 
+#, fuzzy
 msgctxt "report:stock.shipment.internal.report:"
 msgid "/"
-msgstr ""
+msgstr "/"
 
+#, fuzzy
 msgctxt "report:stock.shipment.internal.report:"
 msgid ":"
-msgstr ""
+msgstr ":"
 
 msgctxt "report:stock.shipment.internal.report:"
 msgid "From Location"
@@ -1747,9 +1751,10 @@ msgctxt "report:stock.shipment.internal.report:"
 msgid "To Location:"
 msgstr ""
 
+#, fuzzy
 msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "/"
-msgstr ""
+msgstr "/"
 
 msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Customer Code:"
@@ -1783,13 +1788,15 @@ msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Shipment Number:"
 msgstr ""
 
+#, fuzzy
 msgctxt "report:stock.shipment.out.picking_list:"
 msgid "/"
-msgstr ""
+msgstr "/"
 
+#, fuzzy
 msgctxt "report:stock.shipment.out.picking_list:"
 msgid ":"
-msgstr ""
+msgstr ":"
 
 #, fuzzy
 msgctxt "report:stock.shipment.out.picking_list:"
@@ -1836,13 +1843,15 @@ msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Warehouse:"
 msgstr "Magazijn"
 
+#, fuzzy
 msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "/"
-msgstr ""
+msgstr "/"
 
+#, fuzzy
 msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid ":"
-msgstr ""
+msgstr ":"
 
 #, fuzzy
 msgctxt "report:stock.shipment.out.return.restocking_list:"
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index dda3944..232f2bf 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -1579,9 +1579,10 @@ msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "/"
 msgstr "/"
 
+#, fuzzy
 msgctxt "report:stock.shipment.in.restocking_list:"
 msgid ":"
-msgstr ""
+msgstr ":"
 
 msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "From Location"
@@ -1628,9 +1629,10 @@ msgctxt "report:stock.shipment.internal.report:"
 msgid "/"
 msgstr "/"
 
+#, fuzzy
 msgctxt "report:stock.shipment.internal.report:"
 msgid ":"
-msgstr ""
+msgstr ":"
 
 msgctxt "report:stock.shipment.internal.report:"
 msgid "From Location"
@@ -1709,9 +1711,10 @@ msgctxt "report:stock.shipment.out.picking_list:"
 msgid "/"
 msgstr "/"
 
+#, fuzzy
 msgctxt "report:stock.shipment.out.picking_list:"
 msgid ":"
-msgstr ""
+msgstr ":"
 
 msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Customer:"
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
index ff7b5d3..8bdf2f1 100644
--- a/locale/ru_RU.po
+++ b/locale/ru_RU.po
@@ -1577,9 +1577,10 @@ msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "/"
 msgstr "/"
 
+#, fuzzy
 msgctxt "report:stock.shipment.in.restocking_list:"
 msgid ":"
-msgstr ""
+msgstr ":"
 
 msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "From Location"
@@ -1626,9 +1627,10 @@ msgctxt "report:stock.shipment.internal.report:"
 msgid "/"
 msgstr "/"
 
+#, fuzzy
 msgctxt "report:stock.shipment.internal.report:"
 msgid ":"
-msgstr ""
+msgstr ":"
 
 msgctxt "report:stock.shipment.internal.report:"
 msgid "From Location"
@@ -1707,9 +1709,10 @@ msgctxt "report:stock.shipment.out.picking_list:"
 msgid "/"
 msgstr "/"
 
+#, fuzzy
 msgctxt "report:stock.shipment.out.picking_list:"
 msgid ":"
-msgstr ""
+msgstr ":"
 
 msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Customer:"
@@ -1756,9 +1759,10 @@ msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "/"
 msgstr "/"
 
+#, fuzzy
 msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid ":"
-msgstr ""
+msgstr ":"
 
 #, fuzzy
 msgctxt "report:stock.shipment.out.return.restocking_list:"
diff --git a/locale/sl_SI.po b/locale/sl_SI.po
index 65b4712..ed2e3ed 100644
--- a/locale/sl_SI.po
+++ b/locale/sl_SI.po
@@ -195,7 +195,7 @@ msgstr "ID"
 
 msgctxt "field:stock.configuration,inventory_sequence:"
 msgid "Inventory Sequence"
-msgstr ""
+msgstr "Štetje inventur"
 
 msgctxt "field:stock.configuration,rec_name:"
 msgid "Name"
@@ -263,7 +263,7 @@ msgstr "Izgubljeno/najdeno"
 
 msgctxt "field:stock.inventory,number:"
 msgid "Number"
-msgstr ""
+msgstr "Številka"
 
 msgctxt "field:stock.inventory,rec_name:"
 msgid "Name"
@@ -413,7 +413,6 @@ msgctxt "field:stock.location,type:"
 msgid "Location type"
 msgstr "Tip lokacije"
 
-#, fuzzy
 msgctxt "field:stock.location,warehouse:"
 msgid "Warehouse"
 msgstr "Skladišče"
@@ -428,7 +427,7 @@ msgstr "Zapisal"
 
 msgctxt "field:stock.move,assignation_required:"
 msgid "Assignation Required"
-msgstr ""
+msgstr "Obvezna dodelitev"
 
 msgctxt "field:stock.move,company:"
 msgid "Company"
@@ -692,7 +691,7 @@ msgstr "Promet"
 
 msgctxt "field:stock.shipment.in,number:"
 msgid "Numer"
-msgstr ""
+msgstr "Številka"
 
 msgctxt "field:stock.shipment.in,origins:"
 msgid "Origins"
@@ -754,7 +753,6 @@ msgctxt "field:stock.shipment.in.return,create_uid:"
 msgid "Create User"
 msgstr "Izdelal"
 
-#, fuzzy
 msgctxt "field:stock.shipment.in.return,delivery_address:"
 msgid "Delivery Address"
 msgstr "Prejemnik"
@@ -777,7 +775,7 @@ msgstr "Promet"
 
 msgctxt "field:stock.shipment.in.return,number:"
 msgid "Number"
-msgstr ""
+msgstr "Številka"
 
 msgctxt "field:stock.shipment.in.return,origins:"
 msgid "Origins"
@@ -799,7 +797,6 @@ msgctxt "field:stock.shipment.in.return,state:"
 msgid "State"
 msgstr "Stanje"
 
-#, fuzzy
 msgctxt "field:stock.shipment.in.return,supplier:"
 msgid "Supplier"
 msgstr "Dobavitelj"
@@ -854,7 +851,7 @@ msgstr "Promet"
 
 msgctxt "field:stock.shipment.internal,number:"
 msgid "Number"
-msgstr ""
+msgstr "Številka"
 
 msgctxt "field:stock.shipment.internal,planned_date:"
 msgid "Planned Date"
@@ -934,7 +931,7 @@ msgstr "Promet"
 
 msgctxt "field:stock.shipment.out,number:"
 msgid "Number"
-msgstr ""
+msgstr "Številka"
 
 msgctxt "field:stock.shipment.out,origins:"
 msgid "Origins"
@@ -1034,7 +1031,7 @@ msgstr "Promet"
 
 msgctxt "field:stock.shipment.out.return,number:"
 msgid "Number"
-msgstr ""
+msgstr "Številka"
 
 msgctxt "field:stock.shipment.out.return,origins:"
 msgid "Origins"
@@ -1343,7 +1340,6 @@ msgctxt ""
 msgid "Received"
 msgstr "Prejeto"
 
-#, fuzzy
 msgctxt "model:ir.sequence,name:sequence_inventory"
 msgid "Inventory"
 msgstr "Popis"
@@ -1368,7 +1364,6 @@ msgctxt "model:ir.sequence,name:sequence_shipment_out_return"
 msgid "Customer Return Shipment"
 msgstr "Vrnjena odpremnica"
 
-#, fuzzy
 msgctxt "model:ir.sequence.type,name:sequence_type_inventory"
 msgid "Inventory"
 msgstr "Popis"
@@ -1487,7 +1482,7 @@ msgstr "Kupec"
 
 msgctxt "model:stock.location,name:location_input"
 msgid "Input Zone"
-msgstr "Vstopna cona"
+msgstr "Vhodna cona"
 
 msgctxt "model:stock.location,name:location_lost_found"
 msgid "Lost and Found"
@@ -1495,11 +1490,11 @@ msgstr "Izgubljeno/najdeno"
 
 msgctxt "model:stock.location,name:location_output"
 msgid "Output Zone"
-msgstr "Izstopna cona"
+msgstr "Izhodna cona"
 
 msgctxt "model:stock.location,name:location_storage"
 msgid "Storage Zone"
-msgstr "Shramba"
+msgstr "Cona shrambe"
 
 msgctxt "model:stock.location,name:location_supplier"
 msgid "Supplier"
@@ -1571,7 +1566,7 @@ msgstr "/"
 
 msgctxt "report:stock.shipment.in.restocking_list:"
 msgid ":"
-msgstr ""
+msgstr ":"
 
 msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "From Location"
@@ -1597,10 +1592,9 @@ msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Restocking List"
 msgstr "Obnova zaloge"
 
-#, fuzzy
 msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Shipment Number"
-msgstr "Dobavnica št.:"
+msgstr "Številka pošiljke"
 
 msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Supplier:"
@@ -1620,7 +1614,7 @@ msgstr "/"
 
 msgctxt "report:stock.shipment.internal.report:"
 msgid ":"
-msgstr ""
+msgstr ":"
 
 msgctxt "report:stock.shipment.internal.report:"
 msgid "From Location"
@@ -1650,10 +1644,9 @@ msgctxt "report:stock.shipment.internal.report:"
 msgid "Reference:"
 msgstr "Sklic:"
 
-#, fuzzy
 msgctxt "report:stock.shipment.internal.report:"
 msgid "Shipment Number"
-msgstr "Dobavnica št.:"
+msgstr "Številka pošiljke"
 
 msgctxt "report:stock.shipment.internal.report:"
 msgid "To Location"
@@ -1701,7 +1694,7 @@ msgstr "/"
 
 msgctxt "report:stock.shipment.out.picking_list:"
 msgid ":"
-msgstr ""
+msgstr ":"
 
 msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Customer:"
@@ -1731,10 +1724,9 @@ msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Reference:"
 msgstr "Sklic:"
 
-#, fuzzy
 msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Shipment Number"
-msgstr "Dobavnica št.:"
+msgstr "Številka pošiljke"
 
 msgctxt "report:stock.shipment.out.picking_list:"
 msgid "To Location"
@@ -1762,7 +1754,7 @@ msgstr "Iz lokacije"
 
 msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Number"
-msgstr ""
+msgstr "Številka"
 
 msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Planned Date:"
@@ -1784,7 +1776,6 @@ msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Restocking List"
 msgstr "Obnova zaloge"
 
-#, fuzzy
 msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Shipment"
 msgstr "Pošiljka"
@@ -1981,15 +1972,13 @@ msgctxt "view:product.product:"
 msgid "Products"
 msgstr "Izdelki"
 
-#, fuzzy
 msgctxt "view:stock.configuration:"
 msgid "Inventory"
 msgstr "Popis"
 
-#, fuzzy
 msgctxt "view:stock.configuration:"
 msgid "Shipments"
-msgstr "Pošiljka"
+msgstr "Pošiljke"
 
 msgctxt "view:stock.configuration:"
 msgid "Stock Configuration"
@@ -2045,7 +2034,7 @@ msgstr "Preklic"
 
 msgctxt "view:stock.move:"
 msgid "Do"
-msgstr ""
+msgstr "Izvedi"
 
 msgctxt "view:stock.move:"
 msgid "Move"
diff --git a/locale/zh_CN.po b/locale/zh_CN.po
index 9265f16..e5e2438 100644
--- a/locale/zh_CN.po
+++ b/locale/zh_CN.po
@@ -1539,13 +1539,15 @@ msgctxt "model:stock.shipment.out.return,name:"
 msgid "Customer Return Shipment"
 msgstr ""
 
+#, fuzzy
 msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "/"
-msgstr ""
+msgstr "/"
 
+#, fuzzy
 msgctxt "report:stock.shipment.in.restocking_list:"
 msgid ":"
-msgstr ""
+msgstr ":"
 
 msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "From Location"
@@ -1587,13 +1589,15 @@ msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Warehouse:"
 msgstr ""
 
+#, fuzzy
 msgctxt "report:stock.shipment.internal.report:"
 msgid "/"
-msgstr ""
+msgstr "/"
 
+#, fuzzy
 msgctxt "report:stock.shipment.internal.report:"
 msgid ":"
-msgstr ""
+msgstr ":"
 
 msgctxt "report:stock.shipment.internal.report:"
 msgid "From Location"
@@ -1635,9 +1639,10 @@ msgctxt "report:stock.shipment.internal.report:"
 msgid "To Location:"
 msgstr ""
 
+#, fuzzy
 msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "/"
-msgstr ""
+msgstr "/"
 
 msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Customer Code:"
@@ -1667,13 +1672,15 @@ msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Shipment Number:"
 msgstr ""
 
+#, fuzzy
 msgctxt "report:stock.shipment.out.picking_list:"
 msgid "/"
-msgstr ""
+msgstr "/"
 
+#, fuzzy
 msgctxt "report:stock.shipment.out.picking_list:"
 msgid ":"
-msgstr ""
+msgstr ":"
 
 msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Customer:"
@@ -1715,13 +1722,15 @@ msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Warehouse:"
 msgstr ""
 
+#, fuzzy
 msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "/"
-msgstr ""
+msgstr "/"
 
+#, fuzzy
 msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid ":"
-msgstr ""
+msgstr ":"
 
 msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Customer"
diff --git a/tryton.cfg b/tryton.cfg
index 0e19f72..06a5651 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=4.0.0
+version=4.0.1
 depends:
     company
     currency
diff --git a/trytond_stock.egg-info/PKG-INFO b/trytond_stock.egg-info/PKG-INFO
index bbd09ca..ee8a9e6 100644
--- a/trytond_stock.egg-info/PKG-INFO
+++ b/trytond_stock.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond-stock
-Version: 4.0.0
+Version: 4.0.1
 Summary: Tryton module for stock and inventory
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/trytond_stock.egg-info/SOURCES.txt b/trytond_stock.egg-info/SOURCES.txt
index 6e35d1d..5ff133c 100644
--- a/trytond_stock.egg-info/SOURCES.txt
+++ b/trytond_stock.egg-info/SOURCES.txt
@@ -57,11 +57,13 @@ tryton.cfg
 ./locale/hu_HU.po
 ./locale/it_IT.po
 ./locale/ja_JP.po
+./locale/lo_LA.po
 ./locale/lt_LT.po
 ./locale/nl_NL.po
 ./locale/pt_BR.po
 ./locale/ru_RU.po
 ./locale/sl_SI.po
+./locale/zh_CN.po
 ./tests/__init__.py
 ./tests/scenario_stock_average_cost_price.rst
 ./tests/scenario_stock_inventory.rst
@@ -69,6 +71,7 @@ tryton.cfg
 ./tests/scenario_stock_shipment_internal.rst
 ./tests/scenario_stock_shipment_out.rst
 ./tests/test_stock.py
+./view/address_tree_sequence.xml
 ./view/configuration_form.xml
 ./view/inventory_form.xml
 ./view/inventory_line_form.xml
diff --git a/trytond_stock.egg-info/requires.txt b/trytond_stock.egg-info/requires.txt
index 00e6f64..85a4135 100644
--- a/trytond_stock.egg-info/requires.txt
+++ b/trytond_stock.egg-info/requires.txt
@@ -3,4 +3,4 @@ trytond_company >= 4.0, < 4.1
 trytond_currency >= 4.0, < 4.1
 trytond_party >= 4.0, < 4.1
 trytond_product >= 4.0, < 4.1
-trytond >= 4.0, < 4.1
\ No newline at end of file
+trytond >= 4.0, < 4.1
commit 73876695ee346efc0e80491425c95973e07a4dd1
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Fri May 27 18:26:18 2016 +0200

    Adding upstream version 4.0.0.
    
    Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>

diff --git a/CHANGELOG b/CHANGELOG
index ee24571..1134473 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,11 @@
-Version 3.8.1 - 2016-02-06
+Version 4.0.0 - 2016-05-02
 * Bug fixes (see mercurial logs for details)
+* Rename Shipments code into number
+* Add number to inventories
+* Add supplier and delivery address on supplier return shipment
+* Add Python3 support
+* Add do button on stock move form & list
+* Add warehouse address on internal shipment
 
 Version 3.8.0 - 2015-11-02
 * Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index f9748f1..3f028a1 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
 Metadata-Version: 1.1
 Name: trytond_stock
-Version: 3.8.1
+Version: 4.0.0
 Summary: Tryton module for stock and inventory
 Home-page: http://www.tryton.org/
 Author: Tryton
 Author-email: issue_tracker at tryton.org
 License: GPL-3
-Download-URL: http://downloads.tryton.org/3.8/
+Download-URL: http://downloads.tryton.org/4.0/
 Description: trytond_stock
         =============
         
@@ -55,6 +55,7 @@ Classifier: Intended Audience :: Manufacturing
 Classifier: License :: OSI Approved :: GNU General Public License (GPL)
 Classifier: Natural Language :: Bulgarian
 Classifier: Natural Language :: Catalan
+Classifier: Natural Language :: Chinese (Simplified)
 Classifier: Natural Language :: Czech
 Classifier: Natural Language :: Dutch
 Classifier: Natural Language :: English
@@ -68,6 +69,9 @@ Classifier: Natural Language :: Slovenian
 Classifier: Natural Language :: Spanish
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 2.7
+Classifier: Programming Language :: Python :: 3.3
+Classifier: Programming Language :: Python :: 3.4
+Classifier: Programming Language :: Python :: 3.5
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
 Classifier: Topic :: Office/Business
diff --git a/configuration.py b/configuration.py
index c0e1b42..04b6354 100644
--- a/configuration.py
+++ b/configuration.py
@@ -39,3 +39,9 @@ class Configuration(ModelSingleton, ModelSQL, ModelView):
                     [Eval('context', {}).get('company', -1), None]),
                 ('code', '=', 'stock.shipment.internal'),
                 ], required=True))
+    inventory_sequence = fields.Property(fields.Many2One(
+            'ir.sequence', 'Inventory Sequence', domain=[
+                ('company', 'in',
+                    [Eval('context', {}).get('company', -1), None]),
+                ('code', '=', 'stock.inventory'),
+                ], required=True))
diff --git a/configuration.xml b/configuration.xml
index 5a20963..949590b 100644
--- a/configuration.xml
+++ b/configuration.xml
@@ -52,6 +52,13 @@ this repository contains the full copyright notices and license terms. -->
             <field name="value" eval="'ir.sequence,' + str(ref('sequence_shipment_internal'))"/>
         </record>
 
+        <record model="ir.property" id="property_inventory_sequence">
+            <field name="field"
+                search="[('model.model', '=', 'stock.configuration'), ('name', '=', 'inventory_sequence')]"/>
+            <field name="value"
+                eval="'ir.sequence,' + str(ref('sequence_inventory'))"/>
+        </record>
+
         <record model="ir.model.access" id="access_configuration">
             <field name="model" search="[('model', '=', 'stock.configuration')]"/>
             <field name="perm_read" eval="True"/>
diff --git a/customer_return_restocking_list.odt b/customer_return_restocking_list.odt
index 73030e1..3de0c68 100644
Binary files a/customer_return_restocking_list.odt and b/customer_return_restocking_list.odt differ
diff --git a/delivery_note.odt b/delivery_note.odt
index d57afcb..d8d30f5 100644
Binary files a/delivery_note.odt and b/delivery_note.odt differ
diff --git a/internal_shipment.odt b/internal_shipment.odt
index aff3c80..4b02a89 100644
Binary files a/internal_shipment.odt and b/internal_shipment.odt differ
diff --git a/inventory.py b/inventory.py
index d8d7820..222045f 100644
--- a/inventory.py
+++ b/inventory.py
@@ -19,6 +19,8 @@ DEPENDS = ['state']
 class Inventory(Workflow, ModelSQL, ModelView):
     'Stock Inventory'
     __name__ = 'stock.inventory'
+    _rec_name = 'number'
+    number = fields.Char('Number', states=STATES, depends=DEPENDS)
     location = fields.Many2One(
         'stock.location', 'Location', required=True,
         domain=[('type', '=', 'storage')], states={
@@ -76,10 +78,9 @@ class Inventory(Workflow, ModelSQL, ModelView):
     def __register__(cls, module_name):
         TableHandler = backend.get('TableHandler')
         super(Inventory, cls).__register__(module_name)
-        cursor = Transaction().cursor
 
         # Add index on create_date
-        table = TableHandler(cursor, cls, module_name)
+        table = TableHandler(cls, module_name)
         table.index_action('create_date', action='add')
 
     @staticmethod
@@ -140,8 +141,17 @@ class Inventory(Workflow, ModelSQL, ModelView):
         Line.cancel_move([l for i in inventories for l in i.lines])
 
     @classmethod
-    def create(cls, values):
-        inventories = super(Inventory, cls).create(values)
+    def create(cls, vlist):
+        pool = Pool()
+        Sequence = pool.get('ir.sequence')
+        Configuration = pool.get('stock.configuration')
+        config = Configuration(1)
+        vlist = [x.copy() for x in vlist]
+        for values in vlist:
+            if values.get('number') is None:
+                values['number'] = Sequence.get_id(
+                    config.inventory_sequence.id)
+        inventories = super(Inventory, cls).create(vlist)
         cls.complete_lines(inventories, fill=False)
         return inventories
 
@@ -161,6 +171,7 @@ class Inventory(Workflow, ModelSQL, ModelView):
         default = default.copy()
         default['date'] = Date.today()
         default['lines'] = None
+        default.setdefault('number')
 
         new_inventories = []
         for inventory in inventories:
@@ -279,7 +290,7 @@ class InventoryLine(ModelSQL, ModelView):
     @classmethod
     def __register__(cls, module_name):
         TableHandler = backend.get('TableHandler')
-        cursor = Transaction().cursor
+        cursor = Transaction().connection.cursor()
         pool = Pool()
         Move = pool.get('stock.move')
         sql_table = cls.__table__()
@@ -287,7 +298,7 @@ class InventoryLine(ModelSQL, ModelView):
 
         super(InventoryLine, cls).__register__(module_name)
 
-        table = TableHandler(cursor, cls, module_name)
+        table = TableHandler(cls, module_name)
         # Migration from 2.8: Remove constraint inventory_product_uniq
         table.drop_constraint('inventory_product_uniq')
 
diff --git a/inventory.xml b/inventory.xml
index e39cecf..7f6075f 100644
--- a/inventory.xml
+++ b/inventory.xml
@@ -111,5 +111,25 @@ this repository contains the full copyright notices and license terms. -->
             <field name="group" ref="group_stock"/>
         </record>
 
+        <record model="ir.sequence.type" id="sequence_type_inventory">
+            <field name="name">Inventory</field>
+            <field name="code">stock.inventory</field>
+        </record>
+        <record model="ir.sequence.type-res.group"
+            id="sequence_type_inventory_group_admin">
+            <field name="sequence_type" ref="sequence_type_inventory"/>
+            <field name="group" ref="res.group_admin"/>
+        </record>
+        <record model="ir.sequence.type-res.group"
+            id="sequence_type_inventory_group_stock_admin">
+            <field name="sequence_type" ref="sequence_type_inventory"/>
+            <field name="group" ref="group_stock_admin"/>
+        </record>
+
+        <record model="ir.sequence" id="sequence_inventory">
+            <field name="name">Inventory</field>
+            <field name="code">stock.inventory</field>
+        </record>
+
     </data>
 </tryton>
diff --git a/locale/bg_BG.po b/locale/bg_BG.po
index 5d20f55..63c6d93 100644
--- a/locale/bg_BG.po
+++ b/locale/bg_BG.po
@@ -10,14 +10,18 @@ msgstr ""
 "Не може да променяте мер. ед. на продукт който е свързан с движения на "
 "наличност."
 
+#, fuzzy
 msgctxt "error:product.template:"
 msgid ""
 "You cannot change the type for a product which is associated to stock moves."
 msgstr ""
+"Не може да променяте мер. ед. на продукт който е свързан с движения на "
+"наличност."
 
+#, fuzzy
 msgctxt "error:stock.inventory.line:"
 msgid "Line quantity must be positive."
-msgstr ""
+msgstr "Количеството на движение трябва да е положително число"
 
 msgctxt "error:stock.inventory:"
 msgid "Inventory \"%s\" must be cancelled before deletion."
@@ -180,6 +184,10 @@ msgctxt "field:stock.configuration,id:"
 msgid "ID"
 msgstr "ID"
 
+msgctxt "field:stock.configuration,inventory_sequence:"
+msgid "Inventory Sequence"
+msgstr ""
+
 msgctxt "field:stock.configuration,rec_name:"
 msgid "Name"
 msgstr "Име"
@@ -244,6 +252,10 @@ msgctxt "field:stock.inventory,lost_found:"
 msgid "Lost and Found"
 msgstr "Загубени и намерени"
 
+msgctxt "field:stock.inventory,number:"
+msgid "Number"
+msgstr ""
+
 msgctxt "field:stock.inventory,rec_name:"
 msgid "Name"
 msgstr "Име"
@@ -393,6 +405,11 @@ msgctxt "field:stock.location,type:"
 msgid "Location type"
 msgstr "Вид местонахождение"
 
+#, fuzzy
+msgctxt "field:stock.location,warehouse:"
+msgid "Warehouse"
+msgstr "Склад"
+
 msgctxt "field:stock.location,write_date:"
 msgid "Write Date"
 msgstr "Променено на"
@@ -401,6 +418,10 @@ msgctxt "field:stock.location,write_uid:"
 msgid "Write User"
 msgstr "Променено от"
 
+msgctxt "field:stock.move,assignation_required:"
+msgid "Assignation Required"
+msgstr ""
+
 msgctxt "field:stock.move,company:"
 msgid "Company"
 msgstr "Фирма"
@@ -636,10 +657,6 @@ msgctxt "field:stock.products_by_locations.start,id:"
 msgid "ID"
 msgstr "ID"
 
-msgctxt "field:stock.shipment.in,code:"
-msgid "Code"
-msgstr "Код"
-
 msgctxt "field:stock.shipment.in,company:"
 msgid "Company"
 msgstr "Фирма"
@@ -676,9 +693,14 @@ msgctxt "field:stock.shipment.in,moves:"
 msgid "Moves"
 msgstr "Движения"
 
+msgctxt "field:stock.shipment.in,number:"
+msgid "Numer"
+msgstr ""
+
+#, fuzzy
 msgctxt "field:stock.shipment.in,origins:"
 msgid "Origins"
-msgstr ""
+msgstr "Източник"
 
 msgctxt "field:stock.shipment.in,planned_date:"
 msgid "Planned Date"
@@ -724,10 +746,6 @@ msgctxt "field:stock.shipment.in,write_uid:"
 msgid "Write User"
 msgstr "Променено от"
 
-msgctxt "field:stock.shipment.in.return,code:"
-msgid "Code"
-msgstr "Код"
-
 msgctxt "field:stock.shipment.in.return,company:"
 msgid "Company"
 msgstr "Фирма"
@@ -740,6 +758,11 @@ msgctxt "field:stock.shipment.in.return,create_uid:"
 msgid "Create User"
 msgstr "Създадено от"
 
+#, fuzzy
+msgctxt "field:stock.shipment.in.return,delivery_address:"
+msgid "Delivery Address"
+msgstr "Адрес за доствка"
+
 msgctxt "field:stock.shipment.in.return,effective_date:"
 msgid "Effective Date"
 msgstr "Ефективна дата"
@@ -756,9 +779,14 @@ msgctxt "field:stock.shipment.in.return,moves:"
 msgid "Moves"
 msgstr "Движения"
 
+msgctxt "field:stock.shipment.in.return,number:"
+msgid "Number"
+msgstr ""
+
+#, fuzzy
 msgctxt "field:stock.shipment.in.return,origins:"
 msgid "Origins"
-msgstr ""
+msgstr "Източник"
 
 msgctxt "field:stock.shipment.in.return,planned_date:"
 msgid "Planned Date"
@@ -776,6 +804,11 @@ msgctxt "field:stock.shipment.in.return,state:"
 msgid "State"
 msgstr "Състояние"
 
+#, fuzzy
+msgctxt "field:stock.shipment.in.return,supplier:"
+msgid "Supplier"
+msgstr "Доставчик"
+
 msgctxt "field:stock.shipment.in.return,to_location:"
 msgid "To Location"
 msgstr "Към местонахождение"
@@ -796,10 +829,6 @@ msgctxt "field:stock.shipment.in.return.assign.failed,moves:"
 msgid "Moves"
 msgstr "Движения"
 
-msgctxt "field:stock.shipment.internal,code:"
-msgid "Code"
-msgstr "Код"
-
 msgctxt "field:stock.shipment.internal,company:"
 msgid "Company"
 msgstr "Фирма"
@@ -828,6 +857,10 @@ msgctxt "field:stock.shipment.internal,moves:"
 msgid "Moves"
 msgstr "Движения"
 
+msgctxt "field:stock.shipment.internal,number:"
+msgid "Number"
+msgstr ""
+
 msgctxt "field:stock.shipment.internal,planned_date:"
 msgid "Planned Date"
 msgstr "Планирана дата"
@@ -864,10 +897,6 @@ msgctxt "field:stock.shipment.internal.assign.failed,moves:"
 msgid "Moves"
 msgstr "Движения"
 
-msgctxt "field:stock.shipment.out,code:"
-msgid "Code"
-msgstr "Код"
-
 msgctxt "field:stock.shipment.out,company:"
 msgid "Company"
 msgstr "Фирма"
@@ -908,9 +937,14 @@ msgctxt "field:stock.shipment.out,moves:"
 msgid "Moves"
 msgstr "Движения"
 
+msgctxt "field:stock.shipment.out,number:"
+msgid "Number"
+msgstr ""
+
+#, fuzzy
 msgctxt "field:stock.shipment.out,origins:"
 msgid "Origins"
-msgstr ""
+msgstr "Източник"
 
 msgctxt "field:stock.shipment.out,outgoing_moves:"
 msgid "Outgoing Moves"
@@ -960,10 +994,6 @@ msgctxt "field:stock.shipment.out.assign.failed,inventory_moves:"
 msgid "Inventory Moves"
 msgstr "Движения на инвентаризация"
 
-msgctxt "field:stock.shipment.out.return,code:"
-msgid "Code"
-msgstr "Код"
-
 msgctxt "field:stock.shipment.out.return,company:"
 msgid "Company"
 msgstr "Фирма"
@@ -1008,9 +1038,14 @@ msgctxt "field:stock.shipment.out.return,moves:"
 msgid "Moves"
 msgstr "Движения"
 
+msgctxt "field:stock.shipment.out.return,number:"
+msgid "Number"
+msgstr ""
+
+#, fuzzy
 msgctxt "field:stock.shipment.out.return,origins:"
 msgid "Origins"
-msgstr ""
+msgstr "Източник"
 
 msgctxt "field:stock.shipment.out.return,planned_date:"
 msgid "Planned Date"
@@ -1337,6 +1372,11 @@ msgctxt ""
 msgid "Received"
 msgstr "Получен"
 
+#, fuzzy
+msgctxt "model:ir.sequence,name:sequence_inventory"
+msgid "Inventory"
+msgstr "Инвентаризация"
+
 msgctxt "model:ir.sequence,name:sequence_shipment_in"
 msgid "Supplier Shipment"
 msgstr "Изпращане на доставчик"
@@ -1357,6 +1397,11 @@ msgctxt "model:ir.sequence,name:sequence_shipment_out_return"
 msgid "Customer Return Shipment"
 msgstr "Пратка върната от клиент"
 
+#, fuzzy
+msgctxt "model:ir.sequence.type,name:sequence_type_inventory"
+msgid "Inventory"
+msgstr "Инвентаризация"
+
 msgctxt "model:ir.sequence.type,name:sequence_type_shipment_in"
 msgid "Supplier Shipment"
 msgstr "Пратка на доставчик"
@@ -1549,217 +1594,236 @@ msgctxt "model:stock.shipment.out.return,name:"
 msgid "Customer Return Shipment"
 msgstr "Пратка върната от клиент"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "/"
 msgstr "/"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
-msgid "Code:"
-msgstr "Код:"
+msgctxt "report:stock.shipment.in.restocking_list:"
+msgid ":"
+msgstr ""
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "From Location"
 msgstr "От местонахождение"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Planned Date:"
 msgstr "Планирана дата:"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Product"
 msgstr "Продукт"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Quantity"
 msgstr "Количество"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Reference:"
 msgstr "Отпратка:"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Restocking List"
 msgstr "Списък за увеличаване наличност на продукт"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+#, fuzzy
+msgctxt "report:stock.shipment.in.restocking_list:"
+msgid "Shipment Number"
+msgstr "Номер на пратка:"
+
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Supplier:"
 msgstr "Доставчик:"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "To Location"
 msgstr "Към местонахождение"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Warehouse:"
 msgstr "Склад:"
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "/"
 msgstr "/"
 
-msgctxt "odt:stock.shipment.internal.report:"
-msgid "Code:"
-msgstr "Код:"
+msgctxt "report:stock.shipment.internal.report:"
+msgid ":"
+msgstr ""
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "From Location"
 msgstr "От местонахождение"
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "From Location:"
 msgstr "От местонахождение:"
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "Internal Shipment"
 msgstr "Вътрешно пратка"
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "Planned Date:"
 msgstr "Планирана дата:"
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "Product"
 msgstr "Продукт"
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "Quantity"
 msgstr "Количество"
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "Reference:"
 msgstr "Отпратка:"
 
-msgctxt "odt:stock.shipment.internal.report:"
+#, fuzzy
+msgctxt "report:stock.shipment.internal.report:"
+msgid "Shipment Number"
+msgstr "Номер на пратка:"
+
+msgctxt "report:stock.shipment.internal.report:"
 msgid "To Location"
 msgstr "Към местонахождение"
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "To Location:"
 msgstr "Към местонахождение:"
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "/"
 msgstr "/"
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Customer Code:"
 msgstr "Код на клиент:"
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Date:"
 msgstr "Дата:"
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Delivery Note"
 msgstr "Бележка към доставка"
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Product"
 msgstr "Продукт"
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Quantity"
 msgstr "Количество"
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Reference:"
 msgstr "Отпратка:"
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Shipment Number:"
 msgstr "Номер на пратка:"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "/"
 msgstr "/"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
-msgid "Code:"
-msgstr "Код:"
+msgctxt "report:stock.shipment.out.picking_list:"
+msgid ":"
+msgstr ""
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Customer:"
 msgstr "Клиент:"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "From Location"
 msgstr "От местонахождение"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Picking List"
 msgstr "Списък за опаковане"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Planned Date:"
 msgstr "Планирана дата:"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Product"
 msgstr "Продукт"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Quantity"
 msgstr "Количество"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Reference:"
 msgstr "Отпратка:"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+#, fuzzy
+msgctxt "report:stock.shipment.out.picking_list:"
+msgid "Shipment Number"
+msgstr "Номер на пратка:"
+
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "To Location"
 msgstr "Към местонахождение"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Warehouse:"
 msgstr "Склад:"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "/"
 msgstr "/"
 
 #, fuzzy
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid ":"
 msgstr ":"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
-msgid "Code:"
-msgstr "Код:"
-
 #, fuzzy
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Customer"
 msgstr "Клиент"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "From Location"
 msgstr "От местонахождение"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
+msgid "Number"
+msgstr ""
+
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Planned Date:"
 msgstr "Планирана дата:"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Product"
 msgstr "Продукт"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Quantity"
 msgstr "Количество"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Reference:"
 msgstr "Отпратка:"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Restocking List"
 msgstr "Списък за увеличаване наличност на продукт"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
+msgid "Shipment"
+msgstr ""
+
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "To Location"
 msgstr "Към местонахождение"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Warehouse:"
 msgstr "Склад:"
 
@@ -1948,6 +2012,15 @@ msgctxt "view:product.product:"
 msgid "Products"
 msgstr "Продукти"
 
+#, fuzzy
+msgctxt "view:stock.configuration:"
+msgid "Inventory"
+msgstr "Инвентаризация"
+
+msgctxt "view:stock.configuration:"
+msgid "Shipments"
+msgstr ""
+
 msgctxt "view:stock.configuration:"
 msgid "Stock Configuration"
 msgstr "Конфигуриране на наличност"
@@ -1998,6 +2071,10 @@ msgstr "Местонахождения"
 
 msgctxt "view:stock.move:"
 msgid "Cancel"
+msgstr "Отказ"
+
+msgctxt "view:stock.move:"
+msgid "Do"
 msgstr ""
 
 msgctxt "view:stock.move:"
@@ -2010,7 +2087,7 @@ msgstr "Движения"
 
 msgctxt "view:stock.move:"
 msgid "Reset to Draft"
-msgstr ""
+msgstr "Изпращане в проект"
 
 msgctxt "view:stock.period.cache:"
 msgid "Period Cache"
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
index aad78cf..481dd06 100644
--- a/locale/ca_ES.po
+++ b/locale/ca_ES.po
@@ -202,6 +202,10 @@ msgctxt "field:stock.configuration,id:"
 msgid "ID"
 msgstr "ID"
 
+msgctxt "field:stock.configuration,inventory_sequence:"
+msgid "Inventory Sequence"
+msgstr ""
+
 msgctxt "field:stock.configuration,rec_name:"
 msgid "Name"
 msgstr "Nom"
@@ -266,6 +270,10 @@ msgctxt "field:stock.inventory,lost_found:"
 msgid "Lost and Found"
 msgstr "Perdut-trobat"
 
+msgctxt "field:stock.inventory,number:"
+msgid "Number"
+msgstr ""
+
 msgctxt "field:stock.inventory,rec_name:"
 msgid "Name"
 msgstr "Nom"
@@ -414,6 +422,11 @@ msgctxt "field:stock.location,type:"
 msgid "Location type"
 msgstr "Tipus d'ubicació"
 
+#, fuzzy
+msgctxt "field:stock.location,warehouse:"
+msgid "Warehouse"
+msgstr "Magatzem"
+
 msgctxt "field:stock.location,write_date:"
 msgid "Write Date"
 msgstr "Data modificació"
@@ -422,6 +435,10 @@ msgctxt "field:stock.location,write_uid:"
 msgid "Write User"
 msgstr "Usuari modificació"
 
+msgctxt "field:stock.move,assignation_required:"
+msgid "Assignation Required"
+msgstr ""
+
 msgctxt "field:stock.move,company:"
 msgid "Company"
 msgstr "Empresa"
@@ -646,10 +663,6 @@ msgctxt "field:stock.products_by_locations.start,id:"
 msgid "ID"
 msgstr "ID"
 
-msgctxt "field:stock.shipment.in,code:"
-msgid "Code"
-msgstr "Codi"
-
 msgctxt "field:stock.shipment.in,company:"
 msgid "Company"
 msgstr "Empresa"
@@ -686,6 +699,10 @@ msgctxt "field:stock.shipment.in,moves:"
 msgid "Moves"
 msgstr "Moviments"
 
+msgctxt "field:stock.shipment.in,number:"
+msgid "Numer"
+msgstr ""
+
 msgctxt "field:stock.shipment.in,origins:"
 msgid "Origins"
 msgstr "Orígens"
@@ -734,10 +751,6 @@ msgctxt "field:stock.shipment.in,write_uid:"
 msgid "Write User"
 msgstr "Usuari modificació"
 
-msgctxt "field:stock.shipment.in.return,code:"
-msgid "Code"
-msgstr "Codi"
-
 msgctxt "field:stock.shipment.in.return,company:"
 msgid "Company"
 msgstr "Empresa"
@@ -750,6 +763,11 @@ msgctxt "field:stock.shipment.in.return,create_uid:"
 msgid "Create User"
 msgstr "Usuari creació"
 
+#, fuzzy
+msgctxt "field:stock.shipment.in.return,delivery_address:"
+msgid "Delivery Address"
+msgstr "Adreça d'enviament"
+
 msgctxt "field:stock.shipment.in.return,effective_date:"
 msgid "Effective Date"
 msgstr "Data efectiva"
@@ -766,6 +784,10 @@ msgctxt "field:stock.shipment.in.return,moves:"
 msgid "Moves"
 msgstr "Moviments"
 
+msgctxt "field:stock.shipment.in.return,number:"
+msgid "Number"
+msgstr ""
+
 msgctxt "field:stock.shipment.in.return,origins:"
 msgid "Origins"
 msgstr "Orígens"
@@ -786,6 +808,11 @@ msgctxt "field:stock.shipment.in.return,state:"
 msgid "State"
 msgstr "Estat"
 
+#, fuzzy
+msgctxt "field:stock.shipment.in.return,supplier:"
+msgid "Supplier"
+msgstr "Proveïdor"
+
 msgctxt "field:stock.shipment.in.return,to_location:"
 msgid "To Location"
 msgstr "A la ubicació"
@@ -806,10 +833,6 @@ msgctxt "field:stock.shipment.in.return.assign.failed,moves:"
 msgid "Moves"
 msgstr "Moviments"
 
-msgctxt "field:stock.shipment.internal,code:"
-msgid "Code"
-msgstr "Codi"
-
 msgctxt "field:stock.shipment.internal,company:"
 msgid "Company"
 msgstr "Empresa"
@@ -838,6 +861,10 @@ msgctxt "field:stock.shipment.internal,moves:"
 msgid "Moves"
 msgstr "Moviments"
 
+msgctxt "field:stock.shipment.internal,number:"
+msgid "Number"
+msgstr ""
+
 msgctxt "field:stock.shipment.internal,planned_date:"
 msgid "Planned Date"
 msgstr "Data estimada"
@@ -874,10 +901,6 @@ msgctxt "field:stock.shipment.internal.assign.failed,moves:"
 msgid "Moves"
 msgstr "Moviments"
 
-msgctxt "field:stock.shipment.out,code:"
-msgid "Code"
-msgstr "Codi"
-
 msgctxt "field:stock.shipment.out,company:"
 msgid "Company"
 msgstr "Empresa"
@@ -918,6 +941,10 @@ msgctxt "field:stock.shipment.out,moves:"
 msgid "Moves"
 msgstr "Moviments"
 
+msgctxt "field:stock.shipment.out,number:"
+msgid "Number"
+msgstr ""
+
 msgctxt "field:stock.shipment.out,origins:"
 msgid "Origins"
 msgstr "Orígens"
@@ -970,10 +997,6 @@ msgctxt "field:stock.shipment.out.assign.failed,inventory_moves:"
 msgid "Inventory Moves"
 msgstr "Moviments interns"
 
-msgctxt "field:stock.shipment.out.return,code:"
-msgid "Code"
-msgstr "Codi"
-
 msgctxt "field:stock.shipment.out.return,company:"
 msgid "Company"
 msgstr "Empresa"
@@ -1018,6 +1041,10 @@ msgctxt "field:stock.shipment.out.return,moves:"
 msgid "Moves"
 msgstr "Moviments"
 
+msgctxt "field:stock.shipment.out.return,number:"
+msgid "Number"
+msgstr ""
+
 msgctxt "field:stock.shipment.out.return,origins:"
 msgid "Origins"
 msgstr "Orígens"
@@ -1327,6 +1354,11 @@ msgctxt ""
 msgid "Received"
 msgstr "Rebut"
 
+#, fuzzy
+msgctxt "model:ir.sequence,name:sequence_inventory"
+msgid "Inventory"
+msgstr "Inventari"
+
 msgctxt "model:ir.sequence,name:sequence_shipment_in"
 msgid "Supplier Shipment"
 msgstr "Albarà de proveïdor"
@@ -1347,6 +1379,11 @@ msgctxt "model:ir.sequence,name:sequence_shipment_out_return"
 msgid "Customer Return Shipment"
 msgstr "Albarà devolució client"
 
+#, fuzzy
+msgctxt "model:ir.sequence.type,name:sequence_type_inventory"
+msgid "Inventory"
+msgstr "Inventari"
+
 msgctxt "model:ir.sequence.type,name:sequence_type_shipment_in"
 msgid "Supplier Shipment"
 msgstr "Albarà de proveïdor"
@@ -1539,215 +1576,235 @@ msgctxt "model:stock.shipment.out.return,name:"
 msgid "Customer Return Shipment"
 msgstr "Albarà devolució client"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "/"
 msgstr "/"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
-msgid "Code:"
-msgstr "Codi:"
+msgctxt "report:stock.shipment.in.restocking_list:"
+msgid ":"
+msgstr ""
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "From Location"
 msgstr "Des de la ubicació"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Planned Date:"
 msgstr "Data planejada:"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Product"
 msgstr "Producte"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Quantity"
 msgstr "Quantitat"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Reference:"
 msgstr "Referència:"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Restocking List"
 msgstr "Llista de proveïment"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+#, fuzzy
+msgctxt "report:stock.shipment.in.restocking_list:"
+msgid "Shipment Number"
+msgstr "Número d'albarà:"
+
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Supplier:"
 msgstr "Proveïdor:"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "To Location"
 msgstr "A la ubicació"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Warehouse:"
 msgstr "Magatzem:"
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "/"
 msgstr "/"
 
-msgctxt "odt:stock.shipment.internal.report:"
-msgid "Code:"
-msgstr "Codi:"
+msgctxt "report:stock.shipment.internal.report:"
+msgid ":"
+msgstr ""
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "From Location"
 msgstr "Des de la ubicació"
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "From Location:"
 msgstr "Des de la ubicació:"
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "Internal Shipment"
 msgstr "Albarà intern"
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "Planned Date:"
 msgstr "Data estimada:"
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "Product"
 msgstr "Producte"
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "Quantity"
 msgstr "Quantitat"
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "Reference:"
 msgstr "Referència:"
 
-msgctxt "odt:stock.shipment.internal.report:"
+#, fuzzy
+msgctxt "report:stock.shipment.internal.report:"
+msgid "Shipment Number"
+msgstr "Número d'albarà:"
+
+msgctxt "report:stock.shipment.internal.report:"
 msgid "To Location"
 msgstr "A la ubicació"
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "To Location:"
 msgstr "A la ubicació:"
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "/"
 msgstr "/"
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Customer Code:"
 msgstr "Codi de client:"
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Date:"
 msgstr "Data:"
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Delivery Note"
 msgstr "Nota d'enviament"
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Product"
 msgstr "Producte"
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Quantity"
 msgstr "Quantitat"
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Reference:"
 msgstr "Referència:"
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Shipment Number:"
 msgstr "Número d'albarà:"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "/"
 msgstr "/"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
-msgid "Code:"
-msgstr "Codi:"
+msgctxt "report:stock.shipment.out.picking_list:"
+msgid ":"
+msgstr ""
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Customer:"
 msgstr "Client:"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "From Location"
 msgstr "Des d'ubicació"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Picking List"
 msgstr "Llista de selecció"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Planned Date:"
 msgstr "Data estimada:"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Product"
 msgstr "Producte"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Quantity"
 msgstr "Quantitat"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Reference:"
 msgstr "Referència:"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+#, fuzzy
+msgctxt "report:stock.shipment.out.picking_list:"
+msgid "Shipment Number"
+msgstr "Número d'albarà:"
+
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "To Location"
 msgstr "A la ubicació"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Warehouse:"
 msgstr "Magatzem:"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "/"
 msgstr "/"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid ":"
 msgstr ":"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
-msgid "Code:"
-msgstr "Codi:"
-
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Customer"
 msgstr "Client"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "From Location"
 msgstr "D'ubicació"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
+msgid "Number"
+msgstr ""
+
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Planned Date:"
 msgstr "Data estimada:"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Product"
 msgstr "Producte"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Quantity"
 msgstr "Quantitat"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Reference:"
 msgstr "Referència:"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Restocking List"
 msgstr "Llista de proveïment"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+#, fuzzy
+msgctxt "report:stock.shipment.out.return.restocking_list:"
+msgid "Shipment"
+msgstr "Enviaments"
+
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "To Location"
 msgstr "A la ubicació"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Warehouse:"
 msgstr "Magatzem:"
 
@@ -1935,6 +1992,16 @@ msgctxt "view:product.product:"
 msgid "Products"
 msgstr "Productes"
 
+#, fuzzy
+msgctxt "view:stock.configuration:"
+msgid "Inventory"
+msgstr "Inventari"
+
+#, fuzzy
+msgctxt "view:stock.configuration:"
+msgid "Shipments"
+msgstr "Enviaments"
+
 msgctxt "view:stock.configuration:"
 msgid "Stock Configuration"
 msgstr "Configuració d'estoc"
@@ -1988,6 +2055,10 @@ msgid "Cancel"
 msgstr "Cancel·la"
 
 msgctxt "view:stock.move:"
+msgid "Do"
+msgstr ""
+
+msgctxt "view:stock.move:"
 msgid "Move"
 msgstr "Moviment"
 
diff --git a/locale/cs_CZ.po b/locale/cs_CZ.po
index 0a9eea4..9265f16 100644
--- a/locale/cs_CZ.po
+++ b/locale/cs_CZ.po
@@ -178,6 +178,10 @@ msgctxt "field:stock.configuration,id:"
 msgid "ID"
 msgstr ""
 
+msgctxt "field:stock.configuration,inventory_sequence:"
+msgid "Inventory Sequence"
+msgstr ""
+
 msgctxt "field:stock.configuration,rec_name:"
 msgid "Name"
 msgstr ""
@@ -242,6 +246,10 @@ msgctxt "field:stock.inventory,lost_found:"
 msgid "Lost and Found"
 msgstr ""
 
+msgctxt "field:stock.inventory,number:"
+msgid "Number"
+msgstr ""
+
 msgctxt "field:stock.inventory,rec_name:"
 msgid "Name"
 msgstr ""
@@ -390,6 +398,10 @@ msgctxt "field:stock.location,type:"
 msgid "Location type"
 msgstr ""
 
+msgctxt "field:stock.location,warehouse:"
+msgid "Warehouse"
+msgstr ""
+
 msgctxt "field:stock.location,write_date:"
 msgid "Write Date"
 msgstr ""
@@ -398,6 +410,10 @@ msgctxt "field:stock.location,write_uid:"
 msgid "Write User"
 msgstr ""
 
+msgctxt "field:stock.move,assignation_required:"
+msgid "Assignation Required"
+msgstr ""
+
 msgctxt "field:stock.move,company:"
 msgid "Company"
 msgstr ""
@@ -622,10 +638,6 @@ msgctxt "field:stock.products_by_locations.start,id:"
 msgid "ID"
 msgstr ""
 
-msgctxt "field:stock.shipment.in,code:"
-msgid "Code"
-msgstr ""
-
 msgctxt "field:stock.shipment.in,company:"
 msgid "Company"
 msgstr ""
@@ -662,6 +674,10 @@ msgctxt "field:stock.shipment.in,moves:"
 msgid "Moves"
 msgstr ""
 
+msgctxt "field:stock.shipment.in,number:"
+msgid "Numer"
+msgstr ""
+
 msgctxt "field:stock.shipment.in,origins:"
 msgid "Origins"
 msgstr ""
@@ -710,10 +726,6 @@ msgctxt "field:stock.shipment.in,write_uid:"
 msgid "Write User"
 msgstr ""
 
-msgctxt "field:stock.shipment.in.return,code:"
-msgid "Code"
-msgstr ""
-
 msgctxt "field:stock.shipment.in.return,company:"
 msgid "Company"
 msgstr ""
@@ -726,6 +738,10 @@ msgctxt "field:stock.shipment.in.return,create_uid:"
 msgid "Create User"
 msgstr ""
 
+msgctxt "field:stock.shipment.in.return,delivery_address:"
+msgid "Delivery Address"
+msgstr ""
+
 msgctxt "field:stock.shipment.in.return,effective_date:"
 msgid "Effective Date"
 msgstr ""
@@ -742,6 +758,10 @@ msgctxt "field:stock.shipment.in.return,moves:"
 msgid "Moves"
 msgstr ""
 
+msgctxt "field:stock.shipment.in.return,number:"
+msgid "Number"
+msgstr ""
+
 msgctxt "field:stock.shipment.in.return,origins:"
 msgid "Origins"
 msgstr ""
@@ -762,6 +782,10 @@ msgctxt "field:stock.shipment.in.return,state:"
 msgid "State"
 msgstr ""
 
+msgctxt "field:stock.shipment.in.return,supplier:"
+msgid "Supplier"
+msgstr ""
+
 msgctxt "field:stock.shipment.in.return,to_location:"
 msgid "To Location"
 msgstr ""
@@ -782,10 +806,6 @@ msgctxt "field:stock.shipment.in.return.assign.failed,moves:"
 msgid "Moves"
 msgstr ""
 
-msgctxt "field:stock.shipment.internal,code:"
-msgid "Code"
-msgstr ""
-
 msgctxt "field:stock.shipment.internal,company:"
 msgid "Company"
 msgstr ""
@@ -814,6 +834,10 @@ msgctxt "field:stock.shipment.internal,moves:"
 msgid "Moves"
 msgstr ""
 
+msgctxt "field:stock.shipment.internal,number:"
+msgid "Number"
+msgstr ""
+
 msgctxt "field:stock.shipment.internal,planned_date:"
 msgid "Planned Date"
 msgstr ""
@@ -850,10 +874,6 @@ msgctxt "field:stock.shipment.internal.assign.failed,moves:"
 msgid "Moves"
 msgstr ""
 
-msgctxt "field:stock.shipment.out,code:"
-msgid "Code"
-msgstr ""
-
 msgctxt "field:stock.shipment.out,company:"
 msgid "Company"
 msgstr ""
@@ -894,6 +914,10 @@ msgctxt "field:stock.shipment.out,moves:"
 msgid "Moves"
 msgstr ""
 
+msgctxt "field:stock.shipment.out,number:"
+msgid "Number"
+msgstr ""
+
 msgctxt "field:stock.shipment.out,origins:"
 msgid "Origins"
 msgstr ""
@@ -946,10 +970,6 @@ msgctxt "field:stock.shipment.out.assign.failed,inventory_moves:"
 msgid "Inventory Moves"
 msgstr ""
 
-msgctxt "field:stock.shipment.out.return,code:"
-msgid "Code"
-msgstr ""
-
 msgctxt "field:stock.shipment.out.return,company:"
 msgid "Company"
 msgstr ""
@@ -994,6 +1014,10 @@ msgctxt "field:stock.shipment.out.return,moves:"
 msgid "Moves"
 msgstr ""
 
+msgctxt "field:stock.shipment.out.return,number:"
+msgid "Number"
+msgstr ""
+
 msgctxt "field:stock.shipment.out.return,origins:"
 msgid "Origins"
 msgstr ""
@@ -1295,6 +1319,10 @@ msgctxt ""
 msgid "Received"
 msgstr ""
 
+msgctxt "model:ir.sequence,name:sequence_inventory"
+msgid "Inventory"
+msgstr ""
+
 msgctxt "model:ir.sequence,name:sequence_shipment_in"
 msgid "Supplier Shipment"
 msgstr ""
@@ -1315,6 +1343,10 @@ msgctxt "model:ir.sequence,name:sequence_shipment_out_return"
 msgid "Customer Return Shipment"
 msgstr ""
 
+msgctxt "model:ir.sequence.type,name:sequence_type_inventory"
+msgid "Inventory"
+msgstr ""
+
 msgctxt "model:ir.sequence.type,name:sequence_type_shipment_in"
 msgid "Supplier Shipment"
 msgstr ""
@@ -1507,215 +1539,231 @@ msgctxt "model:stock.shipment.out.return,name:"
 msgid "Customer Return Shipment"
 msgstr ""
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "/"
 msgstr ""
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
-msgid "Code:"
+msgctxt "report:stock.shipment.in.restocking_list:"
+msgid ":"
 msgstr ""
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "From Location"
 msgstr ""
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Planned Date:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Product"
 msgstr ""
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Quantity"
 msgstr ""
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Reference:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Restocking List"
 msgstr ""
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
+msgid "Shipment Number"
+msgstr ""
+
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Supplier:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "To Location"
 msgstr ""
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Warehouse:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "/"
 msgstr ""
 
-msgctxt "odt:stock.shipment.internal.report:"
-msgid "Code:"
+msgctxt "report:stock.shipment.internal.report:"
+msgid ":"
 msgstr ""
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "From Location"
 msgstr ""
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "From Location:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "Internal Shipment"
 msgstr ""
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "Planned Date:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "Product"
 msgstr ""
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "Quantity"
 msgstr ""
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "Reference:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
+msgid "Shipment Number"
+msgstr ""
+
+msgctxt "report:stock.shipment.internal.report:"
 msgid "To Location"
 msgstr ""
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "To Location:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "/"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Customer Code:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Date:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Delivery Note"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Product"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Quantity"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Reference:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Shipment Number:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "/"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.picking_list:"
-msgid "Code:"
+msgctxt "report:stock.shipment.out.picking_list:"
+msgid ":"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Customer:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "From Location"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Picking List"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Planned Date:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Product"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Quantity"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Reference:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
+msgid "Shipment Number"
+msgstr ""
+
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "To Location"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Warehouse:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "/"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid ":"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
-msgid "Code:"
-msgstr ""
-
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Customer"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "From Location"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
+msgid "Number"
+msgstr ""
+
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Planned Date:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Product"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Quantity"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Reference:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Restocking List"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
+msgid "Shipment"
+msgstr ""
+
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "To Location"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Warehouse:"
 msgstr ""
 
@@ -1904,6 +1952,14 @@ msgid "Products"
 msgstr ""
 
 msgctxt "view:stock.configuration:"
+msgid "Inventory"
+msgstr ""
+
+msgctxt "view:stock.configuration:"
+msgid "Shipments"
+msgstr ""
+
+msgctxt "view:stock.configuration:"
 msgid "Stock Configuration"
 msgstr ""
 
@@ -1956,6 +2012,10 @@ msgid "Cancel"
 msgstr ""
 
 msgctxt "view:stock.move:"
+msgid "Do"
+msgstr ""
+
+msgctxt "view:stock.move:"
 msgid "Move"
 msgstr ""
 
diff --git a/locale/de_DE.po b/locale/de_DE.po
index e8ff2ea..9355f24 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -214,6 +214,10 @@ msgctxt "field:stock.configuration,id:"
 msgid "ID"
 msgstr "ID"
 
+msgctxt "field:stock.configuration,inventory_sequence:"
+msgid "Inventory Sequence"
+msgstr ""
+
 msgctxt "field:stock.configuration,rec_name:"
 msgid "Name"
 msgstr "Name"
@@ -278,6 +282,10 @@ msgctxt "field:stock.inventory,lost_found:"
 msgid "Lost and Found"
 msgstr "Inventurdifferenz"
 
+msgctxt "field:stock.inventory,number:"
+msgid "Number"
+msgstr ""
+
 msgctxt "field:stock.inventory,rec_name:"
 msgid "Name"
 msgstr "Name"
@@ -426,6 +434,11 @@ msgctxt "field:stock.location,type:"
 msgid "Location type"
 msgstr "Lagertyp"
 
+#, fuzzy
+msgctxt "field:stock.location,warehouse:"
+msgid "Warehouse"
+msgstr "Warenlager"
+
 msgctxt "field:stock.location,write_date:"
 msgid "Write Date"
 msgstr "Zuletzt geändert"
@@ -434,6 +447,10 @@ msgctxt "field:stock.location,write_uid:"
 msgid "Write User"
 msgstr "Letzte Änderung durch"
 
+msgctxt "field:stock.move,assignation_required:"
+msgid "Assignation Required"
+msgstr ""
+
 msgctxt "field:stock.move,company:"
 msgid "Company"
 msgstr "Unternehmen"
@@ -658,10 +675,6 @@ msgctxt "field:stock.products_by_locations.start,id:"
 msgid "ID"
 msgstr "ID"
 
-msgctxt "field:stock.shipment.in,code:"
-msgid "Code"
-msgstr "Code"
-
 msgctxt "field:stock.shipment.in,company:"
 msgid "Company"
 msgstr "Unternehmen"
@@ -698,6 +711,10 @@ msgctxt "field:stock.shipment.in,moves:"
 msgid "Moves"
 msgstr "Bewegungen"
 
+msgctxt "field:stock.shipment.in,number:"
+msgid "Numer"
+msgstr ""
+
 msgctxt "field:stock.shipment.in,origins:"
 msgid "Origins"
 msgstr "Herkünfte"
@@ -746,10 +763,6 @@ msgctxt "field:stock.shipment.in,write_uid:"
 msgid "Write User"
 msgstr "Letzte Änderung durch"
 
-msgctxt "field:stock.shipment.in.return,code:"
-msgid "Code"
-msgstr "Code"
-
 msgctxt "field:stock.shipment.in.return,company:"
 msgid "Company"
 msgstr "Unternehmen"
@@ -762,6 +775,11 @@ msgctxt "field:stock.shipment.in.return,create_uid:"
 msgid "Create User"
 msgstr "Erstellt durch"
 
+#, fuzzy
+msgctxt "field:stock.shipment.in.return,delivery_address:"
+msgid "Delivery Address"
+msgstr "Lieferadresse"
+
 msgctxt "field:stock.shipment.in.return,effective_date:"
 msgid "Effective Date"
 msgstr "Effektives Datum"
@@ -778,6 +796,10 @@ msgctxt "field:stock.shipment.in.return,moves:"
 msgid "Moves"
 msgstr "Bewegungen"
 
+msgctxt "field:stock.shipment.in.return,number:"
+msgid "Number"
+msgstr ""
+
 msgctxt "field:stock.shipment.in.return,origins:"
 msgid "Origins"
 msgstr "Herkünfte"
@@ -798,6 +820,11 @@ msgctxt "field:stock.shipment.in.return,state:"
 msgid "State"
 msgstr "Status"
 
+#, fuzzy
+msgctxt "field:stock.shipment.in.return,supplier:"
+msgid "Supplier"
+msgstr "Lieferant"
+
 msgctxt "field:stock.shipment.in.return,to_location:"
 msgid "To Location"
 msgstr "Zu Lagerort"
@@ -818,10 +845,6 @@ msgctxt "field:stock.shipment.in.return.assign.failed,moves:"
 msgid "Moves"
 msgstr "Lagerbewegungen"
 
-msgctxt "field:stock.shipment.internal,code:"
-msgid "Code"
-msgstr "Code"
-
 msgctxt "field:stock.shipment.internal,company:"
 msgid "Company"
 msgstr "Unternehmen"
@@ -850,6 +873,10 @@ msgctxt "field:stock.shipment.internal,moves:"
 msgid "Moves"
 msgstr "Bewegungen"
 
+msgctxt "field:stock.shipment.internal,number:"
+msgid "Number"
+msgstr ""
+
 msgctxt "field:stock.shipment.internal,planned_date:"
 msgid "Planned Date"
 msgstr "Geplantes Datum"
@@ -886,10 +913,6 @@ msgctxt "field:stock.shipment.internal.assign.failed,moves:"
 msgid "Moves"
 msgstr "Lagerbewegungen"
 
-msgctxt "field:stock.shipment.out,code:"
-msgid "Code"
-msgstr "Code"
-
 msgctxt "field:stock.shipment.out,company:"
 msgid "Company"
 msgstr "Unternehmen"
@@ -930,6 +953,10 @@ msgctxt "field:stock.shipment.out,moves:"
 msgid "Moves"
 msgstr "Bewegungen"
 
+msgctxt "field:stock.shipment.out,number:"
+msgid "Number"
+msgstr ""
+
 msgctxt "field:stock.shipment.out,origins:"
 msgid "Origins"
 msgstr "Herkünfte"
@@ -982,10 +1009,6 @@ msgctxt "field:stock.shipment.out.assign.failed,inventory_moves:"
 msgid "Inventory Moves"
 msgstr "Bestandsänderungen"
 
-msgctxt "field:stock.shipment.out.return,code:"
-msgid "Code"
-msgstr "Code"
-
 msgctxt "field:stock.shipment.out.return,company:"
 msgid "Company"
 msgstr "Unternehmen"
@@ -1030,6 +1053,10 @@ msgctxt "field:stock.shipment.out.return,moves:"
 msgid "Moves"
 msgstr "Bewegungen"
 
+msgctxt "field:stock.shipment.out.return,number:"
+msgid "Number"
+msgstr ""
+
 msgctxt "field:stock.shipment.out.return,origins:"
 msgid "Origins"
 msgstr "Herkünfte"
@@ -1102,10 +1129,6 @@ msgstr ""
 "* Ein leerer Wert ist ein unbegrenztes Datum in der Zukunft.\n"
 "* Ein Datum in der Vergangenheit berechnet historische Werte."
 
-msgctxt "model:ir.action,name:"
-msgid "Create Return Shipment"
-msgstr "Lieferpostenrückgabe erstellen"
-
 msgctxt "model:ir.action,name:act_inventory_form"
 msgid "Inventories"
 msgstr "Bestandskorrekturen"
@@ -1341,6 +1364,11 @@ msgctxt ""
 msgid "Received"
 msgstr "Erhalten"
 
+#, fuzzy
+msgctxt "model:ir.sequence,name:sequence_inventory"
+msgid "Inventory"
+msgstr "Lagerbestand"
+
 msgctxt "model:ir.sequence,name:sequence_shipment_in"
 msgid "Supplier Shipment"
 msgstr "Lieferposten Lieferant"
@@ -1361,6 +1389,11 @@ msgctxt "model:ir.sequence,name:sequence_shipment_out_return"
 msgid "Customer Return Shipment"
 msgstr "Warenrücknahme Kunde"
 
+#, fuzzy
+msgctxt "model:ir.sequence.type,name:sequence_type_inventory"
+msgid "Inventory"
+msgstr "Lagerbestand"
+
 msgctxt "model:ir.sequence.type,name:sequence_type_shipment_in"
 msgid "Supplier Shipment"
 msgstr "Lieferposten Lieferant"
@@ -1553,215 +1586,235 @@ msgctxt "model:stock.shipment.out.return,name:"
 msgid "Customer Return Shipment"
 msgstr "Warenrücknahme Kunde"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "/"
 msgstr "/"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
-msgid "Code:"
-msgstr "Code:"
+msgctxt "report:stock.shipment.in.restocking_list:"
+msgid ":"
+msgstr ""
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "From Location"
 msgstr "Von Lagerort"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Planned Date:"
 msgstr "Geplantes Datum:"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Product"
 msgstr "Variante"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Quantity"
 msgstr "Anzahl"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Reference:"
 msgstr "Beleg-Nr.:"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Restocking List"
 msgstr "Einlagerungsliste"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+#, fuzzy
+msgctxt "report:stock.shipment.in.restocking_list:"
+msgid "Shipment Number"
+msgstr "Lieferposten Nr.:"
+
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Supplier:"
 msgstr "Lieferant:"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "To Location"
 msgstr "Zu Lagerort"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Warehouse:"
 msgstr "Warenlager:"
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "/"
 msgstr "/"
 
-msgctxt "odt:stock.shipment.internal.report:"
-msgid "Code:"
-msgstr "Code:"
+msgctxt "report:stock.shipment.internal.report:"
+msgid ":"
+msgstr ""
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "From Location"
 msgstr "Von Lagerort"
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "From Location:"
 msgstr "Von Lagerort:"
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "Internal Shipment"
 msgstr "Interner Lieferposten"
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "Planned Date:"
 msgstr "Geplantes Datum:"
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "Product"
 msgstr "Variante"
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "Quantity"
 msgstr "Anzahl"
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "Reference:"
 msgstr "Beleg-Nr.:"
 
-msgctxt "odt:stock.shipment.internal.report:"
+#, fuzzy
+msgctxt "report:stock.shipment.internal.report:"
+msgid "Shipment Number"
+msgstr "Lieferposten Nr.:"
+
+msgctxt "report:stock.shipment.internal.report:"
 msgid "To Location"
 msgstr "Zu Lagerort"
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "To Location:"
 msgstr "Zu Lagerort:"
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "/"
 msgstr "/"
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Customer Code:"
 msgstr "Kundennr:"
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Date:"
 msgstr "Datum:"
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Delivery Note"
 msgstr "Lieferschein"
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Product"
 msgstr "Variante"
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Quantity"
 msgstr "Anzahl"
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Reference:"
 msgstr "Beleg-Nr.:"
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Shipment Number:"
 msgstr "Lieferposten Nr.:"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "/"
 msgstr "/"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
-msgid "Code:"
-msgstr "Code:"
+msgctxt "report:stock.shipment.out.picking_list:"
+msgid ":"
+msgstr ""
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Customer:"
 msgstr "Kunde:"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "From Location"
 msgstr "Von Lagerort"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Picking List"
 msgstr "Pickliste"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Planned Date:"
 msgstr "Geplantes Datum:"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Product"
 msgstr "Variante"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Quantity"
 msgstr "Anzahl"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Reference:"
 msgstr "Beleg-Nr.:"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+#, fuzzy
+msgctxt "report:stock.shipment.out.picking_list:"
+msgid "Shipment Number"
+msgstr "Lieferposten Nr.:"
+
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "To Location"
 msgstr "Zu Lagerort"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Warehouse:"
 msgstr "Warenlager:"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "/"
 msgstr "/"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid ":"
 msgstr ":"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
-msgid "Code:"
-msgstr "Code:"
-
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Customer"
 msgstr "Kunde"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "From Location"
 msgstr "Von Lagerort"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
+msgid "Number"
+msgstr ""
+
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Planned Date:"
 msgstr "Geplantes Datum:"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Product"
 msgstr "Variante"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Quantity"
 msgstr "Anzahl"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Reference:"
 msgstr "Beleg-Nr.:"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Restocking List"
 msgstr "Einlagerungsliste"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+#, fuzzy
+msgctxt "report:stock.shipment.out.return.restocking_list:"
+msgid "Shipment"
+msgstr "Lieferposten"
+
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "To Location"
 msgstr "Zu Lagerort"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Warehouse:"
 msgstr "Warenlager:"
 
@@ -1949,6 +2002,16 @@ msgctxt "view:product.product:"
 msgid "Products"
 msgstr "Varianten"
 
+#, fuzzy
+msgctxt "view:stock.configuration:"
+msgid "Inventory"
+msgstr "Lagerbestand"
+
+#, fuzzy
+msgctxt "view:stock.configuration:"
+msgid "Shipments"
+msgstr "Lieferposten"
+
 msgctxt "view:stock.configuration:"
 msgid "Stock Configuration"
 msgstr "Einstellungen Lager"
@@ -2002,6 +2065,10 @@ msgid "Cancel"
 msgstr "Annullieren"
 
 msgctxt "view:stock.move:"
+msgid "Do"
+msgstr ""
+
+msgctxt "view:stock.move:"
 msgid "Move"
 msgstr "Bewegung"
 
diff --git a/locale/es_AR.po b/locale/es_AR.po
index f19afaf..0e8a8b5 100644
--- a/locale/es_AR.po
+++ b/locale/es_AR.po
@@ -201,6 +201,10 @@ msgctxt "field:stock.configuration,id:"
 msgid "ID"
 msgstr "ID"
 
+msgctxt "field:stock.configuration,inventory_sequence:"
+msgid "Inventory Sequence"
+msgstr ""
+
 msgctxt "field:stock.configuration,rec_name:"
 msgid "Name"
 msgstr "Nombre"
@@ -265,6 +269,10 @@ msgctxt "field:stock.inventory,lost_found:"
 msgid "Lost and Found"
 msgstr "Perdido y encontrado"
 
+msgctxt "field:stock.inventory,number:"
+msgid "Number"
+msgstr ""
+
 msgctxt "field:stock.inventory,rec_name:"
 msgid "Name"
 msgstr "Nombre"
@@ -413,6 +421,11 @@ msgctxt "field:stock.location,type:"
 msgid "Location type"
 msgstr "Tipo de ubicación"
 
+#, fuzzy
+msgctxt "field:stock.location,warehouse:"
+msgid "Warehouse"
+msgstr "Almacén"
+
 msgctxt "field:stock.location,write_date:"
 msgid "Write Date"
 msgstr "Fecha modificación"
@@ -421,6 +434,10 @@ msgctxt "field:stock.location,write_uid:"
 msgid "Write User"
 msgstr "Usuario modificación"
 
+msgctxt "field:stock.move,assignation_required:"
+msgid "Assignation Required"
+msgstr ""
+
 msgctxt "field:stock.move,company:"
 msgid "Company"
 msgstr "Empresa"
@@ -645,10 +662,6 @@ msgctxt "field:stock.products_by_locations.start,id:"
 msgid "ID"
 msgstr "ID"
 
-msgctxt "field:stock.shipment.in,code:"
-msgid "Code"
-msgstr "Código"
-
 msgctxt "field:stock.shipment.in,company:"
 msgid "Company"
 msgstr "Empresa"
@@ -685,6 +698,10 @@ msgctxt "field:stock.shipment.in,moves:"
 msgid "Moves"
 msgstr "Movimientos"
 
+msgctxt "field:stock.shipment.in,number:"
+msgid "Numer"
+msgstr ""
+
 msgctxt "field:stock.shipment.in,origins:"
 msgid "Origins"
 msgstr "Origen"
@@ -733,10 +750,6 @@ msgctxt "field:stock.shipment.in,write_uid:"
 msgid "Write User"
 msgstr "Usuario modificación"
 
-msgctxt "field:stock.shipment.in.return,code:"
-msgid "Code"
-msgstr "Código"
-
 msgctxt "field:stock.shipment.in.return,company:"
 msgid "Company"
 msgstr "Empresa"
@@ -749,6 +762,11 @@ msgctxt "field:stock.shipment.in.return,create_uid:"
 msgid "Create User"
 msgstr "Usuario creación"
 
+#, fuzzy
+msgctxt "field:stock.shipment.in.return,delivery_address:"
+msgid "Delivery Address"
+msgstr "Dirección de envío"
+
 msgctxt "field:stock.shipment.in.return,effective_date:"
 msgid "Effective Date"
 msgstr "Fecha efectiva"
@@ -765,6 +783,10 @@ msgctxt "field:stock.shipment.in.return,moves:"
 msgid "Moves"
 msgstr "Movimientos"
 
+msgctxt "field:stock.shipment.in.return,number:"
+msgid "Number"
+msgstr ""
+
 msgctxt "field:stock.shipment.in.return,origins:"
 msgid "Origins"
 msgstr "Origen"
@@ -785,6 +807,11 @@ msgctxt "field:stock.shipment.in.return,state:"
 msgid "State"
 msgstr "Estado"
 
+#, fuzzy
+msgctxt "field:stock.shipment.in.return,supplier:"
+msgid "Supplier"
+msgstr "Proveedor"
+
 msgctxt "field:stock.shipment.in.return,to_location:"
 msgid "To Location"
 msgstr "A ubicación"
@@ -805,10 +832,6 @@ msgctxt "field:stock.shipment.in.return.assign.failed,moves:"
 msgid "Moves"
 msgstr "Movimientos"
 
-msgctxt "field:stock.shipment.internal,code:"
-msgid "Code"
-msgstr "Código"
-
 msgctxt "field:stock.shipment.internal,company:"
 msgid "Company"
 msgstr "Empresa"
@@ -837,6 +860,10 @@ msgctxt "field:stock.shipment.internal,moves:"
 msgid "Moves"
 msgstr "Movimientos"
 
+msgctxt "field:stock.shipment.internal,number:"
+msgid "Number"
+msgstr ""
+
 msgctxt "field:stock.shipment.internal,planned_date:"
 msgid "Planned Date"
 msgstr "Fecha estimada"
@@ -873,10 +900,6 @@ msgctxt "field:stock.shipment.internal.assign.failed,moves:"
 msgid "Moves"
 msgstr "Movimientos"
 
-msgctxt "field:stock.shipment.out,code:"
-msgid "Code"
-msgstr "Código"
-
 msgctxt "field:stock.shipment.out,company:"
 msgid "Company"
 msgstr "Empresa"
@@ -917,6 +940,10 @@ msgctxt "field:stock.shipment.out,moves:"
 msgid "Moves"
 msgstr "Movimientos"
 
+msgctxt "field:stock.shipment.out,number:"
+msgid "Number"
+msgstr ""
+
 msgctxt "field:stock.shipment.out,origins:"
 msgid "Origins"
 msgstr "Origen"
@@ -969,10 +996,6 @@ msgctxt "field:stock.shipment.out.assign.failed,inventory_moves:"
 msgid "Inventory Moves"
 msgstr "Movimientos de inventario"
 
-msgctxt "field:stock.shipment.out.return,code:"
-msgid "Code"
-msgstr "Código"
-
 msgctxt "field:stock.shipment.out.return,company:"
 msgid "Company"
 msgstr "Empresa"
@@ -1017,6 +1040,10 @@ msgctxt "field:stock.shipment.out.return,moves:"
 msgid "Moves"
 msgstr "Movimientos"
 
+msgctxt "field:stock.shipment.out.return,number:"
+msgid "Number"
+msgstr ""
+
 msgctxt "field:stock.shipment.out.return,origins:"
 msgid "Origins"
 msgstr "Origen"
@@ -1327,6 +1354,11 @@ msgctxt ""
 msgid "Received"
 msgstr "Recibido"
 
+#, fuzzy
+msgctxt "model:ir.sequence,name:sequence_inventory"
+msgid "Inventory"
+msgstr "Inventario"
+
 msgctxt "model:ir.sequence,name:sequence_shipment_in"
 msgid "Supplier Shipment"
 msgstr "Remito de proveedor"
@@ -1347,6 +1379,11 @@ msgctxt "model:ir.sequence,name:sequence_shipment_out_return"
 msgid "Customer Return Shipment"
 msgstr "Remito de devolución de cliente"
 
+#, fuzzy
+msgctxt "model:ir.sequence.type,name:sequence_type_inventory"
+msgid "Inventory"
+msgstr "Inventario"
+
 msgctxt "model:ir.sequence.type,name:sequence_type_shipment_in"
 msgid "Supplier Shipment"
 msgstr "Remito de proveedor"
@@ -1539,215 +1576,235 @@ msgctxt "model:stock.shipment.out.return,name:"
 msgid "Customer Return Shipment"
 msgstr "Remito de devolución de cliente"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "/"
 msgstr "/"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
-msgid "Code:"
-msgstr "Código:"
+msgctxt "report:stock.shipment.in.restocking_list:"
+msgid ":"
+msgstr ""
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "From Location"
 msgstr "Desde ubicación"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Planned Date:"
 msgstr "Fecha estimada:"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Product"
 msgstr "Producto"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Quantity"
 msgstr "Cantidad"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Reference:"
 msgstr "Referencia:"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Restocking List"
 msgstr "Lista reabastecimiento"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+#, fuzzy
+msgctxt "report:stock.shipment.in.restocking_list:"
+msgid "Shipment Number"
+msgstr "Número de Remito:"
+
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Supplier:"
 msgstr "Proveedor:"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "To Location"
 msgstr "A ubicación"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Warehouse:"
 msgstr "Almacén:"
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "/"
 msgstr "/"
 
-msgctxt "odt:stock.shipment.internal.report:"
-msgid "Code:"
-msgstr "Código:"
+msgctxt "report:stock.shipment.internal.report:"
+msgid ":"
+msgstr ""
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "From Location"
 msgstr "Desde ubicación"
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "From Location:"
 msgstr "Desde ubicación:"
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "Internal Shipment"
 msgstr "Remito interno"
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "Planned Date:"
 msgstr "Fecha estimada:"
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "Product"
 msgstr "Producto"
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "Quantity"
 msgstr "Cantidad"
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "Reference:"
 msgstr "Referencia:"
 
-msgctxt "odt:stock.shipment.internal.report:"
+#, fuzzy
+msgctxt "report:stock.shipment.internal.report:"
+msgid "Shipment Number"
+msgstr "Número de Remito:"
+
+msgctxt "report:stock.shipment.internal.report:"
 msgid "To Location"
 msgstr "A ubicación"
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "To Location:"
 msgstr "A ubicación:"
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "/"
 msgstr "/"
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Customer Code:"
 msgstr "Código de cliente:"
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Date:"
 msgstr "Fecha:"
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Delivery Note"
 msgstr "Nota de envío"
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Product"
 msgstr "Producto"
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Quantity"
 msgstr "Cantidad"
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Reference:"
 msgstr "Referencia:"
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Shipment Number:"
 msgstr "Número de Remito:"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "/"
 msgstr "/"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
-msgid "Code:"
-msgstr "Código:"
+msgctxt "report:stock.shipment.out.picking_list:"
+msgid ":"
+msgstr ""
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Customer:"
 msgstr "Cliente:"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "From Location"
 msgstr "Desde ubicación"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Picking List"
 msgstr "Lista de picking"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Planned Date:"
 msgstr "Fecha estimada:"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Product"
 msgstr "Producto"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Quantity"
 msgstr "Cantidad"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Reference:"
 msgstr "Referencia:"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+#, fuzzy
+msgctxt "report:stock.shipment.out.picking_list:"
+msgid "Shipment Number"
+msgstr "Número de Remito:"
+
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "To Location"
 msgstr "A ubicación"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Warehouse:"
 msgstr "Almacén:"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "/"
 msgstr "/"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid ":"
 msgstr ":"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
-msgid "Code:"
-msgstr "Código:"
-
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Customer"
 msgstr "Cliente"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "From Location"
 msgstr "De ubicación"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
+msgid "Number"
+msgstr ""
+
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Planned Date:"
 msgstr "Fecha estimada:"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Product"
 msgstr "Producto"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Quantity"
 msgstr "Cantidad"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Reference:"
 msgstr "Referencia:"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Restocking List"
 msgstr "Lista reabastecimiento"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+#, fuzzy
+msgctxt "report:stock.shipment.out.return.restocking_list:"
+msgid "Shipment"
+msgstr "Remito"
+
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "To Location"
 msgstr "A ubicación"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Warehouse:"
 msgstr "Almacén:"
 
@@ -1935,6 +1992,16 @@ msgctxt "view:product.product:"
 msgid "Products"
 msgstr "Productos"
 
+#, fuzzy
+msgctxt "view:stock.configuration:"
+msgid "Inventory"
+msgstr "Inventario"
+
+#, fuzzy
+msgctxt "view:stock.configuration:"
+msgid "Shipments"
+msgstr "Remito"
+
 msgctxt "view:stock.configuration:"
 msgid "Stock Configuration"
 msgstr "Configuración de stock"
@@ -1988,6 +2055,10 @@ msgid "Cancel"
 msgstr "Cancelar"
 
 msgctxt "view:stock.move:"
+msgid "Do"
+msgstr ""
+
+msgctxt "view:stock.move:"
 msgid "Move"
 msgstr "Movimiento"
 
diff --git a/locale/es_CO.po b/locale/es_CO.po
index 8582fd2..e9336fa 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -203,6 +203,10 @@ msgctxt "field:stock.configuration,id:"
 msgid "ID"
 msgstr "ID"
 
+msgctxt "field:stock.configuration,inventory_sequence:"
+msgid "Inventory Sequence"
+msgstr ""
+
 msgctxt "field:stock.configuration,rec_name:"
 msgid "Name"
 msgstr "Nombre"
@@ -267,6 +271,10 @@ msgctxt "field:stock.inventory,lost_found:"
 msgid "Lost and Found"
 msgstr "Perdido y Encontrado"
 
+msgctxt "field:stock.inventory,number:"
+msgid "Number"
+msgstr ""
+
 msgctxt "field:stock.inventory,rec_name:"
 msgid "Name"
 msgstr "Nombre"
@@ -415,6 +423,11 @@ msgctxt "field:stock.location,type:"
 msgid "Location type"
 msgstr "Tipo de Bodega"
 
+#, fuzzy
+msgctxt "field:stock.location,warehouse:"
+msgid "Warehouse"
+msgstr "Almacén"
+
 msgctxt "field:stock.location,write_date:"
 msgid "Write Date"
 msgstr "Fecha de Modificación"
@@ -423,6 +436,10 @@ msgctxt "field:stock.location,write_uid:"
 msgid "Write User"
 msgstr "Modificado por Usuario"
 
+msgctxt "field:stock.move,assignation_required:"
+msgid "Assignation Required"
+msgstr ""
+
 msgctxt "field:stock.move,company:"
 msgid "Company"
 msgstr "Compañia"
@@ -647,10 +664,6 @@ msgctxt "field:stock.products_by_locations.start,id:"
 msgid "ID"
 msgstr "ID"
 
-msgctxt "field:stock.shipment.in,code:"
-msgid "Code"
-msgstr "Código"
-
 msgctxt "field:stock.shipment.in,company:"
 msgid "Company"
 msgstr "Compañia"
@@ -687,6 +700,10 @@ msgctxt "field:stock.shipment.in,moves:"
 msgid "Moves"
 msgstr "Movimientos"
 
+msgctxt "field:stock.shipment.in,number:"
+msgid "Numer"
+msgstr ""
+
 msgctxt "field:stock.shipment.in,origins:"
 msgid "Origins"
 msgstr "Orígenes"
@@ -735,10 +752,6 @@ msgctxt "field:stock.shipment.in,write_uid:"
 msgid "Write User"
 msgstr "Modificado por Usuario"
 
-msgctxt "field:stock.shipment.in.return,code:"
-msgid "Code"
-msgstr "Código"
-
 msgctxt "field:stock.shipment.in.return,company:"
 msgid "Company"
 msgstr "Compañia"
@@ -751,6 +764,11 @@ msgctxt "field:stock.shipment.in.return,create_uid:"
 msgid "Create User"
 msgstr "Creado por Usuario"
 
+#, fuzzy
+msgctxt "field:stock.shipment.in.return,delivery_address:"
+msgid "Delivery Address"
+msgstr "Dirección de Envío"
+
 msgctxt "field:stock.shipment.in.return,effective_date:"
 msgid "Effective Date"
 msgstr "Fecha Efectiva"
@@ -767,6 +785,10 @@ msgctxt "field:stock.shipment.in.return,moves:"
 msgid "Moves"
 msgstr "Movimientos"
 
+msgctxt "field:stock.shipment.in.return,number:"
+msgid "Number"
+msgstr ""
+
 msgctxt "field:stock.shipment.in.return,origins:"
 msgid "Origins"
 msgstr "Orígenes"
@@ -787,6 +809,11 @@ msgctxt "field:stock.shipment.in.return,state:"
 msgid "State"
 msgstr "Estado"
 
+#, fuzzy
+msgctxt "field:stock.shipment.in.return,supplier:"
+msgid "Supplier"
+msgstr "Proveedor"
+
 msgctxt "field:stock.shipment.in.return,to_location:"
 msgid "To Location"
 msgstr "A Bodega"
@@ -807,10 +834,6 @@ msgctxt "field:stock.shipment.in.return.assign.failed,moves:"
 msgid "Moves"
 msgstr "Movimientos"
 
-msgctxt "field:stock.shipment.internal,code:"
-msgid "Code"
-msgstr "Código"
-
 msgctxt "field:stock.shipment.internal,company:"
 msgid "Company"
 msgstr "Compañia"
@@ -839,6 +862,10 @@ msgctxt "field:stock.shipment.internal,moves:"
 msgid "Moves"
 msgstr "Movimientos"
 
+msgctxt "field:stock.shipment.internal,number:"
+msgid "Number"
+msgstr ""
+
 msgctxt "field:stock.shipment.internal,planned_date:"
 msgid "Planned Date"
 msgstr "Fecha Planeada"
@@ -875,10 +902,6 @@ msgctxt "field:stock.shipment.internal.assign.failed,moves:"
 msgid "Moves"
 msgstr "Movimientos"
 
-msgctxt "field:stock.shipment.out,code:"
-msgid "Code"
-msgstr "Código"
-
 msgctxt "field:stock.shipment.out,company:"
 msgid "Company"
 msgstr "Compañia"
@@ -919,6 +942,10 @@ msgctxt "field:stock.shipment.out,moves:"
 msgid "Moves"
 msgstr "Movimientos"
 
+msgctxt "field:stock.shipment.out,number:"
+msgid "Number"
+msgstr ""
+
 msgctxt "field:stock.shipment.out,origins:"
 msgid "Origins"
 msgstr "Orígenes"
@@ -971,10 +998,6 @@ msgctxt "field:stock.shipment.out.assign.failed,inventory_moves:"
 msgid "Inventory Moves"
 msgstr "Movimientos de Inventario"
 
-msgctxt "field:stock.shipment.out.return,code:"
-msgid "Code"
-msgstr "Código"
-
 msgctxt "field:stock.shipment.out.return,company:"
 msgid "Company"
 msgstr "Compañia"
@@ -1019,6 +1042,10 @@ msgctxt "field:stock.shipment.out.return,moves:"
 msgid "Moves"
 msgstr "Movimientos"
 
+msgctxt "field:stock.shipment.out.return,number:"
+msgid "Number"
+msgstr ""
+
 msgctxt "field:stock.shipment.out.return,origins:"
 msgid "Origins"
 msgstr "Orígenes"
@@ -1327,6 +1354,11 @@ msgctxt ""
 msgid "Received"
 msgstr "Recibido"
 
+#, fuzzy
+msgctxt "model:ir.sequence,name:sequence_inventory"
+msgid "Inventory"
+msgstr "Inventario"
+
 msgctxt "model:ir.sequence,name:sequence_shipment_in"
 msgid "Supplier Shipment"
 msgstr "Envío de Proveedor"
@@ -1347,6 +1379,11 @@ msgctxt "model:ir.sequence,name:sequence_shipment_out_return"
 msgid "Customer Return Shipment"
 msgstr "Devolución de Cliente"
 
+#, fuzzy
+msgctxt "model:ir.sequence.type,name:sequence_type_inventory"
+msgid "Inventory"
+msgstr "Inventario"
+
 msgctxt "model:ir.sequence.type,name:sequence_type_shipment_in"
 msgid "Supplier Shipment"
 msgstr "Envío de Proveedor"
@@ -1539,215 +1576,235 @@ msgctxt "model:stock.shipment.out.return,name:"
 msgid "Customer Return Shipment"
 msgstr "Envío de Devolución de Cliente"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "/"
 msgstr "/"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
-msgid "Code:"
-msgstr "Código:"
+msgctxt "report:stock.shipment.in.restocking_list:"
+msgid ":"
+msgstr ""
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "From Location"
 msgstr "Desde Bodega"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Planned Date:"
 msgstr "Fecha Planeada:"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Product"
 msgstr "Producto"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Quantity"
 msgstr "Cantidad"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Reference:"
 msgstr "Referencia:"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Restocking List"
 msgstr "Lista de renovación de existencias"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+#, fuzzy
+msgctxt "report:stock.shipment.in.restocking_list:"
+msgid "Shipment Number"
+msgstr "Número de Envío:"
+
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Supplier:"
 msgstr "Proveedor:"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "To Location"
 msgstr "A Bodega"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Warehouse:"
 msgstr "Depósito:"
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "/"
 msgstr "/"
 
-msgctxt "odt:stock.shipment.internal.report:"
-msgid "Code:"
-msgstr "Código:"
+msgctxt "report:stock.shipment.internal.report:"
+msgid ":"
+msgstr ""
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "From Location"
 msgstr "Desde Bodega"
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "From Location:"
 msgstr "Desde Bodega:"
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "Internal Shipment"
 msgstr "Envío Interno"
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "Planned Date:"
 msgstr "Fecha Planeada:"
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "Product"
 msgstr "Producto"
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "Quantity"
 msgstr "Cantidad"
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "Reference:"
 msgstr "Referencia:"
 
-msgctxt "odt:stock.shipment.internal.report:"
+#, fuzzy
+msgctxt "report:stock.shipment.internal.report:"
+msgid "Shipment Number"
+msgstr "Número de Envío:"
+
+msgctxt "report:stock.shipment.internal.report:"
 msgid "To Location"
 msgstr "A Bodega"
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "To Location:"
 msgstr "A Bodega:"
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "/"
 msgstr "/"
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Customer Code:"
 msgstr "Código de Cliente:"
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Date:"
 msgstr "Fecha:"
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Delivery Note"
 msgstr "Nota de Entrega"
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Product"
 msgstr "Producto"
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Quantity"
 msgstr "Cantidad"
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Reference:"
 msgstr "Referencia:"
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Shipment Number:"
 msgstr "Número de Envío:"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "/"
 msgstr "/"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
-msgid "Code:"
-msgstr "Código:"
+msgctxt "report:stock.shipment.out.picking_list:"
+msgid ":"
+msgstr ""
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Customer:"
 msgstr "Cliente:"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "From Location"
 msgstr "Desde Bodega"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Picking List"
 msgstr "Lista de selección"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Planned Date:"
 msgstr "Fecha Planeada:"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Product"
 msgstr "Producto"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Quantity"
 msgstr "Cantidad"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Reference:"
 msgstr "Referencia:"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+#, fuzzy
+msgctxt "report:stock.shipment.out.picking_list:"
+msgid "Shipment Number"
+msgstr "Número de Envío:"
+
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "To Location"
 msgstr "A Bodega"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Warehouse:"
 msgstr "Depósito:"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "/"
 msgstr "/"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid ":"
 msgstr ":"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
-msgid "Code:"
-msgstr "Código:"
-
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Customer"
 msgstr "Cliente"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "From Location"
 msgstr "Desde Bodega"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
+msgid "Number"
+msgstr ""
+
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Planned Date:"
 msgstr "Fecha Planeada:"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Product"
 msgstr "Producto"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Quantity"
 msgstr "Cantidad"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Reference:"
 msgstr "Referencia:"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Restocking List"
 msgstr "Lista de renovación de existencias"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+#, fuzzy
+msgctxt "report:stock.shipment.out.return.restocking_list:"
+msgid "Shipment"
+msgstr "Envío"
+
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "To Location"
 msgstr "A Bodega"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Warehouse:"
 msgstr "Depósito:"
 
@@ -1935,6 +1992,16 @@ msgctxt "view:product.product:"
 msgid "Products"
 msgstr "Productos"
 
+#, fuzzy
+msgctxt "view:stock.configuration:"
+msgid "Inventory"
+msgstr "Inventario"
+
+#, fuzzy
+msgctxt "view:stock.configuration:"
+msgid "Shipments"
+msgstr "Envío"
+
 msgctxt "view:stock.configuration:"
 msgid "Stock Configuration"
 msgstr "Configuración de Inventarios"
@@ -1985,6 +2052,10 @@ msgstr "Bodegas"
 
 msgctxt "view:stock.move:"
 msgid "Cancel"
+msgstr "Cancelar"
+
+msgctxt "view:stock.move:"
+msgid "Do"
 msgstr ""
 
 msgctxt "view:stock.move:"
@@ -1997,7 +2068,7 @@ msgstr "Movimientos"
 
 msgctxt "view:stock.move:"
 msgid "Reset to Draft"
-msgstr ""
+msgstr "Restablecer a Borrador"
 
 msgctxt "view:stock.period.cache:"
 msgid "Period Cache"
diff --git a/locale/es_EC.po b/locale/es_EC.po
index 119663a..a99aa4e 100644
--- a/locale/es_EC.po
+++ b/locale/es_EC.po
@@ -202,6 +202,10 @@ msgctxt "field:stock.configuration,id:"
 msgid "ID"
 msgstr "ID"
 
+msgctxt "field:stock.configuration,inventory_sequence:"
+msgid "Inventory Sequence"
+msgstr ""
+
 msgctxt "field:stock.configuration,rec_name:"
 msgid "Name"
 msgstr "Nombre"
@@ -266,6 +270,10 @@ msgctxt "field:stock.inventory,lost_found:"
 msgid "Lost and Found"
 msgstr "Perdido y encontrado"
 
+msgctxt "field:stock.inventory,number:"
+msgid "Number"
+msgstr ""
+
 msgctxt "field:stock.inventory,rec_name:"
 msgid "Name"
 msgstr "Nombre"
@@ -414,6 +422,11 @@ msgctxt "field:stock.location,type:"
 msgid "Location type"
 msgstr "Tipo de ubicación"
 
+#, fuzzy
+msgctxt "field:stock.location,warehouse:"
+msgid "Warehouse"
+msgstr "Bodega"
+
 msgctxt "field:stock.location,write_date:"
 msgid "Write Date"
 msgstr "Fecha de modificación"
@@ -422,6 +435,10 @@ msgctxt "field:stock.location,write_uid:"
 msgid "Write User"
 msgstr "Modificado por usuario"
 
+msgctxt "field:stock.move,assignation_required:"
+msgid "Assignation Required"
+msgstr ""
+
 msgctxt "field:stock.move,company:"
 msgid "Company"
 msgstr "Empresa"
@@ -646,10 +663,6 @@ msgctxt "field:stock.products_by_locations.start,id:"
 msgid "ID"
 msgstr "ID"
 
-msgctxt "field:stock.shipment.in,code:"
-msgid "Code"
-msgstr "Código"
-
 msgctxt "field:stock.shipment.in,company:"
 msgid "Company"
 msgstr "Empresa"
@@ -686,6 +699,10 @@ msgctxt "field:stock.shipment.in,moves:"
 msgid "Moves"
 msgstr "Movimientos"
 
+msgctxt "field:stock.shipment.in,number:"
+msgid "Numer"
+msgstr ""
+
 msgctxt "field:stock.shipment.in,origins:"
 msgid "Origins"
 msgstr "Orígenes"
@@ -734,10 +751,6 @@ msgctxt "field:stock.shipment.in,write_uid:"
 msgid "Write User"
 msgstr "Modificado por usuario"
 
-msgctxt "field:stock.shipment.in.return,code:"
-msgid "Code"
-msgstr "Código"
-
 msgctxt "field:stock.shipment.in.return,company:"
 msgid "Company"
 msgstr "Empresa"
@@ -750,6 +763,11 @@ msgctxt "field:stock.shipment.in.return,create_uid:"
 msgid "Create User"
 msgstr "Creado por usuario"
 
+#, fuzzy
+msgctxt "field:stock.shipment.in.return,delivery_address:"
+msgid "Delivery Address"
+msgstr "Dirección de entrega"
+
 msgctxt "field:stock.shipment.in.return,effective_date:"
 msgid "Effective Date"
 msgstr "Fecha efectiva"
@@ -766,6 +784,10 @@ msgctxt "field:stock.shipment.in.return,moves:"
 msgid "Moves"
 msgstr "Movimientos"
 
+msgctxt "field:stock.shipment.in.return,number:"
+msgid "Number"
+msgstr ""
+
 msgctxt "field:stock.shipment.in.return,origins:"
 msgid "Origins"
 msgstr "Orígenes"
@@ -786,6 +808,11 @@ msgctxt "field:stock.shipment.in.return,state:"
 msgid "State"
 msgstr "Estado"
 
+#, fuzzy
+msgctxt "field:stock.shipment.in.return,supplier:"
+msgid "Supplier"
+msgstr "Proveedor"
+
 msgctxt "field:stock.shipment.in.return,to_location:"
 msgid "To Location"
 msgstr "A ubicación"
@@ -806,10 +833,6 @@ msgctxt "field:stock.shipment.in.return.assign.failed,moves:"
 msgid "Moves"
 msgstr "Movimientos"
 
-msgctxt "field:stock.shipment.internal,code:"
-msgid "Code"
-msgstr "Código"
-
 msgctxt "field:stock.shipment.internal,company:"
 msgid "Company"
 msgstr "Empresa"
@@ -838,6 +861,10 @@ msgctxt "field:stock.shipment.internal,moves:"
 msgid "Moves"
 msgstr "Movimientos"
 
+msgctxt "field:stock.shipment.internal,number:"
+msgid "Number"
+msgstr ""
+
 msgctxt "field:stock.shipment.internal,planned_date:"
 msgid "Planned Date"
 msgstr "Fecha planificada"
@@ -874,10 +901,6 @@ msgctxt "field:stock.shipment.internal.assign.failed,moves:"
 msgid "Moves"
 msgstr "Movimientos"
 
-msgctxt "field:stock.shipment.out,code:"
-msgid "Code"
-msgstr "Código"
-
 msgctxt "field:stock.shipment.out,company:"
 msgid "Company"
 msgstr "Empresa"
@@ -918,6 +941,10 @@ msgctxt "field:stock.shipment.out,moves:"
 msgid "Moves"
 msgstr "Movimientos"
 
+msgctxt "field:stock.shipment.out,number:"
+msgid "Number"
+msgstr ""
+
 msgctxt "field:stock.shipment.out,origins:"
 msgid "Origins"
 msgstr "Orígenes"
@@ -970,10 +997,6 @@ msgctxt "field:stock.shipment.out.assign.failed,inventory_moves:"
 msgid "Inventory Moves"
 msgstr "Movimientos de inventario"
 
-msgctxt "field:stock.shipment.out.return,code:"
-msgid "Code"
-msgstr "Código"
-
 msgctxt "field:stock.shipment.out.return,company:"
 msgid "Company"
 msgstr "Empresa"
@@ -1018,6 +1041,10 @@ msgctxt "field:stock.shipment.out.return,moves:"
 msgid "Moves"
 msgstr "Movimientos"
 
+msgctxt "field:stock.shipment.out.return,number:"
+msgid "Number"
+msgstr ""
+
 msgctxt "field:stock.shipment.out.return,origins:"
 msgid "Origins"
 msgstr "Orígenes"
@@ -1327,6 +1354,11 @@ msgctxt ""
 msgid "Received"
 msgstr "Recibido"
 
+#, fuzzy
+msgctxt "model:ir.sequence,name:sequence_inventory"
+msgid "Inventory"
+msgstr "Inventario"
+
 msgctxt "model:ir.sequence,name:sequence_shipment_in"
 msgid "Supplier Shipment"
 msgstr "Guía de remisión de proveedor"
@@ -1347,6 +1379,11 @@ msgctxt "model:ir.sequence,name:sequence_shipment_out_return"
 msgid "Customer Return Shipment"
 msgstr "Guía de remisión de devolución de cliente"
 
+#, fuzzy
+msgctxt "model:ir.sequence.type,name:sequence_type_inventory"
+msgid "Inventory"
+msgstr "Inventario"
+
 msgctxt "model:ir.sequence.type,name:sequence_type_shipment_in"
 msgid "Supplier Shipment"
 msgstr "Guía de remisión de proveedor"
@@ -1539,215 +1576,235 @@ msgctxt "model:stock.shipment.out.return,name:"
 msgid "Customer Return Shipment"
 msgstr "Guía de remisión de devolución de cliente"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "/"
 msgstr "/"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
-msgid "Code:"
-msgstr "Código:"
+msgctxt "report:stock.shipment.in.restocking_list:"
+msgid ":"
+msgstr ""
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "From Location"
 msgstr "Desde ubicación"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Planned Date:"
 msgstr "Fecha planificada:"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Product"
 msgstr "Producto"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Quantity"
 msgstr "Cantidad"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Reference:"
 msgstr "Referencia:"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Restocking List"
 msgstr "Lista de reabastecimiento"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+#, fuzzy
+msgctxt "report:stock.shipment.in.restocking_list:"
+msgid "Shipment Number"
+msgstr "Número de guía de remisión:"
+
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Supplier:"
 msgstr "Proveedor:"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "To Location"
 msgstr "A ubicación"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Warehouse:"
 msgstr "Bodega:"
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "/"
 msgstr "/"
 
-msgctxt "odt:stock.shipment.internal.report:"
-msgid "Code:"
-msgstr "Código:"
+msgctxt "report:stock.shipment.internal.report:"
+msgid ":"
+msgstr ""
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "From Location"
 msgstr "Desde ubicación"
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "From Location:"
 msgstr "Desde ubicación:"
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "Internal Shipment"
 msgstr "Guía de remisión interna"
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "Planned Date:"
 msgstr "Fecha planificada:"
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "Product"
 msgstr "Producto"
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "Quantity"
 msgstr "Cantidad"
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "Reference:"
 msgstr "Referencia:"
 
-msgctxt "odt:stock.shipment.internal.report:"
+#, fuzzy
+msgctxt "report:stock.shipment.internal.report:"
+msgid "Shipment Number"
+msgstr "Número de guía de remisión:"
+
+msgctxt "report:stock.shipment.internal.report:"
 msgid "To Location"
 msgstr "A ubicación"
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "To Location:"
 msgstr "A ubicación:"
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "/"
 msgstr "/"
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Customer Code:"
 msgstr "Código de cliente:"
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Date:"
 msgstr "Fecha:"
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Delivery Note"
 msgstr "Nota de entrega"
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Product"
 msgstr "Producto"
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Quantity"
 msgstr "Cantidad"
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Reference:"
 msgstr "Referencia:"
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Shipment Number:"
 msgstr "Número de guía de remisión:"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "/"
 msgstr "/"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
-msgid "Code:"
-msgstr "Código:"
+msgctxt "report:stock.shipment.out.picking_list:"
+msgid ":"
+msgstr ""
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Customer:"
 msgstr "Cliente:"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "From Location"
 msgstr "Desde ubicación"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Picking List"
 msgstr "Lista de recogida"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Planned Date:"
 msgstr "Fecha planificada:"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Product"
 msgstr "Producto"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Quantity"
 msgstr "Cantidad"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Reference:"
 msgstr "Referencia:"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+#, fuzzy
+msgctxt "report:stock.shipment.out.picking_list:"
+msgid "Shipment Number"
+msgstr "Número de guía de remisión:"
+
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "To Location"
 msgstr "A ubicación"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Warehouse:"
 msgstr "Bodega:"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "/"
 msgstr "/"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid ":"
 msgstr ":"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
-msgid "Code:"
-msgstr "Código:"
-
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Customer"
 msgstr "Cliente"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "From Location"
 msgstr "Desde ubicación"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
+msgid "Number"
+msgstr ""
+
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Planned Date:"
 msgstr "Fecha planificada:"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Product"
 msgstr "Producto"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Quantity"
 msgstr "Cantidad"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Reference:"
 msgstr "Referencia:"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Restocking List"
 msgstr "Lista de reabastecimiento"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+#, fuzzy
+msgctxt "report:stock.shipment.out.return.restocking_list:"
+msgid "Shipment"
+msgstr "Envío"
+
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "To Location"
 msgstr "A ubicación"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Warehouse:"
 msgstr "Bodega:"
 
@@ -1935,6 +1992,16 @@ msgctxt "view:product.product:"
 msgid "Products"
 msgstr "Productos"
 
+#, fuzzy
+msgctxt "view:stock.configuration:"
+msgid "Inventory"
+msgstr "Inventario"
+
+#, fuzzy
+msgctxt "view:stock.configuration:"
+msgid "Shipments"
+msgstr "Envío"
+
 msgctxt "view:stock.configuration:"
 msgid "Stock Configuration"
 msgstr "Configuración de stock"
@@ -1949,7 +2016,7 @@ msgstr "Líneas de inventario"
 
 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"
+msgstr "Agregar una línea de inventario por cada producto que falta"
 
 msgctxt "view:stock.inventory:"
 msgid "Cancel"
@@ -1988,6 +2055,10 @@ msgid "Cancel"
 msgstr "Cancelar"
 
 msgctxt "view:stock.move:"
+msgid "Do"
+msgstr ""
+
+msgctxt "view:stock.move:"
 msgid "Move"
 msgstr "Movimiento"
 
diff --git a/locale/es_ES.po b/locale/es_ES.po
index ce4f7d2..3e37bfe 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -195,6 +195,10 @@ msgctxt "field:stock.configuration,id:"
 msgid "ID"
 msgstr "ID"
 
+msgctxt "field:stock.configuration,inventory_sequence:"
+msgid "Inventory Sequence"
+msgstr ""
+
 msgctxt "field:stock.configuration,rec_name:"
 msgid "Name"
 msgstr "Nombre"
@@ -259,6 +263,10 @@ msgctxt "field:stock.inventory,lost_found:"
 msgid "Lost and Found"
 msgstr "Perdido-encontrado"
 
+msgctxt "field:stock.inventory,number:"
+msgid "Number"
+msgstr ""
+
 msgctxt "field:stock.inventory,rec_name:"
 msgid "Name"
 msgstr "Nombre"
@@ -407,6 +415,11 @@ msgctxt "field:stock.location,type:"
 msgid "Location type"
 msgstr "Tipo de ubicación"
 
+#, fuzzy
+msgctxt "field:stock.location,warehouse:"
+msgid "Warehouse"
+msgstr "Almacén"
+
 msgctxt "field:stock.location,write_date:"
 msgid "Write Date"
 msgstr "Fecha modificación"
@@ -415,6 +428,10 @@ msgctxt "field:stock.location,write_uid:"
 msgid "Write User"
 msgstr "Usuario modificación"
 
+msgctxt "field:stock.move,assignation_required:"
+msgid "Assignation Required"
+msgstr ""
+
 msgctxt "field:stock.move,company:"
 msgid "Company"
 msgstr "Empresa"
@@ -639,10 +656,6 @@ msgctxt "field:stock.products_by_locations.start,id:"
 msgid "ID"
 msgstr "ID"
 
-msgctxt "field:stock.shipment.in,code:"
-msgid "Code"
-msgstr "Código"
-
 msgctxt "field:stock.shipment.in,company:"
 msgid "Company"
 msgstr "Empresa"
@@ -679,6 +692,10 @@ msgctxt "field:stock.shipment.in,moves:"
 msgid "Moves"
 msgstr "Movimientos"
 
+msgctxt "field:stock.shipment.in,number:"
+msgid "Numer"
+msgstr ""
+
 msgctxt "field:stock.shipment.in,origins:"
 msgid "Origins"
 msgstr "Orígenes"
@@ -727,10 +744,6 @@ msgctxt "field:stock.shipment.in,write_uid:"
 msgid "Write User"
 msgstr "Usuario modificación"
 
-msgctxt "field:stock.shipment.in.return,code:"
-msgid "Code"
-msgstr "Código"
-
 msgctxt "field:stock.shipment.in.return,company:"
 msgid "Company"
 msgstr "Empresa"
@@ -743,6 +756,11 @@ msgctxt "field:stock.shipment.in.return,create_uid:"
 msgid "Create User"
 msgstr "Usuario creación"
 
+#, fuzzy
+msgctxt "field:stock.shipment.in.return,delivery_address:"
+msgid "Delivery Address"
+msgstr "Dirección de envío"
+
 msgctxt "field:stock.shipment.in.return,effective_date:"
 msgid "Effective Date"
 msgstr "Fecha efectiva"
@@ -759,6 +777,10 @@ msgctxt "field:stock.shipment.in.return,moves:"
 msgid "Moves"
 msgstr "Movimientos"
 
+msgctxt "field:stock.shipment.in.return,number:"
+msgid "Number"
+msgstr ""
+
 msgctxt "field:stock.shipment.in.return,origins:"
 msgid "Origins"
 msgstr "Orígenes"
@@ -779,6 +801,11 @@ msgctxt "field:stock.shipment.in.return,state:"
 msgid "State"
 msgstr "Estado"
 
+#, fuzzy
+msgctxt "field:stock.shipment.in.return,supplier:"
+msgid "Supplier"
+msgstr "Proveedor"
+
 msgctxt "field:stock.shipment.in.return,to_location:"
 msgid "To Location"
 msgstr "A ubicación"
@@ -799,10 +826,6 @@ msgctxt "field:stock.shipment.in.return.assign.failed,moves:"
 msgid "Moves"
 msgstr "Movimientos"
 
-msgctxt "field:stock.shipment.internal,code:"
-msgid "Code"
-msgstr "Código"
-
 msgctxt "field:stock.shipment.internal,company:"
 msgid "Company"
 msgstr "Empresa"
@@ -831,6 +854,10 @@ msgctxt "field:stock.shipment.internal,moves:"
 msgid "Moves"
 msgstr "Movimientos"
 
+msgctxt "field:stock.shipment.internal,number:"
+msgid "Number"
+msgstr ""
+
 msgctxt "field:stock.shipment.internal,planned_date:"
 msgid "Planned Date"
 msgstr "Fecha estimada"
@@ -867,10 +894,6 @@ msgctxt "field:stock.shipment.internal.assign.failed,moves:"
 msgid "Moves"
 msgstr "Movimientos"
 
-msgctxt "field:stock.shipment.out,code:"
-msgid "Code"
-msgstr "Código"
-
 msgctxt "field:stock.shipment.out,company:"
 msgid "Company"
 msgstr "Empresa"
@@ -911,6 +934,10 @@ msgctxt "field:stock.shipment.out,moves:"
 msgid "Moves"
 msgstr "Movimientos"
 
+msgctxt "field:stock.shipment.out,number:"
+msgid "Number"
+msgstr ""
+
 msgctxt "field:stock.shipment.out,origins:"
 msgid "Origins"
 msgstr "Origen"
@@ -963,10 +990,6 @@ msgctxt "field:stock.shipment.out.assign.failed,inventory_moves:"
 msgid "Inventory Moves"
 msgstr "Movimientos internos"
 
-msgctxt "field:stock.shipment.out.return,code:"
-msgid "Code"
-msgstr "Código"
-
 msgctxt "field:stock.shipment.out.return,company:"
 msgid "Company"
 msgstr "Empresa"
@@ -1011,6 +1034,10 @@ msgctxt "field:stock.shipment.out.return,moves:"
 msgid "Moves"
 msgstr "Movimientos"
 
+msgctxt "field:stock.shipment.out.return,number:"
+msgid "Number"
+msgstr ""
+
 msgctxt "field:stock.shipment.out.return,origins:"
 msgid "Origins"
 msgstr "Orígenes"
@@ -1320,6 +1347,11 @@ msgctxt ""
 msgid "Received"
 msgstr "Recibido"
 
+#, fuzzy
+msgctxt "model:ir.sequence,name:sequence_inventory"
+msgid "Inventory"
+msgstr "Inventario"
+
 msgctxt "model:ir.sequence,name:sequence_shipment_in"
 msgid "Supplier Shipment"
 msgstr "Albarán proveedor"
@@ -1340,6 +1372,11 @@ msgctxt "model:ir.sequence,name:sequence_shipment_out_return"
 msgid "Customer Return Shipment"
 msgstr "Albarán devolución cliente"
 
+#, fuzzy
+msgctxt "model:ir.sequence.type,name:sequence_type_inventory"
+msgid "Inventory"
+msgstr "Inventario"
+
 msgctxt "model:ir.sequence.type,name:sequence_type_shipment_in"
 msgid "Supplier Shipment"
 msgstr "Albarán proveedor"
@@ -1532,215 +1569,235 @@ msgctxt "model:stock.shipment.out.return,name:"
 msgid "Customer Return Shipment"
 msgstr "Albarán devolución cliente"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "/"
 msgstr "/"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
-msgid "Code:"
-msgstr "Código:"
+msgctxt "report:stock.shipment.in.restocking_list:"
+msgid ":"
+msgstr ""
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "From Location"
 msgstr "Desde ubicación"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Planned Date:"
 msgstr "Fecha estimada:"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Product"
 msgstr "Producto"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Quantity"
 msgstr "Cantidad"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Reference:"
 msgstr "Referencia:"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Restocking List"
 msgstr "Lista de reabastecimiento"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+#, fuzzy
+msgctxt "report:stock.shipment.in.restocking_list:"
+msgid "Shipment Number"
+msgstr "Número de albarán:"
+
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Supplier:"
 msgstr "Proveedor:"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "To Location"
 msgstr "A ubicación"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Warehouse:"
 msgstr "Almacén:"
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "/"
 msgstr "/"
 
-msgctxt "odt:stock.shipment.internal.report:"
-msgid "Code:"
-msgstr "Código:"
+msgctxt "report:stock.shipment.internal.report:"
+msgid ":"
+msgstr ""
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "From Location"
 msgstr "Desde ubicación"
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "From Location:"
 msgstr "Desde ubicación:"
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "Internal Shipment"
 msgstr "Albarán interno"
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "Planned Date:"
 msgstr "Fecha estimada:"
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "Product"
 msgstr "Producto"
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "Quantity"
 msgstr "Cantidad"
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "Reference:"
 msgstr "Referencia:"
 
-msgctxt "odt:stock.shipment.internal.report:"
+#, fuzzy
+msgctxt "report:stock.shipment.internal.report:"
+msgid "Shipment Number"
+msgstr "Número de albarán:"
+
+msgctxt "report:stock.shipment.internal.report:"
 msgid "To Location"
 msgstr "A ubicación"
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "To Location:"
 msgstr "A ubicación:"
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "/"
 msgstr "/"
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Customer Code:"
 msgstr "Código de cliente:"
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Date:"
 msgstr "Fecha:"
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Delivery Note"
 msgstr "Nota de envío"
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Product"
 msgstr "Producto"
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Quantity"
 msgstr "Cantidad"
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Reference:"
 msgstr "Referencia:"
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Shipment Number:"
 msgstr "Número de albarán:"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "/"
 msgstr "/"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
-msgid "Code:"
-msgstr "Código:"
+msgctxt "report:stock.shipment.out.picking_list:"
+msgid ":"
+msgstr ""
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Customer:"
 msgstr "Cliente:"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "From Location"
 msgstr "Desde ubicación"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Picking List"
 msgstr "Lista recogida"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Planned Date:"
 msgstr "Fecha estimada:"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Product"
 msgstr "Producto"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Quantity"
 msgstr "Cantidad"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Reference:"
 msgstr "Referencia:"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+#, fuzzy
+msgctxt "report:stock.shipment.out.picking_list:"
+msgid "Shipment Number"
+msgstr "Número de albarán:"
+
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "To Location"
 msgstr "A ubicación"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Warehouse:"
 msgstr "Almacén:"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "/"
 msgstr "/"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid ":"
 msgstr ":"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
-msgid "Code:"
-msgstr "Código:"
-
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Customer"
 msgstr "Cliente"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "From Location"
 msgstr "Desde ubicación"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
+msgid "Number"
+msgstr ""
+
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Planned Date:"
 msgstr "Fecha estimada:"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Product"
 msgstr "Producto"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Quantity"
 msgstr "Cantidad"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Reference:"
 msgstr "Referencia:"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Restocking List"
 msgstr "Lista de reabastecimiento"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+#, fuzzy
+msgctxt "report:stock.shipment.out.return.restocking_list:"
+msgid "Shipment"
+msgstr "Envío"
+
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "To Location"
 msgstr "A ubicación"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Warehouse:"
 msgstr "Almacén:"
 
@@ -1928,6 +1985,16 @@ msgctxt "view:product.product:"
 msgid "Products"
 msgstr "Productos"
 
+#, fuzzy
+msgctxt "view:stock.configuration:"
+msgid "Inventory"
+msgstr "Inventario"
+
+#, fuzzy
+msgctxt "view:stock.configuration:"
+msgid "Shipments"
+msgstr "Envío"
+
 msgctxt "view:stock.configuration:"
 msgid "Stock Configuration"
 msgstr "Configuración stock"
@@ -1981,6 +2048,10 @@ msgid "Cancel"
 msgstr "Cancelar"
 
 msgctxt "view:stock.move:"
+msgid "Do"
+msgstr ""
+
+msgctxt "view:stock.move:"
 msgid "Move"
 msgstr "Movimiento"
 
diff --git a/locale/es_MX.po b/locale/es_MX.po
index d350b2a..6500f61 100644
--- a/locale/es_MX.po
+++ b/locale/es_MX.po
@@ -196,6 +196,10 @@ msgctxt "field:stock.configuration,id:"
 msgid "ID"
 msgstr "ID"
 
+msgctxt "field:stock.configuration,inventory_sequence:"
+msgid "Inventory Sequence"
+msgstr ""
+
 msgctxt "field:stock.configuration,rec_name:"
 msgid "Name"
 msgstr "Nombre"
@@ -260,6 +264,10 @@ msgctxt "field:stock.inventory,lost_found:"
 msgid "Lost and Found"
 msgstr "Perdido/encontrado"
 
+msgctxt "field:stock.inventory,number:"
+msgid "Number"
+msgstr ""
+
 msgctxt "field:stock.inventory,rec_name:"
 msgid "Name"
 msgstr "Nombre"
@@ -408,6 +416,11 @@ msgctxt "field:stock.location,type:"
 msgid "Location type"
 msgstr "Tipo de ubicación"
 
+#, fuzzy
+msgctxt "field:stock.location,warehouse:"
+msgid "Warehouse"
+msgstr "Almacén"
+
 msgctxt "field:stock.location,write_date:"
 msgid "Write Date"
 msgstr "Fecha modificación"
@@ -416,6 +429,10 @@ msgctxt "field:stock.location,write_uid:"
 msgid "Write User"
 msgstr "Usuario modificación"
 
+msgctxt "field:stock.move,assignation_required:"
+msgid "Assignation Required"
+msgstr ""
+
 msgctxt "field:stock.move,company:"
 msgid "Company"
 msgstr "Empresa"
@@ -640,10 +657,6 @@ msgctxt "field:stock.products_by_locations.start,id:"
 msgid "ID"
 msgstr "ID"
 
-msgctxt "field:stock.shipment.in,code:"
-msgid "Code"
-msgstr "Código"
-
 msgctxt "field:stock.shipment.in,company:"
 msgid "Company"
 msgstr "Empresa"
@@ -680,6 +693,10 @@ msgctxt "field:stock.shipment.in,moves:"
 msgid "Moves"
 msgstr "Movimientos"
 
+msgctxt "field:stock.shipment.in,number:"
+msgid "Numer"
+msgstr ""
+
 msgctxt "field:stock.shipment.in,origins:"
 msgid "Origins"
 msgstr "Orígenes"
@@ -728,10 +745,6 @@ msgctxt "field:stock.shipment.in,write_uid:"
 msgid "Write User"
 msgstr "Usuario modificación"
 
-msgctxt "field:stock.shipment.in.return,code:"
-msgid "Code"
-msgstr "Código"
-
 msgctxt "field:stock.shipment.in.return,company:"
 msgid "Company"
 msgstr "Empresa"
@@ -744,6 +757,11 @@ msgctxt "field:stock.shipment.in.return,create_uid:"
 msgid "Create User"
 msgstr "Usuario creación"
 
+#, fuzzy
+msgctxt "field:stock.shipment.in.return,delivery_address:"
+msgid "Delivery Address"
+msgstr "Dirección envío"
+
 msgctxt "field:stock.shipment.in.return,effective_date:"
 msgid "Effective Date"
 msgstr "Fecha efectiva"
@@ -760,6 +778,10 @@ msgctxt "field:stock.shipment.in.return,moves:"
 msgid "Moves"
 msgstr "Movimientos"
 
+msgctxt "field:stock.shipment.in.return,number:"
+msgid "Number"
+msgstr ""
+
 msgctxt "field:stock.shipment.in.return,origins:"
 msgid "Origins"
 msgstr "Orígenes"
@@ -780,6 +802,11 @@ msgctxt "field:stock.shipment.in.return,state:"
 msgid "State"
 msgstr "Estado"
 
+#, fuzzy
+msgctxt "field:stock.shipment.in.return,supplier:"
+msgid "Supplier"
+msgstr "Proveedor"
+
 msgctxt "field:stock.shipment.in.return,to_location:"
 msgid "To Location"
 msgstr "A ubicación"
@@ -800,10 +827,6 @@ msgctxt "field:stock.shipment.in.return.assign.failed,moves:"
 msgid "Moves"
 msgstr "Movimientos"
 
-msgctxt "field:stock.shipment.internal,code:"
-msgid "Code"
-msgstr "Código"
-
 msgctxt "field:stock.shipment.internal,company:"
 msgid "Company"
 msgstr "Empresa"
@@ -832,6 +855,10 @@ msgctxt "field:stock.shipment.internal,moves:"
 msgid "Moves"
 msgstr "Movimientos"
 
+msgctxt "field:stock.shipment.internal,number:"
+msgid "Number"
+msgstr ""
+
 msgctxt "field:stock.shipment.internal,planned_date:"
 msgid "Planned Date"
 msgstr "Fecha estimada"
@@ -868,10 +895,6 @@ msgctxt "field:stock.shipment.internal.assign.failed,moves:"
 msgid "Moves"
 msgstr "Movimientos"
 
-msgctxt "field:stock.shipment.out,code:"
-msgid "Code"
-msgstr "Código"
-
 msgctxt "field:stock.shipment.out,company:"
 msgid "Company"
 msgstr "Empresa"
@@ -912,6 +935,10 @@ msgctxt "field:stock.shipment.out,moves:"
 msgid "Moves"
 msgstr "Movimientos"
 
+msgctxt "field:stock.shipment.out,number:"
+msgid "Number"
+msgstr ""
+
 msgctxt "field:stock.shipment.out,origins:"
 msgid "Origins"
 msgstr "Origen"
@@ -964,10 +991,6 @@ msgctxt "field:stock.shipment.out.assign.failed,inventory_moves:"
 msgid "Inventory Moves"
 msgstr "Movimientos internos"
 
-msgctxt "field:stock.shipment.out.return,code:"
-msgid "Code"
-msgstr "Código"
-
 msgctxt "field:stock.shipment.out.return,company:"
 msgid "Company"
 msgstr "Empresa"
@@ -1012,6 +1035,10 @@ msgctxt "field:stock.shipment.out.return,moves:"
 msgid "Moves"
 msgstr "Movimientos"
 
+msgctxt "field:stock.shipment.out.return,number:"
+msgid "Number"
+msgstr ""
+
 msgctxt "field:stock.shipment.out.return,origins:"
 msgid "Origins"
 msgstr "Orígenes"
@@ -1322,6 +1349,11 @@ msgctxt ""
 msgid "Received"
 msgstr "Recibido"
 
+#, fuzzy
+msgctxt "model:ir.sequence,name:sequence_inventory"
+msgid "Inventory"
+msgstr "Inventario"
+
 msgctxt "model:ir.sequence,name:sequence_shipment_in"
 msgid "Supplier Shipment"
 msgstr "Envío proveedor"
@@ -1342,6 +1374,11 @@ msgctxt "model:ir.sequence,name:sequence_shipment_out_return"
 msgid "Customer Return Shipment"
 msgstr "Envío devolución cliente"
 
+#, fuzzy
+msgctxt "model:ir.sequence.type,name:sequence_type_inventory"
+msgid "Inventory"
+msgstr "Inventario"
+
 msgctxt "model:ir.sequence.type,name:sequence_type_shipment_in"
 msgid "Supplier Shipment"
 msgstr "Envío proveedor"
@@ -1534,217 +1571,275 @@ msgctxt "model:stock.shipment.out.return,name:"
 msgid "Customer Return Shipment"
 msgstr "Envío devolución cliente"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "/"
 msgstr ""
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
-msgid "Code:"
+msgctxt "report:stock.shipment.in.restocking_list:"
+msgid ":"
 msgstr ""
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+#, fuzzy
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "From Location"
-msgstr ""
+msgstr "Desde ubicación"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+#, fuzzy
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Planned Date:"
-msgstr ""
+msgstr "Fecha estimada"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+#, fuzzy
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Product"
-msgstr ""
+msgstr "Producto"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+#, fuzzy
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Quantity"
-msgstr ""
+msgstr "Cantidad"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+#, fuzzy
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Reference:"
-msgstr ""
+msgstr "Referencia"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+#, fuzzy
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Restocking List"
+msgstr "Lista de reabastecimiento"
+
+msgctxt "report:stock.shipment.in.restocking_list:"
+msgid "Shipment Number"
 msgstr ""
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+#, fuzzy
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Supplier:"
-msgstr ""
+msgstr "Proveedor"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+#, fuzzy
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "To Location"
-msgstr ""
+msgstr "A ubicación"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+#, fuzzy
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Warehouse:"
-msgstr ""
+msgstr "Almacén"
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "/"
 msgstr ""
 
-msgctxt "odt:stock.shipment.internal.report:"
-msgid "Code:"
+msgctxt "report:stock.shipment.internal.report:"
+msgid ":"
 msgstr ""
 
-msgctxt "odt:stock.shipment.internal.report:"
+#, fuzzy
+msgctxt "report:stock.shipment.internal.report:"
 msgid "From Location"
-msgstr ""
+msgstr "Desde ubicación"
 
-msgctxt "odt:stock.shipment.internal.report:"
+#, fuzzy
+msgctxt "report:stock.shipment.internal.report:"
 msgid "From Location:"
-msgstr ""
+msgstr "Desde ubicación"
 
-msgctxt "odt:stock.shipment.internal.report:"
+#, fuzzy
+msgctxt "report:stock.shipment.internal.report:"
 msgid "Internal Shipment"
-msgstr ""
+msgstr "Reubicaciones internas"
 
-msgctxt "odt:stock.shipment.internal.report:"
+#, fuzzy
+msgctxt "report:stock.shipment.internal.report:"
 msgid "Planned Date:"
-msgstr ""
+msgstr "Fecha estimada"
 
-msgctxt "odt:stock.shipment.internal.report:"
+#, fuzzy
+msgctxt "report:stock.shipment.internal.report:"
 msgid "Product"
-msgstr ""
+msgstr "Producto"
 
-msgctxt "odt:stock.shipment.internal.report:"
+#, fuzzy
+msgctxt "report:stock.shipment.internal.report:"
 msgid "Quantity"
-msgstr ""
+msgstr "Cantidad"
 
-msgctxt "odt:stock.shipment.internal.report:"
+#, fuzzy
+msgctxt "report:stock.shipment.internal.report:"
 msgid "Reference:"
+msgstr "Referencia"
+
+msgctxt "report:stock.shipment.internal.report:"
+msgid "Shipment Number"
 msgstr ""
 
-msgctxt "odt:stock.shipment.internal.report:"
+#, fuzzy
+msgctxt "report:stock.shipment.internal.report:"
 msgid "To Location"
-msgstr ""
+msgstr "A ubicación"
 
-msgctxt "odt:stock.shipment.internal.report:"
+#, fuzzy
+msgctxt "report:stock.shipment.internal.report:"
 msgid "To Location:"
-msgstr ""
+msgstr "A ubicación"
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "/"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Customer Code:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+#, fuzzy
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Date:"
-msgstr ""
+msgstr "Fecha"
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+#, fuzzy
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Delivery Note"
-msgstr ""
+msgstr "Nota de envío"
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+#, fuzzy
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Product"
-msgstr ""
+msgstr "Producto"
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+#, fuzzy
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Quantity"
-msgstr ""
+msgstr "Cantidad"
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+#, fuzzy
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Reference:"
-msgstr ""
+msgstr "Referencia"
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Shipment Number:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "/"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.picking_list:"
-msgid "Code:"
+msgctxt "report:stock.shipment.out.picking_list:"
+msgid ":"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+#, fuzzy
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Customer:"
-msgstr ""
+msgstr "Cliente"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+#, fuzzy
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "From Location"
-msgstr ""
+msgstr "Desde ubicación"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+#, fuzzy
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Picking List"
-msgstr ""
+msgstr "Lista recogida"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+#, fuzzy
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Planned Date:"
-msgstr ""
+msgstr "Fecha estimada"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+#, fuzzy
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Product"
-msgstr ""
+msgstr "Producto"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+#, fuzzy
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Quantity"
-msgstr ""
+msgstr "Cantidad"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+#, fuzzy
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Reference:"
+msgstr "Referencia"
+
+msgctxt "report:stock.shipment.out.picking_list:"
+msgid "Shipment Number"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+#, fuzzy
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "To Location"
-msgstr ""
+msgstr "A ubicación"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+#, fuzzy
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Warehouse:"
-msgstr ""
+msgstr "Almacén"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "/"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid ":"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
-msgid "Code:"
-msgstr ""
-
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+#, fuzzy
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Customer"
-msgstr ""
+msgstr "Cliente"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+#, fuzzy
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "From Location"
+msgstr "Desde ubicación"
+
+msgctxt "report:stock.shipment.out.return.restocking_list:"
+msgid "Number"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+#, fuzzy
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Planned Date:"
-msgstr ""
+msgstr "Fecha estimada"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+#, fuzzy
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Product"
-msgstr ""
+msgstr "Producto"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+#, fuzzy
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Quantity"
-msgstr ""
+msgstr "Cantidad"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+#, fuzzy
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Reference:"
-msgstr ""
+msgstr "Referencia"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+#, fuzzy
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Restocking List"
-msgstr ""
+msgstr "Lista de reabastecimiento"
+
+#, fuzzy
+msgctxt "report:stock.shipment.out.return.restocking_list:"
+msgid "Shipment"
+msgstr "Envío"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+#, fuzzy
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "To Location"
-msgstr ""
+msgstr "A ubicación"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+#, fuzzy
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Warehouse:"
-msgstr ""
+msgstr "Almacén"
 
 msgctxt "selection:stock.inventory,state:"
 msgid "Canceled"
@@ -1914,41 +2009,58 @@ msgctxt "selection:stock.shipment.out.return,state:"
 msgid "Received"
 msgstr "Recibido"
 
+#, fuzzy
 msgctxt "view:party.party:"
 msgid "Stock"
-msgstr ""
+msgstr "Almacén y envíos"
 
+#, fuzzy
 msgctxt "view:product.by_location.start:"
 msgid "Product by Location"
-msgstr ""
+msgstr "Producto por ubicación"
 
+#, fuzzy
 msgctxt "view:product.product:"
 msgid "Cost Value"
-msgstr ""
+msgstr "Valor de costo"
 
+#, fuzzy
 msgctxt "view:product.product:"
 msgid "Products"
-msgstr ""
+msgstr "Productos"
 
+#, fuzzy
+msgctxt "view:stock.configuration:"
+msgid "Inventory"
+msgstr "Inventario"
+
+#, fuzzy
+msgctxt "view:stock.configuration:"
+msgid "Shipments"
+msgstr "Envío"
+
+#, fuzzy
 msgctxt "view:stock.configuration:"
 msgid "Stock Configuration"
-msgstr ""
+msgstr "Configuración de almacén"
 
 msgctxt "view:stock.inventory.line:"
 msgid "Inventory Line"
 msgstr ""
 
+#, fuzzy
 msgctxt "view:stock.inventory.line:"
 msgid "Inventory Lines"
-msgstr ""
+msgstr "Movimientos internos"
 
 msgctxt "view:stock.inventory:"
 msgid "Add an inventory line for each missing products"
 msgstr ""
 
+#, fuzzy
 msgctxt "view:stock.inventory:"
 msgid "Cancel"
-msgstr ""
+msgstr "Cancelar"
 
 msgctxt "view:stock.inventory:"
 msgid "Complete Inventory"
@@ -1958,37 +2070,48 @@ msgctxt "view:stock.inventory:"
 msgid "Confirm"
 msgstr ""
 
+#, fuzzy
 msgctxt "view:stock.inventory:"
 msgid "Inventories"
-msgstr ""
+msgstr "Inventarios"
 
+#, fuzzy
 msgctxt "view:stock.inventory:"
 msgid "Inventory"
-msgstr ""
+msgstr "Inventario"
 
+#, fuzzy
 msgctxt "view:stock.location:"
 msgid "Location"
-msgstr ""
+msgstr "Ubicación"
 
 msgctxt "view:stock.location:"
 msgid "Location Quantity"
 msgstr ""
 
+#, fuzzy
 msgctxt "view:stock.location:"
 msgid "Locations"
-msgstr ""
+msgstr "Configuración de ubicaciones"
 
+#, fuzzy
 msgctxt "view:stock.move:"
 msgid "Cancel"
+msgstr "Cancelar"
+
+msgctxt "view:stock.move:"
+msgid "Do"
 msgstr ""
 
+#, fuzzy
 msgctxt "view:stock.move:"
 msgid "Move"
-msgstr ""
+msgstr "Movimientos"
 
+#, fuzzy
 msgctxt "view:stock.move:"
 msgid "Moves"
-msgstr ""
+msgstr "Movimientos"
 
 msgctxt "view:stock.move:"
 msgid "Reset to Draft"
@@ -2002,33 +2125,40 @@ msgctxt "view:stock.period.cache:"
 msgid "Period Caches"
 msgstr ""
 
+#, fuzzy
 msgctxt "view:stock.period:"
 msgid "Close"
-msgstr ""
+msgstr "Cerrado"
 
+#, fuzzy
 msgctxt "view:stock.period:"
 msgid "Draft"
-msgstr ""
+msgstr "Borrador"
 
+#, fuzzy
 msgctxt "view:stock.period:"
 msgid "Period"
-msgstr ""
+msgstr "Período"
 
+#, fuzzy
 msgctxt "view:stock.period:"
 msgid "Periods"
-msgstr ""
+msgstr "Configuración de períodos"
 
+#, fuzzy
 msgctxt "view:stock.product_quantities_warehouse.start:"
 msgid "Product Quantities By Warehouse"
-msgstr ""
+msgstr "Unidades de producto por almacén"
 
+#, fuzzy
 msgctxt "view:stock.product_quantities_warehouse:"
 msgid "Product Quantities By Warehouse"
-msgstr ""
+msgstr "Unidades de producto por almacén"
 
+#, fuzzy
 msgctxt "view:stock.products_by_locations.start:"
 msgid "Products by Locations"
-msgstr ""
+msgstr "Productos por ubicación"
 
 msgctxt "view:stock.shipment.in.return.assign.failed:"
 msgid "Unable to Assign"
@@ -2038,65 +2168,78 @@ msgctxt "view:stock.shipment.in.return.assign.failed:"
 msgid "Unable to assign those products:"
 msgstr ""
 
+#, fuzzy
 msgctxt "view:stock.shipment.in.return:"
 msgid "Assign"
-msgstr ""
+msgstr "Reservado"
 
+#, fuzzy
 msgctxt "view:stock.shipment.in.return:"
 msgid "Cancel"
-msgstr ""
+msgstr "Cancelar"
 
+#, fuzzy
 msgctxt "view:stock.shipment.in.return:"
 msgid "Done"
-msgstr ""
+msgstr "Finalizado"
 
+#, fuzzy
 msgctxt "view:stock.shipment.in.return:"
 msgid "Draft"
-msgstr ""
+msgstr "Borrador"
 
+#, fuzzy
 msgctxt "view:stock.shipment.in.return:"
 msgid "Supplier Return Shipment"
-msgstr ""
+msgstr "Envío devolución proveedor"
 
+#, fuzzy
 msgctxt "view:stock.shipment.in.return:"
 msgid "Supplier Return Shipments"
-msgstr ""
+msgstr "Envíos devolución proveedor"
 
 msgctxt "view:stock.shipment.in.return:"
 msgid "Wait"
 msgstr ""
 
+#, fuzzy
 msgctxt "view:stock.shipment.in:"
 msgid "Cancel"
-msgstr ""
+msgstr "Cancelar"
 
+#, fuzzy
 msgctxt "view:stock.shipment.in:"
 msgid "Done"
-msgstr ""
+msgstr "Finalizado"
 
+#, fuzzy
 msgctxt "view:stock.shipment.in:"
 msgid "Incoming Moves"
-msgstr ""
+msgstr "Movimientos de entrada"
 
+#, fuzzy
 msgctxt "view:stock.shipment.in:"
 msgid "Inventory Moves"
-msgstr ""
+msgstr "Movimientos internos"
 
+#, fuzzy
 msgctxt "view:stock.shipment.in:"
 msgid "Receive"
-msgstr ""
+msgstr "Recibido"
 
 msgctxt "view:stock.shipment.in:"
 msgid "Reset to Draft"
 msgstr ""
 
+#, fuzzy
 msgctxt "view:stock.shipment.in:"
 msgid "Supplier Shipment"
-msgstr ""
+msgstr "Envío proveedor"
 
+#, fuzzy
 msgctxt "view:stock.shipment.in:"
 msgid "Supplier Shipments"
-msgstr ""
+msgstr "Envíos proveedor"
 
 msgctxt "view:stock.shipment.internal.assign.failed:"
 msgid "Unable to Assign"
@@ -2106,29 +2249,35 @@ msgctxt "view:stock.shipment.internal.assign.failed:"
 msgid "Unable to assign those products:"
 msgstr ""
 
+#, fuzzy
 msgctxt "view:stock.shipment.internal:"
 msgid "Assign"
-msgstr ""
+msgstr "Reservado"
 
+#, fuzzy
 msgctxt "view:stock.shipment.internal:"
 msgid "Cancel"
-msgstr ""
+msgstr "Cancelar"
 
+#, fuzzy
 msgctxt "view:stock.shipment.internal:"
 msgid "Done"
-msgstr ""
+msgstr "Finalizado"
 
+#, fuzzy
 msgctxt "view:stock.shipment.internal:"
 msgid "Draft"
-msgstr ""
+msgstr "Borrador"
 
+#, fuzzy
 msgctxt "view:stock.shipment.internal:"
 msgid "Internal Shipment"
-msgstr ""
+msgstr "Reubicaciones internas"
 
+#, fuzzy
 msgctxt "view:stock.shipment.internal:"
 msgid "Internal Shipments"
-msgstr ""
+msgstr "Reubicaciones internas"
 
 msgctxt "view:stock.shipment.internal:"
 msgid "Wait"
@@ -2142,73 +2291,89 @@ msgctxt "view:stock.shipment.out.assign.failed:"
 msgid "Unable to assign those products:"
 msgstr ""
 
+#, fuzzy
 msgctxt "view:stock.shipment.out.return:"
 msgid "Cancel"
-msgstr ""
+msgstr "Cancelar"
 
+#, fuzzy
 msgctxt "view:stock.shipment.out.return:"
 msgid "Customer Return Shipment"
-msgstr ""
+msgstr "Envío devolución cliente"
 
+#, fuzzy
 msgctxt "view:stock.shipment.out.return:"
 msgid "Customer Return Shipments"
-msgstr ""
+msgstr "Envíos devolución cliente "
 
+#, fuzzy
 msgctxt "view:stock.shipment.out.return:"
 msgid "Done"
-msgstr ""
+msgstr "Finalizado"
 
+#, fuzzy
 msgctxt "view:stock.shipment.out.return:"
 msgid "Draft"
-msgstr ""
+msgstr "Borrador"
 
+#, fuzzy
 msgctxt "view:stock.shipment.out.return:"
 msgid "Incoming Moves"
-msgstr ""
+msgstr "Movimientos de entrada"
 
+#, fuzzy
 msgctxt "view:stock.shipment.out.return:"
 msgid "Inventory Moves"
-msgstr ""
+msgstr "Movimientos internos"
 
+#, fuzzy
 msgctxt "view:stock.shipment.out.return:"
 msgid "Received"
-msgstr ""
+msgstr "Recibido"
 
+#, fuzzy
 msgctxt "view:stock.shipment.out:"
 msgid "Assign"
-msgstr ""
+msgstr "Reservado"
 
+#, fuzzy
 msgctxt "view:stock.shipment.out:"
 msgid "Cancel"
-msgstr ""
+msgstr "Cancelar"
 
+#, fuzzy
 msgctxt "view:stock.shipment.out:"
 msgid "Customer Shipment"
-msgstr ""
+msgstr "Envío cliente"
 
+#, fuzzy
 msgctxt "view:stock.shipment.out:"
 msgid "Customer Shipments"
-msgstr ""
+msgstr "Envíos cliente"
 
+#, fuzzy
 msgctxt "view:stock.shipment.out:"
 msgid "Done"
-msgstr ""
+msgstr "Finalizado"
 
+#, fuzzy
 msgctxt "view:stock.shipment.out:"
 msgid "Draft"
-msgstr ""
+msgstr "Borrador"
 
+#, fuzzy
 msgctxt "view:stock.shipment.out:"
 msgid "Inventory Moves"
-msgstr ""
+msgstr "Movimientos internos"
 
 msgctxt "view:stock.shipment.out:"
 msgid "Make shipment"
 msgstr ""
 
+#, fuzzy
 msgctxt "view:stock.shipment.out:"
 msgid "Outgoing Moves"
-msgstr ""
+msgstr "Movimientos de salida"
 
 msgctxt "view:stock.shipment.out:"
 msgid "Wait"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index 3b16252..a02056f 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -206,6 +206,10 @@ msgctxt "field:stock.configuration,id:"
 msgid "ID"
 msgstr "ID"
 
+msgctxt "field:stock.configuration,inventory_sequence:"
+msgid "Inventory Sequence"
+msgstr ""
+
 msgctxt "field:stock.configuration,rec_name:"
 msgid "Name"
 msgstr "Nom"
@@ -270,6 +274,10 @@ msgctxt "field:stock.inventory,lost_found:"
 msgid "Lost and Found"
 msgstr "Pertes et surplus"
 
+msgctxt "field:stock.inventory,number:"
+msgid "Number"
+msgstr ""
+
 msgctxt "field:stock.inventory,rec_name:"
 msgid "Name"
 msgstr "Nom"
@@ -418,6 +426,11 @@ msgctxt "field:stock.location,type:"
 msgid "Location type"
 msgstr "Type d'emplacement"
 
+#, fuzzy
+msgctxt "field:stock.location,warehouse:"
+msgid "Warehouse"
+msgstr "Entrepôt"
+
 msgctxt "field:stock.location,write_date:"
 msgid "Write Date"
 msgstr "Date de mise à jour"
@@ -426,6 +439,10 @@ msgctxt "field:stock.location,write_uid:"
 msgid "Write User"
 msgstr "Mis à jour par"
 
+msgctxt "field:stock.move,assignation_required:"
+msgid "Assignation Required"
+msgstr ""
+
 msgctxt "field:stock.move,company:"
 msgid "Company"
 msgstr "Société"
@@ -650,10 +667,6 @@ msgctxt "field:stock.products_by_locations.start,id:"
 msgid "ID"
 msgstr "ID"
 
-msgctxt "field:stock.shipment.in,code:"
-msgid "Code"
-msgstr "Code"
-
 msgctxt "field:stock.shipment.in,company:"
 msgid "Company"
 msgstr "Société"
@@ -690,6 +703,10 @@ msgctxt "field:stock.shipment.in,moves:"
 msgid "Moves"
 msgstr "Mouvements"
 
+msgctxt "field:stock.shipment.in,number:"
+msgid "Numer"
+msgstr ""
+
 msgctxt "field:stock.shipment.in,origins:"
 msgid "Origins"
 msgstr "Origines"
@@ -738,10 +755,6 @@ msgctxt "field:stock.shipment.in,write_uid:"
 msgid "Write User"
 msgstr "Mis à jour par"
 
-msgctxt "field:stock.shipment.in.return,code:"
-msgid "Code"
-msgstr "Code"
-
 msgctxt "field:stock.shipment.in.return,company:"
 msgid "Company"
 msgstr "Société"
@@ -754,6 +767,11 @@ msgctxt "field:stock.shipment.in.return,create_uid:"
 msgid "Create User"
 msgstr "Créé par"
 
+#, fuzzy
+msgctxt "field:stock.shipment.in.return,delivery_address:"
+msgid "Delivery Address"
+msgstr "Adresse de livraison"
+
 msgctxt "field:stock.shipment.in.return,effective_date:"
 msgid "Effective Date"
 msgstr "Date effective"
@@ -770,6 +788,10 @@ msgctxt "field:stock.shipment.in.return,moves:"
 msgid "Moves"
 msgstr "Mouvements"
 
+msgctxt "field:stock.shipment.in.return,number:"
+msgid "Number"
+msgstr ""
+
 msgctxt "field:stock.shipment.in.return,origins:"
 msgid "Origins"
 msgstr "Origines"
@@ -790,6 +812,11 @@ msgctxt "field:stock.shipment.in.return,state:"
 msgid "State"
 msgstr "État"
 
+#, fuzzy
+msgctxt "field:stock.shipment.in.return,supplier:"
+msgid "Supplier"
+msgstr "Fournisseur"
+
 msgctxt "field:stock.shipment.in.return,to_location:"
 msgid "To Location"
 msgstr "Emplacement de destination"
@@ -810,10 +837,6 @@ msgctxt "field:stock.shipment.in.return.assign.failed,moves:"
 msgid "Moves"
 msgstr "Mouvements"
 
-msgctxt "field:stock.shipment.internal,code:"
-msgid "Code"
-msgstr "Code"
-
 msgctxt "field:stock.shipment.internal,company:"
 msgid "Company"
 msgstr "Société"
@@ -842,6 +865,10 @@ msgctxt "field:stock.shipment.internal,moves:"
 msgid "Moves"
 msgstr "Mouvements"
 
+msgctxt "field:stock.shipment.internal,number:"
+msgid "Number"
+msgstr ""
+
 msgctxt "field:stock.shipment.internal,planned_date:"
 msgid "Planned Date"
 msgstr "Date planifiée"
@@ -878,10 +905,6 @@ msgctxt "field:stock.shipment.internal.assign.failed,moves:"
 msgid "Moves"
 msgstr "Mouvements"
 
-msgctxt "field:stock.shipment.out,code:"
-msgid "Code"
-msgstr "Code"
-
 msgctxt "field:stock.shipment.out,company:"
 msgid "Company"
 msgstr "Société"
@@ -922,6 +945,10 @@ msgctxt "field:stock.shipment.out,moves:"
 msgid "Moves"
 msgstr "Mouvements"
 
+msgctxt "field:stock.shipment.out,number:"
+msgid "Number"
+msgstr ""
+
 msgctxt "field:stock.shipment.out,origins:"
 msgid "Origins"
 msgstr "Origines"
@@ -974,10 +1001,6 @@ msgctxt "field:stock.shipment.out.assign.failed,inventory_moves:"
 msgid "Inventory Moves"
 msgstr "Mouvements internes"
 
-msgctxt "field:stock.shipment.out.return,code:"
-msgid "Code"
-msgstr "Code"
-
 msgctxt "field:stock.shipment.out.return,company:"
 msgid "Company"
 msgstr "Société"
@@ -1022,6 +1045,10 @@ msgctxt "field:stock.shipment.out.return,moves:"
 msgid "Moves"
 msgstr "Mouvements"
 
+msgctxt "field:stock.shipment.out.return,number:"
+msgid "Number"
+msgstr ""
+
 msgctxt "field:stock.shipment.out.return,origins:"
 msgid "Origins"
 msgstr "Origines"
@@ -1333,6 +1360,11 @@ msgctxt ""
 msgid "Received"
 msgstr "Reçu"
 
+#, fuzzy
+msgctxt "model:ir.sequence,name:sequence_inventory"
+msgid "Inventory"
+msgstr "Inventaire"
+
 msgctxt "model:ir.sequence,name:sequence_shipment_in"
 msgid "Supplier Shipment"
 msgstr "Expédition fournisseur"
@@ -1353,6 +1385,11 @@ msgctxt "model:ir.sequence,name:sequence_shipment_out_return"
 msgid "Customer Return Shipment"
 msgstr "Retours d'expédition client"
 
+#, fuzzy
+msgctxt "model:ir.sequence.type,name:sequence_type_inventory"
+msgid "Inventory"
+msgstr "Inventaire"
+
 msgctxt "model:ir.sequence.type,name:sequence_type_shipment_in"
 msgid "Supplier Shipment"
 msgstr "Expédition fournisseur"
@@ -1545,215 +1582,235 @@ msgctxt "model:stock.shipment.out.return,name:"
 msgid "Customer Return Shipment"
 msgstr "Retour d'expédition client"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "/"
 msgstr "/"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
-msgid "Code:"
-msgstr "Code :"
+msgctxt "report:stock.shipment.in.restocking_list:"
+msgid ":"
+msgstr ""
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "From Location"
 msgstr "Emplacement d'origine"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Planned Date:"
 msgstr "Date planifiée :"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Product"
 msgstr "Produit"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Quantity"
 msgstr "Quantité"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Reference:"
 msgstr "Référence :"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Restocking List"
 msgstr "Liste de restockage"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+#, fuzzy
+msgctxt "report:stock.shipment.in.restocking_list:"
+msgid "Shipment Number"
+msgstr "Numéro d'expédition :"
+
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Supplier:"
 msgstr "Fournisseur :"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "To Location"
 msgstr "Emplacement de destination"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Warehouse:"
 msgstr "Entrepôt :"
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "/"
 msgstr "/"
 
-msgctxt "odt:stock.shipment.internal.report:"
-msgid "Code:"
-msgstr "Code :"
+msgctxt "report:stock.shipment.internal.report:"
+msgid ":"
+msgstr ""
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "From Location"
 msgstr "Emplacement d'origine"
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "From Location:"
 msgstr "Emplacement d'origine :"
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "Internal Shipment"
 msgstr "Expédition interne"
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "Planned Date:"
 msgstr "Date planifiée :"
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "Product"
 msgstr "Produit"
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "Quantity"
 msgstr "Quantité"
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "Reference:"
 msgstr "Référence :"
 
-msgctxt "odt:stock.shipment.internal.report:"
+#, fuzzy
+msgctxt "report:stock.shipment.internal.report:"
+msgid "Shipment Number"
+msgstr "Numéro d'expédition :"
+
+msgctxt "report:stock.shipment.internal.report:"
 msgid "To Location"
 msgstr "Emplacement de destination"
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "To Location:"
 msgstr "Emplacement de destination :"
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "/"
 msgstr "/"
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Customer Code:"
 msgstr "Code client :"
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Date:"
 msgstr "Date :"
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Delivery Note"
 msgstr "Bon de livraison"
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Product"
 msgstr "Produit"
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Quantity"
 msgstr "Quantité"
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Reference:"
 msgstr "Référence :"
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Shipment Number:"
 msgstr "Numéro d'expédition :"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "/"
 msgstr "/"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
-msgid "Code:"
-msgstr "Code :"
+msgctxt "report:stock.shipment.out.picking_list:"
+msgid ":"
+msgstr ""
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Customer:"
 msgstr "Client :"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "From Location"
 msgstr "Emplacement d'origine"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Picking List"
 msgstr "Liste de prélèvement"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Planned Date:"
 msgstr "Date planifiée :"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Product"
 msgstr "Produit"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Quantity"
 msgstr "Quantité"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Reference:"
 msgstr "Référence :"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+#, fuzzy
+msgctxt "report:stock.shipment.out.picking_list:"
+msgid "Shipment Number"
+msgstr "Numéro d'expédition :"
+
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "To Location"
 msgstr "Emplacement de destination"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Warehouse:"
 msgstr "Entrepôt :"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "/"
 msgstr "/"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid ":"
 msgstr " :"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
-msgid "Code:"
-msgstr "Code :"
-
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Customer"
 msgstr "Client"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "From Location"
 msgstr "Emplacement d'origine"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
+msgid "Number"
+msgstr ""
+
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Planned Date:"
 msgstr "Date planifiée :"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Product"
 msgstr "Produit"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Quantity"
 msgstr "Quantité"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Reference:"
 msgstr "Référence :"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Restocking List"
 msgstr "Liste de restockage"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+#, fuzzy
+msgctxt "report:stock.shipment.out.return.restocking_list:"
+msgid "Shipment"
+msgstr "Expédition"
+
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "To Location"
 msgstr "Emplacement de destination"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Warehouse:"
 msgstr "Entrepôt :"
 
@@ -1941,6 +1998,16 @@ msgctxt "view:product.product:"
 msgid "Products"
 msgstr "Produits"
 
+#, fuzzy
+msgctxt "view:stock.configuration:"
+msgid "Inventory"
+msgstr "Inventaire"
+
+#, fuzzy
+msgctxt "view:stock.configuration:"
+msgid "Shipments"
+msgstr "Expédition"
+
 msgctxt "view:stock.configuration:"
 msgid "Stock Configuration"
 msgstr "Configuration des stocks"
@@ -1994,6 +2061,10 @@ msgid "Cancel"
 msgstr "Annuler"
 
 msgctxt "view:stock.move:"
+msgid "Do"
+msgstr ""
+
+msgctxt "view:stock.move:"
 msgid "Move"
 msgstr "Mouvement"
 
diff --git a/locale/hu_HU.po b/locale/hu_HU.po
index 0a9eea4..baef5a8 100644
--- a/locale/hu_HU.po
+++ b/locale/hu_HU.po
@@ -7,15 +7,19 @@ msgid ""
 "You cannot change the default uom for a product which is associated to stock"
 " moves."
 msgstr ""
+"AZ alap mértékegység egy terméknek nem változtatható meg, ami "
+"raktármozgatáshoz hozzárendelt."
 
 msgctxt "error:product.template:"
 msgid ""
 "You cannot change the type for a product which is associated to stock moves."
 msgstr ""
+"A típusa egy terméknek nem változtatható meg, ami raktármozgatáshoz "
+"hozzárendelt."
 
 msgctxt "error:stock.inventory.line:"
 msgid "Line quantity must be positive."
-msgstr ""
+msgstr "A sorban szereplő mennyiség pozitívnak kell lenni."
 
 msgctxt "error:stock.inventory:"
 msgid "Inventory \"%s\" must be cancelled before deletion."
@@ -39,9 +43,10 @@ msgctxt "error:stock.move:"
 msgid "Internal move quantity must be positive"
 msgstr ""
 
+#, fuzzy
 msgctxt "error:stock.move:"
 msgid "Move quantity must be positive"
-msgstr ""
+msgstr "A sorban szereplő mennyiség pozitívnak kell lenni."
 
 msgctxt "error:stock.move:"
 msgid "Source and destination location must be different"
@@ -178,6 +183,10 @@ msgctxt "field:stock.configuration,id:"
 msgid "ID"
 msgstr ""
 
+msgctxt "field:stock.configuration,inventory_sequence:"
+msgid "Inventory Sequence"
+msgstr ""
+
 msgctxt "field:stock.configuration,rec_name:"
 msgid "Name"
 msgstr ""
@@ -242,6 +251,10 @@ msgctxt "field:stock.inventory,lost_found:"
 msgid "Lost and Found"
 msgstr ""
 
+msgctxt "field:stock.inventory,number:"
+msgid "Number"
+msgstr ""
+
 msgctxt "field:stock.inventory,rec_name:"
 msgid "Name"
 msgstr ""
@@ -390,6 +403,10 @@ msgctxt "field:stock.location,type:"
 msgid "Location type"
 msgstr ""
 
+msgctxt "field:stock.location,warehouse:"
+msgid "Warehouse"
+msgstr ""
+
 msgctxt "field:stock.location,write_date:"
 msgid "Write Date"
 msgstr ""
@@ -398,6 +415,10 @@ msgctxt "field:stock.location,write_uid:"
 msgid "Write User"
 msgstr ""
 
+msgctxt "field:stock.move,assignation_required:"
+msgid "Assignation Required"
+msgstr ""
+
 msgctxt "field:stock.move,company:"
 msgid "Company"
 msgstr ""
@@ -622,10 +643,6 @@ msgctxt "field:stock.products_by_locations.start,id:"
 msgid "ID"
 msgstr ""
 
-msgctxt "field:stock.shipment.in,code:"
-msgid "Code"
-msgstr ""
-
 msgctxt "field:stock.shipment.in,company:"
 msgid "Company"
 msgstr ""
@@ -662,6 +679,10 @@ msgctxt "field:stock.shipment.in,moves:"
 msgid "Moves"
 msgstr ""
 
+msgctxt "field:stock.shipment.in,number:"
+msgid "Numer"
+msgstr ""
+
 msgctxt "field:stock.shipment.in,origins:"
 msgid "Origins"
 msgstr ""
@@ -710,10 +731,6 @@ msgctxt "field:stock.shipment.in,write_uid:"
 msgid "Write User"
 msgstr ""
 
-msgctxt "field:stock.shipment.in.return,code:"
-msgid "Code"
-msgstr ""
-
 msgctxt "field:stock.shipment.in.return,company:"
 msgid "Company"
 msgstr ""
@@ -726,6 +743,10 @@ msgctxt "field:stock.shipment.in.return,create_uid:"
 msgid "Create User"
 msgstr ""
 
+msgctxt "field:stock.shipment.in.return,delivery_address:"
+msgid "Delivery Address"
+msgstr ""
+
 msgctxt "field:stock.shipment.in.return,effective_date:"
 msgid "Effective Date"
 msgstr ""
@@ -742,6 +763,10 @@ msgctxt "field:stock.shipment.in.return,moves:"
 msgid "Moves"
 msgstr ""
 
+msgctxt "field:stock.shipment.in.return,number:"
+msgid "Number"
+msgstr ""
+
 msgctxt "field:stock.shipment.in.return,origins:"
 msgid "Origins"
 msgstr ""
@@ -762,6 +787,10 @@ msgctxt "field:stock.shipment.in.return,state:"
 msgid "State"
 msgstr ""
 
+msgctxt "field:stock.shipment.in.return,supplier:"
+msgid "Supplier"
+msgstr ""
+
 msgctxt "field:stock.shipment.in.return,to_location:"
 msgid "To Location"
 msgstr ""
@@ -782,10 +811,6 @@ msgctxt "field:stock.shipment.in.return.assign.failed,moves:"
 msgid "Moves"
 msgstr ""
 
-msgctxt "field:stock.shipment.internal,code:"
-msgid "Code"
-msgstr ""
-
 msgctxt "field:stock.shipment.internal,company:"
 msgid "Company"
 msgstr ""
@@ -814,6 +839,10 @@ msgctxt "field:stock.shipment.internal,moves:"
 msgid "Moves"
 msgstr ""
 
+msgctxt "field:stock.shipment.internal,number:"
+msgid "Number"
+msgstr ""
+
 msgctxt "field:stock.shipment.internal,planned_date:"
 msgid "Planned Date"
 msgstr ""
@@ -850,10 +879,6 @@ msgctxt "field:stock.shipment.internal.assign.failed,moves:"
 msgid "Moves"
 msgstr ""
 
-msgctxt "field:stock.shipment.out,code:"
-msgid "Code"
-msgstr ""
-
 msgctxt "field:stock.shipment.out,company:"
 msgid "Company"
 msgstr ""
@@ -894,6 +919,10 @@ msgctxt "field:stock.shipment.out,moves:"
 msgid "Moves"
 msgstr ""
 
+msgctxt "field:stock.shipment.out,number:"
+msgid "Number"
+msgstr ""
+
 msgctxt "field:stock.shipment.out,origins:"
 msgid "Origins"
 msgstr ""
@@ -946,10 +975,6 @@ msgctxt "field:stock.shipment.out.assign.failed,inventory_moves:"
 msgid "Inventory Moves"
 msgstr ""
 
-msgctxt "field:stock.shipment.out.return,code:"
-msgid "Code"
-msgstr ""
-
 msgctxt "field:stock.shipment.out.return,company:"
 msgid "Company"
 msgstr ""
@@ -994,6 +1019,10 @@ msgctxt "field:stock.shipment.out.return,moves:"
 msgid "Moves"
 msgstr ""
 
+msgctxt "field:stock.shipment.out.return,number:"
+msgid "Number"
+msgstr ""
+
 msgctxt "field:stock.shipment.out.return,origins:"
 msgid "Origins"
 msgstr ""
@@ -1295,6 +1324,10 @@ msgctxt ""
 msgid "Received"
 msgstr ""
 
+msgctxt "model:ir.sequence,name:sequence_inventory"
+msgid "Inventory"
+msgstr ""
+
 msgctxt "model:ir.sequence,name:sequence_shipment_in"
 msgid "Supplier Shipment"
 msgstr ""
@@ -1315,6 +1348,10 @@ msgctxt "model:ir.sequence,name:sequence_shipment_out_return"
 msgid "Customer Return Shipment"
 msgstr ""
 
+msgctxt "model:ir.sequence.type,name:sequence_type_inventory"
+msgid "Inventory"
+msgstr ""
+
 msgctxt "model:ir.sequence.type,name:sequence_type_shipment_in"
 msgid "Supplier Shipment"
 msgstr ""
@@ -1507,215 +1544,231 @@ msgctxt "model:stock.shipment.out.return,name:"
 msgid "Customer Return Shipment"
 msgstr ""
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "/"
 msgstr ""
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
-msgid "Code:"
+msgctxt "report:stock.shipment.in.restocking_list:"
+msgid ":"
 msgstr ""
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "From Location"
 msgstr ""
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Planned Date:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Product"
 msgstr ""
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Quantity"
 msgstr ""
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Reference:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Restocking List"
 msgstr ""
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
+msgid "Shipment Number"
+msgstr ""
+
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Supplier:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "To Location"
 msgstr ""
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Warehouse:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "/"
 msgstr ""
 
-msgctxt "odt:stock.shipment.internal.report:"
-msgid "Code:"
+msgctxt "report:stock.shipment.internal.report:"
+msgid ":"
 msgstr ""
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "From Location"
 msgstr ""
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "From Location:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "Internal Shipment"
 msgstr ""
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "Planned Date:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "Product"
 msgstr ""
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "Quantity"
 msgstr ""
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "Reference:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
+msgid "Shipment Number"
+msgstr ""
+
+msgctxt "report:stock.shipment.internal.report:"
 msgid "To Location"
 msgstr ""
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "To Location:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "/"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Customer Code:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Date:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Delivery Note"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Product"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Quantity"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Reference:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Shipment Number:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "/"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.picking_list:"
-msgid "Code:"
+msgctxt "report:stock.shipment.out.picking_list:"
+msgid ":"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Customer:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "From Location"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Picking List"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Planned Date:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Product"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Quantity"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Reference:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
+msgid "Shipment Number"
+msgstr ""
+
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "To Location"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Warehouse:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "/"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid ":"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
-msgid "Code:"
-msgstr ""
-
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Customer"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "From Location"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
+msgid "Number"
+msgstr ""
+
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Planned Date:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Product"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Quantity"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Reference:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Restocking List"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
+msgid "Shipment"
+msgstr ""
+
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "To Location"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Warehouse:"
 msgstr ""
 
@@ -1904,6 +1957,14 @@ msgid "Products"
 msgstr ""
 
 msgctxt "view:stock.configuration:"
+msgid "Inventory"
+msgstr ""
+
+msgctxt "view:stock.configuration:"
+msgid "Shipments"
+msgstr ""
+
+msgctxt "view:stock.configuration:"
 msgid "Stock Configuration"
 msgstr ""
 
@@ -1956,6 +2017,10 @@ msgid "Cancel"
 msgstr ""
 
 msgctxt "view:stock.move:"
+msgid "Do"
+msgstr ""
+
+msgctxt "view:stock.move:"
 msgid "Move"
 msgstr ""
 
diff --git a/locale/it_IT.po b/locale/it_IT.po
index 0a9eea4..9265f16 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -178,6 +178,10 @@ msgctxt "field:stock.configuration,id:"
 msgid "ID"
 msgstr ""
 
+msgctxt "field:stock.configuration,inventory_sequence:"
+msgid "Inventory Sequence"
+msgstr ""
+
 msgctxt "field:stock.configuration,rec_name:"
 msgid "Name"
 msgstr ""
@@ -242,6 +246,10 @@ msgctxt "field:stock.inventory,lost_found:"
 msgid "Lost and Found"
 msgstr ""
 
+msgctxt "field:stock.inventory,number:"
+msgid "Number"
+msgstr ""
+
 msgctxt "field:stock.inventory,rec_name:"
 msgid "Name"
 msgstr ""
@@ -390,6 +398,10 @@ msgctxt "field:stock.location,type:"
 msgid "Location type"
 msgstr ""
 
+msgctxt "field:stock.location,warehouse:"
+msgid "Warehouse"
+msgstr ""
+
 msgctxt "field:stock.location,write_date:"
 msgid "Write Date"
 msgstr ""
@@ -398,6 +410,10 @@ msgctxt "field:stock.location,write_uid:"
 msgid "Write User"
 msgstr ""
 
+msgctxt "field:stock.move,assignation_required:"
+msgid "Assignation Required"
+msgstr ""
+
 msgctxt "field:stock.move,company:"
 msgid "Company"
 msgstr ""
@@ -622,10 +638,6 @@ msgctxt "field:stock.products_by_locations.start,id:"
 msgid "ID"
 msgstr ""
 
-msgctxt "field:stock.shipment.in,code:"
-msgid "Code"
-msgstr ""
-
 msgctxt "field:stock.shipment.in,company:"
 msgid "Company"
 msgstr ""
@@ -662,6 +674,10 @@ msgctxt "field:stock.shipment.in,moves:"
 msgid "Moves"
 msgstr ""
 
+msgctxt "field:stock.shipment.in,number:"
+msgid "Numer"
+msgstr ""
+
 msgctxt "field:stock.shipment.in,origins:"
 msgid "Origins"
 msgstr ""
@@ -710,10 +726,6 @@ msgctxt "field:stock.shipment.in,write_uid:"
 msgid "Write User"
 msgstr ""
 
-msgctxt "field:stock.shipment.in.return,code:"
-msgid "Code"
-msgstr ""
-
 msgctxt "field:stock.shipment.in.return,company:"
 msgid "Company"
 msgstr ""
@@ -726,6 +738,10 @@ msgctxt "field:stock.shipment.in.return,create_uid:"
 msgid "Create User"
 msgstr ""
 
+msgctxt "field:stock.shipment.in.return,delivery_address:"
+msgid "Delivery Address"
+msgstr ""
+
 msgctxt "field:stock.shipment.in.return,effective_date:"
 msgid "Effective Date"
 msgstr ""
@@ -742,6 +758,10 @@ msgctxt "field:stock.shipment.in.return,moves:"
 msgid "Moves"
 msgstr ""
 
+msgctxt "field:stock.shipment.in.return,number:"
+msgid "Number"
+msgstr ""
+
 msgctxt "field:stock.shipment.in.return,origins:"
 msgid "Origins"
 msgstr ""
@@ -762,6 +782,10 @@ msgctxt "field:stock.shipment.in.return,state:"
 msgid "State"
 msgstr ""
 
+msgctxt "field:stock.shipment.in.return,supplier:"
+msgid "Supplier"
+msgstr ""
+
 msgctxt "field:stock.shipment.in.return,to_location:"
 msgid "To Location"
 msgstr ""
@@ -782,10 +806,6 @@ msgctxt "field:stock.shipment.in.return.assign.failed,moves:"
 msgid "Moves"
 msgstr ""
 
-msgctxt "field:stock.shipment.internal,code:"
-msgid "Code"
-msgstr ""
-
 msgctxt "field:stock.shipment.internal,company:"
 msgid "Company"
 msgstr ""
@@ -814,6 +834,10 @@ msgctxt "field:stock.shipment.internal,moves:"
 msgid "Moves"
 msgstr ""
 
+msgctxt "field:stock.shipment.internal,number:"
+msgid "Number"
+msgstr ""
+
 msgctxt "field:stock.shipment.internal,planned_date:"
 msgid "Planned Date"
 msgstr ""
@@ -850,10 +874,6 @@ msgctxt "field:stock.shipment.internal.assign.failed,moves:"
 msgid "Moves"
 msgstr ""
 
-msgctxt "field:stock.shipment.out,code:"
-msgid "Code"
-msgstr ""
-
 msgctxt "field:stock.shipment.out,company:"
 msgid "Company"
 msgstr ""
@@ -894,6 +914,10 @@ msgctxt "field:stock.shipment.out,moves:"
 msgid "Moves"
 msgstr ""
 
+msgctxt "field:stock.shipment.out,number:"
+msgid "Number"
+msgstr ""
+
 msgctxt "field:stock.shipment.out,origins:"
 msgid "Origins"
 msgstr ""
@@ -946,10 +970,6 @@ msgctxt "field:stock.shipment.out.assign.failed,inventory_moves:"
 msgid "Inventory Moves"
 msgstr ""
 
-msgctxt "field:stock.shipment.out.return,code:"
-msgid "Code"
-msgstr ""
-
 msgctxt "field:stock.shipment.out.return,company:"
 msgid "Company"
 msgstr ""
@@ -994,6 +1014,10 @@ msgctxt "field:stock.shipment.out.return,moves:"
 msgid "Moves"
 msgstr ""
 
+msgctxt "field:stock.shipment.out.return,number:"
+msgid "Number"
+msgstr ""
+
 msgctxt "field:stock.shipment.out.return,origins:"
 msgid "Origins"
 msgstr ""
@@ -1295,6 +1319,10 @@ msgctxt ""
 msgid "Received"
 msgstr ""
 
+msgctxt "model:ir.sequence,name:sequence_inventory"
+msgid "Inventory"
+msgstr ""
+
 msgctxt "model:ir.sequence,name:sequence_shipment_in"
 msgid "Supplier Shipment"
 msgstr ""
@@ -1315,6 +1343,10 @@ msgctxt "model:ir.sequence,name:sequence_shipment_out_return"
 msgid "Customer Return Shipment"
 msgstr ""
 
+msgctxt "model:ir.sequence.type,name:sequence_type_inventory"
+msgid "Inventory"
+msgstr ""
+
 msgctxt "model:ir.sequence.type,name:sequence_type_shipment_in"
 msgid "Supplier Shipment"
 msgstr ""
@@ -1507,215 +1539,231 @@ msgctxt "model:stock.shipment.out.return,name:"
 msgid "Customer Return Shipment"
 msgstr ""
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "/"
 msgstr ""
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
-msgid "Code:"
+msgctxt "report:stock.shipment.in.restocking_list:"
+msgid ":"
 msgstr ""
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "From Location"
 msgstr ""
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Planned Date:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Product"
 msgstr ""
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Quantity"
 msgstr ""
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Reference:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Restocking List"
 msgstr ""
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
+msgid "Shipment Number"
+msgstr ""
+
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Supplier:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "To Location"
 msgstr ""
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Warehouse:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "/"
 msgstr ""
 
-msgctxt "odt:stock.shipment.internal.report:"
-msgid "Code:"
+msgctxt "report:stock.shipment.internal.report:"
+msgid ":"
 msgstr ""
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "From Location"
 msgstr ""
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "From Location:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "Internal Shipment"
 msgstr ""
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "Planned Date:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "Product"
 msgstr ""
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "Quantity"
 msgstr ""
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "Reference:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
+msgid "Shipment Number"
+msgstr ""
+
+msgctxt "report:stock.shipment.internal.report:"
 msgid "To Location"
 msgstr ""
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "To Location:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "/"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Customer Code:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Date:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Delivery Note"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Product"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Quantity"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Reference:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Shipment Number:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "/"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.picking_list:"
-msgid "Code:"
+msgctxt "report:stock.shipment.out.picking_list:"
+msgid ":"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Customer:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "From Location"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Picking List"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Planned Date:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Product"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Quantity"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Reference:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
+msgid "Shipment Number"
+msgstr ""
+
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "To Location"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Warehouse:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "/"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid ":"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
-msgid "Code:"
-msgstr ""
-
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Customer"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "From Location"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
+msgid "Number"
+msgstr ""
+
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Planned Date:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Product"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Quantity"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Reference:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Restocking List"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
+msgid "Shipment"
+msgstr ""
+
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "To Location"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Warehouse:"
 msgstr ""
 
@@ -1904,6 +1952,14 @@ msgid "Products"
 msgstr ""
 
 msgctxt "view:stock.configuration:"
+msgid "Inventory"
+msgstr ""
+
+msgctxt "view:stock.configuration:"
+msgid "Shipments"
+msgstr ""
+
+msgctxt "view:stock.configuration:"
 msgid "Stock Configuration"
 msgstr ""
 
@@ -1956,6 +2012,10 @@ msgid "Cancel"
 msgstr ""
 
 msgctxt "view:stock.move:"
+msgid "Do"
+msgstr ""
+
+msgctxt "view:stock.move:"
 msgid "Move"
 msgstr ""
 
diff --git a/locale/ja_JP.po b/locale/ja_JP.po
index 0a9eea4..9265f16 100644
--- a/locale/ja_JP.po
+++ b/locale/ja_JP.po
@@ -178,6 +178,10 @@ msgctxt "field:stock.configuration,id:"
 msgid "ID"
 msgstr ""
 
+msgctxt "field:stock.configuration,inventory_sequence:"
+msgid "Inventory Sequence"
+msgstr ""
+
 msgctxt "field:stock.configuration,rec_name:"
 msgid "Name"
 msgstr ""
@@ -242,6 +246,10 @@ msgctxt "field:stock.inventory,lost_found:"
 msgid "Lost and Found"
 msgstr ""
 
+msgctxt "field:stock.inventory,number:"
+msgid "Number"
+msgstr ""
+
 msgctxt "field:stock.inventory,rec_name:"
 msgid "Name"
 msgstr ""
@@ -390,6 +398,10 @@ msgctxt "field:stock.location,type:"
 msgid "Location type"
 msgstr ""
 
+msgctxt "field:stock.location,warehouse:"
+msgid "Warehouse"
+msgstr ""
+
 msgctxt "field:stock.location,write_date:"
 msgid "Write Date"
 msgstr ""
@@ -398,6 +410,10 @@ msgctxt "field:stock.location,write_uid:"
 msgid "Write User"
 msgstr ""
 
+msgctxt "field:stock.move,assignation_required:"
+msgid "Assignation Required"
+msgstr ""
+
 msgctxt "field:stock.move,company:"
 msgid "Company"
 msgstr ""
@@ -622,10 +638,6 @@ msgctxt "field:stock.products_by_locations.start,id:"
 msgid "ID"
 msgstr ""
 
-msgctxt "field:stock.shipment.in,code:"
-msgid "Code"
-msgstr ""
-
 msgctxt "field:stock.shipment.in,company:"
 msgid "Company"
 msgstr ""
@@ -662,6 +674,10 @@ msgctxt "field:stock.shipment.in,moves:"
 msgid "Moves"
 msgstr ""
 
+msgctxt "field:stock.shipment.in,number:"
+msgid "Numer"
+msgstr ""
+
 msgctxt "field:stock.shipment.in,origins:"
 msgid "Origins"
 msgstr ""
@@ -710,10 +726,6 @@ msgctxt "field:stock.shipment.in,write_uid:"
 msgid "Write User"
 msgstr ""
 
-msgctxt "field:stock.shipment.in.return,code:"
-msgid "Code"
-msgstr ""
-
 msgctxt "field:stock.shipment.in.return,company:"
 msgid "Company"
 msgstr ""
@@ -726,6 +738,10 @@ msgctxt "field:stock.shipment.in.return,create_uid:"
 msgid "Create User"
 msgstr ""
 
+msgctxt "field:stock.shipment.in.return,delivery_address:"
+msgid "Delivery Address"
+msgstr ""
+
 msgctxt "field:stock.shipment.in.return,effective_date:"
 msgid "Effective Date"
 msgstr ""
@@ -742,6 +758,10 @@ msgctxt "field:stock.shipment.in.return,moves:"
 msgid "Moves"
 msgstr ""
 
+msgctxt "field:stock.shipment.in.return,number:"
+msgid "Number"
+msgstr ""
+
 msgctxt "field:stock.shipment.in.return,origins:"
 msgid "Origins"
 msgstr ""
@@ -762,6 +782,10 @@ msgctxt "field:stock.shipment.in.return,state:"
 msgid "State"
 msgstr ""
 
+msgctxt "field:stock.shipment.in.return,supplier:"
+msgid "Supplier"
+msgstr ""
+
 msgctxt "field:stock.shipment.in.return,to_location:"
 msgid "To Location"
 msgstr ""
@@ -782,10 +806,6 @@ msgctxt "field:stock.shipment.in.return.assign.failed,moves:"
 msgid "Moves"
 msgstr ""
 
-msgctxt "field:stock.shipment.internal,code:"
-msgid "Code"
-msgstr ""
-
 msgctxt "field:stock.shipment.internal,company:"
 msgid "Company"
 msgstr ""
@@ -814,6 +834,10 @@ msgctxt "field:stock.shipment.internal,moves:"
 msgid "Moves"
 msgstr ""
 
+msgctxt "field:stock.shipment.internal,number:"
+msgid "Number"
+msgstr ""
+
 msgctxt "field:stock.shipment.internal,planned_date:"
 msgid "Planned Date"
 msgstr ""
@@ -850,10 +874,6 @@ msgctxt "field:stock.shipment.internal.assign.failed,moves:"
 msgid "Moves"
 msgstr ""
 
-msgctxt "field:stock.shipment.out,code:"
-msgid "Code"
-msgstr ""
-
 msgctxt "field:stock.shipment.out,company:"
 msgid "Company"
 msgstr ""
@@ -894,6 +914,10 @@ msgctxt "field:stock.shipment.out,moves:"
 msgid "Moves"
 msgstr ""
 
+msgctxt "field:stock.shipment.out,number:"
+msgid "Number"
+msgstr ""
+
 msgctxt "field:stock.shipment.out,origins:"
 msgid "Origins"
 msgstr ""
@@ -946,10 +970,6 @@ msgctxt "field:stock.shipment.out.assign.failed,inventory_moves:"
 msgid "Inventory Moves"
 msgstr ""
 
-msgctxt "field:stock.shipment.out.return,code:"
-msgid "Code"
-msgstr ""
-
 msgctxt "field:stock.shipment.out.return,company:"
 msgid "Company"
 msgstr ""
@@ -994,6 +1014,10 @@ msgctxt "field:stock.shipment.out.return,moves:"
 msgid "Moves"
 msgstr ""
 
+msgctxt "field:stock.shipment.out.return,number:"
+msgid "Number"
+msgstr ""
+
 msgctxt "field:stock.shipment.out.return,origins:"
 msgid "Origins"
 msgstr ""
@@ -1295,6 +1319,10 @@ msgctxt ""
 msgid "Received"
 msgstr ""
 
+msgctxt "model:ir.sequence,name:sequence_inventory"
+msgid "Inventory"
+msgstr ""
+
 msgctxt "model:ir.sequence,name:sequence_shipment_in"
 msgid "Supplier Shipment"
 msgstr ""
@@ -1315,6 +1343,10 @@ msgctxt "model:ir.sequence,name:sequence_shipment_out_return"
 msgid "Customer Return Shipment"
 msgstr ""
 
+msgctxt "model:ir.sequence.type,name:sequence_type_inventory"
+msgid "Inventory"
+msgstr ""
+
 msgctxt "model:ir.sequence.type,name:sequence_type_shipment_in"
 msgid "Supplier Shipment"
 msgstr ""
@@ -1507,215 +1539,231 @@ msgctxt "model:stock.shipment.out.return,name:"
 msgid "Customer Return Shipment"
 msgstr ""
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "/"
 msgstr ""
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
-msgid "Code:"
+msgctxt "report:stock.shipment.in.restocking_list:"
+msgid ":"
 msgstr ""
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "From Location"
 msgstr ""
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Planned Date:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Product"
 msgstr ""
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Quantity"
 msgstr ""
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Reference:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Restocking List"
 msgstr ""
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
+msgid "Shipment Number"
+msgstr ""
+
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Supplier:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "To Location"
 msgstr ""
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Warehouse:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "/"
 msgstr ""
 
-msgctxt "odt:stock.shipment.internal.report:"
-msgid "Code:"
+msgctxt "report:stock.shipment.internal.report:"
+msgid ":"
 msgstr ""
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "From Location"
 msgstr ""
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "From Location:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "Internal Shipment"
 msgstr ""
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "Planned Date:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "Product"
 msgstr ""
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "Quantity"
 msgstr ""
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "Reference:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
+msgid "Shipment Number"
+msgstr ""
+
+msgctxt "report:stock.shipment.internal.report:"
 msgid "To Location"
 msgstr ""
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "To Location:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "/"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Customer Code:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Date:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Delivery Note"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Product"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Quantity"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Reference:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Shipment Number:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "/"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.picking_list:"
-msgid "Code:"
+msgctxt "report:stock.shipment.out.picking_list:"
+msgid ":"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Customer:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "From Location"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Picking List"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Planned Date:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Product"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Quantity"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Reference:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
+msgid "Shipment Number"
+msgstr ""
+
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "To Location"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Warehouse:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "/"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid ":"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
-msgid "Code:"
-msgstr ""
-
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Customer"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "From Location"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
+msgid "Number"
+msgstr ""
+
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Planned Date:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Product"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Quantity"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Reference:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Restocking List"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
+msgid "Shipment"
+msgstr ""
+
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "To Location"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Warehouse:"
 msgstr ""
 
@@ -1904,6 +1952,14 @@ msgid "Products"
 msgstr ""
 
 msgctxt "view:stock.configuration:"
+msgid "Inventory"
+msgstr ""
+
+msgctxt "view:stock.configuration:"
+msgid "Shipments"
+msgstr ""
+
+msgctxt "view:stock.configuration:"
 msgid "Stock Configuration"
 msgstr ""
 
@@ -1956,6 +2012,10 @@ msgid "Cancel"
 msgstr ""
 
 msgctxt "view:stock.move:"
+msgid "Do"
+msgstr ""
+
+msgctxt "view:stock.move:"
 msgid "Move"
 msgstr ""
 
diff --git a/locale/nl_NL.po b/locale/lo_LA.po
similarity index 74%
copy from locale/nl_NL.po
copy to locale/lo_LA.po
index 8411ace..a44c579 100644
--- a/locale/nl_NL.po
+++ b/locale/lo_LA.po
@@ -124,7 +124,7 @@ msgstr ""
 
 msgctxt "field:party.address,delivery:"
 msgid "Delivery"
-msgstr ""
+msgstr "ມອບສົ່ງ"
 
 msgctxt "field:party.party,customer_location:"
 msgid "Customer Location"
@@ -138,9 +138,10 @@ msgctxt "field:product.by_location.start,forecast_date:"
 msgid "At Date"
 msgstr ""
 
+#, fuzzy
 msgctxt "field:product.by_location.start,id:"
 msgid "ID"
-msgstr ""
+msgstr "ເລກປະຈຳໂຕ"
 
 msgctxt "field:product.product,cost_value:"
 msgid "Cost Value"
@@ -153,7 +154,7 @@ msgstr ""
 #, fuzzy
 msgctxt "field:product.product,quantity:"
 msgid "Quantity"
-msgstr "Hoeveelheid"
+msgstr "ຈຳນວນ"
 
 msgctxt "field:product.template,cost_value:"
 msgid "Cost Value"
@@ -166,24 +167,31 @@ msgstr ""
 #, fuzzy
 msgctxt "field:product.template,quantity:"
 msgid "Quantity"
-msgstr "Hoeveelheid"
+msgstr "ຈຳນວນ"
 
+#, fuzzy
 msgctxt "field:stock.configuration,create_date:"
 msgid "Create Date"
-msgstr ""
+msgstr "ສ້າງວັນທີ"
 
+#, fuzzy
 msgctxt "field:stock.configuration,create_uid:"
 msgid "Create User"
-msgstr ""
+msgstr "ສ້າງຜູ້ໃຊ້ງານ"
 
+#, fuzzy
 msgctxt "field:stock.configuration,id:"
 msgid "ID"
+msgstr "ເລກປະຈຳໂຕ"
+
+msgctxt "field:stock.configuration,inventory_sequence:"
+msgid "Inventory Sequence"
 msgstr ""
 
 #, fuzzy
 msgctxt "field:stock.configuration,rec_name:"
 msgid "Name"
-msgstr "Naam bijlage"
+msgstr "ຊື່"
 
 msgctxt "field:stock.configuration,shipment_in_return_sequence:"
 msgid "Supplier Return Shipment Sequence"
@@ -205,186 +213,196 @@ msgctxt "field:stock.configuration,shipment_out_sequence:"
 msgid "Customer Shipment Sequence"
 msgstr ""
 
+#, fuzzy
 msgctxt "field:stock.configuration,write_date:"
 msgid "Write Date"
-msgstr ""
+msgstr "ຂຽນວັນທີ"
 
+#, fuzzy
 msgctxt "field:stock.configuration,write_uid:"
 msgid "Write User"
-msgstr ""
+msgstr "ຂຽນຜູ້ໃຊ້ງານ"
 
 #, fuzzy
 msgctxt "field:stock.inventory,company:"
 msgid "Company"
-msgstr "Bedrijf"
+msgstr "ສຳນັກງານ"
 
+#, fuzzy
 msgctxt "field:stock.inventory,create_date:"
 msgid "Create Date"
-msgstr ""
+msgstr "ສ້າງວັນທີ"
 
+#, fuzzy
 msgctxt "field:stock.inventory,create_uid:"
 msgid "Create User"
-msgstr ""
+msgstr "ສ້າງຜູ້ໃຊ້ງານ"
 
 #, fuzzy
 msgctxt "field:stock.inventory,date:"
 msgid "Date"
-msgstr "Vervaldatum"
+msgstr "ວັນທີ"
 
+#, fuzzy
 msgctxt "field:stock.inventory,id:"
 msgid "ID"
-msgstr ""
+msgstr "ເລກປະຈຳໂຕ"
 
-#, fuzzy
 msgctxt "field:stock.inventory,lines:"
 msgid "Lines"
-msgstr "Regels"
+msgstr ""
 
+#, fuzzy
 msgctxt "field:stock.inventory,location:"
 msgid "Location"
-msgstr ""
+msgstr "ບ່ອນຢູ່"
 
 msgctxt "field:stock.inventory,lost_found:"
 msgid "Lost and Found"
 msgstr ""
 
+msgctxt "field:stock.inventory,number:"
+msgid "Number"
+msgstr ""
+
 #, fuzzy
 msgctxt "field:stock.inventory,rec_name:"
 msgid "Name"
-msgstr "Naam bijlage"
+msgstr "ຊື່"
 
 #, fuzzy
 msgctxt "field:stock.inventory,state:"
 msgid "State"
-msgstr "Status"
+msgstr "ສະຖານະ"
 
+#, fuzzy
 msgctxt "field:stock.inventory,write_date:"
 msgid "Write Date"
-msgstr ""
+msgstr "ຂຽນວັນທີ"
 
+#, fuzzy
 msgctxt "field:stock.inventory,write_uid:"
 msgid "Write User"
-msgstr ""
+msgstr "ຂຽນຜູ້ໃຊ້ງານ"
 
+#, fuzzy
 msgctxt "field:stock.inventory.line,create_date:"
 msgid "Create Date"
-msgstr ""
+msgstr "ສ້າງວັນທີ"
 
+#, fuzzy
 msgctxt "field:stock.inventory.line,create_uid:"
 msgid "Create User"
-msgstr ""
+msgstr "ສ້າງຜູ້ໃຊ້ງານ"
 
 msgctxt "field:stock.inventory.line,expected_quantity:"
 msgid "Expected Quantity"
 msgstr ""
 
+#, fuzzy
 msgctxt "field:stock.inventory.line,id:"
 msgid "ID"
-msgstr ""
+msgstr "ເລກປະຈຳໂຕ"
 
 msgctxt "field:stock.inventory.line,inventory:"
 msgid "Inventory"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.inventory.line,moves:"
 msgid "Moves"
-msgstr "Boekingen"
+msgstr "ຕັດບັນຊີສາງ"
 
 #, fuzzy
 msgctxt "field:stock.inventory.line,product:"
 msgid "Product"
-msgstr "Producten"
+msgstr "ຜະລິດຕະພັນ"
 
-#, fuzzy
 msgctxt "field:stock.inventory.line,quantity:"
 msgid "Quantity"
-msgstr "Hoeveelheid"
+msgstr "ຈຳນວນ"
 
 #, fuzzy
 msgctxt "field:stock.inventory.line,rec_name:"
 msgid "Name"
-msgstr "Naam bijlage"
+msgstr "ຊື່"
 
-#, fuzzy
 msgctxt "field:stock.inventory.line,unit_digits:"
 msgid "Unit Digits"
-msgstr "Decimalen eenheid"
+msgstr ""
 
 msgctxt "field:stock.inventory.line,uom:"
 msgid "UOM"
 msgstr ""
 
+#, fuzzy
 msgctxt "field:stock.inventory.line,write_date:"
 msgid "Write Date"
-msgstr ""
+msgstr "ຂຽນວັນທີ"
 
+#, fuzzy
 msgctxt "field:stock.inventory.line,write_uid:"
 msgid "Write User"
-msgstr ""
+msgstr "ຂຽນຜູ້ໃຊ້ງານ"
 
-#, fuzzy
 msgctxt "field:stock.location,active:"
 msgid "Active"
-msgstr "Actief"
+msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.location,address:"
 msgid "Address"
-msgstr "Adres"
+msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.location,childs:"
 msgid "Children"
-msgstr "Onderliggende niveaus"
+msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.location,code:"
 msgid "Code"
-msgstr "Code"
+msgstr ""
 
 msgctxt "field:stock.location,cost_value:"
 msgid "Cost Value"
 msgstr ""
 
+#, fuzzy
 msgctxt "field:stock.location,create_date:"
 msgid "Create Date"
-msgstr ""
+msgstr "ສ້າງວັນທີ"
 
+#, fuzzy
 msgctxt "field:stock.location,create_uid:"
 msgid "Create User"
-msgstr ""
+msgstr "ສ້າງຜູ້ໃຊ້ງານ"
 
 msgctxt "field:stock.location,forecast_quantity:"
 msgid "Forecast Quantity"
 msgstr ""
 
+#, fuzzy
 msgctxt "field:stock.location,id:"
 msgid "ID"
-msgstr ""
+msgstr "ເລກປະຈຳໂຕ"
 
 msgctxt "field:stock.location,input_location:"
 msgid "Input"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.location,left:"
 msgid "Left"
-msgstr "Links"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:stock.location,name:"
 msgid "Name"
-msgstr "Naam bijlage"
+msgstr "ຊື່"
 
 msgctxt "field:stock.location,output_location:"
 msgid "Output"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.location,parent:"
 msgid "Parent"
-msgstr "Bovenliggend niveau"
+msgstr ""
 
 msgctxt "field:stock.location,picking_location:"
 msgid "Picking"
@@ -393,73 +411,84 @@ msgstr ""
 #, fuzzy
 msgctxt "field:stock.location,quantity:"
 msgid "Quantity"
-msgstr "Hoeveelheid"
+msgstr "ຈຳນວນ"
 
 #, fuzzy
 msgctxt "field:stock.location,rec_name:"
 msgid "Name"
-msgstr "Naam bijlage"
+msgstr "ຊື່"
 
-#, fuzzy
 msgctxt "field:stock.location,right:"
 msgid "Right"
-msgstr "Rechts"
+msgstr ""
 
+#, fuzzy
 msgctxt "field:stock.location,storage_location:"
 msgid "Storage"
-msgstr ""
+msgstr "ຫ້ອງເກັບມ້ຽນຢາ"
 
 msgctxt "field:stock.location,type:"
 msgid "Location type"
 msgstr ""
 
+msgctxt "field:stock.location,warehouse:"
+msgid "Warehouse"
+msgstr ""
+
+#, fuzzy
 msgctxt "field:stock.location,write_date:"
 msgid "Write Date"
-msgstr ""
+msgstr "ຂຽນວັນທີ"
 
+#, fuzzy
 msgctxt "field:stock.location,write_uid:"
 msgid "Write User"
+msgstr "ຂຽນຜູ້ໃຊ້ງານ"
+
+msgctxt "field:stock.move,assignation_required:"
+msgid "Assignation Required"
 msgstr ""
 
 #, fuzzy
 msgctxt "field:stock.move,company:"
 msgid "Company"
-msgstr "Bedrijf"
+msgstr "ສຳນັກງານ"
 
-#, fuzzy
 msgctxt "field:stock.move,cost_price:"
 msgid "Cost Price"
-msgstr "Kostprijs"
+msgstr ""
 
+#, fuzzy
 msgctxt "field:stock.move,create_date:"
 msgid "Create Date"
-msgstr ""
+msgstr "ສ້າງວັນທີ"
 
+#, fuzzy
 msgctxt "field:stock.move,create_uid:"
 msgid "Create User"
-msgstr ""
+msgstr "ສ້າງຜູ້ໃຊ້ງານ"
 
-#, fuzzy
 msgctxt "field:stock.move,currency:"
 msgid "Currency"
-msgstr "Valuta"
+msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.move,effective_date:"
 msgid "Effective Date"
-msgstr "Effectieve datum"
+msgstr ""
 
 msgctxt "field:stock.move,from_location:"
 msgid "From Location"
 msgstr ""
 
+#, fuzzy
 msgctxt "field:stock.move,id:"
 msgid "ID"
-msgstr ""
+msgstr "ເລກປະຈຳໂຕ"
 
+#, fuzzy
 msgctxt "field:stock.move,internal_quantity:"
 msgid "Internal Quantity"
-msgstr ""
+msgstr "ຈຳນວນພາຍໃນ"
 
 msgctxt "field:stock.move,origin:"
 msgid "Origin"
@@ -472,7 +501,7 @@ msgstr ""
 #, fuzzy
 msgctxt "field:stock.move,product:"
 msgid "Product"
-msgstr "Producten"
+msgstr "ຜະລິດຕະພັນ"
 
 msgctxt "field:stock.move,product_uom_category:"
 msgid "Product Uom Category"
@@ -481,12 +510,12 @@ msgstr ""
 #, fuzzy
 msgctxt "field:stock.move,quantity:"
 msgid "Quantity"
-msgstr "Hoeveelheid"
+msgstr "ຈຳນວນ"
 
 #, fuzzy
 msgctxt "field:stock.move,rec_name:"
 msgid "Name"
-msgstr "Naam bijlage"
+msgstr "ຊື່"
 
 msgctxt "field:stock.move,shipment:"
 msgid "Shipment"
@@ -495,21 +524,19 @@ msgstr ""
 #, fuzzy
 msgctxt "field:stock.move,state:"
 msgid "State"
-msgstr "Status"
+msgstr "ສະຖານະ"
 
 msgctxt "field:stock.move,to_location:"
 msgid "To Location"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.move,unit_digits:"
 msgid "Unit Digits"
-msgstr "Decimalen eenheid"
+msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.move,unit_price:"
 msgid "Unit Price"
-msgstr "Eenheidsprijs"
+msgstr ""
 
 msgctxt "field:stock.move,unit_price_required:"
 msgid "Unit Price Required"
@@ -519,183 +546,189 @@ msgctxt "field:stock.move,uom:"
 msgid "Uom"
 msgstr ""
 
+#, fuzzy
 msgctxt "field:stock.move,write_date:"
 msgid "Write Date"
-msgstr ""
+msgstr "ຂຽນວັນທີ"
 
+#, fuzzy
 msgctxt "field:stock.move,write_uid:"
 msgid "Write User"
-msgstr ""
+msgstr "ຂຽນຜູ້ໃຊ້ງານ"
 
 msgctxt "field:stock.period,caches:"
 msgid "Caches"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.period,company:"
 msgid "Company"
-msgstr "Bedrijf"
+msgstr "ສຳນັກງານ"
 
 msgctxt "field:stock.period,create_date:"
 msgid "Create Date"
-msgstr ""
+msgstr "ສ້າງວັນທີ"
 
 msgctxt "field:stock.period,create_uid:"
 msgid "Create User"
-msgstr ""
+msgstr "ສ້າງຜູ້ໃຊ້ງານ"
 
-#, fuzzy
 msgctxt "field:stock.period,date:"
 msgid "Date"
-msgstr "Vervaldatum"
+msgstr "ວັນທີ"
 
 msgctxt "field:stock.period,id:"
 msgid "ID"
-msgstr ""
+msgstr "ເລກປະຈຳໂຕ"
 
-#, fuzzy
 msgctxt "field:stock.period,rec_name:"
 msgid "Name"
-msgstr "Naam bijlage"
+msgstr "ຊື່"
 
-#, fuzzy
 msgctxt "field:stock.period,state:"
 msgid "State"
-msgstr "Status"
+msgstr "ສະຖານະ"
 
 msgctxt "field:stock.period,write_date:"
 msgid "Write Date"
-msgstr ""
+msgstr "ຂຽນວັນທີ"
 
 msgctxt "field:stock.period,write_uid:"
 msgid "Write User"
-msgstr ""
+msgstr "ຂຽນຜູ້ໃຊ້ງານ"
 
+#, fuzzy
 msgctxt "field:stock.period.cache,create_date:"
 msgid "Create Date"
-msgstr ""
+msgstr "ສ້າງວັນທີ"
 
+#, fuzzy
 msgctxt "field:stock.period.cache,create_uid:"
 msgid "Create User"
-msgstr ""
+msgstr "ສ້າງຜູ້ໃຊ້ງານ"
 
+#, fuzzy
 msgctxt "field:stock.period.cache,id:"
 msgid "ID"
-msgstr ""
+msgstr "ເລກປະຈຳໂຕ"
 
 msgctxt "field:stock.period.cache,internal_quantity:"
 msgid "Internal Quantity"
-msgstr ""
+msgstr "ຈຳນວນພາຍໃນ"
 
+#, fuzzy
 msgctxt "field:stock.period.cache,location:"
 msgid "Location"
-msgstr ""
+msgstr "ບ່ອນຢູ່"
 
 #, fuzzy
 msgctxt "field:stock.period.cache,period:"
 msgid "Period"
-msgstr "Periode"
+msgstr "ງວດ"
 
 #, fuzzy
 msgctxt "field:stock.period.cache,product:"
 msgid "Product"
-msgstr "Producten"
+msgstr "ຜະລິດຕະພັນ"
 
 #, fuzzy
 msgctxt "field:stock.period.cache,rec_name:"
 msgid "Name"
-msgstr "Naam bijlage"
+msgstr "ຊື່"
 
+#, fuzzy
 msgctxt "field:stock.period.cache,write_date:"
 msgid "Write Date"
-msgstr ""
+msgstr "ຂຽນວັນທີ"
 
+#, fuzzy
 msgctxt "field:stock.period.cache,write_uid:"
 msgid "Write User"
-msgstr ""
+msgstr "ຂຽນຜູ້ໃຊ້ງານ"
 
+#, fuzzy
 msgctxt "field:stock.product_quantities_warehouse,create_date:"
 msgid "Create Date"
-msgstr ""
+msgstr "ສ້າງວັນທີ"
 
+#, fuzzy
 msgctxt "field:stock.product_quantities_warehouse,create_uid:"
 msgid "Create User"
-msgstr ""
+msgstr "ສ້າງຜູ້ໃຊ້ງານ"
 
 #, fuzzy
 msgctxt "field:stock.product_quantities_warehouse,date:"
 msgid "Date"
-msgstr "Vervaldatum"
+msgstr "ວັນທີ"
 
+#, fuzzy
 msgctxt "field:stock.product_quantities_warehouse,id:"
 msgid "ID"
-msgstr ""
+msgstr "ເລກປະຈຳໂຕ"
 
-#, fuzzy
 msgctxt "field:stock.product_quantities_warehouse,quantity:"
 msgid "Quantity"
-msgstr "Hoeveelheid"
+msgstr "ຈຳນວນ"
 
 #, fuzzy
 msgctxt "field:stock.product_quantities_warehouse,rec_name:"
 msgid "Name"
-msgstr "Naam bijlage"
+msgstr "ຊື່"
 
+#, fuzzy
 msgctxt "field:stock.product_quantities_warehouse,write_date:"
 msgid "Write Date"
-msgstr ""
+msgstr "ຂຽນວັນທີ"
 
+#, fuzzy
 msgctxt "field:stock.product_quantities_warehouse,write_uid:"
 msgid "Write User"
-msgstr ""
+msgstr "ຂຽນຜູ້ໃຊ້ງານ"
 
+#, fuzzy
 msgctxt "field:stock.product_quantities_warehouse.start,id:"
 msgid "ID"
-msgstr ""
+msgstr "ເລກປະຈຳໂຕ"
 
-#, fuzzy
 msgctxt "field:stock.product_quantities_warehouse.start,warehouse:"
 msgid "Warehouse"
-msgstr "Magazijn"
+msgstr ""
 
 msgctxt "field:stock.products_by_locations.start,forecast_date:"
 msgid "At Date"
 msgstr ""
 
+#, fuzzy
 msgctxt "field:stock.products_by_locations.start,id:"
 msgid "ID"
-msgstr ""
-
-#, fuzzy
-msgctxt "field:stock.shipment.in,code:"
-msgid "Code"
-msgstr "Code"
+msgstr "ເລກປະຈຳໂຕ"
 
 #, fuzzy
 msgctxt "field:stock.shipment.in,company:"
 msgid "Company"
-msgstr "Bedrijf"
+msgstr "ສຳນັກງານ"
 
 msgctxt "field:stock.shipment.in,contact_address:"
 msgid "Contact Address"
 msgstr ""
 
+#, fuzzy
 msgctxt "field:stock.shipment.in,create_date:"
 msgid "Create Date"
-msgstr ""
+msgstr "ສ້າງວັນທີ"
 
+#, fuzzy
 msgctxt "field:stock.shipment.in,create_uid:"
 msgid "Create User"
-msgstr ""
+msgstr "ສ້າງຜູ້ໃຊ້ງານ"
 
-#, fuzzy
 msgctxt "field:stock.shipment.in,effective_date:"
 msgid "Effective Date"
-msgstr "Effectieve datum"
+msgstr ""
 
+#, fuzzy
 msgctxt "field:stock.shipment.in,id:"
 msgid "ID"
-msgstr ""
+msgstr "ເລກປະຈຳໂຕ"
 
 msgctxt "field:stock.shipment.in,incoming_moves:"
 msgid "Incoming Moves"
@@ -705,10 +738,13 @@ msgctxt "field:stock.shipment.in,inventory_moves:"
 msgid "Inventory Moves"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.shipment.in,moves:"
 msgid "Moves"
-msgstr "Boekingen"
+msgstr "ຕັດບັນຊີສາງ"
+
+msgctxt "field:stock.shipment.in,number:"
+msgid "Numer"
+msgstr ""
 
 msgctxt "field:stock.shipment.in,origins:"
 msgid "Origins"
@@ -721,31 +757,28 @@ msgstr ""
 #, fuzzy
 msgctxt "field:stock.shipment.in,rec_name:"
 msgid "Name"
-msgstr "Naam bijlage"
+msgstr "ຊື່"
 
-#, fuzzy
 msgctxt "field:stock.shipment.in,reference:"
 msgid "Reference"
-msgstr "Referentie"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:stock.shipment.in,state:"
 msgid "State"
-msgstr "Status"
+msgstr "ສະຖານະ"
 
-#, fuzzy
 msgctxt "field:stock.shipment.in,supplier:"
 msgid "Supplier"
-msgstr "Leverancier"
+msgstr ""
 
 msgctxt "field:stock.shipment.in,supplier_location:"
 msgid "Supplier Location"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.shipment.in,warehouse:"
 msgid "Warehouse"
-msgstr "Magazijn"
+msgstr ""
 
 msgctxt "field:stock.shipment.in,warehouse_input:"
 msgid "Warehouse Input"
@@ -755,49 +788,56 @@ msgctxt "field:stock.shipment.in,warehouse_storage:"
 msgid "Warehouse Storage"
 msgstr ""
 
+#, fuzzy
 msgctxt "field:stock.shipment.in,write_date:"
 msgid "Write Date"
-msgstr ""
+msgstr "ຂຽນວັນທີ"
 
+#, fuzzy
 msgctxt "field:stock.shipment.in,write_uid:"
 msgid "Write User"
-msgstr ""
-
-#, fuzzy
-msgctxt "field:stock.shipment.in.return,code:"
-msgid "Code"
-msgstr "Code"
+msgstr "ຂຽນຜູ້ໃຊ້ງານ"
 
 #, fuzzy
 msgctxt "field:stock.shipment.in.return,company:"
 msgid "Company"
-msgstr "Bedrijf"
+msgstr "ສຳນັກງານ"
 
+#, fuzzy
 msgctxt "field:stock.shipment.in.return,create_date:"
 msgid "Create Date"
-msgstr ""
+msgstr "ສ້າງວັນທີ"
 
+#, fuzzy
 msgctxt "field:stock.shipment.in.return,create_uid:"
 msgid "Create User"
+msgstr "ສ້າງຜູ້ໃຊ້ງານ"
+
+msgctxt "field:stock.shipment.in.return,delivery_address:"
+msgid "Delivery Address"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.shipment.in.return,effective_date:"
 msgid "Effective Date"
-msgstr "Effectieve datum"
+msgstr ""
 
 msgctxt "field:stock.shipment.in.return,from_location:"
 msgid "From Location"
 msgstr ""
 
+#, fuzzy
 msgctxt "field:stock.shipment.in.return,id:"
 msgid "ID"
-msgstr ""
+msgstr "ເລກປະຈຳໂຕ"
 
 #, fuzzy
 msgctxt "field:stock.shipment.in.return,moves:"
 msgid "Moves"
-msgstr "Boekingen"
+msgstr "ຕັດບັນຊີສາງ"
+
+msgctxt "field:stock.shipment.in.return,number:"
+msgid "Number"
+msgstr ""
 
 msgctxt "field:stock.shipment.in.return,origins:"
 msgid "Origins"
@@ -810,74 +850,81 @@ msgstr ""
 #, fuzzy
 msgctxt "field:stock.shipment.in.return,rec_name:"
 msgid "Name"
-msgstr "Naam bijlage"
+msgstr "ຊື່"
 
-#, fuzzy
 msgctxt "field:stock.shipment.in.return,reference:"
 msgid "Reference"
-msgstr "Referentie"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:stock.shipment.in.return,state:"
 msgid "State"
-msgstr "Status"
+msgstr "ສະຖານະ"
+
+msgctxt "field:stock.shipment.in.return,supplier:"
+msgid "Supplier"
+msgstr ""
 
 msgctxt "field:stock.shipment.in.return,to_location:"
 msgid "To Location"
 msgstr ""
 
+#, fuzzy
 msgctxt "field:stock.shipment.in.return,write_date:"
 msgid "Write Date"
-msgstr ""
+msgstr "ຂຽນວັນທີ"
 
+#, fuzzy
 msgctxt "field:stock.shipment.in.return,write_uid:"
 msgid "Write User"
-msgstr ""
+msgstr "ຂຽນຜູ້ໃຊ້ງານ"
 
+#, fuzzy
 msgctxt "field:stock.shipment.in.return.assign.failed,id:"
 msgid "ID"
-msgstr ""
+msgstr "ເລກປະຈຳໂຕ"
 
 #, fuzzy
 msgctxt "field:stock.shipment.in.return.assign.failed,moves:"
 msgid "Moves"
-msgstr "Boekingen"
-
-#, fuzzy
-msgctxt "field:stock.shipment.internal,code:"
-msgid "Code"
-msgstr "Code"
+msgstr "ຕັດບັນຊີສາງ"
 
 #, fuzzy
 msgctxt "field:stock.shipment.internal,company:"
 msgid "Company"
-msgstr "Bedrijf"
+msgstr "ສຳນັກງານ"
 
+#, fuzzy
 msgctxt "field:stock.shipment.internal,create_date:"
 msgid "Create Date"
-msgstr ""
+msgstr "ສ້າງວັນທີ"
 
+#, fuzzy
 msgctxt "field:stock.shipment.internal,create_uid:"
 msgid "Create User"
-msgstr ""
+msgstr "ສ້າງຜູ້ໃຊ້ງານ"
 
-#, fuzzy
 msgctxt "field:stock.shipment.internal,effective_date:"
 msgid "Effective Date"
-msgstr "Effectieve datum"
+msgstr ""
 
 msgctxt "field:stock.shipment.internal,from_location:"
 msgid "From Location"
 msgstr ""
 
+#, fuzzy
 msgctxt "field:stock.shipment.internal,id:"
 msgid "ID"
-msgstr ""
+msgstr "ເລກປະຈຳໂຕ"
 
 #, fuzzy
 msgctxt "field:stock.shipment.internal,moves:"
 msgid "Moves"
-msgstr "Boekingen"
+msgstr "ຕັດບັນຊີສາງ"
+
+msgctxt "field:stock.shipment.internal,number:"
+msgid "Number"
+msgstr ""
 
 msgctxt "field:stock.shipment.internal,planned_date:"
 msgid "Planned Date"
@@ -886,61 +933,59 @@ msgstr ""
 #, fuzzy
 msgctxt "field:stock.shipment.internal,rec_name:"
 msgid "Name"
-msgstr "Naam bijlage"
+msgstr "ຊື່"
 
-#, fuzzy
 msgctxt "field:stock.shipment.internal,reference:"
 msgid "Reference"
-msgstr "Referentie"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:stock.shipment.internal,state:"
 msgid "State"
-msgstr "Status"
+msgstr "ສະຖານະ"
 
 msgctxt "field:stock.shipment.internal,to_location:"
 msgid "To Location"
 msgstr ""
 
+#, fuzzy
 msgctxt "field:stock.shipment.internal,write_date:"
 msgid "Write Date"
-msgstr ""
+msgstr "ຂຽນວັນທີ"
 
+#, fuzzy
 msgctxt "field:stock.shipment.internal,write_uid:"
 msgid "Write User"
-msgstr ""
+msgstr "ຂຽນຜູ້ໃຊ້ງານ"
 
+#, fuzzy
 msgctxt "field:stock.shipment.internal.assign.failed,id:"
 msgid "ID"
-msgstr ""
+msgstr "ເລກປະຈຳໂຕ"
 
 #, fuzzy
 msgctxt "field:stock.shipment.internal.assign.failed,moves:"
 msgid "Moves"
-msgstr "Boekingen"
-
-#, fuzzy
-msgctxt "field:stock.shipment.out,code:"
-msgid "Code"
-msgstr "Code"
+msgstr "ຕັດບັນຊີສາງ"
 
 #, fuzzy
 msgctxt "field:stock.shipment.out,company:"
 msgid "Company"
-msgstr "Bedrijf"
+msgstr "ສຳນັກງານ"
 
+#, fuzzy
 msgctxt "field:stock.shipment.out,create_date:"
 msgid "Create Date"
-msgstr ""
+msgstr "ສ້າງວັນທີ"
 
+#, fuzzy
 msgctxt "field:stock.shipment.out,create_uid:"
 msgid "Create User"
-msgstr ""
+msgstr "ສ້າງຜູ້ໃຊ້ງານ"
 
-#, fuzzy
 msgctxt "field:stock.shipment.out,customer:"
 msgid "Customer"
-msgstr "Klant"
+msgstr ""
 
 msgctxt "field:stock.shipment.out,customer_location:"
 msgid "Customer Location"
@@ -950,14 +995,14 @@ msgctxt "field:stock.shipment.out,delivery_address:"
 msgid "Delivery Address"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.shipment.out,effective_date:"
 msgid "Effective Date"
-msgstr "Effectieve datum"
+msgstr ""
 
+#, fuzzy
 msgctxt "field:stock.shipment.out,id:"
 msgid "ID"
-msgstr ""
+msgstr "ເລກປະຈຳໂຕ"
 
 msgctxt "field:stock.shipment.out,inventory_moves:"
 msgid "Inventory Moves"
@@ -966,7 +1011,11 @@ msgstr ""
 #, fuzzy
 msgctxt "field:stock.shipment.out,moves:"
 msgid "Moves"
-msgstr "Boekingen"
+msgstr "ຕັດບັນຊີສາງ"
+
+msgctxt "field:stock.shipment.out,number:"
+msgid "Number"
+msgstr ""
 
 msgctxt "field:stock.shipment.out,origins:"
 msgid "Origins"
@@ -983,22 +1032,20 @@ msgstr ""
 #, fuzzy
 msgctxt "field:stock.shipment.out,rec_name:"
 msgid "Name"
-msgstr "Naam bijlage"
+msgstr "ຊື່"
 
-#, fuzzy
 msgctxt "field:stock.shipment.out,reference:"
 msgid "Reference"
-msgstr "Referentie"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:stock.shipment.out,state:"
 msgid "State"
-msgstr "Status"
+msgstr "ສະຖານະ"
 
-#, fuzzy
 msgctxt "field:stock.shipment.out,warehouse:"
 msgid "Warehouse"
-msgstr "Magazijn"
+msgstr ""
 
 msgctxt "field:stock.shipment.out,warehouse_output:"
 msgid "Warehouse Output"
@@ -1008,44 +1055,43 @@ msgctxt "field:stock.shipment.out,warehouse_storage:"
 msgid "Warehouse Storage"
 msgstr ""
 
+#, fuzzy
 msgctxt "field:stock.shipment.out,write_date:"
 msgid "Write Date"
-msgstr ""
+msgstr "ຂຽນວັນທີ"
 
+#, fuzzy
 msgctxt "field:stock.shipment.out,write_uid:"
 msgid "Write User"
-msgstr ""
+msgstr "ຂຽນຜູ້ໃຊ້ງານ"
 
+#, fuzzy
 msgctxt "field:stock.shipment.out.assign.failed,id:"
 msgid "ID"
-msgstr ""
+msgstr "ເລກປະຈຳໂຕ"
 
 msgctxt "field:stock.shipment.out.assign.failed,inventory_moves:"
 msgid "Inventory Moves"
 msgstr ""
 
 #, fuzzy
-msgctxt "field:stock.shipment.out.return,code:"
-msgid "Code"
-msgstr "Code"
-
-#, fuzzy
 msgctxt "field:stock.shipment.out.return,company:"
 msgid "Company"
-msgstr "Bedrijf"
+msgstr "ສຳນັກງານ"
 
+#, fuzzy
 msgctxt "field:stock.shipment.out.return,create_date:"
 msgid "Create Date"
-msgstr ""
+msgstr "ສ້າງວັນທີ"
 
+#, fuzzy
 msgctxt "field:stock.shipment.out.return,create_uid:"
 msgid "Create User"
-msgstr ""
+msgstr "ສ້າງຜູ້ໃຊ້ງານ"
 
-#, fuzzy
 msgctxt "field:stock.shipment.out.return,customer:"
 msgid "Customer"
-msgstr "Klant"
+msgstr ""
 
 msgctxt "field:stock.shipment.out.return,customer_location:"
 msgid "Customer Location"
@@ -1055,14 +1101,14 @@ msgctxt "field:stock.shipment.out.return,delivery_address:"
 msgid "Delivery Address"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.shipment.out.return,effective_date:"
 msgid "Effective Date"
-msgstr "Effectieve datum"
+msgstr ""
 
+#, fuzzy
 msgctxt "field:stock.shipment.out.return,id:"
 msgid "ID"
-msgstr ""
+msgstr "ເລກປະຈຳໂຕ"
 
 msgctxt "field:stock.shipment.out.return,incoming_moves:"
 msgid "Incoming Moves"
@@ -1075,7 +1121,11 @@ msgstr ""
 #, fuzzy
 msgctxt "field:stock.shipment.out.return,moves:"
 msgid "Moves"
-msgstr "Boekingen"
+msgstr "ຕັດບັນຊີສາງ"
+
+msgctxt "field:stock.shipment.out.return,number:"
+msgid "Number"
+msgstr ""
 
 msgctxt "field:stock.shipment.out.return,origins:"
 msgid "Origins"
@@ -1088,22 +1138,20 @@ msgstr ""
 #, fuzzy
 msgctxt "field:stock.shipment.out.return,rec_name:"
 msgid "Name"
-msgstr "Naam bijlage"
+msgstr "ຊື່"
 
-#, fuzzy
 msgctxt "field:stock.shipment.out.return,reference:"
 msgid "Reference"
-msgstr "Referentie"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:stock.shipment.out.return,state:"
 msgid "State"
-msgstr "Status"
+msgstr "ສະຖານະ"
 
-#, fuzzy
 msgctxt "field:stock.shipment.out.return,warehouse:"
 msgid "Warehouse"
-msgstr "Magazijn"
+msgstr ""
 
 msgctxt "field:stock.shipment.out.return,warehouse_input:"
 msgid "Warehouse Input"
@@ -1113,13 +1161,15 @@ msgctxt "field:stock.shipment.out.return,warehouse_storage:"
 msgid "Warehouse Storage"
 msgstr ""
 
+#, fuzzy
 msgctxt "field:stock.shipment.out.return,write_date:"
 msgid "Write Date"
-msgstr ""
+msgstr "ຂຽນວັນທີ"
 
+#, fuzzy
 msgctxt "field:stock.shipment.out.return,write_uid:"
 msgid "Write User"
-msgstr ""
+msgstr "ຂຽນຜູ້ໃຊ້ງານ"
 
 msgctxt "help:party.party,customer_location:"
 msgid "The default destination location when sending products to the party."
@@ -1149,29 +1199,28 @@ msgstr ""
 
 msgctxt "model:ir.action,name:act_inventory_form"
 msgid "Inventories"
-msgstr ""
+msgstr "ກວດນັບສາງ"
 
 msgctxt "model:ir.action,name:act_location_form"
 msgid "Locations"
-msgstr ""
+msgstr "ບ່ອນຢູ່"
 
 msgctxt "model:ir.action,name:act_location_quantity_tree"
 msgid "Locations"
-msgstr ""
+msgstr "ບ່ອນຢູ່"
 
 msgctxt "model:ir.action,name:act_location_tree"
 msgid "Locations"
-msgstr ""
+msgstr "ບ່ອນຢູ່"
 
 #, fuzzy
 msgctxt "model:ir.action,name:act_move_form"
 msgid "Moves"
-msgstr "Boekingen"
+msgstr "ຕັດບັນຊີສາງ"
 
-#, fuzzy
 msgctxt "model:ir.action,name:act_period_list"
 msgid "Periods"
-msgstr "Perioden"
+msgstr "ງວດ"
 
 msgctxt "model:ir.action,name:act_product_quantities_warehouse"
 msgid "Product Quantities By Warehouse"
@@ -1180,47 +1229,54 @@ msgstr ""
 #, fuzzy
 msgctxt "model:ir.action,name:act_products_by_locations"
 msgid "Products"
-msgstr "Producten"
+msgstr "ຜະລິດຕະພັນ"
 
+#, fuzzy
 msgctxt "model:ir.action,name:act_shipment_in_form"
 msgid "Supplier Shipments"
-msgstr ""
+msgstr "ການຈັດສົ່ງຂອງຜູ່ສະໜອງ"
 
 msgctxt "model:ir.action,name:act_shipment_in_return_form"
 msgid "Supplier Return Shipments"
-msgstr ""
+msgstr "ການຈັດສົ່ງຄືນໃຫ້ຜູ່ສະໜອງ"
 
+#, fuzzy
 msgctxt "model:ir.action,name:act_shipment_internal_form"
 msgid "Internal Shipments"
-msgstr ""
+msgstr "ຈັດສົ່ງພາຍໃນ"
 
+#, fuzzy
 msgctxt "model:ir.action,name:act_shipment_out_form"
 msgid "Customer Shipments"
-msgstr ""
+msgstr "ຈັດສົ່ງໃຫ້ລູກຄ້າ"
 
+#, fuzzy
 msgctxt "model:ir.action,name:act_shipment_out_form2"
 msgid "Customer Shipments"
-msgstr ""
+msgstr "ຈັດສົ່ງໃຫ້ລູກຄ້າ"
 
+#, fuzzy
 msgctxt "model:ir.action,name:act_shipment_out_form3"
 msgid "Supplier Shipments"
-msgstr ""
+msgstr "ການຈັດສົ່ງຂອງຜູ່ສະໜອງ"
 
+#, fuzzy
 msgctxt "model:ir.action,name:act_shipment_out_return_form"
 msgid "Customer Return Shipments"
-msgstr ""
+msgstr "ການຈັດສົ່ງຄືນຂອງລູກຄ້າ"
 
 msgctxt "model:ir.action,name:act_stock_configuration_form"
 msgid "Stock Configuration"
-msgstr ""
+msgstr "ການຕັ້ງຄ່າສາງ"
 
 msgctxt "model:ir.action,name:report_shipment_in_restocking_list"
 msgid "Restocking List"
 msgstr ""
 
+#, fuzzy
 msgctxt "model:ir.action,name:report_shipment_internal"
 msgid "Internal Shipment"
-msgstr ""
+msgstr "ຈັດສົ່ງພາຍໃນ"
 
 msgctxt "model:ir.action,name:report_shipment_out_delivery_note"
 msgid "Delivery Note"
@@ -1236,7 +1292,7 @@ msgstr ""
 
 msgctxt "model:ir.action,name:wizard_product_by_location"
 msgid "Product by Locations"
-msgstr ""
+msgstr "ຜະລິດຕະພັນຕາມບ່ອນຢູ່"
 
 msgctxt "model:ir.action,name:wizard_product_quantities_warehouse"
 msgid "Product Quantities By Warehouse"
@@ -1244,7 +1300,7 @@ msgstr ""
 
 msgctxt "model:ir.action,name:wizard_products_by_locations"
 msgid "Products by Locations"
-msgstr ""
+msgstr "ຜະລິດຕະພັນຕາມບ່ອນຢູ່"
 
 msgctxt "model:ir.action,name:wizard_recompute_cost_price"
 msgid "Recompute Cost Price"
@@ -1270,7 +1326,7 @@ msgstr ""
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_inventory_form_domain_draft"
 msgid "Draft"
-msgstr "Concept"
+msgstr "ຊົ່ວຄາວ"
 
 msgctxt "model:ir.action.act_window.domain,name:act_move_form_domain_all"
 msgid "All"
@@ -1300,7 +1356,7 @@ msgstr ""
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_shipment_in_form_domain_draft"
 msgid "Draft"
-msgstr "Concept"
+msgstr "ຊົ່ວຄາວ"
 
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_shipment_in_form_domain_received"
@@ -1321,13 +1377,12 @@ msgstr ""
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_shipment_in_return_form_domain_draft"
 msgid "Draft"
-msgstr "Concept"
+msgstr "ຊົ່ວຄາວ"
 
-#, fuzzy
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_shipment_in_return_form_domain_waiting"
 msgid "Waiting"
-msgstr "In afwachting"
+msgstr ""
 
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_shipment_internal_form_domain_all"
@@ -1343,13 +1398,12 @@ msgstr ""
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_shipment_internal_form_domain_draft"
 msgid "Draft"
-msgstr "Concept"
+msgstr "ຊົ່ວຄາວ"
 
-#, fuzzy
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_shipment_internal_form_domain_waiting"
 msgid "Waiting"
-msgstr "In afwachting"
+msgstr ""
 
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_shipment_out_form_domain_all"
@@ -1365,18 +1419,17 @@ msgstr ""
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_shipment_out_form_domain_draft"
 msgid "Draft"
-msgstr "Concept"
+msgstr "ຊົ່ວຄາວ"
 
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_shipment_out_form_domain_packed"
 msgid "Packed"
 msgstr ""
 
-#, fuzzy
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_shipment_out_form_domain_waiting"
 msgid "Waiting"
-msgstr "In afwachting"
+msgstr ""
 
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_shipment_out_return_form_domain_all"
@@ -1387,121 +1440,135 @@ msgstr ""
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_shipment_out_return_form_domain_draft"
 msgid "Draft"
-msgstr "Concept"
+msgstr "ຊົ່ວຄາວ"
 
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_shipment_out_return_form_domain_received"
 msgid "Received"
 msgstr ""
 
+msgctxt "model:ir.sequence,name:sequence_inventory"
+msgid "Inventory"
+msgstr ""
+
+#, fuzzy
 msgctxt "model:ir.sequence,name:sequence_shipment_in"
 msgid "Supplier Shipment"
-msgstr ""
+msgstr "ການຈັດສົ່ງຂອງຜູ່ສະໜອງ"
 
+#, fuzzy
 msgctxt "model:ir.sequence,name:sequence_shipment_in_return"
 msgid "Supplier Return Shipment"
-msgstr ""
+msgstr "ການຈັດສົ່ງຄືນໃຫ້ຜູ່ສະໜອງ"
 
+#, fuzzy
 msgctxt "model:ir.sequence,name:sequence_shipment_internal"
 msgid "Internal Shipment"
-msgstr ""
+msgstr "ຈັດສົ່ງພາຍໃນ"
 
+#, fuzzy
 msgctxt "model:ir.sequence,name:sequence_shipment_out"
 msgid "Customer Shipment"
-msgstr ""
+msgstr "ການຈັດສົ່ງຂອງຜູ້ສະໜອງ"
 
+#, fuzzy
 msgctxt "model:ir.sequence,name:sequence_shipment_out_return"
 msgid "Customer Return Shipment"
+msgstr "ການຈັດສົ່ງຄືນຂອງລູກຄ້າ"
+
+msgctxt "model:ir.sequence.type,name:sequence_type_inventory"
+msgid "Inventory"
 msgstr ""
 
+#, fuzzy
 msgctxt "model:ir.sequence.type,name:sequence_type_shipment_in"
 msgid "Supplier Shipment"
-msgstr ""
+msgstr "ການຈັດສົ່ງຂອງຜູ່ສະໜອງ"
 
+#, fuzzy
 msgctxt "model:ir.sequence.type,name:sequence_type_shipment_in_return"
 msgid "Supplier Return Shipment"
-msgstr ""
+msgstr "ການຈັດສົ່ງຄືນໃຫ້ຜູ່ສະໜອງ"
 
+#, fuzzy
 msgctxt "model:ir.sequence.type,name:sequence_type_shipment_internal"
 msgid "Internal Shipment"
-msgstr ""
+msgstr "ຈັດສົ່ງພາຍໃນ"
 
+#, fuzzy
 msgctxt "model:ir.sequence.type,name:sequence_type_shipment_out"
 msgid "Customer Shipment"
-msgstr ""
+msgstr "ການຈັດສົ່ງຂອງຜູ້ສະໜອງ"
 
+#, fuzzy
 msgctxt "model:ir.sequence.type,name:sequence_type_shipment_out_return"
 msgid "Customer Return Shipment"
-msgstr ""
+msgstr "ການຈັດສົ່ງຄືນຂອງລູກຄ້າ"
 
-#, fuzzy
 msgctxt "model:ir.ui.menu,name:menu_configuration"
 msgid "Configuration"
-msgstr "Instellingen"
+msgstr "ການຕັ້ງຄ່າ"
 
 msgctxt "model:ir.ui.menu,name:menu_inventory_form"
 msgid "Inventories"
-msgstr ""
+msgstr "ກວດນັບສາງ"
 
 msgctxt "model:ir.ui.menu,name:menu_location_form"
 msgid "Locations"
-msgstr ""
+msgstr "ບ່ອນຢູ່"
 
 msgctxt "model:ir.ui.menu,name:menu_location_tree"
 msgid "Locations"
-msgstr ""
+msgstr "ບ່ອນຢູ່"
 
-#, fuzzy
 msgctxt "model:ir.ui.menu,name:menu_move_form"
 msgid "Moves"
-msgstr "Boekingen"
+msgstr "ຕັດບັນຊີສາງ"
 
-#, fuzzy
 msgctxt "model:ir.ui.menu,name:menu_period_list"
 msgid "Periods"
-msgstr "Perioden"
+msgstr "ງວດ"
 
-#, fuzzy
 msgctxt "model:ir.ui.menu,name:menu_reporting"
 msgid "Reporting"
-msgstr "Rapportage"
+msgstr ""
 
 msgctxt "model:ir.ui.menu,name:menu_shipment_in_form"
 msgid "Supplier Shipments"
-msgstr ""
+msgstr "ການຈັດສົ່ງຂອງຜູ່ສະໜອງ"
 
 msgctxt "model:ir.ui.menu,name:menu_shipment_in_return_form"
 msgid "Supplier Return Shipments"
-msgstr ""
+msgstr "ການຈັດສົ່ງຄືນໃຫ້ຜູ່ສະໜອງ"
 
 msgctxt "model:ir.ui.menu,name:menu_shipment_internal_form"
 msgid "Internal Shipments"
-msgstr ""
+msgstr "ຈັດສົ່ງພາຍໃນ"
 
 msgctxt "model:ir.ui.menu,name:menu_shipment_out_form"
 msgid "Customer Shipments"
-msgstr ""
+msgstr "ຈັດສົ່ງໃຫ້ລູກຄ້າ"
 
 msgctxt "model:ir.ui.menu,name:menu_shipment_out_return_form"
 msgid "Customer Return Shipments"
-msgstr ""
+msgstr "ການຈັດສົ່ງຄືນຂອງລູກຄ້າ"
 
 msgctxt "model:ir.ui.menu,name:menu_stock"
 msgid "Inventory & Stock"
-msgstr ""
+msgstr "ກວດນັບ & ຄຸ້ມຄອງສາງ"
 
 msgctxt "model:ir.ui.menu,name:menu_stock_configuration"
 msgid "Stock Configuration"
-msgstr ""
+msgstr "ການຕັ້ງຄ່າສາງ"
 
+#, fuzzy
 msgctxt "model:product.by_location.start,name:"
 msgid "Product by Location"
-msgstr ""
+msgstr "ຜະລິດຕະພັນຕາມບ່ອນຢູ່"
 
-#, fuzzy
 msgctxt "model:res.group,name:group_stock"
 msgid "Stock"
-msgstr "Voorraad"
+msgstr ""
 
 msgctxt "model:res.group,name:group_stock_admin"
 msgid "Stock Administration"
@@ -1511,9 +1578,10 @@ msgctxt "model:res.group,name:group_stock_force_assignment"
 msgid "Stock Force Assignment"
 msgstr ""
 
+#, fuzzy
 msgctxt "model:stock.configuration,name:"
 msgid "Stock Configuration"
-msgstr ""
+msgstr "ການຕັ້ງຄ່າສາງ"
 
 msgctxt "model:stock.inventory,name:"
 msgid "Stock Inventory"
@@ -1527,10 +1595,9 @@ msgctxt "model:stock.location,name:"
 msgid "Stock Location"
 msgstr ""
 
-#, fuzzy
 msgctxt "model:stock.location,name:location_customer"
 msgid "Customer"
-msgstr "Klant"
+msgstr ""
 
 msgctxt "model:stock.location,name:location_input"
 msgid "Input Zone"
@@ -1548,15 +1615,13 @@ msgctxt "model:stock.location,name:location_storage"
 msgid "Storage Zone"
 msgstr ""
 
-#, fuzzy
 msgctxt "model:stock.location,name:location_supplier"
 msgid "Supplier"
-msgstr "Leverancier"
+msgstr ""
 
-#, fuzzy
 msgctxt "model:stock.location,name:location_warehouse"
 msgid "Warehouse"
-msgstr "Magazijn"
+msgstr ""
 
 msgctxt "model:stock.move,name:"
 msgid "Stock Move"
@@ -1580,288 +1645,293 @@ msgstr ""
 
 msgctxt "model:stock.products_by_locations.start,name:"
 msgid "Products by Locations"
-msgstr ""
+msgstr "ຜະລິດຕະພັນຕາມບ່ອນຢູ່"
 
+#, fuzzy
 msgctxt "model:stock.shipment.in,name:"
 msgid "Supplier Shipment"
-msgstr ""
+msgstr "ການຈັດສົ່ງຂອງຜູ່ສະໜອງ"
 
+#, fuzzy
 msgctxt "model:stock.shipment.in.return,name:"
 msgid "Supplier Return Shipment"
-msgstr ""
+msgstr "ການຈັດສົ່ງຄືນໃຫ້ຜູ່ສະໜອງ"
 
 msgctxt "model:stock.shipment.in.return.assign.failed,name:"
 msgid "Assign Supplier Return Shipment"
 msgstr ""
 
+#, fuzzy
 msgctxt "model:stock.shipment.internal,name:"
 msgid "Internal Shipment"
-msgstr ""
+msgstr "ຈັດສົ່ງພາຍໃນ"
 
 msgctxt "model:stock.shipment.internal.assign.failed,name:"
 msgid "Assign Shipment Internal"
 msgstr ""
 
+#, fuzzy
 msgctxt "model:stock.shipment.out,name:"
 msgid "Customer Shipment"
-msgstr ""
+msgstr "ການຈັດສົ່ງຂອງຜູ້ສະໜອງ"
 
 msgctxt "model:stock.shipment.out.assign.failed,name:"
 msgid "Assign Shipment Out"
 msgstr ""
 
+#, fuzzy
 msgctxt "model:stock.shipment.out.return,name:"
 msgid "Customer Return Shipment"
-msgstr ""
+msgstr "ການຈັດສົ່ງຄືນຂອງລູກຄ້າ"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "/"
 msgstr ""
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
-msgid "Code:"
+msgctxt "report:stock.shipment.in.restocking_list:"
+msgid ":"
 msgstr ""
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "From Location"
 msgstr ""
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Planned Date:"
 msgstr ""
 
 #, fuzzy
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Product"
-msgstr "Producten"
+msgstr "ຜະລິດຕະພັນ"
 
-#, fuzzy
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Quantity"
-msgstr "Hoeveelheid"
+msgstr "ຈຳນວນ"
 
-#, fuzzy
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Reference:"
-msgstr "Referentie:"
+msgstr ""
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Restocking List"
 msgstr ""
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
+msgid "Shipment Number"
+msgstr ""
+
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Supplier:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "To Location"
 msgstr ""
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Warehouse:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "/"
 msgstr ""
 
-msgctxt "odt:stock.shipment.internal.report:"
-msgid "Code:"
+msgctxt "report:stock.shipment.internal.report:"
+msgid ":"
 msgstr ""
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "From Location"
 msgstr ""
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "From Location:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.internal.report:"
+#, fuzzy
+msgctxt "report:stock.shipment.internal.report:"
 msgid "Internal Shipment"
-msgstr ""
+msgstr "ຈັດສົ່ງພາຍໃນ"
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "Planned Date:"
 msgstr ""
 
-#, fuzzy
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "Product"
-msgstr "Producten"
+msgstr "ຜະລິດຕະພັນ"
 
-#, fuzzy
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "Quantity"
-msgstr "Hoeveelheid"
+msgstr "ຈຳນວນ"
 
-#, fuzzy
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "Reference:"
-msgstr "Referentie:"
+msgstr ""
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
+msgid "Shipment Number"
+msgstr ""
+
+msgctxt "report:stock.shipment.internal.report:"
 msgid "To Location"
 msgstr ""
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "To Location:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "/"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Customer Code:"
 msgstr ""
 
 #, fuzzy
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Date:"
-msgstr "Datum:"
+msgstr "ວັນທີ"
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Delivery Note"
 msgstr ""
 
-#, fuzzy
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Product"
-msgstr "Producten"
+msgstr "ຜະລິດຕະພັນ"
 
-#, fuzzy
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Quantity"
-msgstr "Hoeveelheid"
+msgstr "ຈຳນວນ"
 
-#, fuzzy
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Reference:"
-msgstr "Referentie:"
+msgstr ""
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Shipment Number:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "/"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.picking_list:"
-msgid "Code:"
+msgctxt "report:stock.shipment.out.picking_list:"
+msgid ":"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Customer:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "From Location"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Picking List"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Planned Date:"
 msgstr ""
 
 #, fuzzy
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Product"
-msgstr "Producten"
+msgstr "ຜະລິດຕະພັນ"
 
-#, fuzzy
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Quantity"
-msgstr "Hoeveelheid"
+msgstr "ຈຳນວນ"
 
-#, fuzzy
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Reference:"
-msgstr "Referentie:"
+msgstr ""
+
+msgctxt "report:stock.shipment.out.picking_list:"
+msgid "Shipment Number"
+msgstr ""
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "To Location"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Warehouse:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "/"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid ":"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
-msgid "Code:"
-msgstr ""
-
-#, fuzzy
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Customer"
-msgstr "Klant"
+msgstr ""
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "From Location"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
+msgid "Number"
+msgstr ""
+
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Planned Date:"
 msgstr ""
 
-#, fuzzy
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Product"
-msgstr "Producten"
+msgstr "ຜະລິດຕະພັນ"
 
-#, fuzzy
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Quantity"
-msgstr "Hoeveelheid"
+msgstr "ຈຳນວນ"
 
-#, fuzzy
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Reference:"
-msgstr "Referentie:"
+msgstr ""
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Restocking List"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
+msgid "Shipment"
+msgstr ""
+
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "To Location"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Warehouse:"
 msgstr ""
 
-#, fuzzy
 msgctxt "selection:stock.inventory,state:"
 msgid "Canceled"
-msgstr "Geannuleerd"
+msgstr "ຍົກເລີກແລ້ວ"
 
-#, fuzzy
 msgctxt "selection:stock.inventory,state:"
 msgid "Done"
-msgstr "Klaar"
+msgstr ""
 
 #, fuzzy
 msgctxt "selection:stock.inventory,state:"
 msgid "Draft"
-msgstr "Concept"
+msgstr "ຊົ່ວຄາວ"
 
-#, fuzzy
 msgctxt "selection:stock.location,type:"
 msgid "Customer"
-msgstr "Klant"
+msgstr ""
 
 msgctxt "selection:stock.location,type:"
 msgid "Drop"
@@ -1873,45 +1943,40 @@ msgstr ""
 
 msgctxt "selection:stock.location,type:"
 msgid "Production"
-msgstr ""
+msgstr "ຜະລິດຕະພັນ"
 
 msgctxt "selection:stock.location,type:"
 msgid "Storage"
-msgstr ""
+msgstr "ຫ້ອງເກັບມ້ຽນຢາ"
 
-#, fuzzy
 msgctxt "selection:stock.location,type:"
 msgid "Supplier"
-msgstr "Leverancier"
+msgstr ""
 
-#, fuzzy
 msgctxt "selection:stock.location,type:"
 msgid "View"
-msgstr "Overzicht"
+msgstr "ເບິ່ງ"
 
-#, fuzzy
 msgctxt "selection:stock.location,type:"
 msgid "Warehouse"
-msgstr "Magazijn"
+msgstr ""
 
 msgctxt "selection:stock.move,state:"
 msgid "Assigned"
 msgstr ""
 
-#, fuzzy
 msgctxt "selection:stock.move,state:"
 msgid "Canceled"
-msgstr "Geannuleerd"
+msgstr "ຍົກເລີກແລ້ວ"
 
-#, fuzzy
 msgctxt "selection:stock.move,state:"
 msgid "Done"
-msgstr "Klaar"
+msgstr ""
 
 #, fuzzy
 msgctxt "selection:stock.move,state:"
 msgid "Draft"
-msgstr "Concept"
+msgstr "ຊົ່ວຄາວ"
 
 msgctxt "selection:stock.move,state:"
 msgid "Staging"
@@ -1919,27 +1984,24 @@ msgstr ""
 
 msgctxt "selection:stock.period,state:"
 msgid "Closed"
-msgstr ""
+msgstr "ປິດແລ້ວ"
 
-#, fuzzy
 msgctxt "selection:stock.period,state:"
 msgid "Draft"
-msgstr "Concept"
+msgstr "ຊົ່ວຄາວ"
 
-#, fuzzy
 msgctxt "selection:stock.shipment.in,state:"
 msgid "Canceled"
-msgstr "Geannuleerd"
+msgstr "ຍົກເລີກແລ້ວ"
 
-#, fuzzy
 msgctxt "selection:stock.shipment.in,state:"
 msgid "Done"
-msgstr "Klaar"
+msgstr ""
 
 #, fuzzy
 msgctxt "selection:stock.shipment.in,state:"
 msgid "Draft"
-msgstr "Concept"
+msgstr "ຊົ່ວຄາວ"
 
 msgctxt "selection:stock.shipment.in,state:"
 msgid "Received"
@@ -1949,105 +2011,94 @@ msgctxt "selection:stock.shipment.in.return,state:"
 msgid "Assigned"
 msgstr ""
 
-#, fuzzy
 msgctxt "selection:stock.shipment.in.return,state:"
 msgid "Canceled"
-msgstr "Geannuleerd"
+msgstr "ຍົກເລີກແລ້ວ"
 
-#, fuzzy
 msgctxt "selection:stock.shipment.in.return,state:"
 msgid "Done"
-msgstr "Klaar"
+msgstr ""
 
 #, fuzzy
 msgctxt "selection:stock.shipment.in.return,state:"
 msgid "Draft"
-msgstr "Concept"
+msgstr "ຊົ່ວຄາວ"
 
-#, fuzzy
 msgctxt "selection:stock.shipment.in.return,state:"
 msgid "Waiting"
-msgstr "In afwachting"
+msgstr ""
 
 msgctxt "selection:stock.shipment.internal,state:"
 msgid "Assigned"
 msgstr ""
 
-#, fuzzy
 msgctxt "selection:stock.shipment.internal,state:"
 msgid "Canceled"
-msgstr "Geannuleerd"
+msgstr "ຍົກເລີກແລ້ວ"
 
-#, fuzzy
 msgctxt "selection:stock.shipment.internal,state:"
 msgid "Done"
-msgstr "Klaar"
+msgstr ""
 
 #, fuzzy
 msgctxt "selection:stock.shipment.internal,state:"
 msgid "Draft"
-msgstr "Concept"
+msgstr "ຊົ່ວຄາວ"
 
-#, fuzzy
 msgctxt "selection:stock.shipment.internal,state:"
 msgid "Waiting"
-msgstr "In afwachting"
+msgstr ""
 
 msgctxt "selection:stock.shipment.out,state:"
 msgid "Assigned"
 msgstr ""
 
-#, fuzzy
 msgctxt "selection:stock.shipment.out,state:"
 msgid "Canceled"
-msgstr "Geannuleerd"
+msgstr "ຍົກເລີກແລ້ວ"
 
-#, fuzzy
 msgctxt "selection:stock.shipment.out,state:"
 msgid "Done"
-msgstr "Klaar"
+msgstr ""
 
 #, fuzzy
 msgctxt "selection:stock.shipment.out,state:"
 msgid "Draft"
-msgstr "Concept"
+msgstr "ຊົ່ວຄາວ"
 
 msgctxt "selection:stock.shipment.out,state:"
 msgid "Packed"
 msgstr ""
 
-#, fuzzy
 msgctxt "selection:stock.shipment.out,state:"
 msgid "Waiting"
-msgstr "In afwachting"
+msgstr ""
 
-#, fuzzy
 msgctxt "selection:stock.shipment.out.return,state:"
 msgid "Canceled"
-msgstr "Geannuleerd"
+msgstr "ຍົກເລີກແລ້ວ"
 
-#, fuzzy
 msgctxt "selection:stock.shipment.out.return,state:"
 msgid "Done"
-msgstr "Klaar"
+msgstr ""
 
 #, fuzzy
 msgctxt "selection:stock.shipment.out.return,state:"
 msgid "Draft"
-msgstr "Concept"
+msgstr "ຊົ່ວຄາວ"
 
 msgctxt "selection:stock.shipment.out.return,state:"
 msgid "Received"
 msgstr ""
 
-#, fuzzy
 msgctxt "view:party.party:"
 msgid "Stock"
-msgstr "Voorraad"
+msgstr ""
 
+#, fuzzy
 msgctxt "view:product.by_location.start:"
 msgid "Product by Location"
-msgstr ""
+msgstr "ຜະລິດຕະພັນຕາມບ່ອນຢູ່"
 
 msgctxt "view:product.product:"
 msgid "Cost Value"
@@ -2056,12 +2107,21 @@ msgstr ""
 #, fuzzy
 msgctxt "view:product.product:"
 msgid "Products"
-msgstr "Producten"
+msgstr "ຜະລິດຕະພັນ"
 
 msgctxt "view:stock.configuration:"
-msgid "Stock Configuration"
+msgid "Inventory"
 msgstr ""
 
+msgctxt "view:stock.configuration:"
+msgid "Shipments"
+msgstr ""
+
+#, fuzzy
+msgctxt "view:stock.configuration:"
+msgid "Stock Configuration"
+msgstr "ການຕັ້ງຄ່າສາງ"
+
 msgctxt "view:stock.inventory.line:"
 msgid "Inventory Line"
 msgstr ""
@@ -2074,31 +2134,30 @@ msgctxt "view:stock.inventory:"
 msgid "Add an inventory line for each missing products"
 msgstr ""
 
-#, fuzzy
 msgctxt "view:stock.inventory:"
 msgid "Cancel"
-msgstr "Annuleren"
+msgstr "ຍົກເລີກ"
 
 msgctxt "view:stock.inventory:"
 msgid "Complete Inventory"
 msgstr ""
 
-#, fuzzy
 msgctxt "view:stock.inventory:"
 msgid "Confirm"
-msgstr "Bevestig"
+msgstr ""
 
 msgctxt "view:stock.inventory:"
 msgid "Inventories"
-msgstr ""
+msgstr "ກວດນັບສາງ"
 
 msgctxt "view:stock.inventory:"
 msgid "Inventory"
 msgstr ""
 
+#, fuzzy
 msgctxt "view:stock.location:"
 msgid "Location"
-msgstr ""
+msgstr "ບ່ອນຢູ່"
 
 msgctxt "view:stock.location:"
 msgid "Location Quantity"
@@ -2106,21 +2165,26 @@ msgstr ""
 
 msgctxt "view:stock.location:"
 msgid "Locations"
-msgstr ""
+msgstr "ບ່ອນຢູ່ສາງ"
 
+#, fuzzy
 msgctxt "view:stock.move:"
 msgid "Cancel"
+msgstr "ຍົກເລີກ"
+
+msgctxt "view:stock.move:"
+msgid "Do"
 msgstr ""
 
 #, fuzzy
 msgctxt "view:stock.move:"
 msgid "Move"
-msgstr "Boeking"
+msgstr "ຕັດບັນຊີສາງ"
 
 #, fuzzy
 msgctxt "view:stock.move:"
 msgid "Moves"
-msgstr "Boekingen"
+msgstr "ຕັດບັນຊີສາງ"
 
 msgctxt "view:stock.move:"
 msgid "Reset to Draft"
@@ -2137,22 +2201,21 @@ msgstr ""
 #, fuzzy
 msgctxt "view:stock.period:"
 msgid "Close"
-msgstr "Sluiten"
+msgstr "ປິດແລ້ວ"
 
-#, fuzzy
 msgctxt "view:stock.period:"
 msgid "Draft"
-msgstr "Concept"
+msgstr "ຮ່າງກຽມ"
 
 #, fuzzy
 msgctxt "view:stock.period:"
 msgid "Period"
-msgstr "Periode"
+msgstr "ງວດ"
 
 #, fuzzy
 msgctxt "view:stock.period:"
 msgid "Periods"
-msgstr "Perioden"
+msgstr "ງວດ"
 
 msgctxt "view:stock.product_quantities_warehouse.start:"
 msgid "Product Quantities By Warehouse"
@@ -2164,7 +2227,7 @@ msgstr ""
 
 msgctxt "view:stock.products_by_locations.start:"
 msgid "Products by Locations"
-msgstr ""
+msgstr "ຜະລິດຕະພັນຕາມບ່ອນຢູ່"
 
 msgctxt "view:stock.shipment.in.return.assign.failed:"
 msgid "Unable to Assign"
@@ -2178,42 +2241,40 @@ msgctxt "view:stock.shipment.in.return:"
 msgid "Assign"
 msgstr ""
 
-#, fuzzy
 msgctxt "view:stock.shipment.in.return:"
 msgid "Cancel"
-msgstr "Annuleren"
+msgstr "ຍົກເລີກ"
 
-#, fuzzy
 msgctxt "view:stock.shipment.in.return:"
 msgid "Done"
-msgstr "Klaar"
+msgstr ""
 
 #, fuzzy
 msgctxt "view:stock.shipment.in.return:"
 msgid "Draft"
-msgstr "Concept"
+msgstr "ຊົ່ວຄາວ"
 
+#, fuzzy
 msgctxt "view:stock.shipment.in.return:"
 msgid "Supplier Return Shipment"
-msgstr ""
+msgstr "ການຈັດສົ່ງຄືນໃຫ້ຜູ່ສະໜອງ"
 
+#, fuzzy
 msgctxt "view:stock.shipment.in.return:"
 msgid "Supplier Return Shipments"
-msgstr ""
+msgstr "ການຈັດສົ່ງຄືນໃຫ້ຜູ່ສະໜອງ"
 
 msgctxt "view:stock.shipment.in.return:"
 msgid "Wait"
 msgstr ""
 
-#, fuzzy
 msgctxt "view:stock.shipment.in:"
 msgid "Cancel"
-msgstr "Annuleren"
+msgstr "ຍົກເລີກ"
 
-#, fuzzy
 msgctxt "view:stock.shipment.in:"
 msgid "Done"
-msgstr "Klaar"
+msgstr ""
 
 msgctxt "view:stock.shipment.in:"
 msgid "Incoming Moves"
@@ -2227,18 +2288,19 @@ msgctxt "view:stock.shipment.in:"
 msgid "Receive"
 msgstr ""
 
-#, fuzzy
 msgctxt "view:stock.shipment.in:"
 msgid "Reset to Draft"
-msgstr "Terug naar concept"
+msgstr ""
 
+#, fuzzy
 msgctxt "view:stock.shipment.in:"
 msgid "Supplier Shipment"
-msgstr ""
+msgstr "ການຈັດສົ່ງຂອງຜູ່ສະໜອງ"
 
+#, fuzzy
 msgctxt "view:stock.shipment.in:"
 msgid "Supplier Shipments"
-msgstr ""
+msgstr "ການຈັດສົ່ງຂອງຜູ່ສະໜອງ"
 
 msgctxt "view:stock.shipment.internal.assign.failed:"
 msgid "Unable to Assign"
@@ -2252,28 +2314,28 @@ msgctxt "view:stock.shipment.internal:"
 msgid "Assign"
 msgstr ""
 
-#, fuzzy
 msgctxt "view:stock.shipment.internal:"
 msgid "Cancel"
-msgstr "Annuleren"
+msgstr "ຍົກເລີກ"
 
-#, fuzzy
 msgctxt "view:stock.shipment.internal:"
 msgid "Done"
-msgstr "Klaar"
+msgstr ""
 
 #, fuzzy
 msgctxt "view:stock.shipment.internal:"
 msgid "Draft"
-msgstr "Concept"
+msgstr "ຊົ່ວຄາວ"
 
+#, fuzzy
 msgctxt "view:stock.shipment.internal:"
 msgid "Internal Shipment"
-msgstr ""
+msgstr "ຈັດສົ່ງພາຍໃນ"
 
+#, fuzzy
 msgctxt "view:stock.shipment.internal:"
 msgid "Internal Shipments"
-msgstr ""
+msgstr "ຈັດສົ່ງພາຍໃນ"
 
 msgctxt "view:stock.shipment.internal:"
 msgid "Wait"
@@ -2287,28 +2349,27 @@ msgctxt "view:stock.shipment.out.assign.failed:"
 msgid "Unable to assign those products:"
 msgstr ""
 
-#, fuzzy
 msgctxt "view:stock.shipment.out.return:"
 msgid "Cancel"
-msgstr "Annuleren"
+msgstr "ຍົກເລີກ"
 
+#, fuzzy
 msgctxt "view:stock.shipment.out.return:"
 msgid "Customer Return Shipment"
-msgstr ""
+msgstr "ການຈັດສົ່ງຄືນຂອງລູກຄ້າ"
 
 msgctxt "view:stock.shipment.out.return:"
 msgid "Customer Return Shipments"
-msgstr ""
+msgstr "ການຈັດສົ່ງຄືນຂອງລູກຄ້າ"
 
-#, fuzzy
 msgctxt "view:stock.shipment.out.return:"
 msgid "Done"
-msgstr "Klaar"
+msgstr ""
 
 #, fuzzy
 msgctxt "view:stock.shipment.out.return:"
 msgid "Draft"
-msgstr "Concept"
+msgstr "ຊົ່ວຄາວ"
 
 msgctxt "view:stock.shipment.out.return:"
 msgid "Incoming Moves"
@@ -2326,28 +2387,27 @@ msgctxt "view:stock.shipment.out:"
 msgid "Assign"
 msgstr ""
 
-#, fuzzy
 msgctxt "view:stock.shipment.out:"
 msgid "Cancel"
-msgstr "Annuleren"
+msgstr "ຍົກເລີກ"
 
 msgctxt "view:stock.shipment.out:"
 msgid "Customer Shipment"
-msgstr ""
+msgstr "ການຈັດສົ່ງຂອງຜູ້ສະໜອງ"
 
+#, fuzzy
 msgctxt "view:stock.shipment.out:"
 msgid "Customer Shipments"
-msgstr ""
+msgstr "ຈັດສົ່ງໃຫ້ລູກຄ້າ"
 
-#, fuzzy
 msgctxt "view:stock.shipment.out:"
 msgid "Done"
-msgstr "Klaar"
+msgstr ""
 
 #, fuzzy
 msgctxt "view:stock.shipment.out:"
 msgid "Draft"
-msgstr "Concept"
+msgstr "ຊົ່ວຄາວ"
 
 msgctxt "view:stock.shipment.out:"
 msgid "Inventory Moves"
@@ -2365,58 +2425,49 @@ msgctxt "view:stock.shipment.out:"
 msgid "Wait"
 msgstr ""
 
-#, fuzzy
 msgctxt "wizard_button:product.by_location,start,end:"
 msgid "Cancel"
-msgstr "Annuleren"
+msgstr "ຍົກເລີກ"
 
-#, fuzzy
 msgctxt "wizard_button:product.by_location,start,open:"
 msgid "Open"
-msgstr "Open"
+msgstr ""
 
-#, fuzzy
 msgctxt "wizard_button:stock.product_quantities_warehouse,start,end:"
 msgid "Cancel"
-msgstr "Annuleren"
+msgstr "ຍົກເລີກ"
 
-#, fuzzy
 msgctxt "wizard_button:stock.product_quantities_warehouse,start,open_:"
 msgid "Open"
-msgstr "Open"
+msgstr ""
 
-#, fuzzy
 msgctxt "wizard_button:stock.products_by_locations,start,end:"
 msgid "Cancel"
-msgstr "Annuleren"
+msgstr "ຍົກເລີກ"
 
-#, fuzzy
 msgctxt "wizard_button:stock.products_by_locations,start,open:"
 msgid "Open"
-msgstr "Open"
+msgstr ""
 
-#, fuzzy
 msgctxt "wizard_button:stock.shipment.in.return.assign,failed,end:"
 msgid "OK"
-msgstr "Oké"
+msgstr ""
 
 msgctxt "wizard_button:stock.shipment.in.return.assign,failed,force:"
 msgid "Force Assign"
 msgstr ""
 
-#, fuzzy
 msgctxt "wizard_button:stock.shipment.internal.assign,failed,end:"
 msgid "OK"
-msgstr "Oké"
+msgstr ""
 
 msgctxt "wizard_button:stock.shipment.internal.assign,failed,force:"
 msgid "Force Assign"
 msgstr ""
 
-#, fuzzy
 msgctxt "wizard_button:stock.shipment.out.assign,failed,end:"
 msgid "OK"
-msgstr "Oké"
+msgstr ""
 
 msgctxt "wizard_button:stock.shipment.out.assign,failed,force:"
 msgid "Force Assign"
diff --git a/locale/lt_LT.po b/locale/lt_LT.po
index 0a9eea4..9265f16 100644
--- a/locale/lt_LT.po
+++ b/locale/lt_LT.po
@@ -178,6 +178,10 @@ msgctxt "field:stock.configuration,id:"
 msgid "ID"
 msgstr ""
 
+msgctxt "field:stock.configuration,inventory_sequence:"
+msgid "Inventory Sequence"
+msgstr ""
+
 msgctxt "field:stock.configuration,rec_name:"
 msgid "Name"
 msgstr ""
@@ -242,6 +246,10 @@ msgctxt "field:stock.inventory,lost_found:"
 msgid "Lost and Found"
 msgstr ""
 
+msgctxt "field:stock.inventory,number:"
+msgid "Number"
+msgstr ""
+
 msgctxt "field:stock.inventory,rec_name:"
 msgid "Name"
 msgstr ""
@@ -390,6 +398,10 @@ msgctxt "field:stock.location,type:"
 msgid "Location type"
 msgstr ""
 
+msgctxt "field:stock.location,warehouse:"
+msgid "Warehouse"
+msgstr ""
+
 msgctxt "field:stock.location,write_date:"
 msgid "Write Date"
 msgstr ""
@@ -398,6 +410,10 @@ msgctxt "field:stock.location,write_uid:"
 msgid "Write User"
 msgstr ""
 
+msgctxt "field:stock.move,assignation_required:"
+msgid "Assignation Required"
+msgstr ""
+
 msgctxt "field:stock.move,company:"
 msgid "Company"
 msgstr ""
@@ -622,10 +638,6 @@ msgctxt "field:stock.products_by_locations.start,id:"
 msgid "ID"
 msgstr ""
 
-msgctxt "field:stock.shipment.in,code:"
-msgid "Code"
-msgstr ""
-
 msgctxt "field:stock.shipment.in,company:"
 msgid "Company"
 msgstr ""
@@ -662,6 +674,10 @@ msgctxt "field:stock.shipment.in,moves:"
 msgid "Moves"
 msgstr ""
 
+msgctxt "field:stock.shipment.in,number:"
+msgid "Numer"
+msgstr ""
+
 msgctxt "field:stock.shipment.in,origins:"
 msgid "Origins"
 msgstr ""
@@ -710,10 +726,6 @@ msgctxt "field:stock.shipment.in,write_uid:"
 msgid "Write User"
 msgstr ""
 
-msgctxt "field:stock.shipment.in.return,code:"
-msgid "Code"
-msgstr ""
-
 msgctxt "field:stock.shipment.in.return,company:"
 msgid "Company"
 msgstr ""
@@ -726,6 +738,10 @@ msgctxt "field:stock.shipment.in.return,create_uid:"
 msgid "Create User"
 msgstr ""
 
+msgctxt "field:stock.shipment.in.return,delivery_address:"
+msgid "Delivery Address"
+msgstr ""
+
 msgctxt "field:stock.shipment.in.return,effective_date:"
 msgid "Effective Date"
 msgstr ""
@@ -742,6 +758,10 @@ msgctxt "field:stock.shipment.in.return,moves:"
 msgid "Moves"
 msgstr ""
 
+msgctxt "field:stock.shipment.in.return,number:"
+msgid "Number"
+msgstr ""
+
 msgctxt "field:stock.shipment.in.return,origins:"
 msgid "Origins"
 msgstr ""
@@ -762,6 +782,10 @@ msgctxt "field:stock.shipment.in.return,state:"
 msgid "State"
 msgstr ""
 
+msgctxt "field:stock.shipment.in.return,supplier:"
+msgid "Supplier"
+msgstr ""
+
 msgctxt "field:stock.shipment.in.return,to_location:"
 msgid "To Location"
 msgstr ""
@@ -782,10 +806,6 @@ msgctxt "field:stock.shipment.in.return.assign.failed,moves:"
 msgid "Moves"
 msgstr ""
 
-msgctxt "field:stock.shipment.internal,code:"
-msgid "Code"
-msgstr ""
-
 msgctxt "field:stock.shipment.internal,company:"
 msgid "Company"
 msgstr ""
@@ -814,6 +834,10 @@ msgctxt "field:stock.shipment.internal,moves:"
 msgid "Moves"
 msgstr ""
 
+msgctxt "field:stock.shipment.internal,number:"
+msgid "Number"
+msgstr ""
+
 msgctxt "field:stock.shipment.internal,planned_date:"
 msgid "Planned Date"
 msgstr ""
@@ -850,10 +874,6 @@ msgctxt "field:stock.shipment.internal.assign.failed,moves:"
 msgid "Moves"
 msgstr ""
 
-msgctxt "field:stock.shipment.out,code:"
-msgid "Code"
-msgstr ""
-
 msgctxt "field:stock.shipment.out,company:"
 msgid "Company"
 msgstr ""
@@ -894,6 +914,10 @@ msgctxt "field:stock.shipment.out,moves:"
 msgid "Moves"
 msgstr ""
 
+msgctxt "field:stock.shipment.out,number:"
+msgid "Number"
+msgstr ""
+
 msgctxt "field:stock.shipment.out,origins:"
 msgid "Origins"
 msgstr ""
@@ -946,10 +970,6 @@ msgctxt "field:stock.shipment.out.assign.failed,inventory_moves:"
 msgid "Inventory Moves"
 msgstr ""
 
-msgctxt "field:stock.shipment.out.return,code:"
-msgid "Code"
-msgstr ""
-
 msgctxt "field:stock.shipment.out.return,company:"
 msgid "Company"
 msgstr ""
@@ -994,6 +1014,10 @@ msgctxt "field:stock.shipment.out.return,moves:"
 msgid "Moves"
 msgstr ""
 
+msgctxt "field:stock.shipment.out.return,number:"
+msgid "Number"
+msgstr ""
+
 msgctxt "field:stock.shipment.out.return,origins:"
 msgid "Origins"
 msgstr ""
@@ -1295,6 +1319,10 @@ msgctxt ""
 msgid "Received"
 msgstr ""
 
+msgctxt "model:ir.sequence,name:sequence_inventory"
+msgid "Inventory"
+msgstr ""
+
 msgctxt "model:ir.sequence,name:sequence_shipment_in"
 msgid "Supplier Shipment"
 msgstr ""
@@ -1315,6 +1343,10 @@ msgctxt "model:ir.sequence,name:sequence_shipment_out_return"
 msgid "Customer Return Shipment"
 msgstr ""
 
+msgctxt "model:ir.sequence.type,name:sequence_type_inventory"
+msgid "Inventory"
+msgstr ""
+
 msgctxt "model:ir.sequence.type,name:sequence_type_shipment_in"
 msgid "Supplier Shipment"
 msgstr ""
@@ -1507,215 +1539,231 @@ msgctxt "model:stock.shipment.out.return,name:"
 msgid "Customer Return Shipment"
 msgstr ""
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "/"
 msgstr ""
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
-msgid "Code:"
+msgctxt "report:stock.shipment.in.restocking_list:"
+msgid ":"
 msgstr ""
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "From Location"
 msgstr ""
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Planned Date:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Product"
 msgstr ""
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Quantity"
 msgstr ""
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Reference:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Restocking List"
 msgstr ""
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
+msgid "Shipment Number"
+msgstr ""
+
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Supplier:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "To Location"
 msgstr ""
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Warehouse:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "/"
 msgstr ""
 
-msgctxt "odt:stock.shipment.internal.report:"
-msgid "Code:"
+msgctxt "report:stock.shipment.internal.report:"
+msgid ":"
 msgstr ""
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "From Location"
 msgstr ""
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "From Location:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "Internal Shipment"
 msgstr ""
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "Planned Date:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "Product"
 msgstr ""
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "Quantity"
 msgstr ""
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "Reference:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
+msgid "Shipment Number"
+msgstr ""
+
+msgctxt "report:stock.shipment.internal.report:"
 msgid "To Location"
 msgstr ""
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "To Location:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "/"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Customer Code:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Date:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Delivery Note"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Product"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Quantity"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Reference:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Shipment Number:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "/"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.picking_list:"
-msgid "Code:"
+msgctxt "report:stock.shipment.out.picking_list:"
+msgid ":"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Customer:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "From Location"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Picking List"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Planned Date:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Product"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Quantity"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Reference:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
+msgid "Shipment Number"
+msgstr ""
+
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "To Location"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Warehouse:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "/"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid ":"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
-msgid "Code:"
-msgstr ""
-
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Customer"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "From Location"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
+msgid "Number"
+msgstr ""
+
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Planned Date:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Product"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Quantity"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Reference:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Restocking List"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
+msgid "Shipment"
+msgstr ""
+
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "To Location"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Warehouse:"
 msgstr ""
 
@@ -1904,6 +1952,14 @@ msgid "Products"
 msgstr ""
 
 msgctxt "view:stock.configuration:"
+msgid "Inventory"
+msgstr ""
+
+msgctxt "view:stock.configuration:"
+msgid "Shipments"
+msgstr ""
+
+msgctxt "view:stock.configuration:"
 msgid "Stock Configuration"
 msgstr ""
 
@@ -1956,6 +2012,10 @@ msgid "Cancel"
 msgstr ""
 
 msgctxt "view:stock.move:"
+msgid "Do"
+msgstr ""
+
+msgctxt "view:stock.move:"
 msgid "Move"
 msgstr ""
 
diff --git a/locale/nl_NL.po b/locale/nl_NL.po
index 8411ace..e19c00b 100644
--- a/locale/nl_NL.po
+++ b/locale/nl_NL.po
@@ -180,6 +180,10 @@ msgctxt "field:stock.configuration,id:"
 msgid "ID"
 msgstr ""
 
+msgctxt "field:stock.configuration,inventory_sequence:"
+msgid "Inventory Sequence"
+msgstr ""
+
 #, fuzzy
 msgctxt "field:stock.configuration,rec_name:"
 msgid "Name"
@@ -248,6 +252,10 @@ msgctxt "field:stock.inventory,lost_found:"
 msgid "Lost and Found"
 msgstr ""
 
+msgctxt "field:stock.inventory,number:"
+msgid "Number"
+msgstr ""
+
 #, fuzzy
 msgctxt "field:stock.inventory,rec_name:"
 msgid "Name"
@@ -413,6 +421,11 @@ msgctxt "field:stock.location,type:"
 msgid "Location type"
 msgstr ""
 
+#, fuzzy
+msgctxt "field:stock.location,warehouse:"
+msgid "Warehouse"
+msgstr "Magazijn"
+
 msgctxt "field:stock.location,write_date:"
 msgid "Write Date"
 msgstr ""
@@ -421,6 +434,10 @@ msgctxt "field:stock.location,write_uid:"
 msgid "Write User"
 msgstr ""
 
+msgctxt "field:stock.move,assignation_required:"
+msgid "Assignation Required"
+msgstr ""
+
 #, fuzzy
 msgctxt "field:stock.move,company:"
 msgid "Company"
@@ -667,11 +684,6 @@ msgid "ID"
 msgstr ""
 
 #, fuzzy
-msgctxt "field:stock.shipment.in,code:"
-msgid "Code"
-msgstr "Code"
-
-#, fuzzy
 msgctxt "field:stock.shipment.in,company:"
 msgid "Company"
 msgstr "Bedrijf"
@@ -710,6 +722,10 @@ msgctxt "field:stock.shipment.in,moves:"
 msgid "Moves"
 msgstr "Boekingen"
 
+msgctxt "field:stock.shipment.in,number:"
+msgid "Numer"
+msgstr ""
+
 msgctxt "field:stock.shipment.in,origins:"
 msgid "Origins"
 msgstr ""
@@ -764,11 +780,6 @@ msgid "Write User"
 msgstr ""
 
 #, fuzzy
-msgctxt "field:stock.shipment.in.return,code:"
-msgid "Code"
-msgstr "Code"
-
-#, fuzzy
 msgctxt "field:stock.shipment.in.return,company:"
 msgid "Company"
 msgstr "Bedrijf"
@@ -781,6 +792,10 @@ msgctxt "field:stock.shipment.in.return,create_uid:"
 msgid "Create User"
 msgstr ""
 
+msgctxt "field:stock.shipment.in.return,delivery_address:"
+msgid "Delivery Address"
+msgstr ""
+
 #, fuzzy
 msgctxt "field:stock.shipment.in.return,effective_date:"
 msgid "Effective Date"
@@ -799,6 +814,10 @@ msgctxt "field:stock.shipment.in.return,moves:"
 msgid "Moves"
 msgstr "Boekingen"
 
+msgctxt "field:stock.shipment.in.return,number:"
+msgid "Number"
+msgstr ""
+
 msgctxt "field:stock.shipment.in.return,origins:"
 msgid "Origins"
 msgstr ""
@@ -822,6 +841,11 @@ msgctxt "field:stock.shipment.in.return,state:"
 msgid "State"
 msgstr "Status"
 
+#, fuzzy
+msgctxt "field:stock.shipment.in.return,supplier:"
+msgid "Supplier"
+msgstr "Leverancier"
+
 msgctxt "field:stock.shipment.in.return,to_location:"
 msgid "To Location"
 msgstr ""
@@ -844,11 +868,6 @@ msgid "Moves"
 msgstr "Boekingen"
 
 #, fuzzy
-msgctxt "field:stock.shipment.internal,code:"
-msgid "Code"
-msgstr "Code"
-
-#, fuzzy
 msgctxt "field:stock.shipment.internal,company:"
 msgid "Company"
 msgstr "Bedrijf"
@@ -879,6 +898,10 @@ msgctxt "field:stock.shipment.internal,moves:"
 msgid "Moves"
 msgstr "Boekingen"
 
+msgctxt "field:stock.shipment.internal,number:"
+msgid "Number"
+msgstr ""
+
 msgctxt "field:stock.shipment.internal,planned_date:"
 msgid "Planned Date"
 msgstr ""
@@ -920,11 +943,6 @@ msgid "Moves"
 msgstr "Boekingen"
 
 #, fuzzy
-msgctxt "field:stock.shipment.out,code:"
-msgid "Code"
-msgstr "Code"
-
-#, fuzzy
 msgctxt "field:stock.shipment.out,company:"
 msgid "Company"
 msgstr "Bedrijf"
@@ -968,6 +986,10 @@ msgctxt "field:stock.shipment.out,moves:"
 msgid "Moves"
 msgstr "Boekingen"
 
+msgctxt "field:stock.shipment.out,number:"
+msgid "Number"
+msgstr ""
+
 msgctxt "field:stock.shipment.out,origins:"
 msgid "Origins"
 msgstr ""
@@ -1025,11 +1047,6 @@ msgid "Inventory Moves"
 msgstr ""
 
 #, fuzzy
-msgctxt "field:stock.shipment.out.return,code:"
-msgid "Code"
-msgstr "Code"
-
-#, fuzzy
 msgctxt "field:stock.shipment.out.return,company:"
 msgid "Company"
 msgstr "Bedrijf"
@@ -1077,6 +1094,10 @@ msgctxt "field:stock.shipment.out.return,moves:"
 msgid "Moves"
 msgstr "Boekingen"
 
+msgctxt "field:stock.shipment.out.return,number:"
+msgid "Number"
+msgstr ""
+
 msgctxt "field:stock.shipment.out.return,origins:"
 msgid "Origins"
 msgstr ""
@@ -1394,6 +1415,10 @@ msgctxt ""
 msgid "Received"
 msgstr ""
 
+msgctxt "model:ir.sequence,name:sequence_inventory"
+msgid "Inventory"
+msgstr ""
+
 msgctxt "model:ir.sequence,name:sequence_shipment_in"
 msgid "Supplier Shipment"
 msgstr ""
@@ -1414,6 +1439,10 @@ msgctxt "model:ir.sequence,name:sequence_shipment_out_return"
 msgid "Customer Return Shipment"
 msgstr ""
 
+msgctxt "model:ir.sequence.type,name:sequence_type_inventory"
+msgid "Inventory"
+msgstr ""
+
 msgctxt "model:ir.sequence.type,name:sequence_type_shipment_in"
 msgid "Supplier Shipment"
 msgstr ""
@@ -1614,234 +1643,255 @@ msgctxt "model:stock.shipment.out.return,name:"
 msgid "Customer Return Shipment"
 msgstr ""
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "/"
 msgstr ""
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
-msgid "Code:"
+msgctxt "report:stock.shipment.in.restocking_list:"
+msgid ":"
 msgstr ""
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "From Location"
 msgstr ""
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Planned Date:"
 msgstr ""
 
 #, fuzzy
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Product"
 msgstr "Producten"
 
 #, fuzzy
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Quantity"
 msgstr "Hoeveelheid"
 
 #, fuzzy
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Reference:"
 msgstr "Referentie:"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Restocking List"
 msgstr ""
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
-msgid "Supplier:"
+msgctxt "report:stock.shipment.in.restocking_list:"
+msgid "Shipment Number"
 msgstr ""
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+#, fuzzy
+msgctxt "report:stock.shipment.in.restocking_list:"
+msgid "Supplier:"
+msgstr "Leverancier"
+
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "To Location"
 msgstr ""
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+#, fuzzy
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Warehouse:"
-msgstr ""
+msgstr "Magazijn"
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "/"
 msgstr ""
 
-msgctxt "odt:stock.shipment.internal.report:"
-msgid "Code:"
+msgctxt "report:stock.shipment.internal.report:"
+msgid ":"
 msgstr ""
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "From Location"
 msgstr ""
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "From Location:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "Internal Shipment"
 msgstr ""
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "Planned Date:"
 msgstr ""
 
 #, fuzzy
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "Product"
 msgstr "Producten"
 
 #, fuzzy
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "Quantity"
 msgstr "Hoeveelheid"
 
 #, fuzzy
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "Reference:"
 msgstr "Referentie:"
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
+msgid "Shipment Number"
+msgstr ""
+
+msgctxt "report:stock.shipment.internal.report:"
 msgid "To Location"
 msgstr ""
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "To Location:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "/"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Customer Code:"
 msgstr ""
 
 #, fuzzy
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Date:"
 msgstr "Datum:"
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Delivery Note"
 msgstr ""
 
 #, fuzzy
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Product"
 msgstr "Producten"
 
 #, fuzzy
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Quantity"
 msgstr "Hoeveelheid"
 
 #, fuzzy
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Reference:"
 msgstr "Referentie:"
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Shipment Number:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "/"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.picking_list:"
-msgid "Code:"
+msgctxt "report:stock.shipment.out.picking_list:"
+msgid ":"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+#, fuzzy
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Customer:"
-msgstr ""
+msgstr "Klant"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "From Location"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Picking List"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Planned Date:"
 msgstr ""
 
 #, fuzzy
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Product"
 msgstr "Producten"
 
 #, fuzzy
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Quantity"
 msgstr "Hoeveelheid"
 
 #, fuzzy
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Reference:"
 msgstr "Referentie:"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
+msgid "Shipment Number"
+msgstr ""
+
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "To Location"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+#, fuzzy
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Warehouse:"
-msgstr ""
+msgstr "Magazijn"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "/"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid ":"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
-msgid "Code:"
-msgstr ""
-
 #, fuzzy
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Customer"
 msgstr "Klant"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "From Location"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
+msgid "Number"
+msgstr ""
+
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Planned Date:"
 msgstr ""
 
 #, fuzzy
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Product"
 msgstr "Producten"
 
 #, fuzzy
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Quantity"
 msgstr "Hoeveelheid"
 
 #, fuzzy
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Reference:"
 msgstr "Referentie:"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Restocking List"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
+msgid "Shipment"
+msgstr ""
+
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "To Location"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+#, fuzzy
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Warehouse:"
-msgstr ""
+msgstr "Magazijn"
 
 #, fuzzy
 msgctxt "selection:stock.inventory,state:"
@@ -1917,9 +1967,10 @@ msgctxt "selection:stock.move,state:"
 msgid "Staging"
 msgstr ""
 
+#, fuzzy
 msgctxt "selection:stock.period,state:"
 msgid "Closed"
-msgstr ""
+msgstr "Sluiten"
 
 #, fuzzy
 msgctxt "selection:stock.period,state:"
@@ -2059,6 +2110,14 @@ msgid "Products"
 msgstr "Producten"
 
 msgctxt "view:stock.configuration:"
+msgid "Inventory"
+msgstr ""
+
+msgctxt "view:stock.configuration:"
+msgid "Shipments"
+msgstr ""
+
+msgctxt "view:stock.configuration:"
 msgid "Stock Configuration"
 msgstr ""
 
@@ -2108,8 +2167,13 @@ msgctxt "view:stock.location:"
 msgid "Locations"
 msgstr ""
 
+#, fuzzy
 msgctxt "view:stock.move:"
 msgid "Cancel"
+msgstr "Annuleren"
+
+msgctxt "view:stock.move:"
+msgid "Do"
 msgstr ""
 
 #, fuzzy
@@ -2122,9 +2186,10 @@ msgctxt "view:stock.move:"
 msgid "Moves"
 msgstr "Boekingen"
 
+#, fuzzy
 msgctxt "view:stock.move:"
 msgid "Reset to Draft"
-msgstr ""
+msgstr "Terug naar concept"
 
 msgctxt "view:stock.period.cache:"
 msgid "Period Cache"
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index 71a13d8..dda3944 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -203,6 +203,10 @@ msgctxt "field:stock.configuration,id:"
 msgid "ID"
 msgstr "ID"
 
+msgctxt "field:stock.configuration,inventory_sequence:"
+msgid "Inventory Sequence"
+msgstr ""
+
 msgctxt "field:stock.configuration,rec_name:"
 msgid "Name"
 msgstr "Nome"
@@ -267,6 +271,10 @@ msgctxt "field:stock.inventory,lost_found:"
 msgid "Lost and Found"
 msgstr "Achados e Perdidos"
 
+msgctxt "field:stock.inventory,number:"
+msgid "Number"
+msgstr ""
+
 msgctxt "field:stock.inventory,rec_name:"
 msgid "Name"
 msgstr "Nome"
@@ -415,6 +423,11 @@ msgctxt "field:stock.location,type:"
 msgid "Location type"
 msgstr "Tipo da localização"
 
+#, fuzzy
+msgctxt "field:stock.location,warehouse:"
+msgid "Warehouse"
+msgstr "Armazém"
+
 msgctxt "field:stock.location,write_date:"
 msgid "Write Date"
 msgstr "Data de edição"
@@ -423,6 +436,10 @@ msgctxt "field:stock.location,write_uid:"
 msgid "Write User"
 msgstr "Editado por"
 
+msgctxt "field:stock.move,assignation_required:"
+msgid "Assignation Required"
+msgstr ""
+
 msgctxt "field:stock.move,company:"
 msgid "Company"
 msgstr "Empresa"
@@ -647,10 +664,6 @@ msgctxt "field:stock.products_by_locations.start,id:"
 msgid "ID"
 msgstr "ID"
 
-msgctxt "field:stock.shipment.in,code:"
-msgid "Code"
-msgstr "Código"
-
 msgctxt "field:stock.shipment.in,company:"
 msgid "Company"
 msgstr "Empresa"
@@ -687,6 +700,10 @@ msgctxt "field:stock.shipment.in,moves:"
 msgid "Moves"
 msgstr "Movimentações"
 
+msgctxt "field:stock.shipment.in,number:"
+msgid "Numer"
+msgstr ""
+
 msgctxt "field:stock.shipment.in,origins:"
 msgid "Origins"
 msgstr "Origens"
@@ -735,10 +752,6 @@ msgctxt "field:stock.shipment.in,write_uid:"
 msgid "Write User"
 msgstr "Editado por"
 
-msgctxt "field:stock.shipment.in.return,code:"
-msgid "Code"
-msgstr "Código"
-
 msgctxt "field:stock.shipment.in.return,company:"
 msgid "Company"
 msgstr "Empresa"
@@ -751,6 +764,11 @@ msgctxt "field:stock.shipment.in.return,create_uid:"
 msgid "Create User"
 msgstr "Criado por"
 
+#, fuzzy
+msgctxt "field:stock.shipment.in.return,delivery_address:"
+msgid "Delivery Address"
+msgstr "Endereço para entrega"
+
 msgctxt "field:stock.shipment.in.return,effective_date:"
 msgid "Effective Date"
 msgstr "Data efetiva"
@@ -767,6 +785,10 @@ msgctxt "field:stock.shipment.in.return,moves:"
 msgid "Moves"
 msgstr "Movimentações"
 
+msgctxt "field:stock.shipment.in.return,number:"
+msgid "Number"
+msgstr ""
+
 msgctxt "field:stock.shipment.in.return,origins:"
 msgid "Origins"
 msgstr "Origens"
@@ -787,6 +809,11 @@ msgctxt "field:stock.shipment.in.return,state:"
 msgid "State"
 msgstr "Estado"
 
+#, fuzzy
+msgctxt "field:stock.shipment.in.return,supplier:"
+msgid "Supplier"
+msgstr "Fornecedor"
+
 msgctxt "field:stock.shipment.in.return,to_location:"
 msgid "To Location"
 msgstr "Destino"
@@ -807,10 +834,6 @@ msgctxt "field:stock.shipment.in.return.assign.failed,moves:"
 msgid "Moves"
 msgstr "Movimentações"
 
-msgctxt "field:stock.shipment.internal,code:"
-msgid "Code"
-msgstr "Código"
-
 msgctxt "field:stock.shipment.internal,company:"
 msgid "Company"
 msgstr "Empresa"
@@ -839,6 +862,10 @@ msgctxt "field:stock.shipment.internal,moves:"
 msgid "Moves"
 msgstr "Movimentações"
 
+msgctxt "field:stock.shipment.internal,number:"
+msgid "Number"
+msgstr ""
+
 msgctxt "field:stock.shipment.internal,planned_date:"
 msgid "Planned Date"
 msgstr "Data planejada"
@@ -875,10 +902,6 @@ msgctxt "field:stock.shipment.internal.assign.failed,moves:"
 msgid "Moves"
 msgstr "Movimentações"
 
-msgctxt "field:stock.shipment.out,code:"
-msgid "Code"
-msgstr "Código"
-
 msgctxt "field:stock.shipment.out,company:"
 msgid "Company"
 msgstr "Empresa"
@@ -919,6 +942,10 @@ msgctxt "field:stock.shipment.out,moves:"
 msgid "Moves"
 msgstr "Movimentações"
 
+msgctxt "field:stock.shipment.out,number:"
+msgid "Number"
+msgstr ""
+
 msgctxt "field:stock.shipment.out,origins:"
 msgid "Origins"
 msgstr "Origens"
@@ -971,10 +998,6 @@ msgctxt "field:stock.shipment.out.assign.failed,inventory_moves:"
 msgid "Inventory Moves"
 msgstr "Movimentações Internas"
 
-msgctxt "field:stock.shipment.out.return,code:"
-msgid "Code"
-msgstr "Código"
-
 msgctxt "field:stock.shipment.out.return,company:"
 msgid "Company"
 msgstr "Empresa"
@@ -1019,6 +1042,10 @@ msgctxt "field:stock.shipment.out.return,moves:"
 msgid "Moves"
 msgstr "Movimentações"
 
+msgctxt "field:stock.shipment.out.return,number:"
+msgid "Number"
+msgstr ""
+
 msgctxt "field:stock.shipment.out.return,origins:"
 msgid "Origins"
 msgstr "Origens"
@@ -1326,6 +1353,11 @@ msgctxt ""
 msgid "Received"
 msgstr "Recebido"
 
+#, fuzzy
+msgctxt "model:ir.sequence,name:sequence_inventory"
+msgid "Inventory"
+msgstr "Inventário"
+
 msgctxt "model:ir.sequence,name:sequence_shipment_in"
 msgid "Supplier Shipment"
 msgstr "Remessa do Fornecedor"
@@ -1346,6 +1378,11 @@ msgctxt "model:ir.sequence,name:sequence_shipment_out_return"
 msgid "Customer Return Shipment"
 msgstr "Devolução do Cliente"
 
+#, fuzzy
+msgctxt "model:ir.sequence.type,name:sequence_type_inventory"
+msgid "Inventory"
+msgstr "Inventário"
+
 msgctxt "model:ir.sequence.type,name:sequence_type_shipment_in"
 msgid "Supplier Shipment"
 msgstr "Remessa do Fornecedor"
@@ -1538,215 +1575,235 @@ msgctxt "model:stock.shipment.out.return,name:"
 msgid "Customer Return Shipment"
 msgstr "Devolução do Cliente"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "/"
 msgstr "/"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
-msgid "Code:"
-msgstr "Código:"
+msgctxt "report:stock.shipment.in.restocking_list:"
+msgid ":"
+msgstr ""
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "From Location"
 msgstr "Origem"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Planned Date:"
 msgstr "Data Planejada:"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Product"
 msgstr "Produto"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Quantity"
 msgstr "Quantidade"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Reference:"
 msgstr "Referências"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Restocking List"
 msgstr "Relação para re-estocagem"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+#, fuzzy
+msgctxt "report:stock.shipment.in.restocking_list:"
+msgid "Shipment Number"
+msgstr "Número da Remessa:"
+
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Supplier:"
 msgstr "Fornecedor:"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "To Location"
 msgstr "Destino"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Warehouse:"
 msgstr "Armazém:"
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "/"
 msgstr "/"
 
-msgctxt "odt:stock.shipment.internal.report:"
-msgid "Code:"
-msgstr "Código:"
+msgctxt "report:stock.shipment.internal.report:"
+msgid ":"
+msgstr ""
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "From Location"
 msgstr "Origem"
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "From Location:"
 msgstr "Origem:"
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "Internal Shipment"
 msgstr "Remessa Interna"
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "Planned Date:"
 msgstr "Data Planejada:"
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "Product"
 msgstr "Produto"
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "Quantity"
 msgstr "Quantidade"
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "Reference:"
 msgstr "Referência:"
 
-msgctxt "odt:stock.shipment.internal.report:"
+#, fuzzy
+msgctxt "report:stock.shipment.internal.report:"
+msgid "Shipment Number"
+msgstr "Número da Remessa:"
+
+msgctxt "report:stock.shipment.internal.report:"
 msgid "To Location"
 msgstr "Destino"
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "To Location:"
 msgstr "Destino:"
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "/"
 msgstr "/"
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Customer Code:"
 msgstr "Código do Cliente:"
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Date:"
 msgstr "Data:"
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Delivery Note"
 msgstr "Notificação de entrega"
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Product"
 msgstr "Produto"
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Quantity"
 msgstr "Quantidade"
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Reference:"
 msgstr "Referência:"
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Shipment Number:"
 msgstr "Número da Remessa:"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "/"
 msgstr "/"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
-msgid "Code:"
-msgstr "Código:"
+msgctxt "report:stock.shipment.out.picking_list:"
+msgid ":"
+msgstr ""
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Customer:"
 msgstr "Cliente:"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "From Location"
 msgstr "Origem"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Picking List"
 msgstr "Relação para separação"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Planned Date:"
 msgstr "Data Planejada:"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Product"
 msgstr "Produto"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Quantity"
 msgstr "Quantidade"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Reference:"
 msgstr "Referência:"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+#, fuzzy
+msgctxt "report:stock.shipment.out.picking_list:"
+msgid "Shipment Number"
+msgstr "Número da Remessa:"
+
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "To Location"
 msgstr "Destino"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Warehouse:"
 msgstr "Armazém"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "/"
 msgstr "/"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid ":"
 msgstr ":"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
-msgid "Code:"
-msgstr "Código:"
-
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Customer"
 msgstr "Cliente"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "From Location"
 msgstr "Origem"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
+msgid "Number"
+msgstr ""
+
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Planned Date:"
 msgstr "Data Planejada:"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Product"
 msgstr "Produto"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Quantity"
 msgstr "Quantidade"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Reference:"
 msgstr "Referência:"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Restocking List"
 msgstr "Relação para re-estocagem"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+#, fuzzy
+msgctxt "report:stock.shipment.out.return.restocking_list:"
+msgid "Shipment"
+msgstr "Remessa"
+
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "To Location"
 msgstr "Destino"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Warehouse:"
 msgstr "Armazém"
 
@@ -1934,6 +1991,16 @@ msgctxt "view:product.product:"
 msgid "Products"
 msgstr "Produtos"
 
+#, fuzzy
+msgctxt "view:stock.configuration:"
+msgid "Inventory"
+msgstr "Inventário"
+
+#, fuzzy
+msgctxt "view:stock.configuration:"
+msgid "Shipments"
+msgstr "Remessa"
+
 msgctxt "view:stock.configuration:"
 msgid "Stock Configuration"
 msgstr "Configuração do Estoque"
@@ -1987,6 +2054,10 @@ msgid "Cancel"
 msgstr "Cancelar"
 
 msgctxt "view:stock.move:"
+msgid "Do"
+msgstr ""
+
+msgctxt "view:stock.move:"
 msgid "Move"
 msgstr "Movimentação"
 
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
index 5fd00b5..ff7b5d3 100644
--- a/locale/ru_RU.po
+++ b/locale/ru_RU.po
@@ -10,10 +10,13 @@ msgstr ""
 "Вы не можете изменить единицу измерения по умолчанию для продукта, который "
 "связан со складом перемещения."
 
+#, fuzzy
 msgctxt "error:product.template:"
 msgid ""
 "You cannot change the type for a product which is associated to stock moves."
 msgstr ""
+"Вы не можете изменить единицу измерения по умолчанию для продукта, который "
+"связан со складом перемещения."
 
 msgctxt "error:stock.inventory.line:"
 msgid "Line quantity must be positive."
@@ -192,6 +195,10 @@ msgctxt "field:stock.configuration,id:"
 msgid "ID"
 msgstr "ID"
 
+msgctxt "field:stock.configuration,inventory_sequence:"
+msgid "Inventory Sequence"
+msgstr ""
+
 msgctxt "field:stock.configuration,rec_name:"
 msgid "Name"
 msgstr "Наименование"
@@ -256,6 +263,10 @@ msgctxt "field:stock.inventory,lost_found:"
 msgid "Lost and Found"
 msgstr "Утраченная и обретенная"
 
+msgctxt "field:stock.inventory,number:"
+msgid "Number"
+msgstr ""
+
 msgctxt "field:stock.inventory,rec_name:"
 msgid "Name"
 msgstr "Наименование"
@@ -405,6 +416,11 @@ msgctxt "field:stock.location,type:"
 msgid "Location type"
 msgstr "Тип местоположения"
 
+#, fuzzy
+msgctxt "field:stock.location,warehouse:"
+msgid "Warehouse"
+msgstr "Товарный склад"
+
 msgctxt "field:stock.location,write_date:"
 msgid "Write Date"
 msgstr "Дата изменения"
@@ -413,6 +429,10 @@ msgctxt "field:stock.location,write_uid:"
 msgid "Write User"
 msgstr "Изменено пользователем"
 
+msgctxt "field:stock.move,assignation_required:"
+msgid "Assignation Required"
+msgstr ""
+
 msgctxt "field:stock.move,company:"
 msgid "Company"
 msgstr "Организация"
@@ -637,10 +657,6 @@ msgctxt "field:stock.products_by_locations.start,id:"
 msgid "ID"
 msgstr "ID"
 
-msgctxt "field:stock.shipment.in,code:"
-msgid "Code"
-msgstr "Код отгрузки"
-
 msgctxt "field:stock.shipment.in,company:"
 msgid "Company"
 msgstr "Организация"
@@ -677,9 +693,14 @@ msgctxt "field:stock.shipment.in,moves:"
 msgid "Moves"
 msgstr "Перемещения"
 
+msgctxt "field:stock.shipment.in,number:"
+msgid "Numer"
+msgstr ""
+
+#, fuzzy
 msgctxt "field:stock.shipment.in,origins:"
 msgid "Origins"
-msgstr ""
+msgstr "Первоисточник"
 
 msgctxt "field:stock.shipment.in,planned_date:"
 msgid "Planned Date"
@@ -725,10 +746,6 @@ msgctxt "field:stock.shipment.in,write_uid:"
 msgid "Write User"
 msgstr "Изменено пользователем"
 
-msgctxt "field:stock.shipment.in.return,code:"
-msgid "Code"
-msgstr "Код возврата отгрузки"
-
 msgctxt "field:stock.shipment.in.return,company:"
 msgid "Company"
 msgstr "Организация"
@@ -741,6 +758,11 @@ msgctxt "field:stock.shipment.in.return,create_uid:"
 msgid "Create User"
 msgstr "Создано пользователем"
 
+#, fuzzy
+msgctxt "field:stock.shipment.in.return,delivery_address:"
+msgid "Delivery Address"
+msgstr "Адрес доставки"
+
 msgctxt "field:stock.shipment.in.return,effective_date:"
 msgid "Effective Date"
 msgstr "Учетная дата"
@@ -757,9 +779,14 @@ msgctxt "field:stock.shipment.in.return,moves:"
 msgid "Moves"
 msgstr "Перемещения"
 
+msgctxt "field:stock.shipment.in.return,number:"
+msgid "Number"
+msgstr ""
+
+#, fuzzy
 msgctxt "field:stock.shipment.in.return,origins:"
 msgid "Origins"
-msgstr ""
+msgstr "Первоисточник"
 
 msgctxt "field:stock.shipment.in.return,planned_date:"
 msgid "Planned Date"
@@ -777,6 +804,11 @@ msgctxt "field:stock.shipment.in.return,state:"
 msgid "State"
 msgstr "Состояние"
 
+#, fuzzy
+msgctxt "field:stock.shipment.in.return,supplier:"
+msgid "Supplier"
+msgstr "Поставщик"
+
 msgctxt "field:stock.shipment.in.return,to_location:"
 msgid "To Location"
 msgstr "В местоположение"
@@ -797,10 +829,6 @@ msgctxt "field:stock.shipment.in.return.assign.failed,moves:"
 msgid "Moves"
 msgstr "Перемещения"
 
-msgctxt "field:stock.shipment.internal,code:"
-msgid "Code"
-msgstr "Код внутренней отгрузки"
-
 msgctxt "field:stock.shipment.internal,company:"
 msgid "Company"
 msgstr "Организация"
@@ -829,6 +857,10 @@ msgctxt "field:stock.shipment.internal,moves:"
 msgid "Moves"
 msgstr "Перемещения"
 
+msgctxt "field:stock.shipment.internal,number:"
+msgid "Number"
+msgstr ""
+
 msgctxt "field:stock.shipment.internal,planned_date:"
 msgid "Planned Date"
 msgstr "Плановая дата"
@@ -865,10 +897,6 @@ msgctxt "field:stock.shipment.internal.assign.failed,moves:"
 msgid "Moves"
 msgstr "Перемещения"
 
-msgctxt "field:stock.shipment.out,code:"
-msgid "Code"
-msgstr "Код исходящей отгрузки"
-
 msgctxt "field:stock.shipment.out,company:"
 msgid "Company"
 msgstr "Организация"
@@ -909,9 +937,14 @@ msgctxt "field:stock.shipment.out,moves:"
 msgid "Moves"
 msgstr "Перемещения"
 
+msgctxt "field:stock.shipment.out,number:"
+msgid "Number"
+msgstr ""
+
+#, fuzzy
 msgctxt "field:stock.shipment.out,origins:"
 msgid "Origins"
-msgstr ""
+msgstr "Первоисточник"
 
 msgctxt "field:stock.shipment.out,outgoing_moves:"
 msgid "Outgoing Moves"
@@ -961,10 +994,6 @@ msgctxt "field:stock.shipment.out.assign.failed,inventory_moves:"
 msgid "Inventory Moves"
 msgstr "Учет перемещений"
 
-msgctxt "field:stock.shipment.out.return,code:"
-msgid "Code"
-msgstr "Код возврата отгрузки"
-
 msgctxt "field:stock.shipment.out.return,company:"
 msgid "Company"
 msgstr "Организация"
@@ -1009,9 +1038,14 @@ msgctxt "field:stock.shipment.out.return,moves:"
 msgid "Moves"
 msgstr "Перемещения"
 
+msgctxt "field:stock.shipment.out.return,number:"
+msgid "Number"
+msgstr ""
+
+#, fuzzy
 msgctxt "field:stock.shipment.out.return,origins:"
 msgid "Origins"
-msgstr ""
+msgstr "Первоисточник"
 
 msgctxt "field:stock.shipment.out.return,planned_date:"
 msgid "Planned Date"
@@ -1317,6 +1351,11 @@ msgctxt ""
 msgid "Received"
 msgstr "Поступило"
 
+#, fuzzy
+msgctxt "model:ir.sequence,name:sequence_inventory"
+msgid "Inventory"
+msgstr "Инвентаризация"
+
 msgctxt "model:ir.sequence,name:sequence_shipment_in"
 msgid "Supplier Shipment"
 msgstr "Приход от поставщика"
@@ -1337,6 +1376,11 @@ msgctxt "model:ir.sequence,name:sequence_shipment_out_return"
 msgid "Customer Return Shipment"
 msgstr "Возврат от заказчика"
 
+#, fuzzy
+msgctxt "model:ir.sequence.type,name:sequence_type_inventory"
+msgid "Inventory"
+msgstr "Инвентаризация"
+
 msgctxt "model:ir.sequence.type,name:sequence_type_shipment_in"
 msgid "Supplier Shipment"
 msgstr "Приход от поставщика"
@@ -1529,216 +1573,236 @@ msgctxt "model:stock.shipment.out.return,name:"
 msgid "Customer Return Shipment"
 msgstr "Возврат от заказчика"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "/"
 msgstr "/"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
-msgid "Code:"
-msgstr "Код:"
+msgctxt "report:stock.shipment.in.restocking_list:"
+msgid ":"
+msgstr ""
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "From Location"
 msgstr "Из местоположения"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Planned Date:"
 msgstr "Плановая дата:"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Product"
 msgstr "Продукт"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Quantity"
 msgstr "Кол-во"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Reference:"
 msgstr "Ссылка:"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Restocking List"
 msgstr "Список пополнения"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+#, fuzzy
+msgctxt "report:stock.shipment.in.restocking_list:"
+msgid "Shipment Number"
+msgstr "Номер доставки:"
+
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Supplier:"
 msgstr "Поставщик:"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "To Location"
 msgstr "В местоположение"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Warehouse:"
 msgstr "Товарный склад:"
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "/"
 msgstr "/"
 
-msgctxt "odt:stock.shipment.internal.report:"
-msgid "Code:"
-msgstr "Код:"
+msgctxt "report:stock.shipment.internal.report:"
+msgid ":"
+msgstr ""
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "From Location"
 msgstr "Из местоположения"
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "From Location:"
 msgstr "Из местоположения:"
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "Internal Shipment"
 msgstr "Внутреннее перемещение"
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "Planned Date:"
 msgstr "Плановая дата:"
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "Product"
 msgstr "Продукт"
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "Quantity"
 msgstr "Кол-во"
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "Reference:"
 msgstr "Ссылка:"
 
-msgctxt "odt:stock.shipment.internal.report:"
+#, fuzzy
+msgctxt "report:stock.shipment.internal.report:"
+msgid "Shipment Number"
+msgstr "Номер доставки:"
+
+msgctxt "report:stock.shipment.internal.report:"
 msgid "To Location"
 msgstr "В местоположение"
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "To Location:"
 msgstr "В местоположение:"
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "/"
 msgstr "/"
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Customer Code:"
 msgstr "Код заказчика:"
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Date:"
 msgstr "Дата:"
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Delivery Note"
 msgstr "Накладная"
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Product"
 msgstr "Продукт"
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Quantity"
 msgstr "Кол-во"
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Reference:"
 msgstr "Ссылка:"
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Shipment Number:"
 msgstr "Номер доставки:"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "/"
 msgstr "/"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
-msgid "Code:"
-msgstr "Код:"
+msgctxt "report:stock.shipment.out.picking_list:"
+msgid ":"
+msgstr ""
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Customer:"
 msgstr "Заказчик:"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "From Location"
 msgstr "Из местоположения"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Picking List"
 msgstr "Список выбора"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Planned Date:"
 msgstr "Плановая дата:"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Product"
 msgstr "Продукт"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Quantity"
 msgstr "Кол-во"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Reference:"
 msgstr "Ссылка:"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+#, fuzzy
+msgctxt "report:stock.shipment.out.picking_list:"
+msgid "Shipment Number"
+msgstr "Номер доставки:"
+
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "To Location"
 msgstr "В местоположение"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Warehouse:"
 msgstr "Товарный склад:"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "/"
 msgstr "/"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid ":"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
-msgid "Code:"
-msgstr "Код:"
-
 #, fuzzy
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Customer"
 msgstr "Заказчик"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "From Location"
 msgstr "Из местоположения"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
+msgid "Number"
+msgstr ""
+
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Planned Date:"
 msgstr "Плановая дата:"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Product"
 msgstr "Продукт"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Quantity"
 msgstr "Кол-во"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Reference:"
 msgstr "Ссылка:"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Restocking List"
 msgstr "Список пополнения"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+#, fuzzy
+msgctxt "report:stock.shipment.out.return.restocking_list:"
+msgid "Shipment"
+msgstr "Доставка"
+
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "To Location"
 msgstr "В местоположение"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Warehouse:"
 msgstr "Товарный склад:"
 
@@ -1927,6 +1991,16 @@ msgctxt "view:product.product:"
 msgid "Products"
 msgstr "Продукция"
 
+#, fuzzy
+msgctxt "view:stock.configuration:"
+msgid "Inventory"
+msgstr "Инвентаризация"
+
+#, fuzzy
+msgctxt "view:stock.configuration:"
+msgid "Shipments"
+msgstr "Доставка"
+
 msgctxt "view:stock.configuration:"
 msgid "Stock Configuration"
 msgstr "Конфигурация склада"
@@ -1977,6 +2051,10 @@ msgstr "Местоположения"
 
 msgctxt "view:stock.move:"
 msgid "Cancel"
+msgstr "Отменить"
+
+msgctxt "view:stock.move:"
+msgid "Do"
 msgstr ""
 
 msgctxt "view:stock.move:"
@@ -1989,7 +2067,7 @@ msgstr "Перемещения"
 
 msgctxt "view:stock.move:"
 msgid "Reset to Draft"
-msgstr ""
+msgstr "Сброс в черновик"
 
 msgctxt "view:stock.period.cache:"
 msgid "Period Cache"
diff --git a/locale/sl_SI.po b/locale/sl_SI.po
index ca86977..65b4712 100644
--- a/locale/sl_SI.po
+++ b/locale/sl_SI.po
@@ -193,6 +193,10 @@ msgctxt "field:stock.configuration,id:"
 msgid "ID"
 msgstr "ID"
 
+msgctxt "field:stock.configuration,inventory_sequence:"
+msgid "Inventory Sequence"
+msgstr ""
+
 msgctxt "field:stock.configuration,rec_name:"
 msgid "Name"
 msgstr "Ime"
@@ -257,6 +261,10 @@ msgctxt "field:stock.inventory,lost_found:"
 msgid "Lost and Found"
 msgstr "Izgubljeno/najdeno"
 
+msgctxt "field:stock.inventory,number:"
+msgid "Number"
+msgstr ""
+
 msgctxt "field:stock.inventory,rec_name:"
 msgid "Name"
 msgstr "Ime"
@@ -405,6 +413,11 @@ msgctxt "field:stock.location,type:"
 msgid "Location type"
 msgstr "Tip lokacije"
 
+#, fuzzy
+msgctxt "field:stock.location,warehouse:"
+msgid "Warehouse"
+msgstr "Skladišče"
+
 msgctxt "field:stock.location,write_date:"
 msgid "Write Date"
 msgstr "Zapisano"
@@ -413,6 +426,10 @@ msgctxt "field:stock.location,write_uid:"
 msgid "Write User"
 msgstr "Zapisal"
 
+msgctxt "field:stock.move,assignation_required:"
+msgid "Assignation Required"
+msgstr ""
+
 msgctxt "field:stock.move,company:"
 msgid "Company"
 msgstr "Družba"
@@ -637,10 +654,6 @@ msgctxt "field:stock.products_by_locations.start,id:"
 msgid "ID"
 msgstr "ID"
 
-msgctxt "field:stock.shipment.in,code:"
-msgid "Code"
-msgstr "Šifra"
-
 msgctxt "field:stock.shipment.in,company:"
 msgid "Company"
 msgstr "Družba"
@@ -677,6 +690,10 @@ msgctxt "field:stock.shipment.in,moves:"
 msgid "Moves"
 msgstr "Promet"
 
+msgctxt "field:stock.shipment.in,number:"
+msgid "Numer"
+msgstr ""
+
 msgctxt "field:stock.shipment.in,origins:"
 msgid "Origins"
 msgstr "Porekla"
@@ -725,10 +742,6 @@ msgctxt "field:stock.shipment.in,write_uid:"
 msgid "Write User"
 msgstr "Zapisal"
 
-msgctxt "field:stock.shipment.in.return,code:"
-msgid "Code"
-msgstr "Šifra"
-
 msgctxt "field:stock.shipment.in.return,company:"
 msgid "Company"
 msgstr "Družba"
@@ -741,6 +754,11 @@ msgctxt "field:stock.shipment.in.return,create_uid:"
 msgid "Create User"
 msgstr "Izdelal"
 
+#, fuzzy
+msgctxt "field:stock.shipment.in.return,delivery_address:"
+msgid "Delivery Address"
+msgstr "Prejemnik"
+
 msgctxt "field:stock.shipment.in.return,effective_date:"
 msgid "Effective Date"
 msgstr "Dejanski datum"
@@ -757,6 +775,10 @@ msgctxt "field:stock.shipment.in.return,moves:"
 msgid "Moves"
 msgstr "Promet"
 
+msgctxt "field:stock.shipment.in.return,number:"
+msgid "Number"
+msgstr ""
+
 msgctxt "field:stock.shipment.in.return,origins:"
 msgid "Origins"
 msgstr "Porekla"
@@ -777,6 +799,11 @@ msgctxt "field:stock.shipment.in.return,state:"
 msgid "State"
 msgstr "Stanje"
 
+#, fuzzy
+msgctxt "field:stock.shipment.in.return,supplier:"
+msgid "Supplier"
+msgstr "Dobavitelj"
+
 msgctxt "field:stock.shipment.in.return,to_location:"
 msgid "To Location"
 msgstr "Na lokacijo"
@@ -797,10 +824,6 @@ msgctxt "field:stock.shipment.in.return.assign.failed,moves:"
 msgid "Moves"
 msgstr "Promet"
 
-msgctxt "field:stock.shipment.internal,code:"
-msgid "Code"
-msgstr "Šifra"
-
 msgctxt "field:stock.shipment.internal,company:"
 msgid "Company"
 msgstr "Družba"
@@ -829,6 +852,10 @@ msgctxt "field:stock.shipment.internal,moves:"
 msgid "Moves"
 msgstr "Promet"
 
+msgctxt "field:stock.shipment.internal,number:"
+msgid "Number"
+msgstr ""
+
 msgctxt "field:stock.shipment.internal,planned_date:"
 msgid "Planned Date"
 msgstr "Načrtovan datum"
@@ -865,10 +892,6 @@ msgctxt "field:stock.shipment.internal.assign.failed,moves:"
 msgid "Moves"
 msgstr "Promet"
 
-msgctxt "field:stock.shipment.out,code:"
-msgid "Code"
-msgstr "Šifra"
-
 msgctxt "field:stock.shipment.out,company:"
 msgid "Company"
 msgstr "Družba"
@@ -909,6 +932,10 @@ msgctxt "field:stock.shipment.out,moves:"
 msgid "Moves"
 msgstr "Promet"
 
+msgctxt "field:stock.shipment.out,number:"
+msgid "Number"
+msgstr ""
+
 msgctxt "field:stock.shipment.out,origins:"
 msgid "Origins"
 msgstr "Porekla"
@@ -961,10 +988,6 @@ msgctxt "field:stock.shipment.out.assign.failed,inventory_moves:"
 msgid "Inventory Moves"
 msgstr "Inventarni promet"
 
-msgctxt "field:stock.shipment.out.return,code:"
-msgid "Code"
-msgstr "Šifra"
-
 msgctxt "field:stock.shipment.out.return,company:"
 msgid "Company"
 msgstr "Družba"
@@ -1009,6 +1032,10 @@ msgctxt "field:stock.shipment.out.return,moves:"
 msgid "Moves"
 msgstr "Promet"
 
+msgctxt "field:stock.shipment.out.return,number:"
+msgid "Number"
+msgstr ""
+
 msgctxt "field:stock.shipment.out.return,origins:"
 msgid "Origins"
 msgstr "Porekla"
@@ -1316,6 +1343,11 @@ msgctxt ""
 msgid "Received"
 msgstr "Prejeto"
 
+#, fuzzy
+msgctxt "model:ir.sequence,name:sequence_inventory"
+msgid "Inventory"
+msgstr "Popis"
+
 msgctxt "model:ir.sequence,name:sequence_shipment_in"
 msgid "Supplier Shipment"
 msgstr "Prevzemnica"
@@ -1336,6 +1368,11 @@ msgctxt "model:ir.sequence,name:sequence_shipment_out_return"
 msgid "Customer Return Shipment"
 msgstr "Vrnjena odpremnica"
 
+#, fuzzy
+msgctxt "model:ir.sequence.type,name:sequence_type_inventory"
+msgid "Inventory"
+msgstr "Popis"
+
 msgctxt "model:ir.sequence.type,name:sequence_type_shipment_in"
 msgid "Supplier Shipment"
 msgstr "Prevzemnica"
@@ -1528,215 +1565,235 @@ msgctxt "model:stock.shipment.out.return,name:"
 msgid "Customer Return Shipment"
 msgstr "Vrnjena odpremnica"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "/"
 msgstr "/"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
-msgid "Code:"
-msgstr "Šifra:"
+msgctxt "report:stock.shipment.in.restocking_list:"
+msgid ":"
+msgstr ""
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "From Location"
 msgstr "Iz lokacije"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Planned Date:"
 msgstr "Načrtovan datum:"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Product"
 msgstr "Izdelek"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Quantity"
 msgstr "Količina"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Reference:"
 msgstr "Sklic:"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Restocking List"
 msgstr "Obnova zaloge"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+#, fuzzy
+msgctxt "report:stock.shipment.in.restocking_list:"
+msgid "Shipment Number"
+msgstr "Dobavnica št.:"
+
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Supplier:"
 msgstr "Dobavitelj:"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "To Location"
 msgstr "Na lokacijo"
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Warehouse:"
 msgstr "Skladišče:"
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "/"
 msgstr "/"
 
-msgctxt "odt:stock.shipment.internal.report:"
-msgid "Code:"
-msgstr "Šifra:"
+msgctxt "report:stock.shipment.internal.report:"
+msgid ":"
+msgstr ""
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "From Location"
 msgstr "Iz lokacije"
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "From Location:"
 msgstr "Iz lokacije:"
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "Internal Shipment"
 msgstr "Notranja odpremnica"
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "Planned Date:"
 msgstr "Načrtovan datum:"
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "Product"
 msgstr "Izdelek"
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "Quantity"
 msgstr "Količina"
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "Reference:"
 msgstr "Sklic:"
 
-msgctxt "odt:stock.shipment.internal.report:"
+#, fuzzy
+msgctxt "report:stock.shipment.internal.report:"
+msgid "Shipment Number"
+msgstr "Dobavnica št.:"
+
+msgctxt "report:stock.shipment.internal.report:"
 msgid "To Location"
 msgstr "Na lokacijo"
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "To Location:"
 msgstr "Na lokacijo:"
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "/"
 msgstr "/"
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Customer Code:"
 msgstr "Šifra kupca:"
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Date:"
 msgstr "Datum:"
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Delivery Note"
 msgstr "Dobavnica"
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Product"
 msgstr "Izdelek"
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Quantity"
 msgstr "Količina"
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Reference:"
 msgstr "Sklic:"
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Shipment Number:"
 msgstr "Dobavnica št.:"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "/"
 msgstr "/"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
-msgid "Code:"
-msgstr "Šifra:"
+msgctxt "report:stock.shipment.out.picking_list:"
+msgid ":"
+msgstr ""
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Customer:"
 msgstr "Kupec:"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "From Location"
 msgstr "Iz lokacije"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Picking List"
 msgstr "Prevzemni list"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Planned Date:"
 msgstr "Načrtovan datum:"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Product"
 msgstr "Izdelek"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Quantity"
 msgstr "Količina"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Reference:"
 msgstr "Sklic:"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+#, fuzzy
+msgctxt "report:stock.shipment.out.picking_list:"
+msgid "Shipment Number"
+msgstr "Dobavnica št.:"
+
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "To Location"
 msgstr "Na lokacijo"
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Warehouse:"
 msgstr "Skladišče:"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "/"
 msgstr "/"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid ":"
 msgstr ":"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
-msgid "Code:"
-msgstr "Šifra:"
-
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Customer"
 msgstr "Kupec"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "From Location"
 msgstr "Iz lokacije"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
+msgid "Number"
+msgstr ""
+
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Planned Date:"
 msgstr "Načrtovan datum:"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Product"
 msgstr "Izdelek"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Quantity"
 msgstr "Količina"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Reference:"
 msgstr "Sklic:"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Restocking List"
 msgstr "Obnova zaloge"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+#, fuzzy
+msgctxt "report:stock.shipment.out.return.restocking_list:"
+msgid "Shipment"
+msgstr "Pošiljka"
+
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "To Location"
 msgstr "Na lokacijo"
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Warehouse:"
 msgstr "Skladišče:"
 
@@ -1924,6 +1981,16 @@ msgctxt "view:product.product:"
 msgid "Products"
 msgstr "Izdelki"
 
+#, fuzzy
+msgctxt "view:stock.configuration:"
+msgid "Inventory"
+msgstr "Popis"
+
+#, fuzzy
+msgctxt "view:stock.configuration:"
+msgid "Shipments"
+msgstr "Pošiljka"
+
 msgctxt "view:stock.configuration:"
 msgid "Stock Configuration"
 msgstr "Konfiguracija zaloge"
@@ -1977,6 +2044,10 @@ msgid "Cancel"
 msgstr "Preklic"
 
 msgctxt "view:stock.move:"
+msgid "Do"
+msgstr ""
+
+msgctxt "view:stock.move:"
 msgid "Move"
 msgstr "Promet"
 
diff --git a/locale/ja_JP.po b/locale/zh_CN.po
similarity index 90%
copy from locale/ja_JP.po
copy to locale/zh_CN.po
index 0a9eea4..9265f16 100644
--- a/locale/ja_JP.po
+++ b/locale/zh_CN.po
@@ -178,6 +178,10 @@ msgctxt "field:stock.configuration,id:"
 msgid "ID"
 msgstr ""
 
+msgctxt "field:stock.configuration,inventory_sequence:"
+msgid "Inventory Sequence"
+msgstr ""
+
 msgctxt "field:stock.configuration,rec_name:"
 msgid "Name"
 msgstr ""
@@ -242,6 +246,10 @@ msgctxt "field:stock.inventory,lost_found:"
 msgid "Lost and Found"
 msgstr ""
 
+msgctxt "field:stock.inventory,number:"
+msgid "Number"
+msgstr ""
+
 msgctxt "field:stock.inventory,rec_name:"
 msgid "Name"
 msgstr ""
@@ -390,6 +398,10 @@ msgctxt "field:stock.location,type:"
 msgid "Location type"
 msgstr ""
 
+msgctxt "field:stock.location,warehouse:"
+msgid "Warehouse"
+msgstr ""
+
 msgctxt "field:stock.location,write_date:"
 msgid "Write Date"
 msgstr ""
@@ -398,6 +410,10 @@ msgctxt "field:stock.location,write_uid:"
 msgid "Write User"
 msgstr ""
 
+msgctxt "field:stock.move,assignation_required:"
+msgid "Assignation Required"
+msgstr ""
+
 msgctxt "field:stock.move,company:"
 msgid "Company"
 msgstr ""
@@ -622,10 +638,6 @@ msgctxt "field:stock.products_by_locations.start,id:"
 msgid "ID"
 msgstr ""
 
-msgctxt "field:stock.shipment.in,code:"
-msgid "Code"
-msgstr ""
-
 msgctxt "field:stock.shipment.in,company:"
 msgid "Company"
 msgstr ""
@@ -662,6 +674,10 @@ msgctxt "field:stock.shipment.in,moves:"
 msgid "Moves"
 msgstr ""
 
+msgctxt "field:stock.shipment.in,number:"
+msgid "Numer"
+msgstr ""
+
 msgctxt "field:stock.shipment.in,origins:"
 msgid "Origins"
 msgstr ""
@@ -710,10 +726,6 @@ msgctxt "field:stock.shipment.in,write_uid:"
 msgid "Write User"
 msgstr ""
 
-msgctxt "field:stock.shipment.in.return,code:"
-msgid "Code"
-msgstr ""
-
 msgctxt "field:stock.shipment.in.return,company:"
 msgid "Company"
 msgstr ""
@@ -726,6 +738,10 @@ msgctxt "field:stock.shipment.in.return,create_uid:"
 msgid "Create User"
 msgstr ""
 
+msgctxt "field:stock.shipment.in.return,delivery_address:"
+msgid "Delivery Address"
+msgstr ""
+
 msgctxt "field:stock.shipment.in.return,effective_date:"
 msgid "Effective Date"
 msgstr ""
@@ -742,6 +758,10 @@ msgctxt "field:stock.shipment.in.return,moves:"
 msgid "Moves"
 msgstr ""
 
+msgctxt "field:stock.shipment.in.return,number:"
+msgid "Number"
+msgstr ""
+
 msgctxt "field:stock.shipment.in.return,origins:"
 msgid "Origins"
 msgstr ""
@@ -762,6 +782,10 @@ msgctxt "field:stock.shipment.in.return,state:"
 msgid "State"
 msgstr ""
 
+msgctxt "field:stock.shipment.in.return,supplier:"
+msgid "Supplier"
+msgstr ""
+
 msgctxt "field:stock.shipment.in.return,to_location:"
 msgid "To Location"
 msgstr ""
@@ -782,10 +806,6 @@ msgctxt "field:stock.shipment.in.return.assign.failed,moves:"
 msgid "Moves"
 msgstr ""
 
-msgctxt "field:stock.shipment.internal,code:"
-msgid "Code"
-msgstr ""
-
 msgctxt "field:stock.shipment.internal,company:"
 msgid "Company"
 msgstr ""
@@ -814,6 +834,10 @@ msgctxt "field:stock.shipment.internal,moves:"
 msgid "Moves"
 msgstr ""
 
+msgctxt "field:stock.shipment.internal,number:"
+msgid "Number"
+msgstr ""
+
 msgctxt "field:stock.shipment.internal,planned_date:"
 msgid "Planned Date"
 msgstr ""
@@ -850,10 +874,6 @@ msgctxt "field:stock.shipment.internal.assign.failed,moves:"
 msgid "Moves"
 msgstr ""
 
-msgctxt "field:stock.shipment.out,code:"
-msgid "Code"
-msgstr ""
-
 msgctxt "field:stock.shipment.out,company:"
 msgid "Company"
 msgstr ""
@@ -894,6 +914,10 @@ msgctxt "field:stock.shipment.out,moves:"
 msgid "Moves"
 msgstr ""
 
+msgctxt "field:stock.shipment.out,number:"
+msgid "Number"
+msgstr ""
+
 msgctxt "field:stock.shipment.out,origins:"
 msgid "Origins"
 msgstr ""
@@ -946,10 +970,6 @@ msgctxt "field:stock.shipment.out.assign.failed,inventory_moves:"
 msgid "Inventory Moves"
 msgstr ""
 
-msgctxt "field:stock.shipment.out.return,code:"
-msgid "Code"
-msgstr ""
-
 msgctxt "field:stock.shipment.out.return,company:"
 msgid "Company"
 msgstr ""
@@ -994,6 +1014,10 @@ msgctxt "field:stock.shipment.out.return,moves:"
 msgid "Moves"
 msgstr ""
 
+msgctxt "field:stock.shipment.out.return,number:"
+msgid "Number"
+msgstr ""
+
 msgctxt "field:stock.shipment.out.return,origins:"
 msgid "Origins"
 msgstr ""
@@ -1295,6 +1319,10 @@ msgctxt ""
 msgid "Received"
 msgstr ""
 
+msgctxt "model:ir.sequence,name:sequence_inventory"
+msgid "Inventory"
+msgstr ""
+
 msgctxt "model:ir.sequence,name:sequence_shipment_in"
 msgid "Supplier Shipment"
 msgstr ""
@@ -1315,6 +1343,10 @@ msgctxt "model:ir.sequence,name:sequence_shipment_out_return"
 msgid "Customer Return Shipment"
 msgstr ""
 
+msgctxt "model:ir.sequence.type,name:sequence_type_inventory"
+msgid "Inventory"
+msgstr ""
+
 msgctxt "model:ir.sequence.type,name:sequence_type_shipment_in"
 msgid "Supplier Shipment"
 msgstr ""
@@ -1507,215 +1539,231 @@ msgctxt "model:stock.shipment.out.return,name:"
 msgid "Customer Return Shipment"
 msgstr ""
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "/"
 msgstr ""
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
-msgid "Code:"
+msgctxt "report:stock.shipment.in.restocking_list:"
+msgid ":"
 msgstr ""
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "From Location"
 msgstr ""
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Planned Date:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Product"
 msgstr ""
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Quantity"
 msgstr ""
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Reference:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Restocking List"
 msgstr ""
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
+msgid "Shipment Number"
+msgstr ""
+
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Supplier:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "To Location"
 msgstr ""
 
-msgctxt "odt:stock.shipment.in.restocking_list:"
+msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Warehouse:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "/"
 msgstr ""
 
-msgctxt "odt:stock.shipment.internal.report:"
-msgid "Code:"
+msgctxt "report:stock.shipment.internal.report:"
+msgid ":"
 msgstr ""
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "From Location"
 msgstr ""
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "From Location:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "Internal Shipment"
 msgstr ""
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "Planned Date:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "Product"
 msgstr ""
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "Quantity"
 msgstr ""
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "Reference:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
+msgid "Shipment Number"
+msgstr ""
+
+msgctxt "report:stock.shipment.internal.report:"
 msgid "To Location"
 msgstr ""
 
-msgctxt "odt:stock.shipment.internal.report:"
+msgctxt "report:stock.shipment.internal.report:"
 msgid "To Location:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "/"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Customer Code:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Date:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Delivery Note"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Product"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Quantity"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Reference:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.delivery_note:"
+msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Shipment Number:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "/"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.picking_list:"
-msgid "Code:"
+msgctxt "report:stock.shipment.out.picking_list:"
+msgid ":"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Customer:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "From Location"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Picking List"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Planned Date:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Product"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Quantity"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Reference:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
+msgid "Shipment Number"
+msgstr ""
+
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "To Location"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.picking_list:"
+msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Warehouse:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "/"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid ":"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
-msgid "Code:"
-msgstr ""
-
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Customer"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "From Location"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
+msgid "Number"
+msgstr ""
+
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Planned Date:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Product"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Quantity"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Reference:"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Restocking List"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
+msgid "Shipment"
+msgstr ""
+
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "To Location"
 msgstr ""
 
-msgctxt "odt:stock.shipment.out.return.restocking_list:"
+msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Warehouse:"
 msgstr ""
 
@@ -1904,6 +1952,14 @@ msgid "Products"
 msgstr ""
 
 msgctxt "view:stock.configuration:"
+msgid "Inventory"
+msgstr ""
+
+msgctxt "view:stock.configuration:"
+msgid "Shipments"
+msgstr ""
+
+msgctxt "view:stock.configuration:"
 msgid "Stock Configuration"
 msgstr ""
 
@@ -1956,6 +2012,10 @@ msgid "Cancel"
 msgstr ""
 
 msgctxt "view:stock.move:"
+msgid "Do"
+msgstr ""
+
+msgctxt "view:stock.move:"
 msgid "Move"
 msgstr ""
 
diff --git a/location.py b/location.py
index 9f80f6d..cbfac48 100644
--- a/location.py
+++ b/location.py
@@ -12,7 +12,6 @@ from trytond.tools import grouped_slice
 
 __all__ = ['Location', 'Party', 'ProductsByLocationsStart',
     'ProductsByLocations']
-__metaclass__ = PoolMeta
 
 STATES = {
     'readonly': ~Eval('active'),
@@ -53,6 +52,8 @@ class Location(ModelSQL, ModelView):
     left = fields.Integer('Left', required=True, select=True)
     right = fields.Integer('Right', required=True, select=True)
     childs = fields.One2Many("stock.location", "parent", "Children")
+    warehouse = fields.Function(fields.Many2One('stock.location', 'Warehouse'),
+        'get_warehouse')
     input_location = fields.Many2One(
         "stock.location", "Input", states={
             'invisible': Eval('type') != 'warehouse',
@@ -159,9 +160,8 @@ class Location(ModelSQL, ModelView):
     def __register__(cls, module_name):
         TableHandler = backend.get('TableHandler')
         super(Location, cls).__register__(module_name)
-        cursor = Transaction().cursor
 
-        table = TableHandler(cursor, cls, module_name)
+        table = TableHandler(cls, module_name)
         table.index_action(['left', 'right'], 'add')
 
     @classmethod
@@ -205,6 +205,15 @@ class Location(ModelSQL, ModelView):
     def check_xml_record(self, records, values):
         return True
 
+    def get_warehouse(self, name):
+        # Order by descending left to get the first one in the tree
+        locations = self.search([
+                ('parent', 'parent_of', [self.id]),
+                ('type', '=', 'warehouse'),
+                ], order=[('left', 'DESC')])
+        if locations:
+            return locations[0].id
+
     @classmethod
     def search_rec_name(cls, name, clause):
         locations = cls.search([
@@ -384,6 +393,7 @@ class Location(ModelSQL, ModelView):
 
 
 class Party:
+    __metaclass__ = PoolMeta
     __name__ = 'party.party'
     supplier_location = fields.Property(fields.Many2One('stock.location',
         'Supplier Location', domain=[('type', '=', 'supplier')],
diff --git a/move.py b/move.py
index db806e7..6dec253 100644
--- a/move.py
+++ b/move.py
@@ -4,7 +4,7 @@ import datetime
 import operator
 from decimal import Decimal
 from functools import partial
-from collections import OrderedDict
+from collections import OrderedDict, defaultdict
 
 from sql import Literal, Union, Column, Null
 from sql.aggregate import Sum
@@ -18,7 +18,7 @@ from trytond.tools import reduce_ids
 from trytond.transaction import Transaction
 from trytond.pool import Pool
 
-from trytond.modules.product import price_digits
+from trytond.modules.product import price_digits, TemplateFunction
 
 __all__ = ['StockMixin', 'Move']
 
@@ -34,7 +34,7 @@ LOCATION_DOMAIN = [
 LOCATION_DEPENDS = ['state']
 
 
-class StockMixin:
+class StockMixin(object):
     '''Mixin class with helper to setup stock quantity field.'''
 
     @classmethod
@@ -238,6 +238,9 @@ class Move(Workflow, ModelSQL, ModelView):
     unit_price_required = fields.Function(
         fields.Boolean('Unit Price Required'),
         'on_change_with_unit_price_required')
+    assignation_required = fields.Function(
+        fields.Boolean('Assignation Required'),
+        'on_change_with_assignation_required')
 
     @classmethod
     def __setup__(cls):
@@ -299,17 +302,21 @@ class Move(Workflow, ModelSQL, ModelView):
                     },
                 'do': {
                     'invisible': ~Eval('state').in_(['draft', 'assigned']),
+                    'readonly': (Eval('shipment')
+                        | (Eval('assignation_required', True)
+                            & (Eval('state') == 'draft'))),
                     },
                 })
 
     @classmethod
     def __register__(cls, module_name):
         TableHandler = backend.get('TableHandler')
-        cursor = Transaction().cursor
+        transaction = Transaction()
+        cursor = transaction.connection.cursor()
         sql_table = cls.__table__()
 
         # Migration from 1.2: packing renamed into shipment
-        table = TableHandler(cursor, cls, module_name)
+        table = TableHandler(cls, module_name)
         table.drop_constraint('check_packing')
         for suffix in ('in', 'out', 'in_return', 'out_return', 'internal'):
             old_column = 'packing_%s' % suffix
@@ -327,7 +334,7 @@ class Move(Workflow, ModelSQL, ModelView):
         # Migration from 1.8: fill new field internal_quantity
         if not internal_quantity_exist:
             offset = 0
-            limit = cursor.IN_MAX
+            limit = transaction.database.IN_MAX
             moves = True
             while moves:
                 moves = cls.search([], offset=offset, limit=limit)
@@ -339,11 +346,11 @@ class Move(Workflow, ModelSQL, ModelView):
                             columns=[sql_table.internal_quantity],
                             values=[internal_quantity],
                             where=sql_table.id == move.id))
-            table = TableHandler(cursor, cls, module_name)
+            table = TableHandler(cls, module_name)
             table.not_null_action('internal_quantity', action='add')
 
         # Migration from 1.0 check_packing_in_out has been removed
-        table = TableHandler(cursor, cls, module_name)
+        table = TableHandler(cls, module_name)
         table.drop_constraint('check_packing_in_out')
 
         # Migration from 2.6: merge all shipments
@@ -461,6 +468,11 @@ class Move(Workflow, ModelSQL, ModelView):
             return True
         return False
 
+    @fields.depends('from_location')
+    def on_change_with_assignation_required(self, name=None):
+        if self.from_location:
+            return self.from_location.type == 'storage'
+
     @staticmethod
     def _get_shipment():
         'Return list of Model names for shipment Reference'
@@ -552,7 +564,7 @@ class Move(Workflow, ModelSQL, ModelView):
         qty = Uom.compute_qty(self.uom, quantity, product.default_uom)
 
         qty = Decimal(str(qty))
-        if hasattr(Product, 'cost_price'):
+        if not isinstance(Product.cost_price, TemplateFunction):
             product_qty = product.quantity
         else:
             product_qty = product.template.quantity
@@ -571,7 +583,7 @@ class Move(Workflow, ModelSQL, ModelView):
         else:
             new_cost_price = product.cost_price
 
-        if hasattr(Product, 'cost_price'):
+        if not isinstance(Product.cost_price, TemplateFunction):
             digits = Product.cost_price.digits
             write = partial(Product.write, [product])
         else:
@@ -615,7 +627,7 @@ class Move(Workflow, ModelSQL, ModelView):
         cls.check_origin(moves)
         for move in moves:
             move.set_effective_date()
-            move.save()
+        cls.save(moves)
 
     @classmethod
     @ModelView.button
@@ -626,6 +638,8 @@ class Move(Workflow, ModelSQL, ModelView):
             move.set_effective_date()
             move._do()
             move.state = 'done'
+            # This save() call can't be grouped because the average computation
+            # of product cost price requires each move to be done separately
             move.save()
 
     def _do(self):
@@ -759,7 +773,7 @@ class Move(Workflow, ModelSQL, ModelView):
         Date = pool.get('ir.date')
         Location = pool.get('stock.location')
 
-        Transaction().cursor.lock(cls._table)
+        Transaction().database.lock(Transaction().connection, cls._table)
 
         if with_childs:
             locations = Location.search([
@@ -785,6 +799,9 @@ class Move(Workflow, ModelSQL, ModelView):
                 key += (value,)
             return key
 
+        child_locations = {}
+        to_write = []
+        to_assign = []
         success = True
         for move in moves:
             if move.state != 'draft':
@@ -795,9 +812,12 @@ class Move(Workflow, ModelSQL, ModelView):
             # Keep location order for pick_product
             location_qties = OrderedDict()
             if with_childs:
-                childs = Location.search([
-                        ('parent', 'child_of', [move.from_location.id]),
-                        ])
+                childs = child_locations.get(move.from_location)
+                if childs is None:
+                    childs = Location.search([
+                            ('parent', 'child_of', [move.from_location.id]),
+                            ])
+                    child_locations[move.from_location] = childs
             else:
                 childs = [move.from_location]
             for location in childs:
@@ -816,23 +836,24 @@ class Move(Workflow, ModelSQL, ModelView):
             if move.quantity - picked_qties >= move.uom.rounding:
                 success = False
                 first = False
-                cls.write([move], {
-                    'quantity': Uom.round(
-                            move.quantity - picked_qties, move.uom.rounding),
-                    })
+                values = {
+                    'quantity': move.uom.round(
+                        move.quantity - picked_qties),
+                    }
+                to_write.extend([[move], values])
             else:
                 first = True
             for from_location, qty in to_pick:
                 values = {
                     'from_location': from_location.id,
-                    'quantity': Uom.round(qty, move.uom.rounding),
+                    'quantity': move.uom.round(qty),
                     }
                 if first:
-                    cls.write([move], values)
-                    cls.assign([move])
+                    to_write.extend([[move], values])
+                    to_assign.append(move)
                     first = False
                 else:
-                    cls.assign(cls.copy([move], default=values))
+                    to_assign.extend(cls.copy([move], default=values))
 
                 qty_default_uom = Uom.compute_qty(move.uom, qty,
                         move.product.default_uom, round=False)
@@ -841,6 +862,10 @@ class Move(Workflow, ModelSQL, ModelView):
                 to_key = get_key(move, to_location)
                 pbl[from_key] = pbl.get(from_key, 0.0) - qty_default_uom
                 pbl[to_key] = pbl.get(to_key, 0.0) + qty_default_uom
+        if to_write:
+            cls.write(*to_write)
+        if to_assign:
+            cls.assign(to_assign)
         return success
 
     @classmethod
@@ -1130,30 +1155,35 @@ class Move(Workflow, ModelSQL, ModelView):
         pool = Pool()
         Location = pool.get('stock.location')
         Product = pool.get('product.product')
-        Uom = pool.get('product.uom')
 
         assert query is not None, (
             "Query in Move.compute_quantities() can't be None")
         assert 'product' in grouping
 
-        cursor = Transaction().cursor
+        cursor = Transaction().connection.cursor()
         cursor.execute(*query)
         raw_lines = cursor.fetchall()
 
         product_getter = operator.itemgetter(grouping.index('product') + 1)
         res_product_ids = set()
-        quantities = {}
+        quantities = defaultdict(lambda: 0)
         keys = set()
+        # We can do a quick loop without propagation if the request is for a
+        # single location because all the locations are children and we can sum
+        # them directly.
+        if len(location_ids) == 1:
+            location, = location_ids
         for line in raw_lines:
-            location = line[0]
+            if len(location_ids) > 1:
+                location = line[0]
             key = tuple(line[1:-1])
             quantity = line[-1]
-            quantities[(location,) + key] = quantity
+            quantities[(location,) + key] += quantity
             res_product_ids.add(product_getter(line))
             keys.add(key)
 
         # Propagate quantities on from child locations to their parents
-        if with_childs:
+        if with_childs and len(location_ids) > 1:
             # Fetch all child locations
             locations = Location.search([
                     ('parent', 'child_of', location_ids),
@@ -1199,6 +1229,6 @@ class Move(Workflow, ModelSQL, ModelView):
             location = key[0]
             product = product_getter(key)
             uom = default_uom[product]
-            quantities[key] = Uom.round(quantity, uom.rounding)
+            quantities[key] = uom.round(quantity)
 
         return quantities
diff --git a/party.xml b/party.xml
index 582d6a7..4585ce7 100644
--- a/party.xml
+++ b/party.xml
@@ -3,6 +3,12 @@
 this repository contains the full copyright notices and license terms. -->
 <tryton>
     <data>
+        <record model="ir.ui.view" id="address_view_tree_sequence">
+            <field name="model">party.address</field>
+            <field name="inherit" ref="party.address_view_tree_sequence"/>
+            <field name="name">address_tree_sequence</field>
+        </record>
+
         <record model="ir.action.act_window" id="act_shipment_out_form2">
             <field name="name">Customer Shipments</field>
             <field name="res_model">stock.shipment.out</field>
diff --git a/picking_list.odt b/picking_list.odt
index 9daa4db..a48d3c0 100644
Binary files a/picking_list.odt and b/picking_list.odt differ
diff --git a/product.py b/product.py
index 17e0d64..047af08 100644
--- a/product.py
+++ b/product.py
@@ -24,10 +24,10 @@ __all__ = ['Template', 'Product',
     'ProductQuantitiesByWarehouse', 'ProductQuantitiesByWarehouseStart',
     'OpenProductQuantitiesByWarehouse',
     'RecomputeCostPrice']
-__metaclass__ = PoolMeta
 
 
 class Template:
+    __metaclass__ = PoolMeta
     __name__ = "product.template"
     quantity = fields.Function(fields.Float('Quantity'), 'sum_product')
     forecast_quantity = fields.Function(fields.Float('Forecast Quantity'),
@@ -93,7 +93,7 @@ class Template:
         Product.recompute_cost_price(products)
 
 
-class Product(object, StockMixin):
+class Product(StockMixin, object):
     __metaclass__ = PoolMeta
     __name__ = "product.product"
     quantity = fields.Function(fields.Float('Quantity'), 'get_quantity',
diff --git a/setup.py b/setup.py
index d6595fc..c922a8a 100644
--- a/setup.py
+++ b/setup.py
@@ -5,11 +5,17 @@
 from setuptools import setup
 import re
 import os
-import ConfigParser
+import io
+try:
+    from configparser import ConfigParser
+except ImportError:
+    from ConfigParser import ConfigParser
 
 
 def read(fname):
-    return open(os.path.join(os.path.dirname(__file__), fname)).read()
+    return io.open(
+        os.path.join(os.path.dirname(__file__), fname),
+        'r', encoding='utf-8').read()
 
 
 def get_require_version(name):
@@ -21,7 +27,7 @@ def get_require_version(name):
         major_version, minor_version + 1)
     return require
 
-config = ConfigParser.ConfigParser()
+config = ConfigParser()
 config.readfp(open('tryton.cfg'))
 info = dict(config.items('tryton'))
 for key in ('depends', 'extras_depend', 'xml'):
@@ -43,7 +49,7 @@ if minor_version % 2:
 
 requires = ['python-sql >= 0.4']
 for dep in info.get('depends', []):
-    if not re.match(r'(ir|res|webdav)(\W|$)', dep):
+    if not re.match(r'(ir|res)(\W|$)', dep):
         requires.append(get_require_version('trytond_%s' % dep))
 requires.append(get_require_version('trytond'))
 
@@ -83,6 +89,7 @@ setup(name=name,
         'License :: OSI Approved :: GNU General Public License (GPL)',
         'Natural Language :: Bulgarian',
         'Natural Language :: Catalan',
+        'Natural Language :: Chinese (Simplified)',
         'Natural Language :: Czech',
         'Natural Language :: Dutch',
         'Natural Language :: English',
@@ -96,6 +103,9 @@ setup(name=name,
         'Natural Language :: Spanish',
         'Operating System :: OS Independent',
         'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3.3',
+        'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: Implementation :: CPython',
         'Programming Language :: Python :: Implementation :: PyPy',
         'Topic :: Office/Business',
@@ -111,4 +121,12 @@ setup(name=name,
     test_suite='tests',
     test_loader='trytond.test_loader:Loader',
     tests_require=tests_require,
+    use_2to3=True,
+    convert_2to3_doctests=[
+        'tests/scenario_stock_average_cost_price.rst',
+        'tests/scenario_stock_inventory.rst',
+        'tests/scenario_stock_reporting.rst',
+        'tests/scenario_stock_shipment_internal.rst',
+        'tests/scenario_stock_shipment_out.rst',
+        ],
     )
diff --git a/shipment.py b/shipment.py
index 9a62f3b..b9a4d6a 100644
--- a/shipment.py
+++ b/shipment.py
@@ -28,7 +28,6 @@ __all__ = ['ShipmentIn', 'ShipmentInReturn',
     'DeliveryNote', 'PickingList',
     'SupplierRestockingList', 'CustomerReturnRestockingList',
     'InteralShipmentReport']
-__metaclass__ = PoolMeta
 
 STATES = {
     'readonly': "state in ('cancel', 'done')",
@@ -38,7 +37,7 @@ STATES = {
 class ShipmentIn(Workflow, ModelSQL, ModelView):
     "Supplier Shipment"
     __name__ = 'stock.shipment.in'
-    _rec_name = 'code'
+    _rec_name = 'number'
     effective_date = fields.Date('Effective Date',
         states={
             'readonly': Eval('state').in_(['cancel', 'done']),
@@ -125,7 +124,7 @@ class ShipmentIn(Workflow, ModelSQL, ModelView):
         domain=[('company', '=', Eval('company'))], readonly=True,
         depends=['company'])
     origins = fields.Function(fields.Char('Origins'), 'get_origins')
-    code = fields.Char("Code", size=None, select=True, readonly=True)
+    number = fields.Char('Numer', size=None, select=True, readonly=True)
     state = fields.Selection([
         ('draft', 'Draft'),
         ('done', 'Done'),
@@ -170,7 +169,7 @@ class ShipmentIn(Workflow, ModelSQL, ModelView):
     @classmethod
     def __register__(cls, module_name):
         TableHandler = backend.get('TableHandler')
-        cursor = Transaction().cursor
+        cursor = Transaction().connection.cursor()
         model_data = Table('ir_model_data')
         model = Table('ir_model')
         model_field = Table('ir_model_field')
@@ -207,9 +206,9 @@ class ShipmentIn(Workflow, ModelSQL, ModelView):
                 & (model_field.module == module_name)))
 
         old_table = 'stock_packing_in'
-        if TableHandler.table_exist(cursor, old_table):
-            TableHandler.table_rename(cursor, old_table, cls._table)
-        table = TableHandler(cursor, cls, module_name)
+        if TableHandler.table_exist(old_table):
+            TableHandler.table_rename(old_table, cls._table)
+        table = TableHandler(cls, module_name)
         for field in ('create_uid', 'write_uid', 'contact_address',
                 'warehouse', 'supplier'):
             table.drop_fk(field, table=old_table)
@@ -219,12 +218,16 @@ class ShipmentIn(Workflow, ModelSQL, ModelView):
         # Migration from 2.0:
         created_company = table.column_exist('company')
 
+        # Migration from 3.8: rename code into number
+        if table.column_exist('code'):
+            table.column_rename('code', 'number')
+
         super(ShipmentIn, cls).__register__(module_name)
 
         # Migration from 2.0:
         Move = Pool().get('stock.move')
         if (not created_company
-                and TableHandler.table_exist(cursor, Move._table)):
+                and TableHandler.table_exist(Move._table)):
             move = Move.__table__()
             cursor.execute(*sql_table.join(move,
                     condition=(Concat(cls.__name__ + ',', sql_table.id)
@@ -244,7 +247,7 @@ class ShipmentIn(Workflow, ModelSQL, ModelView):
             table.not_null_action('company', action='add')
 
         # Add index on create_date
-        table = TableHandler(cursor, cls, module_name)
+        table = TableHandler(cls, module_name)
         table.index_action('create_date', action='add')
 
     @staticmethod
@@ -374,7 +377,8 @@ class ShipmentIn(Workflow, ModelSQL, ModelView):
         vlist = [x.copy() for x in vlist]
         config = Config(1)
         for values in vlist:
-            values['code'] = Sequence.get_id(config.shipment_in_sequence)
+            if values.get('number') is None:
+                values['number'] = Sequence.get_id(config.shipment_in_sequence)
         shipments = super(ShipmentIn, cls).create(vlist)
         cls._set_move_planned_date(shipments)
         return shipments
@@ -479,7 +483,7 @@ class ShipmentIn(Workflow, ModelSQL, ModelView):
 class ShipmentInReturn(Workflow, ModelSQL, ModelView):
     "Supplier Return Shipment"
     __name__ = 'stock.shipment.in.return'
-    _rec_name = 'code'
+    _rec_name = 'number'
     effective_date = fields.Date('Effective Date',
         states={
             'readonly': Eval('state').in_(['cancel', 'done']),
@@ -498,11 +502,26 @@ class ShipmentInReturn(Workflow, ModelSQL, ModelView):
                 Eval('context', {}).get('company', -1)),
             ],
         depends=['state'])
-    code = fields.Char("Code", size=None, select=True, readonly=True)
+    number = fields.Char('Number', size=None, select=True, readonly=True)
     reference = fields.Char("Reference", size=None, select=True,
         states={
             'readonly': Eval('state') != 'draft',
             }, depends=['state'])
+    supplier = fields.Many2One('party.party', 'Supplier',
+        states={
+            'readonly': (((Eval('state') != 'draft')
+                    | Eval('moves', [0]))
+                    & Eval('supplier', 0)),
+            }, required=True,
+        depends=['state', 'supplier'])
+    delivery_address = fields.Many2One('party.address', 'Delivery Address',
+        states={
+            'readonly': Eval('state') != 'draft',
+            },
+        domain=[
+            ('party', '=', Eval('supplier'))
+            ],
+        depends=['state', 'supplier'])
     from_location = fields.Many2One('stock.location', "From Location",
         required=True, states={
             'readonly': (Eval('state') != 'draft') | Eval('moves', [0]),
@@ -581,13 +600,13 @@ class ShipmentInReturn(Workflow, ModelSQL, ModelView):
     @classmethod
     def __register__(cls, module_name):
         TableHandler = backend.get('TableHandler')
-        cursor = Transaction().cursor
+        cursor = Transaction().connection.cursor()
         sql_table = cls.__table__()
         # Migration from 1.2: packing renamed into shipment
         old_table = 'stock_packing_in_return'
-        if TableHandler.table_exist(cursor, old_table):
-            TableHandler.table_rename(cursor, old_table, cls._table)
-        table = TableHandler(cursor, cls, module_name)
+        if TableHandler.table_exist(old_table):
+            TableHandler.table_rename(old_table, cls._table)
+        table = TableHandler(cls, module_name)
         for field in ('create_uid', 'write_uid', 'from_location',
                 'to_location'):
             table.drop_fk(field, table=old_table)
@@ -597,12 +616,16 @@ class ShipmentInReturn(Workflow, ModelSQL, ModelView):
         # Migration from 2.0:
         created_company = table.column_exist('company')
 
+        # Migration from 3.8: rename code into number
+        if table.column_exist('code'):
+            table.column_rename('code', 'number')
+
         super(ShipmentInReturn, cls).__register__(module_name)
 
         # Migration from 2.0:
         Move = Pool().get('stock.move')
         if (not created_company
-                and TableHandler.table_exist(cursor, Move._table)):
+                and TableHandler.table_exist(Move._table)):
             move = Move.__table__()
             cursor.execute(*sql_table.join(move,
                     condition=(Concat(cls.__name__ + ',', sql_table.id)
@@ -622,7 +645,7 @@ class ShipmentInReturn(Workflow, ModelSQL, ModelView):
             table.not_null_action('company', action='add')
 
         # Add index on create_date
-        table = TableHandler(cursor, cls, module_name)
+        table = TableHandler(cls, module_name)
         table.index_action('create_date', action='add')
 
     @staticmethod
@@ -633,6 +656,12 @@ class ShipmentInReturn(Workflow, ModelSQL, ModelView):
     def default_company():
         return Transaction().context.get('company')
 
+    @fields.depends('supplier')
+    def on_change_supplier(self):
+        if self.supplier:
+            self.delivery_address = self.supplier.address_get('delivery')
+            self.to_location = self.supplier.supplier_location
+
     @property
     def _move_planned_date(self):
         '''
@@ -666,8 +695,9 @@ class ShipmentInReturn(Workflow, ModelSQL, ModelView):
         vlist = [x.copy() for x in vlist]
         config = Config(1)
         for values in vlist:
-            values['code'] = Sequence.get_id(
-                config.shipment_in_return_sequence.id)
+            if values.get('number') is None:
+                values['number'] = Sequence.get_id(
+                    config.shipment_in_return_sequence.id)
         shipments = super(ShipmentInReturn, cls).create(vlist)
         cls._set_move_planned_date(shipments)
         return shipments
@@ -757,7 +787,7 @@ class ShipmentInReturn(Workflow, ModelSQL, ModelView):
 class ShipmentOut(Workflow, ModelSQL, ModelView):
     "Customer Shipment"
     __name__ = 'stock.shipment.out'
-    _rec_name = 'code'
+    _rec_name = 'number'
     effective_date = fields.Date('Effective Date',
         states={
             'readonly': Eval('state').in_(['cancel', 'done']),
@@ -837,7 +867,7 @@ class ShipmentOut(Workflow, ModelSQL, ModelView):
         domain=[('company', '=', Eval('company'))], depends=['company'],
         readonly=True)
     origins = fields.Function(fields.Char('Origins'), 'get_origins')
-    code = fields.Char("Code", size=None, select=True, readonly=True)
+    number = fields.Char('Number', size=None, select=True, readonly=True)
     state = fields.Selection([
         ('draft', 'Draft'),
         ('done', 'Done'),
@@ -905,14 +935,14 @@ class ShipmentOut(Workflow, ModelSQL, ModelView):
     @classmethod
     def __register__(cls, module_name):
         TableHandler = backend.get('TableHandler')
-        cursor = Transaction().cursor
+        cursor = Transaction().connection.cursor()
         sql_table = cls.__table__()
         # Migration from 1.2: packing renamed into shipment
         old_table = 'stock_packing_out'
-        if TableHandler.table_exist(cursor, old_table):
-            TableHandler.table_rename(cursor, old_table, cls._table)
+        if TableHandler.table_exist(old_table):
+            TableHandler.table_rename(old_table, cls._table)
 
-        table = TableHandler(cursor, cls, module_name)
+        table = TableHandler(cls, module_name)
         for field in ('create_uid', 'write_uid', 'delivery_address',
                 'warehouse', 'customer'):
             table.drop_fk(field, table=old_table)
@@ -922,12 +952,16 @@ class ShipmentOut(Workflow, ModelSQL, ModelView):
         # Migration from 2.0:
         created_company = table.column_exist('company')
 
+        # Migration from 3.8: rename code into number
+        if table.column_exist('code'):
+            table.column_rename('code', 'number')
+
         super(ShipmentOut, cls).__register__(module_name)
 
         # Migration from 2.0:
         Move = Pool().get('stock.move')
         if (not created_company
-                and TableHandler.table_exist(cursor, Move._table)):
+                and TableHandler.table_exist(Move._table)):
             move = Move.__table__()
             cursor.execute(*sql_table.join(move,
                     condition=(Concat(cls.__name__ + ',', sql_table.id)
@@ -947,7 +981,7 @@ class ShipmentOut(Workflow, ModelSQL, ModelView):
             table.not_null_action('company', action='add')
 
         # Migration from 1.0 customer_location is no more used
-        table = TableHandler(cursor, cls, module_name)
+        table = TableHandler(cls, module_name)
         table.drop_column('customer_location', exception=True)
 
         # Add index on create_date
@@ -1217,18 +1251,26 @@ class ShipmentOut(Workflow, ModelSQL, ModelView):
         Set planned date of moves for the shipments
         '''
         Move = Pool().get('stock.move')
+        to_write = []
         for shipment in shipments:
             outgoing_date, inventory_date = shipment._move_planned_date
-            Move.write([x for x in shipment.outgoing_moves
+            out_moves_to_write = [x for x in shipment.outgoing_moves
                     if (x.state not in ('assigned', 'done', 'cancel')
-                        and x.planned_date != outgoing_date)], {
-                    'planned_date': outgoing_date,
-                    })
-            Move.write([x for x in shipment.inventory_moves
+                        and x.planned_date != outgoing_date)]
+            if out_moves_to_write:
+                to_write.extend((out_moves_to_write, {
+                        'planned_date': outgoing_date,
+                        }))
+
+            inv_moves_to_write = [x for x in shipment.inventory_moves
                     if (x.state not in ('assigned', 'done', 'cancel')
-                        and x.planned_date != inventory_date)], {
-                    'planned_date': inventory_date,
-                    })
+                        and x.planned_date != inventory_date)]
+            if inv_moves_to_write:
+                to_write.extend((inv_moves_to_write, {
+                        'planned_date': inventory_date,
+                        }))
+        if to_write:
+            Move.write(*to_write)
 
     @classmethod
     def create(cls, vlist):
@@ -1239,7 +1281,9 @@ class ShipmentOut(Workflow, ModelSQL, ModelView):
         vlist = [x.copy() for x in vlist]
         config = Config(1)
         for values in vlist:
-            values['code'] = Sequence.get_id(config.shipment_out_sequence.id)
+            if values.get('number') is None:
+                values['number'] = Sequence.get_id(
+                    config.shipment_out_sequence.id)
         shipments = super(ShipmentOut, cls).create(vlist)
         cls._set_move_planned_date(shipments)
         return shipments
@@ -1309,7 +1353,7 @@ class ShipmentOut(Workflow, ModelSQL, ModelView):
 class ShipmentOutReturn(Workflow, ModelSQL, ModelView):
     "Customer Return Shipment"
     __name__ = 'stock.shipment.out.return'
-    _rec_name = 'code'
+    _rec_name = 'number'
     effective_date = fields.Date('Effective Date',
         states={
             'readonly': Eval('state').in_(['cancel', 'done']),
@@ -1388,7 +1432,7 @@ class ShipmentOutReturn(Workflow, ModelSQL, ModelView):
         domain=[('company', '=', Eval('company'))], depends=['company'],
         readonly=True)
     origins = fields.Function(fields.Char('Origins'), 'get_origins')
-    code = fields.Char("Code", size=None, select=True, readonly=True)
+    number = fields.Char('Number', size=None, select=True, readonly=True)
     state = fields.Selection([
         ('draft', 'Draft'),
         ('done', 'Done'),
@@ -1430,14 +1474,14 @@ class ShipmentOutReturn(Workflow, ModelSQL, ModelView):
     @classmethod
     def __register__(cls, module_name):
         TableHandler = backend.get('TableHandler')
-        cursor = Transaction().cursor
+        cursor = Transaction().connection.cursor()
         sql_table = cls.__table__()
         # Migration from 1.2: packing renamed into shipment
         old_table = 'stock_packing_out_return'
-        if TableHandler.table_exist(cursor, old_table):
-            TableHandler.table_rename(cursor, old_table, cls._table)
+        if TableHandler.table_exist(old_table):
+            TableHandler.table_rename(old_table, cls._table)
 
-        table = TableHandler(cursor, cls, module_name)
+        table = TableHandler(cls, module_name)
         for field in ('create_uid', 'write_uid', 'delivery_address',
                 'warehouse', 'customer'):
             table.drop_fk(field, table=old_table)
@@ -1447,12 +1491,16 @@ class ShipmentOutReturn(Workflow, ModelSQL, ModelView):
         # Migration from 2.0:
         created_company = table.column_exist('company')
 
+        # Migration from 3.8: rename code into number
+        if table.column_exist('code'):
+            table.column_rename('code', 'number')
+
         super(ShipmentOutReturn, cls).__register__(module_name)
 
         # Migration from 2.0:
         Move = Pool().get('stock.move')
         if (not created_company
-                and TableHandler.table_exist(cursor, Move._table)):
+                and TableHandler.table_exist(Move._table)):
             move = Move.__table__()
             cursor.execute(*sql_table.join(move,
                     condition=(Concat(cls.__name__ + ',', sql_table.id)
@@ -1472,7 +1520,7 @@ class ShipmentOutReturn(Workflow, ModelSQL, ModelView):
             table.not_null_action('company', action='add')
 
         # Add index on create_date
-        table = TableHandler(cursor, cls, module_name)
+        table = TableHandler(cls, module_name)
         table.index_action('create_date', action='add')
 
     @staticmethod
@@ -1592,8 +1640,9 @@ class ShipmentOutReturn(Workflow, ModelSQL, ModelView):
         vlist = [x.copy() for x in vlist]
         config = Config(1)
         for values in vlist:
-            values['code'] = Sequence.get_id(
-                    config.shipment_out_return_sequence.id)
+            if values.get('number') is None:
+                values['number'] = Sequence.get_id(
+                        config.shipment_out_return_sequence.id)
         shipments = super(ShipmentOutReturn, cls).create(vlist)
         cls._set_move_planned_date(shipments)
         return shipments
@@ -1746,7 +1795,7 @@ class AssignShipmentOut(Wizard):
 class ShipmentInternal(Workflow, ModelSQL, ModelView):
     "Internal Shipment"
     __name__ = 'stock.shipment.internal'
-    _rec_name = 'code'
+    _rec_name = 'number'
     effective_date = fields.Date('Effective Date',
         states={
             'readonly': Eval('state').in_(['cancel', 'done']),
@@ -1765,7 +1814,7 @@ class ShipmentInternal(Workflow, ModelSQL, ModelView):
                 Eval('context', {}).get('company', -1)),
             ],
         depends=['state'])
-    code = fields.Char("Code", size=None, select=True, readonly=True)
+    number = fields.Char('Number', size=None, select=True, readonly=True)
     reference = fields.Char("Reference", size=None, select=True,
         states={
             'readonly': Eval('state') != 'draft',
@@ -1864,13 +1913,13 @@ class ShipmentInternal(Workflow, ModelSQL, ModelView):
     @classmethod
     def __register__(cls, module_name):
         TableHandler = backend.get('TableHandler')
-        cursor = Transaction().cursor
+        cursor = Transaction().connection.cursor()
         sql_table = cls.__table__()
         # Migration from 1.2: packing renamed into shipment
         old_table = 'stock_packing_internal'
-        if TableHandler.table_exist(cursor, old_table):
-            TableHandler.table_rename(cursor, old_table, cls._table)
-        table = TableHandler(cursor, cls, module_name)
+        if TableHandler.table_exist(old_table):
+            TableHandler.table_rename(old_table, cls._table)
+        table = TableHandler(cls, module_name)
         for field in ('create_uid', 'write_uid', 'from_location',
                 'to_location'):
             table.drop_fk(field, table=old_table)
@@ -1880,12 +1929,16 @@ class ShipmentInternal(Workflow, ModelSQL, ModelView):
         # Migration from 2.0:
         created_company = table.column_exist('company')
 
+        # Migration from 3.8:
+        if table.column_exist('code'):
+            table.column_rename('code', 'number')
+
         super(ShipmentInternal, cls).__register__(module_name)
 
         # Migration from 2.0:
         Move = Pool().get('stock.move')
         if (not created_company
-                and TableHandler.table_exist(cursor, Move._table)):
+                and TableHandler.table_exist(Move._table)):
             move = Move.__table__()
             cursor.execute(*sql_table.join(move,
                     condition=(Concat(cls.__name__ + ',', sql_table.id)
@@ -1905,7 +1958,7 @@ class ShipmentInternal(Workflow, ModelSQL, ModelView):
             table.not_null_action('company', action='add')
 
         # Add index on create_date
-        table = TableHandler(cursor, cls, module_name)
+        table = TableHandler(cls, module_name)
         table.index_action('create_date', action='add')
 
     @staticmethod
@@ -1925,8 +1978,9 @@ class ShipmentInternal(Workflow, ModelSQL, ModelView):
         vlist = [x.copy() for x in vlist]
         config = Config(1)
         for values in vlist:
-            values['code'] = Sequence.get_id(
-                    config.shipment_internal_sequence.id)
+            if values.get('number') is None:
+                values['number'] = Sequence.get_id(
+                        config.shipment_internal_sequence.id)
         return super(ShipmentInternal, cls).create(vlist)
 
     @classmethod
@@ -2020,6 +2074,7 @@ class ShipmentInternal(Workflow, ModelSQL, ModelView):
 
 
 class Address:
+    __metaclass__ = PoolMeta
     __name__ = 'party.address'
     delivery = fields.Boolean('Delivery')
 
diff --git a/supplier_restocking_list.odt b/supplier_restocking_list.odt
index c672dde..df8175f 100644
Binary files a/supplier_restocking_list.odt and b/supplier_restocking_list.odt differ
diff --git a/tests/__init__.py b/tests/__init__.py
index aa4b1e3..d56e7df 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -1,6 +1,9 @@
 # This file is part of Tryton.  The COPYRIGHT file at the top level of
 # this repository contains the full copyright notices and license terms.
 
-from .test_stock import suite
+try:
+    from trytond.modules.stock.tests.test_stock import suite
+except ImportError:
+    from .test_stock import suite
 
 __all__ = ['suite']
diff --git a/tests/scenario_stock_reporting.rst b/tests/scenario_stock_reporting.rst
index ec4b37c..5fe92ef 100644
--- a/tests/scenario_stock_reporting.rst
+++ b/tests/scenario_stock_reporting.rst
@@ -43,12 +43,6 @@ Create customer & supplier::
     >>> supplier = Party(name='Supplier')
     >>> supplier.save()
 
-Create category::
-
-    >>> ProductCategory = Model.get('product.category')
-    >>> category = ProductCategory(name='Category')
-    >>> category.save()
-
 Create product::
 
     >>> ProductUom = Model.get('product.uom')
@@ -58,7 +52,6 @@ Create product::
     >>> product = Product()
     >>> template = ProductTemplate()
     >>> template.name = 'Product'
-    >>> template.category = category
     >>> template.default_uom = unit
     >>> template.type = 'goods'
     >>> template.list_price = Decimal('20')
diff --git a/tests/scenario_stock_shipment_out.rst b/tests/scenario_stock_shipment_out.rst
index 92542d9..4480ab3 100644
--- a/tests/scenario_stock_shipment_out.rst
+++ b/tests/scenario_stock_shipment_out.rst
@@ -41,12 +41,6 @@ Create customer::
     >>> customer = Party(name='Customer')
     >>> customer.save()
 
-Create category::
-
-    >>> ProductCategory = Model.get('product.category')
-    >>> category = ProductCategory(name='Category')
-    >>> category.save()
-
 Create product::
 
     >>> ProductUom = Model.get('product.uom')
@@ -56,7 +50,6 @@ Create product::
     >>> product = Product()
     >>> template = ProductTemplate()
     >>> template.name = 'Product'
-    >>> template.category = category
     >>> template.default_uom = unit
     >>> template.type = 'goods'
     >>> template.list_price = Decimal('20')
@@ -152,8 +145,8 @@ Delete the draft move, assign and pack shipment::
     >>> shipment_out.click('assign_try')
     True
     >>> shipment_out.click('pack')
-    >>> set([m.state for m in shipment_out.outgoing_moves])
-    set([u'assigned'])
+    >>> all(m.state == 'assigned' for m in shipment_out.outgoing_moves)
+    True
     >>> len(shipment_out.outgoing_moves)
     2
     >>> len(shipment_out.inventory_moves)
@@ -167,8 +160,8 @@ Delete the draft move, assign and pack shipment::
 Set the state as Done::
 
     >>> shipment_out.click('done')
-    >>> set([m.state for m in shipment_out.outgoing_moves])
-    set([u'done'])
+    >>> all(m.state == 'done' for m in shipment_out.outgoing_moves)
+    True
     >>> planned_dates = [m.planned_date for m in
     ...     shipment_out.outgoing_moves]
     >>> planned_dates == [today, today]
diff --git a/tests/test_stock.py b/tests/test_stock.py
index 949c25a..f5fb259 100644
--- a/tests/test_stock.py
+++ b/tests/test_stock.py
@@ -9,63 +9,49 @@ from functools import partial
 from collections import defaultdict
 
 import trytond.tests.test_tryton
-from trytond.tests.test_tryton import ModuleTestCase
-from trytond.tests.test_tryton import POOL, DB_NAME, USER, CONTEXT
+from trytond.tests.test_tryton import ModuleTestCase, with_transaction
 from trytond.tests.test_tryton import doctest_setup, doctest_teardown
+from trytond.tests.test_tryton import doctest_checker
 from trytond.transaction import Transaction
 from trytond.exceptions import UserWarning
 from trytond.pool import Pool
 
+from trytond.modules.company.tests import create_company, set_company
+
 
 class StockTestCase(ModuleTestCase):
     'Test Stock module'
     module = 'stock'
     longMessage = True
 
-    def setUp(self):
-        super(StockTestCase, self).setUp()
-        self.template = POOL.get('product.template')
-        self.product = POOL.get('product.product')
-        self.category = POOL.get('product.category')
-        self.uom = POOL.get('product.uom')
-        self.location = POOL.get('stock.location')
-        self.move = POOL.get('stock.move')
-        self.company = POOL.get('company.company')
-        self.user = POOL.get('res.user')
-        self.period = POOL.get('stock.period')
-        self.cache = POOL.get('stock.period.cache')
-
-    def test0010move_internal_quantity(self):
+    @with_transaction()
+    def test_move_internal_quantity(self):
         'Test Move.internal_quantity'
-        with Transaction().start(DB_NAME, USER, context=CONTEXT):
-            category, = self.category.create([{
-                        'name': 'Test Move.internal_quantity',
-                        }])
-            kg, = self.uom.search([('name', '=', 'Kilogram')])
-            g, = self.uom.search([('name', '=', 'Gram')])
-            template, = self.template.create([{
-                        'name': 'Test Move.internal_quantity',
-                        'type': 'goods',
-                        'list_price': Decimal(1),
-                        'cost_price': Decimal(0),
-                        'category': category.id,
-                        'cost_price_method': 'fixed',
-                        'default_uom': kg.id,
-                        }])
-            product, = self.product.create([{
-                        'template': template.id,
-                        }])
-            supplier, = self.location.search([('code', '=', 'SUP')])
-            storage, = self.location.search([('code', '=', 'STO')])
-            company, = self.company.search([
-                    ('rec_name', '=', 'Dunder Mifflin'),
-                    ])
-            currency = company.currency
-            self.user.write([self.user(USER)], {
-                'main_company': company.id,
-                'company': company.id,
-                })
-
+        pool = Pool()
+        Uom = pool.get('product.uom')
+        Template = pool.get('product.template')
+        Product = pool.get('product.product')
+        Location = pool.get('stock.location')
+        Move = pool.get('stock.move')
+
+        kg, = Uom.search([('name', '=', 'Kilogram')])
+        g, = Uom.search([('name', '=', 'Gram')])
+        template, = Template.create([{
+                    'name': 'Test Move.internal_quantity',
+                    'type': 'goods',
+                    'list_price': Decimal(1),
+                    'cost_price': Decimal(0),
+                    'cost_price_method': 'fixed',
+                    'default_uom': kg.id,
+                    }])
+        product, = Product.create([{
+                    'template': template.id,
+                    }])
+        supplier, = Location.search([('code', '=', 'SUP')])
+        storage, = Location.search([('code', '=', 'STO')])
+        company = create_company()
+        currency = company.currency
+        with set_company(company):
             tests = [
                 (kg, 10, 10, 0),
                 (g, 100, 0.1, 1),
@@ -73,7 +59,7 @@ class StockTestCase(ModuleTestCase):
                 (kg, 35.23, 35.23, 2),  # check infinite loop
             ]
             for uom, quantity, internal_quantity, ndigits in tests:
-                move, = self.move.create([{
+                move, = Move.create([{
                             'product': product.id,
                             'uom': uom.id,
                             'quantity': quantity,
@@ -87,49 +73,47 @@ class StockTestCase(ModuleTestCase):
                     internal_quantity)
 
                 for uom, quantity, internal_quantity, ndigits in tests:
-                    self.move.write([move], {
+                    Move.write([move], {
                         'uom': uom.id,
                         'quantity': quantity,
                         })
                     self.assertEqual(round(move.internal_quantity, ndigits),
                         internal_quantity)
 
-    def test0020products_by_location(self):
+    @with_transaction()
+    def test_products_by_location(self):
         'Test products_by_location'
-        with Transaction().start(DB_NAME, USER,
-                context=CONTEXT) as transaction:
-            category, = self.category.create([{
-                        'name': 'Test products_by_location',
-                        }])
-            kg, = self.uom.search([('name', '=', 'Kilogram')])
-            g, = self.uom.search([('name', '=', 'Gram')])
-            template, = self.template.create([{
-                        'name': 'Test products_by_location',
-                        'type': 'goods',
-                        'list_price': Decimal(0),
-                        'cost_price': Decimal(0),
-                        'category': category.id,
-                        'cost_price_method': 'fixed',
-                        'default_uom': kg.id,
-                        }])
-            product, = self.product.create([{
-                        'template': template.id,
-                        }])
-            supplier, = self.location.search([('code', '=', 'SUP')])
-            customer, = self.location.search([('code', '=', 'CUS')])
-            storage, = self.location.search([('code', '=', 'STO')])
-            company, = self.company.search([
-                    ('rec_name', '=', 'Dunder Mifflin'),
-                    ])
-            currency = company.currency
-            self.user.write([self.user(USER)], {
-                'main_company': company.id,
-                'company': company.id,
-                })
-
+        pool = Pool()
+        Uom = pool.get('product.uom')
+        Template = pool.get('product.template')
+        Product = pool.get('product.product')
+        Location = pool.get('stock.location')
+        Move = pool.get('stock.move')
+        Period = pool.get('stock.period')
+        transaction = Transaction()
+
+        kg, = Uom.search([('name', '=', 'Kilogram')])
+        g, = Uom.search([('name', '=', 'Gram')])
+        template, = Template.create([{
+                    'name': 'Test products_by_location',
+                    'type': 'goods',
+                    'list_price': Decimal(0),
+                    'cost_price': Decimal(0),
+                    'cost_price_method': 'fixed',
+                    'default_uom': kg.id,
+                    }])
+        product, = Product.create([{
+                    'template': template.id,
+                    }])
+        supplier, = Location.search([('code', '=', 'SUP')])
+        customer, = Location.search([('code', '=', 'CUS')])
+        storage, = Location.search([('code', '=', 'STO')])
+        company = create_company()
+        currency = company.currency
+        with set_company(company):
             today = datetime.date.today()
 
-            moves = self.move.create([{
+            moves = Move.create([{
                         'product': product.id,
                         'uom': kg.id,
                         'quantity': 5,
@@ -192,9 +176,9 @@ class StockTestCase(ModuleTestCase):
                         'unit_price': Decimal('1'),
                         'currency': currency.id,
                         }])
-            self.move.do([moves[0], moves[2]])
+            Move.do([moves[0], moves[2]])
 
-            products_by_location = partial(self.product.products_by_location,
+            products_by_location = partial(Product.products_by_location,
                     [storage.id], [product.id])
 
             tests = [
@@ -254,7 +238,7 @@ class StockTestCase(ModuleTestCase):
 
             def tests_product_quantity(context, quantity):
                 with transaction.set_context(locations=[storage.id]):
-                    product_reloaded = self.product(product.id)
+                    product_reloaded = Product(product.id)
                     if (not context.get('stock_date_end')
                             or context['stock_date_end'] > today
                             or context.get('forecast')):
@@ -271,50 +255,50 @@ class StockTestCase(ModuleTestCase):
                         fname = 'forecast_quantity'
                     else:
                         fname = 'quantity'
-                    found_products = self.product.search([
+                    found_products = Product.search([
                             (fname, '=', quantity),
                             ])
                     self.assertIn(product, found_products)
 
-                    found_products = self.product.search([
+                    found_products = Product.search([
                             (fname, '!=', quantity),
                             ])
                     self.assertNotIn(product, found_products)
 
-                    found_products = self.product.search([
+                    found_products = Product.search([
                             (fname, 'in', (quantity, quantity + 1)),
                             ])
                     self.assertIn(product, found_products)
 
-                    found_products = self.product.search([
+                    found_products = Product.search([
                             (fname, 'not in', (quantity, quantity + 1)),
                             ])
                     self.assertNotIn(product, found_products)
 
-                    found_products = self.product.search([
+                    found_products = Product.search([
                             (fname, '<', quantity),
                             ])
                     self.assertNotIn(product, found_products)
-                    found_products = self.product.search([
+                    found_products = Product.search([
                             (fname, '<', quantity + 1),
                             ])
                     self.assertIn(product, found_products)
 
-                    found_products = self.product.search([
+                    found_products = Product.search([
                             (fname, '>', quantity),
                             ])
                     self.assertNotIn(product, found_products)
-                    found_products = self.product.search([
+                    found_products = Product.search([
                             (fname, '>', quantity - 1),
                             ])
                     self.assertIn(product, found_products)
 
-                    found_products = self.product.search([
+                    found_products = Product.search([
                             (fname, '>=', quantity),
                             ])
                     self.assertIn(product, found_products)
 
-                    found_products = self.product.search([
+                    found_products = Product.search([
                             (fname, '<=', quantity),
                             ])
                     self.assertIn(product, found_products)
@@ -340,7 +324,7 @@ class StockTestCase(ModuleTestCase):
                 today + relativedelta(days=-2),
                 ]
 
-            moves = self.move.create([{
+            moves = Move.create([{
                         'product': product.id,
                         'uom': g.id,
                         'quantity': 1,
@@ -353,63 +337,65 @@ class StockTestCase(ModuleTestCase):
                         'unit_price': Decimal('1'),
                         'currency': currency.id,
                         }])
-            self.move.do(moves)
+            Move.do(moves)
             # Nothing should change when adding a small quantity
             test_products_by_location()
 
             for period_date in periods:
-                period, = self.period.create([{
+                period, = Period.create([{
                             'date': period_date,
                             'company': company.id,
                             }])
-                self.period.close([period])
+                Period.close([period])
                 test_products_by_location()
 
-        # Test with_childs and stock_skip_warehouse
-        with Transaction().start(DB_NAME, USER,
-                context=CONTEXT) as transaction:
-            company, = self.company.search([
-                    ('rec_name', '=', 'Dunder Mifflin'),
-                    ])
-            self.user.write([self.user(USER)], {
-                'main_company': company.id,
-                'company': company.id,
-                })
-
-            unit, = self.uom.search([('name', '=', 'Unit')])
-            template, = self.template.create([{
-                        'name': 'Test products_by_location',
-                        'type': 'goods',
-                        'list_price': Decimal(0),
-                        'cost_price': Decimal(0),
-                        'cost_price_method': 'fixed',
-                        'default_uom': unit.id,
-                        }])
-            product, = self.product.create([{
-                        'template': template.id,
-                        }])
-
-            lost_found, = self.location.search([('type', '=', 'lost_found')])
-            warehouse, = self.location.search([('type', '=', 'warehouse')])
-            storage, = self.location.search([('code', '=', 'STO')])
-            input_, = self.location.search([('code', '=', 'IN')])
-            storage1, = self.location.create([{
-                        'name': 'Storage 1',
-                        'type': 'view',
-                        'parent': storage.id,
-                        }])
-            storage2, = self.location.create([{
-                        'name': 'Storage 1.1',
-                        'type': 'view',
-                        'parent': storage1.id,
-                        }])
-            storage3, = self.location.create([{
-                        'name': 'Storage 2',
-                        'type': 'view',
-                        'parent': storage.id,
-                        }])
+    @with_transaction()
+    def test_products_by_location_with_childs(self):
+        'Test products_by_location with_childs and stock_skip_warehouse'
+        pool = Pool()
+        Uom = pool.get('product.uom')
+        Template = pool.get('product.template')
+        Product = pool.get('product.product')
+        Location = pool.get('stock.location')
+        Move = pool.get('stock.move')
+
+        unit, = Uom.search([('name', '=', 'Unit')])
+        template, = Template.create([{
+                    'name': 'Test products_by_location',
+                    'type': 'goods',
+                    'list_price': Decimal(0),
+                    'cost_price': Decimal(0),
+                    'cost_price_method': 'fixed',
+                    'default_uom': unit.id,
+                    }])
+        product, = Product.create([{
+                    'template': template.id,
+                    }])
+
+        lost_found, = Location.search([('type', '=', 'lost_found')])
+        warehouse, = Location.search([('type', '=', 'warehouse')])
+        storage, = Location.search([('code', '=', 'STO')])
+        input_, = Location.search([('code', '=', 'IN')])
+        storage1, = Location.create([{
+                    'name': 'Storage 1',
+                    'type': 'view',
+                    'parent': storage.id,
+                    }])
+        storage2, = Location.create([{
+                    'name': 'Storage 1.1',
+                    'type': 'view',
+                    'parent': storage1.id,
+                    }])
+        storage3, = Location.create([{
+                    'name': 'Storage 2',
+                    'type': 'view',
+                    'parent': storage.id,
+                    }])
+        company = create_company()
+        with set_company(company):
+            today = datetime.date.today()
 
-            moves = self.move.create([{
+            moves = Move.create([{
                         'product': product.id,
                         'uom': unit.id,
                         'quantity': 1,
@@ -428,58 +414,61 @@ class StockTestCase(ModuleTestCase):
                         'effective_date': today,
                         'company': company.id,
                         }])
-            self.move.do(moves)
+            Move.do(moves)
 
-            products_by_location = self.product.products_by_location(
+            products_by_location = Product.products_by_location(
                 [warehouse.id], [product.id], with_childs=True)
             self.assertEqual(products_by_location[(warehouse.id, product.id)],
                 1)
+            products_by_location = Product.products_by_location(
+                [warehouse.id, storage.id], [product.id], with_childs=True)
+            self.assertEqual(
+                products_by_location[(warehouse.id, product.id)], 1)
+            self.assertEqual(products_by_location[(storage.id, product.id)], 2)
 
             with Transaction().set_context(stock_skip_warehouse=True):
-                products_by_location = self.product.products_by_location(
+                products_by_location = Product.products_by_location(
                     [warehouse.id], [product.id], with_childs=True)
-                products_by_location_all = self.product.products_by_location(
+                products_by_location_all = Product.products_by_location(
                     [warehouse.id], None, with_childs=True)
-            self.assertEqual(products_by_location[(warehouse.id, product.id)],
-                2)
+            self.assertEqual(
+                products_by_location[(warehouse.id, product.id)], 2)
             self.assertEqual(
                 products_by_location_all[(warehouse.id, product.id)], 2)
 
-    def test0030period(self):
+    @with_transaction()
+    def test_period(self):
         'Test period'
-        with Transaction().start(DB_NAME, USER,
-                context=CONTEXT) as transaction:
-            category, = self.category.create([{
-                        'name': 'Test period',
-                        }])
-            unit, = self.uom.search([('name', '=', 'Unit')])
-            template, = self.template.create([{
-                        'name': 'Test period',
-                        'type': 'goods',
-                        'category': category.id,
-                        'cost_price_method': 'fixed',
-                        'default_uom': unit.id,
-                        'list_price': Decimal(0),
-                        'cost_price': Decimal(0),
-                        }])
-            product, = self.product.create([{
-                        'template': template.id,
-                        }])
-            supplier, = self.location.search([('code', '=', 'SUP')])
-            customer, = self.location.search([('code', '=', 'CUS')])
-            storage, = self.location.search([('code', '=', 'STO')])
-            company, = self.company.search([
-                    ('rec_name', '=', 'Dunder Mifflin'),
-                    ])
-            currency = company.currency
-            self.user.write([self.user(USER)], {
-                'main_company': company.id,
-                'company': company.id,
-                })
-
+        pool = Pool()
+        Uom = pool.get('product.uom')
+        Template = pool.get('product.template')
+        Product = pool.get('product.product')
+        Location = pool.get('stock.location')
+        Move = pool.get('stock.move')
+        Period = pool.get('stock.period')
+        transaction = Transaction()
+
+        unit, = Uom.search([('name', '=', 'Unit')])
+        template, = Template.create([{
+                    'name': 'Test period',
+                    'type': 'goods',
+                    'cost_price_method': 'fixed',
+                    'default_uom': unit.id,
+                    'list_price': Decimal(0),
+                    'cost_price': Decimal(0),
+                    }])
+        product, = Product.create([{
+                    'template': template.id,
+                    }])
+        supplier, = Location.search([('code', '=', 'SUP')])
+        customer, = Location.search([('code', '=', 'CUS')])
+        storage, = Location.search([('code', '=', 'STO')])
+        company = create_company()
+        currency = company.currency
+        with set_company(company):
             today = datetime.date.today()
 
-            moves = self.move.create([{
+            moves = Move.create([{
                         'product': product.id,
                         'uom': unit.id,
                         'quantity': 10,
@@ -513,8 +502,8 @@ class StockTestCase(ModuleTestCase):
                         'unit_price': Decimal('1'),
                         'currency': currency.id,
                         }])
-            self.move.do(moves)
-            self.move.create([{
+            Move.do(moves)
+            Move.create([{
                         'product': product.id,
                         'uom': unit.id,
                         'quantity': 3,
@@ -539,7 +528,7 @@ class StockTestCase(ModuleTestCase):
                 })
             ]
 
-            products_by_location = partial(self.product.products_by_location,
+            products_by_location = partial(Product.products_by_location,
                 [storage.id], [product.id])
 
             tests_pbl = [
@@ -563,11 +552,11 @@ class StockTestCase(ModuleTestCase):
 
             test_products_by_location()
             for days, quantities in tests:
-                period, = self.period.create([{
+                period, = Period.create([{
                             'date': today + relativedelta(days=days),
                             'company': company.id,
                             }])
-                self.period.close([period])
+                Period.close([period])
 
                 self.assertEqual(period.state, 'closed')
 
@@ -580,7 +569,7 @@ class StockTestCase(ModuleTestCase):
                 test_products_by_location()
 
             # Test check_period_closed
-            moves = self.move.create([{
+            moves = Move.create([{
                         'product': product.id,
                         'uom': unit.id,
                         'quantity': 10,
@@ -592,9 +581,9 @@ class StockTestCase(ModuleTestCase):
                         'unit_price': Decimal('1'),
                         'currency': currency.id,
                         }])
-            self.move.do(moves)
+            Move.do(moves)
 
-            self.assertRaises(Exception, self.move.create, [{
+            self.assertRaises(Exception, Move.create, [{
                         'product': product.id,
                         'uom': unit.id,
                         'quantity': 10,
@@ -608,40 +597,45 @@ class StockTestCase(ModuleTestCase):
                         }])
 
             # Test close period check
-            period, = self.period.create([{
+            period, = Period.create([{
                         'date': today,
                         'company': company.id,
                         }])
-            self.assertRaises(Exception, self.period.close, [period])
+            self.assertRaises(Exception, Period.close, [period])
 
-            period, = self.period.create([{
+            period, = Period.create([{
                         'date': today + relativedelta(days=1),
                         'company': company.id,
                         }])
-            self.assertRaises(Exception, self.period.close, [period])
+            self.assertRaises(Exception, Period.close, [period])
 
-    def test0040check_origin(self):
+    @with_transaction()
+    def test_check_origin(self):
         'Test Move check_origin'
-        with Transaction().start(DB_NAME, USER, context=CONTEXT):
-            uom, = self.uom.search([('name', '=', 'Unit')])
-            template, = self.template.create([{
-                        'name': 'Test Move.check_origin',
-                        'type': 'goods',
-                        'list_price': Decimal(1),
-                        'cost_price': Decimal(0),
-                        'cost_price_method': 'fixed',
-                        'default_uom': uom.id,
-                        }])
-            product, = self.product.create([{
-                        'template': template.id,
-                        }])
-            storage, = self.location.search([('code', '=', 'STO')])
-            customer, = self.location.search([('code', '=', 'CUS')])
-            company, = self.company.search([
-                    ('rec_name', '=', 'Dunder Mifflin'),
-                    ])
-
-            moves = self.move.create([{
+        pool = Pool()
+        Uom = pool.get('product.uom')
+        Template = pool.get('product.template')
+        Product = pool.get('product.product')
+        Location = pool.get('stock.location')
+        Move = pool.get('stock.move')
+
+        uom, = Uom.search([('name', '=', 'Unit')])
+        template, = Template.create([{
+                    'name': 'Test Move.check_origin',
+                    'type': 'goods',
+                    'list_price': Decimal(1),
+                    'cost_price': Decimal(0),
+                    'cost_price_method': 'fixed',
+                    'default_uom': uom.id,
+                    }])
+        product, = Product.create([{
+                    'template': template.id,
+                    }])
+        storage, = Location.search([('code', '=', 'STO')])
+        customer, = Location.search([('code', '=', 'CUS')])
+        company = create_company()
+        with set_company(company):
+            moves = Move.create([{
                         'product': product.id,
                         'uom': uom.id,
                         'quantity': 1,
@@ -652,9 +646,9 @@ class StockTestCase(ModuleTestCase):
                         'currency': company.currency.id,
                         }])
 
-            self.move.check_origin(moves, set())
-            self.move.check_origin(moves, {'supplier'})
-            self.assertRaises(UserWarning, self.move.check_origin, moves,
+            Move.check_origin(moves, set())
+            Move.check_origin(moves, {'supplier'})
+            self.assertRaises(UserWarning, Move.check_origin, moves,
                 {'customer'})
 
     def test_assign_try(self):
@@ -668,37 +662,34 @@ class StockTestCase(ModuleTestCase):
                 ]:
             self._test_assign_try(quantity, quantities, success, result)
 
+    @with_transaction()
     def _test_assign_try(self, quantity, quantities, success, result):
-        with Transaction().start(DB_NAME, USER, context=CONTEXT):
-            pool = Pool()
-            Template = pool.get('product.template')
-            Product = pool.get('product.product')
-            Uom = pool.get('product.uom')
-            Location = pool.get('stock.location')
-            Company = pool.get('company.company')
-            Move = pool.get('stock.move')
-
-            uom, = Uom.search([('name', '=', 'Meter')])
-            template = Template(
-                name='Test Move.assign_try',
-                type='goods',
-                list_price=Decimal(1),
-                cost_price=Decimal(0),
-                cost_price_method='fixed',
-                default_uom=uom,
-                )
-            template.save()
-            product = Product(template=template.id)
-            product.save()
-
-            supplier, = Location.search([('code', '=', 'SUP')])
-            storage, = Location.search([('code', '=', 'STO')])
-            customer, = Location.search([('code', '=', 'CUS')])
-
-            company, = Company.search([
-                    ('rec_name', '=', 'Dunder Mifflin'),
-                    ])
-
+        pool = Pool()
+        Template = pool.get('product.template')
+        Product = pool.get('product.product')
+        Uom = pool.get('product.uom')
+        Location = pool.get('stock.location')
+        Move = pool.get('stock.move')
+
+        uom, = Uom.search([('name', '=', 'Meter')])
+        template = Template(
+            name='Test Move.assign_try',
+            type='goods',
+            list_price=Decimal(1),
+            cost_price=Decimal(0),
+            cost_price_method='fixed',
+            default_uom=uom,
+            )
+        template.save()
+        product = Product(template=template.id)
+        product.save()
+
+        supplier, = Location.search([('code', '=', 'SUP')])
+        storage, = Location.search([('code', '=', 'STO')])
+        customer, = Location.search([('code', '=', 'CUS')])
+
+        company = create_company()
+        with set_company(company):
             move, = Move.create([{
                         'product': product.id,
                         'uom': uom.id,
@@ -740,26 +731,27 @@ class StockTestCase(ModuleTestCase):
 
 def suite():
     suite = trytond.tests.test_tryton.suite()
-    from trytond.modules.company.tests import test_company
-    for test in test_company.suite():
-        if test not in suite and not isinstance(test, doctest.DocTestCase):
-            suite.addTest(test)
     suite.addTests(unittest.TestLoader().loadTestsFromTestCase(StockTestCase))
     suite.addTests(doctest.DocFileSuite('scenario_stock_shipment_out.rst',
             setUp=doctest_setup, tearDown=doctest_teardown, encoding='utf-8',
+            checker=doctest_checker,
             optionflags=doctest.REPORT_ONLY_FIRST_FAILURE))
     suite.addTests(doctest.DocFileSuite(
             'scenario_stock_average_cost_price.rst',
             setUp=doctest_setup, tearDown=doctest_teardown, encoding='utf-8',
+            checker=doctest_checker,
             optionflags=doctest.REPORT_ONLY_FIRST_FAILURE))
     suite.addTests(doctest.DocFileSuite(
             'scenario_stock_inventory.rst',
             setUp=doctest_setup, tearDown=doctest_teardown, encoding='utf-8',
+            checker=doctest_checker,
             optionflags=doctest.REPORT_ONLY_FIRST_FAILURE))
     suite.addTests(doctest.DocFileSuite('scenario_stock_shipment_internal.rst',
             setUp=doctest_setup, tearDown=doctest_teardown, encoding='utf-8',
+            checker=doctest_checker,
             optionflags=doctest.REPORT_ONLY_FIRST_FAILURE))
     suite.addTests(doctest.DocFileSuite('scenario_stock_reporting.rst',
             setUp=doctest_setup, tearDown=doctest_teardown, encoding='utf-8',
+            checker=doctest_checker,
             optionflags=doctest.REPORT_ONLY_FIRST_FAILURE))
     return suite
diff --git a/tryton.cfg b/tryton.cfg
index 3076f98..0e19f72 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=3.8.1
+version=4.0.0
 depends:
     company
     currency
diff --git a/trytond_stock.egg-info/PKG-INFO b/trytond_stock.egg-info/PKG-INFO
index dfbfd29..bbd09ca 100644
--- a/trytond_stock.egg-info/PKG-INFO
+++ b/trytond_stock.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
 Metadata-Version: 1.1
 Name: trytond-stock
-Version: 3.8.1
+Version: 4.0.0
 Summary: Tryton module for stock and inventory
 Home-page: http://www.tryton.org/
 Author: Tryton
 Author-email: issue_tracker at tryton.org
 License: GPL-3
-Download-URL: http://downloads.tryton.org/3.8/
+Download-URL: http://downloads.tryton.org/4.0/
 Description: trytond_stock
         =============
         
@@ -55,6 +55,7 @@ Classifier: Intended Audience :: Manufacturing
 Classifier: License :: OSI Approved :: GNU General Public License (GPL)
 Classifier: Natural Language :: Bulgarian
 Classifier: Natural Language :: Catalan
+Classifier: Natural Language :: Chinese (Simplified)
 Classifier: Natural Language :: Czech
 Classifier: Natural Language :: Dutch
 Classifier: Natural Language :: English
@@ -68,6 +69,9 @@ Classifier: Natural Language :: Slovenian
 Classifier: Natural Language :: Spanish
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 2.7
+Classifier: Programming Language :: Python :: 3.3
+Classifier: Programming Language :: Python :: 3.4
+Classifier: Programming Language :: Python :: 3.5
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
 Classifier: Topic :: Office/Business
diff --git a/trytond_stock.egg-info/SOURCES.txt b/trytond_stock.egg-info/SOURCES.txt
index 9b033ee..6e35d1d 100644
--- a/trytond_stock.egg-info/SOURCES.txt
+++ b/trytond_stock.egg-info/SOURCES.txt
@@ -122,11 +122,13 @@ locale/fr_FR.po
 locale/hu_HU.po
 locale/it_IT.po
 locale/ja_JP.po
+locale/lo_LA.po
 locale/lt_LT.po
 locale/nl_NL.po
 locale/pt_BR.po
 locale/ru_RU.po
 locale/sl_SI.po
+locale/zh_CN.po
 tests/scenario_stock_average_cost_price.rst
 tests/scenario_stock_inventory.rst
 tests/scenario_stock_reporting.rst
@@ -139,6 +141,7 @@ trytond_stock.egg-info/entry_points.txt
 trytond_stock.egg-info/not-zip-safe
 trytond_stock.egg-info/requires.txt
 trytond_stock.egg-info/top_level.txt
+view/address_tree_sequence.xml
 view/configuration_form.xml
 view/inventory_form.xml
 view/inventory_line_form.xml
diff --git a/trytond_stock.egg-info/requires.txt b/trytond_stock.egg-info/requires.txt
index f2e4f30..00e6f64 100644
--- a/trytond_stock.egg-info/requires.txt
+++ b/trytond_stock.egg-info/requires.txt
@@ -1,6 +1,6 @@
 python-sql >= 0.4
-trytond_company >= 3.8, < 3.9
-trytond_currency >= 3.8, < 3.9
-trytond_party >= 3.8, < 3.9
-trytond_product >= 3.8, < 3.9
-trytond >= 3.8, < 3.9
\ No newline at end of file
+trytond_company >= 4.0, < 4.1
+trytond_currency >= 4.0, < 4.1
+trytond_party >= 4.0, < 4.1
+trytond_product >= 4.0, < 4.1
+trytond >= 4.0, < 4.1
\ No newline at end of file
diff --git a/view/inventory_tree.xml b/view/address_tree_sequence.xml
similarity index 54%
copy from view/inventory_tree.xml
copy to view/address_tree_sequence.xml
index 1448000..6ebec24 100644
--- a/view/inventory_tree.xml
+++ b/view/address_tree_sequence.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
 <!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
 this repository contains the full copyright notices and license terms. -->
-<tree string="Inventories">
-    <field name="location"/>
-    <field name="date"/>
-    <field name="state"/>
-    <field name="company"/>
-</tree>
+<data>
+    <xpath
+        expr="/tree/field[@name='subdivision']" position="after">
+        <field name="delivery"/>
+    </xpath>
+</data>
diff --git a/view/configuration_form.xml b/view/configuration_form.xml
index 5623085..c126e1d 100644
--- a/view/configuration_form.xml
+++ b/view/configuration_form.xml
@@ -2,6 +2,7 @@
 <!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
 this repository contains the full copyright notices and license terms. -->
 <form string="Stock Configuration">
+    <separator id="shipment" colspan="4" string="Shipments"/>
     <label name="shipment_in_sequence"/>
     <field name="shipment_in_sequence"/>
     <label name="shipment_in_return_sequence"/>
@@ -12,4 +13,7 @@ this repository contains the full copyright notices and license terms. -->
     <field name="shipment_out_return_sequence"/>
     <label name="shipment_internal_sequence"/>
     <field name="shipment_internal_sequence"/>
+    <separator id="inventory" colspan="4" string="Inventory"/>
+    <label name="inventory_sequence"/>
+    <field name="inventory_sequence"/>
 </form>
diff --git a/view/inventory_form.xml b/view/inventory_form.xml
index b139c13..ca5c60a 100644
--- a/view/inventory_form.xml
+++ b/view/inventory_form.xml
@@ -4,13 +4,15 @@ this repository contains the full copyright notices and license terms. -->
 <form string="Inventory" col="4">
     <label name="location"/>
     <field name="location"/>
-    <label name="lost_found"/>
-    <field name="lost_found"/>
+    <label name="number"/>
+    <field name="number"/>
     <label name="date"/>
     <field name="date"/>
+    <label name="lost_found"/>
+    <field name="lost_found"/>
     <label name="company"/>
     <field name="company"/>
-    <label colspan="2" id="empty"/>
+    <newline/>
     <button string="Complete Inventory"
         name="complete_lines" colspan="2"
         help="Add an inventory line for each missing products"/>
diff --git a/view/inventory_tree.xml b/view/inventory_tree.xml
index 1448000..352e693 100644
--- a/view/inventory_tree.xml
+++ b/view/inventory_tree.xml
@@ -2,6 +2,7 @@
 <!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
 this repository contains the full copyright notices and license terms. -->
 <tree string="Inventories">
+    <field name="number"/>
     <field name="location"/>
     <field name="date"/>
     <field name="state"/>
diff --git a/view/move_form.xml b/view/move_form.xml
index 4b95808..b820cd2 100644
--- a/view/move_form.xml
+++ b/view/move_form.xml
@@ -24,13 +24,17 @@ this repository contains the full copyright notices and license terms. -->
     <field name="planned_date"/>
     <label name="effective_date"/>
     <field name="effective_date"/>
+    <label name="origin"/>
+    <field name="origin"/>
     <separator colspan="4" id="separator"/>
     <label name="state"/>
     <field name="state"/>
     <group col="20" colspan="2" id="buttons">
         <button name="cancel" string="Cancel" icon="tryton-cancel"/>
         <button name="draft" string="Reset to Draft" icon="tryton-clear"/>
+        <button name="do" string="Do" icon="tryton-go-next"/>
     </group>
     <field name="unit_price_required" invisible="1" colspan="4"/>
     <field name="unit_digits" invisible="1" colspan="4"/>
+    <field name="assignation_required" invisible="1" colspan="4"/>
 </form>
diff --git a/view/move_tree.xml b/view/move_tree.xml
index d0c06a8..d5ba2b0 100644
--- a/view/move_tree.xml
+++ b/view/move_tree.xml
@@ -13,5 +13,7 @@ this repository contains the full copyright notices and license terms. -->
     <field name="state"/>
     <button name="cancel" string="Cancel"/>
     <button name="draft" string="Reset to Draft"/>
+    <button name="do" string="Do"/>
     <field name="unit_digits" tree_invisible="1"/>
+    <field name="assignation_required" tree_invisible="1"/>
 </tree>
diff --git a/view/shipment_in_form.xml b/view/shipment_in_form.xml
index e9b6577..edab701 100644
--- a/view/shipment_in_form.xml
+++ b/view/shipment_in_form.xml
@@ -4,8 +4,8 @@ this repository contains the full copyright notices and license terms. -->
 <form string="Supplier Shipment" col="4" cursor="supplier">
     <label name="reference"/>
     <field name="reference"/>
-    <label name="code"/>
-    <field name="code"/>
+    <label name="number"/>
+    <field name="number"/>
     <label name="supplier"/>
     <field name="supplier"/>
     <label name="contact_address"/>
diff --git a/view/shipment_in_return_form.xml b/view/shipment_in_return_form.xml
index d599fa0..c408cce 100644
--- a/view/shipment_in_return_form.xml
+++ b/view/shipment_in_return_form.xml
@@ -1,11 +1,15 @@
 <?xml version="1.0"?>
 <!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
 this repository contains the full copyright notices and license terms. -->
-<form string="Supplier Return Shipment" col="4" cursor="from_location">
+<form string="Supplier Return Shipment" col="4" cursor="supplier">
     <label name="reference"/>
     <field name="reference"/>
-    <label name="code"/>
-    <field name="code"/>
+    <label name="number"/>
+    <field name="number"/>
+    <label name="supplier"/>
+    <field name="supplier"/>
+    <label name="delivery_address"/>
+    <field name="delivery_address"/>
     <label name="from_location"/>
     <field name="from_location"/>
     <label name="to_location"/>
diff --git a/view/shipment_in_return_tree.xml b/view/shipment_in_return_tree.xml
index 3ee2aed..7c707bd 100644
--- a/view/shipment_in_return_tree.xml
+++ b/view/shipment_in_return_tree.xml
@@ -2,11 +2,11 @@
 <!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
 this repository contains the full copyright notices and license terms. -->
 <tree string="Supplier Return Shipments">
-    <field name="code"/>
+    <field name="number"/>
     <field name="reference"/>
     <field name="planned_date"/>
     <field name="effective_date"/>
-    <field name="from_location"/>
-    <field name="to_location"/>
+    <field name="supplier"/>
+    <field name="delivery_address"/>
     <field name="state"/>
 </tree>
diff --git a/view/shipment_in_tree.xml b/view/shipment_in_tree.xml
index 41d0f56..9f3e809 100644
--- a/view/shipment_in_tree.xml
+++ b/view/shipment_in_tree.xml
@@ -2,7 +2,7 @@
 <!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
 this repository contains the full copyright notices and license terms. -->
 <tree string="Supplier Shipments">
-    <field name="code"/>
+    <field name="number"/>
     <field name="reference"/>
     <field name="planned_date"/>
     <field name="effective_date"/>
diff --git a/view/shipment_internal_form.xml b/view/shipment_internal_form.xml
index d095731..1672d15 100644
--- a/view/shipment_internal_form.xml
+++ b/view/shipment_internal_form.xml
@@ -4,8 +4,8 @@ this repository contains the full copyright notices and license terms. -->
 <form string="Internal Shipment" col="4" cursor="from_location">
     <label name="reference"/>
     <field name="reference"/>
-    <label name="code"/>
-    <field name="code"/>
+    <label name="number"/>
+    <field name="number"/>
     <label name="from_location"/>
     <field name="from_location"/>
     <label name="to_location"/>
diff --git a/view/shipment_internal_tree.xml b/view/shipment_internal_tree.xml
index ecf5b5c..07a277a 100644
--- a/view/shipment_internal_tree.xml
+++ b/view/shipment_internal_tree.xml
@@ -2,7 +2,7 @@
 <!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
 this repository contains the full copyright notices and license terms. -->
 <tree string="Internal Shipments">
-    <field name="code"/>
+    <field name="number"/>
     <field name="reference"/>
     <field name="planned_date"/>
     <field name="effective_date"/>
diff --git a/view/shipment_out_form.xml b/view/shipment_out_form.xml
index 1d36ae4..6ea5c6f 100644
--- a/view/shipment_out_form.xml
+++ b/view/shipment_out_form.xml
@@ -4,8 +4,8 @@ this repository contains the full copyright notices and license terms. -->
 <form string="Customer Shipment" col="4" cursor="customer">
     <label name="reference"/>
     <field name="reference"/>
-    <label name="code"/>
-    <field name="code"/>
+    <label name="number"/>
+    <field name="number"/>
     <label name="customer"/>
     <field name="customer"/>
     <label name="delivery_address"/>
diff --git a/view/shipment_out_return_form.xml b/view/shipment_out_return_form.xml
index 6e4bb1f..43cf214 100644
--- a/view/shipment_out_return_form.xml
+++ b/view/shipment_out_return_form.xml
@@ -4,8 +4,8 @@ this repository contains the full copyright notices and license terms. -->
 <form string="Customer Return Shipment" col="4" cursor="customer">
     <label name="reference"/>
     <field name="reference"/>
-    <label name="code"/>
-    <field name="code"/>
+    <label name="number"/>
+    <field name="number"/>
     <label name="customer"/>
     <field name="customer"/>
     <label name="delivery_address"/>
diff --git a/view/shipment_out_return_tree.xml b/view/shipment_out_return_tree.xml
index 6152586..3148cd0 100644
--- a/view/shipment_out_return_tree.xml
+++ b/view/shipment_out_return_tree.xml
@@ -2,7 +2,7 @@
 <!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
 this repository contains the full copyright notices and license terms. -->
 <tree string="Customer Return Shipments">
-    <field name="code"/>
+    <field name="number"/>
     <field name="reference"/>
     <field name="state"/>
     <field name="planned_date"/>
diff --git a/view/shipment_out_tree.xml b/view/shipment_out_tree.xml
index 5783ae4..64e5750 100644
--- a/view/shipment_out_tree.xml
+++ b/view/shipment_out_tree.xml
@@ -2,7 +2,7 @@
 <!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
 this repository contains the full copyright notices and license terms. -->
 <tree string="Customer Shipments">
-    <field name="code"/>
+    <field name="number"/>
     <field name="reference"/>
     <field name="planned_date"/>
     <field name="effective_date"/>
-- 
tryton-modules-stock



More information about the tryton-debian-vcs mailing list