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

Conflicts:
	patches/patch_list.py
This commit is contained in:
Anand Doshi
2013-02-16 11:09:37 +05:30
8 changed files with 72 additions and 268 deletions

View File

@@ -171,4 +171,5 @@ patch_list = [
"execute:webnotes.conn.sql('update tabUserRole set parentfield=\"user_roles\" where parentfield=\"userroles\"')",
"patches.february_2013.fix_outstanding",
"patches.february_2013.p01_event",
"execute:webnotes.delete_doc('Page', 'Calendar')"
]