Commit eb894e40 authored by dpingle's avatar dpingle

* Updated leave master on [23/08/2019]

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


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@205849 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 6b23a433
......@@ -124,10 +124,16 @@ Insert into MESSAGES (MSG_NO,MSG_STR,MSG_DESCR,MSG_TYPE,MSG_OPT,MSG_TIME,ALARM,E
----------------------------------------------------- Dipesh [21/08/2019] End
----------------------------------------------------- Dipesh [23/08/2019] Start
update OBJ_ACTIONS set image='ibase/resource/objaction/Audit-trail.svg' where OBJ_NAME='leave' and LINE_NO=21;
delete OBJ_ACTIONS 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',22,'ibase/resource/objaction/exprtExl.svg','Export To Excel','a','a','B','Export2XLS','1',null,null,'S',null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,'2',null,1);
update OBJ_ACTIONS set display_mode=null where OBJ_NAME='leave' and LINE_NO='22';
----------------------------------------------------- Dipesh [23/08/2019] End
......
......@@ -567,7 +567,8 @@ public class LeavesIC extends ValidatorEJB implements LeavesRemote, LeavesLocal
errList.add("VMNUMBER2");
errFields.add(childNodeName.toLowerCase());
}
if (minAllowed > 0 && maxAllowed > 0 && minAllowed > maxAllowed)
//if (minAllowed > 0 && maxAllowed > 0 && minAllowed > maxAllowed)
if (minAllowed > maxAllowed)
{
errList.add("VMNUMBER1");
errFields.add(childNodeName.toLowerCase());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment