tree 13976b87e381e5cca5f35076c4c7b4c28e8c72b5
parent 02c662936fe5b402149f502946ad2864cacad03d
parent 51e51da63fd1d68ca5bf09c87f41d472bddf2574
author Anand Doshi <anand@iwebnotes.com> 1327647635 +0530
committer Anand Doshi <anand@iwebnotes.com> 1327647635 +0530

Merge branch 'latest' of github.com:webnotes/erpnext into latest

Conflicts:
	erpnext/accounts/doctype/receivable_voucher/receivable_voucher.py