Changes in SalesReturnConf.java for DDUK

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@99871 ce508802-f39f-4f6c-b175-0d175dae99d5

webitm-wms/ibase/webitm/ejb/wms/SalesReturnConf.java

@@ -423,7 +423,8 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
 					exchRate = rs.getDouble("EXCH_RATE");
 					custCode = checkNull(rs.getString("CUST_CODE"));
 					acctCode = checkNull(rs.getString("ACCT_CODE"));
-					cctrCode = checkNull(rs.getString("CCTR_CODE"));
+			//		cctrCode = checkNull(rs.getString("CCTR_CODE"));
+					cctrCode = rs.getString("CCTR_CODE");
 					dueDate = rs.getTimestamp("DUE_DATE");
 					finEntity = checkNull(rs.getString("FIN_ENTITY"));					
 					totAmt = rs.getDouble("TOT_AMT");
@@ -2576,8 +2577,8 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
 				System.out.println("bodyText-------"+bodyText);
 				System.out.println("formatCode-------"+formatCode);
 
-				sql1 = "SELECT C.EMAIL_ADDR, C.CUST_NAME, I.INV_AMT, I.SALE_ORDER,  I.CURR_CODE FROM CUSTOMER C, INVOICE I" +
-				" WHERE C.CUST_CODE = I.CUST_CODE AND I.INVOICE_ID = ? ";
+				sql1 = "SELECT C.EMAIL_ADDR, C.CUST_NAME, S.NET_AMT, I.SALE_ORDER,  S.CURR_CODE FROM CUSTOMER C, INVOICE I, SRETURN S " +
+				" WHERE C.CUST_CODE = I.CUST_CODE AND S.INVOICE_ID = I.INVOICE_ID  AND I.INVOICE_ID = ? ";
 				pstmt = conn.prepareStatement(sql1);
 				pstmt.setString(1, invoiceId);
 				rs = pstmt.executeQuery();