tree 88173abaf4e6b8bfe0b4176954d4498b81e7e5d3
parent 7e9048570eda8841bcabcf66676119fbd535c844
parent 3ceba11208b0d392456c1d23760162e7cdfa4fd2
author Anand Doshi <anand@erpnext.com> 1381822249 +0530
committer Anand Doshi <anand@erpnext.com> 1381822249 +0530

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

Conflicts:
	accounts/doctype/sales_invoice/test_sales_invoice.py
	buying/doctype/purchase_order/test_purchase_order.py
	stock/doctype/serial_no/serial_no.py
	stock/doctype/stock_entry/stock_entry.py
	stock/doctype/stock_entry/test_stock_entry.py
	stock/doctype/stock_ledger_entry/stock_ledger_entry.py