diff --git a/stock.py b/stock.py
index 941453871a..cc3fb77caa 100644
--- a/stock.py
+++ b/stock.py
@@ -88,7 +88,7 @@ class ConfigurationSequence(metaclass=PoolMeta):
 class ShipmentDrop(Workflow, ModelSQL, ModelView):
     "Drop Shipment"
     __name__ = 'stock.shipment.drop'
-
+    _rec_name = 'number'
     effective_date = fields.Date(
         "Effective Date",
         states={
@@ -168,7 +168,9 @@ class ShipmentDrop(Workflow, ModelSQL, ModelView):
             'readonly': Eval('state') != 'shipped',
             },
         depends=['state', 'customer'])
-    code = fields.Char('Code', select=1, readonly=True)
+    number = fields.Char(
+        "Number", select=True, readonly=True,
+        help="The main identifier for the shipment.")
     state = fields.Selection([
             ('draft', 'Draft'),
             ('waiting', 'Waiting'),
@@ -193,6 +195,11 @@ class ShipmentDrop(Workflow, ModelSQL, ModelView):
         location = Location.__table__()
         cursor = Transaction().connection.cursor()
 
+        table_h = cls.__table_handler__(module_name)
+        # Migration from 5.8: rename code into number
+        if table_h.column_exist('code'):
+            table_h.column_rename('code', 'number')
+
         super(ShipmentDrop, cls).__register__(module_name)
 
         # Migration from 3.6
@@ -253,6 +260,7 @@ class ShipmentDrop(Workflow, ModelSQL, ModelView):
     @classmethod
     def __setup__(cls):
         super(ShipmentDrop, cls).__setup__()
+        cls._order[0] = ('id', 'DESC')
         cls._transitions |= set((
                 ('draft', 'waiting'),
                 ('waiting', 'shipped'),
@@ -343,7 +351,7 @@ class ShipmentDrop(Workflow, ModelSQL, ModelView):
         vlist = [x.copy() for x in vlist]
         config = Config(1)
         for values in vlist:
-            values['code'] = Sequence.get_id(config.shipment_drop_sequence)
+            values['number'] = Sequence.get_id(config.shipment_drop_sequence)
         shipments = super(ShipmentDrop, cls).create(vlist)
         cls._set_move_planned_date(shipments)
         return shipments
diff --git a/view/shipment_drop_form.xml b/view/shipment_drop_form.xml
index 64bfe398cb..9368539687 100644
--- a/view/shipment_drop_form.xml
+++ b/view/shipment_drop_form.xml
@@ -4,8 +4,8 @@ this repository contains the full copyright notices and license terms. -->
 <form 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_drop_tree.xml b/view/shipment_drop_tree.xml
index 3e25c2a6d4..8f3658f1fa 100644
--- a/view/shipment_drop_tree.xml
+++ b/view/shipment_drop_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>
-    <field name="code" expand="1"/>
+    <field name="number" expand="1"/>
     <field name="reference" expand="1"/>
     <field name="planned_date"/>
     <field name="effective_date"/>