Commit 01227ca0 authored by ssalve's avatar ssalve

Added validation for Customer Name and added field cust_name in B2C Supplies on 21JUL2017


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@106365 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 12e61430
...@@ -80,7 +80,7 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal ...@@ -80,7 +80,7 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
int childNodeLength = 0; int childNodeLength = 0;
int ctr = 0, cnt = 0; int ctr = 0, cnt = 0;
String childNodeName = ""; String childNodeName = "";
String errorType = "",errString=""; String errorType = "",errString="",cust_name="";
String errCode = ""; String errCode = "";
ArrayList<String> errList = new ArrayList<String>(); ArrayList<String> errList = new ArrayList<String>();
ArrayList<String> errFields = new ArrayList<String>(); ArrayList<String> errFields = new ArrayList<String>();
...@@ -228,7 +228,13 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal ...@@ -228,7 +228,13 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
pin = checkNull(genericUtility.getColumnValue("pin", dom)).trim(); pin = checkNull(genericUtility.getColumnValue("pin", dom)).trim();
//System.out.println("tax_reg_no["+tax_reg_no+"]"+"gst_type["+gst_type+"]"+"pin["+pin+"]"); //System.out.println("tax_reg_no["+tax_reg_no+"]"+"gst_type["+gst_type+"]"+"pin["+pin+"]");
}//end of if block for pin }//end of if block for pin
//added by sarita on 21JUL2017
else if("cust_name".equalsIgnoreCase(childNodeName))
{
gst_type = checkNull(genericUtility.getColumnValue("gst_type", dom)).trim();
cust_name = checkNull(genericUtility.getColumnValue("cust_name", dom)).trim();
//System.out.println("tax_reg_no["+tax_reg_no+"]"+"gst_type["+gst_type+"]"+"name["+name+"]");
}//end of if block for name
else if("gst_code_state".equalsIgnoreCase(childNodeName)) else if("gst_code_state".equalsIgnoreCase(childNodeName))
{ {
gst_type = checkNull(genericUtility.getColumnValue("gst_type", dom)).trim(); gst_type = checkNull(genericUtility.getColumnValue("gst_type", dom)).trim();
...@@ -334,7 +340,7 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal ...@@ -334,7 +340,7 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
} }
//Added by sarita on 14/07/2017 [END] //Added by sarita on 14/07/2017 [END]
if("I".equalsIgnoreCase(gst_type) || "R".equalsIgnoreCase(gst_type) if("I".equalsIgnoreCase(gst_type) || "R".equalsIgnoreCase(gst_type)
|| "D".equalsIgnoreCase(gst_type) || "C".equalsIgnoreCase(gst_type)||"E".equalsIgnoreCase(gst_type)) || "D".equalsIgnoreCase(gst_type) || "C".equalsIgnoreCase(gst_type))
{ {
if(tax_reg_no != null && tax_reg_no.trim().length() > 0) if(tax_reg_no != null && tax_reg_no.trim().length() > 0)
{ {
...@@ -366,6 +372,19 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal ...@@ -366,6 +372,19 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
// **************************** Validation for pin [end] ********************************************* // **************************** Validation for pin [end] *********************************************
// *************************** Validation for cust_name [start] *******************************************
//Added by sarita on 21JUL2017
if("S".equalsIgnoreCase(gst_type))
{
if(cust_name == null || cust_name.trim().length() == 0)
{
errCode = "VMATTDET01";
errList.add(errCode);
errFields.add("cust_name");
}
}
// *************************** Validation for cust_name [end] *********************************************
// **************************** Validation for Place of Supply [start] ****************************** // **************************** Validation for Place of Supply [start] ******************************
if("I".equalsIgnoreCase(gst_type) || "R".equalsIgnoreCase(gst_type) || "S".equalsIgnoreCase(gst_type) if("I".equalsIgnoreCase(gst_type) || "R".equalsIgnoreCase(gst_type) || "S".equalsIgnoreCase(gst_type)
|| "A".equalsIgnoreCase(gst_type) || "T".equalsIgnoreCase(gst_type)) || "A".equalsIgnoreCase(gst_type) || "T".equalsIgnoreCase(gst_type))
...@@ -1147,7 +1166,7 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal ...@@ -1147,7 +1166,7 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
String code="",mnth="",year="",finalCode="",tax_reg_no="",loginSiteCode="",ecomRegNo=""; String code="",mnth="",year="",finalCode="",tax_reg_no="",loginSiteCode="",ecomRegNo="";
String name="",addr1="",addr2="",addr3="",city="",state="",pin="",stateCode="",stateCodeReg=""; String name="",addr1="",addr2="",addr3="",city="",state="",pin="",stateCode="",stateCodeReg="";
String nameEdit="",addr1Edit="",addr2Edit="",addr3Edit="",cityEdit="",stateEdit="",pinEdit=""; String nameEdit="",addr1Edit="",addr2Edit="",addr3Edit="",cityEdit="",stateEdit="",pinEdit="";
String taxRegNoEdit="",docTypeEdit="",docNoEdit="",docDateEdit="",amountEdit="",gstCodeEdit="",stateDescEdit="",ecomRegEdit="",revChrEdit="",refIfInvEdit = "",refDateInvEdit="",lrNoEdit="",lrDateEdit="",orderNoEdit="",reasonCdEdit=""; String taxRegNoEdit="",docTypeEdit="",docNoEdit="",docDateEdit="",amountEdit="",gstCodeEdit="",stateDescEdit="",ecomRegEdit="",revChrEdit="",refIfInvEdit = "",refDateInvEdit="",lrNoEdit="",lrDateEdit="",orderNoEdit="",reasonCdEdit="",custNameEdit="";
try try
{ {
conn = getConnection(); conn = getConnection();
...@@ -1242,12 +1261,13 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal ...@@ -1242,12 +1261,13 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
// changes itemdefault to show B2B Invoices fields bydefault by sarita on 21JUL2017 [START] // changes itemdefault to show B2B Invoices fields bydefault by sarita on 21JUL2017 [START]
valueXmlString.append("<doc_type protect = \"0\" visible = \"1\">").append("<![CDATA[]]>").append("</doc_type>"); valueXmlString.append("<doc_type protect = \"0\" visible = \"1\">").append("<![CDATA[]]>").append("</doc_type>");
valueXmlString.append("<tax_reg_no protect = \"0\" visible = \"1\">").append("<![CDATA[]]>").append("</tax_reg_no>"); valueXmlString.append("<tax_reg_no protect = \"0\" visible = \"1\">").append("<![CDATA[]]>").append("</tax_reg_no>");
valueXmlString.append("<cust_name protect = \"0\" visible = \"0\">").append("<![CDATA[]]>").append("</cust_name>");
valueXmlString.append("<gst_code_state protect = \"1\" visible = \"1\">").append("<![CDATA[]]>").append("</gst_code_state>"); valueXmlString.append("<gst_code_state protect = \"1\" visible = \"1\">").append("<![CDATA[]]>").append("</gst_code_state>");
valueXmlString.append("<state_descr protect = \"0\" visible = \"0\">").append("<![CDATA[]]>").append("</state_descr>"); valueXmlString.append("<state_descr protect = \"0\" visible = \"0\">").append("<![CDATA[]]>").append("</state_descr>");
valueXmlString.append("<doc_no protect = \"0\" visible = \"1\">").append("<![CDATA[]]>").append("</doc_no>"); valueXmlString.append("<doc_no protect = \"0\" visible = \"1\">").append("<![CDATA[]]>").append("</doc_no>");
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("<amount protect = \"0\" visible = \"1\">").append("<![CDATA[]]>").append("</amount>"); valueXmlString.append("<amount protect = \"0\" visible = \"1\">").append("<![CDATA[]]>").append("</amount>");
valueXmlString.append("<reverse_chrg protect = \"0\" visible = \"0\">").append("<![CDATA[]]>").append("</reverse_chrg>"); valueXmlString.append("<reverse_chrg protect = \"0\" visible = \"0\">").append("<![CDATA[N]]>").append("</reverse_chrg>");
valueXmlString.append("<ecom_reg_no protect = \"0\" visible = \"1\">").append("<![CDATA[]]>").append("</ecom_reg_no>"); valueXmlString.append("<ecom_reg_no protect = \"0\" visible = \"1\">").append("<![CDATA[]]>").append("</ecom_reg_no>");
valueXmlString.append("<gst_code protect = \"0\" visible = \"1\">").append("<![CDATA[]]>").append("</gst_code>"); valueXmlString.append("<gst_code protect = \"0\" visible = \"1\">").append("<![CDATA[]]>").append("</gst_code>");
valueXmlString.append("<ref_id__inv protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</ref_id__inv>"); valueXmlString.append("<ref_id__inv protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</ref_id__inv>");
...@@ -1313,6 +1333,7 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal ...@@ -1313,6 +1333,7 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
pinEdit = checkNull(genericUtility.getColumnValue("pin", dom)); pinEdit = checkNull(genericUtility.getColumnValue("pin", dom));
orderNoEdit = checkNull(genericUtility.getColumnValue("order_no", dom)); orderNoEdit = checkNull(genericUtility.getColumnValue("order_no", dom));
reasonCdEdit = checkNull(genericUtility.getColumnValue("reas_code", dom)); reasonCdEdit = checkNull(genericUtility.getColumnValue("reas_code", dom));
custNameEdit = checkNull(genericUtility.getColumnValue("cust_name", dom));
if("I".equalsIgnoreCase(gst_type)) if("I".equalsIgnoreCase(gst_type))
{ {
...@@ -1320,6 +1341,7 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal ...@@ -1320,6 +1341,7 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
{ {
valueXmlString.append("<doc_type protect = \"0\" visible = \"1\">").append("<![CDATA["+docTypeEdit+"]]>").append("</doc_type>"); valueXmlString.append("<doc_type protect = \"0\" visible = \"1\">").append("<![CDATA["+docTypeEdit+"]]>").append("</doc_type>");
valueXmlString.append("<tax_reg_no protect = \"0\" visible = \"1\">").append("<![CDATA["+taxRegNoEdit+"]]>").append("</tax_reg_no>"); valueXmlString.append("<tax_reg_no protect = \"0\" visible = \"1\">").append("<![CDATA["+taxRegNoEdit+"]]>").append("</tax_reg_no>");
valueXmlString.append("<cust_name protect = \"0\" visible = \"0\">").append("<![CDATA[]]>").append("</cust_name>");
valueXmlString.append("<gst_code_state protect = \"1\" visible = \"1\">").append("<![CDATA["+gstCodeEdit+"]]>").append("</gst_code_state>"); valueXmlString.append("<gst_code_state protect = \"1\" visible = \"1\">").append("<![CDATA["+gstCodeEdit+"]]>").append("</gst_code_state>");
valueXmlString.append("<state_descr protect = \"0\" visible = \"0\">").append("<![CDATA["+stateDescEdit+"]]>").append("</state_descr>"); valueXmlString.append("<state_descr protect = \"0\" visible = \"0\">").append("<![CDATA["+stateDescEdit+"]]>").append("</state_descr>");
valueXmlString.append("<doc_no protect = \"0\" visible = \"1\">").append("<![CDATA["+docNoEdit+"]]>").append("</doc_no>"); valueXmlString.append("<doc_no protect = \"0\" visible = \"1\">").append("<![CDATA["+docNoEdit+"]]>").append("</doc_no>");
...@@ -1346,6 +1368,7 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal ...@@ -1346,6 +1368,7 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
{ {
valueXmlString.append("<doc_type protect = \"0\" visible = \"1\">").append("<![CDATA["+docTypeEdit+"]]>").append("</doc_type>"); valueXmlString.append("<doc_type protect = \"0\" visible = \"1\">").append("<![CDATA["+docTypeEdit+"]]>").append("</doc_type>");
valueXmlString.append("<tax_reg_no protect = \"0\" visible = \"1\">").append("<![CDATA["+taxRegNoEdit+"]]>").append("</tax_reg_no>"); valueXmlString.append("<tax_reg_no protect = \"0\" visible = \"1\">").append("<![CDATA["+taxRegNoEdit+"]]>").append("</tax_reg_no>");
valueXmlString.append("<cust_name protect = \"0\" visible = \"0\">").append("<![CDATA[]]>").append("</cust_name>");
valueXmlString.append("<gst_code_state protect = \"1\" visible = \"1\">").append("<![CDATA["+gstCodeEdit+"]]>").append("</gst_code_state>"); valueXmlString.append("<gst_code_state protect = \"1\" visible = \"1\">").append("<![CDATA["+gstCodeEdit+"]]>").append("</gst_code_state>");
valueXmlString.append("<state_descr protect = \"0\" visible = \"0\">").append("<![CDATA["+stateDescEdit+"]]>").append("</state_descr>"); valueXmlString.append("<state_descr protect = \"0\" visible = \"0\">").append("<![CDATA["+stateDescEdit+"]]>").append("</state_descr>");
valueXmlString.append("<doc_no protect = \"0\" visible = \"1\">").append("<![CDATA["+docNoEdit+"]]>").append("</doc_no>"); valueXmlString.append("<doc_no protect = \"0\" visible = \"1\">").append("<![CDATA["+docNoEdit+"]]>").append("</doc_no>");
...@@ -1375,6 +1398,7 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal ...@@ -1375,6 +1398,7 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
{ {
valueXmlString.append("<doc_type protect = \"0\" visible = \"0\">").append("<![CDATA["+docTypeEdit+"]]>").append("</doc_type>"); valueXmlString.append("<doc_type protect = \"0\" visible = \"0\">").append("<![CDATA["+docTypeEdit+"]]>").append("</doc_type>");
valueXmlString.append("<tax_reg_no protect = \"0\" visible = \"1\">").append("<![CDATA["+taxRegNoEdit+"]]>").append("</tax_reg_no>"); valueXmlString.append("<tax_reg_no protect = \"0\" visible = \"1\">").append("<![CDATA["+taxRegNoEdit+"]]>").append("</tax_reg_no>");
valueXmlString.append("<cust_name protect = \"0\" visible = \"0\">").append("<![CDATA[]]>").append("</cust_name>");
valueXmlString.append("<gst_code_state protect = \"1\" visible = \"1\">").append("<![CDATA["+gstCodeEdit+"]]>").append("</gst_code_state>"); valueXmlString.append("<gst_code_state protect = \"1\" visible = \"1\">").append("<![CDATA["+gstCodeEdit+"]]>").append("</gst_code_state>");
valueXmlString.append("<state_descr protect = \"0\" visible = \"0\">").append("<![CDATA["+stateDescEdit+"]]>").append("</state_descr>"); valueXmlString.append("<state_descr protect = \"0\" visible = \"0\">").append("<![CDATA["+stateDescEdit+"]]>").append("</state_descr>");
valueXmlString.append("<doc_no protect = \"0\" visible = \"1\">").append("<![CDATA["+docNoEdit+"]]>").append("</doc_no>"); valueXmlString.append("<doc_no protect = \"0\" visible = \"1\">").append("<![CDATA["+docNoEdit+"]]>").append("</doc_no>");
...@@ -1401,6 +1425,7 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal ...@@ -1401,6 +1425,7 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
{ {
valueXmlString.append("<doc_type protect = \"0\" visible = \"0\">").append("<![CDATA["+docTypeEdit+"]]>").append("</doc_type>"); valueXmlString.append("<doc_type protect = \"0\" visible = \"0\">").append("<![CDATA["+docTypeEdit+"]]>").append("</doc_type>");
valueXmlString.append("<tax_reg_no protect = \"0\" visible = \"1\">").append("<![CDATA["+taxRegNoEdit+"]]>").append("</tax_reg_no>"); valueXmlString.append("<tax_reg_no protect = \"0\" visible = \"1\">").append("<![CDATA["+taxRegNoEdit+"]]>").append("</tax_reg_no>");
valueXmlString.append("<cust_name protect = \"0\" visible = \"0\">").append("<![CDATA[]]>").append("</cust_name>");
valueXmlString.append("<gst_code_state protect = \"1\" visible = \"1\">").append("<![CDATA["+gstCodeEdit+"]]>").append("</gst_code_state>"); valueXmlString.append("<gst_code_state protect = \"1\" visible = \"1\">").append("<![CDATA["+gstCodeEdit+"]]>").append("</gst_code_state>");
valueXmlString.append("<state_descr protect = \"0\" visible = \"0\">").append("<![CDATA["+stateDescEdit+"]]>").append("</state_descr>"); valueXmlString.append("<state_descr protect = \"0\" visible = \"0\">").append("<![CDATA["+stateDescEdit+"]]>").append("</state_descr>");
valueXmlString.append("<doc_no protect = \"0\" visible = \"1\">").append("<![CDATA["+docNoEdit+"]]>").append("</doc_no>"); valueXmlString.append("<doc_no protect = \"0\" visible = \"1\">").append("<![CDATA["+docNoEdit+"]]>").append("</doc_no>");
...@@ -1427,6 +1452,7 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal ...@@ -1427,6 +1452,7 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
if("S".equalsIgnoreCase(gst_type)) if("S".equalsIgnoreCase(gst_type))
{ {
valueXmlString.append("<doc_type protect = \"0\" visible = \"0\">").append("<![CDATA["+docTypeEdit+"]]>").append("</doc_type>"); valueXmlString.append("<doc_type protect = \"0\" visible = \"0\">").append("<![CDATA["+docTypeEdit+"]]>").append("</doc_type>");
valueXmlString.append("<cust_name protect = \"0\" visible = \"1\">").append("<![CDATA["+custNameEdit+"]]>").append("</cust_name>");
valueXmlString.append("<tax_reg_no protect = \"0\" visible = \"0\">").append("<![CDATA[]]>").append("</tax_reg_no>"); valueXmlString.append("<tax_reg_no protect = \"0\" visible = \"0\">").append("<![CDATA[]]>").append("</tax_reg_no>");
valueXmlString.append("<gst_code_state protect = \"1\" visible = \"1\">").append("<![CDATA["+gstCodeEdit+"]]>").append("</gst_code_state>"); valueXmlString.append("<gst_code_state protect = \"1\" visible = \"1\">").append("<![CDATA["+gstCodeEdit+"]]>").append("</gst_code_state>");
valueXmlString.append("<state_descr protect = \"0\" visible = \"0\">").append("<![CDATA["+stateDescEdit+"]]>").append("</state_descr>"); valueXmlString.append("<state_descr protect = \"0\" visible = \"0\">").append("<![CDATA["+stateDescEdit+"]]>").append("</state_descr>");
...@@ -1451,11 +1477,10 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal ...@@ -1451,11 +1477,10 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
valueXmlString.append("<reas_code protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</reas_code>"); valueXmlString.append("<reas_code protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</reas_code>");
} }
else if("E".equalsIgnoreCase(gst_type)) else if("E".equalsIgnoreCase(gst_type))
{
if(taxRegNoEdit == null || taxRegNoEdit.trim().length()== 0)
{ {
valueXmlString.append("<doc_type protect = \"0\" visible = \"0\">").append("<![CDATA["+docTypeEdit+"]]>").append("</doc_type>"); valueXmlString.append("<doc_type protect = \"0\" visible = \"0\">").append("<![CDATA["+docTypeEdit+"]]>").append("</doc_type>");
valueXmlString.append("<tax_reg_no protect = \"0\" visible = \"1\">").append("<![CDATA["+taxRegNoEdit+"]]>").append("</tax_reg_no>"); valueXmlString.append("<tax_reg_no protect = \"0\" visible = \"0\">").append("<![CDATA[]]>").append("</tax_reg_no>");
valueXmlString.append("<cust_name protect = \"0\" visible = \"0\">").append("<![CDATA[]]>").append("</cust_name>");
valueXmlString.append("<doc_no protect = \"0\" visible = \"1\">").append("<![CDATA["+docNoEdit+"]]>").append("</doc_no>"); valueXmlString.append("<doc_no protect = \"0\" visible = \"1\">").append("<![CDATA["+docNoEdit+"]]>").append("</doc_no>");
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("<amount protect = \"0\" visible = \"1\">").append("<![CDATA["+amountEdit+"]]>").append("</amount>"); valueXmlString.append("<amount protect = \"0\" visible = \"1\">").append("<![CDATA["+amountEdit+"]]>").append("</amount>");
...@@ -1478,37 +1503,11 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal ...@@ -1478,37 +1503,11 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
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>");
valueXmlString.append("<state_descr protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</state_descr>"); valueXmlString.append("<state_descr protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</state_descr>");
} }
else
{
valueXmlString.append("<doc_type protect = \"0\" visible = \"0\">").append("<![CDATA["+docTypeEdit+"]]>").append("</doc_type>");
valueXmlString.append("<tax_reg_no protect = \"0\" visible = \"1\">").append("<![CDATA["+taxRegNoEdit+"]]>").append("</tax_reg_no>");
valueXmlString.append("<doc_no protect = \"0\" visible = \"1\">").append("<![CDATA["+docNoEdit+"]]>").append("</doc_no>");
valueXmlString.append("<doc_date protect = \"0\" visible = \"1\">").append("<![CDATA["+docDateEdit+"]]>").append("</doc_date>");
valueXmlString.append("<amount protect = \"0\" visible = \"1\">").append("<![CDATA["+amountEdit+"]]>").append("</amount>");
valueXmlString.append("<order_no protect = \"0\" visible = \"1\">").append("<![CDATA["+orderNoEdit+"]]>").append("</order_no>");
valueXmlString.append("<lr_no protect = \"0\" visible = \"1\">").append("<![CDATA["+lrNoEdit+"]]>").append("</lr_no>");
valueXmlString.append("<lr_date protect = \"0\" visible = \"1\">").append("<![CDATA["+lrDateEdit+"]]>").append("</lr_date>");
valueXmlString.append("<reverse_chrg protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</reverse_chrg>");
valueXmlString.append("<ecom_reg_no protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</ecom_reg_no>");
valueXmlString.append("<gst_code protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</gst_code>");
valueXmlString.append("<ref_id__inv protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</ref_id__inv>");
valueXmlString.append("<ref_date__inv protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</ref_date__inv>");
valueXmlString.append("<name protect = \"0\" visible = \"1\">").append("<![CDATA["+nameEdit+"]]>").append("</name>");
valueXmlString.append("<addr1 protect = \"0\" visible = \"1\">").append("<![CDATA["+addr1Edit+"]]>").append("</addr1>");
valueXmlString.append("<addr2 protect = \"0\" visible = \"1\">").append("<![CDATA["+addr2Edit+"]]>").append("</addr2>");
valueXmlString.append("<addr3 protect = \"0\" visible = \"1\">").append("<![CDATA["+addr3Edit+"]]>").append("</addr3>");
valueXmlString.append("<city protect = \"0\" visible = \"1\">").append("<![CDATA["+cityEdit+"]]>").append("</city>");
valueXmlString.append("<gst_state_code protect = \"0\" visible = \"1\">").append("<![CDATA["+stateEdit+"]]>").append("</gst_state_code>");
valueXmlString.append("<pin protect = \"0\" visible = \"1\">").append("<![CDATA["+pinEdit+"]]>").append("</pin>");
valueXmlString.append("<reas_code protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</reas_code>");
valueXmlString.append("<gst_code_state protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</gst_code_state>");
valueXmlString.append("<state_descr protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</state_descr>");
}
}
else if("L".equalsIgnoreCase(gst_type)) else if("L".equalsIgnoreCase(gst_type))
{ {
valueXmlString.append("<doc_type protect = \"0\" visible = \"0\">").append("<![CDATA["+docTypeEdit+"]]>").append("</doc_type>"); valueXmlString.append("<doc_type protect = \"0\" visible = \"0\">").append("<![CDATA["+docTypeEdit+"]]>").append("</doc_type>");
valueXmlString.append("<tax_reg_no protect = \"0\" visible = \"0\">").append("<![CDATA[]]>").append("</tax_reg_no>"); valueXmlString.append("<tax_reg_no protect = \"0\" visible = \"0\">").append("<![CDATA[]]>").append("</tax_reg_no>");
valueXmlString.append("<cust_name protect = \"0\" visible = \"0\">").append("<![CDATA[]]>").append("</cust_name>");
valueXmlString.append("<gst_code_state protect = \"0\" visible = \"0\">").append("<![CDATA[]]>").append("</gst_code_state>"); valueXmlString.append("<gst_code_state protect = \"0\" visible = \"0\">").append("<![CDATA[]]>").append("</gst_code_state>");
valueXmlString.append("<state_descr protect = \"0\" visible = \"0\">").append("<![CDATA[]]>").append("</state_descr>"); valueXmlString.append("<state_descr protect = \"0\" visible = \"0\">").append("<![CDATA[]]>").append("</state_descr>");
valueXmlString.append("<doc_no protect = \"0\" visible = \"0\">").append("<![CDATA[]]>").append("</doc_no>"); valueXmlString.append("<doc_no protect = \"0\" visible = \"0\">").append("<![CDATA[]]>").append("</doc_no>");
...@@ -1537,6 +1536,7 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal ...@@ -1537,6 +1536,7 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
{ {
valueXmlString.append("<doc_type protect = \"0\" visible = \"0\">").append("<![CDATA["+docTypeEdit+"]]>").append("</doc_type>"); valueXmlString.append("<doc_type protect = \"0\" visible = \"0\">").append("<![CDATA["+docTypeEdit+"]]>").append("</doc_type>");
valueXmlString.append("<tax_reg_no protect = \"0\" visible = \"1\">").append("<![CDATA["+taxRegNoEdit+"]]>").append("</tax_reg_no>"); valueXmlString.append("<tax_reg_no protect = \"0\" visible = \"1\">").append("<![CDATA["+taxRegNoEdit+"]]>").append("</tax_reg_no>");
valueXmlString.append("<cust_name protect = \"0\" visible = \"0\">").append("<![CDATA[]]>").append("</cust_name>");
valueXmlString.append("<doc_no protect = \"0\" visible = \"1\">").append("<![CDATA["+docNoEdit+"]]>").append("</doc_no>"); valueXmlString.append("<doc_no protect = \"0\" visible = \"1\">").append("<![CDATA["+docNoEdit+"]]>").append("</doc_no>");
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("<amount protect = \"0\" visible = \"1\">").append("<![CDATA["+amountEdit+"]]>").append("</amount>"); valueXmlString.append("<amount protect = \"0\" visible = \"1\">").append("<![CDATA["+amountEdit+"]]>").append("</amount>");
...@@ -1563,6 +1563,7 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal ...@@ -1563,6 +1563,7 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
{ {
valueXmlString.append("<doc_type protect = \"0\" visible = \"0\">").append("<![CDATA["+docTypeEdit+"]]>").append("</doc_type>"); valueXmlString.append("<doc_type protect = \"0\" visible = \"0\">").append("<![CDATA["+docTypeEdit+"]]>").append("</doc_type>");
valueXmlString.append("<tax_reg_no protect = \"0\" visible = \"1\">").append("<![CDATA["+taxRegNoEdit+"]]>").append("</tax_reg_no>"); valueXmlString.append("<tax_reg_no protect = \"0\" visible = \"1\">").append("<![CDATA["+taxRegNoEdit+"]]>").append("</tax_reg_no>");
valueXmlString.append("<cust_name protect = \"0\" visible = \"0\">").append("<![CDATA[]]>").append("</cust_name>");
valueXmlString.append("<doc_no protect = \"0\" visible = \"1\">").append("<![CDATA["+docNoEdit+"]]>").append("</doc_no>"); valueXmlString.append("<doc_no protect = \"0\" visible = \"1\">").append("<![CDATA["+docNoEdit+"]]>").append("</doc_no>");
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("<amount protect = \"0\" visible = \"1\">").append("<![CDATA["+amountEdit+"]]>").append("</amount>"); valueXmlString.append("<amount protect = \"0\" visible = \"1\">").append("<![CDATA["+amountEdit+"]]>").append("</amount>");
...@@ -1592,6 +1593,7 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal ...@@ -1592,6 +1593,7 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
{ {
valueXmlString.append("<doc_type protect = \"0\" visible = \"0\">").append("<![CDATA["+docTypeEdit+"]]>").append("</doc_type>"); valueXmlString.append("<doc_type protect = \"0\" visible = \"0\">").append("<![CDATA["+docTypeEdit+"]]>").append("</doc_type>");
valueXmlString.append("<tax_reg_no protect = \"0\" visible = \"1\">").append("<![CDATA["+taxRegNoEdit+"]]>").append("</tax_reg_no>"); valueXmlString.append("<tax_reg_no protect = \"0\" visible = \"1\">").append("<![CDATA["+taxRegNoEdit+"]]>").append("</tax_reg_no>");
valueXmlString.append("<cust_name protect = \"0\" visible = \"0\">").append("<![CDATA[]]>").append("</cust_name>");
valueXmlString.append("<doc_no protect = \"0\" visible = \"1\">").append("<![CDATA["+docNoEdit+"]]>").append("</doc_no>"); valueXmlString.append("<doc_no protect = \"0\" visible = \"1\">").append("<![CDATA["+docNoEdit+"]]>").append("</doc_no>");
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("<amount protect = \"0\" visible = \"1\">").append("<![CDATA["+amountEdit+"]]>").append("</amount>"); valueXmlString.append("<amount protect = \"0\" visible = \"1\">").append("<![CDATA["+amountEdit+"]]>").append("</amount>");
...@@ -1618,6 +1620,7 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal ...@@ -1618,6 +1620,7 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
{ {
valueXmlString.append("<doc_type protect = \"0\" visible = \"0\">").append("<![CDATA["+docTypeEdit+"]]>").append("</doc_type>"); valueXmlString.append("<doc_type protect = \"0\" visible = \"0\">").append("<![CDATA["+docTypeEdit+"]]>").append("</doc_type>");
valueXmlString.append("<tax_reg_no protect = \"0\" visible = \"1\">").append("<![CDATA["+taxRegNoEdit+"]]>").append("</tax_reg_no>"); valueXmlString.append("<tax_reg_no protect = \"0\" visible = \"1\">").append("<![CDATA["+taxRegNoEdit+"]]>").append("</tax_reg_no>");
valueXmlString.append("<cust_name protect = \"0\" visible = \"0\">").append("<![CDATA[]]>").append("</cust_name>");
valueXmlString.append("<doc_no protect = \"0\" visible = \"1\">").append("<![CDATA["+docNoEdit+"]]>").append("</doc_no>"); valueXmlString.append("<doc_no protect = \"0\" visible = \"1\">").append("<![CDATA["+docNoEdit+"]]>").append("</doc_no>");
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("<amount protect = \"0\" visible = \"1\">").append("<![CDATA["+amountEdit+"]]>").append("</amount>"); valueXmlString.append("<amount protect = \"0\" visible = \"1\">").append("<![CDATA["+amountEdit+"]]>").append("</amount>");
...@@ -1646,6 +1649,7 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal ...@@ -1646,6 +1649,7 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
valueXmlString.append("<gst_code_state protect = \"0\" visible = \"1\">").append("<![CDATA["+gstCodeEdit+"]]>").append("</gst_code_state>"); valueXmlString.append("<gst_code_state protect = \"0\" visible = \"1\">").append("<![CDATA["+gstCodeEdit+"]]>").append("</gst_code_state>");
valueXmlString.append("<state_descr protect = \"1\" visible = \"0\">").append("<![CDATA["+stateDescEdit+"]]>").append("</state_descr>"); valueXmlString.append("<state_descr protect = \"1\" visible = \"0\">").append("<![CDATA["+stateDescEdit+"]]>").append("</state_descr>");
valueXmlString.append("<amount protect = \"0\" visible = \"1\">").append("<![CDATA["+amountEdit+"]]>").append("</amount>"); valueXmlString.append("<amount protect = \"0\" visible = \"1\">").append("<![CDATA["+amountEdit+"]]>").append("</amount>");
valueXmlString.append("<cust_name protect = \"0\" visible = \"0\">").append("<![CDATA[]]>").append("</cust_name>");
valueXmlString.append("<reas_code protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</reas_code>"); valueXmlString.append("<reas_code protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</reas_code>");
valueXmlString.append("<ref_id__inv protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</ref_id__inv>"); valueXmlString.append("<ref_id__inv protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</ref_id__inv>");
valueXmlString.append("<ref_date__inv protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</ref_date__inv>"); valueXmlString.append("<ref_date__inv protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</ref_date__inv>");
...@@ -1673,6 +1677,7 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal ...@@ -1673,6 +1677,7 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
valueXmlString.append("<gst_code_state protect = \"0\" visible = \"1\">").append("<![CDATA["+gstCodeEdit+"]]>").append("</gst_code_state>"); valueXmlString.append("<gst_code_state protect = \"0\" visible = \"1\">").append("<![CDATA["+gstCodeEdit+"]]>").append("</gst_code_state>");
valueXmlString.append("<state_descr protect = \"0\" visible = \"0\">").append("<![CDATA["+stateDescEdit+"]]>").append("</state_descr>"); valueXmlString.append("<state_descr protect = \"0\" visible = \"0\">").append("<![CDATA["+stateDescEdit+"]]>").append("</state_descr>");
valueXmlString.append("<amount protect = \"0\" visible = \"1\">").append("<![CDATA["+amountEdit+"]]>").append("</amount>"); valueXmlString.append("<amount protect = \"0\" visible = \"1\">").append("<![CDATA["+amountEdit+"]]>").append("</amount>");
valueXmlString.append("<cust_name protect = \"0\" visible = \"0\">").append("<![CDATA[]]>").append("</cust_name>");
valueXmlString.append("<reas_code protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</reas_code>"); valueXmlString.append("<reas_code protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</reas_code>");
valueXmlString.append("<ref_id__inv protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</ref_id__inv>"); valueXmlString.append("<ref_id__inv protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</ref_id__inv>");
valueXmlString.append("<ref_date__inv protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</ref_date__inv>"); valueXmlString.append("<ref_date__inv protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</ref_date__inv>");
...@@ -1726,6 +1731,7 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal ...@@ -1726,6 +1731,7 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
{ {
valueXmlString.append("<doc_type protect = \"0\" visible = \"1\">").append("<![CDATA[R]]>").append("</doc_type>"); valueXmlString.append("<doc_type protect = \"0\" visible = \"1\">").append("<![CDATA[R]]>").append("</doc_type>");
valueXmlString.append("<tax_reg_no protect = \"0\" visible = \"1\">").append("<![CDATA[]]>").append("</tax_reg_no>"); valueXmlString.append("<tax_reg_no protect = \"0\" visible = \"1\">").append("<![CDATA[]]>").append("</tax_reg_no>");
valueXmlString.append("<cust_name protect = \"0\" visible = \"0\">").append("<![CDATA[]]>").append("</cust_name>");
valueXmlString.append("<gst_code_state protect = \"0\" visible = \"1\">").append("<![CDATA[35]]>").append("</gst_code_state>"); valueXmlString.append("<gst_code_state protect = \"0\" visible = \"1\">").append("<![CDATA[35]]>").append("</gst_code_state>");
valueXmlString.append("<state_descr protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</state_descr>"); valueXmlString.append("<state_descr protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</state_descr>");
valueXmlString.append("<doc_no protect = \"0\" visible = \"1\">").append("<![CDATA[]]>").append("</doc_no>"); valueXmlString.append("<doc_no protect = \"0\" visible = \"1\">").append("<![CDATA[]]>").append("</doc_no>");
...@@ -1752,6 +1758,7 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal ...@@ -1752,6 +1758,7 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
{ {
valueXmlString.append("<doc_type protect = \"0\" visible = \"0\">").append("<![CDATA[R]]>").append("</doc_type>"); valueXmlString.append("<doc_type protect = \"0\" visible = \"0\">").append("<![CDATA[R]]>").append("</doc_type>");
valueXmlString.append("<tax_reg_no protect = \"0\" visible = \"1\">").append("<![CDATA[]]>").append("</tax_reg_no>"); valueXmlString.append("<tax_reg_no protect = \"0\" visible = \"1\">").append("<![CDATA[]]>").append("</tax_reg_no>");
valueXmlString.append("<cust_name protect = \"0\" visible = \"0\">").append("<![CDATA[]]>").append("</cust_name>");
valueXmlString.append("<gst_code_state protect = \"0\" visible = \"1\">").append("<![CDATA[35]]>").append("</gst_code_state>"); valueXmlString.append("<gst_code_state protect = \"0\" visible = \"1\">").append("<![CDATA[35]]>").append("</gst_code_state>");
valueXmlString.append("<state_descr protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</state_descr>"); valueXmlString.append("<state_descr protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</state_descr>");
valueXmlString.append("<doc_no protect = \"0\" visible = \"1\">").append("<![CDATA[]]>").append("</doc_no>"); valueXmlString.append("<doc_no protect = \"0\" visible = \"1\">").append("<![CDATA[]]>").append("</doc_no>");
...@@ -1778,6 +1785,7 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal ...@@ -1778,6 +1785,7 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
{ {
valueXmlString.append("<doc_type protect = \"0\" visible = \"0\">").append("<![CDATA[R]]>").append("</doc_type>"); valueXmlString.append("<doc_type protect = \"0\" visible = \"0\">").append("<![CDATA[R]]>").append("</doc_type>");
valueXmlString.append("<tax_reg_no protect = \"0\" visible = \"0\">").append("<![CDATA[]]>").append("</tax_reg_no>"); valueXmlString.append("<tax_reg_no protect = \"0\" visible = \"0\">").append("<![CDATA[]]>").append("</tax_reg_no>");
valueXmlString.append("<cust_name protect = \"0\" visible = \"1\">").append("<![CDATA[]]>").append("</cust_name>");
valueXmlString.append("<gst_code_state protect = \"0\" visible = \"1\">").append("<![CDATA[35]]>").append("</gst_code_state>"); valueXmlString.append("<gst_code_state protect = \"0\" visible = \"1\">").append("<![CDATA[35]]>").append("</gst_code_state>");
valueXmlString.append("<state_descr protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</state_descr>"); valueXmlString.append("<state_descr protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</state_descr>");
valueXmlString.append("<doc_no protect = \"0\" visible = \"1\">").append("<![CDATA[]]>").append("</doc_no>"); valueXmlString.append("<doc_no protect = \"0\" visible = \"1\">").append("<![CDATA[]]>").append("</doc_no>");
...@@ -1803,7 +1811,8 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal ...@@ -1803,7 +1811,8 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
else if("E".equalsIgnoreCase(gst_type)) else if("E".equalsIgnoreCase(gst_type))
{ {
valueXmlString.append("<doc_type protect = \"0\" visible = \"0\">").append("<![CDATA[]]>").append("</doc_type>"); valueXmlString.append("<doc_type protect = \"0\" visible = \"0\">").append("<![CDATA[]]>").append("</doc_type>");
valueXmlString.append("<tax_reg_no protect = \"0\" visible = \"1\">").append("<![CDATA[]]>").append("</tax_reg_no>"); valueXmlString.append("<tax_reg_no protect = \"0\" visible = \"0\">").append("<![CDATA[]]>").append("</tax_reg_no>");
valueXmlString.append("<cust_name protect = \"0\" visible = \"0\">").append("<![CDATA[]]>").append("</cust_name>");
valueXmlString.append("<doc_no protect = \"0\" visible = \"1\">").append("<![CDATA[]]>").append("</doc_no>"); valueXmlString.append("<doc_no protect = \"0\" visible = \"1\">").append("<![CDATA[]]>").append("</doc_no>");
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("<amount protect = \"0\" visible = \"1\">").append("<![CDATA[]]>").append("</amount>"); valueXmlString.append("<amount protect = \"0\" visible = \"1\">").append("<![CDATA[]]>").append("</amount>");
...@@ -1830,6 +1839,7 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal ...@@ -1830,6 +1839,7 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
{ {
valueXmlString.append("<doc_type protect = \"0\" visible = \"0\">").append("<![CDATA[]]>").append("</doc_type>"); valueXmlString.append("<doc_type protect = \"0\" visible = \"0\">").append("<![CDATA[]]>").append("</doc_type>");
valueXmlString.append("<tax_reg_no protect = \"0\" visible = \"0\">").append("<![CDATA[]]>").append("</tax_reg_no>"); valueXmlString.append("<tax_reg_no protect = \"0\" visible = \"0\">").append("<![CDATA[]]>").append("</tax_reg_no>");
valueXmlString.append("<cust_name protect = \"0\" visible = \"0\">").append("<![CDATA[]]>").append("</cust_name>");
valueXmlString.append("<gst_code_state protect = \"0\" visible = \"0\">").append("<![CDATA[]]>").append("</gst_code_state>"); valueXmlString.append("<gst_code_state protect = \"0\" visible = \"0\">").append("<![CDATA[]]>").append("</gst_code_state>");
valueXmlString.append("<state_descr protect = \"0\" visible = \"0\">").append("<![CDATA[]]>").append("</state_descr>"); valueXmlString.append("<state_descr protect = \"0\" visible = \"0\">").append("<![CDATA[]]>").append("</state_descr>");
valueXmlString.append("<doc_no protect = \"0\" visible = \"0\">").append("<![CDATA[]]>").append("</doc_no>"); valueXmlString.append("<doc_no protect = \"0\" visible = \"0\">").append("<![CDATA[]]>").append("</doc_no>");
...@@ -1856,6 +1866,7 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal ...@@ -1856,6 +1866,7 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
{ {
valueXmlString.append("<doc_type protect = \"0\" visible = \"0\">").append("<![CDATA[]]>").append("</doc_type>"); valueXmlString.append("<doc_type protect = \"0\" visible = \"0\">").append("<![CDATA[]]>").append("</doc_type>");
valueXmlString.append("<tax_reg_no protect = \"0\" visible = \"1\">").append("<![CDATA[]]>").append("</tax_reg_no>"); valueXmlString.append("<tax_reg_no protect = \"0\" visible = \"1\">").append("<![CDATA[]]>").append("</tax_reg_no>");
valueXmlString.append("<cust_name protect = \"0\" visible = \"0\">").append("<![CDATA[]]>").append("</cust_name>");
valueXmlString.append("<doc_no protect = \"0\" visible = \"1\">").append("<![CDATA[]]>").append("</doc_no>"); valueXmlString.append("<doc_no protect = \"0\" visible = \"1\">").append("<![CDATA[]]>").append("</doc_no>");
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("<amount protect = \"0\" visible = \"1\">").append("<![CDATA[]]>").append("</amount>"); valueXmlString.append("<amount protect = \"0\" visible = \"1\">").append("<![CDATA[]]>").append("</amount>");
...@@ -1882,6 +1893,7 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal ...@@ -1882,6 +1893,7 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
{ {
valueXmlString.append("<doc_type protect = \"0\" visible = \"0\">").append("<![CDATA[]]>").append("</doc_type>"); valueXmlString.append("<doc_type protect = \"0\" visible = \"0\">").append("<![CDATA[]]>").append("</doc_type>");
valueXmlString.append("<tax_reg_no protect = \"0\" visible = \"1\">").append("<![CDATA[]]>").append("</tax_reg_no>"); valueXmlString.append("<tax_reg_no protect = \"0\" visible = \"1\">").append("<![CDATA[]]>").append("</tax_reg_no>");
valueXmlString.append("<cust_name protect = \"0\" visible = \"0\">").append("<![CDATA[]]>").append("</cust_name>");
valueXmlString.append("<doc_no protect = \"0\" visible = \"1\">").append("<![CDATA[]]>").append("</doc_no>"); valueXmlString.append("<doc_no protect = \"0\" visible = \"1\">").append("<![CDATA[]]>").append("</doc_no>");
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("<amount protect = \"0\" visible = \"1\">").append("<![CDATA[]]>").append("</amount>"); valueXmlString.append("<amount protect = \"0\" visible = \"1\">").append("<![CDATA[]]>").append("</amount>");
...@@ -1909,6 +1921,7 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal ...@@ -1909,6 +1921,7 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
valueXmlString.append("<gst_code_state protect = \"0\" visible = \"1\">").append("<![CDATA[35]]>").append("</gst_code_state>"); valueXmlString.append("<gst_code_state protect = \"0\" visible = \"1\">").append("<![CDATA[35]]>").append("</gst_code_state>");
valueXmlString.append("<state_descr protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</state_descr>"); valueXmlString.append("<state_descr protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</state_descr>");
valueXmlString.append("<amount protect = \"0\" visible = \"1\">").append("<![CDATA[]]>").append("</amount>"); valueXmlString.append("<amount protect = \"0\" visible = \"1\">").append("<![CDATA[]]>").append("</amount>");
valueXmlString.append("<cust_name protect = \"0\" visible = \"0\">").append("<![CDATA[]]>").append("</cust_name>");
valueXmlString.append("<reas_code protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</reas_code>"); valueXmlString.append("<reas_code protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</reas_code>");
valueXmlString.append("<ref_id__inv protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</ref_id__inv>"); valueXmlString.append("<ref_id__inv protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</ref_id__inv>");
valueXmlString.append("<ref_date__inv protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</ref_date__inv>"); valueXmlString.append("<ref_date__inv protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</ref_date__inv>");
...@@ -1936,6 +1949,7 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal ...@@ -1936,6 +1949,7 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
valueXmlString.append("<gst_code_state protect = \"0\" visible = \"1\">").append("<![CDATA[35]]>").append("</gst_code_state>"); valueXmlString.append("<gst_code_state protect = \"0\" visible = \"1\">").append("<![CDATA[35]]>").append("</gst_code_state>");
valueXmlString.append("<state_descr protect = \"0\" visible = \"0\">").append("<![CDATA[]]>").append("</state_descr>"); valueXmlString.append("<state_descr protect = \"0\" visible = \"0\">").append("<![CDATA[]]>").append("</state_descr>");
valueXmlString.append("<amount protect = \"0\" visible = \"1\">").append("<![CDATA[]]>").append("</amount>"); valueXmlString.append("<amount protect = \"0\" visible = \"1\">").append("<![CDATA[]]>").append("</amount>");
valueXmlString.append("<cust_name protect = \"0\" visible = \"0\">").append("<![CDATA[]]>").append("</cust_name>");
valueXmlString.append("<reas_code protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</reas_code>"); valueXmlString.append("<reas_code protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</reas_code>");
valueXmlString.append("<ref_id__inv protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</ref_id__inv>"); valueXmlString.append("<ref_id__inv protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</ref_id__inv>");
valueXmlString.append("<ref_date__inv protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</ref_date__inv>"); valueXmlString.append("<ref_date__inv protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</ref_date__inv>");
...@@ -2069,7 +2083,6 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal ...@@ -2069,7 +2083,6 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
valueXmlString.append("<gst_state_code protect = \"0\" visible = \"1\">").append("<![CDATA["+state1+"]]>").append("</gst_state_code>"); valueXmlString.append("<gst_state_code protect = \"0\" visible = \"1\">").append("<![CDATA["+state1+"]]>").append("</gst_state_code>");
valueXmlString.append("<pin protect = \"0\" visible = \"1\">").append("<![CDATA["+pin+"]]>").append("</pin>"); valueXmlString.append("<pin protect = \"0\" visible = \"1\">").append("<![CDATA["+pin+"]]>").append("</pin>");
} }
// Added by sarita on 21JULY2017 [START]
else if(tax_reg_no == null || tax_reg_no.trim().length() == 0) else if(tax_reg_no == null || tax_reg_no.trim().length() == 0)
{ {
valueXmlString.append("<name protect = \"0\" visible = \"0\">").append("<![CDATA[]]>").append("</name>"); valueXmlString.append("<name protect = \"0\" visible = \"0\">").append("<![CDATA[]]>").append("</name>");
...@@ -2080,7 +2093,6 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal ...@@ -2080,7 +2093,6 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
valueXmlString.append("<gst_state_code protect = \"0\" visible = \"0\">").append("<![CDATA[]]>").append("</gst_state_code>"); valueXmlString.append("<gst_state_code protect = \"0\" visible = \"0\">").append("<![CDATA[]]>").append("</gst_state_code>");
valueXmlString.append("<pin protect = \"0\" visible = \"0\">").append("<![CDATA[]]>").append("</pin>"); valueXmlString.append("<pin protect = \"0\" visible = \"0\">").append("<![CDATA[]]>").append("</pin>");
} }
// Added by sarita on 21JULY2017 [END]
} }
}//end of if block for tax_reg_no }//end of if block for tax_reg_no
...@@ -2225,11 +2237,12 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal ...@@ -2225,11 +2237,12 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
if(gstCode.equalsIgnoreCase(loginSiteCode)) if(gstCode.equalsIgnoreCase(loginSiteCode))
{ {
double rate = Double.parseDouble(gst_rate); double rate = Double.parseDouble(gst_rate);
igst_amt = checkNull(genericUtility.getColumnValue("igst_amt", dom));
cgst_amt = checkNull(genericUtility.getColumnValue("cgst_amt", dom)); cgst_amt = checkNull(genericUtility.getColumnValue("cgst_amt", dom));
sgst_amt = checkNull(genericUtility.getColumnValue("sgst_amt", dom)); sgst_amt = checkNull(genericUtility.getColumnValue("sgst_amt", dom));
System.out.println("cgst_amt["+cgst_amt+"]"+"sgst_amt["+sgst_amt+"]"); System.out.println("cgst_amt["+cgst_amt+"]"+"sgst_amt["+sgst_amt+"]");
//changes done by sarita on 21JUL2017 //changes done by sarita on 21JUL2017
valueXmlString.append("<igst_amt protect = \"1\">").append("<![CDATA[]]>").append("</igst_amt>"); valueXmlString.append("<igst_amt protect = \"1\">").append("<![CDATA["+igst_amt+"]]>").append("</igst_amt>");
valueXmlString.append("<cgst_perc protect = \"1\">").append("<![CDATA["+rate/2+"]]>").append("</cgst_perc>"); valueXmlString.append("<cgst_perc protect = \"1\">").append("<![CDATA["+rate/2+"]]>").append("</cgst_perc>");
valueXmlString.append("<sgst_perc protect = \"1\">").append("<![CDATA["+rate/2+"]]>").append("</sgst_perc>"); valueXmlString.append("<sgst_perc protect = \"1\">").append("<![CDATA["+rate/2+"]]>").append("</sgst_perc>");
valueXmlString.append("<cgst_amt protect = \"0\">").append("<![CDATA["+cgst_amt+"]]>").append("</cgst_amt>"); valueXmlString.append("<cgst_amt protect = \"0\">").append("<![CDATA["+cgst_amt+"]]>").append("</cgst_amt>");
...@@ -2242,8 +2255,8 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal ...@@ -2242,8 +2255,8 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
valueXmlString.append("<igst_perc>").append("<![CDATA["+gst_rate+"]]>").append("</igst_perc>"); valueXmlString.append("<igst_perc>").append("<![CDATA["+gst_rate+"]]>").append("</igst_perc>");
valueXmlString.append("<igst_amt protect = \"0\">").append("<![CDATA["+igst_amt+"]]>").append("</igst_amt>"); valueXmlString.append("<igst_amt protect = \"0\">").append("<![CDATA["+igst_amt+"]]>").append("</igst_amt>");
//changes done by sarita on 21JUL2017 //changes done by sarita on 21JUL2017
valueXmlString.append("<cgst_amt protect = \"1\">").append("<![CDATA[]]>").append("</cgst_amt>"); valueXmlString.append("<cgst_amt protect = \"1\">").append("<![CDATA["+cgst_amt+"]]>").append("</cgst_amt>");
valueXmlString.append("<sgst_amt protect = \"1\">").append("<![CDATA[]]>").append("</sgst_amt>"); valueXmlString.append("<sgst_amt protect = \"1\">").append("<![CDATA["+sgst_amt+"]]>").append("</sgst_amt>");
} }
} }
} }
...@@ -2255,11 +2268,12 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal ...@@ -2255,11 +2268,12 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
if(state_code.equalsIgnoreCase(loginSiteCode)) if(state_code.equalsIgnoreCase(loginSiteCode))
{ {
double rate = Double.parseDouble(gst_rate); double rate = Double.parseDouble(gst_rate);
igst_amt = checkNull(genericUtility.getColumnValue("igst_amt", dom));
cgst_amt = checkNull(genericUtility.getColumnValue("cgst_amt", dom)); cgst_amt = checkNull(genericUtility.getColumnValue("cgst_amt", dom));
sgst_amt = checkNull(genericUtility.getColumnValue("sgst_amt", dom)); sgst_amt = checkNull(genericUtility.getColumnValue("sgst_amt", dom));
System.out.println("cgst_amt["+cgst_amt+"]"+"sgst_amt["+sgst_amt+"]"); System.out.println("cgst_amt["+cgst_amt+"]"+"sgst_amt["+sgst_amt+"]");
//changes by sarita on 21JUL2017 //changes by sarita on 21JUL2017
valueXmlString.append("<igst_amt protect = \"1\">").append("<![CDATA[]]>").append("</igst_amt>"); valueXmlString.append("<igst_amt protect = \"1\">").append("<![CDATA["+igst_amt+"]]>").append("</igst_amt>");
valueXmlString.append("<cgst_perc protect = \"1\">").append("<![CDATA["+rate/2+"]]>").append("</cgst_perc>"); valueXmlString.append("<cgst_perc protect = \"1\">").append("<![CDATA["+rate/2+"]]>").append("</cgst_perc>");
valueXmlString.append("<sgst_perc protect = \"1\">").append("<![CDATA["+rate/2+"]]>").append("</sgst_perc>"); valueXmlString.append("<sgst_perc protect = \"1\">").append("<![CDATA["+rate/2+"]]>").append("</sgst_perc>");
valueXmlString.append("<cgst_amt protect = \"0\">").append("<![CDATA["+cgst_amt+"]]>").append("</cgst_amt>"); valueXmlString.append("<cgst_amt protect = \"0\">").append("<![CDATA["+cgst_amt+"]]>").append("</cgst_amt>");
...@@ -2272,8 +2286,8 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal ...@@ -2272,8 +2286,8 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
valueXmlString.append("<igst_perc>").append("<![CDATA["+gst_rate+"]]>").append("</igst_perc>"); valueXmlString.append("<igst_perc>").append("<![CDATA["+gst_rate+"]]>").append("</igst_perc>");
valueXmlString.append("<igst_amt protect = \"0\">").append("<![CDATA["+igst_amt+"]]>").append("</igst_amt>"); valueXmlString.append("<igst_amt protect = \"0\">").append("<![CDATA["+igst_amt+"]]>").append("</igst_amt>");
//changes by sarita on 21JUL2017 //changes by sarita on 21JUL2017
valueXmlString.append("<cgst_amt protect = \"1\">").append("<![CDATA[]]>").append("</cgst_amt>"); valueXmlString.append("<cgst_amt protect = \"1\">").append("<![CDATA["+cgst_amt+"]]>").append("</cgst_amt>");
valueXmlString.append("<sgst_amt protect = \"1\">").append("<![CDATA[]]>").append("</sgst_amt>"); valueXmlString.append("<sgst_amt protect = \"1\">").append("<![CDATA["+sgst_amt+"]]>").append("</sgst_amt>");
} }
}//end of if block if state_code is not null }//end of if block if state_code is not null
} }
......
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