Skip to content

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

Removed validation for gst type E and N and done changes in itemchange for gst... 

Removed validation for gst type E and N and done changes in itemchange for gst type E and N for doc_type


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@106595 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 6203ed48
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 11 deletions
webitm-gst/ibase/webitm/ejb/gst/Gstr3BIC.java
View file @ 247922a0
...@@ -290,9 +290,9 @@ public class Gstr3BIC extends ValidatorEJB implements Gstr3BICRemote, Gstr3BICLo ...@@ -290,9 +290,9 @@ public class Gstr3BIC extends ValidatorEJB implements Gstr3BICRemote, Gstr3BICLo
System.out.println("gst_type["+gst_type+"]"+"itc_type["+itc_type+"]"+"doc_type["+doc_type+"]"); System.out.println("gst_type["+gst_type+"]"+"itc_type["+itc_type+"]"+"doc_type["+doc_type+"]");
}//end of if block for itc_type }//end of if block for itc_type
}//end of for loop }//end of for loop
// Removed validation for gst_type N and E by sarita on 14AUG2017[START]
// ******************************* Validation for supply_type [START]************************************* // ******************************* Validation for supply_type [START]*************************************
if("N".equalsIgnoreCase(gst_type)) /* if("N".equalsIgnoreCase(gst_type))
{ {
if(supply_type.equalsIgnoreCase("NA")) if(supply_type.equalsIgnoreCase("NA"))
{ {
...@@ -320,11 +320,11 @@ public class Gstr3BIC extends ValidatorEJB implements Gstr3BICRemote, Gstr3BICLo ...@@ -320,11 +320,11 @@ public class Gstr3BIC extends ValidatorEJB implements Gstr3BICRemote, Gstr3BICLo
errFields.add("supply_type"); errFields.add("supply_type");
} }
} }
} }*/
// ******************************* Validation for supply_type [END]*************************************** // ******************************* Validation for supply_type [END]***************************************
// ******************************* Validation for itc_type [START]************************************** // ******************************* Validation for itc_type [START]**************************************
if("E".equalsIgnoreCase(gst_type) && !("R".equalsIgnoreCase(doc_type.trim()))) /* if("E".equalsIgnoreCase(gst_type) && !("R".equalsIgnoreCase(doc_type.trim())))
{ {
if(itc_type.equalsIgnoreCase("NA")) if(itc_type.equalsIgnoreCase("NA"))
{ {
...@@ -332,8 +332,9 @@ public class Gstr3BIC extends ValidatorEJB implements Gstr3BICRemote, Gstr3BICLo ...@@ -332,8 +332,9 @@ public class Gstr3BIC extends ValidatorEJB implements Gstr3BICRemote, Gstr3BICLo
errList.add(errCode); errList.add(errCode);
errFields.add("itc_type"); errFields.add("itc_type");
} }
} } */
// ******************************* Validation for itc_type [END]**************************************** // ******************************* Validation for itc_type [END]****************************************
// Removed validation for gst_type N and E by sarita on 14AUG2017[END]
}//end of case2 }//end of case2
break; break;
}//end of switch statement }//end of switch statement
...@@ -653,13 +654,15 @@ public class Gstr3BIC extends ValidatorEJB implements Gstr3BICRemote, Gstr3BICLo ...@@ -653,13 +654,15 @@ public class Gstr3BIC extends ValidatorEJB implements Gstr3BICRemote, Gstr3BICLo
} }
else if("E".equalsIgnoreCase(gst_type)) else if("E".equalsIgnoreCase(gst_type))
{ {
//valueXmlString.append("<doc_type protect = \"0\" visible = \"1\">").append("<![CDATA["+docTypeEdit+"]]>").append("</doc_type>"); //changed by sarita on 14AUGUST2017
valueXmlString.append("<doc_type protect = \"1\" visible = \"0\">").append("<![CDATA["+docTypeEdit+"]]>").append("</doc_type>");
valueXmlString.append("<doc_date protect = \"0\" visible = \"1\">").append("<![CDATA["+docDateEdit+"]]>").append("</doc_date>"); valueXmlString.append("<doc_date protect = \"0\" visible = \"1\">").append("<![CDATA["+docDateEdit+"]]>").append("</doc_date>");
valueXmlString.append("<gst_code_state protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</gst_code_state>"); valueXmlString.append("<gst_code_state protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</gst_code_state>");
} }
else if("N".equalsIgnoreCase(gst_type)) else if("N".equalsIgnoreCase(gst_type))
{ {
//valueXmlString.append("<gst_code_state protect = \"0\" visible = \"1\">").append("<![CDATA["+gstCodeEdit+"]]>").append("</gst_code_state>"); //changes by sarita on 14AUG 2017
valueXmlString.append("<gst_code_state protect = \"1\" visible = \"0\">").append("<![CDATA["+gstCodeEdit+"]]>").append("</gst_code_state>");
valueXmlString.append("<doc_date protect = \"0\" visible = \"1\">").append("<![CDATA["+docDateEdit+"]]>").append("</doc_date>"); valueXmlString.append("<doc_date protect = \"0\" visible = \"1\">").append("<![CDATA["+docDateEdit+"]]>").append("</doc_date>");
valueXmlString.append("<doc_type protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</doc_type>"); valueXmlString.append("<doc_type protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</doc_type>");
} }
...@@ -722,13 +725,13 @@ public class Gstr3BIC extends ValidatorEJB implements Gstr3BICRemote, Gstr3BICLo ...@@ -722,13 +725,13 @@ public class Gstr3BIC extends ValidatorEJB implements Gstr3BICRemote, Gstr3BICLo
} }
else if("E".equalsIgnoreCase(gst_type)) else if("E".equalsIgnoreCase(gst_type))
{ {
valueXmlString.append("<doc_type protect = \"0\" visible = \"1\">").append("<![CDATA[A ]]>").append("</doc_type>"); valueXmlString.append("<doc_type protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</doc_type>");
valueXmlString.append("<doc_date protect = \"0\" visible = \"1\">").append("<![CDATA[]]>").append("</doc_date>"); valueXmlString.append("<doc_date protect = \"0\" visible = \"1\">").append("<![CDATA[]]>").append("</doc_date>");
valueXmlString.append("<gst_code_state protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</gst_code_state>"); valueXmlString.append("<gst_code_state protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</gst_code_state>");
} }
else if("N".equalsIgnoreCase(gst_type)) else if("N".equalsIgnoreCase(gst_type))
{ {
valueXmlString.append("<gst_code_state protect = \"0\" visible = \"1\">").append("<![CDATA["+gst_codeVal+"]]>").append("</gst_code_state>"); valueXmlString.append("<gst_code_state protect = \"1\" visible = \"0\">").append("<![CDATA["+gst_codeVal+"]]>").append("</gst_code_state>");
valueXmlString.append("<doc_date protect = \"0\" visible = \"1\">").append("<![CDATA[]]>").append("</doc_date>"); valueXmlString.append("<doc_date protect = \"0\" visible = \"1\">").append("<![CDATA[]]>").append("</doc_date>");
valueXmlString.append("<doc_type protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</doc_type>"); valueXmlString.append("<doc_type protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</doc_type>");
} }
......
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