Commit def539e7 authored by ssalve's avatar ssalve

done changes to set tran_type 08 and 09 on 29SEPT2017

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@171420 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 15f6b0e7
...@@ -347,8 +347,8 @@ public class GstrPosEJB extends ValidatorEJB implements GstrPosEJBRemote,GstrPos ...@@ -347,8 +347,8 @@ public class GstrPosEJB extends ValidatorEJB implements GstrPosEJBRemote,GstrPos
{ {
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)) && ("".equalsIgnoreCase(eCommGtin) || eCommGtin.length() <=0))
{ {
tranType = "01"; tranType = "01";
} }
...@@ -361,16 +361,24 @@ public class GstrPosEJB extends ValidatorEJB implements GstrPosEJBRemote,GstrPos ...@@ -361,16 +361,24 @@ 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) && isWithPay)) //&& ("Z".equalsIgnoreCase(docType) || "".equalsIgnoreCase(docType) && isWithPay))
//Added by sarita on 29SEPT2017
&& ("Z".equalsIgnoreCase(docType) || "".equalsIgnoreCase(docType))
&& isWithPay)
//&& (!"".equalsIgnoreCase(eCommGtin) && eCommGtin.length() > 0) ) //&& (!"".equalsIgnoreCase(eCommGtin) && eCommGtin.length() > 0) )
{ {
//tranType = "09"; Added by sarita on 29SEPT2017
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) && !isWithPay)) //&& ("Z".equalsIgnoreCase(docType) || "".equalsIgnoreCase(docType) && !isWithPay))
//Added by sarita on 29SEPT2017
&& ("Z".equalsIgnoreCase(docType) || "".equalsIgnoreCase(docType))
&& !isWithPay)
//&& (!"".equalsIgnoreCase(eCommGtin) && eCommGtin.length() > 0) ) //&& (!"".equalsIgnoreCase(eCommGtin) && eCommGtin.length() > 0) )
{ {
//tranType = "08"; Added by sarita on 29SEPT2017
tranType = "09"; tranType = "09";
} }
else if((taxRegNo.length() > 0) else if((taxRegNo.length() > 0)
......
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