Skip to content

B
business-java
Commit 86cceafe authored by nshaikh's avatar nshaikh
Browse files
Options

Bank reconcile deliverable's merged by azhar 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@103975 ce508802-f39f-4f6c-b175-0d175dae99d5
parent c1cb7ac8
Show whitespace changes
Inline Side-by-side
Showing with 264 additions and 275 deletions
webitm-fin/module-resource/Xsl/bank_reconciliation_wiz2_wiz_en_US_A.xsl
View file @ 86cceafe
...@@ -22,8 +22,7 @@ ...@@ -22,8 +22,7 @@
]]> ]]>
</xsl:variable> </xsl:variable>
<xsl:variable name="hstylecss"> <xsl:variable name="hstylecss">
<![CDATA[ <![CDATA[border-color:yellow;
border-color:yellow;
background:#D7E5F9; background:#D7E5F9;
color:#102132; color:#102132;
text-align:center; text-align:center;
...@@ -39,13 +38,14 @@ ...@@ -39,13 +38,14 @@
<html> <html>
<head> <head>
<meta http-equiv="content-type" content="text/html; charset=UTF-8" /> <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
<script type="text/javascript" src="/ibase/webitm/js/BankRecoWiz.js"></script> <!--script type="text/javascript" src="/ibase/webitm/js/BankRecoWiz.js"></script-->
<script type="text/javascript" src="/ibase/webitm/js/jquery-1.10.2.js"></script> <script type="text/javascript" src="/ibase/webitm/js/jquery-1.10.2.js"></script>
<script type="text/javascript" src="/ibase/webitm/js/jquery-latest.js"></script> <script type="text/javascript" src="/ibase/webitm/js/jquery-latest.js"></script>
<!-- <script type="text/javascript" src="/ibase/webitm/js/jquery.tablesorter.js"></script> --> <!-- <script type="text/javascript" src="/ibase/webitm/js/jquery.tablesorter.js"></script> -->
<!-- <script type="text/javascript" src="/ibase/webitm/js/jquery-1.10.2.js"></script> --> <!-- <script type="text/javascript" src="/ibase/webitm/js/jquery-1.10.2.js"></script> -->
<script type="text/javascript" src="/ibase/webitm/js/sortable_table.js"></script> <script type="text/javascript" src="/ibase/webitm/js/sortable_table.js"></script>
<script type="text/javascript" src="/ibase/webitm/js/resolFixedTableHeader.js"></script> <script type="text/javascript" src="/ibase/webitm/js/resolFixedTableHeader.js"></script>
<script type="text/javascript" src="/ibase/webitm/js/BankRecoWiz.js"></script>
<link href="/ibase/webitm/css/ResolFixedTableHeader.css" rel="stylesheet"/> <link href="/ibase/webitm/css/ResolFixedTableHeader.css" rel="stylesheet"/>
<script language="JavaScript" type="text/javascript"> <script language="JavaScript" type="text/javascript">
...@@ -182,7 +182,7 @@ function setDetail(value) ...@@ -182,7 +182,7 @@ function setDetail(value)
.rEFSER{width: 80px;height: 25px;text-align:center;} .rEFSER{width: 80px;height: 25px;text-align:center;}
.rEFSER_old{width: 80px;height: 13px;text-align:center;} .rEFSER_old{width: 80px;height: 13px;text-align:center;}
.bILLNO{width: 80px;height: 13px;text-align:center;} .bILLNO{width: 80px;height: 13px;text-align:center;}
.rEFID{width: 80px;height: 13px;text-align:center;} .rEFID{width: 100px;height: 13px;text-align:center;}
.aCCTCODE{width: 80px;height: 13px;text-align:center;} .aCCTCODE{width: 80px;height: 13px;text-align:center;}
.cCTRCODE{width: 80px;height: 13px;text-align:center;} .cCTRCODE{width: 80px;height: 13px;text-align:center;}
.dRAMT{width: 80px;height: 13px;text-align:center;} .dRAMT{width: 80px;height: 13px;text-align:center;}
...@@ -214,7 +214,7 @@ function setDetail(value) ...@@ -214,7 +214,7 @@ function setDetail(value)
.dtRANDATE{width: 100px;height: 35px;text-align:left;} .dtRANDATE{width: 100px;height: 35px;text-align:left;}
.dtREFDATE{width: 70px;height: 35px;text-align:left;} .dtREFDATE{width: 70px;height: 35px;text-align:left;}
.drEFSER{width: 80px;height: 30px;text-align:left;} .drEFSER{width: 80px;height: 30px;text-align:left;}
.drEFID{width: 80px;height: 30px;text-align:left;} .drEFID{width: 100px;height: 30px;text-align:left;}
.drEFNo{width: 100px;height: 30px;text-align:left;} .drEFNo{width: 100px;height: 30px;text-align:left;}
.daCCTCODE{width: 80px;height: 30px;text-align:left;} .daCCTCODE{width: 80px;height: 30px;text-align:left;}
.dcCTRCODE{width: 80px;height: 30px;text-align:left;} .dcCTRCODE{width: 80px;height: 30px;text-align:left;}
...@@ -286,21 +286,47 @@ thead { ...@@ -286,21 +286,47 @@ thead {
<form name = "Wizard_Travel" > <form name = "Wizard_Travel" action = "" onsubmit = "return false;">
<!--xsl:for-each select="//Detail1">
<xsl:variable name="site_code"><xsl:value-of select="site_code"/></xsl:variable>
<xsl:variable name="bank_code"><xsl:value-of select="bank_code"/></xsl:variable>
</xsl:for-each>
<input type="text" value="{$site_code}" name="site_code" id="site_code" />
<input type="text" value="{$bank_code}" name="bank_code" id="bank_code" /-->
<xsl:variable name="site_code"><xsl:value-of select="/Root/Detail1/site_code"/></xsl:variable> <xsl:variable name="site_code"><xsl:value-of select="/Root/Detail1/site_code"/></xsl:variable>
<xsl:variable name="bank_code"><xsl:value-of select="/Root/Detail1/bank_code"/></xsl:variable> <xsl:variable name="bank_code"><xsl:value-of select="/Root/Detail1/bank_code"/></xsl:variable>
<xsl:variable name="bank_descr"><xsl:value-of select="/Root/Detail1/bank_descr"/></xsl:variable> <xsl:variable name="bank_descr"><xsl:value-of select="/Root/Detail/bank_descr"/></xsl:variable>
<input type="hidden" value="{$site_code}" name="site_code" id="site_code" /> <input type="hidden" value="{$site_code}" name="site_code" id="site_code" />
<input type="hidden" value="{$bank_code}" name="bank_code" id="bank_code" /> <input type="hidden" value="{$bank_code}" name="bank_code" id="bank_code" />
<xsl:for-each select="Root/Detail2/Detail">
<xsl:variable name="site_code"><xsl:value-of select="site_code"/></xsl:variable>
<xsl:variable name="bank_code"><xsl:value-of select="bank_code"/></xsl:variable>
<input type="hidden" value="{$site_code}" name="site_code" id="site_code_new" />
<input type="hidden" value="{$bank_code}" name="bank_code" id="bank_code_new" />
</xsl:for-each>
<xsl:variable name="filterList"><xsl:value-of select="/Root/Detail1/filter_list"/></xsl:variable>
<xsl:variable name="filterData"><xsl:value-of select="/Root/Detail1/filter_data"/></xsl:variable>
<xsl:variable name="fromDate"><xsl:value-of select="/Root/Detail1/from_date"/></xsl:variable>
<xsl:variable name="toDate"><xsl:value-of select="/Root/Detail1/to_date"/></xsl:variable>
<input type="hidden" value="{$filterList}" name="filter_list" id="filter_list" />
<input type="hidden" value="{$filterData}" name="filter_data" id="filter_data" />
<input type="hidden" value="{$fromDate}" name="from_date_new" id="from_date_new" />
<input type="hidden" value="{$toDate}" name="to_date_new" id="to_date_new" />
<!-- <xmp><xsl:copy-of select="*"/></xmp> --> <!-- <xmp><xsl:copy-of select="*"/></xmp> -->
<div id ="main1" > <div id ="main1" >
<xsl:if test="count(/Root/Detail2/Detail) &lt; 1"> <xsl:if test="count(/Root/Detail2/Detail) &lt; 1">
<table border="1" width="100%"> <table border="0" width="100%">
<tr><td class="header_td" align="center">NO DATA FOUND!!!!!</td></tr> <tr><td class="header_td" align="center">NO DATA FOUND!!!!!</td></tr>
</table> </table>
<!-- <input type="submit" style="cursor:hand" value="Previous" id="Previous" name="Previous" title='' onclick=" window.history.back();" /> --> <!-- <input type="submit" style="cursor:hand" value="Previous" id="Previous" name="Previous" title='' onclick=" window.history.back();" /> -->
...@@ -309,7 +335,7 @@ thead { ...@@ -309,7 +335,7 @@ thead {
</xsl:if> </xsl:if>
<xsl:if test="count(/Root/Detail2/Detail) &gt; 0"> <xsl:if test="count(/Root/Detail2/Detail) &gt; 0">
<table> <table border="0" align = "center">
<tr> <tr>
<td> <td>
<input type="hidden" value="2" name="FORM_NO" ID="FORM_NO" /> <input type="hidden" value="2" name="FORM_NO" ID="FORM_NO" />
...@@ -322,6 +348,8 @@ thead { ...@@ -322,6 +348,8 @@ thead {
<option value="REFNO_DATE_AMT">REFNO-REFDATE-AMT</option> <option value="REFNO_DATE_AMT">REFNO-REFDATE-AMT</option>
<option value="REFNO_AMT">REFNO-AMT</option> <option value="REFNO_AMT">REFNO-AMT</option>
<option value="REFDATE_AMT">REFDATE-AMT</option> <option value="REFDATE_AMT">REFDATE-AMT</option>
<option value="AMT">AMOUNT</option>
</select> </select>
<select name="reconciletype" id="reconciletype" > <select name="reconciletype" id="reconciletype" >
<option value="Automatically">Automatically</option> <option value="Automatically">Automatically</option>
...@@ -348,18 +376,23 @@ thead { ...@@ -348,18 +376,23 @@ thead {
<xsl:if test="count(/Root/Detail2/Detail) &gt; 0"> <xsl:if test="count(/Root/Detail2/Detail) &gt; 0">
<table border="0" style="width: 350px;" cellspacing="1" cellpadding="1"> <table border="0" style="width: 350px;" cellspacing="1" cellpadding="1" align = "center">
<tr> <tr>
<td> <td>
<select name="filterList" id="filterList"> <select name="filterList" id="filterList">
<option value="amt_bc" selected="selected">Amount</option> <option value="none">None</option>
<option value="ref_no" selected="selected">Cheque No</option> <option value="amt_bc"><xsl:if test="$filterList='amt_bc'"><xsl:attribute name="selected">true</xsl:attribute></xsl:if>Amount</option>
<option value="ref_date" selected="selected">Cheque Date</option> <option value="ref_no"><xsl:if test="$filterList='ref_no'"><xsl:attribute name="selected">true</xsl:attribute></xsl:if>Cheque No</option>
<option value="ref_date"><xsl:if test="$filterList='ref_date'"><xsl:attribute name="selected">true</xsl:attribute></xsl:if>Cheque Date</option>
</select> </select>
</td> </td>
<td><input type="text" name="filterData" id="filterData" /></td> <td><input type="text" name="filterData" id="filterData" value="{normalize-space($filterData)}"/></td>
<td><input type="button" name="filter" id="filter" value="FILTER" onclick="return flterAction('filter',this.form)"/></td> <tr>
<td nowrap = "true">From Date:</td><td><input type="date" size="10" name = "from_date" id="from_date" maxlength="10" value="{normalize-space($fromDate)}"/></td>
<td nowrap = "true">To Date:</td><td><input type="date" size="10" name = "to_date" id="to_date" maxlength="10" value="{normalize-space($toDate)}"/></td>
</tr>
<td colspan = "4"><input type="button" name="filter" id="filter" value="FILTER" onclick="return flterAction('filter',this.form)"/></td>
</tr> </tr>
</table> </table>
...@@ -387,21 +420,14 @@ thead { ...@@ -387,21 +420,14 @@ thead {
</table> </table>
<table border="0" style="width: 530px;" cellspacing="1" cellpadding="1" id="frmSiteTable" class = "tableClass" > <table border="0" style="width: 530px;" cellspacing="1" cellpadding="1" id="frmSiteTable" class = "tableClass" >
<thead class="table-head"> <thead class="table-head">
<tr class = "trClass"> <tr class = "trClass">
<th class = "thClass" nowrap="true" valign="middle"><input type="hidden" name="hiden" value="" /></th> <th class = "thClass" nowrap="true" valign="middle"><input type="hidden" name="hiden" value="" /></th>
<th class = "thClass" nowrap="true" valign="middle">Cheque No<img src="/ibase/webitm/images/small_sort.gif"/></th> <th class = "thClass" nowrap="true" valign="middle">Cheque No<img src="/ibase/webitm/images/small_sort.gif"/></th>
<th class = "thClass" nowrap="true" valign="middle">Cheque DATE<img src="/ibase/webitm/images/small_sort.gif"/></th> <th class = "thClass" nowrap="true" valign="middle">Cheque DATE<img src="/ibase/webitm/images/small_sort.gif"/></th>
<th class = "thClass" nowrap="true" valign="middle">Amount(BC)<img src="/ibase/webitm/images/small_sort.gif"/></th> <th class = "thClass" nowrap="true" valign="middle">Amount(BC)<img src="/ibase/webitm/images/small_sort.gif"/></th>
<th class = "thClass" nowrap="true" valign="middle">Currency Code<img src="/ibase/webitm/images/small_sort.gif"/></th> <th class = "thClass" nowrap="true" valign="middle">Currency Code<img src="/ibase/webitm/images/small_sort.gif"/></th>
<th class = "thClass" nowrap="true" valign="middle">Amount<img src="/ibase/webitm/images/small_sort.gif"/></th> <th class = "thClass" nowrap="true" valign="middle">Amount<img src="/ibase/webitm/images/small_sort.gif"/></th>
<th class = "thClass" nowrap="true" valign="middle">Tran Type<img src="/ibase/webitm/images/small_sort.gif"/></th> <th class = "thClass" nowrap="true" valign="middle">Tran Type<img src="/ibase/webitm/images/small_sort.gif"/></th>
<th class = "thClass" nowrap="true" valign="middle">Tran Id<img src="/ibase/webitm/images/small_sort.gif"/></th> <th class = "thClass" nowrap="true" valign="middle">Tran Id<img src="/ibase/webitm/images/small_sort.gif"/></th>
<th class = "thClass" nowrap="true" valign="middle">Payment Mode<img src="/ibase/webitm/images/small_sort.gif"/></th> <th class = "thClass" nowrap="true" valign="middle">Payment Mode<img src="/ibase/webitm/images/small_sort.gif"/></th>
...@@ -409,93 +435,40 @@ thead { ...@@ -409,93 +435,40 @@ thead {
<th class = "thClass" nowrap="true" valign="middle">Statement NO<img src="/ibase/webitm/images/small_sort.gif"/></th> <th class = "thClass" nowrap="true" valign="middle">Statement NO<img src="/ibase/webitm/images/small_sort.gif"/></th>
<th class = "thClass" nowrap="true" valign="middle">Statement Date<img src="/ibase/webitm/images/small_sort.gif"/></th> <th class = "thClass" nowrap="true" valign="middle">Statement Date<img src="/ibase/webitm/images/small_sort.gif"/></th>
<th class = "thClass" nowrap="true" valign="middle">Adj Amt<img src="/ibase/webitm/images/small_sort.gif"/></th> <th class = "thClass" nowrap="true" valign="middle">Adj Amt<img src="/ibase/webitm/images/small_sort.gif"/></th>
<!-- <th class = "thClass" nowrap="true" valign="middle">Amount Adjusted<img src="/ibase/webitm/images/small_sort.gif"/></th> -->
<th class = "thClass" nowrap="true" valign="middle">Status<img src="/ibase/webitm/images/small_sort.gif"/></th> <th class = "thClass" nowrap="true" valign="middle">Status<img src="/ibase/webitm/images/small_sort.gif"/></th>
<th class = "thClass" nowrap="true" valign="middle">Exchange Rate<img src="/ibase/webitm/images/small_sort.gif"/></th> <th class = "thClass" nowrap="true" valign="middle">Exchange Rate<img src="/ibase/webitm/images/small_sort.gif"/></th>
<!-- <th class = "thClass" nowrap="true" valign="middle">FIN Entity<img src="/ibase/webitm/images/small_sort.gif"/></th> -->
<th class = "thClass" nowrap="true" valign="middle">Site Code<img src="/ibase/webitm/images/small_sort.gif"/></th> <th class = "thClass" nowrap="true" valign="middle">Site Code<img src="/ibase/webitm/images/small_sort.gif"/></th>
</tr> </tr>
</thead> </thead>
<xsl:for-each select="Root/Detail2/Detail"> <xsl:for-each select="Root/Detail2/Detail">
<xsl:variable name="cnt" select="position()" /> <xsl:variable name="cnt" select="position()" />
<xsl:variable name="ref_no"><xsl:value-of select="ref_no"/></xsl:variable>
<xsl:variable name="amt_bc"><xsl:value-of select="amt_bc"/></xsl:variable>
<xsl:variable name="curr_code"><xsl:value-of select="curr_code"/></xsl:variable>
<xsl:variable name="amt_bs"><xsl:value-of select="amt_bs"/></xsl:variable>
<xsl:variable name="ref_no"> <xsl:variable name="tran_type"><xsl:value-of select="tran_type"/></xsl:variable>
<xsl:value-of select="ref_no"/> <xsl:variable name="tran_id"><xsl:value-of select="tran_id"/></xsl:variable>
</xsl:variable> <xsl:variable name="ref_mode"><xsl:value-of select="ref_mode"/></xsl:variable>
<xsl:variable name="amt_bc"> <xsl:variable name="eff_date"><xsl:value-of select="eff_date"/></xsl:variable>
<xsl:value-of select="amt_bc"/> <xsl:variable name="stat_no"><xsl:value-of select="stat_no"/></xsl:variable>
</xsl:variable> <xsl:variable name="stat_date"><xsl:value-of select="stat_date"/></xsl:variable>
<xsl:variable name="curr_code"> <xsl:variable name="amt_adj"><xsl:value-of select="amt_adj"/></xsl:variable>
<xsl:value-of select="curr_code"/> <xsl:variable name="status"><xsl:value-of select="status"/></xsl:variable>
</xsl:variable> <xsl:variable name="exch_rate"><xsl:value-of select="exch_rate"/></xsl:variable>
<xsl:variable name="amt_bs"> <xsl:variable name="ref_date"><xsl:value-of select="ref_date"/></xsl:variable>
<xsl:value-of select="amt_bs"/> <xsl:variable name="tran_name"><xsl:value-of select="tran_name"/></xsl:variable>
</xsl:variable> <xsl:variable name="site_code"><xsl:value-of select="site_code"/></xsl:variable>
<xsl:variable name="tran_type">
<xsl:value-of select="tran_type"/>
</xsl:variable>
<xsl:variable name="tran_id">
<xsl:value-of select="tran_id"/>
</xsl:variable>
<xsl:variable name="ref_mode">
<xsl:value-of select="ref_mode"/>
</xsl:variable>
<xsl:variable name="eff_date">
<xsl:value-of select="eff_date"/>
</xsl:variable>
<xsl:variable name="stat_no">
<xsl:value-of select="stat_no"/>
</xsl:variable>
<xsl:variable name="stat_date">
<xsl:value-of select="stat_date"/>
</xsl:variable>
<xsl:variable name="amt_adj">
<xsl:value-of select="amt_adj"/>
</xsl:variable>
<xsl:variable name="status">
<xsl:value-of select="status"/>
</xsl:variable>
<xsl:variable name="exch_rate">
<xsl:value-of select="exch_rate"/>
</xsl:variable>
<xsl:variable name="ref_date">
<xsl:value-of select="ref_date"/>
</xsl:variable>
<xsl:variable name="tran_name">
<xsl:value-of select="tran_name"/>
</xsl:variable>
<xsl:if test="$tran_name = 'bankStatement'"> <xsl:if test="$tran_name = 'bankStatement'">
<tr> <tr>
<td class="td_leftAlign"><div class="dcheckBox"><input type="checkbox" name="checkbox1" value="{$cnt}" /></div></td> <td class="td_leftAlign"><div class="dcheckBox"><input type="checkbox" name="checkbox1" value="{$cnt}" /></div></td>
<td class="td_leftAlign" align="left"><div id="ref_no{$cnt}" class="drEFNo"><xsl:value-of select="ref_no"/></div></td> <td class="td_leftAlign" align="left"><div id="ref_no{$cnt}" class="drEFNo" style ="width:120px"><xsl:value-of select="ref_no"/></div></td>
<td class="td_leftAlign" align="left"><div id="ref_date{$cnt}" class="dtREFDATE"><xsl:value-of select="ref_date"/></div></td> <td class="td_leftAlign" align="left"><div id="ref_date{$cnt}" class="dtREFDATE"><xsl:value-of select="ref_date"/></div></td>
<td class="td_leftAlign" align="right"><div id="amt_bc{$cnt}" class="dcRAMT"><xsl:value-of select="amt_bc"/></div></td> <td class="td_leftAlign" align="right"><div id="amt_bc{$cnt}" class="dcRAMT"><xsl:value-of select="amt_bc"/></div></td>
<td class="td_leftAlign" align="left"><div id="curr_code{$cnt}" class="ddRAMT"><xsl:value-of select="curr_code"/></div></td> <td class="td_leftAlign" align="left"><div id="curr_code{$cnt}" class="ddRAMT"><xsl:value-of select="curr_code"/></div></td>
<td class="td_leftAlign" align="left"><div id="amt_bs{$cnt}" class="dcRAMT"><xsl:value-of select="amt_bs"/></div></td> <td class="td_leftAlign" align="left"><div id="amt_bs{$cnt}" class="dcRAMT"><xsl:value-of select="amt_bs"/></div></td>
<td class="td_leftAlign" align="left"><div id="tran_type{$cnt}" class="dcURRCODE"><xsl:value-of select="tran_type"/></div></td> <td class="td_leftAlign" align="left"><div id="tran_type{$cnt}" class="dcURRCODE"><xsl:value-of select="tran_type"/></div></td>
<td class="td_leftAlign" align="left"><div id="tran_id{$cnt}" class="deXCHRATE"><xsl:value-of select="tran_id"/></div></td> <td class="td_leftAlign" align="left"><div id="tran_id{$cnt}" class="deXCHRATE"><xsl:value-of select="tran_id"/></div></td>
<td class="td_leftAlign" align="left"><div id="ref_mode{$cnt}" class="dfINENTITY"><xsl:value-of select="ref_mode"/></div></td> <td class="td_leftAlign" align="left"><div id="ref_mode{$cnt}" class="dfINENTITY"><xsl:value-of select="ref_mode"/></div></td>
...@@ -503,67 +476,36 @@ thead { ...@@ -503,67 +476,36 @@ thead {
<td class="td_leftAlign" align="left"><div id="stat_no{$cnt}" class="drEFSER"><xsl:value-of select="stat_no"/></div></td> <td class="td_leftAlign" align="left"><div id="stat_no{$cnt}" class="drEFSER"><xsl:value-of select="stat_no"/></div></td>
<td class="td_leftAlign" align="left"><div id="stat_date{$cnt}" class="drEFSER"><xsl:value-of select="stat_date"/></div></td> <td class="td_leftAlign" align="left"><div id="stat_date{$cnt}" class="drEFSER"><xsl:value-of select="stat_date"/></div></td>
<td class="td_leftAlign" align="left"><div id="amt_adj{$cnt}" class="dcRAMT"><xsl:value-of select="amt_adj"/></div></td> <td class="td_leftAlign" align="left"><div id="amt_adj{$cnt}" class="dcRAMT"><xsl:value-of select="amt_adj"/></div></td>
<!-- <td class="td_leftAlign" align="right"><div id="amt_adj{$cnt}" class="dcRAMT"><xsl:value-of select="amt_adj"/></div></td> -->
<td class="td_leftAlign" align="left"><div id="status{$cnt}" class="dtRANDATE"><xsl:value-of select="status"/></div></td> <td class="td_leftAlign" align="left"><div id="status{$cnt}" class="dtRANDATE"><xsl:value-of select="status"/></div></td>
<td class="td_leftAlign" align="left"><div id="exch_rate{$cnt}" class="dsUNDRYTYPE"><xsl:value-of select="exch_rate"/></div></td> <td class="td_leftAlign" align="left"><div id="exch_rate{$cnt}" class="dsUNDRYTYPE"><xsl:value-of select="exch_rate"/></div></td>
<!-- <td class="hide" align="left"><div id="tran_name{$cnt}" class="dsUNDRYTYPE"><xsl:value-of select="tran_name"/></div></td> --> <td align="left" class="td_leftAlign"><div id="tran_type{$cnt}" class="dcURRCODE"><xsl:value-of select="/Root/Detail1/site_code"/></div></td>
<td class="td_leftAlign" align="left"><div id="tran_type{$cnt}" class="dcURRCODE"> <xsl:value-of select="/Root/Detail1/site_code"/></div></td>
</tr> </tr>
</xsl:if> </xsl:if >
<tr/>
<!-- <xsl:if test="$sitecode != $site_code_fr">
<tr>
<td class="hide" align="center" colspan="15"></td>
</tr>
</xsl:if> -->
</xsl:for-each> </xsl:for-each>
</table> </table>
<xsl:for-each select="Root/Detail2/Detail"><xsl:variable name="cnt" select="position()" /><xsl:variable name="tran_name"><xsl:value-of select="tran_name"/></xsl:variable>
<xsl:for-each select="Root/Detail2/Detail"> <table border="0" >
<xsl:variable name="cnt" select="position()" />
<xsl:variable name="tran_name">
<xsl:value-of select="tran_name"/>
</xsl:variable>
<table border="1" >
<xsl:if test="$tran_name = 'bankStatement'"> <xsl:if test="$tran_name = 'bankStatement'">
<tr> <tr>
<td class="hide" align="left"><div id="tran_name{$cnt}" class="dfINENTITY"><xsl:value-of select="tran_name"/></div></td> <td class="hide" align="left"><div id="tran_name{$cnt}" class="dfINENTITY"><xsl:value-of select="tran_name"/></div></td>
</tr> </tr>
</xsl:if> </xsl:if>
</table> </table>
</xsl:for-each>
</xsl:for-each>
</div>
<!-- hidden field added,end --> <!-- hidden field added,end -->
</div>
<!-- <xsl:variable name="cnt" select="0" /> --> <!-- <xsl:variable name="cnt" select="0" /> -->
<div id ="left_menu_l"> <div id ="left_menu_l">
<table border="0" style="width: 530px;" cellspacing="1" cellpadding="1">
<table border="1" style="width: 520px;" cellspacing="1" cellpadding="1">
<tr> <tr>
<td colspan="24" class="header_td" nowrap="true" align="left"><div class="detaildiv"><b>Bank Transaction - <xsl:value-of select="/Root/Detail1/bank_descr"/></b></div></td> <td colspan="24" class="header_td" nowrap="true" align="left"><div class="detaildiv"><b>Bank Transaction - <xsl:value-of select="/Root/Detail1/bank_descr"/></b></div></td>
</tr> </tr>
</table> </table>
<table border="0" style="width: 520px;" cellspacing="1" cellpadding="1" id="toSiteTable" class = "tableClass" > <table border="0" style="width: 560px;" cellspacing="1" cellpadding="1" id="toSiteTable" class = "tableClass" >
<thead class="table-head"> <thead class="table-head">
...@@ -576,19 +518,19 @@ thead { ...@@ -576,19 +518,19 @@ thead {
<th class = "thClass" nowrap="true" valign="middle">Amount(BC)<img src="/ibase/webitm/images/small_sort.gif"/></th> <th class = "thClass" nowrap="true" valign="middle">Amount(BC)<img src="/ibase/webitm/images/small_sort.gif"/></th>
<th class = "thClass" nowrap="true" valign="middle">Currency Code<img src="/ibase/webitm/images/small_sort.gif"/></th> <th class = "thClass" nowrap="true" valign="middle">Currency Code<img src="/ibase/webitm/images/small_sort.gif"/></th>
<th class = "thClass" nowrap="true" valign="middle">Amount<img src="/ibase/webitm/images/small_sort.gif"/></th> <th class = "thClass" nowrap="true" valign="middle">Amount<img src="/ibase/webitm/images/small_sort.gif"/></th>
<th class = "thClass" nowrap="true" valign="middle">Tran Type<img src="/ibase/webitm/images/small_sort.gif"/></th> <th class = "thClass" nowrap="true" valign="middle">Tran Type<img src="/ibase/webitm/images/small_sort.gif"/></th>
<th class = "thClass" nowrap="true" valign="middle" style="width: 150px;">Tran Id<img src="/ibase/webitm/images/small_sort.gif"/></th> <th class = "thClass" nowrap="true" valign="middle">Tran Id<img src="/ibase/webitm/images/small_sort.gif"/></th>
<th class = "thClass" nowrap="true" valign="middle">Payment Mode<img src="/ibase/webitm/images/small_sort.gif"/></th> <th class = "thClass" nowrap="true" valign="middle">Payment Mode<img src="/ibase/webitm/images/small_sort.gif"/></th>
<th class = "thClass" nowrap="true" valign="middle" style="width: 115px;">acct_code<img src="/ibase/webitm/images/small_sort.gif"/></th> <th class = "thClass" nowrap="true" valign="middle">Acct_code<img src="/ibase/webitm/images/small_sort.gif"/></th>
<th class = "thClass" nowrap="true" valign="middle">cctr_code<img src="/ibase/webitm/images/small_sort.gif"/></th> <th class = "thClass" nowrap="true" valign="middle">Cctr_code<img src="/ibase/webitm/images/small_sort.gif"/></th>
<th class = "thClass" nowrap="true" valign="middle">sundry_code<img src="/ibase/webitm/images/small_sort.gif"/></th> <th class = "thClass" nowrap="true" valign="middle">Sundry_code<img src="/ibase/webitm/images/small_sort.gif"/></th>
<th class = "thClass" nowrap="true" valign="middle">Adj Amt<img src="/ibase/webitm/images/small_sort.gif"/></th> <th class = "thClass" nowrap="true" valign="middle">Adj Amt<img src="/ibase/webitm/images/small_sort.gif"/></th>
<!--<th class = "thClass" nowrap="true" valign="middle">Amount Adjusted<img src="/ibase/webitm/images/small_sort.gif"/></th> --> <!--<th class = "thClass" nowrap="true" valign="middle">Amount Adjusted<img src="/ibase/webitm/images/small_sort.gif"/></th> -->
<th class = "thClass" nowrap="true" valign="middle">Status<img src="/ibase/webitm/images/small_sort.gif"/></th> <th class = "thClass" nowrap="true" valign="middle">Status<img src="/ibase/webitm/images/small_sort.gif"/></th>
<th class = "thClass" nowrap="true" valign="middle">Exchange Rate<img src="/ibase/webitm/images/small_sort.gif"/></th> <th class = "thClass" nowrap="true" valign="middle">Exchange Rate<img src="/ibase/webitm/images/small_sort.gif"/></th>
<!-- <th class = "thClass" nowrap="true" valign="middle">FIN Entity<img src="/ibase/webitm/images/small_sort.gif"/></th> --> <!-- <th class = "thClass" nowrap="true" valign="middle">FIN Entity<img src="/ibase/webitm/images/small_sort.gif"/></th> -->
<th class = "thClass" nowrap="true" valign="middle">Site Code<img src="/ibase/webitm/images/small_sort.gif"/></th> <th class = "thClass" nowrap="true" valign="middle">Site Code<img src="/ibase/webitm/images/small_sort.gif"/></th>
<!--<th class = "thClass" nowrap="true" valign="middle">Bank Code<img src="/ibase/webitm/images/small_sort.gif"/></th>-->
</tr> </tr>
...@@ -613,9 +555,9 @@ thead { ...@@ -613,9 +555,9 @@ thead {
<xsl:variable name="amt_bc"> <xsl:variable name="amt_bc">
<xsl:value-of select="amt_bc"/> <xsl:value-of select="amt_bc"/>
</xsl:variable> </xsl:variable>
<xsl:variable name="remarks"> <!--<xsl:variable name="remarks">
<xsl:value-of select="remarks"/> <xsl:value-of select="remarks"/>
</xsl:variable> </xsl:variable>-->
<xsl:variable name="curr_code"> <xsl:variable name="curr_code">
<xsl:value-of select="curr_code"/> <xsl:value-of select="curr_code"/>
</xsl:variable> </xsl:variable>
...@@ -631,12 +573,12 @@ thead { ...@@ -631,12 +573,12 @@ thead {
<xsl:variable name="site_code"> <xsl:variable name="site_code">
<xsl:value-of select="site_code"/> <xsl:value-of select="site_code"/>
</xsl:variable> </xsl:variable>
<xsl:variable name="ref_ser_bt"> <!--<xsl:variable name="ref_ser_bt">
<xsl:value-of select="ref_ser_bt"/> <xsl:value-of select="ref_ser_bt"/>
</xsl:variable> </xsl:variable>-->
<xsl:variable name="ref_tran_no"> <!--<xsl:variable name="ref_tran_no">
<xsl:value-of select="ref_tran_no"/> <xsl:value-of select="ref_tran_no"/>
</xsl:variable> </xsl:variable>-->
<xsl:variable name="acct_code"> <xsl:variable name="acct_code">
<xsl:value-of select="acct_code"/> <xsl:value-of select="acct_code"/>
</xsl:variable> </xsl:variable>
...@@ -646,9 +588,9 @@ thead { ...@@ -646,9 +588,9 @@ thead {
<xsl:variable name="sundry_code"> <xsl:variable name="sundry_code">
<xsl:value-of select="sundry_code"/> <xsl:value-of select="sundry_code"/>
</xsl:variable> </xsl:variable>
<xsl:variable name="status"> <!--<xsl:variable name="status">
<xsl:value-of select="status"/> <xsl:value-of select="status"/>
</xsl:variable> </xsl:variable>-->
<xsl:variable name="exch_rate"> <xsl:variable name="exch_rate">
<xsl:value-of select="exch_rate"/> <xsl:value-of select="exch_rate"/>
</xsl:variable> </xsl:variable>
...@@ -666,6 +608,12 @@ thead { ...@@ -666,6 +608,12 @@ thead {
<xsl:variable name="tran_type"> <xsl:variable name="tran_type">
<xsl:value-of select="tran_type"/> <xsl:value-of select="tran_type"/>
</xsl:variable> </xsl:variable>
<!--<xsl:variable name="site_code">
<xsl:value-of select="site_code"/>
</xsl:variable>-->
<!--<xsl:variable name="bank_code">
<xsl:value-of select="bank_code"/>
</xsl:variable>-->
...@@ -678,7 +626,7 @@ thead { ...@@ -678,7 +626,7 @@ thead {
<tr> <tr>
<td class="td_leftAlign"><div class="dcheckBox"><input type="checkbox" name="checkbox1" value="{$cnt}" /></div></td> <td class="td_leftAlign"><div class="dcheckBox"><input type="checkbox" name="checkbox1" value="{$cnt}" /></div></td>
<!-- <td class="td_leftAlign" align="left"><div id="tran_name{$cnt}" class="drEFID"><xsl:value-of select="tran_name"/></div></td> --> <!-- <td class="td_leftAlign" align="left"><div id="tran_name{$cnt}" class="drEFID"><xsl:value-of select="tran_name"/></div></td> -->
<td class="td_leftAlign" align="left"><div id="ref_no{$cnt}" class="ddRAMT"><xsl:value-of select="ref_no"/></div></td> <td class="td_leftAlign" align="left"><div id="ref_no{$cnt}" class="ddRAMT" style ="width:120px"><xsl:value-of select="ref_no"/></div></td>
<td class="td_leftAlign" align="left"><div id="ref_date{$cnt}" class="dtREFDATE"><xsl:value-of select="ref_date"/></div></td> <td class="td_leftAlign" align="left"><div id="ref_date{$cnt}" class="dtREFDATE"><xsl:value-of select="ref_date"/></div></td>
<td class="td_leftAlign" align="right"><div id="amt_bc{$cnt}" class="dcRAMT"><xsl:value-of select="amt_bc"/></div></td> <td class="td_leftAlign" align="right"><div id="amt_bc{$cnt}" class="dcRAMT"><xsl:value-of select="amt_bc"/></div></td>
<td class="td_leftAlign" align="left"><div id="curr_code{$cnt}" class="deXCHRATE"><xsl:value-of select="curr_code"/></div></td> <td class="td_leftAlign" align="left"><div id="curr_code{$cnt}" class="deXCHRATE"><xsl:value-of select="curr_code"/></div></td>
...@@ -695,7 +643,9 @@ thead { ...@@ -695,7 +643,9 @@ thead {
<td class="td_leftAlign" align="left"><div id="amt_adj{$cnt}" class="dcRAMT"><xsl:value-of select="amt_adj"/></div></td> <td class="td_leftAlign" align="left"><div id="amt_adj{$cnt}" class="dcRAMT"><xsl:value-of select="amt_adj"/></div></td>
<td class="td_leftAlign" align="left"><div id="status{$cnt}" class="dtRANDATE"><xsl:value-of select="status"/></div></td> <td class="td_leftAlign" align="left"><div id="status{$cnt}" class="dtRANDATE"><xsl:value-of select="status"/></div></td>
<td class="td_leftAlign" align="left"><div id="exch_rate{$cnt}" class="dcRAMT" ><xsl:value-of select="exch_rate"/></div></td> <td class="td_leftAlign" align="left"><div id="exch_rate{$cnt}" class="dcRAMT" ><xsl:value-of select="exch_rate"/></div></td>
<td class="td_leftAlign" align="left"><div id="tran_type{$cnt}" class="dcURRCODE"> <xsl:value-of select="/Root/Detail1/site_code"/></div></td> <td class="td_leftAlign" align="left"><div id="site_code_det" class="dcURRCODE"> <xsl:value-of select="site_code"/></div></td>
<!--<td class="td_leftAlign" align="left"><div id="bank_code_det" class="dcURRCODE"> <xsl:value-of select="bank_code"/></div></td>-->
...@@ -730,7 +680,7 @@ thead { ...@@ -730,7 +680,7 @@ thead {
</xsl:variable> </xsl:variable>
<xsl:if test="$tran_name = 'bankTransaction'"> <xsl:if test="$tran_name = 'bankTransaction'">
<table border="1"> <table border="0">
<tr> <tr>
<td class="hide" align="left"><div id="tran_name{$cnt}" class="dsITECODE"><xsl:value-of select="tran_name"/></div></td> <td class="hide" align="left"><div id="tran_name{$cnt}" class="dsITECODE"><xsl:value-of select="tran_name"/></div></td>
...@@ -740,17 +690,6 @@ thead { ...@@ -740,17 +690,6 @@ thead {
</xsl:if> </xsl:if>
</xsl:for-each> </xsl:for-each>
</div> </div>
<xsl:variable name="cnt" select="0" /> <xsl:variable name="cnt" select="0" />
</xsl:if> </xsl:if>
......
webitm-fin/module-resource/Xsl/bank_reconciliation_wiz3_wiz_en_US_A.xsl
View file @ 86cceafe
...@@ -176,7 +176,7 @@ ...@@ -176,7 +176,7 @@
</style> </style>
<form name = "Wizard_Travel" METHOD="post" ACTION="/ibase/ITMWizardHandlerServlet" onSubmit="javascript:return validatePlace('2');"> <form name = "Wizard_Travel" METHOD="post" ACTION="/ibase/ITMWizardHandlerServlet" onSubmit="{javascript:return validatePlace('2');} {return false;}">
<!-- <xmp><xsl:copy-of select="*"/></xmp> --> <!-- <xmp><xsl:copy-of select="*"/></xmp> -->
<xsl:variable name="from_tran_date"><xsl:value-of select="/Root/Detail1/from_tran_date"/></xsl:variable> <xsl:variable name="from_tran_date"><xsl:value-of select="/Root/Detail1/from_tran_date"/></xsl:variable>
<xsl:variable name="to_tran_date"><xsl:value-of select="/Root/Detail1/to_tran_date"/></xsl:variable> <xsl:variable name="to_tran_date"><xsl:value-of select="/Root/Detail1/to_tran_date"/></xsl:variable>
......
webitm-fin/module-resource/css/ResolFixedTableHeader.css
View file @ 86cceafe
...@@ -33,28 +33,29 @@ ...@@ -33,28 +33,29 @@
{ {
border-collapse: collapse; border-collapse: collapse;
padding: 2px 4px; padding: 2px 4px;
word-wrap: break-word; word-wrap: normal;
border: 1px solid; border: 1px solid;
border-top-width: 0px; border-top-width: 0px;
border-left-width: 0px!important; border-left-width: 0px!important;
border-right-width: 1px; border-right-width: 1px;
border-bottom-width: 1px; border-bottom-width: 1px;
overflow:hidden; overflow:hidden;
word-wrap: break-word; word-wrap: normal;
border-color: #fff ; border-color: #fff ;
} }
.ft_container table tr td .ft_container table tr td
{ {
width : 100%!important;
border-collapse: collapse; border-collapse: collapse;
padding: 2px 4px; padding: 2px 4px;
word-wrap: break-word; word-wrap: normal;
/* border-top-width: 1px; */ /* border-top-width: 1px; */
border-left: 1px solid #fff; border-left: 1px solid #fff;
/* border-right-width: 1px; */ /* border-right-width: 1px; */
border-bottom: 1px solid #fff; border-bottom: 1px solid #fff;
overflow:hidden; overflow:hidden;
word-wrap: break-word; word-wrap: normal;
font-weight: normal !important; font-weight: normal !important;
color: #000 !important; color: #000 !important;
} }
......
webitm-fin/module-resource/js/BankRecoWiz.js
View file @ 86cceafe
...@@ -20,7 +20,7 @@ function finishAction( value , frm) ...@@ -20,7 +20,7 @@ function finishAction( value , frm)
var siteCode=document.getElementById("site_code").value; var siteCode=document.getElementById("site_code").value;
//alert("siteCode :"+siteCode); //alert("siteCode :"+siteCode);
var bankCode=document.getElementById("bank_code").value; var bankCode=document.getElementById("bank_code").value;
//alert("bankCode :"+bankCode);
/*var chgUser=document.getElementById("chg_user").value; /*var chgUser=document.getElementById("chg_user").value;
alert("chgUser :"+chgUser); alert("chgUser :"+chgUser);
var chgTerm=document.getElementById("chg_term").value; var chgTerm=document.getElementById("chg_term").value;
...@@ -55,70 +55,123 @@ function finishAction( value , frm) ...@@ -55,70 +55,123 @@ function finishAction( value , frm)
} else { } else {
return false; return false;
}*/ }*/
} }
function flterAction( value , frm) function flterAction( value, frm)
{ {
document.getElementById("action").value = value; document.getElementById("action").value = value;
console.log("value:::" + value);
var filterData = document.getElementById("filterData").value; var filterData = document.getElementById("filterData").value;
//alert("filterData :"+filterData); //alert("filterData :"+filterData);
var filterList = document.getElementById("filterList").value; var filterList = document.getElementById("filterList").value;
//alert("filterList :"+filterList); console.log("filterList :"+filterList);
var fromDate = document.getElementById("from_date").value;
console.log("::from date:: " + fromDate);
if(filterData.trim().length > 0) var toDate = document.getElementById("to_date").value;
{ console.log("::to date:: " + toDate);
fromDate = fromDate == null ? "" : fromDate;
toDate = toDate == null ? "" : toDate;
if( fromDate.length > 0 && toDate.length ==0){
alert("Please enter to date");
}
if( fromDate.length == 0 && toDate.length > 0){
alert("Please enter from date");
}
var frDt = new Date(fromDate);
console.log("formatted from date ::: " + frDt)
var toDt = new Date(toDate);
console.log("formatted to date ::: " + toDt)
if(filterData.trim().length > 0 && filterList !== "none")
{
var samplItem = []; var samplItem = [];
var method = "post"; var method = "post";
var path="/ibase/webitm/jsp/BankRecoFilterWiz.jsp"; var path="/ibase/webitm/jsp/BankRecoFilterWiz.jsp";
var bankCode=document.getElementById("bank_code").value; var bankCode=document.getElementById("bank_code").value;
//alert("bankCode :"+bankCode); if(bankCode.length == 0){
/* var toTranDt=document.getElementById("to_tran_date").value; var bankCode=document.getElementById("bank_code_new").value;
var siteCodeFr=document.getElementById("site_code_fr").value; }
var siteCodeTo= document.getElementById("site_code_to").value; var siteCode = document.getElementById("site_code").value;
var chgUser=document.getElementById("chg_user").value;
var chgTerm=document.getElementById("chg_term").value;
var sundryTypeFr=document.getElementById("sundry_type_fr").value;
var sundryTypeTo= document.getElementById("sundry_type_to").value;
var sundryCodeFr=document.getElementById("sundry_code_fr").value;
var sundryCodeTo= document.getElementById("sundry_code_to").value;
var sundryCodeTo= document.getElementById("sundry_code_to").value;*/
/* var siteCodeFrDescr= document.getElementById("site_code_fr_descr").value; if(siteCode.length == 0){
var siteCodeToDescr= document.getElementById("site_code_to_descr").value;*/ var siteCode=document.getElementById("site_code_new").value;
//alert("sundryCodeTo :"+sundryCodeTo); }
console.log("bank code ::" + bankCode);
console.log("site code ::" + siteCode);
var valueXmlString = " <?xml version = \"1.0\"?> <Root> <header> <editFlag> "; var valueXmlString = " <?xml version = \"1.0\"?> <Root> <header> <editFlag> ";
valueXmlString += " </editFlag> </header> "; valueXmlString += " </editFlag> </header> ";
valueXmlString += " <Detail1>"; valueXmlString += " <Detail1>";
valueXmlString += " <bank_code>"+bankCode+"</bank_code> "; valueXmlString += " <bank_code>"+bankCode+"</bank_code> ";
valueXmlString += " <site_code>"+siteCode+"</site_code> ";
valueXmlString += " <filter_data>"+filterData+"</filter_data> "; valueXmlString += " <filter_data>"+filterData+"</filter_data> ";
valueXmlString += " <filter_list>"+filterList+"</filter_list> "; valueXmlString += " <filter_list>"+filterList+"</filter_list> ";
/*valueXmlString += " <to_tran_date>"+toTranDt+"</to_tran_date> "; valueXmlString += " <fr_date>"+fromDate+"</fr_date> ";
valueXmlString += " <site_code_fr>"+siteCodeFr+"</site_code_fr> "; valueXmlString += " <to_dt>"+toDate+"</to_dt> ";
valueXmlString += " <site_code_to>"+siteCodeTo+"</site_code_to> "; valueXmlString += " </Detail1> ";
valueXmlString += " <chg_user>"+chgUser+"</chg_user> "; //valueXmlString += getXMLDataValues(frm);
valueXmlString += " <chg_term>"+chgTerm+"</chg_term> "; valueXmlString += " </Root> ";
valueXmlString += " <sundry_type_fr>"+sundryTypeFr+"</sundry_type_fr> ";
valueXmlString += " <sundry_type_to>"+sundryTypeTo+"</sundry_type_to> "; samplItem["SAVE_SAMPLE_DATA"] = valueXmlString;
valueXmlString += " <sundry_code_fr>"+sundryCodeFr+"</sundry_code_fr> "; samplItem["RECONCILETYPE"] = reconciletype;
valueXmlString += " <sundry_code_to>"+sundryCodeTo+"</sundry_code_to> ";
post_to_url5(path, samplItem, method);
}else if(filterList == "none"){
if(filterData.trim().length >0) {
alert("Filter value should be blank");
}
var samplItem = [];
var method = "post";
var path="/ibase/webitm/jsp/BankRecoFilterWiz.jsp";
var bankCode=document.getElementById("bank_code").value;
if(bankCode.length == 0){
var bankCode=document.getElementById("bank_code_new").value;
}
var siteCode = document.getElementById("site_code").value;
if(siteCode.length == 0){
var siteCode=document.getElementById("site_code_new").value;
}
console.log("bank code ::" + bankCode);
console.log("site code ::" + siteCode);
var valueXmlString = " <?xml version = \"1.0\"?> <Root> <header> <editFlag> ";
valueXmlString += " </editFlag> </header> ";
valueXmlString += " <Detail1>";
valueXmlString += " <bank_code>"+bankCode+"</bank_code> ";
valueXmlString += " <site_code>"+siteCode+"</site_code> ";
valueXmlString += " <filter_data>"+filterData+"</filter_data> "; valueXmlString += " <filter_data>"+filterData+"</filter_data> ";
valueXmlString += " <filter_list>"+filterList+"</filter_list> "; valueXmlString += " <filter_list>"+filterList+"</filter_list> ";
valueXmlString += " <site_code_fr_descr>"+siteCodeFrDescr+"</site_code_fr_descr> "; valueXmlString += " <fr_date>"+fromDate+"</fr_date> ";
valueXmlString += " <site_code_to_descr>"+siteCodeToDescr+"</site_code_to_descr> ";*/ valueXmlString += " <to_dt>"+toDate+"</to_dt> ";
valueXmlString += " </Detail1> "; valueXmlString += " </Detail1> ";
valueXmlString += getXMLDataValues(frm); //valueXmlString += getXMLDataValues(frm);
valueXmlString += " </Root> "; valueXmlString += " </Root> ";
samplItem["SAVE_SAMPLE_DATA"] = valueXmlString; samplItem["SAVE_SAMPLE_DATA"] = valueXmlString;
samplItem["RECONCILETYPE"] = reconciletype; samplItem["RECONCILETYPE"] = reconciletype;
post_to_url5(path, samplItem, method); post_to_url5(path, samplItem, method);
} }
else if(filterList == "amt_bc" && filterData.trim().length == 0) else if(filterList == "amt_bc" && filterData.trim().length == 0)
{ {
...@@ -132,27 +185,12 @@ function flterAction( value , frm) ...@@ -132,27 +185,12 @@ function flterAction( value , frm)
{ {
alert("Please enter cheque no"); alert("Please enter cheque no");
} }
/*else if(filterList == "BILL_NO" && filterData.trim().length == 0 ) if(frDt > toDt){
{
alert("Please enter BILL NO.");
}
else if(filterList == "DR_AMT" && filterData.trim().length == 0 )
{
alert("Please enter DR Amount");
}
else if(filterList == "CR_AMT" && filterData.trim().length == 0 )
{
alert("Please enter CR Amount");
}
else if(filterList == "SUNDRY-CODE" && filterData.trim().length == 0 )
{
alert("Please enter Sundry Code");
}
else if(filterList == "SUNDRY-TYPE" && filterData.trim().length == 0 )
{
alert("Please enter Sundry Type");
}*/
alert("From date cannot be future date");
}
return false;
} }
...@@ -378,7 +416,7 @@ function getCheckedValues(frm) { ...@@ -378,7 +416,7 @@ function getCheckedValues(frm) {
function getXMLDataValues(frm) function getXMLDataValues(frm)
{ {
console.log("form::: "+ frm);
var xmlData = "<Detail2>"; var xmlData = "<Detail2>";
var bankCode = document.getElementById("bank_code").value; var bankCode = document.getElementById("bank_code").value;
//var siteR = document.getElementById("site_code_to").value; //var siteR = document.getElementById("site_code_to").value;
...@@ -546,7 +584,7 @@ function getXMLDataValues(frm) ...@@ -546,7 +584,7 @@ function getXMLDataValues(frm)
returnValueStr = false; returnValueStr = false;
}*/ }*/
xmlData += "</Detail2>"; xmlData += "</Detail2>";
//alert("xmlData !!!!: " + xmlData); console.log("xmlData !!!!: " + xmlData);
return xmlData; return xmlData;
} }
...@@ -649,6 +687,7 @@ function post_to_url5(path, params, method) { ...@@ -649,6 +687,7 @@ function post_to_url5(path, params, method) {
document.body.appendChild(form); document.body.appendChild(form);
form.submit(); form.submit();
return false;
//alert("submit!!!"); //alert("submit!!!");
} }
webitm-fin/module-resource/js/resolFixedTableHeader.js
View file @ 86cceafe
...@@ -6,14 +6,21 @@ ...@@ -6,14 +6,21 @@
function fixedTableHdr(tableClass, thClass, callFrom) function fixedTableHdr(tableClass, thClass, callFrom)
{ {
console.log("tableclass::" + tableClass);
if (document.getElementsByClassName('tableClass') != null && document.getElementsByClassName('tableClass') != undefined) if (document.getElementsByClassName('tableClass') != null && document.getElementsByClassName('tableClass') != undefined)
{ {
var tableClassLen = document.getElementsByClassName('tableClass').length; var tableClassLen = document.getElementsByClassName('tableClass').length;
//var rows = tableClassLen.rows;
//if(rows.length > 0){
//var cells = rows[0].cells;
//}
//alert("tableClassLen :"+tableClassLen); //alert("tableClassLen :"+tableClassLen);
for (var i = 0; i < tableClassLen; i++) for (var i = 0; i < tableClassLen; i++)
//for (var i = 0; i < cells.length; i++)
{ {
var columnCount = document.getElementsByClassName('tableClass')[i].rows[0].cells.length; var columnCount = document.getElementsByClassName('tableClass')[i].rows[0].cells.length;
//var columnCount = cells[i].colSpan;
//alert("columnCount :"+columnCount); //alert("columnCount :"+columnCount);
......
webitm-fin/module-resource/js/sortable_table.js
View file @ 86cceafe
...@@ -164,6 +164,7 @@ sorttable = { ...@@ -164,6 +164,7 @@ sorttable = {
guessType: function(table, column) { guessType: function(table, column) {
// guess the type of a column based on its first non-blank row // guess the type of a column based on its first non-blank row
console.log("table:: " + table)
sortfn = sorttable.sort_alpha; sortfn = sorttable.sort_alpha;
for (var i=0; i<table.tBodies[0].rows.length; i++) { for (var i=0; i<table.tBodies[0].rows.length; i++) {
text = sorttable.getInnerText(table.tBodies[0].rows[i].cells[column]); text = sorttable.getInnerText(table.tBodies[0].rows[i].cells[column]);
......
webitm-fin/module-resource/jsp/BankRecoFilterWiz.jsp
View file @ 86cceafe
...@@ -23,6 +23,8 @@ ...@@ -23,6 +23,8 @@
//String htmlData = ( new ibase.webitm.utility.GenericUtility() ).transformToString( xslFileName, selectedSampleItems, CommonConstants.APPLICATION_CONTEXT + File.separator + "temp", "Output", ".html" ); //String htmlData = ( new ibase.webitm.utility.GenericUtility() ).transformToString( xslFileName, selectedSampleItems, CommonConstants.APPLICATION_CONTEXT + File.separator + "temp", "Output", ".html" );
// String htmlData = MRPWizardBean.getSalesPersSampleItemList( salesPers, strgCode, selectedItems, selectedSampleItems ); // String htmlData = MRPWizardBean.getSalesPersSampleItemList( salesPers, strgCode, selectedItems, selectedSampleItems );
String filterString = icrWizPrsSave.getFilterData(saveSampleData); String filterString = icrWizPrsSave.getFilterData(saveSampleData);
//String filterString = icrWizPrsSave.preSaveForm(saveSampleData,"filter","");
......
webitm-fin/module-resource/jsp/BankRecoWiz.jsp
View file @ 86cceafe
...@@ -134,7 +134,7 @@ ...@@ -134,7 +134,7 @@
//parent.window.close(); //parent.window.close();
//this.window.close(); //this.window.close();
alert("Only REFNO_DATE_AMT key allowed for multiple Reconcilation..!!"); alert("Selected criteria of reconciliation not allowed..!!");
window.history.back(); window.history.back();
//window.location = 'E12WizardPage.jsp?OBJ_NAME=bank_reconciliation_wiz&amp;FORM_NO=1'; //window.location = 'E12WizardPage.jsp?OBJ_NAME=bank_reconciliation_wiz&amp;FORM_NO=1';
......
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