update role,unit,storage create,update,delete notice
update notice
Merge branch 'master' of https://github.com/kiat-mao/shpost_storage
Merge branch 'master' of https://github.com/kiat-mao/shpost_storage
update chinese
order search with datetime
Merge branch 'master' of https://github.com/kiat-mao/shpost_storage
Merge branch 'master' of https://github.com/kiat-mao/shpost_storage

Conflicts:
	app/models/order.rb
	app/models/stock_log.rb
	app/views/stocks/index.html.erb
	config/locales/ActiveRecord.zh-CN.yml
update is_bad
update is_bad
merge file