pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP] product: harmonize price_compute behavior

Browse Source 
* consistent choice of company for currency, currency rates and prices
* support currency conversion date through params
This commit is contained in:
Victor Feyens
2021-12-23 15:30:22 +01:00
parent 2d98ec42e6
commit a28ba8dbf3
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/product/models/product.py
+7 -3
View File
@@ -663,7 +663,7 @@ class ProductProduct(models.Model):
res |= seller
return res.sorted('price')[:1]
def price_compute(self, price_type, uom=False, currency=False, company=None):
def price_compute(self, price_type, uom=False, currency=False, company=None, date=False):
# TDE FIXME: delegate to template or not ? fields are reencoded here ...
# compatibility about context keys used a bit everywhere in the code
if not uom and self._context.get('uom'):
@@ -676,7 +676,11 @@ class ProductProduct(models.Model):
# standard_price field can only be seen by users in base.group_user
# Thus, in order to compute the sale price from the cost for users not in this group
# We fetch the standard price as the superuser
products = self.with_company(company or self.env.company).sudo()
products = self.with_company(company).sudo()
if not company:
company = self.env.company
date = date or fields.Date.today()
prices = dict.fromkeys(self.ids, 0.0)
for product in products:
@@ -696,7 +700,7 @@ class ProductProduct(models.Model):
# This is right cause a field cannot be in more than one currency
if currency:
prices[product.id] = product.currency_id._convert(
prices[product.id], currency, product.company_id, fields.Date.today())
prices[product.id], currency, company, date)
return prices
addons/product/models/product_template.py
+2 -2
View File
@@ -609,7 +609,7 @@ class ProductTemplate(models.Model):
},
}
def price_compute(self, price_type, uom=False, currency=False, company=None):
def price_compute(self, price_type, uom=False, currency=False, company=None, date=False):
# TDE FIXME: delegate to template or not ? fields are reencoded here ...
# compatibility about context keys used a bit everywhere in the code
if not uom and self._context.get('uom'):
@@ -625,7 +625,7 @@ class ProductTemplate(models.Model):
templates = self.with_company(company).sudo()
if not company:
company = self.env.company
date = self.env.context.get('date') or fields.Date.today()
date = date or fields.Date.today()
prices = dict.fromkeys(self.ids, 0.0)
for template in templates: