sql and srd updated

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

webitm-dis/module-resource/sql/A16ISUN001.sql

+alter table cust_stock_inv add ref_ser char(6);   --To segregate Invoice (S-INV) or return (S-RET) as both are stored in same table and currently identified by tran_id.
+
+alter table cust_stock_det add rcp_val number(14,3);--To store invoice value for received invoice.
+
+alter table cust_stock_det add rcp_repl_val number(14,3);--To store Replacement value.
+
+alter table cust_stock_det add rcp_free_val number(14,3);--To store Free value of invoice received.
+
+alter table cust_stock_det add ret_val number(14,3);--To store Return value of Sales Return.
+
+alter table cust_stock_det add ret_free_val number(14,3);--To store Return Free value of invoice.
+
+alter table cust_stock_det add transit_bill_val number(14,3);--To store  value of  Transit invoice.
+
+alter table cust_stock_det add transit_repl_val number(14,3);--To store  Transit replacement value.
+
+alter table cust_stock_det add transit_free_val number(14,3);--To store  Transit Free invoice value.
+
+commit;
+
+update obj_forms set key_info='prd_code:cust_name' where win_name like'w_secondory_sale_gwt%' and form_no=1;
+commit;
+
+delete pophelp where FIELD_NAME='POS_CODE' and MOD_NAME='W_SECONDORY_SALE_GWT_WIZ';
+commit;
+
+Insert into POPHELP (FIELD_NAME,MOD_NAME,SQL_STR,DW_OBJECT,MSG_TITLE,WIDTH,HEIGHT,CHG_DATE,CHG_USER,CHG_TERM,DIST_OPT,FILTER_STRING,SQL_INPUT,DEFAULT_COL,POP_ALIGN,QUERY_MODE,PAGE_CONTEXT,POPHELP_COLS,POPHELP_SOURCE,MULTI_OPT,HELP_OPTION,POPUP_XSL_NAME,AUTO_FILL_LEN,THUMB_OBJ,THUMB_IMAGE_COL,THUMB_ALT_COL,AUTO_MIN_LENGTH)
+values ('POS_CODE','W_SECONDORY_SALE_GWT_WIZ','SELECT trim(A.POS_CODE) as pos_code ,A.DESCR,trim(A.EMP_CODE) as emp_code,C.EMP_FNAME||'' ''||C.EMP_MNAME||'' ''||C.EMP_LNAME NAME,a.table_no as Division, itmser.sh_descr  as Div_description
+ FROM ORG_STRUCTURE A ,EMPLOYEE C,itemser itmser,ORG_STRUCTURE_CUST D
+WHERE A.VERSION_ID IN(select FN_GET_VERSION_ID from dual)
+AND A.EMP_CODE=C.EMP_CODE(+)
+AND d.version_id=A.version_id and d.table_no=A.table_no and d.pos_code=A.pos_code and D.CUST_CODE is not null
+AND A.POS_CODE IN(SELECT C.POS_CODE FROM ORG_STRUCTURE C
+START WITH C.POS_CODE=''?''
+CONNECT BY PRIOR C.POS_CODE=C.POS_CODE__REPTO
+AND C.VERSION_ID =(select FN_GET_VERSION_ID from dual)
+) and itmser.item_ser=a.table_no
+GROUP by A.POS_CODE,A.DESCR,A.EMP_CODE,A.TABLE_NO,C.EMP_FNAME,C.EMP_MNAME,C.EMP_LNAME,ITMSER.SH_DESCR 
+ORDER BY A.POS_CODE,A.DESCR asc ',null,'Position Code',0,0,null,null,null,'0',null,':login_poscode',0,null,null,null,null,null,0,null,null,null,null,null,null,null);
+
+COMMIT;

webitm-dis/module-resource/srd/d_secondory_sale_gwt_wiz11.srd

@@ -12,7 +12,7 @@ table(column=(type=char(10) update=yes updatewhereclause=yes key=yes name=tran_i
  column=(type=char(10) update=yes updatewhereclause=yes name=tran_id__last dbname="cust_stock.tran_id__last" )
  column=(type=char(5) update=yes updatewhereclause=yes name=item_ser dbname="cust_stock.item_ser" )
  column=(type=datetime update=yes updatewhereclause=yes name=stmt_date dbname="cust_stock.stmt_date" )
- column=(type=char(50) updatewhereclause=yes name=cust_name dbname="customer.cust_name" )
+ column=(type=char(40) updatewhereclause=yes name=cust_name dbname="customer.cust_name" )
  column=(type=char(5) updatewhereclause=yes name=stan_code dbname="customer.stan_code" )
  column=(type=char(3) update=yes updatewhereclause=yes name=order_type dbname="cust_stock.order_type" )
  column=(type=char(40) updatewhereclause=yes name=descr dbname="station.descr" )
@@ -26,7 +26,8 @@ table(column=(type=char(10) update=yes updatewhereclause=yes key=yes name=tran_i
  column=(type=char(1) update=yes updatewhereclause=yes name=status dbname="cust_stock.status" )
  column=(type=char(6) updatewhereclause=yes name=status_dis dbname="status_dis" )
  column=(type=char(4000) updatewhereclause=yes name=position_descr dbname="position_descr" )
- retrieve="PBSELECT( VERSION(400) TABLE(NAME=~"cust_stock~" )  TABLE(NAME=~"customer~" )  TABLE(NAME=~"station~" ) COLUMN(NAME=~"cust_stock.tran_id~") COLUMN(NAME=~"cust_stock.tran_date~") COLUMN(NAME=~"cust_stock.cust_code~") COLUMN(NAME=~"cust_stock.site_code~") COLUMN(NAME=~"cust_stock.tran_id__last~") COLUMN(NAME=~"cust_stock.item_ser~") COLUMN(NAME=~"cust_stock.stmt_date~") COLUMN(NAME=~"customer.cust_name~") COLUMN(NAME=~"customer.stan_code~") COLUMN(NAME=~"cust_stock.order_type~") COLUMN(NAME=~"station.descr~") COLUMN(NAME=~"cust_stock.from_date~") COLUMN(NAME=~"cust_stock.to_date~") COLUMN(NAME=~"cust_stock.prd_code~") COLUMN(NAME=~"cust_stock.confirmed~") COLUMN(NAME=~"cust_stock.conf_date~") COLUMN(NAME=~"cust_stock.pos_code~") COLUMN(NAME=~"cust_stock.emp_code~") COLUMN(NAME=~"cust_stock.status~") COMPUTE(NAME=~"(CASE WHEN cust_stock.status is null THEN 'Open' WHEN cust_stock.status='O' THEN 'Open' WHEN cust_stock.status='S' THEN 'Submit' ELSE 'Open' end) as status_dis~") COMPUTE(NAME=~"FN_GET_POSCODE_DESCR(cust_stock.pos_code) as position_descr~")    JOIN (LEFT=~"cust_stock.cust_code~"    OP =~"=~"RIGHT=~"customer.cust_code~" )    JOIN (LEFT=~"customer.stan_code~"    OP =~"=~"RIGHT=~"station.stan_code~" )WHERE(    EXP1 =~"CUST_STOCK.TRAN_DATE~"   OP =~">=~"    EXP2 =~":from_date~"    LOGIC =~"And~" ) WHERE(    EXP1 =~"CUST_STOCK.TRAN_DATE~"   OP =~"<=~"    EXP2 =~":to_date~" ) ) ARG(NAME = ~"from_date~" TYPE = date)  ARG(NAME = ~"to_date~" TYPE = date) " update="cust_stock" updatewhere=0 updatekeyinplace=no arguments=(("from_date", date),("to_date", date)) )
+ column=(type=char(4000) updatewhereclause=yes name=isattachment dbname="isattachment" )
+ retrieve="PBSELECT( VERSION(400) TABLE(NAME=~"cust_stock~" )  TABLE(NAME=~"customer~" )  TABLE(NAME=~"station~" ) COLUMN(NAME=~"cust_stock.tran_id~") COLUMN(NAME=~"cust_stock.tran_date~") COLUMN(NAME=~"cust_stock.cust_code~") COLUMN(NAME=~"cust_stock.site_code~") COLUMN(NAME=~"cust_stock.tran_id__last~") COLUMN(NAME=~"cust_stock.item_ser~") COLUMN(NAME=~"cust_stock.stmt_date~") COLUMN(NAME=~"customer.cust_name~") COLUMN(NAME=~"customer.stan_code~") COLUMN(NAME=~"cust_stock.order_type~") COLUMN(NAME=~"station.descr~") COLUMN(NAME=~"cust_stock.from_date~") COLUMN(NAME=~"cust_stock.to_date~") COLUMN(NAME=~"cust_stock.prd_code~") COLUMN(NAME=~"cust_stock.confirmed~") COLUMN(NAME=~"cust_stock.conf_date~") COLUMN(NAME=~"cust_stock.pos_code~") COLUMN(NAME=~"cust_stock.emp_code~") COLUMN(NAME=~"cust_stock.status~") COMPUTE(NAME=~"(CASE WHEN cust_stock.status is null THEN 'Open' WHEN cust_stock.status='O' THEN 'Open' WHEN cust_stock.status='S' THEN 'Submit' ELSE 'Open' end) as status_dis~") COMPUTE(NAME=~"FN_GET_POSCODE_DESCR(cust_stock.pos_code) as position_descr~") COMPUTE(NAME=~"FN_ISATTACHMENT(cust_stock.tran_id,'T-CST') as isattachment~")    JOIN (LEFT=~"cust_stock.cust_code~"    OP =~"=~"RIGHT=~"customer.cust_code~" )    JOIN (LEFT=~"customer.stan_code~"    OP =~"=~"RIGHT=~"station.stan_code~" )WHERE(    EXP1 =~"CUST_STOCK.TRAN_DATE~"   OP =~">=~"    EXP2 =~":from_date~"    LOGIC =~"And~" ) WHERE(    EXP1 =~"CUST_STOCK.TRAN_DATE~"   OP =~"<=~"    EXP2 =~":to_date~" ) ) ARG(NAME = ~"from_date~" TYPE = date)  ARG(NAME = ~"to_date~" TYPE = date) " update="CUST_STOCK" updatewhere=0 updatekeyinplace=no arguments=(("from_date", date),("to_date", date)) )
 text(band=header alignment="0" text="Cust Stock Status" border="0" color="33554432" x="2029" y="1" height="17" width="146" html.valueishtml="0"  name=status_t visible="0"  font.face="Arial" font.height="-11" font.weight="400"  font.family="2" font.pitch="2" font.charset="0" background.mode="1" background.color="553648127" )
 text(band=header alignment="0" text="Status" border="0" color="0" x="2" y="4" height="16" width="94" html.valueishtml="0"  name=status_dis_t visible="1"  font.face="Times New Roman" font.height="-10" font.weight="400"  font.family="1" font.pitch="2" font.charset="0" background.mode="1" background.color="553648127" )
 text(band=header alignment="2" text="Customer/Stockiest" border="0" color="0" x="98" y="0" height="16" width="139" html.valueishtml="0"  name=cust_code_t visible="1"  font.face="Times New Roman" font.height="-10" font.weight="400"  font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="67108864" )
@@ -69,6 +70,8 @@ column(band=detail id=18 alignment="0" tabsequence=150 border="0" color="0" x="1
 column(band=detail id=19 alignment="0" tabsequence=180 border="0" color="0" x="2029" y="1" height="16" width="146" format="[general]" html.valueishtml="0"  name=status visible="0" edit.limit=0 edit.case=any edit.autoselect=yes edit.imemode=0  font.face="Times New Roman" font.height="-10" font.weight="400"  font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" )
 column(band=detail id=20 alignment="0" tabsequence=10 border="0" color="0" x="2" y="1" height="16" width="94" format="[general]" html.valueishtml="0"  name=status_dis visible="1" edit.limit=0 edit.case=any edit.autoselect=yes edit.imemode=0  font.face="Times New Roman" font.height="-10" font.weight="400"  font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" )
 column(band=detail id=21 alignment="0" tabsequence=140 border="0" color="0" x="1469" y="1" height="16" width="213" format="[general]" html.valueishtml="0"  name=position_descr visible="1" edit.limit=0 edit.case=any edit.autoselect=yes edit.imemode=0  font.face="Times New Roman" font.height="-10" font.weight="400"  font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" )
+column(band=detail id=22 alignment="0" tabsequence=220 border="0" color="0" x="2523" y="1" height="16" width="104" html.valueishtml="0"  name=isattachment visible="1"  font.face="Times New Roman" font.height="-10" font.weight="400"  font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" )
+text(band=header alignment="0" text="Attachment" border="0" color="33554432" x="2522" y="1" height="19" width="105" html.valueishtml="0"  name=isattachment_t visible="1"  font.face="Times New Roman" font.height="-12" font.weight="400"  font.family="1" font.pitch="2" font.charset="0" background.mode="1" background.color="553648127" )
 htmltable(border="1" )
 htmlgen(clientevents="1" clientvalidation="1" clientcomputedfields="1" clientformatting="0" clientscriptable="0" generatejavascript="1" encodeselflinkargs="1" netscapelayers="0" )
 export.xml(usetemplate="" headgroups="1" includewhitespace="0" metadatatype=0 savemetadata=0  template=(comment="" encoding="UTF-8" name="d_cust_stoc_gwt_view" xml="<?xml version=~"1.0~" encoding=~"UTF-8~" standalone=~"no~"?><untitled><untitled_row __pbband=~"detail~"><tran_id>order_type</tran_id><tran_date>tran_date</tran_date><cust_code>cust_code</cust_code><site_code>site_code</site_code><tran_id__last>cust_name</tran_id__last><item_ser>item_ser</item_ser><stmt_date>stmt_date</stmt_date></untitled_row></untitled>"))

webitm-dis/module-resource/srd/d_secondory_sale_gwt_wiz22.srd

@@ -13,7 +13,8 @@ table(column=(type=char(10) update=yes updatewhereclause=yes key=yes name=tran_i
  column=(type=char(10) updatewhereclause=yes name=tran_code dbname="invoice.tran_code" )
  column=(type=char(40) updatewhereclause=yes name=tran_name dbname="transporter.tran_name" )
  column=(type=char(25) updatewhereclause=yes name=lr_no dbname="invoice.lr_no" )
- retrieve="PBSELECT( VERSION(400) TABLE(NAME=~"cust_stock_inv~" )  TABLE(NAME=~"invoice~" )  TABLE(NAME=~"transporter~" ) COLUMN(NAME=~"cust_stock_inv.tran_id~") COLUMN(NAME=~"cust_stock_inv.invoice_id~") COLUMN(NAME=~"cust_stock_inv.invoice_date~") COLUMN(NAME=~"cust_stock_inv.dlv_flg~") COLUMN(NAME=~"cust_stock_inv.net_amt~") COLUMN(NAME=~"invoice.lr_date~") COLUMN(NAME=~"invoice.tran_code~") COLUMN(NAME=~"transporter.tran_name~") COLUMN(NAME=~"invoice.lr_no~")    JOIN (LEFT=~"cust_stock_inv.invoice_id~"    OP =~"=~"RIGHT=~"invoice.invoice_id~" )    JOIN (LEFT=~"invoice.tran_code~"    OP =~"=~"RIGHT=~"transporter.tran_code~" )WHERE(    EXP1 =~"cust_stock_inv.tran_id~"   OP =~"=~"    EXP2 =~":tran_id~"    LOGIC =~"and~" ) WHERE(    EXP1 =~"~~~"CUST_STOCK_INV~~~".~~~"INVOICE_ID~~~"~"   OP =~"=~"    EXP2 =~":invoice_id~" ) ) ARG(NAME = ~"tran_id~" TYPE = string)  ARG(NAME = ~"invoice_id~" TYPE = string) " update="CUST_STOCK_INV" updatewhere=0 updatekeyinplace=no arguments=(("tran_id", string),("invoice_id", string)) )
+ column=(type=char(6) update=yes updatewhereclause=yes name=ref_ser dbname="cust_stock_inv.ref_ser" values="Invoice	S-INV/Return	S-RET/" )
+ retrieve="PBSELECT( VERSION(400) TABLE(NAME=~"cust_stock_inv~" )  TABLE(NAME=~"invoice~" )  TABLE(NAME=~"transporter~" ) COLUMN(NAME=~"cust_stock_inv.tran_id~") COLUMN(NAME=~"cust_stock_inv.invoice_id~") COLUMN(NAME=~"cust_stock_inv.invoice_date~") COLUMN(NAME=~"cust_stock_inv.dlv_flg~") COLUMN(NAME=~"cust_stock_inv.net_amt~") COLUMN(NAME=~"invoice.lr_date~") COLUMN(NAME=~"invoice.tran_code~") COLUMN(NAME=~"transporter.tran_name~") COLUMN(NAME=~"invoice.lr_no~") COLUMN(NAME=~"cust_stock_inv.ref_ser~")    JOIN (LEFT=~"cust_stock_inv.invoice_id~"    OP =~"=~"RIGHT=~"invoice.invoice_id~" )    JOIN (LEFT=~"invoice.tran_code~"    OP =~"=~"RIGHT=~"transporter.tran_code~" )WHERE(    EXP1 =~"cust_stock_inv.tran_id~"   OP =~"=~"    EXP2 =~":tran_id~"    LOGIC =~"and~" ) WHERE(    EXP1 =~"~~~"CUST_STOCK_INV~~~".~~~"INVOICE_ID~~~"~"   OP =~"=~"    EXP2 =~":invoice_id~" ) ) ARG(NAME = ~"tran_id~" TYPE = string)  ARG(NAME = ~"invoice_id~" TYPE = string) " update="CUST_STOCK_INV" updatewhere=0 updatekeyinplace=no arguments=(("tran_id", string),("invoice_id", string)) )
 text(band=detail alignment="1" text="Invoice Id:" border="0" color="33554432" x="5" y="39" height="16" width="188" html.valueishtml="0"  name=invoice_id_t visible="1"  font.face="Times New Roman" font.height="-10" font.weight="400"  font.family="1" font.pitch="2" font.charset="0" background.mode="1" background.color="536870912" )
 column(band=detail id=2 alignment="0" tabsequence=32766 border="5" color="255" x="198" y="39" height="16" width="78" format="[general]" html.valueishtml="0"  name=invoice_id visible="1" edit.limit=10 edit.case=any edit.focusrectangle=no edit.autoselect=yes edit.autohscroll=yes edit.imemode=0  font.face="Times New Roman" 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="Invoice Date:" border="0" color="33554432" x="282" y="39" height="16" width="156" html.valueishtml="0"  name=invoice_date_t visible="1"  font.face="Times New Roman" font.height="-10" font.weight="400"  font.family="1" font.pitch="2" font.charset="0" background.mode="1" background.color="536870912" )
@@ -31,6 +32,8 @@ column(band=detail id=7 alignment="0" tabsequence=32766 border="0" color="255" x
 column(band=detail id=8 alignment="0" tabsequence=32766 border="0" color="255" x="282" y="114" height="16" width="239" format="[general]" html.valueishtml="0"  name=tran_name visible="1" edit.limit=0 edit.case=any edit.focusrectangle=no edit.autoselect=no edit.imemode=0  font.face="Times New Roman" 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="Tran Id:" border="0" color="33554432" x="5" y="140" height="16" width="188" html.valueishtml="0"  name=tran_id_t visible="1"  font.face="Times New Roman" font.height="-10" font.weight="400"  font.family="1" font.pitch="2" font.charset="0" background.mode="1" background.color="536870912" )
 column(band=detail id=1 alignment="0" tabsequence=32766 border="5" color="255" x="198" y="140" height="16" width="78" format="[general]" html.valueishtml="0"  name=tran_id visible="1" edit.limit=10 edit.case=any edit.focusrectangle=no edit.autoselect=yes edit.autohscroll=yes edit.imemode=0  font.face="Times New Roman" 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="Invoice Flag:" border="0" color="33554432" x="282" y="140" height="16" width="156" html.valueishtml="0"  name=ref_ser_t visible="1"  font.face="Times New Roman" font.height="-10" font.weight="400"  font.family="1" font.pitch="2" font.charset="0" background.mode="1" background.color="536870912" )
+column(band=detail id=10 alignment="0" tabsequence=32766 border="0" color="255" x="446" y="140" height="16" width="93" format="[general]" html.valueishtml="0"  name=ref_ser visible="1" ddlb.limit=0 ddlb.allowedit=no ddlb.case=any ddlb.imemode=0  font.face="Times New Roman" font.height="-10" font.weight="400"  font.family="2" font.pitch="2" font.charset="0" background.mode="2" background.color="67108864" )
 htmltable(border="1" )
 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_cust_stock_gwt_view22" xml="<?xml version=~"1.0~" encoding=~"UTF-8~" standalone=~"no~"?><d_cust_stock_gwt_view22><d_cust_stock_gwt_view22_row __pbband=~"detail~"><tran_id/><invoice_id>invoice_id</invoice_id><invoice_date>invoice_date</invoice_date><dlv_flg>dlv_flg</dlv_flg><net_amt>net_amt</net_amt><lr_date>lr_date</lr_date></d_cust_stock_gwt_view22_row></d_cust_stock_gwt_view22>"))