← Back to team overview

openerp-dev-web team mailing list archive

[Merge] lp:~openerp-dev/openobject-server/6.0-bug-753277-xrg into lp:openobject-server/6.0

 

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

Requested reviews:
  OpenERP Core Team (openerp)
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-server/6.0-bug-753277-xrg/+merge/57117
-- 
https://code.launchpad.net/~openerp-dev/openobject-server/6.0-bug-753277-xrg/+merge/57117
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-server/6.0-bug-753277-xrg.
=== modified file 'bin/osv/orm.py'
--- bin/osv/orm.py	2011-04-06 15:05:25 +0000
+++ bin/osv/orm.py	2011-04-11 08:26:37 +0000
@@ -768,7 +768,8 @@
                     raise Exception(_('Please check that all your lines have %d columns.') % (len(fields),))
 
                 field = fields[i]
-                if field[:len(prefix)] <> prefix:
+                if field[:len(prefix)] <> prefix \
+                        or (not field[len(prefix):] ):
                     if line[i] and skip:
                         return False
                     continue


Follow ups