Skip to content

B
business-java
Commit 72ddb8df authored by wansari's avatar wansari
Browse files
Options

D16JBAS001 updated XSL for new points 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@106043 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 06849fbd
Hide whitespace changes
Inline Side-by-side
Showing with 362 additions and 55 deletions
webitm-gst/module-resource/web/xsl/wizard/gstreco_wiz1_wiz_en_US_A.xsl
View file @ 72ddb8df
......@@ -11,6 +11,7 @@
<script type="text/javascript" src="/ibase/webitm/js/jquery-ui-1.10.4.custom.min.js"></script>
<link href="/ibase/webitm/css/jquery-ui-1.10.4.custom.min.css" rel="stylesheet"/>
<link type="text/css" rel="stylesheet" href="/ibase/webitm/css/htmlWizard.css"/>
<link href="/ibase/webitm/css/gstRecoWizard.css" rel="stylesheet"/>
<body>
<form name="gstWizFormI" id = "gstWizFormI" onkeypress="return event.keyCode != 13" METHOD="post" ACTION="/ibase/ITMWizardHandlerServlet" style="background-color: #f7f8fa;">
......@@ -88,15 +89,14 @@
<input type="hidden" id="app_context" value="false" />
<tr>
<td class="td_rightAlign" nowrap="true">
Period Code* :
Month* :
</td>
<td class="td_leftAlign" colspan = "3" nowrap="true">
<div style="width: 100%;">
<div style="width: 20%;float: left;">
<!-- <input type="text" class="input_editable" value="{$prd_code}" name="Detail1.{normalize-space($dbID)}.prd_code" id="Detail1.{normalize-space($dbID)}.prd_code" onblur="callItemChange('prd_code');" popupFldName="PRD_CODE" onkeyup="getAutoPopupData(this);" tabIndex="80" onfocus="displayPopUpIcon('popUpIcon1');" /> -->
<input type="text" class="input_editable" value="{$prd_code}" name="Detail1.{normalize-space($dbID)}.prd_code" id="Detail1.{normalize-space($dbID)}.prd_code" popupFldName="PRD_CODE" tabIndex="80" onfocus="displayPopUpIcon('popUpIcon1');" onkeyup="getAutoPopupData(this);"/>
<a href="javascript:getListOfValues('PRD_CODE','Detail1.{normalize-space($dbID)}.prd_code','TA821');" id="popUpIcon1" tabIndex="-1"><img src="/ibase/webitm/images/pophelp.png" style = "margin-bottom:-5px"/></a>
<a href="javascript:getListOfValues('PRD_CODE','Detail1.{normalize-space($dbID)}.prd_code','TA821');" id="popUpIcon1" tabIndex="-1"><img src="/ibase/webitm/images/pophelp.png" style = ""/></a>
</div>
</div>
</td>
......@@ -109,9 +109,9 @@
<td class="td_leftAlign" colspan = "3" nowrap="true">
<div style="width: 100%;">
<!-- <input type="text" class="input_editable" value="{$gtin}" name="Detail1.{normalize-space($dbID)}.gtin" id="Detail1.{normalize-space($dbID)}.gtin" onblur="callItemChange('gtin');" popupFldName="gtin" onkeyup="getAutoPopupData(this);" tabIndex="80" onfocus="displayPopUpIcon('popUpIcon2');" /> -->
<input type="text" class="input_editable" value="{$gstin}" name="Detail1.{normalize-space($dbID)}.gstin" id="Detail1.{normalize-space($dbID)}.gstin" popupFldName="gstin" tabIndex="80" onfocus="displayPopUpIcon('popUpIcon2');" onkeyup="getAutoPopupData(this);" />
<a href="javascript:getListOfValues('gstin','Detail1.{normalize-space($dbID)}.gstin','TA821');" id="popUpIcon2" tabIndex="-1"><img src="/ibase/webitm/images/pophelp.png" style = "margin-bottom:-5px" /></a>
<input type="text" value="{$gstin}" name="Detail1.{normalize-space($dbID)}.gstin" id="Detail1.{normalize-space($dbID)}.gstin" popupFldName="gstin" tabIndex="80" onkeyup="getAutoPopupData(this);"
class="editDisplayClass" maxlength="0" ISCHANGED="false" readOnly = "1" style = "width:25%;" />
<!-- <a href="javascript:getListOfValues('gstin','Detail1.{normalize-space($dbID)}.gstin','TA821');" id="popUpIcon2" tabIndex="-1"><img src="/ibase/webitm/images/pophelp.png" style = "margin-bottom:-5px" /></a> -->
</div>
</td>
</tr>
......
webitm-gst/module-resource/web/xsl/wizard/gstreco_wiz2_wiz_en_US_A.xsl
View file @ 72ddb8df
......@@ -7,7 +7,7 @@
<html>
<body>
<body onload="checkMisMatchCount();">
<script type="text/javascript" src="/ibase/webitm/js/gstRecoWizard.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-ui-1.10.4.custom.min.js"></script>
......@@ -17,14 +17,14 @@
<link href="/ibase/webitm/css/htmlWizard.css" rel="stylesheet"/>
<link href="/ibase/webitm/css/gstRecoWizard.css" rel="stylesheet"/>
<link href="/ibase/webitm/css/circle.css" rel="stylesheet"/>
<link href="/ibase/webitm/css/jquery.datetimepicker.css" rel="stylesheet"/>
<link href="/ibase/webitm/css/jquery-ui-1.10.4.custom.min.css" rel="stylesheet"/>
<!-- <link href="/ibase/webitm/css/jquery.datetimepicker.css" rel="stylesheet"/>
<link href="/ibase/webitm/css/jquery-ui-1.10.4.custom.min.css" rel="stylesheet"/> -->
<script>
<![CDATA[
$(function()
{
var acc = document.getElementsByClassName("accordion");
var acc = document.getElementsByClassName("accordionParent");
var i;
for (i = 0; i < acc.length; i++)
......@@ -87,6 +87,14 @@
e.preventDefault();
}
});
window.onclick = function (event)
{
if(!event.target.matches("#showDataMismatchTable"))
{
document.getElementById("showDataMismatch").style.display="none";
}
}
]]>
</script>
......@@ -100,7 +108,7 @@
<input type="hidden" Value="Select All" class="button" id="selectAllRow" onclick="selectAllRows();" style="float: right;margin-right:2px;"/>
</div><br/><br/>
<div id="innerDiv" style="overflow-y:hidden;overflow-x:auto;max-height:80%;">
<div id="innerDiv" style="overflow-y:hidden;overflow-x:auto;max-height:80%;height:0px;">
<table id="errorActivityTable" width="100%" height="13%" class="tableClass" style="margin: 10px 0px 0px 0px;position: relative;width: calc(literal('100% - 15px'));width: -moz-calc(literal('100% - 15px'));padding-right:0px; padding-left:5xp; width: -webkit-calc(literal('100% - 15px'));box-shadow: 3px 3px 3px gray;-moz-box-shadow:3px 3px 3px gray;-webkit-box-shadow: 3px 3px 3px gray;-o-box-shadow: 3px 3px 3px gray;background: rgba(255, 204, 0, 0.66);min-height: 50px;bottom:10px" border="0" cellspacing="0" cellpadding="0">
<xsl:for-each select="//error">
<xsl:if test="position() = 1">
......@@ -151,7 +159,139 @@
</xsl:for-each>
</table>
</div>
<div id="sideImagePanel" class="imagePanel"></div>
<div id = "showDataMismatch" class = "misMatchPanel">
<table id ="showDataMismatchTable" class="tableClass">
<thead class="table-head">
<tr>
<th nowrap="true" style = "text-align:center">
Title
</th>
<th nowrap="true" style = "text-align:center">
Purchase
</th>
<th nowrap="true" style = "text-align:center">
Supply
</th>
</tr>
</thead>
<tbody class="table-body">
<tr class='trClass'>
<td nowrap="true" style = "">
GSTIN
</td>
<td nowrap="true" id = "gstin" style = "">
</td>
<td nowrap="true" id = "gstin__gstr" style = "">
</td>
</tr>
<tr class='trClass'>
<td nowrap="true" style = "">
Invoice No
</td>
<td nowrap="true" id = "doc_no" style = "">
</td>
<td nowrap="true" id = "doc_no__gstr" style = "">
</td>
</tr>
<tr class='trClass'>
<td nowrap="true" style = "">
Invoice Date
</td>
<td nowrap="true" id = "doc_date" style = "">
</td>
<td nowrap="true" id = "doc_date__gstr" style = "">
</td>
</tr>
<tr class='trClass'>
<td nowrap="true" style = "">
HSN/SAC
</td>
<td nowrap="true" id = "gs_code" style = "">
</td>
<td nowrap="true" id = "gs_code__gstr" style = "">
</td>
</tr>
<tr class='trClass'>
<td nowrap="true" style = "">
Quantity
</td>
<td nowrap="true" id = "quantity" style = "">
</td>
<td nowrap="true" id = "quantity__gstr" style = "">
</td>
</tr>
<tr class='trClass'>
<td nowrap="true" style = "">
Rate
</td>
<td nowrap="true" id = "rate" style = "">
</td>
<td nowrap="true" id = "rate__gstr" style = "">
</td>
</tr>
<tr class='trClass'>
<td nowrap="true" style = "">
Taxable Amount
</td>
<td nowrap="true" id = "taxable_amt" style = "">
</td>
<td nowrap="true" id = "taxable_amt__gstr" style = "">
</td>
</tr>
<tr class='trClass'>
<td nowrap="true" style = "">
IGST Amount
</td>
<td nowrap="true" id = "igst_amt" style = "">
</td>
<td nowrap="true" id = "igst_amt__gstr" style = "">
</td>
</tr>
<tr class='trClass'>
<td nowrap="true" style = "">
CGST Amount
</td>
<td nowrap="true" id = "cgst_amt" style = "">
</td>
<td nowrap="true" id = "cgst_amt__gstr" style = "">
</td>
</tr>
<tr class='trClass'>
<td nowrap="true" style = "">
SGST Amount
</td>
<td nowrap="true" id = "sgst_amt" style = "">
</td>
<td nowrap="true" id = "sgst_amt__gstr" style = "">
</td>
</tr>
</tbody>
</table>
</div>
<div id="popHelpContainer"></div>
<div id="overlay"></div>
<div id="mainPageHeaderContatiner">
......@@ -169,7 +309,11 @@
<xsl:if test ="$dbID != '0'">
<xsl:variable name="custDbID"><xsl:value-of select="@domID"/></xsl:variable>
<xsl:variable name="supp_img_path"><xsl:value-of select="supp_img_path"/></xsl:variable>
<button class="accordion" id="custPerc{$custDbID}" type="button" expanded="false">
<xsl:variable name="suppIDList"><xsl:value-of select="suppIDList"/></xsl:variable>
<input type = "hidden" id = "suppIDList{$custDbID}" value = "{$suppIDList}"></input>
<button class="accordion accordionParent" id="custPerc{$custDbID}" type="button" expanded="false">
<div id="percClass{$custDbID}" class="c100 small p100">
<img src="{$supp_img_path}" class="custImg"/>
......@@ -180,17 +324,29 @@
</div>
<div style="margin-left:10px;" class="dataSummry">
<span class="headerText">Supplier- <xsl:value-of select="supp_code"/> &#160; <xsl:value-of select="supp_name"/>&#160;</span>
<span class="headerText">Supplier- <xsl:value-of select="supp_name"/> &#160; GSTIN - <xsl:value-of select="supp_code"/>&#160;</span>
<br></br>
<span class="subText">State Code- <xsl:value-of select="supp_addr"/> </span>
</div>
<div class="mismatchImg">
<!-- <img src="/ibase/images/galaxy/mismatch.png" id = "misMatch{$custDbID}" alt="Mismatch Found" width="20" height="20" style = "border-radius:50%;visibility:hidden"></img>
<img src="/ibase/images/galaxy/greenTick.png" id = "Match{$custDbID}" alt="Match Found" width="20" height="20" style = "border-radius:50%;visibility:hidden"></img> -->
<img src="" id = "Match{$custDbID}" alt="Match Found" width="20" height="20" style = "visibility:hidden"></img>
</div>
</button>
<div class="panel" id="custPanel{$custDbID}">
<xsl:for-each select="Invoices/invoice">
<xsl:variable name="soDbID"><xsl:value-of select="@domID"/></xsl:variable>
<button class="accordion accordionSO" type="button" expanded="false">
<div class="dataSummry" style = "margin-top:8px">
<SELECT id='Detail2.{$soDbID}.status' name="Detail2.{$soDbID}.status" align="LEFT" TABINDEX="170" onclick = "event.stopPropagation();" onchange="checkAll('{$soDbID}','{$soDbID}','{$soDbID}')" class="input_editable">
<xsl:variable name="domIDList"><xsl:value-of select="domIDList"/></xsl:variable>
<input type = "hidden" id = "domIDList{$soDbID}" value = "{$domIDList}"></input>
<button class="accordion accordionSO" onclick = 'openAccordion(this,"{$soDbID}")' type="button" expanded="false">
<!-- <div class="dataSummry" style = "margin-top:8px">
<SELECT id='Detail2.{$soDbID}.status' name="Detail2.{$soDbID}.status" align="LEFT" TABINDEX="170" onclick = "event.stopPropagation();" onchange="setSubmitType('{$soDbID}','{$soDbID}','{$soDbID}')" class="input_editable">
<SELECT id='submitStatus{$soDbID}' name="Detail2.{$soDbID}.status" align="LEFT" TABINDEX="170" onclick = "event.stopPropagation();" onchange="setSubmitType('{$soDbID}','{$soDbID}','{$soDbID}')" class="input_editable">
<OPTION value="X">Select</OPTION>
<OPTION value="A">Accept</OPTION>
<OPTION value="M">Modify</OPTION>
......@@ -198,22 +354,23 @@
<OPTION value="R">Reject</OPTION>
<OPTION value="P">Pending</OPTION>
</SELECT>
</div>
</div> -->
<div style="margin-left:10px;" class="dataSummry">
<span class="headerText">Purchase Order - <xsl:value-of select="invoice_id"/>&#160;-</span>
<span class="headerText">Date - <xsl:value-of select="tran_date"/>&#160;</span>
<span class="headerText">Invoice No - <xsl:value-of select="invoice_id"/>&#160;-</span>
<!-- <span class="headerText">Invoice Date - <xsl:value-of select="order_date"/>&#160;</span> -->
<br></br>
<span class="subText">Doc No - <xsl:value-of select="sale_order"/>&#160;</span>
<span class="subText">Doc No - <xsl:value-of select="doc_no"/>&#160;</span>
<span class="subText">Doc Date - <xsl:value-of select="doc_date"/>&#160;</span>
<span class="subText">Amount - <xsl:value-of select="inv_amt"/>&#160;</span>
<span class="subText">Site Code - <xsl:value-of select="tax_amt"/>&#160;</span>
<!-- <span class="subText">Amount - <xsl:value-of select="inv_amt"/>&#160;</span>
<span class="subText">Site Code - <xsl:value-of select="site_code"/>&#160;</span> -->
</div>
<div class="selectSummry">
<p><xsl:value-of select="data_match"/> mismatch found</p>
<!-- <p>Reconcilation Status - Manual</p> -->
<!-- <p><xsl:value-of select="data_match"/> mismatch found</p> -->
<p id = "Detail2.{$soDbID}.mismatch" style = "display:inline"></p><p style = "display:inline">mismatch found</p>
<xsl:variable name="reco_status"><xsl:value-of select="reco_status"/></xsl:variable>
<xsl:choose>
<!-- <xsl:choose>
<xsl:when test="$reco_status ='E'">
<p>Reconcilation Status - Open</p>
</xsl:when>
......@@ -224,13 +381,23 @@
<p>Reconcilation Status - Automatic</p>
</xsl:when>
<xsl:otherwise>
<p>Reconcilation Status - N</p>
<p>Reconcilation Status - None</p>
</xsl:otherwise>
</xsl:choose>
</xsl:choose> -->
&#160;
<SELECT id='submitStatus{$soDbID}' align="LEFT" TABINDEX="170" onclick = "event.stopPropagation();" onchange="setSubmitType('{$soDbID}','{$soDbID}','{$soDbID}')" class="input_editable">
<OPTION value="X">Select</OPTION>
<OPTION value="A">Accept</OPTION>
<OPTION value="M">Modify</OPTION>
<OPTION value="D">Delete</OPTION>
<OPTION value="R">Reject</OPTION>
<OPTION value="P">Pending</OPTION>
</SELECT>
</div>
</button>
<div class="panel panelSO">
<span id ="spanGSTR1_{$soDbID}" style = "display:inline-block;width:49.90%;overflow-x:scroll;border-right:1px solid black" onscroll="scrollGstrData('spanGSTR1_{$soDbID}','spanGSTR2_{$soDbID}')">
<span id ="spanGSTR1_{$soDbID}" style = "display:inline-block;width:calc(50% - 33px);overflow-x:scroll;border-right:1px solid #dadada" onscroll="scrollGstrData('spanGSTR1_{$soDbID}','spanGSTR2_{$soDbID}')">
<table id ="details{$soDbID}" class="tableClass">
<thead class="table-head">
<tr>
......@@ -247,7 +414,15 @@
<th nowrap="true">SCGT Amount</th>
<th nowrap="true">CESS(%)</th>
<th nowrap="true">CESS Amount</th>
<th nowrap="true" style = "display:none">GSTIN</th>
<th nowrap="true" style = "display:none">Invoice No</th>
<th nowrap="true" style = "display:none">Invoice Date</th>
<th nowrap="true" style = "display:none">HSN/SAC</th>
<th nowrap="true" style = "display:none">Quantity</th>
<th nowrap="true" style = "display:none">Rate</th>
<th nowrap="true" style = "display:none">Taxable Amount</th>
</tr>
</thead>
<tbody class="table-body">
......@@ -261,16 +436,26 @@
<xsl:variable name="cgst_perc"><xsl:value-of select="cgst_perc"/></xsl:variable>
<xsl:variable name="cgst_amt"><xsl:value-of select="cgst_amt"/></xsl:variable>
<xsl:variable name="scgt_perc"><xsl:value-of select="scgt_perc"/></xsl:variable>
<xsl:variable name="scgt_amt"><xsl:value-of select="scgt_amt"/></xsl:variable>
<xsl:variable name="sgst_amt"><xsl:value-of select="sgst_amt"/></xsl:variable>
<xsl:variable name="cess_perc"><xsl:value-of select="cess_perc"/></xsl:variable>
<xsl:variable name="cess_amt"><xsl:value-of select="cess_amt"/></xsl:variable>
<xsl:variable name="tax_reg_no"><xsl:value-of select="tax_reg_no"/></xsl:variable>
<xsl:variable name="doc_no"><xsl:value-of select="doc_no"/></xsl:variable>
<xsl:variable name="doc_date"><xsl:value-of select="doc_date"/></xsl:variable>
<xsl:variable name="gs_code"><xsl:value-of select="gs_code"/></xsl:variable>
<xsl:variable name="quantity"><xsl:value-of select="quantity"/></xsl:variable>
<xsl:variable name="rate"><xsl:value-of select="rate"/></xsl:variable>
<xsl:variable name="taxable_amt"><xsl:value-of select="taxable_amt"/></xsl:variable>
<!--<input type="hidden" id="Detail2.{normalize-space($linedbID)}.tran_id" name="Detail2.{normalize-space($linedbID)}.tran_id" value="{$tran_id}"></input>-->
<input type="hidden" id="Detail2.{normalize-space($soDbID)}.tran_id" name="Detail2.{normalize-space($soDbID)}.tran_id" value="{$tran_id}"></input>
<input type="hidden" id="Detail2.{normalize-space($linedbID)}.tran_id" name="Detail2.{normalize-space($linedbID)}.tran_id" value="{$tran_id}"></input>
<input type="hidden" id="Detail2.{normalize-space($linedbID)}.status" name="Detail2.{normalize-space($linedbID)}.status" value=""></input>
<xsl:choose>
<xsl:when test="line_no">
<tr class='trClass' id="{$linedbID}" onclick="setCheckboxRow(event,this,{$soDbID},'{$custDbID}','details{$soDbID}');">
<tr class='trClass' id="{$linedbID}" onclick="setCheckboxRow(event,this,{$soDbID},'{$custDbID}','details{$soDbID}');"
ondblclick="showGSTRData('{$linedbID}')" >
<td nowrap="true" style="border-left:0px solid black !important;">
<!-- <Input type='checkbox' value="true" class="selectAll{$soDbID}" name="Detail2.{normalize-space($linedbID)}.selectbox" id="Detail2.{normalize-space($linedbID)}.selectbox" onclick="setCheckbox(this,'{$linedbID}','{$soDbID}','{$custDbID}','details{$soDbID}');" tabindex="-1" /> -->
<Input type='checkbox' class="selectAll{$soDbID}" name="Detail2.{normalize-space($linedbID)}.selectbox" id="Detail2.{normalize-space($linedbID)}.selectbox"
......@@ -278,49 +463,63 @@
</td>
<td nowrap="true">
<xsl:value-of select="line_no"/>
<!-- <input type="hidden" name="Detail2.{normalize-space($linedbID)}.line_no" value="{$line_no}"></input> -->
</td>
<td nowrap="true">
<xsl:value-of select="status"/>
<!-- <input type="hidden" name="Detail2.{normalize-space($linedbID)}.status" value="{$status}"></input> -->
</td>
<td nowrap="true">
<xsl:value-of select="igst_perc"/>
<!-- <input type="hidden" name="Detail2.{normalize-space($linedbID)}.igst_perc" value="{$igst_perc}"></input> -->
</td>
<td nowrap="true">
<xsl:value-of select="igst_amt"/>
<!-- <input type="hidden" name="Detail2.{normalize-space($linedbID)}.igst_amt" value="{$igst_amt}"></input> -->
</td>
<td nowrap="true">
<xsl:value-of select="cgst_perc"/>
<!-- <input type="hidden" name="Detail2.{normalize-space($linedbID)}.cgst_perc" value="{$cgst_perc}"></input> -->
</td>
<td nowrap="true">
<xsl:value-of select="cgst_amt"/>
<!-- <input type="hidden" name="Detail2.{normalize-space($linedbID)}.cgst_amt" value="{$cgst_amt}"></input> -->
</td>
<td nowrap="true">
<xsl:value-of select="scgt_perc"/>
<!-- <input type="hidden" name="Detail2.{normalize-space($linedbID)}.scgt_perc" value="{$scgt_perc}"></input> -->
</td>
<td nowrap="true">
<xsl:value-of select="scgt_amt"/>
<!-- <input type="hidden" name="Detail2.{normalize-space($linedbID)}.scgt_amt" value="{$scgt_amt}"></input> -->
<xsl:value-of select="sgst_amt"/>
</td>
<td nowrap="true">
<xsl:value-of select="cess_perc"/>
<!-- <input type="hidden" name="Detail2.{normalize-space($linedbID)}.cess_perc" value="{$cess_perc}"></input> -->
</td>
<td nowrap="true">
<xsl:value-of select="cess_amt"/>
<!-- <input type="hidden" name="Detail2.{normalize-space($linedbID)}.cess_amt" value="{$cess_amt}"></input> -->
</td>
<td nowrap="true" style = "display:none">
<xsl:value-of select="tax_reg_no"/>
</td>
<td nowrap="true" style = "display:none">
<xsl:value-of select="doc_no"/>
</td>
<td nowrap="true" style = "display:none">
<xsl:value-of select="doc_date"/>
</td>
<td nowrap="true" style = "display:none">
<xsl:value-of select="gs_code"/>
</td>
<td nowrap="true" style = "display:none">
<xsl:value-of select="quantity"/>
</td>
<td nowrap="true" style = "display:none">
<xsl:value-of select="rate"/>
</td>
<td nowrap="true" style = "display:none">
<xsl:value-of select="taxable_amt"/>
</td>
</tr>
</xsl:when>
<xsl:otherwise>
<tr>
<tr id="{$linedbID}" ondblclick="showGSTRData('{$linedbID}')" >
<td nowrap="true" style="border-left:0px solid black !important;">
<Input type='checkbox' class="selectAll{$soDbID}" name="Detail2.{normalize-space($linedbID)}.selectbox" id="Detail2.{normalize-space($linedbID)}.selectbox"
onclick = "setChecked(this)" value="false" tabindex="-1" disabled = "true" />
......@@ -331,6 +530,26 @@
</tr>
</xsl:otherwise>
</xsl:choose>
<input type="hidden" name="Detail2.{normalize-space($linedbID)}.tax_reg_no" id="Detail2.{normalize-space($linedbID)}.tax_reg_no" value="{$tax_reg_no}"></input>
<input type="hidden" name="Detail2.{normalize-space($linedbID)}.doc_no" id="Detail2.{normalize-space($linedbID)}.doc_no" value="{$doc_no}"></input>
<input type="hidden" name="Detail2.{normalize-space($linedbID)}.doc_date" id="Detail2.{normalize-space($linedbID)}.doc_date" value="{$doc_date}"></input>
<input type="hidden" name="Detail2.{normalize-space($linedbID)}.gs_code" id="Detail2.{normalize-space($linedbID)}.gs_code" value="{$gs_code}"></input>
<input type="hidden" name="Detail2.{normalize-space($linedbID)}.quantity" id="Detail2.{normalize-space($linedbID)}.quantity" value="{$quantity}"></input>
<input type="hidden" name="Detail2.{normalize-space($linedbID)}.rate" id="Detail2.{normalize-space($linedbID)}.rate" value="{$rate}"></input>
<input type="hidden" name="Detail2.{normalize-space($linedbID)}.taxable_amt" id="Detail2.{normalize-space($linedbID)}.taxable_amt" value="{$taxable_amt}"></input>
<input type="hidden" name="Detail2.{normalize-space($linedbID)}.line_no" id="Detail2.{normalize-space($linedbID)}.line_no" value="{$line_no}"></input>
<input type="hidden" name="Detail2.{normalize-space($linedbID)}.status" id="Detail2.{normalize-space($linedbID)}.status" value="{$status}"></input>
<input type="hidden" name="Detail2.{normalize-space($linedbID)}.igst_perc" id="Detail2.{normalize-space($linedbID)}.igst_perc" value="{$igst_perc}"></input>
<input type="hidden" name="Detail2.{normalize-space($linedbID)}.igst_amt" id="Detail2.{normalize-space($linedbID)}.igst_amt" value="{$igst_amt}"></input>
<input type="hidden" name="Detail2.{normalize-space($linedbID)}.cgst_perc" id="Detail2.{normalize-space($linedbID)}.cgst_perc" value="{$cgst_perc}"></input>
<input type="hidden" name="Detail2.{normalize-space($linedbID)}.cgst_amt" id="Detail2.{normalize-space($linedbID)}.cgst_amt" value="{$cgst_amt}"></input>
<input type="hidden" name="Detail2.{normalize-space($linedbID)}.scgt_perc" id="Detail2.{normalize-space($linedbID)}.scgt_perc" value="{$scgt_perc}"></input>
<input type="hidden" name="Detail2.{normalize-space($linedbID)}.sgst_amt" id="Detail2.{normalize-space($linedbID)}.sgst_amt" value="{$sgst_amt}"></input>
<input type="hidden" name="Detail2.{normalize-space($linedbID)}.cess_perc" id="Detail2.{normalize-space($linedbID)}.cess_perc" value="{$cess_perc}"></input>
<input type="hidden" name="Detail2.{normalize-space($linedbID)}.cess_amt" id="Detail2.{normalize-space($linedbID)}.cess_amt" value="{$cess_amt}"></input>
</xsl:for-each>
</tbody>
</table>
......@@ -338,7 +557,33 @@
<!-- <span style="display:inline-block;height:72px;border:1px solid #dadada;"></span> -->
<span id ="spanGSTR2_{$soDbID}" style = "display:inline-block;width:49.90%;overflow-x:scroll" onscroll="scrollGstrData('spanGSTR1_{$soDbID}','spanGSTR2_{$soDbID}')">
<span id ="" style = "display:inline-block;width:63px;overflow-x:scroll;border-right:1px solid #dadada;" >
<table id ="" class="tableClass">
<thead class="table-head">
<tr>
<th nowrap="true" style = "text-align:center">
VS
</th>
</tr>
</thead>
<tbody class="table-body">
<xsl:for-each select="gstr1">
<xsl:variable name="linedbID"><xsl:value-of select="@domID"/></xsl:variable>
<tr class='trClass' ondblclick="showGSTRData('{$linedbID}')" >
<td nowrap="true" style = "text-align:center">
<!-- <Input type='checkbox' class="" name="selectbox" id="selectbox" style = "visibility:hidden"
value="true" tabindex="-1" /> -->
<div style="height:19px;line-height:31px;">
<img src="" id = "misMatch.{$soDbID}.{$linedbID}" alt="Match Found" style = "visibility:hidden;height:17px;margin:1px;"></img>
</div>
</td>
</tr>
</xsl:for-each>
</tbody>
</table>
</span>
<span id ="spanGSTR2_{$soDbID}" style = "display:inline-block;width:calc(50% - 33px);overflow-x:scroll" onscroll="scrollGstrData('spanGSTR1_{$soDbID}','spanGSTR2_{$soDbID}')">
<table id ="details_GST{$soDbID}" class="tableClass">
<thead class="table-head">
<tr>
......@@ -355,6 +600,14 @@
<th nowrap="true">SCGT Amount</th>
<th nowrap="true">CESS(%)</th>
<th nowrap="true">CESS Amount</th>
<th nowrap="true" style = "display:none">GSTIN</th>
<th nowrap="true" style = "display:none">Invoice No</th>
<th nowrap="true" style = "display:none">Invoice Date</th>
<th nowrap="true" style = "display:none">HSN/SAC</th>
<th nowrap="true" style = "display:none">Quantity</th>
<th nowrap="true" style = "display:none">Rate</th>
<th nowrap="true" style = "display:none">Taxable Amount</th>
</tr>
</thead>
<tbody class="table-body">
......@@ -368,19 +621,28 @@
<xsl:variable name="cgst_perc"><xsl:value-of select="cgst_perc"/></xsl:variable>
<xsl:variable name="cgst_amt"><xsl:value-of select="cgst_amt"/></xsl:variable>
<xsl:variable name="scgt_perc"><xsl:value-of select="scgt_perc"/></xsl:variable>
<xsl:variable name="scgt_amt"><xsl:value-of select="scgt_amt"/></xsl:variable>
<xsl:variable name="sgst_amt"><xsl:value-of select="sgst_amt"/></xsl:variable>
<xsl:variable name="cess_perc"><xsl:value-of select="cess_perc"/></xsl:variable>
<xsl:variable name="cess_amt"><xsl:value-of select="cess_amt"/></xsl:variable>
<xsl:variable name="tax_reg_no"><xsl:value-of select="tax_reg_no"/></xsl:variable>
<xsl:variable name="doc_no"><xsl:value-of select="doc_no"/></xsl:variable>
<xsl:variable name="doc_date"><xsl:value-of select="doc_date"/></xsl:variable>
<xsl:variable name="gs_code"><xsl:value-of select="gs_code"/></xsl:variable>
<xsl:variable name="quantity"><xsl:value-of select="quantity"/></xsl:variable>
<xsl:variable name="rate"><xsl:value-of select="rate"/></xsl:variable>
<xsl:variable name="taxable_amt"><xsl:value-of select="taxable_amt"/></xsl:variable>
<!--<input type="hidden" id="Detail2.{normalize-space($linedbID)}.tran_id__gstn" name="Detail2.{normalize-space($linedbID)}.tran_id__gstn" value="{$tran_id}"></input>-->
<input type="hidden" id="Detail2.{normalize-space($soDbID)}.tran_id__gstn" name="Detail2.{normalize-space($soDbID)}.tran_id__gstn" value="{$tran_id}"></input>
<input type="hidden" name="Detail2.{normalize-space($linedbID)}.tran_id__gstn" id="Detail2.{normalize-space($linedbID)}.tran_id__gstn" value="{$tran_id}"></input>
<xsl:choose>
<xsl:when test="line_no">
<tr class='trClass' id="{$linedbID}" onclick="setCheckboxRow(event,this,{$soDbID},'{$custDbID}','details{$soDbID}');">
<tr class='trClass' id="{$linedbID}" onclick="setCheckboxRow(event,this,{$soDbID},'{$custDbID}','details{$soDbID}');"
ondblclick="showGSTRData('{$linedbID}')" >
<td nowrap="true" style="border-left:0px solid black !important;">
<!-- <Input type='checkbox' value="true" class="selectAll{$soDbID}" name="Detail2.{normalize-space($linedbID)}.selectbox" id="Detail2.{normalize-space($linedbID)}.selectbox" onclick="setCheckbox(this,'{$linedbID}','{$soDbID}','{$custDbID}','details{$soDbID}');" tabindex="-1" /> -->
<Input type='checkbox' class="selectAll{$soDbID}" name="Detail2.{normalize-space($linedbID)}.selectbox" id="Detail2.{normalize-space($linedbID)}.selectbox"
<Input type='checkbox' class="selectAll{$soDbID}" name="selectbox" id="selectbox" style = "visibility:hidden"
onclick = "setChecked(this,'{$linedbID}')" value="true" tabindex="-1" />
</td>
<td nowrap="true">
......@@ -405,7 +667,7 @@
<xsl:value-of select="scgt_perc"/>
</td>
<td nowrap="true">
<xsl:value-of select="scgt_amt"/>
<xsl:value-of select="sgst_amt"/>
</td>
<td nowrap="true">
<xsl:value-of select="cess_perc"/>
......@@ -413,20 +675,64 @@
<td nowrap="true">
<xsl:value-of select="cess_amt"/>
</td>
<td nowrap="true" style = "display:none">
<xsl:value-of select="tax_reg_no"/>
</td>
<td nowrap="true" style = "display:none">
<xsl:value-of select="doc_no"/>
</td>
<td nowrap="true" style = "display:none">
<xsl:value-of select="doc_date"/>
</td>
<td nowrap="true" style = "display:none">
<xsl:value-of select="gs_code"/>
</td>
<td nowrap="true" style = "display:none">
<xsl:value-of select="quantity"/>
</td>
<td nowrap="true" style = "display:none">
<xsl:value-of select="rate"/>
</td>
<td nowrap="true" style = "display:none">
<xsl:value-of select="taxable_amt"/>
</td>
</tr>
</xsl:when>
<xsl:otherwise>
<tr>
<tr id="{$linedbID}" ondblclick="showGSTRData('{$linedbID}')">
<td nowrap="true" style="border-left:0px solid black !important;">
<Input type='checkbox' class="selectAll{$soDbID}" name="Detail2.{normalize-space($linedbID)}.selectbox" id="Detail2.{normalize-space($linedbID)}.selectbox"
onclick = "setChecked(this)" value="false" tabindex="-1" disabled = "true" />
<Input type='checkbox' class="selectAll{$soDbID}" name="selectbox" id="selectbox"
onclick = "setChecked(this)" value="false" tabindex="-1" disabled = "true" style = "visibility:hidden" />
</td>
<td colspan = "10">
Downloaded data not found for this record
</td>
</tr>
</xsl:otherwise>
</xsl:choose>
</xsl:choose>
<input type="hidden" name="Detail2.{normalize-space($linedbID)}.tax_reg_no__gstr" id="Detail2.{normalize-space($linedbID)}.tax_reg_no__gstr" value="{$tax_reg_no}"></input>
<input type="hidden" name="Detail2.{normalize-space($linedbID)}.doc_no" id="Detail2.{normalize-space($linedbID)}.doc_no__gstr" value="{$doc_no}"></input>
<input type="hidden" name="Detail2.{normalize-space($linedbID)}.doc_date" id="Detail2.{normalize-space($linedbID)}.doc_date__gstr" value="{$doc_date}"></input>
<input type="hidden" name="Detail2.{normalize-space($linedbID)}.gs_code__gstr" id="Detail2.{normalize-space($linedbID)}.gs_code__gstr" value="{$gs_code}"></input>
<input type="hidden" name="Detail2.{normalize-space($linedbID)}.quantity__gstr" id="Detail2.{normalize-space($linedbID)}.quantity__gstr" value="{$quantity}"></input>
<input type="hidden" name="Detail2.{normalize-space($linedbID)}.rate__gstr" id="Detail2.{normalize-space($linedbID)}.rate__gstr" value="{$rate}"></input>
<input type="hidden" name="Detail2.{normalize-space($linedbID)}.taxable_amt__gstr" id="Detail2.{normalize-space($linedbID)}.taxable_amt__gstr" value="{$taxable_amt}"></input>
<input type="hidden" name="Detail2.{normalize-space($linedbID)}.line_no__gstr" id="Detail2.{normalize-space($linedbID)}.line_no__gstr" value="{$line_no}"></input>
<input type="hidden" name="Detail2.{normalize-space($linedbID)}.status__gstr" id="Detail2.{normalize-space($linedbID)}.status__gstr" value="{$status}"></input>
<input type="hidden" name="Detail2.{normalize-space($linedbID)}.igst_perc__gstr" id="Detail2.{normalize-space($linedbID)}.igst_perc__gstr" value="{$igst_perc}"></input>
<input type="hidden" name="Detail2.{normalize-space($linedbID)}.igst_amt__gstr" id="Detail2.{normalize-space($linedbID)}.igst_amt__gstr" value="{$igst_amt}"></input>
<input type="hidden" name="Detail2.{normalize-space($linedbID)}.cgst_perc__gstr" id="Detail2.{normalize-space($linedbID)}.cgst_perc__gstr" value="{$cgst_perc}"></input>
<input type="hidden" name="Detail2.{normalize-space($linedbID)}.cgst_amt__gstr" id="Detail2.{normalize-space($linedbID)}.cgst_amt__gstr" value="{$cgst_amt}"></input>
<input type="hidden" name="Detail2.{normalize-space($linedbID)}.scgt_perc__gstr" id="Detail2.{normalize-space($linedbID)}.scgt_perc__gstr" value="{$scgt_perc}"></input>
<input type="hidden" name="Detail2.{normalize-space($linedbID)}.sgst_amt__gstr" id="Detail2.{normalize-space($linedbID)}.sgst_amt__gstr" value="{$sgst_amt}"></input>
<input type="hidden" name="Detail2.{normalize-space($linedbID)}.cess_perc__gstr" id="Detail2.{normalize-space($linedbID)}.cess_perc__gstr" value="{$cess_perc}"></input>
<input type="hidden" name="Detail2.{normalize-space($linedbID)}.cess_amt__gstr" id="Detail2.{normalize-space($linedbID)}.cess_amt__gstr" value="{$cess_amt}"></input>
</xsl:for-each>
</tbody>
</table>
......@@ -447,6 +753,7 @@
<input type="button" style="margin-left:2px;" value="Previous" class="button" title="back" id="back" onclick="form2Previous();"/>
<input type="submit" style="margin-left:2px;" value="Finish" class="button" title="finish" id="finish" onclick="return validateSubmit();setActionVal('finish');" />
</div>
</div>
<div id="buttonreplacement">
......
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