| 
					
				 | 
			
			
				@@ -2693,7 +2693,7 @@ class ReceiptExtendController extends DooController { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     			array_push($dataSummary[$value['cid']][$value['month']][$value['itemCategory']], $value); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     		} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     		 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    		print_r($dataSummary); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    		print_r($dataSummary);die; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     		 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     		Doo::loadClass ( 'receipt.func' ); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     		 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -2714,11 +2714,25 @@ class ReceiptExtendController extends DooController { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 										<td class="taR colGreen"></td>'; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     				 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     				$itemHtml=''; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    				foreach ($aiAllList as $aiak=>$aiav){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    					//foreach ($dataSummary as) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    					$itemHtml.='<td class="taR"></td>'; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    				if(isset($dataSummary[$value['cid']])&&isset($dataSummary[$value['cid'][$month]])){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    					foreach ($aiAllList as $aiak=>$aiav){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    						 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    						 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    						$dataSummary[$value['cid']][$month]; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    						 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    						foreach ($dataSummary as $dsk=>$dsv){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    							 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    						} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    						 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    					} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    				}else{ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    					foreach ($aiAllList as $aiak=>$aiav){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    						$itemHtml.='<td class="taR"></td>'; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    					} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     				} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     				 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    				 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    				 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     				$summaryDateHtml.='<td class="taR colRed"></td>'; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     				 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     			} 
			 |