Merge branch 'master' of http://smartcost.f3322.net:3000/caipin/cld

Conflicts:
	protected/controller/InvoiceController.php

protected/controller/InvoiceController.php

@@ -23,6 +23,7 @@ class InvoiceController extends DooController {
 				Doo::loadModel("execute");
 				$execute=new execute();
 				//2222
+				//8956
 				$verifyList=$verify->find(array('select'=>'staff','asArray'=>true));
 				$list=array();