merging from branch

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

webitm-fin/ibase/webitm/ejb/fin/.directory

+[Dolphin]
+SortOrder=1
+SortRole=date
+Timestamp=2016,4,20,12,6,40
+Version=3
+ViewMode=1

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

 package ibase.webitm.ejb.fin;
 
+import java.rmi.RemoteException;
 import java.sql.*;
 import java.text.*;
 
@@ -8142,7 +8143,7 @@ public class FinCommon
         PreparedStatement pstmt = null;
         Statement stmt = null;
         ResultSet rs = null;
-        String errCode = "",errString = "",finEntity = "",siteCode = "";
+        String errCode = "",errString = "",finEntity = "",siteCode = "",errCode1="";
         String sundryType = "",sundryCode = "",acctCode = "",cctrCode = "";
         String deptCode = "",currCode = "",empCode = "",analCode = "",projCode = "";
         String refType = "",refSer = "",refId = "",remarks = "",partyDocRef = "";
@@ -8293,6 +8294,20 @@ public class FinCommon
             }
 			//ended by rajendra on 17/10/07
 		
+			//Added By Dhiraj Chavan on 18-APR-2016
+			errCode1=isSiteCctr(siteCode,cctrCode,conn);
+			System.out.println("@@@@@@@@@@@@@@isSiteCctr@@@@@@@@@@@@@@@"+errCode1);
+			if(errCode1 != null && errCode1.trim().length() > 0)
+			{
+				
+				System.out.println("@@@@@@@@@@@@@@isSiteCctr@@@@@@@@@@@@@@@"+errCode1);
+                errString = itmDBAccessEJB.getErrorString("",errCode1,"","",conn);
+                return errString;
+            }
+			//ended by Dhiraj Chavan
+			
+			
+			
             sql = "select acct_prd,code from period where fr_date <= ? and to_date >= ? ";
             System.out.println("SQL : "+sql);
             pstmt = conn.prepareStatement(sql);
@@ -8524,6 +8539,110 @@ public class FinCommon
         System.out.println("Returning String from glTraceUpdate ::"+errString);
         return errString;
     }
+	
+
+	//Added By Dhiraj Chavan on 18-APR-2016
+	public String isSiteCctr(String siteCode,String cctrCode,Connection conn) throws ITMException//Added by Dhiraj Chavan 18/04/16
+, SQLException, RemoteException  
+    {
+		
+		System.out.println("inside isSiteCctr");
+		String var_value="",active_yn="",activateyn_flag="",errCode="",errString="";
+		long ll_cnt=0;
+		PreparedStatement pstmt = null;
+        Statement stmt = null;
+        ResultSet rs = null;
+        String sql="";
+        ITMDBAccessEJB itmDBAccessEJB =null; 
+        itmDBAccessEJB=	new ITMDBAccessEJB();
+        /*ValidatorEJB validatorEJB = new ValidatorEJB();*/
+         FinCommon fimcommon=new FinCommon();
+        var_value =fimcommon.getFinparams("999999","SITE_SPECIFIC_CCTR",conn);
+   
+	    System.out.println("@@@@@fimcommon.getFinparams@@@@"+var_value);
+        if(var_value==null || var_value.trim().length() == 0)
+        {
+        	var_value="N";
+        	System.out.println("@@getFinparams@@ckecking null"+var_value);
+        	
+        }
+       
+        if(var_value.equals("Y") || var_value.equalsIgnoreCase("Y"))
+        {
+            sql="select count(1) from  site_cctr where site_code=? and cctr_code=?";
+        	pstmt = conn.prepareStatement(sql);
+            pstmt.setString(1,siteCode);
+            pstmt.setString(2,cctrCode);
+            rs = pstmt.executeQuery();
+            if(rs.next()){
+                ll_cnt=rs.getInt(1);
+                
+            }
+            System.out.println("Count@Dhiraj code@@ll_cnt"+ll_cnt);
+            sql=null;
+            rs.close();
+            rs=null;
+            pstmt.close();
+            pstmt=null;
+           if(ll_cnt > 0)
+            {
+            	sql="select active_yn  from  site_cctr where site_code=? and cctr_code=?";
+            	pstmt = conn.prepareStatement(sql);
+                pstmt.setString(1,siteCode);
+                pstmt.setString(2,cctrCode);
+                rs = pstmt.executeQuery();
+                if(rs.next()){
+                	active_yn=rs.getString(1);
+                    
+                }
+                sql=null;
+                rs.close();
+                rs=null;
+                pstmt.close();
+                pstmt=null;
+                
+                System.out.println("In if (ll_cnt > 0)"+sql+"@@active_yn"+active_yn);
+              }
+            
+            if(active_yn.equals("N")||active_yn.equalsIgnoreCase("N"))
+            {
+            	
+            	errCode="VTCCTRBLK";
+                
+            	} 
+            	
+        }else
+        {
+        	sql="select active_yn from  site_cctr where site_code=? and cctr_code=?";
+        	pstmt = conn.prepareStatement(sql);
+            pstmt.setString(1,siteCode);
+            pstmt.setString(2,cctrCode);
+            rs = pstmt.executeQuery();
+            if(rs.next()){
+            	active_yn=rs.getString(1);
+                
+            }
+            sql=null;
+            rs.close();
+            rs=null;
+            pstmt.close();
+            pstmt=null;
+            if(active_yn.equals("N")||active_yn.equalsIgnoreCase("N"))
+        	{
+        	
+            	errCode="VTCCTRBLK";
+        	
+        	} 
+           
+        	
+        }
+        return errCode;
+		
+    }
+	//Ended By Dhiraj Dhiraj on 18-April-2016
+	
+	
+	
 	    //nvo_business_object_fin - gbf_get_project()
     public String getProject(String refSer,String refId,Connection conn) throws ITMException//Added by Jiten
     {
@@ -9588,6 +9707,150 @@ public class FinCommon
         System.out.println("Returning Strung :"+errString);
         return errString;
     }
