Bug fix

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

webitm-dis/ibase/webitm/ejb/dis/adv/SalesReturnConfirm.java

@@ -495,7 +495,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
 					else 
 					{
 						System.out.println("Committed Transaction.............");
-						//conn.commit();//For test only 
+						conn.commit();//For test only 
 					}
 					
 					if (conn != null) 
@@ -3580,7 +3580,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
 					xmlBuff.append("<drcr_flag>").append("<![CDATA[" + "C" + "]]>").append("</drcr_flag>");
 					xmlBuff.append("<remarks>").append("<![CDATA[" + remarks + "]]>").append("</remarks>");
 					xmlBuff.append("<gp_no>").append("<![CDATA[" + ls_gp_no + "]]>").append("</gp_no>");
-					xmlBuff.append("<gp_date>").append("<![CDATA[" + sdfAppl.format(ld_gp_date).toString() + "]]>").append("</gp_date>");
+					xmlBuff.append("<gp_date>").append("<![CDATA[" + (ld_gp_date==null?"":sdfAppl.format(ld_gp_date).toString()) + "]]>").append("</gp_date>");
 					//xmlBuff.append("<tran_id__rcv>").append("<![CDATA[" + "" + "]]>").append("</tran_id__rcv>");
 					xmlBuff.append("<adj_recv>").append("<![CDATA[" + ls_finpara + "]]>").append("</adj_recv>");
 					xmlBuff.append("<confirmed>").append("<![CDATA[" + "N" + "]]>").append("</confirmed>");
@@ -4171,9 +4171,10 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
 					/*ls_cctr_code = gbf_acct_detr_ttype(ls_itemcode,ls_item_ser,'AR',ls_trantype, as_site_code)
 					ls_acct_code = f_get_token(ls_cctr_code,'~t')*/
 
-					ls_cctr_code = finCommon.getAcctDetrTtype(ls_item_code, ls_item_ser, "AR", as_tran_type, conn);
-					if (ls_cctr_code != null && ls_cctr_code.trim().length() > 0) 
+					
+					if (ls_acct_code == null || ls_acct_code.trim().length() == 0 || ls_cctr_code == null || ls_cctr_code.trim().length() == 0 ) 
 					{
+						ls_cctr_code = finCommon.getAcctDetrTtype(ls_item_code, ls_item_ser, "AR", as_tran_type, conn);
 						String tokens [] = ls_cctr_code.split(",");
 
 						System.out.println("Length="+tokens.length);
@@ -4327,6 +4328,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
 					xmlBuff.append("<fin_entity>").append("<![CDATA[" + ls_fin_entity + "]]>").append("</fin_entity>");
 					xmlBuff.append("<site_code>").append("<![CDATA[" + as_site_code + "]]>").append("</site_code>");
 					xmlBuff.append("<sundry_type>").append("<![CDATA[" + "C" + "]]>").append("</sundry_type>");
+					xmlBuff.append("<sundry_code>").append("<![CDATA[" + ls_cust_code + "]]>").append("</sundry_code>");
 					xmlBuff.append("<cust_code>").append("<![CDATA[" + ls_cust_code + "]]>").append("</cust_code>");
 					xmlBuff.append("<cust_code__dlv>").append("<![CDATA[" + ls_cust_code + "]]>").append("</cust_code__dlv>");
 					xmlBuff.append("<acct_code>").append("<![CDATA[" + ls_acct_code + "]]>").append("</acct_code>");