From 1ce0b70a02294eb58dbe7c0ff1d7048489585e7a Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Wed, 2 Jul 2014 19:03:10 +0200
Subject: [PATCH] Speed Improvements

---
 addons/portal/security/ir.model.access.csv       | 3 ++-
 addons/website/models/website.py                 | 3 ++-
 addons/website_sale/controllers/main.py          | 9 ++++++++-
 openerp/addons/base/security/ir.model.access.csv | 2 +-
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/addons/portal/security/ir.model.access.csv b/addons/portal/security/ir.model.access.csv
index 1ec8d4d0be2..8855b3bf4a5 100644
--- a/addons/portal/security/ir.model.access.csv
+++ b/addons/portal/security/ir.model.access.csv
@@ -3,4 +3,5 @@ access_mail_message_portal,mail.message.portal,mail.model_mail_message,base.grou
 access_mail_mail_portal,mail.mail.portal,mail.model_mail_mail,base.group_portal,1,1,1,0
 access_mail_notification_portal,mail.notification.portal,mail.model_mail_notification,base.group_portal,1,1,1,0
 access_mail_followers_portal,mail.followers.portal,mail.model_mail_followers,base.group_portal,1,1,0,0
-access_ir_attachment_group_portal,ir.attachment group_portal,base.model_ir_attachment,base.group_portal,1,0,1,0
\ No newline at end of file
+access_ir_attachment_group_portal,ir.attachment group_portal,base.model_ir_attachment,base.group_portal,1,0,1,0
+access_ir_ui_menu_group_portal","ir_ui_menu group_portal","base.model_ir_ui_menu",base.group_portal,1,0,0,0
diff --git a/addons/website/models/website.py b/addons/website/models/website.py
index afe05d3817d..f1c2aa283ae 100644
--- a/addons/website/models/website.py
+++ b/addons/website/models/website.py
@@ -244,7 +244,8 @@ class website(osv.osv):
         return is_website_publisher
 
     def is_user(self, cr, uid, ids, context=None):
-        return self.pool['res.users'].has_group(cr, uid, 'base.group_user')
+        Access = self.pool['ir.model.access']
+        return Access.check(cr, uid, 'ir.ui.menu', 'read', False, context=context)
 
     def get_template(self, cr, uid, ids, template, context=None):
         if isinstance(template, (int, long)):
diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py
index fc2a6e42650..00c314f4ed8 100644
--- a/addons/website_sale/controllers/main.py
+++ b/addons/website_sale/controllers/main.py
@@ -233,6 +233,12 @@ class website_sale(http.Controller):
         category_list = category_obj.name_get(cr, uid, category_ids, context=context)
         category_list = sorted(category_list, key=lambda category: category[1])
 
+        pricelist = self.get_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)
+
         if not context.get('pricelist'):
             context['pricelist'] = int(self.get_pricelist())
             product = template_obj.browse(cr, uid, int(product), context=context)
@@ -240,8 +246,9 @@ class website_sale(http.Controller):
         values = {
             'search': search,
             'category': category,
-            'pricelist': self.get_pricelist(),
+            'pricelist': pricelist,
             'attrib_values': attrib_values,
+            'compute_currency': compute_currency,
             'attrib_set': attrib_set,
             'keep': keep,
             'category_list': category_list,
diff --git a/openerp/addons/base/security/ir.model.access.csv b/openerp/addons/base/security/ir.model.access.csv
index 41ac2b8ee40..8aec7db7da9 100644
--- a/openerp/addons/base/security/ir.model.access.csv
+++ b/openerp/addons/base/security/ir.model.access.csv
@@ -35,7 +35,7 @@
 "access_ir_sequence_type_group_system","ir_sequence_type group_system","model_ir_sequence_type","group_system",1,1,1,1
 "access_ir_translation_all","ir_translation all","model_ir_translation",,1,1,1,1
 "access_ir_translation_group_system","ir_translation group_system","model_ir_translation","group_system",1,1,1,1
-"access_ir_ui_menu_group_user","ir_ui_menu group_user","model_ir_ui_menu",,1,0,0,0
+"access_ir_ui_menu_group_user","ir_ui_menu group_user","model_ir_ui_menu",base.group_user,1,0,0,0
 "access_ir_ui_menu_group_system","ir_ui_menu group_system","model_ir_ui_menu","group_system",1,1,1,1
 "access_ir_ui_view_group_user","ir_ui_view group_user","model_ir_ui_view",,1,0,0,0
 "access_ir_ui_view_group_system","ir_ui_view group_system","model_ir_ui_view","group_system",1,1,1,1