UPDATED

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

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

@@ -149,7 +149,7 @@ public class ChargeBackFormAccept extends ActionHandlerEJB implements ChargeBack
 					  " INT_VENDOR_NO ,CUST_NAME_BAT ,CUST_PNAME_BAT  ,TEST_PROD ,CUST_CODE__SHIP ,CUST_NAME__SHIP ,CUST_CODE__END,CUST_NAME,CONTRACT_NO ,"+
 					  " PRICE_LIST,CUST_CODE_DLV,SITE_CODE__LOG,CLAUM_AMT ,ITEM_SER,PARENT__TRAN_ID ,REV__TRAN ,SPEC_REASON ,DIRECT_INV ,"+
 					  " SALE_PERIOD ,SITE_CODE__CR  ,DISCOUNT_INV    ,EMP_CODE  "+
-					  "	FROM CHARGE_BACK_FORM  WHERE TRAN_ID = ?  and VERIFY_FLAG IN( 'Y','P') AND CONFIRMED NOT IN ('Y')" +
+					  "	FROM CHARGE_BACK_FORM  WHERE TRAN_ID = ?  and VERIFY_FLAG IN( 'Y','P') " +
 					  " AND length(error_code) = 0 or error_code is null ";
 				pStmt = conn.prepareStatement(sql);
 				pStmt.setString(1, tranId.trim());
@@ -222,7 +222,7 @@ public class ChargeBackFormAccept extends ActionHandlerEJB implements ChargeBack
 				sql = " SELECT LINE_NO,CONTRACT_NO ,LINE_NO__CONTR  ,CUST_CODE__END   ,QUANTITY  ,LOT_NO ,RATE__SELL ,RATE__CONTR,RATE__DIFF,AMOUNT,TAX_AMT ,TAX_CLASS,TAX_CHAP ,"+
 						" TAX_ENV,INVOICE_ID,ITEM_SER,DISCOUNT_PER ,DISCOUNT_AMT   ,PORDER_NO,PORDER_DATE  , BUYERS_PROD_CODE ,DISC_AMT ,CUST_GRP    ,ITEM_REF,   NET_AMT  ,TRAN_ID__CRN    ,"+
 						" ERROR_MSG,PRICELIST_RATE,CONTRACT_RATE ,ERROR_CODE    ,ITEM_CODE__NDC,UNCONF_CLAIMED,DISCOUNT_PER_UNIT ,"+
-						" CONF_CLAIMED ,SALE_QTY ,SALE_RET_QTY  FROM CHARGE_BACK_FORM_DET WHERE TRAN_ID IN(SELECT TRAN_ID FROM CHARGE_BACK_FORM WHERE TRAN_ID = ? AND VERIFY_FLAG IN ( 'Y','P') AND CONFIRMED NOT IN ('Y')) " +
+						" CONF_CLAIMED ,SALE_QTY ,SALE_RET_QTY  FROM CHARGE_BACK_FORM_DET WHERE TRAN_ID IN(SELECT TRAN_ID FROM CHARGE_BACK_FORM WHERE TRAN_ID = ? AND VERIFY_FLAG IN ( 'Y','P')) " +
 						" AND  (length(error_code) = 0 or error_code is null) ";
 				pStmt = conn.prepareStatement(sql);
 				pStmt.setString(1, tranId.trim());