+	
+    
+    //nvo_business_object_fin - gbf_check_gltran_drcr()
+    public String checkGlTranDrCrPreview(String refSer,String refId,Connection conn) throws ITMException //Added by Jiten
+    {
+        Statement stmt = null;
+        ResultSet rs = null;
+        double drAmt = 0,crAmt = 0,exch = 0;
+        double totDrAmt = 0,totCrAmt = 0,diffAmt = 0;
+        String sql = "",errString = "",postOnLine = "",acct = "",cctr = "";
+        ITMDBAccessEJB itmDBAccessEJB = null;
+//        GenericUtility genericUtility = null;
+        SimpleDateFormat sdf = null;
+        HashMap glTran = null;
+        try{
+            stmt = conn.createStatement();
+//            genericUtility = new GenericUtility();
+            itmDBAccessEJB = new ITMDBAccessEJB();
+            sdf = new SimpleDateFormat(genericUtility.getApplDateFormat());
+            sql = "select case when dr_amt is null then 0 else dr_amt end  * exch_rate," +
+                    "case when cr_amt is null then 0 else cr_amt end  * exch_rate " +
+                    "from gltrace_preview where ref_ser = '"+refSer+"' and ref_id = '"+refId+"'";
+            System.out.println("SQL :"+sql);
+            rs = stmt.executeQuery(sql);
+            while(rs.next()){
+                drAmt = getRequiredDecimal(rs.getDouble(1), 2);
+                crAmt = getRequiredDecimal(rs.getDouble(2), 2);
+
+                totDrAmt = totDrAmt + drAmt;
+                totCrAmt = totCrAmt + crAmt;
+                totDrAmt = getRequiredDecimal(totDrAmt, 2);
+                totCrAmt = getRequiredDecimal(totCrAmt, 2);
+                //System.out.println("debitAmt----"+drAmt+"--creditAmt---"+crAmt+"---Total Debit Amt---"+totDrAmt+"---Total Credit Amt---"+totCrAmt);
+            }
+            rs.close();
+            if(totDrAmt == totCrAmt){
+                return "";
+            }
+            diffAmt = totDrAmt - totCrAmt;
+            diffAmt=getRequiredDecimal(diffAmt, 2);
+            System.out.println("Difference Amount----"+diffAmt);
+            //Added by Manoj dtd 27/06/2014 to check coin differemce limit 
+            String coinDiffLimit=getFinparams("999999", "COIN_DIFF_LIMIT", conn);
+            coinDiffLimit=coinDiffLimit==null?"":coinDiffLimit;
+            if(coinDiffLimit.trim().length() == 0 || coinDiffLimit.trim().equalsIgnoreCase("NULLFOUND"))
+			{
+            	coinDiffLimit = "1";
+			}
+            
+           // if(Math.abs(diffAmt) > 1){
+          //Changed by Manoj dtd 27/06/2014 to check coin differemce limit
+            if(Math.abs(diffAmt) > Double.parseDouble(coinDiffLimit))
+            {
+                errString = itmDBAccessEJB.getErrorString("","VCOINDIFF1","","",conn);
+                return errString;
+            }
+            postOnLine = getFinparams("999999","POST_ON_LINE",conn);
+            if(postOnLine.equalsIgnoreCase("NULLFOUND")){
+                errString = itmDBAccessEJB.getErrorString("","VTENVAR1","","",conn);
+                return errString;
+            }else{
+                postOnLine = postOnLine.substring(0,1);
+                if("Y_N".indexOf(postOnLine) == -1){
+                    errString = itmDBAccessEJB.getErrorString("","VTENVAR1","","",conn);
+                    return errString;
+                }
+            }
+            if(postOnLine.equalsIgnoreCase("Y")){
+                acct = getFinparams("999999","COIN_ACCT",conn);
+                if(acct.equalsIgnoreCase("NULLFOUND")){
+                    errString = itmDBAccessEJB.getErrorString("","VSENVAR1","","",conn);
+                    return errString;
+                }
+                cctr = getFinparams("999999","COIN_CCTR",conn);
+                if(cctr.equalsIgnoreCase("NULLFOUND")){
+                    cctr = "";
+                }
+
+                //acct = acct.substring(0,10);
+                //cctr = cctr.substring(0,4);
+/*
+                sql = "select gltrace.tran_date, gltrace.eff_date, gltrace.fin_entity," +
+                        "gltrace.acct_prd, gltrace.prd_code, gltrace.remarks," +
+                        "gltrace.site_code, gltrace.entry_batch_no," +
+                        "finent.curr_code " +
+                        "from gltrace, finent  where ( gltrace.fin_entity = finent.fin_entity ) and " +
+                        "( gltrace.ref_ser = '"+refSer+"' ) and " +
+                        "( gltrace.ref_id = '"+refId+"' )";
+                System.out.println("SQL :"+sql);
+                rs = stmt.executeQuery(sql);
+                if(rs.next()){
+                    glTran = new HashMap();
+                    glTran.put("tran_date",rs.getTimestamp(1));
+                    glTran.put("eff_date",rs.getTimestamp(2));
+                    glTran.put("fin_entity",rs.getString(3));
+                    glTran.put("acct_prd",rs.getString(4));
+                    glTran.put("prd_code",rs.getString(5));
+                    glTran.put("remarks",rs.getString(6));
+                    glTran.put("site_code",rs.getString(7));
+                    glTran.put("tran_id__trace",rs.getString(8));
+                    glTran.put("entry_batch_no",rs.getString(8));
+                    glTran.put("curr_code",rs.getString(9));
+                }
+                glTran.put("acct_code",acct);
+                glTran.put("cctr_code",cctr);
+                glTran.put("emp_code","");
+                glTran.put("anal_code","");
+                glTran.put("proj_code","");
+                glTran.put("dept_code","");
+
+                if(diffAmt > 0){
+                    glTran.put("dr_amt","0");
+                    glTran.put("cr_amt",Double.toString(diffAmt));
+                }else{
+                    glTran.put("dr_amt",Double.toString(0 - diffAmt));
+                    glTran.put("cr_amt","0");
+                }
+                glTran.put("ref_ser",refSer);
+                glTran.put("ref_id",refId);
+
+                exch = 1;
+
+                glTran.put("dr_amt_base",Double.toString(exch * Double.parseDouble(glTran.get("dr_amt").toString())));
+                glTran.put("cr_amt_base",Double.toString(exch * Double.parseDouble(glTran.get("cr_amt").toString())));
+
+                errString = glTranUpdate(glTran,conn);
+        */ 
+            
+            }
+        }catch(Exception e){
+            System.out.println("Exception in checkGlTranDrCr [FinCommon]"+e);
+            e.printStackTrace();
+            throw new ITMException(e);
+        }finally{
+            try{
+                if(rs != null){rs.close();rs = null;}
+                if(stmt != null){stmt.close();stmt = null;}
+            }catch(Exception t){}
+        }
+        System.out.println("checkGlTranDrCrPreview errString :"+errString);
+        return errString;
+    }
+	
+    
     public double getRequiredDecimal(double actVal, int prec) //Added by Jiten
     {
         NumberFormat numberFormat = NumberFormat.getIntegerInstance ();

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

@@ -229,7 +229,9 @@ public class PayrollVoucherComIc extends ValidatorEJB implements PayrollVoucherC
 			double exchrate=0;
 		    sitecode = genericUtility.getColumnValue("site_code__to",dom);
 		    trandt  = genericUtility.getColumnValue("tran_date__fr",dom);
-		   sql="select a.curr_code from finent a, site b where b.fin_entity = a.fin_entity and b.site_code = ?";
+		    currcodebase= genericUtility.getColumnValue("curr_code", dom);
+		    System.out.println("Currency Code is"+ currcodebase );
+		  /* sql="select a.curr_code from finent a, site b where b.fin_entity = a.fin_entity and b.site_code = ?";
 		   System.out.println("SQL :: "+sql);
 		   pstmt = conn.prepareStatement(sql);
 			pstmt.setString(1,sitecode);
@@ -243,7 +245,7 @@ public class PayrollVoucherComIc extends ValidatorEJB implements PayrollVoucherC
 		pstmt.close();
 		pstmt = null;
 		currcode = genericUtility.getColumnValue("curr_code",dom);
-		valueXmlString.append("<curr_code>").append(currcodebase).append("</curr_code>\r\n");
+		valueXmlString.append("<curr_code>").append(currcodebase).append("</curr_code>\r\n");*/
 		sql="select descr from currency where curr_code = ?";
 		System.out.println("SQL :: "+sql);
 		pstmt = conn.prepareStatement(sql);
@@ -258,20 +260,7 @@ public class PayrollVoucherComIc extends ValidatorEJB implements PayrollVoucherC
 		pstmt.close();
 		pstmt = null;
 		System.out.println("currdescr1 :: "+currdescr1);
-		valueXmlString.append("<descr>").append(currdescr1).append("</descr>\r\n");
-		if(currcodebase != null && currcodebase.trim().length() > 0)
-		{
-			exchrate=finCommon.getDailyExchRateSellBuy( currcode,currcodebase,sitecode,trandt,"B",conn);
-			valueXmlString.append("<exch_rate>").append(exchrate).append("</exch_rate>\r\n");
-		}
-		if(currcodebase != currcode)
-		{
-			valueXmlString.append("<exch_rate protect = \"0\">").append("<![CDATA[" + exchrate + "]]>").append("</exch_rate >");
-		}
-		else
-		{
-			valueXmlString.append("<exch_rate protect = \"1\">").append("<![CDATA[" + exchrate + "]]>").append("</exch_rate >");
-		}
+		valueXmlString.append("<curr_descr>").append(currdescr1).append("</curr_descr>\r\n");
 		}
 		else if(currentColumn.equalsIgnoreCase("site_code__fr"))
 		{

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

@@ -11,34 +11,32 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.StringTokenizer;
-
-//import org.apache.poi.hssf.record.formula.functions.Int;
-//import org.apache.poi.hssf.record.formula.functions.Trim;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
 
 import ibase.system.config.ConnDriver;
-import ibase.utility.E12GenericUtility;
 import ibase.webitm.ejb.ActionHandlerEJB;
 import ibase.webitm.ejb.ITMDBAccessEJB;
 import ibase.webitm.ejb.ValidatorEJB;
-//import ibase.webitm.utility.GenericUtility;
+
 import ibase.webitm.utility.ITMException;
 
 public class PurchaseVoucherGltracePreview extends ActionHandlerEJB implements PurchaseVoucherGltracePreviewLocal,PurchaseVoucherGltracePreviewRemote
 {
+     String ref_id = "";   
 
-	
-	public String preview(String tranID,String xtraParams, String forcedFlag) throws RemoteException,ITMException
+	public String preview(String tranID,String xtraParams, String forcedFlag, Connection conn) throws RemoteException,ITMException
 	{ 
 		System.out.println("Preview Method is called for Purchase Voucher");
 		String retString = "";
 		boolean adj_amt_flag = true,amt_upd_flag = true,retenamt_flag = true,hold_tax_flag = true;
-		Connection conn = null;
+		//Connection conn = null;
 		String sql = "";
 		PreparedStatement pstmt = null,pstmt1 = null,pstmt2 = null;
 		ResultSet rs = null,rs1 = null,rs2 = null;
 		FinCommon finCommon = null;
-//		GenericUtility genericUtility = null;
-		E12GenericUtility genericUtility = new E12GenericUtility();
+
 		ITMDBAccessEJB itmDBAccessEJB = null;
 		ValidatorEJB validatorEJB = null;
 		double netAmt = 0.0,rndTo = 0.0,lc_netwr = 0.0;
@@ -56,14 +54,45 @@ public class PurchaseVoucherGltracePreview extends ActionHandlerEJB implements P
 		double  amtupd = 0.0,retenamt = 0.0,advadj_det = 0.0,net_amt = 0.0,tax_amt = 0.0,retention_amt = 0.0,rndamt = 0.0,holdTax = 0.0,diffamtexch=0.0,exch_h = 0.0;
 		double retentiondays = 0.0,retentionamt = 0.0,exch_d = 0.0,adjamt = 0.0;
 		double adv_add = 0.0,hold_tax = 0.0, exchratevch= 0.0 , billamt = 0.0 ,taxamt = 0.0;
-		String acctcodeadv ="",cctrcodeadv = "",currcodeadv = "", ref_id = "",refser = "",refNo = "",analcode = "";
+		String acctcodeadv ="",cctrcodeadv = "",currcodeadv = "", ref_id1 = "",refser = "",refNo = "",analcode = "";
 		String acctreten ="",cctrreten = "",acct_code__cf = "",cctr_code__cf = "",tranMode = "",detcurrcode = "",projCodeDet = "",projCodeDet1 = "";
-		HashMap hdrmap = new HashMap();
+		HashMap hdrmap = null;
 		HashMap map1 = new HashMap();
 		Date effDate = null;
 		Date tranDate = null;
 		Date refDate = null;
 
+		String ls_acct_tax = "",ls_cctr_tax = "";
+		String itemCode = "",itemSer ="",anly1 = "",acctCodePh = "",cctrCodePh = "",deptCode = "",projCode = "",analCode = "",anly2 = "",anly3 = "",acctVar = "",purcOrd = "";
+		double 	discAmt = 0.0,lc_tax_amt = 0.0,lc_reco_amt = 0.0 ,lc_rndAmt = 0.0;
+		int count = 0,count1 = 0,count2 = 0,count3 = 0,count4 = 0,recoCount = 0;
+		String lineNoRcp = "",prcp_id = "",cctrCodeDis = "",acctCodeDis = "",itemCode2 = "",itemSer2 = "",taxLs = "";
+		double rcpQty=0.0,vchQty = 0.0,rate = 0.0,rcpAmt = 0.0,varAmt = 0.0;
+
+		String prcpId = "",postType = "",acctInvOnline = "",cctrCodePhStr = "",acctCodePhStr = "";
+		double qty = 0.0,stdRate = 0.0,rcpRate = 0.0,stdAmt =0.0,diffAmt = 0.0,actAmt = 0.0,porcpReco = 0.0;
+		double nonPayable = 0.0,vouchQty = 0.0,rcpMra = 0.0,addCost = 0.0,mraPpv = 0.0;
+		double currAmt = 0.0;  
+		HashMap detMap = null;
+		ArrayList detList = new ArrayList();
+		HashMap rcpMap = null;
+		ArrayList rcpList = new ArrayList();
+
+		HashMap dataMap = null;
+
+		ArrayList dataMapList = null;
+		HashMap valueMap = null;
+		HashMap finalMap = null;
+		double totrecoamt = 0.0,sumRecAmt = 0.0,totAmt = 0.0;	
+		String acctCodeReco = "",cctrCodeReco = "",cctrCodeRecov = "",acctCodeRecovStr = "",cctrCodeRecovStr = "";
+		double taxDiff = 0.0,totRecAmt = 0.0;
+		String acctppv = "",acctPpvStr = "",cctrPpvStr = "";
+		String acctPPvArr [];
+		int ppvCount = 0;				
+
+		double exchRate=0;
+		String currCode="";
+
 		System.out.println("tran id = "+tranID);
 		boolean connStatus=false;
 		try{
@@ -78,7 +107,7 @@ public class PurchaseVoucherGltracePreview extends ActionHandlerEJB implements P
 			}
 
 			finCommon = new FinCommon();
-//			genericUtility = new GenericUtility();
+			//genericUtility = new GenericUtility();
 			itmDBAccessEJB = new ITMDBAccessEJB();
 			validatorEJB = new ValidatorEJB();
 			loginEmpCode = validatorEJB.getValueFromXTRA_PARAMS(xtraParams, "loginEmpCode");
@@ -100,30 +129,30 @@ public class PurchaseVoucherGltracePreview extends ActionHandlerEJB implements P
 				tranType = checkNull(rs.getString("tran_type"));
 				tranDate = new Timestamp(rs.getDate("tran_Date").getTime());
 				effDate = new Timestamp(rs.getDate("eff_date").getTime());
-					finentity = rs.getString("fin_entity");
-					sitecode = rs.getString("site_code");
-					sundrycode = rs.getString("supp_code");
-				    empcode = rs.getString("emp_code");
-					currcode = rs.getString("curr_code");
-					remarks = rs.getString("remarks");
-					analcode = rs.getString("anal_code");
-					ref_id = rs.getString("tran_id");
-					suppcode  = rs.getString("supp_code");
-					acct_aphdr = rs.getString("acct_code");
+				finentity = checkNull(rs.getString("fin_entity"));
+				sitecode = checkNull(rs.getString("site_code"));
+				sundrycode = checkNull(rs.getString("supp_code"));
+				empcode = checkNull(rs.getString("emp_code"));
+				currcode = checkNull(rs.getString("curr_code"));
+				remarks = checkNull(rs.getString("remarks"));
+				analcode = checkNull(rs.getString("anal_code"));
+				ref_id = checkNull(rs.getString("tran_id"));
+				suppcode  = checkNull(rs.getString("supp_code"));
+				acct_aphdr = checkNull(rs.getString("acct_code"));
 				cctr_aphdr = rs.getString("cctr_code")==null?"":rs.getString("cctr_code");
-					proj_code = rs.getString("proj_code");
+				proj_code = checkNull(rs.getString("proj_code"));
 				exch_h = rs.getDouble("exch_rate");
 				rndamt = rs.getDouble("rnd_amt");
-					vouchtype = rs.getString("vouch_type");
-					acct_code__cf = rs.getString("acct_code__cf");
-					cctr_code__cf = rs.getString("cctr_code__cf");
+				vouchtype = checkNull(rs.getString("vouch_type"));
+				acct_code__cf = checkNull(rs.getString("acct_code__cf"));
+				cctr_code__cf = checkNull(rs.getString("cctr_code__cf"));
 				billamt = rs.getDouble("bill_amt");
 				taxamt = rs.getDouble("tax_amt");
-					tranMode = rs.getString("tran_mode");
+				tranMode = checkNull(rs.getString("tran_mode"));
 				advAmt = rs.getDouble("adv_amt");
 
 				netAmt = rs.getDouble("net_amt");
-					rndOff = rs.getString("rnd_off");
+				rndOff = checkNull(rs.getString("rnd_off"));
 				rndTo = rs.getDouble("rnd_to");
 
 				System.out.println("VOUCHER TYPE>>>>>>>>>>>>>>>>>"+vouchtype);
@@ -132,7 +161,7 @@ public class PurchaseVoucherGltracePreview extends ActionHandlerEJB implements P
 					System.out.println("VOUCHER TYPE>>>>>>>>>>>>>>>>>"+vouchtype);
 					amtupd = rs.getDouble("net_amt");
 					net_amt = rs.getDouble("net_amt");
-						purc_order = rs.getString("purc_order");
+					purc_order = checkNull(rs.getString("purc_order"));
 
 					System.out.println("AMTUPD..........................."+amtupd);
 					sql = "select case when vouch_adv_amt is null then 0 else vouch_adv_amt end as vouch_adv_amt from porder where purc_order = ?";
@@ -141,7 +170,7 @@ public class PurchaseVoucherGltracePreview extends ActionHandlerEJB implements P
 					rs2 = pstmt2.executeQuery();
 					if(rs2.next())
 					{
-						vouch_adv_amt = rs2.getString("vouch_adv_amt");
+						vouch_adv_amt = checkNull(rs2.getString("vouch_adv_amt"));
 					}
 					rs2.close();
 					rs2=null;
@@ -191,22 +220,19 @@ public class PurchaseVoucherGltracePreview extends ActionHandlerEJB implements P
 			{
 				adjamt = rs.getDouble("adj_amt");
 				exchratevch = rs.getDouble("exch_rate__vouch");
-						currcodeadv = rs.getString("curr_code");
-						acctcodeadv = rs.getString("acct_code");
-						cctrcodeadv = rs.getString("cctr_code");
-						refser = rs.getString("ref_ser");
-						refNo = rs.getString("ref_no");
-					}
-					rs.close();
-					rs=null;
-					pstmt.close();
-					pstmt=null;
-					
-					if(acct_aphdr == acctcodeadv && cctr_aphdr == cctrcodeadv && exch_h == exchratevch){
+				currcodeadv = checkNull(rs.getString("curr_code"));
+				acctcodeadv = checkNull(rs.getString("acct_code"));
+				cctrcodeadv = checkNull(rs.getString("cctr_code"));
+				refser = checkNull(rs.getString("ref_ser"));
+				refNo = checkNull(rs.getString("ref_no"));
 
+				System.out.println("@@@@@@@@@@@ acct_aphdr["+acct_aphdr+"]==acctcodeadv["+acctcodeadv+"]........cctr_aphdr["+cctr_aphdr+"]==cctrcodeadv["+cctrcodeadv+"]........exch_h["+exch_h+"]exchratevch["+exchratevch+"]");
+				if(acct_aphdr == acctcodeadv && cctr_aphdr == cctrcodeadv && exch_h == exchratevch)
+				{
+					System.out.println("@@@@@@@@@@@@@ inside if.......");
 				}
 				else{
-						//hdrmap = new HashMap();
+					hdrmap = new HashMap();
 					adv_add = adv_add + adjamt; 
 					hdrmap.put("tran_date",tranDate);
 					hdrmap.put("eff_date", effDate);
@@ -214,7 +240,7 @@ public class PurchaseVoucherGltracePreview extends ActionHandlerEJB implements P
 					hdrmap.put("site_code",sitecode);
 					hdrmap.put("sundry_type",'S');
 					hdrmap.put("sundry_code",sundrycode);
-						hdrmap.put("acct_code",acctcodeadv);
+					hdrmap.put("acct_code",checknull(acctcodeadv).trim());
 					hdrmap.put("cctr_code",cctrcodeadv);
 					hdrmap.put("emp_code",empcode);
 					hdrmap.put("anal_code","");
@@ -244,7 +270,7 @@ public class PurchaseVoucherGltracePreview extends ActionHandlerEJB implements P
 					String party_doc_ref = finCommon.gfGetPartyDocRef("VOUCH",ref_id,conn);
 					hdrmap.put("party_doc_ref",party_doc_ref);
 
-						System.out.println("calling Gltrace Update for Header adj_amt*******************");
+					System.out.println("calling Gltrace Update for Header adj_amt*************1*****hdrmap["+hdrmap+"]*");
 					errString = finCommon.glTraceUpdate(hdrmap,conn,true); 
 					System.out.println("ERROR STRING>>>>>>>>>>>>>>>>>>>>>>["+errString+"]");
 					if(errString != null && errString.trim().length() > 0)
@@ -254,7 +280,13 @@ public class PurchaseVoucherGltracePreview extends ActionHandlerEJB implements P
 
 				}
 
-					//hdrmap = new HashMap();
+			}  //test for adv
+			rs.close();
+			rs=null;
+			pstmt.close();
+			pstmt=null;	
+				
+				hdrmap = new HashMap();
 				amtupd = amtupd + adjamt;
 				System.out.println("AMT_UPD>>>>>>>> >>>>"+amtupd);
 				hdrmap.put("tran_date",tranDate);
@@ -263,7 +295,7 @@ public class PurchaseVoucherGltracePreview extends ActionHandlerEJB implements P
 				hdrmap.put("site_code",sitecode);
 				hdrmap.put("sundry_type",'S');
 				hdrmap.put("sundry_code",sundrycode);
-							hdrmap.put("acct_code",acct_aphdr);//from header
+				hdrmap.put("acct_code",checknull(acct_aphdr).trim());//from header
 				hdrmap.put("cctr_code",cctr_aphdr);//from header
 				hdrmap.put("emp_code",empcode);
 				hdrmap.put("anal_code",analcode);
@@ -292,14 +324,17 @@ public class PurchaseVoucherGltracePreview extends ActionHandlerEJB implements P
 				String party_doc_ref = finCommon.gfGetPartyDocRef("VOUCH",ref_id,conn);
 				hdrmap.put("party_doc_ref",party_doc_ref);
 
-							System.out.println("calling Gltrace Update for Header amtupd*******************");
+				System.out.println("calling Gltrace Update for Header amtupd**********2********hdrmap["+hdrmap+"]*");
 
 				errString = finCommon.glTraceUpdate(hdrmap,conn,true); 
+				
 				System.out.println("ERROR STRING>>>>>>>>>>>>>>>>>>>>>>["+errString+"]");
 				if(errString != null && errString.trim().length() > 0)
 				{
 					return errString;
 				}
+				
+				
 				//Retention amt
 				sql = "select acct_code__reten as acctreten, cctr_code__reten as cctrreten from supplier where supp_code = ?" ;
 				pstmt = conn.prepareStatement(sql);
@@ -315,13 +350,23 @@ public class PurchaseVoucherGltracePreview extends ActionHandlerEJB implements P
 				pstmt.close();
 				pstmt=null;
 
+				System.out.println("@@@@@@@@@@@ retentionamt["+retentionamt+"]");
 				if ( retentionamt != 0.0)
 				{
+					hdrmap = new HashMap();
+					hdrmap.put("tran_date",tranDate);
+					hdrmap.put("eff_date", effDate);
+					hdrmap.put("fin_entity",finentity);
+					hdrmap.put("site_code",sitecode);
 					hdrmap.put("sundry_type",'S');
 					hdrmap.put("sundry_code",suppcode);
-								hdrmap.put("acct_code",acctreten);
+					hdrmap.put("acct_code",checknull(acctreten).trim());
 					hdrmap.put("cctr_code",cctrreten);
 
+					hdrmap.put("emp_code",empcode);
+					hdrmap.put("anal_code",analcode);
+					hdrmap.put("curr_code",currcode );
+					hdrmap.put("exch_rate",exch_h);
 					if(retentionamt > 0.0)
 					{
 						hdrmap.put("dr_amt",0.0);
@@ -336,7 +381,15 @@ public class PurchaseVoucherGltracePreview extends ActionHandlerEJB implements P
 						System.out.println("retentionamt>>>>>>>"+retentionamt);
 					}
 
-								System.out.println("calling Gltrace Update for Header retentionamt*******************");
+					hdrmap.put("ref_type","F");
+					hdrmap.put("ref_ser","VOUCH");
+					hdrmap.put("ref_id",ref_id);
+					hdrmap.put("remarks",remarks);
+					hdrmap.put("proj_code",proj_code);
+
+					party_doc_ref = finCommon.gfGetPartyDocRef("VOUCH",ref_id,conn);
+					hdrmap.put("party_doc_ref",party_doc_ref);
+					System.out.println("calling Gltrace Update for Header retentionamt*********3***********hdrmap["+hdrmap+"]*");
 					errString = finCommon.glTraceUpdate(hdrmap,conn,true); 
 					System.out.println("ERROR STRING>>>>>>>>>>>>>>>>>>>>>>["+errString+"]");
 					if(errString != null && errString.trim().length() > 0)
@@ -344,16 +397,25 @@ public class PurchaseVoucherGltracePreview extends ActionHandlerEJB implements P
 						return errString;
 					}
 				}
+
+			/*}
+			rs.close();
+			rs=null;
+			pstmt.close();
+			pstmt=null;	*/
+
+			System.out.println("@@@@@@@@@@@@@@ holdTax["+holdTax+"]");
 			//Hold Tax
 			if(holdTax != 0.0)
 			{
+				hdrmap = new HashMap();
 				hdrmap.put("tran_date",tranDate);
 				hdrmap.put("eff_date", effDate);
 				hdrmap.put("fin_entity",finentity);
 				hdrmap.put("site_code",sitecode);
 				hdrmap.put("sundry_type",'S');
 				hdrmap.put("sundry_code",sundrycode);
-						hdrmap.put("acct_code",acct_aphdr);//from header
+				hdrmap.put("acct_code",checknull(acct_aphdr).trim());//from header
 				hdrmap.put("cctr_code",cctr_aphdr);//from header
 				hdrmap.put("emp_code",empcode);
 				hdrmap.put("anal_code",analcode);
@@ -381,7 +443,7 @@ public class PurchaseVoucherGltracePreview extends ActionHandlerEJB implements P
 
 				 party_doc_ref = finCommon.gfGetPartyDocRef("VOUCH",ref_id,conn);
 				hdrmap.put("party_doc_ref",party_doc_ref);
-						System.out.println("calling Gltrace Update for hold tax*******************");
+				System.out.println("calling Gltrace Update for hold tax**********4*********hdrmap["+hdrmap+"]*");
 				errString = finCommon.glTraceUpdate(hdrmap,conn,true); 
 				System.out.println("ERROR STRING>>>>>>>>>>>>>>>>>>>>>>["+errString+"]");
 				if(errString != null && errString.trim().length() > 0)
@@ -390,11 +452,11 @@ public class PurchaseVoucherGltracePreview extends ActionHandlerEJB implements P
 				}
 			}
 			// update gltrace for currency fluctuation
-			        
+			System.out.println("@@@@@@@@@@@@@@ diffamtexch["+diffamtexch+"]");
 			if( diffamtexch != 0.0)
 			{
 				System.out.println("diffamtexch>>>>>>>"+diffamtexch);
-						
+				hdrmap = new HashMap();
 				hdrmap.put("tran_date",tranDate);
 				hdrmap.put("eff_date", effDate);
 				hdrmap.put("fin_entity",finentity);
@@ -402,7 +464,7 @@ public class PurchaseVoucherGltracePreview extends ActionHandlerEJB implements P
 
 				hdrmap.put("sundry_type",'O');
 				hdrmap.put("sundry_code","");
-						hdrmap.put("acct_code",acct_code__cf);//from header
+				hdrmap.put("acct_code",checknull(acct_code__cf).trim());//from header
 				hdrmap.put("cctr_code",cctr_code__cf);//from header
 
 				if(cctrcode == null || cctrcode.trim().length() == 0)
@@ -435,7 +497,7 @@ public class PurchaseVoucherGltracePreview extends ActionHandlerEJB implements P
 
 				 party_doc_ref = finCommon.gfGetPartyDocRef("VOUCH",ref_id,conn);
 				hdrmap.put("party_doc_ref",party_doc_ref);
-						System.out.println("calling Gltrace Update for diff_amt_exch*******************");
+				System.out.println("calling Gltrace Update for diff_amt_exch********5***********hdrmap["+hdrmap+"]*");
 				errString = finCommon.glTraceUpdate(hdrmap,conn,true); 
 				System.out.println("ERROR STRING>>>>>>>>>>>>>>>>>>>>>>["+errString+"]");
 				if(errString != null && errString.trim().length() > 0)
@@ -445,14 +507,7 @@ public class PurchaseVoucherGltracePreview extends ActionHandlerEJB implements P
 			}
 
 			//Detail Coding*******
-			        sql = "select line_no from vouchdet where tran_id = ?";
-			        pstmt1 = conn.prepareStatement(sql);
-					pstmt1.setString(1,tranID);
-					rs1 = pstmt1.executeQuery();
-					while(rs1.next())
-					{
-			        lineNoDet = rs1.getString("line_no");
-			        System.out.println("POSTING DETAIL!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"+rs1.getRow());
+
 			sql = "SELECT finent.curr_code  as basecurr  FROM finent  WHERE finent.fin_entity  = ? " ;
 			pstmt = conn.prepareStatement(sql);
 			pstmt.setString(1,finentity);
@@ -466,34 +521,28 @@ public class PurchaseVoucherGltracePreview extends ActionHandlerEJB implements P
 			pstmt.close();
 			pstmt=null;
 
-					 sql = "SELECT proj_code,line_no,tax_amt,acct_code,amount,cctr_code,dept_code,emp_code,anal_code,analysis1,analysis2,analysis3,basic_curr FROM vouchdet  WHERE tran_id = ? and line_no = ? " ;
+			sql = "SELECT proj_code,line_no,tax_amt,acct_code,amount,cctr_code,dept_code,emp_code,anal_code,analysis1,analysis2,analysis3,basic_curr FROM vouchdet  WHERE tran_id = ?" ;
 			pstmt = conn.prepareStatement(sql);
 			pstmt.setString(1,tranID);
-						pstmt.setString(2,lineNoDet);
+
 			rs = pstmt.executeQuery();
 			while(rs.next())
 			{
-							projCodeDet1 = rs.getString("proj_code");
+				projCodeDet1 = checkNull(rs.getString("proj_code"));
 				lineno = rs.getString("line_no");
 				taxamtDet = rs.getDouble("tax_amt");
-							acctCodeDet = rs.getString("acct_code");
+				acctCodeDet = checkNull(rs.getString("acct_code"));
 				amount = rs.getDouble("amount");
-							cctrCodeDet = rs.getString("cctr_code");
-							deptCodeDet = rs.getString("dept_code");
-							empCodeDet = rs.getString("emp_code");
-							analCodeDet = rs.getString("anal_code");
-							analysis1 = rs.getString("analysis1");
-							analysis2 = rs.getString("analysis2");
-							analysis3 = rs.getString("analysis3");
+				cctrCodeDet = checkNull(rs.getString("cctr_code"));
+				deptCodeDet = checkNull(rs.getString("dept_code"));
+				empCodeDet = checkNull(rs.getString("emp_code"));
+				analCodeDet = checkNull(rs.getString("anal_code"));
+				analysis1 = checkNull(rs.getString("analysis1"));
+				analysis2 = checkNull(rs.getString("analysis2"));
+				analysis3 = checkNull(rs.getString("analysis3"));
 				basiccurr = rs.getString("basic_curr");
 				//vouchAmt = rs.getDouble("vouch_amt");
-						}
-						rs.close();
-						rs=null;
-						pstmt.close();
-						pstmt=null;
 
-					// for each detail do the posting
 
 				if(tranMode == "M")
 				{
@@ -503,17 +552,19 @@ public class PurchaseVoucherGltracePreview extends ActionHandlerEJB implements P
 					projCodeDet = proj_code;
 				}
 
-				lineno = "    " + lineno;
-				lineno = lineno.substring(lineno.length() - 3,lineno.length());
-				hdrmap.put("tran_date",tranDate);
-				hdrmap.put("eff_date", effDate);
-				hdrmap.put("fin_entity",finentity);
-				hdrmap.put("site_code",sitecode);
-				hdrmap.put("exch_rate",exch_h);
+				/*lineno = "    " + lineno;
+				lineno = lineno.substring(lineno.length() - 3,lineno.length());*/
+				detMap = new HashMap();
+
+				detMap.put("tran_date",tranDate);
+				detMap.put("eff_date", effDate);
+				detMap.put("fin_entity",finentity);
+				detMap.put("site_code",sitecode);
+				detMap.put("exch_rate",exch_h);
 				if(vouchtype == "A" && advAmt != 0.0 &&  acctCodeDet.trim().length() == acct_aphdr.trim().length())
 				{
-					hdrmap.put("sundry_type",'S');
-					hdrmap.put("sundry_code",suppcode);
+					detMap.put("sundry_type",'S');
+					detMap.put("sundry_code",suppcode);
 					sql = "select (case when sum(tax_amt) is null then 0 else sum(tax_amt) end)  as taxtranamt from taxtran where tran_code = 'VOUCH' and tran_id = ? and line_no = ? and pay_tax = 'Y'";
 
 					pstmt = conn.prepareStatement(sql);
@@ -530,294 +581,794 @@ public class PurchaseVoucherGltracePreview extends ActionHandlerEJB implements P
 					pstmt=null;
 					if(amount > 0)
 					{
-						hdrmap.put("dr_amt",(amount - taxtranamt));
-						hdrmap.put("cr_amt",0.0);
+						detMap.put("dr_amt",(amount - taxtranamt));
+						detMap.put("cr_amt",0.0);
 						System.out.println("amount>>>>>>>"+amount);
 
 					}
 
 					else{
-						hdrmap.put("dr_amt", 0.0  );
-						hdrmap.put("cr_amt",0.0 - (amount - taxtranamt) );
+						detMap.put("dr_amt", 0.0  );
+						detMap.put("cr_amt",0.0 - (amount - taxtranamt) );
 						System.out.println("amount>>>>>>>"+amount);
 					}
 
 				}
 				else{
-					hdrmap.put("sundry_type",'O');
-					hdrmap.put("sundry_code","");
+
+					detMap.put("sundry_type",'O');
+					detMap.put("sundry_code","");
 					if(amount > 0)
 					{
-						hdrmap.put("dr_amt",amount);
-						hdrmap.put("cr_amt",0.0);
+						detMap.put("dr_amt",amount);
+						detMap.put("cr_amt",0.0);
 						System.out.println("amount>>>>>>>"+amount);
 
 					}
 
 					else{
-						hdrmap.put("dr_amt", 0.0);
-						hdrmap.put("cr_amt",0.0 - amount);
+						detMap.put("dr_amt", 0.0);
+						detMap.put("cr_amt",0.0 - amount);
 						System.out.println("amount>>>>>>>"+amount);
 					}
 
 				}
 
-				hdrmap.put("acct_code",acctCodeDet);
-				hdrmap.put("cctr_code",cctrCodeDet);
-				hdrmap.put("dept_code",deptCodeDet);
-				hdrmap.put("emp_code",empCodeDet);
-				hdrmap.put("anal_code",analCodeDet);
-				hdrmap.put("analysis1",analysis1);
-				hdrmap.put("analysis2",analysis2);
-				hdrmap.put("analysis3",analysis3);
+				detMap.put("acct_code",checknull(acctCodeDet).trim());
+				detMap.put("cctr_code",cctrCodeDet);
+				detMap.put("dept_code",deptCodeDet);
+				detMap.put("emp_code",empCodeDet);
+				detMap.put("anal_code",analCodeDet);
+				detMap.put("analysis1",analysis1);
+				detMap.put("analysis2",analysis2);
+				detMap.put("analysis3",analysis3);
 				/// if posting is in basic currency then put the exchange rate 1	
 
 				if(basiccurr == "Y")
 				{
-					hdrmap.put("curr_code",basiccurr);
-					hdrmap.put("exch_rate",1);
+					detMap.put("curr_code",basiccurr);
+					detMap.put("exch_rate",1);
 				}
 				else 
 				{
-					hdrmap.put("curr_code",currcode );
-					hdrmap.put("exch_rate",exch_h);
+					detMap.put("curr_code",currcode );
+					detMap.put("exch_rate",exch_h);
 				}
-				hdrmap.put("ref_type","F");
-				hdrmap.put("ref_ser","VOUCH");
-				hdrmap.put("ref_id",ref_id);
-				hdrmap.put("remarks",remarks);
-				hdrmap.put("proj_code",proj_code);
-
+				detMap.put("ref_type","F");
+				detMap.put("ref_ser","VOUCH");
+				detMap.put("ref_id",ref_id);
+				detMap.put("remarks",remarks);
+				detMap.put("proj_code",proj_code);
+				detMap.put("amount",amount);
 				 party_doc_ref = finCommon.gfGetPartyDocRef("VOUCH",ref_id,conn);
-				hdrmap.put("party_doc_ref",party_doc_ref);
+				detMap.put("party_doc_ref",party_doc_ref);
 
-				System.out.println("calling Gltrace Update for detail 1*******************");
+				System.out.println("calling Gltrace Update for detail 1******************detMap["+detMap+"]*");
 
-				errString = finCommon.glTraceUpdate(hdrmap,conn,true); 
+				detList.add(detMap);
+				/*errString = finCommon.glTraceUpdate(detMap,conn,true); 
 				System.out.println("ERROR STRING>>>>>>>>>>>>>>>>>>>>>>["+errString+"]");
 				if(errString != null && errString.trim().length() > 0)
 				{
 					return errString;
-				}
+				}*/
 
 				if(taxtranamt != 0.0)
 				{
-			    	    hdrmap.put("tran_date",tranDate);
-						hdrmap.put("eff_date", effDate);
-						hdrmap.put("fin_entity",finentity);
-						hdrmap.put("site_code",sitecode);
-						hdrmap.put("sundry_type",'S');
-						hdrmap.put("sundry_code",suppcode);
+					detMap = new HashMap();//resetting 
+
+					detMap.put("tran_date",tranDate);
+					detMap.put("eff_date", effDate);
+					detMap.put("fin_entity",finentity);
+					detMap.put("site_code",sitecode);
+					detMap.put("sundry_type",'S');
+					detMap.put("sundry_code",suppcode);
 					if(taxtranamt > 0.0)
 					{
-			    	    	hdrmap.put("dr_amt",0.0);
-							hdrmap.put("cr_amt",taxtranamt);
+						detMap.put("dr_amt",0.0);
+						detMap.put("cr_amt",taxtranamt);
 						System.out.println("taxtranamt>>>>>>>"+taxtranamt);
 
 					}
 
 					else{
-							hdrmap.put("dr_amt", 0.0 - taxtranamt);
-							hdrmap.put("cr_amt",0.0);
+						detMap.put("dr_amt", 0.0 - taxtranamt);
+						detMap.put("cr_amt",0.0);
 						System.out.println("taxtranamt>>>>>>>"+taxtranamt);
 					}
-			    	    hdrmap.put("acct_code",acctCodeDet);
-						hdrmap.put("cctr_code",cctrCodeDet);
-						hdrmap.put("dept_code",deptCodeDet);
-						hdrmap.put("emp_code",empCodeDet);
-						hdrmap.put("anal_code",analCodeDet);
-						hdrmap.put("analysis1",analysis1);
-						hdrmap.put("analysis2",analysis2);
-						hdrmap.put("analysis3",analysis3);
-						hdrmap.put("curr_code",currcode );
-						hdrmap.put("exch_rate",exch_h);
-						hdrmap.put("ref_type","F");
-						hdrmap.put("ref_ser","VOUCH");
-						hdrmap.put("ref_id",ref_id);
-						hdrmap.put("remarks",remarks);
-						hdrmap.put("proj_code",proj_code);
+					detMap.put("acct_code",checknull(acctCodeDet).trim());
+					detMap.put("cctr_code",cctrCodeDet);
+					detMap.put("dept_code",deptCodeDet);
+					detMap.put("emp_code",empCodeDet);
+					detMap.put("anal_code",analCodeDet);
+					detMap.put("analysis1",analysis1);
+					detMap.put("analysis2",analysis2);
+					detMap.put("analysis3",analysis3);
+					detMap.put("curr_code",currcode );
+					detMap.put("exch_rate",exch_h);
+					detMap.put("ref_type","F");
+					detMap.put("ref_ser","VOUCH");
+					detMap.put("ref_id",ref_id);
+					detMap.put("remarks",remarks);
+					detMap.put("proj_code",proj_code);
 
 					/* party_doc_ref = finCommon.gfGetPartyDocRef("VOUCH",ref_id,conn);
 						hdrmap.put("party_doc_ref",party_doc_ref);
 					 */
-						System.out.println("calling Gltrace Update for taxtranamt*******************");
+					System.out.println("calling Gltrace Update for taxtranamt***************detMap["+detMap+"]*");
+					detMap.put("amount",amount);
+					detList.add(detMap);
+
+					/*
+						errString = finCommon.glTraceUpdate(detMap,conn,true); 
+						System.out.println("ERROR STRING>>>>>>>>>>>>>>>>>>>>>>["+errString+"]");
+						if(errString != null && errString.trim().length() > 0)
+						{
+							return errString;
+						}*/
+
+				}//for taxtranamt != 0.0
+
+
+			}
+			rs.close();
+			rs=null;
+			pstmt.close();
+			pstmt=null;
+
+			System.out.println("Size of Detail ArrayList::::::::::::::::"+detList.size());	
+
+
+			// for each detail do the posting
+
+			//********Posting for Receipt window
+
+
+
+			sql = "select exch_rate, curr_code from voucher where tran_id = ? ";
+			pstmt = conn.prepareStatement(sql);
+			pstmt.setString(1,tranID);
+			rs = pstmt.executeQuery();
+			if(rs.next())
+			{
+				exchRate = rs.getDouble("exch_rate");
+				currCode = rs.getString("curr_code");
+			}
+			rs.close();
+			rs=null;
+			pstmt.close();
+			pstmt=null;
+
 
+			/*
+					sql = "select line_no from vouchrcp where tran_id = ?";
+					  pstmt1 = conn.prepareStatement(sql);
+						pstmt1.setString(1,tranID);
+						rs1 = pstmt1.executeQuery();
+						while(rs1.next())
+						{
+						     lineNoRcp = rs1.getString("line_no");
+						        System.out.println("Posting Receipt window !!!!!!!!!!!!!!!"+rs1.getRow());*/
+			sql = "select * from vouchrcp where tran_id = ?";
+			pstmt = conn.prepareStatement(sql);
+			pstmt.setString(1,tranID);
+			//	pstmt.setString(2,lineNoRcp);
+			rs = pstmt.executeQuery();
+			while(rs.next())
+			{
+				lineNoRcp = rs.getString("line_no");
+				prcpId = rs.getString("prcp_id");	
+				//	rcpAmt = rs.getDouble("vouch_amt");	
+				itemCode = checkNull(rs.getString("item_code"));
+				itemSer = checkNull(rs.getString("item_ser"));
+				discAmt = rs.getDouble("disc_amt");
+				acctCodePh = checkNull(rs.getString("acct_code"));
+				cctrCodePh = checkNull(rs.getString("cctr_code"));
+				deptCode = checkNull(checkNull(rs.getString("dept_code")));
+				projCode = checkNull(rs.getString("proj_code"));
+				analCode = checkNull(rs.getString("anal_code"));
+				anly1 = checkNull(rs.getString("analysis1"));
+				anly2 = checkNull(rs.getString("analysis2"));
+				anly3 = checkNull(rs.getString("analysis3"));
+
+
+				/**************adding code**/		
+				sql = "select quantity as ld_rcp_qty,vouch_qty as ld_vouch_qty, " +
+						"case when net_amt is null then 0 else net_amt end as lc_rcp_mra," +
+						" case when additional_cost is null then 0 else additional_cost end as lc_addcost " +
+						"from porcpdet where tran_id = ?  and line_no = ? ";
+				pstmt1 = conn.prepareStatement(sql);
+				pstmt1.setString(1,prcpId);
+				pstmt1.setString(2,lineNoRcp);
+				rs1 = pstmt1.executeQuery();
+				while(rs1.next())
+				{
+					rcpQty = rs1.getDouble("ld_rcp_qty");
+					vouchQty = rs1.getDouble("ld_vouch_qty"); 
+					rcpMra = rs1.getDouble("lc_rcp_mra"); 
+					addCost = rs1.getDouble("lc_addcost"); 
+				}
+				rs1.close();
+				rs1=null;
+				pstmt1.close();
+				pstmt1=null;	
+
+
+				if(prcpId!= null && prcpId.trim().length()>0)
+				{
+					sql = "select post_type, acct_inv_online from porcp where tran_id = ?";
+					pstmt1 = conn.prepareStatement(sql);
+					pstmt1.setString(1,prcpId);
+
+					rs1 = pstmt1.executeQuery();
+					while(rs1.next())
+					{
+						postType = rs1.getString("post_type");
+						acctInvOnline = rs1.getString("acct_inv_online");
+					}
+					rs1.close();
+					rs1=null;
+					pstmt1.close();
+					pstmt1=null;
+
+					if(postType == null || postType.trim().length() == 0)
+					{
+						postType = "A";
+					}
+
+				}
+				/************/	
+
+				System.out.println("Transaction Type >>>>"+tranType);
+				System.out.println("acctCodePh  >>>>"+acctCodePh+ "       cctrCodePh "+cctrCodePh);
+				String[] arrayOne = new String[1000];
+				if(acctCodePh == null ||  acctCodePh.trim().length() == 0)
+				{
+					System.out.println("706********INSIDING DETERMINATION TYPE");
+					acctCodePh = finCommon.getAcctDetrTtype(itemCode, itemSer, "IN", tranType, conn);
+
+					arrayOne  = getTokens(acctCodePh,",");
+
+				}
+				System.out.println("cctrCodePh******"+arrayOne[1]+"    acctCodePhStr*********"+arrayOne[0]);
+				//prcp_id  = rs.getString("prcp_id");
+
+
+				if(arrayOne.length > 1)
+				{								
+					cctrCodePhStr = arrayOne[1];
+				}
+				else
+				{
+					cctrCodePhStr = " ";
+				}
+				if(arrayOne.length > 0)
+				{
+					acctCodePhStr = arrayOne[0];
+				}
+				else
+				{
+					acctCodePhStr = " ";
+				}
+				System.out.println("cctrCodePhStr******"+cctrCodePhStr+"    acctCodePhStr*********"+acctCodePhStr);
+				/// pick up the std rate and find out the std amt.
+
+
+				/****adding code***/	
+				qty =  rs.getDouble("vouch_qty");	
+				stdRate = rs.getDouble("std_rate");
+				rcpRate = rs.getDouble("rcp_rate");
+
+				if(stdRate == -1)
+				{
+					stdRate = rcpRate;
+				}
+
+				stdAmt = qty * stdRate;
+				actAmt = rs.getDouble("vouch_amt");
+
+				if("S".equalsIgnoreCase(postType))
+				{
+					// lc_diff_amt take inside if condition post only when post type is 'S'
+					diffAmt = (actAmt * exch_h) - stdAmt;
+					rcpAmt = stdAmt;
+				}
+				else
+				{
+					rcpAmt = actAmt;
+				}
+				if(!"S".equalsIgnoreCase(postType) && !"N".equalsIgnoreCase(acctInvOnline))
+				{
+					sql = "select sum(nvl(reco_amount,0)) as lc_porcp_reco from taxtran " +
+							" where tran_code= 'P-RCP' and tran_id	= ? and line_no	= ?" +
+							" and reco_amount <> 0";
+
+					pstmt1 = conn.prepareStatement(sql);
+					pstmt1.setString(1,prcpId);
+					pstmt1.setString(2,lineNoRcp);
+					rs1 = pstmt1.executeQuery();
+					while(rs1.next())
+					{
+						porcpReco = rs1.getDouble("lc_porcp_reco");
+
+					}
+					rs1.close();
+					rs1=null;
+					pstmt1.close();
+					pstmt1=null;
+
+					sql = "select sum(nvl(a.tax_amt,0)) as lc_non_payable" +
+							" from taxtran a, tax b	where a.tax_code = b.tax_code and " +
+							"a.tran_code= 'P-RCP' and 	a.tran_id	= ?  and a.line_no	= ? " +
+							" and a.tax_amt <> 0 and b.non_payable = 'Y' ";
+
+					pstmt1 = conn.prepareStatement(sql);
+					pstmt1.setString(1,prcpId);
+					pstmt1.setString(2,lineNoRcp);
+					rs1 = pstmt1.executeQuery();
+					while(rs1.next())
+					{
+						nonPayable = rs1.getDouble("lc_non_payable");
+
+					}
+					rs1.close();
+					rs1=null;
+					pstmt1.close();
+					pstmt1=null;
+
+
+
+					//   lc_rcp_mra = lc_rcp_mra - lc_non_payable + lc_disc_amt
+					rcpMra = rcpMra - nonPayable + discAmt;
+					/// praportionate mra as per the voucher quantity.
+					/*lc_rcp_mra = lc_rcp_mra * (ld_qty/ld_rcp_qty) 
+						    				lc_mra_ppv = lc_rcp_amt - lc_rcp_mra  /// voucher amount - rcp mra amount 
+						    				lc_rcp_amt = lc_rcp_mra	*/
+					rcpMra = rcpMra * (qty/rcpQty);
+					mraPpv = rcpAmt - rcpMra;
+					rcpAmt = rcpMra;
+				}// calculate MRA and post diff to PPV a/c
+
+
+
+				/****/	
+
+
+				sql = "select quantity,vouch_qty,rate from porcpdet where tran_id = ? and line_no = ?" ;
+				pstmt2 = conn.prepareStatement(sql);
+				pstmt2.setString(1,prcpId);
+				pstmt2.setString(2,lineNoRcp);
+				rs2 = pstmt2.executeQuery();
+				while(rs2.next())
+				{
+					rcpQty = rs2.getDouble("quantity");
+					vchQty = rs2.getDouble("vouch_qty");
+					rate = rs2.getDouble("rate");
+				}
+				rs2.close();
+				rs2=null;
+				pstmt2.close();
+				pstmt2=null;
+
+				String[] cctrCodeDis1;
+				acctCodeDis= finCommon.getAcctDetrTtype(itemCode, itemSer, "DIS", tranType, conn);
+				cctrCodeDis1 = getTokens(acctCodeDis,",");
+
+
+				varAmt = rcpAmt - (rcpQty - vchQty)*rate;
+				System.out.println("tHE vAMT *****"+varAmt);
+
+				if(varAmt != 0.0)
+				{
+					rcpAmt = (rcpQty - vchQty)*rate;
+				}
+				System.out.println("RCP AMount >>>>>>>>>>"+rcpAmt);
+
+				/*sql = "select count(*) from vouchdet where acct_code = ? and cctr_code = ?";
+									pstmt2 = conn.prepareStatement(sql);
+									pstmt2.setString(1,acctCodePhStr);
+									pstmt2.setString(2,cctrCodePhStr);
+									rs2 = pstmt2.executeQuery();
+									while(rs2.next())
+									{
+										count = rs2.getInt(1);
+
+									}
+							     	rs2.close();
+								    rs2=null;
+								    pstmt2.close();
+								    pstmt2=null;
+									if(count == 0 )
+									{*/
+				rcpMap = new HashMap();
+				// hdrmap.put("amount",rs.getString("acct_code"));
+				rcpMap.put("tran_date",tranDate);
+				rcpMap.put("eff_date", effDate);
+				rcpMap.put("fin_entity",finentity);
+				rcpMap.put("site_code",sitecode);
+				rcpMap.put("acct_code",checknull(acctCodePhStr).trim());
+				rcpMap.put("cctr_code",cctrCodePhStr);
+				rcpMap.put("dr_amt", rcpAmt);
+				rcpMap.put("cr_amt",0.0);
+				rcpMap.put("dept_code",deptCode);
+				//hdrmap.put("emp_code",rs.getString(""));
+				rcpMap.put("anal_code",analCode);
+				rcpMap.put("proj_code",projCode);
+				rcpMap.put("analysis1",anly1);
+				rcpMap.put("analysis2",anly2);
+				rcpMap.put("analysis3",anly3);
+
+				rcpMap.put("exch_rate",exchRate);
+				rcpMap.put("curr_code",currCode);
+				rcpMap.put("ref_id",ref_id);
+			
+				rcpMap.put("sundry_type",'O');
+				//rcpMap.put("sundry_code",suppcode);
+				rcpMap.put("ref_ser","VOUCH");
+				rcpMap.put("remarks",remarks);
+				rcpMap.put("ref_type","F");
+				
+				System.out.println("calling Gltrace Update for VoucherRcp*********1**********rcpMap["+rcpMap+"]*");
+
+				rcpList.add(rcpMap);
+				/*errString = finCommon.glTraceUpdate(hdrmap,conn,true); 
+											System.out.println("ERROR STRING>>>>>>>>>>>>>>>>>>>>>>["+errString+"]");
+											if(errString != null && errString.trim().length() > 0)
+											{
+												return errString;
+											}*/
+				/*	}
+
+									else if (count > 0)//posting again instead of setting into detail*****updating amount
+									{
+										rcpMap = new HashMap();
+											rcpMap.put("tran_date",tranDate);
+											rcpMap.put("eff_date", effDate);
+											rcpMap.put("fin_entity",finentity);
+											rcpMap.put("site_code",sitecode);
+											rcpMap.put("acct_code",arrayOne[0]);
+											rcpMap.put("cctr_code",arrayOne[1]);
+										    System.out.println("Updating amount ******"+ rcpAmt + amount);
+										    rcpMap.put("dr_amt", rcpAmt + amount );//**updating amount
+										    rcpMap.put("cr_amt",0.0);
+										    rcpMap.put("dept_code",deptCode);
+											//hdrmap.put("emp_code",rs.getString(""));
+										    rcpMap.put("anal_code",analCode);
+										    rcpMap.put("proj_code",projCode);
+										    rcpMap.put("analysis1",anly1);
+										    rcpMap.put("analysis2",anly2);
+										    rcpMap.put("analysis3",anly3);
+											System.out.println("calling Gltrace Update for VoucherRcp*********2**********");
+											rcpList.add(rcpMap);
+											errString = finCommon.glTraceUpdate(hdrmap,conn,true); 
+											System.out.println("ERROR STRING>>>>>>>>>>>>>>>>>>>>>>["+errString+"]");
+											if(errString != null && errString.trim().length() > 0)
+											{
+												return errString;
+											}
+									}*/
+
+
+
+
+
+				if("S".equalsIgnoreCase(postType))//if post type is S then only post the recovery
+				{
+					totrecoamt = 0.0;
+					sql = "select a.acct_code__reco,	a.cctr_code__reco, sum(a.reco_amount) as reco_sum from taxtran a," +
+							" tax b  where a.tax_code = b.tax_code and a.tran_code= 'VOUCH' "
+							+"and  a.tran_id	= ? and a.line_no	= ?  and case when a.reco_amount is null " +
+							"then 0 else a.reco_amount end <> 0 and b.effect <> 'N' group by a.acct_code__reco," +
+							" a.cctr_code__reco ";
+
+					pstmt1 = conn.prepareStatement(sql);
+					pstmt1.setString(1,tranID);
+					pstmt1.setString(2,lineNoRcp);
+					rs1 = pstmt1.executeQuery();
+					while(rs1.next())
+					{
+						acctCodeReco = rs1.getString("acct_code__reco");
+						cctrCodeReco = rs1.getString("cctr_code__reco");
+						sumRecAmt = rs1.getDouble("reco_amount");
+
+					}
+					rs1.close();
+					rs1=null;
+					pstmt1.close();
+					pstmt1=null;
+
+					String[] amtRecov = new String[1000];
+					if(acctCodeReco == null ||  acctCodeReco.trim().length() == 0)
+					{
+						System.out.println("1012********INSIDING TAXRECO TYPE");
+						cctrCodeRecov = finCommon.getAcctDetrTtype(itemCode, itemSer, "TAXRECO", tranType, conn);
+
+						amtRecov  = getTokens(acctCodePh,",");
+						///putting condition if else
+
+						if(amtRecov.length>0)
+						{
+							acctCodeRecovStr = amtRecov[0];
+						}
+						else
+						{
+							acctCodeRecovStr = " ";
+						}
+						if(amtRecov.length>1)
+						{
+							cctrCodeRecovStr = amtRecov[1];
+						}
+						else
+						{
+							cctrCodeRecovStr = " ";
+						}
+						System.out.println("1018********acctCodeRecovStr :::"+acctCodeRecovStr+ "****cctrCodeRecovStr***"+cctrCodeRecovStr);
+
+
+						if(cctrCodeRecovStr == null)
+						{
+							cctrCodeRecovStr = cctrCodePhStr;
+						}
+
+					}	
+					if(!"S".equalsIgnoreCase(postType) && "N".equalsIgnoreCase(acctInvOnline))
+					{
+						rcpMap.put("amount",amount - sumRecAmt);
+					}
+					else
+					{
+						totrecoamt = totrecoamt + sumRecAmt;
+					}
+
+					/* sql = "select count(*) from vouchdet where acct_code = ? and cctr_code = ?";
+													pstmt2 = conn.prepareStatement(sql);
+													pstmt2.setString(1,acctCodeRecovStr);
+													pstmt2.setString(2,cctrCodeRecovStr);
+													rs2 = pstmt2.executeQuery();
+													while(rs2.next())
+													{
+														recoCount = rs2.getInt(1);
+
+													}
+											     	rs2.close();
+												    rs2=null;
+												    pstmt2.close();
+												    pstmt2=null;
+
+												    if(recoCount == 0)
+												    {*/
+					rcpMap = new HashMap();
+					rcpMap.put("tran_date",tranDate);
+					rcpMap.put("eff_date", effDate);
+					rcpMap.put("fin_entity",finentity);
+					rcpMap.put("site_code",sitecode);
+					rcpMap.put("acct_code",checknull(acctCodeRecovStr).trim());
+					rcpMap.put("cctr_code",cctrCodeRecovStr);
+					rcpMap.put("dr_amt",sumRecAmt );
+					rcpMap.put("cr_amt",0.0);
+					rcpMap.put("dept_code",deptCode);
+					//hdrmap.put("emp_code",rs.getString(""));
+					rcpMap.put("anal_code",analCode);
+					rcpMap.put("proj_code",projCode);
+					rcpMap.put("analysis1",anly1);
+					rcpMap.put("analysis2",anly2);
+					rcpMap.put("analysis3",anly3);
+
+					rcpMap.put("exch_rate",exchRate);
+					rcpMap.put("curr_code",currCode);
+					rcpMap.put("ref_id",ref_id);
+
+					rcpMap.put("sundry_type",'O');
+					rcpMap.put("ref_ser","VOUCH");
+					rcpMap.put("remarks",remarks);
+					rcpMap.put("ref_type","F");
+					
+					System.out.println("calling Gltrace Update for VoucherRcp********3*********rcpMap["+rcpMap+"]*");
+					rcpList.add(rcpMap);
+
+					/*	errString = finCommon.glTraceUpdate(hdrmap,conn,true); 
+															System.out.println("ERROR STRING>>>>>>>>>>>>>>>>>>>>>>["+errString+"]");
+															if(errString != null && errString.trim().length() > 0)
+															{
+																return errString;
+															}*/
+					/*   }
+													else if (recoCount > 0)//posting again instead of setting into detail*****updating amount
+													{
+														rcpMap.put("tran_date",tranDate);
+														rcpMap.put("eff_date", effDate);
+														rcpMap.put("fin_entity",finentity);
+														rcpMap.put("site_code",sitecode);
+														rcpMap.put("acct_code",acctCodeRecovStr);
+														rcpMap.put("cctr_code",cctrCodeRecovStr);
+														    System.out.println("Updating amount ******"+ varAmt + amount);
+														    rcpMap.put("dr_amt", varAmt + amount );//**updating amount
+														    rcpMap.put("cr_amt",0.0);
+														    rcpMap.put("dept_code",deptCode);
+															//hdrmap.put("emp_code",rs.getString(""));
+														    rcpMap.put("anal_code",analCode);
+														    rcpMap.put("proj_code",projCode);
+														    rcpMap.put("analysis1",anly1);
+														    rcpMap.put("analysis2",anly2);
+														    rcpMap.put("analysis3",anly3);
+															System.out.println("calling Gltrace Update for VoucherRcp*********4**********");
+															rcpList.add(rcpMap);
 															errString = finCommon.glTraceUpdate(hdrmap,conn,true); 
 															System.out.println("ERROR STRING>>>>>>>>>>>>>>>>>>>>>>["+errString+"]");
 															if(errString != null && errString.trim().length() > 0)
 															{
 																return errString;
 															}
+													}*/
 
-			      }
 
 				}
 
-					rs1.close();
-					rs1=null;
-					pstmt1.close();
-					pstmt1=null;
-					
-					//********Posting for Receipt window
+				/// if posting is standards then post diff to diff account
+System.out.println("@@@@@@@@@ acctInvOnline["+acctInvOnline+"]");
+				if(!"N".equalsIgnoreCase(acctInvOnline))
+				{
+					taxDiff = 0.0;
+					sql = "select sum(case when a.tax_amt is null then 0 else a.tax_amt end) as lc_taxdiff, " +
+							"sum(case when a.reco_amount is null then 0 else a.reco_amount end) as lc_totrecoamt from taxtran a, tax b "
+							+" where a.tax_code = b.tax_code  and 	a.tran_code= 'VOUCH' and a.tran_id	= ? and a.line_no	= ?" +
+							" and	b.effect <> 'N' and a.acct_code is null ";
 
-                    String ls_acct_tax = "",ls_cctr_tax = "";
-                    String itemCode = "",itemSer ="",anly1 = "",acctCodePh = "",cctrCodePh = "",deptCode = "",projCode = "",analCode = "",anly2 = "",anly3 = "",acctVar = "",purcOrd = "";
-                    double 	discAmt = 0.0,lc_tax_amt = 0.0,lc_reco_amt = 0.0 ,lc_rndAmt = 0.0;
-                    int count = 0,count1 = 0,count2 = 0,count3 = 0,count4 = 0;
-					String lineNoRcp = "",prcp_id = "",cctrCodeDis = "",acctCodeDis = "",itemCode2 = "",itemSer2 = "",taxLs = "";
-							double rcpQty=0.0,vchQty = 0.0,rate = 0.0,rcpAmt = 0.0,varAmt = 0.0;
-					sql = "select line_no from vouchrcp where tran_id = ?";
 					pstmt1 = conn.prepareStatement(sql);
 					pstmt1.setString(1,tranID);
+					pstmt1.setString(2,lineNoRcp);
 					rs1 = pstmt1.executeQuery();
 					while(rs1.next())
 					{
-						     lineNoRcp = rs1.getString("line_no");
-						        System.out.println("Posting Receipt window !!!!!!!!!!!!!!!"+rs1.getRow());
-						        sql = "select * from vouchrcp where tran_id = ? and line_no = ?";
-						        pstmt = conn.prepareStatement(sql);
-								pstmt.setString(1,tranID);
-								pstmt.setString(2,lineNoRcp);
-								rs = pstmt.executeQuery();
-								while(rs.next())
-								{
+						taxDiff = rs1.getDouble("lc_taxdiff");
+						totRecAmt = rs1.getDouble("lc_totrecoamt");
 
-								rcpAmt = rs.getDouble("vouch_amt");	
-								itemCode = rs.getString("item_code");
-								itemSer = rs.getString("item_ser");
-								discAmt = rs.getDouble("disc_amt");
-								acctCodePh = rs.getString("acct_code");
-								cctrCodePh = rs.getString("cctr_code");
-								deptCode = checkNull(rs.getString("dept_code"));
-								projCode = rs.getString("proj_code");
-								analCode = rs.getString("anal_code");
-								anly1 = rs.getString("analysis1");
-								anly2 = rs.getString("analysis2");
-								anly3 = rs.getString("analysis3");
+					}
+					rs1.close();
+					rs1=null;
+					pstmt1.close();
+					pstmt1=null;
+					//// amish 17-01-04 post recovery amount only in case of standard posting.
 
-								System.out.println("Transaction Type >>>>"+tranType);
-								System.out.println("acctCodePh  >>>>"+acctCodePh+ "       cctrCodePh "+cctrCodePh);
-								String[] arrayOne = new String[1000];
-								if(acctCodePh == null ||  acctCodePh.trim().length() == 0)
+					if("S".equalsIgnoreCase(postType))
 					{
-									System.out.println("706********INSIDING DETERMINATION TYPE");
-									acctCodePh = finCommon.getAcctDetrTtype(itemCode, itemSer, "IN", tranType, conn);
-							
-									arrayOne  = getTokens(acctCodePh,",");
-								
+						taxDiff = taxDiff -  totRecAmt;
+						// amish 31-08-04 post diff in basic currency if post type is standard
+						taxDiff = taxDiff * exch_h;
+						diffAmt = diffAmt + taxDiff;
 					}
-								System.out.println("cctrCodePh******"+arrayOne[1]+"    acctCodePh*********"+arrayOne[0]);
-								prcp_id  = rs.getString("prcp_id");
+					else
+					{
+						mraPpv = mraPpv + taxDiff;
+						diffAmt = mraPpv;
 
+					}
+					System.out.println("Difference Amount :::::::::::::: "+diffAmt);
+					acctppv= checkNull(finCommon.getAcctDetrTtype(itemCode, itemSer, "PPV", tranType, conn));
 
-								sql = "select quantity,vouch_qty,rate from porcpdet where tran_id = ? and line_no = ?" ;
-								    pstmt2 = conn.prepareStatement(sql);
-									pstmt2.setString(1,prcp_id);
-									pstmt2.setString(2,lineNoRcp);
-									rs2 = pstmt2.executeQuery();
-									while(rs2.next())
+					acctPPvArr = getTokens(acctppv,",");
+					System.out.println("Length of array :- "+acctPPvArr.length);
+					if(acctPPvArr.length > 0)
 					{
-										rcpQty = rs2.getDouble("quantity");
-										vchQty = rs2.getDouble("vouch_qty");
-										rate = rs2.getDouble("rate");
+						acctPpvStr = acctPPvArr[0];
 					}
-									rs2.close();
-									rs2=null;
-									pstmt2.close();
-									pstmt2=null;
-									
-									String[] cctrCodeDis1;
-									acctCodeDis= finCommon.getAcctDetrTtype(itemCode, itemSer, "DIS", tranType, conn);
-									cctrCodeDis1 = getTokens(acctCodeDis,",");
-									
-					
-									varAmt = rcpAmt - (rcpQty - vchQty)*rate;
-									System.out.println("tHE vAMT *****"+varAmt);
-									
-									if(varAmt != 0.0)
+					else
 					{
-										rcpAmt = (rcpQty - vchQty)*rate;
+						acctPpvStr =" ";
+					}
+					if(acctPPvArr.length > 1)
+					{
+						cctrPpvStr = acctPPvArr[1];
+					}
+					else
+					{
+						cctrPpvStr = " ";
+					}
+					if(cctrPpvStr == null)
+					{
+						cctrPpvStr = cctrCodePhStr;
 					}
-									System.out.println("RCP AMount >>>>>>>>>>"+rcpAmt);
 
-									sql = "select count(*) from vouchdet where acct_code = ? and cctr_code = ?";
+					/* sql = "select count(*) from vouchdet where acct_code = ? and cctr_code = ?";
 											pstmt2 = conn.prepareStatement(sql);
-									pstmt2.setString(1,arrayOne[0]);
-									pstmt2.setString(2,arrayOne[1]);
+											pstmt2.setString(1,acctPpvStr);
+											pstmt2.setString(2,cctrPpvStr);
 											rs2 = pstmt2.executeQuery();
 											while(rs2.next())
 											{
-										count = rs2.getInt(1);
+												ppvCount = rs2.getInt(1);
 
 											}
 									     	rs2.close();
 										    rs2=null;
 										    pstmt2.close();
 										    pstmt2=null;
-									if(count == 0 )
-									{
-										// hdrmap.put("amount",rs.getString("acct_code"));
-										    hdrmap.put("tran_date",tranDate);
-											hdrmap.put("eff_date", effDate);
-											hdrmap.put("fin_entity",finentity);
-											hdrmap.put("site_code",sitecode);
-											hdrmap.put("acct_code",arrayOne[0]);
-										    hdrmap.put("cctr_code",arrayOne[1]);
-											hdrmap.put("dr_amt", rcpAmt);
-											hdrmap.put("cr_amt",0.0);
-											hdrmap.put("dept_code",deptCode);
-											//hdrmap.put("emp_code",rs.getString(""));
-											hdrmap.put("anal_code",analCode);
-											hdrmap.put("proj_code",projCode);
-											hdrmap.put("analysis1",anly1);
-											hdrmap.put("analysis2",anly2);
-											hdrmap.put("analysis3",anly3);
-											System.out.println("calling Gltrace Update for VoucherRcp*********1**********");
 
-											errString = finCommon.glTraceUpdate(hdrmap,conn,true); 
+										    if(ppvCount == 0)
+										    {*/
+					rcpMap = new HashMap();
+					rcpMap.put("tran_date",tranDate);
+					rcpMap.put("eff_date", effDate);
+					rcpMap.put("fin_entity",finentity);
+					rcpMap.put("site_code",sitecode);
+					rcpMap.put("acct_code",checknull(acctPpvStr).trim());
+					rcpMap.put("cctr_code",cctrPpvStr);
+					rcpMap.put("dr_amt",diffAmt);
+					rcpMap.put("cr_amt",0.0);
+					rcpMap.put("dept_code",deptCode);
+					//hdrmap.put("emp_code",rs.getString(""));
+					rcpMap.put("anal_code",analCode);
+					rcpMap.put("proj_code",projCode);
+					rcpMap.put("analysis1",anly1);
+					rcpMap.put("analysis2",anly2);
+					rcpMap.put("analysis3",anly3);
+
+					rcpMap.put("exch_rate",exchRate);
+					rcpMap.put("curr_code",currCode);
+					rcpMap.put("ref_id",ref_id);
+
+					rcpMap.put("sundry_type",'O');
+					//rcpMap.put("sundry_code",suppcode);
+					rcpMap.put("ref_ser","VOUCH");
+					rcpMap.put("remarks",remarks);
+					rcpMap.put("ref_type","F");
+					
+					System.out.println("calling Gltrace Update for VoucherRcp********3***********rcpMap["+rcpMap+"]*");
+					rcpList.add(rcpMap);
+
+					/*	errString = finCommon.glTraceUpdate(hdrmap,conn,true); 
 													System.out.println("ERROR STRING>>>>>>>>>>>>>>>>>>>>>>["+errString+"]");
 													if(errString != null && errString.trim().length() > 0)
 													{
 														return errString;
-											}
-									}
-									
-									else if (count > 0)//posting again instead of setting into detail*****updating amount
-									{
-										    hdrmap.put("tran_date",tranDate);
-											hdrmap.put("eff_date", effDate);
-											hdrmap.put("fin_entity",finentity);
-											hdrmap.put("site_code",sitecode);
-											hdrmap.put("acct_code",arrayOne[0]);
-										    hdrmap.put("cctr_code",arrayOne[1]);
-										    System.out.println("Updating amount ******"+ rcpAmt + amount);
-											hdrmap.put("dr_amt", rcpAmt + amount );//**updating amount
-											hdrmap.put("cr_amt",0.0);
-											hdrmap.put("dept_code",deptCode);
+													}*/
+					/* }
+											else if (ppvCount > 0)//posting again instead of setting into detail*****updating amount
+											{
+												rcpMap = new HashMap();
+												rcpMap.put("tran_date",tranDate);
+												rcpMap.put("eff_date", effDate);
+												rcpMap.put("fin_entity",finentity);
+												rcpMap.put("site_code",sitecode);
+												rcpMap.put("acct_code",acctCodeRecovStr);
+												rcpMap.put("cctr_code",cctrCodeRecovStr);
+												    System.out.println("Updating PPV amount ******"+ diffAmt + amount);
+												    rcpMap.put("dr_amt", diffAmt + amount );//**updating amount
+												    rcpMap.put("cr_amt",0.0);
+												    rcpMap.put("dept_code",deptCode);
 													//hdrmap.put("emp_code",rs.getString(""));
-											hdrmap.put("anal_code",analCode);
-											hdrmap.put("proj_code",projCode);
-											hdrmap.put("analysis1",anly1);
-											hdrmap.put("analysis2",anly2);
-											hdrmap.put("analysis3",anly3);
-											System.out.println("calling Gltrace Update for VoucherRcp*********2**********");
-											
+												    rcpMap.put("anal_code",analCode);
+												    rcpMap.put("proj_code",projCode);
+												    rcpMap.put("analysis1",anly1);
+												    rcpMap.put("analysis2",anly2);
+												    rcpMap.put("analysis3",anly3);
+													System.out.println("calling Gltrace Update for VoucherRcp*********4**********");
+													rcpList.add(rcpMap);
 													errString = finCommon.glTraceUpdate(hdrmap,conn,true); 
 													System.out.println("ERROR STRING>>>>>>>>>>>>>>>>>>>>>>["+errString+"]");
 													if(errString != null && errString.trim().length() > 0)
 													{
 														return errString;
 													}
+											}*/
 				}
+				//For the following process refer to number 2) in the above note
+				// START following script added by pravin 16/sep/2013 DI3EDOS007 
+				// // START following script added by pravin 16/sep/2013 DI3EDOS007 
+
+
 
-								    if(varAmt != 0.0)//Variance amount
+
+
+				System.out.println("@@@@@@@@ varAmt["+varAmt+"]");
+				if(varAmt != 0.0  && false)//Variance amount  //test
 				{
 					acctVar= checkNull(finCommon.getAcctDetrTtype(itemCode, itemSer, "PPV", tranType, conn));
 					String tempStrAry[];
 					tempStrAry = getTokens(acctVar,",");
 					System.out.println("Length of array :- "+tempStrAry.length);
-//								    	System.out.println("acctVar>>>>>"+acctVar+"    cctrVar "+cctrVar);
-								    sql = "select count(*) from vouchdet where acct_code = ? and cctr_code = ?";
+					//								    	System.out.println("acctVar>>>>>"+acctVar+"    cctrVar "+cctrVar);
+					/*  sql = "select count(*) from vouchdet where acct_code = ? and cctr_code = ?";
 									pstmt2 = conn.prepareStatement(sql);
 									pstmt2.setString(1,tempStrAry[0]);
 									pstmt2.setString(2,tempStrAry[1]);
@@ -830,61 +1381,74 @@ public class PurchaseVoucherGltracePreview extends ActionHandlerEJB implements P
 							     	rs2.close();
 								    rs2=null;
 								    pstmt2.close();
-								    pstmt2=null;
-								    
-								    if(count1 == 0)
-								    {
-								    	   hdrmap.put("tran_date",tranDate);
-											hdrmap.put("eff_date", effDate);
-											hdrmap.put("fin_entity",finentity);
-											hdrmap.put("site_code",sitecode);
-											hdrmap.put("acct_code",tempStrAry[0]);
-										    hdrmap.put("cctr_code",tempStrAry[1]);
-											hdrmap.put("dr_amt",varAmt );
-											hdrmap.put("cr_amt",0.0);
-											hdrmap.put("dept_code",deptCode);
+								    pstmt2=null;*/
+
+					// if(count1 == 0)
+					// {
+					rcpMap = new HashMap();
+					rcpMap.put("tran_date",tranDate);
+					rcpMap.put("eff_date", effDate);
+					rcpMap.put("fin_entity",finentity);
+					rcpMap.put("site_code",sitecode);
+					rcpMap.put("acct_code",checknull(tempStrAry[0]).trim());
+					rcpMap.put("cctr_code",tempStrAry[1]);
+					rcpMap.put("dr_amt",varAmt );
+					rcpMap.put("cr_amt",0.0);
+					rcpMap.put("dept_code",deptCode);
 					//hdrmap.put("emp_code",rs.getString(""));
-											hdrmap.put("anal_code",analCode);
-											hdrmap.put("proj_code",projCode);
-											hdrmap.put("analysis1",anly1);
-											hdrmap.put("analysis2",anly2);
-											hdrmap.put("analysis3",anly3);
-											System.out.println("calling Gltrace Update for VoucherRcp********3**********");
-											
-											errString = finCommon.glTraceUpdate(hdrmap,conn,true); 
+					rcpMap.put("anal_code",analCode);
+					rcpMap.put("proj_code",projCode);
+					rcpMap.put("analysis1",anly1);
+					rcpMap.put("analysis2",anly2);
+					rcpMap.put("analysis3",anly3);
+
+					rcpMap.put("exch_rate",exchRate);
+					rcpMap.put("curr_code",currCode);
+					rcpMap.put("ref_id",ref_id);
+
+					rcpMap.put("sundry_type",'O');
+					//rcpMap.put("sundry_code",suppcode);
+					rcpMap.put("ref_ser","VOUCH");
+					rcpMap.put("remarks",remarks);
+					rcpMap.put("ref_type","F");
+					
+					System.out.println("calling Gltrace Update for VoucherRcp********31**********rcpMap["+rcpMap+"]*");
+					rcpList.add(rcpMap);
+					/*errString = finCommon.glTraceUpdate(hdrmap,conn,true); 
 											System.out.println("ERROR STRING>>>>>>>>>>>>>>>>>>>>>>["+errString+"]");
 											if(errString != null && errString.trim().length() > 0)
 											{
 												return errString;
-											}
-								    }
-									else if (count1 > 0)//posting again instead of setting into detail*****updating amount
-									{
-										    hdrmap.put("tran_date",tranDate);
-											hdrmap.put("eff_date", effDate);
-											hdrmap.put("fin_entity",finentity);
-											hdrmap.put("site_code",sitecode);
-											hdrmap.put("acct_code",tempStrAry[0]);
-										    hdrmap.put("cctr_code",tempStrAry[1]);
+											}*/
+					//    }
+					/*else if (count1 > 0)//posting again instead of setting into detail*****updating amount
+									{
+										rcpMap = new HashMap();
+										rcpMap.put("tran_date",tranDate);
+										rcpMap.put("eff_date", effDate);
+										rcpMap.put("fin_entity",finentity);
+										rcpMap.put("site_code",sitecode);
+										rcpMap.put("acct_code",tempStrAry[0]);
+										rcpMap.put("cctr_code",tempStrAry[1]);
 										    System.out.println("Updating amount ******"+ varAmt + amount);
-											hdrmap.put("dr_amt", varAmt + amount );//**updating amount
-											hdrmap.put("cr_amt",0.0);
-											hdrmap.put("dept_code",deptCode);
+										    rcpMap.put("dr_amt", varAmt + amount );//**updating amount
+										    rcpMap.put("cr_amt",0.0);
+										    rcpMap.put("dept_code",deptCode);
 											//hdrmap.put("emp_code",rs.getString(""));
-											hdrmap.put("anal_code",analCode);
-											hdrmap.put("proj_code",projCode);
-											hdrmap.put("analysis1",anly1);
-											hdrmap.put("analysis2",anly2);
-											hdrmap.put("analysis3",anly3);
+										    rcpMap.put("anal_code",analCode);
+										    rcpMap.put("proj_code",projCode);
+										    rcpMap.put("analysis1",anly1);
+										    rcpMap.put("analysis2",anly2);
+										    rcpMap.put("analysis3",anly3);
 											System.out.println("calling Gltrace Update for VoucherRcp*********4**********");
-											
+											rcpList.add(rcpMap);
 											errString = finCommon.glTraceUpdate(hdrmap,conn,true); 
 											System.out.println("ERROR STRING>>>>>>>>>>>>>>>>>>>>>>["+errString+"]");
 											if(errString != null && errString.trim().length() > 0)
 											{
 												return errString;
 											}
-									}
+									}*/
 
 
 				}//end of variance
@@ -899,7 +1463,7 @@ public class PurchaseVoucherGltracePreview extends ActionHandlerEJB implements P
 						acctCodeDis = acctCodePh;
 						cctrCodeDis = checkNull(cctrCodeDis);
 					}
-								    	sql = "select count(*) from vouchdet where acct_code = ? and cctr_code = ?";
+					/*	sql = "select count(*) from vouchdet where acct_code = ? and cctr_code = ?";
 										pstmt2 = conn.prepareStatement(sql);
 										pstmt2.setString(1,cctrCodeDis1[0]);
 										pstmt2.setString(2,cctrCodeDis1[1]);
@@ -912,60 +1476,76 @@ public class PurchaseVoucherGltracePreview extends ActionHandlerEJB implements P
 								     	rs2.close();
 									    rs2=null;
 									    pstmt2.close();
-									    pstmt2=null;
-								    	if(count2 == 0)
-								    	{
-								    		hdrmap.put("tran_date",tranDate);
-											hdrmap.put("eff_date", effDate);
-											hdrmap.put("fin_entity",finentity);
-											hdrmap.put("site_code",sitecode);
-											hdrmap.put("acct_code",cctrCodeDis1[0]);
-										    hdrmap.put("cctr_code",cctrCodeDis1[1]);
-											hdrmap.put("dr_amt", discAmt);
-											hdrmap.put("cr_amt",0.0);
-											hdrmap.put("dept_code",deptCode);
+									    pstmt2=null;*/
+					/*if(count2 == 0)
+								    	{*/
+					rcpMap = new HashMap();
+					rcpMap.put("tran_date",tranDate);
+					rcpMap.put("eff_date", effDate);
+					rcpMap.put("fin_entity",finentity);
+					rcpMap.put("site_code",sitecode);
+					rcpMap.put("acct_code",checknull(cctrCodeDis1[0]).trim());
+					rcpMap.put("cctr_code",cctrCodeDis1[1]);
+					rcpMap.put("dr_amt", discAmt);
+					rcpMap.put("cr_amt",0.0);
+					rcpMap.put("dept_code",deptCode);
 					//hdrmap.put("emp_code",rs.getString(""));
-											hdrmap.put("anal_code",analCode);
-											hdrmap.put("proj_code",projCode);
-											hdrmap.put("analysis1",anly1);
-											hdrmap.put("analysis2",anly2);
-											hdrmap.put("analysis3",anly3);
-											System.out.println("calling Gltrace Update for VoucherRcp********3**********");
+					rcpMap.put("anal_code",analCode);
+					rcpMap.put("proj_code",projCode);
+					rcpMap.put("analysis1",anly1);
+					rcpMap.put("analysis2",anly2);
+					rcpMap.put("analysis3",anly3);
+
+					rcpMap.put("exch_rate",exchRate);
+					rcpMap.put("curr_code",currCode);
+					rcpMap.put("ref_id",ref_id);
 
+
+					rcpMap.put("sundry_type",'O');
+					//rcpMap.put("sundry_code",suppcode);
+					rcpMap.put("ref_ser","VOUCH");
+					rcpMap.put("remarks",remarks);
+					rcpMap.put("ref_type","F");
+					
+					System.out.println("calling Gltrace Update for VoucherRcp********3**********rcpMap["+rcpMap+"]*");
+					rcpList.add(rcpMap);
+
+					/*
 											errString = finCommon.glTraceUpdate(hdrmap,conn,true); 
 											System.out.println("ERROR STRING>>>>>>>>>>>>>>>>>>>>>>["+errString+"]");
 											if(errString != null && errString.trim().length() > 0)
 											{
 												return errString;
-											}
-								    	}
-								    	else if (count2 > 0)//posting again instead of setting into detail*****updating amount
-										{
-											    hdrmap.put("tran_date",tranDate);
-												hdrmap.put("eff_date", effDate);
-												hdrmap.put("fin_entity",finentity);
-												hdrmap.put("site_code",sitecode);
-												hdrmap.put("acct_code",cctrCodeDis1[0]);
-											    hdrmap.put("cctr_code",cctrCodeDis1[1]);
+											}*/
+					//}
+					/*else if (count2 > 0)//posting again instead of setting into detail*****updating amount
+										{
+								    		rcpMap = new HashMap();
+								    		rcpMap.put("tran_date",tranDate);
+								    		rcpMap.put("eff_date", effDate);
+								    		rcpMap.put("fin_entity",finentity);
+								    		rcpMap.put("site_code",sitecode);
+								    		rcpMap.put("acct_code",cctrCodeDis1[0]);
+								    		rcpMap.put("cctr_code",cctrCodeDis1[1]);
 											    System.out.println("Updating amount *discAmt*****"+ discAmt + amount);
-												hdrmap.put("dr_amt", discAmt + amount );//**updating amount
-												hdrmap.put("cr_amt",0.0);
-												hdrmap.put("dept_code",deptCode);
+											    rcpMap.put("dr_amt", discAmt + amount );//**updating amount
+											    rcpMap.put("cr_amt",0.0);
+											    rcpMap.put("dept_code",deptCode);
 												//hdrmap.put("emp_code",rs.getString(""));
-												hdrmap.put("anal_code",analCode);
-												hdrmap.put("proj_code",projCode);
-												hdrmap.put("analysis1",anly1);
-												hdrmap.put("analysis2",anly2);
-												hdrmap.put("analysis3",anly3);
+											    rcpMap.put("anal_code",analCode);
+											    rcpMap.put("proj_code",projCode);
+											    rcpMap.put("analysis1",anly1);
+											    rcpMap.put("analysis2",anly2);
+											    rcpMap.put("analysis3",anly3);
 												System.out.println("calling Gltrace Update for VoucherRcp*********4**********");
-												
+												rcpList.add(rcpMap);
 												errString = finCommon.glTraceUpdate(hdrmap,conn,true); 
 												System.out.println("ERROR STRING>>>>>>>>>>>>>>>>>>>>>>["+errString+"]");
 												if(errString != null && errString.trim().length() > 0)
 												{
 													return errString;
 												}
-										}
+										}*/
 				}//end of discount amount
 				// taxtran taken outside
 				//do{
