allorder order_status
Merge branch 'master' of https://github.com/jijithvs/epm

Conflicts:
	module/Order/view/order/shift-admin/redo-orders.phtml