hoa don tra hang ===> lỗi
Merge remote-tracking branch 'refs/remotes/origin/develop' into develop

Conflicts:
	source/protected/models/HoaDonTraHang.php
	source/protected/modules/quanlybanhang/controllers/HoaDonBanHangController.php
test lỗi $model->search()