@@ -1054,7 +1634,7 @@ public class PurchaseVoucherGltracePreview extends ActionHandlerEJB implements P
 						ls_cctr_tax = acctCodePh;
 					}
 
-								    	sql = "select count(*) from vouchdet where acct_code = ? and cctr_code = ?";
+					/*sql = "select count(*) from vouchdet where acct_code = ? and cctr_code = ?";
 										pstmt2 = conn.prepareStatement(sql);
 										pstmt2.setString(1,ls_acct_tax);
 										pstmt2.setString(2,ls_cctr_tax);
@@ -1072,58 +1652,71 @@ public class PurchaseVoucherGltracePreview extends ActionHandlerEJB implements P
 										// flag set as 'Y'. Records with flag 'Y' will not be considered in save_det
 										// while batchloading.
 								    	if(count3 == 0)
-								    	{
-								    		hdrmap.put("tran_date",tranDate);
-											hdrmap.put("eff_date", effDate);
-											hdrmap.put("fin_entity",finentity);
-											hdrmap.put("site_code",sitecode);
-											hdrmap.put("acct_code",ls_acct_tax);
-										    hdrmap.put("cctr_code",ls_cctr_tax);
-											hdrmap.put("dr_amt", lc_tax_amt);
-											hdrmap.put("cr_amt",0.0);
-											hdrmap.put("dept_code",deptCode);
+								    	{*/
+					rcpMap = new HashMap();
+					rcpMap.put("tran_date",tranDate);
+					rcpMap.put("eff_date", effDate);
+					rcpMap.put("fin_entity",finentity);
+					rcpMap.put("site_code",sitecode);
+					rcpMap.put("acct_code",checknull(ls_acct_tax).trim());
+					rcpMap.put("cctr_code",ls_cctr_tax);
+					rcpMap.put("dr_amt", lc_tax_amt);
+					rcpMap.put("cr_amt",0.0);
+					rcpMap.put("dept_code",deptCode);
 					//hdrmap.put("emp_code",rs.getString(""));
