sequence hoa don ban & hoa don tra
Merge remote-tracking branch 'refs/remotes/origin/develop' into develop

Conflicts:
	source/protected/components/CPOSRequireLogin.php