Commit 12f312c4 authored by ssalve's avatar ssalve

added reg_date and removed valid_upto


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@106040 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 5c6f65e5
...@@ -69,10 +69,10 @@ ...@@ -69,10 +69,10 @@
<table_column> <table_column>
<type>datetime</type> <type>datetime</type>
<updatewhereclause>yes</updatewhereclause> <updatewhereclause>yes</updatewhereclause>
<name>valid_upto</name> <name>reg_date</name>
<dbname>siteregno.valid_upto</dbname> <dbname>siteregno.reg_date</dbname>
</table_column> </table_column>
<retrieve>PBSELECT( VERSION(400) TABLE(NAME=&quot;siteregno&quot; ) COLUMN(NAME=&quot;siteregno.fin_entity&quot;) COLUMN(NAME=&quot;siteregno.site_code&quot;) COLUMN(NAME=&quot;siteregno.reg_no&quot;) COLUMN(NAME=&quot;siteregno.valid_upto&quot;)) </retrieve> <retrieve>PBSELECT( VERSION(400) TABLE(NAME=&quot;siteregno&quot; ) COLUMN(NAME=&quot;siteregno.fin_entity&quot;) COLUMN(NAME=&quot;siteregno.site_code&quot;) COLUMN(NAME=&quot;siteregno.reg_no&quot;) COLUMN(NAME=&quot;siteregno.reg_date&quot;)) </retrieve>
</TableDefinition> </TableDefinition>
<TextObject> <TextObject>
<band>Header</band> <band>Header</band>
...@@ -160,30 +160,30 @@ ...@@ -160,30 +160,30 @@
</TextObject> </TextObject>
<TextObject> <TextObject>
<band>Header</band> <band>Header</band>
<alignment>2</alignment> <alignment>0</alignment>
<text>Valid Upto</text> <text>Registration Date</text>
<border>2</border> <border>0</border>
<color>33554432</color> <color>33554432</color>
<x>1001</x> <x>1001</x>
<y>8</y> <y>4</y>
<height>60</height> <height>64</height>
<width>471</width> <width>389</width>
<html> <html>
<valueishtml>0</valueishtml> <valueishtml>0</valueishtml>
</html> </html>
<name>valid_upto_t</name> <name>reg_date_t</name>
<visible>1</visible> <visible>1</visible>
<font> <font>
<face>Arial</face> <face>Arial</face>
<height>-10</height> <height>-11</height>
<weight>400</weight> <weight>400</weight>
<family>2</family> <family>2</family>
<pitch>2</pitch> <pitch>2</pitch>
<charset>0</charset> <charset>0</charset>
</font> </font>
<background> <background>
<mode>1</mode> <mode>2</mode>
<color>553648127</color> <color>1073741824</color>
</background> </background>
</TextObject> </TextObject>
<ColumnObject> <ColumnObject>
...@@ -305,24 +305,23 @@ ...@@ -305,24 +305,23 @@
<id>4</id> <id>4</id>
<alignment>0</alignment> <alignment>0</alignment>
<tabsequence>32766</tabsequence> <tabsequence>32766</tabsequence>
<border>5</border> <border>0</border>
<color>33554432</color> <color>33554432</color>
<x>1001</x> <x>1001</x>
<y>8</y> <y>0</y>
<height>72</height> <height>72</height>
<width>471</width> <width>389</width>
<format>[shortdate] [time]</format> <format>[shortdate] [time]</format>
<html> <html>
<valueishtml>0</valueishtml> <valueishtml>0</valueishtml>
</html> </html>
<name>valid_upto</name> <name>reg_date</name>
<visible>1</visible> <visible>1</visible>
<EditStyle style="edit"> <EditStyle style="edit">
<limit>0</limit> <limit>0</limit>
<case>any</case> <case>any</case>
<focusrectangle>no</focusrectangle> <focusrectangle>no</focusrectangle>
<autoselect>yes</autoselect> <autoselect>no</autoselect>
<autohscroll>yes</autohscroll>
<imemode>0</imemode> <imemode>0</imemode>
</EditStyle> </EditStyle>
<font> <font>
......
...@@ -61,12 +61,6 @@ ...@@ -61,12 +61,6 @@
<name>reg_no</name> <name>reg_no</name>
<dbname>siteregno.reg_no</dbname> <dbname>siteregno.reg_no</dbname>
</table_column> </table_column>
<table_column>
<type>datetime</type>
<updatewhereclause>yes</updatewhereclause>
<name>valid_upto</name>
<dbname>siteregno.valid_upto</dbname>
</table_column>
<table_column> <table_column>
<type size="60">char</type> <type size="60">char</type>
<updatewhereclause>yes</updatewhereclause> <updatewhereclause>yes</updatewhereclause>
...@@ -91,7 +85,13 @@ ...@@ -91,7 +85,13 @@
<name>reg_no2</name> <name>reg_no2</name>
<dbname>reg_no2</dbname> <dbname>reg_no2</dbname>
</table_column> </table_column>
<retrieve>PBSELECT( VERSION(400) TABLE(NAME=&quot;siteregno&quot; ) TABLE(NAME=&quot;finent&quot; ) TABLE(NAME=&quot;site&quot; ) COLUMN(NAME=&quot;siteregno.fin_entity&quot;) COLUMN(NAME=&quot;siteregno.site_code&quot;) COLUMN(NAME=&quot;siteregno.reg_no&quot;) COLUMN(NAME=&quot;siteregno.valid_upto&quot;) COLUMN(NAME=&quot;finent.descr&quot;) COLUMN(NAME=&quot;site.descr&quot;) COMPUTE(NAME=&quot;&apos; &apos; as reg_no1&quot;) COMPUTE(NAME=&quot;&apos; &apos; as reg_no2&quot;) JOIN (LEFT=&quot;siteregno.fin_entity&quot; OP =&quot;=&quot;RIGHT=&quot;finent.fin_entity&quot; ) JOIN (LEFT=&quot;siteregno.site_code&quot; OP =&quot;=&quot;RIGHT=&quot;site.site_code&quot; )WHERE( EXP1 =&quot;~&quot;SITEREGNO~&quot;.~&quot;FIN_ENTITY~&quot;&quot; OP =&quot;=&quot; EXP2 =&quot;:fin_entity&quot; LOGIC =&quot;and&quot; ) WHERE( EXP1 =&quot;~&quot;SITEREGNO~&quot;.~&quot;SITE_CODE~&quot;&quot; OP =&quot;=&quot; EXP2 =&quot;:site_code&quot; ) ) ARG(NAME = &quot;fin_entity&quot; TYPE = string) ARG(NAME = &quot;site_code&quot; TYPE = string) </retrieve> <table_column>
<type>datetime</type>
<updatewhereclause>yes</updatewhereclause>
<name>reg_date</name>
<dbname>siteregno.reg_date</dbname>
</table_column>
<retrieve>PBSELECT( VERSION(400) TABLE(NAME=&quot;siteregno&quot; ) TABLE(NAME=&quot;finent&quot; ) TABLE(NAME=&quot;site&quot; ) COLUMN(NAME=&quot;siteregno.fin_entity&quot;) COLUMN(NAME=&quot;siteregno.site_code&quot;) COLUMN(NAME=&quot;siteregno.reg_no&quot;) COLUMN(NAME=&quot;finent.descr&quot;) COLUMN(NAME=&quot;site.descr&quot;) COMPUTE(NAME=&quot;&apos; &apos; as reg_no1&quot;) COMPUTE(NAME=&quot;&apos; &apos; as reg_no2&quot;) COLUMN(NAME=&quot;siteregno.reg_date&quot;) JOIN (LEFT=&quot;siteregno.fin_entity&quot; OP =&quot;=&quot;RIGHT=&quot;finent.fin_entity&quot; ) JOIN (LEFT=&quot;siteregno.site_code&quot; OP =&quot;=&quot;RIGHT=&quot;site.site_code&quot; )WHERE( EXP1 =&quot;~&quot;SITEREGNO~&quot;.~&quot;FIN_ENTITY~&quot;&quot; OP =&quot;=&quot; EXP2 =&quot;:fin_entity&quot; LOGIC =&quot;and&quot; ) WHERE( EXP1 =&quot;~&quot;SITEREGNO~&quot;.~&quot;SITE_CODE~&quot;&quot; OP =&quot;=&quot; EXP2 =&quot;:site_code&quot; ) ) ARG(NAME = &quot;fin_entity&quot; TYPE = string) ARG(NAME = &quot;site_code&quot; TYPE = string) </retrieve>
<argument> <argument>
<name>fin_entity</name> <name>fin_entity</name>
<type>string</type> <type>string</type>
...@@ -101,33 +101,9 @@ ...@@ -101,33 +101,9 @@
<type>string</type> <type>string</type>
</argument> </argument>
</TableDefinition> </TableDefinition>
<GroupBox>
<band>Detail</band>
<text>GST_REGNO</text>
<border>5</border>
<color>33554432</color>
<x>1</x>
<y>1</y>
<height>145</height>
<width>607</width>
<name>gb_1</name>
<visible>1</visible>
<font>
<face>Arial</face>
<height>-10</height>
<weight>400</weight>
<family>2</family>
<pitch>2</pitch>
<charset>0</charset>
</font>
<background>
<mode>1</mode>
<color>553648127</color>
</background>
</GroupBox>
<ColumnObject> <ColumnObject>
<band>Detail</band> <band>Detail</band>
<id>5</id> <id>4</id>
<alignment>0</alignment> <alignment>0</alignment>
<tabsequence>32766</tabsequence> <tabsequence>32766</tabsequence>
<border>5</border> <border>5</border>
...@@ -164,7 +140,7 @@ ...@@ -164,7 +140,7 @@
</ColumnObject> </ColumnObject>
<ColumnObject> <ColumnObject>
<band>Detail</band> <band>Detail</band>
<id>6</id> <id>5</id>
<alignment>0</alignment> <alignment>0</alignment>
<tabsequence>32766</tabsequence> <tabsequence>32766</tabsequence>
<border>5</border> <border>5</border>
...@@ -202,17 +178,17 @@ ...@@ -202,17 +178,17 @@
<TextObject> <TextObject>
<band>Detail</band> <band>Detail</band>
<alignment>1</alignment> <alignment>1</alignment>
<text>Fin Entity:</text> <text>GST Username:</text>
<border>2</border> <border>2</border>
<color>33554432</color> <color>33554432</color>
<x>3</x> <x>3</x>
<y>19</y> <y>103</y>
<height>16</height> <height>15</height>
<width>180</width> <width>180</width>
<html> <html>
<valueishtml>0</valueishtml> <valueishtml>0</valueishtml>
</html> </html>
<name>fin_entity_t</name> <name>t_1</name>
<visible>1</visible> <visible>1</visible>
<font> <font>
<face>Times New Roman</face> <face>Times New Roman</face>
...@@ -224,23 +200,23 @@ ...@@ -224,23 +200,23 @@
</font> </font>
<background> <background>
<mode>1</mode> <mode>1</mode>
<color>536870912</color> <color>553648127</color>
</background> </background>
</TextObject> </TextObject>
<TextObject> <TextObject>
<band>Detail</band> <band>Detail</band>
<alignment>1</alignment> <alignment>1</alignment>
<text>Site Code:</text> <text>Gross Turnover:</text>
<border>2</border> <border>2</border>
<color>33554432</color> <color>33554432</color>
<x>3</x> <x>3</x>
<y>40</y> <y>123</y>
<height>16</height> <height>16</height>
<width>180</width> <width>180</width>
<html> <html>
<valueishtml>0</valueishtml> <valueishtml>0</valueishtml>
</html> </html>
<name>site_code_t</name> <name>t_2</name>
<visible>1</visible> <visible>1</visible>
<font> <font>
<face>Times New Roman</face> <face>Times New Roman</face>
...@@ -252,24 +228,33 @@ ...@@ -252,24 +228,33 @@
</font> </font>
<background> <background>
<mode>1</mode> <mode>1</mode>
<color>536870912</color> <color>553648127</color>
</background> </background>
</TextObject> </TextObject>
<TextObject> <ColumnObject>
<band>Detail</band> <band>Detail</band>
<alignment>1</alignment> <id>6</id>
<text>GSTN Number:</text> <alignment>0</alignment>
<border>2</border> <tabsequence>50</tabsequence>
<border>5</border>
<color>33554432</color> <color>33554432</color>
<x>3</x> <x>188</x>
<y>61</y> <y>103</y>
<height>16</height> <height>16</height>
<width>180</width> <width>100</width>
<format>[general]</format>
<html> <html>
<valueishtml>0</valueishtml> <valueishtml>0</valueishtml>
</html> </html>
<name>reg_no_t</name> <name>reg_no1</name>
<visible>1</visible> <visible>1</visible>
<EditStyle style="edit">
<limit>0</limit>
<case>any</case>
<focusrectangle>no</focusrectangle>
<autoselect>no</autoselect>
<imemode>0</imemode>
</EditStyle>
<font> <font>
<face>Times New Roman</face> <face>Times New Roman</face>
<height>-10</height> <height>-10</height>
...@@ -279,24 +264,61 @@ ...@@ -279,24 +264,61 @@
<charset>0</charset> <charset>0</charset>
</font> </font>
<background> <background>
<mode>1</mode> <mode>2</mode>
<color>536870912</color> <color>1073741824</color>
</background> </background>
</TextObject> </ColumnObject>
<ColumnObject>
<band>Detail</band>
<id>7</id>
<alignment>0</alignment>
<tabsequence>60</tabsequence>
<border>5</border>
<color>33554432</color>
<x>188</x>
<y>124</y>
<height>16</height>
<width>100</width>
<format>[general]</format>
<html>
<valueishtml>0</valueishtml>
</html>
<name>reg_no2</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>Times New Roman</face>
<height>-10</height>
<weight>400</weight>
<family>1</family>
<pitch>2</pitch>
<charset>0</charset>
</font>
<background>
<mode>2</mode>
<color>1073741824</color>
</background>
</ColumnObject>
<TextObject> <TextObject>
<band>Detail</band> <band>Detail</band>
<alignment>1</alignment> <alignment>1</alignment>
<text>Valid Upto:</text> <text>Fin Entity:</text>
<border>2</border> <border>2</border>
<color>33554432</color> <color>33554432</color>
<x>3</x> <x>3</x>
<y>82</y> <y>19</y>
<height>16</height> <height>16</height>
<width>180</width> <width>180</width>
<html> <html>
<valueishtml>0</valueishtml> <valueishtml>0</valueishtml>
</html> </html>
<name>valid_upto_t</name> <name>fin_entity_t</name>
<visible>1</visible> <visible>1</visible>
<font> <font>
<face>Times New Roman</face> <face>Times New Roman</face>
...@@ -314,17 +336,17 @@ ...@@ -314,17 +336,17 @@
<TextObject> <TextObject>
<band>Detail</band> <band>Detail</band>
<alignment>1</alignment> <alignment>1</alignment>
<text>GST Username:</text> <text>Site Code:</text>
<border>2</border> <border>2</border>
<color>33554432</color> <color>33554432</color>
<x>3</x> <x>3</x>
<y>103</y> <y>40</y>
<height>15</height> <height>16</height>
<width>180</width> <width>180</width>
<html> <html>
<valueishtml>0</valueishtml> <valueishtml>0</valueishtml>
</html> </html>
<name>t_1</name> <name>site_code_t</name>
<visible>1</visible> <visible>1</visible>
<font> <font>
<face>Times New Roman</face> <face>Times New Roman</face>
...@@ -336,23 +358,23 @@ ...@@ -336,23 +358,23 @@
</font> </font>
<background> <background>
<mode>1</mode> <mode>1</mode>
<color>553648127</color> <color>536870912</color>
</background> </background>
</TextObject> </TextObject>
<TextObject> <TextObject>
<band>Detail</band> <band>Detail</band>
<alignment>1</alignment> <alignment>1</alignment>
<text>Gross Turnover:</text> <text>GSTN Number:</text>
<border>2</border> <border>2</border>
<color>33554432</color> <color>33554432</color>
<x>3</x> <x>3</x>
<y>123</y> <y>61</y>
<height>16</height> <height>16</height>
<width>180</width> <width>180</width>
<html> <html>
<valueishtml>0</valueishtml> <valueishtml>0</valueishtml>
</html> </html>
<name>t_2</name> <name>reg_no_t</name>
<visible>1</visible> <visible>1</visible>
<font> <font>
<face>Times New Roman</face> <face>Times New Roman</face>
...@@ -364,7 +386,7 @@ ...@@ -364,7 +386,7 @@
</font> </font>
<background> <background>
<mode>1</mode> <mode>1</mode>
<color>553648127</color> <color>536870912</color>
</background> </background>
</TextObject> </TextObject>
<ColumnObject> <ColumnObject>
...@@ -481,68 +503,21 @@ ...@@ -481,68 +503,21 @@
<color>1073741824</color> <color>1073741824</color>
</background> </background>
</ColumnObject> </ColumnObject>
<ColumnObject> <TextObject>
<band>Detail</band> <band>Detail</band>
<id>4</id> <alignment>1</alignment>
<alignment>0</alignment> <text>Valid Upto:</text>
<tabsequence>40</tabsequence> <border>2</border>
<border>5</border>
<color>33554432</color> <color>33554432</color>
<x>188</x> <x>3</x>
<y>82</y> <y>82</y>
<height>16</height> <height>16</height>
<width>100</width> <width>181</width>
<format>[shortdate] [time]</format>
<html>
<valueishtml>0</valueishtml>
</html>
<name>valid_upto</name>
<visible>1</visible>
<EditStyle style="edit">
<limit>0</limit>
<case>any</case>
<focusrectangle>no</focusrectangle>
<autoselect>yes</autoselect>
<autohscroll>yes</autohscroll>
<imemode>0</imemode>
</EditStyle>
<font>
<face>Times New Roman</face>
<height>-10</height>
<weight>400</weight>
<family>1</family>
<pitch>2</pitch>
<charset>0</charset>
</font>
<background>
<mode>2</mode>
<color>1073741824</color>
</background>
</ColumnObject>
<ColumnObject>
<band>Detail</band>
<id>7</id>
<alignment>0</alignment>
<tabsequence>50</tabsequence>
<border>5</border>
<color>33554432</color>
<x>188</x>
<y>103</y>
<height>16</height>
<width>100</width>
<format>[general]</format>
<html> <html>
<valueishtml>0</valueishtml> <valueishtml>0</valueishtml>
</html> </html>
<name>reg_no1</name> <name>valid_upto_t</name>
<visible>1</visible> <visible>1</visible>
<EditStyle style="edit">
<limit>0</limit>
<case>any</case>
<focusrectangle>no</focusrectangle>
<autoselect>no</autoselect>
<imemode>0</imemode>
</EditStyle>
<font> <font>
<face>Times New Roman</face> <face>Times New Roman</face>
<height>-10</height> <height>-10</height>
...@@ -552,26 +527,26 @@ ...@@ -552,26 +527,26 @@
<charset>0</charset> <charset>0</charset>
</font> </font>
<background> <background>
<mode>2</mode> <mode>1</mode>
<color>1073741824</color> <color>536870912</color>
</background> </background>
</ColumnObject> </TextObject>
<ColumnObject> <ColumnObject>
<band>Detail</band> <band>Detail</band>
<id>8</id> <id>8</id>
<alignment>0</alignment> <alignment>0</alignment>
<tabsequence>60</tabsequence> <tabsequence>70</tabsequence>
<border>5</border> <border>5</border>
<color>33554432</color> <color>0</color>
<x>188</x> <x>189</x>
<y>124</y> <y>82</y>
<height>16</height> <height>16</height>
<width>100</width> <width>100</width>
<format>[general]</format> <format>[shortdate] [time]</format>
<html> <html>
<valueishtml>0</valueishtml> <valueishtml>0</valueishtml>
</html> </html>
<name>reg_no2</name> <name>reg_date</name>
<visible>1</visible> <visible>1</visible>
<EditStyle style="edit"> <EditStyle style="edit">
<limit>0</limit> <limit>0</limit>
......
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