mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-31 18:59:08 +00:00
fixed conflict
This commit is contained in:
6
patches/november_2012/add_employee_field_in_employee.py
Normal file
6
patches/november_2012/add_employee_field_in_employee.py
Normal 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""")
|
||||
9
patches/november_2012/leave_application_cleanup.py
Normal file
9
patches/november_2012/leave_application_cleanup.py
Normal 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""")
|
||||
Reference in New Issue
Block a user