Small Modifications in Sales Order
Merge branch 'master' of https://github.com/webnotes/erpnext into item_discount

Conflicts:
	selling/doctype/sales_bom/sales_bom.py
	selling/doctype/sales_order/sales_order.py
IPVA 2014
IPVA 2014.2
Small Changes in Sales Order
Merge branch 'item_discount'

Conflicts:
	selling/doctype/sales_order/sales_order.py