Changes like removed trim() while populating cctr from ROUND_ADJUST_CCTR,...

Changes like removed trim() while populating cctr from ROUND_ADJUST_CCTR, default value of INV_IBCA_GEN is N if NULLFOUND, CalCommission method is called based on value is Y of COMM_CALC_ON_OFF.

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

webitm-dis/ibase/webitm/ejb/dis/PostOrdInvoicePost.java

@@ -811,7 +811,8 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi
 						lcRecoAmt=rs.getDouble("reco_amount");
 						totRecoAmt += lcRecoAmt;
 						
-						if (totRecoAmt != 0) // 07-dec-16 manoharan
+						//if (totRecoAmt != 0) // 07-dec-16 manoharan 09apr2019 pavan
+						if (lnAmountTax != 0) // 09apr19 Pavan R
 						{
 							if( lsAcctCodeTax == null || lsAcctCodeTax.trim().length() == 0)
 							{
@@ -955,11 +956,11 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi
 			}
 			else
 			{
-				ls_cctr_code__radj=ls_cctr_code__radj.trim();
+				ls_cctr_code__radj=ls_cctr_code__radj;//.trim(); //Pavan R 09apr19[to allow space in cctr]
 			}
 			
-			System.out.println("ls_acct_code__radj"+ls_acct_code__radj);
-			System.out.println("ls_cctr_code__radj"+ls_cctr_code__radj);
+			System.out.println("ls_acct_code__radj["+ls_acct_code__radj+"]");
+			System.out.println("ls_cctr_code__radj["+ls_cctr_code__radj+"]");
 				
 				if (ln_amount_radj != 0) // 07-dec-16 manoharan
 				{ 
@@ -1801,7 +1802,8 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi
 				
 				if("NULLFOUND".equals(invIbcaGen))
 				{
-					invIbcaGen = "Y";
+					//invIbcaGen = "Y";
+					invIbcaGen = "N";
 				}
 				
 				if("Y".equals(invIbcaGen))
@@ -3343,6 +3345,7 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi
 		System.out.println("----------------confirmed method (Invoice confirm)---- with Connection-----");
 		Calendar currentDate = Calendar.getInstance();
 		boolean successFlag = false;
+		String commCalcOnOff = "";
 		try
 		{
 			SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getApplDateFormat());
@@ -3446,11 +3449,17 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi
 					System.out.println("retString from E12GenerateEDIEJB = ["+ retString + "]");
 				}
 			}
-			CalculateCommission calCom=new CalculateCommission();
-			commDrcrConf = checkNull(finCommon.getFinparams("999999", "COMM_DRCR_CONF", conn));
-			commJvConf = checkNull(finCommon.getFinparams("999999", "COMM_JV_CONF", conn));
-			errString =  calCom.CalCommission(invoiceId,"I","",commDrcrConf,commJvConf,xtraParams, conn);
-			
+			//Pavan R 09apr19[to CalculateCommission based on COMM_CALC_ON_OFF finparm ]
+			commCalcOnOff = finCommon.getFinparams("999999", "COMM_CALC_ON_OFF", conn);
+			System.out.println("@@@@@1046 commCalcOnOff["+commCalcOnOff+"]");
+			if("Y".equalsIgnoreCase(commCalcOnOff))					
+			{
+				CalculateCommission calCom=new CalculateCommission();
+				commDrcrConf = checkNull(finCommon.getFinparams("999999", "COMM_DRCR_CONF", conn));
+				commJvConf = checkNull(finCommon.getFinparams("999999", "COMM_JV_CONF", conn));
+				
+				errString =  calCom.CalCommission(invoiceId,"I","",commDrcrConf,commJvConf,xtraParams, conn);
+			}
 			if( errString != null && errString.trim().length() > 0 )
 			{
 				return errString;