[tryton-debian-vcs] tryton-modules-stock branch debian updated. debian/4.2.1-1-1-g5f3dcbb

Mathias Behrle tryton-debian-vcs at alioth.debian.org
Wed Jun 7 13:36:16 UTC 2017


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

commit 5f3dcbb98d2f6c6c1321eea2d365caea67f88bfb
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Jun 7 15:27:01 2017 +0200

    Merging upstream version 4.4.0.

diff --git a/CHANGELOG b/CHANGELOG
index f17bb98..4b2d1b0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,8 @@
-Version 4.2.1 - 2017-03-10
+Version 4.4.0 - 2017-05-01
 * Bug fixes (see mercurial logs for details)
+* Add employee on shipments for some states
+* Add request state on internal shipment
+* Manage same picking/storage and output location
 
 Version 4.2.0 - 2016-11-28
 * Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index d003179..85c15c6 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
 Metadata-Version: 1.1
 Name: trytond_stock
-Version: 4.2.1
+Version: 4.4.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/4.2/
+Download-URL: http://downloads.tryton.org/4.4/
 Description: trytond_stock
         =============
         
@@ -52,7 +52,7 @@ Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Financial and Insurance Industry
 Classifier: Intended Audience :: Legal Industry
 Classifier: Intended Audience :: Manufacturing
-Classifier: License :: OSI Approved :: GNU General Public License (GPL)
+Classifier: License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
 Classifier: Natural Language :: Bulgarian
 Classifier: Natural Language :: Catalan
 Classifier: Natural Language :: Chinese (Simplified)
diff --git a/__init__.py b/__init__.py
index 559b845..166b1bb 100644
--- a/__init__.py
+++ b/__init__.py
@@ -16,6 +16,7 @@ def register():
     Pool.register(
         Location,
         Party,
+        PartyLocation,
         ProductsByLocationsContext,
         LocationLeadTime,
         Move,
@@ -38,6 +39,8 @@ def register():
         Inventory,
         InventoryLine,
         Configuration,
+        ConfigurationSequence,
+        ConfigurationLocation,
         module='stock', type_='model')
     Pool.register(
         AssignShipmentOut,
diff --git a/configuration.py b/configuration.py
index 956b76e..758f2ee 100644
--- a/configuration.py
+++ b/configuration.py
@@ -1,51 +1,220 @@
 # 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 trytond.model import ModelView, ModelSQL, ModelSingleton, fields
+from trytond import backend
+from trytond.model import (ModelView, ModelSQL, ModelSingleton, ValueMixin,
+    fields)
+from trytond.pool import Pool
 from trytond.pyson import Eval
+from trytond.tools.multivalue import migrate_property
+from trytond.modules.company.model import (
+    CompanyMultiValueMixin, CompanyValueMixin)
 
-__all__ = ['Configuration']
+__all__ = ['Configuration', 'ConfigurationSequence', 'ConfigurationLocation']
+sequences = ['shipment_in_sequence', 'shipment_in_return_sequence',
+    'shipment_out_sequence', 'shipment_out_return_sequence',
+    'shipment_internal_sequence', 'inventory_sequence']
+shipment_internal_transit = fields.Many2One(
+    'stock.location', "Internal Shipment Transit", required=True,
+    domain=[
+        ('type', '=', 'storage'),
+        ])
 
 
-class Configuration(ModelSingleton, ModelSQL, ModelView):
+def default_func(field_name):
+    @classmethod
+    def default(cls, **pattern):
+        return getattr(
+            cls.multivalue_model(field_name),
+            'default_%s' % field_name, lambda: None)()
+    return default
+
+
+def default_sequence(name):
+    @classmethod
+    def default(cls):
+        pool = Pool()
+        ModelData = pool.get('ir.model.data')
+        try:
+            return ModelData.get_id('stock', name)
+        except KeyError:
+            return None
+    return default
+
+
+class Configuration(
+        ModelSingleton, ModelSQL, ModelView, CompanyMultiValueMixin):
     'Stock Configuration'
     __name__ = 'stock.configuration'
-    shipment_in_sequence = fields.Property(fields.Many2One('ir.sequence',
-            'Supplier Shipment Sequence', domain=[
+    shipment_in_sequence = fields.MultiValue(fields.Many2One(
+            'ir.sequence', "Supplier Shipment Sequence", required=True,
+            domain=[
                 ('company', 'in',
                     [Eval('context', {}).get('company', -1), None]),
                 ('code', '=', 'stock.shipment.in'),
-                ], required=True))
-    shipment_in_return_sequence = fields.Property(fields.Many2One(
-            'ir.sequence', 'Supplier Return Shipment Sequence', domain=[
+                ]))
+    shipment_in_return_sequence = fields.MultiValue(fields.Many2One(
+            'ir.sequence', "Supplier Return Shipment Sequence", required=True,
+            domain=[
                 ('company', 'in',
                     [Eval('context', {}).get('company', -1), None]),
                 ('code', '=', 'stock.shipment.in.return'),
-                ], required=True))
-    shipment_out_sequence = fields.Property(fields.Many2One('ir.sequence',
-            'Customer Shipment Sequence', domain=[
+                ]))
+    shipment_out_sequence = fields.MultiValue(fields.Many2One(
+            'ir.sequence', "Customer Shipment Sequence", required=True,
+            domain=[
                 ('company', 'in',
                     [Eval('context', {}).get('company', -1), None]),
                 ('code', '=', 'stock.shipment.out'),
-                ], required=True))
-    shipment_out_return_sequence = fields.Property(fields.Many2One(
-            'ir.sequence', 'Customer Return Shipment Sequence', domain=[
+                ]))
+    shipment_out_return_sequence = fields.MultiValue(fields.Many2One(
+            'ir.sequence', "Customer Return Shipment Sequence", required=True,
+            domain=[
                 ('company', 'in',
                     [Eval('context', {}).get('company', -1), None]),
                 ('code', '=', 'stock.shipment.out.return'),
-                ], required=True))
-    shipment_internal_sequence = fields.Property(fields.Many2One(
-            'ir.sequence', 'Internal Shipment Sequence', domain=[
+                ]))
+    shipment_internal_sequence = fields.MultiValue(fields.Many2One(
+            'ir.sequence', "Internal Shipment Sequence", required=True,
+            domain=[
                 ('company', 'in',
                     [Eval('context', {}).get('company', -1), None]),
                 ('code', '=', 'stock.shipment.internal'),
-                ], required=True))
-    shipment_internal_transit = fields.Property(fields.Many2One(
-            'stock.location', 'Internal Shipment Transit', domain=[
-                ('type', '=', 'storage'),
-                ], required=True))
-    inventory_sequence = fields.Property(fields.Many2One(
-            'ir.sequence', 'Inventory Sequence', domain=[
+                ]))
+    inventory_sequence = fields.MultiValue(fields.Many2One(
+            'ir.sequence', "Inventory Sequence", required=True,
+            domain=[
                 ('company', 'in',
                     [Eval('context', {}).get('company', -1), None]),
                 ('code', '=', 'stock.inventory'),
-                ], required=True))
+                ]))
+    shipment_internal_transit = fields.MultiValue(shipment_internal_transit)
+
+    @classmethod
+    def multivalue_model(cls, field):
+        pool = Pool()
+        if field in sequences:
+            return pool.get('stock.configuration.sequence')
+        if field == 'shipment_internal_transit':
+            return pool.get('stock.configuration.location')
+        return super(Configuration, cls).multivalue_model(field)
+
+    default_shipment_in_sequence = default_func('shipment_in_sequence')
+    default_shipment_in_return_sequence = default_func(
+        'shipment_in_return_sequence')
+    default_shipment_out_sequence = default_func('shipment_out_sequence')
+    default_shipment_out_return_sequence = default_func(
+        'shipment_out_return_sequence')
+    default_shipment_internal_sequence = default_func(
+        'shipment_internal_sequence')
+    default_inventory_sequence = default_func('inventory_sequence')
+    default_shipment_internal_transit = default_func(
+        'shipment_internal_transit')
+
+
+class ConfigurationSequence(ModelSQL, CompanyValueMixin):
+    "Stock Configuration Sequence"
+    __name__ = 'stock.configuration.sequence'
+    shipment_in_sequence = fields.Many2One(
+        'ir.sequence', "Supplier Shipment Sequence", required=True,
+        domain=[
+            ('company', 'in', [Eval('company', -1), None]),
+            ('code', '=', 'stock.shipment.in'),
+            ],
+        depends=['company'])
+    shipment_in_return_sequence = fields.Many2One(
+        'ir.sequence', "Supplier Return Shipment Sequence", required=True,
+        domain=[
+            ('company', 'in', [Eval('company', -1), None]),
+            ('code', '=', 'stock.shipment.in.return'),
+            ],
+        depends=['company'])
+    shipment_out_sequence = fields.Many2One(
+        'ir.sequence', "Customer Shipment Sequence", required=True,
+        domain=[
+            ('company', 'in', [Eval('company', -1), None]),
+            ('code', '=', 'stock.shipment.out'),
+            ],
+        depends=['company'])
+    shipment_out_return_sequence = fields.Many2One(
+        'ir.sequence', "Customer Return Shipment Sequence", required=True,
+        domain=[
+            ('company', 'in', [Eval('company', -1), None]),
+            ('code', '=', 'stock.shipment.out.return'),
+            ],
+        depends=['company'])
+    shipment_internal_sequence = fields.Many2One(
+        'ir.sequence', "Internal Shipment Sequence", required=True,
+        domain=[
+            ('company', 'in', [Eval('company', -1), None]),
+            ('code', '=', 'stock.shipment.internal'),
+            ],
+        depends=['company'])
+    inventory_sequence = fields.Many2One(
+        'ir.sequence', "Inventory Sequence", required=True,
+        domain=[
+            ('company', 'in', [Eval('company', -1), None]),
+            ('code', '=', 'stock.inventory'),
+            ],
+        depends=['company'])
+
+    @classmethod
+    def __register__(cls, module_name):
+        TableHandler = backend.get('TableHandler')
+        exist = TableHandler.table_exist(cls._table)
+
+        super(ConfigurationSequence, cls).__register__(module_name)
+
+        if not exist:
+            cls._migrate_property([], [], [])
+
+    @classmethod
+    def _migrate_property(cls, field_names, value_names, fields):
+        field_names.extend(sequences)
+        value_names.extend(sequences)
+        fields.append('company')
+        migrate_property(
+            'stock.configuration', field_names, cls, value_names,
+            fields=fields)
+
+    default_shipment_in_sequence = default_sequence('sequence_shipment_in')
+    default_shipment_in_return_sequence = default_sequence(
+        'sequence_shipment_in_return')
+    default_shipment_out_sequence = default_sequence('sequence_shipment_out')
+    default_shipment_out_return_sequence = default_sequence(
+        'sequence_shipment_out_return')
+    default_shipment_internal_sequence = default_sequence(
+        'sequence_shipment_internal')
+    default_inventory_sequence = default_sequence('sequence_inventory')
+
+
+class ConfigurationLocation(ModelSQL, ValueMixin):
+    "Stock Configuration Location"
+    __name__ = 'stock.configuration.location'
+    shipment_internal_transit = shipment_internal_transit
+
+    @classmethod
+    def __register__(cls, module_name):
+        TableHandler = backend.get('TableHandler')
+        exist = TableHandler.table_exist(cls._table)
+
+        super(ConfigurationLocation, cls).__register__(module_name)
+
+        if not exist:
+            cls._migrate_property([], [], [])
+
+    @classmethod
+    def _migrate_property(cls, field_names, value_names, fields):
+        field_names.append('shipment_internal_transit')
+        value_names.append('shipment_internal_transit')
+        migrate_property(
+            'stock.configuration', field_names, cls, value_names,
+            fields=fields)
+
+    @classmethod
+    def default_shipment_internal_transit(cls):
+        pool = Pool()
+        ModelData = pool.get('ir.model.data')
+        try:
+            return ModelData.get_id('stock', 'location_transit')
+        except KeyError:
+            return None
diff --git a/configuration.xml b/configuration.xml
index bf9a307..02ff9c0 100644
--- a/configuration.xml
+++ b/configuration.xml
@@ -40,44 +40,4 @@ this repository contains the full copyright notices and license terms. -->
         </record>
 
     </data>
-    <data noupdate="1">
-
-        <record model="ir.property" id="property_shipment_in_sequence">
-            <field name="field"
-                search="[('model.model', '=', 'stock.configuration'), ('name', '=', 'shipment_in_sequence')]"/>
-            <field name="value" eval="'ir.sequence,' + str(ref('sequence_shipment_in'))"/>
-        </record>
-
-        <record model="ir.property" id="property_shipment_in_return_sequence">
-            <field name="field"
-                search="[('model.model', '=', 'stock.configuration'), ('name', '=', 'shipment_in_return_sequence')]"/>
-            <field name="value" eval="'ir.sequence,' + str(ref('sequence_shipment_in_return'))"/>
-        </record>
-
-        <record model="ir.property" id="property_shipment_out_sequence">
-            <field name="field"
-                search="[('model.model', '=', 'stock.configuration'), ('name', '=', 'shipment_out_sequence')]"/>
-            <field name="value" eval="'ir.sequence,' + str(ref('sequence_shipment_out'))"/>
-        </record>
-
-        <record model="ir.property" id="property_shipment_out_return_sequence">
-            <field name="field"
-                search="[('model.model', '=', 'stock.configuration'), ('name', '=', 'shipment_out_return_sequence')]"/>
-            <field name="value" eval="'ir.sequence,' + str(ref('sequence_shipment_out_return'))"/>
-        </record>
-
-        <record model="ir.property" id="property_shipment_internal_sequence">
-            <field name="field"
-                search="[('model.model', '=', 'stock.configuration'), ('name', '=', 'shipment_internal_sequence')]"/>
-            <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>
-
-    </data>
 </tryton>
diff --git a/doc/index.rst b/doc/index.rst
index ceb9f42..cd51aa5 100644
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -182,6 +182,9 @@ out of which the product are going) and two list of moves:
   The moves between the output location of the warehouse and a
   customer location.
 
+If the picking or storage location is configured as the same as the output
+location, then only outgoing moves are created and no assignation is done.
+
 
 The customer shipment can be in one of this states:
 
diff --git a/locale/bg.po b/locale/bg.po
index f75a552..88e0a74 100644
--- a/locale/bg.po
+++ b/locale/bg.po
@@ -136,10 +136,59 @@ msgctxt "field:party.party,customer_location:"
 msgid "Customer Location"
 msgstr "Местонахождение на клиент"
 
+#, fuzzy
+msgctxt "field:party.party,locations:"
+msgid "Locations"
+msgstr "Местонахождения"
+
 msgctxt "field:party.party,supplier_location:"
 msgid "Supplier Location"
 msgstr "Местонахождение на доставчик"
 
+#, fuzzy
+msgctxt "field:party.party.location,create_date:"
+msgid "Create Date"
+msgstr "Създадено на"
+
+#, fuzzy
+msgctxt "field:party.party.location,create_uid:"
+msgid "Create User"
+msgstr "Създадено от"
+
+#, fuzzy
+msgctxt "field:party.party.location,customer_location:"
+msgid "Customer Location"
+msgstr "Местонахождение на клиент"
+
+#, fuzzy
+msgctxt "field:party.party.location,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:party.party.location,party:"
+msgid "Party"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:party.party.location,rec_name:"
+msgid "Name"
+msgstr "Име"
+
+#, fuzzy
+msgctxt "field:party.party.location,supplier_location:"
+msgid "Supplier Location"
+msgstr "Местонахождение на доставчик"
+
+#, fuzzy
+msgctxt "field:party.party.location,write_date:"
+msgid "Write Date"
+msgstr "Променено на"
+
+#, fuzzy
+msgctxt "field:party.party.location,write_uid:"
+msgid "Write User"
+msgstr "Променено от"
+
 msgctxt "field:product.by_location.context,forecast_date:"
 msgid "At Date"
 msgstr ""
@@ -229,6 +278,104 @@ msgctxt "field:stock.configuration,write_uid:"
 msgid "Write User"
 msgstr "Променено от"
 
+#, fuzzy
+msgctxt "field:stock.configuration.location,create_date:"
+msgid "Create Date"
+msgstr "Създадено на"
+
+#, fuzzy
+msgctxt "field:stock.configuration.location,create_uid:"
+msgid "Create User"
+msgstr "Създадено от"
+
+#, fuzzy
+msgctxt "field:stock.configuration.location,id:"
+msgid "ID"
+msgstr "ID"
+
+#, fuzzy
+msgctxt "field:stock.configuration.location,rec_name:"
+msgid "Name"
+msgstr "Име"
+
+msgctxt "field:stock.configuration.location,shipment_internal_transit:"
+msgid "Internal Shipment Transit"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:stock.configuration.location,write_date:"
+msgid "Write Date"
+msgstr "Променено на"
+
+#, fuzzy
+msgctxt "field:stock.configuration.location,write_uid:"
+msgid "Write User"
+msgstr "Променено от"
+
+#, fuzzy
+msgctxt "field:stock.configuration.sequence,company:"
+msgid "Company"
+msgstr "Фирма"
+
+#, fuzzy
+msgctxt "field:stock.configuration.sequence,create_date:"
+msgid "Create Date"
+msgstr "Създадено на"
+
+#, fuzzy
+msgctxt "field:stock.configuration.sequence,create_uid:"
+msgid "Create User"
+msgstr "Създадено от"
+
+#, fuzzy
+msgctxt "field:stock.configuration.sequence,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:stock.configuration.sequence,inventory_sequence:"
+msgid "Inventory Sequence"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:stock.configuration.sequence,rec_name:"
+msgid "Name"
+msgstr "Име"
+
+#, fuzzy
+msgctxt "field:stock.configuration.sequence,shipment_in_return_sequence:"
+msgid "Supplier Return Shipment Sequence"
+msgstr "Последователност за пратка върната на доставик"
+
+#, fuzzy
+msgctxt "field:stock.configuration.sequence,shipment_in_sequence:"
+msgid "Supplier Shipment Sequence"
+msgstr "Последователност за пратка на доставчик"
+
+#, fuzzy
+msgctxt "field:stock.configuration.sequence,shipment_internal_sequence:"
+msgid "Internal Shipment Sequence"
+msgstr "Последователност на вътрешна пратка"
+
+#, fuzzy
+msgctxt "field:stock.configuration.sequence,shipment_out_return_sequence:"
+msgid "Customer Return Shipment Sequence"
+msgstr "Последователност за пратка върната от клиент"
+
+#, fuzzy
+msgctxt "field:stock.configuration.sequence,shipment_out_sequence:"
+msgid "Customer Shipment Sequence"
+msgstr "Последователност на пратка за клиент"
+
+#, fuzzy
+msgctxt "field:stock.configuration.sequence,write_date:"
+msgid "Write Date"
+msgstr "Променено на"
+
+#, fuzzy
+msgctxt "field:stock.configuration.sequence,write_uid:"
+msgid "Write User"
+msgstr "Променено от"
+
 msgctxt "field:stock.inventory,company:"
 msgid "Company"
 msgstr "Фирма"
@@ -742,6 +889,10 @@ msgctxt "field:stock.shipment.in,create_uid:"
 msgid "Create User"
 msgstr "Създадено от"
 
+msgctxt "field:stock.shipment.in,done_by:"
+msgid "Done By"
+msgstr ""
+
 msgctxt "field:stock.shipment.in,effective_date:"
 msgid "Effective Date"
 msgstr "Ефективна дата"
@@ -764,7 +915,7 @@ msgstr "Движения"
 
 #, fuzzy
 msgctxt "field:stock.shipment.in,number:"
-msgid "Numer"
+msgid "Number"
 msgstr "Номер"
 
 #, fuzzy
@@ -780,6 +931,10 @@ msgctxt "field:stock.shipment.in,rec_name:"
 msgid "Name"
 msgstr "Име"
 
+msgctxt "field:stock.shipment.in,received_by:"
+msgid "Received By"
+msgstr ""
+
 msgctxt "field:stock.shipment.in,reference:"
 msgid "Reference"
 msgstr "Отпратка"
@@ -816,6 +971,10 @@ msgctxt "field:stock.shipment.in,write_uid:"
 msgid "Write User"
 msgstr "Променено от"
 
+msgctxt "field:stock.shipment.in.return,assigned_by:"
+msgid "Assigned By"
+msgstr ""
+
 msgctxt "field:stock.shipment.in.return,company:"
 msgid "Company"
 msgstr "Фирма"
@@ -833,6 +992,10 @@ msgctxt "field:stock.shipment.in.return,delivery_address:"
 msgid "Delivery Address"
 msgstr "Адрес за доствка"
 
+msgctxt "field:stock.shipment.in.return,done_by:"
+msgid "Done By"
+msgstr ""
+
 msgctxt "field:stock.shipment.in.return,effective_date:"
 msgid "Effective Date"
 msgstr "Ефективна дата"
@@ -900,6 +1063,10 @@ msgctxt "field:stock.shipment.in.return.assign.failed,moves:"
 msgid "Moves"
 msgstr "Движения"
 
+msgctxt "field:stock.shipment.internal,assigned_by:"
+msgid "Received By"
+msgstr ""
+
 msgctxt "field:stock.shipment.internal,company:"
 msgid "Company"
 msgstr "Фирма"
@@ -912,6 +1079,10 @@ msgctxt "field:stock.shipment.internal,create_uid:"
 msgid "Create User"
 msgstr "Създадено от"
 
+msgctxt "field:stock.shipment.internal,done_by:"
+msgid "Done By"
+msgstr ""
+
 msgctxt "field:stock.shipment.internal,effective_date:"
 msgid "Effective Date"
 msgstr "Ефективна дата"
@@ -963,6 +1134,10 @@ msgctxt "field:stock.shipment.internal,reference:"
 msgid "Reference"
 msgstr "Отпратка"
 
+msgctxt "field:stock.shipment.internal,shipped_by:"
+msgid "Shipped By"
+msgstr ""
+
 msgctxt "field:stock.shipment.internal,state:"
 msgid "State"
 msgstr "Състояние"
@@ -991,6 +1166,10 @@ msgctxt "field:stock.shipment.internal.assign.failed,moves:"
 msgid "Moves"
 msgstr "Движения"
 
+msgctxt "field:stock.shipment.out,assigned_by:"
+msgid "Assigned By"
+msgstr ""
+
 msgctxt "field:stock.shipment.out,company:"
 msgid "Company"
 msgstr "Фирма"
@@ -1015,6 +1194,10 @@ msgctxt "field:stock.shipment.out,delivery_address:"
 msgid "Delivery Address"
 msgstr "Адрес за доствка"
 
+msgctxt "field:stock.shipment.out,done_by:"
+msgid "Done By"
+msgstr ""
+
 msgctxt "field:stock.shipment.out,effective_date:"
 msgid "Effective Date"
 msgstr "Ефективна дата"
@@ -1045,6 +1228,10 @@ msgctxt "field:stock.shipment.out,outgoing_moves:"
 msgid "Outgoing Moves"
 msgstr "Изходящи движения"
 
+msgctxt "field:stock.shipment.out,packed_by:"
+msgid "Packed By"
+msgstr ""
+
 msgctxt "field:stock.shipment.out,planned_date:"
 msgid "Planned Date"
 msgstr "Планирана дата"
@@ -1113,6 +1300,10 @@ msgctxt "field:stock.shipment.out.return,delivery_address:"
 msgid "Delivery Address"
 msgstr "Адрес за доствка"
 
+msgctxt "field:stock.shipment.out.return,done_by:"
+msgid "Done By"
+msgstr ""
+
 msgctxt "field:stock.shipment.out.return,effective_date:"
 msgid "Effective Date"
 msgstr "Ефективна дата"
@@ -1151,6 +1342,10 @@ msgctxt "field:stock.shipment.out.return,rec_name:"
 msgid "Name"
 msgstr "Име"
 
+msgctxt "field:stock.shipment.out.return,received_by:"
+msgid "Received By"
+msgstr ""
+
 msgctxt "field:stock.shipment.out.return,reference:"
 msgid "Reference"
 msgstr "Отпратка"
@@ -1191,6 +1386,20 @@ msgstr ""
 "Източник-местонахождения по подразбиране когато се получават продукти от "
 "партньора."
 
+#, fuzzy
+msgctxt "help:party.party.location,customer_location:"
+msgid "The default destination location when sending products to the party."
+msgstr ""
+"Целта-местонахождение по подразбиране когато се изпращат продукти на "
+"партньора."
+
+#, fuzzy
+msgctxt "help:party.party.location,supplier_location:"
+msgid "The default source location when receiving products from the party."
+msgstr ""
+"Източник-местонахождения по подразбиране когато се получават продукти от "
+"партньора."
+
 msgctxt "help:product.by_location.context,forecast_date:"
 msgid ""
 "Allow to compute expected stock quantities for this date.\n"
@@ -1402,6 +1611,11 @@ msgid "Draft"
 msgstr "Проект"
 
 msgctxt ""
+"model:ir.action.act_window.domain,name:act_shipment_internal_form_domain_requests"
+msgid "Requests"
+msgstr ""
+
+msgctxt ""
 "model:ir.action.act_window.domain,name:act_shipment_internal_form_domain_shipped"
 msgid "Shipped"
 msgstr ""
@@ -1568,6 +1782,10 @@ msgctxt "model:ir.ui.menu,name:menu_stock_configuration"
 msgid "Stock Configuration"
 msgstr "Конфигуриране на наличност"
 
+msgctxt "model:party.party.location,name:"
+msgid "Party Location"
+msgstr ""
+
 #, fuzzy
 msgctxt "model:product.by_location.context,name:"
 msgid "Product by Location"
@@ -1589,6 +1807,14 @@ msgctxt "model:stock.configuration,name:"
 msgid "Stock Configuration"
 msgstr "Конфигуриране на наличност"
 
+msgctxt "model:stock.configuration.location,name:"
+msgid "Stock Configuration Location"
+msgstr ""
+
+msgctxt "model:stock.configuration.sequence,name:"
+msgid "Stock Configuration Sequence"
+msgstr ""
+
 msgctxt "model:stock.inventory,name:"
 msgid "Stock Inventory"
 msgstr "Инвентаризация на наличност"
@@ -2072,6 +2298,10 @@ msgid "Draft"
 msgstr "Проект"
 
 msgctxt "selection:stock.shipment.internal,state:"
+msgid "Request"
+msgstr ""
+
+msgctxt "selection:stock.shipment.internal,state:"
 msgid "Shipped"
 msgstr ""
 
@@ -2195,6 +2425,10 @@ msgid "Draft"
 msgstr "Проект"
 
 msgctxt "view:stock.shipment.in.return:"
+msgid "Other Info"
+msgstr ""
+
+msgctxt "view:stock.shipment.in.return:"
 msgid "Wait"
 msgstr "Очакване"
 
@@ -2215,6 +2449,10 @@ msgid "Inventory Moves"
 msgstr "Движения на инвентаризация"
 
 msgctxt "view:stock.shipment.in:"
+msgid "Other Info"
+msgstr ""
+
+msgctxt "view:stock.shipment.in:"
 msgid "Receive"
 msgstr "Получаване"
 
@@ -2243,6 +2481,10 @@ msgid "Draft"
 msgstr "Проект"
 
 msgctxt "view:stock.shipment.internal:"
+msgid "Other Info"
+msgstr ""
+
+msgctxt "view:stock.shipment.internal:"
 msgid "Ship"
 msgstr ""
 
@@ -2276,6 +2518,10 @@ msgid "Inventory Moves"
 msgstr "Движения на инвентаризация"
 
 msgctxt "view:stock.shipment.out.return:"
+msgid "Other Info"
+msgstr ""
+
+msgctxt "view:stock.shipment.out.return:"
 msgid "Received"
 msgstr "Получен"
 
@@ -2296,14 +2542,14 @@ msgid "Draft"
 msgstr "Проект"
 
 msgctxt "view:stock.shipment.out:"
-msgid "Inventory Moves"
-msgstr "Движения на инвентаризация"
-
-msgctxt "view:stock.shipment.out:"
 msgid "Make shipment"
 msgstr "Създаване на изпращане"
 
 msgctxt "view:stock.shipment.out:"
+msgid "Other Info"
+msgstr ""
+
+msgctxt "view:stock.shipment.out:"
 msgid "Outgoing Moves"
 msgstr "Изходящи движения"
 
diff --git a/locale/ca.po b/locale/ca.po
index 1ff5a8a..8191a6d 100644
--- a/locale/ca.po
+++ b/locale/ca.po
@@ -8,14 +8,14 @@ msgid ""
 " moves."
 msgstr ""
 "No podeu canviar la UdM predeterminada d'un producte que està associat amb "
-"moviments d'estoc."
+"moviments d'existències."
 
 msgctxt "error:product.template:"
 msgid ""
 "You cannot change the type for a product which is associated to stock moves."
 msgstr ""
 "No podeu canviar el tipus d'un producte que està associat amb moviments "
-"d'estoc."
+"d'existències."
 
 msgctxt "error:stock.inventory.line:"
 msgid "Line quantity must be positive."
@@ -57,14 +57,14 @@ msgstr "Les ubicacions origen i destí han de ser diferents."
 
 msgctxt "error:stock.move:"
 msgid "The stock move \"%s\" has no origin."
-msgstr "El moviment d'estoc \"%s\" no té origen."
+msgstr "El moviment d'existències \"%s\" no té origen."
 
 msgctxt "error:stock.move:"
 msgid ""
 "You can not delete stock move \"%s\" because it is not in draft or cancelled"
 " state."
 msgstr ""
-"No podeu eliminar el moviment d'estoc \"%s\" perquè no està en estat "
+"No podeu eliminar el moviment d'existències \"%s\" perquè no està en estat "
 "esborrany o cancel·lat."
 
 msgctxt "error:stock.move:"
@@ -76,28 +76,28 @@ msgstr ""
 msgctxt "error:stock.move:"
 msgid "You can not modify stock move \"%s\" because it is in \"Assigned\" state."
 msgstr ""
-"No podeu canviar el moviment d'estoc \"%s\" perquè es troba en l'estat "
-"\"Reservat\"."
+"No podeu canviar el moviment d'existències \"%s\" perquè es troba en l'estat"
+" \"Reservat\"."
 
 msgctxt "error:stock.move:"
 msgid ""
 "You can not modify stock move \"%s\" because it is in \"Done\" or \"Cancel\""
 " state."
 msgstr ""
-"No podeu canviar el moviment d'estoc \"%s\" perquè es troba en l'estat "
-"\"Finalitzat\" o \"Cancel·lat\"."
+"No podeu canviar el moviment d'existències \"%s\" perquè es troba en l'estat"
+" \"Finalitzat\" o \"Cancel·lat\"."
 
 msgctxt "error:stock.move:"
 msgid "You can not set stock move \"%s\" to assigned state."
-msgstr "No podeu canviar el moviment d'estoc \"%s\" a estat reservat."
+msgstr "No podeu canviar el moviment d'existències \"%s\" a estat reservat."
 
 msgctxt "error:stock.move:"
 msgid "You can not set stock move \"%s\" to done state."
-msgstr "No podeu canviar el moviment d'estoc \"%s\" a estat finalitzat."
+msgstr "No podeu canviar el moviment d'existències \"%s\" a estat finalitzat."
 
 msgctxt "error:stock.move:"
 msgid "You can not set stock move \"%s\" to draft state."
-msgstr "No podeu canviar el moviment d'estoc \"%s\" a estat esborrany."
+msgstr "No podeu canviar el moviment d'existències \"%s\" a estat esborrany."
 
 msgctxt "error:stock.period:"
 msgid "You can not close a period in the future or today."
@@ -154,10 +154,50 @@ msgctxt "field:party.party,customer_location:"
 msgid "Customer Location"
 msgstr "Ubicació del client"
 
+msgctxt "field:party.party,locations:"
+msgid "Locations"
+msgstr "Ubicacions"
+
 msgctxt "field:party.party,supplier_location:"
 msgid "Supplier Location"
 msgstr "Ubicació del proveïdor"
 
+msgctxt "field:party.party.location,create_date:"
+msgid "Create Date"
+msgstr "Data de creació"
+
+msgctxt "field:party.party.location,create_uid:"
+msgid "Create User"
+msgstr "Usuari de creació"
+
+msgctxt "field:party.party.location,customer_location:"
+msgid "Customer Location"
+msgstr "Ubicació del client"
+
+msgctxt "field:party.party.location,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:party.party.location,party:"
+msgid "Party"
+msgstr "Tercer"
+
+msgctxt "field:party.party.location,rec_name:"
+msgid "Name"
+msgstr "Nom"
+
+msgctxt "field:party.party.location,supplier_location:"
+msgid "Supplier Location"
+msgstr "Ubicació del proveïdor"
+
+msgctxt "field:party.party.location,write_date:"
+msgid "Write Date"
+msgstr "Data de modificació"
+
+msgctxt "field:party.party.location,write_uid:"
+msgid "Write User"
+msgstr "Usuari de modificació"
+
 msgctxt "field:product.by_location.context,forecast_date:"
 msgid "At Date"
 msgstr "A data"
@@ -246,6 +286,86 @@ msgctxt "field:stock.configuration,write_uid:"
 msgid "Write User"
 msgstr "Usuari de modificació"
 
+msgctxt "field:stock.configuration.location,create_date:"
+msgid "Create Date"
+msgstr "Data de creació"
+
+msgctxt "field:stock.configuration.location,create_uid:"
+msgid "Create User"
+msgstr "Usuari de creació"
+
+msgctxt "field:stock.configuration.location,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:stock.configuration.location,rec_name:"
+msgid "Name"
+msgstr "Nom"
+
+msgctxt "field:stock.configuration.location,shipment_internal_transit:"
+msgid "Internal Shipment Transit"
+msgstr "Trànsit albarans interns"
+
+msgctxt "field:stock.configuration.location,write_date:"
+msgid "Write Date"
+msgstr "Data de modificació"
+
+msgctxt "field:stock.configuration.location,write_uid:"
+msgid "Write User"
+msgstr "Usuari de modificació"
+
+msgctxt "field:stock.configuration.sequence,company:"
+msgid "Company"
+msgstr "Empresa"
+
+msgctxt "field:stock.configuration.sequence,create_date:"
+msgid "Create Date"
+msgstr "Data de creació"
+
+msgctxt "field:stock.configuration.sequence,create_uid:"
+msgid "Create User"
+msgstr "Usuari de creació"
+
+msgctxt "field:stock.configuration.sequence,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:stock.configuration.sequence,inventory_sequence:"
+msgid "Inventory Sequence"
+msgstr "Seqüència d'inventari"
+
+msgctxt "field:stock.configuration.sequence,rec_name:"
+msgid "Name"
+msgstr "Nom"
+
+msgctxt "field:stock.configuration.sequence,shipment_in_return_sequence:"
+msgid "Supplier Return Shipment Sequence"
+msgstr "Seqüència d'albarà devolució proveïdor"
+
+msgctxt "field:stock.configuration.sequence,shipment_in_sequence:"
+msgid "Supplier Shipment Sequence"
+msgstr "Seqüència d'albarà proveïdor"
+
+msgctxt "field:stock.configuration.sequence,shipment_internal_sequence:"
+msgid "Internal Shipment Sequence"
+msgstr "Seqüència d'albarà intern"
+
+msgctxt "field:stock.configuration.sequence,shipment_out_return_sequence:"
+msgid "Customer Return Shipment Sequence"
+msgstr "Seqüència d'albarà devolució client"
+
+msgctxt "field:stock.configuration.sequence,shipment_out_sequence:"
+msgid "Customer Shipment Sequence"
+msgstr "Seqüència d'albarà client"
+
+msgctxt "field:stock.configuration.sequence,write_date:"
+msgid "Write Date"
+msgstr "Data de modificació"
+
+msgctxt "field:stock.configuration.sequence,write_uid:"
+msgid "Write User"
+msgstr "Usuari de modificació"
+
 msgctxt "field:stock.inventory,company:"
 msgid "Company"
 msgstr "Empresa"
@@ -734,6 +854,10 @@ msgctxt "field:stock.shipment.in,create_uid:"
 msgid "Create User"
 msgstr "Usuari de creació"
 
+msgctxt "field:stock.shipment.in,done_by:"
+msgid "Done By"
+msgstr "Realitzat per"
+
 msgctxt "field:stock.shipment.in,effective_date:"
 msgid "Effective Date"
 msgstr "Data efectiva"
@@ -755,7 +879,7 @@ msgid "Moves"
 msgstr "Moviments"
 
 msgctxt "field:stock.shipment.in,number:"
-msgid "Numer"
+msgid "Number"
 msgstr "Número"
 
 msgctxt "field:stock.shipment.in,origins:"
@@ -770,6 +894,10 @@ msgctxt "field:stock.shipment.in,rec_name:"
 msgid "Name"
 msgstr "Nom"
 
+msgctxt "field:stock.shipment.in,received_by:"
+msgid "Received By"
+msgstr "Rebut per"
+
 msgctxt "field:stock.shipment.in,reference:"
 msgid "Reference"
 msgstr "Referència"
@@ -806,6 +934,10 @@ msgctxt "field:stock.shipment.in,write_uid:"
 msgid "Write User"
 msgstr "Usuari de modificació"
 
+msgctxt "field:stock.shipment.in.return,assigned_by:"
+msgid "Assigned By"
+msgstr "Assignat per"
+
 msgctxt "field:stock.shipment.in.return,company:"
 msgid "Company"
 msgstr "Empresa"
@@ -822,6 +954,10 @@ msgctxt "field:stock.shipment.in.return,delivery_address:"
 msgid "Delivery Address"
 msgstr "Adreça d'enviament"
 
+msgctxt "field:stock.shipment.in.return,done_by:"
+msgid "Done By"
+msgstr "Realitzat per"
+
 msgctxt "field:stock.shipment.in.return,effective_date:"
 msgid "Effective Date"
 msgstr "Data efectiva"
@@ -886,6 +1022,10 @@ msgctxt "field:stock.shipment.in.return.assign.failed,moves:"
 msgid "Moves"
 msgstr "Moviments"
 
+msgctxt "field:stock.shipment.internal,assigned_by:"
+msgid "Received By"
+msgstr "Rebut per"
+
 msgctxt "field:stock.shipment.internal,company:"
 msgid "Company"
 msgstr "Empresa"
@@ -898,6 +1038,10 @@ msgctxt "field:stock.shipment.internal,create_uid:"
 msgid "Create User"
 msgstr "Usuari de creació"
 
+msgctxt "field:stock.shipment.internal,done_by:"
+msgid "Done By"
+msgstr "Realitzat per"
+
 msgctxt "field:stock.shipment.internal,effective_date:"
 msgid "Effective Date"
 msgstr "Data efectiva"
@@ -946,6 +1090,10 @@ msgctxt "field:stock.shipment.internal,reference:"
 msgid "Reference"
 msgstr "Referència"
 
+msgctxt "field:stock.shipment.internal,shipped_by:"
+msgid "Shipped By"
+msgstr "Enviat per"
+
 msgctxt "field:stock.shipment.internal,state:"
 msgid "State"
 msgstr "Estat"
@@ -974,6 +1122,10 @@ msgctxt "field:stock.shipment.internal.assign.failed,moves:"
 msgid "Moves"
 msgstr "Moviments"
 
+msgctxt "field:stock.shipment.out,assigned_by:"
+msgid "Assigned By"
+msgstr "Assignat per"
+
 msgctxt "field:stock.shipment.out,company:"
 msgid "Company"
 msgstr "Empresa"
@@ -998,6 +1150,10 @@ msgctxt "field:stock.shipment.out,delivery_address:"
 msgid "Delivery Address"
 msgstr "Adreça d'enviament"
 
+msgctxt "field:stock.shipment.out,done_by:"
+msgid "Done By"
+msgstr "Realitzat per"
+
 msgctxt "field:stock.shipment.out,effective_date:"
 msgid "Effective Date"
 msgstr "Data efectiva"
@@ -1026,6 +1182,10 @@ msgctxt "field:stock.shipment.out,outgoing_moves:"
 msgid "Outgoing Moves"
 msgstr "Moviments de sortida"
 
+msgctxt "field:stock.shipment.out,packed_by:"
+msgid "Packed By"
+msgstr "Empaquetat per"
+
 msgctxt "field:stock.shipment.out,planned_date:"
 msgid "Planned Date"
 msgstr "Data estimada"
@@ -1094,6 +1254,10 @@ msgctxt "field:stock.shipment.out.return,delivery_address:"
 msgid "Delivery Address"
 msgstr "Adreça d'enviament"
 
+msgctxt "field:stock.shipment.out.return,done_by:"
+msgid "Done By"
+msgstr "Realitzat per"
+
 msgctxt "field:stock.shipment.out.return,effective_date:"
 msgid "Effective Date"
 msgstr "Data efectiva"
@@ -1130,6 +1294,10 @@ msgctxt "field:stock.shipment.out.return,rec_name:"
 msgid "Name"
 msgstr "Nom"
 
+msgctxt "field:stock.shipment.out.return,received_by:"
+msgid "Received By"
+msgstr "Rebut per"
+
 msgctxt "field:stock.shipment.out.return,reference:"
 msgid "Reference"
 msgstr "Referència"
@@ -1168,13 +1336,23 @@ msgid "The default source location when receiving products from the party."
 msgstr ""
 "La ubicació d'origen predeterminada quan es reben productes del tercer."
 
+msgctxt "help:party.party.location,customer_location:"
+msgid "The default destination location when sending products to the party."
+msgstr ""
+"La ubicació de destinació predeterminada quan s'envien productes al tercer."
+
+msgctxt "help:party.party.location,supplier_location:"
+msgid "The default source location when receiving products from the party."
+msgstr ""
+"La ubicació d'origen predeterminada quan es reben productes del tercer."
+
 msgctxt "help:product.by_location.context,forecast_date:"
 msgid ""
 "Allow to compute expected stock quantities for this date.\n"
 "* An empty value is an infinite date in the future.\n"
 "* A date in the past will provide historical values."
 msgstr ""
-"Permet calcular les quantitats previstes d'estoc per a aquesta data.\n"
+"Permet calcular les quantitats previstes per a aquesta data.\n"
 "* Un valor buit és un data infinita en el futur.\n"
 "* Una data en el passat proporcionarà valors històrics."
 
@@ -1188,7 +1366,7 @@ msgid ""
 "* An empty value is an infinite date in the future.\n"
 "* A date in the past will provide historical values."
 msgstr ""
-"Permet calcular les quantitats previstes d'estoc per a aquesta data.\n"
+"Permet calcular les quantitats previstes per a aquesta data.\n"
 "* Un valor buit és un data infinita en el futur.\n"
 "* Una data en el passat proporcionarà valors històrics."
 
@@ -1258,7 +1436,7 @@ msgstr "Albarans devolució client"
 
 msgctxt "model:ir.action,name:act_stock_configuration_form"
 msgid "Stock Configuration"
-msgstr "Configuració d'estoc"
+msgstr "Configuració d'existències"
 
 msgctxt "model:ir.action,name:report_shipment_in_restocking_list"
 msgid "Restocking List"
@@ -1375,6 +1553,11 @@ msgid "Draft"
 msgstr "Esborrany"
 
 msgctxt ""
+"model:ir.action.act_window.domain,name:act_shipment_internal_form_domain_requests"
+msgid "Requests"
+msgstr "Sol·licituds"
+
+msgctxt ""
 "model:ir.action.act_window.domain,name:act_shipment_internal_form_domain_shipped"
 msgid "Shipped"
 msgstr "Enviat"
@@ -1530,7 +1713,11 @@ msgstr "Logística"
 
 msgctxt "model:ir.ui.menu,name:menu_stock_configuration"
 msgid "Stock Configuration"
-msgstr "Estoc"
+msgstr "Existències"
+
+msgctxt "model:party.party.location,name:"
+msgid "Party Location"
+msgstr "Ubicació del tercer"
 
 msgctxt "model:product.by_location.context,name:"
 msgid "Product by Location"
@@ -1550,19 +1737,27 @@ msgstr "Forçar reserves a logística"
 
 msgctxt "model:stock.configuration,name:"
 msgid "Stock Configuration"
-msgstr "Configuració d'estoc"
+msgstr "Configuració d'existències"
+
+msgctxt "model:stock.configuration.location,name:"
+msgid "Stock Configuration Location"
+msgstr "Configuració d'ubicacions d'existències"
+
+msgctxt "model:stock.configuration.sequence,name:"
+msgid "Stock Configuration Sequence"
+msgstr "Configuració de seqüencies d'existències"
 
 msgctxt "model:stock.inventory,name:"
 msgid "Stock Inventory"
-msgstr "Inventari d'estoc"
+msgstr "Inventari d'existències"
 
 msgctxt "model:stock.inventory.line,name:"
 msgid "Stock Inventory Line"
-msgstr "Línia d'inventari d'estoc"
+msgstr "Línia d'inventari d'existències"
 
 msgctxt "model:stock.location,name:"
 msgid "Stock Location"
-msgstr "Ubicació d'estoc"
+msgstr "Ubicació d'existències"
 
 msgctxt "model:stock.location,name:location_customer"
 msgid "Customer"
@@ -1602,15 +1797,15 @@ msgstr "Ubicació temps d'espera"
 
 msgctxt "model:stock.move,name:"
 msgid "Stock Move"
-msgstr "Moviment d'estoc"
+msgstr "Moviment d'existències"
 
 msgctxt "model:stock.period,name:"
 msgid "Stock Period"
-msgstr "Període d'estoc"
+msgstr "Període d'existències"
 
 msgctxt "model:stock.period.cache,name:"
 msgid "Stock Period Cache"
-msgstr "Període d'estoc precalculat"
+msgstr "Període d'existències precalculat"
 
 msgctxt "model:stock.product_quantities_warehouse,name:"
 msgid "Product Quantities By Warehouse"
@@ -2021,6 +2216,10 @@ msgid "Draft"
 msgstr "Esborrany"
 
 msgctxt "selection:stock.shipment.internal,state:"
+msgid "Request"
+msgstr "Sol·licitud"
+
+msgctxt "selection:stock.shipment.internal,state:"
 msgid "Shipped"
 msgstr "Enviat"
 
@@ -2141,6 +2340,10 @@ msgid "Draft"
 msgstr "Esborrany"
 
 msgctxt "view:stock.shipment.in.return:"
+msgid "Other Info"
+msgstr "Informació addicional"
+
+msgctxt "view:stock.shipment.in.return:"
 msgid "Wait"
 msgstr "En espera"
 
@@ -2161,6 +2364,10 @@ msgid "Inventory Moves"
 msgstr "Moviments interns"
 
 msgctxt "view:stock.shipment.in:"
+msgid "Other Info"
+msgstr "Informació addicional"
+
+msgctxt "view:stock.shipment.in:"
 msgid "Receive"
 msgstr "Rebut"
 
@@ -2189,6 +2396,10 @@ msgid "Draft"
 msgstr "Esborrany"
 
 msgctxt "view:stock.shipment.internal:"
+msgid "Other Info"
+msgstr "Informació addicional"
+
+msgctxt "view:stock.shipment.internal:"
 msgid "Ship"
 msgstr "Envia"
 
@@ -2221,6 +2432,10 @@ msgid "Inventory Moves"
 msgstr "Moviments interns"
 
 msgctxt "view:stock.shipment.out.return:"
+msgid "Other Info"
+msgstr "Informació addicional"
+
+msgctxt "view:stock.shipment.out.return:"
 msgid "Received"
 msgstr "Rebut"
 
@@ -2241,14 +2456,14 @@ msgid "Draft"
 msgstr "Esborrany"
 
 msgctxt "view:stock.shipment.out:"
-msgid "Inventory Moves"
-msgstr "Moviments interns"
-
-msgctxt "view:stock.shipment.out:"
 msgid "Make shipment"
 msgstr "Empaqueta"
 
 msgctxt "view:stock.shipment.out:"
+msgid "Other Info"
+msgstr "Informació addicional"
+
+msgctxt "view:stock.shipment.out:"
 msgid "Outgoing Moves"
 msgstr "Moviments de sortida"
 
diff --git a/locale/cs.po b/locale/cs.po
index 66c701f..c8ff490 100644
--- a/locale/cs.po
+++ b/locale/cs.po
@@ -130,10 +130,51 @@ msgctxt "field:party.party,customer_location:"
 msgid "Customer Location"
 msgstr ""
 
+msgctxt "field:party.party,locations:"
+msgid "Locations"
+msgstr ""
+
 msgctxt "field:party.party,supplier_location:"
 msgid "Supplier Location"
 msgstr ""
 
+msgctxt "field:party.party.location,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:party.party.location,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:party.party.location,customer_location:"
+msgid "Customer Location"
+msgstr ""
+
+msgctxt "field:party.party.location,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:party.party.location,party:"
+msgid "Party"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:party.party.location,rec_name:"
+msgid "Name"
+msgstr "Namu"
+
+msgctxt "field:party.party.location,supplier_location:"
+msgid "Supplier Location"
+msgstr ""
+
+msgctxt "field:party.party.location,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:party.party.location,write_uid:"
+msgid "Write User"
+msgstr ""
+
 msgctxt "field:product.by_location.context,forecast_date:"
 msgid "At Date"
 msgstr ""
@@ -223,6 +264,88 @@ msgctxt "field:stock.configuration,write_uid:"
 msgid "Write User"
 msgstr ""
 
+msgctxt "field:stock.configuration.location,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:stock.configuration.location,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:stock.configuration.location,id:"
+msgid "ID"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:stock.configuration.location,rec_name:"
+msgid "Name"
+msgstr "Namu"
+
+msgctxt "field:stock.configuration.location,shipment_internal_transit:"
+msgid "Internal Shipment Transit"
+msgstr ""
+
+msgctxt "field:stock.configuration.location,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:stock.configuration.location,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:stock.configuration.sequence,company:"
+msgid "Company"
+msgstr ""
+
+msgctxt "field:stock.configuration.sequence,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:stock.configuration.sequence,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:stock.configuration.sequence,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:stock.configuration.sequence,inventory_sequence:"
+msgid "Inventory Sequence"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:stock.configuration.sequence,rec_name:"
+msgid "Name"
+msgstr "Namu"
+
+msgctxt "field:stock.configuration.sequence,shipment_in_return_sequence:"
+msgid "Supplier Return Shipment Sequence"
+msgstr ""
+
+msgctxt "field:stock.configuration.sequence,shipment_in_sequence:"
+msgid "Supplier Shipment Sequence"
+msgstr ""
+
+msgctxt "field:stock.configuration.sequence,shipment_internal_sequence:"
+msgid "Internal Shipment Sequence"
+msgstr ""
+
+msgctxt "field:stock.configuration.sequence,shipment_out_return_sequence:"
+msgid "Customer Return Shipment Sequence"
+msgstr ""
+
+msgctxt "field:stock.configuration.sequence,shipment_out_sequence:"
+msgid "Customer Shipment Sequence"
+msgstr ""
+
+msgctxt "field:stock.configuration.sequence,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:stock.configuration.sequence,write_uid:"
+msgid "Write User"
+msgstr ""
+
 msgctxt "field:stock.inventory,company:"
 msgid "Company"
 msgstr ""
@@ -720,6 +843,10 @@ msgctxt "field:stock.shipment.in,create_uid:"
 msgid "Create User"
 msgstr ""
 
+msgctxt "field:stock.shipment.in,done_by:"
+msgid "Done By"
+msgstr ""
+
 msgctxt "field:stock.shipment.in,effective_date:"
 msgid "Effective Date"
 msgstr ""
@@ -741,7 +868,7 @@ msgid "Moves"
 msgstr ""
 
 msgctxt "field:stock.shipment.in,number:"
-msgid "Numer"
+msgid "Number"
 msgstr ""
 
 msgctxt "field:stock.shipment.in,origins:"
@@ -757,6 +884,10 @@ msgctxt "field:stock.shipment.in,rec_name:"
 msgid "Name"
 msgstr "Namu"
 
+msgctxt "field:stock.shipment.in,received_by:"
+msgid "Received By"
+msgstr ""
+
 msgctxt "field:stock.shipment.in,reference:"
 msgid "Reference"
 msgstr ""
@@ -793,6 +924,10 @@ msgctxt "field:stock.shipment.in,write_uid:"
 msgid "Write User"
 msgstr ""
 
+msgctxt "field:stock.shipment.in.return,assigned_by:"
+msgid "Assigned By"
+msgstr ""
+
 msgctxt "field:stock.shipment.in.return,company:"
 msgid "Company"
 msgstr ""
@@ -809,6 +944,10 @@ msgctxt "field:stock.shipment.in.return,delivery_address:"
 msgid "Delivery Address"
 msgstr ""
 
+msgctxt "field:stock.shipment.in.return,done_by:"
+msgid "Done By"
+msgstr ""
+
 msgctxt "field:stock.shipment.in.return,effective_date:"
 msgid "Effective Date"
 msgstr ""
@@ -874,6 +1013,10 @@ msgctxt "field:stock.shipment.in.return.assign.failed,moves:"
 msgid "Moves"
 msgstr ""
 
+msgctxt "field:stock.shipment.internal,assigned_by:"
+msgid "Received By"
+msgstr ""
+
 msgctxt "field:stock.shipment.internal,company:"
 msgid "Company"
 msgstr ""
@@ -886,6 +1029,10 @@ msgctxt "field:stock.shipment.internal,create_uid:"
 msgid "Create User"
 msgstr ""
 
+msgctxt "field:stock.shipment.internal,done_by:"
+msgid "Done By"
+msgstr ""
+
 msgctxt "field:stock.shipment.internal,effective_date:"
 msgid "Effective Date"
 msgstr ""
@@ -935,6 +1082,10 @@ msgctxt "field:stock.shipment.internal,reference:"
 msgid "Reference"
 msgstr ""
 
+msgctxt "field:stock.shipment.internal,shipped_by:"
+msgid "Shipped By"
+msgstr ""
+
 msgctxt "field:stock.shipment.internal,state:"
 msgid "State"
 msgstr ""
@@ -963,6 +1114,10 @@ msgctxt "field:stock.shipment.internal.assign.failed,moves:"
 msgid "Moves"
 msgstr ""
 
+msgctxt "field:stock.shipment.out,assigned_by:"
+msgid "Assigned By"
+msgstr ""
+
 msgctxt "field:stock.shipment.out,company:"
 msgid "Company"
 msgstr ""
@@ -987,6 +1142,10 @@ msgctxt "field:stock.shipment.out,delivery_address:"
 msgid "Delivery Address"
 msgstr ""
 
+msgctxt "field:stock.shipment.out,done_by:"
+msgid "Done By"
+msgstr ""
+
 msgctxt "field:stock.shipment.out,effective_date:"
 msgid "Effective Date"
 msgstr ""
@@ -1015,6 +1174,10 @@ msgctxt "field:stock.shipment.out,outgoing_moves:"
 msgid "Outgoing Moves"
 msgstr ""
 
+msgctxt "field:stock.shipment.out,packed_by:"
+msgid "Packed By"
+msgstr ""
+
 msgctxt "field:stock.shipment.out,planned_date:"
 msgid "Planned Date"
 msgstr ""
@@ -1084,6 +1247,10 @@ msgctxt "field:stock.shipment.out.return,delivery_address:"
 msgid "Delivery Address"
 msgstr ""
 
+msgctxt "field:stock.shipment.out.return,done_by:"
+msgid "Done By"
+msgstr ""
+
 msgctxt "field:stock.shipment.out.return,effective_date:"
 msgid "Effective Date"
 msgstr ""
@@ -1121,6 +1288,10 @@ msgctxt "field:stock.shipment.out.return,rec_name:"
 msgid "Name"
 msgstr "Namu"
 
+msgctxt "field:stock.shipment.out.return,received_by:"
+msgid "Received By"
+msgstr ""
+
 msgctxt "field:stock.shipment.out.return,reference:"
 msgid "Reference"
 msgstr ""
@@ -1157,6 +1328,14 @@ msgctxt "help:party.party,supplier_location:"
 msgid "The default source location when receiving products from the party."
 msgstr ""
 
+msgctxt "help:party.party.location,customer_location:"
+msgid "The default destination location when sending products to the party."
+msgstr ""
+
+msgctxt "help:party.party.location,supplier_location:"
+msgid "The default source location when receiving products from the party."
+msgstr ""
+
 msgctxt "help:product.by_location.context,forecast_date:"
 msgid ""
 "Allow to compute expected stock quantities for this date.\n"
@@ -1358,6 +1537,11 @@ msgid "Draft"
 msgstr ""
 
 msgctxt ""
+"model:ir.action.act_window.domain,name:act_shipment_internal_form_domain_requests"
+msgid "Requests"
+msgstr ""
+
+msgctxt ""
 "model:ir.action.act_window.domain,name:act_shipment_internal_form_domain_shipped"
 msgid "Shipped"
 msgstr ""
@@ -1515,6 +1699,10 @@ msgctxt "model:ir.ui.menu,name:menu_stock_configuration"
 msgid "Stock Configuration"
 msgstr ""
 
+msgctxt "model:party.party.location,name:"
+msgid "Party Location"
+msgstr ""
+
 msgctxt "model:product.by_location.context,name:"
 msgid "Product by Location"
 msgstr ""
@@ -1535,6 +1723,14 @@ msgctxt "model:stock.configuration,name:"
 msgid "Stock Configuration"
 msgstr ""
 
+msgctxt "model:stock.configuration.location,name:"
+msgid "Stock Configuration Location"
+msgstr ""
+
+msgctxt "model:stock.configuration.sequence,name:"
+msgid "Stock Configuration Sequence"
+msgstr ""
+
 msgctxt "model:stock.inventory,name:"
 msgid "Stock Inventory"
 msgstr ""
@@ -2013,6 +2209,10 @@ msgid "Draft"
 msgstr ""
 
 msgctxt "selection:stock.shipment.internal,state:"
+msgid "Request"
+msgstr ""
+
+msgctxt "selection:stock.shipment.internal,state:"
 msgid "Shipped"
 msgstr ""
 
@@ -2133,6 +2333,10 @@ msgid "Draft"
 msgstr ""
 
 msgctxt "view:stock.shipment.in.return:"
+msgid "Other Info"
+msgstr ""
+
+msgctxt "view:stock.shipment.in.return:"
 msgid "Wait"
 msgstr ""
 
@@ -2153,6 +2357,10 @@ msgid "Inventory Moves"
 msgstr ""
 
 msgctxt "view:stock.shipment.in:"
+msgid "Other Info"
+msgstr ""
+
+msgctxt "view:stock.shipment.in:"
 msgid "Receive"
 msgstr ""
 
@@ -2181,6 +2389,10 @@ msgid "Draft"
 msgstr ""
 
 msgctxt "view:stock.shipment.internal:"
+msgid "Other Info"
+msgstr ""
+
+msgctxt "view:stock.shipment.internal:"
 msgid "Ship"
 msgstr ""
 
@@ -2213,6 +2425,10 @@ msgid "Inventory Moves"
 msgstr ""
 
 msgctxt "view:stock.shipment.out.return:"
+msgid "Other Info"
+msgstr ""
+
+msgctxt "view:stock.shipment.out.return:"
 msgid "Received"
 msgstr ""
 
@@ -2233,11 +2449,11 @@ msgid "Draft"
 msgstr ""
 
 msgctxt "view:stock.shipment.out:"
-msgid "Inventory Moves"
+msgid "Make shipment"
 msgstr ""
 
 msgctxt "view:stock.shipment.out:"
-msgid "Make shipment"
+msgid "Other Info"
 msgstr ""
 
 msgctxt "view:stock.shipment.out:"
diff --git a/locale/de.po b/locale/de.po
index fe21ff7..9e15deb 100644
--- a/locale/de.po
+++ b/locale/de.po
@@ -72,8 +72,8 @@ msgstr ""
 msgctxt "error:stock.move:"
 msgid "You can not modify move \"%(move)s\" because period \"%(period)s\" is closed."
 msgstr ""
-"Änderung von Buchungssatz \"%(move)s\" nicht möglich, weil Buchungszeitraum "
-"\"%(period)s\" geschlossen ist."
+"Änderung von Lagerbewegung \"%(move)s\" nicht möglich, weil die Lagerperiode"
+" \"%(period)s\" geschlossen ist."
 
 msgctxt "error:stock.move:"
 msgid "You can not modify stock move \"%s\" because it is in \"Assigned\" state."
@@ -166,10 +166,50 @@ msgctxt "field:party.party,customer_location:"
 msgid "Customer Location"
 msgstr "Lagerort Kunde"
 
+msgctxt "field:party.party,locations:"
+msgid "Locations"
+msgstr "Lagerorte"
+
 msgctxt "field:party.party,supplier_location:"
 msgid "Supplier Location"
 msgstr "Lagerort Lieferant"
 
+msgctxt "field:party.party.location,create_date:"
+msgid "Create Date"
+msgstr "Erstellungsdatum"
+
+msgctxt "field:party.party.location,create_uid:"
+msgid "Create User"
+msgstr "Erstellt durch"
+
+msgctxt "field:party.party.location,customer_location:"
+msgid "Customer Location"
+msgstr "Lagerort Kunde"
+
+msgctxt "field:party.party.location,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:party.party.location,party:"
+msgid "Party"
+msgstr "Partei"
+
+msgctxt "field:party.party.location,rec_name:"
+msgid "Name"
+msgstr "Name"
+
+msgctxt "field:party.party.location,supplier_location:"
+msgid "Supplier Location"
+msgstr "Lagerort Lieferant"
+
+msgctxt "field:party.party.location,write_date:"
+msgid "Write Date"
+msgstr "Zuletzt geändert"
+
+msgctxt "field:party.party.location,write_uid:"
+msgid "Write User"
+msgstr "Letzte Änderung durch"
+
 msgctxt "field:product.by_location.context,forecast_date:"
 msgid "At Date"
 msgstr "Ermittlungsdatum"
@@ -258,6 +298,86 @@ msgctxt "field:stock.configuration,write_uid:"
 msgid "Write User"
 msgstr "Letzte Änderung durch"
 
+msgctxt "field:stock.configuration.location,create_date:"
+msgid "Create Date"
+msgstr "Erstellungsdatum"
+
+msgctxt "field:stock.configuration.location,create_uid:"
+msgid "Create User"
+msgstr "Erstellt durch"
+
+msgctxt "field:stock.configuration.location,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:stock.configuration.location,rec_name:"
+msgid "Name"
+msgstr "Name"
+
+msgctxt "field:stock.configuration.location,shipment_internal_transit:"
+msgid "Internal Shipment Transit"
+msgstr "Transit Interner Lieferposten"
+
+msgctxt "field:stock.configuration.location,write_date:"
+msgid "Write Date"
+msgstr "Zuletzt geändert"
+
+msgctxt "field:stock.configuration.location,write_uid:"
+msgid "Write User"
+msgstr "Letzte Änderung durch"
+
+msgctxt "field:stock.configuration.sequence,company:"
+msgid "Company"
+msgstr "Unternehmen"
+
+msgctxt "field:stock.configuration.sequence,create_date:"
+msgid "Create Date"
+msgstr "Erstellungsdatum"
+
+msgctxt "field:stock.configuration.sequence,create_uid:"
+msgid "Create User"
+msgstr "Erstellt durch"
+
+msgctxt "field:stock.configuration.sequence,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:stock.configuration.sequence,inventory_sequence:"
+msgid "Inventory Sequence"
+msgstr "Nummernkreis Inventur"
+
+msgctxt "field:stock.configuration.sequence,rec_name:"
+msgid "Name"
+msgstr "Name"
+
+msgctxt "field:stock.configuration.sequence,shipment_in_return_sequence:"
+msgid "Supplier Return Shipment Sequence"
+msgstr "Nummernkreis Warenrückgabe"
+
+msgctxt "field:stock.configuration.sequence,shipment_in_sequence:"
+msgid "Supplier Shipment Sequence"
+msgstr "Nummernkreis Lieferposten von Lieferanten"
+
+msgctxt "field:stock.configuration.sequence,shipment_internal_sequence:"
+msgid "Internal Shipment Sequence"
+msgstr "Nummernkreis Interne Lieferposten"
+
+msgctxt "field:stock.configuration.sequence,shipment_out_return_sequence:"
+msgid "Customer Return Shipment Sequence"
+msgstr "Nummernkreis Warenrücknahme"
+
+msgctxt "field:stock.configuration.sequence,shipment_out_sequence:"
+msgid "Customer Shipment Sequence"
+msgstr "Nummernkreis Lieferposten an Kunden"
+
+msgctxt "field:stock.configuration.sequence,write_date:"
+msgid "Write Date"
+msgstr "Zuletzt geändert"
+
+msgctxt "field:stock.configuration.sequence,write_uid:"
+msgid "Write User"
+msgstr "Letzte Änderung durch"
+
 msgctxt "field:stock.inventory,company:"
 msgid "Company"
 msgstr "Unternehmen"
@@ -746,6 +866,10 @@ msgctxt "field:stock.shipment.in,create_uid:"
 msgid "Create User"
 msgstr "Erstellt durch"
 
+msgctxt "field:stock.shipment.in,done_by:"
+msgid "Done By"
+msgstr "Erledigt durch"
+
 msgctxt "field:stock.shipment.in,effective_date:"
 msgid "Effective Date"
 msgstr "Effektives Datum"
@@ -767,7 +891,7 @@ msgid "Moves"
 msgstr "Bewegungen"
 
 msgctxt "field:stock.shipment.in,number:"
-msgid "Numer"
+msgid "Number"
 msgstr "Nummer"
 
 msgctxt "field:stock.shipment.in,origins:"
@@ -782,6 +906,10 @@ msgctxt "field:stock.shipment.in,rec_name:"
 msgid "Name"
 msgstr "Name"
 
+msgctxt "field:stock.shipment.in,received_by:"
+msgid "Received By"
+msgstr "Entgegen genommen von"
+
 msgctxt "field:stock.shipment.in,reference:"
 msgid "Reference"
 msgstr "Beleg-Nr."
@@ -818,6 +946,10 @@ msgctxt "field:stock.shipment.in,write_uid:"
 msgid "Write User"
 msgstr "Letzte Änderung durch"
 
+msgctxt "field:stock.shipment.in.return,assigned_by:"
+msgid "Assigned By"
+msgstr "Zugewiesen von"
+
 msgctxt "field:stock.shipment.in.return,company:"
 msgid "Company"
 msgstr "Unternehmen"
@@ -834,6 +966,10 @@ msgctxt "field:stock.shipment.in.return,delivery_address:"
 msgid "Delivery Address"
 msgstr "Lieferadresse"
 
+msgctxt "field:stock.shipment.in.return,done_by:"
+msgid "Done By"
+msgstr "Erledigt durch"
+
 msgctxt "field:stock.shipment.in.return,effective_date:"
 msgid "Effective Date"
 msgstr "Effektives Datum"
@@ -898,6 +1034,10 @@ msgctxt "field:stock.shipment.in.return.assign.failed,moves:"
 msgid "Moves"
 msgstr "Lagerbewegungen"
 
+msgctxt "field:stock.shipment.internal,assigned_by:"
+msgid "Received By"
+msgstr "Entgegen genommen von"
+
 msgctxt "field:stock.shipment.internal,company:"
 msgid "Company"
 msgstr "Unternehmen"
@@ -910,6 +1050,10 @@ msgctxt "field:stock.shipment.internal,create_uid:"
 msgid "Create User"
 msgstr "Erstellt durch"
 
+msgctxt "field:stock.shipment.internal,done_by:"
+msgid "Done By"
+msgstr "Erledigt durch"
+
 msgctxt "field:stock.shipment.internal,effective_date:"
 msgid "Effective Date"
 msgstr "Effektives Datum"
@@ -958,6 +1102,10 @@ msgctxt "field:stock.shipment.internal,reference:"
 msgid "Reference"
 msgstr "Beleg-Nr."
 
+msgctxt "field:stock.shipment.internal,shipped_by:"
+msgid "Shipped By"
+msgstr "Versendet durch"
+
 msgctxt "field:stock.shipment.internal,state:"
 msgid "State"
 msgstr "Status"
@@ -986,6 +1134,10 @@ msgctxt "field:stock.shipment.internal.assign.failed,moves:"
 msgid "Moves"
 msgstr "Lagerbewegungen"
 
+msgctxt "field:stock.shipment.out,assigned_by:"
+msgid "Assigned By"
+msgstr "Zugewiesen von"
+
 msgctxt "field:stock.shipment.out,company:"
 msgid "Company"
 msgstr "Unternehmen"
@@ -1010,6 +1162,10 @@ msgctxt "field:stock.shipment.out,delivery_address:"
 msgid "Delivery Address"
 msgstr "Lieferadresse"
 
+msgctxt "field:stock.shipment.out,done_by:"
+msgid "Done By"
+msgstr "Erledigt durch"
+
 msgctxt "field:stock.shipment.out,effective_date:"
 msgid "Effective Date"
 msgstr "Effektives Datum"
@@ -1038,6 +1194,10 @@ msgctxt "field:stock.shipment.out,outgoing_moves:"
 msgid "Outgoing Moves"
 msgstr "Ausgehende Bewegungen"
 
+msgctxt "field:stock.shipment.out,packed_by:"
+msgid "Packed By"
+msgstr "Verpackt durch"
+
 msgctxt "field:stock.shipment.out,planned_date:"
 msgid "Planned Date"
 msgstr "Geplantes Datum"
@@ -1106,6 +1266,10 @@ msgctxt "field:stock.shipment.out.return,delivery_address:"
 msgid "Delivery Address"
 msgstr "Lieferadresse"
 
+msgctxt "field:stock.shipment.out.return,done_by:"
+msgid "Done By"
+msgstr "Erledigt durch"
+
 msgctxt "field:stock.shipment.out.return,effective_date:"
 msgid "Effective Date"
 msgstr "Effektives Datum"
@@ -1142,6 +1306,10 @@ msgctxt "field:stock.shipment.out.return,rec_name:"
 msgid "Name"
 msgstr "Name"
 
+msgctxt "field:stock.shipment.out.return,received_by:"
+msgid "Received By"
+msgstr "Entgegen genommen von"
+
 msgctxt "field:stock.shipment.out.return,reference:"
 msgid "Reference"
 msgstr "Beleg-Nr."
@@ -1178,6 +1346,14 @@ msgctxt "help:party.party,supplier_location:"
 msgid "The default source location when receiving products from the party."
 msgstr "Standardherkunftsort für Sendungen vom Geschäftspartner"
 
+msgctxt "help:party.party.location,customer_location:"
+msgid "The default destination location when sending products to the party."
+msgstr "Standardbestimmungsort für Sendungen zum Geschäftspartner."
+
+msgctxt "help:party.party.location,supplier_location:"
+msgid "The default source location when receiving products from the party."
+msgstr "Standardherkunftsort für Sendungen vom Geschäftspartner."
+
 msgctxt "help:product.by_location.context,forecast_date:"
 msgid ""
 "Allow to compute expected stock quantities for this date.\n"
@@ -1385,6 +1561,11 @@ msgid "Draft"
 msgstr "Entwurf"
 
 msgctxt ""
+"model:ir.action.act_window.domain,name:act_shipment_internal_form_domain_requests"
+msgid "Requests"
+msgstr "Anfragen"
+
+msgctxt ""
 "model:ir.action.act_window.domain,name:act_shipment_internal_form_domain_shipped"
 msgid "Shipped"
 msgstr "Versendet"
@@ -1542,6 +1723,10 @@ msgctxt "model:ir.ui.menu,name:menu_stock_configuration"
 msgid "Stock Configuration"
 msgstr "Lager"
 
+msgctxt "model:party.party.location,name:"
+msgid "Party Location"
+msgstr "Partei Ort"
+
 msgctxt "model:product.by_location.context,name:"
 msgid "Product by Location"
 msgstr "Variante nach Lagerort"
@@ -1562,6 +1747,14 @@ msgctxt "model:stock.configuration,name:"
 msgid "Stock Configuration"
 msgstr "Einstellungen Lager"
 
+msgctxt "model:stock.configuration.location,name:"
+msgid "Stock Configuration Location"
+msgstr "Einstellungen Lager Lagerort"
+
+msgctxt "model:stock.configuration.sequence,name:"
+msgid "Stock Configuration Sequence"
+msgstr "Einstellungen Lager Nummernkreis"
+
 msgctxt "model:stock.inventory,name:"
 msgid "Stock Inventory"
 msgstr "Lager Lagerbestand"
@@ -2031,6 +2224,10 @@ msgid "Draft"
 msgstr "Entwurf"
 
 msgctxt "selection:stock.shipment.internal,state:"
+msgid "Request"
+msgstr "Anfrage"
+
+msgctxt "selection:stock.shipment.internal,state:"
 msgid "Shipped"
 msgstr "Versendet"
 
@@ -2151,6 +2348,10 @@ msgid "Draft"
 msgstr "Entwurf"
 
 msgctxt "view:stock.shipment.in.return:"
+msgid "Other Info"
+msgstr "Weitere Informationen"
+
+msgctxt "view:stock.shipment.in.return:"
 msgid "Wait"
 msgstr "Warten"
 
@@ -2171,6 +2372,10 @@ msgid "Inventory Moves"
 msgstr "Bestandsänderungen"
 
 msgctxt "view:stock.shipment.in:"
+msgid "Other Info"
+msgstr "Weitere Informationen"
+
+msgctxt "view:stock.shipment.in:"
 msgid "Receive"
 msgstr "Einlagern"
 
@@ -2199,6 +2404,10 @@ msgid "Draft"
 msgstr "Entwurf"
 
 msgctxt "view:stock.shipment.internal:"
+msgid "Other Info"
+msgstr "Weitere Informationen"
+
+msgctxt "view:stock.shipment.internal:"
 msgid "Ship"
 msgstr "Versenden"
 
@@ -2231,6 +2440,10 @@ msgid "Inventory Moves"
 msgstr "Bestandsänderungen"
 
 msgctxt "view:stock.shipment.out.return:"
+msgid "Other Info"
+msgstr "Weitere Informationen"
+
+msgctxt "view:stock.shipment.out.return:"
 msgid "Received"
 msgstr "Erhalten"
 
@@ -2251,14 +2464,14 @@ msgid "Draft"
 msgstr "Entwurf"
 
 msgctxt "view:stock.shipment.out:"
-msgid "Inventory Moves"
-msgstr "Bestandsänderungen"
-
-msgctxt "view:stock.shipment.out:"
 msgid "Make shipment"
 msgstr "Packen"
 
 msgctxt "view:stock.shipment.out:"
+msgid "Other Info"
+msgstr "Weitere Informationen"
+
+msgctxt "view:stock.shipment.out:"
 msgid "Outgoing Moves"
 msgstr "Ausgehende Bewegungen"
 
diff --git a/locale/es.po b/locale/es.po
index 7bb0acc..884eb08 100644
--- a/locale/es.po
+++ b/locale/es.po
@@ -7,14 +7,15 @@ msgid ""
 "You cannot change the default uom for a product which is associated to stock"
 " moves."
 msgstr ""
-"No puede cambiar la UdM por defecto de un producto con movimientos de stock."
+"No puede cambiar la UdM por defecto de un producto con movimientos de "
+"existencias."
 
 msgctxt "error:product.template:"
 msgid ""
 "You cannot change the type for a product which is associated to stock moves."
 msgstr ""
 "No se puede cambiar el tipo de un producto del cual existen movimientos de "
-"stock."
+"existencias."
 
 msgctxt "error:stock.inventory.line:"
 msgid "Line quantity must be positive."
@@ -54,15 +55,15 @@ msgstr "Las ubicaciones origen y destino deben ser distintas."
 
 msgctxt "error:stock.move:"
 msgid "The stock move \"%s\" has no origin."
-msgstr "El movimiento de stock \"%s\" no tiene ningún origen."
+msgstr "El movimiento de existencias \"%s\" no tiene ningún origen."
 
 msgctxt "error:stock.move:"
 msgid ""
 "You can not delete stock move \"%s\" because it is not in draft or cancelled"
 " state."
 msgstr ""
-"No puede eliminar el movimiento de stock \"%s\" porque no está en estado "
-"borrador o cancelado."
+"No puede eliminar el movimiento de existencias \"%s\" porque no está en "
+"estado borrador o cancelado."
 
 msgctxt "error:stock.move:"
 msgid "You can not modify move \"%(move)s\" because period \"%(period)s\" is closed."
@@ -73,28 +74,28 @@ msgstr ""
 msgctxt "error:stock.move:"
 msgid "You can not modify stock move \"%s\" because it is in \"Assigned\" state."
 msgstr ""
-"No puede cambiar el movimiento de stock \"%s\" porque se encuentra en estado"
-" \"Reservado\"."
+"No puede cambiar el movimiento de existencias \"%s\" porque se encuentra en "
+"estado \"Reservado\"."
 
 msgctxt "error:stock.move:"
 msgid ""
 "You can not modify stock move \"%s\" because it is in \"Done\" or \"Cancel\""
 " state."
 msgstr ""
-"No puede cambiar el movimiento de stock \"%s\" porque se encuentra en estado"
-" \"Finalizado\" o \"Cancelado\"."
+"No puede cambiar el movimiento de existencias \"%s\" porque se encuentra en "
+"estado \"Finalizado\" o \"Cancelado\"."
 
 msgctxt "error:stock.move:"
 msgid "You can not set stock move \"%s\" to assigned state."
-msgstr "No puede cambiar el movimiento de stock \"%s\" a estado reservado."
+msgstr "No puede cambiar el movimiento de existencias \"%s\" a estado reservado."
 
 msgctxt "error:stock.move:"
 msgid "You can not set stock move \"%s\" to done state."
-msgstr "No puede cambiar el movimiento de stock \"%s\" a estado finalizado."
+msgstr "No puede cambiar el movimiento de existencias \"%s\" a estado finalizado."
 
 msgctxt "error:stock.move:"
 msgid "You can not set stock move \"%s\" to draft state."
-msgstr "No puede cambiar el movimiento de stock \"%s\" a estado borrador."
+msgstr "No puede cambiar el movimiento de existencias \"%s\" a estado borrador."
 
 msgctxt "error:stock.period:"
 msgid "You can not close a period in the future or today."
@@ -147,10 +148,50 @@ msgctxt "field:party.party,customer_location:"
 msgid "Customer Location"
 msgstr "Ubicación de cliente"
 
+msgctxt "field:party.party,locations:"
+msgid "Locations"
+msgstr "Ubicaciones"
+
 msgctxt "field:party.party,supplier_location:"
 msgid "Supplier Location"
 msgstr "Ubicación de proveedor"
 
+msgctxt "field:party.party.location,create_date:"
+msgid "Create Date"
+msgstr "Fecha de creación"
+
+msgctxt "field:party.party.location,create_uid:"
+msgid "Create User"
+msgstr "Usuario de creación"
+
+msgctxt "field:party.party.location,customer_location:"
+msgid "Customer Location"
+msgstr "Ubicación de cliente"
+
+msgctxt "field:party.party.location,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:party.party.location,party:"
+msgid "Party"
+msgstr "Tercero"
+
+msgctxt "field:party.party.location,rec_name:"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:party.party.location,supplier_location:"
+msgid "Supplier Location"
+msgstr "Ubicación de proveedor"
+
+msgctxt "field:party.party.location,write_date:"
+msgid "Write Date"
+msgstr "Fecha de modificación"
+
+msgctxt "field:party.party.location,write_uid:"
+msgid "Write User"
+msgstr "Usuario de modificación"
+
 msgctxt "field:product.by_location.context,forecast_date:"
 msgid "At Date"
 msgstr "A la fecha"
@@ -239,6 +280,86 @@ msgctxt "field:stock.configuration,write_uid:"
 msgid "Write User"
 msgstr "Usuario de modificación"
 
+msgctxt "field:stock.configuration.location,create_date:"
+msgid "Create Date"
+msgstr "Fecha de creación"
+
+msgctxt "field:stock.configuration.location,create_uid:"
+msgid "Create User"
+msgstr "Usuario de creación"
+
+msgctxt "field:stock.configuration.location,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:stock.configuration.location,rec_name:"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:stock.configuration.location,shipment_internal_transit:"
+msgid "Internal Shipment Transit"
+msgstr "Transito albaranes internos"
+
+msgctxt "field:stock.configuration.location,write_date:"
+msgid "Write Date"
+msgstr "Fecha de modificación"
+
+msgctxt "field:stock.configuration.location,write_uid:"
+msgid "Write User"
+msgstr "Usuario de modificación"
+
+msgctxt "field:stock.configuration.sequence,company:"
+msgid "Company"
+msgstr "Empresa"
+
+msgctxt "field:stock.configuration.sequence,create_date:"
+msgid "Create Date"
+msgstr "Fecha de creación"
+
+msgctxt "field:stock.configuration.sequence,create_uid:"
+msgid "Create User"
+msgstr "Usuario de creación"
+
+msgctxt "field:stock.configuration.sequence,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:stock.configuration.sequence,inventory_sequence:"
+msgid "Inventory Sequence"
+msgstr "Secuencia de inventario"
+
+msgctxt "field:stock.configuration.sequence,rec_name:"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:stock.configuration.sequence,shipment_in_return_sequence:"
+msgid "Supplier Return Shipment Sequence"
+msgstr "Secuencia de albarán devolución proveedor"
+
+msgctxt "field:stock.configuration.sequence,shipment_in_sequence:"
+msgid "Supplier Shipment Sequence"
+msgstr "Secuencia de albarán proveedor"
+
+msgctxt "field:stock.configuration.sequence,shipment_internal_sequence:"
+msgid "Internal Shipment Sequence"
+msgstr "Secuencia de albarán interno"
+
+msgctxt "field:stock.configuration.sequence,shipment_out_return_sequence:"
+msgid "Customer Return Shipment Sequence"
+msgstr "Secuencia de albarán devolución cliente"
+
+msgctxt "field:stock.configuration.sequence,shipment_out_sequence:"
+msgid "Customer Shipment Sequence"
+msgstr "Secuencia de albarán cliente"
+
+msgctxt "field:stock.configuration.sequence,write_date:"
+msgid "Write Date"
+msgstr "Fecha de modificación"
+
+msgctxt "field:stock.configuration.sequence,write_uid:"
+msgid "Write User"
+msgstr "Usuario de modificación"
+
 msgctxt "field:stock.inventory,company:"
 msgid "Company"
 msgstr "Empresa"
@@ -727,6 +848,10 @@ msgctxt "field:stock.shipment.in,create_uid:"
 msgid "Create User"
 msgstr "Usuario de creación"
 
+msgctxt "field:stock.shipment.in,done_by:"
+msgid "Done By"
+msgstr "Realizado por"
+
 msgctxt "field:stock.shipment.in,effective_date:"
 msgid "Effective Date"
 msgstr "Fecha efectiva"
@@ -748,7 +873,7 @@ msgid "Moves"
 msgstr "Movimientos"
 
 msgctxt "field:stock.shipment.in,number:"
-msgid "Numer"
+msgid "Number"
 msgstr "Número"
 
 msgctxt "field:stock.shipment.in,origins:"
@@ -763,6 +888,10 @@ msgctxt "field:stock.shipment.in,rec_name:"
 msgid "Name"
 msgstr "Nombre"
 
+msgctxt "field:stock.shipment.in,received_by:"
+msgid "Received By"
+msgstr "Recibido por"
+
 msgctxt "field:stock.shipment.in,reference:"
 msgid "Reference"
 msgstr "Referencia"
@@ -799,6 +928,10 @@ msgctxt "field:stock.shipment.in,write_uid:"
 msgid "Write User"
 msgstr "Usuario de modificación"
 
+msgctxt "field:stock.shipment.in.return,assigned_by:"
+msgid "Assigned By"
+msgstr "Asignado por"
+
 msgctxt "field:stock.shipment.in.return,company:"
 msgid "Company"
 msgstr "Empresa"
@@ -815,6 +948,10 @@ msgctxt "field:stock.shipment.in.return,delivery_address:"
 msgid "Delivery Address"
 msgstr "Dirección de envío"
 
+msgctxt "field:stock.shipment.in.return,done_by:"
+msgid "Done By"
+msgstr "Realizado por"
+
 msgctxt "field:stock.shipment.in.return,effective_date:"
 msgid "Effective Date"
 msgstr "Fecha efectiva"
@@ -879,6 +1016,10 @@ msgctxt "field:stock.shipment.in.return.assign.failed,moves:"
 msgid "Moves"
 msgstr "Movimientos"
 
+msgctxt "field:stock.shipment.internal,assigned_by:"
+msgid "Received By"
+msgstr "Recibido por"
+
 msgctxt "field:stock.shipment.internal,company:"
 msgid "Company"
 msgstr "Empresa"
@@ -891,6 +1032,10 @@ msgctxt "field:stock.shipment.internal,create_uid:"
 msgid "Create User"
 msgstr "Usuario de creación"
 
+msgctxt "field:stock.shipment.internal,done_by:"
+msgid "Done By"
+msgstr "Realizado por"
+
 msgctxt "field:stock.shipment.internal,effective_date:"
 msgid "Effective Date"
 msgstr "Fecha efectiva"
@@ -939,6 +1084,10 @@ msgctxt "field:stock.shipment.internal,reference:"
 msgid "Reference"
 msgstr "Referencia"
 
+msgctxt "field:stock.shipment.internal,shipped_by:"
+msgid "Shipped By"
+msgstr "Enviado por"
+
 msgctxt "field:stock.shipment.internal,state:"
 msgid "State"
 msgstr "Estado"
@@ -967,6 +1116,10 @@ msgctxt "field:stock.shipment.internal.assign.failed,moves:"
 msgid "Moves"
 msgstr "Movimientos"
 
+msgctxt "field:stock.shipment.out,assigned_by:"
+msgid "Assigned By"
+msgstr "Asignado por"
+
 msgctxt "field:stock.shipment.out,company:"
 msgid "Company"
 msgstr "Empresa"
@@ -991,6 +1144,10 @@ msgctxt "field:stock.shipment.out,delivery_address:"
 msgid "Delivery Address"
 msgstr "Dirección de envío"
 
+msgctxt "field:stock.shipment.out,done_by:"
+msgid "Done By"
+msgstr "Realizado por"
+
 msgctxt "field:stock.shipment.out,effective_date:"
 msgid "Effective Date"
 msgstr "Fecha efectiva"
@@ -1019,6 +1176,10 @@ msgctxt "field:stock.shipment.out,outgoing_moves:"
 msgid "Outgoing Moves"
 msgstr "Movimientos de salida"
 
+msgctxt "field:stock.shipment.out,packed_by:"
+msgid "Packed By"
+msgstr "Empaquetado por"
+
 msgctxt "field:stock.shipment.out,planned_date:"
 msgid "Planned Date"
 msgstr "Fecha estimada"
@@ -1087,6 +1248,10 @@ msgctxt "field:stock.shipment.out.return,delivery_address:"
 msgid "Delivery Address"
 msgstr "Dirección de envío"
 
+msgctxt "field:stock.shipment.out.return,done_by:"
+msgid "Done By"
+msgstr "Realizado por"
+
 msgctxt "field:stock.shipment.out.return,effective_date:"
 msgid "Effective Date"
 msgstr "Fecha efectiva"
@@ -1123,6 +1288,10 @@ msgctxt "field:stock.shipment.out.return,rec_name:"
 msgid "Name"
 msgstr "Nombre"
 
+msgctxt "field:stock.shipment.out.return,received_by:"
+msgid "Received By"
+msgstr "Recibido por"
+
 msgctxt "field:stock.shipment.out.return,reference:"
 msgid "Reference"
 msgstr "Referencia"
@@ -1161,6 +1330,16 @@ msgid "The default source location when receiving products from the party."
 msgstr ""
 "La ubicación de origen por defecto cuando se reciben productos del tercero."
 
+msgctxt "help:party.party.location,customer_location:"
+msgid "The default destination location when sending products to the party."
+msgstr ""
+"La ubicación de destino por defecto cuando se envían productos al tercero."
+
+msgctxt "help:party.party.location,supplier_location:"
+msgid "The default source location when receiving products from the party."
+msgstr ""
+"La ubicación de origen por defecto cuando se reciben productos del tercero."
+
 msgctxt "help:product.by_location.context,forecast_date:"
 msgid ""
 "Allow to compute expected stock quantities for this date.\n"
@@ -1251,7 +1430,7 @@ msgstr "Albaranes devolución cliente"
 
 msgctxt "model:ir.action,name:act_stock_configuration_form"
 msgid "Stock Configuration"
-msgstr "Configuración stock"
+msgstr "Configuración existencias"
 
 msgctxt "model:ir.action,name:report_shipment_in_restocking_list"
 msgid "Restocking List"
@@ -1368,6 +1547,11 @@ msgid "Draft"
 msgstr "Borrador"
 
 msgctxt ""
+"model:ir.action.act_window.domain,name:act_shipment_internal_form_domain_requests"
+msgid "Requests"
+msgstr "Solicitudes"
+
+msgctxt ""
 "model:ir.action.act_window.domain,name:act_shipment_internal_form_domain_shipped"
 msgid "Shipped"
 msgstr "Enviado"
@@ -1523,7 +1707,11 @@ msgstr "Logística"
 
 msgctxt "model:ir.ui.menu,name:menu_stock_configuration"
 msgid "Stock Configuration"
-msgstr "Stock"
+msgstr "Existencias"
+
+msgctxt "model:party.party.location,name:"
+msgid "Party Location"
+msgstr "Ubicación del tercero"
 
 msgctxt "model:product.by_location.context,name:"
 msgid "Product by Location"
@@ -1543,19 +1731,27 @@ msgstr "Forzar reserva en logística"
 
 msgctxt "model:stock.configuration,name:"
 msgid "Stock Configuration"
-msgstr "Configuración stock"
+msgstr "Configuración existencias"
+
+msgctxt "model:stock.configuration.location,name:"
+msgid "Stock Configuration Location"
+msgstr "Configuración de ubicaciones de existencias"
+
+msgctxt "model:stock.configuration.sequence,name:"
+msgid "Stock Configuration Sequence"
+msgstr "Configuración de secuencias de existencias"
 
 msgctxt "model:stock.inventory,name:"
 msgid "Stock Inventory"
-msgstr "Inventario de stock"
+msgstr "Inventario de existencias"
 
 msgctxt "model:stock.inventory.line,name:"
 msgid "Stock Inventory Line"
-msgstr "Línea inventario de stock"
+msgstr "Línea inventario de existencias"
 
 msgctxt "model:stock.location,name:"
 msgid "Stock Location"
-msgstr "Ubicación de stock"
+msgstr "Ubicación de existencias"
 
 msgctxt "model:stock.location,name:location_customer"
 msgid "Customer"
@@ -1595,15 +1791,15 @@ msgstr "Ubicación tiempo de espera"
 
 msgctxt "model:stock.move,name:"
 msgid "Stock Move"
-msgstr "Movimiento de stock"
+msgstr "Movimiento de existencias"
 
 msgctxt "model:stock.period,name:"
 msgid "Stock Period"
-msgstr "Período de stock"
+msgstr "Período de existencias"
 
 msgctxt "model:stock.period.cache,name:"
 msgid "Stock Period Cache"
-msgstr "Período de stock precalculado"
+msgstr "Período de existencias precalculado"
 
 msgctxt "model:stock.product_quantities_warehouse,name:"
 msgid "Product Quantities By Warehouse"
@@ -2014,6 +2210,10 @@ msgid "Draft"
 msgstr "Borrador"
 
 msgctxt "selection:stock.shipment.internal,state:"
+msgid "Request"
+msgstr "Solicitud"
+
+msgctxt "selection:stock.shipment.internal,state:"
 msgid "Shipped"
 msgstr "Enviado"
 
@@ -2134,6 +2334,10 @@ msgid "Draft"
 msgstr "Borrador"
 
 msgctxt "view:stock.shipment.in.return:"
+msgid "Other Info"
+msgstr "Información adicional"
+
+msgctxt "view:stock.shipment.in.return:"
 msgid "Wait"
 msgstr "Esperando"
 
@@ -2154,6 +2358,10 @@ msgid "Inventory Moves"
 msgstr "Movimientos internos"
 
 msgctxt "view:stock.shipment.in:"
+msgid "Other Info"
+msgstr "Información adicional"
+
+msgctxt "view:stock.shipment.in:"
 msgid "Receive"
 msgstr "Recibir"
 
@@ -2182,6 +2390,10 @@ msgid "Draft"
 msgstr "Borrador"
 
 msgctxt "view:stock.shipment.internal:"
+msgid "Other Info"
+msgstr "Información adicional"
+
+msgctxt "view:stock.shipment.internal:"
 msgid "Ship"
 msgstr "Enviar"
 
@@ -2214,6 +2426,10 @@ msgid "Inventory Moves"
 msgstr "Movimientos internos"
 
 msgctxt "view:stock.shipment.out.return:"
+msgid "Other Info"
+msgstr "Información adicional"
+
+msgctxt "view:stock.shipment.out.return:"
 msgid "Received"
 msgstr "Recibido"
 
@@ -2234,14 +2450,14 @@ msgid "Draft"
 msgstr "Borrador"
 
 msgctxt "view:stock.shipment.out:"
-msgid "Inventory Moves"
-msgstr "Movimientos internos"
-
-msgctxt "view:stock.shipment.out:"
 msgid "Make shipment"
 msgstr "Empaquetar"
 
 msgctxt "view:stock.shipment.out:"
+msgid "Other Info"
+msgstr "Información adicional"
+
+msgctxt "view:stock.shipment.out:"
 msgid "Outgoing Moves"
 msgstr "Movimientos de salida"
 
diff --git a/locale/es_419.po b/locale/es_419.po
index 0043848..c42b196 100644
--- a/locale/es_419.po
+++ b/locale/es_419.po
@@ -12,16 +12,16 @@ msgctxt "error:product.template:"
 msgid ""
 "You cannot change the type for a product which is associated to stock moves."
 msgstr ""
-"No puede cambiar el tipo de un producto el cual está asociado con "
-"movimientos de stock."
 
+#, fuzzy
 msgctxt "error:stock.inventory.line:"
 msgid "Line quantity must be positive."
-msgstr ""
+msgstr "La cantidad del movimiento debe ser positiva"
 
+#, fuzzy
 msgctxt "error:stock.inventory:"
 msgid "Inventory \"%s\" must be cancelled before deletion."
-msgstr "Debe cancelar el inventario \"%s\" antes de eliminarlo."
+msgstr "Debe cancelar el envío interno \"%s\" antes de eliminarlo."
 
 msgctxt "error:stock.inventory:"
 msgid "Line \"%s\" is not unique on Inventory \"%s\"."
@@ -51,7 +51,7 @@ msgstr ""
 
 msgctxt "error:stock.move:"
 msgid "The stock move \"%s\" has no origin."
-msgstr "El movimiento de stock \"%s\" no tiene origen."
+msgstr ""
 
 msgctxt "error:stock.move:"
 msgid ""
@@ -66,77 +66,65 @@ msgstr ""
 msgctxt "error:stock.move:"
 msgid "You can not modify stock move \"%s\" because it is in \"Assigned\" state."
 msgstr ""
-"No puede modificar el movimiento de stock \"%s\" porque se encuentra en "
-"estado \"Asignado\"."
 
 msgctxt "error:stock.move:"
 msgid ""
 "You can not modify stock move \"%s\" because it is in \"Done\" or \"Cancel\""
 " state."
 msgstr ""
-"No puede modificar el movimiento de stock \"%s\" porque se encuentra en "
-"estado \"Realizado\" o \"Cancelado\"."
 
 msgctxt "error:stock.move:"
 msgid "You can not set stock move \"%s\" to assigned state."
-msgstr "No puede establecer el movimiento de stock \"%s\" a estado asignado."
+msgstr ""
 
 msgctxt "error:stock.move:"
 msgid "You can not set stock move \"%s\" to done state."
-msgstr "No puede establecer el movimiento de stock \"%s\" a estado realizado."
+msgstr ""
 
 msgctxt "error:stock.move:"
 msgid "You can not set stock move \"%s\" to draft state."
-msgstr "No puede establecer el movimiento de stock \"%s\" a estado borrador."
+msgstr ""
 
 msgctxt "error:stock.period:"
 msgid "You can not close a period in the future or today."
-msgstr "No puede cerrar un período con fecha futura o de hoy."
+msgstr ""
 
 msgctxt "error:stock.period:"
 msgid "You can not close a period when there still are assigned moves."
 msgstr ""
-"No puede cerrar un período cuando todavía dispone de movimientos asignados."
 
 msgctxt "error:stock.shipment.in.return:"
 msgid "Supplier Return Shipment \"%s\" must be cancelled before deletion."
 msgstr ""
-"Debe cancelar la guía de remisión de devolución a proveedor \"%s\" antes de "
-"eliminarla."
+"Debe cancelar el envío de devolución a proveedor \"%s\" antes de borrarlo."
 
 msgctxt "error:stock.shipment.in:"
 msgid ""
 "Incoming Moves must have the warehouse input location as destination "
 "location."
 msgstr ""
-"Los movimientos de entrada deben tener un almacén de entrada como ubicación "
-"de destino."
 
 msgctxt "error:stock.shipment.in:"
 msgid ""
 "Inventory Moves must have the warehouse input location as source location."
 msgstr ""
-"Los movimientos de inventario deben tener un almacén de entrada como "
-"ubicación de origen."
 
 msgctxt "error:stock.shipment.in:"
 msgid "Supplier Shipment \"%s\" must be cancelled before deletion."
-msgstr ""
-"Debe cancelar la guía de remisión de proveedor \"%s\" antes de eliminarla."
+msgstr "Debe cancelar el envío de proveedor \"%s\" antes de eliminarlo."
 
 msgctxt "error:stock.shipment.internal:"
 msgid "Internal Shipment \"%s\" must be cancelled before deletion."
-msgstr "Debe cancelar la guía de remisión interna \"%s\" antes de eliminarla."
+msgstr "Debe cancelar el envío interno \"%s\" antes de eliminarlo."
 
 msgctxt "error:stock.shipment.out.return:"
 msgid "Customer Return Shipment \"%s\" must be cancelled before deletion."
 msgstr ""
-"Debe cancelar la guía de remisión de devolución de cliente \"%s\" antes de "
-"eliminarla."
+"Debe cancelar el envío de devolución de cliente \"%s\" antes de eliminarlo."
 
 msgctxt "error:stock.shipment.out:"
 msgid "Customer Shipment \"%s\" must be cancelled before deletion."
-msgstr "Debe cancelar la guía de remisión a cliente \"%s\" antes de eliminarla."
+msgstr "Debe cancelar el envío a cliente \"%s\" antes de eliminarlo."
 
 msgctxt "field:party.address,delivery:"
 msgid "Delivery"
@@ -144,11 +132,52 @@ msgstr "Entrega"
 
 msgctxt "field:party.party,customer_location:"
 msgid "Customer Location"
-msgstr "Ubicación cliente"
+msgstr ""
+
+msgctxt "field:party.party,locations:"
+msgid "Locations"
+msgstr ""
 
 msgctxt "field:party.party,supplier_location:"
 msgid "Supplier Location"
-msgstr "Ubicación proveedor"
+msgstr ""
+
+msgctxt "field:party.party.location,create_date:"
+msgid "Create Date"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:party.party.location,create_uid:"
+msgid "Create User"
+msgstr "Creado por usuario"
+
+msgctxt "field:party.party.location,customer_location:"
+msgid "Customer Location"
+msgstr ""
+
+msgctxt "field:party.party.location,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:party.party.location,party:"
+msgid "Party"
+msgstr ""
+
+msgctxt "field:party.party.location,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:party.party.location,supplier_location:"
+msgid "Supplier Location"
+msgstr ""
+
+msgctxt "field:party.party.location,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:party.party.location,write_uid:"
+msgid "Write User"
+msgstr ""
 
 msgctxt "field:product.by_location.context,forecast_date:"
 msgid "At Date"
@@ -164,7 +193,7 @@ msgstr ""
 
 msgctxt "field:product.product,cost_value:"
 msgid "Cost Value"
-msgstr "Valor de costo"
+msgstr "Costo"
 
 msgctxt "field:product.product,forecast_quantity:"
 msgid "Forecast Quantity"
@@ -174,9 +203,10 @@ msgctxt "field:product.product,quantity:"
 msgid "Quantity"
 msgstr ""
 
+#, fuzzy
 msgctxt "field:product.template,cost_value:"
 msgid "Cost Value"
-msgstr "Valor de costo"
+msgstr "Costo"
 
 msgctxt "field:product.template,forecast_quantity:"
 msgid "Forecast Quantity"
@@ -190,9 +220,10 @@ msgctxt "field:stock.configuration,create_date:"
 msgid "Create Date"
 msgstr ""
 
+#, fuzzy
 msgctxt "field:stock.configuration,create_uid:"
 msgid "Create User"
-msgstr ""
+msgstr "Creado por usuario"
 
 msgctxt "field:stock.configuration,id:"
 msgid "ID"
@@ -208,27 +239,27 @@ msgstr ""
 
 msgctxt "field:stock.configuration,shipment_in_return_sequence:"
 msgid "Supplier Return Shipment Sequence"
-msgstr "Secuencia de guía de remisión de devolución a proveedor"
+msgstr "Secuencia de envío de devolución a proveedor"
 
 msgctxt "field:stock.configuration,shipment_in_sequence:"
 msgid "Supplier Shipment Sequence"
-msgstr "Secuencia de guía de remisión de proveedor"
+msgstr "Secuencia de envío de proveedor"
 
 msgctxt "field:stock.configuration,shipment_internal_sequence:"
 msgid "Internal Shipment Sequence"
-msgstr "Secuencia de guía de remisión interna"
+msgstr "Secuencia de envío interna"
 
 msgctxt "field:stock.configuration,shipment_internal_transit:"
 msgid "Internal Shipment Transit"
-msgstr "Tránsito de guías de remisión internas"
+msgstr "Tránsito de envíos internas"
 
 msgctxt "field:stock.configuration,shipment_out_return_sequence:"
 msgid "Customer Return Shipment Sequence"
-msgstr "Secuencia de guía de remisión de devolución de cliente"
+msgstr "Secuencia de envíos de devolución de cliente"
 
 msgctxt "field:stock.configuration,shipment_out_sequence:"
 msgid "Customer Shipment Sequence"
-msgstr "Secuencia de guía de remisión a cliente"
+msgstr "Secuencia de envíos a cliente"
 
 msgctxt "field:stock.configuration,write_date:"
 msgid "Write Date"
@@ -236,7 +267,89 @@ msgstr ""
 
 msgctxt "field:stock.configuration,write_uid:"
 msgid "Write User"
-msgstr "Modificado por usuario"
+msgstr ""
+
+msgctxt "field:stock.configuration.location,create_date:"
+msgid "Create Date"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:stock.configuration.location,create_uid:"
+msgid "Create User"
+msgstr "Creado por usuario"
+
+msgctxt "field:stock.configuration.location,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:stock.configuration.location,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:stock.configuration.location,shipment_internal_transit:"
+msgid "Internal Shipment Transit"
+msgstr "Tránsito de envíos internos"
+
+msgctxt "field:stock.configuration.location,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:stock.configuration.location,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:stock.configuration.sequence,company:"
+msgid "Company"
+msgstr ""
+
+msgctxt "field:stock.configuration.sequence,create_date:"
+msgid "Create Date"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:stock.configuration.sequence,create_uid:"
+msgid "Create User"
+msgstr "Creado por usuario"
+
+msgctxt "field:stock.configuration.sequence,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:stock.configuration.sequence,inventory_sequence:"
+msgid "Inventory Sequence"
+msgstr ""
+
+msgctxt "field:stock.configuration.sequence,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:stock.configuration.sequence,shipment_in_return_sequence:"
+msgid "Supplier Return Shipment Sequence"
+msgstr "Secuencia de envíos de devolución a proveedor"
+
+msgctxt "field:stock.configuration.sequence,shipment_in_sequence:"
+msgid "Supplier Shipment Sequence"
+msgstr "Secuencia de envíos de proveedor"
+
+msgctxt "field:stock.configuration.sequence,shipment_internal_sequence:"
+msgid "Internal Shipment Sequence"
+msgstr "Secuencia de envío interno"
+
+msgctxt "field:stock.configuration.sequence,shipment_out_return_sequence:"
+msgid "Customer Return Shipment Sequence"
+msgstr "Secuencia de envío de devolución de cliente"
+
+msgctxt "field:stock.configuration.sequence,shipment_out_sequence:"
+msgid "Customer Shipment Sequence"
+msgstr "Secuencia de envíos a cliente"
+
+msgctxt "field:stock.configuration.sequence,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:stock.configuration.sequence,write_uid:"
+msgid "Write User"
+msgstr ""
 
 msgctxt "field:stock.inventory,company:"
 msgid "Company"
@@ -246,6 +359,7 @@ msgctxt "field:stock.inventory,create_date:"
 msgid "Create Date"
 msgstr ""
 
+#, fuzzy
 msgctxt "field:stock.inventory,create_uid:"
 msgid "Create User"
 msgstr "Creado por usuario"
@@ -264,8 +378,9 @@ msgstr ""
 
 msgctxt "field:stock.inventory,location:"
 msgid "Location"
-msgstr "Ubicación"
+msgstr ""
 
+#, fuzzy
 msgctxt "field:stock.inventory,lost_found:"
 msgid "Lost and Found"
 msgstr "Perdido y encontrado"
@@ -288,19 +403,20 @@ msgstr ""
 
 msgctxt "field:stock.inventory,write_uid:"
 msgid "Write User"
-msgstr "Modificado por usuario"
+msgstr ""
 
 msgctxt "field:stock.inventory.line,create_date:"
 msgid "Create Date"
 msgstr ""
 
+#, fuzzy
 msgctxt "field:stock.inventory.line,create_uid:"
 msgid "Create User"
 msgstr "Creado por usuario"
 
 msgctxt "field:stock.inventory.line,expected_quantity:"
 msgid "Expected Quantity"
-msgstr "Cantidad esperada"
+msgstr ""
 
 msgctxt "field:stock.inventory.line,id:"
 msgid "ID"
@@ -312,7 +428,7 @@ msgstr ""
 
 msgctxt "field:stock.inventory.line,inventory_state:"
 msgid "Inventory State"
-msgstr "Estado de inventario"
+msgstr ""
 
 msgctxt "field:stock.inventory.line,moves:"
 msgid "Moves"
@@ -344,7 +460,7 @@ msgstr ""
 
 msgctxt "field:stock.inventory.line,write_uid:"
 msgid "Write User"
-msgstr "Modificado por usuario"
+msgstr ""
 
 msgctxt "field:stock.location,active:"
 msgid "Active"
@@ -364,12 +480,13 @@ msgstr ""
 
 msgctxt "field:stock.location,cost_value:"
 msgid "Cost Value"
-msgstr "Valor de costo"
+msgstr "Costo"
 
 msgctxt "field:stock.location,create_date:"
 msgid "Create Date"
 msgstr ""
 
+#, fuzzy
 msgctxt "field:stock.location,create_uid:"
 msgid "Create User"
 msgstr "Creado por usuario"
@@ -436,12 +553,13 @@ msgstr ""
 
 msgctxt "field:stock.location,write_uid:"
 msgid "Write User"
-msgstr "Modificado por usuario"
+msgstr ""
 
 msgctxt "field:stock.location.lead_time,create_date:"
 msgid "Create Date"
 msgstr ""
 
+#, fuzzy
 msgctxt "field:stock.location.lead_time,create_uid:"
 msgid "Create User"
 msgstr "Creado por usuario"
@@ -476,11 +594,11 @@ msgstr ""
 
 msgctxt "field:stock.location.lead_time,write_uid:"
 msgid "Write User"
-msgstr "Modificado por usuario"
+msgstr ""
 
 msgctxt "field:stock.move,assignation_required:"
 msgid "Assignation Required"
-msgstr "Asignación requerida"
+msgstr ""
 
 msgctxt "field:stock.move,company:"
 msgid "Company"
@@ -488,12 +606,13 @@ msgstr ""
 
 msgctxt "field:stock.move,cost_price:"
 msgid "Cost Price"
-msgstr "Precio de costo"
+msgstr "Costo"
 
 msgctxt "field:stock.move,create_date:"
 msgid "Create Date"
 msgstr ""
 
+#, fuzzy
 msgctxt "field:stock.move,create_uid:"
 msgid "Create User"
 msgstr "Creado por usuario"
@@ -524,7 +643,7 @@ msgstr ""
 
 msgctxt "field:stock.move,planned_date:"
 msgid "Planned Date"
-msgstr "Fecha planificada"
+msgstr ""
 
 msgctxt "field:stock.move,product:"
 msgid "Product"
@@ -532,7 +651,7 @@ msgstr ""
 
 msgctxt "field:stock.move,product_uom_category:"
 msgid "Product Uom Category"
-msgstr "Categoría de UdM del producto"
+msgstr ""
 
 msgctxt "field:stock.move,quantity:"
 msgid "Quantity"
@@ -576,7 +695,7 @@ msgstr ""
 
 msgctxt "field:stock.move,write_uid:"
 msgid "Write User"
-msgstr "Modificado por usuario"
+msgstr ""
 
 msgctxt "field:stock.period,caches:"
 msgid "Caches"
@@ -590,6 +709,7 @@ msgctxt "field:stock.period,create_date:"
 msgid "Create Date"
 msgstr ""
 
+#, fuzzy
 msgctxt "field:stock.period,create_uid:"
 msgid "Create User"
 msgstr "Creado por usuario"
@@ -616,12 +736,13 @@ msgstr ""
 
 msgctxt "field:stock.period,write_uid:"
 msgid "Write User"
-msgstr "Modificado por usuario"
+msgstr ""
 
 msgctxt "field:stock.period.cache,create_date:"
 msgid "Create Date"
 msgstr ""
 
+#, fuzzy
 msgctxt "field:stock.period.cache,create_uid:"
 msgid "Create User"
 msgstr "Creado por usuario"
@@ -656,12 +777,13 @@ msgstr ""
 
 msgctxt "field:stock.period.cache,write_uid:"
 msgid "Write User"
-msgstr "Modificado por usuario"
+msgstr ""
 
 msgctxt "field:stock.product_quantities_warehouse,create_date:"
 msgid "Create Date"
 msgstr ""
 
+#, fuzzy
 msgctxt "field:stock.product_quantities_warehouse,create_uid:"
 msgid "Create User"
 msgstr "Creado por usuario"
@@ -688,7 +810,7 @@ msgstr ""
 
 msgctxt "field:stock.product_quantities_warehouse,write_uid:"
 msgid "Write User"
-msgstr "Modificado por usuario"
+msgstr ""
 
 msgctxt "field:stock.product_quantities_warehouse.context,id:"
 msgid "ID"
@@ -726,6 +848,10 @@ msgctxt "field:stock.shipment.in,create_uid:"
 msgid "Create User"
 msgstr "Creado por usuario"
 
+msgctxt "field:stock.shipment.in,done_by:"
+msgid "Done By"
+msgstr ""
+
 msgctxt "field:stock.shipment.in,effective_date:"
 msgid "Effective Date"
 msgstr ""
@@ -747,7 +873,7 @@ msgid "Moves"
 msgstr ""
 
 msgctxt "field:stock.shipment.in,number:"
-msgid "Numer"
+msgid "Number"
 msgstr ""
 
 msgctxt "field:stock.shipment.in,origins:"
@@ -756,15 +882,20 @@ msgstr ""
 
 msgctxt "field:stock.shipment.in,planned_date:"
 msgid "Planned Date"
-msgstr "Fecha planificada"
+msgstr ""
 
 msgctxt "field:stock.shipment.in,rec_name:"
 msgid "Name"
 msgstr ""
 
+msgctxt "field:stock.shipment.in,received_by:"
+msgid "Received By"
+msgstr ""
+
+#, fuzzy
 msgctxt "field:stock.shipment.in,reference:"
 msgid "Reference"
-msgstr ""
+msgstr "Referencias:"
 
 msgctxt "field:stock.shipment.in,state:"
 msgid "State"
@@ -776,7 +907,7 @@ msgstr ""
 
 msgctxt "field:stock.shipment.in,supplier_location:"
 msgid "Supplier Location"
-msgstr "Ubicación proveedor"
+msgstr ""
 
 msgctxt "field:stock.shipment.in,warehouse:"
 msgid "Warehouse"
@@ -796,7 +927,11 @@ msgstr ""
 
 msgctxt "field:stock.shipment.in,write_uid:"
 msgid "Write User"
-msgstr "Modificado por usuario"
+msgstr ""
+
+msgctxt "field:stock.shipment.in.return,assigned_by:"
+msgid "Assigned By"
+msgstr ""
 
 msgctxt "field:stock.shipment.in.return,company:"
 msgid "Company"
@@ -806,6 +941,7 @@ msgctxt "field:stock.shipment.in.return,create_date:"
 msgid "Create Date"
 msgstr ""
 
+#, fuzzy
 msgctxt "field:stock.shipment.in.return,create_uid:"
 msgid "Create User"
 msgstr "Creado por usuario"
@@ -814,6 +950,10 @@ msgctxt "field:stock.shipment.in.return,delivery_address:"
 msgid "Delivery Address"
 msgstr "Dirección de entrega"
 
+msgctxt "field:stock.shipment.in.return,done_by:"
+msgid "Done By"
+msgstr ""
+
 msgctxt "field:stock.shipment.in.return,effective_date:"
 msgid "Effective Date"
 msgstr ""
@@ -840,19 +980,20 @@ msgstr ""
 
 msgctxt "field:stock.shipment.in.return,planned_date:"
 msgid "Planned Date"
-msgstr "Fecha planificada"
+msgstr ""
 
 msgctxt "field:stock.shipment.in.return,rec_name:"
 msgid "Name"
 msgstr ""
 
+#, fuzzy
 msgctxt "field:stock.shipment.in.return,reference:"
 msgid "Reference"
-msgstr ""
+msgstr "Referencias:"
 
 msgctxt "field:stock.shipment.in.return,state:"
 msgid "State"
-msgstr "Estad"
+msgstr ""
 
 msgctxt "field:stock.shipment.in.return,supplier:"
 msgid "Supplier"
@@ -868,7 +1009,7 @@ msgstr ""
 
 msgctxt "field:stock.shipment.in.return,write_uid:"
 msgid "Write User"
-msgstr "Modificado por usuario"
+msgstr ""
 
 msgctxt "field:stock.shipment.in.return.assign.failed,id:"
 msgid "ID"
@@ -878,6 +1019,10 @@ msgctxt "field:stock.shipment.in.return.assign.failed,moves:"
 msgid "Moves"
 msgstr ""
 
+msgctxt "field:stock.shipment.internal,assigned_by:"
+msgid "Received By"
+msgstr ""
+
 msgctxt "field:stock.shipment.internal,company:"
 msgid "Company"
 msgstr ""
@@ -888,7 +1033,11 @@ msgstr ""
 
 msgctxt "field:stock.shipment.internal,create_uid:"
 msgid "Create User"
-msgstr "Creado por usuario"
+msgstr "\\"
+
+msgctxt "field:stock.shipment.internal,done_by:"
+msgid "Done By"
+msgstr ""
 
 msgctxt "field:stock.shipment.internal,effective_date:"
 msgid "Effective Date"
@@ -924,18 +1073,23 @@ msgstr ""
 
 msgctxt "field:stock.shipment.internal,planned_date:"
 msgid "Planned Date"
-msgstr "Fecha planificada"
+msgstr ""
 
 msgctxt "field:stock.shipment.internal,planned_start_date:"
 msgid "Planned Start Date"
-msgstr "Fecha de inicio planificada"
+msgstr ""
 
 msgctxt "field:stock.shipment.internal,rec_name:"
 msgid "Name"
 msgstr ""
 
+#, fuzzy
 msgctxt "field:stock.shipment.internal,reference:"
 msgid "Reference"
+msgstr "Referencias:"
+
+msgctxt "field:stock.shipment.internal,shipped_by:"
+msgid "Shipped By"
 msgstr ""
 
 msgctxt "field:stock.shipment.internal,state:"
@@ -956,7 +1110,7 @@ msgstr ""
 
 msgctxt "field:stock.shipment.internal,write_uid:"
 msgid "Write User"
-msgstr "Modificado por usuario"
+msgstr ""
 
 msgctxt "field:stock.shipment.internal.assign.failed,id:"
 msgid "ID"
@@ -966,6 +1120,10 @@ msgctxt "field:stock.shipment.internal.assign.failed,moves:"
 msgid "Moves"
 msgstr ""
 
+msgctxt "field:stock.shipment.out,assigned_by:"
+msgid "Assigned By"
+msgstr ""
+
 msgctxt "field:stock.shipment.out,company:"
 msgid "Company"
 msgstr ""
@@ -974,6 +1132,7 @@ msgctxt "field:stock.shipment.out,create_date:"
 msgid "Create Date"
 msgstr ""
 
+#, fuzzy
 msgctxt "field:stock.shipment.out,create_uid:"
 msgid "Create User"
 msgstr "Creado por usuario"
@@ -984,12 +1143,17 @@ msgstr ""
 
 msgctxt "field:stock.shipment.out,customer_location:"
 msgid "Customer Location"
-msgstr "Ubicación cliente"
+msgstr ""
 
+#, fuzzy
 msgctxt "field:stock.shipment.out,delivery_address:"
 msgid "Delivery Address"
 msgstr "Dirección de entrega"
 
+msgctxt "field:stock.shipment.out,done_by:"
+msgid "Done By"
+msgstr ""
+
 msgctxt "field:stock.shipment.out,effective_date:"
 msgid "Effective Date"
 msgstr ""
@@ -1012,23 +1176,28 @@ msgstr ""
 
 msgctxt "field:stock.shipment.out,origins:"
 msgid "Origins"
-msgstr "Orígenes"
+msgstr ""
 
 msgctxt "field:stock.shipment.out,outgoing_moves:"
 msgid "Outgoing Moves"
 msgstr ""
 
+msgctxt "field:stock.shipment.out,packed_by:"
+msgid "Packed By"
+msgstr ""
+
 msgctxt "field:stock.shipment.out,planned_date:"
 msgid "Planned Date"
-msgstr "Fecha planificada"
+msgstr ""
 
 msgctxt "field:stock.shipment.out,rec_name:"
 msgid "Name"
 msgstr ""
 
+#, fuzzy
 msgctxt "field:stock.shipment.out,reference:"
 msgid "Reference"
-msgstr ""
+msgstr "Referencias:"
 
 msgctxt "field:stock.shipment.out,state:"
 msgid "State"
@@ -1052,7 +1221,7 @@ msgstr ""
 
 msgctxt "field:stock.shipment.out,write_uid:"
 msgid "Write User"
-msgstr "Modificado por usuario"
+msgstr ""
 
 msgctxt "field:stock.shipment.out.assign.failed,id:"
 msgid "ID"
@@ -1070,6 +1239,7 @@ msgctxt "field:stock.shipment.out.return,create_date:"
 msgid "Create Date"
 msgstr ""
 
+#, fuzzy
 msgctxt "field:stock.shipment.out.return,create_uid:"
 msgid "Create User"
 msgstr "Creado por usuario"
@@ -1080,12 +1250,17 @@ msgstr ""
 
 msgctxt "field:stock.shipment.out.return,customer_location:"
 msgid "Customer Location"
-msgstr "Ubicación cliente"
+msgstr ""
 
+#, fuzzy
 msgctxt "field:stock.shipment.out.return,delivery_address:"
 msgid "Delivery Address"
 msgstr "Dirección de entrega"
 
+msgctxt "field:stock.shipment.out.return,done_by:"
+msgid "Done By"
+msgstr ""
+
 msgctxt "field:stock.shipment.out.return,effective_date:"
 msgid "Effective Date"
 msgstr ""
@@ -1116,15 +1291,20 @@ msgstr ""
 
 msgctxt "field:stock.shipment.out.return,planned_date:"
 msgid "Planned Date"
-msgstr "Fecha planificada"
+msgstr ""
 
 msgctxt "field:stock.shipment.out.return,rec_name:"
 msgid "Name"
 msgstr ""
 
+msgctxt "field:stock.shipment.out.return,received_by:"
+msgid "Received By"
+msgstr ""
+
+#, fuzzy
 msgctxt "field:stock.shipment.out.return,reference:"
 msgid "Reference"
-msgstr ""
+msgstr "Referencias:"
 
 msgctxt "field:stock.shipment.out.return,state:"
 msgid "State"
@@ -1148,7 +1328,7 @@ msgstr ""
 
 msgctxt "field:stock.shipment.out.return,write_uid:"
 msgid "Write User"
-msgstr "Modificado por usuario"
+msgstr ""
 
 msgctxt "help:party.party,customer_location:"
 msgid "The default destination location when sending products to the party."
@@ -1158,6 +1338,14 @@ msgctxt "help:party.party,supplier_location:"
 msgid "The default source location when receiving products from the party."
 msgstr ""
 
+msgctxt "help:party.party.location,customer_location:"
+msgid "The default destination location when sending products to the party."
+msgstr ""
+
+msgctxt "help:party.party.location,supplier_location:"
+msgid "The default source location when receiving products from the party."
+msgstr ""
+
 msgctxt "help:product.by_location.context,forecast_date:"
 msgid ""
 "Allow to compute expected stock quantities for this date.\n"
@@ -1186,7 +1374,7 @@ msgstr ""
 
 msgctxt "model:ir.action,name:act_location_lead_time_form"
 msgid "Location Lead Times"
-msgstr "Tiempo de espera de la ubicación"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_location_quantity_tree"
 msgid "Locations Quantity"
@@ -1214,35 +1402,35 @@ msgstr ""
 
 msgctxt "model:ir.action,name:act_shipment_in_form"
 msgid "Supplier Shipments"
-msgstr "Guías de remisión de proveedor"
+msgstr "Envío de proveedor"
 
 msgctxt "model:ir.action,name:act_shipment_in_return_form"
 msgid "Supplier Return Shipments"
-msgstr "Guías de remisión de devolución a proveedor"
+msgstr "Devolución a proveedor"
 
 msgctxt "model:ir.action,name:act_shipment_internal_form"
 msgid "Internal Shipments"
-msgstr "Guías de remisión internas"
+msgstr "Envíos internos"
 
 msgctxt "model:ir.action,name:act_shipment_out_form"
 msgid "Customer Shipments"
-msgstr "Guías de remisión a cliente"
+msgstr "Envíos a cliente"
 
 msgctxt "model:ir.action,name:act_shipment_out_form2"
 msgid "Customer Shipments"
-msgstr "Guías de remisión a cliente"
+msgstr "Envíos a cliente"
 
 msgctxt "model:ir.action,name:act_shipment_out_form3"
 msgid "Supplier Shipments"
-msgstr "Guías de remisión de proveedor"
+msgstr "Envíos de proveedor"
 
 msgctxt "model:ir.action,name:act_shipment_out_return_form"
 msgid "Customer Return Shipments"
-msgstr "Guías de remisión de devolución de cliente"
+msgstr "Devoluciones de cliente"
 
 msgctxt "model:ir.action,name:act_stock_configuration_form"
 msgid "Stock Configuration"
-msgstr "Configuración de stock"
+msgstr ""
 
 msgctxt "model:ir.action,name:report_shipment_in_restocking_list"
 msgid "Restocking List"
@@ -1250,15 +1438,15 @@ msgstr ""
 
 msgctxt "model:ir.action,name:report_shipment_internal"
 msgid "Internal Shipment"
-msgstr "Guía de remisión interna"
+msgstr "Envío interno"
 
 msgctxt "model:ir.action,name:report_shipment_out_delivery_note"
 msgid "Delivery Note"
-msgstr "Nota de entrega"
+msgstr "Remisión"
 
 msgctxt "model:ir.action,name:report_shipment_out_picking_list"
 msgid "Picking List"
-msgstr "Lista de recogida"
+msgstr ""
 
 msgctxt "model:ir.action,name:report_shipment_out_return_restocking_list"
 msgid "Restocking List"
@@ -1270,15 +1458,15 @@ msgstr "Recalcular el precio de costo"
 
 msgctxt "model:ir.action,name:wizard_shipment_in_return_assign"
 msgid "Assign Purchase Return Shipment"
-msgstr "Asignar guía de remisión de devolución de compra"
+msgstr "Reservar devolución de compra"
 
 msgctxt "model:ir.action,name:wizard_shipment_internal_assign"
 msgid "Assign Shipment Internal"
-msgstr "Asignar guía de remisión interna"
+msgstr "Reservar envío interno"
 
 msgctxt "model:ir.action,name:wizard_shipment_out_assign"
 msgid "Assign Shipment Out"
-msgstr "Asignar guía de remisión de salida"
+msgstr "Reservar envío de salida"
 
 msgctxt "model:ir.action.act_window.domain,name:act_inventory_form_domain_all"
 msgid "All"
@@ -1331,7 +1519,7 @@ msgstr ""
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_shipment_in_return_form_domain_assigned"
 msgid "Assigned"
-msgstr "Asignado"
+msgstr ""
 
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_shipment_in_return_form_domain_draft"
@@ -1351,13 +1539,19 @@ msgstr ""
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_shipment_internal_form_domain_assigned"
 msgid "Assigned"
-msgstr "Asignado"
+msgstr ""
 
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_shipment_internal_form_domain_draft"
 msgid "Draft"
 msgstr ""
 
+#, fuzzy
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_shipment_internal_form_domain_requests"
+msgid "Requests"
+msgstr "="
+
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_shipment_internal_form_domain_shipped"
 msgid "Shipped"
@@ -1376,7 +1570,7 @@ msgstr ""
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_shipment_out_form_domain_assigned"
 msgid "Assigned"
-msgstr "Asignado"
+msgstr ""
 
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_shipment_out_form_domain_draft"
@@ -1414,23 +1608,23 @@ msgstr ""
 
 msgctxt "model:ir.sequence,name:sequence_shipment_in"
 msgid "Supplier Shipment"
-msgstr "Guía de remisión de proveedor"
+msgstr "Envío de proveedor"
 
 msgctxt "model:ir.sequence,name:sequence_shipment_in_return"
 msgid "Supplier Return Shipment"
-msgstr "Guía de remisión de devolución a proveedor"
+msgstr "Envío a proveedor"
 
 msgctxt "model:ir.sequence,name:sequence_shipment_internal"
 msgid "Internal Shipment"
-msgstr "Guía de remisión interna"
+msgstr "Envío interno"
 
 msgctxt "model:ir.sequence,name:sequence_shipment_out"
 msgid "Customer Shipment"
-msgstr "Guía de remisión a cliente"
+msgstr "Envío a cliente"
 
 msgctxt "model:ir.sequence,name:sequence_shipment_out_return"
 msgid "Customer Return Shipment"
-msgstr "Guía de remisión de devolución de cliente"
+msgstr "Devolución de cliente"
 
 msgctxt "model:ir.sequence.type,name:sequence_type_inventory"
 msgid "Inventory"
@@ -1438,23 +1632,23 @@ msgstr ""
 
 msgctxt "model:ir.sequence.type,name:sequence_type_shipment_in"
 msgid "Supplier Shipment"
-msgstr "Guía de remisión de proveedor"
+msgstr "Envío de proveedor"
 
 msgctxt "model:ir.sequence.type,name:sequence_type_shipment_in_return"
 msgid "Supplier Return Shipment"
-msgstr "Guía de remisión de devolución a proveedor"
+msgstr "Devolución a proveedor"
 
 msgctxt "model:ir.sequence.type,name:sequence_type_shipment_internal"
 msgid "Internal Shipment"
-msgstr "Guía de remisión interna"
+msgstr "Envío interno"
 
 msgctxt "model:ir.sequence.type,name:sequence_type_shipment_out"
 msgid "Customer Shipment"
-msgstr "Guía de remisión a cliente"
+msgstr "Envío a cliente"
 
 msgctxt "model:ir.sequence.type,name:sequence_type_shipment_out_return"
 msgid "Customer Return Shipment"
-msgstr "Guía de remisión de devolución de cliente"
+msgstr "Devolución de cliente"
 
 msgctxt "model:ir.ui.menu,name:menu_configuration"
 msgid "Configuration"
@@ -1470,7 +1664,7 @@ msgstr ""
 
 msgctxt "model:ir.ui.menu,name:menu_location_lead_time_form"
 msgid "Location Lead Times"
-msgstr "Tiempo de espera de ubicaciones"
+msgstr ""
 
 msgctxt "model:ir.ui.menu,name:menu_location_tree"
 msgid "Locations"
@@ -1490,19 +1684,19 @@ msgstr ""
 
 msgctxt "model:ir.ui.menu,name:menu_shipment_in_form"
 msgid "Supplier Shipments"
-msgstr "Guías de remisión de proveedores"
+msgstr "Envíos de proveedores"
 
 msgctxt "model:ir.ui.menu,name:menu_shipment_in_return_form"
 msgid "Supplier Return Shipments"
-msgstr "Guías de remisión de devoluciones a proveedores"
+msgstr "Devoluciones a proveedores"
 
 msgctxt "model:ir.ui.menu,name:menu_shipment_internal_form"
 msgid "Internal Shipments"
-msgstr "Guías de remisión internas"
+msgstr "Envíos internos"
 
 msgctxt "model:ir.ui.menu,name:menu_shipment_out_form"
 msgid "Customer Shipments"
-msgstr "Guías de remisión a clientes"
+msgstr "Envíos a clientes"
 
 msgctxt "model:ir.ui.menu,name:menu_shipment_out_return_form"
 msgid "Customer Return Shipments"
@@ -1510,11 +1704,15 @@ msgstr "Devoluciones de clientes"
 
 msgctxt "model:ir.ui.menu,name:menu_stock"
 msgid "Inventory & Stock"
-msgstr "Inventarios"
+msgstr "Inventarios y Existencias"
 
 msgctxt "model:ir.ui.menu,name:menu_stock_configuration"
 msgid "Stock Configuration"
-msgstr "Configuración de stock"
+msgstr ""
+
+msgctxt "model:party.party.location,name:"
+msgid "Party Location"
+msgstr ""
 
 msgctxt "model:product.by_location.context,name:"
 msgid "Product by Location"
@@ -1526,19 +1724,28 @@ msgstr "Stock"
 
 msgctxt "model:res.group,name:group_stock_admin"
 msgid "Stock Administration"
-msgstr "Administración de stock"
+msgstr ""
 
 msgctxt "model:res.group,name:group_stock_force_assignment"
 msgid "Stock Force Assignment"
-msgstr "Asignación forzada de stock"
+msgstr ""
 
 msgctxt "model:stock.configuration,name:"
 msgid "Stock Configuration"
-msgstr "Configuración de stock"
+msgstr ""
 
+msgctxt "model:stock.configuration.location,name:"
+msgid "Stock Configuration Location"
+msgstr ""
+
+msgctxt "model:stock.configuration.sequence,name:"
+msgid "Stock Configuration Sequence"
+msgstr ""
+
+#, fuzzy
 msgctxt "model:stock.inventory,name:"
 msgid "Stock Inventory"
-msgstr ""
+msgstr "Línea de inventario de stock"
 
 msgctxt "model:stock.inventory.line,name:"
 msgid "Stock Inventory Line"
@@ -1582,7 +1789,7 @@ msgstr "Bodega"
 
 msgctxt "model:stock.location.lead_time,name:"
 msgid "Location Lead Time"
-msgstr "Tiempo de espera de ubicación"
+msgstr ""
 
 msgctxt "model:stock.move,name:"
 msgid "Stock Move"
@@ -1596,6 +1803,7 @@ msgctxt "model:stock.period.cache,name:"
 msgid "Stock Period Cache"
 msgstr ""
 
+#, fuzzy
 msgctxt "model:stock.product_quantities_warehouse,name:"
 msgid "Product Quantities By Warehouse"
 msgstr "Cantidades de producto por bodega"
@@ -1606,39 +1814,39 @@ msgstr "Cantidades de producto por bodega"
 
 msgctxt "model:stock.products_by_locations.context,name:"
 msgid "Products by Locations"
-msgstr "Productos por ubicaciones"
+msgstr ""
 
 msgctxt "model:stock.shipment.in,name:"
 msgid "Supplier Shipment"
-msgstr "Guía de remisión de proveedor"
+msgstr "Envío de proveedor"
 
 msgctxt "model:stock.shipment.in.return,name:"
 msgid "Supplier Return Shipment"
-msgstr "Guías de remisión de devolución a proveedor"
+msgstr "Devolución a proveedor"
 
 msgctxt "model:stock.shipment.in.return.assign.failed,name:"
 msgid "Assign Supplier Return Shipment"
-msgstr "Asignar guía de remisión de devolución a proveedor"
+msgstr "Reservar devolución a proveedor"
 
 msgctxt "model:stock.shipment.internal,name:"
 msgid "Internal Shipment"
-msgstr "Guía de remisión interna"
+msgstr "Envío interno"
 
 msgctxt "model:stock.shipment.internal.assign.failed,name:"
 msgid "Assign Shipment Internal"
-msgstr "Asignar guía de remisión interna"
+msgstr "Reservar envío interno"
 
 msgctxt "model:stock.shipment.out,name:"
 msgid "Customer Shipment"
-msgstr "Guía de remisión a cliente"
+msgstr "Envío a cliente"
 
 msgctxt "model:stock.shipment.out.assign.failed,name:"
 msgid "Assign Shipment Out"
-msgstr "Asignar guía de remisión de salida"
+msgstr "Reservar envío de salida"
 
 msgctxt "model:stock.shipment.out.return,name:"
 msgid "Customer Return Shipment"
-msgstr "Guía de remisión de devolución de cliente"
+msgstr "Devolución de cliente"
 
 msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "/"
@@ -1654,7 +1862,7 @@ msgstr ""
 
 msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Planned Date:"
-msgstr "Fecha planificada:"
+msgstr ""
 
 msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Product"
@@ -1664,9 +1872,10 @@ msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Quantity"
 msgstr ""
 
+#, fuzzy
 msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Reference:"
-msgstr ""
+msgstr "Referencias:"
 
 msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Restocking List"
@@ -1674,7 +1883,7 @@ msgstr ""
 
 msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Shipment Number"
-msgstr "Número de guía de remisión"
+msgstr "Número de envío"
 
 msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Supplier:"
@@ -1706,11 +1915,11 @@ msgstr ""
 
 msgctxt "report:stock.shipment.internal.report:"
 msgid "Internal Shipment"
-msgstr "Guía de remisión interna"
+msgstr "Envío interno"
 
 msgctxt "report:stock.shipment.internal.report:"
 msgid "Planned Date:"
-msgstr "Fecha planificada:"
+msgstr ""
 
 msgctxt "report:stock.shipment.internal.report:"
 msgid "Product"
@@ -1722,11 +1931,11 @@ msgstr ""
 
 msgctxt "report:stock.shipment.internal.report:"
 msgid "Reference:"
-msgstr ""
+msgstr "Referencias:"
 
 msgctxt "report:stock.shipment.internal.report:"
 msgid "Shipment Number"
-msgstr "Número de guía de remisión"
+msgstr "Número de Envío"
 
 msgctxt "report:stock.shipment.internal.report:"
 msgid "To Location"
@@ -1750,7 +1959,7 @@ msgstr ""
 
 msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Delivery Note"
-msgstr "Nota de entrega"
+msgstr "Remisión"
 
 msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Product"
@@ -1760,13 +1969,14 @@ msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Quantity"
 msgstr ""
 
+#, fuzzy
 msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Reference:"
-msgstr ""
+msgstr "Referencias:"
 
 msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Shipment Number:"
-msgstr "Número de guía de remisión:"
+msgstr "Número de Envío:"
 
 msgctxt "report:stock.shipment.out.picking_list:"
 msgid "/"
@@ -1786,11 +1996,11 @@ msgstr ""
 
 msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Picking List"
-msgstr "Lista de recogida"
+msgstr ""
 
 msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Planned Date:"
-msgstr "Fecha planificada:"
+msgstr ""
 
 msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Product"
@@ -1800,18 +2010,20 @@ msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Quantity"
 msgstr ""
 
+#, fuzzy
 msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Reference:"
-msgstr ""
+msgstr "Referencias:"
 
 msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Shipment Number"
-msgstr "Número de guía de remisión"
+msgstr "Número de Envío"
 
 msgctxt "report:stock.shipment.out.picking_list:"
 msgid "To Location"
 msgstr ""
 
+#, fuzzy
 msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Warehouse:"
 msgstr "Bodega:"
@@ -1838,7 +2050,7 @@ msgstr ""
 
 msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Planned Date:"
-msgstr "Fecha planificada:"
+msgstr ""
 
 msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Product"
@@ -1848,9 +2060,10 @@ msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Quantity"
 msgstr ""
 
+#, fuzzy
 msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Reference:"
-msgstr ""
+msgstr "Referencias:"
 
 msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Restocking List"
@@ -1872,9 +2085,10 @@ msgctxt "selection:stock.inventory,state:"
 msgid "Canceled"
 msgstr ""
 
+#, fuzzy
 msgctxt "selection:stock.inventory,state:"
 msgid "Done"
-msgstr "Realizado"
+msgstr "Realizar"
 
 msgctxt "selection:stock.inventory,state:"
 msgid "Draft"
@@ -1884,9 +2098,10 @@ msgctxt "selection:stock.inventory.line,inventory_state:"
 msgid "Canceled"
 msgstr ""
 
+#, fuzzy
 msgctxt "selection:stock.inventory.line,inventory_state:"
 msgid "Done"
-msgstr "Realizado"
+msgstr "Realizar"
 
 msgctxt "selection:stock.inventory.line,inventory_state:"
 msgid "Draft"
@@ -1898,7 +2113,7 @@ msgstr ""
 
 msgctxt "selection:stock.location,type:"
 msgid "Drop"
-msgstr "Entrega directa"
+msgstr "Rechazado"
 
 msgctxt "selection:stock.location,type:"
 msgid "Lost and Found"
@@ -1926,15 +2141,16 @@ msgstr "Bodega"
 
 msgctxt "selection:stock.move,state:"
 msgid "Assigned"
-msgstr "Asignado"
+msgstr ""
 
 msgctxt "selection:stock.move,state:"
 msgid "Canceled"
 msgstr ""
 
+#, fuzzy
 msgctxt "selection:stock.move,state:"
 msgid "Done"
-msgstr "Realizado"
+msgstr "Realizar"
 
 msgctxt "selection:stock.move,state:"
 msgid "Draft"
@@ -1956,9 +2172,10 @@ msgctxt "selection:stock.shipment.in,state:"
 msgid "Canceled"
 msgstr ""
 
+#, fuzzy
 msgctxt "selection:stock.shipment.in,state:"
 msgid "Done"
-msgstr "Realizado"
+msgstr "Realizar"
 
 msgctxt "selection:stock.shipment.in,state:"
 msgid "Draft"
@@ -1970,15 +2187,16 @@ msgstr ""
 
 msgctxt "selection:stock.shipment.in.return,state:"
 msgid "Assigned"
-msgstr "Asignado"
+msgstr ""
 
 msgctxt "selection:stock.shipment.in.return,state:"
 msgid "Canceled"
 msgstr ""
 
+#, fuzzy
 msgctxt "selection:stock.shipment.in.return,state:"
 msgid "Done"
-msgstr "Realizado"
+msgstr "Realizar"
 
 msgctxt "selection:stock.shipment.in.return,state:"
 msgid "Draft"
@@ -1990,21 +2208,26 @@ msgstr ""
 
 msgctxt "selection:stock.shipment.internal,state:"
 msgid "Assigned"
-msgstr "Asignado"
+msgstr ""
 
 msgctxt "selection:stock.shipment.internal,state:"
 msgid "Canceled"
 msgstr ""
 
+#, fuzzy
 msgctxt "selection:stock.shipment.internal,state:"
 msgid "Done"
-msgstr "Realizado"
+msgstr "Realizar"
 
 msgctxt "selection:stock.shipment.internal,state:"
 msgid "Draft"
 msgstr ""
 
 msgctxt "selection:stock.shipment.internal,state:"
+msgid "Request"
+msgstr "="
+
+msgctxt "selection:stock.shipment.internal,state:"
 msgid "Shipped"
 msgstr ""
 
@@ -2014,15 +2237,16 @@ msgstr ""
 
 msgctxt "selection:stock.shipment.out,state:"
 msgid "Assigned"
-msgstr "Asignado"
+msgstr ""
 
 msgctxt "selection:stock.shipment.out,state:"
 msgid "Canceled"
 msgstr ""
 
+#, fuzzy
 msgctxt "selection:stock.shipment.out,state:"
 msgid "Done"
-msgstr "Realizado"
+msgstr "Realizar"
 
 msgctxt "selection:stock.shipment.out,state:"
 msgid "Draft"
@@ -2030,7 +2254,7 @@ msgstr ""
 
 msgctxt "selection:stock.shipment.out,state:"
 msgid "Packed"
-msgstr ""
+msgstr "Empacado"
 
 msgctxt "selection:stock.shipment.out,state:"
 msgid "Waiting"
@@ -2040,9 +2264,10 @@ msgctxt "selection:stock.shipment.out.return,state:"
 msgid "Canceled"
 msgstr ""
 
+#, fuzzy
 msgctxt "selection:stock.shipment.out.return,state:"
 msgid "Done"
-msgstr "Realizado"
+msgstr "Realizar"
 
 msgctxt "selection:stock.shipment.out.return,state:"
 msgid "Draft"
@@ -2052,13 +2277,14 @@ msgctxt "selection:stock.shipment.out.return,state:"
 msgid "Received"
 msgstr ""
 
+#, fuzzy
 msgctxt "view:party.party:"
 msgid "Stock"
 msgstr "Stock"
 
 msgctxt "view:product.product:"
 msgid "Cost Value"
-msgstr "Valor de costo"
+msgstr "Costo"
 
 msgctxt "view:stock.configuration:"
 msgid "Inventory"
@@ -2066,11 +2292,11 @@ msgstr ""
 
 msgctxt "view:stock.configuration:"
 msgid "Shipments"
-msgstr "Guías de remisión"
+msgstr "Envíos"
 
 msgctxt "view:stock.inventory:"
 msgid "Add an inventory line for each missing products"
-msgstr "Agregar una línea de inventario por cada producto que falta"
+msgstr ""
 
 msgctxt "view:stock.inventory:"
 msgid "Cancel"
@@ -2090,11 +2316,11 @@ msgstr ""
 
 msgctxt "view:stock.move:"
 msgid "Do"
-msgstr "Realizar"
+msgstr ""
 
 msgctxt "view:stock.move:"
 msgid "Reset to Draft"
-msgstr "Restablecer a borrador"
+msgstr ""
 
 msgctxt "view:stock.period:"
 msgid "Close"
@@ -2106,16 +2332,17 @@ msgstr ""
 
 msgctxt "view:stock.shipment.in.return.assign.failed:"
 msgid "Unable to assign those products:"
-msgstr "No se pueden asignar estos productos:"
+msgstr ""
 
 msgctxt "view:stock.shipment.in.return:"
 msgid "Assign"
-msgstr "Asignar"
+msgstr ""
 
 msgctxt "view:stock.shipment.in.return:"
 msgid "Cancel"
 msgstr ""
 
+#, fuzzy
 msgctxt "view:stock.shipment.in.return:"
 msgid "Done"
 msgstr "Realizar"
@@ -2125,6 +2352,10 @@ msgid "Draft"
 msgstr ""
 
 msgctxt "view:stock.shipment.in.return:"
+msgid "Other Info"
+msgstr ""
+
+msgctxt "view:stock.shipment.in.return:"
 msgid "Wait"
 msgstr ""
 
@@ -2132,6 +2363,7 @@ msgctxt "view:stock.shipment.in:"
 msgid "Cancel"
 msgstr ""
 
+#, fuzzy
 msgctxt "view:stock.shipment.in:"
 msgid "Done"
 msgstr "Realizar"
@@ -2145,25 +2377,30 @@ msgid "Inventory Moves"
 msgstr ""
 
 msgctxt "view:stock.shipment.in:"
+msgid "Other Info"
+msgstr ""
+
+msgctxt "view:stock.shipment.in:"
 msgid "Receive"
 msgstr ""
 
 msgctxt "view:stock.shipment.in:"
 msgid "Reset to Draft"
-msgstr "Restablecer a borrador"
+msgstr ""
 
 msgctxt "view:stock.shipment.internal.assign.failed:"
 msgid "Unable to assign those products:"
-msgstr "No se pueden asignar estos productos:"
+msgstr ""
 
 msgctxt "view:stock.shipment.internal:"
 msgid "Assign"
-msgstr "Asignar"
+msgstr ""
 
 msgctxt "view:stock.shipment.internal:"
 msgid "Cancel"
 msgstr ""
 
+#, fuzzy
 msgctxt "view:stock.shipment.internal:"
 msgid "Done"
 msgstr "Realizar"
@@ -2173,6 +2410,10 @@ msgid "Draft"
 msgstr ""
 
 msgctxt "view:stock.shipment.internal:"
+msgid "Other Info"
+msgstr ""
+
+msgctxt "view:stock.shipment.internal:"
 msgid "Ship"
 msgstr ""
 
@@ -2182,12 +2423,13 @@ msgstr ""
 
 msgctxt "view:stock.shipment.out.assign.failed:"
 msgid "Unable to assign those products:"
-msgstr "No se pueden asignar estos productos:"
+msgstr ""
 
 msgctxt "view:stock.shipment.out.return:"
 msgid "Cancel"
 msgstr ""
 
+#, fuzzy
 msgctxt "view:stock.shipment.out.return:"
 msgid "Done"
 msgstr "Realizar"
@@ -2205,12 +2447,16 @@ msgid "Inventory Moves"
 msgstr ""
 
 msgctxt "view:stock.shipment.out.return:"
+msgid "Other Info"
+msgstr ""
+
+msgctxt "view:stock.shipment.out.return:"
 msgid "Received"
 msgstr ""
 
 msgctxt "view:stock.shipment.out:"
 msgid "Assign"
-msgstr "Asignar"
+msgstr ""
 
 msgctxt "view:stock.shipment.out:"
 msgid "Cancel"
@@ -2225,14 +2471,14 @@ msgid "Draft"
 msgstr ""
 
 msgctxt "view:stock.shipment.out:"
-msgid "Inventory Moves"
-msgstr ""
-
-msgctxt "view:stock.shipment.out:"
 msgid "Make shipment"
 msgstr "Hacer el envío"
 
 msgctxt "view:stock.shipment.out:"
+msgid "Other Info"
+msgstr ""
+
+msgctxt "view:stock.shipment.out:"
 msgid "Outgoing Moves"
 msgstr ""
 
@@ -2246,7 +2492,7 @@ msgstr ""
 
 msgctxt "wizard_button:stock.shipment.in.return.assign,failed,force:"
 msgid "Force Assign"
-msgstr "Forzar asignación"
+msgstr ""
 
 msgctxt "wizard_button:stock.shipment.internal.assign,failed,end:"
 msgid "OK"
@@ -2254,7 +2500,7 @@ msgstr ""
 
 msgctxt "wizard_button:stock.shipment.internal.assign,failed,force:"
 msgid "Force Assign"
-msgstr "Forzar asignación"
+msgstr ""
 
 msgctxt "wizard_button:stock.shipment.out.assign,failed,end:"
 msgid "OK"
@@ -2262,4 +2508,4 @@ msgstr ""
 
 msgctxt "wizard_button:stock.shipment.out.assign,failed,force:"
 msgid "Force Assign"
-msgstr "Forzar asignación"
+msgstr ""
diff --git a/locale/fr.po b/locale/fr.po
index 3f3ff25..f1c0a5b 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -85,7 +85,7 @@ msgid ""
 " state."
 msgstr ""
 "Vous ne pouvez pas modifier le mouvement de stock « %s » parce qu'il est "
-"dans l'état « Fait » ou « Annulé »."
+"dans l'état « Effectué » ou « Annulé »."
 
 msgctxt "error:stock.move:"
 msgid "You can not set stock move \"%s\" to assigned state."
@@ -158,10 +158,50 @@ msgctxt "field:party.party,customer_location:"
 msgid "Customer Location"
 msgstr "Emplacement client"
 
+msgctxt "field:party.party,locations:"
+msgid "Locations"
+msgstr "Emplacements"
+
 msgctxt "field:party.party,supplier_location:"
 msgid "Supplier Location"
 msgstr "Emplacement fournisseur"
 
+msgctxt "field:party.party.location,create_date:"
+msgid "Create Date"
+msgstr "Date de création"
+
+msgctxt "field:party.party.location,create_uid:"
+msgid "Create User"
+msgstr "Créé par"
+
+msgctxt "field:party.party.location,customer_location:"
+msgid "Customer Location"
+msgstr "Emplacement client"
+
+msgctxt "field:party.party.location,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:party.party.location,party:"
+msgid "Party"
+msgstr "Tiers"
+
+msgctxt "field:party.party.location,rec_name:"
+msgid "Name"
+msgstr "Nom"
+
+msgctxt "field:party.party.location,supplier_location:"
+msgid "Supplier Location"
+msgstr "Emplacement fournisseur"
+
+msgctxt "field:party.party.location,write_date:"
+msgid "Write Date"
+msgstr "Date de mise à jour"
+
+msgctxt "field:party.party.location,write_uid:"
+msgid "Write User"
+msgstr "Mis à jour par"
+
 msgctxt "field:product.by_location.context,forecast_date:"
 msgid "At Date"
 msgstr "À la date"
@@ -250,6 +290,86 @@ msgctxt "field:stock.configuration,write_uid:"
 msgid "Write User"
 msgstr "Mis à jour par"
 
+msgctxt "field:stock.configuration.location,create_date:"
+msgid "Create Date"
+msgstr "Date de création"
+
+msgctxt "field:stock.configuration.location,create_uid:"
+msgid "Create User"
+msgstr "Créé par"
+
+msgctxt "field:stock.configuration.location,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:stock.configuration.location,rec_name:"
+msgid "Name"
+msgstr "Nom"
+
+msgctxt "field:stock.configuration.location,shipment_internal_transit:"
+msgid "Internal Shipment Transit"
+msgstr "Transit de livraison interne"
+
+msgctxt "field:stock.configuration.location,write_date:"
+msgid "Write Date"
+msgstr "Date de mise à jour"
+
+msgctxt "field:stock.configuration.location,write_uid:"
+msgid "Write User"
+msgstr "Mis à jour par"
+
+msgctxt "field:stock.configuration.sequence,company:"
+msgid "Company"
+msgstr "Société"
+
+msgctxt "field:stock.configuration.sequence,create_date:"
+msgid "Create Date"
+msgstr "Date de création"
+
+msgctxt "field:stock.configuration.sequence,create_uid:"
+msgid "Create User"
+msgstr "Créé par"
+
+msgctxt "field:stock.configuration.sequence,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:stock.configuration.sequence,inventory_sequence:"
+msgid "Inventory Sequence"
+msgstr "Séquence d'inventaire"
+
+msgctxt "field:stock.configuration.sequence,rec_name:"
+msgid "Name"
+msgstr "Nom"
+
+msgctxt "field:stock.configuration.sequence,shipment_in_return_sequence:"
+msgid "Supplier Return Shipment Sequence"
+msgstr "Séquence de retour d'expédition fournisseur"
+
+msgctxt "field:stock.configuration.sequence,shipment_in_sequence:"
+msgid "Supplier Shipment Sequence"
+msgstr "Séquence d'expédition fournisseur"
+
+msgctxt "field:stock.configuration.sequence,shipment_internal_sequence:"
+msgid "Internal Shipment Sequence"
+msgstr "Séquence d'expédition interne"
+
+msgctxt "field:stock.configuration.sequence,shipment_out_return_sequence:"
+msgid "Customer Return Shipment Sequence"
+msgstr "Séquence de retour d'expédition client"
+
+msgctxt "field:stock.configuration.sequence,shipment_out_sequence:"
+msgid "Customer Shipment Sequence"
+msgstr "Séquence d'expédition client"
+
+msgctxt "field:stock.configuration.sequence,write_date:"
+msgid "Write Date"
+msgstr "Date de mise à jour"
+
+msgctxt "field:stock.configuration.sequence,write_uid:"
+msgid "Write User"
+msgstr "Mis à jour par"
+
 msgctxt "field:stock.inventory,company:"
 msgid "Company"
 msgstr "Société"
@@ -738,6 +858,10 @@ msgctxt "field:stock.shipment.in,create_uid:"
 msgid "Create User"
 msgstr "Créé par"
 
+msgctxt "field:stock.shipment.in,done_by:"
+msgid "Done By"
+msgstr "Effectué par"
+
 msgctxt "field:stock.shipment.in,effective_date:"
 msgid "Effective Date"
 msgstr "Date effective"
@@ -759,7 +883,7 @@ msgid "Moves"
 msgstr "Mouvements"
 
 msgctxt "field:stock.shipment.in,number:"
-msgid "Numer"
+msgid "Number"
 msgstr "Numéro"
 
 msgctxt "field:stock.shipment.in,origins:"
@@ -774,6 +898,10 @@ msgctxt "field:stock.shipment.in,rec_name:"
 msgid "Name"
 msgstr "Nom"
 
+msgctxt "field:stock.shipment.in,received_by:"
+msgid "Received By"
+msgstr "Reçu par"
+
 msgctxt "field:stock.shipment.in,reference:"
 msgid "Reference"
 msgstr "Référence"
@@ -810,6 +938,10 @@ msgctxt "field:stock.shipment.in,write_uid:"
 msgid "Write User"
 msgstr "Mis à jour par"
 
+msgctxt "field:stock.shipment.in.return,assigned_by:"
+msgid "Assigned By"
+msgstr "Assigné par"
+
 msgctxt "field:stock.shipment.in.return,company:"
 msgid "Company"
 msgstr "Société"
@@ -826,6 +958,10 @@ msgctxt "field:stock.shipment.in.return,delivery_address:"
 msgid "Delivery Address"
 msgstr "Adresse de livraison"
 
+msgctxt "field:stock.shipment.in.return,done_by:"
+msgid "Done By"
+msgstr "Effectué par"
+
 msgctxt "field:stock.shipment.in.return,effective_date:"
 msgid "Effective Date"
 msgstr "Date effective"
@@ -890,6 +1026,10 @@ msgctxt "field:stock.shipment.in.return.assign.failed,moves:"
 msgid "Moves"
 msgstr "Mouvements"
 
+msgctxt "field:stock.shipment.internal,assigned_by:"
+msgid "Received By"
+msgstr "Reçu par"
+
 msgctxt "field:stock.shipment.internal,company:"
 msgid "Company"
 msgstr "Société"
@@ -902,6 +1042,10 @@ msgctxt "field:stock.shipment.internal,create_uid:"
 msgid "Create User"
 msgstr "Créé par"
 
+msgctxt "field:stock.shipment.internal,done_by:"
+msgid "Done By"
+msgstr "Effectué par"
+
 msgctxt "field:stock.shipment.internal,effective_date:"
 msgid "Effective Date"
 msgstr "Date effective"
@@ -950,6 +1094,10 @@ msgctxt "field:stock.shipment.internal,reference:"
 msgid "Reference"
 msgstr "Référence"
 
+msgctxt "field:stock.shipment.internal,shipped_by:"
+msgid "Shipped By"
+msgstr "Livré par"
+
 msgctxt "field:stock.shipment.internal,state:"
 msgid "State"
 msgstr "État"
@@ -978,6 +1126,10 @@ msgctxt "field:stock.shipment.internal.assign.failed,moves:"
 msgid "Moves"
 msgstr "Mouvements"
 
+msgctxt "field:stock.shipment.out,assigned_by:"
+msgid "Assigned By"
+msgstr "Assigné par"
+
 msgctxt "field:stock.shipment.out,company:"
 msgid "Company"
 msgstr "Société"
@@ -1002,6 +1154,10 @@ msgctxt "field:stock.shipment.out,delivery_address:"
 msgid "Delivery Address"
 msgstr "Adresse de livraison"
 
+msgctxt "field:stock.shipment.out,done_by:"
+msgid "Done By"
+msgstr "Effectué par"
+
 msgctxt "field:stock.shipment.out,effective_date:"
 msgid "Effective Date"
 msgstr "Date effective"
@@ -1030,6 +1186,10 @@ msgctxt "field:stock.shipment.out,outgoing_moves:"
 msgid "Outgoing Moves"
 msgstr "Mouvements sortants"
 
+msgctxt "field:stock.shipment.out,packed_by:"
+msgid "Packed By"
+msgstr "Emballé par"
+
 msgctxt "field:stock.shipment.out,planned_date:"
 msgid "Planned Date"
 msgstr "Date planifiée"
@@ -1098,6 +1258,10 @@ msgctxt "field:stock.shipment.out.return,delivery_address:"
 msgid "Delivery Address"
 msgstr "Adresse de livraison"
 
+msgctxt "field:stock.shipment.out.return,done_by:"
+msgid "Done By"
+msgstr "Effectué par"
+
 msgctxt "field:stock.shipment.out.return,effective_date:"
 msgid "Effective Date"
 msgstr "Date effective"
@@ -1134,6 +1298,10 @@ msgctxt "field:stock.shipment.out.return,rec_name:"
 msgid "Name"
 msgstr "Nom"
 
+msgctxt "field:stock.shipment.out.return,received_by:"
+msgid "Received By"
+msgstr "Reçu par"
+
 msgctxt "field:stock.shipment.out.return,reference:"
 msgid "Reference"
 msgstr "Référence"
@@ -1174,6 +1342,18 @@ msgstr ""
 "L'emplacement d'origine par défaut quand des produits sont reçus depuis ce "
 "tiers."
 
+msgctxt "help:party.party.location,customer_location:"
+msgid "The default destination location when sending products to the party."
+msgstr ""
+"L'emplacement de destination par défaut quand des produits sont envoyés vers"
+" le tiers."
+
+msgctxt "help:party.party.location,supplier_location:"
+msgid "The default source location when receiving products from the party."
+msgstr ""
+"L'emplacement d'origine par défaut quand des produits sont reçus depuis le "
+"tiers."
+
 msgctxt "help:product.by_location.context,forecast_date:"
 msgid ""
 "Allow to compute expected stock quantities for this date.\n"
@@ -1381,6 +1561,11 @@ msgid "Draft"
 msgstr "Brouillon"
 
 msgctxt ""
+"model:ir.action.act_window.domain,name:act_shipment_internal_form_domain_requests"
+msgid "Requests"
+msgstr "Demandes"
+
+msgctxt ""
 "model:ir.action.act_window.domain,name:act_shipment_internal_form_domain_shipped"
 msgid "Shipped"
 msgstr "Livrées"
@@ -1538,6 +1723,10 @@ msgctxt "model:ir.ui.menu,name:menu_stock_configuration"
 msgid "Stock Configuration"
 msgstr "Configuration des stocks"
 
+msgctxt "model:party.party.location,name:"
+msgid "Party Location"
+msgstr "Emplacement tiers"
+
 msgctxt "model:product.by_location.context,name:"
 msgid "Product by Location"
 msgstr "Produits par emplacement"
@@ -1558,6 +1747,14 @@ msgctxt "model:stock.configuration,name:"
 msgid "Stock Configuration"
 msgstr "Configuration des stocks"
 
+msgctxt "model:stock.configuration.location,name:"
+msgid "Stock Configuration Location"
+msgstr "Configuration de stock Emplacement"
+
+msgctxt "model:stock.configuration.sequence,name:"
+msgid "Stock Configuration Sequence"
+msgstr "Configuration de stock Séquence"
+
 msgctxt "model:stock.inventory,name:"
 msgid "Stock Inventory"
 msgstr "Inventaire du stock"
@@ -2027,6 +2224,10 @@ msgid "Draft"
 msgstr "Brouillon"
 
 msgctxt "selection:stock.shipment.internal,state:"
+msgid "Request"
+msgstr "Demande"
+
+msgctxt "selection:stock.shipment.internal,state:"
 msgid "Shipped"
 msgstr "Livrée"
 
@@ -2147,6 +2348,10 @@ msgid "Draft"
 msgstr "Brouillon"
 
 msgctxt "view:stock.shipment.in.return:"
+msgid "Other Info"
+msgstr "Autres informations"
+
+msgctxt "view:stock.shipment.in.return:"
 msgid "Wait"
 msgstr "Attendre"
 
@@ -2167,6 +2372,10 @@ msgid "Inventory Moves"
 msgstr "Mouvements internes"
 
 msgctxt "view:stock.shipment.in:"
+msgid "Other Info"
+msgstr "Autres informations"
+
+msgctxt "view:stock.shipment.in:"
 msgid "Receive"
 msgstr "Recevoir"
 
@@ -2195,6 +2404,10 @@ msgid "Draft"
 msgstr "Brouillon"
 
 msgctxt "view:stock.shipment.internal:"
+msgid "Other Info"
+msgstr "Autres informations"
+
+msgctxt "view:stock.shipment.internal:"
 msgid "Ship"
 msgstr "Livrer"
 
@@ -2227,6 +2440,10 @@ msgid "Inventory Moves"
 msgstr "Mouvements internes"
 
 msgctxt "view:stock.shipment.out.return:"
+msgid "Other Info"
+msgstr "Autres informations"
+
+msgctxt "view:stock.shipment.out.return:"
 msgid "Received"
 msgstr "Reçu"
 
@@ -2247,14 +2464,14 @@ msgid "Draft"
 msgstr "Brouillon"
 
 msgctxt "view:stock.shipment.out:"
-msgid "Inventory Moves"
-msgstr "Mouvements internes"
-
-msgctxt "view:stock.shipment.out:"
 msgid "Make shipment"
 msgstr "Faire l'expédition"
 
 msgctxt "view:stock.shipment.out:"
+msgid "Other Info"
+msgstr "Autres informations"
+
+msgctxt "view:stock.shipment.out:"
 msgid "Outgoing Moves"
 msgstr "Mouvements sortants"
 
diff --git a/locale/hu_HU.po b/locale/hu_HU.po
index e3718c9..39589e5 100644
--- a/locale/hu_HU.po
+++ b/locale/hu_HU.po
@@ -135,10 +135,57 @@ msgctxt "field:party.party,customer_location:"
 msgid "Customer Location"
 msgstr ""
 
+#, fuzzy
+msgctxt "field:party.party,locations:"
+msgid "Locations"
+msgstr "Raktárhely"
+
 msgctxt "field:party.party,supplier_location:"
 msgid "Supplier Location"
 msgstr ""
 
+#, fuzzy
+msgctxt "field:party.party.location,create_date:"
+msgid "Create Date"
+msgstr "Létrehozás détuma"
+
+#, fuzzy
+msgctxt "field:party.party.location,create_uid:"
+msgid "Create User"
+msgstr "Által létrehozva "
+
+msgctxt "field:party.party.location,customer_location:"
+msgid "Customer Location"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:party.party.location,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:party.party.location,party:"
+msgid "Party"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:party.party.location,rec_name:"
+msgid "Name"
+msgstr "Név"
+
+msgctxt "field:party.party.location,supplier_location:"
+msgid "Supplier Location"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:party.party.location,write_date:"
+msgid "Write Date"
+msgstr "utolsó módosítás dátuma"
+
+#, fuzzy
+msgctxt "field:party.party.location,write_uid:"
+msgid "Write User"
+msgstr "Által módosítva"
+
 msgctxt "field:product.by_location.context,forecast_date:"
 msgid "At Date"
 msgstr ""
@@ -239,6 +286,99 @@ msgid "Write User"
 msgstr "Által módosítva"
 
 #, fuzzy
+msgctxt "field:stock.configuration.location,create_date:"
+msgid "Create Date"
+msgstr "Létrehozás détuma"
+
+#, fuzzy
+msgctxt "field:stock.configuration.location,create_uid:"
+msgid "Create User"
+msgstr "Által létrehozva "
+
+#, fuzzy
+msgctxt "field:stock.configuration.location,id:"
+msgid "ID"
+msgstr "ID"
+
+#, fuzzy
+msgctxt "field:stock.configuration.location,rec_name:"
+msgid "Name"
+msgstr "Név"
+
+msgctxt "field:stock.configuration.location,shipment_internal_transit:"
+msgid "Internal Shipment Transit"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:stock.configuration.location,write_date:"
+msgid "Write Date"
+msgstr "utolsó módosítás dátuma"
+
+#, fuzzy
+msgctxt "field:stock.configuration.location,write_uid:"
+msgid "Write User"
+msgstr "Által módosítva"
+
+#, fuzzy
+msgctxt "field:stock.configuration.sequence,company:"
+msgid "Company"
+msgstr "Társaság"
+
+#, fuzzy
+msgctxt "field:stock.configuration.sequence,create_date:"
+msgid "Create Date"
+msgstr "Létrehozás détuma"
+
+#, fuzzy
+msgctxt "field:stock.configuration.sequence,create_uid:"
+msgid "Create User"
+msgstr "Által létrehozva "
+
+#, fuzzy
+msgctxt "field:stock.configuration.sequence,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:stock.configuration.sequence,inventory_sequence:"
+msgid "Inventory Sequence"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:stock.configuration.sequence,rec_name:"
+msgid "Name"
+msgstr "Név"
+
+msgctxt "field:stock.configuration.sequence,shipment_in_return_sequence:"
+msgid "Supplier Return Shipment Sequence"
+msgstr ""
+
+msgctxt "field:stock.configuration.sequence,shipment_in_sequence:"
+msgid "Supplier Shipment Sequence"
+msgstr ""
+
+msgctxt "field:stock.configuration.sequence,shipment_internal_sequence:"
+msgid "Internal Shipment Sequence"
+msgstr ""
+
+msgctxt "field:stock.configuration.sequence,shipment_out_return_sequence:"
+msgid "Customer Return Shipment Sequence"
+msgstr ""
+
+msgctxt "field:stock.configuration.sequence,shipment_out_sequence:"
+msgid "Customer Shipment Sequence"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:stock.configuration.sequence,write_date:"
+msgid "Write Date"
+msgstr "utolsó módosítás dátuma"
+
+#, fuzzy
+msgctxt "field:stock.configuration.sequence,write_uid:"
+msgid "Write User"
+msgstr "Által módosítva"
+
+#, fuzzy
 msgctxt "field:stock.inventory,company:"
 msgid "Company"
 msgstr "Társaság"
@@ -825,6 +965,10 @@ msgctxt "field:stock.shipment.in,create_uid:"
 msgid "Create User"
 msgstr "Által létrehozva "
 
+msgctxt "field:stock.shipment.in,done_by:"
+msgid "Done By"
+msgstr ""
+
 msgctxt "field:stock.shipment.in,effective_date:"
 msgid "Effective Date"
 msgstr ""
@@ -849,7 +993,7 @@ msgstr "Raktár mozgás"
 
 #, fuzzy
 msgctxt "field:stock.shipment.in,number:"
-msgid "Numer"
+msgid "Number"
 msgstr "Szám"
 
 msgctxt "field:stock.shipment.in,origins:"
@@ -865,6 +1009,10 @@ msgctxt "field:stock.shipment.in,rec_name:"
 msgid "Name"
 msgstr "Név"
 
+msgctxt "field:stock.shipment.in,received_by:"
+msgid "Received By"
+msgstr ""
+
 msgctxt "field:stock.shipment.in,reference:"
 msgid "Reference"
 msgstr ""
@@ -906,6 +1054,10 @@ msgctxt "field:stock.shipment.in,write_uid:"
 msgid "Write User"
 msgstr "Által módosítva"
 
+msgctxt "field:stock.shipment.in.return,assigned_by:"
+msgid "Assigned By"
+msgstr ""
+
 #, fuzzy
 msgctxt "field:stock.shipment.in.return,company:"
 msgid "Company"
@@ -925,6 +1077,10 @@ msgctxt "field:stock.shipment.in.return,delivery_address:"
 msgid "Delivery Address"
 msgstr ""
 
+msgctxt "field:stock.shipment.in.return,done_by:"
+msgid "Done By"
+msgstr ""
+
 msgctxt "field:stock.shipment.in.return,effective_date:"
 msgid "Effective Date"
 msgstr ""
@@ -999,6 +1155,10 @@ msgctxt "field:stock.shipment.in.return.assign.failed,moves:"
 msgid "Moves"
 msgstr "Raktár mozgás"
 
+msgctxt "field:stock.shipment.internal,assigned_by:"
+msgid "Received By"
+msgstr ""
+
 #, fuzzy
 msgctxt "field:stock.shipment.internal,company:"
 msgid "Company"
@@ -1014,6 +1174,10 @@ msgctxt "field:stock.shipment.internal,create_uid:"
 msgid "Create User"
 msgstr "Által létrehozva "
 
+msgctxt "field:stock.shipment.internal,done_by:"
+msgid "Done By"
+msgstr ""
+
 msgctxt "field:stock.shipment.internal,effective_date:"
 msgid "Effective Date"
 msgstr ""
@@ -1066,6 +1230,10 @@ msgctxt "field:stock.shipment.internal,reference:"
 msgid "Reference"
 msgstr ""
 
+msgctxt "field:stock.shipment.internal,shipped_by:"
+msgid "Shipped By"
+msgstr ""
+
 #, fuzzy
 msgctxt "field:stock.shipment.internal,state:"
 msgid "State"
@@ -1099,6 +1267,10 @@ msgctxt "field:stock.shipment.internal.assign.failed,moves:"
 msgid "Moves"
 msgstr "Raktár mozgás"
 
+msgctxt "field:stock.shipment.out,assigned_by:"
+msgid "Assigned By"
+msgstr ""
+
 #, fuzzy
 msgctxt "field:stock.shipment.out,company:"
 msgid "Company"
@@ -1127,6 +1299,10 @@ msgctxt "field:stock.shipment.out,delivery_address:"
 msgid "Delivery Address"
 msgstr ""
 
+msgctxt "field:stock.shipment.out,done_by:"
+msgid "Done By"
+msgstr ""
+
 msgctxt "field:stock.shipment.out,effective_date:"
 msgid "Effective Date"
 msgstr ""
@@ -1158,6 +1334,10 @@ msgctxt "field:stock.shipment.out,outgoing_moves:"
 msgid "Outgoing Moves"
 msgstr ""
 
+msgctxt "field:stock.shipment.out,packed_by:"
+msgid "Packed By"
+msgstr ""
+
 msgctxt "field:stock.shipment.out,planned_date:"
 msgid "Planned Date"
 msgstr ""
@@ -1236,6 +1416,10 @@ msgctxt "field:stock.shipment.out.return,delivery_address:"
 msgid "Delivery Address"
 msgstr ""
 
+msgctxt "field:stock.shipment.out.return,done_by:"
+msgid "Done By"
+msgstr ""
+
 msgctxt "field:stock.shipment.out.return,effective_date:"
 msgid "Effective Date"
 msgstr ""
@@ -1276,6 +1460,10 @@ msgctxt "field:stock.shipment.out.return,rec_name:"
 msgid "Name"
 msgstr "Név"
 
+msgctxt "field:stock.shipment.out.return,received_by:"
+msgid "Received By"
+msgstr ""
+
 msgctxt "field:stock.shipment.out.return,reference:"
 msgid "Reference"
 msgstr ""
@@ -1316,6 +1504,14 @@ msgctxt "help:party.party,supplier_location:"
 msgid "The default source location when receiving products from the party."
 msgstr ""
 
+msgctxt "help:party.party.location,customer_location:"
+msgid "The default destination location when sending products to the party."
+msgstr ""
+
+msgctxt "help:party.party.location,supplier_location:"
+msgid "The default source location when receiving products from the party."
+msgstr ""
+
 msgctxt "help:product.by_location.context,forecast_date:"
 msgid ""
 "Allow to compute expected stock quantities for this date.\n"
@@ -1527,6 +1723,11 @@ msgid "Draft"
 msgstr ""
 
 msgctxt ""
+"model:ir.action.act_window.domain,name:act_shipment_internal_form_domain_requests"
+msgid "Requests"
+msgstr ""
+
+msgctxt ""
 "model:ir.action.act_window.domain,name:act_shipment_internal_form_domain_shipped"
 msgid "Shipped"
 msgstr ""
@@ -1692,6 +1893,10 @@ msgctxt "model:ir.ui.menu,name:menu_stock_configuration"
 msgid "Stock Configuration"
 msgstr ""
 
+msgctxt "model:party.party.location,name:"
+msgid "Party Location"
+msgstr ""
+
 msgctxt "model:product.by_location.context,name:"
 msgid "Product by Location"
 msgstr ""
@@ -1712,6 +1917,14 @@ msgctxt "model:stock.configuration,name:"
 msgid "Stock Configuration"
 msgstr ""
 
+msgctxt "model:stock.configuration.location,name:"
+msgid "Stock Configuration Location"
+msgstr ""
+
+msgctxt "model:stock.configuration.sequence,name:"
+msgid "Stock Configuration Sequence"
+msgstr ""
+
 msgctxt "model:stock.inventory,name:"
 msgid "Stock Inventory"
 msgstr ""
@@ -2233,6 +2446,10 @@ msgid "Draft"
 msgstr ""
 
 msgctxt "selection:stock.shipment.internal,state:"
+msgid "Request"
+msgstr ""
+
+msgctxt "selection:stock.shipment.internal,state:"
 msgid "Shipped"
 msgstr ""
 
@@ -2363,6 +2580,10 @@ msgid "Draft"
 msgstr ""
 
 msgctxt "view:stock.shipment.in.return:"
+msgid "Other Info"
+msgstr ""
+
+msgctxt "view:stock.shipment.in.return:"
 msgid "Wait"
 msgstr ""
 
@@ -2385,6 +2606,10 @@ msgid "Inventory Moves"
 msgstr ""
 
 msgctxt "view:stock.shipment.in:"
+msgid "Other Info"
+msgstr ""
+
+msgctxt "view:stock.shipment.in:"
 msgid "Receive"
 msgstr ""
 
@@ -2415,6 +2640,10 @@ msgid "Draft"
 msgstr ""
 
 msgctxt "view:stock.shipment.internal:"
+msgid "Other Info"
+msgstr ""
+
+msgctxt "view:stock.shipment.internal:"
 msgid "Ship"
 msgstr ""
 
@@ -2449,6 +2678,10 @@ msgid "Inventory Moves"
 msgstr ""
 
 msgctxt "view:stock.shipment.out.return:"
+msgid "Other Info"
+msgstr ""
+
+msgctxt "view:stock.shipment.out.return:"
 msgid "Received"
 msgstr ""
 
@@ -2471,11 +2704,11 @@ msgid "Draft"
 msgstr ""
 
 msgctxt "view:stock.shipment.out:"
-msgid "Inventory Moves"
+msgid "Make shipment"
 msgstr ""
 
 msgctxt "view:stock.shipment.out:"
-msgid "Make shipment"
+msgid "Other Info"
 msgstr ""
 
 msgctxt "view:stock.shipment.out:"
diff --git a/locale/it_IT.po b/locale/it_IT.po
index 513eba7..6f91c64 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -130,10 +130,57 @@ msgctxt "field:party.party,customer_location:"
 msgid "Customer Location"
 msgstr ""
 
+#, fuzzy
+msgctxt "field:party.party,locations:"
+msgid "Locations"
+msgstr "Luogo"
+
 msgctxt "field:party.party,supplier_location:"
 msgid "Supplier Location"
 msgstr ""
 
+#, fuzzy
+msgctxt "field:party.party.location,create_date:"
+msgid "Create Date"
+msgstr "Data di creazione"
+
+#, fuzzy
+msgctxt "field:party.party.location,create_uid:"
+msgid "Create User"
+msgstr "Utente creazione"
+
+msgctxt "field:party.party.location,customer_location:"
+msgid "Customer Location"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:party.party.location,id:"
+msgid "ID"
+msgstr "Movimento contabile"
+
+msgctxt "field:party.party.location,party:"
+msgid "Party"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:party.party.location,rec_name:"
+msgid "Name"
+msgstr "Nome"
+
+msgctxt "field:party.party.location,supplier_location:"
+msgid "Supplier Location"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:party.party.location,write_date:"
+msgid "Write Date"
+msgstr "Utente scrittura"
+
+#, fuzzy
+msgctxt "field:party.party.location,write_uid:"
+msgid "Write User"
+msgstr "modificato da"
+
 msgctxt "field:product.by_location.context,forecast_date:"
 msgid "At Date"
 msgstr ""
@@ -232,6 +279,99 @@ msgid "Write User"
 msgstr "modificato da"
 
 #, fuzzy
+msgctxt "field:stock.configuration.location,create_date:"
+msgid "Create Date"
+msgstr "Data di creazione"
+
+#, fuzzy
+msgctxt "field:stock.configuration.location,create_uid:"
+msgid "Create User"
+msgstr "Utente creazione"
+
+#, fuzzy
+msgctxt "field:stock.configuration.location,id:"
+msgid "ID"
+msgstr "Movimento contabile"
+
+#, fuzzy
+msgctxt "field:stock.configuration.location,rec_name:"
+msgid "Name"
+msgstr "Nome"
+
+msgctxt "field:stock.configuration.location,shipment_internal_transit:"
+msgid "Internal Shipment Transit"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:stock.configuration.location,write_date:"
+msgid "Write Date"
+msgstr "Utente scrittura"
+
+#, fuzzy
+msgctxt "field:stock.configuration.location,write_uid:"
+msgid "Write User"
+msgstr "modificato da"
+
+#, fuzzy
+msgctxt "field:stock.configuration.sequence,company:"
+msgid "Company"
+msgstr "Azienda"
+
+#, fuzzy
+msgctxt "field:stock.configuration.sequence,create_date:"
+msgid "Create Date"
+msgstr "Data di creazione"
+
+#, fuzzy
+msgctxt "field:stock.configuration.sequence,create_uid:"
+msgid "Create User"
+msgstr "Utente creazione"
+
+#, fuzzy
+msgctxt "field:stock.configuration.sequence,id:"
+msgid "ID"
+msgstr "Movimento contabile"
+
+msgctxt "field:stock.configuration.sequence,inventory_sequence:"
+msgid "Inventory Sequence"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:stock.configuration.sequence,rec_name:"
+msgid "Name"
+msgstr "Nome"
+
+msgctxt "field:stock.configuration.sequence,shipment_in_return_sequence:"
+msgid "Supplier Return Shipment Sequence"
+msgstr ""
+
+msgctxt "field:stock.configuration.sequence,shipment_in_sequence:"
+msgid "Supplier Shipment Sequence"
+msgstr ""
+
+msgctxt "field:stock.configuration.sequence,shipment_internal_sequence:"
+msgid "Internal Shipment Sequence"
+msgstr ""
+
+msgctxt "field:stock.configuration.sequence,shipment_out_return_sequence:"
+msgid "Customer Return Shipment Sequence"
+msgstr ""
+
+msgctxt "field:stock.configuration.sequence,shipment_out_sequence:"
+msgid "Customer Shipment Sequence"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:stock.configuration.sequence,write_date:"
+msgid "Write Date"
+msgstr "Utente scrittura"
+
+#, fuzzy
+msgctxt "field:stock.configuration.sequence,write_uid:"
+msgid "Write User"
+msgstr "modificato da"
+
+#, fuzzy
 msgctxt "field:stock.inventory,company:"
 msgid "Company"
 msgstr "Azienda"
@@ -810,6 +950,10 @@ msgctxt "field:stock.shipment.in,create_uid:"
 msgid "Create User"
 msgstr "Utente creazione"
 
+msgctxt "field:stock.shipment.in,done_by:"
+msgid "Done By"
+msgstr ""
+
 #, fuzzy
 msgctxt "field:stock.shipment.in,effective_date:"
 msgid "Effective Date"
@@ -835,7 +979,7 @@ msgstr "Movimenti"
 
 #, fuzzy
 msgctxt "field:stock.shipment.in,number:"
-msgid "Numer"
+msgid "Number"
 msgstr "Numero"
 
 #, fuzzy
@@ -852,6 +996,10 @@ msgctxt "field:stock.shipment.in,rec_name:"
 msgid "Name"
 msgstr "Nome"
 
+msgctxt "field:stock.shipment.in,received_by:"
+msgid "Received By"
+msgstr ""
+
 #, fuzzy
 msgctxt "field:stock.shipment.in,reference:"
 msgid "Reference"
@@ -893,6 +1041,10 @@ msgctxt "field:stock.shipment.in,write_uid:"
 msgid "Write User"
 msgstr "modificato da"
 
+msgctxt "field:stock.shipment.in.return,assigned_by:"
+msgid "Assigned By"
+msgstr ""
+
 #, fuzzy
 msgctxt "field:stock.shipment.in.return,company:"
 msgid "Company"
@@ -912,6 +1064,10 @@ msgctxt "field:stock.shipment.in.return,delivery_address:"
 msgid "Delivery Address"
 msgstr ""
 
+msgctxt "field:stock.shipment.in.return,done_by:"
+msgid "Done By"
+msgstr ""
+
 #, fuzzy
 msgctxt "field:stock.shipment.in.return,effective_date:"
 msgid "Effective Date"
@@ -989,6 +1145,10 @@ msgctxt "field:stock.shipment.in.return.assign.failed,moves:"
 msgid "Moves"
 msgstr "Movimenti"
 
+msgctxt "field:stock.shipment.internal,assigned_by:"
+msgid "Received By"
+msgstr ""
+
 #, fuzzy
 msgctxt "field:stock.shipment.internal,company:"
 msgid "Company"
@@ -1004,6 +1164,10 @@ msgctxt "field:stock.shipment.internal,create_uid:"
 msgid "Create User"
 msgstr "Utente creazione"
 
+msgctxt "field:stock.shipment.internal,done_by:"
+msgid "Done By"
+msgstr ""
+
 #, fuzzy
 msgctxt "field:stock.shipment.internal,effective_date:"
 msgid "Effective Date"
@@ -1058,6 +1222,10 @@ msgctxt "field:stock.shipment.internal,reference:"
 msgid "Reference"
 msgstr "Riferimento"
 
+msgctxt "field:stock.shipment.internal,shipped_by:"
+msgid "Shipped By"
+msgstr ""
+
 #, fuzzy
 msgctxt "field:stock.shipment.internal,state:"
 msgid "State"
@@ -1091,6 +1259,10 @@ msgctxt "field:stock.shipment.internal.assign.failed,moves:"
 msgid "Moves"
 msgstr "Movimenti"
 
+msgctxt "field:stock.shipment.out,assigned_by:"
+msgid "Assigned By"
+msgstr ""
+
 #, fuzzy
 msgctxt "field:stock.shipment.out,company:"
 msgid "Company"
@@ -1119,6 +1291,10 @@ msgctxt "field:stock.shipment.out,delivery_address:"
 msgid "Delivery Address"
 msgstr ""
 
+msgctxt "field:stock.shipment.out,done_by:"
+msgid "Done By"
+msgstr ""
+
 #, fuzzy
 msgctxt "field:stock.shipment.out,effective_date:"
 msgid "Effective Date"
@@ -1152,6 +1328,10 @@ msgctxt "field:stock.shipment.out,outgoing_moves:"
 msgid "Outgoing Moves"
 msgstr ""
 
+msgctxt "field:stock.shipment.out,packed_by:"
+msgid "Packed By"
+msgstr ""
+
 msgctxt "field:stock.shipment.out,planned_date:"
 msgid "Planned Date"
 msgstr ""
@@ -1230,6 +1410,10 @@ msgctxt "field:stock.shipment.out.return,delivery_address:"
 msgid "Delivery Address"
 msgstr ""
 
+msgctxt "field:stock.shipment.out.return,done_by:"
+msgid "Done By"
+msgstr ""
+
 #, fuzzy
 msgctxt "field:stock.shipment.out.return,effective_date:"
 msgid "Effective Date"
@@ -1272,6 +1456,10 @@ msgctxt "field:stock.shipment.out.return,rec_name:"
 msgid "Name"
 msgstr "Nome"
 
+msgctxt "field:stock.shipment.out.return,received_by:"
+msgid "Received By"
+msgstr ""
+
 #, fuzzy
 msgctxt "field:stock.shipment.out.return,reference:"
 msgid "Reference"
@@ -1312,6 +1500,14 @@ msgctxt "help:party.party,supplier_location:"
 msgid "The default source location when receiving products from the party."
 msgstr ""
 
+msgctxt "help:party.party.location,customer_location:"
+msgid "The default destination location when sending products to the party."
+msgstr ""
+
+msgctxt "help:party.party.location,supplier_location:"
+msgid "The default source location when receiving products from the party."
+msgstr ""
+
 msgctxt "help:product.by_location.context,forecast_date:"
 msgid ""
 "Allow to compute expected stock quantities for this date.\n"
@@ -1528,6 +1724,11 @@ msgid "Draft"
 msgstr "Bozza"
 
 msgctxt ""
+"model:ir.action.act_window.domain,name:act_shipment_internal_form_domain_requests"
+msgid "Requests"
+msgstr ""
+
+msgctxt ""
 "model:ir.action.act_window.domain,name:act_shipment_internal_form_domain_shipped"
 msgid "Shipped"
 msgstr ""
@@ -1697,6 +1898,10 @@ msgctxt "model:ir.ui.menu,name:menu_stock_configuration"
 msgid "Stock Configuration"
 msgstr ""
 
+msgctxt "model:party.party.location,name:"
+msgid "Party Location"
+msgstr ""
+
 msgctxt "model:product.by_location.context,name:"
 msgid "Product by Location"
 msgstr ""
@@ -1718,6 +1923,14 @@ msgctxt "model:stock.configuration,name:"
 msgid "Stock Configuration"
 msgstr ""
 
+msgctxt "model:stock.configuration.location,name:"
+msgid "Stock Configuration Location"
+msgstr ""
+
+msgctxt "model:stock.configuration.sequence,name:"
+msgid "Stock Configuration Sequence"
+msgstr ""
+
 msgctxt "model:stock.inventory,name:"
 msgid "Stock Inventory"
 msgstr ""
@@ -2243,6 +2456,10 @@ msgid "Draft"
 msgstr "Bozza"
 
 msgctxt "selection:stock.shipment.internal,state:"
+msgid "Request"
+msgstr ""
+
+msgctxt "selection:stock.shipment.internal,state:"
 msgid "Shipped"
 msgstr ""
 
@@ -2379,6 +2596,10 @@ msgctxt "view:stock.shipment.in.return:"
 msgid "Draft"
 msgstr "Bozza"
 
+msgctxt "view:stock.shipment.in.return:"
+msgid "Other Info"
+msgstr ""
+
 #, fuzzy
 msgctxt "view:stock.shipment.in.return:"
 msgid "Wait"
@@ -2403,6 +2624,10 @@ msgid "Inventory Moves"
 msgstr ""
 
 msgctxt "view:stock.shipment.in:"
+msgid "Other Info"
+msgstr ""
+
+msgctxt "view:stock.shipment.in:"
 msgid "Receive"
 msgstr ""
 
@@ -2434,6 +2659,10 @@ msgid "Draft"
 msgstr "Bozza"
 
 msgctxt "view:stock.shipment.internal:"
+msgid "Other Info"
+msgstr ""
+
+msgctxt "view:stock.shipment.internal:"
 msgid "Ship"
 msgstr ""
 
@@ -2470,6 +2699,10 @@ msgid "Inventory Moves"
 msgstr ""
 
 msgctxt "view:stock.shipment.out.return:"
+msgid "Other Info"
+msgstr ""
+
+msgctxt "view:stock.shipment.out.return:"
 msgid "Received"
 msgstr ""
 
@@ -2493,11 +2726,11 @@ msgid "Draft"
 msgstr "Bozza"
 
 msgctxt "view:stock.shipment.out:"
-msgid "Inventory Moves"
+msgid "Make shipment"
 msgstr ""
 
 msgctxt "view:stock.shipment.out:"
-msgid "Make shipment"
+msgid "Other Info"
 msgstr ""
 
 msgctxt "view:stock.shipment.out:"
diff --git a/locale/ja_JP.po b/locale/ja_JP.po
index 32a61be..572b6ef 100644
--- a/locale/ja_JP.po
+++ b/locale/ja_JP.po
@@ -130,10 +130,51 @@ msgctxt "field:party.party,customer_location:"
 msgid "Customer Location"
 msgstr ""
 
+#, fuzzy
+msgctxt "field:party.party,locations:"
+msgid "Locations"
+msgstr "Locations"
+
 msgctxt "field:party.party,supplier_location:"
 msgid "Supplier Location"
 msgstr ""
 
+msgctxt "field:party.party.location,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:party.party.location,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:party.party.location,customer_location:"
+msgid "Customer Location"
+msgstr ""
+
+msgctxt "field:party.party.location,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:party.party.location,party:"
+msgid "Party"
+msgstr ""
+
+msgctxt "field:party.party.location,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:party.party.location,supplier_location:"
+msgid "Supplier Location"
+msgstr ""
+
+msgctxt "field:party.party.location,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:party.party.location,write_uid:"
+msgid "Write User"
+msgstr ""
+
 msgctxt "field:product.by_location.context,forecast_date:"
 msgid "At Date"
 msgstr ""
@@ -222,6 +263,86 @@ msgctxt "field:stock.configuration,write_uid:"
 msgid "Write User"
 msgstr ""
 
+msgctxt "field:stock.configuration.location,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:stock.configuration.location,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:stock.configuration.location,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:stock.configuration.location,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:stock.configuration.location,shipment_internal_transit:"
+msgid "Internal Shipment Transit"
+msgstr ""
+
+msgctxt "field:stock.configuration.location,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:stock.configuration.location,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:stock.configuration.sequence,company:"
+msgid "Company"
+msgstr ""
+
+msgctxt "field:stock.configuration.sequence,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:stock.configuration.sequence,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:stock.configuration.sequence,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:stock.configuration.sequence,inventory_sequence:"
+msgid "Inventory Sequence"
+msgstr ""
+
+msgctxt "field:stock.configuration.sequence,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:stock.configuration.sequence,shipment_in_return_sequence:"
+msgid "Supplier Return Shipment Sequence"
+msgstr ""
+
+msgctxt "field:stock.configuration.sequence,shipment_in_sequence:"
+msgid "Supplier Shipment Sequence"
+msgstr ""
+
+msgctxt "field:stock.configuration.sequence,shipment_internal_sequence:"
+msgid "Internal Shipment Sequence"
+msgstr ""
+
+msgctxt "field:stock.configuration.sequence,shipment_out_return_sequence:"
+msgid "Customer Return Shipment Sequence"
+msgstr ""
+
+msgctxt "field:stock.configuration.sequence,shipment_out_sequence:"
+msgid "Customer Shipment Sequence"
+msgstr ""
+
+msgctxt "field:stock.configuration.sequence,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:stock.configuration.sequence,write_uid:"
+msgid "Write User"
+msgstr ""
+
 msgctxt "field:stock.inventory,company:"
 msgid "Company"
 msgstr ""
@@ -723,6 +844,10 @@ msgctxt "field:stock.shipment.in,create_uid:"
 msgid "Create User"
 msgstr ""
 
+msgctxt "field:stock.shipment.in,done_by:"
+msgid "Done By"
+msgstr ""
+
 msgctxt "field:stock.shipment.in,effective_date:"
 msgid "Effective Date"
 msgstr ""
@@ -745,7 +870,7 @@ msgid "Moves"
 msgstr "Moves"
 
 msgctxt "field:stock.shipment.in,number:"
-msgid "Numer"
+msgid "Number"
 msgstr ""
 
 msgctxt "field:stock.shipment.in,origins:"
@@ -760,6 +885,10 @@ msgctxt "field:stock.shipment.in,rec_name:"
 msgid "Name"
 msgstr ""
 
+msgctxt "field:stock.shipment.in,received_by:"
+msgid "Received By"
+msgstr ""
+
 msgctxt "field:stock.shipment.in,reference:"
 msgid "Reference"
 msgstr ""
@@ -798,6 +927,10 @@ msgctxt "field:stock.shipment.in,write_uid:"
 msgid "Write User"
 msgstr ""
 
+msgctxt "field:stock.shipment.in.return,assigned_by:"
+msgid "Assigned By"
+msgstr ""
+
 msgctxt "field:stock.shipment.in.return,company:"
 msgid "Company"
 msgstr ""
@@ -814,6 +947,10 @@ msgctxt "field:stock.shipment.in.return,delivery_address:"
 msgid "Delivery Address"
 msgstr ""
 
+msgctxt "field:stock.shipment.in.return,done_by:"
+msgid "Done By"
+msgstr ""
+
 msgctxt "field:stock.shipment.in.return,effective_date:"
 msgid "Effective Date"
 msgstr ""
@@ -881,6 +1018,10 @@ msgctxt "field:stock.shipment.in.return.assign.failed,moves:"
 msgid "Moves"
 msgstr "Moves"
 
+msgctxt "field:stock.shipment.internal,assigned_by:"
+msgid "Received By"
+msgstr ""
+
 msgctxt "field:stock.shipment.internal,company:"
 msgid "Company"
 msgstr ""
@@ -893,6 +1034,10 @@ msgctxt "field:stock.shipment.internal,create_uid:"
 msgid "Create User"
 msgstr ""
 
+msgctxt "field:stock.shipment.internal,done_by:"
+msgid "Done By"
+msgstr ""
+
 msgctxt "field:stock.shipment.internal,effective_date:"
 msgid "Effective Date"
 msgstr ""
@@ -942,6 +1087,10 @@ msgctxt "field:stock.shipment.internal,reference:"
 msgid "Reference"
 msgstr ""
 
+msgctxt "field:stock.shipment.internal,shipped_by:"
+msgid "Shipped By"
+msgstr ""
+
 msgctxt "field:stock.shipment.internal,state:"
 msgid "State"
 msgstr ""
@@ -971,6 +1120,10 @@ msgctxt "field:stock.shipment.internal.assign.failed,moves:"
 msgid "Moves"
 msgstr "Moves"
 
+msgctxt "field:stock.shipment.out,assigned_by:"
+msgid "Assigned By"
+msgstr ""
+
 msgctxt "field:stock.shipment.out,company:"
 msgid "Company"
 msgstr ""
@@ -996,6 +1149,10 @@ msgctxt "field:stock.shipment.out,delivery_address:"
 msgid "Delivery Address"
 msgstr ""
 
+msgctxt "field:stock.shipment.out,done_by:"
+msgid "Done By"
+msgstr ""
+
 msgctxt "field:stock.shipment.out,effective_date:"
 msgid "Effective Date"
 msgstr ""
@@ -1025,6 +1182,10 @@ msgctxt "field:stock.shipment.out,outgoing_moves:"
 msgid "Outgoing Moves"
 msgstr ""
 
+msgctxt "field:stock.shipment.out,packed_by:"
+msgid "Packed By"
+msgstr ""
+
 msgctxt "field:stock.shipment.out,planned_date:"
 msgid "Planned Date"
 msgstr ""
@@ -1095,6 +1256,10 @@ msgctxt "field:stock.shipment.out.return,delivery_address:"
 msgid "Delivery Address"
 msgstr ""
 
+msgctxt "field:stock.shipment.out.return,done_by:"
+msgid "Done By"
+msgstr ""
+
 msgctxt "field:stock.shipment.out.return,effective_date:"
 msgid "Effective Date"
 msgstr ""
@@ -1132,6 +1297,10 @@ msgctxt "field:stock.shipment.out.return,rec_name:"
 msgid "Name"
 msgstr ""
 
+msgctxt "field:stock.shipment.out.return,received_by:"
+msgid "Received By"
+msgstr ""
+
 msgctxt "field:stock.shipment.out.return,reference:"
 msgid "Reference"
 msgstr ""
@@ -1169,6 +1338,14 @@ msgctxt "help:party.party,supplier_location:"
 msgid "The default source location when receiving products from the party."
 msgstr ""
 
+msgctxt "help:party.party.location,customer_location:"
+msgid "The default destination location when sending products to the party."
+msgstr ""
+
+msgctxt "help:party.party.location,supplier_location:"
+msgid "The default source location when receiving products from the party."
+msgstr ""
+
 msgctxt "help:product.by_location.context,forecast_date:"
 msgid ""
 "Allow to compute expected stock quantities for this date.\n"
@@ -1370,6 +1547,11 @@ msgid "Draft"
 msgstr "Draft"
 
 msgctxt ""
+"model:ir.action.act_window.domain,name:act_shipment_internal_form_domain_requests"
+msgid "Requests"
+msgstr ""
+
+msgctxt ""
 "model:ir.action.act_window.domain,name:act_shipment_internal_form_domain_shipped"
 msgid "Shipped"
 msgstr "Shipped"
@@ -1527,6 +1709,10 @@ msgctxt "model:ir.ui.menu,name:menu_stock_configuration"
 msgid "Stock Configuration"
 msgstr "Stock Configuration"
 
+msgctxt "model:party.party.location,name:"
+msgid "Party Location"
+msgstr ""
+
 msgctxt "model:product.by_location.context,name:"
 msgid "Product by Location"
 msgstr ""
@@ -1548,6 +1734,14 @@ msgctxt "model:stock.configuration,name:"
 msgid "Stock Configuration"
 msgstr "Stock Configuration"
 
+msgctxt "model:stock.configuration.location,name:"
+msgid "Stock Configuration Location"
+msgstr ""
+
+msgctxt "model:stock.configuration.sequence,name:"
+msgid "Stock Configuration Sequence"
+msgstr ""
+
 msgctxt "model:stock.inventory,name:"
 msgid "Stock Inventory"
 msgstr ""
@@ -2059,6 +2253,10 @@ msgctxt "selection:stock.shipment.internal,state:"
 msgid "Draft"
 msgstr "Draft"
 
+msgctxt "selection:stock.shipment.internal,state:"
+msgid "Request"
+msgstr ""
+
 #, fuzzy
 msgctxt "selection:stock.shipment.internal,state:"
 msgid "Shipped"
@@ -2193,6 +2391,10 @@ msgid "Draft"
 msgstr "Draft"
 
 msgctxt "view:stock.shipment.in.return:"
+msgid "Other Info"
+msgstr ""
+
+msgctxt "view:stock.shipment.in.return:"
 msgid "Wait"
 msgstr ""
 
@@ -2212,6 +2414,10 @@ msgctxt "view:stock.shipment.in:"
 msgid "Inventory Moves"
 msgstr ""
 
+msgctxt "view:stock.shipment.in:"
+msgid "Other Info"
+msgstr ""
+
 #, fuzzy
 msgctxt "view:stock.shipment.in:"
 msgid "Receive"
@@ -2244,6 +2450,10 @@ msgid "Draft"
 msgstr "Draft"
 
 msgctxt "view:stock.shipment.internal:"
+msgid "Other Info"
+msgstr ""
+
+msgctxt "view:stock.shipment.internal:"
 msgid "Ship"
 msgstr ""
 
@@ -2276,6 +2486,10 @@ msgctxt "view:stock.shipment.out.return:"
 msgid "Inventory Moves"
 msgstr ""
 
+msgctxt "view:stock.shipment.out.return:"
+msgid "Other Info"
+msgstr ""
+
 #, fuzzy
 msgctxt "view:stock.shipment.out.return:"
 msgid "Received"
@@ -2300,11 +2514,11 @@ msgid "Draft"
 msgstr "Draft"
 
 msgctxt "view:stock.shipment.out:"
-msgid "Inventory Moves"
+msgid "Make shipment"
 msgstr ""
 
 msgctxt "view:stock.shipment.out:"
-msgid "Make shipment"
+msgid "Other Info"
 msgstr ""
 
 msgctxt "view:stock.shipment.out:"
diff --git a/locale/lo.po b/locale/lo.po
index 66dd61d..de5d4e8 100644
--- a/locale/lo.po
+++ b/locale/lo.po
@@ -130,10 +130,57 @@ msgctxt "field:party.party,customer_location:"
 msgid "Customer Location"
 msgstr ""
 
+#, fuzzy
+msgctxt "field:party.party,locations:"
+msgid "Locations"
+msgstr "ບ່ອນຢູ່"
+
 msgctxt "field:party.party,supplier_location:"
 msgid "Supplier Location"
 msgstr ""
 
+#, fuzzy
+msgctxt "field:party.party.location,create_date:"
+msgid "Create Date"
+msgstr "ສ້າງວັນທີ"
+
+#, fuzzy
+msgctxt "field:party.party.location,create_uid:"
+msgid "Create User"
+msgstr "ສ້າງຜູ້ໃຊ້ງານ"
+
+msgctxt "field:party.party.location,customer_location:"
+msgid "Customer Location"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:party.party.location,id:"
+msgid "ID"
+msgstr "ເລດລຳດັບ"
+
+msgctxt "field:party.party.location,party:"
+msgid "Party"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:party.party.location,rec_name:"
+msgid "Name"
+msgstr "ຊື່"
+
+msgctxt "field:party.party.location,supplier_location:"
+msgid "Supplier Location"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:party.party.location,write_date:"
+msgid "Write Date"
+msgstr "ຂຽນວັນທີ"
+
+#, fuzzy
+msgctxt "field:party.party.location,write_uid:"
+msgid "Write User"
+msgstr "ຂຽນຜູ້ໃຊ້ງານ"
+
 msgctxt "field:product.by_location.context,forecast_date:"
 msgid "At Date"
 msgstr ""
@@ -232,6 +279,99 @@ msgid "Write User"
 msgstr "ຂຽນຜູ້ໃຊ້ງານ"
 
 #, fuzzy
+msgctxt "field:stock.configuration.location,create_date:"
+msgid "Create Date"
+msgstr "ສ້າງວັນທີ"
+
+#, fuzzy
+msgctxt "field:stock.configuration.location,create_uid:"
+msgid "Create User"
+msgstr "ສ້າງຜູ້ໃຊ້ງານ"
+
+#, fuzzy
+msgctxt "field:stock.configuration.location,id:"
+msgid "ID"
+msgstr "ເລດລຳດັບ"
+
+#, fuzzy
+msgctxt "field:stock.configuration.location,rec_name:"
+msgid "Name"
+msgstr "ຊື່"
+
+msgctxt "field:stock.configuration.location,shipment_internal_transit:"
+msgid "Internal Shipment Transit"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:stock.configuration.location,write_date:"
+msgid "Write Date"
+msgstr "ຂຽນວັນທີ"
+
+#, fuzzy
+msgctxt "field:stock.configuration.location,write_uid:"
+msgid "Write User"
+msgstr "ຂຽນຜູ້ໃຊ້ງານ"
+
+#, fuzzy
+msgctxt "field:stock.configuration.sequence,company:"
+msgid "Company"
+msgstr "ສຳນັກງານ"
+
+#, fuzzy
+msgctxt "field:stock.configuration.sequence,create_date:"
+msgid "Create Date"
+msgstr "ສ້າງວັນທີ"
+
+#, fuzzy
+msgctxt "field:stock.configuration.sequence,create_uid:"
+msgid "Create User"
+msgstr "ສ້າງຜູ້ໃຊ້ງານ"
+
+#, fuzzy
+msgctxt "field:stock.configuration.sequence,id:"
+msgid "ID"
+msgstr "ເລດລຳດັບ"
+
+msgctxt "field:stock.configuration.sequence,inventory_sequence:"
+msgid "Inventory Sequence"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:stock.configuration.sequence,rec_name:"
+msgid "Name"
+msgstr "ຊື່"
+
+msgctxt "field:stock.configuration.sequence,shipment_in_return_sequence:"
+msgid "Supplier Return Shipment Sequence"
+msgstr ""
+
+msgctxt "field:stock.configuration.sequence,shipment_in_sequence:"
+msgid "Supplier Shipment Sequence"
+msgstr ""
+
+msgctxt "field:stock.configuration.sequence,shipment_internal_sequence:"
+msgid "Internal Shipment Sequence"
+msgstr ""
+
+msgctxt "field:stock.configuration.sequence,shipment_out_return_sequence:"
+msgid "Customer Return Shipment Sequence"
+msgstr ""
+
+msgctxt "field:stock.configuration.sequence,shipment_out_sequence:"
+msgid "Customer Shipment Sequence"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:stock.configuration.sequence,write_date:"
+msgid "Write Date"
+msgstr "ຂຽນວັນທີ"
+
+#, fuzzy
+msgctxt "field:stock.configuration.sequence,write_uid:"
+msgid "Write User"
+msgstr "ຂຽນຜູ້ໃຊ້ງານ"
+
+#, fuzzy
 msgctxt "field:stock.inventory,company:"
 msgid "Company"
 msgstr "ສຳນັກງານ"
@@ -800,6 +940,10 @@ msgctxt "field:stock.shipment.in,create_uid:"
 msgid "Create User"
 msgstr "ສ້າງຜູ້ໃຊ້ງານ"
 
+msgctxt "field:stock.shipment.in,done_by:"
+msgid "Done By"
+msgstr ""
+
 #, fuzzy
 msgctxt "field:stock.shipment.in,effective_date:"
 msgid "Effective Date"
@@ -824,7 +968,7 @@ msgstr "ຕັດບັນຊີສາງ"
 
 #, fuzzy
 msgctxt "field:stock.shipment.in,number:"
-msgid "Numer"
+msgid "Number"
 msgstr "ເລກທີ"
 
 #, fuzzy
@@ -841,6 +985,10 @@ msgctxt "field:stock.shipment.in,rec_name:"
 msgid "Name"
 msgstr "ຊື່"
 
+msgctxt "field:stock.shipment.in,received_by:"
+msgid "Received By"
+msgstr ""
+
 #, fuzzy
 msgctxt "field:stock.shipment.in,reference:"
 msgid "Reference"
@@ -882,6 +1030,10 @@ msgctxt "field:stock.shipment.in,write_uid:"
 msgid "Write User"
 msgstr "ຂຽນຜູ້ໃຊ້ງານ"
 
+msgctxt "field:stock.shipment.in.return,assigned_by:"
+msgid "Assigned By"
+msgstr ""
+
 #, fuzzy
 msgctxt "field:stock.shipment.in.return,company:"
 msgid "Company"
@@ -901,6 +1053,10 @@ msgctxt "field:stock.shipment.in.return,delivery_address:"
 msgid "Delivery Address"
 msgstr ""
 
+msgctxt "field:stock.shipment.in.return,done_by:"
+msgid "Done By"
+msgstr ""
+
 #, fuzzy
 msgctxt "field:stock.shipment.in.return,effective_date:"
 msgid "Effective Date"
@@ -978,6 +1134,10 @@ msgctxt "field:stock.shipment.in.return.assign.failed,moves:"
 msgid "Moves"
 msgstr "ຕັດບັນຊີສາງ"
 
+msgctxt "field:stock.shipment.internal,assigned_by:"
+msgid "Received By"
+msgstr ""
+
 #, fuzzy
 msgctxt "field:stock.shipment.internal,company:"
 msgid "Company"
@@ -993,6 +1153,10 @@ msgctxt "field:stock.shipment.internal,create_uid:"
 msgid "Create User"
 msgstr "ສ້າງຜູ້ໃຊ້ງານ"
 
+msgctxt "field:stock.shipment.internal,done_by:"
+msgid "Done By"
+msgstr ""
+
 #, fuzzy
 msgctxt "field:stock.shipment.internal,effective_date:"
 msgid "Effective Date"
@@ -1047,6 +1211,10 @@ msgctxt "field:stock.shipment.internal,reference:"
 msgid "Reference"
 msgstr "ເອກະສານອ້າງອີງ"
 
+msgctxt "field:stock.shipment.internal,shipped_by:"
+msgid "Shipped By"
+msgstr ""
+
 #, fuzzy
 msgctxt "field:stock.shipment.internal,state:"
 msgid "State"
@@ -1080,6 +1248,10 @@ msgctxt "field:stock.shipment.internal.assign.failed,moves:"
 msgid "Moves"
 msgstr "ຕັດບັນຊີສາງ"
 
+msgctxt "field:stock.shipment.out,assigned_by:"
+msgid "Assigned By"
+msgstr ""
+
 #, fuzzy
 msgctxt "field:stock.shipment.out,company:"
 msgid "Company"
@@ -1107,6 +1279,10 @@ msgctxt "field:stock.shipment.out,delivery_address:"
 msgid "Delivery Address"
 msgstr ""
 
+msgctxt "field:stock.shipment.out,done_by:"
+msgid "Done By"
+msgstr ""
+
 #, fuzzy
 msgctxt "field:stock.shipment.out,effective_date:"
 msgid "Effective Date"
@@ -1140,6 +1316,10 @@ msgctxt "field:stock.shipment.out,outgoing_moves:"
 msgid "Outgoing Moves"
 msgstr ""
 
+msgctxt "field:stock.shipment.out,packed_by:"
+msgid "Packed By"
+msgstr ""
+
 msgctxt "field:stock.shipment.out,planned_date:"
 msgid "Planned Date"
 msgstr ""
@@ -1217,6 +1397,10 @@ msgctxt "field:stock.shipment.out.return,delivery_address:"
 msgid "Delivery Address"
 msgstr ""
 
+msgctxt "field:stock.shipment.out.return,done_by:"
+msgid "Done By"
+msgstr ""
+
 #, fuzzy
 msgctxt "field:stock.shipment.out.return,effective_date:"
 msgid "Effective Date"
@@ -1259,6 +1443,10 @@ msgctxt "field:stock.shipment.out.return,rec_name:"
 msgid "Name"
 msgstr "ຊື່"
 
+msgctxt "field:stock.shipment.out.return,received_by:"
+msgid "Received By"
+msgstr ""
+
 #, fuzzy
 msgctxt "field:stock.shipment.out.return,reference:"
 msgid "Reference"
@@ -1299,6 +1487,14 @@ msgctxt "help:party.party,supplier_location:"
 msgid "The default source location when receiving products from the party."
 msgstr ""
 
+msgctxt "help:party.party.location,customer_location:"
+msgid "The default destination location when sending products to the party."
+msgstr ""
+
+msgctxt "help:party.party.location,supplier_location:"
+msgid "The default source location when receiving products from the party."
+msgstr ""
+
 msgctxt "help:product.by_location.context,forecast_date:"
 msgid ""
 "Allow to compute expected stock quantities for this date.\n"
@@ -1520,6 +1716,11 @@ msgid "Draft"
 msgstr "ຊົ່ວຄາວ"
 
 msgctxt ""
+"model:ir.action.act_window.domain,name:act_shipment_internal_form_domain_requests"
+msgid "Requests"
+msgstr ""
+
+msgctxt ""
 "model:ir.action.act_window.domain,name:act_shipment_internal_form_domain_shipped"
 msgid "Shipped"
 msgstr ""
@@ -1692,6 +1893,10 @@ msgctxt "model:ir.ui.menu,name:menu_stock_configuration"
 msgid "Stock Configuration"
 msgstr "ການຕັ້ງຄ່າສາງ"
 
+msgctxt "model:party.party.location,name:"
+msgid "Party Location"
+msgstr ""
+
 #, fuzzy
 msgctxt "model:product.by_location.context,name:"
 msgid "Product by Location"
@@ -1715,6 +1920,14 @@ msgctxt "model:stock.configuration,name:"
 msgid "Stock Configuration"
 msgstr "ການຕັ້ງຄ່າສາງ"
 
+msgctxt "model:stock.configuration.location,name:"
+msgid "Stock Configuration Location"
+msgstr ""
+
+msgctxt "model:stock.configuration.sequence,name:"
+msgid "Stock Configuration Sequence"
+msgstr ""
+
 msgctxt "model:stock.inventory,name:"
 msgid "Stock Inventory"
 msgstr ""
@@ -2229,6 +2442,10 @@ msgid "Draft"
 msgstr "ຊົ່ວຄາວ"
 
 msgctxt "selection:stock.shipment.internal,state:"
+msgid "Request"
+msgstr ""
+
+msgctxt "selection:stock.shipment.internal,state:"
 msgid "Shipped"
 msgstr ""
 
@@ -2358,6 +2575,10 @@ msgid "Draft"
 msgstr "ຊົ່ວຄາວ"
 
 msgctxt "view:stock.shipment.in.return:"
+msgid "Other Info"
+msgstr ""
+
+msgctxt "view:stock.shipment.in.return:"
 msgid "Wait"
 msgstr ""
 
@@ -2379,6 +2600,10 @@ msgid "Inventory Moves"
 msgstr ""
 
 msgctxt "view:stock.shipment.in:"
+msgid "Other Info"
+msgstr ""
+
+msgctxt "view:stock.shipment.in:"
 msgid "Receive"
 msgstr ""
 
@@ -2409,6 +2634,10 @@ msgid "Draft"
 msgstr "ຊົ່ວຄາວ"
 
 msgctxt "view:stock.shipment.internal:"
+msgid "Other Info"
+msgstr ""
+
+msgctxt "view:stock.shipment.internal:"
 msgid "Ship"
 msgstr ""
 
@@ -2443,6 +2672,10 @@ msgid "Inventory Moves"
 msgstr ""
 
 msgctxt "view:stock.shipment.out.return:"
+msgid "Other Info"
+msgstr ""
+
+msgctxt "view:stock.shipment.out.return:"
 msgid "Received"
 msgstr ""
 
@@ -2465,11 +2698,11 @@ msgid "Draft"
 msgstr "ຊົ່ວຄາວ"
 
 msgctxt "view:stock.shipment.out:"
-msgid "Inventory Moves"
+msgid "Make shipment"
 msgstr ""
 
 msgctxt "view:stock.shipment.out:"
-msgid "Make shipment"
+msgid "Other Info"
 msgstr ""
 
 msgctxt "view:stock.shipment.out:"
diff --git a/locale/lt.po b/locale/lt.po
index 66c701f..c8ff490 100644
--- a/locale/lt.po
+++ b/locale/lt.po
@@ -130,10 +130,51 @@ msgctxt "field:party.party,customer_location:"
 msgid "Customer Location"
 msgstr ""
 
+msgctxt "field:party.party,locations:"
+msgid "Locations"
+msgstr ""
+
 msgctxt "field:party.party,supplier_location:"
 msgid "Supplier Location"
 msgstr ""
 
+msgctxt "field:party.party.location,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:party.party.location,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:party.party.location,customer_location:"
+msgid "Customer Location"
+msgstr ""
+
+msgctxt "field:party.party.location,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:party.party.location,party:"
+msgid "Party"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:party.party.location,rec_name:"
+msgid "Name"
+msgstr "Namu"
+
+msgctxt "field:party.party.location,supplier_location:"
+msgid "Supplier Location"
+msgstr ""
+
+msgctxt "field:party.party.location,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:party.party.location,write_uid:"
+msgid "Write User"
+msgstr ""
+
 msgctxt "field:product.by_location.context,forecast_date:"
 msgid "At Date"
 msgstr ""
@@ -223,6 +264,88 @@ msgctxt "field:stock.configuration,write_uid:"
 msgid "Write User"
 msgstr ""
 
+msgctxt "field:stock.configuration.location,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:stock.configuration.location,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:stock.configuration.location,id:"
+msgid "ID"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:stock.configuration.location,rec_name:"
+msgid "Name"
+msgstr "Namu"
+
+msgctxt "field:stock.configuration.location,shipment_internal_transit:"
+msgid "Internal Shipment Transit"
+msgstr ""
+
+msgctxt "field:stock.configuration.location,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:stock.configuration.location,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:stock.configuration.sequence,company:"
+msgid "Company"
+msgstr ""
+
+msgctxt "field:stock.configuration.sequence,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:stock.configuration.sequence,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:stock.configuration.sequence,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:stock.configuration.sequence,inventory_sequence:"
+msgid "Inventory Sequence"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:stock.configuration.sequence,rec_name:"
+msgid "Name"
+msgstr "Namu"
+
+msgctxt "field:stock.configuration.sequence,shipment_in_return_sequence:"
+msgid "Supplier Return Shipment Sequence"
+msgstr ""
+
+msgctxt "field:stock.configuration.sequence,shipment_in_sequence:"
+msgid "Supplier Shipment Sequence"
+msgstr ""
+
+msgctxt "field:stock.configuration.sequence,shipment_internal_sequence:"
+msgid "Internal Shipment Sequence"
+msgstr ""
+
+msgctxt "field:stock.configuration.sequence,shipment_out_return_sequence:"
+msgid "Customer Return Shipment Sequence"
+msgstr ""
+
+msgctxt "field:stock.configuration.sequence,shipment_out_sequence:"
+msgid "Customer Shipment Sequence"
+msgstr ""
+
+msgctxt "field:stock.configuration.sequence,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:stock.configuration.sequence,write_uid:"
+msgid "Write User"
+msgstr ""
+
 msgctxt "field:stock.inventory,company:"
 msgid "Company"
 msgstr ""
@@ -720,6 +843,10 @@ msgctxt "field:stock.shipment.in,create_uid:"
 msgid "Create User"
 msgstr ""
 
+msgctxt "field:stock.shipment.in,done_by:"
+msgid "Done By"
+msgstr ""
+
 msgctxt "field:stock.shipment.in,effective_date:"
 msgid "Effective Date"
 msgstr ""
@@ -741,7 +868,7 @@ msgid "Moves"
 msgstr ""
 
 msgctxt "field:stock.shipment.in,number:"
-msgid "Numer"
+msgid "Number"
 msgstr ""
 
 msgctxt "field:stock.shipment.in,origins:"
@@ -757,6 +884,10 @@ msgctxt "field:stock.shipment.in,rec_name:"
 msgid "Name"
 msgstr "Namu"
 
+msgctxt "field:stock.shipment.in,received_by:"
+msgid "Received By"
+msgstr ""
+
 msgctxt "field:stock.shipment.in,reference:"
 msgid "Reference"
 msgstr ""
@@ -793,6 +924,10 @@ msgctxt "field:stock.shipment.in,write_uid:"
 msgid "Write User"
 msgstr ""
 
+msgctxt "field:stock.shipment.in.return,assigned_by:"
+msgid "Assigned By"
+msgstr ""
+
 msgctxt "field:stock.shipment.in.return,company:"
 msgid "Company"
 msgstr ""
@@ -809,6 +944,10 @@ msgctxt "field:stock.shipment.in.return,delivery_address:"
 msgid "Delivery Address"
 msgstr ""
 
+msgctxt "field:stock.shipment.in.return,done_by:"
+msgid "Done By"
+msgstr ""
+
 msgctxt "field:stock.shipment.in.return,effective_date:"
 msgid "Effective Date"
 msgstr ""
@@ -874,6 +1013,10 @@ msgctxt "field:stock.shipment.in.return.assign.failed,moves:"
 msgid "Moves"
 msgstr ""
 
+msgctxt "field:stock.shipment.internal,assigned_by:"
+msgid "Received By"
+msgstr ""
+
 msgctxt "field:stock.shipment.internal,company:"
 msgid "Company"
 msgstr ""
@@ -886,6 +1029,10 @@ msgctxt "field:stock.shipment.internal,create_uid:"
 msgid "Create User"
 msgstr ""
 
+msgctxt "field:stock.shipment.internal,done_by:"
+msgid "Done By"
+msgstr ""
+
 msgctxt "field:stock.shipment.internal,effective_date:"
 msgid "Effective Date"
 msgstr ""
@@ -935,6 +1082,10 @@ msgctxt "field:stock.shipment.internal,reference:"
 msgid "Reference"
 msgstr ""
 
+msgctxt "field:stock.shipment.internal,shipped_by:"
+msgid "Shipped By"
+msgstr ""
+
 msgctxt "field:stock.shipment.internal,state:"
 msgid "State"
 msgstr ""
@@ -963,6 +1114,10 @@ msgctxt "field:stock.shipment.internal.assign.failed,moves:"
 msgid "Moves"
 msgstr ""
 
+msgctxt "field:stock.shipment.out,assigned_by:"
+msgid "Assigned By"
+msgstr ""
+
 msgctxt "field:stock.shipment.out,company:"
 msgid "Company"
 msgstr ""
@@ -987,6 +1142,10 @@ msgctxt "field:stock.shipment.out,delivery_address:"
 msgid "Delivery Address"
 msgstr ""
 
+msgctxt "field:stock.shipment.out,done_by:"
+msgid "Done By"
+msgstr ""
+
 msgctxt "field:stock.shipment.out,effective_date:"
 msgid "Effective Date"
 msgstr ""
@@ -1015,6 +1174,10 @@ msgctxt "field:stock.shipment.out,outgoing_moves:"
 msgid "Outgoing Moves"
 msgstr ""
 
+msgctxt "field:stock.shipment.out,packed_by:"
+msgid "Packed By"
+msgstr ""
+
 msgctxt "field:stock.shipment.out,planned_date:"
 msgid "Planned Date"
 msgstr ""
@@ -1084,6 +1247,10 @@ msgctxt "field:stock.shipment.out.return,delivery_address:"
 msgid "Delivery Address"
 msgstr ""
 
+msgctxt "field:stock.shipment.out.return,done_by:"
+msgid "Done By"
+msgstr ""
+
 msgctxt "field:stock.shipment.out.return,effective_date:"
 msgid "Effective Date"
 msgstr ""
@@ -1121,6 +1288,10 @@ msgctxt "field:stock.shipment.out.return,rec_name:"
 msgid "Name"
 msgstr "Namu"
 
+msgctxt "field:stock.shipment.out.return,received_by:"
+msgid "Received By"
+msgstr ""
+
 msgctxt "field:stock.shipment.out.return,reference:"
 msgid "Reference"
 msgstr ""
@@ -1157,6 +1328,14 @@ msgctxt "help:party.party,supplier_location:"
 msgid "The default source location when receiving products from the party."
 msgstr ""
 
+msgctxt "help:party.party.location,customer_location:"
+msgid "The default destination location when sending products to the party."
+msgstr ""
+
+msgctxt "help:party.party.location,supplier_location:"
+msgid "The default source location when receiving products from the party."
+msgstr ""
+
 msgctxt "help:product.by_location.context,forecast_date:"
 msgid ""
 "Allow to compute expected stock quantities for this date.\n"
@@ -1358,6 +1537,11 @@ msgid "Draft"
 msgstr ""
 
 msgctxt ""
+"model:ir.action.act_window.domain,name:act_shipment_internal_form_domain_requests"
+msgid "Requests"
+msgstr ""
+
+msgctxt ""
 "model:ir.action.act_window.domain,name:act_shipment_internal_form_domain_shipped"
 msgid "Shipped"
 msgstr ""
@@ -1515,6 +1699,10 @@ msgctxt "model:ir.ui.menu,name:menu_stock_configuration"
 msgid "Stock Configuration"
 msgstr ""
 
+msgctxt "model:party.party.location,name:"
+msgid "Party Location"
+msgstr ""
+
 msgctxt "model:product.by_location.context,name:"
 msgid "Product by Location"
 msgstr ""
@@ -1535,6 +1723,14 @@ msgctxt "model:stock.configuration,name:"
 msgid "Stock Configuration"
 msgstr ""
 
+msgctxt "model:stock.configuration.location,name:"
+msgid "Stock Configuration Location"
+msgstr ""
+
+msgctxt "model:stock.configuration.sequence,name:"
+msgid "Stock Configuration Sequence"
+msgstr ""
+
 msgctxt "model:stock.inventory,name:"
 msgid "Stock Inventory"
 msgstr ""
@@ -2013,6 +2209,10 @@ msgid "Draft"
 msgstr ""
 
 msgctxt "selection:stock.shipment.internal,state:"
+msgid "Request"
+msgstr ""
+
+msgctxt "selection:stock.shipment.internal,state:"
 msgid "Shipped"
 msgstr ""
 
@@ -2133,6 +2333,10 @@ msgid "Draft"
 msgstr ""
 
 msgctxt "view:stock.shipment.in.return:"
+msgid "Other Info"
+msgstr ""
+
+msgctxt "view:stock.shipment.in.return:"
 msgid "Wait"
 msgstr ""
 
@@ -2153,6 +2357,10 @@ msgid "Inventory Moves"
 msgstr ""
 
 msgctxt "view:stock.shipment.in:"
+msgid "Other Info"
+msgstr ""
+
+msgctxt "view:stock.shipment.in:"
 msgid "Receive"
 msgstr ""
 
@@ -2181,6 +2389,10 @@ msgid "Draft"
 msgstr ""
 
 msgctxt "view:stock.shipment.internal:"
+msgid "Other Info"
+msgstr ""
+
+msgctxt "view:stock.shipment.internal:"
 msgid "Ship"
 msgstr ""
 
@@ -2213,6 +2425,10 @@ msgid "Inventory Moves"
 msgstr ""
 
 msgctxt "view:stock.shipment.out.return:"
+msgid "Other Info"
+msgstr ""
+
+msgctxt "view:stock.shipment.out.return:"
 msgid "Received"
 msgstr ""
 
@@ -2233,11 +2449,11 @@ msgid "Draft"
 msgstr ""
 
 msgctxt "view:stock.shipment.out:"
-msgid "Inventory Moves"
+msgid "Make shipment"
 msgstr ""
 
 msgctxt "view:stock.shipment.out:"
-msgid "Make shipment"
+msgid "Other Info"
 msgstr ""
 
 msgctxt "view:stock.shipment.out:"
diff --git a/locale/nl.po b/locale/nl.po
index e259bfe..6d4310f 100644
--- a/locale/nl.po
+++ b/locale/nl.po
@@ -130,10 +130,56 @@ msgctxt "field:party.party,customer_location:"
 msgid "Customer Location"
 msgstr ""
 
+msgctxt "field:party.party,locations:"
+msgid "Locations"
+msgstr ""
+
 msgctxt "field:party.party,supplier_location:"
 msgid "Supplier Location"
 msgstr ""
 
+#, fuzzy
+msgctxt "field:party.party.location,create_date:"
+msgid "Create Date"
+msgstr "Datum"
+
+#, fuzzy
+msgctxt "field:party.party.location,create_uid:"
+msgid "Create User"
+msgstr "Gebruiker"
+
+msgctxt "field:party.party.location,customer_location:"
+msgid "Customer Location"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:party.party.location,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:party.party.location,party:"
+msgid "Party"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:party.party.location,rec_name:"
+msgid "Name"
+msgstr "Naam bijlage"
+
+msgctxt "field:party.party.location,supplier_location:"
+msgid "Supplier Location"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:party.party.location,write_date:"
+msgid "Write Date"
+msgstr "Schrijfdatum"
+
+#, fuzzy
+msgctxt "field:party.party.location,write_uid:"
+msgid "Write User"
+msgstr "Gebruiker"
+
 msgctxt "field:product.by_location.context,forecast_date:"
 msgid "At Date"
 msgstr ""
@@ -232,6 +278,99 @@ msgid "Write User"
 msgstr "Gebruiker"
 
 #, fuzzy
+msgctxt "field:stock.configuration.location,create_date:"
+msgid "Create Date"
+msgstr "Datum"
+
+#, fuzzy
+msgctxt "field:stock.configuration.location,create_uid:"
+msgid "Create User"
+msgstr "Gebruiker"
+
+#, fuzzy
+msgctxt "field:stock.configuration.location,id:"
+msgid "ID"
+msgstr "ID"
+
+#, fuzzy
+msgctxt "field:stock.configuration.location,rec_name:"
+msgid "Name"
+msgstr "Naam bijlage"
+
+msgctxt "field:stock.configuration.location,shipment_internal_transit:"
+msgid "Internal Shipment Transit"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:stock.configuration.location,write_date:"
+msgid "Write Date"
+msgstr "Schrijfdatum"
+
+#, fuzzy
+msgctxt "field:stock.configuration.location,write_uid:"
+msgid "Write User"
+msgstr "Gebruiker"
+
+#, fuzzy
+msgctxt "field:stock.configuration.sequence,company:"
+msgid "Company"
+msgstr "Bedrijf"
+
+#, fuzzy
+msgctxt "field:stock.configuration.sequence,create_date:"
+msgid "Create Date"
+msgstr "Datum"
+
+#, fuzzy
+msgctxt "field:stock.configuration.sequence,create_uid:"
+msgid "Create User"
+msgstr "Gebruiker"
+
+#, fuzzy
+msgctxt "field:stock.configuration.sequence,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:stock.configuration.sequence,inventory_sequence:"
+msgid "Inventory Sequence"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:stock.configuration.sequence,rec_name:"
+msgid "Name"
+msgstr "Naam bijlage"
+
+msgctxt "field:stock.configuration.sequence,shipment_in_return_sequence:"
+msgid "Supplier Return Shipment Sequence"
+msgstr ""
+
+msgctxt "field:stock.configuration.sequence,shipment_in_sequence:"
+msgid "Supplier Shipment Sequence"
+msgstr ""
+
+msgctxt "field:stock.configuration.sequence,shipment_internal_sequence:"
+msgid "Internal Shipment Sequence"
+msgstr ""
+
+msgctxt "field:stock.configuration.sequence,shipment_out_return_sequence:"
+msgid "Customer Return Shipment Sequence"
+msgstr ""
+
+msgctxt "field:stock.configuration.sequence,shipment_out_sequence:"
+msgid "Customer Shipment Sequence"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:stock.configuration.sequence,write_date:"
+msgid "Write Date"
+msgstr "Schrijfdatum"
+
+#, fuzzy
+msgctxt "field:stock.configuration.sequence,write_uid:"
+msgid "Write User"
+msgstr "Gebruiker"
+
+#, fuzzy
 msgctxt "field:stock.inventory,company:"
 msgid "Company"
 msgstr "Bedrijf"
@@ -813,6 +952,10 @@ msgctxt "field:stock.shipment.in,create_uid:"
 msgid "Create User"
 msgstr "Gebruiker"
 
+msgctxt "field:stock.shipment.in,done_by:"
+msgid "Done By"
+msgstr ""
+
 #, fuzzy
 msgctxt "field:stock.shipment.in,effective_date:"
 msgid "Effective Date"
@@ -838,7 +981,7 @@ msgstr "Boekingen"
 
 #, fuzzy
 msgctxt "field:stock.shipment.in,number:"
-msgid "Numer"
+msgid "Number"
 msgstr "Nummer"
 
 #, fuzzy
@@ -855,6 +998,10 @@ msgctxt "field:stock.shipment.in,rec_name:"
 msgid "Name"
 msgstr "Naam bijlage"
 
+msgctxt "field:stock.shipment.in,received_by:"
+msgid "Received By"
+msgstr ""
+
 #, fuzzy
 msgctxt "field:stock.shipment.in,reference:"
 msgid "Reference"
@@ -897,6 +1044,10 @@ msgctxt "field:stock.shipment.in,write_uid:"
 msgid "Write User"
 msgstr "Gebruiker"
 
+msgctxt "field:stock.shipment.in.return,assigned_by:"
+msgid "Assigned By"
+msgstr ""
+
 #, fuzzy
 msgctxt "field:stock.shipment.in.return,company:"
 msgid "Company"
@@ -916,6 +1067,10 @@ msgctxt "field:stock.shipment.in.return,delivery_address:"
 msgid "Delivery Address"
 msgstr ""
 
+msgctxt "field:stock.shipment.in.return,done_by:"
+msgid "Done By"
+msgstr ""
+
 #, fuzzy
 msgctxt "field:stock.shipment.in.return,effective_date:"
 msgid "Effective Date"
@@ -993,6 +1148,10 @@ msgctxt "field:stock.shipment.in.return.assign.failed,moves:"
 msgid "Moves"
 msgstr "Boekingen"
 
+msgctxt "field:stock.shipment.internal,assigned_by:"
+msgid "Received By"
+msgstr ""
+
 #, fuzzy
 msgctxt "field:stock.shipment.internal,company:"
 msgid "Company"
@@ -1008,6 +1167,10 @@ msgctxt "field:stock.shipment.internal,create_uid:"
 msgid "Create User"
 msgstr "Gebruiker"
 
+msgctxt "field:stock.shipment.internal,done_by:"
+msgid "Done By"
+msgstr ""
+
 #, fuzzy
 msgctxt "field:stock.shipment.internal,effective_date:"
 msgid "Effective Date"
@@ -1062,6 +1225,10 @@ msgctxt "field:stock.shipment.internal,reference:"
 msgid "Reference"
 msgstr "Referentie"
 
+msgctxt "field:stock.shipment.internal,shipped_by:"
+msgid "Shipped By"
+msgstr ""
+
 #, fuzzy
 msgctxt "field:stock.shipment.internal,state:"
 msgid "State"
@@ -1095,6 +1262,10 @@ msgctxt "field:stock.shipment.internal.assign.failed,moves:"
 msgid "Moves"
 msgstr "Boekingen"
 
+msgctxt "field:stock.shipment.out,assigned_by:"
+msgid "Assigned By"
+msgstr ""
+
 #, fuzzy
 msgctxt "field:stock.shipment.out,company:"
 msgid "Company"
@@ -1123,6 +1294,10 @@ msgctxt "field:stock.shipment.out,delivery_address:"
 msgid "Delivery Address"
 msgstr ""
 
+msgctxt "field:stock.shipment.out,done_by:"
+msgid "Done By"
+msgstr ""
+
 #, fuzzy
 msgctxt "field:stock.shipment.out,effective_date:"
 msgid "Effective Date"
@@ -1156,6 +1331,10 @@ msgctxt "field:stock.shipment.out,outgoing_moves:"
 msgid "Outgoing Moves"
 msgstr ""
 
+msgctxt "field:stock.shipment.out,packed_by:"
+msgid "Packed By"
+msgstr ""
+
 msgctxt "field:stock.shipment.out,planned_date:"
 msgid "Planned Date"
 msgstr ""
@@ -1235,6 +1414,10 @@ msgctxt "field:stock.shipment.out.return,delivery_address:"
 msgid "Delivery Address"
 msgstr ""
 
+msgctxt "field:stock.shipment.out.return,done_by:"
+msgid "Done By"
+msgstr ""
+
 #, fuzzy
 msgctxt "field:stock.shipment.out.return,effective_date:"
 msgid "Effective Date"
@@ -1277,6 +1460,10 @@ msgctxt "field:stock.shipment.out.return,rec_name:"
 msgid "Name"
 msgstr "Naam bijlage"
 
+msgctxt "field:stock.shipment.out.return,received_by:"
+msgid "Received By"
+msgstr ""
+
 #, fuzzy
 msgctxt "field:stock.shipment.out.return,reference:"
 msgid "Reference"
@@ -1318,6 +1505,14 @@ msgctxt "help:party.party,supplier_location:"
 msgid "The default source location when receiving products from the party."
 msgstr ""
 
+msgctxt "help:party.party.location,customer_location:"
+msgid "The default destination location when sending products to the party."
+msgstr ""
+
+msgctxt "help:party.party.location,supplier_location:"
+msgid "The default source location when receiving products from the party."
+msgstr ""
+
 msgctxt "help:product.by_location.context,forecast_date:"
 msgid ""
 "Allow to compute expected stock quantities for this date.\n"
@@ -1527,6 +1722,11 @@ msgid "Draft"
 msgstr "Concept"
 
 msgctxt ""
+"model:ir.action.act_window.domain,name:act_shipment_internal_form_domain_requests"
+msgid "Requests"
+msgstr ""
+
+msgctxt ""
 "model:ir.action.act_window.domain,name:act_shipment_internal_form_domain_shipped"
 msgid "Shipped"
 msgstr ""
@@ -1692,6 +1892,10 @@ msgctxt "model:ir.ui.menu,name:menu_stock_configuration"
 msgid "Stock Configuration"
 msgstr ""
 
+msgctxt "model:party.party.location,name:"
+msgid "Party Location"
+msgstr ""
+
 msgctxt "model:product.by_location.context,name:"
 msgid "Product by Location"
 msgstr ""
@@ -1713,6 +1917,14 @@ msgctxt "model:stock.configuration,name:"
 msgid "Stock Configuration"
 msgstr ""
 
+msgctxt "model:stock.configuration.location,name:"
+msgid "Stock Configuration Location"
+msgstr ""
+
+msgctxt "model:stock.configuration.sequence,name:"
+msgid "Stock Configuration Sequence"
+msgstr ""
+
 msgctxt "model:stock.inventory,name:"
 msgid "Stock Inventory"
 msgstr ""
@@ -2243,6 +2455,10 @@ msgid "Draft"
 msgstr "Concept"
 
 msgctxt "selection:stock.shipment.internal,state:"
+msgid "Request"
+msgstr ""
+
+msgctxt "selection:stock.shipment.internal,state:"
 msgid "Shipped"
 msgstr ""
 
@@ -2382,6 +2598,10 @@ msgid "Draft"
 msgstr "Concept"
 
 msgctxt "view:stock.shipment.in.return:"
+msgid "Other Info"
+msgstr ""
+
+msgctxt "view:stock.shipment.in.return:"
 msgid "Wait"
 msgstr ""
 
@@ -2404,6 +2624,10 @@ msgid "Inventory Moves"
 msgstr ""
 
 msgctxt "view:stock.shipment.in:"
+msgid "Other Info"
+msgstr ""
+
+msgctxt "view:stock.shipment.in:"
 msgid "Receive"
 msgstr ""
 
@@ -2436,6 +2660,10 @@ msgid "Draft"
 msgstr "Concept"
 
 msgctxt "view:stock.shipment.internal:"
+msgid "Other Info"
+msgstr ""
+
+msgctxt "view:stock.shipment.internal:"
 msgid "Ship"
 msgstr ""
 
@@ -2471,6 +2699,10 @@ msgid "Inventory Moves"
 msgstr ""
 
 msgctxt "view:stock.shipment.out.return:"
+msgid "Other Info"
+msgstr ""
+
+msgctxt "view:stock.shipment.out.return:"
 msgid "Received"
 msgstr ""
 
@@ -2494,11 +2726,11 @@ msgid "Draft"
 msgstr "Concept"
 
 msgctxt "view:stock.shipment.out:"
-msgid "Inventory Moves"
+msgid "Make shipment"
 msgstr ""
 
 msgctxt "view:stock.shipment.out:"
-msgid "Make shipment"
+msgid "Other Info"
 msgstr ""
 
 msgctxt "view:stock.shipment.out:"
diff --git a/locale/pl.po b/locale/pl.po
index 32a61be..4799765 100644
--- a/locale/pl.po
+++ b/locale/pl.po
@@ -124,71 +124,127 @@ msgstr ""
 
 msgctxt "field:party.address,delivery:"
 msgid "Delivery"
-msgstr ""
+msgstr "Dostawa"
 
+#, fuzzy
 msgctxt "field:party.party,customer_location:"
 msgid "Customer Location"
-msgstr ""
+msgstr "Lokalizacja klienta"
+
+#, fuzzy
+msgctxt "field:party.party,locations:"
+msgid "Locations"
+msgstr "Lokalizacje"
 
+#, fuzzy
 msgctxt "field:party.party,supplier_location:"
 msgid "Supplier Location"
+msgstr "Lokalizacja dostawcy"
+
+#, fuzzy
+msgctxt "field:party.party.location,create_date:"
+msgid "Create Date"
+msgstr "Data utworzenia"
+
+#, fuzzy
+msgctxt "field:party.party.location,create_uid:"
+msgid "Create User"
+msgstr "Utworzył"
+
+#, fuzzy
+msgctxt "field:party.party.location,customer_location:"
+msgid "Customer Location"
+msgstr "Lokalizacja klienta"
+
+#, fuzzy
+msgctxt "field:party.party.location,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:party.party.location,party:"
+msgid "Party"
 msgstr ""
 
+#, fuzzy
+msgctxt "field:party.party.location,rec_name:"
+msgid "Name"
+msgstr "Nazwa"
+
+#, fuzzy
+msgctxt "field:party.party.location,supplier_location:"
+msgid "Supplier Location"
+msgstr "Lokalizacja dostawcy"
+
+#, fuzzy
+msgctxt "field:party.party.location,write_date:"
+msgid "Write Date"
+msgstr "Data zapisu"
+
+#, fuzzy
+msgctxt "field:party.party.location,write_uid:"
+msgid "Write User"
+msgstr "Zapisał"
+
+#, fuzzy
 msgctxt "field:product.by_location.context,forecast_date:"
 msgid "At Date"
-msgstr ""
+msgstr "Na dzień"
 
 msgctxt "field:product.by_location.context,id:"
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
+#, fuzzy
 msgctxt "field:product.by_location.context,stock_date_end:"
 msgid "At Date"
-msgstr ""
+msgstr "Na dzień"
 
 msgctxt "field:product.product,cost_value:"
 msgid "Cost Value"
 msgstr ""
 
+#, fuzzy
 msgctxt "field:product.product,forecast_quantity:"
 msgid "Forecast Quantity"
-msgstr ""
+msgstr "Ilość przewidywana"
 
 msgctxt "field:product.product,quantity:"
 msgid "Quantity"
-msgstr ""
+msgstr "Ilość"
 
 msgctxt "field:product.template,cost_value:"
 msgid "Cost Value"
 msgstr ""
 
+#, fuzzy
 msgctxt "field:product.template,forecast_quantity:"
 msgid "Forecast Quantity"
-msgstr ""
+msgstr "Ilość przewidywana"
 
 msgctxt "field:product.template,quantity:"
 msgid "Quantity"
-msgstr ""
+msgstr "Ilość"
 
 msgctxt "field:stock.configuration,create_date:"
 msgid "Create Date"
-msgstr ""
+msgstr "Data utworzenia"
 
 msgctxt "field:stock.configuration,create_uid:"
 msgid "Create User"
-msgstr ""
+msgstr "Utworzył"
 
 msgctxt "field:stock.configuration,id:"
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 msgctxt "field:stock.configuration,inventory_sequence:"
 msgid "Inventory Sequence"
 msgstr ""
 
+#, fuzzy
 msgctxt "field:stock.configuration,rec_name:"
 msgid "Name"
-msgstr ""
+msgstr "Nazwa"
 
 msgctxt "field:stock.configuration,shipment_in_return_sequence:"
 msgid "Supplier Return Shipment Sequence"
@@ -216,81 +272,172 @@ msgstr ""
 
 msgctxt "field:stock.configuration,write_date:"
 msgid "Write Date"
-msgstr ""
+msgstr "Data zapisu"
 
 msgctxt "field:stock.configuration,write_uid:"
 msgid "Write User"
+msgstr "Zapisał"
+
+#, fuzzy
+msgctxt "field:stock.configuration.location,create_date:"
+msgid "Create Date"
+msgstr "Data utworzenia"
+
+#, fuzzy
+msgctxt "field:stock.configuration.location,create_uid:"
+msgid "Create User"
+msgstr "Utworzył"
+
+#, fuzzy
+msgctxt "field:stock.configuration.location,id:"
+msgid "ID"
+msgstr "ID"
+
+#, fuzzy
+msgctxt "field:stock.configuration.location,rec_name:"
+msgid "Name"
+msgstr "Nazwa"
+
+msgctxt "field:stock.configuration.location,shipment_internal_transit:"
+msgid "Internal Shipment Transit"
 msgstr ""
 
-msgctxt "field:stock.inventory,company:"
+#, fuzzy
+msgctxt "field:stock.configuration.location,write_date:"
+msgid "Write Date"
+msgstr "Data zapisu"
+
+#, fuzzy
+msgctxt "field:stock.configuration.location,write_uid:"
+msgid "Write User"
+msgstr "Zapisał"
+
+#, fuzzy
+msgctxt "field:stock.configuration.sequence,company:"
 msgid "Company"
+msgstr "Firma"
+
+#, fuzzy
+msgctxt "field:stock.configuration.sequence,create_date:"
+msgid "Create Date"
+msgstr "Data utworzenia"
+
+#, fuzzy
+msgctxt "field:stock.configuration.sequence,create_uid:"
+msgid "Create User"
+msgstr "Utworzył"
+
+#, fuzzy
+msgctxt "field:stock.configuration.sequence,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:stock.configuration.sequence,inventory_sequence:"
+msgid "Inventory Sequence"
 msgstr ""
 
+#, fuzzy
+msgctxt "field:stock.configuration.sequence,rec_name:"
+msgid "Name"
+msgstr "Nazwa"
+
+msgctxt "field:stock.configuration.sequence,shipment_in_return_sequence:"
+msgid "Supplier Return Shipment Sequence"
+msgstr ""
+
+msgctxt "field:stock.configuration.sequence,shipment_in_sequence:"
+msgid "Supplier Shipment Sequence"
+msgstr ""
+
+msgctxt "field:stock.configuration.sequence,shipment_internal_sequence:"
+msgid "Internal Shipment Sequence"
+msgstr ""
+
+msgctxt "field:stock.configuration.sequence,shipment_out_return_sequence:"
+msgid "Customer Return Shipment Sequence"
+msgstr ""
+
+msgctxt "field:stock.configuration.sequence,shipment_out_sequence:"
+msgid "Customer Shipment Sequence"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:stock.configuration.sequence,write_date:"
+msgid "Write Date"
+msgstr "Data zapisu"
+
+#, fuzzy
+msgctxt "field:stock.configuration.sequence,write_uid:"
+msgid "Write User"
+msgstr "Zapisał"
+
+msgctxt "field:stock.inventory,company:"
+msgid "Company"
+msgstr "Firma"
+
 msgctxt "field:stock.inventory,create_date:"
 msgid "Create Date"
-msgstr ""
+msgstr "Data utworzenia"
 
 msgctxt "field:stock.inventory,create_uid:"
 msgid "Create User"
-msgstr ""
+msgstr "Utworzył"
 
 msgctxt "field:stock.inventory,date:"
 msgid "Date"
-msgstr ""
+msgstr "Data"
 
 msgctxt "field:stock.inventory,id:"
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 msgctxt "field:stock.inventory,lines:"
 msgid "Lines"
-msgstr ""
+msgstr "Wiersze"
 
-#, fuzzy
 msgctxt "field:stock.inventory,location:"
 msgid "Location"
-msgstr "Locations"
+msgstr "Lokalizacja"
 
-#, fuzzy
 msgctxt "field:stock.inventory,lost_found:"
 msgid "Lost and Found"
-msgstr "Lost and Found"
+msgstr "Zgubione i znalezione"
 
 msgctxt "field:stock.inventory,number:"
 msgid "Number"
-msgstr ""
+msgstr "Numer"
 
 msgctxt "field:stock.inventory,rec_name:"
 msgid "Name"
-msgstr ""
+msgstr "Nazwa"
 
 msgctxt "field:stock.inventory,state:"
 msgid "State"
-msgstr ""
+msgstr "Stan"
 
 msgctxt "field:stock.inventory,write_date:"
 msgid "Write Date"
-msgstr ""
+msgstr "Data zapisu"
 
 msgctxt "field:stock.inventory,write_uid:"
 msgid "Write User"
-msgstr ""
+msgstr "Zapisał"
 
 msgctxt "field:stock.inventory.line,create_date:"
 msgid "Create Date"
-msgstr ""
+msgstr "Data utworzenia"
 
 msgctxt "field:stock.inventory.line,create_uid:"
 msgid "Create User"
-msgstr ""
+msgstr "Utworzył"
 
 msgctxt "field:stock.inventory.line,expected_quantity:"
 msgid "Expected Quantity"
-msgstr ""
+msgstr "Oczekiwana ilość"
 
 msgctxt "field:stock.inventory.line,id:"
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #, fuzzy
 msgctxt "field:stock.inventory.line,inventory:"
@@ -306,18 +453,17 @@ msgctxt "field:stock.inventory.line,moves:"
 msgid "Moves"
 msgstr "Moves"
 
-#, fuzzy
 msgctxt "field:stock.inventory.line,product:"
 msgid "Product"
-msgstr "Products"
+msgstr "Produkt"
 
 msgctxt "field:stock.inventory.line,quantity:"
 msgid "Quantity"
-msgstr ""
+msgstr "Ilość"
 
 msgctxt "field:stock.inventory.line,rec_name:"
 msgid "Name"
-msgstr ""
+msgstr "Nazwa"
 
 msgctxt "field:stock.inventory.line,unit_digits:"
 msgid "Unit Digits"
@@ -325,31 +471,31 @@ msgstr ""
 
 msgctxt "field:stock.inventory.line,uom:"
 msgid "UOM"
-msgstr ""
+msgstr "Jednostka miary"
 
 msgctxt "field:stock.inventory.line,write_date:"
 msgid "Write Date"
-msgstr ""
+msgstr "Data zapisu"
 
 msgctxt "field:stock.inventory.line,write_uid:"
 msgid "Write User"
-msgstr ""
+msgstr "Zapisał"
 
 msgctxt "field:stock.location,active:"
 msgid "Active"
-msgstr ""
+msgstr "Aktywny"
 
 msgctxt "field:stock.location,address:"
 msgid "Address"
-msgstr ""
+msgstr "Adres"
 
 msgctxt "field:stock.location,childs:"
 msgid "Children"
-msgstr ""
+msgstr "Elementy podrzędne"
 
 msgctxt "field:stock.location,code:"
 msgid "Code"
-msgstr ""
+msgstr "Kod"
 
 msgctxt "field:stock.location,cost_value:"
 msgid "Cost Value"
@@ -357,23 +503,24 @@ msgstr ""
 
 msgctxt "field:stock.location,create_date:"
 msgid "Create Date"
-msgstr ""
+msgstr "Data utworzenia"
 
 msgctxt "field:stock.location,create_uid:"
 msgid "Create User"
-msgstr ""
+msgstr "Utworzył"
 
 msgctxt "field:stock.location,forecast_quantity:"
 msgid "Forecast Quantity"
-msgstr ""
+msgstr "Ilość przewidywana"
 
 msgctxt "field:stock.location,id:"
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
+#, fuzzy
 msgctxt "field:stock.location,input_location:"
 msgid "Input"
-msgstr ""
+msgstr "Wejście"
 
 msgctxt "field:stock.location,left:"
 msgid "Left"
@@ -381,7 +528,7 @@ msgstr ""
 
 msgctxt "field:stock.location,name:"
 msgid "Name"
-msgstr ""
+msgstr "Nazwa"
 
 msgctxt "field:stock.location,output_location:"
 msgid "Output"
@@ -389,7 +536,7 @@ msgstr ""
 
 msgctxt "field:stock.location,parent:"
 msgid "Parent"
-msgstr ""
+msgstr "Element nadrzędny"
 
 msgctxt "field:stock.location,picking_location:"
 msgid "Picking"
@@ -397,11 +544,11 @@ msgstr ""
 
 msgctxt "field:stock.location,quantity:"
 msgid "Quantity"
-msgstr ""
+msgstr "Ilość"
 
 msgctxt "field:stock.location,rec_name:"
 msgid "Name"
-msgstr ""
+msgstr "Nazwa"
 
 msgctxt "field:stock.location,right:"
 msgid "Right"
@@ -415,30 +562,29 @@ msgctxt "field:stock.location,type:"
 msgid "Location type"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.location,warehouse:"
 msgid "Warehouse"
-msgstr "Warehouse"
+msgstr "Magazyn"
 
 msgctxt "field:stock.location,write_date:"
 msgid "Write Date"
-msgstr ""
+msgstr "Data zapisu"
 
 msgctxt "field:stock.location,write_uid:"
 msgid "Write User"
-msgstr ""
+msgstr "Zapisał"
 
 msgctxt "field:stock.location.lead_time,create_date:"
 msgid "Create Date"
-msgstr ""
+msgstr "Data utworzenia"
 
 msgctxt "field:stock.location.lead_time,create_uid:"
 msgid "Create User"
-msgstr ""
+msgstr "Utworzył"
 
 msgctxt "field:stock.location.lead_time,id:"
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 msgctxt "field:stock.location.lead_time,lead_time:"
 msgid "Lead Time"
@@ -446,11 +592,11 @@ msgstr ""
 
 msgctxt "field:stock.location.lead_time,rec_name:"
 msgid "Name"
-msgstr ""
+msgstr "Nazwa"
 
 msgctxt "field:stock.location.lead_time,sequence:"
 msgid "Sequence"
-msgstr ""
+msgstr "Kolejność"
 
 #, fuzzy
 msgctxt "field:stock.location.lead_time,warehouse_from:"
@@ -464,11 +610,11 @@ msgstr "Warehouse"
 
 msgctxt "field:stock.location.lead_time,write_date:"
 msgid "Write Date"
-msgstr ""
+msgstr "Data zapisu"
 
 msgctxt "field:stock.location.lead_time,write_uid:"
 msgid "Write User"
-msgstr ""
+msgstr "Zapisał"
 
 msgctxt "field:stock.move,assignation_required:"
 msgid "Assignation Required"
@@ -476,7 +622,7 @@ msgstr ""
 
 msgctxt "field:stock.move,company:"
 msgid "Company"
-msgstr ""
+msgstr "Firma"
 
 msgctxt "field:stock.move,cost_price:"
 msgid "Cost Price"
@@ -484,27 +630,28 @@ msgstr ""
 
 msgctxt "field:stock.move,create_date:"
 msgid "Create Date"
-msgstr ""
+msgstr "Data utworzenia"
 
 msgctxt "field:stock.move,create_uid:"
 msgid "Create User"
-msgstr ""
+msgstr "Utworzył"
 
 msgctxt "field:stock.move,currency:"
 msgid "Currency"
-msgstr ""
+msgstr "Waluta"
 
 msgctxt "field:stock.move,effective_date:"
 msgid "Effective Date"
 msgstr ""
 
+#, fuzzy
 msgctxt "field:stock.move,from_location:"
 msgid "From Location"
-msgstr ""
+msgstr "Z lokalizacji"
 
 msgctxt "field:stock.move,id:"
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 msgctxt "field:stock.move,internal_quantity:"
 msgid "Internal Quantity"
@@ -512,16 +659,15 @@ msgstr ""
 
 msgctxt "field:stock.move,origin:"
 msgid "Origin"
-msgstr ""
+msgstr "Pochodzenie"
 
 msgctxt "field:stock.move,planned_date:"
 msgid "Planned Date"
-msgstr ""
+msgstr "Data planowana"
 
-#, fuzzy
 msgctxt "field:stock.move,product:"
 msgid "Product"
-msgstr "Products"
+msgstr "Produkt"
 
 msgctxt "field:stock.move,product_uom_category:"
 msgid "Product Uom Category"
@@ -529,11 +675,11 @@ msgstr ""
 
 msgctxt "field:stock.move,quantity:"
 msgid "Quantity"
-msgstr ""
+msgstr "Ilość"
 
 msgctxt "field:stock.move,rec_name:"
 msgid "Name"
-msgstr ""
+msgstr "Nazwa"
 
 msgctxt "field:stock.move,shipment:"
 msgid "Shipment"
@@ -541,11 +687,12 @@ msgstr ""
 
 msgctxt "field:stock.move,state:"
 msgid "State"
-msgstr ""
+msgstr "Stan"
 
+#, fuzzy
 msgctxt "field:stock.move,to_location:"
 msgid "To Location"
-msgstr ""
+msgstr "Do lokalizacji"
 
 msgctxt "field:stock.move,unit_digits:"
 msgid "Unit Digits"
@@ -553,7 +700,7 @@ msgstr ""
 
 msgctxt "field:stock.move,unit_price:"
 msgid "Unit Price"
-msgstr ""
+msgstr "Cena jednostkowa"
 
 msgctxt "field:stock.move,unit_price_required:"
 msgid "Unit Price Required"
@@ -561,15 +708,15 @@ msgstr ""
 
 msgctxt "field:stock.move,uom:"
 msgid "Uom"
-msgstr ""
+msgstr "Jednostka miary"
 
 msgctxt "field:stock.move,write_date:"
 msgid "Write Date"
-msgstr ""
+msgstr "Data zapisu"
 
 msgctxt "field:stock.move,write_uid:"
 msgid "Write User"
-msgstr ""
+msgstr "Zapisał"
 
 msgctxt "field:stock.period,caches:"
 msgid "Caches"
@@ -577,150 +724,150 @@ msgstr ""
 
 msgctxt "field:stock.period,company:"
 msgid "Company"
-msgstr ""
+msgstr "Firma"
 
 msgctxt "field:stock.period,create_date:"
 msgid "Create Date"
-msgstr ""
+msgstr "Data utworzenia"
 
 msgctxt "field:stock.period,create_uid:"
 msgid "Create User"
-msgstr ""
+msgstr "Utworzył"
 
 msgctxt "field:stock.period,date:"
 msgid "Date"
-msgstr ""
+msgstr "Data"
 
 msgctxt "field:stock.period,id:"
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 msgctxt "field:stock.period,rec_name:"
 msgid "Name"
-msgstr ""
+msgstr "Nazwa"
 
 msgctxt "field:stock.period,state:"
 msgid "State"
-msgstr ""
+msgstr "Stan"
 
 msgctxt "field:stock.period,write_date:"
 msgid "Write Date"
-msgstr ""
+msgstr "Data zapisu"
 
 msgctxt "field:stock.period,write_uid:"
 msgid "Write User"
-msgstr ""
+msgstr "Zapisał"
 
 msgctxt "field:stock.period.cache,create_date:"
 msgid "Create Date"
-msgstr ""
+msgstr "Data utworzenia"
 
 msgctxt "field:stock.period.cache,create_uid:"
 msgid "Create User"
-msgstr ""
+msgstr "Utworzył"
 
 msgctxt "field:stock.period.cache,id:"
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 msgctxt "field:stock.period.cache,internal_quantity:"
 msgid "Internal Quantity"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.period.cache,location:"
 msgid "Location"
-msgstr "Locations"
+msgstr "Lokalizacja"
 
-#, fuzzy
 msgctxt "field:stock.period.cache,period:"
 msgid "Period"
-msgstr "Periods"
+msgstr "Okres"
 
-#, fuzzy
 msgctxt "field:stock.period.cache,product:"
 msgid "Product"
-msgstr "Products"
+msgstr "Produkt"
 
 msgctxt "field:stock.period.cache,rec_name:"
 msgid "Name"
-msgstr ""
+msgstr "Nazwa"
 
 msgctxt "field:stock.period.cache,write_date:"
 msgid "Write Date"
-msgstr ""
+msgstr "Data zapisu"
 
 msgctxt "field:stock.period.cache,write_uid:"
 msgid "Write User"
-msgstr ""
+msgstr "Zapisał"
 
 msgctxt "field:stock.product_quantities_warehouse,create_date:"
 msgid "Create Date"
-msgstr ""
+msgstr "Data utworzenia"
 
 msgctxt "field:stock.product_quantities_warehouse,create_uid:"
 msgid "Create User"
-msgstr ""
+msgstr "Utworzył"
 
 msgctxt "field:stock.product_quantities_warehouse,date:"
 msgid "Date"
-msgstr ""
+msgstr "Data"
 
 msgctxt "field:stock.product_quantities_warehouse,id:"
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 msgctxt "field:stock.product_quantities_warehouse,quantity:"
 msgid "Quantity"
-msgstr ""
+msgstr "Ilość"
 
 msgctxt "field:stock.product_quantities_warehouse,rec_name:"
 msgid "Name"
-msgstr ""
+msgstr "Nazwa"
 
 msgctxt "field:stock.product_quantities_warehouse,write_date:"
 msgid "Write Date"
-msgstr ""
+msgstr "Data zapisu"
 
 msgctxt "field:stock.product_quantities_warehouse,write_uid:"
 msgid "Write User"
-msgstr ""
+msgstr "Zapisał"
 
 msgctxt "field:stock.product_quantities_warehouse.context,id:"
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
-#, fuzzy
 msgctxt "field:stock.product_quantities_warehouse.context,warehouse:"
 msgid "Warehouse"
-msgstr "Warehouse"
+msgstr "Magazyn"
 
 msgctxt "field:stock.products_by_locations.context,forecast_date:"
 msgid "At Date"
-msgstr ""
+msgstr "Na dzień"
 
 msgctxt "field:stock.products_by_locations.context,id:"
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 msgctxt "field:stock.products_by_locations.context,stock_date_end:"
 msgid "At Date"
-msgstr ""
+msgstr "Na dzień"
 
 msgctxt "field:stock.shipment.in,company:"
 msgid "Company"
-msgstr ""
+msgstr "Firma"
 
 msgctxt "field:stock.shipment.in,contact_address:"
 msgid "Contact Address"
-msgstr ""
+msgstr "Adres kontaktowy"
 
 msgctxt "field:stock.shipment.in,create_date:"
 msgid "Create Date"
-msgstr ""
+msgstr "Data utworzenia"
 
 msgctxt "field:stock.shipment.in,create_uid:"
 msgid "Create User"
+msgstr "Utworzył"
+
+msgctxt "field:stock.shipment.in,done_by:"
+msgid "Done By"
 msgstr ""
 
 msgctxt "field:stock.shipment.in,effective_date:"
@@ -729,7 +876,7 @@ msgstr ""
 
 msgctxt "field:stock.shipment.in,id:"
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 msgctxt "field:stock.shipment.in,incoming_moves:"
 msgid "Incoming Moves"
@@ -744,20 +891,26 @@ msgctxt "field:stock.shipment.in,moves:"
 msgid "Moves"
 msgstr "Moves"
 
+#, fuzzy
 msgctxt "field:stock.shipment.in,number:"
-msgid "Numer"
-msgstr ""
+msgid "Number"
+msgstr "Numer"
 
+#, fuzzy
 msgctxt "field:stock.shipment.in,origins:"
 msgid "Origins"
-msgstr ""
+msgstr "Źródła"
 
 msgctxt "field:stock.shipment.in,planned_date:"
 msgid "Planned Date"
-msgstr ""
+msgstr "Data planowana"
 
 msgctxt "field:stock.shipment.in,rec_name:"
 msgid "Name"
+msgstr "Nazwa"
+
+msgctxt "field:stock.shipment.in,received_by:"
+msgid "Received By"
 msgstr ""
 
 msgctxt "field:stock.shipment.in,reference:"
@@ -766,21 +919,19 @@ msgstr ""
 
 msgctxt "field:stock.shipment.in,state:"
 msgid "State"
-msgstr ""
+msgstr "Stan"
 
-#, fuzzy
 msgctxt "field:stock.shipment.in,supplier:"
 msgid "Supplier"
-msgstr "Supplier"
+msgstr "Dostawca"
 
 msgctxt "field:stock.shipment.in,supplier_location:"
 msgid "Supplier Location"
-msgstr ""
+msgstr "Lokalizacja dostawcy"
 
-#, fuzzy
 msgctxt "field:stock.shipment.in,warehouse:"
 msgid "Warehouse"
-msgstr "Warehouse"
+msgstr "Magazyn"
 
 msgctxt "field:stock.shipment.in,warehouse_input:"
 msgid "Warehouse Input"
@@ -792,39 +943,48 @@ msgstr ""
 
 msgctxt "field:stock.shipment.in,write_date:"
 msgid "Write Date"
-msgstr ""
+msgstr "Data zapisu"
 
 msgctxt "field:stock.shipment.in,write_uid:"
 msgid "Write User"
+msgstr "Zapisał"
+
+msgctxt "field:stock.shipment.in.return,assigned_by:"
+msgid "Assigned By"
 msgstr ""
 
 msgctxt "field:stock.shipment.in.return,company:"
 msgid "Company"
-msgstr ""
+msgstr "Firma"
 
 msgctxt "field:stock.shipment.in.return,create_date:"
 msgid "Create Date"
-msgstr ""
+msgstr "Data utworzenia"
 
 msgctxt "field:stock.shipment.in.return,create_uid:"
 msgid "Create User"
-msgstr ""
+msgstr "Utworzył"
 
 msgctxt "field:stock.shipment.in.return,delivery_address:"
 msgid "Delivery Address"
+msgstr "Adres dostawy"
+
+msgctxt "field:stock.shipment.in.return,done_by:"
+msgid "Done By"
 msgstr ""
 
 msgctxt "field:stock.shipment.in.return,effective_date:"
 msgid "Effective Date"
 msgstr ""
 
+#, fuzzy
 msgctxt "field:stock.shipment.in.return,from_location:"
 msgid "From Location"
-msgstr ""
+msgstr "Z lokalizacji"
 
 msgctxt "field:stock.shipment.in.return,id:"
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #, fuzzy
 msgctxt "field:stock.shipment.in.return,moves:"
@@ -833,19 +993,20 @@ msgstr "Moves"
 
 msgctxt "field:stock.shipment.in.return,number:"
 msgid "Number"
-msgstr ""
+msgstr "Numer"
 
+#, fuzzy
 msgctxt "field:stock.shipment.in.return,origins:"
 msgid "Origins"
-msgstr ""
+msgstr "Źródła"
 
 msgctxt "field:stock.shipment.in.return,planned_date:"
 msgid "Planned Date"
-msgstr ""
+msgstr "Data planowana"
 
 msgctxt "field:stock.shipment.in.return,rec_name:"
 msgid "Name"
-msgstr ""
+msgstr "Nazwa"
 
 msgctxt "field:stock.shipment.in.return,reference:"
 msgid "Reference"
@@ -853,44 +1014,52 @@ msgstr ""
 
 msgctxt "field:stock.shipment.in.return,state:"
 msgid "State"
-msgstr ""
+msgstr "Stan"
 
-#, fuzzy
 msgctxt "field:stock.shipment.in.return,supplier:"
 msgid "Supplier"
-msgstr "Supplier"
+msgstr "Dostawca"
 
+#, fuzzy
 msgctxt "field:stock.shipment.in.return,to_location:"
 msgid "To Location"
-msgstr ""
+msgstr "Do lokalizacji"
 
 msgctxt "field:stock.shipment.in.return,write_date:"
 msgid "Write Date"
-msgstr ""
+msgstr "Data zapisu"
 
 msgctxt "field:stock.shipment.in.return,write_uid:"
 msgid "Write User"
-msgstr ""
+msgstr "Zapisał"
 
 msgctxt "field:stock.shipment.in.return.assign.failed,id:"
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #, fuzzy
 msgctxt "field:stock.shipment.in.return.assign.failed,moves:"
 msgid "Moves"
 msgstr "Moves"
 
+msgctxt "field:stock.shipment.internal,assigned_by:"
+msgid "Received By"
+msgstr ""
+
 msgctxt "field:stock.shipment.internal,company:"
 msgid "Company"
-msgstr ""
+msgstr "Firma"
 
 msgctxt "field:stock.shipment.internal,create_date:"
 msgid "Create Date"
-msgstr ""
+msgstr "Data utworzenia"
 
 msgctxt "field:stock.shipment.internal,create_uid:"
 msgid "Create User"
+msgstr "Utworzył"
+
+msgctxt "field:stock.shipment.internal,done_by:"
+msgid "Done By"
 msgstr ""
 
 msgctxt "field:stock.shipment.internal,effective_date:"
@@ -901,13 +1070,14 @@ msgctxt "field:stock.shipment.internal,effective_start_date:"
 msgid "Effective Start Date"
 msgstr ""
 
+#, fuzzy
 msgctxt "field:stock.shipment.internal,from_location:"
 msgid "From Location"
-msgstr ""
+msgstr "Z lokalizacji"
 
 msgctxt "field:stock.shipment.internal,id:"
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 msgctxt "field:stock.shipment.internal,incoming_moves:"
 msgid "Incoming Moves"
@@ -920,7 +1090,7 @@ msgstr "Moves"
 
 msgctxt "field:stock.shipment.internal,number:"
 msgid "Number"
-msgstr ""
+msgstr "Numer"
 
 msgctxt "field:stock.shipment.internal,outgoing_moves:"
 msgid "Outgoing Moves"
@@ -928,27 +1098,31 @@ msgstr ""
 
 msgctxt "field:stock.shipment.internal,planned_date:"
 msgid "Planned Date"
-msgstr ""
+msgstr "Data planowana"
 
 msgctxt "field:stock.shipment.internal,planned_start_date:"
 msgid "Planned Start Date"
-msgstr ""
+msgstr "Zaplanowana data rozpoczęcia"
 
 msgctxt "field:stock.shipment.internal,rec_name:"
 msgid "Name"
-msgstr ""
+msgstr "Nazwa"
 
 msgctxt "field:stock.shipment.internal,reference:"
 msgid "Reference"
 msgstr ""
 
+msgctxt "field:stock.shipment.internal,shipped_by:"
+msgid "Shipped By"
+msgstr ""
+
 msgctxt "field:stock.shipment.internal,state:"
 msgid "State"
-msgstr ""
+msgstr "Stan"
 
 msgctxt "field:stock.shipment.internal,to_location:"
 msgid "To Location"
-msgstr ""
+msgstr "Do lokalizacji"
 
 msgctxt "field:stock.shipment.internal,transit_location:"
 msgid "Transit Location"
@@ -956,44 +1130,51 @@ msgstr ""
 
 msgctxt "field:stock.shipment.internal,write_date:"
 msgid "Write Date"
-msgstr ""
+msgstr "Data zapisu"
 
 msgctxt "field:stock.shipment.internal,write_uid:"
 msgid "Write User"
-msgstr ""
+msgstr "Zapisał"
 
 msgctxt "field:stock.shipment.internal.assign.failed,id:"
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #, fuzzy
 msgctxt "field:stock.shipment.internal.assign.failed,moves:"
 msgid "Moves"
 msgstr "Moves"
 
+msgctxt "field:stock.shipment.out,assigned_by:"
+msgid "Assigned By"
+msgstr ""
+
 msgctxt "field:stock.shipment.out,company:"
 msgid "Company"
-msgstr ""
+msgstr "Firma"
 
 msgctxt "field:stock.shipment.out,create_date:"
 msgid "Create Date"
-msgstr ""
+msgstr "Data utworzenia"
 
 msgctxt "field:stock.shipment.out,create_uid:"
 msgid "Create User"
-msgstr ""
+msgstr "Utworzył"
 
-#, fuzzy
 msgctxt "field:stock.shipment.out,customer:"
 msgid "Customer"
-msgstr "Customer"
+msgstr "Klient"
 
 msgctxt "field:stock.shipment.out,customer_location:"
 msgid "Customer Location"
-msgstr ""
+msgstr "Lokalizacja klienta"
 
 msgctxt "field:stock.shipment.out,delivery_address:"
 msgid "Delivery Address"
+msgstr "Adres dostawy"
+
+msgctxt "field:stock.shipment.out,done_by:"
+msgid "Done By"
 msgstr ""
 
 msgctxt "field:stock.shipment.out,effective_date:"
@@ -1002,7 +1183,7 @@ msgstr ""
 
 msgctxt "field:stock.shipment.out,id:"
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 msgctxt "field:stock.shipment.out,inventory_moves:"
 msgid "Inventory Moves"
@@ -1015,23 +1196,27 @@ msgstr "Moves"
 
 msgctxt "field:stock.shipment.out,number:"
 msgid "Number"
-msgstr ""
+msgstr "Numer"
 
 msgctxt "field:stock.shipment.out,origins:"
 msgid "Origins"
-msgstr ""
+msgstr "Źródła"
 
 msgctxt "field:stock.shipment.out,outgoing_moves:"
 msgid "Outgoing Moves"
 msgstr ""
 
+msgctxt "field:stock.shipment.out,packed_by:"
+msgid "Packed By"
+msgstr ""
+
 msgctxt "field:stock.shipment.out,planned_date:"
 msgid "Planned Date"
-msgstr ""
+msgstr "Data planowana"
 
 msgctxt "field:stock.shipment.out,rec_name:"
 msgid "Name"
-msgstr ""
+msgstr "Nazwa"
 
 msgctxt "field:stock.shipment.out,reference:"
 msgid "Reference"
@@ -1039,12 +1224,11 @@ msgstr ""
 
 msgctxt "field:stock.shipment.out,state:"
 msgid "State"
-msgstr ""
+msgstr "Stan"
 
-#, fuzzy
 msgctxt "field:stock.shipment.out,warehouse:"
 msgid "Warehouse"
-msgstr "Warehouse"
+msgstr "Magazyn"
 
 msgctxt "field:stock.shipment.out,warehouse_output:"
 msgid "Warehouse Output"
@@ -1056,15 +1240,15 @@ msgstr ""
 
 msgctxt "field:stock.shipment.out,write_date:"
 msgid "Write Date"
-msgstr ""
+msgstr "Data zapisu"
 
 msgctxt "field:stock.shipment.out,write_uid:"
 msgid "Write User"
-msgstr ""
+msgstr "Zapisał"
 
 msgctxt "field:stock.shipment.out.assign.failed,id:"
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 msgctxt "field:stock.shipment.out.assign.failed,inventory_moves:"
 msgid "Inventory Moves"
@@ -1072,27 +1256,30 @@ msgstr ""
 
 msgctxt "field:stock.shipment.out.return,company:"
 msgid "Company"
-msgstr ""
+msgstr "Firma"
 
 msgctxt "field:stock.shipment.out.return,create_date:"
 msgid "Create Date"
-msgstr ""
+msgstr "Data utworzenia"
 
 msgctxt "field:stock.shipment.out.return,create_uid:"
 msgid "Create User"
-msgstr ""
+msgstr "Utworzył"
 
-#, fuzzy
 msgctxt "field:stock.shipment.out.return,customer:"
 msgid "Customer"
-msgstr "Customer"
+msgstr "Klient"
 
 msgctxt "field:stock.shipment.out.return,customer_location:"
 msgid "Customer Location"
-msgstr ""
+msgstr "Lokalizacja klienta"
 
 msgctxt "field:stock.shipment.out.return,delivery_address:"
 msgid "Delivery Address"
+msgstr "Adres dostawy"
+
+msgctxt "field:stock.shipment.out.return,done_by:"
+msgid "Done By"
 msgstr ""
 
 msgctxt "field:stock.shipment.out.return,effective_date:"
@@ -1101,7 +1288,7 @@ msgstr ""
 
 msgctxt "field:stock.shipment.out.return,id:"
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 msgctxt "field:stock.shipment.out.return,incoming_moves:"
 msgid "Incoming Moves"
@@ -1118,18 +1305,23 @@ msgstr "Moves"
 
 msgctxt "field:stock.shipment.out.return,number:"
 msgid "Number"
-msgstr ""
+msgstr "Numer"
 
+#, fuzzy
 msgctxt "field:stock.shipment.out.return,origins:"
 msgid "Origins"
-msgstr ""
+msgstr "Źródła"
 
 msgctxt "field:stock.shipment.out.return,planned_date:"
 msgid "Planned Date"
-msgstr ""
+msgstr "Planowana data"
 
 msgctxt "field:stock.shipment.out.return,rec_name:"
 msgid "Name"
+msgstr "Nazwa"
+
+msgctxt "field:stock.shipment.out.return,received_by:"
+msgid "Received By"
 msgstr ""
 
 msgctxt "field:stock.shipment.out.return,reference:"
@@ -1138,12 +1330,11 @@ msgstr ""
 
 msgctxt "field:stock.shipment.out.return,state:"
 msgid "State"
-msgstr ""
+msgstr "Stan"
 
-#, fuzzy
 msgctxt "field:stock.shipment.out.return,warehouse:"
 msgid "Warehouse"
-msgstr "Warehouse"
+msgstr "Magazyn"
 
 msgctxt "field:stock.shipment.out.return,warehouse_input:"
 msgid "Warehouse Input"
@@ -1155,11 +1346,11 @@ msgstr ""
 
 msgctxt "field:stock.shipment.out.return,write_date:"
 msgid "Write Date"
-msgstr ""
+msgstr "Data zapisu"
 
 msgctxt "field:stock.shipment.out.return,write_uid:"
 msgid "Write User"
-msgstr ""
+msgstr "Zapisał"
 
 msgctxt "help:party.party,customer_location:"
 msgid "The default destination location when sending products to the party."
@@ -1169,6 +1360,14 @@ msgctxt "help:party.party,supplier_location:"
 msgid "The default source location when receiving products from the party."
 msgstr ""
 
+msgctxt "help:party.party.location,customer_location:"
+msgid "The default destination location when sending products to the party."
+msgstr ""
+
+msgctxt "help:party.party.location,supplier_location:"
+msgid "The default source location when receiving products from the party."
+msgstr ""
+
 msgctxt "help:product.by_location.context,forecast_date:"
 msgid ""
 "Allow to compute expected stock quantities for this date.\n"
@@ -1193,7 +1392,7 @@ msgstr "Inventories"
 
 msgctxt "model:ir.action,name:act_location_form"
 msgid "Locations"
-msgstr "Locations"
+msgstr "Lokalizacje"
 
 msgctxt "model:ir.action,name:act_location_lead_time_form"
 msgid "Location Lead Times"
@@ -1205,7 +1404,7 @@ msgstr "Locations Quantity"
 
 msgctxt "model:ir.action,name:act_location_tree"
 msgid "Locations"
-msgstr "Locations"
+msgstr "Lokalizacje"
 
 msgctxt "model:ir.action,name:act_move_form"
 msgid "Moves"
@@ -1213,15 +1412,15 @@ msgstr "Moves"
 
 msgctxt "model:ir.action,name:act_period_list"
 msgid "Periods"
-msgstr "Periods"
+msgstr "Okresy"
 
 msgctxt "model:ir.action,name:act_product_quantities_warehouse"
 msgid "Product Quantities By Warehouse"
-msgstr "Product Quantities By Warehouse"
+msgstr "Ilości produktów wg magazynu"
 
 msgctxt "model:ir.action,name:act_products_by_locations"
 msgid "Products"
-msgstr "Products"
+msgstr "Produkty"
 
 msgctxt "model:ir.action,name:act_shipment_in_form"
 msgid "Supplier Shipments"
@@ -1265,7 +1464,7 @@ msgstr "Internal Shipment"
 
 msgctxt "model:ir.action,name:report_shipment_out_delivery_note"
 msgid "Delivery Note"
-msgstr "Delivery Note"
+msgstr "List przewozowy"
 
 msgctxt "model:ir.action,name:report_shipment_out_picking_list"
 msgid "Picking List"
@@ -1293,21 +1492,21 @@ msgstr "Assign Shipment Out"
 
 msgctxt "model:ir.action.act_window.domain,name:act_inventory_form_domain_all"
 msgid "All"
-msgstr "All"
+msgstr "Wszystko"
 
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_inventory_form_domain_draft"
 msgid "Draft"
-msgstr "Draft"
+msgstr "Szkic"
 
 msgctxt "model:ir.action.act_window.domain,name:act_move_form_domain_all"
 msgid "All"
-msgstr "All"
+msgstr "Wszystko"
 
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_move_form_domain_from_supplier"
 msgid "From Suppliers"
-msgstr "From Suppliers"
+msgstr "Od dostawców"
 
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_move_form_domain_from_supplier_waiting"
@@ -1317,57 +1516,62 @@ msgstr "From Suppliers Waiting"
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_move_form_domain_to_customer"
 msgid "To Customers"
-msgstr "To Customers"
+msgstr "Do klientów"
 
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_shipment_in_form_domain_all"
 msgid "All"
-msgstr "All"
+msgstr "Wszystko"
 
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_shipment_in_form_domain_draft"
 msgid "Draft"
-msgstr "Draft"
+msgstr "Szkic"
 
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_shipment_in_form_domain_received"
 msgid "Received"
-msgstr "Received"
+msgstr "Odebrany"
 
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_shipment_in_return_form_domain_all"
 msgid "All"
-msgstr "All"
+msgstr "Wszystko"
 
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_shipment_in_return_form_domain_assigned"
 msgid "Assigned"
-msgstr "Assigned"
+msgstr "Przypisany"
 
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_shipment_in_return_form_domain_draft"
 msgid "Draft"
-msgstr "Draft"
+msgstr "Szkic"
 
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_shipment_in_return_form_domain_waiting"
 msgid "Waiting"
-msgstr "Waiting"
+msgstr "Oczekujący"
 
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_shipment_internal_form_domain_all"
 msgid "All"
-msgstr "All"
+msgstr "Wszystko"
 
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_shipment_internal_form_domain_assigned"
 msgid "Assigned"
-msgstr "Assigned"
+msgstr "Przypisany"
 
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_shipment_internal_form_domain_draft"
 msgid "Draft"
-msgstr "Draft"
+msgstr "Szkic"
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_shipment_internal_form_domain_requests"
+msgid "Requests"
+msgstr ""
 
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_shipment_internal_form_domain_shipped"
@@ -1377,22 +1581,22 @@ msgstr "Shipped"
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_shipment_internal_form_domain_waiting"
 msgid "Waiting"
-msgstr "Waiting"
+msgstr "Oczekujący"
 
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_shipment_out_form_domain_all"
 msgid "All"
-msgstr "All"
+msgstr "Wszystko"
 
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_shipment_out_form_domain_assigned"
 msgid "Assigned"
-msgstr "Assigned"
+msgstr "Przypisany"
 
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_shipment_out_form_domain_draft"
 msgid "Draft"
-msgstr "Draft"
+msgstr "Szkic"
 
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_shipment_out_form_domain_packed"
@@ -1402,22 +1606,22 @@ msgstr "Packed"
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_shipment_out_form_domain_waiting"
 msgid "Waiting"
-msgstr "Waiting"
+msgstr "Oczekujący"
 
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_shipment_out_return_form_domain_all"
 msgid "All"
-msgstr "All"
+msgstr "Wszystko"
 
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_shipment_out_return_form_domain_draft"
 msgid "Draft"
-msgstr "Draft"
+msgstr "Szkic"
 
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_shipment_out_return_form_domain_received"
 msgid "Received"
-msgstr "Received"
+msgstr "Otrzymany"
 
 msgctxt "model:ir.sequence,name:sequence_inventory"
 msgid "Inventory"
@@ -1469,7 +1673,7 @@ msgstr "Customer Return Shipment"
 
 msgctxt "model:ir.ui.menu,name:menu_configuration"
 msgid "Configuration"
-msgstr "Configuration"
+msgstr "Konfiguracja"
 
 msgctxt "model:ir.ui.menu,name:menu_inventory_form"
 msgid "Inventories"
@@ -1477,7 +1681,7 @@ msgstr "Inventories"
 
 msgctxt "model:ir.ui.menu,name:menu_location_form"
 msgid "Locations"
-msgstr "Locations"
+msgstr "Lokalizacje"
 
 msgctxt "model:ir.ui.menu,name:menu_location_lead_time_form"
 msgid "Location Lead Times"
@@ -1493,7 +1697,7 @@ msgstr "Moves"
 
 msgctxt "model:ir.ui.menu,name:menu_period_list"
 msgid "Periods"
-msgstr "Periods"
+msgstr "Okresy"
 
 msgctxt "model:ir.ui.menu,name:menu_reporting"
 msgid "Reporting"
@@ -1527,9 +1731,13 @@ msgctxt "model:ir.ui.menu,name:menu_stock_configuration"
 msgid "Stock Configuration"
 msgstr "Stock Configuration"
 
+msgctxt "model:party.party.location,name:"
+msgid "Party Location"
+msgstr ""
+
 msgctxt "model:product.by_location.context,name:"
 msgid "Product by Location"
-msgstr ""
+msgstr "Produkt wg lokalizacji"
 
 msgctxt "model:res.group,name:group_stock"
 msgid "Stock"
@@ -1548,6 +1756,14 @@ msgctxt "model:stock.configuration,name:"
 msgid "Stock Configuration"
 msgstr "Stock Configuration"
 
+msgctxt "model:stock.configuration.location,name:"
+msgid "Stock Configuration Location"
+msgstr ""
+
+msgctxt "model:stock.configuration.sequence,name:"
+msgid "Stock Configuration Sequence"
+msgstr ""
+
 msgctxt "model:stock.inventory,name:"
 msgid "Stock Inventory"
 msgstr ""
@@ -1562,7 +1778,7 @@ msgstr ""
 
 msgctxt "model:stock.location,name:location_customer"
 msgid "Customer"
-msgstr "Customer"
+msgstr "Klient"
 
 msgctxt "model:stock.location,name:location_input"
 msgid "Input Zone"
@@ -1570,7 +1786,7 @@ msgstr "Input Zone"
 
 msgctxt "model:stock.location,name:location_lost_found"
 msgid "Lost and Found"
-msgstr "Lost and Found"
+msgstr "Zgubione i znalezione"
 
 msgctxt "model:stock.location,name:location_output"
 msgid "Output Zone"
@@ -1582,7 +1798,7 @@ msgstr "Storage Zone"
 
 msgctxt "model:stock.location,name:location_supplier"
 msgid "Supplier"
-msgstr "Supplier"
+msgstr "Dostawca"
 
 msgctxt "model:stock.location,name:location_transit"
 msgid "Transit"
@@ -1590,7 +1806,7 @@ msgstr "Transit"
 
 msgctxt "model:stock.location,name:location_warehouse"
 msgid "Warehouse"
-msgstr "Warehouse"
+msgstr "Magazyn"
 
 #, fuzzy
 msgctxt "model:stock.location.lead_time,name:"
@@ -1609,19 +1825,17 @@ msgctxt "model:stock.period.cache,name:"
 msgid "Stock Period Cache"
 msgstr ""
 
-#, fuzzy
 msgctxt "model:stock.product_quantities_warehouse,name:"
 msgid "Product Quantities By Warehouse"
-msgstr "Product Quantities By Warehouse"
+msgstr "Ilości produktów wg magazynu"
 
-#, fuzzy
 msgctxt "model:stock.product_quantities_warehouse.context,name:"
 msgid "Product Quantities By Warehouse"
-msgstr "Product Quantities By Warehouse"
+msgstr "Ilości produktów wg magazynu"
 
 msgctxt "model:stock.products_by_locations.context,name:"
 msgid "Products by Locations"
-msgstr ""
+msgstr "Produkty wg lokalizacji"
 
 #, fuzzy
 msgctxt "model:stock.shipment.in,name:"
@@ -1665,28 +1879,27 @@ msgstr "Customer Return Shipment"
 
 msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "/"
-msgstr ""
+msgstr "/"
 
 msgctxt "report:stock.shipment.in.restocking_list:"
 msgid ":"
-msgstr ""
+msgstr ":"
 
 msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "From Location"
-msgstr ""
+msgstr "Z lokalizacji"
 
 msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Planned Date:"
-msgstr ""
+msgstr "Data planowana:"
 
-#, fuzzy
 msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Product"
-msgstr "Products"
+msgstr "Produkt"
 
 msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Quantity"
-msgstr ""
+msgstr "Ilość"
 
 msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Reference:"
@@ -1701,35 +1914,33 @@ msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Shipment Number"
 msgstr ""
 
-#, fuzzy
 msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Supplier:"
-msgstr "Supplier"
+msgstr "Dostawca:"
 
 msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "To Location"
-msgstr ""
+msgstr "Do lokalizacji"
 
-#, fuzzy
 msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Warehouse:"
-msgstr "Warehouse"
+msgstr "Magazyn:"
 
 msgctxt "report:stock.shipment.internal.report:"
 msgid "/"
-msgstr ""
+msgstr "/"
 
 msgctxt "report:stock.shipment.internal.report:"
 msgid ":"
-msgstr ""
+msgstr ":"
 
 msgctxt "report:stock.shipment.internal.report:"
 msgid "From Location"
-msgstr ""
+msgstr "Z lokalizacji"
 
 msgctxt "report:stock.shipment.internal.report:"
 msgid "From Location:"
-msgstr ""
+msgstr "Z lokalizacji:"
 
 #, fuzzy
 msgctxt "report:stock.shipment.internal.report:"
@@ -1738,16 +1949,15 @@ msgstr "Internal Shipment"
 
 msgctxt "report:stock.shipment.internal.report:"
 msgid "Planned Date:"
-msgstr ""
+msgstr "Data planowana:"
 
-#, fuzzy
 msgctxt "report:stock.shipment.internal.report:"
 msgid "Product"
-msgstr "Products"
+msgstr "Produkt"
 
 msgctxt "report:stock.shipment.internal.report:"
 msgid "Quantity"
-msgstr ""
+msgstr "Ilość"
 
 msgctxt "report:stock.shipment.internal.report:"
 msgid "Reference:"
@@ -1759,37 +1969,35 @@ msgstr ""
 
 msgctxt "report:stock.shipment.internal.report:"
 msgid "To Location"
-msgstr ""
+msgstr "Do lokalizacji"
 
 msgctxt "report:stock.shipment.internal.report:"
 msgid "To Location:"
-msgstr ""
+msgstr "Do lokalizacji:"
 
 msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "/"
-msgstr ""
+msgstr "/"
 
 msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Customer Code:"
-msgstr ""
+msgstr "Kod klienta:"
 
 msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Date:"
-msgstr ""
+msgstr "Data:"
 
-#, fuzzy
 msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Delivery Note"
-msgstr "Delivery Note"
+msgstr "List przewozowy"
 
-#, fuzzy
 msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Product"
-msgstr "Products"
+msgstr "Produkt"
 
 msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Quantity"
-msgstr ""
+msgstr "Ilość"
 
 msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Reference:"
@@ -1801,20 +2009,19 @@ msgstr ""
 
 msgctxt "report:stock.shipment.out.picking_list:"
 msgid "/"
-msgstr ""
+msgstr "/"
 
 msgctxt "report:stock.shipment.out.picking_list:"
 msgid ":"
-msgstr ""
+msgstr ":"
 
-#, fuzzy
 msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Customer:"
-msgstr "Customer"
+msgstr "Klient:"
 
 msgctxt "report:stock.shipment.out.picking_list:"
 msgid "From Location"
-msgstr ""
+msgstr "Z lokalizacji"
 
 #, fuzzy
 msgctxt "report:stock.shipment.out.picking_list:"
@@ -1823,16 +2030,15 @@ msgstr "Picking List"
 
 msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Planned Date:"
-msgstr ""
+msgstr "Data planowana:"
 
-#, fuzzy
 msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Product"
-msgstr "Products"
+msgstr "Produkt"
 
 msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Quantity"
-msgstr ""
+msgstr "Ilość"
 
 msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Reference:"
@@ -1844,46 +2050,43 @@ msgstr ""
 
 msgctxt "report:stock.shipment.out.picking_list:"
 msgid "To Location"
-msgstr ""
+msgstr "Do lokalizacji"
 
-#, fuzzy
 msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Warehouse:"
-msgstr "Warehouse"
+msgstr "Magazyn:"
 
 msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "/"
-msgstr ""
+msgstr "/"
 
 msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid ":"
-msgstr ""
+msgstr ":"
 
-#, fuzzy
 msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Customer"
-msgstr "Customer"
+msgstr "Klient"
 
 msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "From Location"
-msgstr ""
+msgstr "Z lokalizacji"
 
 msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Number"
-msgstr ""
+msgstr "Numer"
 
 msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Planned Date:"
-msgstr ""
+msgstr "Data planowana:"
 
-#, fuzzy
 msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Product"
-msgstr "Products"
+msgstr "Produkt"
 
 msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Quantity"
-msgstr ""
+msgstr "Ilość"
 
 msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Reference:"
@@ -1900,92 +2103,83 @@ msgstr ""
 
 msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "To Location"
-msgstr ""
+msgstr "Do lokalizacji"
 
-#, fuzzy
 msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Warehouse:"
-msgstr "Warehouse"
+msgstr "Magazyn:"
 
 msgctxt "selection:stock.inventory,state:"
 msgid "Canceled"
-msgstr ""
+msgstr "Anulowany"
 
 msgctxt "selection:stock.inventory,state:"
 msgid "Done"
-msgstr ""
+msgstr "Ukończony"
 
-#, fuzzy
 msgctxt "selection:stock.inventory,state:"
 msgid "Draft"
-msgstr "Draft"
+msgstr "Szkic"
 
 msgctxt "selection:stock.inventory.line,inventory_state:"
 msgid "Canceled"
-msgstr ""
+msgstr "Anulowany"
 
 msgctxt "selection:stock.inventory.line,inventory_state:"
 msgid "Done"
-msgstr ""
+msgstr "Ukończony"
 
-#, fuzzy
 msgctxt "selection:stock.inventory.line,inventory_state:"
 msgid "Draft"
-msgstr "Draft"
+msgstr "Szkic"
 
-#, fuzzy
 msgctxt "selection:stock.location,type:"
 msgid "Customer"
-msgstr "Customer"
+msgstr "Klient"
 
 msgctxt "selection:stock.location,type:"
 msgid "Drop"
 msgstr ""
 
-#, fuzzy
 msgctxt "selection:stock.location,type:"
 msgid "Lost and Found"
-msgstr "Lost and Found"
+msgstr "Zgubione i znalezione"
 
 msgctxt "selection:stock.location,type:"
 msgid "Production"
-msgstr ""
+msgstr "Produkcja"
 
 msgctxt "selection:stock.location,type:"
 msgid "Storage"
 msgstr ""
 
-#, fuzzy
 msgctxt "selection:stock.location,type:"
 msgid "Supplier"
-msgstr "Supplier"
+msgstr "Dostawca"
 
 msgctxt "selection:stock.location,type:"
 msgid "View"
-msgstr ""
+msgstr "Widok"
 
-#, fuzzy
 msgctxt "selection:stock.location,type:"
 msgid "Warehouse"
-msgstr "Warehouse"
+msgstr "Magazyn"
 
-#, fuzzy
 msgctxt "selection:stock.move,state:"
 msgid "Assigned"
-msgstr "Assigned"
+msgstr "Przypisany"
 
 msgctxt "selection:stock.move,state:"
 msgid "Canceled"
-msgstr ""
+msgstr "Anulowany"
 
 msgctxt "selection:stock.move,state:"
 msgid "Done"
-msgstr ""
+msgstr "Ukończony"
 
-#, fuzzy
 msgctxt "selection:stock.move,state:"
 msgid "Draft"
-msgstr "Draft"
+msgstr "Szkic"
 
 msgctxt "selection:stock.move,state:"
 msgid "Staging"
@@ -1993,127 +2187,117 @@ msgstr ""
 
 msgctxt "selection:stock.period,state:"
 msgid "Closed"
-msgstr ""
+msgstr "Zamknięty"
 
-#, fuzzy
 msgctxt "selection:stock.period,state:"
 msgid "Draft"
-msgstr "Draft"
+msgstr "Szkic"
 
 msgctxt "selection:stock.shipment.in,state:"
 msgid "Canceled"
-msgstr ""
+msgstr "Anulowany"
 
 msgctxt "selection:stock.shipment.in,state:"
 msgid "Done"
-msgstr ""
+msgstr "Ukończony"
 
-#, fuzzy
 msgctxt "selection:stock.shipment.in,state:"
 msgid "Draft"
-msgstr "Draft"
+msgstr "Szkic"
 
-#, fuzzy
 msgctxt "selection:stock.shipment.in,state:"
 msgid "Received"
-msgstr "Received"
+msgstr "Odebrany"
 
-#, fuzzy
 msgctxt "selection:stock.shipment.in.return,state:"
 msgid "Assigned"
-msgstr "Assigned"
+msgstr "Przypisany"
 
 msgctxt "selection:stock.shipment.in.return,state:"
 msgid "Canceled"
-msgstr ""
+msgstr "Anulowany"
 
 msgctxt "selection:stock.shipment.in.return,state:"
 msgid "Done"
-msgstr ""
+msgstr "Ukończony"
 
-#, fuzzy
 msgctxt "selection:stock.shipment.in.return,state:"
 msgid "Draft"
-msgstr "Draft"
+msgstr "Szkic"
 
-#, fuzzy
 msgctxt "selection:stock.shipment.in.return,state:"
 msgid "Waiting"
-msgstr "Waiting"
+msgstr "Oczekujący"
 
-#, fuzzy
 msgctxt "selection:stock.shipment.internal,state:"
 msgid "Assigned"
-msgstr "Assigned"
+msgstr "Przypisany"
 
 msgctxt "selection:stock.shipment.internal,state:"
 msgid "Canceled"
-msgstr ""
+msgstr "Anulowany"
 
 msgctxt "selection:stock.shipment.internal,state:"
 msgid "Done"
-msgstr ""
+msgstr "Ukończony"
 
-#, fuzzy
 msgctxt "selection:stock.shipment.internal,state:"
 msgid "Draft"
-msgstr "Draft"
+msgstr "Szkic"
+
+msgctxt "selection:stock.shipment.internal,state:"
+msgid "Request"
+msgstr ""
 
 #, fuzzy
 msgctxt "selection:stock.shipment.internal,state:"
 msgid "Shipped"
 msgstr "Shipped"
 
-#, fuzzy
 msgctxt "selection:stock.shipment.internal,state:"
 msgid "Waiting"
-msgstr "Waiting"
+msgstr "Oczekujący"
 
-#, fuzzy
 msgctxt "selection:stock.shipment.out,state:"
 msgid "Assigned"
-msgstr "Assigned"
+msgstr "Przypisany"
 
 msgctxt "selection:stock.shipment.out,state:"
 msgid "Canceled"
-msgstr ""
+msgstr "Anulowany"
 
 msgctxt "selection:stock.shipment.out,state:"
 msgid "Done"
-msgstr ""
+msgstr "Ukończony"
 
-#, fuzzy
 msgctxt "selection:stock.shipment.out,state:"
 msgid "Draft"
-msgstr "Draft"
+msgstr "Szkic"
 
 #, fuzzy
 msgctxt "selection:stock.shipment.out,state:"
 msgid "Packed"
 msgstr "Packed"
 
-#, fuzzy
 msgctxt "selection:stock.shipment.out,state:"
 msgid "Waiting"
-msgstr "Waiting"
+msgstr "Oczekujący"
 
 msgctxt "selection:stock.shipment.out.return,state:"
 msgid "Canceled"
-msgstr ""
+msgstr "Anulowany"
 
 msgctxt "selection:stock.shipment.out.return,state:"
 msgid "Done"
-msgstr ""
+msgstr "Ukończony"
 
-#, fuzzy
 msgctxt "selection:stock.shipment.out.return,state:"
 msgid "Draft"
-msgstr "Draft"
+msgstr "Szkic"
 
-#, fuzzy
 msgctxt "selection:stock.shipment.out.return,state:"
 msgid "Received"
-msgstr "Received"
+msgstr "Otrzymany"
 
 #, fuzzy
 msgctxt "view:party.party:"
@@ -2139,7 +2323,7 @@ msgstr ""
 
 msgctxt "view:stock.inventory:"
 msgid "Cancel"
-msgstr ""
+msgstr "Anuluj"
 
 msgctxt "view:stock.inventory:"
 msgid "Complete Inventory"
@@ -2147,62 +2331,64 @@ msgstr ""
 
 msgctxt "view:stock.inventory:"
 msgid "Confirm"
-msgstr ""
+msgstr "Potwierdź"
 
 msgctxt "view:stock.move:"
 msgid "Cancel"
-msgstr ""
+msgstr "Anuluj"
 
 msgctxt "view:stock.move:"
 msgid "Do"
 msgstr ""
 
+#, fuzzy
 msgctxt "view:stock.move:"
 msgid "Reset to Draft"
-msgstr ""
+msgstr "Przywróć do szkicu"
 
 msgctxt "view:stock.period:"
 msgid "Close"
-msgstr ""
+msgstr "Zamknij"
 
-#, fuzzy
 msgctxt "view:stock.period:"
 msgid "Draft"
-msgstr "Draft"
+msgstr "Szkic"
 
 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 "Assigned"
+msgstr "Przydziel"
 
 msgctxt "view:stock.shipment.in.return:"
 msgid "Cancel"
-msgstr ""
+msgstr "Anuluj"
 
 msgctxt "view:stock.shipment.in.return:"
 msgid "Done"
-msgstr ""
+msgstr "Ukończony"
 
-#, fuzzy
 msgctxt "view:stock.shipment.in.return:"
 msgid "Draft"
-msgstr "Draft"
+msgstr "Szkic"
 
 msgctxt "view:stock.shipment.in.return:"
-msgid "Wait"
+msgid "Other Info"
 msgstr ""
 
+msgctxt "view:stock.shipment.in.return:"
+msgid "Wait"
+msgstr "Czekaj"
+
 msgctxt "view:stock.shipment.in:"
 msgid "Cancel"
-msgstr ""
+msgstr "Anuluj"
 
 msgctxt "view:stock.shipment.in:"
 msgid "Done"
-msgstr ""
+msgstr "Ukończony"
 
 msgctxt "view:stock.shipment.in:"
 msgid "Incoming Moves"
@@ -2212,36 +2398,41 @@ msgctxt "view:stock.shipment.in:"
 msgid "Inventory Moves"
 msgstr ""
 
-#, fuzzy
+msgctxt "view:stock.shipment.in:"
+msgid "Other Info"
+msgstr ""
+
 msgctxt "view:stock.shipment.in:"
 msgid "Receive"
-msgstr "Received"
+msgstr "Odbierz"
 
 msgctxt "view:stock.shipment.in:"
 msgid "Reset to Draft"
-msgstr ""
+msgstr "Przywróć do szkicu"
 
 msgctxt "view:stock.shipment.internal.assign.failed:"
 msgid "Unable to assign those products:"
 msgstr ""
 
-#, fuzzy
 msgctxt "view:stock.shipment.internal:"
 msgid "Assign"
-msgstr "Assigned"
+msgstr "Przydziel"
 
 msgctxt "view:stock.shipment.internal:"
 msgid "Cancel"
-msgstr ""
+msgstr "Anuluj"
 
 msgctxt "view:stock.shipment.internal:"
 msgid "Done"
-msgstr ""
+msgstr "Ukończony"
 
-#, fuzzy
 msgctxt "view:stock.shipment.internal:"
 msgid "Draft"
-msgstr "Draft"
+msgstr "Szkic"
+
+msgctxt "view:stock.shipment.internal:"
+msgid "Other Info"
+msgstr ""
 
 msgctxt "view:stock.shipment.internal:"
 msgid "Ship"
@@ -2249,7 +2440,7 @@ msgstr ""
 
 msgctxt "view:stock.shipment.internal:"
 msgid "Wait"
-msgstr ""
+msgstr "Czekaj"
 
 msgctxt "view:stock.shipment.out.assign.failed:"
 msgid "Unable to assign those products:"
@@ -2257,16 +2448,15 @@ msgstr ""
 
 msgctxt "view:stock.shipment.out.return:"
 msgid "Cancel"
-msgstr ""
+msgstr "Anuluj"
 
 msgctxt "view:stock.shipment.out.return:"
 msgid "Done"
-msgstr ""
+msgstr "Ukończony"
 
-#, fuzzy
 msgctxt "view:stock.shipment.out.return:"
 msgid "Draft"
-msgstr "Draft"
+msgstr "Szkic"
 
 msgctxt "view:stock.shipment.out.return:"
 msgid "Incoming Moves"
@@ -2276,35 +2466,37 @@ msgctxt "view:stock.shipment.out.return:"
 msgid "Inventory Moves"
 msgstr ""
 
+msgctxt "view:stock.shipment.out.return:"
+msgid "Other Info"
+msgstr ""
+
 #, fuzzy
 msgctxt "view:stock.shipment.out.return:"
 msgid "Received"
 msgstr "Received"
 
-#, fuzzy
 msgctxt "view:stock.shipment.out:"
 msgid "Assign"
-msgstr "Assigned"
+msgstr "Przydziel"
 
 msgctxt "view:stock.shipment.out:"
 msgid "Cancel"
-msgstr ""
+msgstr "Anuluj"
 
 msgctxt "view:stock.shipment.out:"
 msgid "Done"
-msgstr ""
+msgstr "Ukończony"
 
-#, fuzzy
 msgctxt "view:stock.shipment.out:"
 msgid "Draft"
-msgstr "Draft"
+msgstr "Szkic"
 
 msgctxt "view:stock.shipment.out:"
-msgid "Inventory Moves"
+msgid "Make shipment"
 msgstr ""
 
 msgctxt "view:stock.shipment.out:"
-msgid "Make shipment"
+msgid "Other Info"
 msgstr ""
 
 msgctxt "view:stock.shipment.out:"
@@ -2313,28 +2505,28 @@ msgstr ""
 
 msgctxt "view:stock.shipment.out:"
 msgid "Wait"
-msgstr ""
+msgstr "Czekaj"
 
 msgctxt "wizard_button:stock.shipment.in.return.assign,failed,end:"
 msgid "OK"
-msgstr ""
+msgstr "OK"
 
 msgctxt "wizard_button:stock.shipment.in.return.assign,failed,force:"
 msgid "Force Assign"
-msgstr ""
+msgstr "Wymuś przydzielenie"
 
 msgctxt "wizard_button:stock.shipment.internal.assign,failed,end:"
 msgid "OK"
-msgstr ""
+msgstr "OK"
 
 msgctxt "wizard_button:stock.shipment.internal.assign,failed,force:"
 msgid "Force Assign"
-msgstr ""
+msgstr "Wymuś przydzielenie"
 
 msgctxt "wizard_button:stock.shipment.out.assign,failed,end:"
 msgid "OK"
-msgstr ""
+msgstr "OK"
 
 msgctxt "wizard_button:stock.shipment.out.assign,failed,force:"
 msgid "Force Assign"
-msgstr ""
+msgstr "Wymuś przydzielenie"
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index bf04a33..9c27437 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -31,7 +31,9 @@ msgstr "A linha \"%s\" não é única no Inventário \"%s\"."
 
 msgctxt "error:stock.location:"
 msgid "Location \"%(location)s\" must be a child of warehouse \"%(warehouse)s\"."
-msgstr "A localização \"%(location)s\" deve ser filha do armazém \"%(warehouse)s\"."
+msgstr ""
+"A localização \"%(location)s\" deve ser filha do almoxarifado "
+"\"%(warehouse)s\"."
 
 msgctxt "error:stock.location:"
 msgid ""
@@ -121,15 +123,15 @@ msgid ""
 "Incoming Moves must have the warehouse input location as destination "
 "location."
 msgstr ""
-"Movimentações de Entrada devem ter a localização de entrada do armazém como "
-"localização de destino."
+"Movimentações de Entrada devem ter a localização de entrada do almoxarifado "
+"como localização de destino."
 
 msgctxt "error:stock.shipment.in:"
 msgid ""
 "Inventory Moves must have the warehouse input location as source location."
 msgstr ""
-"Movimentações Internas devem possuir a localização de entrada do armazém "
-"como localização de origem."
+"Movimentações Internas devem possuir a localização de entrada do "
+"almoxarifado como localização de origem."
 
 msgctxt "error:stock.shipment.in:"
 msgid "Supplier Shipment \"%s\" must be cancelled before deletion."
@@ -155,22 +157,61 @@ msgctxt "field:party.party,customer_location:"
 msgid "Customer Location"
 msgstr "Localização do cliente"
 
+msgctxt "field:party.party,locations:"
+msgid "Locations"
+msgstr "Locais"
+
 msgctxt "field:party.party,supplier_location:"
 msgid "Supplier Location"
 msgstr "Localização do fornecedor"
 
+msgctxt "field:party.party.location,create_date:"
+msgid "Create Date"
+msgstr "Data de criação"
+
+msgctxt "field:party.party.location,create_uid:"
+msgid "Create User"
+msgstr "Criado por"
+
+msgctxt "field:party.party.location,customer_location:"
+msgid "Customer Location"
+msgstr "Localização do Cliente"
+
+msgctxt "field:party.party.location,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:party.party.location,party:"
+msgid "Party"
+msgstr "Pessoa"
+
+msgctxt "field:party.party.location,rec_name:"
+msgid "Name"
+msgstr "Nome"
+
+msgctxt "field:party.party.location,supplier_location:"
+msgid "Supplier Location"
+msgstr "Localização do Fornecedor"
+
+msgctxt "field:party.party.location,write_date:"
+msgid "Write Date"
+msgstr "Data de edição"
+
+msgctxt "field:party.party.location,write_uid:"
+msgid "Write User"
+msgstr "Editado por"
+
 msgctxt "field:product.by_location.context,forecast_date:"
 msgid "At Date"
-msgstr ""
+msgstr "Na Data"
 
-#, fuzzy
 msgctxt "field:product.by_location.context,id:"
 msgid "ID"
 msgstr "ID"
 
 msgctxt "field:product.by_location.context,stock_date_end:"
 msgid "At Date"
-msgstr ""
+msgstr "Na Data"
 
 msgctxt "field:product.product,cost_value:"
 msgid "Cost Value"
@@ -210,7 +251,7 @@ msgstr "ID"
 
 msgctxt "field:stock.configuration,inventory_sequence:"
 msgid "Inventory Sequence"
-msgstr ""
+msgstr "Sequência do Inventário"
 
 msgctxt "field:stock.configuration,rec_name:"
 msgid "Name"
@@ -230,7 +271,7 @@ msgstr "Sequência de Remessa Interna"
 
 msgctxt "field:stock.configuration,shipment_internal_transit:"
 msgid "Internal Shipment Transit"
-msgstr ""
+msgstr "Trânsito de Remessa Interna"
 
 msgctxt "field:stock.configuration,shipment_out_return_sequence:"
 msgid "Customer Return Shipment Sequence"
@@ -248,6 +289,86 @@ msgctxt "field:stock.configuration,write_uid:"
 msgid "Write User"
 msgstr "Editado por"
 
+msgctxt "field:stock.configuration.location,create_date:"
+msgid "Create Date"
+msgstr "Data de criação"
+
+msgctxt "field:stock.configuration.location,create_uid:"
+msgid "Create User"
+msgstr "Criado por"
+
+msgctxt "field:stock.configuration.location,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:stock.configuration.location,rec_name:"
+msgid "Name"
+msgstr "Nome"
+
+msgctxt "field:stock.configuration.location,shipment_internal_transit:"
+msgid "Internal Shipment Transit"
+msgstr "Trânsito de Remessa Interna"
+
+msgctxt "field:stock.configuration.location,write_date:"
+msgid "Write Date"
+msgstr "Data de edição"
+
+msgctxt "field:stock.configuration.location,write_uid:"
+msgid "Write User"
+msgstr "Editado por"
+
+msgctxt "field:stock.configuration.sequence,company:"
+msgid "Company"
+msgstr "Empresa"
+
+msgctxt "field:stock.configuration.sequence,create_date:"
+msgid "Create Date"
+msgstr "Data de criação"
+
+msgctxt "field:stock.configuration.sequence,create_uid:"
+msgid "Create User"
+msgstr "Criado por"
+
+msgctxt "field:stock.configuration.sequence,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:stock.configuration.sequence,inventory_sequence:"
+msgid "Inventory Sequence"
+msgstr "Sequência de Inventório"
+
+msgctxt "field:stock.configuration.sequence,rec_name:"
+msgid "Name"
+msgstr "Nome"
+
+msgctxt "field:stock.configuration.sequence,shipment_in_return_sequence:"
+msgid "Supplier Return Shipment Sequence"
+msgstr "Sequência de Remessa de Devolução ao Fornecedor"
+
+msgctxt "field:stock.configuration.sequence,shipment_in_sequence:"
+msgid "Supplier Shipment Sequence"
+msgstr "Sequência de Remessa do Fornecedor"
+
+msgctxt "field:stock.configuration.sequence,shipment_internal_sequence:"
+msgid "Internal Shipment Sequence"
+msgstr "Sequência de Remessa Interna"
+
+msgctxt "field:stock.configuration.sequence,shipment_out_return_sequence:"
+msgid "Customer Return Shipment Sequence"
+msgstr "Sequência de Devolução do Cliente"
+
+msgctxt "field:stock.configuration.sequence,shipment_out_sequence:"
+msgid "Customer Shipment Sequence"
+msgstr "Sequência de Remessa ao Cliente"
+
+msgctxt "field:stock.configuration.sequence,write_date:"
+msgid "Write Date"
+msgstr "Data de edição"
+
+msgctxt "field:stock.configuration.sequence,write_uid:"
+msgid "Write User"
+msgstr "Editado por"
+
 msgctxt "field:stock.inventory,company:"
 msgid "Company"
 msgstr "Empresa"
@@ -280,7 +401,6 @@ msgctxt "field:stock.inventory,lost_found:"
 msgid "Lost and Found"
 msgstr "Achados e Perdidos"
 
-#, fuzzy
 msgctxt "field:stock.inventory,number:"
 msgid "Number"
 msgstr "Número"
@@ -323,7 +443,7 @@ msgstr "Inventário"
 
 msgctxt "field:stock.inventory.line,inventory_state:"
 msgid "Inventory State"
-msgstr ""
+msgstr "Estado do Inventário"
 
 msgctxt "field:stock.inventory.line,moves:"
 msgid "Moves"
@@ -411,7 +531,7 @@ msgstr "Saída"
 
 msgctxt "field:stock.location,parent:"
 msgid "Parent"
-msgstr "Parente"
+msgstr "Pai"
 
 msgctxt "field:stock.location,picking_location:"
 msgid "Picking"
@@ -437,10 +557,9 @@ msgctxt "field:stock.location,type:"
 msgid "Location type"
 msgstr "Tipo da localização"
 
-#, fuzzy
 msgctxt "field:stock.location,warehouse:"
 msgid "Warehouse"
-msgstr "Armazém"
+msgstr "Almoxarifado"
 
 msgctxt "field:stock.location,write_date:"
 msgid "Write Date"
@@ -450,58 +569,49 @@ msgctxt "field:stock.location,write_uid:"
 msgid "Write User"
 msgstr "Editado por"
 
-#, fuzzy
 msgctxt "field:stock.location.lead_time,create_date:"
 msgid "Create Date"
 msgstr "Data de criação"
 
-#, fuzzy
 msgctxt "field:stock.location.lead_time,create_uid:"
 msgid "Create User"
-msgstr "Usuário de Criação"
+msgstr "Criado por"
 
-#, fuzzy
 msgctxt "field:stock.location.lead_time,id:"
 msgid "ID"
 msgstr "ID"
 
 msgctxt "field:stock.location.lead_time,lead_time:"
 msgid "Lead Time"
-msgstr ""
+msgstr "Tempo de Espera"
 
-#, fuzzy
 msgctxt "field:stock.location.lead_time,rec_name:"
 msgid "Name"
 msgstr "Nome"
 
-#, fuzzy
 msgctxt "field:stock.location.lead_time,sequence:"
 msgid "Sequence"
 msgstr "Sequência"
 
-#, fuzzy
 msgctxt "field:stock.location.lead_time,warehouse_from:"
 msgid "Warehouse From"
-msgstr "Armazém"
+msgstr "Do Almoxarifado"
 
-#, fuzzy
 msgctxt "field:stock.location.lead_time,warehouse_to:"
 msgid "Warehouse To"
-msgstr "Armazém"
+msgstr "Para o Almoxarifado"
 
-#, fuzzy
 msgctxt "field:stock.location.lead_time,write_date:"
 msgid "Write Date"
-msgstr "Editado por"
+msgstr "Data de edição"
 
-#, fuzzy
 msgctxt "field:stock.location.lead_time,write_uid:"
 msgid "Write User"
-msgstr "Gravado por"
+msgstr "Editado por"
 
 msgctxt "field:stock.move,assignation_required:"
 msgid "Assignation Required"
-msgstr ""
+msgstr "Atribuição Obrigatória"
 
 msgctxt "field:stock.move,company:"
 msgid "Company"
@@ -711,28 +821,25 @@ msgctxt "field:stock.product_quantities_warehouse,write_uid:"
 msgid "Write User"
 msgstr "Editado por"
 
-#, fuzzy
 msgctxt "field:stock.product_quantities_warehouse.context,id:"
 msgid "ID"
 msgstr "ID"
 
-#, fuzzy
 msgctxt "field:stock.product_quantities_warehouse.context,warehouse:"
 msgid "Warehouse"
-msgstr "Estoque/Almoxarifado"
+msgstr "Almoxarifado"
 
 msgctxt "field:stock.products_by_locations.context,forecast_date:"
 msgid "At Date"
-msgstr ""
+msgstr "Na Data"
 
-#, fuzzy
 msgctxt "field:stock.products_by_locations.context,id:"
 msgid "ID"
 msgstr "ID"
 
 msgctxt "field:stock.products_by_locations.context,stock_date_end:"
 msgid "At Date"
-msgstr ""
+msgstr "Na data"
 
 msgctxt "field:stock.shipment.in,company:"
 msgid "Company"
@@ -750,6 +857,10 @@ msgctxt "field:stock.shipment.in,create_uid:"
 msgid "Create User"
 msgstr "Criado por"
 
+msgctxt "field:stock.shipment.in,done_by:"
+msgid "Done By"
+msgstr "Feito Por"
+
 msgctxt "field:stock.shipment.in,effective_date:"
 msgid "Effective Date"
 msgstr "Data efetiva"
@@ -770,9 +881,8 @@ msgctxt "field:stock.shipment.in,moves:"
 msgid "Moves"
 msgstr "Movimentações"
 
-#, fuzzy
 msgctxt "field:stock.shipment.in,number:"
-msgid "Numer"
+msgid "Number"
 msgstr "Número"
 
 msgctxt "field:stock.shipment.in,origins:"
@@ -787,6 +897,10 @@ msgctxt "field:stock.shipment.in,rec_name:"
 msgid "Name"
 msgstr "Nome"
 
+msgctxt "field:stock.shipment.in,received_by:"
+msgid "Received By"
+msgstr "Recebido Por"
+
 msgctxt "field:stock.shipment.in,reference:"
 msgid "Reference"
 msgstr "Referência"
@@ -805,15 +919,15 @@ msgstr "Localização do fornecedor"
 
 msgctxt "field:stock.shipment.in,warehouse:"
 msgid "Warehouse"
-msgstr "Armazém"
+msgstr "Almoxarifado"
 
 msgctxt "field:stock.shipment.in,warehouse_input:"
 msgid "Warehouse Input"
-msgstr "Entrada do Armazém"
+msgstr "Entrada do Almoxarifado"
 
 msgctxt "field:stock.shipment.in,warehouse_storage:"
 msgid "Warehouse Storage"
-msgstr "Armazenamento do Armazém"
+msgstr "Armazenamento do Almoxarifado"
 
 msgctxt "field:stock.shipment.in,write_date:"
 msgid "Write Date"
@@ -823,6 +937,10 @@ msgctxt "field:stock.shipment.in,write_uid:"
 msgid "Write User"
 msgstr "Editado por"
 
+msgctxt "field:stock.shipment.in.return,assigned_by:"
+msgid "Assigned By"
+msgstr "Atribuído Por"
+
 msgctxt "field:stock.shipment.in.return,company:"
 msgid "Company"
 msgstr "Empresa"
@@ -835,10 +953,13 @@ 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"
+msgstr "Endereço para Entrega"
+
+msgctxt "field:stock.shipment.in.return,done_by:"
+msgid "Done By"
+msgstr "Feito Por"
 
 msgctxt "field:stock.shipment.in.return,effective_date:"
 msgid "Effective Date"
@@ -856,7 +977,6 @@ msgctxt "field:stock.shipment.in.return,moves:"
 msgid "Moves"
 msgstr "Movimentações"
 
-#, fuzzy
 msgctxt "field:stock.shipment.in.return,number:"
 msgid "Number"
 msgstr "Número"
@@ -881,7 +1001,6 @@ msgctxt "field:stock.shipment.in.return,state:"
 msgid "State"
 msgstr "Estado"
 
-#, fuzzy
 msgctxt "field:stock.shipment.in.return,supplier:"
 msgid "Supplier"
 msgstr "Fornecedor"
@@ -906,6 +1025,10 @@ msgctxt "field:stock.shipment.in.return.assign.failed,moves:"
 msgid "Moves"
 msgstr "Movimentações"
 
+msgctxt "field:stock.shipment.internal,assigned_by:"
+msgid "Received By"
+msgstr "Recebido Por"
+
 msgctxt "field:stock.shipment.internal,company:"
 msgid "Company"
 msgstr "Empresa"
@@ -918,13 +1041,17 @@ msgctxt "field:stock.shipment.internal,create_uid:"
 msgid "Create User"
 msgstr "Criado por"
 
+msgctxt "field:stock.shipment.internal,done_by:"
+msgid "Done By"
+msgstr "Feito Por"
+
 msgctxt "field:stock.shipment.internal,effective_date:"
 msgid "Effective Date"
 msgstr "Data efetiva"
 
 msgctxt "field:stock.shipment.internal,effective_start_date:"
 msgid "Effective Start Date"
-msgstr ""
+msgstr "Data Efetiva de Início"
 
 msgctxt "field:stock.shipment.internal,from_location:"
 msgid "From Location"
@@ -934,7 +1061,6 @@ msgctxt "field:stock.shipment.internal,id:"
 msgid "ID"
 msgstr "ID"
 
-#, fuzzy
 msgctxt "field:stock.shipment.internal,incoming_moves:"
 msgid "Incoming Moves"
 msgstr "Movimentações de Entrada"
@@ -943,12 +1069,10 @@ msgctxt "field:stock.shipment.internal,moves:"
 msgid "Moves"
 msgstr "Movimentações"
 
-#, fuzzy
 msgctxt "field:stock.shipment.internal,number:"
 msgid "Number"
 msgstr "Número"
 
-#, fuzzy
 msgctxt "field:stock.shipment.internal,outgoing_moves:"
 msgid "Outgoing Moves"
 msgstr "Movimentações de Saída"
@@ -959,7 +1083,7 @@ msgstr "Data planejada"
 
 msgctxt "field:stock.shipment.internal,planned_start_date:"
 msgid "Planned Start Date"
-msgstr ""
+msgstr "Data Planejada de Início"
 
 msgctxt "field:stock.shipment.internal,rec_name:"
 msgid "Name"
@@ -969,6 +1093,10 @@ msgctxt "field:stock.shipment.internal,reference:"
 msgid "Reference"
 msgstr "Referência"
 
+msgctxt "field:stock.shipment.internal,shipped_by:"
+msgid "Shipped By"
+msgstr "Enviado Por"
+
 msgctxt "field:stock.shipment.internal,state:"
 msgid "State"
 msgstr "Estado"
@@ -979,7 +1107,7 @@ msgstr "Destino"
 
 msgctxt "field:stock.shipment.internal,transit_location:"
 msgid "Transit Location"
-msgstr ""
+msgstr "Localização do Trânsito"
 
 msgctxt "field:stock.shipment.internal,write_date:"
 msgid "Write Date"
@@ -997,6 +1125,10 @@ msgctxt "field:stock.shipment.internal.assign.failed,moves:"
 msgid "Moves"
 msgstr "Movimentações"
 
+msgctxt "field:stock.shipment.out,assigned_by:"
+msgid "Assigned By"
+msgstr "Atribuído Por"
+
 msgctxt "field:stock.shipment.out,company:"
 msgid "Company"
 msgstr "Empresa"
@@ -1021,6 +1153,10 @@ msgctxt "field:stock.shipment.out,delivery_address:"
 msgid "Delivery Address"
 msgstr "Endereço para entrega"
 
+msgctxt "field:stock.shipment.out,done_by:"
+msgid "Done By"
+msgstr "Feito Por"
+
 msgctxt "field:stock.shipment.out,effective_date:"
 msgid "Effective Date"
 msgstr "Data efetiva"
@@ -1037,7 +1173,6 @@ msgctxt "field:stock.shipment.out,moves:"
 msgid "Moves"
 msgstr "Movimentações"
 
-#, fuzzy
 msgctxt "field:stock.shipment.out,number:"
 msgid "Number"
 msgstr "Número"
@@ -1050,6 +1185,10 @@ msgctxt "field:stock.shipment.out,outgoing_moves:"
 msgid "Outgoing Moves"
 msgstr "Movimentações de Saída"
 
+msgctxt "field:stock.shipment.out,packed_by:"
+msgid "Packed By"
+msgstr "Empacotado Por"
+
 msgctxt "field:stock.shipment.out,planned_date:"
 msgid "Planned Date"
 msgstr "Data planejada"
@@ -1068,15 +1207,15 @@ msgstr "Estado"
 
 msgctxt "field:stock.shipment.out,warehouse:"
 msgid "Warehouse"
-msgstr "Armazém"
+msgstr "Almoxarifado"
 
 msgctxt "field:stock.shipment.out,warehouse_output:"
 msgid "Warehouse Output"
-msgstr "Saída do Armazém"
+msgstr "Saída do Almoxarifado"
 
 msgctxt "field:stock.shipment.out,warehouse_storage:"
 msgid "Warehouse Storage"
-msgstr "Armazenamento do Armazém"
+msgstr "Armazenamento do Almoxarifado"
 
 msgctxt "field:stock.shipment.out,write_date:"
 msgid "Write Date"
@@ -1118,6 +1257,10 @@ msgctxt "field:stock.shipment.out.return,delivery_address:"
 msgid "Delivery Address"
 msgstr "Endereço para entrega"
 
+msgctxt "field:stock.shipment.out.return,done_by:"
+msgid "Done By"
+msgstr "Feito Por"
+
 msgctxt "field:stock.shipment.out.return,effective_date:"
 msgid "Effective Date"
 msgstr "Data efetiva"
@@ -1138,7 +1281,6 @@ msgctxt "field:stock.shipment.out.return,moves:"
 msgid "Moves"
 msgstr "Movimentações"
 
-#, fuzzy
 msgctxt "field:stock.shipment.out.return,number:"
 msgid "Number"
 msgstr "Número"
@@ -1155,6 +1297,10 @@ msgctxt "field:stock.shipment.out.return,rec_name:"
 msgid "Name"
 msgstr "Nome"
 
+msgctxt "field:stock.shipment.out.return,received_by:"
+msgid "Received By"
+msgstr "Recebido Por"
+
 msgctxt "field:stock.shipment.out.return,reference:"
 msgid "Reference"
 msgstr "Referência"
@@ -1165,15 +1311,15 @@ msgstr "Estado"
 
 msgctxt "field:stock.shipment.out.return,warehouse:"
 msgid "Warehouse"
-msgstr "Armazém"
+msgstr "Almoxarifado"
 
 msgctxt "field:stock.shipment.out.return,warehouse_input:"
 msgid "Warehouse Input"
-msgstr "Entrada do Armazém"
+msgstr "Entrada do Almoxarifado"
 
 msgctxt "field:stock.shipment.out.return,warehouse_storage:"
 msgid "Warehouse Storage"
-msgstr "Armazenamento do Armazém"
+msgstr "Armazenamento do Almoxarifado"
 
 msgctxt "field:stock.shipment.out.return,write_date:"
 msgid "Write Date"
@@ -1191,12 +1337,23 @@ msgctxt "help:party.party,supplier_location:"
 msgid "The default source location when receiving products from the party."
 msgstr "Origem padrão ao receber do fornecedor."
 
+msgctxt "help:party.party.location,customer_location:"
+msgid "The default destination location when sending products to the party."
+msgstr "Destino padrão ao enviar produtos ao cliente."
+
+msgctxt "help:party.party.location,supplier_location:"
+msgid "The default source location when receiving products from the party."
+msgstr "Origem padrão ao receber produtos do fornecedor."
+
 msgctxt "help:product.by_location.context,forecast_date:"
 msgid ""
 "Allow to compute expected stock quantities for this date.\n"
 "* An empty value is an infinite date in the future.\n"
 "* A date in the past will provide historical values."
 msgstr ""
+"Permite o cálculo da quantidade esperada em estoque para esta data.\n"
+"* Um valor vazio é uma data infinita no futuro.\n"
+"* Uma data no passado fornecerá valores do histórico."
 
 msgctxt "help:stock.location,picking_location:"
 msgid "If empty the Storage is used"
@@ -1208,6 +1365,9 @@ msgid ""
 "* An empty value is an infinite date in the future.\n"
 "* A date in the past will provide historical values."
 msgstr ""
+"Permite o cálculo da quantidade esperada em estoque para esta data.\n"
+"* Um valor vazio é uma data infinita no futuro.\n"
+"* Uma data no passado fornecerá valores do histórico."
 
 msgctxt "model:ir.action,name:act_inventory_form"
 msgid "Inventories"
@@ -1219,12 +1379,11 @@ msgstr "Localizações"
 
 msgctxt "model:ir.action,name:act_location_lead_time_form"
 msgid "Location Lead Times"
-msgstr ""
+msgstr "Tempo de Espera da Localização"
 
-#, fuzzy
 msgctxt "model:ir.action,name:act_location_quantity_tree"
 msgid "Locations Quantity"
-msgstr "Localizações"
+msgstr "Quantidade das Localizações"
 
 msgctxt "model:ir.action,name:act_location_tree"
 msgid "Locations"
@@ -1240,7 +1399,7 @@ msgstr "Períodos"
 
 msgctxt "model:ir.action,name:act_product_quantities_warehouse"
 msgid "Product Quantities By Warehouse"
-msgstr "Quantidade de Produto por Armazém"
+msgstr "Quantidade de Produto por Almoxarifado"
 
 msgctxt "model:ir.action,name:act_products_by_locations"
 msgid "Products"
@@ -1392,7 +1551,11 @@ msgctxt ""
 msgid "Draft"
 msgstr "Rascunho"
 
-#, fuzzy
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_shipment_internal_form_domain_requests"
+msgid "Requests"
+msgstr "Pedidos"
+
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_shipment_internal_form_domain_shipped"
 msgid "Shipped"
@@ -1421,7 +1584,7 @@ msgstr "Rascunho"
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_shipment_out_form_domain_packed"
 msgid "Packed"
-msgstr "Embalado"
+msgstr "Empacotado"
 
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_shipment_out_form_domain_waiting"
@@ -1443,7 +1606,6 @@ msgctxt ""
 msgid "Received"
 msgstr "Recebido"
 
-#, fuzzy
 msgctxt "model:ir.sequence,name:sequence_inventory"
 msgid "Inventory"
 msgstr "Inventário"
@@ -1468,7 +1630,6 @@ 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"
@@ -1507,7 +1668,7 @@ msgstr "Localizações"
 
 msgctxt "model:ir.ui.menu,name:menu_location_lead_time_form"
 msgid "Location Lead Times"
-msgstr ""
+msgstr "Tempo de Espera da Localização"
 
 msgctxt "model:ir.ui.menu,name:menu_location_tree"
 msgid "Locations"
@@ -1553,10 +1714,13 @@ msgctxt "model:ir.ui.menu,name:menu_stock_configuration"
 msgid "Stock Configuration"
 msgstr "Configuração do estoque"
 
-#, fuzzy
+msgctxt "model:party.party.location,name:"
+msgid "Party Location"
+msgstr "Localização da Pessoa"
+
 msgctxt "model:product.by_location.context,name:"
 msgid "Product by Location"
-msgstr "Produtos por Localizações"
+msgstr "Produto por Local"
 
 msgctxt "model:res.group,name:group_stock"
 msgid "Stock"
@@ -1574,6 +1738,14 @@ msgctxt "model:stock.configuration,name:"
 msgid "Stock Configuration"
 msgstr "Configuração do estoque"
 
+msgctxt "model:stock.configuration.location,name:"
+msgid "Stock Configuration Location"
+msgstr "Configuração de Estoque do Local"
+
+msgctxt "model:stock.configuration.sequence,name:"
+msgid "Stock Configuration Sequence"
+msgstr "Configuração de Estoque Sequência"
+
 msgctxt "model:stock.inventory,name:"
 msgid "Stock Inventory"
 msgstr "Inventário do estoque"
@@ -1612,15 +1784,15 @@ msgstr "Fornecedor"
 
 msgctxt "model:stock.location,name:location_transit"
 msgid "Transit"
-msgstr ""
+msgstr "Trânsito"
 
 msgctxt "model:stock.location,name:location_warehouse"
 msgid "Warehouse"
-msgstr "Armazém"
+msgstr "Almoxarifado"
 
 msgctxt "model:stock.location.lead_time,name:"
 msgid "Location Lead Time"
-msgstr ""
+msgstr "Tempo de Espera da Localização"
 
 msgctxt "model:stock.move,name:"
 msgid "Stock Move"
@@ -1636,14 +1808,12 @@ msgstr "Reserva de Período do Estoque"
 
 msgctxt "model:stock.product_quantities_warehouse,name:"
 msgid "Product Quantities By Warehouse"
-msgstr "Quantidade de Produto por Armazém"
+msgstr "Quantidade de Produto por Almoxarifado"
 
-#, fuzzy
 msgctxt "model:stock.product_quantities_warehouse.context,name:"
 msgid "Product Quantities By Warehouse"
-msgstr "Quantidade de Produto por Armazém"
+msgstr "Quantidade de Produto por Almoxarifado"
 
-#, fuzzy
 msgctxt "model:stock.products_by_locations.context,name:"
 msgid "Products by Locations"
 msgstr "Produtos por Localizações"
@@ -1684,7 +1854,6 @@ msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "/"
 msgstr "/"
 
-#, fuzzy
 msgctxt "report:stock.shipment.in.restocking_list:"
 msgid ":"
 msgstr ":"
@@ -1713,10 +1882,9 @@ msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Restocking List"
 msgstr "Relação para re-estocagem"
 
-#, fuzzy
 msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Shipment Number"
-msgstr "Número da Remessa:"
+msgstr "Número da Remessa"
 
 msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Supplier:"
@@ -1728,13 +1896,12 @@ msgstr "Destino"
 
 msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Warehouse:"
-msgstr "Armazém:"
+msgstr "Almoxarifado:"
 
 msgctxt "report:stock.shipment.internal.report:"
 msgid "/"
 msgstr "/"
 
-#, fuzzy
 msgctxt "report:stock.shipment.internal.report:"
 msgid ":"
 msgstr ":"
@@ -1767,10 +1934,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 da Remessa:"
+msgstr "Número da Remessa"
 
 msgctxt "report:stock.shipment.internal.report:"
 msgid "To Location"
@@ -1816,7 +1982,6 @@ msgctxt "report:stock.shipment.out.picking_list:"
 msgid "/"
 msgstr "/"
 
-#, fuzzy
 msgctxt "report:stock.shipment.out.picking_list:"
 msgid ":"
 msgstr ":"
@@ -1849,10 +2014,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 da Remessa:"
+msgstr "Número da Remessa"
 
 msgctxt "report:stock.shipment.out.picking_list:"
 msgid "To Location"
@@ -1860,7 +2024,7 @@ msgstr "Destino"
 
 msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Warehouse:"
-msgstr "Armazém"
+msgstr "Almoxarifado"
 
 msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "/"
@@ -1878,7 +2042,6 @@ msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "From Location"
 msgstr "Origem"
 
-#, fuzzy
 msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Number"
 msgstr "Número"
@@ -1903,7 +2066,6 @@ msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Restocking List"
 msgstr "Relação para re-estocagem"
 
-#, fuzzy
 msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Shipment"
 msgstr "Remessa"
@@ -1914,7 +2076,7 @@ msgstr "Destino"
 
 msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Warehouse:"
-msgstr "Armazém"
+msgstr "Almoxarifado"
 
 msgctxt "selection:stock.inventory,state:"
 msgid "Canceled"
@@ -1928,17 +2090,14 @@ msgctxt "selection:stock.inventory,state:"
 msgid "Draft"
 msgstr "Rascunho"
 
-#, fuzzy
 msgctxt "selection:stock.inventory.line,inventory_state:"
 msgid "Canceled"
 msgstr "Cancelado"
 
-#, fuzzy
 msgctxt "selection:stock.inventory.line,inventory_state:"
 msgid "Done"
 msgstr "Feito"
 
-#, fuzzy
 msgctxt "selection:stock.inventory.line,inventory_state:"
 msgid "Draft"
 msgstr "Rascunho"
@@ -1973,7 +2132,7 @@ msgstr "Exibir"
 
 msgctxt "selection:stock.location,type:"
 msgid "Warehouse"
-msgstr "Armazém"
+msgstr "Almoxarifado"
 
 msgctxt "selection:stock.move,state:"
 msgid "Assigned"
@@ -2055,7 +2214,10 @@ msgctxt "selection:stock.shipment.internal,state:"
 msgid "Draft"
 msgstr "Rascunho"
 
-#, fuzzy
+msgctxt "selection:stock.shipment.internal,state:"
+msgid "Request"
+msgstr "Soliditado"
+
 msgctxt "selection:stock.shipment.internal,state:"
 msgid "Shipped"
 msgstr "Enviado"
@@ -2082,7 +2244,7 @@ msgstr "Rascunho"
 
 msgctxt "selection:stock.shipment.out,state:"
 msgid "Packed"
-msgstr "Embalado"
+msgstr "Empacotado"
 
 msgctxt "selection:stock.shipment.out,state:"
 msgid "Waiting"
@@ -2112,15 +2274,13 @@ msgctxt "view:product.product:"
 msgid "Cost Value"
 msgstr "Valor de Custo"
 
-#, fuzzy
 msgctxt "view:stock.configuration:"
 msgid "Inventory"
 msgstr "Inventário"
 
-#, fuzzy
 msgctxt "view:stock.configuration:"
 msgid "Shipments"
-msgstr "Remessa"
+msgstr "Remessas"
 
 msgctxt "view:stock.inventory:"
 msgid "Add an inventory line for each missing products"
@@ -2142,7 +2302,6 @@ msgctxt "view:stock.move:"
 msgid "Cancel"
 msgstr "Cancelar"
 
-#, fuzzy
 msgctxt "view:stock.move:"
 msgid "Do"
 msgstr "Executar"
@@ -2180,6 +2339,10 @@ msgid "Draft"
 msgstr "Rascunho"
 
 msgctxt "view:stock.shipment.in.return:"
+msgid "Other Info"
+msgstr "Outras Informações"
+
+msgctxt "view:stock.shipment.in.return:"
 msgid "Wait"
 msgstr "Em Espera"
 
@@ -2200,6 +2363,10 @@ msgid "Inventory Moves"
 msgstr "Movimentações Internas"
 
 msgctxt "view:stock.shipment.in:"
+msgid "Other Info"
+msgstr "Outras Informações"
+
+msgctxt "view:stock.shipment.in:"
 msgid "Receive"
 msgstr "Receber"
 
@@ -2227,7 +2394,10 @@ msgctxt "view:stock.shipment.internal:"
 msgid "Draft"
 msgstr "Rascunho"
 
-#, fuzzy
+msgctxt "view:stock.shipment.internal:"
+msgid "Other Info"
+msgstr "Outras Informações"
+
 msgctxt "view:stock.shipment.internal:"
 msgid "Ship"
 msgstr "Enviar"
@@ -2261,6 +2431,10 @@ msgid "Inventory Moves"
 msgstr "Movimentações Internas"
 
 msgctxt "view:stock.shipment.out.return:"
+msgid "Other Info"
+msgstr "Outras Informações"
+
+msgctxt "view:stock.shipment.out.return:"
 msgid "Received"
 msgstr "Recebido"
 
@@ -2281,14 +2455,14 @@ msgid "Draft"
 msgstr "Rascunho"
 
 msgctxt "view:stock.shipment.out:"
-msgid "Inventory Moves"
-msgstr "Movimentações Internas"
-
-msgctxt "view:stock.shipment.out:"
 msgid "Make shipment"
 msgstr "Fazer a remessa"
 
 msgctxt "view:stock.shipment.out:"
+msgid "Other Info"
+msgstr "Outras Informações"
+
+msgctxt "view:stock.shipment.out:"
 msgid "Outgoing Moves"
 msgstr "Movimentações de Saída"
 
diff --git a/locale/ru.po b/locale/ru.po
index 3e2b099..cbf483d 100644
--- a/locale/ru.po
+++ b/locale/ru.po
@@ -147,10 +147,59 @@ msgctxt "field:party.party,customer_location:"
 msgid "Customer Location"
 msgstr "Местоположение заказчика"
 
+#, fuzzy
+msgctxt "field:party.party,locations:"
+msgid "Locations"
+msgstr "Местоположения"
+
 msgctxt "field:party.party,supplier_location:"
 msgid "Supplier Location"
 msgstr "Местоположение поставщика"
 
+#, fuzzy
+msgctxt "field:party.party.location,create_date:"
+msgid "Create Date"
+msgstr "Дата создания"
+
+#, fuzzy
+msgctxt "field:party.party.location,create_uid:"
+msgid "Create User"
+msgstr "Создано пользователем"
+
+#, fuzzy
+msgctxt "field:party.party.location,customer_location:"
+msgid "Customer Location"
+msgstr "Местоположение заказчика"
+
+#, fuzzy
+msgctxt "field:party.party.location,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:party.party.location,party:"
+msgid "Party"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:party.party.location,rec_name:"
+msgid "Name"
+msgstr "Наименование"
+
+#, fuzzy
+msgctxt "field:party.party.location,supplier_location:"
+msgid "Supplier Location"
+msgstr "Местоположение поставщика"
+
+#, fuzzy
+msgctxt "field:party.party.location,write_date:"
+msgid "Write Date"
+msgstr "Дата изменения"
+
+#, fuzzy
+msgctxt "field:party.party.location,write_uid:"
+msgid "Write User"
+msgstr "Изменено пользователем"
+
 msgctxt "field:product.by_location.context,forecast_date:"
 msgid "At Date"
 msgstr ""
@@ -240,6 +289,104 @@ msgctxt "field:stock.configuration,write_uid:"
 msgid "Write User"
 msgstr "Изменено пользователем"
 
+#, fuzzy
+msgctxt "field:stock.configuration.location,create_date:"
+msgid "Create Date"
+msgstr "Дата создания"
+
+#, fuzzy
+msgctxt "field:stock.configuration.location,create_uid:"
+msgid "Create User"
+msgstr "Создано пользователем"
+
+#, fuzzy
+msgctxt "field:stock.configuration.location,id:"
+msgid "ID"
+msgstr "ID"
+
+#, fuzzy
+msgctxt "field:stock.configuration.location,rec_name:"
+msgid "Name"
+msgstr "Наименование"
+
+msgctxt "field:stock.configuration.location,shipment_internal_transit:"
+msgid "Internal Shipment Transit"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:stock.configuration.location,write_date:"
+msgid "Write Date"
+msgstr "Дата изменения"
+
+#, fuzzy
+msgctxt "field:stock.configuration.location,write_uid:"
+msgid "Write User"
+msgstr "Изменено пользователем"
+
+#, fuzzy
+msgctxt "field:stock.configuration.sequence,company:"
+msgid "Company"
+msgstr "Организация"
+
+#, fuzzy
+msgctxt "field:stock.configuration.sequence,create_date:"
+msgid "Create Date"
+msgstr "Дата создания"
+
+#, fuzzy
+msgctxt "field:stock.configuration.sequence,create_uid:"
+msgid "Create User"
+msgstr "Создано пользователем"
+
+#, fuzzy
+msgctxt "field:stock.configuration.sequence,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:stock.configuration.sequence,inventory_sequence:"
+msgid "Inventory Sequence"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:stock.configuration.sequence,rec_name:"
+msgid "Name"
+msgstr "Наименование"
+
+#, fuzzy
+msgctxt "field:stock.configuration.sequence,shipment_in_return_sequence:"
+msgid "Supplier Return Shipment Sequence"
+msgstr "Нумерация возвратов поставщику"
+
+#, fuzzy
+msgctxt "field:stock.configuration.sequence,shipment_in_sequence:"
+msgid "Supplier Shipment Sequence"
+msgstr "Нумерация приходов от поставщика"
+
+#, fuzzy
+msgctxt "field:stock.configuration.sequence,shipment_internal_sequence:"
+msgid "Internal Shipment Sequence"
+msgstr "Нумерация внутреннего перемещения"
+
+#, fuzzy
+msgctxt "field:stock.configuration.sequence,shipment_out_return_sequence:"
+msgid "Customer Return Shipment Sequence"
+msgstr "Нумерация возвратов от заказчика"
+
+#, fuzzy
+msgctxt "field:stock.configuration.sequence,shipment_out_sequence:"
+msgid "Customer Shipment Sequence"
+msgstr "Нумерация отгрузки заказчику"
+
+#, fuzzy
+msgctxt "field:stock.configuration.sequence,write_date:"
+msgid "Write Date"
+msgstr "Дата изменения"
+
+#, fuzzy
+msgctxt "field:stock.configuration.sequence,write_uid:"
+msgid "Write User"
+msgstr "Изменено пользователем"
+
 msgctxt "field:stock.inventory,company:"
 msgid "Company"
 msgstr "Организация"
@@ -743,6 +890,10 @@ msgctxt "field:stock.shipment.in,create_uid:"
 msgid "Create User"
 msgstr "Создано пользователем"
 
+msgctxt "field:stock.shipment.in,done_by:"
+msgid "Done By"
+msgstr ""
+
 msgctxt "field:stock.shipment.in,effective_date:"
 msgid "Effective Date"
 msgstr "Учетная дата"
@@ -765,7 +916,7 @@ msgstr "Перемещения"
 
 #, fuzzy
 msgctxt "field:stock.shipment.in,number:"
-msgid "Numer"
+msgid "Number"
 msgstr "Номер"
 
 #, fuzzy
@@ -781,6 +932,10 @@ msgctxt "field:stock.shipment.in,rec_name:"
 msgid "Name"
 msgstr "Наименование"
 
+msgctxt "field:stock.shipment.in,received_by:"
+msgid "Received By"
+msgstr ""
+
 msgctxt "field:stock.shipment.in,reference:"
 msgid "Reference"
 msgstr "Ссылка"
@@ -817,6 +972,10 @@ msgctxt "field:stock.shipment.in,write_uid:"
 msgid "Write User"
 msgstr "Изменено пользователем"
 
+msgctxt "field:stock.shipment.in.return,assigned_by:"
+msgid "Assigned By"
+msgstr ""
+
 msgctxt "field:stock.shipment.in.return,company:"
 msgid "Company"
 msgstr "Организация"
@@ -834,6 +993,10 @@ msgctxt "field:stock.shipment.in.return,delivery_address:"
 msgid "Delivery Address"
 msgstr "Адрес доставки"
 
+msgctxt "field:stock.shipment.in.return,done_by:"
+msgid "Done By"
+msgstr ""
+
 msgctxt "field:stock.shipment.in.return,effective_date:"
 msgid "Effective Date"
 msgstr "Учетная дата"
@@ -901,6 +1064,10 @@ msgctxt "field:stock.shipment.in.return.assign.failed,moves:"
 msgid "Moves"
 msgstr "Перемещения"
 
+msgctxt "field:stock.shipment.internal,assigned_by:"
+msgid "Received By"
+msgstr ""
+
 msgctxt "field:stock.shipment.internal,company:"
 msgid "Company"
 msgstr "Организация"
@@ -913,6 +1080,10 @@ msgctxt "field:stock.shipment.internal,create_uid:"
 msgid "Create User"
 msgstr "Создано пользователем"
 
+msgctxt "field:stock.shipment.internal,done_by:"
+msgid "Done By"
+msgstr ""
+
 msgctxt "field:stock.shipment.internal,effective_date:"
 msgid "Effective Date"
 msgstr "Учетная дата"
@@ -964,6 +1135,10 @@ msgctxt "field:stock.shipment.internal,reference:"
 msgid "Reference"
 msgstr "Ссылка"
 
+msgctxt "field:stock.shipment.internal,shipped_by:"
+msgid "Shipped By"
+msgstr ""
+
 msgctxt "field:stock.shipment.internal,state:"
 msgid "State"
 msgstr "Состояние"
@@ -992,6 +1167,10 @@ msgctxt "field:stock.shipment.internal.assign.failed,moves:"
 msgid "Moves"
 msgstr "Перемещения"
 
+msgctxt "field:stock.shipment.out,assigned_by:"
+msgid "Assigned By"
+msgstr ""
+
 msgctxt "field:stock.shipment.out,company:"
 msgid "Company"
 msgstr "Организация"
@@ -1016,6 +1195,10 @@ msgctxt "field:stock.shipment.out,delivery_address:"
 msgid "Delivery Address"
 msgstr "Адрес доставки"
 
+msgctxt "field:stock.shipment.out,done_by:"
+msgid "Done By"
+msgstr ""
+
 msgctxt "field:stock.shipment.out,effective_date:"
 msgid "Effective Date"
 msgstr "Учетная дата"
@@ -1046,6 +1229,10 @@ msgctxt "field:stock.shipment.out,outgoing_moves:"
 msgid "Outgoing Moves"
 msgstr "Внешнее перемещение"
 
+msgctxt "field:stock.shipment.out,packed_by:"
+msgid "Packed By"
+msgstr ""
+
 msgctxt "field:stock.shipment.out,planned_date:"
 msgid "Planned Date"
 msgstr "Плановая дата"
@@ -1114,6 +1301,10 @@ msgctxt "field:stock.shipment.out.return,delivery_address:"
 msgid "Delivery Address"
 msgstr "Адрес доставки"
 
+msgctxt "field:stock.shipment.out.return,done_by:"
+msgid "Done By"
+msgstr ""
+
 msgctxt "field:stock.shipment.out.return,effective_date:"
 msgid "Effective Date"
 msgstr "Учетная дата"
@@ -1152,6 +1343,10 @@ msgctxt "field:stock.shipment.out.return,rec_name:"
 msgid "Name"
 msgstr "Наименование"
 
+msgctxt "field:stock.shipment.out.return,received_by:"
+msgid "Received By"
+msgstr ""
+
 msgctxt "field:stock.shipment.out.return,reference:"
 msgid "Reference"
 msgstr "Ссылка"
@@ -1189,6 +1384,17 @@ msgctxt "help:party.party,supplier_location:"
 msgid "The default source location when receiving products from the party."
 msgstr "По умолчанию, местоположение при получении продукции от контрагента."
 
+#, fuzzy
+msgctxt "help:party.party.location,customer_location:"
+msgid "The default destination location when sending products to the party."
+msgstr ""
+"Местоположение назначения по умолчанию при отправке продукции контрагенту."
+
+#, fuzzy
+msgctxt "help:party.party.location,supplier_location:"
+msgid "The default source location when receiving products from the party."
+msgstr "По умолчанию, местоположение при получении продукции от контрагента."
+
 msgctxt "help:product.by_location.context,forecast_date:"
 msgid ""
 "Allow to compute expected stock quantities for this date.\n"
@@ -1391,6 +1597,11 @@ msgid "Draft"
 msgstr "Черновик"
 
 msgctxt ""
+"model:ir.action.act_window.domain,name:act_shipment_internal_form_domain_requests"
+msgid "Requests"
+msgstr ""
+
+msgctxt ""
 "model:ir.action.act_window.domain,name:act_shipment_internal_form_domain_shipped"
 msgid "Shipped"
 msgstr ""
@@ -1550,6 +1761,10 @@ msgctxt "model:ir.ui.menu,name:menu_stock_configuration"
 msgid "Stock Configuration"
 msgstr "Конфигурация склада"
 
+msgctxt "model:party.party.location,name:"
+msgid "Party Location"
+msgstr ""
+
 #, fuzzy
 msgctxt "model:product.by_location.context,name:"
 msgid "Product by Location"
@@ -1571,6 +1786,14 @@ msgctxt "model:stock.configuration,name:"
 msgid "Stock Configuration"
 msgstr "Конфигурация склада"
 
+msgctxt "model:stock.configuration.location,name:"
+msgid "Stock Configuration Location"
+msgstr ""
+
+msgctxt "model:stock.configuration.sequence,name:"
+msgid "Stock Configuration Sequence"
+msgstr ""
+
 msgctxt "model:stock.inventory,name:"
 msgid "Stock Inventory"
 msgstr "Хранилище опись"
@@ -2055,6 +2278,10 @@ msgid "Draft"
 msgstr "Черновик"
 
 msgctxt "selection:stock.shipment.internal,state:"
+msgid "Request"
+msgstr ""
+
+msgctxt "selection:stock.shipment.internal,state:"
 msgid "Shipped"
 msgstr ""
 
@@ -2178,6 +2405,10 @@ msgid "Draft"
 msgstr "Черновик"
 
 msgctxt "view:stock.shipment.in.return:"
+msgid "Other Info"
+msgstr ""
+
+msgctxt "view:stock.shipment.in.return:"
 msgid "Wait"
 msgstr "Ожидать"
 
@@ -2198,6 +2429,10 @@ msgid "Inventory Moves"
 msgstr "Учет перемещений"
 
 msgctxt "view:stock.shipment.in:"
+msgid "Other Info"
+msgstr ""
+
+msgctxt "view:stock.shipment.in:"
 msgid "Receive"
 msgstr "Поступление"
 
@@ -2226,6 +2461,10 @@ msgid "Draft"
 msgstr "Черновик"
 
 msgctxt "view:stock.shipment.internal:"
+msgid "Other Info"
+msgstr ""
+
+msgctxt "view:stock.shipment.internal:"
 msgid "Ship"
 msgstr ""
 
@@ -2259,6 +2498,10 @@ msgid "Inventory Moves"
 msgstr "Учет перемещений"
 
 msgctxt "view:stock.shipment.out.return:"
+msgid "Other Info"
+msgstr ""
+
+msgctxt "view:stock.shipment.out.return:"
 msgid "Received"
 msgstr "Поступило"
 
@@ -2279,14 +2522,14 @@ msgid "Draft"
 msgstr "Черновик"
 
 msgctxt "view:stock.shipment.out:"
-msgid "Inventory Moves"
-msgstr "Учет перемещений"
-
-msgctxt "view:stock.shipment.out:"
 msgid "Make shipment"
 msgstr "Сделать отгрузку"
 
 msgctxt "view:stock.shipment.out:"
+msgid "Other Info"
+msgstr ""
+
+msgctxt "view:stock.shipment.out:"
 msgid "Outgoing Moves"
 msgstr "Внешнее перемещение"
 
diff --git a/locale/sl.po b/locale/sl.po
index 4a6dca4..daf094a 100644
--- a/locale/sl.po
+++ b/locale/sl.po
@@ -145,22 +145,61 @@ msgctxt "field:party.party,customer_location:"
 msgid "Customer Location"
 msgstr "Lokacija kupca"
 
+msgctxt "field:party.party,locations:"
+msgid "Locations"
+msgstr "Lokacije"
+
 msgctxt "field:party.party,supplier_location:"
 msgid "Supplier Location"
 msgstr "Lokacija dobavitelja"
 
+msgctxt "field:party.party.location,create_date:"
+msgid "Create Date"
+msgstr "Izdelano"
+
+msgctxt "field:party.party.location,create_uid:"
+msgid "Create User"
+msgstr "Izdelal"
+
+msgctxt "field:party.party.location,customer_location:"
+msgid "Customer Location"
+msgstr "Lokacija kupca"
+
+msgctxt "field:party.party.location,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:party.party.location,party:"
+msgid "Party"
+msgstr "Partner"
+
+msgctxt "field:party.party.location,rec_name:"
+msgid "Name"
+msgstr "Ime"
+
+msgctxt "field:party.party.location,supplier_location:"
+msgid "Supplier Location"
+msgstr "Lokacija dobavitelja"
+
+msgctxt "field:party.party.location,write_date:"
+msgid "Write Date"
+msgstr "Zapisano"
+
+msgctxt "field:party.party.location,write_uid:"
+msgid "Write User"
+msgstr "Zapisal"
+
 msgctxt "field:product.by_location.context,forecast_date:"
 msgid "At Date"
-msgstr ""
+msgstr "Na dan"
 
-#, fuzzy
 msgctxt "field:product.by_location.context,id:"
 msgid "ID"
 msgstr "ID"
 
 msgctxt "field:product.by_location.context,stock_date_end:"
 msgid "At Date"
-msgstr ""
+msgstr "Na dan"
 
 msgctxt "field:product.product,cost_value:"
 msgid "Cost Value"
@@ -220,7 +259,7 @@ msgstr "Štetje notranjih odpremnic"
 
 msgctxt "field:stock.configuration,shipment_internal_transit:"
 msgid "Internal Shipment Transit"
-msgstr ""
+msgstr "Tranzit notranjih odpremnic"
 
 msgctxt "field:stock.configuration,shipment_out_return_sequence:"
 msgid "Customer Return Shipment Sequence"
@@ -238,6 +277,86 @@ msgctxt "field:stock.configuration,write_uid:"
 msgid "Write User"
 msgstr "Zapisal"
 
+msgctxt "field:stock.configuration.location,create_date:"
+msgid "Create Date"
+msgstr "Izdelano"
+
+msgctxt "field:stock.configuration.location,create_uid:"
+msgid "Create User"
+msgstr "Izdelal"
+
+msgctxt "field:stock.configuration.location,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:stock.configuration.location,rec_name:"
+msgid "Name"
+msgstr "Ime"
+
+msgctxt "field:stock.configuration.location,shipment_internal_transit:"
+msgid "Internal Shipment Transit"
+msgstr "Tranzit notranjih odpremnic"
+
+msgctxt "field:stock.configuration.location,write_date:"
+msgid "Write Date"
+msgstr "Zapisano"
+
+msgctxt "field:stock.configuration.location,write_uid:"
+msgid "Write User"
+msgstr "Zapisal"
+
+msgctxt "field:stock.configuration.sequence,company:"
+msgid "Company"
+msgstr "Družba"
+
+msgctxt "field:stock.configuration.sequence,create_date:"
+msgid "Create Date"
+msgstr "Izdelano"
+
+msgctxt "field:stock.configuration.sequence,create_uid:"
+msgid "Create User"
+msgstr "Izdelal"
+
+msgctxt "field:stock.configuration.sequence,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:stock.configuration.sequence,inventory_sequence:"
+msgid "Inventory Sequence"
+msgstr "Štetje inventur"
+
+msgctxt "field:stock.configuration.sequence,rec_name:"
+msgid "Name"
+msgstr "Ime"
+
+msgctxt "field:stock.configuration.sequence,shipment_in_return_sequence:"
+msgid "Supplier Return Shipment Sequence"
+msgstr "Štetje vrnjenih prevzemnic"
+
+msgctxt "field:stock.configuration.sequence,shipment_in_sequence:"
+msgid "Supplier Shipment Sequence"
+msgstr "Štetje prevzemnic"
+
+msgctxt "field:stock.configuration.sequence,shipment_internal_sequence:"
+msgid "Internal Shipment Sequence"
+msgstr "Štetje notranjih odpremnic"
+
+msgctxt "field:stock.configuration.sequence,shipment_out_return_sequence:"
+msgid "Customer Return Shipment Sequence"
+msgstr "Štetje vrnjenih odpremnic"
+
+msgctxt "field:stock.configuration.sequence,shipment_out_sequence:"
+msgid "Customer Shipment Sequence"
+msgstr "Štetje odpremnic"
+
+msgctxt "field:stock.configuration.sequence,write_date:"
+msgid "Write Date"
+msgstr "Zapisano"
+
+msgctxt "field:stock.configuration.sequence,write_uid:"
+msgid "Write User"
+msgstr "Zapisal"
+
 msgctxt "field:stock.inventory,company:"
 msgid "Company"
 msgstr "Družba"
@@ -312,7 +431,7 @@ msgstr "Popis"
 
 msgctxt "field:stock.inventory.line,inventory_state:"
 msgid "Inventory State"
-msgstr ""
+msgstr "Stanje inventure"
 
 msgctxt "field:stock.inventory.line,moves:"
 msgid "Moves"
@@ -438,22 +557,18 @@ msgctxt "field:stock.location,write_uid:"
 msgid "Write User"
 msgstr "Zapisal"
 
-#, fuzzy
 msgctxt "field:stock.location.lead_time,create_date:"
 msgid "Create Date"
 msgstr "Izdelano"
 
-#, fuzzy
 msgctxt "field:stock.location.lead_time,create_uid:"
 msgid "Create User"
 msgstr "Izdelal"
 
-#, fuzzy
 msgctxt "field:stock.location.lead_time,id:"
 msgid "ID"
 msgstr "ID"
 
-#, fuzzy
 msgctxt "field:stock.location.lead_time,lead_time:"
 msgid "Lead Time"
 msgstr "Dobavni rok"
@@ -468,18 +583,16 @@ msgstr "Zap.št."
 
 msgctxt "field:stock.location.lead_time,warehouse_from:"
 msgid "Warehouse From"
-msgstr ""
+msgstr "Iz skladišča"
 
 msgctxt "field:stock.location.lead_time,warehouse_to:"
 msgid "Warehouse To"
-msgstr ""
+msgstr "V skladišče"
 
-#, fuzzy
 msgctxt "field:stock.location.lead_time,write_date:"
 msgid "Write Date"
 msgstr "Zapisano"
 
-#, fuzzy
 msgctxt "field:stock.location.lead_time,write_uid:"
 msgid "Write User"
 msgstr "Zapisal"
@@ -696,28 +809,25 @@ msgctxt "field:stock.product_quantities_warehouse,write_uid:"
 msgid "Write User"
 msgstr "Zapisal"
 
-#, fuzzy
 msgctxt "field:stock.product_quantities_warehouse.context,id:"
 msgid "ID"
 msgstr "ID"
 
-#, fuzzy
 msgctxt "field:stock.product_quantities_warehouse.context,warehouse:"
 msgid "Warehouse"
 msgstr "Skladišče"
 
 msgctxt "field:stock.products_by_locations.context,forecast_date:"
 msgid "At Date"
-msgstr ""
+msgstr "Na dan"
 
-#, fuzzy
 msgctxt "field:stock.products_by_locations.context,id:"
 msgid "ID"
 msgstr "ID"
 
 msgctxt "field:stock.products_by_locations.context,stock_date_end:"
 msgid "At Date"
-msgstr ""
+msgstr "Na dan"
 
 msgctxt "field:stock.shipment.in,company:"
 msgid "Company"
@@ -735,6 +845,10 @@ msgctxt "field:stock.shipment.in,create_uid:"
 msgid "Create User"
 msgstr "Izdelal"
 
+msgctxt "field:stock.shipment.in,done_by:"
+msgid "Done By"
+msgstr "Zaključil"
+
 msgctxt "field:stock.shipment.in,effective_date:"
 msgid "Effective Date"
 msgstr "Dejanski datum"
@@ -756,7 +870,7 @@ msgid "Moves"
 msgstr "Promet"
 
 msgctxt "field:stock.shipment.in,number:"
-msgid "Numer"
+msgid "Number"
 msgstr "Številka"
 
 msgctxt "field:stock.shipment.in,origins:"
@@ -771,6 +885,10 @@ msgctxt "field:stock.shipment.in,rec_name:"
 msgid "Name"
 msgstr "Ime"
 
+msgctxt "field:stock.shipment.in,received_by:"
+msgid "Received By"
+msgstr "Prejel"
+
 msgctxt "field:stock.shipment.in,reference:"
 msgid "Reference"
 msgstr "Sklic"
@@ -807,6 +925,10 @@ msgctxt "field:stock.shipment.in,write_uid:"
 msgid "Write User"
 msgstr "Zapisal"
 
+msgctxt "field:stock.shipment.in.return,assigned_by:"
+msgid "Assigned By"
+msgstr "Dodelil"
+
 msgctxt "field:stock.shipment.in.return,company:"
 msgid "Company"
 msgstr "Družba"
@@ -823,6 +945,10 @@ msgctxt "field:stock.shipment.in.return,delivery_address:"
 msgid "Delivery Address"
 msgstr "Prejemnik"
 
+msgctxt "field:stock.shipment.in.return,done_by:"
+msgid "Done By"
+msgstr "Zaključil"
+
 msgctxt "field:stock.shipment.in.return,effective_date:"
 msgid "Effective Date"
 msgstr "Dejanski datum"
@@ -887,6 +1013,10 @@ msgctxt "field:stock.shipment.in.return.assign.failed,moves:"
 msgid "Moves"
 msgstr "Promet"
 
+msgctxt "field:stock.shipment.internal,assigned_by:"
+msgid "Received By"
+msgstr "Prejel"
+
 msgctxt "field:stock.shipment.internal,company:"
 msgid "Company"
 msgstr "Družba"
@@ -899,13 +1029,17 @@ msgctxt "field:stock.shipment.internal,create_uid:"
 msgid "Create User"
 msgstr "Izdelal"
 
+msgctxt "field:stock.shipment.internal,done_by:"
+msgid "Done By"
+msgstr "Zaključil"
+
 msgctxt "field:stock.shipment.internal,effective_date:"
 msgid "Effective Date"
 msgstr "Dejanski datum"
 
 msgctxt "field:stock.shipment.internal,effective_start_date:"
 msgid "Effective Start Date"
-msgstr ""
+msgstr "Dejanski začetek"
 
 msgctxt "field:stock.shipment.internal,from_location:"
 msgid "From Location"
@@ -915,7 +1049,6 @@ msgctxt "field:stock.shipment.internal,id:"
 msgid "ID"
 msgstr "ID"
 
-#, fuzzy
 msgctxt "field:stock.shipment.internal,incoming_moves:"
 msgid "Incoming Moves"
 msgstr "Vhodni promet"
@@ -928,7 +1061,6 @@ msgctxt "field:stock.shipment.internal,number:"
 msgid "Number"
 msgstr "Številka"
 
-#, fuzzy
 msgctxt "field:stock.shipment.internal,outgoing_moves:"
 msgid "Outgoing Moves"
 msgstr "Izhodni promet"
@@ -939,7 +1071,7 @@ msgstr "Načrtovan datum"
 
 msgctxt "field:stock.shipment.internal,planned_start_date:"
 msgid "Planned Start Date"
-msgstr ""
+msgstr "Načrtovan začetek"
 
 msgctxt "field:stock.shipment.internal,rec_name:"
 msgid "Name"
@@ -949,6 +1081,10 @@ msgctxt "field:stock.shipment.internal,reference:"
 msgid "Reference"
 msgstr "Sklic"
 
+msgctxt "field:stock.shipment.internal,shipped_by:"
+msgid "Shipped By"
+msgstr "Odpremil"
+
 msgctxt "field:stock.shipment.internal,state:"
 msgid "State"
 msgstr "Stanje"
@@ -959,7 +1095,7 @@ msgstr "Na lokacijo"
 
 msgctxt "field:stock.shipment.internal,transit_location:"
 msgid "Transit Location"
-msgstr ""
+msgstr "Lokacija tranzita"
 
 msgctxt "field:stock.shipment.internal,write_date:"
 msgid "Write Date"
@@ -977,6 +1113,10 @@ msgctxt "field:stock.shipment.internal.assign.failed,moves:"
 msgid "Moves"
 msgstr "Promet"
 
+msgctxt "field:stock.shipment.out,assigned_by:"
+msgid "Assigned By"
+msgstr "Dodelil"
+
 msgctxt "field:stock.shipment.out,company:"
 msgid "Company"
 msgstr "Družba"
@@ -1001,6 +1141,10 @@ msgctxt "field:stock.shipment.out,delivery_address:"
 msgid "Delivery Address"
 msgstr "Prejemnik"
 
+msgctxt "field:stock.shipment.out,done_by:"
+msgid "Done By"
+msgstr "Zaključil"
+
 msgctxt "field:stock.shipment.out,effective_date:"
 msgid "Effective Date"
 msgstr "Dejanski datum"
@@ -1029,6 +1173,10 @@ msgctxt "field:stock.shipment.out,outgoing_moves:"
 msgid "Outgoing Moves"
 msgstr "Izhodni promet"
 
+msgctxt "field:stock.shipment.out,packed_by:"
+msgid "Packed By"
+msgstr "Pakiral"
+
 msgctxt "field:stock.shipment.out,planned_date:"
 msgid "Planned Date"
 msgstr "Načrtovan datum"
@@ -1097,6 +1245,10 @@ msgctxt "field:stock.shipment.out.return,delivery_address:"
 msgid "Delivery Address"
 msgstr "Prejemnik"
 
+msgctxt "field:stock.shipment.out.return,done_by:"
+msgid "Done By"
+msgstr "Zaključil"
+
 msgctxt "field:stock.shipment.out.return,effective_date:"
 msgid "Effective Date"
 msgstr "Dejanski datum"
@@ -1133,6 +1285,10 @@ msgctxt "field:stock.shipment.out.return,rec_name:"
 msgid "Name"
 msgstr "Ime"
 
+msgctxt "field:stock.shipment.out.return,received_by:"
+msgid "Received By"
+msgstr "Prejel"
+
 msgctxt "field:stock.shipment.out.return,reference:"
 msgid "Reference"
 msgstr "Sklic"
@@ -1169,12 +1325,23 @@ msgctxt "help:party.party,supplier_location:"
 msgid "The default source location when receiving products from the party."
 msgstr "Privzeta izvorna lokacija pri prevzemu izdelkov od partnerja."
 
+msgctxt "help:party.party.location,customer_location:"
+msgid "The default destination location when sending products to the party."
+msgstr "Privzeta ciljna lokacija pri odpremi izdelkov k partnerju."
+
+msgctxt "help:party.party.location,supplier_location:"
+msgid "The default source location when receiving products from the party."
+msgstr "Privzeta izvorna lokacija pri prevzemu izdelkov od partnerja."
+
 msgctxt "help:product.by_location.context,forecast_date:"
 msgid ""
 "Allow to compute expected stock quantities for this date.\n"
 "* An empty value is an infinite date in the future.\n"
 "* A date in the past will provide historical values."
 msgstr ""
+"Omogoča izračun predvidenih zalog na ta dan.\n"
+"* Prazno polje pomeni neskončno v prihodnost.\n"
+"* Pretekli datum daje zgodovino zaloge."
 
 msgctxt "help:stock.location,picking_location:"
 msgid "If empty the Storage is used"
@@ -1186,6 +1353,9 @@ msgid ""
 "* An empty value is an infinite date in the future.\n"
 "* A date in the past will provide historical values."
 msgstr ""
+"Omogoča izračun predvidenih zalog na ta dan.\n"
+"* Prazno polje pomeni neskončno v prihodnost.\n"
+"* Pretekli datum daje zgodovino zaloge."
 
 msgctxt "model:ir.action,name:act_inventory_form"
 msgid "Inventories"
@@ -1197,12 +1367,11 @@ msgstr "Lokacije"
 
 msgctxt "model:ir.action,name:act_location_lead_time_form"
 msgid "Location Lead Times"
-msgstr ""
+msgstr "Dobavni roki lokacij"
 
-#, fuzzy
 msgctxt "model:ir.action,name:act_location_quantity_tree"
 msgid "Locations Quantity"
-msgstr "Lokacije"
+msgstr "Količine lokacij"
 
 msgctxt "model:ir.action,name:act_location_tree"
 msgid "Locations"
@@ -1370,11 +1539,15 @@ msgctxt ""
 msgid "Draft"
 msgstr "Priprava"
 
-#, fuzzy
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_shipment_internal_form_domain_requests"
+msgid "Requests"
+msgstr "Zahtevki"
+
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_shipment_internal_form_domain_shipped"
 msgid "Shipped"
-msgstr "Poslano"
+msgstr "Odpremljeno"
 
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_shipment_internal_form_domain_waiting"
@@ -1483,7 +1656,7 @@ msgstr "Lokacije"
 
 msgctxt "model:ir.ui.menu,name:menu_location_lead_time_form"
 msgid "Location Lead Times"
-msgstr ""
+msgstr "Dobavni roki lokacij"
 
 msgctxt "model:ir.ui.menu,name:menu_location_tree"
 msgid "Locations"
@@ -1529,9 +1702,13 @@ msgctxt "model:ir.ui.menu,name:menu_stock_configuration"
 msgid "Stock Configuration"
 msgstr "Konfiguracija"
 
+msgctxt "model:party.party.location,name:"
+msgid "Party Location"
+msgstr "Lokacija partnerja"
+
 msgctxt "model:product.by_location.context,name:"
 msgid "Product by Location"
-msgstr ""
+msgstr "Izdelek po lokacijah"
 
 msgctxt "model:res.group,name:group_stock"
 msgid "Stock"
@@ -1549,6 +1726,14 @@ msgctxt "model:stock.configuration,name:"
 msgid "Stock Configuration"
 msgstr "Konfiguracija zaloge"
 
+msgctxt "model:stock.configuration.location,name:"
+msgid "Stock Configuration Location"
+msgstr "Konfiguracija lokacije zalog"
+
+msgctxt "model:stock.configuration.sequence,name:"
+msgid "Stock Configuration Sequence"
+msgstr "Konfiguracija štetja zalog"
+
 msgctxt "model:stock.inventory,name:"
 msgid "Stock Inventory"
 msgstr "Popis"
@@ -1587,7 +1772,7 @@ msgstr "Dobavitelj"
 
 msgctxt "model:stock.location,name:location_transit"
 msgid "Transit"
-msgstr ""
+msgstr "Tranzit"
 
 msgctxt "model:stock.location,name:location_warehouse"
 msgid "Warehouse"
@@ -1595,7 +1780,7 @@ msgstr "Skladišče"
 
 msgctxt "model:stock.location.lead_time,name:"
 msgid "Location Lead Time"
-msgstr ""
+msgstr "Dobavni rok lokacije"
 
 msgctxt "model:stock.move,name:"
 msgid "Stock Move"
@@ -1613,14 +1798,13 @@ msgctxt "model:stock.product_quantities_warehouse,name:"
 msgid "Product Quantities By Warehouse"
 msgstr "Količine izdelkov po skladiščih"
 
-#, fuzzy
 msgctxt "model:stock.product_quantities_warehouse.context,name:"
 msgid "Product Quantities By Warehouse"
 msgstr "Količine izdelkov po skladiščih"
 
 msgctxt "model:stock.products_by_locations.context,name:"
 msgid "Products by Locations"
-msgstr ""
+msgstr "Izdelki po lokacijah"
 
 msgctxt "model:stock.shipment.in,name:"
 msgid "Supplier Shipment"
@@ -1894,17 +2078,14 @@ msgctxt "selection:stock.inventory,state:"
 msgid "Draft"
 msgstr "V pripravi"
 
-#, fuzzy
 msgctxt "selection:stock.inventory.line,inventory_state:"
 msgid "Canceled"
 msgstr "Preklicano"
 
-#, fuzzy
 msgctxt "selection:stock.inventory.line,inventory_state:"
 msgid "Done"
 msgstr "Zaključeno"
 
-#, fuzzy
 msgctxt "selection:stock.inventory.line,inventory_state:"
 msgid "Draft"
 msgstr "V pripravi"
@@ -2021,10 +2202,13 @@ msgctxt "selection:stock.shipment.internal,state:"
 msgid "Draft"
 msgstr "V pripravi"
 
-#, fuzzy
+msgctxt "selection:stock.shipment.internal,state:"
+msgid "Request"
+msgstr "Zahtevek"
+
 msgctxt "selection:stock.shipment.internal,state:"
 msgid "Shipped"
-msgstr "Poslano"
+msgstr "Odpremljeno"
 
 msgctxt "selection:stock.shipment.internal,state:"
 msgid "Waiting"
@@ -2143,6 +2327,10 @@ msgid "Draft"
 msgstr "Priprava"
 
 msgctxt "view:stock.shipment.in.return:"
+msgid "Other Info"
+msgstr "Drugo"
+
+msgctxt "view:stock.shipment.in.return:"
 msgid "Wait"
 msgstr "Čakanje"
 
@@ -2163,6 +2351,10 @@ msgid "Inventory Moves"
 msgstr "Inventarni promet"
 
 msgctxt "view:stock.shipment.in:"
+msgid "Other Info"
+msgstr "Drugo"
+
+msgctxt "view:stock.shipment.in:"
 msgid "Receive"
 msgstr "Prejem"
 
@@ -2190,10 +2382,13 @@ msgctxt "view:stock.shipment.internal:"
 msgid "Draft"
 msgstr "Priprava"
 
-#, fuzzy
+msgctxt "view:stock.shipment.internal:"
+msgid "Other Info"
+msgstr "Drugo"
+
 msgctxt "view:stock.shipment.internal:"
 msgid "Ship"
-msgstr "Pošiljanje"
+msgstr "Odpremi"
 
 msgctxt "view:stock.shipment.internal:"
 msgid "Wait"
@@ -2224,6 +2419,10 @@ msgid "Inventory Moves"
 msgstr "Inventarni promet"
 
 msgctxt "view:stock.shipment.out.return:"
+msgid "Other Info"
+msgstr "Drugo"
+
+msgctxt "view:stock.shipment.out.return:"
 msgid "Received"
 msgstr "Prejeto"
 
@@ -2244,14 +2443,14 @@ msgid "Draft"
 msgstr "Priprava"
 
 msgctxt "view:stock.shipment.out:"
-msgid "Inventory Moves"
-msgstr "Inventarni promet"
-
-msgctxt "view:stock.shipment.out:"
 msgid "Make shipment"
 msgstr "Odprema"
 
 msgctxt "view:stock.shipment.out:"
+msgid "Other Info"
+msgstr "Drugo"
+
+msgctxt "view:stock.shipment.out:"
 msgid "Outgoing Moves"
 msgstr "Izhodni promet"
 
diff --git a/locale/zh_CN.po b/locale/zh_CN.po
index 0a938b8..4709715 100644
--- a/locale/zh_CN.po
+++ b/locale/zh_CN.po
@@ -130,10 +130,56 @@ msgctxt "field:party.party,customer_location:"
 msgid "Customer Location"
 msgstr ""
 
+msgctxt "field:party.party,locations:"
+msgid "Locations"
+msgstr ""
+
 msgctxt "field:party.party,supplier_location:"
 msgid "Supplier Location"
 msgstr ""
 
+#, fuzzy
+msgctxt "field:party.party.location,create_date:"
+msgid "Create Date"
+msgstr "创建日期:"
+
+#, fuzzy
+msgctxt "field:party.party.location,create_uid:"
+msgid "Create User"
+msgstr "添加用户"
+
+msgctxt "field:party.party.location,customer_location:"
+msgid "Customer Location"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:party.party.location,id:"
+msgid "ID"
+msgstr "编号"
+
+msgctxt "field:party.party.location,party:"
+msgid "Party"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:party.party.location,rec_name:"
+msgid "Name"
+msgstr "纳木"
+
+msgctxt "field:party.party.location,supplier_location:"
+msgid "Supplier Location"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:party.party.location,write_date:"
+msgid "Write Date"
+msgstr "写入日期"
+
+#, fuzzy
+msgctxt "field:party.party.location,write_uid:"
+msgid "Write User"
+msgstr "写入帐号"
+
 msgctxt "field:product.by_location.context,forecast_date:"
 msgid "At Date"
 msgstr ""
@@ -229,6 +275,98 @@ msgctxt "field:stock.configuration,write_uid:"
 msgid "Write User"
 msgstr "写入帐号"
 
+#, fuzzy
+msgctxt "field:stock.configuration.location,create_date:"
+msgid "Create Date"
+msgstr "创建日期:"
+
+#, fuzzy
+msgctxt "field:stock.configuration.location,create_uid:"
+msgid "Create User"
+msgstr "添加用户"
+
+#, fuzzy
+msgctxt "field:stock.configuration.location,id:"
+msgid "ID"
+msgstr "编号"
+
+#, fuzzy
+msgctxt "field:stock.configuration.location,rec_name:"
+msgid "Name"
+msgstr "纳木"
+
+msgctxt "field:stock.configuration.location,shipment_internal_transit:"
+msgid "Internal Shipment Transit"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:stock.configuration.location,write_date:"
+msgid "Write Date"
+msgstr "写入日期"
+
+#, fuzzy
+msgctxt "field:stock.configuration.location,write_uid:"
+msgid "Write User"
+msgstr "写入帐号"
+
+msgctxt "field:stock.configuration.sequence,company:"
+msgid "Company"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:stock.configuration.sequence,create_date:"
+msgid "Create Date"
+msgstr "创建日期:"
+
+#, fuzzy
+msgctxt "field:stock.configuration.sequence,create_uid:"
+msgid "Create User"
+msgstr "添加用户"
+
+#, fuzzy
+msgctxt "field:stock.configuration.sequence,id:"
+msgid "ID"
+msgstr "编号"
+
+msgctxt "field:stock.configuration.sequence,inventory_sequence:"
+msgid "Inventory Sequence"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:stock.configuration.sequence,rec_name:"
+msgid "Name"
+msgstr "纳木"
+
+msgctxt "field:stock.configuration.sequence,shipment_in_return_sequence:"
+msgid "Supplier Return Shipment Sequence"
+msgstr ""
+
+msgctxt "field:stock.configuration.sequence,shipment_in_sequence:"
+msgid "Supplier Shipment Sequence"
+msgstr ""
+
+msgctxt "field:stock.configuration.sequence,shipment_internal_sequence:"
+msgid "Internal Shipment Sequence"
+msgstr ""
+
+msgctxt "field:stock.configuration.sequence,shipment_out_return_sequence:"
+msgid "Customer Return Shipment Sequence"
+msgstr ""
+
+msgctxt "field:stock.configuration.sequence,shipment_out_sequence:"
+msgid "Customer Shipment Sequence"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:stock.configuration.sequence,write_date:"
+msgid "Write Date"
+msgstr "写入日期"
+
+#, fuzzy
+msgctxt "field:stock.configuration.sequence,write_uid:"
+msgid "Write User"
+msgstr "写入帐号"
+
 msgctxt "field:stock.inventory,company:"
 msgid "Company"
 msgstr ""
@@ -781,6 +919,10 @@ msgctxt "field:stock.shipment.in,create_uid:"
 msgid "Create User"
 msgstr "添加用户"
 
+msgctxt "field:stock.shipment.in,done_by:"
+msgid "Done By"
+msgstr ""
+
 msgctxt "field:stock.shipment.in,effective_date:"
 msgid "Effective Date"
 msgstr ""
@@ -803,7 +945,7 @@ msgid "Moves"
 msgstr ""
 
 msgctxt "field:stock.shipment.in,number:"
-msgid "Numer"
+msgid "Number"
 msgstr ""
 
 msgctxt "field:stock.shipment.in,origins:"
@@ -819,6 +961,10 @@ msgctxt "field:stock.shipment.in,rec_name:"
 msgid "Name"
 msgstr "纳木"
 
+msgctxt "field:stock.shipment.in,received_by:"
+msgid "Received By"
+msgstr ""
+
 msgctxt "field:stock.shipment.in,reference:"
 msgid "Reference"
 msgstr ""
@@ -858,6 +1004,10 @@ msgctxt "field:stock.shipment.in,write_uid:"
 msgid "Write User"
 msgstr "写入帐号"
 
+msgctxt "field:stock.shipment.in.return,assigned_by:"
+msgid "Assigned By"
+msgstr ""
+
 msgctxt "field:stock.shipment.in.return,company:"
 msgid "Company"
 msgstr ""
@@ -876,6 +1026,10 @@ msgctxt "field:stock.shipment.in.return,delivery_address:"
 msgid "Delivery Address"
 msgstr ""
 
+msgctxt "field:stock.shipment.in.return,done_by:"
+msgid "Done By"
+msgstr ""
+
 msgctxt "field:stock.shipment.in.return,effective_date:"
 msgid "Effective Date"
 msgstr ""
@@ -946,6 +1100,10 @@ msgctxt "field:stock.shipment.in.return.assign.failed,moves:"
 msgid "Moves"
 msgstr ""
 
+msgctxt "field:stock.shipment.internal,assigned_by:"
+msgid "Received By"
+msgstr ""
+
 msgctxt "field:stock.shipment.internal,company:"
 msgid "Company"
 msgstr ""
@@ -960,6 +1118,10 @@ msgctxt "field:stock.shipment.internal,create_uid:"
 msgid "Create User"
 msgstr "添加用户"
 
+msgctxt "field:stock.shipment.internal,done_by:"
+msgid "Done By"
+msgstr ""
+
 msgctxt "field:stock.shipment.internal,effective_date:"
 msgid "Effective Date"
 msgstr ""
@@ -1010,6 +1172,10 @@ msgctxt "field:stock.shipment.internal,reference:"
 msgid "Reference"
 msgstr ""
 
+msgctxt "field:stock.shipment.internal,shipped_by:"
+msgid "Shipped By"
+msgstr ""
+
 #, fuzzy
 msgctxt "field:stock.shipment.internal,state:"
 msgid "State"
@@ -1042,6 +1208,10 @@ msgctxt "field:stock.shipment.internal.assign.failed,moves:"
 msgid "Moves"
 msgstr ""
 
+msgctxt "field:stock.shipment.out,assigned_by:"
+msgid "Assigned By"
+msgstr ""
+
 msgctxt "field:stock.shipment.out,company:"
 msgid "Company"
 msgstr ""
@@ -1068,6 +1238,10 @@ msgctxt "field:stock.shipment.out,delivery_address:"
 msgid "Delivery Address"
 msgstr ""
 
+msgctxt "field:stock.shipment.out,done_by:"
+msgid "Done By"
+msgstr ""
+
 msgctxt "field:stock.shipment.out,effective_date:"
 msgid "Effective Date"
 msgstr ""
@@ -1097,6 +1271,10 @@ msgctxt "field:stock.shipment.out,outgoing_moves:"
 msgid "Outgoing Moves"
 msgstr ""
 
+msgctxt "field:stock.shipment.out,packed_by:"
+msgid "Packed By"
+msgstr ""
+
 msgctxt "field:stock.shipment.out,planned_date:"
 msgid "Planned Date"
 msgstr ""
@@ -1172,6 +1350,10 @@ msgctxt "field:stock.shipment.out.return,delivery_address:"
 msgid "Delivery Address"
 msgstr ""
 
+msgctxt "field:stock.shipment.out.return,done_by:"
+msgid "Done By"
+msgstr ""
+
 msgctxt "field:stock.shipment.out.return,effective_date:"
 msgid "Effective Date"
 msgstr ""
@@ -1210,6 +1392,10 @@ msgctxt "field:stock.shipment.out.return,rec_name:"
 msgid "Name"
 msgstr "纳木"
 
+msgctxt "field:stock.shipment.out.return,received_by:"
+msgid "Received By"
+msgstr ""
+
 msgctxt "field:stock.shipment.out.return,reference:"
 msgid "Reference"
 msgstr ""
@@ -1249,6 +1435,14 @@ msgctxt "help:party.party,supplier_location:"
 msgid "The default source location when receiving products from the party."
 msgstr ""
 
+msgctxt "help:party.party.location,customer_location:"
+msgid "The default destination location when sending products to the party."
+msgstr ""
+
+msgctxt "help:party.party.location,supplier_location:"
+msgid "The default source location when receiving products from the party."
+msgstr ""
+
 msgctxt "help:product.by_location.context,forecast_date:"
 msgid ""
 "Allow to compute expected stock quantities for this date.\n"
@@ -1455,6 +1649,11 @@ msgid "Draft"
 msgstr ""
 
 msgctxt ""
+"model:ir.action.act_window.domain,name:act_shipment_internal_form_domain_requests"
+msgid "Requests"
+msgstr ""
+
+msgctxt ""
 "model:ir.action.act_window.domain,name:act_shipment_internal_form_domain_shipped"
 msgid "Shipped"
 msgstr ""
@@ -1615,6 +1814,10 @@ msgctxt "model:ir.ui.menu,name:menu_stock_configuration"
 msgid "Stock Configuration"
 msgstr ""
 
+msgctxt "model:party.party.location,name:"
+msgid "Party Location"
+msgstr ""
+
 msgctxt "model:product.by_location.context,name:"
 msgid "Product by Location"
 msgstr ""
@@ -1635,6 +1838,14 @@ msgctxt "model:stock.configuration,name:"
 msgid "Stock Configuration"
 msgstr ""
 
+msgctxt "model:stock.configuration.location,name:"
+msgid "Stock Configuration Location"
+msgstr ""
+
+msgctxt "model:stock.configuration.sequence,name:"
+msgid "Stock Configuration Sequence"
+msgstr ""
+
 msgctxt "model:stock.inventory,name:"
 msgid "Stock Inventory"
 msgstr ""
@@ -2128,6 +2339,10 @@ msgid "Draft"
 msgstr ""
 
 msgctxt "selection:stock.shipment.internal,state:"
+msgid "Request"
+msgstr ""
+
+msgctxt "selection:stock.shipment.internal,state:"
 msgid "Shipped"
 msgstr ""
 
@@ -2257,6 +2472,10 @@ msgid "Draft"
 msgstr ""
 
 msgctxt "view:stock.shipment.in.return:"
+msgid "Other Info"
+msgstr ""
+
+msgctxt "view:stock.shipment.in.return:"
 msgid "Wait"
 msgstr ""
 
@@ -2279,6 +2498,10 @@ msgid "Inventory Moves"
 msgstr ""
 
 msgctxt "view:stock.shipment.in:"
+msgid "Other Info"
+msgstr ""
+
+msgctxt "view:stock.shipment.in:"
 msgid "Receive"
 msgstr ""
 
@@ -2309,6 +2532,10 @@ msgid "Draft"
 msgstr ""
 
 msgctxt "view:stock.shipment.internal:"
+msgid "Other Info"
+msgstr ""
+
+msgctxt "view:stock.shipment.internal:"
 msgid "Ship"
 msgstr ""
 
@@ -2343,6 +2570,10 @@ msgid "Inventory Moves"
 msgstr ""
 
 msgctxt "view:stock.shipment.out.return:"
+msgid "Other Info"
+msgstr ""
+
+msgctxt "view:stock.shipment.out.return:"
 msgid "Received"
 msgstr ""
 
@@ -2365,11 +2596,11 @@ msgid "Draft"
 msgstr ""
 
 msgctxt "view:stock.shipment.out:"
-msgid "Inventory Moves"
+msgid "Make shipment"
 msgstr ""
 
 msgctxt "view:stock.shipment.out:"
-msgid "Make shipment"
+msgid "Other Info"
 msgstr ""
 
 msgctxt "view:stock.shipment.out:"
diff --git a/location.py b/location.py
index 0a3b219..9add3c2 100644
--- a/location.py
+++ b/location.py
@@ -3,15 +3,16 @@
 import datetime
 from decimal import Decimal
 
-from trytond.model import ModelView, ModelSQL, MatchMixin, fields, \
-    sequence_ordered
+from trytond.model import (ModelView, ModelSQL, MatchMixin, ValueMixin, fields,
+    sequence_ordered)
 from trytond import backend
 from trytond.pyson import Eval, If
 from trytond.transaction import Transaction
 from trytond.pool import Pool, PoolMeta
 from trytond.tools import grouped_slice
+from trytond.tools.multivalue import migrate_property
 
-__all__ = ['Location', 'Party', 'ProductsByLocationsContext',
+__all__ = ['Location', 'Party', 'PartyLocation', 'ProductsByLocationsContext',
     'LocationLeadTime']
 
 STATES = {
@@ -396,17 +397,84 @@ class Location(ModelSQL, ModelView):
         return res
 
 
+supplier_location = fields.Many2One(
+    'stock.location', "Supplier Location", domain=[('type', '=', 'supplier')],
+    help='The default source location when receiving products from the party.')
+customer_location = fields.Many2One(
+    'stock.location', "Customer Location", domain=[('type', '=', 'customer')],
+    help='The default destination location when sending products to the party.'
+    )
+
+
 class Party:
     __metaclass__ = PoolMeta
     __name__ = 'party.party'
-    supplier_location = fields.Property(fields.Many2One('stock.location',
-        'Supplier Location', domain=[('type', '=', 'supplier')],
-        help='The default source location when receiving products from the '
-        'party.'))
-    customer_location = fields.Property(fields.Many2One('stock.location',
-        'Customer Location', domain=[('type', '=', 'customer')],
-        help='The default destination location when sending products to the '
-        'party.'))
+    supplier_location = fields.MultiValue(supplier_location)
+    customer_location = fields.MultiValue(customer_location)
+    locations = fields.One2Many(
+        'party.party.location', 'party', "Locations")
+
+    @classmethod
+    def multivalue_model(cls, field):
+        pool = Pool()
+        if field in {'supplier_location', 'customer_location'}:
+            return pool.get('party.party.location')
+        return super(Party, cls).multivalue_model(field)
+
+    @classmethod
+    def default_supplier_location(cls, **pattern):
+        return cls.multivalue_model(
+            'supplier_location').default_supplier_location()
+
+    @classmethod
+    def default_customer_location(cls, **pattern):
+        return cls.multivalue_model(
+            'customer_location').default_customer_location()
+
+
+class PartyLocation(ModelSQL, ValueMixin):
+    "Party Location"
+    __name__ = 'party.party.location'
+    party = fields.Many2One(
+        'party.party', "Party", ondelete='CASCADE', select=True)
+    supplier_location = supplier_location
+    customer_location = customer_location
+
+    @classmethod
+    def __register__(cls, module_name):
+        TableHandler = backend.get('TableHandler')
+        exist = TableHandler.table_exist(cls._table)
+
+        super(PartyLocation, cls).__register__(module_name)
+
+        if not exist:
+            cls._migrate_property([], [], [])
+
+    @classmethod
+    def _migrate_property(cls, field_names, value_names, fields):
+        field_names.extend(['supplier_location', 'customer_location'])
+        value_names.extend(['supplier_location', 'customer_location'])
+        migrate_property(
+            'party.party', field_names, cls, value_names,
+            parent='party', fields=fields)
+
+    @classmethod
+    def default_supplier_location(cls):
+        pool = Pool()
+        ModelData = pool.get('ir.model.data')
+        try:
+            return ModelData.get_id('stock', 'location_supplier')
+        except KeyError:
+            return None
+
+    @classmethod
+    def default_customer_location(cls):
+        pool = Pool()
+        ModelData = pool.get('ir.model.data')
+        try:
+            return ModelData.get_id('stock', 'location_customer')
+        except KeyError:
+            return None
 
 
 class ProductsByLocationsContext(ModelView):
diff --git a/location.xml b/location.xml
index ed7fbaa..dd3edd6 100644
--- a/location.xml
+++ b/location.xml
@@ -215,25 +215,5 @@ this repository contains the full copyright notices and license terms. -->
             <field name="name">Transit</field>
             <field name="type">storage</field>
         </record>
-
-        <record model="ir.property" id="property_supplier_location">
-            <field name="field"
-                   search="[('model.model', '=', 'party.party'),
-                           ('name', '=', 'supplier_location')]"/>
-            <field name="value" eval="'stock.location,' + str(ref('location_supplier'))"/>
-        </record>
-        <record model="ir.property" id="property_customer_location">
-            <field name="field"
-                   search="[('model.model', '=', 'party.party'),
-                           ('name', '=', 'customer_location')]"/>
-            <field name="value" eval="'stock.location,' + str(ref('location_customer'))"/>
-        </record>
-
-        <record model="ir.property" id="property_shipment_internal_transit">
-            <field name="field"
-                   search="[('model.model', '=', 'stock.configuration'),
-                           ('name', '=', 'shipment_internal_transit')]"/>
-            <field name="value" eval="'stock.location,' + str(ref('location_transit'))"/>
-        </record>
     </data>
 </tryton>
diff --git a/move.py b/move.py
index 2a95fab..22571aa 100644
--- a/move.py
+++ b/move.py
@@ -7,7 +7,7 @@ from functools import partial
 from collections import OrderedDict, defaultdict
 from itertools import groupby
 
-from sql import Literal, Union, Column, Null
+from sql import Literal, Union, Column, Null, For
 from sql.aggregate import Sum
 from sql.conditionals import Coalesce
 from sql.operators import Concat
@@ -628,9 +628,6 @@ class Move(Workflow, ModelSQL, ModelView):
     @Workflow.transition('assigned')
     def assign(cls, moves):
         cls.check_origin(moves)
-        for move in moves:
-            move.set_effective_date()
-        cls.save(moves)
 
     @classmethod
     @ModelView.button
@@ -761,7 +758,7 @@ class Move(Workflow, ModelSQL, ModelView):
                 to_pick.append((location, available_qty))
                 needed_qty -= available_qty
         # Force assignation for consumables:
-        if self.product.consumable:
+        if self.product.consumable and self.from_location.type != 'view':
             to_pick.append((self.from_location, needed_qty))
             return to_pick
         return to_pick
@@ -778,8 +775,13 @@ class Move(Workflow, ModelSQL, ModelView):
         Uom = pool.get('product.uom')
         Date = pool.get('ir.date')
         Location = pool.get('stock.location')
+        Period = pool.get('stock.period')
+        transaction = Transaction()
+        database = transaction.database
+        connection = transaction.connection
 
-        Transaction().database.lock(Transaction().connection, cls._table)
+        if not moves:
+            return True
 
         if with_childs:
             locations = Location.search([
@@ -788,12 +790,42 @@ class Move(Workflow, ModelSQL, ModelView):
                     ])
         else:
             locations = list(set((m.from_location for m in moves)))
+        location_ids = [l.id for l in locations]
+        product_ids = list(set((m.product.id for m in moves)))
+        stock_date_end = Date.today()
+
+        if database.has_select_for():
+            table = cls.__table__()
+            query = table.select(Literal(1),
+                where=(table.to_location.in_(location_ids)
+                    | table.from_location.in_(location_ids))
+                & table.product.in_(product_ids),
+                for_=For('UPDATE', nowait=True))
+
+            PeriodCache = Period.get_cache(grouping)
+            if PeriodCache:
+                periods = Period.search([
+                        ('date', '<', stock_date_end),
+                        ('state', '=', 'closed'),
+                        ], order=[('date', 'DESC')], limit=1)
+                if periods:
+                    period, = periods
+                    query.where &= Coalesce(
+                        table.effective_date,
+                        table.planned_date,
+                        datetime.date.max) > period.date
+
+            with connection.cursor() as cursor:
+                cursor.execute(*query)
+        else:
+            database.lock(connection, cls._table)
+
         with Transaction().set_context(
-                stock_date_end=Date.today(),
+                stock_date_end=stock_date_end,
                 stock_assign=True):
             pbl = Product.products_by_location(
-                location_ids=[l.id for l in locations],
-                product_ids=[m.product.id for m in moves],
+                location_ids=location_ids,
+                product_ids=product_ids,
                 grouping=grouping)
 
         def get_key(move, location):
@@ -814,7 +846,6 @@ class Move(Workflow, ModelSQL, ModelView):
                 if move.state == 'staging':
                     success = False
                 continue
-            to_location = move.to_location
             # Keep location order for pick_product
             location_qties = OrderedDict()
             if with_childs:
@@ -865,9 +896,7 @@ class Move(Workflow, ModelSQL, ModelView):
                         move.product.default_uom, round=False)
 
                 from_key = get_key(move, from_location)
-                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:
@@ -886,7 +915,8 @@ class Move(Workflow, ModelSQL, ModelView):
             stock_date_start: if set return the delta of the stock between the
                 two dates, (ignored if stock_date_end is missing).
             stock_assign: if set compute also the assigned outgoing moves as
-                done.
+                done at the stock_date_end except for delta which is at the
+                planned date.
             forecast: if set compute the forecast quantity.
             stock_destinations: A list of location ids. If set, restrict the
                 computation to moves from and to those locations.
@@ -947,6 +977,9 @@ class Move(Workflow, ModelSQL, ModelView):
                         & (move.planned_date <= context['stock_date_end'])
                         )
                     | (move.effective_date <= context['stock_date_end'])
+                    | (move.state == (
+                            'assigned' if not context.get('stock_date_start')
+                            else ''))
                     )
                 )
             state_date_clause_in = state_date_clause(False)
@@ -965,6 +998,10 @@ class Move(Workflow, ModelSQL, ModelView):
                             & (move.planned_date <= today)
                             )
                         | (move.effective_date <= today)
+                        | (move.state == (
+                                'assigned'
+                                if not context.get('stock_date_start')
+                                else ''))
                         )
                     )
                 | (move.state.in_(['done', 'assigned', 'draft'])
@@ -980,6 +1017,10 @@ class Move(Workflow, ModelSQL, ModelView):
                             (move.effective_date <= context['stock_date_end'])
                             & (move.effective_date >= today)
                             )
+                        | (move.state == (
+                                'assigned'
+                                if not context.get('stock_date_start')
+                                else ''))
                         )
                     )
                 )
diff --git a/party.xml b/party.xml
index 4585ce7..90ed4ca 100644
--- a/party.xml
+++ b/party.xml
@@ -13,7 +13,8 @@ this repository contains the full copyright notices and license terms. -->
             <field name="name">Customer Shipments</field>
             <field name="res_model">stock.shipment.out</field>
             <field name="domain"
-                eval="[('customer', 'in', Eval('active_ids'))]" pyson="1"/>
+                eval="[If(Eval('active_ids', []) == [Eval('active_id')], ('customer', '=', Eval('active_id')), ('customer', 'in', Eval('active_ids')))]"
+                pyson="1"/>
         </record>
         <record model="ir.action.keyword"
                 id="act_open_purchase_keyword1">
@@ -31,7 +32,8 @@ this repository contains the full copyright notices and license terms. -->
             <field name="name">Supplier Shipments</field>
             <field name="res_model">stock.shipment.in</field>
             <field name="domain"
-                eval="[('supplier', 'in', Eval('active_ids'))]" pyson="1"/>
+                eval="[If(Eval('active_ids', []) == [Eval('active_id')], ('supplier', '=', Eval('active_id')), ('supplier', 'in', Eval('active_ids')))]"
+                pyson="1"/>
         </record>
         <record model="ir.action.keyword"
                 id="act_open_purchase_keyword2">
diff --git a/period.py b/period.py
index 5b9b802..34bf713 100644
--- a/period.py
+++ b/period.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 itertools import chain
+
+from sql import Literal, For
+
 from trytond.model import Workflow, ModelView, ModelSQL, fields
 from trytond.pyson import Eval, If
 from trytond.transaction import Transaction
@@ -93,6 +96,20 @@ class Period(Workflow, ModelSQL, ModelView):
         Location = pool.get('stock.location')
         Move = pool.get('stock.move')
         Date = pool.get('ir.date')
+        transaction = Transaction()
+        connection = transaction.connection
+        database = transaction.database
+
+        # XXX: A move in the period could be inserted before the lock
+        # from a different transaction. It will not be taken in the pbl
+        # computation but it is quite rare because only past periods are
+        # closed.
+        database.lock(connection, Move._table)
+        if database.has_select_for():
+            move = Move.__table__()
+            query = move.select(Literal(1), for_=For('UPDATE', nowait=True))
+            with connection.cursor() as cursor:
+                cursor.execute(*query)
 
         locations = Location.search([
                 ('type', 'not in', ['warehouse', 'view']),
diff --git a/setup.py b/setup.py
index a07b5ae..2c54199 100644
--- a/setup.py
+++ b/setup.py
@@ -86,7 +86,7 @@ setup(name=name,
         'Intended Audience :: Financial and Insurance Industry',
         'Intended Audience :: Legal Industry',
         'Intended Audience :: Manufacturing',
-        'License :: OSI Approved :: GNU General Public License (GPL)',
+        'License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)',
         'Natural Language :: Bulgarian',
         'Natural Language :: Catalan',
         'Natural Language :: Chinese (Simplified)',
diff --git a/shipment.py b/shipment.py
index ad29c3a..a78f10b 100644
--- a/shipment.py
+++ b/shipment.py
@@ -31,9 +31,37 @@ __all__ = ['ShipmentIn', 'ShipmentInReturn',
     'SupplierRestockingList', 'CustomerReturnRestockingList',
     'InteralShipmentReport']
 
-STATES = {
-    'readonly': "state in ('cancel', 'done')",
-}
+
+def set_employee(field):
+    def decorator(func):
+        @functools.wraps(func)
+        def wrapper(cls, shipments, *args, **kwargs):
+            pool = Pool()
+            User = pool.get('res.user')
+            user = User(Transaction().user)
+
+            result = func(cls, shipments, *args, **kwargs)
+            employee = user.employee
+            if employee:
+                company = employee.company
+                cls.write(
+                    [s for s in shipments
+                        if not getattr(s, field) and s.company == company], {
+                        field: employee.id,
+                        })
+            return result
+        return wrapper
+    return decorator
+
+
+def employee_field(string):
+    return fields.Many2One(
+        'company.employee', string,
+        domain=[('company', '=', Eval('company', -1))],
+        states={
+            'readonly': Eval('state').in_(['done', 'cancel']),
+            },
+        depends=['company', 'state'])
 
 
 class ShipmentIn(Workflow, ModelSQL, ModelView):
@@ -126,7 +154,9 @@ class ShipmentIn(Workflow, ModelSQL, ModelView):
         domain=[('company', '=', Eval('company'))], readonly=True,
         depends=['company'])
     origins = fields.Function(fields.Char('Origins'), 'get_origins')
-    number = fields.Char('Numer', size=None, select=True, readonly=True)
+    number = fields.Char('Number', size=None, select=True, readonly=True)
+    received_by = employee_field("Received By")
+    done_by = employee_field("Done By")
     state = fields.Selection([
         ('draft', 'Draft'),
         ('done', 'Done'),
@@ -307,7 +337,7 @@ class ShipmentIn(Workflow, ModelSQL, ModelView):
     def get_incoming_moves(self, name):
         moves = []
         for move in self.moves:
-            if move.to_location.id == self.warehouse.input_location.id:
+            if move.to_location == self.warehouse_input:
                 moves.append(move.id)
         return moves
 
@@ -322,8 +352,7 @@ class ShipmentIn(Workflow, ModelSQL, ModelView):
     def get_inventory_moves(self, name):
         moves = []
         for move in self.moves:
-            if (move.from_location.id ==
-                    self.warehouse.input_location.id):
+            if move.from_location == self.warehouse_input:
                 moves.append(move.id)
         return moves
 
@@ -397,6 +426,9 @@ class ShipmentIn(Workflow, ModelSQL, ModelView):
         default = default.copy()
         default['inventory_moves'] = None
         default['incoming_moves'] = None
+        default.setdefault('number')
+        default.setdefault('received_by')
+        default.setdefault('done_by')
         return super(ShipmentIn, cls).copy(shipments, default=default)
 
     @classmethod
@@ -410,7 +442,7 @@ class ShipmentIn(Workflow, ModelSQL, ModelView):
         move.uom = incoming_move.uom
         move.quantity = incoming_move.quantity
         move.from_location = incoming_move.to_location
-        move.to_location = incoming_move.shipment.warehouse.storage_location
+        move.to_location = incoming_move.shipment.warehouse_storage
         move.state = Move.default_state()
         # Product will be considered in stock only when the inventory
         # move will be made:
@@ -464,6 +496,7 @@ class ShipmentIn(Workflow, ModelSQL, ModelView):
     @classmethod
     @ModelView.button
     @Workflow.transition('received')
+    @set_employee('received_by')
     def receive(cls, shipments):
         Move = Pool().get('stock.move')
         Move.do([m for s in shipments for m in s.incoming_moves])
@@ -472,6 +505,7 @@ class ShipmentIn(Workflow, ModelSQL, ModelView):
     @classmethod
     @ModelView.button
     @Workflow.transition('done')
+    @set_employee('done_by')
     def done(cls, shipments):
         pool = Pool()
         Move = pool.get('stock.move')
@@ -553,6 +587,8 @@ class ShipmentInReturn(Workflow, ModelSQL, ModelView):
             ],
         depends=['state', 'from_location', 'to_location', 'company'])
     origins = fields.Function(fields.Char('Origins'), 'get_origins')
+    assigned_by = employee_field("Assigned By")
+    done_by = employee_field("Done By")
     state = fields.Selection([
         ('draft', 'Draft'),
         ('cancel', 'Canceled'),
@@ -726,6 +762,16 @@ class ShipmentInReturn(Workflow, ModelSQL, ModelView):
         super(ShipmentInReturn, cls).delete(shipments)
 
     @classmethod
+    def copy(cls, shipments, default=None):
+        if default is None:
+            default = {}
+        default = default.copy()
+        default.setdefault('number')
+        default.setdefault('assigned_by')
+        default.setdefault('done_by')
+        return super(ShipmentInReturn, cls).copy(shipments, default=default)
+
+    @classmethod
     @ModelView.button
     @Workflow.transition('draft')
     def draft(cls, shipments):
@@ -751,6 +797,7 @@ class ShipmentInReturn(Workflow, ModelSQL, ModelView):
 
     @classmethod
     @Workflow.transition('assigned')
+    @set_employee('assigned_by')
     def assign(cls, shipments):
         Move = Pool().get('stock.move')
         Move.assign([m for s in shipments for m in s.moves])
@@ -758,6 +805,7 @@ class ShipmentInReturn(Workflow, ModelSQL, ModelView):
     @classmethod
     @ModelView.button
     @Workflow.transition('done')
+    @set_employee('done_by')
     def done(cls, shipments):
         pool = Pool()
         Move = pool.get('stock.move')
@@ -856,7 +904,8 @@ class ShipmentOut(Workflow, ModelSQL, ModelView):
                 ('company', '=', Eval('company')),
                 ],
             states={
-                'readonly': ((Eval('state').in_(['waiting', 'done', 'cancel']))
+                'readonly': ((Eval('state').in_(
+                            ['waiting', 'packed', 'done', 'cancel']))
                     | ~Eval('warehouse') | ~Eval('customer')),
                 },
             depends=['state', 'warehouse', 'customer', 'warehouse_output',
@@ -872,7 +921,9 @@ class ShipmentOut(Workflow, ModelSQL, ModelView):
                 ],
             states={
                 'readonly': Eval('state').in_(
-                    ['draft', 'packed', 'done', 'cancel']),
+                    ['draft', 'assigned', 'packed', 'done', 'cancel']),
+                'invisible': (
+                    Eval('warehouse_storage') == Eval('warehouse_output')),
                 },
             depends=['state', 'warehouse', 'warehouse_storage',
                 'warehouse_output', 'company']),
@@ -882,6 +933,9 @@ class ShipmentOut(Workflow, ModelSQL, ModelView):
         readonly=True)
     origins = fields.Function(fields.Char('Origins'), 'get_origins')
     number = fields.Char('Number', size=None, select=True, readonly=True)
+    assigned_by = employee_field("Assigned By")
+    packed_by = employee_field("Packed By")
+    done_by = employee_field("Done By")
     state = fields.Selection([
         ('draft', 'Draft'),
         ('done', 'Done'),
@@ -902,6 +956,7 @@ class ShipmentOut(Workflow, ModelSQL, ModelView):
         cls._transitions |= set((
                 ('draft', 'waiting'),
                 ('waiting', 'assigned'),
+                ('waiting', 'packed'),
                 ('assigned', 'packed'),
                 ('packed', 'done'),
                 ('assigned', 'waiting'),
@@ -932,13 +987,18 @@ class ShipmentOut(Workflow, ModelSQL, ModelView):
                             'tryton-go-next')),
                     },
                 'pack': {
-                    'invisible': Eval('state') != 'assigned',
+                    'invisible': If(Eval('warehouse_storage')
+                        == Eval('warehouse_output'),
+                        ~Eval('state').in_(['assigned', 'waiting']),
+                        Eval('state') != 'assigned'),
                     },
                 'done': {
                     'invisible': Eval('state') != 'packed',
                     },
                 'assign_wizard': {
-                    'invisible': Eval('state') != 'waiting',
+                    'invisible': ((Eval('state') != 'waiting')
+                        | (Eval('warehouse_storage')
+                            == Eval('warehouse_output'))),
                     },
                 'assign_try': {},
                 'assign_force': {},
@@ -1034,7 +1094,11 @@ class ShipmentOut(Workflow, ModelSQL, ModelView):
     @fields.depends('warehouse')
     def on_change_with_warehouse_storage(self, name=None):
         if self.warehouse:
-            return self.warehouse.storage_location.id
+            if self.warehouse.picking_location:
+                location = self.warehouse.picking_location
+            else:
+                location = self.warehouse.storage_location
+            return location.id
 
     @classmethod
     def default_warehouse_output(cls):
@@ -1050,7 +1114,7 @@ class ShipmentOut(Workflow, ModelSQL, ModelView):
     def get_outgoing_moves(self, name):
         moves = []
         for move in self.moves:
-            if move.from_location.id == self.warehouse.output_location.id:
+            if move.from_location == self.warehouse_output:
                 moves.append(move.id)
         return moves
 
@@ -1065,7 +1129,7 @@ class ShipmentOut(Workflow, ModelSQL, ModelView):
     def get_inventory_moves(self, name):
         moves = []
         for move in self.moves:
-            if move.to_location.id == self.warehouse.output_location.id:
+            if move.to_location == self.warehouse_output:
                 moves.append(move.id)
         return moves
 
@@ -1106,6 +1170,9 @@ class ShipmentOut(Workflow, ModelSQL, ModelView):
 
         to_create = []
         for shipment in shipments:
+            if shipment.warehouse_storage == shipment.warehouse_output:
+                # Do not create inventory moves
+                continue
             for move in shipment.outgoing_moves:
                 if move.state in ('cancel', 'done'):
                     continue
@@ -1117,9 +1184,8 @@ class ShipmentOut(Workflow, ModelSQL, ModelView):
         'Return inventory move for the outgoing move'
         pool = Pool()
         Move = pool.get('stock.move')
-        wrh = move.shipment.warehouse
         return Move(
-            from_location=wrh.picking_location or wrh.storage_location,
+            from_location=self.warehouse_storage,
             to_location=move.from_location,
             product=move.product,
             uom=move.uom,
@@ -1134,12 +1200,14 @@ class ShipmentOut(Workflow, ModelSQL, ModelView):
 
     @classmethod
     @Workflow.transition('assigned')
+    @set_employee('assigned_by')
     def assign(cls, shipments):
         cls._sync_inventory_to_outgoing(shipments, create=True, write=False)
 
     @classmethod
     @ModelView.button
     @Workflow.transition('packed')
+    @set_employee('packed_by')
     def pack(cls, shipments):
         pool = Pool()
         Move = pool.get('stock.move')
@@ -1171,6 +1239,9 @@ class ShipmentOut(Workflow, ModelSQL, ModelView):
         Move = pool.get('stock.move')
         Uom = pool.get('product.uom')
         for shipment in shipments:
+            if shipment.warehouse_storage == shipment.warehouse_output:
+                # Do not create inventory moves
+                continue
             # Sum all outgoing quantities
             outgoing_qty = {}
             for move in shipment.outgoing_moves:
@@ -1234,6 +1305,7 @@ class ShipmentOut(Workflow, ModelSQL, ModelView):
     @classmethod
     @ModelView.button
     @Workflow.transition('done')
+    @set_employee('done_by')
     def done(cls, shipments):
         pool = Pool()
         Move = pool.get('stock.move')
@@ -1314,6 +1386,10 @@ class ShipmentOut(Workflow, ModelSQL, ModelView):
         default = default.copy()
         default['inventory_moves'] = None
         default['outgoing_moves'] = None
+        default.setdefault('number')
+        default.setdefault('assigned_by')
+        default.setdefault('packed_by')
+        default.setdefault('done_by')
         return super(ShipmentOut, cls).copy(shipments, default=default)
 
     @classmethod
@@ -1447,6 +1523,8 @@ class ShipmentOutReturn(Workflow, ModelSQL, ModelView):
         readonly=True)
     origins = fields.Function(fields.Char('Origins'), 'get_origins')
     number = fields.Char('Number', size=None, select=True, readonly=True)
+    received_by = employee_field("Received By")
+    done_by = employee_field("Done By")
     state = fields.Selection([
         ('draft', 'Draft'),
         ('done', 'Done'),
@@ -1588,7 +1666,7 @@ class ShipmentOutReturn(Workflow, ModelSQL, ModelView):
     def get_incoming_moves(self, name):
         moves = []
         for move in self.moves:
-            if move.to_location.id == self.warehouse.input_location.id:
+            if move.to_location == self.warehouse_input:
                 moves.append(move.id)
         return moves
 
@@ -1603,7 +1681,7 @@ class ShipmentOutReturn(Workflow, ModelSQL, ModelView):
     def get_inventory_moves(self, name):
         moves = []
         for move in self.moves:
-            if move.from_location.id == self.warehouse.input_location.id:
+            if move.from_location == self.warehouse_input:
                 moves.append(move.id)
         return moves
 
@@ -1673,6 +1751,9 @@ class ShipmentOutReturn(Workflow, ModelSQL, ModelView):
         default = default.copy()
         default['inventory_moves'] = None
         default['incoming_moves'] = None
+        default.setdefault('number')
+        default.setdefault('received_by')
+        default.setdefault('done_by')
         return super(ShipmentOutReturn, cls).copy(shipments, default=default)
 
     @classmethod
@@ -1699,6 +1780,7 @@ class ShipmentOutReturn(Workflow, ModelSQL, ModelView):
     @classmethod
     @ModelView.button
     @Workflow.transition('received')
+    @set_employee('received_by')
     def receive(cls, shipments):
         Move = Pool().get('stock.move')
         Move.do([m for s in shipments for m in s.incoming_moves])
@@ -1707,6 +1789,7 @@ class ShipmentOutReturn(Workflow, ModelSQL, ModelView):
     @classmethod
     @ModelView.button
     @Workflow.transition('done')
+    @set_employee('done_by')
     def done(cls, shipments):
         pool = Pool()
         Move = pool.get('stock.move')
@@ -1735,7 +1818,7 @@ class ShipmentOutReturn(Workflow, ModelSQL, ModelView):
         move.uom = incoming_move.uom
         move.quantity = incoming_move.quantity
         move.from_location = incoming_move.to_location
-        move.to_location = incoming_move.shipment.warehouse.storage_location
+        move.to_location = incoming_move.shipment.warehouse_storage
         move.state = Move.default_state()
         # Product will be considered in stock only when the inventory
         # move will be made:
@@ -1817,7 +1900,7 @@ class ShipmentInternal(Workflow, ModelSQL, ModelView):
         depends=['state'])
     planned_date = fields.Date('Planned Date',
         states={
-            'readonly': Eval('state') != 'draft',
+            'readonly': ~Eval('state').in_(['request', 'draft']),
             }, depends=['state'])
     effective_start_date = fields.Date('Effective Start Date',
         states={
@@ -1826,13 +1909,13 @@ class ShipmentInternal(Workflow, ModelSQL, ModelView):
         depends=['state'])
     planned_start_date = fields.Date('Planned Start Date',
         states={
-            'readonly': ~Eval('state').in_(['draft']),
+            'readonly': ~Eval('state').in_(['request', 'draft']),
             'required': Bool(Eval('planned_date')),
             },
         depends=['state'])
     company = fields.Many2One('company.company', 'Company', required=True,
         states={
-            'readonly': Eval('state') != 'draft',
+            'readonly': ~Eval('state').in_(['request', 'draft']),
             },
         domain=[
             ('id', If(Eval('context', {}).contains('company'), '=', '!='),
@@ -1842,18 +1925,20 @@ class ShipmentInternal(Workflow, ModelSQL, ModelView):
     number = fields.Char('Number', size=None, select=True, readonly=True)
     reference = fields.Char("Reference", size=None, select=True,
         states={
-            'readonly': Eval('state') != 'draft',
+            'readonly': ~Eval('state').in_(['request', 'draft']),
             }, depends=['state'])
     from_location = fields.Many2One('stock.location', "From Location",
         required=True, states={
-            'readonly': (Eval('state') != 'draft') | Eval('moves', [0]),
+            'readonly': (~Eval('state').in_(['request', 'draft'])
+                | Eval('moves', [0])),
             },
         domain=[
             ('type', 'in', ['view', 'storage', 'lost_found']),
             ], depends=['state'])
     to_location = fields.Many2One('stock.location', "To Location",
         required=True, states={
-            'readonly': (Eval('state') != 'draft') | Eval('moves', [0]),
+            'readonly': (~Eval('state').in_(['request', 'draft'])
+                    | Eval('moves', [0])),
             }, domain=[
             ('type', 'in', ['view', 'storage', 'lost_found']),
             ], depends=['state'])
@@ -1864,10 +1949,10 @@ class ShipmentInternal(Workflow, ModelSQL, ModelView):
             'readonly': (Eval('state').in_(['cancel', 'assigned', 'done'])
                 | ~Eval('from_location') | ~Eval('to_location')),
             'invisible': (Bool(Eval('transit_location'))
-                & (Eval('state') != 'draft')),
+                & ~Eval('state').in_(['request', 'draft'])),
             },
         domain=[
-            If(Eval('state') == 'draft', [
+            If(Eval('state').in_(['request', 'draft']), [
                     ('from_location', '=', Eval('from_location')),
                     ('to_location', '=', Eval('to_location')),
                     ],
@@ -1908,7 +1993,7 @@ class ShipmentInternal(Workflow, ModelSQL, ModelView):
                 'readonly': Eval('state').in_(
                     ['assigned', 'shipped', 'done', 'cancel']),
                 'invisible': (~Eval('transit_location')
-                    | (Eval('state') == 'draft')),
+                    | Eval('state').in_(['request', 'draft'])),
                 },
             depends=['from_location', 'to_location', 'transit_location',
                 'state']),
@@ -1926,12 +2011,16 @@ class ShipmentInternal(Workflow, ModelSQL, ModelView):
             states={
                 'readonly': Eval('state').in_(['done', 'cancel']),
                 'invisible': (~Eval('transit_location')
-                    | (Eval('state') == 'draft')),
+                    | Eval('state').in_(['request', 'draft'])),
                 },
             depends=['from_location', 'to_location', 'transit_location',
                 'state']),
         'get_incoming_moves', setter='set_moves')
+    assigned_by = employee_field("Received By")
+    shipped_by = employee_field("Shipped By")
+    done_by = employee_field("Done By")
     state = fields.Selection([
+            ('request', 'Request'),
             ('draft', 'Draft'),
             ('cancel', 'Canceled'),
             ('waiting', 'Waiting'),
@@ -1949,6 +2038,7 @@ class ShipmentInternal(Workflow, ModelSQL, ModelView):
                     'before deletion.'),
                 })
         cls._transitions |= set((
+                ('request', 'draft'),
                 ('draft', 'waiting'),
                 ('waiting', 'waiting'),
                 ('waiting', 'assigned'),
@@ -1957,6 +2047,7 @@ class ShipmentInternal(Workflow, ModelSQL, ModelView):
                 ('shipped', 'done'),
                 ('waiting', 'draft'),
                 ('assigned', 'waiting'),
+                ('request', 'cancel'),
                 ('draft', 'cancel'),
                 ('waiting', 'cancel'),
                 ('assigned', 'cancel'),
@@ -1968,10 +2059,13 @@ class ShipmentInternal(Workflow, ModelSQL, ModelView):
                         ['cancel', 'shipped', 'done']),
                     },
                 'draft': {
-                    'invisible': ~Eval('state').in_(['cancel', 'waiting']),
+                    'invisible': ~Eval('state').in_(
+                        ['cancel', 'request', 'waiting']),
                     'icon': If(Eval('state') == 'cancel',
                         'tryton-clear',
-                        'tryton-go-previous'),
+                        If(Eval('state') == 'request',
+                            'tryton-go-next',
+                            'tryton-go-previous')),
                     },
                 'wait': {
                     'invisible': ~Eval('state').in_(['assigned', 'waiting',
@@ -2071,7 +2165,7 @@ class ShipmentInternal(Workflow, ModelSQL, ModelView):
         pool = Pool()
         Config = pool.get('stock.configuration')
         if self.planned_date != self.planned_start_date:
-            return Config(1).shipment_internal_transit.id
+            return Config(1).get_multivalue('shipment_internal_transit').id
 
     @fields.depends('planned_date', 'from_location', 'to_location')
     def on_change_with_planned_start_date(self, pattern=None):
@@ -2157,6 +2251,9 @@ class ShipmentInternal(Workflow, ModelSQL, ModelView):
         default['incoming_moves'] = None
         default['moves'] = None
         default.setdefault('number')
+        default.setdefault('assigned_by')
+        default.setdefault('shipped_by')
+        default.setdefault('done_by')
         copies = super(ShipmentInternal, cls).copy(shipments, default=default)
         for shipment, copy in zip(shipments, copies):
             Move.copy(shipment.outgoing_moves, default={
@@ -2176,6 +2273,8 @@ class ShipmentInternal(Workflow, ModelSQL, ModelView):
         to_delete = []
         to_save = []
         for shipment in shipments:
+            if not shipment.transit_location:
+                continue
             product_qty = defaultdict(lambda: 0)
             for move in shipment.outgoing_moves:
                 if move.state == 'cancel':
@@ -2205,6 +2304,31 @@ class ShipmentInternal(Workflow, ModelSQL, ModelView):
             Move.delete(to_delete)
 
     @classmethod
+    def _set_transit(cls, shipments):
+        pool = Pool()
+        Move = pool.get('stock.move')
+
+        to_write = []
+        for shipment in shipments:
+            if not shipment.transit_location:
+                continue
+            moves = [m for m in shipment.moves
+                if m.state != 'done'
+                and m.from_location != shipment.transit_location
+                and m.to_location != shipment.transit_location]
+            Move.copy(moves, default={
+                    'from_location': shipment.transit_location.id,
+                    'planned_date': shipment.planned_date,
+                    })
+            to_write.append(moves)
+            to_write.append({
+                    'to_location': shipment.transit_location.id,
+                    'planned_date': shipment.planned_start_date,
+                    })
+        if to_write:
+            Move.write(*to_write)
+
+    @classmethod
     @ModelView.button
     @Workflow.transition('draft')
     def draft(cls, shipments):
@@ -2231,48 +2355,28 @@ class ShipmentInternal(Workflow, ModelSQL, ModelView):
 
         Move.draft([m for s in shipments for m in s.moves])
 
-        direct = []
-        transit = []
-        for shipment in shipments:
-            if not shipment.transit_location:
-                direct.append(shipment)
-            else:
-                transit.append(shipment)
-
         moves = []
-        for shipment in direct:
+        for shipment in shipments:
+            if shipment.transit_location:
+                continue
             for move in shipment.moves:
                 if move.state != 'done':
                     move.planned_date = shipment.planned_date
                     moves.append(move)
         Move.save(moves)
 
-        to_write = []
-        for shipment in transit:
-            moves = [m for m in shipment.moves
-                if m.state != 'done'
-                and m.from_location != shipment.transit_location
-                and m.to_location != shipment.transit_location]
-            Move.copy(moves, default={
-                    'from_location': shipment.transit_location.id,
-                    'planned_date': shipment.planned_date,
-                    })
-            to_write.append(moves)
-            to_write.append({
-                    'to_location': shipment.transit_location.id,
-                    'planned_date': shipment.planned_start_date,
-                    })
-        if to_write:
-            Move.write(*to_write)
-        cls._sync_moves(transit)
+        cls._set_transit(shipments)
+        cls._sync_moves(shipments)
 
     @classmethod
     @Workflow.transition('assigned')
+    @set_employee('assigned_by')
     def assign(cls, shipments):
         pass
 
     @classmethod
     @Workflow.transition('shipped')
+    @set_employee('shipped_by')
     def ship(cls, shipments):
         pool = Pool()
         Move = pool.get('stock.move')
@@ -2286,6 +2390,7 @@ class ShipmentInternal(Workflow, ModelSQL, ModelView):
     @classmethod
     @ModelView.button
     @Workflow.transition('done')
+    @set_employee('done_by')
     def done(cls, shipments):
         pool = Pool()
         Move = pool.get('stock.move')
diff --git a/shipment.xml b/shipment.xml
index d990c3a..ab51f00 100644
--- a/shipment.xml
+++ b/shipment.xml
@@ -239,6 +239,14 @@ this repository contains the full copyright notices and license terms. -->
             <field name="act_window" ref="act_shipment_internal_form"/>
         </record>
         <record model="ir.action.act_window.domain"
+            id="act_shipment_internal_form_domain_requests">
+            <field name="name">Requests</field>
+            <field name="sequence" eval="5"/>
+            <field name="domain" eval="[('state', '=', 'request')]" pyson="1"/>
+            <field name="count" eval="True"/>
+            <field name="act_window" ref="act_shipment_internal_form"/>
+        </record>
+        <record model="ir.action.act_window.domain"
             id="act_shipment_internal_form_domain_draft">
             <field name="name">Draft</field>
             <field name="sequence" eval="10"/>
diff --git a/tests/scenario_stock_shipment_internal.rst b/tests/scenario_stock_shipment_internal.rst
index ec1ab8d..8ff130e 100644
--- a/tests/scenario_stock_shipment_internal.rst
+++ b/tests/scenario_stock_shipment_internal.rst
@@ -53,12 +53,20 @@ Create stock user::
 
     >>> User = Model.get('res.user')
     >>> Group = Model.get('res.group')
+    >>> Party = Model.get('party.party')
+    >>> Employee = Model.get('company.employee')
     >>> stock_user = User()
     >>> stock_user.name = 'Stock'
     >>> stock_user.login = 'stock'
     >>> stock_user.main_company = company
     >>> stock_group, = Group.find([('name', '=', 'Stock')])
     >>> stock_user.groups.append(stock_group)
+    >>> employee_party = Party(name="Employee")
+    >>> employee_party.save()
+    >>> employee = Employee(party=employee_party)
+    >>> employee.save()
+    >>> stock_user.employees.append(employee)
+    >>> stock_user.employee = employee
     >>> stock_user.save()
 
 Create Internal Shipment::
@@ -76,11 +84,17 @@ Create Internal Shipment::
     >>> move.from_location = internal_loc
     >>> move.to_location = storage_loc
     >>> move.currency = company.currency
+    >>> shipment.save()
+    >>> shipment.assigned_by
+    >>> shipment.done_by
+
     >>> shipment.click('wait')
     >>> shipment.state
     u'waiting'
     >>> shipment.click('assign_try')
     False
+    >>> shipment.assigned_by
+    >>> shipment.done_by
 
 Create Internal Shipment from lost_found location::
 
@@ -110,9 +124,15 @@ Check that now whe can finish the older shipment::
 
     >>> shipment.click('assign_try')
     True
+    >>> shipment.assigned_by == employee
+    True
+    >>> shipment.done_by
+
     >>> shipment.click('done')
     >>> shipment.state
     u'done'
+    >>> shipment.done_by == employee
+    True
 
 Add lead time inside the warehouse::
 
diff --git a/tests/scenario_stock_shipment_out.rst b/tests/scenario_stock_shipment_out.rst
index 8455069..4f163a4 100644
--- a/tests/scenario_stock_shipment_out.rst
+++ b/tests/scenario_stock_shipment_out.rst
@@ -46,6 +46,28 @@ Create product::
     >>> product.template = template
     >>> product.save()
 
+Create stock user::
+
+    >>> User = Model.get('res.user')
+    >>> Group = Model.get('res.group')
+    >>> Employee = Model.get('company.employee')
+    >>> stock_user = User()
+    >>> stock_user.name = "Stock"
+    >>> stock_user.login = 'stock'
+    >>> stock_user.main_company = company
+    >>> stock_user.groups.extend(Group.find([
+    ...             ('name', '=', 'Stock'),
+    ...             ]))
+    >>> employee_party = Party(name="Employee")
+    >>> employee_party.save()
+    >>> employee = Employee(party=employee_party)
+    >>> employee.save()
+    >>> stock_user.employees.append(employee)
+    >>> stock_user.employee = employee
+    >>> stock_user.save()
+
+    >>> config.user = stock_user.id
+
 Get stock locations::
 
     >>> Location = Model.get('stock.location')
@@ -78,6 +100,9 @@ Add two shipment lines of same product::
     ...     move.unit_price = Decimal('1')
     ...     move.currency = company.currency
     >>> shipment_out.save()
+    >>> shipment_out.assigned_by
+    >>> shipment_out.packed_by
+    >>> shipment_out.done_by
 
 Set the shipment state to waiting::
 
@@ -118,7 +143,7 @@ Assign the shipment now::
     >>> effective_dates = [m.effective_date for m in
     ...     shipment_out.inventory_moves]
     >>> len(set(effective_dates))
-    2
+    1
     >>> planned_dates = [m.planned_date for m in
     ...     shipment_out.outgoing_moves]
     >>> len(set(planned_dates))
@@ -132,7 +157,15 @@ Delete the draft move, assign and pack shipment::
     >>> shipment_out.inventory_moves.remove(move)
     >>> shipment_out.click('assign_try')
     True
+    >>> shipment_out.assigned_by == employee
+    True
+    >>> shipment_out.packed_by
+    >>> shipment_out.done_by
+
     >>> shipment_out.click('pack')
+    >>> shipment_out.packed_by == employee
+    True
+    >>> shipment_out.done_by
     >>> all(m.state == 'assigned' for m in shipment_out.outgoing_moves)
     True
     >>> len(shipment_out.outgoing_moves)
@@ -148,6 +181,8 @@ Delete the draft move, assign and pack shipment::
 Set the state as Done::
 
     >>> shipment_out.click('done')
+    >>> shipment_out.done_by == employee
+    True
     >>> all(m.state == 'done' for m in shipment_out.outgoing_moves)
     True
     >>> planned_dates = [m.planned_date for m in
diff --git a/tests/scenario_stock_shipment_out_same_storage_output.rst b/tests/scenario_stock_shipment_out_same_storage_output.rst
new file mode 100644
index 0000000..9e4714d
--- /dev/null
+++ b/tests/scenario_stock_shipment_out_same_storage_output.rst
@@ -0,0 +1,92 @@
+===================================================
+Stock Shipment Out Same Storage and Output Scenario
+===================================================
+
+Imports::
+
+    >>> from decimal import Decimal
+    >>> from proteus import Model
+    >>> from trytond.tests.tools import activate_modules
+    >>> from trytond.modules.company.tests.tools import create_company, \
+    ...     get_company
+
+Install stock Module::
+
+    >>> config = activate_modules('stock')
+
+Create company::
+
+    >>> _ = create_company()
+    >>> company = get_company()
+
+Create customer::
+
+    >>> Party = Model.get('party.party')
+    >>> customer = Party(name='Customer')
+    >>> customer.save()
+
+Create product::
+
+    >>> ProductUom = Model.get('product.uom')
+    >>> ProductTemplate = Model.get('product.template')
+    >>> Product = Model.get('product.product')
+    >>> unit, = ProductUom.find([('name', '=', 'Unit')])
+    >>> product = Product()
+    >>> template = ProductTemplate()
+    >>> template.name = 'Product'
+    >>> template.default_uom = unit
+    >>> template.type = 'goods'
+    >>> template.list_price = Decimal('20')
+    >>> template.cost_price = Decimal('8')
+    >>> template.save()
+    >>> product.template = template
+    >>> product.save()
+
+Get stock locations::
+
+    >>> Location = Model.get('stock.location')
+    >>> warehouse_loc, = Location.find([('code', '=', 'WH')])
+    >>> customer_loc, = Location.find([('code', '=', 'CUS')])
+    >>> storage_loc, = Location.find([('code', '=', 'STO')])
+    >>> warehouse_loc.output_location = storage_loc
+    >>> warehouse_loc.save()
+
+Create Shipment Out::
+
+    >>> ShipmentOut = Model.get('stock.shipment.out')
+    >>> shipment_out = ShipmentOut()
+    >>> shipment_out.customer = customer
+    >>> shipment_out.warehouse = warehouse_loc
+    >>> shipment_out.company = company
+    >>> move = shipment_out.outgoing_moves.new()
+    >>> move.product = product
+    >>> move.uom = unit
+    >>> move.quantity = 1
+    >>> move.from_location = storage_loc
+    >>> move.to_location = customer_loc
+    >>> shipment_out.save()
+
+    >>> len(shipment_out.outgoing_moves)
+    1
+    >>> len(shipment_out.inventory_moves)
+    0
+
+Set the shipment state to waiting::
+
+    >>> shipment_out.click('wait')
+    >>> shipment_out.state
+    u'waiting'
+    >>> len(shipment_out.outgoing_moves)
+    1
+    >>> len(shipment_out.inventory_moves)
+    0
+
+Assign the shipment::
+
+    >>> shipment_out.click('pack')
+    >>> shipment_out.state
+    u'packed'
+    >>> len(shipment_out.outgoing_moves)
+    1
+    >>> len(shipment_out.inventory_moves)
+    0
diff --git a/tests/test_stock.py b/tests/test_stock.py
index d4e664d..b670eab 100644
--- a/tests/test_stock.py
+++ b/tests/test_stock.py
@@ -728,6 +728,165 @@ class StockTestCase(ModuleTestCase):
                 states[state].sort()
             self.assertEqual(states, result, msg=msg)
 
+    @with_transaction()
+    def test_assign_try_chained(self):
+        "Test Move assign_try chained"
+        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')])
+        storage2, = Location.copy([storage])
+        storage3, = Location.copy([storage])
+
+        company = create_company()
+        with set_company(company):
+            move, = Move.create([{
+                        'product': product.id,
+                        'uom': uom.id,
+                        'quantity': 1,
+                        'from_location': supplier.id,
+                        'to_location': storage.id,
+                        'company': company.id,
+                        'unit_price': Decimal(1),
+                        'currency': company.currency.id,
+                        }])
+            Move.do([move])
+
+            moves = Move.create([{
+                        'product': product.id,
+                        'uom': uom.id,
+                        'quantity': 1,
+                        'from_location': from_.id,
+                        'to_location': to.id,
+                        'company': company.id,
+                        'unit_price': Decimal(1),
+                        'currency': company.currency.id,
+                        } for from_, to in [
+                        (storage, storage2),
+                        (storage2, storage3)]])
+
+            self.assertFalse(Move.assign_try(moves))
+            self.assertEqual([m.state for m in moves], ['assigned', 'draft'])
+
+    @with_transaction()
+    def test_assign_without_moves(self):
+        "Test Move assign_try with empty moves"
+        pool = Pool()
+        Move = pool.get('stock.move')
+
+        self.assertTrue(Move.assign_try([]))
+
+    @with_transaction()
+    def test_products_by_location_assign(self):
+        "Test products by location for assignation"
+        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')
+        today = datetime.date.today()
+
+        unit, = Uom.search([('name', '=', 'Unit')])
+        template = Template(
+            name="Product",
+            type='goods',
+            list_price=Decimal(1),
+            cost_price=Decimal(1),
+            cost_price_method='fixed',
+            default_uom=unit,
+            )
+        template.save()
+        product, = Product.create([{'template': template.id}])
+
+        supplier, = Location.search([('code', '=', 'SUP')])
+        storage, = Location.search([('code', '=', 'STO')])
+        customer, = Location.search([('code', '=', 'CUS')])
+
+        company = create_company()
+        with set_company(company):
+            move_supplier, = Move.create([{
+                        'product': product.id,
+                        'uom': unit.id,
+                        'quantity': 10,
+                        'from_location': supplier.id,
+                        'to_location': storage.id,
+                        'planned_date': today,
+                        'company': company.id,
+                        'unit_price': product.cost_price,
+                        'currency': company.currency.id,
+                        }])
+            move_customer, = Move.create([{
+                        'product': product.id,
+                        'uom': unit.id,
+                        'quantity': 5,
+                        'from_location': storage.id,
+                        'to_location': customer.id,
+                        'planned_date': today + relativedelta(days=1),
+                        'company': company.id,
+                        'unit_price': product.list_price,
+                        'currency': company.currency.id,
+                        }])
+
+            Move.assign([move_supplier])
+            with Transaction().set_context(
+                    stock_date_end=today,
+                    stock_assign=True):
+                pbl = Product.products_by_location([storage.id], [product.id])
+                self.assertDictEqual(pbl, {})
+
+            Move.assign([move_customer])
+            with Transaction().set_context(
+                    stock_date_end=today,
+                    stock_assign=True):
+                pbl = Product.products_by_location([storage.id], [product.id])
+                self.assertDictEqual(pbl, {(storage.id, product.id): -5})
+
+            Move.do([move_supplier])
+            with Transaction().set_context(
+                    stock_date_end=today,
+                    stock_assign=True):
+                pbl = Product.products_by_location([storage.id], [product.id])
+                self.assertDictEqual(pbl, {(storage.id, product.id): 5})
+
+            with Transaction().set_context(
+                    stock_date_end=today + relativedelta(days=1),
+                    stock_assign=True):
+                pbl = Product.products_by_location([storage.id], [product.id])
+                self.assertDictEqual(pbl, {(storage.id, product.id): 5})
+
+            with Transaction().set_context(
+                    stock_date_start=today,
+                    stock_date_end=today,
+                    stock_assign=True):
+                pbl = Product.products_by_location([storage.id], [product.id])
+                self.assertDictEqual(pbl, {(storage.id, product.id): 10})
+
+            with Transaction().set_context(
+                    stock_date_start=today + relativedelta(days=1),
+                    stock_date_end=today + relativedelta(days=1),
+                    stock_assign=True):
+                pbl = Product.products_by_location([storage.id], [product.id])
+                self.assertDictEqual(pbl, {(storage.id, product.id): -5})
+
 
 def suite():
     suite = trytond.tests.test_tryton.suite()
@@ -737,6 +896,11 @@ def suite():
             checker=doctest_checker,
             optionflags=doctest.REPORT_ONLY_FIRST_FAILURE))
     suite.addTests(doctest.DocFileSuite(
+            'scenario_stock_shipment_out_same_storage_output.rst',
+            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',
             tearDown=doctest_teardown, encoding='utf-8',
             checker=doctest_checker,
diff --git a/tryton.cfg b/tryton.cfg
index 3753c69..24a65c6 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=4.2.1
+version=4.4.0
 depends:
     company
     currency
diff --git a/trytond_stock.egg-info/PKG-INFO b/trytond_stock.egg-info/PKG-INFO
index 2c5f27d..1e7568c 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: 4.2.1
+Version: 4.4.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/4.2/
+Download-URL: http://downloads.tryton.org/4.4/
 Description: trytond_stock
         =============
         
@@ -52,7 +52,7 @@ Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Financial and Insurance Industry
 Classifier: Intended Audience :: Legal Industry
 Classifier: Intended Audience :: Manufacturing
-Classifier: License :: OSI Approved :: GNU General Public License (GPL)
+Classifier: License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
 Classifier: Natural Language :: Bulgarian
 Classifier: Natural Language :: Catalan
 Classifier: Natural Language :: Chinese (Simplified)
diff --git a/trytond_stock.egg-info/SOURCES.txt b/trytond_stock.egg-info/SOURCES.txt
index a2710e7..3e27da6 100644
--- a/trytond_stock.egg-info/SOURCES.txt
+++ b/trytond_stock.egg-info/SOURCES.txt
@@ -69,6 +69,7 @@ tryton.cfg
 ./tests/scenario_stock_reporting.rst
 ./tests/scenario_stock_shipment_internal.rst
 ./tests/scenario_stock_shipment_out.rst
+./tests/scenario_stock_shipment_out_same_storage_output.rst
 ./tests/test_stock.py
 ./view/address_tree_sequence.xml
 ./view/configuration_form.xml
@@ -136,6 +137,7 @@ tests/scenario_stock_inventory.rst
 tests/scenario_stock_reporting.rst
 tests/scenario_stock_shipment_internal.rst
 tests/scenario_stock_shipment_out.rst
+tests/scenario_stock_shipment_out_same_storage_output.rst
 trytond_stock.egg-info/PKG-INFO
 trytond_stock.egg-info/SOURCES.txt
 trytond_stock.egg-info/dependency_links.txt
diff --git a/trytond_stock.egg-info/requires.txt b/trytond_stock.egg-info/requires.txt
index 077d625..012d7fb 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 >= 4.2, < 4.3
-trytond_currency >= 4.2, < 4.3
-trytond_party >= 4.2, < 4.3
-trytond_product >= 4.2, < 4.3
-trytond >= 4.2, < 4.3
+trytond_company >= 4.4, < 4.5
+trytond_currency >= 4.4, < 4.5
+trytond_party >= 4.4, < 4.5
+trytond_product >= 4.4, < 4.5
+trytond >= 4.4, < 4.5
diff --git a/view/inventory_form.xml b/view/inventory_form.xml
index b9c10d8..563473f 100644
--- a/view/inventory_form.xml
+++ b/view/inventory_form.xml
@@ -20,7 +20,7 @@ this repository contains the full copyright notices and license terms. -->
     <group col="4" colspan="4" id="group_buttons">
         <label name="state"/>
         <field name="state"/>
-        <group colspan="2" col="3" id="buttons">
+        <group colspan="2" col="-1" id="buttons">
             <button string="Cancel" name="cancel" icon="tryton-cancel" />
             <button string="Confirm" name="confirm" icon="tryton-ok"/>
         </group>
diff --git a/view/move_form.xml b/view/move_form.xml
index d534815..7f77800 100644
--- a/view/move_form.xml
+++ b/view/move_form.xml
@@ -28,7 +28,7 @@ this repository contains the full copyright notices and license terms. -->
     <field name="origin" colspan="3"/>
     <label name="state"/>
     <field name="state"/>
-    <group col="20" colspan="2" id="buttons">
+    <group col="-1" 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"/>
diff --git a/view/period_form.xml b/view/period_form.xml
index b9a571d..e100385 100644
--- a/view/period_form.xml
+++ b/view/period_form.xml
@@ -8,7 +8,7 @@ this repository contains the full copyright notices and license terms. -->
     <field name="date"/>
     <label name="state"/>
     <field name="state"/>
-    <group col="2" colspan="2" id="buttons">
+    <group col="-1" colspan="2" id="buttons">
         <button name="draft" string="Draft" icon="tryton-clear"/>
         <button name="close" string="Close" icon="tryton-ok"/>
     </group>
diff --git a/view/product_tree_qty.xml b/view/product_tree_qty.xml
index 19e51bb..fad3b54 100644
--- a/view/product_tree_qty.xml
+++ b/view/product_tree_qty.xml
@@ -2,8 +2,8 @@
 <!-- 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>
-    <field name="template"/>
     <field name="code"/>
+    <field name="name"/>
     <field name="quantity"/>
     <field name="forecast_quantity"/>
     <field name="default_uom"/>
diff --git a/view/shipment_in_form.xml b/view/shipment_in_form.xml
index 1740d0a..789074d 100644
--- a/view/shipment_in_form.xml
+++ b/view/shipment_in_form.xml
@@ -25,11 +25,17 @@ this repository contains the full copyright notices and license terms. -->
         <page string="Inventory Moves" id="inventory_moves">
             <field name="inventory_moves" colspan="4"/>
         </page>
+        <page string="Other Info" id="other">
+            <label name="received_by"/>
+            <field name="received_by"/>
+            <label name="done_by"/>
+            <field name="done_by"/>
+        </page>
     </notebook>
     <group col="4" colspan="6" id="state_buttons">
         <label name="state"/>
         <field name="state"/>
-        <group col="5" colspan="2" id="buttons">
+        <group col="-1" colspan="2" id="buttons">
             <button string="Cancel" name="cancel" icon="tryton-cancel"/>
             <button string="Receive" name="receive" icon="tryton-go-next"/>
             <button string="Done" name="done" icon="tryton-ok"/>
diff --git a/view/shipment_in_return_form.xml b/view/shipment_in_return_form.xml
index d401a0a..f7dc7ea 100644
--- a/view/shipment_in_return_form.xml
+++ b/view/shipment_in_return_form.xml
@@ -18,10 +18,20 @@ this repository contains the full copyright notices and license terms. -->
     <field name="planned_date"/>
     <label name="effective_date"/>
     <field name="effective_date"/>
-    <field name="moves"  colspan="4"/>
+    <notebook colspan="4">
+        <page name="moves">
+            <field name="moves"  colspan="4"/>
+        </page>
+        <page string="Other Info" id="other">
+            <label name="assigned_by"/>
+            <field name="assigned_by"/>
+            <label name="done_by"/>
+            <field name="done_by"/>
+        </page>
+    </notebook>
     <label name="state"/>
     <field name="state"/>
-    <group col="5" colspan="2" id="buttons">
+    <group col="-1" colspan="2" id="buttons">
         <button string="Cancel" name="cancel" icon="tryton-cancel"/>
         <button string="Draft" name="draft" icon="tryton-go-previous"/>
         <button string="Wait" name="wait"/>
diff --git a/view/shipment_internal_form.xml b/view/shipment_internal_form.xml
index aae0d6f..f8f7998 100644
--- a/view/shipment_internal_form.xml
+++ b/view/shipment_internal_form.xml
@@ -30,10 +30,18 @@ this repository contains the full copyright notices and license terms. -->
         <page name="incoming_moves">
             <field name="incoming_moves" colspan="4"/>
         </page>
+        <page string="Other Info" id="other">
+            <label name="assigned_by"/>
+            <field name="assigned_by"/>
+            <label name="shipped_by"/>
+            <field name="shipped_by"/>
+            <label name="done_by"/>
+            <field name="done_by"/>
+        </page>
     </notebook>
     <label name="state"/>
     <field name="state"/>
-    <group col="6" colspan="2" id="buttons">
+    <group col="-1" colspan="2" id="buttons">
         <button string="Cancel" name="cancel" icon="tryton-cancel"/>
         <button string="Draft" name="draft"/>
         <button string="Wait" name="wait"/>
diff --git a/view/shipment_out_form.xml b/view/shipment_out_form.xml
index 7ca08c2..1c94b7b 100644
--- a/view/shipment_out_form.xml
+++ b/view/shipment_out_form.xml
@@ -19,17 +19,25 @@ this repository contains the full copyright notices and license terms. -->
     <label name="warehouse"/>
     <field name="warehouse"/>
     <notebook colspan="4">
-        <page string="Inventory Moves" id="inventory_moves">
+        <page name="inventory_moves">
             <field name="inventory_moves" colspan="4"/>
         </page>
         <page string="Outgoing Moves" id="outgoing_moves">
             <field name="outgoing_moves" colspan="4"/>
         </page>
+        <page string="Other Info" id="other">
+            <label name="assigned_by"/>
+            <field name="assigned_by"/>
+            <label name="packed_by"/>
+            <field name="packed_by"/>
+            <label name="done_by"/>
+            <field name="done_by"/>
+        </page>
     </notebook>
     <group col="4" colspan="4" id="state_buttons">
         <label name="state"/>
         <field name="state"/>
-        <group col="6" colspan="2" id="buttons">
+        <group col="-1" colspan="2" id="buttons">
             <button string="Cancel" name="cancel" icon="tryton-cancel"/>
             <button string="Draft" name="draft"/>
             <button string="Wait" name="wait"/>
@@ -39,4 +47,6 @@ this repository contains the full copyright notices and license terms. -->
             <button string="Done" name="done" icon="tryton-ok"/>
         </group>
     </group>
+    <field name="warehouse_storage" invisible="1" colspan="4"/>
+    <field name="warehouse_output" invisible="1" colspan="4"/>
 </form>
diff --git a/view/shipment_out_return_form.xml b/view/shipment_out_return_form.xml
index d84640e..4fec98d 100644
--- a/view/shipment_out_return_form.xml
+++ b/view/shipment_out_return_form.xml
@@ -25,11 +25,17 @@ this repository contains the full copyright notices and license terms. -->
         <page string="Inventory Moves" id="inventory_moves">
             <field name="inventory_moves" colspan="4"/>
         </page>
+        <page string="Other Info" id="other">
+            <label name="received_by"/>
+            <field name="received_by"/>
+            <label name="done_by"/>
+            <field name="done_by"/>
+        </page>
     </notebook>
     <group col="4" colspan="6" id="state_buttons">
         <label name="state"/>
         <field name="state"/>
-        <group col="5" colspan="2" id="buttons">
+        <group col="-1" colspan="2" id="buttons">
             <button string="Cancel" name="cancel" icon="tryton-cancel"/>
             <button string="Draft" name="draft" icon="tryton-clear"/>
             <button string="Received" name="receive" icon="tryton-go-next"/>
-- 
tryton-modules-stock



More information about the tryton-debian-vcs mailing list