Thread: [Weberp-svn] SF.net SVN: weberp:[9568] trunk (Page 15)

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

Revision: 9568
          http://weberp.svn.sourceforge.net/weberp/?rev=9568&view=rev
Author:   tim_schofield
Date:     2012-08-27 10:51:56 +0000 (Mon, 27 Aug 2012)
Log Message:
-----------
Replace <a tags with new InternalLink() function

Modified Paths:
--------------
    trunk/GLAccountCSV.php
    trunk/GLAccountInquiry.php
    trunk/GLAccounts.php
    trunk/GLBalanceSheet.php
    trunk/GLJournal.php
    trunk/GLJournalInquiry.php
    trunk/GLProfit_Loss.php
    trunk/GLTagProfit_Loss.php
    trunk/GLTags.php
    trunk/GLTransInquiry.php
    trunk/GLTrialBalance.php
    trunk/GoodsReceived.php
    trunk/GoodsReceivedControlled.php
    trunk/Labels.php

Modified: trunk/GLAccountCSV.php
===================================================================

--- trunk/GLAccountCSV.php	2012-08-26 22:50:57 UTC (rev 9567)
+++ trunk/GLAccountCSV.php	2012-08-27 10:51:56 UTC (rev 9568)
@@ -265,7 +265,7 @@
 
 	} /*end for each SelectedAccount */
 	fclose($fp);
-	echo '<div class="centre"><a href="' .  $FileName . '">' . _('click here') . '</a> ' . _('to view the file') . '</div><br />';
+	echo '<div class="centre">' .  InternalLink('', $FileName, _('click here')) . _('to view the file') . '</div><br />';
 } /* end of if CreateCSV button hit */
 
 include('includes/footer.inc');

Modified: trunk/GLAccountInquiry.php
===================================================================
--- trunk/GLAccountInquiry.php	2012-08-26 22:50:57 UTC (rev 9567)
+++ trunk/GLAccountInquiry.php	2012-08-27 10:51:56 UTC (rev 9568)
@@ -270,24 +270,15 @@
 		if ($tagrow['tagdescription']=='') {
 			$tagrow['tagdescription']=_('None');
 		}
-		printf('<td>%s</td>
-			<td class="number"><a href="%s">%s</a></td>
-			<td>%s</td>
-			<td class="number">%s</td>
-			<td class="number">%s</td>
-			<td>%s</td>
-			<td class="number"><b>%s</b></td>
-			<td>%s</td>
-			</tr>',
-			$myrow['typename'],
-			$URL_to_TransDetail,
-			$myrow['typeno'],
-			$FormatedTranDate,
-			$DebitAmount,
-			$CreditAmount,
-			$myrow['narrative'],
-			locale_money_format($RunningTotal,$_SESSION['CompanyRecord']['currencydefault']),
-			$tagrow['tagdescription']);
+		echo '<td>' . $myrow['typename'] . '</td>
+			<td class="number">' . InternalLink('', $URL_to_TransDetail, $myrow['typeno']) . '</td>
+			<td>' . $FormatedTranDate . '</td>
+			<td class="number">' . $DebitAmount . '</td>
+			<td class="number">' . $CreditAmount . '</td>
+			<td>' . $myrow['narrative'] . '</td>
+			<td class="number"><b>' . locale_money_format($RunningTotal,$_SESSION['CompanyRecord']['currencydefault']) . '</b></td>
+			<td>' . $tagrow['tagdescription'] . '</td>
+			</tr>';
 
 	}
 

Modified: trunk/GLAccounts.php
===================================================================
--- trunk/GLAccounts.php	2012-08-26 22:50:57 UTC (rev 9567)
+++ trunk/GLAccounts.php	2012-08-27 10:51:56 UTC (rev 9568)
@@ -319,21 +319,13 @@
 		}
 
 
