diff --git a/addons/product/models/product.py b/addons/product/models/product.py index ecf48deeb33..dba77cc1937 100644 --- a/addons/product/models/product.py +++ b/addons/product/models/product.py @@ -516,7 +516,10 @@ class ProductProduct(models.Model): if date is None: date = fields.Date.today() res = self.env['product.supplierinfo'] - for seller in self.seller_ids: + sellers = self.seller_ids + if self.env.context.get('force_company'): + sellers = sellers.filtered(lambda s: not s.company_id or s.company_id.id == self.env.context['force_company']) + for seller in sellers: # Set quantity in UoM of seller quantity_uom_seller = quantity if quantity_uom_seller and uom_id and uom_id != seller.product_uom: diff --git a/addons/purchase/models/purchase.py b/addons/purchase/models/purchase.py index 8f80e112b32..efab0354cbf 100644 --- a/addons/purchase/models/purchase.py +++ b/addons/purchase/models/purchase.py @@ -958,7 +958,11 @@ class ProcurementOrder(models.Model): """Return the datetime value to use as Order Date (``date_order``) for the Purchase Order created to satisfy the given procurement. """ self.ensure_one() - seller_delay = int(self.product_id._select_seller(quantity=self.product_qty, uom_id=self.product_uom).delay) + seller_delay = int( + self.product_id.with_context(force_company=self.company_id.id)._select_seller( + quantity=self.product_qty, uom_id=self.product_uom + ).delay + ) return schedule_date - relativedelta(days=seller_delay) @api.multi @@ -966,7 +970,7 @@ class ProcurementOrder(models.Model): self.ensure_one() procurement_uom_po_qty = self.product_uom._compute_quantity(self.product_qty, self.product_id.uom_po_id) - seller = self.product_id._select_seller( + seller = self.product_id.with_context(force_company=self.company_id.id)._select_seller( partner_id=supplier.name, quantity=procurement_uom_po_qty, date=po.date_order and po.date_order[:10],