From e35c7df84307fe7878a42c216520f45eb89569dd Mon Sep 17 00:00:00 2001 From: Amit Mendapara Date: Fri, 3 Oct 2008 12:55:07 +0530 Subject: * Fixed document integration. bzr revid: ame@tinyerp.com-20081003072507-giez2izj0tihmxwt --- addons/process/process.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'addons/process/process.py') diff --git a/addons/process/process.py b/addons/process/process.py index 0e92b90be80..219fe47e1ed 100644 --- a/addons/process/process.py +++ b/addons/process/process.py @@ -122,6 +122,9 @@ class process_process(osv.osv): wkf_ids = self.pool.get('workflow').search(cr, uid, [('osv', '=', data['model'])]) data['workflow'] = (wkf_ids or False) and wkf_ids[0] + if 'directory_id' in node and node.directory_id: + data['directory_id'] = node.directory_id.id + if node.menu_id: data['menu'] = {'name': node.menu_id.complete_name, 'id': node.menu_id.id} @@ -190,9 +193,9 @@ class process_process(osv.osv): refobj = pool.get(ref_model).browse(cr, uid, [ref_id], context)[0] fields = pool.get(ref_model).fields_get(cr, uid, context=context) - # chech whether directory_id from inherited from document module - if 'directory_id' in refobj and refobj.directory_id: - res['directory'] = self.pool.get('document.directory').get_resource_path(cr, uid, node.directory_id.id, ref_model, ref_id) + # chech for directory_id from inherited from document module + if nodes[nid].get('directory_id', False): + res['directory'] = self.pool.get('document.directory').get_resource_path(cr, uid, nodes[nid]['directory_id'], ref_model, ref_id) resource['name'] = refobj.name_get(context)[0][1] resource['perm'] = pool.get(ref_model).perm_read(cr, uid, [ref_id], context)[0] -- cgit v1.2.3 From ed25f0694ffab270c469d2017057a6a6e0206ae9 Mon Sep 17 00:00:00 2001 From: Harshad Modi Date: Fri, 3 Oct 2008 13:50:47 +0530 Subject: * fixed bugs : on get resource path method * put domain on directory_id on process node ( only show directory of that process node model ) * fixed bugs : on process node to get resource (ftp) path bzr revid: hmo@tinyerp.com-20081003082047-71vm1k2jf2wnsq5x --- addons/process/process.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/process/process.py') diff --git a/addons/process/process.py b/addons/process/process.py index 219fe47e1ed..3702c7882c4 100644 --- a/addons/process/process.py +++ b/addons/process/process.py @@ -195,7 +195,7 @@ class process_process(osv.osv): # chech for directory_id from inherited from document module if nodes[nid].get('directory_id', False): - res['directory'] = self.pool.get('document.directory').get_resource_path(cr, uid, nodes[nid]['directory_id'], ref_model, ref_id) + resource['directory'] = self.pool.get('document.directory').get_resource_path(cr, uid, nodes[nid]['directory_id'], ref_model, ref_id) resource['name'] = refobj.name_get(context)[0][1] resource['perm'] = pool.get(ref_model).perm_read(cr, uid, [ref_id], context)[0] -- cgit v1.2.3