From ffd190ff3ca9e6ccc966c901bf38f5d035e545f7 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Tue, 5 Mar 2013 17:10:33 +0530 Subject: [PATCH 1/2] fix in patch list --- patches/patch_list.py | 1 - 1 file changed, 1 deletion(-) diff --git a/patches/patch_list.py b/patches/patch_list.py index 9dc335d89d1..6c7c5e01a23 100644 --- a/patches/patch_list.py +++ b/patches/patch_list.py @@ -207,5 +207,4 @@ patch_list = [ "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 From b343a4895c749e566b3209aa736114aca3f3e77d Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Tue, 5 Mar 2013 17:24:15 +0530 Subject: [PATCH 2/2] fix in empty col check in voucher import tool --- accounts/page/voucher_import_tool/voucher_import_tool.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/accounts/page/voucher_import_tool/voucher_import_tool.py b/accounts/page/voucher_import_tool/voucher_import_tool.py index 2d7cd25fd1e..62cf7c6cc02 100644 --- a/accounts/page/voucher_import_tool/voucher_import_tool.py +++ b/accounts/page/voucher_import_tool/voucher_import_tool.py @@ -233,7 +233,7 @@ def get_data(rows, company_abbr): 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),