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

Conflicts:
	accounts/doctype/account/account.py
	controllers/accounts_controller.py
	patches/patch_list.py
	selling/doctype/sales_common/sales_common.py
	stock/doctype/purchase_receipt/purchase_receipt.py
This commit is contained in:
Anand Doshi
2013-11-15 19:12:09 +05:30
26 changed files with 590 additions and 143 deletions

View File

@@ -245,4 +245,5 @@ patch_list = [
"execute:webnotes.reload_doc('core', 'doctype', 'defaultvalue') #2013-11-15",
"execute:webnotes.reload_doc('core', 'doctype', 'comment') #2013-11-15",
"patches.1311.p02_index_singles",
"patches.1311.p01_make_gl_entries_for_si",
]