Skip to content

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

F17BBAS001 updated XSL for adding new columns 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@106119 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 32b79b47
Hide whitespace changes
Inline Side-by-side
Showing with 174 additions and 350 deletions
webitm-gst/ibase/webitm/ejb/gst/GSTRecoWizEJB.java
View file @ b34733a1
...@@ -702,6 +702,7 @@ public class GSTRecoWizEJB extends ValidatorEJB implements GSTRecoWizEJBLocal, G ...@@ -702,6 +702,7 @@ public class GSTRecoWizEJB extends ValidatorEJB implements GSTRecoWizEJBLocal, G
sql = " SELECT D.TRAN_ID,D.LINE_NO,D.STATUS,D.GS_CODE,D.TAXABLE_AMT,D.IGST_PERC,D.IGST_AMT,D.CGST_PERC,D.CGST_AMT, " sql = " SELECT D.TRAN_ID,D.LINE_NO,D.STATUS,D.GS_CODE,D.TAXABLE_AMT,D.IGST_PERC,D.IGST_AMT,D.CGST_PERC,D.CGST_AMT, "
+ " D.SGST_PERC,D.SGST_AMT,D.GS_DESCR,D.UNIT,D.QUANTITY,D.SUPPLY_TYPE,D.CESS_PERC,D.CESS_AMT,D.REMARKS " + " D.SGST_PERC,D.SGST_AMT,D.GS_DESCR,D.UNIT,D.QUANTITY,D.SUPPLY_TYPE,D.CESS_PERC,D.CESS_AMT,D.REMARKS "
+ " ,H.TAX_REG_NO,H.DOC_NO, H.DOC_DATE " + " ,H.TAX_REG_NO,H.DOC_NO, H.DOC_DATE "
+ " ,H.GST_CODE,D.ITC_TYPE,D.ITC_IGST,D.ITC_CGST,D.ITC_SGST,D.ITC_CESS "
+ " FROM GST_DATA_HDR H, GST_DATA_DET D WHERE H.TRAN_ID = D.TRAN_ID " + " FROM GST_DATA_HDR H, GST_DATA_DET D WHERE H.TRAN_ID = D.TRAN_ID "
+ " AND H.DOC_NO = ? AND H.SUBMIT_STATUS = ? AND H.REC_TYPE = ? " + " AND H.DOC_NO = ? AND H.SUBMIT_STATUS = ? AND H.REC_TYPE = ? "
+ " AND TAX_REG_NO = ? ORDER BY D.GS_CODE "; + " AND TAX_REG_NO = ? ORDER BY D.GS_CODE ";
...@@ -728,6 +729,7 @@ public class GSTRecoWizEJB extends ValidatorEJB implements GSTRecoWizEJBLocal, G ...@@ -728,6 +729,7 @@ public class GSTRecoWizEJB extends ValidatorEJB implements GSTRecoWizEJBLocal, G
else else
{ {
listSize = domIDList.size(); listSize = domIDList.size();
System.out.println("@@listSize["+listSize+"] gstrDataCount["+gstrDataCount+"]");
if(listSize <= gstrDataCount) if(listSize <= gstrDataCount)
{ {
domIDGstr++; domIDGstr++;
...@@ -780,6 +782,13 @@ public class GSTRecoWizEJB extends ValidatorEJB implements GSTRecoWizEJBLocal, G ...@@ -780,6 +782,13 @@ public class GSTRecoWizEJB extends ValidatorEJB implements GSTRecoWizEJBLocal, G
valueXmlString.append("<tax_reg_no>").append("<![CDATA["+checkNullAndTrim(rsDet.getString("TAX_REG_NO"))+"]]>").append("</tax_reg_no>"); valueXmlString.append("<tax_reg_no>").append("<![CDATA["+checkNullAndTrim(rsDet.getString("TAX_REG_NO"))+"]]>").append("</tax_reg_no>");
valueXmlString.append("<rate>").append("<![CDATA[]]>").append("</rate>"); valueXmlString.append("<rate>").append("<![CDATA[]]>").append("</rate>");
valueXmlString.append("<gst_code>").append("<![CDATA["+checkNullAndTrim(rsDet.getString("GST_CODE"))+"]]>").append("</gst_code>");
valueXmlString.append("<itc_type>").append("<![CDATA["+checkNullAndTrim(rsDet.getString("ITC_TYPE"))+"]]>").append("</itc_type>");
valueXmlString.append("<itc_igst>").append("<![CDATA["+checkNullAndTrim(rsDet.getString("ITC_IGST"))+"]]>").append("</itc_igst>");
valueXmlString.append("<itc_cgst>").append("<![CDATA["+checkNullAndTrim(rsDet.getString("ITC_CGST"))+"]]>").append("</itc_cgst>");
valueXmlString.append("<itc_sgst>").append("<![CDATA["+checkNullAndTrim(rsDet.getString("ITC_SGST"))+"]]>").append("</itc_sgst>");
valueXmlString.append("<itc_cess>").append("<![CDATA["+checkNullAndTrim(rsDet.getString("ITC_CESS"))+"]]>").append("</itc_cess>");
valueXmlString.append("</gstr"+j+">"); valueXmlString.append("</gstr"+j+">");
if(j==1) if(j==1)
...@@ -807,6 +816,8 @@ public class GSTRecoWizEJB extends ValidatorEJB implements GSTRecoWizEJBLocal, G ...@@ -807,6 +816,8 @@ public class GSTRecoWizEJB extends ValidatorEJB implements GSTRecoWizEJBLocal, G
{ {
gstrDataCount = gstrDataCount - gstrDataCountTemp; gstrDataCount = gstrDataCount - gstrDataCountTemp;
System.out.println("@@domIDList2--["+domIDList2+"]");
for(int x = 0 ;x<gstrDataCount ; x++) for(int x = 0 ;x<gstrDataCount ; x++)
{ {
valueXmlString.append("<gstr1 domID='"+domIDList2.get(x)+"'>"); valueXmlString.append("<gstr1 domID='"+domIDList2.get(x)+"'>");
...@@ -816,11 +827,15 @@ public class GSTRecoWizEJB extends ValidatorEJB implements GSTRecoWizEJBLocal, G ...@@ -816,11 +827,15 @@ public class GSTRecoWizEJB extends ValidatorEJB implements GSTRecoWizEJBLocal, G
} }
else else
{ {
int tempCnt = gstrDataCount;
gstrDataCount = gstrDataCountTemp - gstrDataCount; gstrDataCount = gstrDataCountTemp - gstrDataCount;
System.out.println("@@domIDList--["+domIDList+"] domIDTemp["+domIDTemp+"]");
for(int x = 0 ;x<gstrDataCount ; x++) for(int x = 0 ;x<gstrDataCount ; x++)
{ {
valueXmlString.append("<gstr"+j+" domID='"+domIDList.get(domIDTemp+x)+"'>"); /*valueXmlString.append("<gstr"+j+" domID='"+domIDList.get(domIDTemp+x)+"'>");*/
valueXmlString.append("<gstr"+j+" domID='"+domIDList.get(tempCnt+x)+"'>");
System.out.println("For making blank row as GSTR2 data not found for this row"); System.out.println("For making blank row as GSTR2 data not found for this row");
valueXmlString.append("</gstr"+j+">"); valueXmlString.append("</gstr"+j+">");
} }
...@@ -891,345 +906,6 @@ public class GSTRecoWizEJB extends ValidatorEJB implements GSTRecoWizEJBLocal, G ...@@ -891,345 +906,6 @@ public class GSTRecoWizEJB extends ValidatorEJB implements GSTRecoWizEJBLocal, G
return valueXmlString.toString(); return valueXmlString.toString();
} }
public int getDiffCount(String gstr1, String gstr2)
{
int diffCount = 0;
try
{
//dom = genericUtility.parseString(gstr1);
//dom = genericUtility.parseString(xmlString);
}
catch(Exception e)
{
}
return diffCount;
}
/*@Override
public String itemChanged(Document dom, Document dom1, Document dom2, String objContext, String currentColumn, String editFlag, String xtraParams) throws RemoteException, ITMException
{
Connection conn = null;
PreparedStatement pstmt = null,pstmtDet = null;
ResultSet rs = null,rsDet = null;
int currentFormNo = 0;
StringBuffer valueXmlString = new StringBuffer();
String currDate = "",userId = "",chgTerm = "",loginSiteCode = "",empCode = "";
String prdCode = "",gstin = "";
String sql = "";
java.util.Map<String,ArrayList> suppMap = new java.util.HashMap<String,ArrayList>();
ArrayList<String> invoiceIDList = new ArrayList<String>();
java.util.Map<String,String> suppDetails = new java.util.HashMap<String,String>();
String orderNo = "",tranID = "",suppCode = "",invoiceID = "",suppName = "",suppAddr = "",suppImgPath = "",submissionType = "";
int id = 1,gstrDataCount = 0,gstrDataCountTemp = 0;
int domIDDetail2 = 0;
int domIDInvoice = 0;
int domIDGstr = 0;
try
{
conn = getConnection();
//currDate = getCurrdateAppFormat();
userId = genericUtility.getValueFromXTRA_PARAMS( xtraParams, "loginCode" );
chgTerm = genericUtility.getValueFromXTRA_PARAMS( xtraParams, "chgTerm" );
loginSiteCode = genericUtility.getValueFromXTRA_PARAMS( xtraParams, "loginSiteCode" );
empCode = checkNullAndTrim(genericUtility.getValueFromXTRA_PARAMS( xtraParams, "loginEmpCode" ));
if(objContext != null && objContext.trim().length() > 0)
{
currentFormNo = Integer.parseInt(objContext);
}
valueXmlString = new StringBuffer("<?xml version = \"1.0\"?><Root><header><editFlag>");
valueXmlString.append(editFlag).append("</editFlag></header>");
valueXmlString = new StringBuffer( "<?xml version=\"1.0\"?><Root><Header><editFlag>" );
valueXmlString.append( editFlag ).append( "</editFlag></Header>" );
System.out.println("currentColumn["+currentColumn+"] && currentFormNo["+currentFormNo+"]");
switch ( currentFormNo )
{
case 1:
{
valueXmlString.append("<Detail1 domID='1' selected = 'N'>\r");
if( currentColumn.trim().equalsIgnoreCase( "itm_default" ))
{
valueXmlString.append("<prd_code>").append("<![CDATA[]]>").append("</prd_code>");
valueXmlString.append("<gstin>").append("<![CDATA[]]>").append("</gstin>");
}
valueXmlString.append("</Detail1>\r\n");
}
break;
case 2 :
{
prdCode = genericUtility.getColumnValue("prd_code", dom1);
gstin = genericUtility.getColumnValue("gstin", dom1);
System.out.println("Period code ["+prdCode+"] gstin ["+gstin+"]");
if( currentColumn.trim().equalsIgnoreCase( "itm_default" ))
{
valueXmlString.append("<Detail2 domID='0'>");
valueXmlString.append("<prd_code>").append("<![CDATA["+prdCode+"]]>").append("</prd_code>");
valueXmlString.append("<gstin>").append("<![CDATA["+gstin+"]]>").append("</gstin>");
valueXmlString.append("</Detail2>");
sql = " SELECT P.SUPP_CODE,I.INVOICE_ID FROM PORCP P, SUPPLIER S, INVOICE I, GST_DATA_HDR G WHERE "
+" P.SUPP_CODE = S.SUPP_CODE "
+" AND P.INVOICE_NO = I.INVOICE_ID "
+" AND G.ORDER_NO = P.INVOICE_NO"
+" AND G.TAX_REG_NO = ? AND G.PRD_CODE = ? AND G.REC_TYPE = '1' AND G.RECO_STATUS ! = 'M' ";
sql = " SELECT P.SUPP_CODE,I.INVOICE_ID FROM PORCP P, SUPPLIER S, INVOICE I, GST_DATA_HDR G WHERE "
+" P.SUPP_CODE = S.SUPP_CODE "
+" AND P.INVOICE_NO = I.INVOICE_ID "
+" AND G.DOC_NO = P.INVOICE_NO"
+" AND G.TAX_REG_NO = ? AND G.PRD_CODE = ? AND G.SUBMISSION_TYPE = 'P' AND G.RECO_STATUS ! = 'M' ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, gstin);
pstmt.setString(2, prdCode);
rs = pstmt.executeQuery();
while (rs.next())
{
suppCode = checkNullAndTrim(rs.getString("SUPP_CODE"));
invoiceID = rs.getString("INVOICE_ID");
if (suppMap.containsKey(suppCode))
{
invoiceIDList = (ArrayList) suppMap.get(suppCode);
invoiceIDList.add(invoiceID);
suppMap.put(suppCode, invoiceIDList);
}
else
{
invoiceIDList = new ArrayList();
invoiceIDList.add(invoiceID);
suppMap.put(suppCode, invoiceIDList);
}
}
if ( rs != null )
{
rs.close();rs = null;
}
if( pstmt != null )
{
pstmt.close();pstmt = null;
}
java.util.Iterator itr = suppMap.entrySet().iterator();
while(itr.hasNext())
{
Map.Entry pair = (Map.Entry)itr.next();
suppCode = (String) pair.getKey();
invoiceIDList = (ArrayList) pair.getValue();
System.out.println("SuppCode["+suppCode+"]-->>Invoice ID List ["+invoiceIDList+"]");
domIDDetail2++;
valueXmlString.append("<Detail2 domID='"+domIDDetail2+"' selected = 'N'>");//Start Multiple suppliers
sql = " SELECT SH_NAME,ADDR1 FROM SUPPLIER WHERE SUPP_CODE = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, suppCode);
rs = pstmt.executeQuery();
if (rs.next())
{
suppName = checkNullAndTrim(rs.getString("SH_NAME"));
suppAddr = checkNullAndTrim(rs.getString("ADDR1"));
}
if(rs!=null)
{
rs.close();rs=null;
}
if(pstmt!=null)
{
pstmt.close();pstmt=null;
}
DistUtility utility = new DistUtility();
suppImgPath = utility.getImagePath("w_gstWiz", suppCode , suppName , "customer", null);
valueXmlString.append("<supp_code>").append("<![CDATA["+suppCode+"]]>").append("</supp_code>");
valueXmlString.append("<supp_name>").append("<![CDATA["+suppName+"]]>").append("</supp_name>");
valueXmlString.append("<supp_addr>").append("<![CDATA["+suppAddr+"]]>").append("</supp_addr>");
valueXmlString.append("<supp_img_path>").append("<![CDATA["+suppImgPath+"]]>").append("</supp_img_path>");
valueXmlString.append("<Invoices>");//Start Multiple invoice inside single supplier
for(int i = 0; i< invoiceIDList.size(); i++)
{
domIDInvoice = i + 1;
invoiceID = (String) invoiceIDList.get(i);
valueXmlString.append("<invoice domID='"+domIDInvoice+"'>");
sql = " SELECT I.INVOICE_ID,I.TRAN_DATE,I.SALE_ORDER,I.INV_AMT,I.TAX_AMT,G.RECO_STATUS FROM INVOICE I,GST_DATA_HDR G "
+ " WHERE I.INVOICE_ID = G.ORDER_NO AND G.REC_TYPE = '1' AND I.INVOICE_ID = ? ";
sql = " SELECT I.INVOICE_ID,I.TRAN_DATE,I.SALE_ORDER,I.INV_AMT,I.TAX_AMT,G.RECO_STATUS FROM INVOICE I,GST_DATA_HDR G "
+ " WHERE I.INVOICE_ID = G.DOC_NO AND G.SUBMISSION_TYPE = 'P' AND I.INVOICE_ID = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, invoiceID);
rs = pstmt.executeQuery();
if (rs.next())
{
valueXmlString.append("<invoice_id>").append("<![CDATA["+invoiceID+"]]>").append("</invoice_id>");
valueXmlString.append("<tran_date>").append("<![CDATA["+genericUtility.getValidDateString(rs.getString("tran_date"), genericUtility.getDBDateTimeFormat(), genericUtility.getApplDateFormat())+"]]>").append("</tran_date>");
valueXmlString.append("<sale_order>").append("<![CDATA["+rs.getString("SALE_ORDER")+"]]>").append("</sale_order>");
valueXmlString.append("<inv_amt>").append("<![CDATA["+rs.getString("INV_AMT")+"]]>").append("</inv_amt>");
valueXmlString.append("<tax_amt>").append("<![CDATA["+rs.getString("TAX_AMT")+"]]>").append("</tax_amt>");
valueXmlString.append("<reco_status>").append("<![CDATA["+rs.getString("RECO_STATUS")+"]]>").append("</reco_status>");
}
if(rs!=null)
{
rs.close();rs=null;
}
if(pstmt!=null)
{
pstmt.close();pstmt=null;
}
for(int j = 1 ;j<=2 ; j++)
{
gstrDataCount = 0;
domIDGstr = 0;
if(j==1)
{
submissionType = "P";
}
if(j==2)
{
submissionType = "D";
}
sql = " SELECT D.TRAN_ID,D.LINE_NO,D.STATUS,D.GS_CODE,D.TAXABLE_AMT,D.IGST_PERC,D.IGST_AMT,D.CGST_PERC,D.CGST_AMT, "
+ " D.SGST_PERC,D.SGST_AMT,D.GS_DESCR,D.UNIT,D.QUANTITY,D.SUPPLY_TYPE,D.CESS_PERC,D.CESS_AMT,D.REMARKS "
+ " FROM GST_DATA_HDR H, GST_DATA_DET D WHERE H.TRAN_ID = D.TRAN_ID "
+ " AND H.ORDER_NO = ? AND H.REC_TYPE = ? ORDER BY D.GS_CODE ";
sql = " SELECT D.TRAN_ID,D.LINE_NO,D.STATUS,D.GS_CODE,D.TAXABLE_AMT,D.IGST_PERC,D.IGST_AMT,D.CGST_PERC,D.CGST_AMT, "
+ " D.SGST_PERC,D.SGST_AMT,D.GS_DESCR,D.UNIT,D.QUANTITY,D.SUPPLY_TYPE,D.CESS_PERC,D.CESS_AMT,D.REMARKS "
+ " FROM GST_DATA_HDR H, GST_DATA_DET D WHERE H.TRAN_ID = D.TRAN_ID "
+ " AND H.DOC_NO = ? AND H.SUBMISSION_TYPE = ? ORDER BY D.GS_CODE ";
pstmtDet = conn.prepareStatement(sql);
pstmtDet.setString(1, invoiceID);
//pstmtDet.setString(2, String.valueOf(j));
pstmtDet.setString(2, submissionType);
rsDet = pstmtDet.executeQuery();
while (rsDet.next())
{
gstrDataCount++;
domIDGstr++;
valueXmlString.append("<gstr"+j+" domID='"+domIDGstr+"'>");
valueXmlString.append("<tran_id>").append("<![CDATA["+rsDet.getString("TRAN_ID")+"]]>").append("</tran_id>");
valueXmlString.append("<line_no>").append("<![CDATA["+rsDet.getString("LINE_NO")+"]]>").append("</line_no>");
valueXmlString.append("<status>").append("<![CDATA["+rsDet.getString("STATUS")+"]]>").append("</status>");
valueXmlString.append("<gs_code>").append("<![CDATA["+rsDet.getString("GS_CODE")+"]]>").append("</gs_code>");
valueXmlString.append("<taxable_amt>").append("<![CDATA["+rsDet.getString("TAXABLE_AMT")+"]]>").append("</taxable_amt>");
valueXmlString.append("<igst_perc>").append("<![CDATA["+rsDet.getString("IGST_PERC")+"]]>").append("</igst_perc>");
valueXmlString.append("<igst_amt>").append("<![CDATA["+rsDet.getString("IGST_AMT")+"]]>").append("</igst_amt>");
valueXmlString.append("<cgst_perc>").append("<![CDATA["+rsDet.getString("CGST_PERC")+"]]>").append("</cgst_perc>");
valueXmlString.append("<cgst_amt>").append("<![CDATA["+rsDet.getString("CGST_AMT")+"]]>").append("</cgst_amt>");
valueXmlString.append("<sgst_perc>").append("<![CDATA["+rsDet.getString("SGST_PERC")+"]]>").append("</sgst_perc>");
valueXmlString.append("<sgst_amt>").append("<![CDATA["+rsDet.getString("SGST_AMT")+"]]>").append("</sgst_amt>");
valueXmlString.append("<gs_descr>").append("<![CDATA["+rsDet.getString("GS_DESCR")+"]]>").append("</gs_descr>");
valueXmlString.append("<unit>").append("<![CDATA["+rsDet.getString("UNIT")+"]]>").append("</unit>");
valueXmlString.append("<quantity>").append("<![CDATA["+rsDet.getString("QUANTITY")+"]]>").append("</quantity>");
valueXmlString.append("<supply_type>").append("<![CDATA["+rsDet.getString("SUPPLY_TYPE")+"]]>").append("</supply_type>");
valueXmlString.append("<cess_perc>").append("<![CDATA["+rsDet.getString("CESS_PERC")+"]]>").append("</cess_perc>");
valueXmlString.append("<cess_amt>").append("<![CDATA["+rsDet.getString("CESS_AMT")+"]]>").append("</cess_amt>");
valueXmlString.append("<remarks>").append("<![CDATA["+rsDet.getString("REMARKS")+"]]>").append("</remarks>");
valueXmlString.append("</gstr"+j+">");
}
if ( rsDet != null )
{
rsDet.close();rsDet = null;
}
if( pstmtDet != null )
{
pstmtDet.close();pstmtDet = null;
}
System.out.println("J-->["+j+"] and gstrDataCount--["+gstrDataCount+"]");
if(j == 2)
{
gstrDataCount = gstrDataCountTemp - gstrDataCount;
for(int x = 1 ;x<=gstrDataCount ; x++)
{
valueXmlString.append("<gstr"+j+">");
System.out.println("For making blank row as GSTR2 data not found for this row");
valueXmlString.append("</gstr"+j+">");
}
}
gstrDataCountTemp = gstrDataCount;
}
valueXmlString.append("<data_match>").append("<![CDATA["+gstrDataCount+"]]>").append("</data_match>");
valueXmlString.append("</invoice>");
}
valueXmlString.append("</Invoices>"); //End Multiple invoice inside single supplier
valueXmlString.append("</Detail2>");//End Multiple suppliers
}
}
}
break;
}
}
catch(Exception e)
{
System.out.println("Exception: itemChange GSTWizardEJB: ==>\n"+e.getMessage());
e.printStackTrace();
throw new ITMException(e);
}
finally
{
try
{
if(rs != null)
{
rs.close();rs = null;
}
if(pstmt != null)
{
pstmt.close();pstmt = null;
}
if(conn != null)
{
conn.close();conn = null;
}
}
catch(Exception d)
{
d.printStackTrace();
throw new ITMException(d);
}
}
valueXmlString.append("</Root>");
return valueXmlString.toString();
}*/
/** /**
* @param input String * @param input String
* @return * @return
......
webitm-gst/module-resource/web/xsl/wizard/gstreco_wiz2_wiz_en_US_A.xsl
View file @ b34733a1
...@@ -284,6 +284,73 @@ ...@@ -284,6 +284,73 @@
</td> </td>
<td nowrap="true" id = "sgst_amt__gstr" style = ""> <td nowrap="true" id = "sgst_amt__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 = "">
ITC Type
</td>
<td nowrap="true" id = "itc_type" style = "">
</td>
<td nowrap="true" id = "itc_type__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>
</tr> </tr>
</tbody> </tbody>
...@@ -423,6 +490,13 @@ ...@@ -423,6 +490,13 @@
<th nowrap="true" style = "display:none">Rate</th> <th nowrap="true" style = "display:none">Rate</th>
<th nowrap="true" style = "display:none">Taxable Amount</th> <th nowrap="true" style = "display:none">Taxable Amount</th>
<th nowrap="true">GST CODE</th>
<th nowrap="true">ITC TYPE</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>
</tr> </tr>
</thead> </thead>
<tbody class="table-body"> <tbody class="table-body">
...@@ -448,9 +522,14 @@ ...@@ -448,9 +522,14 @@
<xsl:variable name="rate"><xsl:value-of select="rate"/></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> <xsl:variable name="taxable_amt"><xsl:value-of select="taxable_amt"/></xsl:variable>
<xsl:variable name="gst_code"><xsl:value-of select="gst_code"/></xsl:variable>
<xsl:variable name="itc_type"><xsl:value-of select="itc_type"/></xsl:variable>
<xsl:variable name="itc_igst"><xsl:value-of select="itc_igst"/></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_cess"><xsl:value-of select="itc_cess"/></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>-->
<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:choose>
<xsl:when test="line_no"> <xsl:when test="line_no">
...@@ -516,6 +595,25 @@ ...@@ -516,6 +595,25 @@
<xsl:value-of select="taxable_amt"/> <xsl:value-of select="taxable_amt"/>
</td> </td>
<td nowrap="true" >
<xsl:value-of select="gst_code"/>
</td>
<td nowrap="true" >
<xsl:value-of select="itc_type"/>
</td>
<td nowrap="true" >
<xsl:value-of select="itc_igst"/>
</td>
<td nowrap="true" >
<xsl:value-of select="itc_cgst"/>
</td>
<td nowrap="true" >
<xsl:value-of select="itc_sgst"/>
</td>
<td nowrap="true" >
<xsl:value-of select="itc_cess"/>
</td>
</tr> </tr>
</xsl:when> </xsl:when>
<xsl:otherwise> <xsl:otherwise>
...@@ -524,14 +622,16 @@ ...@@ -524,14 +622,16 @@
<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)" value="false" tabindex="-1" disabled = "true" /> onclick = "setChecked(this)" value="false" tabindex="-1" disabled = "true" />
</td> </td>
<td colspan = "10"> <td colspan = "17">
Purchase data not found for this record Purchase data not found for this record
</td> </td>
</tr> </tr>
</xsl:otherwise> </xsl:otherwise>
</xsl:choose> </xsl:choose>
<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)}.data_match" name="Detail2.{normalize-space($linedbID)}.data_match" value=""></input>
<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)}.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_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)}.doc_date" id="Detail2.{normalize-space($linedbID)}.doc_date" value="{$doc_date}"></input>
...@@ -549,7 +649,14 @@ ...@@ -549,7 +649,14 @@
<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)}.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_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_cess" id="Detail2.{normalize-space($linedbID)}.itc_cess" value="{$itc_cess}"></input>
</xsl:for-each> </xsl:for-each>
</tbody> </tbody>
</table> </table>
...@@ -608,6 +715,14 @@ ...@@ -608,6 +715,14 @@
<th nowrap="true" style = "display:none">Quantity</th> <th nowrap="true" style = "display:none">Quantity</th>
<th nowrap="true" style = "display:none">Rate</th> <th nowrap="true" style = "display:none">Rate</th>
<th nowrap="true" style = "display:none">Taxable Amount</th> <th nowrap="true" style = "display:none">Taxable Amount</th>
<th nowrap="true">GST CODE</th>
<th nowrap="true">ITC TYPE</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>
</tr> </tr>
</thead> </thead>
<tbody class="table-body"> <tbody class="table-body">
...@@ -633,9 +748,15 @@ ...@@ -633,9 +748,15 @@
<xsl:variable name="rate"><xsl:value-of select="rate"/></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> <xsl:variable name="taxable_amt"><xsl:value-of select="taxable_amt"/></xsl:variable>
<xsl:variable name="gst_code"><xsl:value-of select="gst_code"/></xsl:variable>
<xsl:variable name="itc_type"><xsl:value-of select="itc_type"/></xsl:variable>
<xsl:variable name="itc_igst"><xsl:value-of select="itc_igst"/></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_cess"><xsl:value-of select="itc_cess"/></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>-->
<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:choose>
<xsl:when test="line_no"> <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}');"
...@@ -699,6 +820,25 @@ ...@@ -699,6 +820,25 @@
<xsl:value-of select="taxable_amt"/> <xsl:value-of select="taxable_amt"/>
</td> </td>
<td nowrap="true" >
<xsl:value-of select="gst_code"/>
</td>
<td nowrap="true" >
<xsl:value-of select="itc_type"/>
</td>
<td nowrap="true" >
<xsl:value-of select="itc_igst"/>
</td>
<td nowrap="true" >
<xsl:value-of select="itc_cgst"/>
</td>
<td nowrap="true" >
<xsl:value-of select="itc_sgst"/>
</td>
<td nowrap="true" >
<xsl:value-of select="itc_cess"/>
</td>
</tr> </tr>
</xsl:when> </xsl:when>
<xsl:otherwise> <xsl:otherwise>
...@@ -707,13 +847,15 @@ ...@@ -707,13 +847,15 @@
<Input type='checkbox' class="selectAll{$soDbID}" name="selectbox" id="selectbox" <Input type='checkbox' class="selectAll{$soDbID}" name="selectbox" id="selectbox"
onclick = "setChecked(this)" value="false" tabindex="-1" disabled = "true" style = "visibility:hidden" /> onclick = "setChecked(this)" value="false" tabindex="-1" disabled = "true" style = "visibility:hidden" />
</td> </td>
<td colspan = "10"> <td colspan = "17">
Downloaded data not found for this record Downloaded data not found for this record
</td> </td>
</tr> </tr>
</xsl:otherwise> </xsl:otherwise>
</xsl:choose> </xsl:choose>
<input type="hidden" name="Detail2.{normalize-space($linedbID)}.tran_id__gstn" id="Detail2.{normalize-space($linedbID)}.tran_id__gstn" value="{$tran_id}"></input>
<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)}.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_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)}.doc_date" id="Detail2.{normalize-space($linedbID)}.doc_date__gstr" value="{$doc_date}"></input>
...@@ -731,8 +873,14 @@ ...@@ -731,8 +873,14 @@
<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>
<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)}.itc_type__gstr" id="Detail2.{normalize-space($linedbID)}.itc_type__gstr" value="{$itc_type}"></input>
<input type="hidden" name="Detail2.{normalize-space($linedbID)}.itc_igst__gstr" id="Detail2.{normalize-space($linedbID)}.itc_igst__gstr" value="{$itc_igst}"></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_cess__gstr" id="Detail2.{normalize-space($linedbID)}.itc_cess__gstr" value="{$itc_cess}"></input>
</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