MiscVoucherIC.java - acct_code_adv should be set from finparm entry GTPL point 416

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

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

@@ -3230,11 +3230,14 @@ public class MiscVoucherIC extends ValidatorEJB implements MiscVoucherICLocal, M
 								}
 								else if("A".equalsIgnoreCase(vouchType))
 								{
+									/*Commenred below 2 lines by Varsha V on 09-08-18 because blank was setting for both acct_code_ap and cctr_code_ap
 									acctCodeAp = "";
 									cctrCodeAp = "";
+									*/
 									//Done changes by sarita on 03 JUL 18 for gtpl Issue Tracker No. 416 to set acct_code_adv and cctr_code_adv if Sundry_type is 'E' and voucher type is 'A' [START]												
 									cctrCodeAdv = findValue(conn, "a.cctr_code__sal" , " employee a, site b ", " a.pay_site = b.site_code and a.emp_code", sundryCode);
-									empAdvSchemeCd = admCommon.getEnv("999999", "DEF_EMPADV_SCHEMECD", conn);
+									//Commented by Varsha V on 09-08-18 for taking acct_code_adv value from finparam
+									/*empAdvSchemeCd = admCommon.getEnv("999999", "DEF_EMPADV_SCHEMECD", conn);
 									System.out.println("Sarita 02JUL18::: cctrCodeAdv ["+cctrCodeAdv+"] \t empAdvSchemeCd ["+empAdvSchemeCd+"]");
 									if("NULLFOUND".equalsIgnoreCase(empAdvSchemeCd) || (empAdvSchemeCd == null ||empAdvSchemeCd.trim().length() == 0))
 									{
@@ -3283,8 +3286,23 @@ public class MiscVoucherIC extends ValidatorEJB implements MiscVoucherICLocal, M
 										{
 											acctCodeAdv = "";
 										}
-									}
+									}*/
 									//Done changes by sarita on 03 JUL 18 for gtpl Issue Tracker No. 416 to set acct_code_adv and cctr_code_adv if Sundry_type is 'E' and voucher type is 'A' [END]
+									//Ended by Varsha V on 09-08-18 for taking acct_code_adv value from finparam
+									
+									//Added by Varsha V on 09-08-18 acct_code_adv should be set from finparam as per discuss with Shiri maam
+									acctCodeAdv = finCommon.getFinparams("999999", "EMPADV_DEFAULT_ACCT", conn);
+									if("NULLFOUND".equalsIgnoreCase(acctCodeAdv) || (acctCodeAdv == null || acctCodeAdv.trim().length() == 0))
+									{
+										acctCodeAdv = "";
+									}
+									System.out.println("acctCodeAdv: ["+acctCodeAdv+"]");
+									valueXmlString.append("<acct_code__adv>").append("<![CDATA[" + acctCodeAdv + "]]>").append("</acct_code__adv>");
+									valueXmlString.append("<cctr_code__adv>").append("<![CDATA[" + cctrCodeAdv + "]]>").append("</cctr_code__adv>");
+									setNodeValue(dom, "acct_code__adv", acctCodeAdv);
+									setNodeValue(dom, "cctr_code__adv", cctrCodeAdv);
+									//Ended by Varsha V on 09-08-18 acct_code_adv should be set from finparam as per discuss with Shiri maam
+									
 							    }
 								//Added by Varsha V. on 24-05-18 for setting acct_code__pay, cctr_code__pay on sundry_code changed
 								System.out.println("============acctCodeAp: "+acctCodeAp+" cctrCodeAp: "+cctrCodeAp);
@@ -3639,6 +3657,7 @@ public class MiscVoucherIC extends ValidatorEJB implements MiscVoucherICLocal, M
 								{
 									cctrCodeAp = "";
 							    }
+								System.out.println(">>>>>>>>>>>acctCodeAp: ["+acctCodeAp+"] cctrCodeAp: ["+cctrCodeAp+"] acctCodeAdv: ["+acctCodeAdv+"] cctrCodeAdv: ["+cctrCodeAdv+"]");
 								valueXmlString.append("<acct_code__ap>").append("<![CDATA[" + acctCodeAp + "]]>").append("</acct_code__ap>");
 								mdescr = findValue(conn, "descr" , "accounts", "acct_code", acctCodeAp);
 								valueXmlString.append("<accounts_descr>").append("<![CDATA[" + mdescr + "]]>").append("</accounts_descr>");