* update leave master on[26/08/2019]

leave21.xml
w_leave.sql
d_leave_edit.srd
LeavesIC.java


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

webitm-adm/module-resource/SQL/w_leave.sql

@@ -141,6 +141,8 @@ update OBJ_ACTIONS set display_mode=null where OBJ_NAME='leave' and LINE_NO='22'
 Insert into OBJ_ACTIONS (OBJ_NAME,LINE_NO,IMAGE,DESCRIPTION,SERVICE_CODE,INTERACTIVE,RIGHTS_CHAR,TITLE,FORM_NO,SERVICE_HANDLER,PLACEMENT,ACTION_TYPE,TRAN_TYPE,CHG_DATE,CHG_TERM,CHG_USER,IS_CONFIRMATION_REQ,SEP_DUTY_OPT,RE_AUTH_OPT,SHOW_IN_PANEL,PAGE_CONTEXT,TYPE,ACTION_ARG,SWIPE_POSITION,MULTI_ROW_OPT,ACTION_ID,DEF_NODATA,IN_PROC_INTRUPT,ESTIMATED_TIME,ACTION_GROUP,DISPLAY_OPT,DISPLAY_MODE,SHOW_CONFIRM,REC_SPECIFIC) 
 values ('leave',8,'ibase/resource/objaction/copyTransaction.svg','Adding New','a','a','A','Copy Transaction','1',null,null,'S',null,null,null,null,null,null,null,null,null,null,null,null,'0',null,null,null,null,null,null,'1',null,null);
 
+
+Insert into OBJ_ITEMCHANGE (OBJ_NAME,FORM_NO,FIELD_NAME,MANDATORY) values ('leave','1','itm_default',null);
 ----------------------------------------------------- Dipesh [26/08/2019] End
 
 

webitm-adm/module-resource/metadata/leave21.xml

@@ -219,18 +219,21 @@
 		</table_column>
 		<table_column>
 			<type>datetime</type>
+			<update>yes</update>
 			<updatewhereclause>yes</updatewhereclause>
 			<name>chg_date</name>
 			<dbname>leaves.chg_date</dbname>
 		</table_column>
 		<table_column>
 			<type size="10">char</type>
+			<update>yes</update>
 			<updatewhereclause>yes</updatewhereclause>
 			<name>chg_user</name>
 			<dbname>leaves.chg_user</dbname>
 		</table_column>
 		<table_column>
 			<type size="300">char</type>
+			<update>yes</update>
 			<updatewhereclause>yes</updatewhereclause>
 			<name>chg_term</name>
 			<dbname>leaves.chg_term</dbname>

webitm-adm/src/ibase/webitm/ejb/adm/LeavesIC.java

@@ -51,7 +51,7 @@ public class LeavesIC extends ValidatorEJB implements LeavesRemote, LeavesLocal
 		Connection conn = null;
 		PreparedStatement pstmt = null;
 		ResultSet rs = null;
-		String colName = "";
+		//String colName = "";
 		String sql = "";
 		String encashable = "";
 		String accumulate = "";
@@ -62,7 +62,7 @@ public class LeavesIC extends ValidatorEJB implements LeavesRemote, LeavesLocal
 		String adCodeEnch = "";
         String allowAdvleave = "";
 		int cnt = 0;
-		colName = currentColumn;
+		//colName = currentColumn;
 		int currentFormNo = 0;
 		StringBuffer valueXmlString = null;
 		E12GenericUtility genericUtility = null;
@@ -85,9 +85,20 @@ public class LeavesIC extends ValidatorEJB implements LeavesRemote, LeavesLocal
 			{
 				case 1:
 				{
-					System.out.println("=========================================Case1============================");
+					System.out.println("=========================================Case1============================" + currentColumn);
 					valueXmlString.append("<Detail1>\r\n");
-					if (currentColumn.equalsIgnoreCase("itm_defaultedit")) 
+					if ("itm_default".equalsIgnoreCase(currentColumn)) 
+					{
+						encashable = checkNull(genericUtility.getColumnValue("encashable", dom));
+						System.out.println("encashable in itemdefault :::"+encashable);
+						if ("N".equalsIgnoreCase(encashable)) 
+						{
+							valueXmlString.append("<lve_code__convert  protect=\"1\"><![CDATA[").append("").append("]]></lve_code__convert>\r\n");
+							valueXmlString.append("<ad_code__ench  protect=\"1\"><![CDATA[").append("").append("]]></ad_code__ench>\r\n");
+						}
+						
+					}
+					else if (currentColumn.equalsIgnoreCase("itm_defaultedit")) 
 					{
 						leaveUnit = checkNull(genericUtility.getColumnValue("lve_unit", dom));
 						if (leaveUnit == null || leaveUnit.trim().length() == 0)
@@ -781,7 +792,7 @@ public class LeavesIC extends ValidatorEJB implements LeavesRemote, LeavesLocal
 			input = "";
 		}
 
-		return input;
+		return input.trim();
 	}
 	private String checkInt(String input) 
 	{