openerp-dev-web team mailing list archive

[xrg <xrg@xxxxxxxxx>]

xrg has proposed merging lp:~openerp-dev/openobject-client/trunk-bug-753277-xrg into lp:openobject-client.

Requested reviews:
  OpenERP sa GTK client R&D (openerp-dev-gtk)
Related bugs:
  Bug #753277 in OpenERP GTK Client: "[PS] Trying to import a csv file, the client crashed without any notice"
  https://bugs.launchpad.net/openobject-client/+bug/753277

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-client/trunk-bug-753277-xrg/+merge/57129
-- 
https://code.launchpad.net/~openerp-dev/openobject-client/trunk-bug-753277-xrg/+merge/57129
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-client/trunk-bug-753277-xrg.

=== modified file 'bin/modules/gui/window/win_import.py'
--- bin/modules/gui/window/win_import.py	2011-01-17 14:10:46 +0000
+++ bin/modules/gui/window/win_import.py	2011-04-11 09:44:33 +0000
@@ -53,7 +53,7 @@
     try:
         res = rpc.session.rpc_exec_auth('/object', 'execute', model, 'import_data', f, datas, 'init', '', False, context)
     except Exception, e:
-        common.warning(str(e), _('XML-RPC error !'), parent=parent)
+        # common.warning(str(e), _('XML-RPC error !'), parent=parent)
         return False
     result = res[0]
     if result>=0:
@@ -254,9 +254,9 @@
                             for key, value in self.fields_invert.items():
                                 if key.encode('utf8') == f:
                                     inverted.append(value)
-                        return import_csv(csv, inverted, self.model, self.fields_invert, context=self.context, parent=self.win)
+                        return import_csv(csv, inverted, self.model, self.fields_invert, context=self.context, parent=self.parent)
                     else:
-                        return import_csv(csv, fields, self.model, self.fields, context=self.context, parent=self.win)
+                        return import_csv(csv, fields, self.model, self.fields, context=self.context, parent=self.parent)
                 return False
             else:
                 self.parent.present()