FinCommon.java - added code to call new getAcctDetrTtype method with site code...

FinCommon.java - added code to call new getAcctDetrTtype method with site code argument[Reverted commented changes]


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

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

@@ -5981,7 +5981,7 @@ public class FinCommon
      */
 	public String getAcctDetrTtype(String itemCode, String itemSer, String purpose, String tranType, Connection conn) throws ITMException
 	{
-		String acctCode = null, cctrCode = null, stkOpt = null, itemSerN = null, grpCode = null;
+		/*String acctCode = null, cctrCode = null, stkOpt = null, itemSerN = null, grpCode = null;
 		String sql = null;
 		PreparedStatement pstmt = null;
 		ResultSet rs = null;
@@ -6171,7 +6171,7 @@ public class FinCommon
 				else
 				{					
 					//Changed By pragyan on 04/Mar/15 as suggested by Manohran Sir from NVO.start
-					sql = " SELECT ACCT_CODE__IN,CCTR_CODE__IN FROM ITEM_ACCT_DETR WHERE ITEM_CODE = '" + itemCode + "' "
+					/*sql = " SELECT ACCT_CODE__IN,CCTR_CODE__IN FROM ITEM_ACCT_DETR WHERE ITEM_CODE = '" + itemCode + "' "
 					+ " AND ITEM_SER = '" + itemSer + "' AND TRAN_TYPE = ' '";
 					
 					pstmt = conn.prepareStatement(sql);
@@ -6245,7 +6245,7 @@ public class FinCommon
 								pstmt.close(); pstmt = null;
 							}
 						}
-					}
+					}*//*
 					sql = " SELECT ACCT_CODE__IN,CCTR_CODE__IN FROM ITEM_ACCT_DETR WHERE ITEM_CODE = '" + itemCode + "' "
 							+ " AND ITEM_SER = '"+ itemSer + "' AND TRAN_TYPE = '" + tranType + "' AND FIN_ENTITY = ' ' ";
 					
@@ -9756,8 +9756,8 @@ public class FinCommon
 //start Changes By sAkhtar on 28 june 2010
 			else if(purpose.equalsIgnoreCase("ACCDEPR")) // ACCOUNT CODE ACCUMULATED DEPR FOR FIXED ASSET
 			{
-				sql = " select acct_code__acc_depr,cctr_code__acc_depr from item_acct_detr where item_code = ?"
-				+ " and item_ser = ? and grp_code = ? ";
+				/*sql = " select acct_code__acc_depr,cctr_code__acc_depr from item_acct_detr where item_code = ?"
+				+ " and item_ser = ? and grp_code = ? ";*//*
 
 				sql = " SELECT ACCT_CODE__ACC_DEPR,CCTR_CODE__ACC_DEPR FROM ITEM_ACCT_DETR WHERE ITEM_CODE = '" + itemCode + "' "
 				+ " AND ITEM_SER = '" + itemSer + "' AND TRAN_TYPE = '" + tranType + "' AND FIN_ENTITY = ' ' ";
@@ -9879,8 +9879,8 @@ public class FinCommon
 									if (acctCode == null  || acctCode.trim().length() == 0)
 									{
 										//changes by sarita on 28 JUN 18 to change column name CCTR_CODE__ACC to [CCTR_CODE__ACC_DEPR] == START
-										sql = " SELECT ACCT_CODE__ACC_DEPR,CCTR_CODE__ACC FROM ITEM_ACCT_DETR WHERE ITEM_SER = '"+ itemSerN +"' AND ITEM_CODE = ' ' "
-												+ " AND TRAN_TYPE = ' ' AND FIN_ENTITY = ' '";
+										/*sql = " SELECT ACCT_CODE__ACC_DEPR,CCTR_CODE__ACC FROM ITEM_ACCT_DETR WHERE ITEM_SER = '"+ itemSerN +"' AND ITEM_CODE = ' ' "
+												+ " AND TRAN_TYPE = ' ' AND FIN_ENTITY = ' '";*//*
 										sql = " SELECT ACCT_CODE__ACC_DEPR,CCTR_CODE__ACC_DEPR FROM ITEM_ACCT_DETR WHERE ITEM_SER = '"+ itemSerN +"' AND ITEM_CODE = ' ' "
 												+ " AND TRAN_TYPE = ' ' AND FIN_ENTITY = ' '";
 										//changes by sarita on 28 JUN 18 to change column name CCTR_CODE__ACC to [CCTR_CODE__ACC_DEPR] == END
@@ -11029,9 +11029,9 @@ public class FinCommon
 			}
 		}
 		System.out.println("From getFromAcctDetr [" + acctCode + "," + cctrCode + "]");
-		return acctCode + "," + cctrCode;
+		return acctCode + "," + cctrCode;*/
 		//added code to call new getAcctDetrTtype method with site code argument by Varsha V on 19-12-18
-		//return getAcctDetrTtype(itemCode, itemSer, purpose, tranType, "", conn);
+		 return getAcctDetrTtype(itemCode, itemSer, purpose, tranType, "", conn);
 	}
 	/////////////
     /**