tree 1f6185c6495907f2388b5b215e60ec4112587e62
parent 3510764e7c8fd03aab0b16678b846b547237c21d
parent de46f1404e1b5338916e38f982e2e6be49e4c660
author Anand Doshi <anand@erpnext.com> 1381819726 +0530
committer Anand Doshi <anand@erpnext.com> 1381819726 +0530

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

Conflicts:
	accounts/doctype/sales_invoice/sales_invoice.txt
	controllers/selling_controller.py
	patches/patch_list.py
	selling/doctype/lead/lead.py
	selling/doctype/opportunity/opportunity.py
	selling/doctype/quotation/quotation.py
	selling/doctype/quotation/quotation.txt
	selling/doctype/sales_order/sales_order.txt
	stock/doctype/purchase_receipt/purchase_receipt.py
	stock/doctype/serial_no/serial_no.py
	stock/doctype/stock_entry/stock_entry.py
	stock/doctype/stock_ledger_entry/stock_ledger_entry.py