[Weberp-svn] SF.net SVN: weberp:[9550] trunk
Brought to you by:
sotandeka,
tim_schofield
Menu
▾
▴
[Weberp-svn] SF.net SVN: weberp:[9550] trunk
|
From: <tim...@us...> - 2012-08-24 13:33:53
|
Revision: 9550
http://weberp.svn.sourceforge.net/weberp/?rev=9550&view=rev
Author: tim_schofield
Date: 2012-08-24 13:33:46 +0000 (Fri, 24 Aug 2012)
Log Message:
-----------
Replace <a tags with InternalLink() function
Modified Paths:
--------------
trunk/SalesAnalysis_UserDefined.php
trunk/SalesCategories.php
trunk/SalesGLPostings.php
trunk/SalesPeople.php
trunk/SalesTypes.php
trunk/SecurityTokens.php
trunk/SelectAsset.php
trunk/SelectCompletedOrder.php
trunk/SelectContract.php
trunk/SelectCreditItems.php
trunk/SelectGLAccount.php
trunk/SelectOrderItems.php
trunk/css/silverwolf/images/sales.png
Modified: trunk/SalesAnalysis_UserDefined.php
===================================================================
--- trunk/SalesAnalysis_UserDefined.php 2012-08-24 11:13:04 UTC (rev 9549)
+++ trunk/SalesAnalysis_UserDefined.php 2012-08-24 13:33:46 UTC (rev 9550)
@@ -24,8 +24,8 @@
$title = _('User Defined Sales Analysis Problem');
include('includes/header.inc');
echo '<br />' . _('The report did not have any none zero lines of information to show and so it has not been created');
- 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>';
+ echo '<br />' . InternalLink($rootpath, 'SalesAnalRepts.php?SelectedReport=' . $_GET['ReportID'], _('Look at the design of this report'));
+ echo '<br />' . InternalLink($rootpath, 'index.php', _('Back to the menu'));
include('includes/footer.inc');
exit;
}
@@ -44,7 +44,7 @@
echo '<meta http-equiv="Refresh" content="0; url=' . $rootpath . '/' . $_SESSION['reports_dir'] . '/SalesAnalysis.csv">';
echo '<p>' . _('You should automatically be forwarded to the CSV Sales Analysis file when it is ready') . '. ' . _('If this does not happen') .
- ' <a href="' . $rootpath . '/' . $_SESSION['reports_dir'] . '/SalesAnalysis.csv">' . _('click here') . '</a> ' . _('to continue') . '<br /></p>';
+ . InternalLink($rootpath, '/' . $_SESSION['reports_dir'] . '/SalesAnalysis.csv', _('click here')) . _('to continue') . '<br /></p>';
include('includes/footer.inc');
}
?>
\ No newline at end of file
Modified: trunk/SalesCategories.php
===================================================================
--- trunk/SalesCategories.php 2012-08-24 11:13:04 UTC (rev 9549)
+++ trunk/SalesCategories.php 2012-08-24 13:33:46 UTC (rev 9550)
@@ -65,7 +65,11 @@
if ($UploadTheFile=='Yes'){
$result = move_uploaded_file($_FILES['ItemPicture']['tmp_name'], $filename);
- $message = ($result)?_('File url') .'<a href="'. $filename .'">' . $filename . '</a>' : _('Something is wrong with uploading a file.');
+ if ($result) {
+ $message = _('File url') . InternalLink('', $filename, $filename);
+ } else {
+ _('Something is wrong with uploading a file.');
+ }
}
/* EOR Add Image upload for New Item - by Ori */
}
@@ -180,7 +184,7 @@
// ----------------------------------------------------------------------------------------
// Calculate Path for navigation
-$CategoryPath = '<a href="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?ParentCategory=NULL">' . _('Main') . '</a>' . " \\ ";
+$CategoryPath = InternalLink('', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?ParentCategory=NULL', _('Main')) . " \\ ";
$TempPath = '';
if (isset($ParentCategory)) {
$TmpParentID = $ParentCategory;
@@ -196,8 +200,7 @@
if (DB_num_rows($result) > 0) {
$row = DB_fetch_array($result);
$LastParentName = $row['salescatname'];
- $TempPath = '<a href="'. htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?ParentCategory='.$TmpParentID.'">'.$LastParentName .
- '</a>'." \\ ".$TempPath;
+ $TempPath = InternalLink('', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?ParentCategory='.$TmpParentID, $LastParentName) . " \\ ".$TempPath;
$TmpParentID = $row['parentcatid']; // Set For Next Round
} else {
$Buzy = false;
@@ -265,22 +268,12 @@
$ParentCategory='NULL';
}
- printf('<td>%s</td>
- <td>%s</td>
- <td><a href="%sParentCategory=%s">' . _('Select') . '</td>
- <td><a href="%sSelectedCategory=%s&ParentCategory=%s">' . _('Edit') . '</td>
- <td><a href="%sSelectedCategory=%s&delete=yes&EditName=1&ParentCategory=%s">' . _('Delete') . '</td>
- </tr>',
- $myrow['salescatname'],
- $CatImgLink,
- htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?',
- $myrow['salescatid'],
- htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?',
- $myrow['salescatid'],
- $ParentCategory,
- htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?',
- $myrow['salescatid'],
- $ParentCategory);
+ echo '<td>' . $myrow['salescatname'] . '</td>
+ <td>' . $CatImgLink . '</td>
+ <td>' . InternalLink('', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?ParentCategory=' . $myrow['salescatid'], _('Select')) . '</td>
+ <td>' . InternalLink('', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?SelectedCategory=' . $myrow['salescatid'] . '&ParentCategory=' . $ParentCategory, _('Edit')) . '</td>
+ <td>' . InternalLink('', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?SelectedCategory=' . $myrow['salescatid'] . '&delete=yes&EditName=1&ParentCategory=' . $ParentCategory, _('Delete')) . '</td>
+ </tr>';
}
//END WHILE LIST LOOP
echo '</table>';
@@ -340,7 +333,7 @@
<td>' . _('Image File') . '</td>
<td>
<img src="'.$rootpath . '/' . $_SESSION['part_pics_dir'] . '/' . 'cat_'.$myrow['salescatid'].'.jpg" width="64px" />
- <a href="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?DeleteImage='.$myrow['salescatid'].'">' . _('Delete Image') . '</a>
+ ' . InternalLink('', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?DeleteImage='.$myrow['salescatid'], _('Delete Image')) . '
</td>
</tr>';
}
@@ -455,9 +448,7 @@
echo '<td>' . $myrow['stockid'] . '</td>';
echo '<td>' . $myrow['description'] . '</td>';
- echo '<td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?ParentCategory='.$ParentCategory.'&DelStockID='.$myrow['stockid'].'">'.
- _('Remove').
- '</a></td></tr>';
+ echo '<td>' . InternalLink('', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?ParentCategory='.$ParentCategory.'&DelStockID='.$myrow['stockid'], _('Remove')). '</td></tr>';
}
echo '</table>';
} else {
Modified: trunk/SalesGLPostings.php
===================================================================
--- trunk/SalesGLPostings.php 2012-08-24 11:13:04 UTC (rev 9549)
+++ trunk/SalesGLPostings.php 2012-08-24 13:33:46 UTC (rev 9550)
@@ -126,22 +126,14 @@
$k=1;
}
- printf('<td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td><a href="%sSelectedSalesPostingID=%s">' . _('Edit') . '</td>
- <td><a href="%sSelectedSalesPostingID=%s&delete=yes">'. _('Delete') . '</td></tr>',
- $myrow['area'],
- $myrow['stkcat'],
- $myrow['salestype'],
- $myrow['salesglcode'],
- $myrow['discountglcode'],
- htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?',
- $myrow['id'],
- htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?',
- $myrow['id']);
+ echo '<td>' . $myrow['area'] . '</td>
+ <td>' . $myrow['stkcat'] . '</td>
+ <td>' . $myrow['salestype'] . '</td>
+ <td>' . $myrow['salesglcode'] . '</td>
+ <td>' . $myrow['discountglcode'] . '</td>
+ <td>' . InternalLink('', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?SelectedSalesPostingID=' . $myrow['id'], _('Edit')) . '</td>
+ <td>' . InternalLink('', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?SelectedSalesPostingID=' . $myrow['id'] . '&delete=yes', _('Delete')) . '</td>
+ </tr>';
}
}
@@ -239,22 +231,14 @@
$k=1;
}
- printf('<td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td><a href="%sSelectedSalesPostingID=%s">' . _('Edit') . '</td>
- <td><a href="%sSelectedSalesPostingID=%s&delete=yes">'. _('Delete') . '</td></tr>',
- $myrow['area'],
- $myrow['stkcat'],
- $myrow['salestype'],
- $myrow['chart1name'],
- $myrow['chart2name'],
- htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?',
- $myrow['id'],
- htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?',
- $myrow['id']);
+ echo '<td>' . $myrow['area'] . '</td>
+ <td>' . $myrow['stkcat'] . '</td>
+ <td>' . $myrow['salestype'] . '</td>
+ <td>' . $myrow['chart1name'] . '</td>
+ <td>' . $myrow['chart2name'] . '</td>
+ <td>' . InternalLink('', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?SelectedSalesPostingID=' . $myrow['id'], _('Edit')) . '</td>
+ <td>' . InternalLink('', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?SelectedSalesPostingID=' . $myrow['id'] . '&delete=yes', _('Delete')) . '</td>
+ </tr>';
}
//END WHILE LIST LOOP
echo '</table>';
@@ -264,7 +248,7 @@
//end of ifs and buts!
if (isset($SelectedSalesPostingID)) {
- echo '<div class="centre"><a href="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '">' . _('Show All Sales Posting Codes Defined') . '</a></div>';
+ echo '<div class="centre">' . InternalLink('', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8'), _('Show All Sales Posting Codes Defined')) . '</div>';
}
Modified: trunk/SalesPeople.php
===================================================================
--- trunk/SalesPeople.php 2012-08-24 11:13:04 UTC (rev 9549)
+++ trunk/SalesPeople.php 2012-08-24 13:33:46 UTC (rev 9550)
@@ -211,37 +211,25 @@
$ActiveText = _('No');
}
- printf('
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td class="number">%s</td>
- <td class="number">%s</td>
- <td class="number">%s</td>
- <td>%s</td>
- <td><a href="%sSelectedSaleperson=%s">'. _('Edit') . '</a></td>
- <td><a href="%sSelectedSaleperson=%s&delete=1">' . _('Delete') . '</a></td>
- </tr>',
- $myrow['salesmancode'],
- $myrow['salesmanname'],
- $myrow['smantel'],
- $myrow['smanfax'],
- $myrow['commissionrate1'],
- $myrow['breakpoint'],
- $myrow['commissionrate2'],
- $ActiveText,
- htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?',
- $myrow['salesmancode'],
- htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?',
- $myrow['salesmancode']);
+ echo '
+ <td>' . $myrow['salesmancode'] . '</td>
+ <td>' . $myrow['salesmanname'] . '</td>
+ <td>' . $myrow['smantel'] . '</td>
+ <td>' . $myrow['smanfax'] . '</td>
+ <td class="number">' . $myrow['commissionrate1'] . '</td>
+ <td class="number">' . $myrow['breakpoint'] . '</td>
+ <td class="number">' . $myrow['commissionrate2'] . '</td>
+ <td>' . $ActiveText . '</td>
+ <td>' . InternalLink('', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?SelectedSaleperson=' . $myrow['salesmancode'], _('Edit')) . '</td>
+ <td>' . InternalLink('', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?SelectedSaleperson=' . $myrow['salesmancode'] . '&delete=1', _('Delete')) . '</td>
+ </tr>';
} //END WHILE LIST LOOP
echo '</table><br />';
} //end of ifs and buts!
if (isset($SelectedSalesPerson)) {
- echo '<div class="centre"><a href="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '">' . _('Show All Sales People') . '</a></div>';
+ echo '<div class="centre">' . InternalLink('', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8'), _('Show All Sales People')) . '</div>';
}
if (! isset($_GET['delete'])) {
Modified: trunk/SalesTypes.php
===================================================================
--- trunk/SalesTypes.php 2012-08-24 11:13:04 UTC (rev 9549)
+++ trunk/SalesTypes.php 2012-08-24 13:33:46 UTC (rev 9550)
@@ -190,17 +190,11 @@
$k=1;
}
- printf('<td>%s</td>
- <td>%s</td>
- <td><a href="%sSelectedType=%s">' . _('Edit') . '</td>
- <td><a href="%sSelectedType=%s&delete=yes" onclick=\'return confirm("' . _('Are you sure you wish to delete this price list and all the prices it may have set up?') . '");\'>' . _('Delete') . '</td>
- </tr>',
- $myrow['typeabbrev'],
- $myrow['sales_type'],
- htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?',
- $myrow['typeabbrev'],
- htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?',
- $myrow['typeabbrev']);
+ echo '<td>' . $myrow['typeabbrev'] . '</td>
+ <td>' . $myrow['sales_type'] . '</td>
+ <td>' . InternalLink('', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?SelectedType=' . $myrow['typeabbrev'], _('Edit')) . '</td>
+ <td>' . InternalLink('', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?SelectedType=' . $myrow['typeabbrev'] . '&delete=yes', _('Delete')) . '</td>
+ </tr>';
}
//END WHILE LIST LOOP
echo '</table>';
@@ -209,7 +203,7 @@
//end of ifs and buts!
if (isset($SelectedType)) {
- echo '<p><div class="centre"><a href="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '">' . _('Show All Sales Types Defined') . '</a></div></p>';
+ echo '<div class="centre">' . InternalLink('', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8'), _('Show All Sales Types Defined')) . '</div>';
}
if (! isset($_GET['delete'])) {
Modified: trunk/SecurityTokens.php
===================================================================
--- trunk/SecurityTokens.php 2012-08-24 11:13:04 UTC (rev 9549)
+++ trunk/SecurityTokens.php 2012-08-24 13:33:46 UTC (rev 9550)
@@ -73,7 +73,7 @@
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') . '?SelectedToken=' . $myrow[0] . '&Action=edit">' . _('Edit') . '</a></td></tr>';
+ ' . InternalLink('', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?SelectedToken=' . $myrow[0] . '&Action=edit', _('Edit')) . '</td></tr>';
}
echo '</table><p></p>';
Modified: trunk/SelectAsset.php
===================================================================
--- trunk/SelectAsset.php 2012-08-24 11:13:04 UTC (rev 9549)
+++ trunk/SelectAsset.php 2012-08-24 13:33:46 UTC (rev 9550)
@@ -35,7 +35,7 @@
$result = DB_query($SQL, $db);
if (DB_num_rows($result) == 0) {
echo '<p><font size="4" color="red">' . _('Problem Report') . ':</font><br />' . _('There are no asset categories currently defined please use the link below to set them up');
- echo '<br /><a href="' . $rootpath . '/FixedAssetCategories.php">' . _('Define Asset Categories') . '</a></font></p>';
+ echo '<br />' . InternalLink($rootpath, 'FixedAssetCategories.php', _('Define Asset Categories')) . '</font></p>';
exit;
}
// end of showing search facilities
Modified: trunk/SelectCompletedOrder.php
===================================================================
--- trunk/SelectCompletedOrder.php 2012-08-24 11:13:04 UTC (rev 9549)
+++ trunk/SelectCompletedOrder.php 2012-08-24 13:33:46 UTC (rev 9550)
@@ -562,24 +562,15 @@
$FormatedOrderDate = ConvertSQLDate($myrow['orddate']);
$FormatedOrderValue = locale_money_format($myrow['ordervalue'],$myrow['currcode']);
- printf('<td><a href="%s">%s</a></td>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td class="number">%s</td>
- </tr>',
- $ViewPage,
- $myrow['orderno'],
- $myrow['name'],
- $myrow['brname'],
- $myrow['customerref'],
- $FormatedOrderDate,
- $FormatedDelDate,
- $myrow['deliverto'],
- $FormatedOrderValue);
+ echo '<td>' . InternalLink('', $ViewPage, $myrow['orderno']) . '</td>
+ <td>' . $myrow['name'] . '</td>
+ <td>' . $myrow['brname'] . '</td>
+ <td>' . $myrow['customerref'] . '</td>
+ <td>' . $FormatedOrderDate . '</td>
+ <td>' . $FormatedDelDate . '</td>
+ <td>' . $myrow['deliverto'] . '</td>
+ <td class="number">' . $FormatedOrderValue . '</td>
+ </tr>';
//end of page full new headings if
}
Modified: trunk/SelectContract.php
===================================================================
--- trunk/SelectContract.php 2012-08-24 11:13:04 UTC (rev 9549)
+++ trunk/SelectContract.php 2012-08-24 13:33:46 UTC (rev 9550)
@@ -62,8 +62,8 @@
echo '</select></td> ';
}
-echo '<td><button type="submit" name="SearchContracts">' . _('Search') . '</button></td>';
-echo '<td> <a href="' . $rootpath . '/Contracts.php">' . _('New Contract') . '</a></td></tr></table></p>';
+echo '<td><button type="submit" name="SearchContracts">' . _('Search') . '</button></td>
+ td> ' . InternalLink($rootpath, 'Contracts.php', _('New Contract')) . '</td></tr></table></p>';
//figure out the SQL required from the inputs available
@@ -162,22 +162,22 @@
$FormatedRequiredDate = ConvertSQLDate($myrow['requireddate']);
if ($myrow['status']==0 OR $myrow['status']==1){ //still setting up the contract
- echo '<td><a href="' . $ModifyPage . '">' . _('Modify') . '</a></td>';
+ echo '<td>' . InternalLink('', $ModifyPage, _('Modify')) . '</td>';
} else {
echo '<td>' . _('n/a') . '</td>';
}
if ($myrow['status']==1 OR $myrow['status']==2){ // quoted or ordered
- echo '<td><a href="' . $OrderModifyPage . '">' . $myrow['orderno'] . '</a></td>';
+ echo '<td>' . InternalLink('', $OrderModifyPage, $myrow['orderno']) . '</td>';
} else {
echo '<td>' . _('n/a') . '</td>';
}
if ($myrow['status']==2){ //the customer has accepted the quote but not completed contract yet
- echo '<td><a href="' . $IssueToWOPage . '">' . $myrow['wo'] . '</a></td>';
+ echo '<td>' . InternalLink('', $IssueToWOPage, $myrow['wo']) . '</td>';
} else {
echo '<td>' . _('n/a') . '</td>';
}
if ($myrow['status']==2 OR $myrow['status']==3){
- echo '<td><a href="' . $CostingPage . '">' . _('View') . '</a></td>';
+ echo '<td>' . InternalLink('', $CostingPage, _('View')) . '</td>';
} else {
echo '<td>' . _('n/a') . '</td>';
}
Modified: trunk/SelectCreditItems.php
===================================================================
--- trunk/SelectCreditItems.php 2012-08-24 11:13:04 UTC (rev 9549)
+++ trunk/SelectCreditItems.php 2012-08-24 13:33:46 UTC (rev 9550)
@@ -30,7 +30,7 @@
if (isset($_POST['ProcessCredit']) and !isset($_SESSION['CreditItems'.$identifier])){
prnMsg(_('This credit note has already been processed. Refreshing the page will not enter the credit note again') . '<br />' .
_('Please use the navigation links provided rather than using the browser back button and then having to refresh'),'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;
}
@@ -662,7 +662,7 @@
if ($LineItem->Controlled==0){
echo '<td><input type="text" class="number" name="Quantity_' . $LineItem->LineNumber . '" maxlength="6" size="6" value="' . locale_number_format($LineItem->Quantity, $LineItem->DecimalPlaces) . '" /></td>';
} else {
- echo '<td class="number"><a href="' . $rootpath . '/CreditItemsControlled.php?LineNo=' . $LineItem->LineNumber . '">' . $LineItem->Quantity . '</a>
+ echo '<td class="number">' . InternalLink($rootpath, 'CreditItemsControlled.php?LineNo=' . $LineItem->LineNumber, $LineItem->Quantity) . '
<input type="hidden" name="Quantity_' . $LineItem->LineNumber . '" value="' . $LineItem->Quantity . '" /></td>';
}
@@ -720,7 +720,7 @@
echo '<td class="number">' . $DisplayTaxAmount . '</td>
<td class="number">' . $DisplayGrossLineTotal . '</td>
- <td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?Delete=' . $LineItem->LineNumber . '" onclick="return confirm(\'' . _('Are you sure you wish to delete this line item from the credit note?') . '\');">' . _('Delete') . '</a></td>
+ <td>' . InternalLink('', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?Delete=' . $LineItem->LineNumber, _('Delete')) . '</td>
</tr>';
@@ -1998,13 +1998,13 @@
unset($_SESSION['CreditItems'.$identifier]);
echo prnMsg(_('Credit Note number') . ' ' . $CreditNo . ' ' . _('processed') , 'success');
- echo '<div class="centre"><a target="_blank" href="' . $rootpath . '/PrintCustTrans.php?FromTransNo=' . $CreditNo . '&InvOrCredit=Credit">' . _('Show this Credit Note on screen') . '</a><br />';
+ echo '<div class="centre">' . InternalLink($rootpath, 'PrintCustTrans.php?FromTransNo=' . $CreditNo . '&InvOrCredit=Credit', _('Show this Credit Note on screen')) . '<br />';
if ($_SESSION['InvoicePortraitFormat']==0){
- echo '<a href="' . $rootpath . '/PrintCustTrans.php?FromTransNo=' . $CreditNo . '&InvOrCredit=Credit&PrintPDF=True">' . _('Print this Credit Note') . '</a>';
+ echo InternalLink($rootpath, 'PrintCustTrans.php?FromTransNo=' . $CreditNo . '&InvOrCredit=Credit&PrintPDF=True', _('Print this Credit Note'));
} else {
- echo '<a href="' . $rootpath . '/PrintCustTransPortrait.php?FromTransNo=' . $CreditNo . '&InvOrCredit=Credit&PrintPDF=True">' . _('Print this Credit Note') . '</a>';
+ echo InternalLink($rootpath, 'PrintCustTransPortrait.php?FromTransNo=' . $CreditNo . '&InvOrCredit=Credit&PrintPDF=True', _('Print this Credit Note'));
}
- echo '<p><a href="' . $rootpath . '/SelectCreditItems.php">' . _('Enter Another Credit Note') . '</a></p></div>';
+ echo '<p>' . InternalLink($rootpath, 'SelectCreditItems.php', _('Enter Another Credit Note')) . '</p></div>';
} /*end of process credit note */
Modified: trunk/SelectGLAccount.php
===================================================================
--- trunk/SelectGLAccount.php 2012-08-24 11:13:04 UTC (rev 9549)
+++ trunk/SelectGLAccount.php 2012-08-24 13:33:46 UTC (rev 9550)
@@ -20,9 +20,11 @@
$AccountID = $_POST['Select'];
$_POST['Select'] = NULL;
- echo '<br /><div class="centre"><a href="' . $rootpath . '/GLAccounts.php?SelectedAccount=' . $AccountID . '">' . _('Edit Account') . '</a>';
- echo '<br /><a href="' . $rootpath . '/GLAccountInquiry.php?Account=' . $AccountID . '">' . _('Account Inquiry') . '</a>';
- echo '<br /><a href="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '">' . _('New Search') . '</a></div>';
+ echo '<br />
+ <div class="centre">
+ ' . InternalLink($rootpath, 'GLAccounts.php?SelectedAccount=' . $AccountID, _('Edit Account')) . '<br />
+ ' . InternalLink($rootpath, 'GLAccountInquiry.php?Account=' . $AccountID, _('Account Inquiry')) . '<br />
+ ' . InternalLink('', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8'), _('New Search')) . '</div>';
} elseif (isset($_POST['Search'])){
@@ -32,7 +34,7 @@
if ($_POST['Keywords']=='' and $_POST['GLCode']=='') {
$msg=_('At least one Account Name keyword OR an extract of an Account Code must be entered for the search');
} else {
- If (mb_strlen($_POST['Keywords'])>0) {
+ if (mb_strlen($_POST['Keywords'])>0) {
//insert wildcard characters in spaces
$SearchString = '%' . str_replace(' ', '%', $_POST['Keywords']) . '%';
Modified: trunk/SelectOrderItems.php
===================================================================
--- trunk/SelectOrderItems.php 2012-08-24 11:13:04 UTC (rev 9549)
+++ trunk/SelectOrderItems.php 2012-08-24 13:33:46 UTC (rev 9550)
@@ -1062,8 +1062,8 @@
if (isset($_POST['DeliveryDetails'])){
echo '<meta http-equiv="Refresh" content="0; url=' . $rootpath . '/DeliveryDetails.php?identifier='.$identifier . '">';
prnMsg(_('You should automatically be forwarded to the entry of the delivery details page') . '. ' . _('if this does not happen') . ' (' . _('if the browser does not support META Refresh') . ') ' .
- '<a href="' . $rootpath . '/DeliveryDetails.php?identifier='.$identifier . '">' . _('click here') . '</a> ' . _('to continue'), 'info');
- exit;
+ InternalLink($rootpath, 'DeliveryDetails.php?identifier='.$identifier, _('click here')) . _('to continue'), 'info');
+ exit;
}
if (isset($NewItem)){
@@ -1255,7 +1255,7 @@
echo '<input type="hidden" name="POLine_' . $OrderLine->LineNumber . '" value="" />';
}
- echo '<td><a target="_blank" href="' . $rootpath . '/StockStatus.php?identifier='.$identifier . '&StockID=' . $OrderLine->StockID . '&DebtorNo=' . $_SESSION['Items'.$identifier]->DebtorNo . '">' . $OrderLine->StockID . '</a></td>
+ echo '<td>' . InternalLink($rootpath, 'StockStatus.php?identifier='.$identifier . '&StockID=' . $OrderLine->StockID . '&DebtorNo=' . $_SESSION['Items'.$identifier]->DebtorNo, $OrderLine->StockID) . '</td>
<td title="'. $OrderLine->LongDescription . '">' . $OrderLine->ItemDescription . '</td>';
echo '<td><input class="number" tabindex="2" type="text" name="Quantity_' . $OrderLine->LineNumber . '" size="6" maxlength="6" value="' . locale_number_format($OrderLine->Quantity, $OrderLine->DecimalPlaces) . '" />';
@@ -1300,7 +1300,7 @@
echo '<td><input type="text" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" name="ItemDue_' . $OrderLine->LineNumber . '" size="10" maxlength="10" value="' . $LineDueDate . '" /></td>';
- echo '<td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?identifier='.$identifier . '&Delete=' . $OrderLine->LineNumber . '" onclick="return confirm(\'' . _('Are You Sure?') . '\');">' . $RemTxt . '</a></td>
+ echo '<td>' . InternalLink('', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?identifier='.$identifier . '&Delete=' . $OrderLine->LineNumber, $RemTxt) . '</td>
<td>' . $LineComments . '</td></tr>';
if ($_SESSION['AllowOrderLineItemNarrative'] == 1){
Modified: trunk/css/silverwolf/images/sales.png
===================================================================
--- trunk/css/silverwolf/images/sales.png 2012-08-24 11:13:04 UTC (rev 9549)
+++ trunk/css/silverwolf/images/sales.png 2012-08-24 13:33:46 UTC (rev 9550)
@@ -1,10 +1,32 @@
\x89PNG
|
