change for a/c effect and cross update

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

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

@@ -39,6 +39,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
 		String confirm = "";
 		String siteCode = "";
 		String errString = "" ;
+		String tranSer = "";
 		String loginEmpCode = "";
 		Connection conn = null;
 		ConnDriver connDriver = null;
@@ -78,6 +79,33 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
 			{
 				errString = gbfRetrieveReceipt(tranId,siteCode,xtraParams,conn);
 				System.out.println("err String from gdfRetrieveMiscRcp ="+errString);
+				if(errString != null && errString.trim().length() > 0)
+				{
+					return errString;
+				}
+				
+				//added by akhilesh on 05/09/2013 for check cr dr amt 
+				sql = "select distinct(ref_ser) from gltrace where ref_id = ?";	
+				pstmt = conn.prepareStatement(sql);
+				pstmt.setString(1,tranId);  
+				rs = pstmt.executeQuery();
+				if(rs.next())
+				{     
+					tranSer = rs.getString(1);
+				}
+				rs.close();
+				rs = null;
+				pstmt.close();
+				pstmt = null;
+									
+				errString = finCommon.checkGlTranDrCr(tranSer,tranId,conn);
+				System.out.println("err String from checkGlTranDrCr ="+errString);
+				
+				if(errString != null && errString.trim().length() > 0)
+				{
+					return errString;
+				}
+				
 				if(errString == null || errString.trim().length() == 0)
 				{
 					sql = "update receipt set confirmed = 'Y', conf_date = ?,emp_code__aprv = ? where tran_id = ?";
@@ -1414,9 +1442,9 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
 			totBc = total * (Double)RcpHdrMap.get("exch_rate");
 			System.out.println("DDDDDDDDDDDDDDDDDDd"+total);
 			/// the upper block is transfer here.
-			total = total + (Double)RcpHdrMap.get("net_amt");	
+			total = total + (Double)RcpHdrMap.get("net_amt")+(Double)RcpHdrMap.get("tax_amt");	//change done by akhilesh on 05/sep/2013 for adjust tax amount
 			
-			totBc = totBc + (Double)RcpHdrMap.get("net_amt__bc");	
+			totBc = totBc + (Double)RcpHdrMap.get("net_amt__bc")+(Double)RcpHdrMap.get("tax_amt");	//change done by akhilesh on 05/sep/2013 for adjust tax amount
 
 			System.out.println("net_amt AND net_amt__bc 1"+total+""+totBc);
 
@@ -1469,7 +1497,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
 
 
 			System.out.println("chq and total "+chq+""+total);
-			if(chq != (total+(Double)RcpHdrMap.get("tax_amt")))
+			if(chq != (total))
 			{
 				errString = itmDBAccessEJB.getErrorString("","VTRCPT8","","",conn);
 				conn.rollback();
@@ -1946,7 +1974,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
 			System.out.println("AMOUTTTTTTTTTTTTTTT"+(Double)RcpHdrMap.get("net_amt")+""+netAmountBc);
 			if(isInBaseCurr == true)
 			{
-				netAmountBc = netAmountBc+taxAmt;//added by akhilesh on 31/july/13 for tax provision
+				//netAmountBc = netAmountBc+taxAmt;//added by akhilesh on 31/july/13 for tax provision
 				System.out.println("IN TRUE!!!!!!!!!!!!!!!!!");
 				glTraceMap.put("curr_code", basecurrCode);
 
@@ -1964,7 +1992,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
 			}
 			else 
 			{
-				netAmt = netAmt+taxAmt;//added by akhilesh on 31/july/13 for tax provision
+				//netAmt = netAmt+taxAmt;//added by akhilesh on 31/july/13 for tax provision
 
 				System.out.println("IN FALSE!!!!!!!!!!!!!!!!!");
 				glTraceMap.put("curr_code", currCode);