-											hdrmap.put("anal_code",analCode);
-											hdrmap.put("proj_code",projCode);
-											hdrmap.put("analysis1",anly1);
-											hdrmap.put("analysis2",anly2);
-											hdrmap.put("analysis3",anly3);
-											System.out.println("calling Gltrace Update for VoucherRcp********taxing*********");
-											
-											errString = finCommon.glTraceUpdate(hdrmap,conn,true); 
+					rcpMap.put("anal_code",analCode);
+					rcpMap.put("proj_code",projCode);
+					rcpMap.put("analysis1",anly1);
+					rcpMap.put("analysis2",anly2);
+					rcpMap.put("analysis3",anly3);
+
+					rcpMap.put("exch_rate",exchRate);
+					rcpMap.put("curr_code",currCode);
+					rcpMap.put("ref_id",ref_id);
+
+					rcpMap.put("sundry_type",'O');
+					//rcpMap.put("sundry_code",suppcode);
+					rcpMap.put("ref_ser","VOUCH");
+					rcpMap.put("remarks",remarks);
+					rcpMap.put("ref_type","F");
+					
+					System.out.println("calling Gltrace Update for VoucherRcp********taxing*********rcpMap["+rcpMap+"]*");
+					rcpList.add(rcpMap);
+					/*errString = finCommon.glTraceUpdate(hdrmap,conn,true); 
 											System.out.println("ERROR STRING>>>>>>>>>>>>>>>>>>>>>>["+errString+"]");
 											if(errString != null && errString.trim().length() > 0)
 											{
 												return errString;
-											}
-								    	}
+											}*/
+					/*}
 								    	else if (count3 > 0)//posting again instead of setting into detail*****updating amount
 										{
-											    hdrmap.put("tran_date",tranDate);
-												hdrmap.put("eff_date", effDate);
-												hdrmap.put("fin_entity",finentity);
-												hdrmap.put("site_code",sitecode);
-												hdrmap.put("acct_code",ls_acct_tax);
-											    hdrmap.put("cctr_code",ls_cctr_tax);
+								    		rcpMap = new HashMap();
+								    		rcpMap.put("tran_date",tranDate);
+								    		rcpMap.put("eff_date", effDate);
+								    		rcpMap.put("fin_entity",finentity);
+								    		rcpMap.put("site_code",sitecode);
+								    		rcpMap.put("acct_code",ls_acct_tax);
+								    		rcpMap.put("cctr_code",ls_cctr_tax);
 											    System.out.println("Updating amount *discAmt*****"+ discAmt + amount);
-												hdrmap.put("dr_amt",( lc_tax_amt + amount) - lc_reco_amt );//**updating amount
-												hdrmap.put("cr_amt",0.0);
-												hdrmap.put("dept_code",deptCode);
+											    rcpMap.put("dr_amt",( lc_tax_amt + amount) - lc_reco_amt );//**updating amount
+											    rcpMap.put("cr_amt",0.0);
+											    rcpMap.put("dept_code",deptCode);
 												//hdrmap.put("emp_code",rs.getString(""));
-												hdrmap.put("anal_code",analCode);
-												hdrmap.put("proj_code",projCode);
-												hdrmap.put("analysis1",anly1);
-												hdrmap.put("analysis2",anly2);
-												hdrmap.put("analysis3",anly3);
+											    rcpMap.put("anal_code",analCode);
+											    rcpMap.put("proj_code",projCode);
+											    rcpMap.put("analysis1",anly1);
+											    rcpMap.put("analysis2",anly2);
+											    rcpMap.put("analysis3",anly3);
 												System.out.println("calling Gltrace Update for VoucherRcp********taxing*********");
-												
+												rcpList.add(rcpMap);
 												errString = finCommon.glTraceUpdate(hdrmap,conn,true); 
 												System.out.println("ERROR STRING>>>>>>>>>>>>>>>>>>>>>>["+errString+"]");
 												if(errString != null && errString.trim().length() > 0)
 												{
 													return errString;
 												}
-										}
+										}*/
 				}
 
 				//Rounding off net Amt
