From 657a8ce62c279eb1776c4e9102bb6697f4615d8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sat, 14 Jan 2023 17:09:52 +0100 Subject: [PATCH] Group only with the fields existing on the shipment Closes #11998 (grafted from c383c81b587c1006ceb76e71196ff3d29a2c3f53) --HG-- branch : 6.0 --- modules/sale_shipment_grouping/sale.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/sale_shipment_grouping/sale.py b/modules/sale_shipment_grouping/sale.py index a21243f9a3..4e9ac51b96 100644 --- a/modules/sale_shipment_grouping/sale.py +++ b/modules/sale_shipment_grouping/sale.py @@ -31,9 +31,10 @@ class Sale(metaclass=PoolMeta): ('state', 'in', ['draft', 'waiting']), ] shipment_domain += self._get_grouped_shipment_planned_date(shipment) - defaults = Shipment.default_get(self._shipment_grouping_fields, - with_rec_name=False) - for field in self._shipment_grouping_fields: + fields = [ + f for f in self._shipment_grouping_fields if f in Shipment._fields] + defaults = Shipment.default_get(fields, with_rec_name=False) + for field in fields: shipment_domain.append((field, '=', getattr(shipment, field, defaults.get(field)))) return shipment_domain