Anand Doshi 879ec66ea3 Merge branch 'production' of github.com:webnotes/erpnext into production
Conflicts:
	accounts/doctype/purchase_invoice_item/purchase_invoice_item.txt
	buying/doctype/purchase_order_item/purchase_order_item.txt
	buying/doctype/supplier_quotation_item/supplier_quotation_item.txt
	patches/patch_list.py
2012-12-19 22:28:00 +05:30
..
2012-09-24 19:13:42 +05:30