-	printf('<td>%s</td>
-			<td>%s</td>
-			<td>%s</td>
-			<td>%s</td>
-			<td><a href="%s&SelectedAccount=%s">' . _('Edit') . '</td>
-			<td><a href="%s&SelectedAccount=%s&delete=1" onclick="return confirm("' . _('Are you sure you wish to delete this account? Additional checks will be performed in any event to ensure data integrity is not compromised.') . '");">' . _('Delete') . '</td>
-		</tr>',
-		$myrow[0],
-		$myrow[1],
-		$myrow[2],
-		$myrow[3],
-		htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?',
-		$myrow[0],
-		htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?',
-		$myrow[0]);
+	echo '<td>' . $myrow[0] . '</td>
+			<td>' . $myrow[1] . '</td>
+			<td>' . $myrow[2] . '</td>
+			<td>' . $myrow[3] . '</td>
+			<td>' . InternalLink('', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?&SelectedAccount=' . $myrow[0], _('Edit')) . '</td>
+			<td>' . InternalLink('', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?&SelectedAccount=' . $myrow[0] . '&delete=1', _('Delete')) . '</td>
+		</tr>';
 
 	}
 	//END WHILE LIST LOOP
@@ -345,7 +337,7 @@
 echo '<br />';
 
 if (isset($SelectedAccount)) {
-	echo '<div class="centre"><a href="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '">' .  _('Show All Accounts') . '</a></div>';
+	echo '<div class="centre">' . InternalLink('', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8'),  _('Show All Accounts')) . '</div>';
 }
 
 echo '<br />';

Modified: trunk/GLBalanceSheet.php
===================================================================
--- trunk/GLBalanceSheet.php	2012-08-26 22:50:57 UTC (rev 9567)
+++ trunk/GLBalanceSheet.php	2012-08-27 10:51:56 UTC (rev 9568)
@@ -87,7 +87,7 @@
 		$title = _('Balance Sheet') . ' - ' . _('Problem Report') . '....';
 		include('includes/header.inc');
 		prnMsg( _('The accumulated profits brought forward could not be calculated by the SQL because') . ' - ' . DB_error_msg($db) );
-		echo '<br /><a href="' .$rootpath .'/index.php">'. _('Back to the menu'). '</a>';
+		echo '<br />' . InternalLink($rootpath, 'index.php', _('Back to the menu'));
 		if ($debug==1){
 			echo '<br />'. $SQL;
 		}
@@ -125,7 +125,7 @@
 		$title = _('Balance Sheet') . ' - ' . _('Problem Report') . '....';
 		include('includes/header.inc');
 		prnMsg( _('No general ledger accounts were returned by the SQL because') . ' - ' . DB_error_msg($db) );
-		echo '<br /><a href="' .$rootpath .'/index.php">'. _('Back to the menu'). '</a>';
+		echo '<br />' . InternalLink($rootpath, 'index.php', _('Back to the menu'));
 		if ($debug==1){
 			echo '<br />'. $SQL;
 		}
@@ -288,7 +288,7 @@
 		$title = _('Print Balance Sheet Error');
 		include('includes/header.inc');
 		prnMsg( _('There were no entries to print out for the selections specified') );
-		echo '<br /><a href="'. $rootpath.'/index.php">'. _('Back to the menu'). '</a>';
+		echo '<br />' . InternalLink($rootpath, 'index.php', _('Back to the menu'));
 		include('includes/footer.inc');
 		exit;
 	} else {
@@ -529,7 +529,7 @@
 				$k++;
 			}
 
-			$ActEnquiryURL = '<a href="' . $rootpath . '/GLAccountInquiry.php?Period=' . $_POST['BalancePeriodEnd'] . '&Account=' . $myrow['accountcode'] . '">' . $myrow['accountcode'] . '</a>';
+			$ActEnquiryURL = InternalLink($rootpath, 'GLAccountInquiry.php?Period=' . $_POST['BalancePeriodEnd'] . '&Account=' . $myrow['accountcode'], $myrow['accountcode']);
 
 			$PrintString = '<td>%s</td>
 					<td>%s</td>

Modified: trunk/GLJournal.php
===================================================================
--- trunk/GLJournal.php	2012-08-26 22:50:57 UTC (rev 9567)
+++ trunk/GLJournal.php	2012-08-27 10:51:56 UTC (rev 9568)
@@ -388,7 +388,7 @@
 	}
 
 	echo '<td>' . $JournalItem->Narrative  . '</td>
-			<td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?Delete=' . $JournalItem->ID . '">'._('Delete').'</a></td>
+			<td>' . InternalLink('', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?Delete=' . $JournalItem->ID, _('Delete')) . '</td>
 		</tr>';
 }
 

