mirror of
https://github.com/NaN-tic/trytond-patches.git
synced 2023-12-14 06:03:03 +01:00
parent
9fc3649408
commit
65931c8ffb
18
issue11998.diff
Normal file
18
issue11998.diff
Normal file
|
@ -0,0 +1,18 @@
|
|||
diff --git a/tryton/modules/sale_shipment_grouping/sale.py b/tryton/modules/sale_shipment_grouping/sale.py
|
||||
index 4b78b6be9d..5f50fefefc 100644
|
||||
--- a/tryton/modules/sale_shipment_grouping/sale.py
|
||||
+++ b/tryton/modules/sale_shipment_grouping/sale.py
|
||||
@@ -37,9 +37,10 @@ class Sale(metaclass=PoolMeta):
|
||||
('state', 'in', self._shipment_grouping_state),
|
||||
]
|
||||
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
|
2
series
2
series
|
@ -39,3 +39,5 @@ issue11582.diff # [trytond] Add authentication services
|
|||
issue11582-sao.diff # [sao] Add authentication services
|
||||
|
||||
issue11989.diff # [purchase_request] Clear requests when copying purchase lines
|
||||
|
||||
issue11998.diff # [sale_shipment_grouping] KeyError when processing a sale with modules sale_shipment_cost and sale_shipment_grouping installed.
|
||||
|
|
Loading…
Reference in a new issue