@@ -1138,10 +1731,30 @@ public class PurchaseVoucherGltracePreview extends ActionHandlerEJB implements P
 					{
 
 						ls_cctrcode_rnd = finCommon.getFinparams("999999", "RND_ACCT", conn);
-								    		
+System.out.println("@@@@@@@@ ls_cctrcode_rnd["+ls_cctrcode_rnd+"]");
 						if(ls_cctrcode_rnd != "NULLFOUND")
 						{
-								    			ls_acctcode_rnd = getTokens(ls_cctrcode_rnd,";").toString();
+							//ls_acctcode_rnd = getTokens(ls_cctrcode_rnd,";");
+							String ls_cctrcode_rndArray[]=ls_cctrcode_rnd.split(";");
+							System.out.println("@@@@@ ls_cctrcode_rndArray.length["+ls_cctrcode_rndArray.length+"]");
+							if( ls_cctrcode_rndArray.length > 0)
+							{	
+								ls_acctcode_rnd=ls_cctrcode_rndArray[0];
+							}
+							else
+							{
+								ls_acctcode_rnd="";
+							}
+							if(  ls_cctrcode_rndArray.length > 1 )
+							{
+								ls_cctrcode_rnd=ls_cctrcode_rndArray[1];
+								
+							}
+							else
+							{
+								ls_cctrcode_rnd=" ";
+							}
+							
 						}
 
 						System.out.println("ls_cctrcode_rnd*****"+ls_cctrcode_rnd+"     ls_acctcode_rnd "+ls_acctcode_rnd);
@@ -1153,34 +1766,53 @@ public class PurchaseVoucherGltracePreview extends ActionHandlerEJB implements P
 						}
 						if( ls_cctrcode_rnd.trim().length() ==  0)
 						{
-									    		ls_cctrcode_rnd = null;
+							ls_cctrcode_rnd = " ";
 						}
 
