Skip to content

B
business-java
Commit b01b83b7 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@171842 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 57f06c92
Show whitespace changes
Inline Side-by-side
Showing with 103 additions and 9 deletions
webitm-gst/module-resource/web/js/gstRecoWizard.js
View file @ b01b83b7
...@@ -1268,6 +1268,7 @@ function setActionVal(action) ...@@ -1268,6 +1268,7 @@ function setActionVal(action)
function openAccordion(curAccorObj,id) function openAccordion(curAccorObj,id)
{ {
var accordionList = document.getElementsByClassName("accordionSO"); var accordionList = document.getElementsByClassName("accordionSO");
//alert("accordionList"+accordionList)
for(var i=0; i<accordionList.length; i++) for(var i=0; i<accordionList.length; i++)
{ {
accordionList[i].classList.remove("active"); accordionList[i].classList.remove("active");
...@@ -1340,11 +1341,11 @@ function setColors(curAccorObj,id) ...@@ -1340,11 +1341,11 @@ function setColors(curAccorObj,id)
} }
console.log("TR ID---->["+trLeft[i].id+"]"); console.log("TR ID---->["+trLeft[i].id+"]");
console.log("misMatchCnt---->["+misMatchCnt+"]");
if(trLeft[i].id != null && trLeft[i].id != "" && trLeft[i].id.length > 0 ) if(trLeft[i].id != null && trLeft[i].id != "" && trLeft[i].id.length > 0 )
{ {
var rowID = trLeft[i].id; var rowID = trLeft[i].id;
//alert("rowID["+rowID+"] rowMisMatch["+rowMisMatch+"]"); // alert("rowID["+rowID+"] rowMisMatch["+rowMisMatch+"]");
if(rowMisMatch > 0) if(rowMisMatch > 0)
{ {
document.getElementById("misMatch."+id+"."+rowID).style.visibility = "visible"; document.getElementById("misMatch."+id+"."+rowID).style.visibility = "visible";
...@@ -1532,7 +1533,8 @@ function showGSTRData(id) ...@@ -1532,7 +1533,8 @@ function showGSTRData(id)
document.getElementById("showDataMismatch").style.display = "block"; document.getElementById("showDataMismatch").style.display = "block";
document.getElementById("showDataMismatch").style.position = "bottom: 25px"; document.getElementById("showDataMismatch").style.position = "bottom: 25px";
var gstin = document.getElementById("Detail2."+id+".tax_reg_no").value; /*commented by kaustubh on 28 sep 2017*/
/*var gstin = document.getElementById("Detail2."+id+".tax_reg_no").value;
var gstin__gstr = document.getElementById("Detail2."+id+".tax_reg_no__gstr").value; var gstin__gstr = document.getElementById("Detail2."+id+".tax_reg_no__gstr").value;
var invoice_no = document.getElementById("Detail2."+id+".doc_no").value; var invoice_no = document.getElementById("Detail2."+id+".doc_no").value;
var invoice_no__gstr = document.getElementById("Detail2."+id+".doc_no__gstr").value; var invoice_no__gstr = document.getElementById("Detail2."+id+".doc_no__gstr").value;
...@@ -1551,10 +1553,47 @@ function showGSTRData(id) ...@@ -1551,10 +1553,47 @@ function showGSTRData(id)
var cgst_amt = document.getElementById("Detail2."+id+".cgst_amt").value; var cgst_amt = document.getElementById("Detail2."+id+".cgst_amt").value;
var cgst_amt__gstr = document.getElementById("Detail2."+id+".cgst_amt__gstr").value; var cgst_amt__gstr = document.getElementById("Detail2."+id+".cgst_amt__gstr").value;
var sgst_amt = document.getElementById("Detail2."+id+".sgst_amt").value; var sgst_amt = document.getElementById("Detail2."+id+".sgst_amt").value;
var sgst_amt__gstr = document.getElementById("Detail2."+id+".sgst_amt__gstr").value; var sgst_amt__gstr = document.getElementById("Detail2."+id+".sgst_amt__gstr").value;*/
var gstin = document.getElementById("Detail2."+id+".tax_reg_no").value;
var gstin__gstr = document.getElementById("Detail2."+id+".tax_reg_no__gstr").value;
var doc_no = document.getElementById("Detail2."+id+".doc_no").value;
var doc_no__gstr = document.getElementById("Detail2."+id+".doc_no__gstr").value;
var doc_date = document.getElementById("Detail2."+id+".doc_date").value;
var doc_date__gstr = document.getElementById("Detail2."+id+".doc_date__gstr").value;
var cust_code = document.getElementById("Detail2."+id+".cust_code").value;
var cust_code__gstr = document.getElementById("Detail2."+id+".cust_code__gstr").value;
var amount = document.getElementById("Detail2."+id+".amount").value;
var amount__gstr = document.getElementById("Detail2."+id+".amount__gstr").value;
var reverse_chrg = document.getElementById("Detail2."+id+".reverse_chrg").value;
var reverse_chrg__gstr = document.getElementById("Detail2."+id+".reverse_chrg__gstr").value;
var reas_code = document.getElementById("Detail2."+id+".reas_code").value;
var reas_code__gstr = document.getElementById("Detail2."+id+".reas_code__gstr").value;
var order_no = document.getElementById("Detail2."+id+".order_no").value;
var order_no__gstr = document.getElementById("Detail2."+id+".order_no__gstr").value;
document.getElementById("gstin").innerHTML = gstin; document.getElementById("gstin").innerHTML = gstin;
document.getElementById("gstin__gstr").innerHTML = gstin__gstr; document.getElementById("gstin__gstr").innerHTML = gstin__gstr;
document.getElementById("doc_no").innerHTML = doc_no;
document.getElementById("doc_no__gstr").innerHTML = doc_no__gstr;
document.getElementById("doc_date").innerHTML = doc_date;
document.getElementById("doc_date__gstr").innerHTML = doc_date__gstr;
document.getElementById("cust_code").innerHTML = cust_code;
document.getElementById("cust_code__gstr").innerHTML = cust_code__gstr;
document.getElementById("amount").innerHTML = amount;
document.getElementById("amount__gstr").innerHTML = amount__gstr;
document.getElementById("reverse_chrg").innerHTML = reverse_chrg;
document.getElementById("reverse_chrg__gstr").innerHTML = reverse_chrg__gstr;
document.getElementById("reas_code").innerHTML = reas_code;
document.getElementById("reas_code__gstr").innerHTML = reas_code__gstr;
document.getElementById("order_no").innerHTML = order_no;
document.getElementById("order_no__gstr").innerHTML = order_no__gstr;
/*commented by kaustubh on 28 sep 2017*/
/*document.getElementById("gstin").innerHTML = gstin;
document.getElementById("gstin__gstr").innerHTML = gstin__gstr;
document.getElementById("doc_no").innerHTML = invoice_no; document.getElementById("doc_no").innerHTML = invoice_no;
document.getElementById("doc_no__gstr").innerHTML = invoice_no__gstr; document.getElementById("doc_no__gstr").innerHTML = invoice_no__gstr;
document.getElementById("doc_date").innerHTML = doc_date; document.getElementById("doc_date").innerHTML = doc_date;
...@@ -1572,9 +1611,23 @@ function showGSTRData(id) ...@@ -1572,9 +1611,23 @@ function showGSTRData(id)
document.getElementById("cgst_amt").innerHTML = cgst_amt; document.getElementById("cgst_amt").innerHTML = cgst_amt;
document.getElementById("cgst_amt__gstr").innerHTML = cgst_amt__gstr; document.getElementById("cgst_amt__gstr").innerHTML = cgst_amt__gstr;
document.getElementById("sgst_amt").innerHTML = sgst_amt; document.getElementById("sgst_amt").innerHTML = sgst_amt;
document.getElementById("sgst_amt__gstr").innerHTML = sgst_amt__gstr; document.getElementById("sgst_amt__gstr").innerHTML = sgst_amt__gstr;*/
console.log("gstin["+gstin+"]====gstin__gstr["+gstin__gstr+"]"); console.log("amount["+amount+"]====amount__gstr["+amount__gstr+"]");
/* commented by kaustubh on 4 oct 2017 */
/*console.log("gstin["+gstin+"]====gstin__gstr["+gstin__gstr+"]");
console.log("doc_no["+doc_no+"]====doc_no__gstr["+doc_no__gstr+"]");
console.log("doc_date["+doc_date+"]====doc_date__gstr["+doc_date__gstr+"]");
console.log("cust_code["+cust_code+"]====cust_code__gstr["+cust_code__gstr+"]");
console.log("reverse_chrg["+reverse_chrg+"]====reverse_chrg__gstr["+reverse_chrg__gstr+"]");
console.log("order_no["+order_no+"]====order_no__gstr["+order_no__gstr+"]");*/
/*commeneted by kaustubh on 29 sep 2017 */
/*console.log("gstin["+gstin+"]====gstin__gstr["+gstin__gstr+"]");
console.log("invoice_no["+invoice_no+"]====invoice_no["+invoice_no__gstr+"]"); console.log("invoice_no["+invoice_no+"]====invoice_no["+invoice_no__gstr+"]");
console.log("doc_date["+doc_date+"]====doc_date__gstr["+doc_date__gstr+"]"); console.log("doc_date["+doc_date+"]====doc_date__gstr["+doc_date__gstr+"]");
console.log("gs_code["+gs_code+"]====gs_code__gstr["+gs_code__gstr+"]"); console.log("gs_code["+gs_code+"]====gs_code__gstr["+gs_code__gstr+"]");
...@@ -1583,9 +1636,50 @@ function showGSTRData(id) ...@@ -1583,9 +1636,50 @@ function showGSTRData(id)
console.log("taxable_amt["+taxable_amt+"]====taxable_amt__gstr["+taxable_amt__gstr+"]"); console.log("taxable_amt["+taxable_amt+"]====taxable_amt__gstr["+taxable_amt__gstr+"]");
console.log("igst_amt["+igst_amt+"]====igst_amt__gstr["+igst_amt__gstr+"]"); console.log("igst_amt["+igst_amt+"]====igst_amt__gstr["+igst_amt__gstr+"]");
console.log("cgst_amt["+cgst_amt+"]====cgst_amt__gstr["+cgst_amt__gstr+"]"); console.log("cgst_amt["+cgst_amt+"]====cgst_amt__gstr["+cgst_amt__gstr+"]");
console.log("sgst_amt["+sgst_amt+"]====sgst_amt["+sgst_amt__gstr+"]"); console.log("sgst_amt["+sgst_amt+"]====sgst_amt["+sgst_amt__gstr+"]");*/
if(gstin != gstin__gstr) if(amount != amount__gstr)
{
document.getElementById("amount").style.background = "#ffe6e6";
document.getElementById("amount__gstr").style.background = "#ffe6e6";
}
/*if(gstin != gstin__gstr)
{
document.getElementById("gstin").style.background = "#ffe6e6";
document.getElementById("gstin__gstr").style.background = "#ffe6e6";
}
if(doc_no != doc_no__gstr)
{
document.getElementById("doc_no").style.background = "#ffe6e6";
document.getElementById("doc_no__gstr").style.background = "#ffe6e6";
}
if(doc_date != doc_date__gstr)
{
document.getElementById("doc_date").style.background = "#ffe6e6";
document.getElementById("doc_date__gstr").style.background = "#ffe6e6";
}
if(cust_code != cust_code__gstr)
{
document.getElementById("cust_code").style.background = "#ffe6e6";
document.getElementById("cust_code__gstr").style.background = "#ffe6e6";
}
if(reverse_chrg != reverse_chrg__gstr)
{
document.getElementById("reverse_chrg").style.background = "#ffe6e6";
document.getElementById("reverse_chrg__gstr").style.background = "#ffe6e6";
}
if(order_no != order_no__gstr)
{
document.getElementById("order_no").style.background = "#ffe6e6";
document.getElementById("order_no__gstr").style.background = "#ffe6e6";
}*/
/*commeneted by kaustubh on 29 sep 2017 */
/*if(gstin != gstin__gstr)
{ {
document.getElementById("gstin").style.background = "#ffe6e6"; document.getElementById("gstin").style.background = "#ffe6e6";
document.getElementById("gstin__gstr").style.background = "#ffe6e6"; document.getElementById("gstin__gstr").style.background = "#ffe6e6";
...@@ -1634,6 +1728,6 @@ function showGSTRData(id) ...@@ -1634,6 +1728,6 @@ function showGSTRData(id)
{ {
document.getElementById("sgst_amt").style.background = "#ffe6e6"; document.getElementById("sgst_amt").style.background = "#ffe6e6";
document.getElementById("sgst_amt__gstr").style.background = "#ffe6e6"; document.getElementById("sgst_amt__gstr").style.background = "#ffe6e6";
} }*/
} }
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