fixed  chart A3 InventoryReport
finish chart A3 for admin
Merge branch '1126'

Conflicts:
	public/app/js/model.js
change order for admin chart
change order