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

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

@@ -1410,10 +1410,8 @@ public class MiscVoucherIC extends ValidatorEJB implements MiscVoucherICLocal, M
 											errFields.add(childNodeName.toLowerCase()); 
 										}
 									}
-								}
-							}//end by Abhijit
-							
-							//End of Comment
+								}*///end by Abhijit
+							}
 						}
 						break;
                    
@@ -3496,7 +3494,7 @@ public class MiscVoucherIC extends ValidatorEJB implements MiscVoucherICLocal, M
 									setNodeValue(dom, "exch_rate", mexrate);
 								}
 							}
-                            finEntity = genericUtility.getColumnValue("fin_entity", dom);
+							finEntity = genericUtility.getColumnValue("fin_entity", dom);
 							currCode1 = findValue(conn, "curr_code" , "finent", "fin_entity", finEntity);
 							if(currCode1 != null && currCode != null && currCode1.trim().equalsIgnoreCase(currCode.trim()))
 							{
@@ -3506,7 +3504,7 @@ public class MiscVoucherIC extends ValidatorEJB implements MiscVoucherICLocal, M
 							{
 								valueXmlString.append("<exch_rate protect = \"0\">").append("<![CDATA[" + mexrate + "]]>").append ("</exch_rate>");
 							}
-					        vouchType = genericUtility.getColumnValue("vouch_type", dom);
+							vouchType = genericUtility.getColumnValue("vouch_type", dom);
 							if("A".equalsIgnoreCase(vouchType))
 							{
 								if(acctCodeAdv == null || acctCodeAdv.trim().length() == 0)
@@ -3582,12 +3580,12 @@ public class MiscVoucherIC extends ValidatorEJB implements MiscVoucherICLocal, M
 								valueXmlString.append("<cr_term>").append("<![CDATA[" + crTerm + "]]>").append("</cr_term>");
 								//Added by Jaffar S. on 21-05-18
 								setNodeValue(dom, "cr_term", defCrTerm);
-                                crDays1 = findValue(conn, "cr_days" ,"crterm", "cr_term", crTerm);
-                                if(crDays1 != null && crDays1.trim().length() > 0)
-                                {
-                                	crDays = Integer.parseInt(crDays1);
-                                }
-							    startFrom = findValue(conn, "start_from" ,"crterm", "cr_term", crTerm);
+								crDays1 = findValue(conn, "cr_days" ,"crterm", "cr_term", crTerm);
+								if(crDays1 != null && crDays1.trim().length() > 0)
+								{
+									crDays = Integer.parseInt(crDays1);
+								}
+								startFrom = findValue(conn, "start_from" ,"crterm", "cr_term", crTerm);
 								dueDate = this.getDueDate(conn,simpleDateFormat,startFrom,tranDate,effDate,billDate,crDays);
 							}
 							if(dueDate != null)
@@ -3616,14 +3614,14 @@ public class MiscVoucherIC extends ValidatorEJB implements MiscVoucherICLocal, M
 								valueXmlString.append("<cctr_code__pay>").append("<![CDATA[" + "" + "]]>").append("</cctr_code__pay>");
 								valueXmlString.append("<cctr_descr__pay>").append("<![CDATA[" + "" + "]]>").append("</cctr_descr__pay>");
 							}
-                            acctCodePay = genericUtility.getColumnValue("acct_code__pay", dom);
+							acctCodePay = genericUtility.getColumnValue("acct_code__pay", dom);
 							if(acctCodePay == null || acctCodePay.trim().length() == 0)
 							{
 								acctCodePay = genericUtility.getColumnValue("acct_code__ap", dom);
 								cctrCodePay = genericUtility.getColumnValue("cctr_code__ap", dom);
 								sundryTypePay = genericUtility.getColumnValue("sundry_type__pay", dom);
 								sundryCodePay = genericUtility.getColumnValue("sundry_code__pay", dom);
-                                stanCodePay = getStanCode(conn , sundryTypePay,sundryCodePay);
+								stanCodePay = getStanCode(conn , sundryTypePay,sundryCodePay);
 								if(stanCodePay != null && (stanCodePay.trim().length() > 0 ))
 								{
 									stanNamePay = findValue(conn, "descr" , "station", "stan_code", stanCodePay);
@@ -3654,7 +3652,7 @@ public class MiscVoucherIC extends ValidatorEJB implements MiscVoucherICLocal, M
 								setNodeValue(dom, "cctr_code__pay", cctrCodeAp);
 								
 							}
-                            cctrCodeAp = genericUtility.getColumnValue("cctr_code__ap", dom);
+							cctrCodeAp = genericUtility.getColumnValue("cctr_code__ap", dom);
 							cctrDescr = findValue(conn, "descr" , "costctr", "cctr_code", cctrCodeAp);
 							valueXmlString.append("<cctr_descr__ap>").append("<![CDATA[" + cctrDescr + "]]>").append("</cctr_descr__ap>");
 							cctrCodePay = genericUtility.getColumnValue("cctr_code__pay", dom);
@@ -3670,7 +3668,7 @@ public class MiscVoucherIC extends ValidatorEJB implements MiscVoucherICLocal, M
 							//End
 							
 						}
-                        else if(currentColumn.trim().equalsIgnoreCase("order_ref"))
+						  else if(currentColumn.trim().equalsIgnoreCase("order_ref"))
 				        {
 							orderRef = genericUtility.getColumnValue("order_ref", dom);	
 							val = "Y";