1

protected/controller/InvoiceController.php

@@ -5560,7 +5560,7 @@ class InvoiceController extends DooController {
 		if ($timeType == 'CREATE')
 			$descField = 'a.date';
 		
-		$con = '';
+		$con = ' 1 ';
 		if (! empty ( $D1 ) && ! empty ( $D2 ))
 			$con .= ' and ' . $descField . ' BETWEEN "' . $D1 . '" AND "' . $D2 . '" ';
 		elseif (! empty ( $D1 ) && empty ( $D2 ))
@@ -5586,18 +5586,19 @@ class InvoiceController extends DooController {
 				'previous' => '' 
 		);
 		
-		if(!empty($con)){
-			$con=' where 1 '.$con;
-		}
+// 		if(!empty($con)){
+// 			$con=' where 1 '.$con;
+// 		}
 		
-		$sql = 'select a.iid from CLD_invoiceReceivables as a
-				' . $con ;
+// 		$sql = 'select a.iid from CLD_invoiceReceivables as a
+// 				' . $con ;
 		
 		
 		
 		
+		$pageinfo =$this->get_page ( "CLD_invoiceReceivables", $con, $page, $page_size, "invoiceApprovalAchieve", $get, "" );
 		//echo $sql; 
-		$pageinfo = $this->getPageBySql ( $sql, $page, $page_size, "invoiceReceivablesAS", $get, "" );
+		//$pageinfo = $this->getPageBySql ( $sql, $page, $page_size, "invoiceReceivablesAS", $get, "" );
 		$limit = $pageinfo ['lower'] . ',' . $page_size;
 		$list = $invoiceReceivables->getInvoiceReceivablesByConditionPage ( $limit, $con, 'desc', $descField );
 		foreach ( $list as $key => $value ) {
@@ -8244,14 +8245,9 @@ class InvoiceController extends DooController {
 	 */
 	public function getTableCountBySql($sql = "") {
 		
-		
-		
 		$query = Doo::db ()->query ( $sql );
 		$result = $query->fetchAll ();
 		
-		$b =$query->count ();
-		print_r($b);
-		
 		return count ( $result );
 	}
 	function isInvoiceNew($type = "GLOBAL") {

protected/model/invoiceReceivables.php

@@ -535,7 +535,7 @@ class invoiceReceivables extends DooModel {
 		
 		
 		
-		$sql='select * from '.$this->_table.' as a '.$con.' ORDER BY '.$descField.' '.$desc.' limit '.$limit;
+		$sql='select * from '.$this->_table.' as a where '.$con.' ORDER BY '.$descField.' '.$desc.' limit '.$limit;
 		//echo $sql;
 		$query = Doo::db ()->query ( $sql );
 		$list = $query->fetchAll ();