fixed conflict

This commit is contained in:
Nabin Hait
2012-11-30 15:02:20 +05:30
50 changed files with 1414 additions and 2671 deletions

View File

@@ -0,0 +1,6 @@
import webnotes
def execute():
webnotes.clear_perms("Employee")
webnotes.reload_doc("hr", "doctype", "employee")
webnotes.conn.sql("""update tabEmployee set employee=name""")

View File

@@ -0,0 +1,9 @@
import webnotes
def execute():
webnotes.clear_perms("Leave Application")
webnotes.reload_doc("hr", "doctype", "leave_application")
webnotes.conn.sql("""update `tabLeave Application` set status='Approved'
where docstatus=1""")
webnotes.conn.sql("""update `tabLeave Application` set status='Open'
where docstatus=0""")