Commit 130dfa45 authored by pshetty's avatar pshetty

Secondary Sales related changes

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@174892 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 0b034210
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
<color>536870912</color> <color>536870912</color>
</Summary> </Summary>
<Footer> <Footer>
<height>1</height> <height>0</height>
<color>536870912</color> <color>536870912</color>
</Footer> </Footer>
<Detail> <Detail>
...@@ -56,17 +56,6 @@ ...@@ -56,17 +56,6 @@
<name>invoice_id</name> <name>invoice_id</name>
<dbname>cust_stock_inv.invoice_id</dbname> <dbname>cust_stock_inv.invoice_id</dbname>
</table_column> </table_column>
<table_column>
<type size="6">char</type>
<update>yes</update>
<updatewhereclause>yes</updatewhereclause>
<name>ref_ser</name>
<dbname>cust_stock_inv.ref_ser</dbname>
<values>
<item display="Invoice" data="S-INV"/>
<item display="Return" data="S-RET"/>
</values>
</table_column>
<table_column> <table_column>
<type>datetime</type> <type>datetime</type>
<update>yes</update> <update>yes</update>
...@@ -81,7 +70,6 @@ ...@@ -81,7 +70,6 @@
<name>dlv_flg</name> <name>dlv_flg</name>
<dbname>cust_stock_inv.dlv_flg</dbname> <dbname>cust_stock_inv.dlv_flg</dbname>
<values> <values>
<item display="Select" data="S"/>
<item display="Receipt" data="Y"/> <item display="Receipt" data="Y"/>
<item display="Transit" data="N"/> <item display="Transit" data="N"/>
</values> </values>
...@@ -125,8 +113,14 @@ ...@@ -125,8 +113,14 @@
<name>net_amt</name> <name>net_amt</name>
<dbname>cust_stock_inv.net_amt</dbname> <dbname>cust_stock_inv.net_amt</dbname>
</table_column> </table_column>
<retrieve>PBSELECT( VERSION(400) TABLE(NAME=&quot;cust_stock_inv&quot; ) TABLE(NAME=&quot;invoice&quot; ) TABLE(NAME=&quot;transporter&quot; ) COLUMN(NAME=&quot;cust_stock_inv.invoice_id&quot;) COLUMN(NAME=&quot;cust_stock_inv.invoice_date&quot;) COLUMN(NAME=&quot;cust_stock_inv.dlv_flg&quot;) COLUMN(NAME=&quot;invoice.lr_no&quot;) COLUMN(NAME=&quot;invoice.lr_date&quot;) COLUMN(NAME=&quot;invoice.tran_code&quot;) COLUMN(NAME=&quot;transporter.tran_name&quot;) COLUMN(NAME=&quot;cust_stock_inv.tran_id&quot;) COLUMN(NAME=&quot;cust_stock_inv.net_amt&quot;) COLUMN(NAME=&quot;cust_stock_inv.ref_ser&quot;) JOIN (LEFT=&quot;invoice.tran_code&quot; OP =&quot;=&quot;RIGHT=&quot;transporter.tran_code&quot; OUTER1 =&quot;invoice.tran_code&quot; ) JOIN (LEFT=&quot;cust_stock_inv.invoice_id&quot; OP =&quot;=&quot;RIGHT=&quot;invoice.invoice_id&quot; )WHERE( EXP1 =&quot;CUST_STOCK_INV.TRAN_ID&quot; OP =&quot;=&quot; EXP2 =&quot;:tran_id&quot; ) ) ARG(NAME = &quot;tran_id&quot; TYPE = string) </retrieve> <table_column>
<update>CUST_STOCK_INV</update> <type size="0">char</type>
<updatewhereclause>yes</updatewhereclause>
<name>invoice_flag</name>
<dbname>invoice_flag</dbname>
</table_column>
<retrieve>PBSELECT( VERSION(400) TABLE(NAME=&quot;cust_stock_inv&quot; ) TABLE(NAME=&quot;invoice&quot; ) TABLE(NAME=&quot;transporter&quot; ) COLUMN(NAME=&quot;cust_stock_inv.invoice_id&quot;) COLUMN(NAME=&quot;cust_stock_inv.invoice_date&quot;) COLUMN(NAME=&quot;cust_stock_inv.dlv_flg&quot;) COLUMN(NAME=&quot;invoice.lr_no&quot;) COLUMN(NAME=&quot;invoice.lr_date&quot;) COLUMN(NAME=&quot;invoice.tran_code&quot;) COLUMN(NAME=&quot;transporter.tran_name&quot;) COLUMN(NAME=&quot;cust_stock_inv.tran_id&quot;) COLUMN(NAME=&quot;cust_stock_inv.net_amt&quot;) COMPUTE(NAME=&quot;&apos;&apos; as invoice_flag&quot;) JOIN (LEFT=&quot;invoice.tran_code&quot; OP =&quot;=&quot;RIGHT=&quot;transporter.tran_code&quot; OUTER1 =&quot;invoice.tran_code&quot; ) JOIN (LEFT=&quot;cust_stock_inv.invoice_id&quot; OP =&quot;=&quot;RIGHT=&quot;invoice.invoice_id&quot; )WHERE( EXP1 =&quot;CUST_STOCK_INV.TRAN_ID&quot; OP =&quot;=&quot; EXP2 =&quot;:tran_id&quot; ) ) ARG(NAME = &quot;tran_id&quot; TYPE = string) </retrieve>
<update>cust_stock_inv</update>
<updatewhere>0</updatewhere> <updatewhere>0</updatewhere>
<updatekeyinplace>no</updatekeyinplace> <updatekeyinplace>no</updatekeyinplace>
<argument> <argument>
...@@ -168,20 +162,20 @@ ...@@ -168,20 +162,20 @@
<text>Invoice Flag</text> <text>Invoice Flag</text>
<border>0</border> <border>0</border>
<color>33554432</color> <color>33554432</color>
<x>1013</x> <x>103</x>
<y>2</y> <y>1</y>
<height>15</height> <height>16</height>
<width>94</width> <width>50</width>
<html> <html>
<valueishtml>0</valueishtml> <valueishtml>0</valueishtml>
</html> </html>
<name>ref_ser_t</name> <name>invoice_flag_t</name>
<visible>1</visible> <visible>1</visible>
<font> <font>
<face>Times New Roman</face> <face>Arial</face>
<height>-10</height> <height>-11</height>
<weight>400</weight> <weight>400</weight>
<family>1</family> <family>2</family>
<pitch>2</pitch> <pitch>2</pitch>
<charset>0</charset> <charset>0</charset>
</font> </font>
...@@ -196,7 +190,7 @@ ...@@ -196,7 +190,7 @@
<text>Invoice Date</text> <text>Invoice Date</text>
<border>0</border> <border>0</border>
<color>33554432</color> <color>33554432</color>
<x>104</x> <x>155</x>
<y>2</y> <y>2</y>
<height>15</height> <height>15</height>
<width>111</width> <width>111</width>
...@@ -224,7 +218,7 @@ ...@@ -224,7 +218,7 @@
<text>Net Value</text> <text>Net Value</text>
<border>0</border> <border>0</border>
<color>33554432</color> <color>33554432</color>
<x>217</x> <x>268</x>
<y>2</y> <y>2</y>
<height>15</height> <height>15</height>
<width>76</width> <width>76</width>
...@@ -252,7 +246,7 @@ ...@@ -252,7 +246,7 @@
<text>Receipt/ Transit</text> <text>Receipt/ Transit</text>
<border>0</border> <border>0</border>
<color>33554432</color> <color>33554432</color>
<x>295</x> <x>346</x>
<y>2</y> <y>2</y>
<height>15</height> <height>15</height>
<width>92</width> <width>92</width>
...@@ -280,7 +274,7 @@ ...@@ -280,7 +274,7 @@
<text>LR No</text> <text>LR No</text>
<border>0</border> <border>0</border>
<color>33554432</color> <color>33554432</color>
<x>389</x> <x>440</x>
<y>2</y> <y>2</y>
<height>15</height> <height>15</height>
<width>96</width> <width>96</width>
...@@ -308,7 +302,7 @@ ...@@ -308,7 +302,7 @@
<text>LR Date</text> <text>LR Date</text>
<border>0</border> <border>0</border>
<color>33554432</color> <color>33554432</color>
<x>487</x> <x>538</x>
<y>2</y> <y>2</y>
<height>15</height> <height>15</height>
<width>101</width> <width>101</width>
...@@ -336,7 +330,7 @@ ...@@ -336,7 +330,7 @@
<text>Transporter Code</text> <text>Transporter Code</text>
<border>0</border> <border>0</border>
<color>33554432</color> <color>33554432</color>
<x>916</x> <x>967</x>
<y>2</y> <y>2</y>
<height>15</height> <height>15</height>
<width>95</width> <width>95</width>
...@@ -364,7 +358,7 @@ ...@@ -364,7 +358,7 @@
<text>Transporter Name</text> <text>Transporter Name</text>
<border>0</border> <border>0</border>
<color>33554432</color> <color>33554432</color>
<x>590</x> <x>641</x>
<y>2</y> <y>2</y>
<height>15</height> <height>15</height>
<width>185</width> <width>185</width>
...@@ -392,7 +386,7 @@ ...@@ -392,7 +386,7 @@
<text>Transaction Id</text> <text>Transaction Id</text>
<border>0</border> <border>0</border>
<color>33554432</color> <color>33554432</color>
<x>777</x> <x>828</x>
<y>2</y> <y>2</y>
<height>15</height> <height>15</height>
<width>137</width> <width>137</width>
...@@ -400,7 +394,7 @@ ...@@ -400,7 +394,7 @@
<valueishtml>0</valueishtml> <valueishtml>0</valueishtml>
</html> </html>
<name>tran_id_t</name> <name>tran_id_t</name>
<visible>0</visible> <visible>1</visible>
<font> <font>
<face>Arial</face> <face>Arial</face>
<height>-10</height> <height>-10</height>
...@@ -452,41 +446,6 @@ ...@@ -452,41 +446,6 @@
<color>16777215</color> <color>16777215</color>
</background> </background>
</ColumnObject> </ColumnObject>
<ColumnObject>
<band>Detail</band>
<id>10</id>
<alignment>0</alignment>
<tabsequence>32766</tabsequence>
<border>0</border>
<color>33554432</color>
<x>1014</x>
<y>2</y>
<height>18</height>
<width>93</width>
<html>
<valueishtml>0</valueishtml>
</html>
<name>ref_ser</name>
<visible>1</visible>
<EditStyle style="ddlb">
<limit>0</limit>
<allowedit>no</allowedit>
<case>any</case>
<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>2</id> <id>2</id>
...@@ -494,7 +453,7 @@ ...@@ -494,7 +453,7 @@
<tabsequence>32766</tabsequence> <tabsequence>32766</tabsequence>
<border>0</border> <border>0</border>
<color>33554432</color> <color>33554432</color>
<x>104</x> <x>155</x>
<y>2</y> <y>2</y>
<height>18</height> <height>18</height>
<width>111</width> <width>111</width>
...@@ -529,7 +488,7 @@ ...@@ -529,7 +488,7 @@
<tabsequence>10</tabsequence> <tabsequence>10</tabsequence>
<border>0</border> <border>0</border>
<color>33554432</color> <color>33554432</color>
<x>295</x> <x>346</x>
<y>2</y> <y>2</y>
<height>18</height> <height>18</height>
<width>92</width> <width>92</width>
...@@ -567,7 +526,7 @@ ...@@ -567,7 +526,7 @@
<tabsequence>32766</tabsequence> <tabsequence>32766</tabsequence>
<border>0</border> <border>0</border>
<color>33554432</color> <color>33554432</color>
<x>389</x> <x>440</x>
<y>2</y> <y>2</y>
<height>18</height> <height>18</height>
<width>96</width> <width>96</width>
...@@ -605,7 +564,7 @@ ...@@ -605,7 +564,7 @@
<tabsequence>32766</tabsequence> <tabsequence>32766</tabsequence>
<border>0</border> <border>0</border>
<color>33554432</color> <color>33554432</color>
<x>487</x> <x>538</x>
<y>2</y> <y>2</y>
<height>18</height> <height>18</height>
<width>101</width> <width>101</width>
...@@ -640,7 +599,7 @@ ...@@ -640,7 +599,7 @@
<tabsequence>32766</tabsequence> <tabsequence>32766</tabsequence>
<border>0</border> <border>0</border>
<color>33554432</color> <color>33554432</color>
<x>916</x> <x>967</x>
<y>2</y> <y>2</y>
<height>18</height> <height>18</height>
<width>95</width> <width>95</width>
...@@ -678,7 +637,7 @@ ...@@ -678,7 +637,7 @@
<tabsequence>32766</tabsequence> <tabsequence>32766</tabsequence>
<border>0</border> <border>0</border>
<color>33554432</color> <color>33554432</color>
<x>590</x> <x>641</x>
<y>2</y> <y>2</y>
<height>18</height> <height>18</height>
<width>185</width> <width>185</width>
...@@ -716,7 +675,7 @@ ...@@ -716,7 +675,7 @@
<tabsequence>32766</tabsequence> <tabsequence>32766</tabsequence>
<border>0</border> <border>0</border>
<color>33554432</color> <color>33554432</color>
<x>777</x> <x>828</x>
<y>2</y> <y>2</y>
<height>18</height> <height>18</height>
<width>137</width> <width>137</width>
...@@ -725,7 +684,7 @@ ...@@ -725,7 +684,7 @@
<valueishtml>0</valueishtml> <valueishtml>0</valueishtml>
</html> </html>
<name>tran_id</name> <name>tran_id</name>
<visible>0</visible> <visible>1</visible>
<EditStyle style="edit"> <EditStyle style="edit">
<limit>10</limit> <limit>10</limit>
<case>any</case> <case>any</case>
...@@ -754,7 +713,7 @@ ...@@ -754,7 +713,7 @@
<tabsequence>32766</tabsequence> <tabsequence>32766</tabsequence>
<border>0</border> <border>0</border>
<color>33554432</color> <color>33554432</color>
<x>217</x> <x>268</x>
<y>2</y> <y>2</y>
<height>18</height> <height>18</height>
<width>76</width> <width>76</width>
...@@ -785,6 +744,42 @@ ...@@ -785,6 +744,42 @@
<color>16777215</color> <color>16777215</color>
</background> </background>
</ColumnObject> </ColumnObject>
<ColumnObject>
<band>Detail</band>
<id>10</id>
<alignment>0</alignment>
<tabsequence>32766</tabsequence>
<border>0</border>
<color>33554432</color>
<x>103</x>
<y>1</y>
<height>15</height>
<width>50</width>
<format>[general]</format>
<html>
<valueishtml>0</valueishtml>
</html>
<name>invoice_flag</name>
<visible>1</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>
<HtmlTable> <HtmlTable>
<border>1</border> <border>1</border>
</HtmlTable> </HtmlTable>
......
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