commited changes regarding invoice ref date of debit credit note

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@178123 ce508802-f39f-4f6c-b175-0d175dae99d5

webitm-gst-client/ibase/webitm/ejb/gstclient/GstDataPrc.java

@@ -7297,10 +7297,10 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 										  +" and inv.invoice_id = i.invoice_id "
 										  +" and i.drcr_flag ='C'"    //added by kaustubh on 26 july to seperate Debit and credit note data
 										  +" and case when i.confirmed is null then 'N' else i.confirmed end  = 'Y' "
-										  +" and (select count(1) from taxtran ti where ti.tran_code = 'CRNRCP' ) > 0 " ; //modified by kaustubh on 26 july 2017 add DRNCRP
+										  +" and (select count(1) from taxtran ti where ti.tran_code = 'CRNRCP' ) > 0 "  //modified by kaustubh on 26 july 2017 add DRNCRP
 										 /* +" and to_date(inv.conf_date) < '"+currMonthStartDate+"' "  commented by kaustubh on 26 july remove to_date for DB2*/
 										//  +" and inv.conf_date  < '"+currMonthStartDate+"' "      commented by kaustubh on 27 july
-										 if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME ))  
+										/* if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME ))  
 										  {
 											  hdrSql = hdrSql +" and inv.tran_date between  '"+fromDate+"'and '" +toDate+"'";
 										  }
@@ -7309,7 +7309,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 											 
 											  hdrSql = hdrSql  +" and inv.tran_date between  '"+strDate+"'and '" +endDate+"'";
 										  }
-										  hdrSql = hdrSql 
+										  hdrSql = hdrSql */
 										//  +" and inv.tran_date between ? and ?  "
 										  +" and c.tax_reg_2 <> 'UNREGISTER' " 
 										  +" and case when i.confirmed is null then 'N' else i.confirmed end = 'Y' "
@@ -7535,11 +7535,11 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 									  +" and inv.invoice_id = i.invoice_id "
 									  +" and i.drcr_flag ='D'"    //added by kaustubh on 26 july to seperate Debit and credit note data
 									  +" and case when i.confirmed is null then 'N' else i.confirmed end  = 'Y' "
-									  +" and (select count(1) from taxtran ti where ti.tran_code = 'DRNRCP' ) > 0 " ;  //modified by kaustubh on 26 july 2017 add DRNCRP
+									  +" and (select count(1) from taxtran ti where ti.tran_code = 'DRNRCP' ) > 0 "  //modified by kaustubh on 26 july 2017 add DRNCRP
 									 /* +" and to_date(inv.conf_date) < '"+currMonthStartDate+"' "  commented by kaustubh on 26 july remove to_date for DB2*/
 									//  +" and inv.conf_date  < '"+currMonthStartDate+"' "      commented by kaustubh on 27 july 2017
 									//+" and inv.tran_date  < '"+currMonthStartDate+"' "        changed by kaustubh on 31 july 2017
-										 if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME ))  
+										/* if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME ))  
 										  {
 											 // hdrSql = hdrSql +" and inv.tran_date  < '"+currMonthStartDate+"' ";
 											  hdrSql = hdrSql +" and inv.tran_date between  '"+fromDate+"'and '" +toDate+"'";
@@ -7549,7 +7549,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 											 
 											  hdrSql = hdrSql  +" and inv.tran_date between  '"+strDate+"'and '" +endDate+"'";
 										  }
-										  hdrSql = hdrSql 
+										  hdrSql = hdrSql */
 							      //    +" and inv.tran_date between ? and ?  "
 									  +" and c.tax_reg_2 <> 'UNREGISTER' " 
 									  +" and case when i.confirmed is null then 'N' else i.confirmed end = 'Y' "
@@ -27496,7 +27496,7 @@ dtlSql =         " select '' as  TRAN_ID, "
 						lrDate = rsSelHdr.getTimestamp("LR_DATE");
 					}	
 					
-					if ("9B(1)".equals(tranSer))
+					if ("9B(1)".equals(tranSer)  || "9B1(CRN-REG)".equals(tranSer) || "9B2(CRN-UNREG)".equals(tranSer) || "9B2(DRN-UNREG)".equals(tranSer) || "9B2(CRN-UNREG)".equals(tranSer) )
 					{
 						refDateInv = rsSelHdr.getTimestamp("REF_DATE__INV");
 					}