From 44a48fac034bda00065d42043fa8707864e3a8f0 Mon Sep 17 00:00:00 2001
From: hieplq <hieplq@hasuvimex.vn>
Date: Tue, 25 Aug 2015 19:24:52 +0800
Subject: [PATCH] IDEMPIERE-2789:csv export:query for detail tab is run same as
 number of record

---
 .../adempiere/impexp/GridTabCSVExporter.java  | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/org.adempiere.base/src/org/adempiere/impexp/GridTabCSVExporter.java b/org.adempiere.base/src/org/adempiere/impexp/GridTabCSVExporter.java
index d276fe8034..a0d3b52fcb 100644
--- a/org.adempiere.base/src/org/adempiere/impexp/GridTabCSVExporter.java
+++ b/org.adempiere.base/src/org/adempiere/impexp/GridTabCSVExporter.java
@@ -282,8 +282,16 @@ public class GridTabCSVExporter implements IGridTabExporter
 			         }	
 				}
 
-				while(true){		 
-					  if(childs.size()>0){
+				if(childs.size()>0){
+					for (GridTab childTab:childs){
+						if (!childTab.isLoadComplete()){
+							childTab.initTab(false);
+						}
+						
+						childTab.query(false, 0, 0);
+					}
+					
+					while(true){
 						 Map<String, Object> tmpRow = resolveMasterDetailRow(rowDetail,tabMapDetails,headArray,index); 					  
 						 if(tmpRow!= null){   							
 						   for(Map.Entry<String, Object> details : tmpRow.entrySet()) {	
@@ -296,10 +304,9 @@ public class GridTabCSVExporter implements IGridTabExporter
 						}else{
 						   break;
 						}
-					 }else{
-						break;
-					 }
-			    }  	
+					 
+			    	}  	
+				}
 				
 				if(rowDetail==0)
 				    mapWriter.write(row, header,processors);
@@ -348,7 +355,6 @@ public class GridTabCSVExporter implements IGridTabExporter
 		    GridTab childTab = childTabDetail.getKey();
 		    //String  whereCla = getWhereClause (childTab, parentGrid, currentParentIndex);
 		    //childTab.getTableModel().dataRequery(whereCla, false, 0);
-		    childTab.query(false, 0, 0);
 			Map<String,Object> row = new HashMap<String,Object>();
 			boolean isActiveRow = true;
 		    if (childTab.getRowCount() > 0) {