odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] base_import: avoid name clash when importing ir.translation records. Call the orm method directly. 

This hack is needed in 7.0 to avoid changes in the API.
Renaming the load method of ir.translation is the proper solution for trunk (done in server revision 5018)

bzr revid: mat@openerp.com-20140313082813-afjsj912q2idrhl5
This commit is contained in:
Martin Trigaux 2014-03-13 09:28:13 +01:00
parent ba823b0a63 c9bca78bb1
commit 6abd78e753
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
addons/base_import/models.py
View File

@ -11,6 +11,7 @@ except ImportError:
import psycopg2
from openerp.osv import orm, fields
from openerp.osv.orm import BaseModel
from openerp.tools.translate import _
FIELDS_RECURSION_LIMIT = 2
@ -316,8 +317,12 @@ class ir_import(orm.TransientModel):
}]
_logger.info('importing %d rows...', len(data))
import_result = self.pool[record.res_model].load(
cr, uid, import_fields, data, context=context)
# DO NOT FORWARD PORT, already fixed in trunk
# hack to avoid to call the load method from ir_translation (name clash)
if record.res_model == 'ir.translation':
import_result = BaseModel.load(self.pool['ir.translation'], cr, uid, import_fields, data, context=context)
else:
import_result = self.pool[record.res_model].load(cr, uid, import_fields, data, context=context)
_logger.info('done')
# If transaction aborted, RELEASE SAVEPOINT is going to raise