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

Conflicts:
	patches/patch_list.py
This commit is contained in:
Anand Doshi
2013-07-29 13:31:00 +05:30
5 changed files with 65 additions and 15 deletions

View File

@@ -263,4 +263,5 @@ patch_list = [
"patches.july_2013.p09_remove_website_pyc",
"patches.july_2013.p10_change_partner_user_to_website_user",
"patches.july_2013.p11_update_price_list_currency",
"execute:webnotes.bean('Selling Settings').save() #2013-07-29",
]