bzr revid: jvo@tinyerp.com-20090929135659-3zf9j2m8a8py2qvx
This commit is contained in:
Jay (Open ERP) 2009-09-29 19:26:59 +05:30
parent 34645503b7
commit f47eae5220
1 changed files with 5 additions and 6 deletions

View File

@ -651,11 +651,11 @@ class document_file(osv.osv):
def create(self, cr, uid, vals, context={}):
vals['title']=vals['name']
vals['parent_id'] = context.get('parent_id',False) or vals.get('parent_id',False)
# if not vals.get('res_id', False) and context.get('default_res_id',False):
# vals['res_id']=context.get('default_res_id',False)
# if not vals.get('res_model', False) and context.get('default_res_model',False):
# vals['res_model']=context.get('default_res_model',False)
vals['res_model'] = "report.document.user"
if not vals.get('res_id', False) and context.get('default_res_id',False):
vals['res_id']=context.get('default_res_id',False)
if not vals.get('res_model', False) and context.get('default_res_model',False):
vals['res_model']=context.get('default_res_model',False)
if vals.get('res_id', False) and vals.get('res_model',False):
obj_model=self.pool.get(vals['res_model'])
result = obj_model.read(cr, uid, [vals['res_id']], context=context)
@ -695,7 +695,6 @@ class document_file(osv.osv):
res = content_index(base64.decodestring(datas), vals['datas_fname'], vals.get('content_type', None))
super(document_file,self).write(cr, uid, [result], {
'index_content' : res,
'res_id' : result
})
cr.commit()
except: