openerp-dev-web team mailing list archive

[xrg <xrg@xxxxxxxxx>]

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

Requested reviews:
  OpenERP Core Team (openerp)
Related bugs:
  Bug #767283 in OpenERP Server: "orm: at csv import, properly report lines with less columns"
  https://bugs.launchpad.net/openobject-server/+bug/767283

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

=== modified file 'bin/osv/orm.py'
--- bin/osv/orm.py	2011-04-11 10:08:47 +0000
+++ bin/osv/orm.py	2011-04-20 15:32:26 +0000
@@ -762,10 +762,12 @@
             done = {}
             for i in range(len(fields)):
                 res = False
+                if i >= len(line):
+                    raise Exception(_('Please check that all your lines have %d columns.'
+                        'Stopped around line %d having %d columns.') % \
+                            (len(fields), position+2, len(line)))
                 if not line[i]:
                     continue
-                if i >= len(line):
-                    raise Exception(_('Please check that all your lines have %d columns.') % (len(fields),))
 
                 field = fields[i]
                 if field[:len(prefix)] <> prefix: