Nijil Y edf8bc2a3e 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
2011-12-08 17:29:24 +05:30
..
2011-09-15 15:06:23 +05:30
2011-09-05 18:43:09 +05:30
2011-09-05 18:43:09 +05:30