Commit a1c68fb3 authored by ssalve's avatar ssalve

done changes for ecom gstin number on 28JUL2017


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@106412 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 33932919
......@@ -402,10 +402,11 @@ public class GstrPosEJB extends ValidatorEJB implements GstrPosEJBRemote,GstrPos
if("I".equalsIgnoreCase(gstType)) //B2B Supplies, with SEZ and deemed exports
{
if( taxRegNo.length() > 0
if((taxRegNo.length() > 0)
&& ("N".equalsIgnoreCase(reverseCharge) || "".equalsIgnoreCase(reverseCharge))
&& ("R".equalsIgnoreCase(docType) || "".equalsIgnoreCase(docType))
&& ("".equalsIgnoreCase(eCommGtin) || eCommGtin.length() <=0))
&& ("R".equalsIgnoreCase(docType) || "".equalsIgnoreCase(docType)))
//changes by sarita on 28JUL2017
//&& ("".equalsIgnoreCase(eCommGtin) || eCommGtin.length() <=0))
{
tranType = "01";
}
......@@ -418,22 +419,25 @@ public class GstrPosEJB extends ValidatorEJB implements GstrPosEJBRemote,GstrPos
}
else if((taxRegNo.length() > 0)
&& ("N".equalsIgnoreCase(reverseCharge) || "".equalsIgnoreCase(reverseCharge))
&& ("Z".equalsIgnoreCase(docType) || "".equalsIgnoreCase(docType))
&& (!"".equalsIgnoreCase(eCommGtin) && eCommGtin.length() > 0) && isWithPay)
&& ("Z".equalsIgnoreCase(docType) || "".equalsIgnoreCase(docType) && isWithPay))
//changes by sarita on 28JUL2017
//&& (!"".equalsIgnoreCase(eCommGtin) && eCommGtin.length() > 0) )
{
tranType = "08";
}
else if((taxRegNo.length() > 0)
&& ("N".equalsIgnoreCase(reverseCharge) || "".equalsIgnoreCase(reverseCharge))
&& ("Z".equalsIgnoreCase(docType) || "".equalsIgnoreCase(docType))
&& (!"".equalsIgnoreCase(eCommGtin) && eCommGtin.length() > 0) && !isWithPay)
&& ("Z".equalsIgnoreCase(docType) || "".equalsIgnoreCase(docType) && !isWithPay))
//changes by sarita on 28JUL2017
//&& (!"".equalsIgnoreCase(eCommGtin) && eCommGtin.length() > 0) )
{
tranType = "09";
}
else if((taxRegNo.length() > 0)
&& ("N".equalsIgnoreCase(reverseCharge) || "".equalsIgnoreCase(reverseCharge))
&& ("DE".equalsIgnoreCase(docType) || "".equalsIgnoreCase(docType))
&& (!"".equalsIgnoreCase(eCommGtin) && eCommGtin.length() > 0))
&& ("DE".equalsIgnoreCase(docType) || "".equalsIgnoreCase(docType)))
//changes by sarita on 28JUL 2017
//&& (!"".equalsIgnoreCase(eCommGtin) && eCommGtin.length() > 0))
{
tranType = "10";
}
......
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