Commit 42dbeaae authored by piyush's avatar piyush

Changes done in bellow components against Sun CCF:

1) business-pb/ITM/ADM/i2admt_d - Import bellow components in i2admt_d.pbl in the sequence mentioned
	1.1) d_arrear_post_acc.srd
	1.2) d_emp_separation_brow.srd
	1.3) d_emp_separation_edit.srd

2) business-pb/ITM/ADM/i2admm_d - Import bellow components in i2admm_d.pbl in the sequence mentioned
	2.1) d_emp_det_chg_brow.srd

3) business-pb/ITM/ADM/i2admf_n - Import bellow components in i2admf_n.pbl in the sequence mentioned
    3.1) s_payroll_post.srs
	3.2) nvo_bo_payroll_post.sru

4) business-pb/ITM/ADM/i2admt_n - Import bellow components in i2admt_n.pbl in the sequence mentioned
    4.1) nvo_bo_emp_separation.sru
	4.2) nvo_bo_itax_proc.sru
	4.3) nvo_bo_itax_proc1.sru
	4.4) nvo_bo_it_reproc.sru
	4.5) nvo_bo_leave_proc.sru
	4.6) nvo_bo_payroll_post_acc.sru

5) business-java/webitm-adm/module-resource/SQL
	5.1) ADM-RCP-DDL.SQL
	5.2) ADM-RCP-DATA-DML.SQL

6) business-java/webitm-adm/module-resource/metadata
	6.1) emp_separation11.xml
	6.2) emp_separation21.xml
	6.3) emp_det_chg11.xml
	
