Merge branch 'master' of github.com:webnotes/erpnext
diff --git a/accounts/page/voucher_import_tool/voucher_import_tool.py b/accounts/page/voucher_import_tool/voucher_import_tool.py
index bbd8b4e..0a2178a 100644
--- a/accounts/page/voucher_import_tool/voucher_import_tool.py
+++ b/accounts/page/voucher_import_tool/voucher_import_tool.py
@@ -234,7 +234,7 @@
start_row = i+2
# check for empty columns
- empty_columns = [i+1 for i, c in enumerate(rows[i+1]) if not c]
+ empty_columns = [j+1 for j, c in enumerate(rows[i+1]) if not c]
if empty_columns:
raise Exception, """Column No(s). %s %s empty. \
Please remove them and try again.""" % (comma_and(empty_columns),
diff --git a/patches/patch_list.py b/patches/patch_list.py
index 9dc335d..6c7c5e0 100644
--- a/patches/patch_list.py
+++ b/patches/patch_list.py
@@ -207,5 +207,4 @@
"patches.march_2013.p01_c_form",
"execute:webnotes.conn.sql('update tabDocPerm set `submit`=1, `cancel`=1, `amend`=1 where parent=\"Time Log\"')",
"execute:webnotes.delete_doc('DocType', 'Attendance Control Panel')",
- "execute:webnotes.reload_doc('hr', 'doctype', 'upload_attendance')",
]
\ No newline at end of file