Updated the java file for Product wizard trade mark pophelp.

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

webitm-wms/ibase/webitm/ejb/wms/DDProductWizEJB.java

@@ -1402,27 +1402,36 @@ public class DDProductWizEJB extends ValidatorEJB implements DDProductWizRemote,
 
 			}
 			// Changed by Sneha on 01-04-2016, for Size Availability [End] 
+			
+			// Changed by Sneha on 14-10-2016, for Purchase tax pophelp [Start] 
 			//Changed by wasim on 02-08-2016 for tax chapter pop help [START]
 			else if(field.equals("tax_chap"))
 			{
 				String purchaseTaxList = checkNullAndTrim(discommon.getDisparams("999999", "PURCHASE_TAX_LIST", conn));
 				System.out.println("purchaseTaxList ============>>["+purchaseTaxList+"]");
-				
-				
-				if("NULLFOUND".equalsIgnoreCase(purchaseTaxList) || "".equalsIgnoreCase(purchaseTaxList) || purchaseTaxList.length() == 0)
+
+				if("NULLFOUND".equalsIgnoreCase(purchaseTaxList) || "".equalsIgnoreCase(purchaseTaxList) || purchaseTaxList.length() == 0 || purchaseTaxList.equalsIgnoreCase(null))
 				{
 					sql = "SELECT TAX_CHAP,DESCR FROM TAXCHAP";
 				}
 				else
 				{
 					purchaseTaxList = purchaseTaxList.replace(",","','");
-					
-					System.out.println("Inside else for PURCHASE_TAX_LIST after ============>>["+purchaseTaxList+"]");
 					sql = "SELECT TAX_CHAP,DESCR FROM TAXCHAP WHERE TAX_CHAP IN ('"+purchaseTaxList+"')";
 				}
-				
 			}
 			//Changed by wasim on 02-08-2016 for tax chapter pop help [END]
+			// Changed by Sneha on 14-10-2016, for Purchase tax pophelp [End] 
+			
+			//Changed by Sneha on 17-10-2016, for trade mark pophelp [Start] 
+			else if(field.equals("trade_mark"))
+			{
+				
+				sql = "SELECT FLD_VALUE, TRIM(Descr) FROM GENCODES WHERE FLD_NAME = 'TRADE_MARK' ORDER BY FLD_VALUE ";
+			}
+			
+			//Changed by Sneha on 17-10-2016, for trade mark pophelp [End] 
+			
 			pstmt = conn.prepareStatement(sql);
 			//Changed by wasim on 14-07-2016 to set site code in loc_code query [START]
 			if ("loc_code".equalsIgnoreCase(field.trim()))