diff --git a/__init__.py b/__init__.py
index 7f277d2ea6..3fd8490ef7 100644
--- a/__init__.py
+++ b/__init__.py
@@ -9,5 +9,6 @@ from .sale import *
 def register():
     Pool.register(
         Party,
+        PartySaleShipmentGroupingMethod,
         Sale,
         module='sale_shipment_grouping', type_='model')
diff --git a/party.py b/party.py
index 79aa4eebfb..eb90936806 100644
--- a/party.py
+++ b/party.py
@@ -1,18 +1,56 @@
 # 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 import backend
+from trytond.model import ModelSQL, ValueMixin, fields
+from trytond.pool import PoolMeta, Pool
+from trytond.tools.multivalue import migrate_property
 
-from trytond.model import fields
-from trytond.pool import PoolMeta
-
-__all__ = ['Party']
+__all__ = ['Party', 'PartySaleShipmentGroupingMethod']
 
 
 class Party:
     __metaclass__ = PoolMeta
     __name__ = 'party.party'
 
-    sale_shipment_grouping_method = fields.Property(fields.Selection([
+    sale_shipment_grouping_method = fields.MultiValue(fields.Selection([
                 (None, 'None'),
                 ('standard', 'Standard'),
                 ],
             'Sale Shipment Grouping Method'))
+    sale_shipment_grouping_methods = fields.One2Many(
+        'party.party.sale_shipment_grouping_method', 'party',
+        "Sale Shipment Grouping Methods")
+
+
+class PartySaleShipmentGroupingMethod(ModelSQL, ValueMixin):
+    "Party Sale Shipment Grouping Method"
+    __name__ = 'party.party.sale_shipment_grouping_method'
+    party = fields.Many2One(
+        'party.party', "Party", ondelete='CASCADE', select=True)
+    sale_shipment_grouping_method = fields.Selection(
+        'get_sale_shipment_grouping_methods', "Sale Shipment Grouping Method")
+
+    @classmethod
+    def __register__(cls, module_name):
+        TableHandler = backend.get('TableHandler')
+        exist = TableHandler.table_exist(cls._table)
+
+        super(PartySaleShipmentGroupingMethod, cls).__register__(module_name)
+
+        if not exist:
+            cls._migrate_property([], [], [])
+
+    @classmethod
+    def _migrate_property(cls, field_names, value_names, fields):
+        field_names.append('sale_shipment_grouping_method')
+        value_names.append('sale_shipment_grouping_method')
+        migrate_property(
+            'party.party', field_names, cls, value_names,
+            parent='party', fields=fields)
+
+    @classmethod
+    def get_sale_shipment_grouping_methods(cls):
+        pool = Pool()
+        Party = pool.get('party.party')
+        field_name = 'sale_shipment_grouping_method'
+        return Party.fields_get([field_name])[field_name]['selection']