[Weberp-svn] SF.net SVN: weberp:[5147] trunk

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

Revision: 5147
          http://weberp.svn.sourceforge.net/weberp/?rev=5147&view=rev
Author:   tim_schofield
Date:     2011-04-09 10:47:30 +0000 (Sat, 09 Apr 2011)

Log Message:
-----------
XHTML corrections and other fixes

Modified Paths:
--------------
    trunk/Stocks.php
    trunk/WOSerialNos.php
    trunk/includes/SQL_CommonFunctions.inc

Modified: trunk/Stocks.php
===================================================================
--- trunk/Stocks.php	2011-04-09 08:51:26 UTC (rev 5146)
+++ trunk/Stocks.php	2011-04-09 10:47:30 UTC (rev 5147)
@@ -1029,8 +1029,8 @@
 	echo '<input type="hidden" name="PropType' . $PropertyCounter .'" value=' . $PropertyRow['controltype'] . '>';
 	echo '</td></tr>';
 	$PropertyCounter++;
-	unset($StockID);
 } //end loop round properties for the item category
+unset($StockID);
 echo '</table><br>';
 echo '<input type="hidden" name="PropertyCounter" value=' . $PropertyCounter . '>';
 

Modified: trunk/WOSerialNos.php
===================================================================
--- trunk/WOSerialNos.php	2011-04-09 08:51:26 UTC (rev 5146)
+++ trunk/WOSerialNos.php	2011-04-09 10:47:30 UTC (rev 5147)
@@ -50,6 +50,7 @@
 		} else {
 			DB_Txn_Begin($db);
 			/*Process the additional controlled items into woserialnos and update the quantity on the work order order in woitems*/
+			$InputError=false;
 			$sql = "INSERT INTO woserialnos (stockid,
 												wo,
 												qualitytext,
@@ -58,7 +59,7 @@
 			$ValueLine = " ('" . $StockID . "',
 							'" . $WO . "',
 							'' ,
-							";
+							'";
 			for ($i=0;$i<$_POST['NumberToAdd'];$i++){
 				$NextItemNumber = $NextSerialNo + $i;
 				$result = DB_query("SELECT serialno FROM woserialnos
@@ -229,7 +230,7 @@
 echo '<input type="hidden" name="Serialised" value="' . $Serialised . '">';
 echo '<input type="hidden" name="NextSerialNo" value="' . $NextSerialNo . '">';
 
-echo '<table>';
+echo '<table class="selection">';
 
 if ($Serialised==1 AND $NextSerialNo>0){
 	echo '<tr><td>' . _('Add A Number of New Serial Numbers');
@@ -256,8 +257,7 @@
 }
 
 echo '<td><input type="submit" name="AddControlledItems" value="' . _('Add') . '"></td></tr>
-	</table>';
-echo '<hr>';
+	</table><br />';
 
 $sql = "SELECT serialno,
 				quantity,
@@ -272,7 +272,7 @@
 if (DB_num_rows($WOSerialNoResult)==0){
 	prnMsg(_('There are no serial items or batches yet defined for this work order item. Create new items first'),'info');
 } else {
-	echo '<table>';
+	echo '<br /><table class="selection">';
 	if ($Serialised==1){
 		$Header = '<tr><th>' . _('Serial No') . '</th><th>' . _('Notes') . '</th></tr>';
 	} else {
@@ -291,13 +291,13 @@
 		echo '<tr><td><input type="text" name="Reference' . $i .'" value="' . $WOSNRow['serialno'] . '"></td>';
 		echo '<input type="hidden" name="OldReference' . $i . '" value="' . $WOSNRow['serialno'] . '">';
 		if ($Serialised==0){
-			echo '<td><input type="text" name="Quantity' . $i .'" value="' . $WOSNRow['quantity'] . '"</td>';
+			echo '<td><input type="text" name="Quantity' . $i .'" value="' . $WOSNRow['quantity'] . '" /></td>';
 			echo '<input type="hidden" name="OldQuantity' . $i . '" value="' . $WOSNRow['quantity'] . '">';
 		} else {
 			echo '<input type="hidden" name="Quantity' . $i . '" value="1">';
 		}
 		echo '<td><textarea name="Notes' . $i .'" cols=60 rows=3>' . $WOSNRow['qualitytext'] .'</textarea></td>';
-		echo '<td><a href="' . $_SESSION['PHP_SELF'] . '?' . SID . '&Delete=1&Reference=' . $WOSNRow['serialno'] . '&Quantity=' . $WOSNRow['quantity'] . '&WO=' . $WO . '&StockID=' . $StockID . '&Description=' . $Description . '&Serialised=' . $Serialised . '&NextSerialNo=' . $NextSerialNo . '">' . _('Delete') . '</td></tr>';
+		echo '<td><a href="' . $_SERVER['PHP_SELF'] . '?Delete=1&Reference=' . $WOSNRow['serialno'] . '&Quantity=' . $WOSNRow['quantity'] . '&WO=' . $WO . '&StockID=' . $StockID . '&Description=' . $Description . '&Serialised=' . $Serialised . '&NextSerialNo=' . $NextSerialNo . '">' . _('Delete') . '</td></tr>';
 		$i++;
 		$j++;
 	}
@@ -307,14 +307,14 @@
 	if ($Serialised==0){
 		echo '<tr><td align="center" colspan=3>';
 	} else {
-		echo '<tr><td align="center" colspan=2>';
+		echo '<tr><td style="text-align: center" colspan=2>';
 	}
 	echo '<input type="submit" name="UpdateItems" value="' . _('Update') . '"></td></tr>';
 	echo '</table>';
 
 } //end of if there are woserialno items defined
 
-echo '<p/><a href="' . $rootpath . '/WorkOrderEntry.php?' . SID . '&WO=' . $WO . '">' . _('Back To Work Order') . ' ' . $WO .'</a>';
+echo '<br /><div class="centre"><a href="' . $rootpath . '/WorkOrderEntry.php?WO=' . $WO . '">' . _('Back To Work Order') . ' ' . $WO .'</a></div>';
 echo '</form>';
 
 include('includes/footer.inc');

Modified: trunk/includes/SQL_CommonFunctions.inc
===================================================================
--- trunk/includes/SQL_CommonFunctions.inc	2011-04-09 08:51:26 UTC (rev 5146)
+++ trunk/includes/SQL_CommonFunctions.inc	2011-04-09 10:47:30 UTC (rev 5147)
@@ -46,7 +46,7 @@
 						materialuseagevarac,
 						wipact
 					FROM stockmaster
-					LEFT JOIN stockcategory
+					INNER JOIN stockcategory
 					ON stockmaster.categoryid=stockcategory.categoryid
 					AND stockmaster.stockid = '" . $StockID . "'";
 


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