mass fix
Merge origin/master

Conflicts:
	biz/theme-adminlte/modules/inventory/views/notice/index.php
	biz/theme-adminlte/modules/inventory/views/receive/_detail.php
	biz/theme-adminlte/modules/inventory/views/receive/index.php
	biz/theme-adminlte/modules/inventory/views/transfer/_detail.php
	biz/theme-adminlte/modules/inventory/views/transfer/_form.php
	biz/theme-adminlte/modules/inventory/views/transfer/_search.php
gitignore