projects
/
odoo
/
odoo.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c0307f3
)
fix
author
Fabien Pinckaers
<fp@openerp.com>
Wed, 2 Jul 2014 18:08:51 +0000
(20:08 +0200)
committer
Fabien Pinckaers
<fp@openerp.com>
Wed, 2 Jul 2014 18:08:51 +0000
(20:08 +0200)
addons/website_sale_options/controllers/main.py
patch
|
blob
|
history
diff --git
a/addons/website_sale_options/controllers/main.py
b/addons/website_sale_options/controllers/main.py
index
9f4989d
..
f2b53d8
100644
(file)
--- a/
addons/website_sale_options/controllers/main.py
+++ b/
addons/website_sale_options/controllers/main.py
@@
-53,12
+53,18
@@
class website_sale_options(website_sale):
@http.route(['/shop/modal'], type='json', auth="public", methods=['POST'], website=True)
def modal(self, product_id, **kw):
cr, uid, context, pool = request.cr, request.uid, request.context, request.registry
@http.route(['/shop/modal'], type='json', auth="public", methods=['POST'], website=True)
def modal(self, product_id, **kw):
cr, uid, context, pool = request.cr, request.uid, request.context, request.registry
+ pricelist = self.get_pricelist()
if not context.get('pricelist'):
if not context.get('pricelist'):
- context['pricelist'] = int(self.get_pricelist())
+ context['pricelist'] = int(pricelist)
+
+ from_currency = pool.get('product.price.type')._get_field_currency(cr, uid, 'list_price', context)
+ to_currency = pricelist.currency_id
+ compute_currency = lambda price: pool['res.currency']._compute(cr, uid, from_currency, to_currency, price, context=context)
product = pool['product.product'].browse(cr, uid, int(product_id), context=context)
return request.website._render("website_sale_options.modal", {
'product': product,
product = pool['product.product'].browse(cr, uid, int(product_id), context=context)
return request.website._render("website_sale_options.modal", {
'product': product,
+ 'compute_currency': compute_currency,
'get_attribute_value_ids': self.get_attribute_value_ids,
'get_attribute_value_ids': self.get_attribute_value_ids,
- })
\ No newline at end of file
+ })