diff options
Diffstat (limited to 'addons/document/document.py')
| -rw-r--r-- | addons/document/document.py | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/addons/document/document.py b/addons/document/document.py index 1671b6bc1ba..54f12e204fe 100644 --- a/addons/document/document.py +++ b/addons/document/document.py @@ -31,11 +31,10 @@ from StringIO import StringIO import psycopg2 import openerp -from openerp import netsvc -from openerp import pooler from openerp import tools from openerp.osv import fields, osv from openerp.osv.orm import except_orm +import openerp.report.interface from openerp.tools.misc import ustr from openerp.tools.translate import _ from openerp.tools.safe_eval import safe_eval @@ -138,7 +137,7 @@ class document_file(osv.osv): It is a hack that will try to discover if the mentioned record is clearly associated with a partner record. """ - obj_model = self.pool.get(res_model) + obj_model = self.pool[res_model] if obj_model._name == 'res.partner': return res_id elif 'partner_id' in obj_model._columns and obj_model._columns['partner_id']._obj == 'res.partner': @@ -423,7 +422,6 @@ class document_directory_content(osv.osv): tname = '' if content.include_name: record_name = node.displayname or '' - # obj = node.context._dirobj.pool.get(model) if record_name: tname = (content.prefix or '') + record_name + (content.suffix or '') + (content.extension or '') else: @@ -456,7 +454,7 @@ class document_directory_content(osv.osv): if node.extension != '.pdf': raise Exception("Invalid content: %s" % node.extension) report = self.pool.get('ir.actions.report.xml').browse(cr, uid, node.report_id, context=context) - srv = netsvc.Service._services['report.'+report.report_name] + srv = openerp.report.interface.report_int._reports['report.'+report.report_name] ctx = node.context.context.copy() ctx.update(node.dctx) pdf,pdftype = srv.create(cr, uid, [node.act_id,], {}, context=ctx) @@ -620,7 +618,7 @@ class node_context(object): if context is None: context = {} context['uid'] = uid - self._dirobj = pooler.get_pool(cr.dbname).get('document.directory') + self._dirobj = openerp.registry(cr.dbname).get('document.directory') self.node_file_class = node_file self.extra_ctx = {} # Extra keys for context, that do _not_ trigger inequality assert self._dirobj @@ -1297,9 +1295,9 @@ class node_res_dir(node_class): Note that many objects use NULL for a name, so we should better call the name_search(),name_get() set of methods """ - obj = self.context._dirobj.pool.get(self.res_model) - if not obj: + if self.res_model not in self.context._dirobj.pool: return [] + obj = self.context._dirobj.pool[self.res_model] dirobj = self.context._dirobj uid = self.context.uid ctx = self.context.context.copy() @@ -1334,7 +1332,7 @@ class node_res_dir(node_class): if self.ressource_tree: object2 = False if self.resm_id: - object2 = dirobj.pool.get(self.res_model).browse(cr, uid, self.resm_id) or False + object2 = dirobj.pool[self.res_model].browse(cr, uid, self.resm_id) or False if obj._parent_name in obj.fields_get(cr, uid): where.append((obj._parent_name,'=',object2 and object2.id or False)) @@ -1505,7 +1503,7 @@ class node_res_obj(node_class): ctx = self.context.context.copy() ctx.update(self.dctx) directory = dirobj.browse(cr, uid, self.dir_id) - obj = dirobj.pool.get(self.res_model) + obj = dirobj.pool[self.res_model] where = [] res = [] if name: @@ -1591,7 +1589,7 @@ class node_res_obj(node_class): uid = self.context.uid ctx = self.context.context.copy() ctx.update(self.dctx) - res_obj = dirobj.pool.get(self.res_model) + res_obj = dirobj.pool[self.res_model] object2 = res_obj.browse(cr, uid, self.res_id) or False @@ -1999,7 +1997,7 @@ class nodefd_content(StringIO, node_descriptor): par = self._get_parent() uid = par.context.uid - cr = pooler.get_db(par.context.dbname).cursor() + cr = openerp.registry(par.context.dbname).db.cursor() try: if self.mode in ('w', 'w+', 'r+'): data = self.getvalue() @@ -2052,7 +2050,7 @@ class nodefd_static(StringIO, node_descriptor): par = self._get_parent() # uid = par.context.uid - cr = pooler.get_db(par.context.dbname).cursor() + cr = openerp.registry(par.context.dbname).db.cursor() try: if self.mode in ('w', 'w+', 'r+'): data = self.getvalue() |