Skip to content

B
business-java
Commit e33cdbb5 authored by pchavan's avatar pchavan
Browse files
Options

commited changes to make reconcilation through invoice 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@171845 ce508802-f39f-4f6c-b175-0d175dae99d5
parent b01b83b7
Hide whitespace changes
Inline Side-by-side
Showing with 519 additions and 29 deletions
webitm-gst/module-resource/web/xsl/wizard/gstreco_wiz2_wiz_en_US_A.xsl
View file @ e33cdbb5
...@@ -160,7 +160,7 @@ ...@@ -160,7 +160,7 @@
</table> </table>
</div> </div>
<div id = "showDataMismatch" class = "misMatchPanel"> <!-- <div id = "showDataMismatch" class = "misMatchPanel">
<table id ="showDataMismatchTable" class="tableClass"> <table id ="showDataMismatchTable" class="tableClass">
<thead class="table-head"> <thead class="table-head">
<tr> <tr>
...@@ -203,7 +203,7 @@ ...@@ -203,7 +203,7 @@
Invoice Date Invoice Date
</td> </td>
<td nowrap="true" id = "doc_date" style = ""> <td nowrap="true" id = "doc_date" style = "">
cess_amt
</td> </td>
<td nowrap="true" id = "doc_date__gstr" style = ""> <td nowrap="true" id = "doc_date__gstr" style = "">
...@@ -286,7 +286,7 @@ ...@@ -286,7 +286,7 @@
</td> </td>
</tr> </tr>
<!-- New Columns added --> New Columns added
<tr class='trClass'> <tr class='trClass'>
<td nowrap="true" style = ""> <td nowrap="true" style = "">
GST CODE GST CODE
...@@ -351,14 +351,258 @@ ...@@ -351,14 +351,258 @@
</td> </td>
<td nowrap="true" id = "itc_cess__gstr" style = ""> <td nowrap="true" id = "itc_cess__gstr" style = "">
</td>
<td nowrap="true" id = "gst_rate" style = "">
</td> </td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
</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 = "">
Customer Code
</td>
<td nowrap="true" id = "cust_code" style = "">
</td>
<td nowrap="true" id = "cust_code__gstr" style = "">
</td>
</tr>
<tr class='trClass'>
<td nowrap="true" style = "">
Amount
</td>
<td nowrap="true" id = "amount" style = "">
</td>
<td nowrap="true" id = "amount__gstr" style = "">
</td>
</tr>
<tr class='trClass'>
<td nowrap="true" style = "">
Reverse Charge
</td>
<td nowrap="true" id = "reverse_chrg" style = "">
</td>
<td nowrap="true" id = "reverse_chrg__gstr" style = "">
</td>
</tr>
<tr class='trClass'>
<td nowrap="true" style = "">
Reason Code
</td>
<td nowrap="true" id = "reas_code" style = "">
</td>
<td nowrap="true" id = "reas_code__gstr" style = "">
</td>
</tr>
<tr class='trClass'>
<td nowrap="true" style = "">
Order No
</td>
<td nowrap="true" id = "order_no" style = "">
</td>
<td nowrap="true" id = "order_no__gstr" style = "">
</td>
</tr>
<tr class='trClass'>
<td nowrap="true" style = "">
Tran Type
</td>
<td nowrap="true" id = "tran_type" style = "">
</td>
<td nowrap="true" id = "tran_type__gstr" style = "">
</td>
</tr>
<tr class='trClass'>
<td nowrap="true" style = "">
remarks
</td>
<td nowrap="true" id = "remarks" style = "">
</td>
<td nowrap="true" id = "remarks__gstr" style = "">
</td>
</tr>
<!-- New Columns added -->
<tr class='trClass'>
<td nowrap="true" style = "">
GST CODE
</td>
<td nowrap="true" id = "gst_code" style = "">
</td>
<td nowrap="true" id = "gst_code__gstr" style = "">
</td>
</tr>
<tr class='trClass'>
<td nowrap="true" style = "">
GST TYPE
</td>
<td nowrap="true" id = "gst_type" style = "">
</td>
<td nowrap="true" id = "gst_type__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> -->
<!-- <tr class='trClass'>
<td nowrap="true" style = "">
ITC IGST
</td>
<td nowrap="true" id = "itc_igst" style = "">
</td>
<td nowrap="true" id = "itc_igst__gstr" style = "">
</td>
</tr>
<tr class='trClass'>
<td nowrap="true" style = "">
ITC CGST
</td>
<td nowrap="true" id = "itc_cgst" style = "">
</td>
<td nowrap="true" id = "itc_cgst__gstr" style = "">
</td>
</tr>
<tr class='trClass'>
<td nowrap="true" style = "">
ITC SGST
</td>
<td nowrap="true" id = "itc_sgst" style = "">
</td>
<td nowrap="true" id = "itc_sgst__gstr" style = "">
</td>
</tr>
<tr class='trClass'>
<td nowrap="true" style = "">
ITC CESS
</td>
<td nowrap="true" id = "itc_cess" style = "">
</td>
<td nowrap="true" id = "itc_cess__gstr" style = "">
</td>
<td nowrap="true" id = "gst_rate" style = "">
</td>
</tr> -->
</tbody>
</table>
</div> </div>
<div id="popHelpContainer"></div> <div id="popHelpContainer"></div>
<div id="overlay"></div> <div id="overlay"></div>
<div id="mainPageHeaderContatiner"> <div id="mainPageHeaderContatiner">
...@@ -397,10 +641,10 @@ ...@@ -397,10 +641,10 @@
</div> </div>
<div class="mismatchImg"> <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/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="/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> <img src="" id = "Match{$custDbID}" alt="Match Found" width="20" height="20" style = "visibility:hidden"></img>
</div> </div>
</button> </button>
<div class="panel" id="custPanel{$custDbID}"> <div class="panel" id="custPanel{$custDbID}">
...@@ -467,9 +711,9 @@ ...@@ -467,9 +711,9 @@
<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}')"> <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"> <table id ="details{$soDbID}" class="tableClass">
<thead class="table-head"> <thead class="table-head">
<tr> <!-- <tr>
<th nowrap="true" style="border-left:0px solid black !important;" > <th nowrap="true" style="border-left:0px solid black !important;" >
<!-- <Input id='selectAll{$soDbID}' type='checkbox' name='selectAll' custId='{$custDbID}' tableId='{$soDbID}' onClick="checkAll('{$custDbID}','details{$soDbID}','{$soDbID}')"/> --> <Input id='selectAll{$soDbID}' type='checkbox' name='selectAll' custId='{$custDbID}' tableId='{$soDbID}' onClick="checkAll('{$custDbID}','details{$soDbID}','{$soDbID}')"/>
</th> </th>
<th nowrap="true">Sr No</th> <th nowrap="true">Sr No</th>
<th nowrap="true">Status</th> <th nowrap="true">Status</th>
...@@ -496,6 +740,44 @@ ...@@ -496,6 +740,44 @@
<th nowrap="true">ITC CGST</th> <th nowrap="true">ITC CGST</th>
<th nowrap="true">ITC SGST</th> <th nowrap="true">ITC SGST</th>
<th nowrap="true">ITC CESS</th> <th nowrap="true">ITC CESS</th>
<th nowrap="true">GST RATE</th>
</tr> -->
<tr>
<th nowrap="true" style="border-left:0px solid black !important;" >
<Input id='selectAll{$soDbID}' type='checkbox' name='selectAll' custId='{$custDbID}' tableId='{$soDbID}' onClick="checkAll('{$custDbID}','details{$soDbID}','{$soDbID}')"/>
</th>
<th nowrap="true">Sr No</th>
<th nowrap="true">Customer Code</th>
<th nowrap="true">Amount</th>
<th nowrap="true">Reverse Charge</th>
<th nowrap="true">Reason Code</th>
<th nowrap="true">Order No</th>
<th nowrap="true">Tran Type</th>
<th nowrap="true">Remarks</th>
<th nowrap="true">GST CODE</th>
<th nowrap="true">GST TYPE</th>
<!-- <th nowrap="true">CGST Amount</th>
<th nowrap="true">SCGT(%)</th>
<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>
<!-- <th nowrap="true">ITC IGST</th>
<th nowrap="true">ITC CGST</th>
<th nowrap="true">ITC SGST</th>
<th nowrap="true">ITC CESS</th>
<th nowrap="true">GST RATE</th> -->
</tr> </tr>
</thead> </thead>
...@@ -505,11 +787,11 @@ ...@@ -505,11 +787,11 @@
<xsl:variable name="tran_id"><xsl:value-of select="tran_id"/></xsl:variable> <xsl:variable name="tran_id"><xsl:value-of select="tran_id"/></xsl:variable>
<xsl:variable name="line_no"><xsl:value-of select="line_no"/></xsl:variable> <xsl:variable name="line_no"><xsl:value-of select="line_no"/></xsl:variable>
<xsl:variable name="status"><xsl:value-of select=" status"/></xsl:variable> <xsl:variable name="status"><xsl:value-of select=" status"/></xsl:variable>
<xsl:variable name="igst_perc"><xsl:value-of select="igst_perc"/></xsl:variable> <!-- <xsl:variable name="igst_perc"><xsl:value-of select="igst_perc"/></xsl:variable> -->
<xsl:variable name="igst_amt"><xsl:value-of select="igst_amt"/></xsl:variable> <xsl:variable name="igst_amt"><xsl:value-of select="igst_amt"/></xsl:variable>
<xsl:variable name="cgst_perc"><xsl:value-of select="cgst_perc"/></xsl:variable> <!-- <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="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_perc"><xsl:value-of select="scgt_perc"/></xsl:variable> -->
<xsl:variable name="sgst_amt"><xsl:value-of select="sgst_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_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="cess_amt"><xsl:value-of select="cess_amt"/></xsl:variable>
...@@ -528,6 +810,24 @@ ...@@ -528,6 +810,24 @@
<xsl:variable name="itc_cgst"><xsl:value-of select="itc_cgst"/></xsl:variable> <xsl:variable name="itc_cgst"><xsl:value-of select="itc_cgst"/></xsl:variable>
<xsl:variable name="itc_sgst"><xsl:value-of select="itc_sgst"/></xsl:variable> <xsl:variable name="itc_sgst"><xsl:value-of select="itc_sgst"/></xsl:variable>
<xsl:variable name="itc_cess"><xsl:value-of select="itc_cess"/></xsl:variable> <xsl:variable name="itc_cess"><xsl:value-of select="itc_cess"/></xsl:variable>
<xsl:variable name="gst_rate"><xsl:value-of select="gst_rate"/></xsl:variable>
<!-- newly added by kaustubh -->
<xsl:variable name="cust_code"><xsl:value-of select="cust_code"/></xsl:variable>
<xsl:variable name="order_no"><xsl:value-of select="order_no"/></xsl:variable>
<xsl:variable name="amount"><xsl:value-of select="amount"/></xsl:variable>
<xsl:variable name="reverse_chrg"><xsl:value-of select="reverse_chrg"/></xsl:variable>
<xsl:variable name="reas_code"><xsl:value-of select="reas_code"/></xsl:variable>
<xsl:variable name="gst_type"><xsl:value-of select="gst_type"/></xsl:variable>
<xsl:variable name="prd_code"><xsl:value-of select="prd_code"/></xsl:variable>
<xsl:variable name="cust_name"><xsl:value-of select="cust_name"/></xsl:variable>
<xsl:variable name="reverse_chrg"><xsl:value-of select="reverse_chrg"/></xsl:variable>
<xsl:variable name="lr_no"><xsl:value-of select="lr_no"/></xsl:variable>
<xsl:variable name="lr_date"><xsl:value-of select="lr_date"/></xsl:variable>
<xsl:variable name="reas_code"><xsl:value-of select="reas_code"/></xsl:variable>
<xsl:variable name="ecom_reg_no"><xsl:value-of select="ecom_reg_no"/></xsl:variable>
<xsl:variable name="gst_code"><xsl:value-of select="gst_code"/></xsl:variable>
<xsl:variable name="gst_type"><xsl:value-of select="gst_type"/></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($linedbID)}.tran_id" name="Detail2.{normalize-space($linedbID)}.tran_id" value="{$tran_id}"></input>-->
...@@ -540,7 +840,7 @@ ...@@ -540,7 +840,7 @@
<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="Detail2.{normalize-space($linedbID)}.selectbox" id="Detail2.{normalize-space($linedbID)}.selectbox"
onclick = "setChecked(this,'{$linedbID}')" value="true" tabindex="-1" /> onclick = "setChecked(this,'{$linedbID}')" value="true" tabindex="-1" />
</td> </td>
<td nowrap="true"> <!-- <td nowrap="true">
<xsl:value-of select="line_no"/> <xsl:value-of select="line_no"/>
</td> </td>
<td nowrap="true"> <td nowrap="true">
...@@ -571,8 +871,6 @@ ...@@ -571,8 +871,6 @@
<xsl:value-of select="cess_amt"/> <xsl:value-of select="cess_amt"/>
</td> </td>
<td nowrap="true" style = "display:none"> <td nowrap="true" style = "display:none">
<xsl:value-of select="tax_reg_no"/> <xsl:value-of select="tax_reg_no"/>
</td> </td>
...@@ -613,7 +911,53 @@ ...@@ -613,7 +911,53 @@
<td nowrap="true" > <td nowrap="true" >
<xsl:value-of select="itc_cess"/> <xsl:value-of select="itc_cess"/>
</td> </td>
<td nowrap="true" >
<xsl:value-of select="gst_rate"/>
</td> -->
<!-- added by kaustubh -->
<td nowrap="true">
<xsl:value-of select="line_no"/>
</td>
<td nowrap="true">
<xsl:value-of select="cust_code"/>
</td>
<td nowrap="true">
<xsl:value-of select="amount"/>
</td>
<td nowrap="true">
<xsl:value-of select="reverse_chrg"/>
</td>
<td nowrap="true">
<xsl:value-of select="order_no"/>
</td>
<td nowrap="true">
<xsl:value-of select="reas_code"/>
</td>
<td nowrap="true">
<xsl:value-of select="tran_type"/>
</td>
<td nowrap="true">
<xsl:value-of select="remarks"/>
</td>
<td nowrap="true">
<xsl:value-of select="gst_code"/>
</td>
<td nowrap="true">
<xsl:value-of select="gst_type"/>
</td>
</tr> </tr>
</xsl:when> </xsl:when>
<xsl:otherwise> <xsl:otherwise>
...@@ -641,21 +985,42 @@ ...@@ -641,21 +985,42 @@
<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)}.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)}.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)}.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_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)}.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_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)}.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)}.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)}.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_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> <input type="hidden" name="Detail2.{normalize-space($linedbID)}.cess_amt" id="Detail2.{normalize-space($linedbID)}.cess_amt" value="{$cess_amt}"></input>
<input type="hidden" name="Detail2.{normalize-space($linedbID)}.gst_code" id="Detail2.{normalize-space($linedbID)}.gst_code" value="{$gst_code}"></input> <input type="hidden" name="Detail2.{normalize-space($linedbID)}.gst_code" id="Detail2.{normalize-space($linedbID)}.gst_code" value="{$gst_code}"></input>
<input type="hidden" name="Detail2.{normalize-space($linedbID)}.itc_type" id="Detail2.{normalize-space($linedbID)}.itc_type" value="{$itc_type}"></input> <input type="hidden" name="Detail2.{normalize-space($linedbID)}.itc_type" id="Detail2.{normalize-space($linedbID)}.itc_type" value="{$itc_type}"></input>
<input type="hidden" name="Detail2.{normalize-space($linedbID)}.itc_igst" id="Detail2.{normalize-space($linedbID)}.itc_igst" value="{$itc_igst}"></input> <input type="hidden" name="Detail2.{normalize-space($linedbID)}.itc_igst" id="Detail2.{normalize-space($linedbID)}.itc_igst" value="{$itc_igst}"></input>
<input type="hidden" name="Detail2.{normalize-space($linedbID)}.itc_cgst" id="Detail2.{normalize-space($linedbID)}.itc_cgst" value="{$itc_cgst}"></input> <input type="hidden" name="Detail2.{normalize-space($linedbID)}.itc_cgst" id="Detail2.{normalize-space($linedbID)}.itc_cgst" value="{$itc_cgst}"></input>
<input type="hidden" name="Detail2.{normalize-space($linedbID)}.itc_sgst" id="Detail2.{normalize-space($linedbID)}.itc_sgst" value="{$itc_sgst}"></input> <input type="hidden" name="Detail2.{normalize-space($linedbID)}.itc_sgst" id="Detail2.{normalize-space($linedbID)}.itc_sgst" value="{$itc_sgst}"></input>
<input type="hidden" name="Detail2.{normalize-space($linedbID)}.itc_cess" id="Detail2.{normalize-space($linedbID)}.itc_cess" value="{$itc_cess}"></input> <input type="hidden" name="Detail2.{normalize-space($linedbID)}.itc_cess" id="Detail2.{normalize-space($linedbID)}.itc_cess" value="{$itc_cess}"></input>
<input type="hidden" name="Detail2.{normalize-space($linedbID)}.gst_rate" id="Detail2.{normalize-space($linedbID)}.gst_rate" value="{$gst_rate}"></input>
<!-- added by kaustubh on 28 sep 2017 -->
<input type="hidden" name="Detail2.{normalize-space($linedbID)}.cust_code" id="Detail2.{normalize-space($linedbID)}.cust_code" value="{$cust_code}"></input>
<input type="hidden" name="Detail2.{normalize-space($linedbID)}.amount" id="Detail2.{normalize-space($linedbID)}.amount" value="{$amount}"></input>
<input type="hidden" name="Detail2.{normalize-space($linedbID)}.reverse_chrg" id="Detail2.{normalize-space($linedbID)}.reverse_chrg" value="{$reverse_chrg}"></input>
<input type="hidden" name="Detail2.{normalize-space($linedbID)}.reas_code" id="Detail2.{normalize-space($linedbID)}.reas_code" value="{$reas_code}"></input>
<input type="hidden" name="Detail2.{normalize-space($linedbID)}.gst_type" id="Detail2.{normalize-space($linedbID)}.gst_type" value="{$gst_type}"></input>
<input type="hidden" name="Detail2.{normalize-space($linedbID)}.prd_code" id="Detail2.{normalize-space($linedbID)}.prd_code" value="{$prd_code}"></input>
<input type="hidden" name="Detail2.{normalize-space($linedbID)}.cust_code" id="Detail2.{normalize-space($linedbID)}.cust_code" value="{$cust_code}"></input>
<input type="hidden" name="Detail2.{normalize-space($linedbID)}.cust_name" id="Detail2.{normalize-space($linedbID)}.cust_name" value="{$cust_name}"></input>
<input type="hidden" name="Detail2.{normalize-space($linedbID)}.lr_no" id="Detail2.{normalize-space($linedbID)}.lr_no" value="{$lr_no}"></input>
<input type="hidden" name="Detail2.{normalize-space($linedbID)}.lr_date" id="Detail2.{normalize-space($linedbID)}.lr_date" value="{$lr_date}"></input>
<input type="hidden" name="Detail2.{normalize-space($linedbID)}.reas_code" id="Detail2.{normalize-space($linedbID)}.reas_code" value="{$reas_code}"></input>
<input type="hidden" name="Detail2.{normalize-space($linedbID)}.ecom_reg_no" id="Detail2.{normalize-space($linedbID)}.ecom_reg_no" value="{$ecom_reg_no}"></input>
<input type="hidden" name="Detail2.{normalize-space($linedbID)}.gst_code" id="Detail2.{normalize-space($linedbID)}.gst_code" value="{$gst_code}"></input>
<input type="hidden" name="Detail2.{normalize-space($linedbID)}.gst_type" id="Detail2.{normalize-space($linedbID)}.gst_type" value="{$gst_type}"></input>
<input type="hidden" name="Detail2.{normalize-space($linedbID)}.order_no" id="Detail2.{normalize-space($linedbID)}.order_no" value="{$order_no}"></input>
</xsl:for-each> </xsl:for-each>
</tbody> </tbody>
...@@ -693,9 +1058,9 @@ ...@@ -693,9 +1058,9 @@
<span id ="spanGSTR2_{$soDbID}" style = "display:inline-block;width:calc(50% - 33px);overflow-x:scroll" onscroll="scrollGstrData('spanGSTR1_{$soDbID}','spanGSTR2_{$soDbID}')"> <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"> <table id ="details_GST{$soDbID}" class="tableClass">
<thead class="table-head"> <thead class="table-head">
<tr> <!-- <tr>
<th nowrap="true" style="border-left:0px solid black !important;" > <th nowrap="true" style="border-left:0px solid black !important;" >
<!-- <Input id='selectAll{$soDbID}' type='checkbox' name='selectAll' custId='{$custDbID}' tableId='{$soDbID}' onClick="checkAll('{$custDbID}','details{$soDbID}','{$soDbID}')"/> --> <Input id='selectAll{$soDbID}' type='checkbox' name='selectAll' custId='{$custDbID}' tableId='{$soDbID}' onClick="checkAll('{$custDbID}','details{$soDbID}','{$soDbID}')"/>
</th> </th>
<th nowrap="true">Sr No</th> <th nowrap="true">Sr No</th>
<th nowrap="true">Status</th> <th nowrap="true">Status</th>
...@@ -722,8 +1087,47 @@ ...@@ -722,8 +1087,47 @@
<th nowrap="true">ITC CGST</th> <th nowrap="true">ITC CGST</th>
<th nowrap="true">ITC SGST</th> <th nowrap="true">ITC SGST</th>
<th nowrap="true">ITC CESS</th> <th nowrap="true">ITC CESS</th>
<th nowrap="true">GST RATE</th>
</tr> -->
<tr>
<th nowrap="true" style="border-left:0px solid black !important;" >
<Input id='selectAll{$soDbID}' type='checkbox' name='selectAll' custId='{$custDbID}' tableId='{$soDbID}' onClick="checkAll('{$custDbID}','details{$soDbID}','{$soDbID}')"/>
</th>
<th nowrap="true">Sr No</th>
<th nowrap="true">Customer Code </th>
<th nowrap="true">Amount</th>
<th nowrap="true">Reverse Charge</th>
<th nowrap="true">Reason Code</th>
<th nowrap="true">Order No</th>
<th nowrap="true">Tran Type</th>
<th nowrap="true">Remarks</th>
<th nowrap="true">GST CODE</th>
<th nowrap="true">GST TYPE</th>
<!-- <th nowrap="true">CGST Amount</th>
<th nowrap="true">SCGT(%)</th>
<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>
<!-- <th nowrap="true">ITC IGST</th>
<th nowrap="true">ITC CGST</th>
<th nowrap="true">ITC SGST</th>
<th nowrap="true">ITC CESS</th>
<th nowrap="true">GST RATE</th> -->
</tr> </tr>
</thead> </thead>
<tbody class="table-body"> <tbody class="table-body">
<xsl:for-each select="gstr2"> <xsl:for-each select="gstr2">
...@@ -731,11 +1135,11 @@ ...@@ -731,11 +1135,11 @@
<xsl:variable name="tran_id"><xsl:value-of select="tran_id"/></xsl:variable> <xsl:variable name="tran_id"><xsl:value-of select="tran_id"/></xsl:variable>
<xsl:variable name="line_no"><xsl:value-of select="line_no"/></xsl:variable> <xsl:variable name="line_no"><xsl:value-of select="line_no"/></xsl:variable>
<xsl:variable name="status"><xsl:value-of select=" status"/></xsl:variable> <xsl:variable name="status"><xsl:value-of select=" status"/></xsl:variable>
<xsl:variable name="igst_perc"><xsl:value-of select="igst_perc"/></xsl:variable> <!-- <xsl:variable name="igst_perc"><xsl:value-of select="igst_perc"/></xsl:variable> -->
<xsl:variable name="igst_amt"><xsl:value-of select="igst_amt"/></xsl:variable> <xsl:variable name="igst_amt"><xsl:value-of select="igst_amt"/></xsl:variable>
<xsl:variable name="cgst_perc"><xsl:value-of select="cgst_perc"/></xsl:variable> <!-- <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="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_perc"><xsl:value-of select="scgt_perc"/></xsl:variable> -->
<xsl:variable name="sgst_amt"><xsl:value-of select="sgst_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_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="cess_amt"><xsl:value-of select="cess_amt"/></xsl:variable>
...@@ -754,6 +1158,23 @@ ...@@ -754,6 +1158,23 @@
<xsl:variable name="itc_cgst"><xsl:value-of select="itc_cgst"/></xsl:variable> <xsl:variable name="itc_cgst"><xsl:value-of select="itc_cgst"/></xsl:variable>
<xsl:variable name="itc_sgst"><xsl:value-of select="itc_sgst"/></xsl:variable> <xsl:variable name="itc_sgst"><xsl:value-of select="itc_sgst"/></xsl:variable>
<xsl:variable name="itc_cess"><xsl:value-of select="itc_cess"/></xsl:variable> <xsl:variable name="itc_cess"><xsl:value-of select="itc_cess"/></xsl:variable>
<xsl:variable name="gst_rate"><xsl:value-of select="gst_rate"/></xsl:variable>
<xsl:variable name="cust_code"><xsl:value-of select="cust_code"/></xsl:variable>
<xsl:variable name="order_no"><xsl:value-of select="order_no"/></xsl:variable>
<xsl:variable name="amount"><xsl:value-of select="amount"/></xsl:variable>
<xsl:variable name="reverse_chrg"><xsl:value-of select="reverse_chrg"/></xsl:variable>
<xsl:variable name="reas_code"><xsl:value-of select="reas_code"/></xsl:variable>
<xsl:variable name="gst_type"><xsl:value-of select="gst_type"/></xsl:variable>
<xsl:variable name="cust_code"><xsl:value-of select="cust_code"/></xsl:variable>
<xsl:variable name="prd_code"><xsl:value-of select="prd_code"/></xsl:variable>
<xsl:variable name="cust_name"><xsl:value-of select="cust_name"/></xsl:variable>
<xsl:variable name="lr_no"><xsl:value-of select="lr_no"/></xsl:variable>
<xsl:variable name="lr_date"><xsl:value-of select="lr_date"/></xsl:variable>
<xsl:variable name="reas_code"><xsl:value-of select="reas_code"/></xsl:variable>
<xsl:variable name="ecom_reg_no"><xsl:value-of select="ecom_reg_no"/></xsl:variable>
<xsl:variable name="gst_code"><xsl:value-of select="gst_code"/></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($linedbID)}.tran_id__gstn" name="Detail2.{normalize-space($linedbID)}.tran_id__gstn" value="{$tran_id}"></input>-->
...@@ -766,7 +1187,7 @@ ...@@ -766,7 +1187,7 @@
<Input type='checkbox' class="selectAll{$soDbID}" name="selectbox" id="selectbox" style = "visibility:hidden" <Input type='checkbox' class="selectAll{$soDbID}" name="selectbox" id="selectbox" style = "visibility:hidden"
onclick = "setChecked(this,'{$linedbID}')" value="true" tabindex="-1" /> onclick = "setChecked(this,'{$linedbID}')" value="true" tabindex="-1" />
</td> </td>
<td nowrap="true"> <!-- <td nowrap="true">
<xsl:value-of select="line_no"/> <xsl:value-of select="line_no"/>
</td> </td>
<td nowrap="true"> <td nowrap="true">
...@@ -838,6 +1259,44 @@ ...@@ -838,6 +1259,44 @@
<td nowrap="true" > <td nowrap="true" >
<xsl:value-of select="itc_cess"/> <xsl:value-of select="itc_cess"/>
</td> </td>
<td nowrap="true" >
<xsl:value-of select="gst_rate"/>
</td> -->
<td nowrap="true">
<xsl:value-of select="line_no"/>
</td>
<td nowrap="true">
<xsl:value-of select="cust_code"/>
</td>
<td nowrap="true">
<xsl:value-of select="amount"/>
</td>
<td nowrap="true">
<xsl:value-of select="reverse_chrg"/>
</td>
<td nowrap="true">
<xsl:value-of select="reverse_chrg"/>
</td>
<td nowrap="true">
<xsl:value-of select="reas_code"/>
</td>
<td nowrap="true">
<xsl:value-of select="gst_code"/>
</td>
<td nowrap="true">
<xsl:value-of select="gst_type"/>
</td>
</tr> </tr>
</xsl:when> </xsl:when>
...@@ -865,11 +1324,11 @@ ...@@ -865,11 +1324,11 @@
<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)}.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)}.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)}.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_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)}.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_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)}.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)}.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)}.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_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> <input type="hidden" name="Detail2.{normalize-space($linedbID)}.cess_amt__gstr" id="Detail2.{normalize-space($linedbID)}.cess_amt__gstr" value="{$cess_amt}"></input>
...@@ -880,7 +1339,38 @@ ...@@ -880,7 +1339,38 @@
<input type="hidden" name="Detail2.{normalize-space($linedbID)}.itc_cgst__gstr" id="Detail2.{normalize-space($linedbID)}.itc_cgst__gstr" value="{$itc_cgst}"></input> <input type="hidden" name="Detail2.{normalize-space($linedbID)}.itc_cgst__gstr" id="Detail2.{normalize-space($linedbID)}.itc_cgst__gstr" value="{$itc_cgst}"></input>
<input type="hidden" name="Detail2.{normalize-space($linedbID)}.itc_sgst__gstr" id="Detail2.{normalize-space($linedbID)}.itc_sgst__gstr" value="{$itc_sgst}"></input> <input type="hidden" name="Detail2.{normalize-space($linedbID)}.itc_sgst__gstr" id="Detail2.{normalize-space($linedbID)}.itc_sgst__gstr" value="{$itc_sgst}"></input>
<input type="hidden" name="Detail2.{normalize-space($linedbID)}.itc_cess__gstr" id="Detail2.{normalize-space($linedbID)}.itc_cess__gstr" value="{$itc_cess}"></input> <input type="hidden" name="Detail2.{normalize-space($linedbID)}.itc_cess__gstr" id="Detail2.{normalize-space($linedbID)}.itc_cess__gstr" value="{$itc_cess}"></input>
<input type="hidden" name="Detail2.{normalize-space($linedbID)}.gst__rate" id="Detail2.{normalize-space($linedbID)}.gst_rate" value="{$gst_rate}"></input>
<!-- added by kaustubh on 29 sep 2017 -->
<input type="hidden" name="Detail2.{normalize-space($linedbID)}.cust_code__gstr" id="Detail2.{normalize-space($linedbID)}.cust_code__gstr" value="{$cust_code}"></input>
<input type="hidden" name="Detail2.{normalize-space($linedbID)}.amount__gstr" id="Detail2.{normalize-space($linedbID)}.amount__gstr" value="{$amount}"></input>
<input type="hidden" name="Detail2.{normalize-space($linedbID)}.reverse_chrg__gstr" id="Detail2.{normalize-space($linedbID)}.reverse_chrg__gstr" value="{$reverse_chrg}"></input>
<input type="hidden" name="Detail2.{normalize-space($linedbID)}.reas_code__gstr" id="Detail2.{normalize-space($linedbID)}.reas_code__gstr" value="{$reas_code}"></input>
<input type="hidden" name="Detail2.{normalize-space($linedbID)}.gst_type__gstr" id="Detail2.{normalize-space($linedbID)}.gst_type__gstr" value="{$gst_type}"></input>
<input type="hidden" name="Detail2.{normalize-space($linedbID)}.prd_code__gstr" id="Detail2.{normalize-space($linedbID)}.prd_code__gstr" value="{$prd_code}"></input>
<input type="hidden" name="Detail2.{normalize-space($linedbID)}.cust_code__gstr" id="Detail2.{normalize-space($linedbID)}.cust_code__gstr" value="{$cust_code}"></input>
<input type="hidden" name="Detail2.{normalize-space($linedbID)}.cust_name__gstr" id="Detail2.{normalize-space($linedbID)}.cust_name__gstr" value="{$cust_name}"></input>
<input type="hidden" name="Detail2.{normalize-space($linedbID)}.lr_no__gstr" id="Detail2.{normalize-space($linedbID)}.lr_no__gstr" value="{$lr_no}"></input>
<input type="hidden" name="Detail2.{normalize-space($linedbID)}.lr_date__gstr" id="Detail2.{normalize-space($linedbID)}.lr_date__gstr" value="{$lr_date}"></input>
<input type="hidden" name="Detail2.{normalize-space($linedbID)}.reas_code__gstr" id="Detail2.{normalize-space($linedbID)}.reas_code__gstr" value="{$reas_code}"></input>
<input type="hidden" name="Detail2.{normalize-space($linedbID)}.ecom_reg_no__gstr" id="Detail2.{normalize-space($linedbID)}.ecom_reg_no__gstr" value="{$ecom_reg_no}"></input>
<input type="hidden" name="Detail2.{normalize-space($linedbID)}.gst_code__gstr" id="Detail2.{normalize-space($linedbID)}.gst_code__gstr" value="{$gst_code}"></input>
<input type="hidden" name="Detail2.{normalize-space($linedbID)}.gst_type__gstr" id="Detail2.{normalize-space($linedbID)}.gst_type__gstr" value="{$gst_type}"></input>
<input type="hidden" name="Detail2.{normalize-space($linedbID)}.order_no__gstr" id="Detail2.{normalize-space($linedbID)}.order_no__gstr" value="{$order_no}"></input>
<xsl:variable name="cust_code"><xsl:value-of select="cust_code"/></xsl:variable>
<xsl:variable name="amount"><xsl:value-of select="amount"/></xsl:variable>
<xsl:variable name="reverse_chrg"><xsl:value-of select="reverse_chrg"/></xsl:variable>
<xsl:variable name="reas_code"><xsl:value-of select="reas_code"/></xsl:variable>
<xsl:variable name="gst_type"><xsl:value-of select="gst_type"/></xsl:variable>
</xsl:for-each> </xsl:for-each>
</tbody> </tbody>
</table> </table>
......
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