From 1f4d5959e926711d922e1507fdcdfa8e5bf496bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 26 Jun 2024 13:37:01 +0200 Subject: [PATCH] Do not compute carrier price without a company in the context Closes #13364 (grafted from b500a599f8f4d01024a57b6751c6c66cf476e6ef) --HG-- branch : 7.0 --- modules/carrier/carrier.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/carrier/carrier.py b/modules/carrier/carrier.py index daf8714912..8436a65e61 100644 --- a/modules/carrier/carrier.py +++ b/modules/carrier/carrier.py @@ -46,7 +46,8 @@ class Carrier(DeactivableMixin, ModelSQL, ModelView): 'Compute carrier sale price with currency' pool = Pool() Company = pool.get('company.company') - if self.carrier_cost_method == 'product': + if (self.carrier_cost_method == 'product' + and self.carrier_product._context.get('company') is not None): list_price = self.carrier_product.list_price_used if list_price is not None: company = Company(self.carrier_product._context['company']) @@ -57,7 +58,8 @@ class Carrier(DeactivableMixin, ModelSQL, ModelView): 'Compute carrier purchase price with currency' pool = Pool() Company = pool.get('company.company') - if self.carrier_cost_method == 'product': + if (self.carrier_cost_method == 'product' + and self.carrier_product._context.get('company') is not None): cost_price = self.carrier_product.cost_price if cost_price is not None: company = Company(self.carrier_product._context['company'])