tree 7b747e40492cffd298a84c74418a0727d85442dd
parent 154c8579d6e706e9e251ec35f5a7023f3a53370e
parent e505fbea54c156e724f73a0668b21667d9e711f3
author Anand Doshi <anand@erpnext.com> 1384522929 +0530
committer Anand Doshi <anand@erpnext.com> 1384522929 +0530

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