more work on sales order shipping and inventory issue
Merge branch 'master' of github.com:topdsoft/computare2.0

Conflicts:
	app/Controller/Component/ComputareARComponent.php