Posting of hold tax (pay_tax) wrong in detail posting corrected

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

webitm-fin/src/ibase/webitm/ejb/fin/adv/VoucherConf.java

@@ -2885,8 +2885,11 @@ public class VoucherConf extends ActionHandlerEJB //implements ReceiptAdvConfLoc
 				glTraceMap.put("site_code", (String) VchHdrMap.get("site_code"));
 				glTraceMap.put("sundry_type", "S");
 				glTraceMap.put("sundry_code", (String) VchHdrMap.get("supp_code"));
-				glTraceMap.put("acct_code", (String) VchHdrMap.get("acct_code"));
-				glTraceMap.put("cctr_code", (String) VchHdrMap.get("cctr_code"));
+				//glTraceMap.put("acct_code", (String) VchHdrMap.get("acct_code"));
+				//glTraceMap.put("cctr_code", (String) VchHdrMap.get("cctr_code"));
+				glTraceMap.put("acct_code", acctCodeAP);
+				glTraceMap.put("cctr_code", cctrCodeAP);
+				
 				glTraceMap.put("emp_code", (String) VchHdrMap.get("emp_code"));
 				glTraceMap.put("anal_code", (String) VchHdrMap.get("anal_code"));
 				glTraceMap.put("curr_code", (String) VchHdrMap.get("curr_code"));
@@ -3346,23 +3349,23 @@ public class VoucherConf extends ActionHandlerEJB //implements ReceiptAdvConfLoc
 				acctCodeHdr = (String) VchHdrMap.get("acct_code__adv");
 				acctCodeDet = (String) DetMap.get("acct_code");
 				amount = (double) Double.parseDouble( "" + DetMap.get("amount"));
-				sql = "select sum(tax_amt) as tax_amt  from taxtran  "
-						+ " where tran_code = 'VOUCH' and tran_id = ? "  
-				+ " and line_no = ?  and pay_tax = 'Y' ";
-				pstmt = conn.prepareStatement(sql);
-				pstmt.setString(1,tranId);
-				pstmt.setString(2,lineNo);
-				rs = pstmt.executeQuery();
-				if(rs.next())
-				{
-					taxtranAmt = rs.getDouble("tax_amt");
-				}
-				rs.close();
-				rs = null;
-				pstmt.close();
-				pstmt = null;
 				if("A".equals(vouchType) && advAmt != 0 && acctCodeHdr.trim().equals(acctCodeDet.trim()))
 				{
+					sql = "select sum(tax_amt) as tax_amt  from taxtran  "
+							+ " where tran_code = 'VOUCH' and tran_id = ? "  
+					+ " and line_no = ?  and pay_tax = 'Y' ";
+					pstmt = conn.prepareStatement(sql);
+					pstmt.setString(1,tranId);
+					pstmt.setString(2,lineNo);
+					rs = pstmt.executeQuery();
+					if(rs.next())
+					{
+						taxtranAmt = rs.getDouble("tax_amt");
+					}
+					rs.close();
+					rs = null;
+					pstmt.close();
+					pstmt = null;
 					glTraceMap.put("sundry_type", "S");
 					glTraceMap.put("sundry_code", (String) VchHdrMap.get("supp_code") );