Skip to content

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

Updated GstrIC.java class done changes in itemdefault to set B2B Invoice filed... 

Updated GstrIC.java class done changes in itemdefault to set B2B Invoice filed by default , done changes in rate to apply IGST , CGST and SCGT as required on 21JUL2017


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@106345 ce508802-f39f-4f6c-b175-0d175dae99d5
parent ef14a972
Hide whitespace changes
Inline Side-by-side
Showing with 71 additions and 64 deletions
webitm-gst/ibase/webitm/ejb/gst/GstrIC.java
View file @ 36295fd6
...@@ -163,14 +163,14 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal ...@@ -163,14 +163,14 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
{ {
doc_type = checkNull(genericUtility.getColumnValue("doc_type", dom)).trim(); doc_type = checkNull(genericUtility.getColumnValue("doc_type", dom)).trim();
gst_type = checkNull(genericUtility.getColumnValue("gst_type", dom)).trim(); gst_type = checkNull(genericUtility.getColumnValue("gst_type", dom)).trim();
System.out.println("Document Type is ["+doc_type+"]"+"gst_type["+gst_type+"]"); //System.out.println("Document Type is ["+doc_type+"]"+"gst_type["+gst_type+"]");
}//end of if block for doc_type }//end of if block for doc_type
else if("tax_reg_no".equalsIgnoreCase(childNodeName)) else if("tax_reg_no".equalsIgnoreCase(childNodeName))
{ {
gst_type = checkNull(genericUtility.getColumnValue("gst_type", dom)).trim(); gst_type = checkNull(genericUtility.getColumnValue("gst_type", dom)).trim();
tax_reg_no = checkNull(genericUtility.getColumnValue("tax_reg_no", dom)).trim(); tax_reg_no = checkNull(genericUtility.getColumnValue("tax_reg_no", dom)).trim();
System.out.println("tax_reg_no["+tax_reg_no+"]"+"gst_type["+gst_type+"]"); //System.out.println("tax_reg_no["+tax_reg_no+"]"+"gst_type["+gst_type+"]");
}//end of if block for tax_reg_no }//end of if block for tax_reg_no
else if("name".equalsIgnoreCase(childNodeName)) else if("name".equalsIgnoreCase(childNodeName))
...@@ -178,7 +178,7 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal ...@@ -178,7 +178,7 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
tax_reg_no = checkNull(genericUtility.getColumnValue("tax_reg_no", dom)).trim(); tax_reg_no = checkNull(genericUtility.getColumnValue("tax_reg_no", dom)).trim();
gst_type = checkNull(genericUtility.getColumnValue("gst_type", dom)).trim(); gst_type = checkNull(genericUtility.getColumnValue("gst_type", dom)).trim();
name = checkNull(genericUtility.getColumnValue("name", dom)).trim(); name = checkNull(genericUtility.getColumnValue("name", dom)).trim();
System.out.println("tax_reg_no["+tax_reg_no+"]"+"gst_type["+gst_type+"]"+"name["+name+"]"); //System.out.println("tax_reg_no["+tax_reg_no+"]"+"gst_type["+gst_type+"]"+"name["+name+"]");
}//end of if block for name }//end of if block for name
else if("addr1".equalsIgnoreCase(childNodeName)) else if("addr1".equalsIgnoreCase(childNodeName))
...@@ -186,7 +186,7 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal ...@@ -186,7 +186,7 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
tax_reg_no = checkNull(genericUtility.getColumnValue("tax_reg_no", dom)).trim(); tax_reg_no = checkNull(genericUtility.getColumnValue("tax_reg_no", dom)).trim();
gst_type = checkNull(genericUtility.getColumnValue("gst_type", dom)).trim(); gst_type = checkNull(genericUtility.getColumnValue("gst_type", dom)).trim();
addr1 = checkNull(genericUtility.getColumnValue("addr1", dom)).trim(); addr1 = checkNull(genericUtility.getColumnValue("addr1", dom)).trim();
System.out.println("tax_reg_no["+tax_reg_no+"]"+"gst_type["+gst_type+"]"+"addr1["+addr1+"]"); //System.out.println("tax_reg_no["+tax_reg_no+"]"+"gst_type["+gst_type+"]"+"addr1["+addr1+"]");
}//end of if block for addr1 }//end of if block for addr1
else if("addr2".equalsIgnoreCase(childNodeName)) else if("addr2".equalsIgnoreCase(childNodeName))
...@@ -194,7 +194,7 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal ...@@ -194,7 +194,7 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
tax_reg_no = checkNull(genericUtility.getColumnValue("tax_reg_no", dom)).trim(); tax_reg_no = checkNull(genericUtility.getColumnValue("tax_reg_no", dom)).trim();
gst_type = checkNull(genericUtility.getColumnValue("gst_type", dom)).trim(); gst_type = checkNull(genericUtility.getColumnValue("gst_type", dom)).trim();
addr2 = checkNull(genericUtility.getColumnValue("addr2", dom)).trim(); addr2 = checkNull(genericUtility.getColumnValue("addr2", dom)).trim();
System.out.println("tax_reg_no["+tax_reg_no+"]"+"gst_type["+gst_type+"]"+"addr2["+addr2+"]"); //System.out.println("tax_reg_no["+tax_reg_no+"]"+"gst_type["+gst_type+"]"+"addr2["+addr2+"]");
}//end of if block for addr2 }//end of if block for addr2
else if("addr3".equalsIgnoreCase(childNodeName)) else if("addr3".equalsIgnoreCase(childNodeName))
...@@ -202,7 +202,7 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal ...@@ -202,7 +202,7 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
tax_reg_no = checkNull(genericUtility.getColumnValue("tax_reg_no", dom)).trim(); tax_reg_no = checkNull(genericUtility.getColumnValue("tax_reg_no", dom)).trim();
gst_type = checkNull(genericUtility.getColumnValue("gst_type", dom)).trim(); gst_type = checkNull(genericUtility.getColumnValue("gst_type", dom)).trim();
addr3 = checkNull(genericUtility.getColumnValue("addr3", dom)).trim(); addr3 = checkNull(genericUtility.getColumnValue("addr3", dom)).trim();
System.out.println("tax_reg_no["+tax_reg_no+"]"+"gst_type["+gst_type+"]"+"addr3["+addr3+"]"); //System.out.println("tax_reg_no["+tax_reg_no+"]"+"gst_type["+gst_type+"]"+"addr3["+addr3+"]");
}//end of if block for addr3 }//end of if block for addr3
else if("city".equalsIgnoreCase(childNodeName)) else if("city".equalsIgnoreCase(childNodeName))
...@@ -210,7 +210,7 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal ...@@ -210,7 +210,7 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
tax_reg_no = checkNull(genericUtility.getColumnValue("tax_reg_no", dom)).trim(); tax_reg_no = checkNull(genericUtility.getColumnValue("tax_reg_no", dom)).trim();
gst_type = checkNull(genericUtility.getColumnValue("gst_type", dom)).trim(); gst_type = checkNull(genericUtility.getColumnValue("gst_type", dom)).trim();
city = checkNull(genericUtility.getColumnValue("city", dom)).trim(); city = checkNull(genericUtility.getColumnValue("city", dom)).trim();
System.out.println("tax_reg_no["+tax_reg_no+"]"+"gst_type["+gst_type+"]"+"city["+city+"]"); //System.out.println("tax_reg_no["+tax_reg_no+"]"+"gst_type["+gst_type+"]"+"city["+city+"]");
}//end of if block for city }//end of if block for city
else if("gst_state_code".equalsIgnoreCase(childNodeName)) else if("gst_state_code".equalsIgnoreCase(childNodeName))
...@@ -218,7 +218,7 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal ...@@ -218,7 +218,7 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
tax_reg_no = checkNull(genericUtility.getColumnValue("tax_reg_no", dom)).trim(); tax_reg_no = checkNull(genericUtility.getColumnValue("tax_reg_no", dom)).trim();
gst_type = checkNull(genericUtility.getColumnValue("gst_type", dom)).trim(); gst_type = checkNull(genericUtility.getColumnValue("gst_type", dom)).trim();
state = checkNull(genericUtility.getColumnValue("gst_state_code", dom)).trim(); state = checkNull(genericUtility.getColumnValue("gst_state_code", dom)).trim();
System.out.println("tax_reg_no["+tax_reg_no+"]"+"gst_type["+gst_type+"]"+"state["+state+"]"); //System.out.println("tax_reg_no["+tax_reg_no+"]"+"gst_type["+gst_type+"]"+"state["+state+"]");
}//end of if block for state }//end of if block for state
else if("pin".equalsIgnoreCase(childNodeName)) else if("pin".equalsIgnoreCase(childNodeName))
...@@ -226,21 +226,21 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal ...@@ -226,21 +226,21 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
tax_reg_no = checkNull(genericUtility.getColumnValue("tax_reg_no", dom)).trim(); tax_reg_no = checkNull(genericUtility.getColumnValue("tax_reg_no", dom)).trim();
gst_type = checkNull(genericUtility.getColumnValue("gst_type", dom)).trim(); gst_type = checkNull(genericUtility.getColumnValue("gst_type", dom)).trim();
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
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();
state_code = checkNull(genericUtility.getColumnValue("gst_code_state", dom)).trim(); state_code = checkNull(genericUtility.getColumnValue("gst_code_state", dom)).trim();
System.out.println("gst_type["+gst_type+"]"+"gst_code_state["+state_code+"]"); //System.out.println("gst_type["+gst_type+"]"+"gst_code_state["+state_code+"]");
}//end of if block for gst_code_state }//end of if block for gst_code_state
else if("doc_no".equalsIgnoreCase(childNodeName)) else if("doc_no".equalsIgnoreCase(childNodeName))
{ {
gst_type = checkNull(genericUtility.getColumnValue("gst_type", dom)).trim(); gst_type = checkNull(genericUtility.getColumnValue("gst_type", dom)).trim();
doc_no = checkNull(genericUtility.getColumnValue("doc_no", dom)).trim(); doc_no = checkNull(genericUtility.getColumnValue("doc_no", dom)).trim();
System.out.println("gst_type["+gst_type+"]"+"doc_no["+doc_no+"]"); //System.out.println("gst_type["+gst_type+"]"+"doc_no["+doc_no+"]");
}//end of if block for doc_no }//end of if block for doc_no
else if("doc_date".equalsIgnoreCase(childNodeName)) else if("doc_date".equalsIgnoreCase(childNodeName))
...@@ -254,14 +254,14 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal ...@@ -254,14 +254,14 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
{ {
gst_type = checkNull(genericUtility.getColumnValue("gst_type", dom)).trim(); gst_type = checkNull(genericUtility.getColumnValue("gst_type", dom)).trim();
amount = checkNull(genericUtility.getColumnValue("amount", dom)).trim(); amount = checkNull(genericUtility.getColumnValue("amount", dom)).trim();
System.out.println("gst_type["+gst_type+"]"+"amount["+amount+"]"); //System.out.println("gst_type["+gst_type+"]"+"amount["+amount+"]");
}//end of if block for amount }//end of if block for amount
else if("reverse_chrg".equalsIgnoreCase(childNodeName)) else if("reverse_chrg".equalsIgnoreCase(childNodeName))
{ {
gst_type = checkNull(genericUtility.getColumnValue("gst_type", dom)).trim(); gst_type = checkNull(genericUtility.getColumnValue("gst_type", dom)).trim();
reverse_chrg = checkNull(genericUtility.getColumnValue("reverse_chrg", dom)).trim(); reverse_chrg = checkNull(genericUtility.getColumnValue("reverse_chrg", dom)).trim();
System.out.println("gst_type["+gst_type+"]"+"reverse_chrg["+reverse_chrg+"]"); //System.out.println("gst_type["+gst_type+"]"+"reverse_chrg["+reverse_chrg+"]");
}//end of if block for reverse_chrg }//end of if block for reverse_chrg
else if("ecom_reg_no".equalsIgnoreCase(childNodeName)) else if("ecom_reg_no".equalsIgnoreCase(childNodeName))
...@@ -269,42 +269,42 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal ...@@ -269,42 +269,42 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
gst_type = checkNull(genericUtility.getColumnValue("gst_type", dom)).trim(); gst_type = checkNull(genericUtility.getColumnValue("gst_type", dom)).trim();
doc_type = checkNull(genericUtility.getColumnValue("doc_type", dom)).trim(); doc_type = checkNull(genericUtility.getColumnValue("doc_type", dom)).trim();
ecomRegNo = checkNull(genericUtility.getColumnValue("ecom_reg_no", dom)).trim(); ecomRegNo = checkNull(genericUtility.getColumnValue("ecom_reg_no", dom)).trim();
System.out.println("gst_type["+gst_type+"]"+"doc_type["+doc_type+"]"+"ecomRegNo["+ecomRegNo+"]"); //System.out.println("gst_type["+gst_type+"]"+"doc_type["+doc_type+"]"+"ecomRegNo["+ecomRegNo+"]");
}//end of if block for ecom_reg_no }//end of if block for ecom_reg_no
else if("ref_id__inv".equalsIgnoreCase(childNodeName)) else if("ref_id__inv".equalsIgnoreCase(childNodeName))
{ {
gst_type = checkNull(genericUtility.getColumnValue("gst_type", dom)).trim(); gst_type = checkNull(genericUtility.getColumnValue("gst_type", dom)).trim();
ref_id__inv = checkNull(genericUtility.getColumnValue("ref_id__inv", dom)).trim(); ref_id__inv = checkNull(genericUtility.getColumnValue("ref_id__inv", dom)).trim();
System.out.println("gst_type["+gst_type+"]"+"ref_id__inv["+ref_id__inv+"]"); //System.out.println("gst_type["+gst_type+"]"+"ref_id__inv["+ref_id__inv+"]");
}//end of if block for ref_id__inv }//end of if block for ref_id__inv
else if("ref_date__inv".equalsIgnoreCase(childNodeName)) else if("ref_date__inv".equalsIgnoreCase(childNodeName))
{ {
gst_type = checkNull(genericUtility.getColumnValue("gst_type", dom)).trim(); gst_type = checkNull(genericUtility.getColumnValue("gst_type", dom)).trim();
ref_date__inv = checkNull(genericUtility.getColumnValue("ref_date__inv", dom)).trim(); ref_date__inv = checkNull(genericUtility.getColumnValue("ref_date__inv", dom)).trim();
System.out.println("gst_type["+gst_type+"]"+"ref_date__inv["+ref_date__inv+"]"); //System.out.println("gst_type["+gst_type+"]"+"ref_date__inv["+ref_date__inv+"]");
}//end of if block for ref_date__inv }//end of if block for ref_date__inv
else if("order_no".equalsIgnoreCase(childNodeName)) else if("order_no".equalsIgnoreCase(childNodeName))
{ {
gst_type = checkNull(genericUtility.getColumnValue("gst_type", dom)).trim(); gst_type = checkNull(genericUtility.getColumnValue("gst_type", dom)).trim();
orderNo = checkNull(genericUtility.getColumnValue("order_no", dom)).trim(); orderNo = checkNull(genericUtility.getColumnValue("order_no", dom)).trim();
System.out.println("gst_type["+gst_type+"]"+"orderNo["+orderNo+"]"); //System.out.println("gst_type["+gst_type+"]"+"orderNo["+orderNo+"]");
}//end of if block for order_no }//end of if block for order_no
else if("lr_no".equalsIgnoreCase(childNodeName)) else if("lr_no".equalsIgnoreCase(childNodeName))
{ {
gst_type = checkNull(genericUtility.getColumnValue("gst_type", dom)).trim(); gst_type = checkNull(genericUtility.getColumnValue("gst_type", dom)).trim();
lr_no = checkNull(genericUtility.getColumnValue("lr_no", dom)).trim(); lr_no = checkNull(genericUtility.getColumnValue("lr_no", dom)).trim();
System.out.println("gst_type["+gst_type+"]"+"lr_no["+lr_no+"]"); //System.out.println("gst_type["+gst_type+"]"+"lr_no["+lr_no+"]");
}//end of if block for lr_no }//end of if block for lr_no
else if("lr_date".equalsIgnoreCase(childNodeName)) else if("lr_date".equalsIgnoreCase(childNodeName))
{ {
gst_type = checkNull(genericUtility.getColumnValue("gst_type", dom)).trim(); gst_type = checkNull(genericUtility.getColumnValue("gst_type", dom)).trim();
lr_date = checkNull(genericUtility.getColumnValue("lr_date", dom)).trim(); lr_date = checkNull(genericUtility.getColumnValue("lr_date", dom)).trim();
System.out.println("gst_type["+gst_type+"]"+"lr_date["+lr_date+"]"); //System.out.println("gst_type["+gst_type+"]"+"lr_date["+lr_date+"]");
}//end of if block for lr_date }//end of if block for lr_date
}//end of for loop }//end of for loop
...@@ -552,28 +552,28 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal ...@@ -552,28 +552,28 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
{ {
gst_type = checkNull(genericUtility.getColumnValue("gst_type", dom1)).trim(); gst_type = checkNull(genericUtility.getColumnValue("gst_type", dom1)).trim();
gs_code = checkNull(genericUtility.getColumnValue("gs_code", dom)).trim(); gs_code = checkNull(genericUtility.getColumnValue("gs_code", dom)).trim();
System.out.println("gst_type["+gst_type+"]"+"gs_code["+gs_code+"]"); //System.out.println("gst_type["+gst_type+"]"+"gs_code["+gs_code+"]");
}//end of if block for GS Code }//end of if block for GS Code
else if("quantity".equalsIgnoreCase(childNodeName)) else if("quantity".equalsIgnoreCase(childNodeName))
{ {
gst_type = checkNull(genericUtility.getColumnValue("gst_type", dom1)).trim(); gst_type = checkNull(genericUtility.getColumnValue("gst_type", dom1)).trim();
quantity = checkNull(genericUtility.getColumnValue("quantity", dom)).trim(); quantity = checkNull(genericUtility.getColumnValue("quantity", dom)).trim();
System.out.println("gst_type["+gst_type+"]"+"quantity["+quantity+"]"); //System.out.println("gst_type["+gst_type+"]"+"quantity["+quantity+"]");
}//end of if block for quantity }//end of if block for quantity
else if("unit".equalsIgnoreCase(childNodeName)) else if("unit".equalsIgnoreCase(childNodeName))
{ {
gst_type = checkNull(genericUtility.getColumnValue("gst_type", dom1)).trim(); gst_type = checkNull(genericUtility.getColumnValue("gst_type", dom1)).trim();
unit = checkNull(genericUtility.getColumnValue("unit", dom)).trim(); unit = checkNull(genericUtility.getColumnValue("unit", dom)).trim();
System.out.println("gst_type["+gst_type+"]"+"unit["+unit+"]"); //System.out.println("gst_type["+gst_type+"]"+"unit["+unit+"]");
}//end of if block for unit }//end of if block for unit
else if("taxable_amt".equalsIgnoreCase(childNodeName)) else if("taxable_amt".equalsIgnoreCase(childNodeName))
{ {
gst_type = checkNull(genericUtility.getColumnValue("gst_type", dom1)).trim(); gst_type = checkNull(genericUtility.getColumnValue("gst_type", dom1)).trim();
taxable_amt = checkNull(genericUtility.getColumnValue("taxable_amt", dom)).trim(); taxable_amt = checkNull(genericUtility.getColumnValue("taxable_amt", dom)).trim();
System.out.println("gst_type["+gst_type+"]"+"taxable_amt["+taxable_amt+"]"); //System.out.println("gst_type["+gst_type+"]"+"taxable_amt["+taxable_amt+"]");
}//end of if block for taxable_amt }//end of if block for taxable_amt
else if("gst_rate".equalsIgnoreCase(childNodeName)) else if("gst_rate".equalsIgnoreCase(childNodeName))
...@@ -584,7 +584,7 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal ...@@ -584,7 +584,7 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
// Added by sarita on 14/07/2017 // Added by sarita on 14/07/2017
gstRate = converStringToDouble(checkNull(genericUtility.getColumnValue("gst_rate", dom)).trim()); gstRate = converStringToDouble(checkNull(genericUtility.getColumnValue("gst_rate", dom)).trim());
taxable_amt = checkNull(genericUtility.getColumnValue("taxable_amt", dom)).trim(); taxable_amt = checkNull(genericUtility.getColumnValue("taxable_amt", dom)).trim();
System.out.println("gst_type["+gst_type+"]"+"doc_type["+doc_type+"]"+"gst_rate["+gst_rate+"]"+"gstRate["+gstRate+"]"+"taxable_amt["+taxable_amt+"]"); //System.out.println("gst_type["+gst_type+"]"+"doc_type["+doc_type+"]"+"gst_rate["+gst_rate+"]"+"gstRate["+gstRate+"]"+"taxable_amt["+taxable_amt+"]");
}//end of if block for gst_rate }//end of if block for gst_rate
else if("igst_perc".equalsIgnoreCase(childNodeName)) else if("igst_perc".equalsIgnoreCase(childNodeName))
...@@ -595,7 +595,7 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal ...@@ -595,7 +595,7 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
igst_perc = checkNull(genericUtility.getColumnValue("igst_perc", dom)).trim(); igst_perc = checkNull(genericUtility.getColumnValue("igst_perc", dom)).trim();
igst_percVal = converStringToDouble(checkNull(genericUtility.getColumnValue("igst_perc", dom)).trim()); igst_percVal = converStringToDouble(checkNull(genericUtility.getColumnValue("igst_perc", dom)).trim());
state_code_cdn = getGstCodeForCDNR(dom,conn); state_code_cdn = getGstCodeForCDNR(dom,conn);
System.out.println("gst_type["+gst_type+"]"+"state_code["+state_code+"]"+"loginSiteCode["+loginSiteCode+"]"+"igst_perc["+igst_perc+"]"+"igst_percVal["+igst_percVal+"]"); //System.out.println("gst_type["+gst_type+"]"+"state_code["+state_code+"]"+"loginSiteCode["+loginSiteCode+"]"+"igst_perc["+igst_perc+"]"+"igst_percVal["+igst_percVal+"]");
}//end of if block for igst_perc }//end of if block for igst_perc
else if("igst_amt".equalsIgnoreCase(childNodeName)) else if("igst_amt".equalsIgnoreCase(childNodeName))
...@@ -606,7 +606,7 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal ...@@ -606,7 +606,7 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
igst_amt = checkNull(genericUtility.getColumnValue("igst_amt", dom)).trim(); igst_amt = checkNull(genericUtility.getColumnValue("igst_amt", dom)).trim();
igst_amtVal = converStringToDouble(checkNull(genericUtility.getColumnValue("igst_amt", dom)).trim()); igst_amtVal = converStringToDouble(checkNull(genericUtility.getColumnValue("igst_amt", dom)).trim());
state_code_cdn = getGstCodeForCDNR(dom,conn); state_code_cdn = getGstCodeForCDNR(dom,conn);
System.out.println("gst_type["+gst_type+"]"+"state_code["+state_code+"]"+"loginSiteCode["+loginSiteCode+"]"+"igst_amt["+igst_amt+"]"+"igst_amtVal["+igst_amtVal+"]"); //System.out.println("gst_type["+gst_type+"]"+"state_code["+state_code+"]"+"loginSiteCode["+loginSiteCode+"]"+"igst_amt["+igst_amt+"]"+"igst_amtVal["+igst_amtVal+"]");
}//end of if block for igst_amt }//end of if block for igst_amt
else if("cgst_perc".equalsIgnoreCase(childNodeName)) else if("cgst_perc".equalsIgnoreCase(childNodeName))
...@@ -617,7 +617,7 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal ...@@ -617,7 +617,7 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
loginSiteCode = checkNull(getStateFromLoginSite(loginSite,conn)); loginSiteCode = checkNull(getStateFromLoginSite(loginSite,conn));
cgst_percVal = converStringToDouble(checkNull(genericUtility.getColumnValue("cgst_perc", dom)).trim()); cgst_percVal = converStringToDouble(checkNull(genericUtility.getColumnValue("cgst_perc", dom)).trim());
state_code_cdn = getGstCodeForCDNR(dom,conn); state_code_cdn = getGstCodeForCDNR(dom,conn);
System.out.println("gst_type["+gst_type+"]"+"state_code["+state_code+"]"+"cgst_perc["+cgst_perc+"]"+"loginSiteCode["+loginSiteCode+"]"+"cgst_percVal["+cgst_percVal+"]"); //System.out.println("gst_type["+gst_type+"]"+"state_code["+state_code+"]"+"cgst_perc["+cgst_perc+"]"+"loginSiteCode["+loginSiteCode+"]"+"cgst_percVal["+cgst_percVal+"]");
}//end of if block for cgst_perc }//end of if block for cgst_perc
else if("cgst_amt".equalsIgnoreCase(childNodeName)) else if("cgst_amt".equalsIgnoreCase(childNodeName))
...@@ -628,7 +628,7 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal ...@@ -628,7 +628,7 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
loginSiteCode = checkNull(getStateFromLoginSite(loginSite,conn)); loginSiteCode = checkNull(getStateFromLoginSite(loginSite,conn));
cgst_amtVal = converStringToDouble(checkNull(genericUtility.getColumnValue("cgst_amt", dom)).trim()); cgst_amtVal = converStringToDouble(checkNull(genericUtility.getColumnValue("cgst_amt", dom)).trim());
state_code_cdn = getGstCodeForCDNR(dom,conn); state_code_cdn = getGstCodeForCDNR(dom,conn);
System.out.println("gst_type["+gst_type+"]"+"state_code["+state_code+"]"+"cgst_amt["+cgst_amt+"]"+"loginSiteCode["+loginSiteCode+"]"+"cgst_amtVal["+cgst_amtVal+"]"); //System.out.println("gst_type["+gst_type+"]"+"state_code["+state_code+"]"+"cgst_amt["+cgst_amt+"]"+"loginSiteCode["+loginSiteCode+"]"+"cgst_amtVal["+cgst_amtVal+"]");
}//end of if block for cgst_amt }//end of if block for cgst_amt
else if("sgst_perc".equalsIgnoreCase(childNodeName)) else if("sgst_perc".equalsIgnoreCase(childNodeName))
...@@ -639,7 +639,7 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal ...@@ -639,7 +639,7 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
loginSiteCode = checkNull(getStateFromLoginSite(loginSite,conn)); loginSiteCode = checkNull(getStateFromLoginSite(loginSite,conn));
sgst_percVal = converStringToDouble(checkNull(genericUtility.getColumnValue("sgst_perc", dom)).trim()); sgst_percVal = converStringToDouble(checkNull(genericUtility.getColumnValue("sgst_perc", dom)).trim());
state_code_cdn = getGstCodeForCDNR(dom,conn); state_code_cdn = getGstCodeForCDNR(dom,conn);
System.out.println("gst_type["+gst_type+"]"+"state_code["+state_code+"]"+"sgst_perc["+sgst_perc+"]"+"loginSiteCode["+loginSiteCode+"]"+"sgst_percVal["+sgst_percVal+"]"); //System.out.println("gst_type["+gst_type+"]"+"state_code["+state_code+"]"+"sgst_perc["+sgst_perc+"]"+"loginSiteCode["+loginSiteCode+"]"+"sgst_percVal["+sgst_percVal+"]");
}//end of if block for sgst_perc }//end of if block for sgst_perc
else if("sgst_amt".equalsIgnoreCase(childNodeName)) else if("sgst_amt".equalsIgnoreCase(childNodeName))
...@@ -650,14 +650,14 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal ...@@ -650,14 +650,14 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
loginSiteCode = checkNull(getStateFromLoginSite(loginSite,conn)); loginSiteCode = checkNull(getStateFromLoginSite(loginSite,conn));
sgst_amtVal = converStringToDouble(checkNull(genericUtility.getColumnValue("sgst_amt", dom)).trim()); sgst_amtVal = converStringToDouble(checkNull(genericUtility.getColumnValue("sgst_amt", dom)).trim());
state_code_cdn = getGstCodeForCDNR(dom,conn); state_code_cdn = getGstCodeForCDNR(dom,conn);
System.out.println("gst_type["+gst_type+"]"+"state_code["+state_code+"]"+"sgst_amt["+sgst_amt+"]"+"loginSiteCode["+loginSiteCode+"]"+"sgst_amtVal["+sgst_amtVal+"]"); //System.out.println("gst_type["+gst_type+"]"+"state_code["+state_code+"]"+"sgst_amt["+sgst_amt+"]"+"loginSiteCode["+loginSiteCode+"]"+"sgst_amtVal["+sgst_amtVal+"]");
}//end of if block for sgst_amt }//end of if block for sgst_amt
else if("itc_type".equalsIgnoreCase(childNodeName)) else if("itc_type".equalsIgnoreCase(childNodeName))
{ {
gst_type = checkNull(genericUtility.getColumnValue("gst_type", dom1)).trim(); gst_type = checkNull(genericUtility.getColumnValue("gst_type", dom1)).trim();
itc_type = checkNull(genericUtility.getColumnValue("itc_type", dom)).trim(); itc_type = checkNull(genericUtility.getColumnValue("itc_type", dom)).trim();
System.out.println("gst_type["+gst_type+"]"+"itc_type["+itc_type+"]"); //System.out.println("gst_type["+gst_type+"]"+"itc_type["+itc_type+"]");
}//end of if block for itc_type }//end of if block for itc_type
}//end of for loop }//end of for loop
...@@ -804,7 +804,7 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal ...@@ -804,7 +804,7 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
refInvDateDate = Timestamp.valueOf(genericUtility.getValidDateString(ref_date__inv, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0"); refInvDateDate = Timestamp.valueOf(genericUtility.getValidDateString(ref_date__inv, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0");
String dt = "01/07/2017"; String dt = "01/07/2017";
invDate = Timestamp.valueOf(genericUtility.getValidDateString(dt, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0"); invDate = Timestamp.valueOf(genericUtility.getValidDateString(dt, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0");
System.out.println("ref_id__inv is ["+refIdInv+"]"+"ref_date__inv["+ref_date__inv+"]"+"refInvDateDate["+refInvDateDate+"]"+"Date1/7/17["+dt+"]"+"invDate["+invDate+"]"); //System.out.println("ref_id__inv is ["+refIdInv+"]"+"ref_date__inv["+ref_date__inv+"]"+"refInvDateDate["+refInvDateDate+"]"+"Date1/7/17["+dt+"]"+"invDate["+invDate+"]");
if(refInvDateDate.after(invDate)) if(refInvDateDate.after(invDate))
{ {
sql = "select gst_code from gst_data_hdr where doc_no=?"; sql = "select gst_code from gst_data_hdr where doc_no=?";
...@@ -883,7 +883,7 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal ...@@ -883,7 +883,7 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
refInvDateDate = Timestamp.valueOf(genericUtility.getValidDateString(ref_date__inv, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0"); refInvDateDate = Timestamp.valueOf(genericUtility.getValidDateString(ref_date__inv, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0");
String dt = "01/07/2017"; String dt = "01/07/2017";
invDate = Timestamp.valueOf(genericUtility.getValidDateString(dt, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0"); invDate = Timestamp.valueOf(genericUtility.getValidDateString(dt, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0");
System.out.println("ref_id__inv is ["+refIdInv+"]"+"ref_date__inv["+ref_date__inv+"]"+"refInvDateDate["+refInvDateDate+"]"+"Date1/7/17["+dt+"]"+"invDate["+invDate+"]"); //System.out.println("ref_id__inv is ["+refIdInv+"]"+"ref_date__inv["+ref_date__inv+"]"+"refInvDateDate["+refInvDateDate+"]"+"Date1/7/17["+dt+"]"+"invDate["+invDate+"]");
if(refInvDateDate.after(invDate)) if(refInvDateDate.after(invDate))
{ {
sql = "select gst_code from gst_data_hdr where doc_no=?"; sql = "select gst_code from gst_data_hdr where doc_no=?";
...@@ -963,7 +963,7 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal ...@@ -963,7 +963,7 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
refInvDateDate = Timestamp.valueOf(genericUtility.getValidDateString(ref_date__inv, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0"); refInvDateDate = Timestamp.valueOf(genericUtility.getValidDateString(ref_date__inv, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0");
String dt = "01/07/2017"; String dt = "01/07/2017";
invDate = Timestamp.valueOf(genericUtility.getValidDateString(dt, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0"); invDate = Timestamp.valueOf(genericUtility.getValidDateString(dt, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0");
System.out.println("ref_id__inv is ["+refIdInv+"]"+"ref_date__inv["+ref_date__inv+"]"+"refInvDateDate["+refInvDateDate+"]"+"Date1/7/17["+dt+"]"+"invDate["+invDate+"]"); //System.out.println("ref_id__inv is ["+refIdInv+"]"+"ref_date__inv["+ref_date__inv+"]"+"refInvDateDate["+refInvDateDate+"]"+"Date1/7/17["+dt+"]"+"invDate["+invDate+"]");
if(refInvDateDate.after(invDate)) if(refInvDateDate.after(invDate))
{ {
sql = "select gst_code from gst_data_hdr where doc_no=?"; sql = "select gst_code from gst_data_hdr where doc_no=?";
...@@ -1239,32 +1239,31 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal ...@@ -1239,32 +1239,31 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
rs = null; rs = null;
} }
}//end of if block for obj_name='gstr_purc' }//end of if block for obj_name='gstr_purc'
// changes itemdefault to show B2B Invoices fields bydefault by sarita on 21JUL2017 [START]
valueXmlString.append("<gst_type protect = \"0\" visible = \"1\">").append("<![CDATA[]]>").append("</gst_type>"); valueXmlString.append("<doc_type protect = \"0\" visible = \"1\">").append("<![CDATA[]]>").append("</doc_type>");
valueXmlString.append("<tran_type protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</tran_type>"); valueXmlString.append("<tax_reg_no protect = \"0\" visible = \"1\">").append("<![CDATA[]]>").append("</tax_reg_no>");
valueXmlString.append("<doc_type protect = \"1\" visible = \"0\">").append("<![CDATA[R]]>").append("</doc_type>"); valueXmlString.append("<gst_code_state protect = \"1\" visible = \"1\">").append("<![CDATA[]]>").append("</gst_code_state>");
valueXmlString.append("<doc_no protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</doc_no>"); valueXmlString.append("<state_descr protect = \"0\" visible = \"0\">").append("<![CDATA[]]>").append("</state_descr>");
valueXmlString.append("<doc_date protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</doc_date>"); valueXmlString.append("<doc_no protect = \"0\" visible = \"1\">").append("<![CDATA[]]>").append("</doc_no>");
valueXmlString.append("<amount protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</amount>"); 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("<amount protect = \"0\" visible = \"1\">").append("<![CDATA[]]>").append("</amount>");
valueXmlString.append("<state_descr protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</state_descr>"); valueXmlString.append("<reverse_chrg protect = \"0\" visible = \"0\">").append("<![CDATA[]]>").append("</reverse_chrg>");
valueXmlString.append("<gst_code protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</gst_code>"); valueXmlString.append("<ecom_reg_no protect = \"0\" visible = \"1\">").append("<![CDATA[]]>").append("</ecom_reg_no>");
valueXmlString.append("<ecom_reg_no protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</ecom_reg_no>"); valueXmlString.append("<gst_code protect = \"0\" visible = \"1\">").append("<![CDATA[]]>").append("</gst_code>");
valueXmlString.append("<tax_reg_no protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</tax_reg_no>");
valueXmlString.append("<reverse_chrg protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</reverse_chrg>");
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>");
valueXmlString.append("<lr_no protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</lr_no>"); valueXmlString.append("<lr_no protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</lr_no>");
valueXmlString.append("<lr_date protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</lr_date>"); valueXmlString.append("<lr_date protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</lr_date>");
valueXmlString.append("<name protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</name>"); valueXmlString.append("<name protect = \"0\" visible = \"0\">").append("<![CDATA[]]>").append("</name>");
valueXmlString.append("<addr1 protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</addr1>"); valueXmlString.append("<addr1 protect = \"0\" visible = \"0\">").append("<![CDATA[]]>").append("</addr1>");
valueXmlString.append("<addr2 protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</addr2>"); valueXmlString.append("<addr2 protect = \"0\" visible = \"0\">").append("<![CDATA[]]>").append("</addr2>");
valueXmlString.append("<addr3 protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</addr3>"); valueXmlString.append("<addr3 protect = \"0\" visible = \"0\">").append("<![CDATA[]]>").append("</addr3>");
valueXmlString.append("<city protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</city>"); valueXmlString.append("<city protect = \"0\" visible = \"0\">").append("<![CDATA[]]>").append("</city>");
valueXmlString.append("<gst_state_code protect = \"1\" 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 = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</pin>"); valueXmlString.append("<pin protect = \"0\" visible = \"0\">").append("<![CDATA[]]>").append("</pin>");
valueXmlString.append("<order_no protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</order_no>"); valueXmlString.append("<order_no protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</order_no>");
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>");
// changes itemdefault to show B2B Invoices fields bydefault by sarita on 21JUL2017 [END]
}//end of if block for itm_default }//end of if block for itm_default
else if("itm_defaultedit".equalsIgnoreCase(currentColumn.trim())) else if("itm_defaultedit".equalsIgnoreCase(currentColumn.trim()))
...@@ -1727,7 +1726,7 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal ...@@ -1727,7 +1726,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("<gst_code_state protect = \"0\" visible = \"1\">").append("<![CDATA[]]>").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>");
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>");
...@@ -1753,7 +1752,7 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal ...@@ -1753,7 +1752,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("<gst_code_state protect = \"0\" visible = \"1\">").append("<![CDATA[]]>").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>");
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>");
...@@ -1779,7 +1778,7 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal ...@@ -1779,7 +1778,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("<gst_code_state protect = \"0\" visible = \"1\">").append("<![CDATA[]]>").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>");
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>");
...@@ -1907,7 +1906,7 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal ...@@ -1907,7 +1906,7 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
} }
else if("A".equalsIgnoreCase(gst_type)) else if("A".equalsIgnoreCase(gst_type))
{ {
valueXmlString.append("<gst_code_state protect = \"0\" visible = \"1\">").append("<![CDATA[]]>").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("<reas_code protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</reas_code>"); valueXmlString.append("<reas_code protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</reas_code>");
...@@ -1934,7 +1933,7 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal ...@@ -1934,7 +1933,7 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
} }
else if("T".equalsIgnoreCase(gst_type)) else if("T".equalsIgnoreCase(gst_type))
{ {
valueXmlString.append("<gst_code_state protect = \"0\" visible = \"1\">").append("<![CDATA[]]>").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("<reas_code protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</reas_code>"); valueXmlString.append("<reas_code protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</reas_code>");
...@@ -2217,6 +2216,8 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal ...@@ -2217,6 +2216,8 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
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
valueXmlString.append("<igst_amt protect = \"1\">").append("<![CDATA[]]>").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>");
...@@ -2228,10 +2229,12 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal ...@@ -2228,10 +2229,12 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
System.out.println("igst_amt["+igst_amt+"]"); System.out.println("igst_amt["+igst_amt+"]");
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>");
//valueXmlString.append("<igst_amt protect = \"0\">").append("<![CDATA[]]>").append("</igst_amt>"); //changes done by sarita on 21JUL2017
valueXmlString.append("<cgst_amt protect = \"1\">").append("<![CDATA[]]>").append("</cgst_amt>");
valueXmlString.append("<sgst_amt protect = \"1\">").append("<![CDATA[]]>").append("</sgst_amt>");
} }
} }
}// }
} }
else else
{ {
...@@ -2243,6 +2246,8 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal ...@@ -2243,6 +2246,8 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
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
valueXmlString.append("<igst_amt protect = \"1\">").append("<![CDATA[]]>").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>");
...@@ -2254,7 +2259,9 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal ...@@ -2254,7 +2259,9 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
System.out.println("igst_amt["+igst_amt+"]"); System.out.println("igst_amt["+igst_amt+"]");
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>");
//valueXmlString.append("<igst_amt protect = \"0\">").append("<![CDATA[]]>").append("</igst_amt>"); //changes by sarita on 21JUL2017
valueXmlString.append("<cgst_amt protect = \"1\">").append("<![CDATA[]]>").append("</cgst_amt>");
valueXmlString.append("<sgst_amt protect = \"1\">").append("<![CDATA[]]>").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