bug fixing in taxformrecomulti

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

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

@@ -3676,7 +3676,10 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
 								
 								if( !"NULLFOUND".equalsIgnoreCase( lsDamagedtype ) && lsDamagedtype.trim().length() > 0 ) // and len(trim(ls_damagedtype)) > 0 then
 								{
-									tranType = genericUtility.getColumnValue( "tran_type", dom ); //dw_header.getitemstring(1,"tran_type")
+									// 08/07/11 manoharan tran_type to be taken from header not detail
+									//tranType = genericUtility.getColumnValue( "tran_type", dom ); //dw_header.getitemstring(1,"tran_type")
+									tranType = genericUtility.getColumnValue( "tran_type", dom1 ); //dw_header.getitemstring(1,"tran_type")
+									// end 08/07/11 manoharan tran_type to be taken from header not detail
 									if( lsDamagedtype != null && tranType != null && lsDamagedtype.trim().equalsIgnoreCase( tranType.trim() ) )
 									{
 										valueXmlString.append("<status>").append("<![CDATA[" + "D" + "]]>").append("</status>");
@@ -6914,7 +6917,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
 								pstmt = null;													
 													
 								lcAdjAmt = 0;
-								sqlStr = " select nvl(sum(nvl(b.quantity,0) * nvl(b.rate,0)),0) lc_adj_amt "
+								sqlStr = " select (sum((case when b.quantity is null then 0 else b.quantity end) * (case when b.rate is null then 0 else b.rate end))) lc_adj_amt "
 								+" from sreturn a , sreturndet b "
 								+" where  a.tran_id    		<> ? "//:ls_tran_id
 								+" and	 b.tran_id     	=  a.tran_id "
@@ -7970,8 +7973,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
 						locCode = rs.getString(1);
 						sql="select descr from location where loc_code = ? ";
 						pstmt = conn.prepareStatement(sql);
-						pstmt.setString(1,itemCode);
-						pstmt.setString(2,siteCode);
+						pstmt.setString(1,locCode);
 						rs = pstmt.executeQuery();
 						if(rs.next())
 						{

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

@@ -866,7 +866,7 @@ public class TaxFormRecoMulti extends ProcessEJB implements TaxFormRecoMultiLoca
 						else if (refSer.equals("S-INV"))
 						{
 							getDataSql = "SELECT TAXTRAN.TRAN_CODE,TAXTRAN.TRAN_ID,TAXTRAN.TAX_FORM,TAXTRAN.TAX_FORM_DATE,"
-							+"TAXTRAN.TAX_CLASS,TAXTRAN.TAX_ENV,INVOICE.TRAN_DATE,INVOICE.CUST_CODE,CUSTOMER.CUST_NAME,SUM( TAXTRAN.TAX_AMT ) AS TAX_AMT "
+							+"TAXTRAN.TAX_CLASS,TAXTRAN.TAX_ENV,INVOICE.TRAN_DATE,INVOICE.CUST_CODE,CUSTOMER.CUST_NAME,SUM( TAXTRAN.TAX_AMT ) AS TAX_AMT, ' ' ,' ' "
 							+" FROM TAXTRAN,TAX,INVOICE,CUSTOMER WHERE "
 							+"( TAX.TAX_CODE = TAXTRAN.TAX_CODE ) AND ( TAXTRAN.TRAN_ID = INVOICE.INVOICE_ID )"
 							+" AND ( INVOICE.CUST_CODE = CUSTOMER.CUST_CODE ) AND ( ( TAXTRAN.TRAN_CODE = ? ) AND"