Updated the Product wizard js for Item description

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

webitm-wms/module-resource/web/js/prodWiz_Edit.js

@@ -334,17 +334,18 @@
 			var size = document.getElementById("Detail3."+idNum+".size_code_descr").value;
 			var phyAttribute3 = document.getElementById("Detail3."+idNum+".phy_attrib_3").value;
 			//var editDescr = document.getElementById("Detail3."+idNum+".editDescr").value;
+			var attr_value = document.getElementById("Detail3.1.attr_value").value;
+			var descr = "";
 			
 			if(phyAttribute3 == "NA")
 			{
 				//descr = editDescr + " " + size + " " + color;
-				//descr = valueFromServlet + " - " + color + " - " + size;
-				descr = valueFromServlet + " - " + size;
+				descr = attr_value + " - " + color + " - " + size;
 			}
 			else
 			{
 				//descr = editDescr + " " + size + " " + color + " " + phyAttribute3;
-				descr = valueFromServlet +  " - " + size;
+				descr = attr_value + " - " + phyAttribute3 + " - " + color + " - " + size;
 			}
 			document.getElementById("Detail3."+idNum+".descr").value = descr;
 		}
@@ -361,17 +362,18 @@
 			var size = document.getElementById("Detail3."+idNum+".size_code_descr").value;
 			var phyAttribute3 = document.getElementById("Detail3."+idNum+".phy_attrib_3").value;
 			//var editDescr = document.getElementById("Detail3."+idNum+".editDescr").value;
+			var attr_value = document.getElementById("Detail3.1.attr_value").value;
 			var descr = "";
-
+			
 			if(phyAttribute3 == "NA")
 			{
 				//descr = editDescr + " " + size + " " + color;
-				descr = valueFromServlet + " - " + color + " - " + size;
+				descr = attr_value + " - " + color + " - " + size;
 			}
 			else
 			{
 				//descr = editDescr + " " + size + " " + color + " " + phyAttribute3;
-				descr = valueFromServlet + " - " + phyAttribute3 + " - " + color + " - " + size;
+				descr = attr_value + " - " + phyAttribute3 + " - " + color + " - " + size;
 			}
 			
 			document.getElementById("Detail3."+idNum+".descr").value = descr;			
@@ -388,17 +390,18 @@
 			var size = document.getElementById("Detail3."+idNum+".size_code_descr").value;
 			var phyAttribute3 = document.getElementById("Detail3."+idNum+".phy_attrib_3").value;
 			//var editDescr = document.getElementById("Detail3."+idNum+".editDescr").value;
-			
+			var attr_value = document.getElementById("Detail3.1.attr_value").value;
 			var descr = "";
+			
 			if(phyAttribute3 == "NA")
 			{
 				//descr = editDescr + " " + size + " " + color;
-				descr = valueFromServlet + " - " + color + " - " + size;
+				descr = attr_value + " - " + color + " - " + size;
 			}
 			else
 			{
 				//descr = editDescr + " " + size + " " + color + " " + phyAttribute3;
-				descr = valueFromServlet + " - " + phyAttribute3 + " - " + color + " - " + size;
+				descr = attr_value + " - " + phyAttribute3 + " - " + color + " - " + size;
 			}
 			document.getElementById("Detail3."+idNum+".descr").value = descr;
 		}
@@ -1797,7 +1800,7 @@
 	function addItem()
 	{	
 		//alert("----- inside addItem -----");
-		
+
 		rowId = maxId;
 		if(document.getElementById("maxRowId").value == "")
 		{
@@ -1817,6 +1820,7 @@
 		//alert("maxRowId----------"+maxRowId);
 		
 		var count = 0;
+		var itemParntDescr = document.getElementById("Detail3."+rowId+".attr_value").value;		
 		var descr = document.getElementById("Detail3."+rowId+".descr").value;
 		var itemCode = document.getElementById("Detail3."+rowId+".item_code").value;
 		var phyAttribute1 = document.getElementById("Detail3."+rowId+".phy_attrib_1").value;
@@ -1841,7 +1845,7 @@
 		var loginCode = document.getElementById("Detail3."+count+".login_code").value;
 		
 		//alert("itemCode---"+itemCode);	
-		itmparntChangeNew(itemCode, "GET_ITEM_DESCR");
+		//itmparntChangeNew(itemCode, "GET_ITEM_DESCR");
 		//alert("valueFromServlet for GET_ITEM_DESCR --->>"+valueFromServlet);
 
 		var chkbox = "Y";
@@ -2106,7 +2110,8 @@
 		
 		$('#SKUItemId tbody').append(row);
 		//document.getElementById("Detail3."+ maxRowId +".editDescr").value = valueFromServlet;
-		document.getElementById("Detail3."+ maxRowId +".descr").value = valueFromServlet;
+		document.getElementById("Detail3."+ maxRowId +".descr").value = itemParntDescr;
+		//document.getElementById("Detail3."+ maxRowId +".descr").innerHTML = itemParntDescr;
 		document.getElementById("Detail3."+ maxRowId +".language_dtl").value = languageDtl;
 		document.getElementById("Detail3."+ maxRowId +".descr").focus();
 		
@@ -2263,7 +2268,7 @@
 	// Changed by Sneha on 24-06-2016 for Delete row [End]
 	
 	// Changed by Sneha on 01-07-2016, to set item description [Start]
-	function setItemDescr(idNum) 
+	/*function setItemDescr(idNum) 
 	{
 		var color = document.getElementById("Detail3."+idNum+".color_code_descr").value;
 		var size = document.getElementById("Detail3."+idNum+".size_code_descr").value;
@@ -2280,7 +2285,7 @@
 			descr = editDescr + " " + size + " " + color + " " + phyAttribute3;
 		}
 		document.getElementById("Detail3."+idNum+".descr").value = descr;
-	}
+	}*/
 	/*
 	function setItemDescrOnload() 
 	{

webitm-wms/module-resource/web/js/prodWiz_Form_I.js

@@ -491,6 +491,7 @@
 		if (document.getElementById("Detail1.1.item_parnt").value == "")
 		{
 			alert("Please Enter Parent Code.");
+			document.getElementById("Detail1.1.item_parnt").focus(); // Changed by Sneha on 08-07-2016, focus
 			return false;
 		}
 		else if (document.getElementById("Detail1.1.item_parnt_desc").value == "")