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

webitm-dis/module-resource/metadata/sales_quot_prop_wiz2sale_quotdet.xml

@@ -174,7 +174,7 @@
 				<item display="Fixed" data="FIX"/>
 			</values>
 		</table_column>
-		<retrieve>PBSELECT( VERSION(400) TABLE(NAME=&quot;item&quot; )  TABLE(NAME=&quot;sales_quot_calc&quot; ) COMPUTE(NAME=&quot;&apos;&apos;as sr_no&quot;) COLUMN(NAME=&quot;sales_quot_calc.quot_no&quot;) COLUMN(NAME=&quot;sales_quot_calc.line_no&quot;) COLUMN(NAME=&quot;sales_quot_calc.item_code&quot;) COLUMN(NAME=&quot;item.descr&quot;) COLUMN(NAME=&quot;sales_quot_calc.unit&quot;) COLUMN(NAME=&quot;sales_quot_calc.qty_per_month&quot;) COLUMN(NAME=&quot;sales_quot_calc.rate&quot;) COLUMN(NAME=&quot;sales_quot_calc.discount&quot;) COLUMN(NAME=&quot;sales_quot_calc.rate__new&quot;) COLUMN(NAME=&quot;sales_quot_calc.gross_rate&quot;) COLUMN(NAME=&quot;sales_quot_calc.comm_perc&quot;) COLUMN(NAME=&quot;sales_quot_calc.comm_per_unit&quot;) COMPUTE(NAME=&quot;&apos;&apos;as basic_dist_price&quot;) COLUMN(NAME=&quot;sales_quot_calc.cost_rate&quot;) COMPUTE(NAME=&quot;&apos;&apos;as available_stock&quot;) COMPUTE(NAME=&quot;&apos;&apos;as profit&quot;) COMPUTE(NAME=&quot;&apos;&apos;as profit_on_goods&quot;) COMPUTE(NAME=&quot;&apos;&apos;as final_price&quot;) COMPUTE(NAME=&quot;&apos;&apos;as perc_profit&quot;) COLUMN(NAME=&quot;sales_quot_calc.discount_type&quot;)    JOIN (LEFT=&quot;item.item_code&quot;    OP =&quot;=&quot;RIGHT=&quot;sales_quot_calc.item_code&quot; )WHERE(    EXP1 =&quot;~&quot;SALES_QUOT_CALC~&quot;.~&quot;QUOT_NO~&quot;&quot;   OP =&quot;=&quot;    EXP2 =&quot;:quot_no&quot;    LOGIC =&quot;And&quot; ) WHERE(    EXP1 =&quot;~&quot;SALES_QUOT_CALC~&quot;.~&quot;LINE_NO~&quot;&quot;   OP =&quot;=&quot;    EXP2 =&quot;:line_no&quot; ) ) ARG(NAME = &quot;quot_no&quot; TYPE = string)  ARG(NAME = &quot;line_no&quot; TYPE = number) </retrieve>
+		<retrieve>PBSELECT( VERSION(400) TABLE(NAME=&quot;item&quot; )  TABLE(NAME=&quot;sales_quot_calc&quot; ) COMPUTE(NAME=&quot;&apos;&apos;as sr_no&quot;) COLUMN(NAME=&quot;sales_quot_calc.quot_no&quot;) COLUMN(NAME=&quot;sales_quot_calc.line_no&quot;) COLUMN(NAME=&quot;sales_quot_calc.item_code&quot;) COLUMN(NAME=&quot;item.descr&quot;) COLUMN(NAME=&quot;sales_quot_calc.unit&quot;) COLUMN(NAME=&quot;sales_quot_calc.qty_per_month&quot;) COLUMN(NAME=&quot;sales_quot_calc.rate&quot;) COLUMN(NAME=&quot;sales_quot_calc.discount&quot;) COLUMN(NAME=&quot;sales_quot_calc.rate__new&quot;) COLUMN(NAME=&quot;sales_quot_calc.gross_rate&quot;) COLUMN(NAME=&quot;sales_quot_calc.comm_perc&quot;) COLUMN(NAME=&quot;sales_quot_calc.comm_per_unit&quot;) COMPUTE(NAME=&quot;&apos;&apos;as basic_dist_price&quot;) COLUMN(NAME=&quot;sales_quot_calc.cost_rate&quot;) COMPUTE(NAME=&quot;&apos;&apos;as available_stock&quot;) COMPUTE(NAME=&quot;&apos;&apos;as profit&quot;) COMPUTE(NAME=&quot;&apos;&apos;as profit_on_goods&quot;) COMPUTE(NAME=&quot;&apos;&apos;as final_price&quot;) COMPUTE(NAME=&quot;&apos;&apos;as perc_profit&quot;) COLUMN(NAME=&quot;sales_quot_calc.discount_type&quot;)    JOIN (LEFT=&quot;item.item_code&quot;    OP =&quot;=&quot;RIGHT=&quot;sales_quot_calc.item_code&quot; )WHERE(    EXP1 =&quot;~&quot;SALES_QUOT_CALC~&quot;.~&quot;QUOT_NO~&quot;&quot;   OP =&quot;=&quot;    EXP2 =&quot;:quot_no&quot; ) ) ARG(NAME = &quot;quot_no&quot; TYPE = string)  ARG(NAME = &quot;line_no&quot; TYPE = number) </retrieve>
 		<argument>
 			<name>quot_no</name>
 			<type>string</type>