Modified: trunk/GLJournalInquiry.php
===================================================================
--- trunk/GLJournalInquiry.php	2012-08-26 22:50:57 UTC (rev 9567)
+++ trunk/GLJournalInquiry.php	2012-08-27 10:51:56 UTC (rev 9568)
@@ -106,7 +106,7 @@
 					<td class="number">'.$myrow['tag'] . ' - ' . $myrow['tagdescription'].'</td>';
 
 			if ($myrow['typeno']!=$LastJournal) {
-				echo '<td class="number"><a href="PDFGLJournal.php?JournalNo='.$myrow['typeno'].'">'._('Print') .'</a></td></tr>';
+				echo '<td class="number">' . InternalLink('', 'PDFGLJournal.php?JournalNo='.$myrow['typeno'], _('Print')) . '</td></tr>';
 
 				$LastJournal = $myrow['typeno'];
 			} else {

Modified: trunk/GLProfit_Loss.php
===================================================================
--- trunk/GLProfit_Loss.php	2012-08-26 22:50:57 UTC (rev 9567)
+++ trunk/GLProfit_Loss.php	2012-08-27 10:51:56 UTC (rev 9568)
@@ -162,7 +162,7 @@
 		$title = _('Profit and Loss') . ' - ' . _('Problem Report') . '....';
 		include('includes/header.inc');
 		prnMsg( _('No general ledger accounts were returned by the SQL because') . ' - ' . DB_error_msg($db) );
-		echo '<br /><a href="' .$rootpath .'/index.php">'. _('Back to the menu'). '</a>';
+		echo '<br />' . InternalLink($rootpath, 'index.php', _('Back to the menu'));
 		if ($debug == 1){
 			echo '<br />'. $SQL;
 		}
@@ -174,7 +174,7 @@
 		include('includes/header.inc');
 		echo '<br />';
 		prnMsg( _('There were no entries to print out for the selections specified'),'warn' );
-		echo '<br /><a href="'. $rootpath.'/index.php">'. _('Back to the menu'). '</a>';
+		echo '<br />' . InternalLink($rootpath, 'index.php', _('Back to the menu'));
 		include('includes/footer.inc');
 		exit;
 	}
@@ -907,7 +907,7 @@
 				$k++;
 			}
 
