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

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 5939
          http://weberp.svn.sourceforge.net/weberp/?rev=5939&view=rev
Author:   tim_schofield
Date:     2011-07-12 13:24:38 +0000 (Tue, 12 Jul 2011)

Log Message:
-----------
Remove unnecessary use of SID

Modified Paths:
--------------
    trunk/GoodsReceived.php
    trunk/InventoryPlanningPrefSupplier.php
    trunk/includes/ConstructSQLForUserDefinedSalesReport.inc
    trunk/includes/InputSerialItemsKeyed.php

Modified: trunk/GoodsReceived.php
===================================================================

--- trunk/GoodsReceived.php	2011-07-12 13:24:24 UTC (rev 5938)
+++ trunk/GoodsReceived.php	2011-07-12 13:24:38 UTC (rev 5939)
@@ -15,11 +15,11 @@
 $title = _('Receive Purchase Orders');
 include('includes/header.inc');
 
-echo '<a href="'. $rootpath . '/PO_SelectOSPurchOrder.php?' . SID . '">' . _('Back to Purchase Orders'). '</a><br />';
+echo '<a href="'. $rootpath . '/PO_SelectOSPurchOrder.php">' . _('Back to Purchase Orders'). '</a><br />';
 
 if (isset($_GET['PONumber']) and $_GET['PONumber']<=0 and !isset($_SESSION['PO'])) {
 	/* This page can only be called with a purchase order number for invoicing*/
-	echo '<div class="centre"><a href= "' . $rootpath . '/PO_SelectOSPurchOrder.php?' . SID . '">'.
+	echo '<div class="centre"><a href= "' . $rootpath . '/PO_SelectOSPurchOrder.php">'.
 		_('Select a purchase order to receive').'</a></div>';
 	echo '<br />'. _('This page can only be opened if a purchase order has been selected. Please select a purchase order first');
 	include ('includes/footer.inc');
@@ -62,7 +62,7 @@
 	_('Receive') . '" alt="" />' . ' ' . _('Receive Purchase Order') . '';
 
 echo ' : '. $_SESSION['PO']->OrderNo .' '. _('from'). ' ' . $_SESSION['PO']->SupplierName . '</p>';
-echo '<form action="' . $_SERVER['PHP_SELF'] . '?' . SID . '" method=post>';
+echo '<form action="' . $_SERVER['PHP_SELF'] . '" method=post>';
 echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
 
 if (!isset($_POST['ProcessGoodsReceived'])) {
@@ -159,7 +159,7 @@
 
 		if ($LnItm->Controlled == 1) {
 
-			echo '<input type=hidden name="RecvQty_' . $LnItm->LineNo . '" value="' . $LnItm->ReceiveQty . '"><a href="GoodsReceivedControlled.php?' . SID . '&LineNo=' . $LnItm->LineNo . '">' . number_format($LnItm->ReceiveQty,$LnItm->DecimalPlaces) . '</a></td>';
+			echo '<input type=hidden name="RecvQty_' . $LnItm->LineNo . '" value="' . $LnItm->ReceiveQty . '"><a href="GoodsReceivedControlled.php?LineNo=' . $LnItm->LineNo . '">' . number_format($LnItm->ReceiveQty,$LnItm->DecimalPlaces) . '</a></td>';
 
 		} else {
 			echo '<input type=text class=number name="RecvQty_' . $LnItm->LineNo . '" maxlength=10 size=10 value="' . $LnItm->ReceiveQty . '"></td>';
@@ -173,10 +173,10 @@
 
 		if ($LnItm->Controlled == 1) {
 			if ($LnItm->Serialised==1){
-				echo '<td><a href="GoodsReceivedControlled.php?' . SID . '&LineNo=' . $LnItm->LineNo . '">'.
+				echo '<td><a href="GoodsReceivedControlled.php?LineNo=' . $LnItm->LineNo . '">'.
 					_('Enter Serial Nos'). '</a></td>';
 			} else {
-				echo '<td><a href="GoodsReceivedControlled.php?' . SID . '&LineNo=' . $LnItm->LineNo . '">'.
+				echo '<td><a href="GoodsReceivedControlled.php?LineNo=' . $LnItm->LineNo . '">'.
 					_('Enter Batches'). '</a></td>';
 			}
 		}
@@ -705,7 +705,7 @@
 
 	echo '<br /><div class=centre>'. _('GRN number'). ' '. $GRN .' '. _('has been processed').'<br />';
 	echo '<br /><a href=PDFGrn.php?GRNNo='.$GRN .'&PONo='.$PONo.'>'. _('Print this Goods Received Note (GRN)').'</a><br /><br />';
-	echo '<a href="' . $rootpath . '/PO_SelectOSPurchOrder.php?' . SID . '">' .
+	echo '<a href="' . $rootpath . '/PO_SelectOSPurchOrder.php">' .
 		_('Select a different purchase order for receiving goods against'). '</a></div>';
 /*end of process goods received entry */
 	include('includes/footer.inc');
@@ -713,7 +713,7 @@
 
 } else { /*Process Goods received not set so show a link to allow mod of line items on order and allow input of date goods received*/
 
-	echo '<br /><div class="centre"><a href="' . $rootpath . '/PO_Items.php?=' . SID . '">' . _('Modify Order Items'). '</a></div>';
+	echo '<br /><div class="centre"><a href="' . $rootpath . '/PO_Items.php">' . _('Modify Order Items'). '</a></div>';
 
 	echo '<br /><div class="centre"><input type=submit name=Update Value=' . _('Update') . '></div><br />';
 	echo '<div class="centre"><input type=submit name="ProcessGoodsReceived" Value="' . _('Process Goods Received') . '"></div>';

Modified: trunk/InventoryPlanningPrefSupplier.php
===================================================================
--- trunk/InventoryPlanningPrefSupplier.php	2011-07-12 13:24:24 UTC (rev 5938)
+++ trunk/InventoryPlanningPrefSupplier.php	2011-07-12 13:24:38 UTC (rev 5939)
@@ -457,7 +457,7 @@
 		$title = _('Print Inventory Planning Report Empty');
 		include('includes/header.inc');
 		prnMsg( _('There were no items in the range and location specified'),'error');
-		echo '<br /><a href="'.$rootpath/.'index.php">' . _('Back to the menu') . '</a>';
+		echo '<br /><a href="'.$rootpath.'/index.php">' . _('Back to the menu') . '</a>';
 		include('includes/footer.inc');
 		exit;
 	} else {

Modified: trunk/includes/ConstructSQLForUserDefinedSalesReport.inc
===================================================================
--- trunk/includes/ConstructSQLForUserDefinedSalesReport.inc	2011-07-12 13:24:24 UTC (rev 5938)
+++ trunk/includes/ConstructSQLForUserDefinedSalesReport.inc	2011-07-12 13:24:38 UTC (rev 5939)
@@ -176,16 +176,16 @@
     $title = _('User Defined Sales Analysis Problem') . ' ....';
    include('includes/header.inc');
     prnMsg (  _('The report does not have any output columns') . '. ' . _('You need to set up the data columns that you wish to show in the report'),'error',_('No Columns'));
-    echo "<BR><A HREF='$rootpath/SalesAnalReptCols.php?" . SID . "&ReportID=" . $_GET['ReportID'] . "'>" . _('Enter Columns for this report') . '</A>';
-    echo "<BR><A HREF='$rootpath/index.php?" . SID . "'>" . _('Back to the menu') . '</A>';
+    echo '<br /><a href="'.$rootpath.'/SalesAnalReptCols.php?ReportID=' . $_GET['ReportID'] . '">' . _('Enter Columns for this report') . '</a>';
+    echo '<br /><a href="'.$rootpath.'/index.php">' . _('Back to the menu') . '</a>';
     include('includes/footer.inc');
     Exit;
 } elseif (DB_num_rows($ColsResult) >10){
     $title = _('User Defined Sales Analysis Problem') . ' ....';
    include('includes/header.inc');
     prnMsg (_('The report cannot have more than 10 columns in it') . '. ' . _('Please delete one or more columns before attempting to run it'),'error',_('Too Many Columns'));
-    echo "<BR><A HREF='$rootpath/SalesAnalReptCols.php?" . SID . "&ReportID=" . $_GET['ReportID'] . "'>" . _('Maintain Columns for this report') . '</A>';
-    echo "<BR><A HREF='$rootpath/index.php?" . SID . "'>" . _('Back to the menu') . '</A>';
+    echo '<br /><a href="'.$rootpath.'/SalesAnalReptCols.php?ReportID=' . $_GET['ReportID'] . '">' . _('Maintain Columns for this report') . '</a>';
+    echo '<br /><a href="'.$rootpath.'/index.php">' . _('Back to the menu') . '</a>';
     include('includes/footer.inc');
     exit;
 }
@@ -265,7 +265,7 @@
 	     $title = _('User Defined Sales Analysis Problem') . ' ....';
 	    include('includes/header.inc');
 	     prnMsg(_('Calculated fields must use columns defined in the report specification') . '. ' . _('The numerator column number entered for this calculation is not defined in the report'),'error',_('Calculation With Undefined Column'));
-	     echo "<BR><A HREF='$rootpath/SalesAnalReptCols.php?" . SID . "&ReportID=" . $_GET['ReportID'] . "'>" . _('Maintain Columns for this report') . '</A>';
+	     echo '<br /><a href="'.$rootpath.'/SalesAnalReptCols.php?ReportID=' . $_GET['ReportID'] . '">' . _('Maintain Columns for this report') . '</a>';
 	     include('includes/footer.inc');
 	     exit;
 	 }
@@ -336,8 +336,8 @@
     $title = _('User Defined Sales Analysis Problem') . ' ....';
    include('includes/header.inc');
     prnMsg(_('The user defined sales analysis SQL did not return any rows') . ' - ' . _('have another look at the criteria specified'),'error',_('Nothing To Report'));
-    echo "<BR><A HREF='$rootpath/SalesAnalRepts.php?" . SID . '&SelectedReport=' . $_GET['ReportID'] . "'>" . _('Look at the design of this report') . '</A>';
-    echo "<BR><A HREF='$rootpath/index.php?" . SID . "'>" . _('Back to the menu') . '</A>';
+    echo '<br /><a href="'.$rootpath.'/SalesAnalRepts.php?SelectedReport=' . $_GET['ReportID'] . '">' . _('Look at the design of this report') . '</a>';
+    echo '<br /><a href="'.$rootpath.'/index.php">' . _('Back to the menu') . '</a>';
     include('includes/footer.inc');
 
    exit;

Modified: trunk/includes/InputSerialItemsKeyed.php
===================================================================
--- trunk/includes/InputSerialItemsKeyed.php	2011-07-12 13:24:24 UTC (rev 5938)
+++ trunk/includes/InputSerialItemsKeyed.php	2011-07-12 13:24:38 UTC (rev 5939)
@@ -54,7 +54,7 @@
 		echo '<td class=number>' . $Bundle->ExpiryDate . '</td>';
 	}
 
-	echo '<td><a href="' . $_SERVER['PHP_SELF'] . '?' . SID . 'Delete=' . $Bundle->BundleRef . '&StockID=' . $LineItem->StockID . '&LineNo=' . $LineNo .'">'. _('Delete'). '</a></td></tr>';
+	echo '<td><a href="' . $_SERVER['PHP_SELF'] . '?Delete=' . $Bundle->BundleRef . '&StockID=' . $LineItem->StockID . '&LineNo=' . $LineNo .'">'. _('Delete'). '</a></td></tr>';
 
 	$TotalQuantity += $Bundle->BundleQty;
 }
@@ -79,7 +79,7 @@
 echo $tableheader;
 
 
-echo '<form action="' . $_SERVER['PHP_SELF'] . '?=' . SID . '" name="Ga6uF5Wa" method="post">
+echo '<form action="' . $_SERVER['PHP_SELF'] . '" name="Ga6uF5Wa" method="post">
       <input type=hidden name=LineNo value="' . $LineNo . '">
       <input type=hidden name=StockID value="' . $StockID . '">
       <input type=hidden name=EntryType value="KEYED">';


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


