Skip to content

B
business-java
Commit a1c68fb3 authored by ssalve's avatar ssalve
Browse files
Options

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
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 9 deletions
webitm-gst/ibase/webitm/ejb/gst/GstrPosEJB.java
View file @ a1c68fb3
...@@ -402,10 +402,11 @@ public class GstrPosEJB extends ValidatorEJB implements GstrPosEJBRemote,GstrPos ...@@ -402,10 +402,11 @@ public class GstrPosEJB extends ValidatorEJB implements GstrPosEJBRemote,GstrPos
if("I".equalsIgnoreCase(gstType)) //B2B Supplies, with SEZ and deemed exports if("I".equalsIgnoreCase(gstType)) //B2B Supplies, with SEZ and deemed exports
{ {
if( taxRegNo.length() > 0 if((taxRegNo.length() > 0)
&& ("N".equalsIgnoreCase(reverseCharge) || "".equalsIgnoreCase(reverseCharge)) && ("N".equalsIgnoreCase(reverseCharge) || "".equalsIgnoreCase(reverseCharge))
&& ("R".equalsIgnoreCase(docType) || "".equalsIgnoreCase(docType)) && ("R".equalsIgnoreCase(docType) || "".equalsIgnoreCase(docType)))
&& ("".equalsIgnoreCase(eCommGtin) || eCommGtin.length() <=0)) //changes by sarita on 28JUL2017
//&& ("".equalsIgnoreCase(eCommGtin) || eCommGtin.length() <=0))
{ {
tranType = "01"; tranType = "01";
} }
...@@ -418,22 +419,25 @@ public class GstrPosEJB extends ValidatorEJB implements GstrPosEJBRemote,GstrPos ...@@ -418,22 +419,25 @@ public class GstrPosEJB extends ValidatorEJB implements GstrPosEJBRemote,GstrPos
} }
else if((taxRegNo.length() > 0) else if((taxRegNo.length() > 0)
&& ("N".equalsIgnoreCase(reverseCharge) || "".equalsIgnoreCase(reverseCharge)) && ("N".equalsIgnoreCase(reverseCharge) || "".equalsIgnoreCase(reverseCharge))
&& ("Z".equalsIgnoreCase(docType) || "".equalsIgnoreCase(docType)) && ("Z".equalsIgnoreCase(docType) || "".equalsIgnoreCase(docType) && isWithPay))
&& (!"".equalsIgnoreCase(eCommGtin) && eCommGtin.length() > 0) && isWithPay) //changes by sarita on 28JUL2017
//&& (!"".equalsIgnoreCase(eCommGtin) && eCommGtin.length() > 0) )
{ {
tranType = "08"; tranType = "08";
} }
else if((taxRegNo.length() > 0) else if((taxRegNo.length() > 0)
&& ("N".equalsIgnoreCase(reverseCharge) || "".equalsIgnoreCase(reverseCharge)) && ("N".equalsIgnoreCase(reverseCharge) || "".equalsIgnoreCase(reverseCharge))
&& ("Z".equalsIgnoreCase(docType) || "".equalsIgnoreCase(docType)) && ("Z".equalsIgnoreCase(docType) || "".equalsIgnoreCase(docType) && !isWithPay))
&& (!"".equalsIgnoreCase(eCommGtin) && eCommGtin.length() > 0) && !isWithPay) //changes by sarita on 28JUL2017
//&& (!"".equalsIgnoreCase(eCommGtin) && eCommGtin.length() > 0) )
{ {
tranType = "09"; tranType = "09";
} }
else if((taxRegNo.length() > 0) else if((taxRegNo.length() > 0)
&& ("N".equalsIgnoreCase(reverseCharge) || "".equalsIgnoreCase(reverseCharge)) && ("N".equalsIgnoreCase(reverseCharge) || "".equalsIgnoreCase(reverseCharge))
&& ("DE".equalsIgnoreCase(docType) || "".equalsIgnoreCase(docType)) && ("DE".equalsIgnoreCase(docType) || "".equalsIgnoreCase(docType)))
&& (!"".equalsIgnoreCase(eCommGtin) && eCommGtin.length() > 0)) //changes by sarita on 28JUL 2017
//&& (!"".equalsIgnoreCase(eCommGtin) && eCommGtin.length() > 0))
{ {
tranType = "10"; 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