MiscVoucherIC.java - On changing sundry code if sundry type is employee then...

MiscVoucherIC.java - On changing sundry code  if sundry type is employee then acct_code_pay and cctr_code_pay should set
PayVoucherComIc.java - added condition for remark if its null


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

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

@@ -3136,11 +3136,17 @@ public class MiscVoucherIC extends ValidatorEJB implements MiscVoucherICLocal, M
 								valueXmlString.append("<designation>").append("<![CDATA[" + designation + "]]>").append("</designation>");
 								if(acctCodeAp == null || (acctCodeAp.trim().length() == 0 ))
 								{
-									acctCodeAp = findValue(conn, "a.acct_code__sal" , "employee a", "site b", "a.pay_site", "a.emp_code", "b.site_code", sundryCode);
+									//Commented and added line by Varsha V on 25-05-18 because of sql issue
+									//acctCodeAp = findValue(conn, "a.acct_code__sal" , "employee a", "site b", "a.pay_site", "a.emp_code", "b.site_code", sundryCode);
+									acctCodeAp = findValue(conn, "a.acct_code__sal" , " employee a, site b ", " a.pay_site = b.site_code and a.emp_code", sundryCode);
+									//Ended line by Varsha V on 25-05-18 because of sql issue
 							    }
 								if(cctrCodeAp == null || (cctrCodeAp.trim().length() == 0 ))
 								{
-									cctrCodeAp = findValue(conn, "a.cctr_code__sal" , "employee a", "site b", "a.pay_site", "a.emp_code", "b.site_code", sundryCode);
+									//Commented and added line by Varsha V on 25-05-18 because of sql issue
+									//cctrCodeAp = findValue(conn, "a.cctr_code__sal" , "employee a", "site b", "a.pay_site", "a.emp_code", "b.site_code", sundryCode);
+									cctrCodeAp = findValue(conn, "a.cctr_code__sal" , " employee a, site b ", " a.pay_site = b.site_code and a.emp_code", sundryCode);
+									//Ended line by Varsha V on 25-05-18 because of sql issue
 							    }
 								descName = mFname + "" + mLname;
 								//currCode = findValue(conn, "curr_code", "site", "finent", "site.fin_entity", "site_code", "finent.fin_entity", siteCode);
@@ -3192,6 +3198,16 @@ public class MiscVoucherIC extends ValidatorEJB implements MiscVoucherICLocal, M
 									acctCodeAp = "";
 									cctrCodeAp = "";
 							    }
+								//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);
+								acctCodeAp = (acctCodeAp == null)? "":acctCodeAp;
+								cctrCodeAp = (cctrCodeAp == null)? "":cctrCodeAp; 
+								System.out.println("============acctCodeAp: "+acctCodeAp+" cctrCodeAp: "+cctrCodeAp);
+								setNodeValue(dom, "acct_code__pay", acctCodeAp);
+								setNodeValue(dom, "cctr_code__pay", cctrCodeAp);
+								valueXmlString.append("<acct_code__pay>").append("<![CDATA[" + acctCodeAp + "]]>").append("</acct_code__pay>");
+								valueXmlString.append("<cctr_code__pay>").append("<![CDATA[" + cctrCodeAp + "]]>").append("</cctr_code__pay>");
+								//Ended by Varsha V. on 24-05-18 for setting acct_code__pay, cctr_code__pay on sundry_code changed
                             }
 							else if("P".equalsIgnoreCase(sundryType))
 							{
@@ -4360,11 +4376,10 @@ public class MiscVoucherIC extends ValidatorEJB implements MiscVoucherICLocal, M
 							{
 								valueXmlString.append("<proj_code>").append("<![CDATA[" + projCode1 + "]]>").append("</proj_code>");
 							}
-							//Added by Varsha V on 24-05-18 for setting tax_class, tax_chap, tax_env
 							valueXmlString.append("<tax_class>").append("<![CDATA[" + checkNull(taxClass) + "]]>").append("</tax_class>");
 							valueXmlString.append("<tax_chap>").append("<![CDATA[" + checkNull(taxChap) + "]]>").append("</tax_chap>");
 							valueXmlString.append("<tax_env>").append("<![CDATA[" + checkNull(taxEnv) + "]]>").append("</tax_env>");
-							//Ended by Varsha V on 24-05-18 for setting tax_class, tax_chap, tax_env
+							
 						}
                         
 						else if(currentColumn.trim().equalsIgnoreCase("itm_defaultedit"))

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

@@ -161,6 +161,12 @@ conn = getConnection();
 				System.out.println("descr1 :: "+descr1);
 				valueXmlString.append("<acct_descr>").append(descr1).append("</acct_descr>\r\n");
 				remarks = finCommon.getFinparams("999999", "PUR_EXP_REMARKS",conn);
+				//Added by Varsha V on 25-05-18 for adding condtion of null
+				if(remarks == null || remarks.equalsIgnoreCase("NULLFOUND"))
+				{
+					remarks = "";
+				}
+				//Ended by Varsha V on 25-05-18 for adding condtion of null
 				valueXmlString.append("<remarks>").append(remarks).append("</remarks>\r\n");