diff --git a/CHANGELOG b/CHANGELOG
index a433a30c61..037b361084 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,4 @@
+* Rename Shipments code into number
 * Add number to inventories
 * Add supplier and delivery address on supplier return shipment
 * Add Python3 support
diff --git a/customer_return_restocking_list.odt b/customer_return_restocking_list.odt
index 73030e1a40..3de0c68bbe 100644
Binary files a/customer_return_restocking_list.odt and b/customer_return_restocking_list.odt differ
diff --git a/delivery_note.odt b/delivery_note.odt
index d57afcbd4f..d8d30f5bee 100644
Binary files a/delivery_note.odt and b/delivery_note.odt differ
diff --git a/internal_shipment.odt b/internal_shipment.odt
index 16698c4b51..4b02a896b5 100644
Binary files a/internal_shipment.odt and b/internal_shipment.odt differ
diff --git a/picking_list.odt b/picking_list.odt
index 9daa4dbcee..a48d3c0196 100644
Binary files a/picking_list.odt and b/picking_list.odt differ
diff --git a/shipment.py b/shipment.py
index d014b37d19..b9a4d6a87e 100644
--- a/shipment.py
+++ b/shipment.py
@@ -37,7 +37,7 @@ STATES = {
 class ShipmentIn(Workflow, ModelSQL, ModelView):
     "Supplier Shipment"
     __name__ = 'stock.shipment.in'
-    _rec_name = 'code'
+    _rec_name = 'number'
     effective_date = fields.Date('Effective Date',
         states={
             'readonly': Eval('state').in_(['cancel', 'done']),
@@ -124,7 +124,7 @@ class ShipmentIn(Workflow, ModelSQL, ModelView):
         domain=[('company', '=', Eval('company'))], readonly=True,
         depends=['company'])
     origins = fields.Function(fields.Char('Origins'), 'get_origins')
-    code = fields.Char("Code", size=None, select=True, readonly=True)
+    number = fields.Char('Numer', size=None, select=True, readonly=True)
     state = fields.Selection([
         ('draft', 'Draft'),
         ('done', 'Done'),
@@ -218,6 +218,10 @@ class ShipmentIn(Workflow, ModelSQL, ModelView):
         # Migration from 2.0:
         created_company = table.column_exist('company')
 
+        # Migration from 3.8: rename code into number
+        if table.column_exist('code'):
+            table.column_rename('code', 'number')
+
         super(ShipmentIn, cls).__register__(module_name)
 
         # Migration from 2.0:
@@ -373,7 +377,8 @@ class ShipmentIn(Workflow, ModelSQL, ModelView):
         vlist = [x.copy() for x in vlist]
         config = Config(1)
         for values in vlist:
-            values['code'] = Sequence.get_id(config.shipment_in_sequence)
+            if values.get('number') is None:
+                values['number'] = Sequence.get_id(config.shipment_in_sequence)
         shipments = super(ShipmentIn, cls).create(vlist)
         cls._set_move_planned_date(shipments)
         return shipments
@@ -478,7 +483,7 @@ class ShipmentIn(Workflow, ModelSQL, ModelView):
 class ShipmentInReturn(Workflow, ModelSQL, ModelView):
     "Supplier Return Shipment"
     __name__ = 'stock.shipment.in.return'
-    _rec_name = 'code'
+    _rec_name = 'number'
     effective_date = fields.Date('Effective Date',
         states={
             'readonly': Eval('state').in_(['cancel', 'done']),
@@ -497,7 +502,7 @@ class ShipmentInReturn(Workflow, ModelSQL, ModelView):
                 Eval('context', {}).get('company', -1)),
             ],
         depends=['state'])
-    code = fields.Char("Code", size=None, select=True, readonly=True)
+    number = fields.Char('Number', size=None, select=True, readonly=True)
     reference = fields.Char("Reference", size=None, select=True,
         states={
             'readonly': Eval('state') != 'draft',
@@ -611,6 +616,10 @@ class ShipmentInReturn(Workflow, ModelSQL, ModelView):
         # Migration from 2.0:
         created_company = table.column_exist('company')
 
+        # Migration from 3.8: rename code into number
+        if table.column_exist('code'):
+            table.column_rename('code', 'number')
+
         super(ShipmentInReturn, cls).__register__(module_name)
 
         # Migration from 2.0:
@@ -686,8 +695,9 @@ class ShipmentInReturn(Workflow, ModelSQL, ModelView):
         vlist = [x.copy() for x in vlist]
         config = Config(1)
         for values in vlist:
-            values['code'] = Sequence.get_id(
-                config.shipment_in_return_sequence.id)
+            if values.get('number') is None:
+                values['number'] = Sequence.get_id(
+                    config.shipment_in_return_sequence.id)
         shipments = super(ShipmentInReturn, cls).create(vlist)
         cls._set_move_planned_date(shipments)
         return shipments
@@ -777,7 +787,7 @@ class ShipmentInReturn(Workflow, ModelSQL, ModelView):
 class ShipmentOut(Workflow, ModelSQL, ModelView):
     "Customer Shipment"
     __name__ = 'stock.shipment.out'
-    _rec_name = 'code'
+    _rec_name = 'number'
     effective_date = fields.Date('Effective Date',
         states={
             'readonly': Eval('state').in_(['cancel', 'done']),
@@ -857,7 +867,7 @@ class ShipmentOut(Workflow, ModelSQL, ModelView):
         domain=[('company', '=', Eval('company'))], depends=['company'],
         readonly=True)
     origins = fields.Function(fields.Char('Origins'), 'get_origins')
-    code = fields.Char("Code", size=None, select=True, readonly=True)
+    number = fields.Char('Number', size=None, select=True, readonly=True)
     state = fields.Selection([
         ('draft', 'Draft'),
         ('done', 'Done'),
@@ -942,6 +952,10 @@ class ShipmentOut(Workflow, ModelSQL, ModelView):
         # Migration from 2.0:
         created_company = table.column_exist('company')
 
+        # Migration from 3.8: rename code into number
+        if table.column_exist('code'):
+            table.column_rename('code', 'number')
+
         super(ShipmentOut, cls).__register__(module_name)
 
         # Migration from 2.0:
@@ -1267,7 +1281,9 @@ class ShipmentOut(Workflow, ModelSQL, ModelView):
         vlist = [x.copy() for x in vlist]
         config = Config(1)
         for values in vlist:
-            values['code'] = Sequence.get_id(config.shipment_out_sequence.id)
+            if values.get('number') is None:
+                values['number'] = Sequence.get_id(
+                    config.shipment_out_sequence.id)
         shipments = super(ShipmentOut, cls).create(vlist)
         cls._set_move_planned_date(shipments)
         return shipments
@@ -1337,7 +1353,7 @@ class ShipmentOut(Workflow, ModelSQL, ModelView):
 class ShipmentOutReturn(Workflow, ModelSQL, ModelView):
     "Customer Return Shipment"
     __name__ = 'stock.shipment.out.return'
-    _rec_name = 'code'
+    _rec_name = 'number'
     effective_date = fields.Date('Effective Date',
         states={
             'readonly': Eval('state').in_(['cancel', 'done']),
@@ -1416,7 +1432,7 @@ class ShipmentOutReturn(Workflow, ModelSQL, ModelView):
         domain=[('company', '=', Eval('company'))], depends=['company'],
         readonly=True)
     origins = fields.Function(fields.Char('Origins'), 'get_origins')
-    code = fields.Char("Code", size=None, select=True, readonly=True)
+    number = fields.Char('Number', size=None, select=True, readonly=True)
     state = fields.Selection([
         ('draft', 'Draft'),
         ('done', 'Done'),
@@ -1475,6 +1491,10 @@ class ShipmentOutReturn(Workflow, ModelSQL, ModelView):
         # Migration from 2.0:
         created_company = table.column_exist('company')
 
+        # Migration from 3.8: rename code into number
+        if table.column_exist('code'):
+            table.column_rename('code', 'number')
+
         super(ShipmentOutReturn, cls).__register__(module_name)
 
         # Migration from 2.0:
@@ -1620,8 +1640,9 @@ class ShipmentOutReturn(Workflow, ModelSQL, ModelView):
         vlist = [x.copy() for x in vlist]
         config = Config(1)
         for values in vlist:
-            values['code'] = Sequence.get_id(
-                    config.shipment_out_return_sequence.id)
+            if values.get('number') is None:
+                values['number'] = Sequence.get_id(
+                        config.shipment_out_return_sequence.id)
         shipments = super(ShipmentOutReturn, cls).create(vlist)
         cls._set_move_planned_date(shipments)
         return shipments
@@ -1774,7 +1795,7 @@ class AssignShipmentOut(Wizard):
 class ShipmentInternal(Workflow, ModelSQL, ModelView):
     "Internal Shipment"
     __name__ = 'stock.shipment.internal'
-    _rec_name = 'code'
+    _rec_name = 'number'
     effective_date = fields.Date('Effective Date',
         states={
             'readonly': Eval('state').in_(['cancel', 'done']),
@@ -1793,7 +1814,7 @@ class ShipmentInternal(Workflow, ModelSQL, ModelView):
                 Eval('context', {}).get('company', -1)),
             ],
         depends=['state'])
-    code = fields.Char("Code", size=None, select=True, readonly=True)
+    number = fields.Char('Number', size=None, select=True, readonly=True)
     reference = fields.Char("Reference", size=None, select=True,
         states={
             'readonly': Eval('state') != 'draft',
@@ -1908,6 +1929,10 @@ class ShipmentInternal(Workflow, ModelSQL, ModelView):
         # Migration from 2.0:
         created_company = table.column_exist('company')
 
+        # Migration from 3.8:
+        if table.column_exist('code'):
+            table.column_rename('code', 'number')
+
         super(ShipmentInternal, cls).__register__(module_name)
 
         # Migration from 2.0:
@@ -1953,8 +1978,9 @@ class ShipmentInternal(Workflow, ModelSQL, ModelView):
         vlist = [x.copy() for x in vlist]
         config = Config(1)
         for values in vlist:
-            values['code'] = Sequence.get_id(
-                    config.shipment_internal_sequence.id)
+            if values.get('number') is None:
+                values['number'] = Sequence.get_id(
+                        config.shipment_internal_sequence.id)
         return super(ShipmentInternal, cls).create(vlist)
 
     @classmethod
diff --git a/supplier_restocking_list.odt b/supplier_restocking_list.odt
index c672ddeea4..df8175f0f9 100644
Binary files a/supplier_restocking_list.odt and b/supplier_restocking_list.odt differ
diff --git a/view/shipment_in_form.xml b/view/shipment_in_form.xml
index e9b657731d..edab701ba3 100644
--- a/view/shipment_in_form.xml
+++ b/view/shipment_in_form.xml
@@ -4,8 +4,8 @@ this repository contains the full copyright notices and license terms. -->
 <form string="Supplier Shipment" col="4" cursor="supplier">
     <label name="reference"/>
     <field name="reference"/>
-    <label name="code"/>
-    <field name="code"/>
+    <label name="number"/>
+    <field name="number"/>
     <label name="supplier"/>
     <field name="supplier"/>
     <label name="contact_address"/>
diff --git a/view/shipment_in_return_form.xml b/view/shipment_in_return_form.xml
index 0f929fd854..c408cce6da 100644
--- a/view/shipment_in_return_form.xml
+++ b/view/shipment_in_return_form.xml
@@ -4,8 +4,8 @@ this repository contains the full copyright notices and license terms. -->
 <form string="Supplier Return Shipment" col="4" cursor="supplier">
     <label name="reference"/>
     <field name="reference"/>
-    <label name="code"/>
-    <field name="code"/>
+    <label name="number"/>
+    <field name="number"/>
     <label name="supplier"/>
     <field name="supplier"/>
     <label name="delivery_address"/>
diff --git a/view/shipment_in_return_tree.xml b/view/shipment_in_return_tree.xml
index 189563dc9f..7c707bd260 100644
--- a/view/shipment_in_return_tree.xml
+++ b/view/shipment_in_return_tree.xml
@@ -2,7 +2,7 @@
 <!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
 this repository contains the full copyright notices and license terms. -->
 <tree string="Supplier Return Shipments">
-    <field name="code"/>
+    <field name="number"/>
     <field name="reference"/>
     <field name="planned_date"/>
     <field name="effective_date"/>
diff --git a/view/shipment_in_tree.xml b/view/shipment_in_tree.xml
index 41d0f56c03..9f3e8097e7 100644
--- a/view/shipment_in_tree.xml
+++ b/view/shipment_in_tree.xml
@@ -2,7 +2,7 @@
 <!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
 this repository contains the full copyright notices and license terms. -->
 <tree string="Supplier Shipments">
-    <field name="code"/>
+    <field name="number"/>
     <field name="reference"/>
     <field name="planned_date"/>
     <field name="effective_date"/>
diff --git a/view/shipment_internal_form.xml b/view/shipment_internal_form.xml
index d0957319d8..1672d1584a 100644
--- a/view/shipment_internal_form.xml
+++ b/view/shipment_internal_form.xml
@@ -4,8 +4,8 @@ this repository contains the full copyright notices and license terms. -->
 <form string="Internal Shipment" col="4" cursor="from_location">
     <label name="reference"/>
     <field name="reference"/>
-    <label name="code"/>
-    <field name="code"/>
+    <label name="number"/>
+    <field name="number"/>
     <label name="from_location"/>
     <field name="from_location"/>
     <label name="to_location"/>
diff --git a/view/shipment_internal_tree.xml b/view/shipment_internal_tree.xml
index ecf5b5c132..07a277ad2b 100644
--- a/view/shipment_internal_tree.xml
+++ b/view/shipment_internal_tree.xml
@@ -2,7 +2,7 @@
 <!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
 this repository contains the full copyright notices and license terms. -->
 <tree string="Internal Shipments">
-    <field name="code"/>
+    <field name="number"/>
     <field name="reference"/>
     <field name="planned_date"/>
     <field name="effective_date"/>
diff --git a/view/shipment_out_form.xml b/view/shipment_out_form.xml
index 1d36ae4b01..6ea5c6fad4 100644
--- a/view/shipment_out_form.xml
+++ b/view/shipment_out_form.xml
@@ -4,8 +4,8 @@ this repository contains the full copyright notices and license terms. -->
 <form string="Customer Shipment" col="4" cursor="customer">
     <label name="reference"/>
     <field name="reference"/>
-    <label name="code"/>
-    <field name="code"/>
+    <label name="number"/>
+    <field name="number"/>
     <label name="customer"/>
     <field name="customer"/>
     <label name="delivery_address"/>
diff --git a/view/shipment_out_return_form.xml b/view/shipment_out_return_form.xml
index 6e4bb1fc77..43cf2142ae 100644
--- a/view/shipment_out_return_form.xml
+++ b/view/shipment_out_return_form.xml
@@ -4,8 +4,8 @@ this repository contains the full copyright notices and license terms. -->
 <form string="Customer Return Shipment" col="4" cursor="customer">
     <label name="reference"/>
     <field name="reference"/>
-    <label name="code"/>
-    <field name="code"/>
+    <label name="number"/>
+    <field name="number"/>
     <label name="customer"/>
     <field name="customer"/>
     <label name="delivery_address"/>
diff --git a/view/shipment_out_return_tree.xml b/view/shipment_out_return_tree.xml
index 6152586b48..3148cd0f2e 100644
--- a/view/shipment_out_return_tree.xml
+++ b/view/shipment_out_return_tree.xml
@@ -2,7 +2,7 @@
 <!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
 this repository contains the full copyright notices and license terms. -->
 <tree string="Customer Return Shipments">
-    <field name="code"/>
+    <field name="number"/>
     <field name="reference"/>
     <field name="state"/>
     <field name="planned_date"/>
diff --git a/view/shipment_out_tree.xml b/view/shipment_out_tree.xml
index 5783ae4849..64e5750824 100644
--- a/view/shipment_out_tree.xml
+++ b/view/shipment_out_tree.xml
@@ -2,7 +2,7 @@
 <!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
 this repository contains the full copyright notices and license terms. -->
 <tree string="Customer Shipments">
-    <field name="code"/>
+    <field name="number"/>
     <field name="reference"/>
     <field name="planned_date"/>
     <field name="effective_date"/>