diff --git a/modules/sale_invoice_grouping/sale.py b/modules/sale_invoice_grouping/sale.py
index 3bcac4054a..9d2d55de86 100644
--- a/modules/sale_invoice_grouping/sale.py
+++ b/modules/sale_invoice_grouping/sale.py
@@ -15,10 +15,9 @@ class Sale(metaclass=PoolMeta):
         party = self.invoice_party or self.party
         return party.sale_invoice_grouping_method
 
-    @property
-    def _invoice_grouping_fields(self):
-        return ('state', 'company', 'type', 'journal', 'party',
-            'invoice_address', 'currency', 'account', 'payment_term')
+    def _get_invoice_grouping_fields(self, invoice):
+        return ['state', 'company', 'type', 'journal', 'party',
+            'invoice_address', 'currency', 'account', 'payment_term']
 
     def _get_grouped_invoice_order(self):
         "Returns the order clause used to find invoice that should be grouped"
@@ -30,9 +29,9 @@ class Sale(metaclass=PoolMeta):
         invoice_domain = [
             ('lines.origin', 'like', 'sale.line,%'),
             ]
-        defaults = Invoice.default_get(self._invoice_grouping_fields,
-            with_rec_name=False)
-        for field in self._invoice_grouping_fields:
+        fields = self._get_invoice_grouping_fields(invoice)
+        defaults = Invoice.default_get(fields, with_rec_name=False)
+        for field in fields:
             invoice_domain.append(
                 (field, '=', getattr(invoice, field, defaults.get(field)))
                 )
diff --git a/modules/sale_shipment_grouping/sale.py b/modules/sale_shipment_grouping/sale.py
index 5f50fefefc..845ee55f23 100644
--- a/modules/sale_shipment_grouping/sale.py
+++ b/modules/sale_shipment_grouping/sale.py
@@ -3,7 +3,7 @@
 
 from itertools import groupby
 
-from trytond.pool import PoolMeta
+from trytond.pool import Pool, PoolMeta
 from trytond.transaction import Transaction
 
 
@@ -18,14 +18,18 @@ class Sale(metaclass=PoolMeta):
     def _shipment_grouping_state(self):
         return ['draft', 'waiting']
 
-    @property
-    def _shipment_grouping_fields(self):
-        return ('customer', 'delivery_address', 'company', 'warehouse')
+    def _get_shipment_grouping_fields(self, shipment):
+        pool = Pool()
+        ShipmentOut = pool.get('stock.shipment.out')
+        fields = ['customer', 'company', 'warehouse']
+        if isinstance(shipment, ShipmentOut):
+            fields.append('delivery_address')
+        return fields
 
     def _get_grouped_shipment_planned_date(self, shipment):
         return [('planned_date', '=', shipment.planned_date)]
 
-    def _get_grouped_shipment_order(self):
+    def _get_grouped_shipment_order(self, shipment_type):
         "Returns the order used to find shipments that should be grouped"
         return None
 
@@ -37,8 +41,7 @@ class Sale(metaclass=PoolMeta):
             ('state', 'in', self._shipment_grouping_state),
             ]
         shipment_domain += self._get_grouped_shipment_planned_date(shipment)
-        fields = [
-            f for f in self._shipment_grouping_fields if f in Shipment._fields]
+        fields = self._get_shipment_grouping_fields(shipment)
         defaults = Shipment.default_get(fields, with_rec_name=False)
         for field in fields:
             shipment_domain.append((field, '=',
@@ -55,7 +58,7 @@ class Sale(metaclass=PoolMeta):
                 shipment = self._get_shipment_sale(shipment_type, values)
             Shipment = shipment.__class__
             domain = self._get_grouped_shipment_domain(shipment)
-            order = self._get_grouped_shipment_order()
+            order = self._get_grouped_shipment_order(shipment_type)
             grouped_shipments = Shipment.search(domain, order=order, limit=1)
             if grouped_shipments:
                 shipment, = grouped_shipments