[Weberp-cvs] SF.net SVN: web-erp:[3446] trunk

[<tim...@us...>]

Revision: 3446
          http://web-erp.svn.sourceforge.net/web-erp/?rev=3446&view=rev
Author:   tim_schofield
Date:     2010-05-05 10:11:54 +0000 (Wed, 05 May 2010)

Log Message:
-----------
Tim: Fix javascript errors in order entry process

Modified Paths:
--------------
    trunk/SelectOrderItems.php
    trunk/css/silverwolf/default.css
    trunk/doc/Change.log.html
    trunk/javascripts/MiscFunctions.js

Modified: trunk/SelectOrderItems.php
===================================================================
--- trunk/SelectOrderItems.php	2010-05-05 08:01:05 UTC (rev 3445)
+++ trunk/SelectOrderItems.php	2010-05-05 10:11:54 UTC (rev 3446)
@@ -1452,7 +1452,7 @@
 						SID,
 						$myrow['stockid']);
 				if ($j==1) {
-					$jsCall = '<script  type="text/javascript">defaultControl(document.SelectParts.itm'.$myrow['stockid'].');</script>';
+					$jsCall = '<script  type="text/javascript">if (document.SelectParts) {defaultControl(document.SelectParts.itm'.$myrow['stockid'].');}</script>';
 				}
 				$j++;
 #end of page full new headings if
@@ -1502,7 +1502,7 @@
 
 		<?php
 		if (!isset($_POST['PartSearch'])) {
-			echo '<script  type="text/javascript">defaultControl(document.SelectParts.Keywords);</script>';
+			echo '<script  type="text/javascript">if (document.SelectParts) {defaultControl(document.SelectParts.Keywords);}</script>';
 		}
 		if (in_array(2,$_SESSION['AllowedPageSecurityTokens'])){
 			echo '<td style="text-align:center" colspan=1><input tabindex=6 type=submit name="ChangeCustomer" value="' . _('Change Customer') . '"></td>';
@@ -1646,7 +1646,7 @@
 					SID,
 					$myrow['stockid']);
 				if ($j==1) {
-					$jsCall = '<script  type="text/javascript">defaultControl(document.SelectParts.itm'.$myrow['stockid'].');</script>';
+					$jsCall = '<script  type="text/javascript">if (document.SelectParts) {defaultControl(document.SelectParts.itm'.$myrow['stockid'].');}</script>';
 				}
 				$j++;
 	#end of page full new headings if
@@ -1687,6 +1687,7 @@
 						<td><input type="text" class="date" name="itemdue_' . $i . '" size=25 maxlength=25
 						alt="'.$_SESSION['DefaultDateFormat'].'" value="' . $DefaultDeliveryDate . '"></td></tr>';
 	   		}
+			echo '<script  type="text/javascript">if (document.SelectParts) {defaultControl(document.SelectParts.part_1);}</script>';
 
 		 	echo '</table><br><div class="centre"><input type="submit" name="QuickEntry" value="' . _('Quick Entry') . '">
 					 <input type="submit" name="PartSearch" value="' . _('Search Parts') . '"></div>';
@@ -1698,10 +1699,9 @@
 	}#end of else not selecting a customer
 
 echo '</form>';
-echo '<script  type="text/javascript">defaultControl(document.SelectParts.part_1);</script>';
 
 if (isset($_GET['NewOrder']) and $_GET['NewOrder']!='') {
-	echo '<script  type="text/javascript">defaultControl(document.SelectCustomer.CustKeywords);</script>';
+	echo '<script  type="text/javascript">if (document.SelectParts) {defaultControl(document.SelectCustomer.CustKeywords);}</script>';
 }
 include('includes/footer.inc');
 ?>

Modified: trunk/css/silverwolf/default.css
===================================================================
--- trunk/css/silverwolf/default.css	2010-05-05 08:01:05 UTC (rev 3445)
+++ trunk/css/silverwolf/default.css	2010-05-05 10:11:54 UTC (rev 3446)
@@ -64,7 +64,7 @@
 	font-size: 10px;
 	color: #300;
 	text-align: center;
-	vertical-align: center;
+	vertical-align: middle;
 }
 
 .tableheader {

Modified: trunk/doc/Change.log.html
===================================================================
--- trunk/doc/Change.log.html	2010-05-05 08:01:05 UTC (rev 3445)
+++ trunk/doc/Change.log.html	2010-05-05 10:11:54 UTC (rev 3446)
@@ -1,5 +1,6 @@
 <p><font SIZE=4 COLOR=BLUE><b>webERP Change Log</b></font></p>
 <p></p>
+<p>05/05/10 Tim: Fix javascript errors in order entry process</p>
 <p>05/05/10 Zhiguo: PO_ReadInOrder.inc - Correct sql so that only one line per order line appears in the goods received screen</p>
 <p>04/05/10 SiteMe: DateFunctions.inc - Fixed DateAdd function to correctly calculate Y/m/d dates.</p>
 <p>04/05/10 Tim: SelectProduct.php - Correctly display the product when selected from more than one page.</p>

Modified: trunk/javascripts/MiscFunctions.js
===================================================================
--- trunk/javascripts/MiscFunctions.js	2010-05-05 08:01:05 UTC (rev 3445)
+++ trunk/javascripts/MiscFunctions.js	2010-05-05 10:11:54 UTC (rev 3446)
@@ -6,10 +6,10 @@
 fB.click();
 }
 function rTN(event){
-if (window.event) k=window.event.keyCode;
-else if (event) k=event.which;
+if (event) k=event.keyCode;
+else if (event) var k=event.which;
 else return true;
-kC=String.fromCharCode(k);
+var kC=String.fromCharCode(k);
 if ((k==null) || (k==0) || (k==8) || (k==9) || (k==13) || (k==27)) return true;
 else if ((("0123456789,.-").indexOf(kC)>-1)) return true;
 else return false;
@@ -75,9 +75,9 @@
 /*Renier & Louis (in...@ti...) 25.02.2007
 Copyright 2004-2007 Tillcor International
 */
-days=new Array('Su','Mo','Tu','We','Th','Fr','Sa');
-months=new Array('Jan','Feb','Mar','Apr','May','Jun','Jul','Aug','Sep','Oct','Nov','Dec');
-dateDivID="calendar";
+var days=new Array('Su','Mo','Tu','We','Th','Fr','Sa');
+var months=new Array('Jan','Feb','Mar','Apr','May','Jun','Jul','Aug','Sep','Oct','Nov','Dec');
+var dateDivID="calendar";
 function Calendar(md,dF){
 iF=document.getElementsByName(md).item(0);
 pB=iF;
@@ -159,7 +159,7 @@
 }
 function convertDate(dS,dF){
 var d,m,y;
-if (dF="d.m.Y")
+if (dF=="d.m.Y")
 dA=dS.split(".")
 else
 dA=dS.split("/");
@@ -199,7 +199,7 @@
 function initial(){
 if (document.getElementsByTagName){
 var as=document.getElementsByTagName("a");
-for (i=0;i<as.length;i++){
+for (var i=0;i<as.length;i++){
 var a=as[i];
 if (a.getAttribute("href") &&
 a.getAttribute("rel")=="external")


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.