audrius/suite
1
0
Fork 1
mirror of https://gitlab.com/hibou-io/hibou-odoo/suite.git synced 2025-01-20 12:37:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

[FIX] delivery_fedex_hibou,delivery_hibou,delivery_ups_hibou,sale_planner: choose delivery packaging, warehouse specific fedex for 13

Browse Source
This commit is contained in:
Jared Kipe
2022-02-08 12:32:45 -08:00
parent ca6ec69e2b
commit 83c3006676
6 changed files with 287 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sale_planner/wizard/order_planner.py
View File

@@ -28,7 +28,11 @@ class FakeCollection():
yield v
def filtered(self, f):
return filter(f, self.vals)
return self.__class__([v for v in self.vals if f(v)])
def mapped(self, s):
# note this only maps to one level and doesn't really support recordset
return [v[s] for v in self.vals]
def sudo(self, *args, **kwargs):
return self
@@ -699,7 +703,7 @@ class SaleOrderMakePlan(models.TransientModel):
if has_error:
continue
order_fake.warehouse_id = warehouses.filtered(lambda wh: wh.id == wh_id)
order_fake.order_line = FakeCollection(filter(lambda line: line.product_id.id in wh_vals['product_ids'], original_order_fake_order_line))
order_fake.order_line = FakeCollection(list(filter(lambda line: line.product_id.id in wh_vals['product_ids'], original_order_fake_order_line)))
wh_carrier_options = self._generate_shipping_carrier_option(wh_vals, order_fake, carrier)
if not wh_carrier_options:
has_error = True