done by Kunal Mandhre

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

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

@@ -3441,9 +3441,18 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
 						//}
 						//else
 						//{
-							mexpDate = expDate; //genericUtility.getValidDateString( ( mexpDateStr == null ?  : mexpDateStr ), genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0");
+						//Commented By Mahesh Patidar on 16/04/2012 for request "DISWIN0045" to set expire date from dom if not found in stock
+							//mexpDate = expDate; //genericUtility.getValidDateString( ( mexpDateStr == null ?  : mexpDateStr ), genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0");
 						//}
-						
+						//Added By Mahesh Patidar on 16/04/2012 for request "DISWIN0045" to set expire date from dom if not found in stock
+						if(expDate != null)
+						{
+							mexpDate = expDate;
+						}
+						else
+						{
+							mexpDate = Timestamp.valueOf(genericUtility.getValidDateString( ( mexpDateStr == null ? getCurrdateInAppFormat() : mexpDateStr ), genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0");
+						}//ended By Mahesh Patidar
 						String ldtLrdateStr = genericUtility.getColumnValue( "lr_date", dom1 );
 						
 						ldtLrdate = ldtLrdateStr == null ? null : Timestamp.valueOf(genericUtility.getValidDateString( ( ldtLrdateStr == null ? getCurrdateInAppFormat() : ldtLrdateStr ), genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0");
@@ -3974,17 +3983,20 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
 							{
 								mexpDate = null; //setnull(mexp_date)
 								valueXmlString.append("<exp_date>").append("<![CDATA["+""+"]]>").append("</exp_date>");
+								setNodeValue( dom, "exp_date", "" ); //Added By Mahesh Patidar on 16/04/2012 for set expiry date in node
 							}
 							else
 							{	
 								mexpDate  = distCommon.CalcExpiry( mmfgDate, mshlife );
 								valueXmlString.append("<exp_date>").append("<![CDATA[" + genericUtility.getValidDateString( mexpDate.toString(),genericUtility.getDBDateFormat(), genericUtility.getApplDateFormat() ) + "]]>").append("</exp_date>");
+								setNodeValue( dom, "exp_date",  genericUtility.getValidDateString( mexpDate.toString(),genericUtility.getDBDateFormat(), genericUtility.getApplDateFormat() ));//Added By Mahesh Patidar on 16/04/2012 for set expiry date in node
 							}
 						}
 						else
 						{
 							mexpDate = null; //setnull(mexp_date)
 							valueXmlString.append("<exp_date>").append("<![CDATA["+""+"]]>").append("</exp_date>");
+							setNodeValue( dom, "exp_date", "" );//Added By Mahesh Patidar on 16/04/2012 for set expiry date in node
 						}
 						
 						//dw_detedit[ii_currformno].setitem(1,"exp_date",mexp_date)