tree 5ac16010f0d7bf7489712b1c1247473e3978208a
parent 4a7248ee0b188f104b251eb7cfbb0ab30ae6de5f
parent e5daef72bf330d12f02019e948c44c4901e98a90
author Anand Doshi <anand@erpnext.com> 1361969068 +0530
committer Anand Doshi <anand@erpnext.com> 1361969068 +0530

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

Conflicts:
	accounts/doctype/purchase_invoice/purchase_invoice.py
	stock/doctype/purchase_receipt/purchase_receipt.py