+						rcpMap = new HashMap();
 
+						rcpMap.put("tran_date",tranDate);
+						rcpMap.put("eff_date", effDate);
+						rcpMap.put("fin_entity",finentity);
+						rcpMap.put("site_code",sitecode);
+						rcpMap.put("acct_code",checknull(ls_acctcode_rnd).trim());
+						rcpMap.put("cctr_code",ls_cctrcode_rnd);
 						
-									    		hdrmap.put("tran_date",tranDate);
-												hdrmap.put("eff_date", effDate);
-												hdrmap.put("fin_entity",finentity);
-												hdrmap.put("site_code",sitecode);
-												hdrmap.put("acct_code",ls_acctcode_rnd);
-											    hdrmap.put("cctr_code",ls_cctrcode_rnd);
-												hdrmap.put("dr_amt", lc_tax_amt);
-												hdrmap.put("cr_amt",0.0);
-												hdrmap.put("dept_code",deptCode);
+						if( lc_rndAmt > 0 )
+						{
+							rcpMap.put("dr_amt", lc_rndAmt );  //lc_tax_amt
+							rcpMap.put("cr_amt",0.0);
+						}
+						else
+						{
+							rcpMap.put("dr_amt",0.0);
+							rcpMap.put("cr_amt", lc_rndAmt );  //lc_tax_amt
+						}
+						rcpMap.put("dept_code",deptCode);
 						//hdrmap.put("emp_code",rs.getString(""));
-												hdrmap.put("anal_code",analCode);
-												hdrmap.put("proj_code",projCode);
-												hdrmap.put("analysis1",anly1);
-												hdrmap.put("analysis2",anly2);
-												hdrmap.put("analysis3",anly3);
-												System.out.println("calling Gltrace Update for VoucherRcp********roundoff*********");
-												
-												errString = finCommon.glTraceUpdate(hdrmap,conn,true); 
+						rcpMap.put("anal_code",analCode);
+						rcpMap.put("proj_code",projCode);
+						rcpMap.put("analysis1",anly1);
+						rcpMap.put("analysis2",anly2);
+						rcpMap.put("analysis3",anly3);
+
+						rcpMap.put("exch_rate",exchRate);
+						rcpMap.put("curr_code",currCode);
+						rcpMap.put("ref_id",ref_id);
+
+						rcpMap.put("sundry_type",'O');
+						rcpMap.put("ref_ser","VOUCH");
+						rcpMap.put("remarks",remarks);
+						rcpMap.put("ref_type","F");
+						
+						System.out.println("calling Gltrace Update for VoucherRcp********roundoff*********rcpMap["+rcpMap+"]*");
+						rcpList.add(rcpMap);
+						/*	errString = finCommon.glTraceUpdate(hdrmap,conn,true); 
 												System.out.println("ERROR STRING>>>>>>>>>>>>>>>>>>>>>>["+errString+"]");
 												if(errString != null && errString.trim().length() > 0)
 												{
 													return errString;
-												}
+												}*/
 
 					}
 
@@ -1193,15 +1825,105 @@ public class PurchaseVoucherGltracePreview extends ActionHandlerEJB implements P
 			rs=null;
 			pstmt.close();
 			pstmt=null;
-						}
+			/*	}
 
 						rs1.close();
 						rs1=null;
 						pstmt1.close();
-						pstmt1=null;
+						pstmt1=null;*/
+
+
+			System.out.println("@@@@@@@@@@@@@@@@@@@@@@@@ detList["+detList.size()+"]["+detList+"]");
+			System.out.println("@@@@@@@@@@@@@@@@@@@@@@@@ rcpList["+rcpList.size()+"]["+rcpList+"]");
+
+			ArrayList mainList = new ArrayList();
+			//mainList.add(detList);
+			//mainList.add(rcpList);
+			detList.addAll(rcpList);
+			System.out.println("ArrayList Sizeeeeee ::::::::::::"+detList.size());
+			/****Iterating Main List***/
+			HashMap<String,HashMap> mainMap = new HashMap<String,HashMap>();
+
+			for(int i = 0;i < detList.size();i++)
+			{
+
+				//getting values from both detail and rcpt 	
+
+				dataMapList 	=   new ArrayList();
+
+				valueMap = new HashMap();
+				totAmt = 0.0;
+				dataMap = new HashMap();
+				//dataMapList = (ArrayList)detList.get(i);
+				dataMap = (HashMap)detList.get(i);
+
+				System.out.println("DATA MAP PRINTINGGGG:::::::::::"+dataMap);
+
+				String tempKey = dataMap.get("acct_code").toString().trim()+"@"+dataMap.get("cctr_code")+"@"+dataMap.get("anal_code");
+				System.out.println("tempKey===========>>>>>"+tempKey);
+
+				if(mainMap != null && mainMap.containsKey(tempKey))
+				{
+					valueMap = mainMap.get(dataMap.get("acct_code").toString().trim()+"@"+dataMap.get("cctr_code")+"@"+dataMap.get("anal_code"));//retrieving values
+					totAmt =(Double)(valueMap.get("dr_amt")) ;//+ (Double)dataMap.get("amount");
+					currAmt = (Double)dataMap.get("dr_amt");
+					totAmt = totAmt + currAmt;
+					System.out.println("Amount after adding::::::::::::::"+totAmt);
+					valueMap.put("dr_amt",totAmt);
+
+					if( (Double)dataMap.get("dr_amt") != 0   ||  (Double)dataMap.get("cr_amt") != 0 )
+					{	
+						mainMap.put(tempKey,valueMap);
+						System.out.println("@@@@@@@@@@@ modify----->valueMap["+valueMap+"]");
+					}
+					else
+					{
+						System.out.println("@@@@@@@@@@ valueMap amount is zero...........");
+					}
+				}
+				else
+				{
+					System.out.println("@@@@@@@@@@@ added----->dataMap["+dataMap+"]");
+					if( (Double)dataMap.get("dr_amt") != 0 ||  (Double)dataMap.get("cr_amt") != 0 )
+					{
+						mainMap.put(tempKey,dataMap);
+					}
+					else
+					{
+						System.out.println("@@@@@@@@@@ dataMap amount is zero...........");
+					}
+				}
+
+			}
+
+			System.out.println("@@@@@@@@@@@@ final:::::mainMap for glTraceUpdate["+mainMap+"]");
+
+			Iterator<Entry<String,HashMap>> iterator = mainMap.entrySet().iterator();
+			while (iterator.hasNext())
+			{
+				finalMap = new HashMap();
+				Map.Entry<String,HashMap> entry = (Map.Entry<String,HashMap>) iterator.next();
+				System.out.println("Key : " + entry.getKey() + " Value :" + entry.getValue());
+
+				finalMap = entry.getValue();
+
+				System.out.println("FINAL MAP FOR POSTING!!!!!!!!====>>>>>finalMap["+finalMap+"]");
+				errString = finCommon.glTraceUpdate(finalMap,conn,true); 
+				System.out.println("ERROR STRING>>>>>>>>>>>>>>>>>>>>>>["+errString+"]");
+				if(errString != null && errString.trim().length() > 0)
+				{
+					return errString;
+				}
 
+			}
 
 
+			errString = finCommon.checkGlTranDrCrPreview("VOUCH", ref_id, conn);  // refSer
+			System.out.println("@@@@@@@@@@ checkGlTranDrCrPreview errString["+errString+"]");
+			if(errString != null && errString.trim().length() > 0)
+			{
+				return errString;
+			}
 			
 			
 
@@ -1445,8 +2167,8 @@ public class PurchaseVoucherGltracePreview extends ActionHandlerEJB implements P
 						{
 							conn.rollback();
 						}
-							conn.close();
-							conn = null;
+						//conn.close();
+						//conn = null;
 					}
 				}
 				if(rs != null)
@@ -1586,8 +2308,14 @@ public class PurchaseVoucherGltracePreview extends ActionHandlerEJB implements P
 		double reqVal = Double.parseDouble(strValue);
 		return reqVal;
 	}
-	
+	private String checknull(String inp)
+	{
+		if(inp == null)
+			inp = "";
+		return inp.trim();
+	}
 }
 
 /*
  * SELECT VOUCHRCP.TRAN_ID,VOUCHRCP.LINE_NO,VOUCHRCP.PRCP_ID,VOUCHRCP.LINE_NO__RCP,VOUCHRCP.ITEM_CODE,VOUCHRCP.UNIT,VOUCHRCP.RCP_QTY,VOUCHRCP.VOUCH_QTY,VOUCHRCP.RCP_RATE,VOUCHRCP.VOUCH_RATE,VOUCHRCP.PURC_ORDER,VOUCHRCP.LINE_NO__PORD,VOUCHRCP.VOUCH_AMT,VOUCHRCP.TAX_CLASS,VOUCHRCP.TAX_CHAP,VOUCHRCP.TAX_ENV,VOUCHRCP.DISCOUNT,VOUCHRCP.DISC_AMT,VOUCHRCP.TAX_AMT,VOUCHRCP.NET_AMT,VOUCHRCP.RCP_AMT,VOUCHRCP.POST_DIFF,VOUCHRCP.CHG_DATE,VOUCHRCP.CHG_USER,VOUCHRCP.CHG_TERM,VOUCHRCP.ITEM_SER,ITEM.DESCR,VOUCHRCP.ACCT_CODE__DIFF,VOUCHRCP.CCTR_CODE__DIFF,VOUCHRCP.VOUCH_QTY__STDUOM,VOUCHRCP.VOUCH_RATE__STDUOM,VOUCHRCP.ACCT_CODE,VOUCHRCP.CCTR_CODE,ACCOUNTS.DESCR,VOUCHRCP.TAX_ADV_AMT,VOUCHRCP.RATE__CLG,VOUCHRCP.STD_RATE,VOUCHRCP.DEPT_CODE,VOUCHRCP.ANAL_CODE,ANALYSIS.DESCR,COSTCTR.DESCR,VOUCHRCP.PROJ_CODE,VOUCHRCP.ANALYSIS1,VOUCHRCP.ANALYSIS2,VOUCHRCP.ANALYSIS3,FN_GET_BUDGET_AMT('VOUCH',"VOUCHER"."SITE_CODE","VOUCHRCP"."ACCT_CODE","VOUCHRCP"."CCTR_CODE",VOUCHRCP.ANAL_CODE ,"VOUCHRCP"."DEPT_CODE",'A') BUDGET_AMT_ANAL,FN_GET_CONS_AMT('VOUCH',"VOUCHER"."SITE_CODE","VOUCHRCP"."ACCT_CODE","VOUCHRCP"."CCTR_CODE",VOUCHRCP.ANAL_CODE,"VOUCHRCP"."DEPT_CODE",'A') CONSUMED_AMT_ANAL,(CASE WHEN (FN_GET_CONS_AMT('VOUCH',VOUCHER.SITE_CODE,VOUCHRCP.ACCT_CODE,VOUCHRCP.CCTR_CODE,VOUCHRCP.ANAL_CODE,VOUCHRCP.DEPT_CODE,'A')) > 0 THEN (FN_GET_BUDGET_AMT('VOUCH',VOUCHER.SITE_CODE,VOUCHRCP.ACCT_CODE,VOUCHRCP.CCTR_CODE,VOUCHRCP.ANAL_CODE ,VOUCHRCP.DEPT_CODE,'A') - FN_GET_CONS_AMT('VOUCH',VOUCHER.SITE_CODE,VOUCHRCP.ACCT_CODE,VOUCHRCP.CCTR_CODE,VOUCHRCP.ANAL_CODE,VOUCHRCP.DEPT_CODE,'A')) ELSE 0 END)  BUDGET_AMT FROM VOUCHRCP  VOUCHRCP,ITEM  ITEM,ACCOUNTS  ACCOUNTS,ANALYSIS  ANALYSIS,COSTCTR  COSTCTR,VOUCHER  VOUCHER WHERE ( VOUCHRCP.ITEM_CODE      = ITEM.ITEM_CODE   ) AND ( VOUCHER.TRAN_ID      = VOUCHRCP.TRAN_ID   ) AND ( VOUCHRCP.ACCT_CODE=ACCOUNTS.ACCT_CODE(+)) AND ( VOUCHRCP.ANAL_CODE=ANALYSIS.ANAL_CODE(+)) AND ( VOUCHRCP.CCTR_CODE=COSTCTR.CCTR_CODE(+)) AND VOUCHRCP.TRAN_ID    =      ?*/
+

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

@@ -15,6 +15,6 @@ import javax.ejb.Local;
 public interface PurchaseVoucherGltracePreviewLocal extends ActionHandlerLocal 
 {
 	
-	public String preview(String tranID,String xtraParams, String forcedFlag) throws RemoteException,ITMException;
+	public String preview(String tranID,String xtraParams, String forcedFlag, Connection conn) throws RemoteException,ITMException;
 }
 

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

@@ -14,6 +14,6 @@ import javax.ejb.Remote;
 @Remote 
 public interface PurchaseVoucherGltracePreviewRemote extends ActionHandlerRemote
 {
-	public String preview(String tranID,String xtraParams, String forcedFlag) throws RemoteException,ITMException;
+	public String preview(String tranID,String xtraParams, String forcedFlag, Connection conn) throws RemoteException,ITMException;
 
 }

webitm-fin/ibase/webitm/ejb/fin/adv/.directory

 [Dolphin]
 SortOrder=1
+SortRole=date
 Sorting=2
-Timestamp=2014,1,29,14,59,8
+Timestamp=2016,4,20,12,7,43
+Version=3
 ViewMode=1

webitm-fin/ibase/webitm/ejb/fin/adv/MiscValConf.java

@@ -1167,9 +1167,11 @@ public String confirm(String tranId,String xtraParams,String forcedFlag) throws
 				if(rs.next())
 				{
 					sitePayment = rs.getString("site_code__pay");
+					System.out.println( "Site Payment"+sitePayment);
 				}
 				else
 				{
+					System.out.println("Else Condition");
 					sqlInner ="select site_code__pay from supplier where supp_code = ? " ;		
 					pstmtInner = conn.prepareStatement(sqlInner);
 					pstmtInner.setString(1,supp);
@@ -1182,6 +1184,7 @@ public String confirm(String tranId,String xtraParams,String forcedFlag) throws
 					rsInner = null;
 					pstmtInner.close();
 					pstmtInner = null;
+					System.out.println("Else sitePayment"+sitePayment);
 				}
 				rs.close();
 				rs = null;
@@ -1192,6 +1195,8 @@ public String confirm(String tranId,String xtraParams,String forcedFlag) throws
 				{
 					sitePayment = siteCode;
 				}
