tree d86f69638b7e16661f4009fb91c563529e0af959
parent ea9f845814190e189e63e9b0692f17d2a02fba63
parent efa94ce1bf092b7b4150aed1ca2ce1611fb7f203
author Anand Doshi <anand@erpnext.com> 1380712972 +0530
committer Anand Doshi <anand@erpnext.com> 1380712972 +0530

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

Conflicts:
	accounts/doctype/purchase_invoice/purchase_invoice.py
	accounts/doctype/sales_invoice/sales_invoice.txt
	selling/doctype/lead/lead.txt
	selling/doctype/opportunity/opportunity.txt
	stock/doctype/warehouse/warehouse.py