[MERGE] forward port of branch 7.0 up to 00ec786

[odoo/odoo.git] / addons / hr_timesheet_invoice / report / account_analytic_profit.py

diff --git a/addons/hr_timesheet_invoice/report/account_analytic_profit.py b/addons/hr_timesheet_invoice/report/account_analytic_profit.py
index dfdce39..d9fb879 100644 (file)
--- a/addons/hr_timesheet_invoice/report/account_analytic_profit.py
+++ b/addons/hr_timesheet_invoice/report/account_analytic_profit.py
@@ -20,7 +20,6 @@
 ##############################################################################
 
 from openerp.report import report_sxw
-from openerp import pooler
 
 class account_analytic_profit(report_sxw.rml_parse):
     def __init__(self, cr, uid, name, context):
@@ -32,15 +31,15 @@ class account_analytic_profit(report_sxw.rml_parse):
             'line': self._line,
         })
     def _user_ids(self, lines):
-        user_obj=pooler.get_pool(self.cr.dbname).get('res.users')
+        user_obj = self.pool['res.users']
         ids=list(set([b.user_id.id for b in lines]))
         return user_obj.browse(self.cr, self.uid, ids)
 
     def _journal_ids(self, form, user_id):
         if isinstance(user_id, (int, long)):
             user_id = [user_id]
-        line_obj=pooler.get_pool(self.cr.dbname).get('account.analytic.line')
-        journal_obj=pooler.get_pool(self.cr.dbname).get('account.analytic.journal')
+        line_obj = self.pool['account.analytic.line']
+        journal_obj = self.pool['account.analytic.journal']
         line_ids=line_obj.search(self.cr, self.uid, [
             ('date', '>=', form['date_from']),
             ('date', '<=', form['date_to']),
@@ -51,10 +50,9 @@ class account_analytic_profit(report_sxw.rml_parse):
         return journal_obj.browse(self.cr, self.uid, ids)
 
     def _line(self, form, journal_ids, user_ids):
-        pool=pooler.get_pool(self.cr.dbname)
-        line_obj=pool.get('account.analytic.line')
-        product_obj=pool.get('product.product')
-        price_obj=pool.get('product.pricelist')
+        line_obj = self.pool['account.analytic.line']
+        product_obj = self.pool['product.product']
+        price_obj = self.pool['product.pricelist']
         ids=line_obj.search(self.cr, self.uid, [
                 ('date', '>=', form['date_from']),
                 ('date', '<=', form['date_to']),
@@ -111,7 +109,7 @@ class account_analytic_profit(report_sxw.rml_parse):
         return res.values()
 
     def _lines(self, form):
-        line_obj=pooler.get_pool(self.cr.dbname).get('account.analytic.line')
+        line_obj = self.pool['account.analytic.line']
         ids=line_obj.search(self.cr, self.uid, [
             ('date', '>=', form['date_from']),
             ('date', '<=', form['date_to']),