pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE]: Merge with lp:openobject-trunk-dev-addons2

Browse Source 
bzr revid: ksa@tinyerp.co.in-20100917103906-zick9zmfc7ul06pz
This commit is contained in:
ksa (Open ERP)
2010-09-17 16:09:06 +05:30
parent 0e66de1a9f 0abd243192
commit 49b9ae8e2e
4599 changed files with 168662 additions and 156971 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/document/document.py
+3 -9
View File
@@ -22,16 +22,10 @@
import base64
from osv import osv, fields
import urlparse
import os
import pooler
import netsvc
from osv.orm import except_orm
#import StringIO
from psycopg2 import Binary
# from psycopg2 import Binary
#from tools import config
import tools
from tools.translate import _
@@ -239,10 +233,10 @@ class document_file(osv.osv):
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':
bro = obj_model.browse(self, cr, uid, res_id, context=context)
bro = obj_model.browse(cr, uid, res_id, context=context)
return bro.partner_id.id
elif 'address_id' in obj_model._columns and obj_model._columns['address_id']._obj == 'res.partner.address':
bro = obj_model.browse(self, cr, uid, res_id, context=context)
bro = obj_model.browse(cr, uid, res_id, context=context)
return bro.address_id.partner_id.id
return False