Reciept

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

webitm-fin/ibase/webitm/ejb/fin/ReceiptAdv.java

@@ -1935,6 +1935,7 @@ implements ReceiptAdvLocal, ReceiptAdvRemote
 		String bdFluctuationCf = "";
 		String rcpAutoFinchg = "";
 		String custName = "";
+		String lcBillDescAmt = "";
 		double amountBc = 0.0D;
 		double discExchRate = 0.0D;
 		double mexchrate = 0.0D;
@@ -2611,9 +2612,9 @@ implements ReceiptAdvLocal, ReceiptAdvRemote
 						if ((billDisc == null) || (billDisc.trim().length() == 0))
 							billDisc = "N";
 						if (billDisc.trim().equalsIgnoreCase("Y"))
-						{
-							sql = "select export_fund.exch_rate  from export_fund, export_fundet where ( export_fund.tran_id = export_fundet.tran_id ) and ( export_fund.confirmed = 'Y' ) and ( ( export_fundet.ref_ser = ? ) and ( export_fundet.ref_no = ? ) )";
-
+						{													//added by ritesh  start
+							sql = "select export_fund.exch_rate,lc_billdisc_amt from export_fund, export_fundet where ( export_fund.tran_id = export_fundet.tran_id ) and ( export_fund.confirmed = 'Y' ) and ( ( export_fundet.ref_ser = ? ) and ( export_fundet.ref_no = ? ) )";
+							
 							pstmt = conn.prepareStatement(sql);
 							pstmt.setString(1, refSer);
 							pstmt.setString(2, refNo);
@@ -2621,9 +2622,10 @@ implements ReceiptAdvLocal, ReceiptAdvRemote
 							if (rs.next())
 							{
 								exchRate = rs.getDouble(1);
+								lcBillDescAmt  = rs.getString(2);
 							}
-							valueXmlString.append("<bill_disc_amt>").append("<![CDATA[" + (totAmt - adjAmt) + "]]>").append("</bill_disc_amt>");				//added by ritesh as discussion with pravin on 13/05/13
-						}
+							valueXmlString.append("<bill_disc_amt>").append("<![CDATA[" + lcBillDescAmt + "]]>").append("</bill_disc_amt>");   
+						}													//added by ritesh  end
 						valueXmlString.append("<bill_disc>").append("<![CDATA[" + billDisc + "]]>").append("</bill_disc>");
 						valueXmlString.append("<curr_code>").append("<![CDATA[" + currCode + "]]>").append("</curr_code>");
 						valueXmlString.append("<currency_descr>").append("<![CDATA[" + currDescr + "]]>").append("</currency_descr>");