-			$ActEnquiryURL = '<a href="' . $rootpath . '/GLAccountInquiry.php?Period=' . $_POST['ToPeriod'] . '&Account=' . $myrow['accountcode'] . '&Show=Yes">' . $myrow['accountcode'] . '</a>';
+			$ActEnquiryURL = InternalLink($rootpath, 'GLAccountInquiry.php?Period=' . $_POST['ToPeriod'] . '&Account=' . $myrow['accountcode'] . '&Show=Yes', $myrow['accountcode']);
 
 			if ($Section ==1){
 				printf('<td>%s</td>

Modified: trunk/GLTagProfit_Loss.php
===================================================================
--- trunk/GLTagProfit_Loss.php	2012-08-26 22:50:57 UTC (rev 9567)
+++ trunk/GLTagProfit_Loss.php	2012-08-27 10:51:56 UTC (rev 9568)
@@ -7,7 +7,6 @@
 include('includes/SQL_CommonFunctions.inc');
 include('includes/AccountSectionsDef.inc'); // This loads the $Sections variable
 
-
 if (isset($_POST['FromPeriod']) and ($_POST['FromPeriod'] > $_POST['ToPeriod'])){
 	prnMsg(_('The selected period from is actually after the period to') . '! ' . _('Please reselect the reporting period'),'error');
 	$_POST['SelectADifferentPeriod']='Select A Different Period';
@@ -39,7 +38,6 @@
 				ORDER BY periodno DESC";
 	$Periods = DB_query($sql,$db);
 
-
 	while ($myrow=DB_fetch_array($Periods,$db)){
 		if(isset($_POST['FromPeriod']) AND $_POST['FromPeriod']!=''){
 			if( $_POST['FromPeriod']== $myrow['periodno']){
@@ -96,11 +94,11 @@
 	$result=DB_query($SQL,$db);
 	echo '<option value="0">0 - None' . '</option>';
 	while ($myrow=DB_fetch_array($result)){
-    	if (isset($_POST['tag']) and $_POST['tag']==$myrow['tagref']){
+		if (isset($_POST['tag']) and $_POST['tag']==$myrow['tagref']){
 			echo '<option selected="True" value="' . $myrow['tagref'] . '">' . $myrow['tagref'].' - ' .$myrow['tagdescription'] . '</option>';
-    	} else {
+		} else {
 			echo '<option value="' . $myrow['tagref'] . '">' . $myrow['tagref'].' - ' .$myrow['tagdescription'] . '</option>';
-    	}
+		}
 	}
 	echo '</select></td>';
 // End select tag
@@ -181,7 +179,7 @@
 		$title = _('Income and Expenditure') . ' - ' . _('Problem Report') . '....';
 		include('includes/header.inc');
 		prnMsg( _('No general ledger accounts were returned by the SQL because') . ' - ' . DB_error_msg($db) );
-		echo '<br /><a href="' .$rootpath .'/index.php">'. _('Back to the menu'). '</a>';
+		echo '<br />' . InternalLink($rootpath, 'index.php', _('Back to the menu'));
 		if ($debug == 1){
 			echo '<br />'. $SQL;
 		}
@@ -193,7 +191,7 @@
 		include('includes/header.inc');
 		echo '<br />';
 		prnMsg( _('There were no entries to print out for the selections specified'),'info');
-		echo '<br /><a href="'. $rootpath.'/index.php">'. _('Back to the menu'). '</a>';
+		echo '<br />' . InternalLink($rootpath, 'index.php', _('Back to the menu'));
 		include('includes/footer.inc');
 		exit;
 	}
@@ -625,7 +623,7 @@
 
 					echo '<tr>
 							<td colspan="3"></td>
-      						<td><hr /></td>
+	  						<td><hr /></td>
 							<td></td>
 							<td><hr /></td>
 							<td></td>
@@ -747,7 +745,7 @@
 				$k++;
 			}
 
-			$ActEnquiryURL = '<a href="' . $rootpath . '/GLAccountInquiry.php?Period=' . $_POST['ToPeriod'] . '&amp;Account=' . $myrow['account'] . '&amp;Show=Yes">' . $myrow['account'] . '</a>';
+			$ActEnquiryURL = InternalLink($rootpath, 'GLAccountInquiry.php?Period=' . $_POST['ToPeriod'] . '&amp;Account=' . $myrow['account'] . '&amp;Show=Yes', $myrow['account']);
 
 			if ($Section ==4){
 				 printf('<td>%s</td>

Modified: trunk/GLTags.php
===================================================================
--- trunk/GLTags.php	2012-08-26 22:50:57 UTC (rev 9567)
+++ trunk/GLTags.php	2012-08-27 10:51:56 UTC (rev 9568)
@@ -49,16 +49,20 @@
 
 echo '</form>';
 
-echo '<table class="selection">';
-echo '<tr><th>'. _('Tag ID') .'</th>';
-echo '<th>'. _('Description'). '</th>';
+echo '<table class="selection">
+		<tr>
+			<th>'. _('Tag ID') .'</th>
+			<th>'. _('Description'). '</th>
+		</tr>';
 
 $sql="SELECT tagref, tagdescription FROM tags order by tagref";
 $result= DB_query($sql,$db);
 
 while ($myrow = DB_fetch_array($result,$db)){
-	echo '<tr><td>'.$myrow[0].'</td><td>'.$myrow[1].'</td><td>
-		<a href="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?SelectedTag=' . $myrow[0] . '&Action=edit">' . _('Edit') . '</a></td></tr>';
+	echo '<tr>
+			<td>'.$myrow[0].'</td><td>'.$myrow[1].'</td>
+			<td>' . InternalLink('', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?SelectedTag=' . $myrow[0] . '&Action=edit', _('Edit')) . '</td>
+		</tr>';
 }
 
 echo '</table><p></p>';

Modified: trunk/GLTransInquiry.php
===================================================================
--- trunk/GLTransInquiry.php	2012-08-26 22:50:57 UTC (rev 9567)
+++ trunk/GLTransInquiry.php	2012-08-27 10:51:56 UTC (rev 9568)
@@ -8,7 +8,7 @@
 include('includes/header.inc');
 
 // Page Border
-$menuUrl = '<a href="'. $rootpath . '/index.php?Application=GL">' . _('General Ledger Menu') . '</a></div>';
+$menuUrl = InternalLink($rootpath, 'index.php?Application=GL', _('General Ledger Menu')) . '</div>';
 
 if ( !isset($_GET['TypeID']) OR !isset($_GET['TransNo']) ) {
 	prnMsg(_('This page requires a valid transaction type and number'),'warn');
@@ -135,7 +135,7 @@
 				}
 				echo '<td>' . $TranDate . '</td>
 						<td>' . MonthAndYearFromSQLDate($TransRow['lastdate_in_period']) . '</td>
-						<td><a href="' . $URL . '">' . $TransRow['accountname'] . '</a></td>
+						<td>' . InternalLink('', $URL, $TransRow['accountname']) . '</td>
 						<td class="number">' . $DebitAmount . '</td>
 						<td class="number">' . $CreditAmount . '</td>
 						<td>' . $TransRow['narrative'] . '</td>
@@ -172,7 +172,7 @@
 					}
 					echo '<td>' . $TranDate . '</td>
 							<td>' . MonthAndYearFromSQLDate($TransRow['lastdate_in_period']) . '</td>
-							<td><a href="' . $URL . $DetailRow[0] . $date . '">' . $TransRow['accountname']  . ' - ' . $DetailRow[5] . '</a></td>
+							<td>' . InternalLink('', $URL . $DetailRow[0] . $date, $TransRow['accountname']  . ' - ' . $DetailRow[5]) . '</td>
 							<td class="number">' . $Debit . '</td>
 							<td class="number">' . $Credit . '</td>
 							<td>' . $TransRow['narrative'] . '</td>

Modified: trunk/GLTrialBalance.php
===================================================================
--- trunk/GLTrialBalance.php	2012-08-26 22:50:57 UTC (rev 9567)
+++ trunk/GLTrialBalance.php	2012-08-27 10:51:56 UTC (rev 9568)
@@ -147,7 +147,7 @@
 		$title = _('Trial Balance') . ' - ' . _('Problem Report') . '....';
 		include('includes/header.inc');
 		prnMsg( _('No general ledger accounts were returned by the SQL because') . ' - ' . DB_error_msg($db) );
-		echo '<br /><a href="' .$rootpath .'/index.php">'. _('Back to the menu'). '</a>';
+		echo '<br />' . InternalLink($rootpath, 'index.php', _('Back to the menu'));
 		if ($debug==1){
 			echo '<br />'. $SQL;
 		}
@@ -159,7 +159,7 @@
 		include('includes/header.inc');
 		echo '<br />';
 		prnMsg( _('There were no entries to print out for the selections specified') );
-		echo '<br /><a href="'. $rootpath.'/index.php">'. _('Back to the menu'). '</a>';
+		echo '<br />' . InternalLink($rootpath, 'index.php', _('Back to the menu'));
 		include('includes/footer.inc');
 		exit;
 	}
@@ -596,7 +596,7 @@
 		$CheckPeriodActual += $AccountPeriodActual;
 		$CheckPeriodBudget += $AccountPeriodBudget;
 
-		$ActEnquiryURL = '<a href="'. $rootpath . '/GLAccountInquiry.php?Period=' . $_POST['ToPeriod'] . '&amp;Account=' . $myrow['accountcode'] . '&amp;Show=Yes">' . $myrow['accountcode'] . '</a>';
+		$ActEnquiryURL = InternalLink($rootpath, 'GLAccountInquiry.php?Period=' . $_POST['ToPeriod'] . '&amp;Account=' . $myrow['accountcode'] . '&amp;Show=Yes', $myrow['accountcode']);
 
 		printf('<td>%s</td>
 			<td>%s</td>

Modified: trunk/GoodsReceived.php
===================================================================
--- trunk/GoodsReceived.php	2012-08-26 22:50:57 UTC (rev 9567)
+++ trunk/GoodsReceived.php	2012-08-27 10:51:56 UTC (rev 9568)
@@ -16,12 +16,11 @@
 $title = _('Receive Purchase Orders');
 include('includes/header.inc');
 
-echo '<a href="'. $rootpath . '/PO_SelectOSPurchOrder.php">' . _('Back to Purchase Orders'). '</a><br />';
+echo InternalLink($rootpath, 'PO_SelectOSPurchOrder.php', _('Back to Purchase Orders')) . '<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">'.
-		_('Select a purchase order to receive').'</a></div>';
+	echo '<div class="centre">' . InternalLink($rootpath, 'PO_SelectOSPurchOrder.php', _('Select a purchase order to receive')) . '</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');
 	exit;
@@ -159,7 +158,7 @@
 
 		//Now Display LineItem
 		if (file_exists($_SESSION['part_pics_dir'] . '/' . $LnItm->StockID . '.jpg')) {
-			echo '<td><a href="' . $rootpath . '/' . $_SESSION['part_pics_dir'] . '/' . $LnItm->StockID . '.jpg" target="_blank">'. $LnItm->StockID . '</a><br /></td>';
+			echo '<td>' . InternalLink($rootpath, '/' . $_SESSION['part_pics_dir'] . '/' . $LnItm->StockID . '.jpg', $LnItm->StockID) . '<br /></td>';
 		} else {
 			echo '<td>'. $LnItm->StockID . '</td>';
 		}
@@ -173,7 +172,7 @@
 		if ($LnItm->Controlled == 1) {
 
 			echo '<input type="hidden" name="RecvQty_' . $LnItm->LineNo . '" value="' . $LnItm->ReceiveQty . '" />
-					<a href="GoodsReceivedControlled.php?LineNo=' . $LnItm->LineNo . '" />' . locale_number_format($LnItm->ReceiveQty,$LnItm->DecimalPlaces) . '</a></td>';
+					' . InternalLink('', 'GoodsReceivedControlled.php?LineNo=' . $LnItm->LineNo, locale_number_format($LnItm->ReceiveQty,$LnItm->DecimalPlaces)) . '</td>';
 
 		} else {
 			echo '<input type="text" class="number" name="RecvQty_' . $LnItm->LineNo . '" maxlength="10" size="10" value="' . locale_number_format($LnItm->ReceiveQty,$LnItm->DecimalPlaces) . '" /></td>';
@@ -192,11 +191,9 @@
 
 		if ($LnItm->Controlled == 1) {
 			if ($LnItm->Serialised==1){
-				echo '<td><a href="GoodsReceivedControlled.php?LineNo=' . $LnItm->LineNo . '">'.
-					_('Enter Serial Nos'). '</a></td>';
+				echo '<td>' . InternalLink('', 'GoodsReceivedControlled.php?LineNo=' . $LnItm->LineNo, _('Enter Serial Nos')) . '</td>';
 			} else {
-				echo '<td><a href="GoodsReceivedControlled.php?LineNo=' . $LnItm->LineNo . '">'.
-					_('Enter Batches'). '</a></td>';
+				echo '<td>' . InternaLink('', 'GoodsReceivedControlled.php?LineNo=' . $LnItm->LineNo, _('Enter Batches')) . '</td>';
 			}
 		}
 		echo '</tr>';
@@ -346,9 +343,8 @@
 					<td>' . $myrow['quantityrecd'] . '</td></tr>';
 				echo '</table>';
 			}
-			echo '<div class="centre"><a href="'.$rootpath.'/PO_SelectOSPurchOrder.php">'.
-				_('Select a different purchase order for receiving goods against').'</a></div>';
-			echo '<div class="centre"><a href="'.$rootpath.'/GoodsReceived.php?PONumber=' . $_SESSION['PO']->OrderNumber . '">'. _('Re-read the updated purchase order for receiving goods against'). '</a></div>';
+			echo '<div class="centre">' . InternalLink($rootpath, 'PO_SelectOSPurchOrder.php', _('Select a different purchase order for receiving goods against')) . '</div>';
+			echo '<div class="centre">' . InternalLink($rootpath, 'GoodsReceived.php?PONumber=' . $_SESSION['PO']->OrderNumber, _('Re-read the updated purchase order for receiving goods against')) . '</div>';
 			unset($_SESSION['PO']->LineItems);
 			unset($_SESSION['PO']);
 			unset($_POST['ProcessGoodsReceived']);
@@ -732,16 +728,15 @@
 	unset($_POST['ProcessGoodsReceived']);
 
 	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">' .
-		_('Select a different purchase order for receiving goods against'). '</a></div>';
+	echo '<br />' . InternalLink('', 'PDFGrn.php?GRNNo='.$GRN .'&PONo='.$PONo, _('Print this Goods Received Note (GRN)'));
+	echo '<br />' . InternalLink($rootpath, 'PO_SelectOSPurchOrder.php', _('Select a different purchase order for receiving goods against')) . '</div>';
 /*end of process goods received entry */
 	include('includes/footer.inc');
 	exit;
 
 } 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">' . _('Modify Order Items'). '</a></div>';
+	echo '<br /><div class="centre">' . InternalLink($rootpath, 'PO_Items.php', _('Modify Order Items')) . '</div>';
 
 	echo '<br /><div class="centre"><button type="submit" name="Update">' . _('Update') . '</button></div><br />';
 	echo '<div class="centre"><button type="submit" name="ProcessGoodsReceived">' . _('Process Goods Received') . '</button></div><br />';

Modified: trunk/GoodsReceivedControlled.php
===================================================================
--- trunk/GoodsReceivedControlled.php	2012-08-26 22:50:57 UTC (rev 9567)
+++ trunk/GoodsReceivedControlled.php	2012-08-27 10:51:56 UTC (rev 9568)
@@ -16,8 +16,7 @@
 
 if (!isset($_SESSION['PO'])) {
 	/* This page can only be called with a purchase order number for receiving*/
-	echo '<div class="centre"><a href="' . $rootpath . '/PO_SelectOSPurchOrder.php">'.
-		_('Select a purchase order to receive'). '</a></div><br />';
+	echo '<div class="centre">' . InternalLink($rootpath, 'PO_SelectOSPurchOrder.php', _('Select a purchase order to receive')) . '</div><br />';
 	prnMsg( _('This page can only be opened if a purchase order and line item has been selected') . '. ' . _('Please do that first'),'error');
 	include('includes/footer.inc');
 	exit;
@@ -28,8 +27,7 @@
 } else if ($_POST['LineNo']>0){
 	$LineNo = $_POST['LineNo'];
 } else {
-	echo '<div class="centre"><a href="' . $rootpath . '/GoodsReceived.php">'.
-		_('Select a line Item to Receive').'</a></div>';
+	echo '<div class="centre">' . InternalLink($rootpath, 'GoodsReceived.php', _('Select a line Item to Receive')) . '</div>';
 	prnMsg( _('This page can only be opened if a Line Item on a PO has been selected') . '. ' . _('Please do that first'), 'error');
 	include( 'includes/footer.inc');
 	exit;
@@ -40,8 +38,7 @@
 
 if ($LineItem->Controlled !=1 ){ /*This page only relavent for controlled items */
 
-	echo '<div class="centre"><a href="' . $rootpath . '/GoodsReceived.php">'.
-		_('Back to the Purchase Order'). '</a></div>';
+	echo '<div class="centre">' . InternalLink($rootpath, 'GoodsReceived.php', _('Back to the Purchase Order')) . '</div>';
 	prnMsg( _('The line being received must be controlled as defined in the item definition'), 'error');
 	include('includes/footer.inc');
 	exit;
@@ -63,7 +60,7 @@
 include ('includes/InputSerialItems.php');
 echo '<div style="text-align: right">';
 
-echo '<br /><a href="'.$rootpath.'/GoodsReceived.php">'. _('Back To Purchase Order'). ' # '. $_SESSION['PO']->OrderNo . '</a>';
+echo '<br />' . InternalLink($rootpath, 'GoodsReceived.php', _('Back To Purchase Order'). ' # '. $_SESSION['PO']->OrderNo);
 
 echo '</div>';
 

Modified: trunk/Labels.php
===================================================================
--- trunk/Labels.php	2012-08-26 22:50:57 UTC (rev 9567)
+++ trunk/Labels.php	2012-08-27 10:51:56 UTC (rev 9568)
@@ -505,7 +505,7 @@
 		</div>
 	<br />
 		<div class="centre">
-			' . InternalLink($rootpath, 'PDFPrintLabel.php', _('Print Labels') . '
+			' . InternalLink($rootpath, 'PDFPrintLabel.php', _('Print Labels')) . '
 		</div>
 	</form>';
 

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





Thread: [Weberp-svn] SF.net SVN: weberp:[9568] trunk (Page 15)

weberp-svn