Merge branch 'master' of github.com:webnotes/erpnext
This commit is contained in:
commit
acd52a021b
@ -234,7 +234,7 @@ def get_data(rows, company_abbr):
|
|||||||
start_row = i+2
|
start_row = i+2
|
||||||
|
|
||||||
# check for empty columns
|
# 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:
|
if empty_columns:
|
||||||
raise Exception, """Column No(s). %s %s empty. \
|
raise Exception, """Column No(s). %s %s empty. \
|
||||||
Please remove them and try again.""" % (comma_and(empty_columns),
|
Please remove them and try again.""" % (comma_and(empty_columns),
|
||||||
|
@ -207,5 +207,4 @@ patch_list = [
|
|||||||
"patches.march_2013.p01_c_form",
|
"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.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.delete_doc('DocType', 'Attendance Control Panel')",
|
||||||
"execute:webnotes.reload_doc('hr', 'doctype', 'upload_attendance')",
|
|
||||||
]
|
]
|
Loading…
Reference in New Issue
Block a user