gpa(Open ERP) has proposed merging
lp:~openerp-dev/openobject-server/trunk-bug-826623-gpa into
lp:openobject-server.
Requested reviews:
Naresh(OpenERP) (nch-openerp)
Related bugs:
Bug #826623 in OpenERP Server: "Import translation do not work after another
import"
https://bugs.launchpad.net/openobject-server/+bug/826623
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-bug-826623-gpa/+merge/71987
fixed problem import translation do not work after another import
--
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-bug-826623-gpa/+merge/71987
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-server/trunk-bug-826623-gpa.
=== modified file 'openerp/addons/base/module/wizard/base_import_language.py'
--- openerp/addons/base/module/wizard/base_import_language.py 2011-01-06 13:06:54 +0000
+++ openerp/addons/base/module/wizard/base_import_language.py 2011-08-18 06:31:08 +0000
@@ -35,9 +35,13 @@
'name': fields.char('Language Name',size=64 , required=True),
'code': fields.char('Code (eg:en__US)',size=5 , required=True),
'data': fields.binary('File', required=True),
+ 'overwrite': fields.boolean('Overwrite Existing Terms'),
+ }
+ _defaults = {
+ 'overwrite': False
}
- def import_lang(self, cr, uid, ids, context):
+ def import_lang(self, cr, uid, ids, context=None):
"""
Import Language
@param cr: the current row, from the database cursor.
@@ -45,8 +49,12 @@
@param ids: the ID or list of IDs
@param context: A standard dictionary
"""
-
+ if context is None:
+ context = {}
+
import_data = self.browse(cr, uid, ids)[0]
+ if import_data.overwrite:
+ context = {'overwrite': True}
fileobj = TemporaryFile('w+')
fileobj.write(base64.decodestring(import_data.data))
@@ -56,7 +64,7 @@
fileformat = first_line.endswith("type,name,res_id,src,value") and 'csv' or 'po'
fileobj.seek(0)
- tools.trans_load_data(cr, fileobj, fileformat, import_data.code, lang_name=import_data.name)
+ tools.trans_load_data(cr, fileobj, fileformat, import_data.code, lang_name=import_data.name, context=context)
tools.trans_update_res_ids(cr)
fileobj.close()
return {}
=== modified file 'openerp/addons/base/module/wizard/base_import_language_view.xml'
--- openerp/addons/base/module/wizard/base_import_language_view.xml 2010-11-12 11:08:42 +0000
+++ openerp/addons/base/module/wizard/base_import_language_view.xml 2011-08-18 06:31:08 +0000
@@ -27,6 +27,7 @@
<field name="name" width="200"/>
<field name="code"/>
<field name="data" colspan="4"/>
+ <field name="overwrite"/>
</group>
<group colspan="8" col="8">
<separator string="" colspan="8"/>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
