Commit 1bfa7ec7 authored by sanashaikh's avatar sanashaikh

Sana S: Modified on 26/09/2019

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@208263 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 9480e87b
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
<dbname>payroll.dept_code</dbname> <dbname>payroll.dept_code</dbname>
</table_column> </table_column>
<table_column> <table_column>
<type size="300">char</type> <type size="60">char</type>
<updatewhereclause>yes</updatewhereclause> <updatewhereclause>yes</updatewhereclause>
<name>remarks</name> <name>remarks</name>
<dbname>payroll.remarks</dbname> <dbname>payroll.remarks</dbname>
...@@ -126,7 +126,7 @@ ...@@ -126,7 +126,7 @@
<name>pay_site</name> <name>pay_site</name>
<dbname>employee.pay_site</dbname> <dbname>employee.pay_site</dbname>
</table_column> </table_column>
<retrieve>PBSELECT( VERSION(400) TABLE(NAME=&quot;employee&quot; ) TABLE(NAME=&quot;payroll&quot; ) COLUMN(NAME=&quot;payroll.prd_code&quot;) COLUMN(NAME=&quot;payroll.emp_code&quot;) COLUMN(NAME=&quot;employee.emp_lname&quot;) COLUMN(NAME=&quot;employee.emp_fname&quot;) COLUMN(NAME=&quot;payroll.dept_code&quot;) COLUMN(NAME=&quot;payroll.remarks&quot;) COLUMN(NAME=&quot;payroll.allow_amt&quot;) COLUMN(NAME=&quot;payroll.dedn_amt&quot;) COLUMN(NAME=&quot;payroll.net_amt&quot;) COLUMN(NAME=&quot;payroll.work_days&quot;) COLUMN(NAME=&quot;payroll.paid_days&quot;) COLUMN(NAME=&quot;employee.pay_site&quot;) JOIN (LEFT=&quot;employee.emp_code&quot; OP =&quot;=&quot;RIGHT=&quot;payroll.emp_code&quot; )WHERE( EXP1 =&quot;payroll.prd_code&quot; OP =&quot;=&quot; EXP2 =&quot;:prd_code&quot; LOGIC =&quot;and&quot; ) WHERE( EXP1 =&quot;payroll.voucher_no&quot; OP =&quot;is not&quot; EXP2 =&quot;null&quot; ) ) ARG(NAME = &quot;prd_code&quot; TYPE = string) </retrieve> <retrieve>PBSELECT( VERSION(400) TABLE(NAME=&quot;employee&quot; ) TABLE(NAME=&quot;payroll&quot; ) COLUMN(NAME=&quot;payroll.prd_code&quot;) COLUMN(NAME=&quot;payroll.emp_code&quot;) COLUMN(NAME=&quot;employee.emp_lname&quot;) COLUMN(NAME=&quot;employee.emp_fname&quot;) COLUMN(NAME=&quot;payroll.dept_code&quot;) COLUMN(NAME=&quot;payroll.remarks&quot;) COLUMN(NAME=&quot;payroll.allow_amt&quot;) COLUMN(NAME=&quot;payroll.dedn_amt&quot;) COLUMN(NAME=&quot;payroll.net_amt&quot;) COLUMN(NAME=&quot;payroll.work_days&quot;) COLUMN(NAME=&quot;payroll.paid_days&quot;) COLUMN(NAME=&quot;employee.pay_site&quot;) JOIN (LEFT=&quot;employee.emp_code&quot; OP =&quot;=&quot;RIGHT=&quot;payroll.emp_code&quot; )WHERE( EXP1 =&quot;payroll.prd_code&quot; OP =&quot;=&quot; EXP2 =&quot;:prd_code&quot; LOGIC =&quot;and&quot; ) WHERE( EXP1 =&quot;employee.emp_code&quot; OP =&quot;=&quot; EXP2 =&quot;:emp_code&quot; ) ) ARG(NAME = &quot;prd_code&quot; TYPE = string) ARG(NAME = &quot;emp_code&quot; TYPE = string) </retrieve>
<update>payroll</update> <update>payroll</update>
<updatewhere>0</updatewhere> <updatewhere>0</updatewhere>
<updatekeyinplace>no</updatekeyinplace> <updatekeyinplace>no</updatekeyinplace>
...@@ -134,6 +134,10 @@ ...@@ -134,6 +134,10 @@
<name>prd_code</name> <name>prd_code</name>
<type>string</type> <type>string</type>
</argument> </argument>
<argument>
<name>emp_code</name>
<type>string</type>
</argument>
</TableDefinition> </TableDefinition>
<TextObject> <TextObject>
<band>Header</band> <band>Header</band>
...@@ -141,7 +145,7 @@ ...@@ -141,7 +145,7 @@
<text>Last name</text> <text>Last name</text>
<border>6</border> <border>6</border>
<color>0</color> <color>0</color>
<x>99</x> <x>69</x>
<y>3</y> <y>3</y>
<height>16</height> <height>16</height>
<width>111</width> <width>111</width>
...@@ -169,7 +173,7 @@ ...@@ -169,7 +173,7 @@
<text>First name</text> <text>First name</text>
<border>6</border> <border>6</border>
<color>0</color> <color>0</color>
<x>212</x> <x>182</x>
<y>3</y> <y>3</y>
<height>16</height> <height>16</height>
<width>113</width> <width>113</width>
...@@ -197,7 +201,7 @@ ...@@ -197,7 +201,7 @@
<text>Remarks</text> <text>Remarks</text>
<border>6</border> <border>6</border>
<color>0</color> <color>0</color>
<x>327</x> <x>297</x>
<y>3</y> <y>3</y>
<height>16</height> <height>16</height>
<width>276</width> <width>276</width>
...@@ -225,10 +229,10 @@ ...@@ -225,10 +229,10 @@
<text>Department</text> <text>Department</text>
<border>6</border> <border>6</border>
<color>0</color> <color>0</color>
<x>605</x> <x>575</x>
<y>3</y> <y>3</y>
<height>16</height> <height>16</height>
<width>85</width> <width>69</width>
<html> <html>
<valueishtml>0</valueishtml> <valueishtml>0</valueishtml>
</html> </html>
...@@ -250,13 +254,13 @@ ...@@ -250,13 +254,13 @@
<TextObject> <TextObject>
<band>Header</band> <band>Header</band>
<alignment>1</alignment> <alignment>1</alignment>
<text>Allowance</text> <text>Allow. Amt.</text>
<border>6</border> <border>6</border>
<color>0</color> <color>0</color>
<x>692</x> <x>646</x>
<y>3</y> <y>3</y>
<height>16</height> <height>16</height>
<width>93</width> <width>71</width>
<html> <html>
<valueishtml>0</valueishtml> <valueishtml>0</valueishtml>
</html> </html>
...@@ -278,13 +282,13 @@ ...@@ -278,13 +282,13 @@
<TextObject> <TextObject>
<band>Header</band> <band>Header</band>
<alignment>1</alignment> <alignment>1</alignment>
<text>Deduction</text> <text>Ded. Amt.</text>
<border>6</border> <border>6</border>
<color>0</color> <color>0</color>
<x>787</x> <x>719</x>
<y>3</y> <y>3</y>
<height>16</height> <height>16</height>
<width>95</width> <width>71</width>
<html> <html>
<valueishtml>0</valueishtml> <valueishtml>0</valueishtml>
</html> </html>
...@@ -306,13 +310,13 @@ ...@@ -306,13 +310,13 @@
<TextObject> <TextObject>
<band>Header</band> <band>Header</band>
<alignment>1</alignment> <alignment>1</alignment>
<text>Net Amount</text> <text>Net Amt.</text>
<border>6</border> <border>6</border>
<color>0</color> <color>0</color>
<x>884</x> <x>792</x>
<y>3</y> <y>3</y>
<height>16</height> <height>16</height>
<width>70</width> <width>71</width>
<html> <html>
<valueishtml>0</valueishtml> <valueishtml>0</valueishtml>
</html> </html>
...@@ -334,10 +338,10 @@ ...@@ -334,10 +338,10 @@
<TextObject> <TextObject>
<band>Header</band> <band>Header</band>
<alignment>1</alignment> <alignment>1</alignment>
<text>Paid Days</text> <text>Paid days</text>
<border>6</border> <border>6</border>
<color>0</color> <color>0</color>
<x>956</x> <x>865</x>
<y>3</y> <y>3</y>
<height>16</height> <height>16</height>
<width>71</width> <width>71</width>
...@@ -365,7 +369,7 @@ ...@@ -365,7 +369,7 @@
<text>Work Days</text> <text>Work Days</text>
<border>6</border> <border>6</border>
<color>0</color> <color>0</color>
<x>1029</x> <x>938</x>
<y>3</y> <y>3</y>
<height>16</height> <height>16</height>
<width>70</width> <width>70</width>
...@@ -390,13 +394,13 @@ ...@@ -390,13 +394,13 @@
<TextObject> <TextObject>
<band>Header</band> <band>Header</band>
<alignment>2</alignment> <alignment>2</alignment>
<text>Employee Code</text> <text>Emp. Code</text>
<border>6</border> <border>6</border>
<color>0</color> <color>0</color>
<x>2</x> <x>2</x>
<y>3</y> <y>3</y>
<height>16</height> <height>16</height>
<width>95</width> <width>65</width>
<html> <html>
<valueishtml>0</valueishtml> <valueishtml>0</valueishtml>
</html> </html>
...@@ -421,10 +425,10 @@ ...@@ -421,10 +425,10 @@
<text>Site</text> <text>Site</text>
<border>6</border> <border>6</border>
<color>0</color> <color>0</color>
<x>1101</x> <x>1010</x>
<y>3</y> <y>3</y>
<height>16</height> <height>16</height>
<width>45</width> <width>123</width>
<html> <html>
<valueishtml>0</valueishtml> <valueishtml>0</valueishtml>
</html> </html>
...@@ -449,10 +453,10 @@ ...@@ -449,10 +453,10 @@
<text>Period</text> <text>Period</text>
<border>6</border> <border>6</border>
<color>0</color> <color>0</color>
<x>1148</x> <x>1135</x>
<y>3</y> <y>3</y>
<height>16</height> <height>16</height>
<width>55</width> <width>160</width>
<html> <html>
<valueishtml>0</valueishtml> <valueishtml>0</valueishtml>
</html> </html>
...@@ -473,20 +477,20 @@ ...@@ -473,20 +477,20 @@
</TextObject> </TextObject>
<ColumnObject> <ColumnObject>
<band>Detail</band> <band>Detail</band>
<id>3</id> <id>4</id>
<alignment>0</alignment> <alignment>0</alignment>
<tabsequence>20</tabsequence> <tabsequence>30</tabsequence>
<border>5</border> <border>5</border>
<color>0</color> <color>0</color>
<x>99</x> <x>182</x>
<y>1</y> <y>1</y>
<height>16</height> <height>16</height>
<width>111</width> <width>113</width>
<format>[general]</format> <format>[general]</format>
<html> <html>
<valueishtml>0</valueishtml> <valueishtml>0</valueishtml>
</html> </html>
<name>emp_lname</name> <name>emp_fname</name>
<visible>1</visible> <visible>1</visible>
<EditStyle style="edit"> <EditStyle style="edit">
<limit>15</limit> <limit>15</limit>
...@@ -510,20 +514,20 @@ ...@@ -510,20 +514,20 @@
</ColumnObject> </ColumnObject>
<ColumnObject> <ColumnObject>
<band>Detail</band> <band>Detail</band>
<id>2</id> <id>5</id>
<alignment>0</alignment> <alignment>0</alignment>
<tabsequence>10</tabsequence> <tabsequence>50</tabsequence>
<border>5</border> <border>5</border>
<color>0</color> <color>0</color>
<x>2</x> <x>575</x>
<y>1</y> <y>2</y>
<height>16</height> <height>16</height>
<width>95</width> <width>69</width>
<format>[general]</format> <format>[general]</format>
<html> <html>
<valueishtml>0</valueishtml> <valueishtml>0</valueishtml>
</html> </html>
<name>emp_code</name> <name>payroll_dept_code</name>
<visible>1</visible> <visible>1</visible>
<EditStyle style="edit"> <EditStyle style="edit">
<limit>0</limit> <limit>0</limit>
...@@ -546,26 +550,25 @@ ...@@ -546,26 +550,25 @@
</ColumnObject> </ColumnObject>
<ColumnObject> <ColumnObject>
<band>Detail</band> <band>Detail</band>
<id>4</id> <id>6</id>
<alignment>0</alignment> <alignment>0</alignment>
<tabsequence>30</tabsequence> <tabsequence>40</tabsequence>
<border>5</border> <border>5</border>
<color>0</color> <color>0</color>
<x>212</x> <x>297</x>
<y>1</y> <y>2</y>
<height>16</height> <height>16</height>
<width>113</width> <width>276</width>
<format>[general]</format> <format>[general]</format>
<html> <html>
<valueishtml>0</valueishtml> <valueishtml>0</valueishtml>
</html> </html>
<name>emp_fname</name> <name>remarks</name>
<visible>1</visible> <visible>1</visible>
<EditStyle style="edit"> <EditStyle style="edit">
<limit>15</limit> <limit>0</limit>
<case>any</case> <case>any</case>
<autoselect>yes</autoselect> <autoselect>yes</autoselect>
<autohscroll>yes</autohscroll>
<imemode>0</imemode> <imemode>0</imemode>
</EditStyle> </EditStyle>
<font> <font>
...@@ -583,20 +586,20 @@ ...@@ -583,20 +586,20 @@
</ColumnObject> </ColumnObject>
<ColumnObject> <ColumnObject>
<band>Detail</band> <band>Detail</band>
<id>5</id> <id>7</id>
<alignment>0</alignment> <alignment>1</alignment>
<tabsequence>50</tabsequence> <tabsequence>60</tabsequence>
<border>5</border> <border>5</border>
<color>0</color> <color>0</color>
<x>605</x> <x>646</x>
<y>1</y> <y>1</y>
<height>16</height> <height>16</height>
<width>85</width> <width>71</width>
<format>[general]</format> <format>[general]</format>
<html> <html>
<valueishtml>0</valueishtml> <valueishtml>0</valueishtml>
</html> </html>
<name>payroll_dept_code</name> <name>allow_amt</name>
<visible>1</visible> <visible>1</visible>
<EditStyle style="edit"> <EditStyle style="edit">
<limit>0</limit> <limit>0</limit>
...@@ -619,20 +622,20 @@ ...@@ -619,20 +622,20 @@
</ColumnObject> </ColumnObject>
<ColumnObject> <ColumnObject>
<band>Detail</band> <band>Detail</band>
<id>6</id> <id>8</id>
<alignment>0</alignment> <alignment>1</alignment>
<tabsequence>40</tabsequence> <tabsequence>70</tabsequence>
<border>5</border> <border>5</border>
<color>0</color> <color>0</color>
<x>327</x> <x>719</x>
<y>1</y> <y>1</y>
<height>16</height> <height>16</height>
<width>276</width> <width>71</width>
<format>[general]</format> <format>[general]</format>
<html> <html>
<valueishtml>0</valueishtml> <valueishtml>0</valueishtml>
</html> </html>
<name>remarks</name> <name>dedn_amt</name>
<visible>1</visible> <visible>1</visible>
<EditStyle style="edit"> <EditStyle style="edit">
<limit>0</limit> <limit>0</limit>
...@@ -655,20 +658,20 @@ ...@@ -655,20 +658,20 @@
</ColumnObject> </ColumnObject>
<ColumnObject> <ColumnObject>
<band>Detail</band> <band>Detail</band>
<id>7</id> <id>9</id>
<alignment>1</alignment> <alignment>1</alignment>
<tabsequence>60</tabsequence> <tabsequence>80</tabsequence>
<border>5</border> <border>5</border>
<color>0</color> <color>0</color>
<x>692</x> <x>792</x>
<y>1</y> <y>1</y>
<height>16</height> <height>16</height>
<width>93</width> <width>71</width>
<format>[general]</format> <format>[general]</format>
<html> <html>
<valueishtml>0</valueishtml> <valueishtml>0</valueishtml>
</html> </html>
<name>allow_amt</name> <name>payroll_net_amt</name>
<visible>1</visible> <visible>1</visible>
<EditStyle style="edit"> <EditStyle style="edit">
<limit>0</limit> <limit>0</limit>
...@@ -691,20 +694,20 @@ ...@@ -691,20 +694,20 @@
</ColumnObject> </ColumnObject>
<ColumnObject> <ColumnObject>
<band>Detail</band> <band>Detail</band>
<id>8</id> <id>11</id>
<alignment>1</alignment> <alignment>0</alignment>
<tabsequence>70</tabsequence> <tabsequence>90</tabsequence>
<border>5</border> <border>5</border>
<color>0</color> <color>0</color>
<x>787</x> <x>865</x>
<y>1</y> <y>1</y>
<height>16</height> <height>16</height>
<width>95</width> <width>71</width>
<format>[general]</format> <format>[general]</format>
<html> <html>
<valueishtml>0</valueishtml> <valueishtml>0</valueishtml>
</html> </html>
<name>dedn_amt</name> <name>payroll_paid_days</name>
<visible>1</visible> <visible>1</visible>
<EditStyle style="edit"> <EditStyle style="edit">
<limit>0</limit> <limit>0</limit>
...@@ -727,12 +730,12 @@ ...@@ -727,12 +730,12 @@
</ColumnObject> </ColumnObject>
<ColumnObject> <ColumnObject>
<band>Detail</band> <band>Detail</band>
<id>9</id> <id>10</id>
<alignment>1</alignment> <alignment>0</alignment>
<tabsequence>80</tabsequence> <tabsequence>100</tabsequence>
<border>5</border> <border>5</border>
<color>0</color> <color>0</color>
<x>884</x> <x>938</x>
<y>1</y> <y>1</y>
<height>16</height> <height>16</height>
<width>70</width> <width>70</width>
...@@ -740,7 +743,7 @@ ...@@ -740,7 +743,7 @@
<html> <html>
<valueishtml>0</valueishtml> <valueishtml>0</valueishtml>
</html> </html>
<name>payroll_net_amt</name> <name>payroll_work_days</name>
<visible>1</visible> <visible>1</visible>
<EditStyle style="edit"> <EditStyle style="edit">
<limit>0</limit> <limit>0</limit>
...@@ -763,25 +766,26 @@ ...@@ -763,25 +766,26 @@
</ColumnObject> </ColumnObject>
<ColumnObject> <ColumnObject>
<band>Detail</band> <band>Detail</band>
<id>11</id> <id>3</id>
<alignment>0</alignment> <alignment>0</alignment>
<tabsequence>90</tabsequence> <tabsequence>20</tabsequence>
<border>5</border> <border>5</border>
<color>0</color> <color>0</color>
<x>956</x> <x>69</x>
<y>1</y> <y>1</y>
<height>16</height> <height>16</height>
<width>71</width> <width>111</width>
<format>[general]</format> <format>[general]</format>
<html> <html>
<valueishtml>0</valueishtml> <valueishtml>0</valueishtml>
</html> </html>
<name>payroll_paid_days</name> <name>emp_lname</name>
<visible>1</visible> <visible>1</visible>
<EditStyle style="edit"> <EditStyle style="edit">
<limit>0</limit> <limit>15</limit>
<case>any</case> <case>any</case>
<autoselect>yes</autoselect> <autoselect>yes</autoselect>
<autohscroll>yes</autohscroll>
<imemode>0</imemode> <imemode>0</imemode>
</EditStyle> </EditStyle>
<font> <font>
...@@ -799,20 +803,20 @@ ...@@ -799,20 +803,20 @@
</ColumnObject> </ColumnObject>
<ColumnObject> <ColumnObject>
<band>Detail</band> <band>Detail</band>
<id>10</id> <id>2</id>
<alignment>0</alignment> <alignment>0</alignment>
<tabsequence>100</tabsequence> <tabsequence>10</tabsequence>
<border>5</border> <border>5</border>
<color>0</color> <color>0</color>
<x>1029</x> <x>2</x>
<y>1</y> <y>1</y>
<height>16</height> <height>16</height>
<width>70</width> <width>65</width>
<format>[general]</format> <format>[general]</format>
<html> <html>
<valueishtml>0</valueishtml> <valueishtml>0</valueishtml>
</html> </html>
<name>payroll_work_days</name> <name>emp_code</name>
<visible>1</visible> <visible>1</visible>
<EditStyle style="edit"> <EditStyle style="edit">
<limit>0</limit> <limit>0</limit>
...@@ -840,10 +844,10 @@ ...@@ -840,10 +844,10 @@
<tabsequence>32766</tabsequence> <tabsequence>32766</tabsequence>
<border>5</border> <border>5</border>
<color>0</color> <color>0</color>
<x>1101</x> <x>1010</x>
<y>1</y> <y>2</y>
<height>16</height> <height>16</height>
<width>45</width> <width>123</width>
<format>[general]</format> <format>[general]</format>
<html> <html>
<valueishtml>0</valueishtml> <valueishtml>0</valueishtml>
...@@ -876,10 +880,10 @@ ...@@ -876,10 +880,10 @@
<tabsequence>32766</tabsequence> <tabsequence>32766</tabsequence>
<border>5</border> <border>5</border>
<color>0</color> <color>0</color>
<x>1148</x> <x>1135</x>
<y>1</y> <y>2</y>
<height>16</height> <height>16</height>
<width>55</width> <width>160</width>
<format>[general]</format> <format>[general]</format>
<html> <html>
<valueishtml>0</valueishtml> <valueishtml>0</valueishtml>
......
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