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

Revert "[FIX] website_sale: Avoid compute tax for every company"

Browse Source 
This reverts commit 04cddc447b.

Public user can't read taxes (map_tax() only play with ids)
This commit is contained in:
Christophe Simonis
2017-08-23 18:07:38 +02:00
parent 857778fa94
commit 420e433fa3
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/website_sale/models/product.py
+2 -4
View File
@@ -190,9 +190,7 @@ class Product(models.Model):
def _website_price(self):
qty = self._context.get('quantity', 1.0)
partner = self.env.user.partner_id
current_website = self.env['website'].get_current_website()
pricelist = current_website.get_current_pricelist()
company_id = current_website.company_id
pricelist = self.env['website'].get_current_website().get_current_pricelist()
context = dict(self._context, pricelist=pricelist.id, partner=partner)
self2 = self.with_context(context) if self._context != context else self
@@ -200,7 +198,7 @@ class Product(models.Model):
ret = self.env.user.has_group('sale.group_show_price_subtotal') and 'total_excluded' or 'total_included'
for p, p2 in zip(self, self2):
taxes = partner.property_account_position_id.map_tax(p.taxes_id.filtered(lambda x: x.company_id == company_id))
taxes = partner.property_account_position_id.map_tax(p.taxes_id)
p.website_price = taxes.compute_all(p2.price, pricelist.currency_id, quantity=qty, product=p2, partner=partner)[ret]
p.website_public_price = taxes.compute_all(p2.lst_price, quantity=qty, product=p2, partner=partner)[ret]