Changes on Sales order

Changes on Sales order
Merge branch 'master' of https://github.com/BSSAM/bs

Conflicts:
	nbproject/private/private.xml