webitm-dis/module-resource/metadata/sales_quot_prop_wiz2sale_quotitems.xml

@@ -53,7 +53,6 @@
 			<type size="10">char</type>
 			<update>yes</update>
 			<updatewhereclause>yes</updatewhereclause>
-			<key>yes</key>
 			<name>quot_no</name>
 			<dbname>sales_quot_calc.quot_no</dbname>
 		</table_column>
@@ -61,7 +60,6 @@
 			<type precision="0">decimal</type>
 			<update>yes</update>
 			<updatewhereclause>yes</updatewhereclause>
-			<key>yes</key>
 			<name>line_no</name>
 			<dbname>sales_quot_calc.line_no</dbname>
 		</table_column>
@@ -189,10 +187,7 @@
 			<name>perc_profit</name>
 			<dbname>perc_profit</dbname>
 		</table_column>
-		<retrieve>PBSELECT( VERSION(400) TABLE(NAME=&quot;item&quot; )  TABLE(NAME=&quot;sales_quot_calc&quot; ) COMPUTE(NAME=&quot;&apos;&apos;as sr_no&quot;) COLUMN(NAME=&quot;sales_quot_calc.quot_no&quot;) COLUMN(NAME=&quot;sales_quot_calc.line_no&quot;) COLUMN(NAME=&quot;sales_quot_calc.item_code&quot;) COLUMN(NAME=&quot;item.descr&quot;) COLUMN(NAME=&quot;sales_quot_calc.unit&quot;) COLUMN(NAME=&quot;sales_quot_calc.qty_per_month&quot;) COLUMN(NAME=&quot;sales_quot_calc.rate&quot;) COLUMN(NAME=&quot;sales_quot_calc.discount_type&quot;) COLUMN(NAME=&quot;sales_quot_calc.discount&quot;) COLUMN(NAME=&quot;sales_quot_calc.rate__new&quot;) COLUMN(NAME=&quot;sales_quot_calc.gross_rate&quot;) COLUMN(NAME=&quot;sales_quot_calc.comm_perc&quot;) COLUMN(NAME=&quot;sales_quot_calc.comm_per_unit&quot;) COMPUTE(NAME=&quot;&apos;&apos;as basic_dist_price&quot;) COLUMN(NAME=&quot;sales_quot_calc.cost_rate&quot;) COMPUTE(NAME=&quot;&apos;&apos;as available_stock&quot;) COMPUTE(NAME=&quot;&apos;&apos;as profit&quot;) COMPUTE(NAME=&quot;&apos;&apos;as profit_on_goods&quot;) COMPUTE(NAME=&quot;&apos;&apos;as final_price&quot;) COMPUTE(NAME=&quot;&apos;&apos;as perc_profit&quot;)    JOIN (LEFT=&quot;item.item_code&quot;    OP =&quot;=&quot;RIGHT=&quot;sales_quot_calc.item_code&quot; )WHERE(    EXP1 =&quot;~&quot;SALES_QUOT_CALC~&quot;.~&quot;QUOT_NO~&quot;&quot;   OP =&quot;=&quot;    EXP2 =&quot;:quot_no&quot;    LOGIC =&quot;And&quot; ) WHERE(    EXP1 =&quot;~&quot;SALES_QUOT_CALC~&quot;.~&quot;LINE_NO~&quot;&quot;   OP =&quot;=&quot;    EXP2 =&quot;:line_no&quot; ) ) ARG(NAME = &quot;quot_no&quot; TYPE = string)  ARG(NAME = &quot;line_no&quot; TYPE = number) </retrieve>
-		<update>SALES_QUOT_CALC</update>
-		<updatewhere>0</updatewhere>
-		<updatekeyinplace>no</updatekeyinplace>
+		<retrieve>PBSELECT( VERSION(400) TABLE(NAME=&quot;item&quot; )  TABLE(NAME=&quot;sales_quot_calc&quot; ) COMPUTE(NAME=&quot;&apos;&apos;as sr_no&quot;) COLUMN(NAME=&quot;sales_quot_calc.quot_no&quot;) COLUMN(NAME=&quot;sales_quot_calc.line_no&quot;) COLUMN(NAME=&quot;sales_quot_calc.item_code&quot;) COLUMN(NAME=&quot;item.descr&quot;) COLUMN(NAME=&quot;sales_quot_calc.unit&quot;) COLUMN(NAME=&quot;sales_quot_calc.qty_per_month&quot;) COLUMN(NAME=&quot;sales_quot_calc.rate&quot;) COLUMN(NAME=&quot;sales_quot_calc.discount_type&quot;) COLUMN(NAME=&quot;sales_quot_calc.discount&quot;) COLUMN(NAME=&quot;sales_quot_calc.rate__new&quot;) COLUMN(NAME=&quot;sales_quot_calc.gross_rate&quot;) COLUMN(NAME=&quot;sales_quot_calc.comm_perc&quot;) COLUMN(NAME=&quot;sales_quot_calc.comm_per_unit&quot;) COMPUTE(NAME=&quot;&apos;&apos;as basic_dist_price&quot;) COLUMN(NAME=&quot;sales_quot_calc.cost_rate&quot;) COMPUTE(NAME=&quot;&apos;&apos;as available_stock&quot;) COMPUTE(NAME=&quot;&apos;&apos;as profit&quot;) COMPUTE(NAME=&quot;&apos;&apos;as profit_on_goods&quot;) COMPUTE(NAME=&quot;&apos;&apos;as final_price&quot;) COMPUTE(NAME=&quot;&apos;&apos;as perc_profit&quot;)    JOIN (LEFT=&quot;item.item_code&quot;    OP =&quot;=&quot;RIGHT=&quot;sales_quot_calc.item_code&quot; )WHERE(    EXP1 =&quot;~&quot;SALES_QUOT_CALC~&quot;.~&quot;QUOT_NO~&quot;&quot;   OP =&quot;=&quot;    EXP2 =&quot;:quot_no&quot; ) ) ARG(NAME = &quot;quot_no&quot; TYPE = string)  ARG(NAME = &quot;line_no&quot; TYPE = number) </retrieve>
 		<argument>
 			<name>quot_no</name>
 			<type>string</type>