Skip to content

B
business-java
Commit 8a03e48f authored by arawankar's avatar arawankar
Browse files
Options

Changes made in below component to resolve bugs reported by vinuth from sun 

EmpLvePrkBalTrfConf.java
EmpLvePrkBalTrfIC.java
emp_lveprkbal_trf12.xml
emp_lveprkbal_trf22.xml
d_emp_lveprkbal_trf12.srd
d_emp_lveprkbal_trf22.srd
emp_lveprkbal_trf11.xml
emp_lveprkbal_trf21.xml
d_emp_lveprkbal_trf11.srd
d_emp_lveprkbal_trf21.srd


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@190547 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 58b83ef7
Expand all Show whitespace changes
Inline Side-by-side
Showing with 3877 additions and 454 deletions
webitm-adm/ibase/webitm/ejb/adm/adv/EmpLeaveConf.java
View file @ 8a03e48f
...@@ -3750,6 +3750,7 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal, ...@@ -3750,6 +3750,7 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal,
if( ((fVal6 < 0) || (fVal6 == 0 && (fVal3.before(mDate1) || fVal3.equals(mDate1))))) if( ((fVal6 < 0) || (fVal6 == 0 && (fVal3.before(mDate1) || fVal3.equals(mDate1)))))
{ {
continue; continue;
} }
if(fVal6 < nextBal) if(fVal6 < nextBal)
{ {
......
webitm-adm/module-resource/metadata/emp_lveprkbal_trf11.xml 0 → 100644
View file @ 8a03e48f
This diff is collapsed.
webitm-adm/module-resource/metadata/emp_lveprkbal_trf21.xml 0 → 100644
View file @ 8a03e48f
This diff is collapsed.
webitm-adm/module-resource/metadata/emp_lveprkbal_trf22.xml
View file @ 8a03e48f
...@@ -714,71 +714,6 @@ ...@@ -714,71 +714,6 @@
<color>16777215</color> <color>16777215</color>
</background> </background>
</ColumnObject> </ColumnObject>
<TextObject>
<band>Detail</band>
<alignment>1</alignment>
<text>Adjustment Date To :</text>
<border>0</border>
<color>33554432</color>
<x>326</x>
<y>139</y>
<height>16</height>
<width>123</width>
<html>
<valueishtml>0</valueishtml>
</html>
<name>adj_date_to_t</name>
<visible>0</visible>
<font>
<face>Arial</face>
<height>-10</height>
<weight>400</weight>
<family>2</family>
<pitch>2</pitch>
<charset>0</charset>
</font>
<background>
<mode>2</mode>
<color>67108864</color>
</background>
</TextObject>
<ColumnObject>
<band>Detail</band>
<id>11</id>
<alignment>0</alignment>
<tabsequence>32766</tabsequence>
<border>5</border>
<color>33554432</color>
<x>453</x>
<y>139</y>
<height>16</height>
<width>105</width>
<format>[shortdate] [time]</format>
<html>
<valueishtml>0</valueishtml>
</html>
<name>adj_date_to</name>
<visible>1</visible>
<EditStyle style="edit">
<limit>0</limit>
<case>any</case>
<focusrectangle>no</focusrectangle>
<autoselect>no</autoselect>
<imemode>0</imemode>
</EditStyle>
<font>
<face>Arial</face>
<height>-10</height>
<weight>400</weight>
<family>2</family>
<pitch>2</pitch>
<charset>0</charset>
</font>
<background>
<mode>2</mode>
<color>16777215</color>
</background>
</ColumnObject>
<ColumnObject> <ColumnObject>
<band>Detail</band> <band>Detail</band>
<id>9</id> <id>9</id>
...@@ -851,15 +786,15 @@ ...@@ -851,15 +786,15 @@
<text>Adjustment Date From :</text> <text>Adjustment Date From :</text>
<border>0</border> <border>0</border>
<color>33554432</color> <color>33554432</color>
<x>41</x> <x>22</x>
<y>139</y> <y>139</y>
<height>16</height> <height>16</height>
<width>123</width> <width>142</width>
<html> <html>
<valueishtml>0</valueishtml> <valueishtml>0</valueishtml>
</html> </html>
<name>adj_date_fr_t</name> <name>adj_date_fr_t</name>
<visible>0</visible> <visible>1</visible>
<font> <font>
<face>Arial</face> <face>Arial</face>
<height>-10</height> <height>-10</height>
...@@ -887,7 +822,7 @@ ...@@ -887,7 +822,7 @@
<valueishtml>0</valueishtml> <valueishtml>0</valueishtml>
</html> </html>
<name>encashable_t</name> <name>encashable_t</name>
<visible>1</visible> <visible>0</visible>
<font> <font>
<face>Liberation Sans</face> <face>Liberation Sans</face>
<height>-10</height> <height>-10</height>
...@@ -942,18 +877,90 @@ ...@@ -942,18 +877,90 @@
<band>Detail</band> <band>Detail</band>
<id>13</id> <id>13</id>
<alignment>0</alignment> <alignment>0</alignment>
<tabsequence>0</tabsequence> <tabsequence>32766</tabsequence>
<border>5</border> <border>5</border>
<color>33554432</color> <color>33554432</color>
<x>168</x> <x>168</x>
<y>162</y> <y>162</y>
<height>16</height> <height>16</height>
<width>20</width> <width>20</width>
<format>[general]</format>
<html> <html>
<valueishtml>0</valueishtml> <valueishtml>0</valueishtml>
</html> </html>
<name>encashable</name> <name>encashable</name>
<visible>1</visible> <visible>0</visible>
<EditStyle style="edit">
<limit>0</limit>
<case>any</case>
<autoselect>yes</autoselect>
<imemode>0</imemode>
</EditStyle>
<font>
<face>Arial</face>
<height>-10</height>
<weight>400</weight>
<family>2</family>
<pitch>2</pitch>
<charset>0</charset>
</font>
<background>
<mode>2</mode>
<color>16777215</color>
</background>
</ColumnObject>
<TextObject>
<band>Detail</band>
<alignment>1</alignment>
<text>Adjustment Date To :</text>
<border>0</border>
<color>33554432</color>
<x>326</x>
<y>139</y>
<height>16</height>
<width>123</width>
<html>
<valueishtml>0</valueishtml>
</html>
<name>adj_date_to_t</name>
<visible>0</visible>
<font>
<face>Arial</face>
<height>-10</height>
<weight>400</weight>
<family>2</family>
<pitch>2</pitch>
<charset>0</charset>
</font>
<background>
<mode>2</mode>
<color>67108864</color>
</background>
</TextObject>
<ColumnObject>
<band>Detail</band>
<id>11</id>
<alignment>0</alignment>
<tabsequence>32766</tabsequence>
<border>5</border>
<color>33554432</color>
<x>453</x>
<y>139</y>
<height>16</height>
<width>105</width>
<format>[shortdate] [time]</format>
<html>
<valueishtml>0</valueishtml>
</html>
<name>adj_date_to</name>
<visible>0</visible>
<EditStyle style="edit">
<limit>0</limit>
<case>any</case>
<focusrectangle>no</focusrectangle>
<autoselect>no</autoselect>
<imemode>0</imemode>
</EditStyle>
<font> <font>
<face>Arial</face> <face>Arial</face>
<height>-10</height> <height>-10</height>
......
webitm-adm/module-resource/srd/d_emp_lveprkbal_trf11.srd 0 → 100644
View file @ 8a03e48f
This diff is collapsed.
webitm-adm/module-resource/srd/d_emp_lveprkbal_trf21.srd 0 → 100644
View file @ 8a03e48f
This diff is collapsed.
webitm-adm/module-resource/srd/d_emp_lveprkbal_trf22.srd
View file @ 8a03e48f
...@@ -35,14 +35,14 @@ column(band=detail id=8 alignment="1" tabsequence=32766 border="5" color="335544 ...@@ -35,14 +35,14 @@ column(band=detail id=8 alignment="1" tabsequence=32766 border="5" color="335544
column(band=detail id=10 alignment="0" tabsequence=32766 border="5" color="33554432" x="453" y="116" height="16" width="105" format="[general]" html.valueishtml="0" name=lve_unit visible="0" edit.limit=1 edit.case=any edit.focusrectangle=no edit.autoselect=yes edit.autohscroll=yes edit.imemode=0 font.face="Arial" 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=10 alignment="0" tabsequence=32766 border="5" color="33554432" x="453" y="116" height="16" width="105" format="[general]" html.valueishtml="0" name=lve_unit visible="0" edit.limit=1 edit.case=any edit.focusrectangle=no edit.autoselect=yes edit.autohscroll=yes edit.imemode=0 font.face="Arial" 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=5 alignment="0" tabsequence=32766 border="5" color="33554432" x="168" y="70" height="16" width="105" format="[shortdate] [time]" html.valueishtml="0" name=from_date visible="1" edit.limit=0 edit.case=any edit.focusrectangle=no edit.autoselect=yes edit.autohscroll=yes edit.imemode=0 font.face="Arial" 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=5 alignment="0" tabsequence=32766 border="5" color="33554432" x="168" y="70" height="16" width="105" format="[shortdate] [time]" html.valueishtml="0" name=from_date visible="1" edit.limit=0 edit.case=any edit.focusrectangle=no edit.autoselect=yes edit.autohscroll=yes edit.imemode=0 font.face="Arial" 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=7 alignment="0" tabsequence=32766 border="5" color="33554432" x="168" y="93" height="16" width="105" format="[shortdate] [time]" html.valueishtml="0" name=exp_date visible="1" edit.limit=0 edit.case=any edit.focusrectangle=no edit.autoselect=yes edit.autohscroll=yes edit.imemode=0 font.face="Arial" 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=7 alignment="0" tabsequence=32766 border="5" color="33554432" x="168" y="93" height="16" width="105" format="[shortdate] [time]" html.valueishtml="0" name=exp_date visible="1" edit.limit=0 edit.case=any edit.focusrectangle=no edit.autoselect=yes edit.autohscroll=yes edit.imemode=0 font.face="Arial" font.height="-10" font.weight="400" font.family="2" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" )
text(band=detail alignment="1" text="Adjustment Date To :" border="0" color="33554432" x="326" y="139" height="16" width="123" html.valueishtml="0" name=adj_date_to_t visible="0" font.face="Arial" font.height="-10" font.weight="400" font.family="2" font.pitch="2" font.charset="0" background.mode="2" background.color="67108864" )
column(band=detail id=11 alignment="0" tabsequence=32766 border="5" color="33554432" x="453" y="139" height="16" width="105" format="[shortdate] [time]" html.valueishtml="0" name=adj_date_to visible="1" edit.limit=0 edit.case=any edit.focusrectangle=no edit.autoselect=no edit.imemode=0 font.face="Arial" 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="0" tabsequence=32766 border="5" color="33554432" x="168" y="116" height="16" width="105" format="[general]" html.valueishtml="0" name=acct_prd visible="0" edit.limit=6 edit.case=any edit.focusrectangle=no edit.autoselect=yes edit.autohscroll=yes edit.imemode=0 font.face="Arial" 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="0" tabsequence=32766 border="5" color="33554432" x="168" y="116" height="16" width="105" format="[general]" html.valueishtml="0" name=acct_prd visible="0" edit.limit=6 edit.case=any edit.focusrectangle=no edit.autoselect=yes edit.autohscroll=yes edit.imemode=0 font.face="Arial" font.height="-10" font.weight="400" font.family="2" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" )
text(band=detail alignment="1" text="Acct Prd :" border="0" color="33554432" x="41" y="116" height="16" width="123" html.valueishtml="0" name=acct_prd_t visible="0" font.face="Arial" font.height="-10" font.weight="400" font.family="2" font.pitch="2" font.charset="0" background.mode="2" background.color="67108864" ) text(band=detail alignment="1" text="Acct Prd :" border="0" color="33554432" x="41" y="116" height="16" width="123" html.valueishtml="0" name=acct_prd_t visible="0" font.face="Arial" font.height="-10" font.weight="400" font.family="2" font.pitch="2" font.charset="0" background.mode="2" background.color="67108864" )
text(band=detail alignment="1" text="Adjustment Date From :" border="0" color="33554432" x="41" y="139" height="16" width="123" html.valueishtml="0" name=adj_date_fr_t visible="0" font.face="Arial" font.height="-10" font.weight="400" font.family="2" font.pitch="2" font.charset="0" background.mode="2" background.color="67108864" ) text(band=detail alignment="1" text="Adjustment Date From :" border="0" color="33554432" x="22" y="139" height="16" width="142" html.valueishtml="0" name=adj_date_fr_t visible="1" font.face="Arial" font.height="-10" font.weight="400" font.family="2" font.pitch="2" font.charset="0" background.mode="2" background.color="67108864" )
text(band=detail alignment="1" text="Encashable :" border="0" color="33554432" x="41" y="162" height="15" width="123" html.valueishtml="0" name=encashable_t visible="1" font.face="Liberation Sans" font.height="-10" font.weight="400" font.family="2" font.pitch="2" font.charset="0" background.mode="2" background.color="67108864" ) text(band=detail alignment="1" text="Encashable :" border="0" color="33554432" x="41" y="162" height="15" width="123" html.valueishtml="0" name=encashable_t visible="0" font.face="Liberation Sans" font.height="-10" font.weight="400" font.family="2" font.pitch="2" font.charset="0" background.mode="2" background.color="67108864" )
column(band=detail id=11 alignment="0" tabsequence=32766 border="5" color="33554432" x="168" y="139" height="16" width="105" format="[shortdate] [time]" html.valueishtml="0" name=adj_date_fr visible="1" edit.limit=0 edit.case=any edit.focusrectangle=no edit.autoselect=no edit.imemode=0 font.face="Arial" 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=32766 border="5" color="33554432" x="168" y="139" height="16" width="105" format="[shortdate] [time]" html.valueishtml="0" name=adj_date_fr visible="1" edit.limit=0 edit.case=any edit.focusrectangle=no edit.autoselect=no edit.imemode=0 font.face="Arial" 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=13 alignment="0" tabsequence=0 border="5" color="33554432" x="168" y="162" height="16" width="20" html.valueishtml="0" name=encashable visible="1" font.face="Arial" 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=13 alignment="0" tabsequence=32766 border="5" color="33554432" x="168" y="162" height="16" width="20" format="[general]" html.valueishtml="0" name=encashable visible="0" edit.limit=0 edit.case=any edit.autoselect=yes edit.imemode=0 font.face="Arial" font.height="-10" font.weight="400" font.family="2" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" )
text(band=detail alignment="1" text="Adjustment Date To :" border="0" color="33554432" x="326" y="139" height="16" width="123" html.valueishtml="0" name=adj_date_to_t visible="0" font.face="Arial" font.height="-10" font.weight="400" font.family="2" font.pitch="2" font.charset="0" background.mode="2" background.color="67108864" )
column(band=detail id=11 alignment="0" tabsequence=32766 border="5" color="33554432" x="453" y="139" height="16" width="105" format="[shortdate] [time]" html.valueishtml="0" name=adj_date_to visible="0" edit.limit=0 edit.case=any edit.focusrectangle=no edit.autoselect=no edit.imemode=0 font.face="Arial" font.height="-10" font.weight="400" font.family="2" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" )
htmltable(border="1" ) htmltable(border="1" )
htmlgen(clientevents="1" clientvalidation="1" clientcomputedfields="1" clientformatting="0" clientscriptable="0" generatejavascript="1" encodeselflinkargs="1" netscapelayers="0" ) htmlgen(clientevents="1" clientvalidation="1" clientcomputedfields="1" clientformatting="0" clientscriptable="0" generatejavascript="1" encodeselflinkargs="1" netscapelayers="0" )
export.xml(headgroups="1" includewhitespace="0" metadatatype=0 savemetadata=0 template=(comment="" encoding="UTF-8" name="d_emp_lveprkbal_trf22" xml="<?xml version=~"1.0~" encoding=~"UTF-8~" standalone=~"no~"?><untitled><untitled_row __pbband=~"detail~"><emp_lveprkbal_trfdet_tran_id>tran_id</emp_lveprkbal_trfdet_tran_id><emp_lveprkbal_trfdet_line_no>line_no</emp_lveprkbal_trfdet_line_no><emp_lveprkbal_trfdet_balance_code>balance_code</emp_lveprkbal_trfdet_balance_code><balance_code_descr>balance_code_descr</balance_code_descr><emp_lveprkbal_trfdet_from_date>from_date</emp_lveprkbal_trfdet_from_date><emp_lveprkbal_trfdet_to_date>to_date</emp_lveprkbal_trfdet_to_date><emp_lveprkbal_trfdet_exp_date>exp_date</emp_lveprkbal_trfdet_exp_date><emp_lveprkbal_trfdet_balance>balance</emp_lveprkbal_trfdet_balance><emp_lveprkbal_trfdet_acct_prd>acct_prd</emp_lveprkbal_trfdet_acct_prd><emp_lveprkbal_trfdet_lve_unit>lve_unit</emp_lveprkbal_trfdet_lve_unit></untitled_row></untitled>")) export.xml(headgroups="1" includewhitespace="0" metadatatype=0 savemetadata=0 template=(comment="" encoding="UTF-8" name="d_emp_lveprkbal_trf22" xml="<?xml version=~"1.0~" encoding=~"UTF-8~" standalone=~"no~"?><untitled><untitled_row __pbband=~"detail~"><emp_lveprkbal_trfdet_tran_id>tran_id</emp_lveprkbal_trfdet_tran_id><emp_lveprkbal_trfdet_line_no>line_no</emp_lveprkbal_trfdet_line_no><emp_lveprkbal_trfdet_balance_code>balance_code</emp_lveprkbal_trfdet_balance_code><balance_code_descr>balance_code_descr</balance_code_descr><emp_lveprkbal_trfdet_from_date>from_date</emp_lveprkbal_trfdet_from_date><emp_lveprkbal_trfdet_to_date>to_date</emp_lveprkbal_trfdet_to_date><emp_lveprkbal_trfdet_exp_date>exp_date</emp_lveprkbal_trfdet_exp_date><emp_lveprkbal_trfdet_balance>balance</emp_lveprkbal_trfdet_balance><emp_lveprkbal_trfdet_acct_prd>acct_prd</emp_lveprkbal_trfdet_acct_prd><emp_lveprkbal_trfdet_lve_unit>lve_unit</emp_lveprkbal_trfdet_lve_unit></untitled_row></untitled>"))
......
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