to set tax_date as invoice tran_date instead of so tax_date

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

webitm-dis/ibase/webitm/ejb/dis/PostOrdInvoiceGen.java

@@ -387,7 +387,7 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB
 		double lc_disc_amt=0.00,ld_discount=0.00;
 		double totalCommSp1=0.0,totalCommSp2=0.0,totalCommSp3=0.0,totalCommAmt=0.0;
 		String despIdKey="",despId="",sysDate="",salesInvPstHdr="",despLineNo="",userId="",termId="",loginSite="",tranId="";
-		String xmlInvString="",retString="";
+		String xmlInvString="",retString="", taxDateStr="";
 		double lcCommAmtOc=0.0,tcommAmt=0.0,lcExchRate=0.0;
 		int lineNo=0,lineNoDet=0;
 		Timestamp dueDate=null,sysDateTs=null;
@@ -485,11 +485,13 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB
 			{
 				xmlBuff.append("<tran_date><![CDATA[" + ldsInvHdrMp.get("invoice__date") + "]]></tran_date>");
 				xmlBuff.append("<eff_date><![CDATA[" + ldsInvHdrMp.get("invoice__date") + "]]></eff_date>");
+				taxDateStr = ldsInvHdrMp.get("invoice__date");
 			}
 			else
 			{
 				xmlBuff.append("<tran_date><![CDATA[" + ldsInvHdrMp.get("lr_date") + "]]></tran_date>");
 				xmlBuff.append("<eff_date><![CDATA[" + ldsInvHdrMp.get("lr_date") + "]]></eff_date>");
+				taxDateStr = ldsInvHdrMp.get("lr_date");
 			}
 
 			xmlBuff.append("<fin_entity><![CDATA[" +invDespMap.get("fin_entity")+ "]]></fin_entity>");		//fin_entity required 'site_fin_entity'
@@ -551,7 +553,7 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB
 				xmlBuff.append("<acct_code__sal><![CDATA[" +sorderSalMap.get("lsacct_sal")+ "]]></acct_code__sal>");
 				xmlBuff.append("<cctr_code__sal><![CDATA[" +sorderSalMap.get("lscctr_sal")+ "]]></cctr_code__sal>");
 				xmlBuff.append("<posttype><![CDATA[" +"H"+ "]]></posttype>");
-				marketReg = checknull(sorderSalMap.get("ls_market_reg"));
+				marketReg = checknull(sorderSalMap.gtaxDateStret("ls_market_reg"));
 				if(marketReg.trim().length()>0)
 				{
 				xmlBuff.append("<market_reg><![CDATA["+marketReg+"]]></market_reg>");
@@ -633,7 +635,8 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB
 			}			
 			//Changed by mayur on 27-02-18--------[END] 		
 			xmlBuff.append("<tran_code><![CDATA["+invDespMap.get("tran_code")+"]]></tran_code>"); //[to set tran_code from despatch]
-			xmlBuff.append("<tax_date><![CDATA["+invDespMap.get("tax_date")+"]]></tax_date>");			
+			//xmlBuff.append("<tax_date><![CDATA["+invDespMap.get("tax_date")+"]]></tax_date>");//[to set tax_date as invoice tran_date instead of so date]
+			xmlBuff.append("<tax_date><![CDATA["+taxDateStr+"]]></tax_date>");
 			xmlBuff.append("<frt_amt><![CDATA["+invDespMap.get("frt_amt")+"]]></frt_amt>");			
 			xmlBuff.append("<frt_type><![CDATA["+invDespMap.get("frt_term")+"]]></frt_type>");			
 			xmlBuff.append("<curr_code><![CDATA["+invDespMap.get("sorder_curr_code")+"]]></curr_code>");