Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:webnotes/erpnext

Browse Source
This commit is contained in:
Nabin Hait 2013-03-05 18:23:50 +05:30
commit acd52a021b
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
accounts/page/voucher_import_tool/voucher_import_tool.py
View File

@ -234,7 +234,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),

1
patches/patch_list.py
View File

@ -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')",
]