W16LKAT002 updated JS for Sales Order wizard previous issue for rate

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

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

@@ -1711,14 +1711,16 @@ var sorttable = "";
 	 			//qty = qty + parseInt(document.getElementById("tab."+t+".fld."+i+"").value);
 	 			qty = qty + parseFloat(document.getElementById("tab."+t+".fld."+i+"").value);
 	 			//document.getElementById("display."+t+"").innerHTML = qty;
-	 			document.getElementById("sum"+t+"").innerHTML = qty.toFixed(3);
-	 			
-	 			document.getElementById("pieces"+t+"").innerHTML =  qty.toFixed(3);
+	 			//document.getElementById("sum"+t+"").innerHTML = qty.toFixed(3);
+	 			//document.getElementById("pieces"+t+"").innerHTML =  qty.toFixed(3);
+	 			document.getElementById("sum"+t+"").innerHTML = qty.toFixed(2);
+	 			document.getElementById("pieces"+t+"").innerHTML =  qty.toFixed(2);
 	 		}	
 	 	}
 	 	
 	 	var currCode = document.getElementById("curr_code").value;
-	 	document.getElementById("rate"+t+"").innerHTML = " pieces at "+ currCode +" "+ finalPrice.toFixed(3) +" (Excluding Tax)";
+	 	//document.getElementById("rate"+t+"").innerHTML = " pieces at "+ currCode +" "+ finalPrice.toFixed(3) +" (Excluding Tax)";
+	 	document.getElementById("rate"+t+"").innerHTML = " pieces at "+ currCode +" "+ finalPrice.toFixed(2) +" (Excluding Tax)";
 	 }
 	 
 	//Changed by samadhan on 03/02/2015 for fixed matxix table header Start
@@ -1979,7 +1981,8 @@ var sorttable = "";
 	    			xmlString = xmlString + document.getElementById("Detail3."+rows[0]+".item_code").value +"~"+document.getElementById("dsp_date"+rows[0]).value+"****"; 
 	    			xmlString = xmlString + document.getElementById("Detail3."+rows[0]+".item_code").value +"::";
 	    			xmlString = xmlString + document.getElementById("Detail3."+rows[0]+".quantity").value +"::";
-	    			xmlString = xmlString + document.getElementById("Detail3."+rows[0]+".discount").value; 
+	    			xmlString = xmlString + document.getElementById("Detail3."+rows[0]+".discount").value +"::";
+	    			xmlString = xmlString + document.getElementById("Detail3."+rows[0]+".rate").value; 
 	    			
 	    			//alert("@@Length="+rows.length);
 	    			for(var j=1;j<rows.length-1;j++)
@@ -1996,7 +1999,8 @@ var sorttable = "";
 	    				
 	    				xmlString = xmlString +"~"+document.getElementById("Detail3."+rows[j]+".item_code").value +"::";
 	    				xmlString = xmlString + document.getElementById("Detail3."+rows[j]+".quantity").value +"::";
-	    				xmlString = xmlString + document.getElementById("Detail3."+rows[j]+".discount").value; 
+	    				xmlString = xmlString + document.getElementById("Detail3."+rows[j]+".discount").value +"::";
+	    				xmlString = xmlString + document.getElementById("Detail3."+rows[0]+".rate").value; 
 	    			}
 	    			
 	    			//xmlString = xmlString + "****" + arr[i][2]; //This for setting Tab number
@@ -2536,10 +2540,11 @@ var sorttable = "";
 		    								tr = tr + "<input type='hidden'    id='Detail2."+fld+".item_code'  name='Detail2."+fld+".item_code'  value='"+itemQtys[0]+"' class='editInputClass' style='width: 60px;text-align: right;' />";
 		    								tr = tr + "<input type='hidden'    value='"+dte+"' id='Detail2."+fld+".dsp_date'  name='Detail2."+fld+".dsp_date' class='editInputClass' style='width: 60px;text-align: right;'/>";
 		    								//tr = tr + "<input type='text'    value='"+dte+"' id='Detail2."+fld+".dlv_date'  name='Detail2."+fld+".dlv_date' class='editInputClass' style='width: 60px;text-align: right;'/>";
-		    								if (itemQtys[1] == "" || itemQtys[1] == "undefined" || itemQtys[1] == null )
+		    								//if (itemQtys[1] == "" || itemQtys[1] == "undefined" || itemQtys[1] == null )//Changed by wasim if qty 0 then set blank
+		    								if (itemQtys[1] == "" || itemQtys[1] == "undefined" || itemQtys[1] == null || itemQtys[1] == "0" )
 		    								{
 		    									qtytr = +qtytr + 0;
-		    									tr = tr + "<td><input type='text'  onchange='calQuantity(this.id,"+xlen+","+xrows+","+qt+","+fld+","+t+","+rate+"); sendInfo(this.id);' id='Detail2."+fld+".quantity'   name='Detail2."+fld+".quantity'   title='"+details[4]+"' onkeypress='return isQuantity(event)'  maxlength='10'  ISCHANGED='true' class='editInputClass' style='width:100%;border:none;text-align: right; outline:none' value='0' /></td>";
+		    									tr = tr + "<td><input type='text'  onchange='calQuantity(this.id,"+xlen+","+xrows+","+qt+","+fld+","+t+","+rate+"); sendInfo(this.id);' id='Detail2."+fld+".quantity'   name='Detail2."+fld+".quantity'   title='"+details[4]+"' onkeypress='return isQuantity(event)'  maxlength='10'  ISCHANGED='true' class='editInputClass' style='width:100%;border:none;text-align: right; outline:none' value='' /></td>";
 		    								}
 		    								else
 		    								{
@@ -2549,6 +2554,7 @@ var sorttable = "";
 		    								
 		    								tr = tr + "<input type = 'hidden'  class = "+t+" value = "+tabNum+" id='Detail2."+fld+".line_no__contr'  name='Detail2."+fld+".line_no__contr' ></input>";
 		    								tr = tr + "<input type = 'hidden' value = "+itemQtys[2]+" id='Detail2."+fld+".discount'  name='Detail2."+fld+".discount' ></input>";
+		    								tr = tr + "<input type = 'hidden' value = "+itemQtys[3]+" id='Detail2."+fld+".rate'  name='Detail2."+fld+".rate' ></input>";
 		    								
 		    								//Tooltip login to get rate if quantity is present [START]
 		    								if(itemQtys[1] > 0)
@@ -2639,7 +2645,15 @@ var sorttable = "";
 	    			var q= document.getElementById("tempQty"+t+p).value;
 	    			
 	    			//document.getElementById("tab."+t+".fld."+p).value = q;
-	    			document.getElementById("tab."+t+".fld."+p).value = q;
+	    			//Changed by wasim on 31-03-2017 to not to display total quantity as zero
+	    			if(q=="0" || q == 0 || q == null || q == "")
+	    			{
+	    				console.log("Quantity is zero");
+	    			}	
+	    			else
+	    			{
+	    				document.getElementById("tab."+t+".fld."+p).value = q;
+	    			}	
 	    			totalQty = +totalQty + +q;
 	    		}
 	    		//document.getElementById("display."+t+"").innerHTML = totalQty;