7) business-pb/ITM/module-resource/metadata	
	7.1) emp_separation11.xml
	7.2) emp_separation21.xml
	7.3) emp_det_chg11.xml


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@190777 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 87ba655b
......@@ -23157,3 +23157,65 @@ COMMIT;
--------------- DDL from ADM-RCP-DATA-V39 (Piyush).SQL.Start -------
--- No Catlog SQL in this version
--------------- DDL from ADM-RCP-DATA-V39 (Piyush).SQL.End -------
--------------- DDL from ADM-RCP-DATA-V40 (Piyush).SQL.Start -------
--- Date: 14/09/2018.Start
INSERT INTO PAYRPARM
(
PRD_CODE,
VAR_NAME,
VAR_TYPE,
VAR_VALUE,
DESCR,
VAR_SUBS,
CHG_DATE,
CHG_USER,
CHG_TERM
)
VALUES
(
'999999',
'CHK_MINLVEBAL_ONCONF',
'S',
'N',
'Minimum Leave Balance to be checked or not on confirmation',
NULL,
SYSDATE,
'BASE',
'BASE'
)
;
COMMIT;
INSERT INTO MESSAGES
(
MSG_NO,
MSG_STR,
MSG_DESCR,
MSG_TYPE,
MSG_OPT,
CHG_DATE,
CHG_USER,
CHG_TERM
)
VALUES
(
'VPITXPRC01',
'IT Update Failed!',
'Failed to update infome tax',
'E',
'Y',
SYSDATE,
'BASE',
'BASE'
)
;
COMMIT;
--- Date: 14/09/2018.End
--------------- DDL from ADM-RCP-DATA-V39 (Piyush).SQL.End -------
......@@ -3238,3 +3238,92 @@ END;
--------------- DDL from ADM-RCP-DDL-V39 (Piyush).SQL.Start -------
--- No Catlog SQL in this version
--------------- DDL from ADM-RCP-DDL-V39 (Piyush).SQL.End -------
--------------- DDL from ADM-RCP-DDL-V40 (Piyush).SQL.Start -------
--- Date: 14/09/2018.Start
create or replace
FUNCTION FN_GET_EMP_NAME (as_emp_code char,as_return_type char)
return varchar2 is
ls_emp_fname employee.emp_fname%type;
ls_emp_mname employee.emp_mname%type;
ls_emp_lname employee.emp_lname%type;
ls_emp_fname_long employee.emp_fname_long%type;
ls_emp_mname_long employee.emp_mname_long%type;
ls_emp_lname_long employee.emp_lname_long%type;
ls_emp_aprv_name varchar2(120);
ls_emp_code__aprv employee.emp_code%type;
begin
ls_emp_code__aprv := as_emp_code;
if (as_return_type = 'Z') then -- For maintain compitability with database function used in SFA application
select INITCAP(trim(emp_fname)) ||' '||INITCAP(trim(emp_lname)) into ls_emp_aprv_name from employee where emp_code = ls_emp_code__aprv;
RETURN LS_EMP_APRV_NAME;
elsif (as_return_type = 'F') then
select emp_fname into ls_emp_fname from employee where emp_code = as_emp_code;
return ls_emp_fname;
elsif as_return_type ='M' then
select emp_mname into ls_emp_mname from employee where emp_code = as_emp_code;
return ls_emp_mname;
elsif as_return_type ='L' then
select emp_lname into ls_emp_lname from employee where emp_code = as_emp_code;
return ls_emp_lname;
elsif as_return_type ='X' then
select emp_fname,emp_mname,emp_lname into ls_emp_fname,ls_emp_mname,ls_emp_lname
from employee where emp_code = as_emp_code;
return trim(ls_emp_fname) ||' '|| trim(ls_emp_mname) ||' '|| trim(ls_emp_lname);
elsif as_return_type ='FL' then
select emp_fname,emp_mname,emp_lname into ls_emp_fname,ls_emp_mname,ls_emp_lname
from employee where emp_code = as_emp_code;
return trim(ls_emp_fname) ||' '|| trim(ls_emp_lname);
elsif as_return_type ='FM' then
select emp_fname,emp_mname,emp_lname into ls_emp_fname,ls_emp_mname,ls_emp_lname
from employee where emp_code = as_emp_code;
return trim(ls_emp_fname) ||' '|| trim(ls_emp_mname);
elsif as_return_type ='FML' then
select emp_fname,emp_mname,emp_lname into ls_emp_fname,ls_emp_mname,ls_emp_lname
from employee where emp_code = as_emp_code;
return trim(ls_emp_fname) ||' '|| trim(ls_emp_mname) ||' '|| trim(ls_emp_Lname);
elsif (as_return_type = 'F1') then
select case when emp_fname_long is null or length(trim(emp_fname_long)) = 0 then emp_fname else emp_fname_long end into ls_emp_fname_long from employee where emp_code = as_emp_code;
return ls_emp_fname_long;
elsif as_return_type ='M1' then
select case when emp_mname_long is null or length(trim(emp_mname_long)) = 0 then emp_mname else emp_mname_long end into ls_emp_mname_long from employee where emp_code = as_emp_code;
return ls_emp_mname_long;
elsif as_return_type ='L1' then
select case when emp_lname_long is null or length(trim(emp_fname_long)) = 0 then emp_lname else emp_lname_long end into ls_emp_lname from employee where emp_code = as_emp_code;
return ls_emp_lname;
elsif as_return_type ='X1' then
select case when emp_fname_long is null or length(trim(emp_fname_long)) = 0 then emp_fname else emp_fname_long end,
case when emp_mname_long is null or length(trim(emp_mname_long)) = 0 then emp_mname else emp_mname_long end,
CASE WHEN EMP_LNAME_LONG IS NULL OR LENGTH(TRIM(EMP_FNAME_LONG)) = 0 THEN EMP_LNAME ELSE EMP_LNAME_LONG END
--into ls_emp_fname,ls_emp_mname,ls_emp_lname from employee where emp_code = as_emp_code;
into ls_emp_fname_long,ls_emp_mname_long,ls_emp_lname_long from employee where emp_code = as_emp_code;
return trim(ls_emp_fname_long) ||' '|| trim(ls_emp_mname_long) ||' '|| trim(ls_emp_lname_long);
elsif as_return_type ='FL1' then
select case when emp_fname_long is null or length(trim(emp_fname_long)) = 0 then emp_fname else emp_fname_long end,
case when emp_mname_long is null or length(trim(emp_mname_long)) = 0 then emp_mname else emp_mname_long end,
CASE WHEN EMP_LNAME_LONG IS NULL OR LENGTH(TRIM(EMP_FNAME_LONG)) = 0 THEN EMP_LNAME ELSE EMP_LNAME_LONG END
--into ls_emp_fname,ls_emp_mname,ls_emp_lname from employee where emp_code = as_emp_code;
into ls_emp_fname_long,ls_emp_mname_long,ls_emp_lname_long from employee where emp_code = as_emp_code;
return trim(ls_emp_fname_long) ||' '|| trim(ls_emp_lname_long);
elsif as_return_type ='FM1' then
select case when emp_fname_long is null or length(trim(emp_fname_long)) = 0 then emp_fname else emp_fname_long end,
case when emp_mname_long is null or length(trim(emp_mname_long)) = 0 then emp_mname else emp_mname_long end,
CASE WHEN EMP_LNAME_LONG IS NULL OR LENGTH(TRIM(EMP_FNAME_LONG)) = 0 THEN EMP_LNAME ELSE EMP_LNAME_LONG END
--into ls_emp_fname,ls_emp_mname,ls_emp_lname from employee where emp_code = as_emp_code;
into ls_emp_fname_long,ls_emp_mname_long,ls_emp_lname_long from employee where emp_code = as_emp_code;
return trim(ls_emp_fname_long) ||' '|| trim(ls_emp_mname_long);
elsif as_return_type ='FML1' then
select case when emp_fname_long is null or length(trim(emp_fname_long)) = 0 then emp_fname else emp_fname_long end,
case when emp_mname_long is null or length(trim(emp_mname_long)) = 0 then emp_mname else emp_mname_long end,
CASE WHEN EMP_LNAME_LONG IS NULL OR LENGTH(TRIM(EMP_FNAME_LONG)) = 0 THEN EMP_LNAME ELSE EMP_LNAME_LONG END
--into ls_emp_fname,ls_emp_mname,ls_emp_lname from employee where emp_code = as_emp_code;
into ls_emp_fname_long,ls_emp_mname_long,ls_emp_lname_long from employee where emp_code = as_emp_code;
return trim(ls_emp_fname_long) ||' '|| trim(ls_emp_mname_long) ||' '|| trim(ls_emp_lname_long);
end if;
return trim(ls_emp_fname) ||' '|| trim(ls_emp_mname) ||' '|| trim(ls_emp_Lname);
END;
/
--- Date: 14/09/2018.Start
--------------- DDL from ADM-RCP-DDL-V40 (Piyush).SQL.Start -------
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