+				System.out.println("sitePayment"+sitePayment+" !=siteCode"+siteCode);
+				
 				if((sitePayment != siteCode) && (("I").equalsIgnoreCase(runMode)))
 				{
 					winName = "W_PAY_IBCA";

webitm-fin/ibase/webitm/ejb/fin/adv/PayVoucherComPrc.java

@@ -4,6 +4,7 @@
 package ibase.webitm.ejb.fin.adv;
 import ibase.webitm.utility.*;
 import ibase.utility.CommonConstants;
+import ibase.utility.E12GenericUtility;
 import ibase.webitm.ejb.*;
 import ibase.system.config.*;
 
@@ -37,7 +38,7 @@ public class PayVoucherComPrc extends ProcessEJB implements PayVoucherComPrcLoca
 {          //PayVoucherComPrc
 	
 	DistCommon distCommonObj = new DistCommon();
-	GenericUtility genericUtility = GenericUtility.getInstance();
+	E12GenericUtility genericUtility = new E12GenericUtility();
 	ITMDBAccessEJB itmDBAccessEJB = new ITMDBAccessEJB();
 	public String process() throws RemoteException,ITMException
 	{
@@ -53,7 +54,6 @@ public class PayVoucherComPrc extends ProcessEJB implements PayVoucherComPrcLoca
 		try
 		{
 			DistCommon distCommonObj = new DistCommon();
-			GenericUtility genericUtility = GenericUtility.getInstance();
 			ITMDBAccessEJB itmDBAccessEJB = new ITMDBAccessEJB();
 				
 			if(xmlString != null && xmlString.trim().length()!=0)
@@ -105,17 +105,16 @@ public class PayVoucherComPrc extends ProcessEJB implements PayVoucherComPrcLoca
 		tabSeparatedData.append("<description>").append("Group0 description").append("</description>");
 		tabSeparatedData.append("<Header0>");			
 		ConnDriver connDriver = new ConnDriver();	
-		GenericUtility genericUtility = GenericUtility.getInstance();
 		//StringBuffer tabSeparatedData = new StringBuffer();
 		String userId = "",benefitType  ="",freightType="",chargeType="",sqlItemCodeAl="",sqlItem="",siteCode = "",suppCodefr ="",acctCode ="";	
 		String cctrCode ="",acctCodeadl ="",cctrCodeadl ="",currCode="";
 		String exchrate="";
-		String sitecodefr ="",siteCodeto ="",taxClass ="", taxChap="",taxEnv="",postVouch ="",remark="";
+		String sitecodefr ="",siteCodeto ="",taxClass ="", taxChap="",taxEnv="",postVouch ="",remark="",payableSite="";
 		String frDate="", toDate="" ,procdate="", pucOrder="";;
 		int count = 0;
 		String ordDate="",suppcode="",suppname="",itemcode="",lineno="",quantity="",unit="",taxamt="";
 		boolean recFound =false;
-		int cntact=0,cntcctr=0,cntsite=0,cntcurr=0;
+		int cntact=0,cntcctr=0,cntsite=0,cntcurr=0,cntsupfr=0,cntsupto=0,cntpayable=0;
 		int cntF=0,cntL=0,cntC=0;
 		SimpleDateFormat sdf = null;
 		try
@@ -146,28 +145,17 @@ public class PayVoucherComPrc extends ProcessEJB implements PayVoucherComPrcLoca
 		    toDate = GenericUtility.getInstance().getColumnValue("tran_date__to",headerDom);
 		    procdate = GenericUtility.getInstance().getColumnValue("proc_date",headerDom);
 		    singleVoucher = GenericUtility.getInstance().getColumnValue("single_voucher",headerDom);
+		    payableSite = GenericUtility.getInstance().getColumnValue("site_code",headerDom);
+		    System.out.println("tran_date__fr "+ frDate);
+		    System.out.println("toDate"+ toDate);
 			//===============Convert date to TimeStamp date format===========
-			Timestamp dateFrom = null,dateTo = null;
-			Object date = null;
-		    sdf = new SimpleDateFormat(genericUtility.getApplDateFormat());
-			date = sdf.parse(frDate);			
-			SimpleDateFormat sdf1 = new SimpleDateFormat(genericUtility.getDBDateFormat());
-			dateFrom =	java.sql.Timestamp.valueOf(sdf1.format(date).toString() + " 00:00:00.0");
-			date = sdf.parse(toDate);
-			dateTo =	java.sql.Timestamp.valueOf(sdf1.format(date).toString() + " 00:00:00.0");
-
-			System.out.println(" DB dateFrom=>"+dateFrom+"=DB date to=>"+dateTo);
 		
-			//===============================================================
-
-	       // String frDate1  = GenericUtility.getInstance().getValidDateString(frDate.substring(0,8),GenericUtility.getInstance().getApplDateFormat(),GenericUtility.getInstance().getDBDateFormat());
-	        //String toDate1 = GenericUtility.getInstance().getValidDateString(toDate.substring(0,8),GenericUtility.getInstance().getApplDateFormat(),GenericUtility.getInstance().getDBDateFormat());
-	        //System.out.println("FromDate :["+frDate1+"]");
-	        //System.out.println("ToDate :["+toDate1+"]");
-	        //Timestamp frDateTimestamp = Timestamp.valueOf(frDate1+" 00:00:00");
-	        //Timestamp toDateTimestamp = Timestamp.valueOf(toDate1+" 00:00:00");
-	       //// -------------Validation
-	       if(acctCode!= null && acctCode.trim().length() > 0)
+		    if(acctCode == null || acctCode.trim().length() == 0  )
+		    {
+		    	errString = itmDBAccess.getErrorString("acct_code","VMACCODE1",userId);
+				return errString;
+		    }
+		    else
 		    {
 				sql="select count(*) from accounts where acct_code=?";
 				pstmt = conn.prepareStatement(sql);
@@ -185,14 +173,100 @@ public class PayVoucherComPrc extends ProcessEJB implements PayVoucherComPrcLoca
 				System.out.println("acctCode" + acctCode);
 				if(cntact==0)
 				{
-				errString = itmDBAccess.getErrorString("acct_code","ACCT01",userId);
+					errString = itmDBAccess.getErrorString("acct_code","VMACTCDMT",userId);
 					return errString;
 				}
 		    }
 
-	       if(cctrCode!= null && cctrCode.trim().length() > 0)
+		    if(sitecodefr == null || sitecodefr.trim().length() == 0  )
 		    {
+		    	errString = itmDBAccess.getErrorString("site_code__fr","VMSITECDFR",userId);
+				return errString;
+		    }
+		    else
+		    {
+			sql="select count(*) from site where site_code=?";
+			pstmt = conn.prepareStatement(sql);
+			pstmt.setString(1, sitecodefr);
+			rs = pstmt.executeQuery();
+			if(rs.next())
+			{
+				cntsupfr=rs.getInt(1);
+			}
+			rs.close();
+			rs=null;
+			pstmt.close();
+			pstmt=null;
+			System.out.println("cntsupfr" + cntsupfr);
+			System.out.println("site_code" + sitecodefr);
+			if(cntsupfr==0)
+			{
+				errString = itmDBAccess.getErrorString("site_code__fr","VMSITE",userId);
+				return errString;
+			}
+		    }
+		    if(siteCodeto == null || siteCodeto.trim().length() == 0  )
+		    {
+		    	errString = itmDBAccess.getErrorString("site_code__to","VMSITECDTO",userId);
+				return errString;
+		    }
+		    else
+		    {
+			sql="select count(*) from site where site_code=?";
+			pstmt = conn.prepareStatement(sql);
+			pstmt.setString(1, siteCodeto);
+			rs = pstmt.executeQuery();
+			if(rs.next())
+			{
+				cntsupto=rs.getInt(1);
+			}
+			rs.close();
+			rs=null;
+			pstmt.close();
+			pstmt=null;
 
+			System.out.println("cntsupto" + cntsupto);
+			System.out.println("siteCodeto" + siteCodeto);
+			if(cntsupto==0)
+			{
+				errString = itmDBAccess.getErrorString("site_code__to","VMSITE",userId);
+				return errString;
+			}
+		    }
+		    if(payableSite == null || payableSite.trim().length() == 0  )
+		    {
+		    	errString = itmDBAccess.getErrorString("site_code","VMPSITECD",userId);
+				return errString;
+		    }
+		    else
+		    {
+			sql="select count(*) from site where site_code=?";
+			pstmt = conn.prepareStatement(sql);
+			pstmt.setString(1, payableSite);
+			rs = pstmt.executeQuery();
+			if(rs.next())
+			{
+				cntpayable=rs.getInt(1);
+			}
+			rs.close();
+			rs=null;
+			pstmt.close();
+			pstmt=null;
+			System.out.println("cntpayable" + cntpayable);
+			System.out.println("payableSite" + payableSite);
+			if(cntpayable==0)
+			{
+				errString = itmDBAccess.getErrorString("site_code","VMSITE",userId);
+				return errString;
+			}
+		    }
+		    if(cctrCode == null || cctrCode.trim().length() == 0  )
+		    {
+		    	errString = itmDBAccess.getErrorString("cctr_code","VMCCTRE",userId);
+				return errString;
+		    }
+		    else
+		    {
 			sql="select count(*) from costctr where cctr_code= ?";
 			pstmt = conn.prepareStatement(sql);
 			pstmt.setString(1, cctrCode);
@@ -209,17 +283,24 @@ public class PayVoucherComPrc extends ProcessEJB implements PayVoucherComPrcLoca
 			System.out.println("cntcctr" + cntcctr);
 			if(cntcctr == 0)
 			{
-				errString = itmDBAccess.getErrorString("cctr_code","VTCCTR",userId);
+				errString = itmDBAccess.getErrorString("cctr_code","VTCCTR1",userId);
 				return errString;
 			}
 		    }
-	       if(suppCodefr!= null && suppCodefr.trim().length() > 0)
-	       {
+			   System.out.println("suppCodefr"+ suppCodefr);
+			   System.out.println("chargeType"+ chargeType);
 			   
 	    	   if(chargeType.equalsIgnoreCase("F"))
 				{
+	  			 if(suppCodefr == null || suppCodefr.trim().length() == 0  )
+				   {
+						   errString = itmDBAccess.getErrorString("supp_code__fr","VMTRANCD1",userId);
+							return errString;   
+				 }
+	  			 else
+	  			 {
 	  			
-				sql="select count(*) from transporter where tran_code=?";
+				sql="select count(*) from transporter where tran_code= ?";
 				pstmt = conn.prepareStatement(sql);
 				pstmt.setString(1, suppCodefr);
 				rs = pstmt.executeQuery();
@@ -231,12 +312,23 @@ public class PayVoucherComPrc extends ProcessEJB implements PayVoucherComPrcLoca
 				rs=null;
 				pstmt.close();
 				pstmt=null;
-				if(cntF <= 0)
+				System.out.println("cntF" + cntF);
+				System.out.println("suppCodefr" + suppCodefr);
+				if(cntF == 0)
 				{
-					errString = itmDBAccess.getErrorString("supp_code__fr","VMSITE1",userId);
+					errString = itmDBAccess.getErrorString("supp_code__fr","VTTRANS1",userId);
+					return errString;
+				}
 				}
 				}
 				else if(chargeType.equalsIgnoreCase("L"))
+				{
+				 if(suppCodefr == null || suppCodefr.trim().length() == 0  )
+				   {
+						   errString = itmDBAccess.getErrorString("supp_code__fr","NULLSUPPCD",userId);
+							return errString;   
+				 }
+				 else
 				 {
 					sql="select count(*) from supplier where supp_code=?";
 					pstmt = conn.prepareStatement(sql);
@@ -250,11 +342,15 @@ public class PayVoucherComPrc extends ProcessEJB implements PayVoucherComPrcLoca
 					rs=null;
 					pstmt.close();
 					pstmt=null;
-					if(cntL <= 0)
+					System.out.println("cntL" + cntL);
+					System.out.println("suppCodefr" + suppCodefr);
+					if(cntL == 0)
 					{
 						errString = itmDBAccess.getErrorString("supp_code__fr","VTSUPP1",userId);
+						return errString;
 					
 					}
+				 }
 					
 				}
 				else if(chargeType.equalsIgnoreCase("C"))
@@ -271,14 +367,19 @@ public class PayVoucherComPrc extends ProcessEJB implements PayVoucherComPrcLoca
 					rs=null;
 					pstmt.close();
 					pstmt=null;
-					if(cntC <= 0)
+					if(cntC < 0)
 					{
 						errString = itmDBAccess.getErrorString("supp_code__fr","VTTAXAUTH",userId);
+						//return errString;
 					}
 					
 				}   
+	    	   if(currCode == null || currCode.trim().length() == 0  )
+	    	   {
+	    		   errString = itmDBAccess.getErrorString("curr_code","VTCURR",userId);
+					return errString; 
 	    	   }
-	       if(currCode!= null && currCode.trim().length() > 0)
+	    	   else
 	    	   {
 	    	   sql="select count(*) from currency where curr_code= ?";
 				pstmt = conn.prepareStatement(sql);
@@ -294,12 +395,14 @@ public class PayVoucherComPrc extends ProcessEJB implements PayVoucherComPrcLoca
 				pstmt=null;
 				if(cntsite == 0)
 				{
-					errString = itmDBAccess.getErrorString("curr_code","VTCURR1",userId);
+					errString = itmDBAccess.getErrorString("curr_code","CURRCODNE",userId);
+					return errString;
 				}
 	    	   }
 			if(frDate == null || toDate == null)
 			{
 			    errString = itmDBAccess.getErrorString("","VEDATE",userId);
+			    return errString; 
 				
 			}
 	       else
@@ -317,8 +420,26 @@ public class PayVoucherComPrc extends ProcessEJB implements PayVoucherComPrcLoca
 				if (fromUtilDate.after(toUtilDate))
 				{
 				    errString = itmDBAccess.getErrorString("","VFRTODATE",userId);
+				    return errString; 
 				}
 	       }
+
+			Timestamp dateFrom = null,dateTo = null;
+			Object date = null;
+		    sdf = new SimpleDateFormat(genericUtility.getApplDateFormat());
+			date = sdf.parse(frDate);			
+			SimpleDateFormat sdf1 = new SimpleDateFormat(genericUtility.getDBDateFormat());
+			dateFrom =	java.sql.Timestamp.valueOf(sdf1.format(date).toString() + " 00:00:00.0");
+			date = sdf.parse(toDate);
+			dateTo =	java.sql.Timestamp.valueOf(sdf1.format(date).toString() + " 00:00:00.0");
+
+			System.out.println(" DB dateFrom=>"+dateFrom+"=DB date to=>"+dateTo);
+			/* if(dateTo != null && dateTo.before(dateFrom))
+             {
+                 System.out.println("In COndition");
+                 errString = itmDBAccessEJB.getErrorString("","VTDATE6 ",userId);
+                 return errString; 
+             }*/
 			String suppCodefr1="";
 			System.out.println("CHARGE TYPE" + chargeType);
 			suppCodefr1  = genericUtility.getColumnValue("supp_code__fr",headerDom);
@@ -422,7 +543,7 @@ public class PayVoucherComPrc extends ProcessEJB implements PayVoucherComPrcLoca
 						"pur_exp_reco.ref_id = despatch.desp_id and pur_exp_reco.charge_type = 'F' ))and" +
 						" ( despatch.site_code   >='"+sitecodefr+"' ) AND  " +
 						"( despatch.site_code   <= '"+siteCodeto+"') AND  " +
-					/*	"( despatch.desp_date   >= '"+dateFrom+"' ) AND  " +
+					/* ibase3-webitm-fin5-7-0-34	"( despatch.desp_date   >= '"+dateFrom+"' ) AND  " +
 						"( despatch.desp_date   <= '"+dateTo+"') AND  " +  */
 						"( despatch.desp_date   >= ? ) AND  " +
 						"( despatch.desp_date   <= ?) AND  " +
@@ -597,7 +718,6 @@ public class PayVoucherComPrc extends ProcessEJB implements PayVoucherComPrcLoca
 			            errString = tabSeparatedData.toString();
 			            System.out.println("Count is #########"+count);
 			            tabSeparatedData.append("</Detail2>");  	
-			            	
 					}
 					 rs.close();
 					 rs = null;
@@ -616,7 +736,6 @@ public class PayVoucherComPrc extends ProcessEJB implements PayVoucherComPrcLoca
 		          		"' ' as stan_fr,' ' as stan_to, '' as tran_id, " +
 		          		"' ' as gross_weight," +
 		          		" ' ' as no_art," +
-		          		"' ' as frt_amt ," +
 		          		" porddet.tot_amt," +
 		          		"0 flag_onoff ,' ' as bill_no ," +
 		          		"' ' as bill_date,porder.curr_code, " +
@@ -706,53 +825,10 @@ public class PayVoucherComPrc extends ProcessEJB implements PayVoucherComPrcLoca
 					   
 					 
 			}
-			else
-	          {
-		        System.out.println("Sql:::::is Null ::::::::::::::");
-		        errString = itmDBAccessEJB.getErrorString("","VTNOREC1","","",conn);
-	          }
-			 if(chargeType.equalsIgnoreCase("F"))
+			else if(chargeType.equalsIgnoreCase("F"))
 				{
 					System.out.println("freightType" +freightType);
 					 if(freightType.equalsIgnoreCase("1"))
-					{
-						/*dw_data.dataobject = 'd_pur_exp_reco_freight'*/
-						sql = "select  despatch.lr_no," +
-								"despatch.lr_date," +
-								"( case when despatch.stan_code__init is NULL then fn_station_descr(' ',despatch.stan_code__init) else despatch.dlv_city end ) as stan_fr," +
-								"despatch.desp_id," +
-								"(case when despatch.gross_weight is null then 0 else despatch.gross_weight end)," +
-								"(case when despatch.no_art is null then 0 else despatch.no_art end), " +
-								"(case when despatch.freight is null then 0 else despatch.freight end )," +
-								" (case when despatch.freight is null then 0 else despatch.freight end ) ," +
-								" ' ' as bill_no ," +
-								"0 flag_onoff," +
-								"despatch.curr_code," +
-								"despatch.site_code," +
-								"' ' as tran_date," +
-								"'  ' as ord_date," +
-								"'  ' as supp_code," +
-								"'  ' as supp_name ," +
-								"' ' as descr," +
-								"' ' as item_code," +
-								"' ' as quantity ," +
-								"'S-DSP' as ref_ser, "+
-								" 0  AS exp_amt , " +
-								" 0  as clg_chg ," +
-								"0  as adl_amount , " +
-								"' ' as line_no FROM despatch, sorder " +
-								" WHERE ( sorder.sale_order = despatch.sord_no ) and  " +
-								"(despatch.desp_id not in (select pur_exp_reco.ref_id from pur_exp_reco where pur_exp_reco.ref_ser = 'S-DSP' and pur_exp_reco.ref_id = despatch.desp_id and pur_exp_reco.charge_type = 'F' )) and " +
-								"(despatch.site_code >= '"+sitecodefr+"') and " +
-								" (despatch.site_code <= '"+siteCodeto+"') " +
-								"and          (despatch.desp_date >= ?) " +
-								"and  (despatch.desp_date <= ?) " +
-								"and  (LTRIM(RTRIM(despatch.curr_code__frt)) = '"+currCode+"')" +
-								" and  (despatch.confirmed = 'Y') " +
-								"and" +
-							    "(sorder.frt_term IN ('P','B'))  ";
-					}
-					else if(freightType.equalsIgnoreCase("2"))
 					{
 						sql="select porcp.lr_no ," +
 							"porcp.lr_date," +
@@ -766,10 +842,10 @@ public class PayVoucherComPrc extends ProcessEJB implements PayVoucherComPrcLoca
 								"'                    ' as bill_no , " +
 								"porcp.curr_code, " +
 								"porcp.site_code," +
-								"'' as tran_date," +
+								"porcp.tran_date," +
 								"' ' as ord_date," +
-								"' ' as supp_code," +
-								"'  ' as supp_name ," +
+								"porcp.supp_code," +
+								"supplier.supp_name ," +
 								"' ' as descr," +
 								"' ' as item_code," +
 								"' ' as quantity, " +
@@ -781,7 +857,7 @@ public class PayVoucherComPrc extends ProcessEJB implements PayVoucherComPrcLoca
 								" WHERE ( porcp.tran_id not in (select pur_exp_reco.ref_id from pur_exp_reco where pur_exp_reco.ref_ser ='P-RCP' and " +
 									" pur_exp_reco.ref_id = porcp.tran_id and pur_exp_reco.charge_type = 'F'))" +
 									" and ( porcp.supp_code = supplier.supp_code ) and" +
-								"( porcp.tran_date   <= ?) and " +
+								"( porcp.tran_date   >= ?) and " +
 								"( porcp.tran_date   <= ?) and " +
 								"( porcp.site_code  >= '"+ sitecodefr + "') and  " +
 								"( porcp.site_code  <= '"+ siteCodeto +"')  and" +
@@ -791,7 +867,7 @@ public class PayVoucherComPrc extends ProcessEJB implements PayVoucherComPrcLoca
 								"( porcp.freight_status IN ('T','B','T') ) and" +
 								"( porcp.confirmed   = 'Y')";
 					}
-					else if(freightType.equalsIgnoreCase("3"))
+					else if(freightType.equalsIgnoreCase("2"))
 					{
 						sql="select porcp.lr_no," +
 							"porcp.lr_date," +
@@ -806,10 +882,10 @@ public class PayVoucherComPrc extends ProcessEJB implements PayVoucherComPrcLoca
 							" '                    ' as bill_no," +
 							" porcp.curr_code," +
 							"porcp.site_code," +
-							"'' as tran_date," +
+							"porcp.tran_date," +
 							"'  ' as ord_date," +
-							"' ' as supp_code," +
-							"' ' as supp_name ," +
+							"porcp.supp_code," +
+							"supplier.supp_name ," +
 							"' ' as descr," +
 							"' ' as item_code," +
 							"' ' as quantity ," +
@@ -821,7 +897,7 @@ public class PayVoucherComPrc extends ProcessEJB implements PayVoucherComPrcLoca
 							"WHERE ( porcp.tran_id not in (select pur_exp_reco.ref_id from pur_exp_reco where pur_exp_reco.ref_ser ='P-RET' and " +
 							" pur_exp_reco.ref_id = porcp.tran_id and pur_exp_reco.charge_type = 'F')) " +
 							"and ( porcp.supp_code = supplier.supp_code ) and" +
-							"( porcp.tran_date   <= ?) AND" +
+							"( porcp.tran_date   >= ?) AND" +
 							"( porcp.tran_date   <= ?) AND" +
 							"( porcp.site_code  >= '"+ sitecodefr + "') AND  " +
 							"( porcp.site_code  <= '"+ siteCodeto +"')  and" +
@@ -831,7 +907,7 @@ public class PayVoucherComPrc extends ProcessEJB implements PayVoucherComPrcLoca
 							"( porcp.freight_status IN ('P','B','T') ) and" +
 							"( porcp.confirmed   = 'Y')";
 					}
-					else if(freightType.equalsIgnoreCase("4"))
+					else if(freightType.equalsIgnoreCase("3"))
 					{
 						sql="select distord_iss.lr_no, distord_iss.lr_date,fn_station_descr(distord_iss.site_code,' ') ," +
 								" fn_station_descr(distord_iss.site_code__dlv, ' ')," +
@@ -843,7 +919,7 @@ public class PayVoucherComPrc extends ProcessEJB implements PayVoucherComPrcLoca
 								" 0 flag_onoff ," +
 								" '                    ' as bill_no ," +
 								"distord_iss.curr_code as curr_code, " +
-								" distord_iss.site_code,'' as tran_date," +
+								" distord_iss.site_code,distord_iss.tran_date," +
 								"' ' as ord_date,' ' as supp_code," +
 								"' ' as supp_name ,' ' as descr,' ' as item_code,'' as quantity,  " +
 								"'D-ISS' as ref_ser, "+
@@ -861,7 +937,7 @@ public class PayVoucherComPrc extends ProcessEJB implements PayVoucherComPrcLoca
 								" distord_iss.confirmed   = 'Y' and" +
 								"( distord_iss.frt_type IN ('P','B'))";
 					}
-					else if(freightType.equalsIgnoreCase("5"))
+					else if(freightType.equalsIgnoreCase("4"))
 					{
 						
 						sql="select distord_rcp.lr_no , " +
@@ -877,7 +953,7 @@ public class PayVoucherComPrc extends ProcessEJB implements PayVoucherComPrcLoca
 								"'                   ' as bill_no," +
 								" distord_rcp.curr_code," +
 								"distord_rcp.site_code," +
-								"' ' as tran_date," +
+								"distord_rcp.tran_date," +
 								"' ' as ord_date," +
 								"' ' as supp_code," +
 								"' ' as supp_name ," +
@@ -900,7 +976,7 @@ public class PayVoucherComPrc extends ProcessEJB implements PayVoucherComPrcLoca
 								"( distord_rcp.confirmed   = 'Y')";
 						System.out.println("Executing SQL :: "+sql);
 					}
-					else if(freightType.equalsIgnoreCase("6"))
+					else if(freightType.equalsIgnoreCase("5"))
 					{
 						
 						//dw_data.dataobject = 'd_pur_exp_coniss_freight'
@@ -939,12 +1015,12 @@ public class PayVoucherComPrc extends ProcessEJB implements PayVoucherComPrcLoca
 								"( consume_iss.freight_type IN ('P','B'))";
 							
 					}
-					else if(freightType.equalsIgnoreCase("7"))
+					else if(freightType.equalsIgnoreCase("6"))
 					{
 						sql="select sreturn.lr_no," +
 								" sreturn.lr_date," +
 								"fn_station_descr(' ', customer.stan_code)," +
-								"fn_station_descr(sreturn.site_code, ' '),sreturn.tran_id," +
+								"fn_station_descr(sreturn.site_code, ' '),sreturn.tran_id,sreturn.tran_id as tran_id," +
 						    " 0 gross_weight ,"+
 						    " 0 no_art ,"+
 							"(case when sreturn.frt_amt is null then 0 else sreturn.frt_amt end)," +
@@ -952,7 +1028,7 @@ public class PayVoucherComPrc extends ProcessEJB implements PayVoucherComPrcLoca
 							" '                    ' as bill_no," +
 							"sreturn.curr_code, " +
 							"sreturn.site_code," +
-							"'' as tran_date," +
+							"sreturn.tran_date," +
 							"' ' as ord_date," +
 							"' ' as supp_code," +
 							"' ' as supp_name ," +
@@ -967,7 +1043,7 @@ public class PayVoucherComPrc extends ProcessEJB implements PayVoucherComPrcLoca
 							"WHERE ( sreturn.tran_id not in (select pur_exp_reco.ref_id from pur_exp_reco where pur_exp_reco.ref_ser ='S-RET' and " +
 							" pur_exp_reco.ref_id = sreturn.tran_id and pur_exp_reco.charge_type = 'F')) " +
 							"and ( sreturn.cust_code = customer.cust_code ) and" +
-							"( sreturn.tran_date   <= ?) and" +
+							"( sreturn.tran_date   >= ?) and" +
 							"( sreturn.tran_date   <= ?) and" +
 							"( sreturn.site_code  >= '"+ sitecodefr + "') and  " +
 							"( sreturn.site_code  <= '"+ siteCodeto +"') and" +
@@ -1016,6 +1092,7 @@ public class PayVoucherComPrc extends ProcessEJB implements PayVoucherComPrcLoca
 				            tabSeparatedData.append ("<ref_line_no>").append("<![CDATA[" + (rs.getString(25)==null?" ":rs.getString(25)) +"]]>").append("</ref_line_no>");
 						    errString = tabSeparatedData.toString();
 						    System.out.println("#####Counter#####"+ count);
+						    System.out.println("IF");
 						    tabSeparatedData.append("</Detail2>");
 						}
 			            rs.close();
@@ -1092,7 +1169,6 @@ public class PayVoucherComPrc extends ProcessEJB implements PayVoucherComPrcLoca
 	{
 		Document detailDom = null;
 		Document headerDom = null;
-		GenericUtility genericUtility = GenericUtility.getInstance();
 		String retStr = "";
 		
 		try
@@ -1164,7 +1240,6 @@ public class PayVoucherComPrc extends ProcessEJB implements PayVoucherComPrcLoca
 		Statement st = null; 
 		String errFrSret ="";
 		String frsFlag=null;
-		GenericUtility genericUtility = GenericUtility.getInstance();
 		ConnDriver connDriver = new ConnDriver();//Added by Jaimin 30/08/2007 requst-ID :DI78DIS028
 		Connection conn= null;//Added by Jaimin 30/08/2007		requst-ID :DI78DIS028
 		String type = genericUtility.getColumnValue("single_voucher",headerDom);//Added by jaimin 01/09/2007 requst-ID :DI78DIS028
@@ -1296,6 +1371,8 @@ public class PayVoucherComPrc extends ProcessEJB implements PayVoucherComPrcLoca
 			lscurrcode  = genericUtility.getColumnValue("curr_code",headerDom);
 			lssitefr  = genericUtility.getColumnValue("site_code__fr",headerDom);
 			lssiteto  = genericUtility.getColumnValue("site_code__to",headerDom);
+			postVouch  = genericUtility.getColumnValue("post_vouch",headerDom);
+			System.out.println("Post voucher" +postVouch);
 			lstaxclass  = checkNull(genericUtility.getColumnValue("tax_class",headerDom));
 			System.out.println("Tax Class@@@@@@@"+ lstaxclass);
 			lstaxchap  = checkNull(genericUtility.getColumnValue("tax_chap",headerDom));
@@ -1695,7 +1772,8 @@ public class PayVoucherComPrc extends ProcessEJB implements PayVoucherComPrcLoca
 					}
 					else
 					{
-						errString = itmDBAccessEJB.getErrorString("","VTAMT","","",conn);
+						errString = itmDBAccessEJB.getErrorString("","VTAMTNULL","","",conn);
+						return errString;
 					}
 					int z=0;
 					for(int n = 0;n < nodeListLength;n++)
@@ -1707,7 +1785,7 @@ public class PayVoucherComPrc extends ProcessEJB implements PayVoucherComPrcLoca
 						String trandate1="",trandate2="",refdate1="",refdate2,tranID="",lssitecodedet="";
 				    	lcamt1 = GenericUtility.getInstance().getColumnValueFromNode("amount",detailNode);
 				    	System.out.println("lcamt1@@@@@" + lcamt1);
-				    	lcamt=Double.parseDouble(lcamt1);
+				    	lcamt = lcamt1 == null ? 0 : Double.parseDouble(lcamt1);
 				    	System.out.println("lcamt@@@" + lcamt);
 				    	lcamount = lcamount +  lcamt;
 				    	trandate1 = GenericUtility.getInstance().getColumnValueFromNode("proc_date",detailNode);
@@ -1805,6 +1883,8 @@ public class PayVoucherComPrc extends ProcessEJB implements PayVoucherComPrcLoca
 			 pstmt = null;
 			
 						}
+						else
+						{
 		   			 sql = "insert into pur_exp_reco (tran_id,tran_date,site_code,ref_ser, ref_id ,ref_date ,charge_type ,curr_code ," +
 		   			 		" exch_rate , amount ,  net_amt ,net_amt__bc,tax_amt ,tax_class ,tax_chap,tax_env ," +
 		   			 		"chg_date ,chg_user, chg_term , confirmed ,conf_date,emp_code__aprv,bill_no,bill_date,lr_no)" +
@@ -1844,12 +1924,16 @@ public class PayVoucherComPrc extends ProcessEJB implements PayVoucherComPrcLoca
 			 System.out.println("Insert multiple Voucher count " + a);
 			 pstmt.close();
 			 pstmt = null;
+		}
 			 z++;
              System.out.println("Successfully INSERT into Payrol Voucher..................");	
              System.out.println("Z count" +z);
 		}
