to set tax_class, tax_env from supplier if not found in site_supplier

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

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

@@ -3272,10 +3272,14 @@ public class MiscVoucherIC extends ValidatorEJB implements MiscVoucherICLocal, M
 								cctrCodeAp = findValue(conn, "cctr_code__ap" , "supplier", "supp_code", sundryCode);
 								acctCodeAdv = findValue(conn, "acct_code__ap_adv" , "supplier", "supp_code", sundryCode);
 								cctrCodeAdv = findValue(conn, "cctr_code__ap_adv" , "supplier", "supp_code", sundryCode);
-								stanCode = findValue(conn, "stan_code" , "supplier", "supp_code", sundryCode);
-								taxClass = findValue(conn, "tax_class" , "supplier", "supp_code", sundryCode);
-								taxChap = findValue(conn, "tax_chap" , "supplier", "supp_code", sundryCode);
-								//Added by Pavan R [to set tax_env from supplier if not found in site_supplier] 
+								stanCode = findValue(conn, "stan_code" , "supplier", "supp_code", sundryCode);	
+								//Added by Pavan R [to set tax_class, tax_env from supplier if not found in site_supplier]
+								taxClass = findValue(conn, "tax_class", "site_supplier", "site_code", "supp_code", siteCode, sundryCode);
+								if(taxClass == null || taxClass.trim().length() == 0 || "null".equals(taxClass))
+								{
+									taxClass = findValue(conn, "tax_class" , "supplier", "supp_code", sundryCode);
+								}
+								taxChap = findValue(conn, "tax_chap" , "supplier", "supp_code", sundryCode);								 
 								taxEnv = findValue(conn, "tax_env", "site_supplier", "site_code", "supp_code", siteCode, sundryCode);
 								if(taxEnv == null || taxEnv.trim().length() == 0 || "null".equals(taxEnv))
 								{