tree b73c38663be36bbdabc3ee1908d7e1f532e0650b
parent add0c85648a760cf658e2ed25d8e60c8c68419cf
parent 630256f65bb496f9e79e871fdadfdc3a35f56599
author Nijil Y <nijil.y@live.com> 1323345564 +0530
committer Nijil Y <nijil.y@live.com> 1323345564 +0530

Discount in purchase cycle Merge branch 'master' of git://github.com/nijil/erpnext

Conflicts:
	erpnext/accounts/doctype/pv_detail/pv_detail.txt
	erpnext/buying/doctype/po_detail/po_detail.txt
	erpnext/stock/doctype/purchase_receipt_detail/purchase_receipt_detail.txt