+	    postVouch  = genericUtility.getColumnValue("post_vouch",headerDom);			
 		System.out.println("postVouch.equalsIgnoreCase()"+postVouch);
-		if(errString.length()==0 && postVouch.equalsIgnoreCase("Y"));
+		System.out.println("PostVoucher Condition value is"+ postVouch);
+		System.out.println("errString.length()==0"+ postVouch);
+		if( "Y".equalsIgnoreCase(postVouch))
 			{
 			System.out.println("PostVoucher"+ postVouch);
 			errString = Conf.confirm(tranIdPe, xtraParams, forcedFlag,conn); //nvo_miscvouch.gbf_retrieve_misc_vou(lstr_pur_exp_reco.voucher_no, lstr_pur_exp_reco.voucher_no,2,ls_errcode,ls_site_code)
@@ -1865,14 +1949,21 @@ public class PayVoucherComPrc extends ProcessEJB implements PayVoucherComPrcLoca
 			return errString;
 			}
 			tranIdPe="";
-					if(postVouch.equalsIgnoreCase("N"))
+		
+			
+			if("N".equalsIgnoreCase(postVouch))
 			{
+				System.out.println("N.equalsIgnoreCase(postVouch)"+postVouch );
+				errString="CONFSUCCES";
+				System.out.println("errString1"+errString);
+				
 			 System.out.println("Post Voucher N");
 			}
 		System.out.println("lltrue"+lltrue);
 		lltrue++;
 		System.out.println("lltrue count is"+lltrue);
 					
+
 	}while(lltrue != 1);
 			System.out.println("Out while"); 
 			
@@ -1969,9 +2060,11 @@ public class PayVoucherComPrc extends ProcessEJB implements PayVoucherComPrcLoca
 			lstaxchap  = checkNull(genericUtility.getColumnValue("tax_chap",headerDom));
 			lstaxenv  = checkNull(genericUtility.getColumnValue("tax_env",headerDom));	
 			lsremarks  = checkNull(genericUtility.getColumnValue("remarks",headerDom));
+			postVouch  = genericUtility.getColumnValue("post_vouch",headerDom);	
 	        String loginUser = GenericUtility.getInstance().getValueFromXTRA_PARAMS(xtraParams,"loginCode");
 	        String termID = GenericUtility.getInstance().getValueFromXTRA_PARAMS(xtraParams,"termId");
 	        
+
 			//select count(*) from site a, site b where a.FIN_ENTITY = b.FIN_ENTITY and a.site_code = ? and b.site_code = ?
 			sql="select count(*)from site a, site b where a.FIN_ENTITY = b.FIN_ENTITY and a.site_code = ? and b.site_code = ?";
 			pstmt = conn.prepareStatement(sql);
@@ -2226,7 +2319,7 @@ public class PayVoucherComPrc extends ProcessEJB implements PayVoucherComPrcLoca
 				
 			    	lcamt1 = GenericUtility.getInstance().getColumnValueFromNode("amount",detailNode);
 			    	System.out.println("lcamt in multi voucher" + lcamt1);
-			    	lcamt=Double.parseDouble(lcamt1);
+			    	lcamt = lcamt1 == null ? 0 : Double.parseDouble(lcamt1);
 			    	System.out.println("lcamt in multi voucher" + lcamt);
 			    	lstranid = GenericUtility.getInstance().getColumnValueFromNode("tran_id",detailNode);
 			    	System.out.println("Ref_id is"+ lstranid);
@@ -2353,7 +2446,8 @@ public class PayVoucherComPrc extends ProcessEJB implements PayVoucherComPrcLoca
 				 }
 				else
 					{
-						errString = itmDBAccessEJB.getErrorString("","VTAMT","","",conn);
+						errString = itmDBAccessEJB.getErrorString("","VTAMTNULL","","",conn);
+						return errString;
 					}
 						
 				    	lcamt1 = GenericUtility.getInstance().getColumnValueFromNode("amount",detailNode);
@@ -2505,10 +2599,12 @@ public class PayVoucherComPrc extends ProcessEJB implements PayVoucherComPrcLoca
 			 pstmt = null;
             	 }
              }
-		
-			}
+             postVouch  = genericUtility.getColumnValue("post_vouch",headerDom);	
+             System.out.println("Post Voucher is"+postVouch);
              System.out.println("postVouch.equalsIgnoreCase()"+postVouch);
-			if(errString.length()==0 && postVouch.equalsIgnoreCase("Y"));
+             errString = postVoucherMulti(postVouch,tranIdPe, xtraParams, forcedFlag,conn);
+			}
+ 			/*if(errString.length()==0 && postVouch.equalsIgnoreCase("Y"));
  				{
  				System.out.println("PostVoucher"+ postVouch);
  				errString = Conf.confirm(tranIdPe, xtraParams, forcedFlag,conn); //nvo_miscvouch.gbf_retrieve_misc_vou(lstr_pur_exp_reco.voucher_no, lstr_pur_exp_reco.voucher_no,2,ls_errcode,ls_site_code)
@@ -2528,11 +2624,7 @@ public class PayVoucherComPrc extends ProcessEJB implements PayVoucherComPrcLoca
  						if(postVouch.equalsIgnoreCase("N"))
  						{
  							System.out.println("Post Voucher N");
-						}
-		System.out.println("lltrue"+lltrue);
-		lltrue++;
-		System.out.println("lltrue"+lltrue);
-	
+ 						}*/
 			
 		}
 		catch (SQLException sqx)
@@ -2571,6 +2663,41 @@ public class PayVoucherComPrc extends ProcessEJB implements PayVoucherComPrcLoca
 		}
 	    return errString; 
 	}
+	private String postVoucherMulti(String postVouch,String tranIdPe,String xtraParams, String forcedFlag,Connection conn) throws RemoteException, ITMException
+	{
+		String errString="";
+		 MiscValConf Conf = null;
+		 Conf = new MiscValConf();
+		 System.out.println("postVouch" +postVouch);
+		 System.out.println("tranIdPe" +tranIdPe);
+		 System.out.println("xtraParams" +xtraParams);
+		 System.out.println("forcedFlag" +forcedFlag);
+		 System.out.println("conn" +conn);
+		if(postVouch.equalsIgnoreCase("Y"))
+			{
+			System.out.println("PostVoucher"+ postVouch);
+			errString = Conf.confirm(tranIdPe, xtraParams, forcedFlag,conn); //nvo_miscvouch.gbf_retrieve_misc_vou(lstr_pur_exp_reco.voucher_no, lstr_pur_exp_reco.voucher_no,2,ls_errcode,ls_site_code)
+			}
+			Conf = null;
+		    if(errString.indexOf("CONFSUCCES") > -1)
+			{
+						System.out.println("Sucessfully");
+					}
+					if(errString != null && errString.trim().length() > 0)
+					{
+						System.out.println("Return errString");
+						return errString;
+					}
+					
+					tranIdPe="";
+					if(postVouch.equalsIgnoreCase("N"))
+					{
+						errString="CONFSUCCES";
+						System.out.println("errString2"+errString);
+					}
+					return errString;
+		
+	}
 	private String gfmiscvoucherpe( String winname, String ref,ArrayList payHeadList, String lsvouchtype, ArrayList payDetailList, double lctaxamt,Timestamp currDate,String lssundrytype,String  lsremarks,String ldlrdate, String lsbillno, String tranIdPe,String xtraParams, String postVouch,Connection conn)throws ITMException
 	{
 	    String sql="";
@@ -2737,7 +2864,7 @@ public class PayVoucherComPrc extends ProcessEJB implements PayVoucherComPrcLoca
 			 System.out.println("cctr_code__adv"+lscctradv);
 			//finCommon.getFinparams("999999", "COMM_CALC", conn);
 			lsrndoff = finCommon.getFinparams("999999", "PAY_RND_OFF",conn);
-			if (!lsrndoff.equalsIgnoreCase("NULLFOUND"));
+			if (!lsrndoff.equalsIgnoreCase("NULLFOUND"))
 			{
 			    llrndto = 1;
 			}