From cf93d5ac92c7424ebf34a6c238cc89d2df56b330 Mon Sep 17 00:00:00 2001
From: Vo Minh Thu <vmt@openerp.com>
Date: Wed, 27 Mar 2013 10:13:51 +0100
Subject: [PATCH] [REF] product: rml_parse has already a self.pool, not need to
 call pooler.get_pool().

bzr revid: vmt@openerp.com-20130327091351-wyrttjys8btke9hx
---
 addons/product/report/product_pricelist.py | 24 ++++++++--------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/addons/product/report/product_pricelist.py b/addons/product/report/product_pricelist.py
index 5e9f8cf0a8a..9b0708f5d4a 100644
--- a/addons/product/report/product_pricelist.py
+++ b/addons/product/report/product_pricelist.py
@@ -21,7 +21,6 @@
 
 import time
 
-from openerp import pooler
 from openerp.osv import osv
 from openerp.report import report_sxw
 from openerp.tools.translate import _
@@ -63,20 +62,17 @@ class product_pricelist(report_sxw.rml_parse):
         return True
 
     def _get_pricelist(self, pricelist_id):
-        pool = pooler.get_pool(self.cr.dbname)
-        pricelist = pool.get('product.pricelist').read(self.cr, self.uid, [pricelist_id], ['name'], context=self.localcontext)[0]
+        pricelist = self.pool.get('product.pricelist').read(self.cr, self.uid, [pricelist_id], ['name'], context=self.localcontext)[0]
         return pricelist['name']
 
     def _get_currency(self, pricelist_id):
-        pool = pooler.get_pool(self.cr.dbname)
-        pricelist = pool.get('product.pricelist').read(self.cr, self.uid, [pricelist_id], ['currency_id'], context=self.localcontext)[0]
+        pricelist = self.pool.get('product.pricelist').read(self.cr, self.uid, [pricelist_id], ['currency_id'], context=self.localcontext)[0]
         return pricelist['currency_id'][1]
 
     # TODO 7.0 - remove this method, its unused
     def _get_currency_symbol(self, pricelist_id):
-        pool = pooler.get_pool(self.cr.dbname)
-        pricelist = pool.get('product.pricelist').read(self.cr, self.uid, [pricelist_id], ['currency_id'], context=self.localcontext)[0]
-        symbol = pool.get('res.currency').read(self.cr, self.uid, [pricelist['currency_id'][0]], ['symbol'], context=self.localcontext)[0]
+        pricelist = self.pool.get('product.pricelist').read(self.cr, self.uid, [pricelist_id], ['currency_id'], context=self.localcontext)[0]
+        symbol = self.pool.get('res.currency').read(self.cr, self.uid, [pricelist['currency_id'][0]], ['symbol'], context=self.localcontext)[0]
         return symbol['symbol'] or ''
 
     def _get_categories(self, products, form):
@@ -84,20 +80,19 @@ class product_pricelist(report_sxw.rml_parse):
         res=[]
         self.pricelist = form['price_list']
         self._set_quantity(form)
-        pool = pooler.get_pool(self.cr.dbname)
         pro_ids=[]
         for product in products:
             pro_ids.append(product.id)
             if product.categ_id.id not in cat_ids:
                 cat_ids.append(product.categ_id.id)
 
-        cats = pool.get('product.category').name_get(self.cr, self.uid, cat_ids, context=self.localcontext)
+        cats = self.pool.get('product.category').name_get(self.cr, self.uid, cat_ids, context=self.localcontext)
         if not cats:
             return res
         for cat in cats:
-            product_ids=pool.get('product.product').search(self.cr, self.uid, [('id', 'in', pro_ids), ('categ_id', '=', cat[0])], context=self.localcontext)
+            product_ids=self.pool.get('product.product').search(self.cr, self.uid, [('id', 'in', pro_ids), ('categ_id', '=', cat[0])], context=self.localcontext)
             products = []
-            for product in pool.get('product.product').read(self.cr, self.uid, product_ids, ['name', 'code'], context=self.localcontext):
+            for product in self.pool.get('product.product').read(self.cr, self.uid, product_ids, ['name', 'code'], context=self.localcontext):
                 val = {
                      'id':product['id'],
                      'name':product['name'],
@@ -116,13 +111,12 @@ class product_pricelist(report_sxw.rml_parse):
 
     def _get_price(self, pricelist_id, product_id, qty):
         sale_price_digits = self.get_digits(dp='Product Price')
-        pool = pooler.get_pool(self.cr.dbname)
         pricelist = self.pool.get('product.pricelist').browse(self.cr, self.uid, [pricelist_id], context=self.localcontext)[0]
-        price_dict = pool.get('product.pricelist').price_get(self.cr, self.uid, [pricelist_id], product_id, qty, context=self.localcontext)
+        price_dict = self.pool.get('product.pricelist').price_get(self.cr, self.uid, [pricelist_id], product_id, qty, context=self.localcontext)
         if price_dict[pricelist_id]:
             price = self.formatLang(price_dict[pricelist_id], digits=sale_price_digits, currency_obj=pricelist.currency_id)
         else:
-            res = pool.get('product.product').read(self.cr, self.uid, [product_id])
+            res = self.pool.get('product.product').read(self.cr, self.uid, [product_id])
             price =  self.formatLang(res[0]['list_price'], digits=sale_price_digits, currency_obj=pricelist.currency_id)
         return price