SUN source merging

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

webitm-adm/module-resource/SQL/ADM-RCP-DDL.SQL

@@ -2919,106 +2919,3 @@ ALTER TABLE EMP_EMPLOY_EVENTS ADD CONSTRAINT FK_EMPEVENTS_BU_CODE FOREIGN KEY (
 
 --------------- DDL from ADM-RCP-DDL-V33.SQL.End -------
 
------- ADM-RCP-DDL-V34 (Piyush).SQL.Start ------
-
-SET DEFINE OFF
-
---- Request ID: A16ESUN007.SQL.Start ---
-ALTER TABLE ITPROJ_CALCHDR ADD CALC_BASE_CRITERIA CHAR(1);
-ALTER TABLE IT_CALCHDR ADD CALC_BASE_CRITERIA CHAR(1);
---- Request ID: A16ESUN007.SQL.End ---
-
-
---- Request ID: A16ESUN009.SQL.Start ---
---- Request ID: A16ESUN009.SQL.End ---
-
---- Request ID: A16HSUN001-1.sql.Start ---
-
-ALTER TABLE EMPLOYEE ADD MOTHER_TONGUE VARCHAR2(10);
-ALTER TABLE EMPLOYEE ADD CAST_CATEGORY CHAR(5);
-ALTER TABLE EMPLOYEE ADD COUNT_CODE__BIRTH CHAR(5);
-ALTER TABLE EMPLOYEE ADD JOB_TITLE VARCHAR2(200);
-ALTER TABLE EMPLOYEE ADD EMP_ID_EXTERNAL VARCHAR2(20);
-
-ALTER TABLE EMPQUAL ADD COURSE_TYPE CHAR(5);
-ALTER TABLE EMPQUAL ADD COURSE_DURATION NUMBER(3);
-ALTER TABLE EMPQUAL ADD COUNT_CODE__QUAL CHAR(5);
-
-ALTER TABLE EMPEXPERIENCE ADD COUNT_CODE__WORK CHAR(5);
-
-ALTER TABLE EMPLOYEE_DET_CHANGE ADD MOTHER_TONGUE__O VARCHAR2(10);
-ALTER TABLE EMPLOYEE_DET_CHANGE ADD MOTHER_TONGUE VARCHAR2(10);
-ALTER TABLE EMPLOYEE_DET_CHANGE ADD CAST_CATEGORY__O CHAR(5);
-ALTER TABLE EMPLOYEE_DET_CHANGE ADD CAST_CATEGORY CHAR(5);
-ALTER TABLE EMPLOYEE_DET_CHANGE ADD COUNT_CODE__BIRTH_O CHAR(5);
-ALTER TABLE EMPLOYEE_DET_CHANGE ADD COUNT_CODE__BIRTH CHAR(5);
-ALTER TABLE EMPLOYEE_DET_CHANGE ADD JOB_TITLE_O VARCHAR2(200);
-ALTER TABLE EMPLOYEE_DET_CHANGE ADD JOB_TITLE VARCHAR2(200);
-ALTER TABLE EMPLOYEE_DET_CHANGE ADD EMP_ID_EXTERNAL_O VARCHAR2(20);
-ALTER TABLE EMPLOYEE_DET_CHANGE ADD EMP_ID_EXTERNAL VARCHAR2(20);
-
-CREATE OR REPLACE FUNCTION FN_GET_COUNT_DESCR(AS_COUNT_CODE In CHAR) 
-RETURN VARCHAR2 IS COUNT_DESCR VARCHAR2(200);
-
-BEGIN
-	COUNT_DESCR := ''; 
-	BEGIN
-	SELECT DESCR INTO COUNT_DESCR  FROM COUNTRY WHERE COUNT_CODE = AS_COUNT_CODE;
-		EXCEPTION WHEN NO_DATA_FOUND THEN 
-		COUNT_DESCR := ''; 
-	END;
-	RETURN COUNT_DESCR;
-END;
-/
-
---- Request ID: A16HSUN001-1.sql.End ---
-
---- Request ID: A16HSUN001-2.sql.Start ---
-
-ALTER TABLE EMP_STATUSCHG ADD REASON_CODE CHAR(5);
-
-ALTER TABLE EMP_EMPLOY_EVENTS ADD REASON_CODE CHAR(5);
-ALTER TABLE EMP_EMPLOY_EVENTS ADD JOB_TITLE_FR VARCHAR2(200);
-ALTER TABLE EMP_EMPLOY_EVENTS ADD JOB_TITLE_TO VARCHAR2(200);
-
-ALTER TABLE ORG_STRUCTURE ADD DEPT_CODE CHAR(5);
-
---- Request ID: A16HSUN001-2.sql.End ---
-
---- Request ID: A16HSUN001-3.sql.Start ---
-
-
---- Request ID: A16HSUN001-3.sql.End ---
-
---- Request ID: A16HSUN001-4.sql.Start ---
-
-
---- Request ID: A16HSUN001-4.sql.End ---
-
---- Request ID: A16HSUN001-5.sql.Start ---
-
-
---- Request ID: A16HSUN001-5.sql.End ---
-
-
---- Request ID: office-sql.Start ---
-
-
---- Request ID: office-sql.End ---
-
---- Request ID:A16HSUN006. Migration of IT Declaration to RCP and IT Declaration through Upload START ---
-
---alter table for adding seq_no in emp_itdecl_hdr table--
-alter table emp_itdecl_hdr add seq_no number(2) default 1 not null;
-
---drop index emp_itdecl_hdr_aeqd on table emp_itdecl_hdr --
-drop index emp_itdecl_hdr_aeqd ;
-commit;
-
---create index for AEQDS on emp_itdecl_hdr table (ACCT_PRD, EMP_CODE__DECL, QTR_NO, DECL_TYPE, SEQ_NO)--
-create unique index emp_itdecl_hdr_aeqd on emp_itdecl_hdr (acct_prd asc, emp_code__decl asc, qtr_no asc, decl_type asc, seq_no asc);
-commit;
-
---- Request ID:A16HSUN006. Migration of IT Declaration to RCP and IT Declaration through Upload END ---
-
------- ADM-RCP-DDL-V34 (Piyush).SQL.End ------

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

@@ -163,11 +163,10 @@
 			<updatewhereclause>yes</updatewhereclause>
 			<name>upd_paystru</name>
 			<dbname>std_paystru.upd_paystru</dbname>
-			<initial>2</initial>
+			<initial>Y</initial>
 			<values>
-				<item display="If Non Zero" data="1"/>
-				<item display="Always" data="2"/>
-				<item display="Never" data="3"/>
+				<item display="Yes" data="Y"/>
+				<item display="No" data="N"/>
 			</values>
 		</table_column>
 		<table_column>
@@ -870,7 +869,7 @@
 		<x>166</x>
 		<y>166</y>
 		<height>15</height>
-		<width>97</width>
+		<width>48</width>
 		<format>[general]</format>
 		<html>
 			<valueishtml>0</valueishtml>

webitm-adm/module-resource/srd/d_std_paystru21.srd

@@ -17,7 +17,7 @@ table(column=(type=char(5) update=yes updatewhereclause=yes key=yes name=pay_tab
  column=(type=char(1) update=yes updatewhereclause=yes name=frequency dbname="std_paystru.frequency" initial="2" values="Lump sum	1/Monthly	2/Quarterly	3/Half Yearly	4/Yearly	5/Once In A Two Year	6/Once In Three Year	7/" )
  column=(type=char(1) update=yes updatewhereclause=yes name=pay_method dbname="std_paystru.pay_method" initial="S" values="Through Salary	S/Claim	C/" )
  column=(type=char(100) update=yes updatewhereclause=yes name=res_formula dbname="std_paystru.res_formula" )
- column=(type=char(1) update=yes updatewhereclause=yes name=upd_paystru dbname="std_paystru.upd_paystru" initial="2" values="If Non Zero	1/Always	2/Never	3/" )
+ column=(type=char(1) update=yes updatewhereclause=yes name=upd_paystru dbname="std_paystru.upd_paystru" initial="Y" values="Yes	Y/No	N/" )
  column=(type=char(1) update=yes updatewhereclause=yes name=appl_mode dbname="std_paystru.appl_mode" initial="3" values="Cadre wise	1/Grade Wise	2/Employee Specific	3/" )
  column=(type=char(1) update=yes updatewhereclause=yes name=mtakehome_mode dbname="std_paystru.mtakehome_mode" initial="A" values="Not Applicable	N/Allowance	A/Deduction	D/" )
  column=(type=char(1) update=yes updatewhereclause=yes name=can_modify dbname="std_paystru.can_modify" initial="N" values="Yes	Y/No	N/" )
@@ -46,7 +46,7 @@ column(band=detail id=5 alignment="0" tabsequence=30 border="5" color="0" x="166
 column(band=detail id=7 alignment="0" tabsequence=40 border="5" color="0" x="166" y="86" height="15" width="80" format="dd/mm/yy" html.valueishtml="0"  name=eff_date visible="1" editmask.mask="dd/mm/yy" editmask.imemode=0 editmask.focusrectangle=no  font.face="Times New Roman" font.height="-10" font.weight="400"  font.family="2" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" )
 column(band=detail id=9 alignment="1" tabsequence=60 border="5" color="0" x="166" y="106" height="15" width="86" format="#########0.000" html.valueishtml="0"  name=amount visible="1" editmask.mask="#########0.000" editmask.imemode=0 editmask.focusrectangle=no  font.face="Times New Roman" font.height="-10" font.weight="400"  font.family="2" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" )
 column(band=detail id=11 alignment="0" tabsequence=80 border="5" color="0" x="166" y="126" height="15" width="119" format="[general]" html.valueishtml="0"  name=frequency visible="1" ddlb.limit=1 ddlb.allowedit=no ddlb.case=upper ddlb.imemode=0  font.face="Times New Roman" font.height="-10" font.weight="400"  font.family="2" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" )
-column(band=detail id=14 alignment="0" tabsequence=110 border="5" color="0" x="166" y="166" height="15" width="97" format="[general]" html.valueishtml="0"  name=upd_paystru visible="1" ddlb.limit=1 ddlb.allowedit=no ddlb.case=upper ddlb.imemode=0  font.face="Times New Roman" font.height="-10" font.weight="400"  font.family="2" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" )
+column(band=detail id=14 alignment="0" tabsequence=110 border="5" color="0" x="166" y="166" height="15" width="48" format="[general]" html.valueishtml="0"  name=upd_paystru visible="1" ddlb.limit=1 ddlb.allowedit=no ddlb.case=upper ddlb.imemode=0  font.face="Times New Roman" font.height="-10" font.weight="400"  font.family="2" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" )
 column(band=detail id=16 alignment="0" tabsequence=130 border="5" color="0" x="166" y="186" height="15" width="98" format="[general]" html.valueishtml="0"  name=mtakehome_mode visible="1" ddlb.limit=1 ddlb.allowedit=no ddlb.case=upper ddlb.imemode=0  font.face="Times New Roman" font.height="-10" font.weight="400"  font.family="2" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" )
 column(band=detail id=18 alignment="0" tabsequence=150 border="5" color="0" x="166" y="206" height="15" width="98" format="[general]" html.valueishtml="0"  name=mgross_mode visible="1" ddlb.limit=1 ddlb.allowedit=no ddlb.case=upper ddlb.imemode=0  font.face="Times New Roman" font.height="-10" font.weight="400"  font.family="2" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" )
 column(band=detail id=20 alignment="0" tabsequence=32766 border="5" color="0" x="166" y="226" height="15" width="80" format="dd/mm/yy" html.valueishtml="0"  name=chg_date visible="1" editmask.useformat=yes editmask.mask="dd/mm/yy" editmask.imemode=0 editmask.focusrectangle=no  font.face="Times New Roman" font.height="-10" font.weight="400"  font.family="2" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" )