-Budget Id considered from Site master for Account Budget Generation to be...

-Budget Id  considered from Site master for Account Budget Generation to be removed and site_code to be taken from budget master


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

webitm-fin/ibase/webitm/ejb/fin/BudgetGrpAcctGenPrc.java

@@ -91,7 +91,8 @@ public class BudgetGrpAcctGenPrc extends ActionHandlerEJB implements BudgetGrpAc
 
 				// Getting site code against selected budget id. Modified on 11-Jun-2013  
 								 
-				 sql = "select site_code from site where budget_id = ?";
+				// sql = "select site_code from site where budget_id = ?";
+				 sql = "select site_code from budgets where budget_id = ?";
 				 
 				 pstmt = conn.prepareStatement(sql);
 				 pstmt.setString(1,budgetId);
@@ -202,7 +203,7 @@ public class BudgetGrpAcctGenPrc extends ActionHandlerEJB implements BudgetGrpAc
 					 if(rs.next()){
 					
 						acctPrd = rs.getString(1);
-						prdCode = rs.getString(2);
+						prdCode = checkNull(rs.getString(2));
 						finEntity = rs.getString(3);
 						fromDate = rs.getDate(4);
 						todate = rs.getDate(5);
@@ -210,7 +211,7 @@ public class BudgetGrpAcctGenPrc extends ActionHandlerEJB implements BudgetGrpAc
 					 
 					 System.out.println("\n acctPrd "+acctPrd+"  prdCode : "+prdCode+"  finEntity: "+finEntity+"  fromDate: "+fromDate+"  todate: "+todate);
 					 
-					 if(acctPrd==null||prdCode==null||finEntity==null||fromDate==null||todate==null){
+					 if(acctPrd==null||finEntity==null||fromDate==null||todate==null){
 						 
 						 //Error : Required data not found from budgets
 						 errString = itmDBAccessEJB.getErrorString("","VTBUDINFNF",chgUser);
@@ -469,6 +470,15 @@ public class BudgetGrpAcctGenPrc extends ActionHandlerEJB implements BudgetGrpAc
 	
 	}
 	
+	private String checkNull(String input)
+	{
+		if (input == null)
+		{
+			input = "";
+		}
+		return input;
+	}
+
 	/* @ SANDESH R SURVE				Created Date- 08-May-2013
 	 * 
 	 Closes passed PreparedStatement, ResultSet object