Menu
▾
▴
[Web-erp-svn] SF.net SVN: web-erp:[4622] trunk
|
From: <dai...@us...> - 2011-07-03 04:33:28
|
Revision: 4622
http://web-erp.svn.sourceforge.net/web-erp/?rev=4622&view=rev
Author: daintree
Date: 2011-07-03 04:33:19 +0000 (Sun, 03 Jul 2011)
Log Message:
-----------
strtoupper to mb_strtoupper
Modified Paths:
--------------
trunk/AccountGroups.php
trunk/Areas.php
trunk/BOMExtendedQty.php
trunk/BOMIndented.php
trunk/BOMIndentedReverse.php
trunk/BOMInquiry.php
trunk/Contracts.php
trunk/CounterSales.php
trunk/Currencies.php
trunk/CustomerBranches.php
trunk/CustomerTypes.php
trunk/Customers.php
trunk/DiscountCategories.php
trunk/Factors.php
trunk/FixedAssetCategories.php
trunk/FixedAssetDepreciation.php
trunk/FixedAssetItems.php
trunk/GetStockImage.php
trunk/Locations.php
trunk/MRPCalendar.php
trunk/MRPDemandTypes.php
trunk/MRPDemands.php
trunk/MRPReport.php
trunk/Numbers/Words/lang.dk.php
trunk/Numbers/Words/lang.en_GB.php
trunk/Numbers/Words/lang.en_US.php
trunk/Numbers/Words/lang.es_AR.php
trunk/Numbers/Words/lang.he.php
trunk/Numbers/Words/lang.hu_HU.php
trunk/Numbers/Words/lang.pl.php
trunk/Numbers/Words/lang.pt_BR.php
trunk/Numbers/Words/lang.ru.php
trunk/POReport.php
trunk/PcAssignCashToTab.php
trunk/PcAuthorizeExpenses.php
trunk/PcClaimExpensesFromTab.php
trunk/PcExpenses.php
trunk/PcExpensesTypeTab.php
trunk/PcReportTab.php
trunk/PcTabs.php
trunk/PcTypeTabs.php
trunk/Prices.php
trunk/PrintCustStatements.php
trunk/PurchData.php
trunk/SalesCategories.php
trunk/SalesInquiry.php
trunk/SalesPeople.php
trunk/SalesTypes.php
trunk/SelectAsset.php
trunk/SelectCustomer.php
trunk/SelectOrderItems.php
trunk/SelectProduct.php
trunk/SelectSalesOrder.php
trunk/SelectSupplier.php
trunk/SelectWorkOrder.php
trunk/SpecialOrder.php
trunk/StockAdjustments.php
trunk/StockCategories.php
trunk/StockCostUpdate.php
trunk/StockLocMovements.php
trunk/StockLocStatus.php
trunk/StockLocTransfer.php
trunk/StockMovements.php
trunk/StockQuantityByDate.php
trunk/StockReorderLevel.php
trunk/StockSerialItems.php
trunk/StockStatus.php
trunk/StockTransfers.php
trunk/StockUsage.php
trunk/StockUsageGraph.php
trunk/Stocks.php
trunk/SupplierTypes.php
trunk/Suppliers.php
trunk/WhereUsedInquiry.php
trunk/WorkOrderEntry.php
trunk/WorkOrderIssue.php
trunk/Z_ChangeStockCategory.php
trunk/Z_ChangeStockCode.php
trunk/Z_ImportFixedAssets.php
trunk/Z_ImportStocks.php
trunk/Z_MakeNewCompany.php
trunk/Z_poAddLanguage.php
trunk/doc/Change.log
trunk/includes/DefineCartClass.php
trunk/includes/MiscFunctions.php
trunk/includes/htmlMimeMail.php
trunk/includes/mimePart.php
trunk/includes/tcpdf/2dbarcodes.php
trunk/includes/tcpdf/barcodes.php
trunk/includes/tcpdf/tcpdf.php
trunk/reportwriter/WriteForm.inc
trunk/reportwriter/admin/RCFunctions.inc
Modified: trunk/AccountGroups.php
===================================================================
--- trunk/AccountGroups.php 2011-07-03 03:35:49 UTC (rev 4621)
+++ trunk/AccountGroups.php 2011-07-03 04:33:19 UTC (rev 4622)
@@ -262,7 +262,7 @@
<td>' . $PandLText . '</td>
<td>' . $myrow[4] . '</td>';
echo '<td><a href="' . $_SERVER['PHP_SELF'] . '?SelectedAccountGroup=' . htmlentities($myrow[0], ENT_QUOTES,'UTF-8') . '">' . _('Edit') . '</a></td>';
- echo '<td><a href="' . $_SERVER['PHP_SELF'] . '?SelectedAccountGroup=' . htmlentities($myrow[0], ENT_QUOTES,'UTF-8') . '&delete=1">' . _('Delete') .'</a></td></tr>';
+ echo '<td><a href="' . $_SERVER['PHP_SELF'] . '?SelectedAccountGroup=' . htmlentities($myrow[0], ENT_QUOTES,'UTF-8') . '&delete=1" onclick="return confirm(\'' . _('Are you sure you wish to delete this account group?') . '\');">' . _('Delete') .'</a></td></tr>';
} //END WHILE LIST LOOP
echo '</table>';
Modified: trunk/Areas.php
===================================================================
--- trunk/Areas.php 2011-07-03 03:35:49 UTC (rev 4621)
+++ trunk/Areas.php 2011-07-03 04:33:19 UTC (rev 4622)
@@ -10,9 +10,9 @@
if (isset($_GET['SelectedArea'])){
- $SelectedArea = strtoupper($_GET['SelectedArea']);
+ $SelectedArea = mb_strtoupper($_GET['SelectedArea']);
} elseif (isset($_POST['SelectedArea'])){
- $SelectedArea = strtoupper($_POST['SelectedArea']);
+ $SelectedArea = mb_strtoupper($_POST['SelectedArea']);
}
if (isset($Errors)) {
@@ -30,7 +30,7 @@
ie the page has called itself with some user input */
//first off validate inputs sensible
- $_POST['AreaCode'] = strtoupper($_POST['AreaCode']);
+ $_POST['AreaCode'] = mb_strtoupper($_POST['AreaCode']);
$sql = "SELECT count(areacode) from areas WHERE areacode='".$_POST['AreaCode']."'";
$result = DB_query($sql, $db);
$myrow = DB_fetch_row($result);
Modified: trunk/BOMExtendedQty.php
===================================================================
--- trunk/BOMExtendedQty.php 2011-07-03 03:35:49 UTC (rev 4621)
+++ trunk/BOMExtendedQty.php 2011-07-03 04:33:19 UTC (rev 4622)
@@ -303,7 +303,7 @@
$YPos -=$line_height;
$pdf->addTextWrap($Left_Margin,$YPos,300,$FontSize,_('Extended Quantity BOM Listing For ')
- . strtoupper($_POST['Part']));
+ . mb_strtoupper($_POST['Part']));
$pdf->addTextWrap($Page_Width-$Right_Margin-140,$YPos,160,$FontSize,_('Printed') . ': ' .
Date($_SESSION['DefaultDateFormat']) . ' ' . _('Page') . ' ' . $PageNumber,'left');
$YPos -=$line_height;
Modified: trunk/BOMIndented.php
===================================================================
--- trunk/BOMIndented.php 2011-07-03 03:35:49 UTC (rev 4621)
+++ trunk/BOMIndented.php 2011-07-03 04:33:19 UTC (rev 4622)
@@ -315,7 +315,7 @@
$YPos =$YPos - (2*$line_height);
$pdf->addTextWrap($Left_Margin+1,$YPos,40,$FontSize,_('Assembly:'),'',0);
- $pdf->addTextWrap(85,$YPos,100,$FontSize,strtoupper($_POST['Part']),'',0);
+ $pdf->addTextWrap(85,$YPos,100,$FontSize,mb_strtoupper($_POST['Part']),'',0);
$pdf->addTextWrap(185,$YPos,150,$FontSize,$assemblydesc,'',0);
$YPos -=(2*$line_height);
$Xpos = $Left_Margin+5;
Modified: trunk/BOMIndentedReverse.php
===================================================================
--- trunk/BOMIndentedReverse.php 2011-07-03 03:35:49 UTC (rev 4621)
+++ trunk/BOMIndentedReverse.php 2011-07-03 04:33:19 UTC (rev 4622)
@@ -291,7 +291,7 @@
$YPos =$YPos - $line_height;
$pdf->addTextWrap($Left_Margin+1,$YPos,60,$FontSize,_('Component:'),'',0);
- $pdf->addTextWrap(100,$YPos,100,$FontSize,strtoupper($_POST['Part']),'',0);
+ $pdf->addTextWrap(100,$YPos,100,$FontSize,mb_strtoupper($_POST['Part']),'',0);
$pdf->addTextWrap(200,$YPos,150,$FontSize,$assemblydesc,'',0);
$YPos -=(2*$line_height);
$Xpos = $Left_Margin+5;
Modified: trunk/BOMInquiry.php
===================================================================
--- trunk/BOMInquiry.php 2011-07-03 03:35:49 UTC (rev 4621)
+++ trunk/BOMInquiry.php 2011-07-03 04:33:19 UTC (rev 4622)
@@ -7,9 +7,9 @@
include('includes/header.inc');
if (isset($_GET['StockID'])){
- $StockID =trim(strtoupper($_GET['StockID']));
+ $StockID =trim(mb_strtoupper($_GET['StockID']));
} elseif (isset($_POST['StockID'])){
- $StockID =trim(strtoupper($_POST['StockID']));
+ $StockID =trim(mb_strtoupper($_POST['StockID']));
}
if (!isset($_POST['StockID'])) {
Modified: trunk/Contracts.php
===================================================================
--- trunk/Contracts.php 2011-07-03 03:35:49 UTC (rev 4621)
+++ trunk/Contracts.php 2011-07-03 04:33:19 UTC (rev 4622)
@@ -107,7 +107,7 @@
$filename = $_SESSION['part_pics_dir'] . '/' . $_SESSION['Contract'.$identifier]->ContractRef . '.jpg';
//But check for the worst
- if (strtoupper(mb_substr(trim($_FILES['Drawing']['name']),mb_strlen($_FILES['Drawing']['name'])-3))!='JPG'){
+ if (mb_strtoupper(mb_substr(trim($_FILES['Drawing']['name']),mb_strlen($_FILES['Drawing']['name'])-3))!='JPG'){
prnMsg(_('Only jpg files are supported - a file extension of .jpg is expected'),'warn');
$UploadTheFile ='No';
} elseif ( $_FILES['Drawing']['size'] > ($_SESSION['MaxImageSize']*1024)) { //File Size Check
@@ -611,7 +611,7 @@
} else {
if (mb_strlen($_POST['CustKeywords'])>0) {
//insert wildcard characters in spaces
- $_POST['CustKeywords'] = strtoupper(trim($_POST['CustKeywords']));
+ $_POST['CustKeywords'] = mb_strtoupper(trim($_POST['CustKeywords']));
$SearchString = '%' . str_replace(' ', '%', $_POST['CustKeywords']) . '%';
$SQL = "SELECT custbranch.brname,
@@ -630,7 +630,7 @@
} elseif (mb_strlen($_POST['CustCode'])>0){
- $_POST['CustCode'] = strtoupper(trim($_POST['CustCode']));
+ $_POST['CustCode'] = mb_strtoupper(trim($_POST['CustCode']));
$SQL = "SELECT custbranch.brname,
custbranch.contactname,
Modified: trunk/CounterSales.php
===================================================================
--- trunk/CounterSales.php 2011-07-03 03:35:49 UTC (rev 4621)
+++ trunk/CounterSales.php 2011-07-03 04:33:19 UTC (rev 4622)
@@ -223,7 +223,7 @@
}
if (isset($_POST['Keywords']) AND mb_strlen($_POST['Keywords'])>0) {
//insert wildcard characters in spaces
- $_POST['Keywords'] = strtoupper($_POST['Keywords']);
+ $_POST['Keywords'] = mb_strtoupper($_POST['Keywords']);
$SearchString = '%' . str_replace(' ', '%', $_POST['Keywords']) . '%';
if ($_POST['StockCat']=='All'){
@@ -256,7 +256,7 @@
} else if (mb_strlen($_POST['StockCode'])>0){
- $_POST['StockCode'] = strtoupper($_POST['StockCode']);
+ $_POST['StockCode'] = mb_strtoupper($_POST['StockCode']);
$SearchString = '%' . $_POST['StockCode'] . '%';
if ($_POST['StockCat']=='All'){
@@ -382,7 +382,7 @@
$i++;
if (isset($_POST[$QuickEntryCode])) {
- $NewItem = strtoupper($_POST[$QuickEntryCode]);
+ $NewItem = mb_strtoupper($_POST[$QuickEntryCode]);
}
if (isset($_POST[$QuickEntryQty])) {
$NewItemQty = $_POST[$QuickEntryQty];
Modified: trunk/Currencies.php
===================================================================
--- trunk/Currencies.php 2011-07-03 03:35:49 UTC (rev 4621)
+++ trunk/Currencies.php 2011-07-03 04:33:19 UTC (rev 4622)
@@ -237,7 +237,7 @@
$k++;
}
// Lets show the country flag
- $ImageFile = 'flags/' . strtoupper($myrow[1]) . '.gif';
+ $ImageFile = 'flags/' . mb_strtoupper($myrow[1]) . '.gif';
if(!file_exists($ImageFile)){
$ImageFile = 'flags/blank.gif';
Modified: trunk/CustomerBranches.php
===================================================================
--- trunk/CustomerBranches.php 2011-07-03 03:35:49 UTC (rev 4621)
+++ trunk/CustomerBranches.php 2011-07-03 04:33:19 UTC (rev 4622)
@@ -7,9 +7,9 @@
include('includes/header.inc');
if (isset($_GET['DebtorNo'])) {
- $DebtorNo = strtoupper($_GET['DebtorNo']);
+ $DebtorNo = mb_strtoupper($_GET['DebtorNo']);
} else if (isset($_POST['DebtorNo'])){
- $DebtorNo = strtoupper($_POST['DebtorNo']);
+ $DebtorNo = mb_strtoupper($_POST['DebtorNo']);
}
if (!isset($DebtorNo)) {
@@ -22,9 +22,9 @@
if (isset($_GET['SelectedBranch'])){
- $SelectedBranch = strtoupper($_GET['SelectedBranch']);
+ $SelectedBranch = mb_strtoupper($_GET['SelectedBranch']);
} else if (isset($_POST['SelectedBranch'])){
- $SelectedBranch = strtoupper($_POST['SelectedBranch']);
+ $SelectedBranch = mb_strtoupper($_POST['SelectedBranch']);
}
if (isset($Errors)) {
@@ -44,7 +44,7 @@
//first off validate inputs sensible
- $_POST['BranchCode'] = strtoupper($_POST['BranchCode']);
+ $_POST['BranchCode'] = mb_strtoupper($_POST['BranchCode']);
if (ContainsIllegalCharacters($_POST['BranchCode']) OR strstr($_POST['BranchCode'],' ')) {
$InputError = 1;
Modified: trunk/CustomerTypes.php
===================================================================
--- trunk/CustomerTypes.php 2011-07-03 03:35:49 UTC (rev 4621)
+++ trunk/CustomerTypes.php 2011-07-03 04:33:19 UTC (rev 4622)
@@ -7,9 +7,9 @@
include('includes/header.inc');
if (isset($_POST['SelectedType'])){
- $SelectedType = strtoupper($_POST['SelectedType']);
+ $SelectedType = mb_strtoupper($_POST['SelectedType']);
} elseif (isset($_GET['SelectedType'])){
- $SelectedType = strtoupper($_GET['SelectedType']);
+ $SelectedType = mb_strtoupper($_GET['SelectedType']);
}
if (isset($Errors)) {
Modified: trunk/Customers.php
===================================================================
--- trunk/Customers.php 2011-07-03 03:35:49 UTC (rev 4621)
+++ trunk/Customers.php 2011-07-03 04:33:19 UTC (rev 4622)
@@ -29,7 +29,7 @@
//first off validate inputs sensible
- $_POST['DebtorNo'] = strtoupper($_POST['DebtorNo']);
+ $_POST['DebtorNo'] = mb_strtoupper($_POST['DebtorNo']);
$sql="SELECT COUNT(debtorno) FROM debtorsmaster WHERE debtorno='".$_POST['DebtorNo']."'";
$result=DB_query($sql,$db);
Modified: trunk/DiscountCategories.php
===================================================================
--- trunk/DiscountCategories.php 2011-07-03 03:35:49 UTC (rev 4621)
+++ trunk/DiscountCategories.php 2011-07-03 04:33:19 UTC (rev 4622)
@@ -31,7 +31,7 @@
FROM stockmaster
WHERE mbflag <>'K'
AND mbflag<>'D'
- AND stockid='" . strtoupper($_POST['StockID']) . "'",$db);
+ AND stockid='" . mb_strtoupper($_POST['StockID']) . "'",$db);
if (DB_num_rows($result)==0){
$InputError = 1;
prnMsg(_('The stock item entered must be set up as either a manufactured or purchased or assembly item'),'warn');
@@ -40,9 +40,9 @@
if ($InputError !=1) {
$sql = "UPDATE stockmaster SET discountcategory='" . $_POST['DiscountCategory'] . "'
- WHERE stockid='" . strtoupper($_POST['StockID']) . "'";
+ WHERE stockid='" . mb_strtoupper($_POST['StockID']) . "'";
- $result = DB_query($sql,$db, _('The discount category') . ' ' . $_POST['DiscountCategory'] . ' ' . _('record for') . ' ' . strtoupper($_POST['StockID']) . ' ' . _('could not be updated because'));
+ $result = DB_query($sql,$db, _('The discount category') . ' ' . $_POST['DiscountCategory'] . ' ' . _('record for') . ' ' . mb_strtoupper($_POST['StockID']) . ' ' . _('could not be updated because'));
prnMsg(_('The stock master has been updated with this discount category'),'success');
unset($_POST['DiscountCategory']);
@@ -53,7 +53,7 @@
} elseif (isset($_GET['Delete']) and $_GET['Delete']=='yes') {
/*the link to delete a selected record was clicked instead of the submit button */
- $sql="UPDATE stockmaster SET discountcategory='' WHERE stockid='" . trim(strtoupper($_GET['StockID'])) ."'";
+ $sql="UPDATE stockmaster SET discountcategory='' WHERE stockid='" . trim(mb_strtoupper($_GET['StockID'])) ."'";
$result = DB_query($sql,$db);
prnMsg( _('The stock master record has been updated to no discount category'),'success');
echo '<br />';
Modified: trunk/Factors.php
===================================================================
--- trunk/Factors.php 2011-07-03 03:35:49 UTC (rev 4621)
+++ trunk/Factors.php 2011-07-03 04:33:19 UTC (rev 4622)
@@ -9,10 +9,10 @@
include('includes/header.inc');
if (isset($_GET['FactorID'])){
- $FactorID = strtoupper($_GET['FactorID']);
+ $FactorID = mb_strtoupper($_GET['FactorID']);
$_POST['Amend']=True;
} elseif (isset($_POST['FactorID'])){
- $FactorID = strtoupper($_POST['FactorID']);
+ $FactorID = mb_strtoupper($_POST['FactorID']);
} else {
unset($FactorID);
}
Modified: trunk/FixedAssetCategories.php
===================================================================
--- trunk/FixedAssetCategories.php 2011-07-03 03:35:49 UTC (rev 4621)
+++ trunk/FixedAssetCategories.php 2011-07-03 04:33:19 UTC (rev 4622)
@@ -12,9 +12,9 @@
_('Fixed Asset Categories') . '" alt="" />' . ' ' . $title . '</p>';
if (isset($_GET['SelectedCategory'])){
- $SelectedCategory = strtoupper($_GET['SelectedCategory']);
+ $SelectedCategory = mb_strtoupper($_GET['SelectedCategory']);
} else if (isset($_POST['SelectedCategory'])){
- $SelectedCategory = strtoupper($_POST['SelectedCategory']);
+ $SelectedCategory = mb_strtoupper($_POST['SelectedCategory']);
}
if (isset($_POST['submit'])) {
@@ -27,7 +27,7 @@
//first off validate inputs sensible
- $_POST['CategoryID'] = strtoupper($_POST['CategoryID']);
+ $_POST['CategoryID'] = mb_strtoupper($_POST['CategoryID']);
if (mb_strlen($_POST['CategoryID']) > 6) {
$InputError = 1;
@@ -96,13 +96,12 @@
depnact,
disposalact,
accumdepnact)
- VALUES (
- '" . $_POST['CategoryID'] . "',
- '" . $_POST['CategoryDescription'] . "',
- '" . $_POST['CostAct'] . "',
- '" . $_POST['DepnAct'] . "',
- '" . $_POST['DisposalAct'] . "',
- '" . $_POST['AccumDepnAct'] . "')";
+ VALUES ('" . $_POST['CategoryID'] . "',
+ '" . $_POST['CategoryDescription'] . "',
+ '" . $_POST['CostAct'] . "',
+ '" . $_POST['DepnAct'] . "',
+ '" . $_POST['DisposalAct'] . "',
+ '" . $_POST['AccumDepnAct'] . "')";
$ErrMsg = _('Could not insert the new fixed asset category') . $_POST['CategoryDescription'] . _('because');
$result = DB_query($sql,$db,$ErrMsg);
prnMsg(_('A new fixed asset category record has been added for') . ' ' . $_POST['CategoryDescription'],'success');
@@ -144,22 +143,25 @@
links to delete or edit each. These will call the same page again and allow update/input
or deletion of the records*/
- $sql = 'SELECT categoryid,
+ $sql = "SELECT categoryid,
categorydescription,
costact,
depnact,
disposalact,
accumdepnact
- FROM fixedassetcategories';
+ FROM fixedassetcategories";
$result = DB_query($sql,$db);
- echo '<br /><table class=selection>';
- echo '<tr><th>' . _('Cat Code') . '</th>
+ echo '<br />
+ <table class="selection">';
+ echo '<tr>
+ <th>' . _('Cat Code') . '</th>
<th>' . _('Description') . '</th>
<th>' . _('Cost GL') . '</th>
<th>' . _('P & L Depn GL') . '</th>
<th>' . _('Disposal GL') . '</th>
- <th>' . _('Accum Depn GL') . '</th></tr>';
+ <th>' . _('Accum Depn GL') . '</th>
+ </tr>';
$k=0; //row colour counter
@@ -178,7 +180,7 @@
<td class="number">%s</td>
<td class="number">%s</td>
<td><a href="%sSelectedCategory=%s">' . _('Edit') . '</td>
- <td><a href="%sSelectedCategory=%s&delete=yes" onclick="return confirm("' . _('Are you sure you wish to delete this fixed asset category? Additional checks will be performed before actual deletion to ensure data integrity is not compromised.') . '");">' . _('Delete') . '</td>
+ <td><a href="%sSelectedCategory=%s&delete=yes" onclick="return confirm(\'' . _('Are you sure you wish to delete this fixed asset category? Additional checks will be performed before actual deletion to ensure data integrity is not compromised.') . '\');">' . _('Delete') . '</td>
</tr>',
$myrow['categoryid'],
$myrow['categorydescription'],
@@ -186,9 +188,9 @@
$myrow['depnact'],
$myrow['disposalact'],
$myrow['accumdepnact'],
- $_SERVER['PHP_SELF'] . '?' . SID,
+ $_SERVER['PHP_SELF'] . '?',
$myrow['categoryid'],
- $_SERVER['PHP_SELF'] . '?' . SID,
+ $_SERVER['PHP_SELF'] . '?',
$myrow['categoryid']);
}
//END WHILE LIST LOOP
@@ -201,7 +203,7 @@
echo '<br /><div class="centre"><a href="' . $_SERVER['PHP_SELF'] . '">' ._('Show All Fixed Asset Categories') . '</a></div>';
}
-echo '<form name="CategoryForm" method="post" action="' . $_SERVER['PHP_SELF'] . '?' . SID . '">';
+echo '<form name="CategoryForm" method="post" action="' . $_SERVER['PHP_SELF'] . '">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
if (isset($SelectedCategory) and !isset($_POST['submit'])) {
@@ -238,23 +240,21 @@
}
//SQL to poulate account selection boxes
-$sql = 'SELECT accountcode,
+$sql = "SELECT accountcode,
accountname
- FROM chartmaster,
- accountgroups
- WHERE chartmaster.group_=accountgroups.groupname and
- accountgroups.pandl=0
- ORDER BY accountcode';
+ FROM chartmaster INNER JOIN accountgroups
+ ON chartmaster.group_=accountgroups.groupname
+ WHERE accountgroups.pandl=0
+ ORDER BY accountcode";
$BSAccountsResult = DB_query($sql,$db);
-$sql = 'SELECT accountcode,
+$sql = "SELECT accountcode,
accountname
- FROM chartmaster,
- accountgroups
- WHERE chartmaster.group_=accountgroups.groupname and
- accountgroups.pandl!=0
- ORDER BY accountcode';
+ FROM chartmaster INNER JOIN accountgroups
+ ON chartmaster.group_=accountgroups.groupname
+ WHERE accountgroups.pandl!=0
+ ORDER BY accountcode";
$PnLAccountsResult = DB_query($sql,$db);
Modified: trunk/FixedAssetDepreciation.php
===================================================================
--- trunk/FixedAssetDepreciation.php 2011-07-03 03:35:49 UTC (rev 4621)
+++ trunk/FixedAssetDepreciation.php 2011-07-03 04:33:19 UTC (rev 4622)
@@ -9,13 +9,13 @@
/*Get the last period depreciation (depn is transtype =44) was posted for */
-$result = DB_query('SELECT periods.lastdate_in_period,
+$result = DB_query("SELECT periods.lastdate_in_period,
max(fixedassettrans.periodno)
FROM fixedassettrans INNER JOIN periods
ON fixedassettrans.periodno=periods.periodno
WHERE transtype=44
GROUP BY periods.lastdate_in_period
- ORDER BY periods.lastdate_in_period DESC',$db);
+ ORDER BY periods.lastdate_in_period DESC",$db);
$LastDepnRun = DB_fetch_row($result);
@@ -65,7 +65,7 @@
fixedassetcategories.accumdepnact,
fixedassetcategories.depnact,
fixedassetcategories.categorydescription
-ORDER BY assetcategoryid, assetid";
+ ORDER BY assetcategoryid, assetid";
$AssetsResult=DB_query($sql, $db);
$InputError = false; //always hope for the best
@@ -104,11 +104,11 @@
if ($AssetCategoryDescription != $AssetRow['categorydescription'] OR $AssetCategoryDescription =='0'){
if ($AssetCategoryDescription !='0'){ //then print totals
echo '<tr><th colspan=3 align="right">' . _('Total for') . ' ' . $AssetCategoryDescription . ' </th>
- <th class="number">' . number_format($TotalCategoryCost,2) . '</th>
- <th class="number">' . number_format($TotalCategoryAccumDepn,2) . '</th>
- <th class="number">' . number_format(($TotalCategoryCost-$TotalCategoryAccumDepn),2) . '</th>
+ <th class="number">' . number_format($TotalCategoryCost,$_SESSION['CompanyRecord']['decimalplaces']) . '</th>
+ <th class="number">' . number_format($TotalCategoryAccumDepn,$_SESSION['CompanyRecord']['decimalplaces']) . '</th>
+ <th class="number">' . number_format(($TotalCategoryCost-$TotalCategoryAccumDepn),$_SESSION['CompanyRecord']['decimalplaces']) . '</th>
<th colspan=2></th>
- <th class="number">' . number_format($TotalCategoryDepn,2) . '</th>
+ <th class="number">' . number_format($TotalCategoryDepn,$_SESSION['CompanyRecord']['decimalplaces']) . '</th>
</tr>';
}
echo '<tr><th colspan=9 align="left">' . $AssetRow['categorydescription'] . '</th></tr>';
@@ -147,12 +147,12 @@
echo '<td>' . $AssetRow['assetid'] . '</td>
<td>' . $AssetRow['description'] . '</td>
<td>' . ConvertSQLDate($AssetRow['datepurchased']) . '</td>
- <td class="number">' . number_format($AssetRow['costtotal'],2) . '</td>
- <td class="number">' . number_format($AssetRow['depnbfwd'],2) . '</td>
- <td class="number">' . number_format($AssetRow['costtotal']-$AssetRow['depnbfwd'],2) . '</td>
+ <td class="number">' . number_format($AssetRow['costtotal'],$_SESSION['CompanyRecord']['decimalplaces']) . '</td>
+ <td class="number">' . number_format($AssetRow['depnbfwd'],$_SESSION['CompanyRecord']['decimalplaces']) . '</td>
+ <td class="number">' . number_format($AssetRow['costtotal']-$AssetRow['depnbfwd'],$_SESSION['CompanyRecord']['decimalplaces']) . '</td>
<td align="center">' . $DepreciationType . '</td>
<td class="number">' . $AssetRow['depnrate'] . '</td>
- <td class="number">' . number_format($NewDepreciation ,2) . '</td>
+ <td class="number">' . number_format($NewDepreciation ,$_SESSION['CompanyRecord']['decimalplaces']) . '</td>
</tr>';
$TotalCategoryCost +=$AssetRow['costtotal'];
$TotalCategoryAccumDepn +=$AssetRow['depnbfwd'];
@@ -227,18 +227,18 @@
} //end if Committing the depreciation to DB
} //end loop around the assets to calculate depreciation for
echo '<tr><th colspan=3 align="right">' . _('Total for') . ' ' . $AssetCategoryDescription . ' </th>
- <th class="number">' . number_format($TotalCategoryCost,2) . '</th>
- <th class="number">' . number_format($TotalCategoryAccumDepn,2) . '</th>
- <th class="number">' . number_format(($TotalCategoryCost-$TotalCategoryAccumDepn),2) . '</th>
+ <th class="number">' . number_format($TotalCategoryCost,$_SESSION['CompanyRecord']['decimalplaces']) . '</th>
+ <th class="number">' . number_format($TotalCategoryAccumDepn,$_SESSION['CompanyRecord']['decimalplaces']) . '</th>
+ <th class="number">' . number_format(($TotalCategoryCost-$TotalCategoryAccumDepn),$_SESSION['CompanyRecord']['decimalplaces']) . '</th>
<th colspan=2></th>
- <th class="number">' . number_format($TotalCategoryDepn,2) . '</th>
+ <th class="number">' . number_format($TotalCategoryDepn,$_SESSION['CompanyRecord']['decimalplaces']) . '</th>
</tr>';
echo '<tr><th colspan=3 align="right">' . _('GRAND Total') . ' </th>
- <th class="number">' . number_format($TotalCost,2) . '</th>
- <th class="number">' . number_format($TotalAccumDepn,2) . '</th>
- <th class="number">' . number_format(($TotalCost-$TotalAccumDepn),2) . '</th>
+ <th class="number">' . number_format($TotalCost,$_SESSION['CompanyRecord']['decimalplaces']) . '</th>
+ <th class="number">' . number_format($TotalAccumDepn,$_SESSION['CompanyRecord']['decimalplaces']) . '</th>
+ <th class="number">' . number_format(($TotalCost-$TotalAccumDepn),$_SESSION['CompanyRecord']['decimalplaces']) . '</th>
<th colspan=2></th>
- <th class="number">' . number_format($TotalDepn,2) . '</th>
+ <th class="number">' . number_format($TotalDepn,$_SESSION['CompanyRecord']['decimalplaces']) . '</th>
</tr>';
echo '</table><hr><p></p>';
@@ -247,11 +247,11 @@
$result = DB_Txn_Commit($db);
prnMsg(_('Depreciation') . ' ' . $TransNo . ' ' . _('has been successfully entered'),'success');
unset($_POST['ProcessDate']);
- echo '<br /><a href="index.php' . '?' . SID . '">' ._('Return to main menu').'</a>';
+ echo '<br /><a href="index.php">' ._('Return to main menu').'</a>';
/*And post the journal too */
include ('includes/GLPostings.inc');
} else {
- echo '<form action=' . $_SERVER['PHP_SELF'] . '?' . SID . ' method=post name="form">';
+ echo '<form action=' . $_SERVER['PHP_SELF'] . ' method=post name="form">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<p></p>';
echo '<table class=selection width=30%><tr></tr><tr>';
Modified: trunk/FixedAssetItems.php
===================================================================
--- trunk/FixedAssetItems.php 2011-07-03 03:35:49 UTC (rev 4621)
+++ trunk/FixedAssetItems.php 2011-07-03 04:33:19 UTC (rev 4622)
@@ -30,7 +30,7 @@
$filename = $_SESSION['part_pics_dir'] . '/ASSET_' . $AssetID . '.jpg';
//But check for the worst
- if (strtoupper(mb_substr(trim($_FILES['ItemPicture']['name']),mb_strlen($_FILES['ItemPicture']['name'])-3))!='JPG'){
+ if (mb_strtoupper(mb_substr(trim($_FILES['ItemPicture']['name']),mb_strlen($_FILES['ItemPicture']['name'])-3))!='JPG'){
prnMsg(_('Only jpg files are supported - a file extension of .jpg is expected'),'warn');
$UploadTheFile ='No';
} elseif ( $_FILES['ItemPicture']['size'] > ($_SESSION['MaxImageSize']*1024)) { //File Size Check
Modified: trunk/GetStockImage.php
===================================================================
--- trunk/GetStockImage.php 2011-07-03 03:35:49 UTC (rev 4621)
+++ trunk/GetStockImage.php 2011-07-03 04:33:19 UTC (rev 4622)
@@ -68,7 +68,7 @@
}
$filepath = $_SESSION['part_pics_dir'] . $pathsep;
-$stockid = trim(strtoupper($_GET['StockID']));
+$stockid = trim(mb_strtoupper($_GET['StockID']));
if( isset($_GET['bgcolor']) )
$bgcolor = $_GET['bgcolor'];
if( isset($_GET['textcolor']) )
Modified: trunk/Locations.php
===================================================================
--- trunk/Locations.php 2011-07-03 03:35:49 UTC (rev 4621)
+++ trunk/Locations.php 2011-07-03 04:33:19 UTC (rev 4622)
@@ -22,7 +22,7 @@
/* actions to take once the user has clicked the submit button
ie the page has called itself with some user input */
- $_POST['LocCode']=strtoupper($_POST['LocCode']);
+ $_POST['LocCode']=mb_strtoupper($_POST['LocCode']);
if( trim($_POST['LocCode']) == '' ) {
$InputError = 1;
prnMsg( _('The location code may not be empty'), 'error');
Modified: trunk/MRPCalendar.php
===================================================================
--- trunk/MRPCalendar.php 2011-07-03 03:35:49 UTC (rev 4621)
+++ trunk/MRPCalendar.php 2011-07-03 04:33:19 UTC (rev 4622)
@@ -11,9 +11,9 @@
if (isset($_POST['ChangeDate'])){
- $ChangeDate =trim(strtoupper($_POST['ChangeDate']));
+ $ChangeDate =trim(mb_strtoupper($_POST['ChangeDate']));
} elseif (isset($_GET['ChangeDate'])){
- $ChangeDate =trim(strtoupper($_GET['ChangeDate']));
+ $ChangeDate =trim(mb_strtoupper($_GET['ChangeDate']));
}
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/inventory.png" title="' .
Modified: trunk/MRPDemandTypes.php
===================================================================
--- trunk/MRPDemandTypes.php 2011-07-03 03:35:49 UTC (rev 4621)
+++ trunk/MRPDemandTypes.php 2011-07-03 04:33:19 UTC (rev 4622)
@@ -8,9 +8,9 @@
//SelectedDT is the Selected MRPDemandType
if (isset($_POST['SelectedDT'])){
- $SelectedDT = trim(strtoupper($_POST['SelectedDT']));
+ $SelectedDT = trim(mb_strtoupper($_POST['SelectedDT']));
} elseif (isset($_GET['SelectedDT'])){
- $SelectedDT = trim(strtoupper($_GET['SelectedDT']));
+ $SelectedDT = trim(mb_strtoupper($_GET['SelectedDT']));
}
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/inventory.png" title="' .
@@ -26,8 +26,8 @@
//first off validate inputs sensible
- if (trim(strtoupper($_POST['MRPDemandType']) == 'WO') or
- trim(strtoupper($_POST['MRPDemandType']) == 'SO')) {
+ if (trim(mb_strtoupper($_POST['MRPDemandType']) == 'WO') or
+ trim(mb_strtoupper($_POST['MRPDemandType']) == 'SO')) {
$InputError = 1;
prnMsg(_('The Demand Type is reserved for the system'),'error');
}
@@ -57,7 +57,7 @@
$sql = "INSERT INTO mrpdemandtypes (mrpdemandtype,
description)
- VALUES ('" . trim(strtoupper($_POST['MRPDemandType'])) . "',
+ VALUES ('" . trim(mb_strtoupper($_POST['MRPDemandType'])) . "',
'" . $_POST['Description'] . "'
)";
$msg = _('The new demand type has been added to the database');
Modified: trunk/MRPDemands.php
===================================================================
--- trunk/MRPDemands.php 2011-07-03 03:35:49 UTC (rev 4621)
+++ trunk/MRPDemands.php 2011-07-03 04:33:19 UTC (rev 4622)
@@ -18,9 +18,9 @@
}
if (isset($_POST['StockID'])){
- $StockID =trim(strtoupper($_POST['StockID']));
+ $StockID =trim(mb_strtoupper($_POST['StockID']));
} elseif (isset($_GET['StockID'])){
- $StockID =trim(strtoupper($_GET['StockID']));
+ $StockID =trim(mb_strtoupper($_GET['StockID']));
}
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/inventory.png" title="' .
@@ -191,7 +191,7 @@
if ($myrow[0]>0) {
//If $myrow[0] > 0, it means this is an edit, so do an update
$sql = "UPDATE mrpdemands SET quantity = '" . $_POST['Quantity'] . "',
- mrpdemandtype = '" . trim(strtoupper($_POST['MRPDemandtype'])) . "',
+ mrpdemandtype = '" . trim(mb_strtoupper($_POST['MRPDemandtype'])) . "',
duedate = '" . $FormatedDuedate . "'
WHERE demandid = '" . $DemandID . "'";
$msg = _("The MRP demand record has been updated for").' '.$StockID;
@@ -203,7 +203,7 @@
quantity,
duedate)
VALUES ('" . $StockID . "',
- '" . trim(strtoupper($_POST['MRPDemandtype'])) . "',
+ '" . trim(mb_strtoupper($_POST['MRPDemandtype'])) . "',
'" . $_POST['Quantity'] . "',
'" . $FormatedDuedate . "'
)";
Modified: trunk/MRPReport.php
===================================================================
--- trunk/MRPReport.php 2011-07-03 03:35:49 UTC (rev 4621)
+++ trunk/MRPReport.php 2011-07-03 04:33:19 UTC (rev 4622)
@@ -569,7 +569,7 @@
}
if ($_POST['Keywords']) {
//insert wildcard characters in spaces
- $_POST['Keywords'] = strtoupper($_POST['Keywords']);
+ $_POST['Keywords'] = mb_strtoupper($_POST['Keywords']);
$SearchString = '%' . str_replace(' ', '%', $_POST['Keywords']) . '%';
if ($_POST['StockCat'] == 'All') {
$SQL = "SELECT stockmaster.stockid,
@@ -608,7 +608,7 @@
ORDER BY stockmaster.stockid";
}
} elseif (isset($_POST['StockCode'])) {
- $_POST['StockCode'] = strtoupper($_POST['StockCode']);
+ $_POST['StockCode'] = mb_strtoupper($_POST['StockCode']);
if ($_POST['StockCat'] == 'All') {
$SQL = "SELECT stockmaster.stockid,
stockmaster.description,
Modified: trunk/Numbers/Words/lang.dk.php
===================================================================
--- trunk/Numbers/Words/lang.dk.php 2011-07-03 03:35:49 UTC (rev 4621)
+++ trunk/Numbers/Words/lang.dk.php 2011-07-03 04:33:19 UTC (rev 4622)
@@ -368,7 +368,7 @@
* @since Numbers_Words 0.4
*/
function toCurrencyWords($int_curr, $decimal, $fraction = false, $convert_fraction = true) {
- $int_curr = strtoupper($int_curr);
+ $int_curr = mb_strtoupper($int_curr);
if (!isset($this->_currency_names[$int_curr])) {
$int_curr = $this->def_currency;
}
Modified: trunk/Numbers/Words/lang.en_GB.php
===================================================================
--- trunk/Numbers/Words/lang.en_GB.php 2011-07-03 03:35:49 UTC (rev 4621)
+++ trunk/Numbers/Words/lang.en_GB.php 2011-07-03 04:33:19 UTC (rev 4622)
@@ -380,7 +380,7 @@
* @since Numbers_Words 0.13.1
*/
function toCurrencyWords($int_curr, $decimal, $fraction = false, $convert_fraction = true) {
- $int_curr = strtoupper($int_curr);
+ $int_curr = mb_strtoupper($int_curr);
if (!isset($this->_currency_names[$int_curr])) {
$int_curr = $this->def_currency;
}
Modified: trunk/Numbers/Words/lang.en_US.php
===================================================================
--- trunk/Numbers/Words/lang.en_US.php 2011-07-03 03:35:49 UTC (rev 4621)
+++ trunk/Numbers/Words/lang.en_US.php 2011-07-03 04:33:19 UTC (rev 4622)
@@ -472,7 +472,7 @@
* @since Numbers_Words 0.4
*/
function toCurrencyWords($int_curr, $decimal, $fraction = false, $convert_fraction = true) {
- $int_curr = strtoupper($int_curr);
+ $int_curr = mb_strtoupper($int_curr);
if (!isset($this->_currency_names[$int_curr])) {
$int_curr = $this->def_currency;
}
Modified: trunk/Numbers/Words/lang.es_AR.php
===================================================================
--- trunk/Numbers/Words/lang.es_AR.php 2011-07-03 03:35:49 UTC (rev 4621)
+++ trunk/Numbers/Words/lang.es_AR.php 2011-07-03 04:33:19 UTC (rev 4622)
@@ -430,7 +430,7 @@
* @author Martin Marrese
*/
function toCurrencyWords($int_curr, $decimal, $fraction = false, $convert_fraction = true) {
- $int_curr = strtoupper($int_curr);
+ $int_curr = mb_strtoupper($int_curr);
if (!isset($this->_currency_names[$int_curr])) {
$int_curr = $this->def_currency;
}
Modified: trunk/Numbers/Words/lang.he.php
===================================================================
--- trunk/Numbers/Words/lang.he.php 2011-07-03 03:35:49 UTC (rev 4621)
+++ trunk/Numbers/Words/lang.he.php 2011-07-03 04:33:19 UTC (rev 4622)
@@ -462,7 +462,7 @@
* @since Numbers_Words 0.4
*/
function toCurrencyWords($int_curr, $decimal, $fraction = false, $convert_fraction = true) {
- $int_curr = strtoupper($int_curr);
+ $int_curr = mb_strtoupper($int_curr);
if (!isset($this->_currency_names[$int_curr])) {
$int_curr = $this->def_currency;
}
Modified: trunk/Numbers/Words/lang.hu_HU.php
===================================================================
--- trunk/Numbers/Words/lang.hu_HU.php 2011-07-03 03:35:49 UTC (rev 4621)
+++ trunk/Numbers/Words/lang.hu_HU.php 2011-07-03 04:33:19 UTC (rev 4622)
@@ -359,7 +359,7 @@
* @since Numbers_Words 0.4
*/
function toCurrencyWords($int_curr, $decimal, $fraction = false, $convert_fraction = true) {
- $int_curr = strtoupper($int_curr);
+ $int_curr = mb_strtoupper($int_curr);
if (!isset($this->_currency_names[$int_curr])) {
$int_curr = $this->def_currency;
}
Modified: trunk/Numbers/Words/lang.pl.php
===================================================================
--- trunk/Numbers/Words/lang.pl.php 2011-07-03 03:35:49 UTC (rev 4621)
+++ trunk/Numbers/Words/lang.pl.php 2011-07-03 04:33:19 UTC (rev 4622)
@@ -439,7 +439,7 @@
* @since Numbers_Words 0.4
*/
function toCurrencyWords($int_curr, $decimal, $fraction = false, $convert_fraction = true) {
- $int_curr = strtoupper($int_curr);
+ $int_curr = mb_strtoupper($int_curr);
if (!isset($this->_currency_names[$int_curr])) {
$int_curr = $this->def_currency;
}
Modified: trunk/Numbers/Words/lang.pt_BR.php
===================================================================
--- trunk/Numbers/Words/lang.pt_BR.php 2011-07-03 03:35:49 UTC (rev 4621)
+++ trunk/Numbers/Words/lang.pt_BR.php 2011-07-03 04:33:19 UTC (rev 4622)
@@ -279,7 +279,7 @@
* @since Numbers_Words 0.10.1
*/
function toCurrencyWords($int_curr, $decimal, $fraction = false, $convert_fraction = true) {
- $int_curr = strtoupper($int_curr);
+ $int_curr = mb_strtoupper($int_curr);
if (!isset($this->_currency_name[$int_curr])){
$int_curr = $this->def_currency;
}
Modified: trunk/Numbers/Words/lang.ru.php
===================================================================
--- trunk/Numbers/Words/lang.ru.php 2011-07-03 03:35:49 UTC (rev 4621)
+++ trunk/Numbers/Words/lang.ru.php 2011-07-03 04:33:19 UTC (rev 4622)
@@ -599,7 +599,7 @@
*/
function toCurrencyWords($int_curr, $decimal, $fraction = false, $convert_fraction = true)
{
- $int_curr = strtoupper($int_curr);
+ $int_curr = mb_strtoupper($int_curr);
if (!isset($this->_currency_names[$int_curr])) {
$int_curr = $this->def_currency;
}
Modified: trunk/POReport.php
===================================================================
--- trunk/POReport.php 2011-07-03 03:35:49 UTC (rev 4621)
+++ trunk/POReport.php 2011-07-03 04:33:19 UTC (rev 4622)
@@ -21,18 +21,18 @@
if (isset($_POST['submit']) or isset($_POST['submitcsv'])) {
if (isset($_POST['PartNumber'])){
- $PartNumber = trim(strtoupper($_POST['PartNumber']));
+ $PartNumber = trim(mb_strtoupper($_POST['PartNumber']));
} elseif (isset($_GET['PartNumber'])){
- $PartNumber = trim(strtoupper($_GET['PartNumber']));
+ $PartNumber = trim(mb_strtoupper($_GET['PartNumber']));
}
# Part Number operator - either LIKE or =
$PartNumberOp = $_POST['PartNumberOp'];
if (isset($_POST['SupplierId'])){
- $SupplierId = trim(strtoupper($_POST['SupplierId']));
+ $SupplierId = trim(mb_strtoupper($_POST['SupplierId']));
} elseif (isset($_GET['SupplierId'])){
- $SupplierId = trim(strtoupper($_GET['SupplierId']));
+ $SupplierId = trim(mb_strtoupper($_GET['SupplierId']));
}
$SupplierIdOp = $_POST['SupplierIdOp'];
@@ -45,9 +45,9 @@
}
if (isset($_POST['SupplierName'])){
- $SupplierName = trim(strtoupper($_POST['SupplierName']));
+ $SupplierName = trim(mb_strtoupper($_POST['SupplierName']));
} elseif (isset($_GET['SupplierName'])){
- $SupplierName = trim(strtoupper($_GET['SupplierName']));
+ $SupplierName = trim(mb_strtoupper($_GET['SupplierName']));
}
// Had to add supplierid to SummaryType when do summary by name because there could be several accounts
Modified: trunk/PcAssignCashToTab.php
===================================================================
--- trunk/PcAssignCashToTab.php 2011-07-03 03:35:49 UTC (rev 4621)
+++ trunk/PcAssignCashToTab.php 2011-07-03 04:33:19 UTC (rev 4622)
@@ -6,9 +6,9 @@
include('includes/header.inc');
if (isset($_POST['SelectedTabs'])){
- $SelectedTabs = strtoupper($_POST['SelectedTabs']);
+ $SelectedTabs = mb_strtoupper($_POST['SelectedTabs']);
} elseif (isset($_GET['SelectedTabs'])){
- $SelectedTabs = strtoupper($_GET['SelectedTabs']);
+ $SelectedTabs = mb_strtoupper($_GET['SelectedTabs']);
}
if (isset($_POST['SelectedIndex'])){
Modified: trunk/PcAuthorizeExpenses.php
===================================================================
--- trunk/PcAuthorizeExpenses.php 2011-07-03 03:35:49 UTC (rev 4621)
+++ trunk/PcAuthorizeExpenses.php 2011-07-03 04:33:19 UTC (rev 4622)
@@ -7,9 +7,9 @@
include('includes/SQL_CommonFunctions.inc');
if (isset($_POST['SelectedTabs'])){
- $SelectedTabs = strtoupper($_POST['SelectedTabs']);
+ $SelectedTabs = mb_strtoupper($_POST['SelectedTabs']);
} elseif (isset($_GET['SelectedTabs'])){
- $SelectedTabs = strtoupper($_GET['SelectedTabs']);
+ $SelectedTabs = mb_strtoupper($_GET['SelectedTabs']);
}
if (isset($_POST['SelectedIndex'])){
Modified: trunk/PcClaimExpensesFromTab.php
===================================================================
--- trunk/PcClaimExpensesFromTab.php 2011-07-03 03:35:49 UTC (rev 4621)
+++ trunk/PcClaimExpensesFromTab.php 2011-07-03 04:33:19 UTC (rev 4622)
@@ -8,9 +8,9 @@
if (isset($_POST['SelectedTabs'])){
- $SelectedTabs = strtoupper($_POST['SelectedTabs']);
+ $SelectedTabs = mb_strtoupper($_POST['SelectedTabs']);
} elseif (isset($_GET['SelectedTabs'])){
- $SelectedTabs = strtoupper($_GET['SelectedTabs']);
+ $SelectedTabs = mb_strtoupper($_GET['SelectedTabs']);
}
if (isset($_POST['SelectedIndex'])){
Modified: trunk/PcExpenses.php
===================================================================
--- trunk/PcExpenses.php 2011-07-03 03:35:49 UTC (rev 4621)
+++ trunk/PcExpenses.php 2011-07-03 04:33:19 UTC (rev 4622)
@@ -10,9 +10,9 @@
. '" alt="" />' . ' ' . $title . '</p>';
if (isset($_POST['SelectedExpense'])){
- $SelectedExpense = strtoupper($_POST['SelectedExpense']);
+ $SelectedExpense = mb_strtoupper($_POST['SelectedExpense']);
} elseif (isset($_GET['SelectedExpense'])){
- $SelectedExpense = strtoupper($_GET['SelectedExpense']);
+ $SelectedExpense = mb_strtoupper($_GET['SelectedExpense']);
}
if (isset($_POST['Cancel'])) {
Modified: trunk/PcExpensesTypeTab.php
===================================================================
--- trunk/PcExpensesTypeTab.php 2011-07-03 03:35:49 UTC (rev 4621)
+++ trunk/PcExpensesTypeTab.php 2011-07-03 04:33:19 UTC (rev 4622)
@@ -10,9 +10,9 @@
. '" alt="" />' . ' ' . $title . '</p>';
if (isset($_POST['SelectedType'])){
- $SelectedType = strtoupper($_POST['SelectedType']);
+ $SelectedType = mb_strtoupper($_POST['SelectedType']);
} elseif (isset($_GET['SelectedType'])){
- $SelectedType = strtoupper($_GET['SelectedType']);
+ $SelectedType = mb_strtoupper($_GET['SelectedType']);
} else {
$SelectedType='';
}
@@ -23,9 +23,9 @@
}
if (isset($_POST['SelectedTab'])){
- $SelectedTab = strtoupper($_POST['SelectedTab']);
+ $SelectedTab = mb_strtoupper($_POST['SelectedTab']);
} elseif (isset($_GET['SelectedTab'])){
- $SelectedTab = strtoupper($_GET['SelectedTab']);
+ $SelectedTab = mb_strtoupper($_GET['SelectedTab']);
}
if (isset($_POST['Cancel'])) {
Modified: trunk/PcReportTab.php
===================================================================
--- trunk/PcReportTab.php 2011-07-03 03:35:49 UTC (rev 4621)
+++ trunk/PcReportTab.php 2011-07-03 04:33:19 UTC (rev 4622)
@@ -8,9 +8,9 @@
$title = _('Petty Cash Management Report');
if (isset($_POST['SelectedTabs'])){
- $SelectedTabs = strtoupper($_POST['SelectedTabs']);
+ $SelectedTabs = mb_strtoupper($_POST['SelectedTabs']);
} elseif (isset($_GET['SelectedTabs'])){
- $SelectedTabs = strtoupper($_GET['SelectedTabs']);
+ $SelectedTabs = mb_strtoupper($_GET['SelectedTabs']);
}
if ((! isset($_POST['FromDate']) AND ! isset($_POST['ToDate'])) OR isset($_POST['SelectDifferentDate'])){
Modified: trunk/PcTabs.php
===================================================================
--- trunk/PcTabs.php 2011-07-03 03:35:49 UTC (rev 4621)
+++ trunk/PcTabs.php 2011-07-03 04:33:19 UTC (rev 4622)
@@ -9,9 +9,9 @@
. '" alt="" />' . ' ' . $title . '</p>';
if (isset($_POST['SelectedTab'])){
- $SelectedTab = strtoupper($_POST['SelectedTab']);
+ $SelectedTab = mb_strtoupper($_POST['SelectedTab']);
} elseif (isset($_GET['SelectedTab'])){
- $SelectedTab = strtoupper($_GET['SelectedTab']);
+ $SelectedTab = mb_strtoupper($_GET['SelectedTab']);
}
if (isset($_POST['Cancel'])) {
Modified: trunk/PcTypeTabs.php
===================================================================
--- trunk/PcTypeTabs.php 2011-07-03 03:35:49 UTC (rev 4621)
+++ trunk/PcTypeTabs.php 2011-07-03 04:33:19 UTC (rev 4622)
@@ -9,9 +9,9 @@
. '" alt="" />' . ' ' . $title . '</p>';
if (isset($_POST['SelectedTab'])){
- $SelectedTab = strtoupper($_POST['SelectedTab']);
+ $SelectedTab = mb_strtoupper($_POST['SelectedTab']);
} elseif (isset($_GET['SelectedTab'])){
- $SelectedTab = strtoupper($_GET['SelectedTab']);
+ $SelectedTab = mb_strtoupper($_GET['SelectedTab']);
}
if (isset($Errors)) {
Modified: trunk/Prices.php
===================================================================
--- trunk/Prices.php 2011-07-03 03:35:49 UTC (rev 4621)
+++ trunk/Prices.php 2011-07-03 04:33:19 UTC (rev 4622)
@@ -14,9 +14,9 @@
if (isset($_GET['Item'])){
- $Item = trim(strtoupper($_GET['Item']));
+ $Item = trim(mb_strtoupper($_GET['Item']));
}elseif (isset($_POST['Item'])){
- $Item = trim(strtoupper($_POST['Item']));
+ $Item = trim(mb_strtoupper($_POST['Item']));
}
if (!isset($_POST['TypeAbbrev']) OR $_POST['TypeAbbrev']==''){
Modified: trunk/PrintCustStatements.php
===================================================================
--- trunk/PrintCustStatements.php 2011-07-03 03:35:49 UTC (rev 4621)
+++ trunk/PrintCustStatements.php 2011-07-03 04:33:19 UTC (rev 4622)
@@ -33,12 +33,12 @@
}
If (isset($_POST['PrintPDF']) && isset($_POST['FromCust']) && $_POST['FromCust']!=''){
- $_POST['FromCust'] = strtoupper($_POST['FromCust']);
+ $_POST['FromCust'] = mb_strtoupper($_POST['FromCust']);
If (!isset($_POST['ToCust'])){
$_POST['ToCust'] = $_POST['FromCust'];
} else {
- $_POST['ToCust'] = strtoupper($_POST['ToCust']);
+ $_POST['ToCust'] = mb_strtoupper($_POST['ToCust']);
}
include('includes/PDFStarter.php');
$pdf->addInfo('Title', _('Customer Statements') );
Modified: trunk/PurchData.php
===================================================================
--- trunk/PurchData.php 2011-07-03 03:35:49 UTC (rev 4621)
+++ trunk/PurchData.php 2011-07-03 04:33:19 UTC (rev 4622)
@@ -8,15 +8,15 @@
include ('includes/header.inc');
if (isset($_GET['SupplierID'])) {
- $SupplierID = trim(strtoupper($_GET['SupplierID']));
+ $SupplierID = trim(mb_strtoupper($_GET['SupplierID']));
} elseif (isset($_POST['SupplierID'])) {
- $SupplierID = trim(strtoupper($_POST['SupplierID']));
+ $SupplierID = trim(mb_strtoupper($_POST['SupplierID']));
}
if (isset($_GET['StockID'])) {
- $StockID = trim(strtoupper($_GET['StockID']));
+ $StockID = trim(mb_strtoupper($_GET['StockID']));
} elseif (isset($_POST['StockID'])) {
- $StockID = trim(strtoupper($_POST['StockID']));
+ $StockID = trim(mb_strtoupper($_POST['StockID']));
}
if (isset($_POST['StockUOM'])) {
Modified: trunk/SalesCategories.php
===================================================================
--- trunk/SalesCategories.php 2011-07-03 03:35:49 UTC (rev 4621)
+++ trunk/SalesCategories.php 2011-07-03 04:33:19 UTC (rev 4622)
@@ -11,24 +11,24 @@
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/customer.png" title="' . _('Search') . '" alt="" />' . ' ' . $title . '</p>';
if (isset($_GET['SelectedCategory'])){
- $SelectedCategory = strtoupper($_GET['SelectedCategory']);
+ $SelectedCategory = mb_strtoupper($_GET['SelectedCategory']);
} else if (isset($_POST['SelectedCategory'])){
- $SelectedCategory = strtoupper($_POST['SelectedCategory']);
+ $SelectedCategory = mb_strtoupper($_POST['SelectedCategory']);
}
if (isset($_GET['ParentCategory'])){
- $ParentCategory = strtoupper($_GET['ParentCategory']);
+ $ParentCategory = mb_strtoupper($_GET['ParentCategory']);
} else if (isset($_POST['ParentCategory'])){
- $ParentCategory = strtoupper($_POST['ParentCategory']);
+ $ParentCategory = mb_strtoupper($_POST['ParentCategory']);
}
if( isset($ParentCategory) AND $ParentCategory == 0 ) {
unset($ParentCategory);
}
if (isset($_GET['EditName'])){
- $EditName = strtoupper($_GET['EditName']);
+ $EditName = mb_strtoupper($_GET['EditName']);
} else if (isset($_POST['EditName'])){
- $EditName = strtoupper($_POST['EditName']);
+ $EditName = mb_strtoupper($_POST['EditName']);
}
if (isset($SelectedCategory) AND isset($_FILES['ItemPicture']) AND $_FILES['ItemPicture']['name'] !='') {
@@ -39,7 +39,7 @@
$FileName = $_SESSION['part_pics_dir'] . '/cat_' . $SelectedCategory . '.jpg';
//But check for the worst
- if (strtoupper(mb_substr(trim($_FILES['ItemPicture']['name']),mb_strlen($_FILES['ItemPicture']['name'])-3))!='JPG'){
+ if (mb_strtoupper(mb_substr(trim($_FILES['ItemPicture']['name']),mb_strlen($_FILES['ItemPicture']['name'])-3))!='JPG'){
prnMsg(_('Only jpg files are supported - a file extension of .jpg is expected'),'warn');
$UploadTheFile ='No';
} elseif ( $_FILES['ItemPicture']['size'] > ($_SESSION['MaxImageSize']*1024)) { //File Size Check
Modified: trunk/SalesInquiry.php
===================================================================
--- trunk/SalesInquiry.php 2011-07-03 03:35:49 UTC (rev 4621)
+++ trunk/SalesInquiry.php 2011-07-03 04:33:19 UTC (rev 4622)
@@ -20,26 +20,26 @@
}
if (isset($_POST['PartNumber'])){
- $PartNumber = trim(strtoupper($_POST['PartNumber']));
+ $PartNumber = trim(mb_strtoupper($_POST['PartNumber']));
} elseif (isset($_GET['PartNumber'])){
- $PartNumber = trim(strtoupper($_GET['PartNumber']));
+ $PartNumber = trim(mb_strtoupper($_GET['PartNumber']));
}
# Part Number operator - either LIKE or =
$PartNumberOp = $_POST['PartNumberOp'];
if (isset($_POST['DebtorNo'])){
- $DebtorNo = trim(strtoupper($_POST['DebtorNo']));
+ $DebtorNo = trim(mb_strtoupper($_POST['DebtorNo']));
} elseif (isset($_GET['DebtorNo'])){
- $DebtorNo = trim(strtoupper($_GET['DebtorNo']));
+ $DebtorNo = trim(mb_strtoupper($_GET['DebtorNo']));
}
$DebtorNoOp = $_POST['DebtorNoOp'];
if (isset($_POST['DebtorName'])){
- $DebtorName = trim(strtoupper($_POST['DebtorName']));
+ $DebtorName = trim(mb_strtoupper($_POST['DebtorName']));
} elseif (isset($_GET['DebtorName'])){
- $DebtorName = trim(strtoupper($_GET['DebtorName']));
+ $DebtorName = trim(mb_strtoupper($_GET['DebtorName']));
}
$DebtorNameOp = $_POST['DebtorNameOp'];
Modified: trunk/SalesPeople.php
===================================================================
--- trunk/SalesPeople.php 2011-07-03 03:35:49 UTC (rev 4621)
+++ trunk/SalesPeople.php 2011-07-03 04:33:19 UTC (rev 4622)
@@ -6,9 +6,9 @@
include('includes/header.inc');
if (isset($_GET['SelectedSaleperson'])){
- $SelectedSaleperson =strtoupper($_GET['SelectedSaleperson']);
+ $SelectedSaleperson =mb_strtoupper($_GET['SelectedSaleperson']);
} elseif(isset($_POST['SelectedSaleperson'])){
- $SelectedSaleperson =strtoupper($_POST['SelectedSaleperson']);
+ $SelectedSaleperson =mb_strtoupper($_POST['SelectedSaleperson']);
}
if (isset($Errors)) {
Modified: trunk/SalesTypes.php
===================================================================
--- trunk/SalesTypes.php 2011-07-03 03:35:49 UTC (rev 4621)
+++ trunk/SalesTypes.php 2011-07-03 04:33:19 UTC (rev 4622)
@@ -6,9 +6,9 @@
include('includes/header.inc');
if (isset($_POST['SelectedType'])){
- $SelectedType = strtoupper($_POST['SelectedType']);
+ $SelectedType = mb_strtoupper($_POST['SelectedType']);
} elseif (isset($_GET['SelectedType'])){
- $SelectedType = strtoupper($_GET['SelectedType']);
+ $SelectedType = mb_strtoupper($_GET['SelectedType']);
}
if (isset($Errors)) {
Modified: trunk/SelectAsset.php
===================================================================
--- trunk/SelectAsset.php 2011-07-03 03:35:49 UTC (rev 4621)
+++ trunk/SelectAsset.php 2011-07-03 04:33:19 UTC (rev 4622)
@@ -25,7 +25,7 @@
}
}
if (isset($_POST['AssetCode'])) {
- $_POST['AssetCode'] = trim(strtoupper($_POST['AssetCode']));
+ $_POST['AssetCode'] = trim(mb_strtoupper($_POST['AssetCode']));
}
// Always show the search facilities
$SQL = 'SELECT categoryid,
@@ -123,7 +123,7 @@
if ($_POST['Keywords']) {
//insert wildcard characters in spaces
- $_POST['Keywords'] = strtoupper($_POST['Keywords']);
+ $_POST['Keywords'] = mb_strtoupper($_POST['Keywords']);
$SearchString = '%' . str_replace(' ', '%', $_POST['Keywords']) . '%';
if ($_POST['AssetCategory'] == 'ALL') {
if ($_POST['AssetLocation']=='ALL'){
Modified: trunk/SelectCustomer.php
===================================================================
--- trunk/SelectCustomer.php 2011-07-03 03:35:49 UTC (rev 4621)
+++ trunk/SelectCustomer.php 2011-07-03 04:33:19 UTC (rev 4622)
@@ -91,7 +91,7 @@
}
if (mb_strlen($_POST['Keywords'])>0) {
$msg = _('Search Result: Customer Name has been used in search') . '<br />';
- $_POST['Keywords'] = strtoupper($_POST['Keywords']);
+ $_POST['Keywords'] = mb_strtoupper($_POST['Keywords']);
} elseif (mb_strlen($_POST['CustCode'])>0) {
$msg = _('Search Result: Customer Code has been used in search') . '<br />';
} elseif (mb_strlen($_POST['CustPhone'])>0) {
@@ -124,7 +124,7 @@
} else {
if (mb_strlen($_POST['Keywords']) > 0) {
//using the customer name
- $_POST['Keywords'] = strtoupper(trim($_POST['Keywords']));
+ $_POST['Keywords'] = mb_strtoupper(trim($_POST['Keywords']));
//insert wildcard characters in spaces
$SearchString = '%' . str_replace(' ', '%', $_POST['Keywords']) . '%';
$SQL = "SELECT debtorsmaster.debtorno,
@@ -144,7 +144,7 @@
WHERE debtorsmaster.name " . LIKE . " '" . $SearchString . "'
AND debtorsmaster.typeid = debtortype.typeid";
} elseif (mb_strlen($_POST['CustCode']) > 0) {
- $_POST['CustCode'] = strtoupper(trim($_POST['CustCode']));
+ $_POST['CustCode'] = mb_strtoupper(trim($_POST['CustCode']));
$SQL = "SELECT debtorsmaster.debtorno,
debtorsmaster.name,
debtorsmaster.address1,
Modified: trunk/SelectOrderItems.php
===================================================================
--- trunk/SelectOrderItems.php 2011-07-03 03:35:49 UTC (rev 4621)
+++ trunk/SelectOrderItems.php 2011-07-03 04:33:19 UTC (rev 4622)
@@ -305,7 +305,7 @@
} else {
if (mb_strlen($_POST['CustKeywords'])>0) {
//insert wildcard characters in spaces
- $_POST['CustKeywords'] = strtoupper(trim($_POST['CustKeywords']));
+ $_POST['CustKeywords'] = mb_strtoupper(trim($_POST['CustKeywords']));
$SearchString = '%' . str_replace(' ', '%', $_POST['CustKeywords']) . '%';
$SQL = "SELECT custbranch.brname,
@@ -328,7 +328,7 @@
} elseif (mb_strlen($_POST['CustCode'])>0){
- $_POST['CustCode'] = strtoupper(trim($_POST['CustCode']));
+ $_POST['CustCode'] = mb_strtoupper(trim($_POST['CustCode']));
$SQL = "SELECT custbranch.brname,
custbranch.contactname,
@@ -766,7 +766,7 @@
}
if (isset($_POST['Keywords']) AND mb_strlen($_POST['Keywords'])>0) {
//insert wildcard characters in spaces
- $_POST['Keywords'] = strtoupper($_POST['Keywords']);
+ $_POST['Keywords'] = mb_strtoupper($_POST['Keywords']);
$SearchString = '%' . str_replace(' ', '%', $_POST['Keywords']) . '%';
if ($_POST['StockCat']=='All'){
@@ -797,7 +797,7 @@
} elseif (mb_strlen($_POST['StockCode'])>0){
- $_POST['StockCode'] = strtoupper($_POST['StockCode']);
+ $_POST['StockCode'] = mb_strtoupper($_POST['StockCode']);
$SearchString = '%' . $_POST['StockCode'] . '%';
if ($_POST['StockCat']=='All'){
@@ -918,7 +918,7 @@
$i++;
if (isset($_POST[$QuickEntryCode])) {
- $NewItem = strtoupper($_POST[$QuickEntryCode]);
+ $NewItem = mb_strtoupper($_POST[$QuickEntryCode]);
}
if (isset($_POST[$QuickEntryQty])) {
$NewItemQty = $_POST[$QuickEntryQty];
Modified: trunk/SelectProduct.php
===================================================================
--- trunk/SelectProduct.php 2011-07-03 03:35:49 UTC (rev 4621)
+++ trunk/SelectProduct.php 2011-07-03 04:33:19 UTC (rev 4622)
@@ -10,8 +10,8 @@
if (isset($_GET['StockID'])) {
//The page is called with a StockID
- $_GET['StockID'] = trim(strtoupper($_GET['StockID']));
- $_POST['Select'] = trim(strtoupper($_GET['StockID']));
+ $_GET['StockID'] = trim(mb_strtoupper($_GET['StockID']));
+ $_POST['Select'] = trim(mb_strtoupper($_GET['StockID']));
}
echo '<p class="page_title_text"><img src="' . $rootpath . '/css/' . $theme . '/images/inventory.png" title="' . _('Inventory Items') . '" alt="" />' . ' ' . _('Inventory Items') . '</p>';
if (isset($_GET['NewSearch']) or isset($_POST['Next']) or isset($_POST['Previous']) or isset($_POST['Go'])) {
@@ -27,7 +27,7 @@
}
}
if (isset($_POST['StockCode'])) {
- $_POST['StockCode'] = trim(strtoupper($_POST['StockCode']));
+ $_POST['StockCode'] = trim(mb_strtoupper($_POST['StockCode']));
}
// Always show the search facilities
$SQL = "SELECT categoryid,
@@ -534,7 +534,7 @@
}
if ($_POST['Keywords']) {
//insert wildcard characters in spaces
- $_POST['Keywords'] = strtoupper($_POST['Keywords']);
+ $_POST['Keywords'] = mb_strtoupper($_POST['Keywords']);
$SearchString = '%' . str_replace(' ', '%', $_POST['Keywords']) . '%';
if ($_POST['StockCat'] == 'All') {
$SQL = "SELECT stockmaster.stockid,
@@ -575,7 +575,7 @@
ORDER BY stockmaster.stockid";
}
} elseif (isset($_POST['StockCode'])) {
- $_POST['StockCode'] = strtoupper($_POST['StockCode']);
+ $_POST['StockCode'] = mb_strtoupper($_POST['StockCode']);
if ($_POST['StockCat'] == 'All') {
$SQL = "SELECT stockmaster.stockid,
stockmaster.description,
Modified: trunk/SelectSalesOrder.php
===================================================================
--- trunk/SelectSalesOrder.php 2011-07-03 03:35:49 UTC (rev 4621)
+++ trunk/SelectSalesOrder.php 2011-07-03 04:33:19 UTC (rev 4622)
@@ -398,9 +398,9 @@
}
if (isset($_POST['StockID'])){
- $StockID = trim(strtoupper($_POST['StockID']));
+ $StockID = trim(mb_strtoupper($_POST['StockID']));
} elseif (isset($_GET['StockID'])){
- $StockID = trim(strtoupper($_GET['StockID']));
+ $StockID = trim(mb_strtoupper($_GET['StockID']));
}
if (!isset($StockID)) {
Modified: trunk/SelectSupplier.php
===================================================================
--- trunk/SelectSupplier.php 2011-07-03 03:35:49 UTC (rev 4621)
+++ trunk/SelectSupplier.php 2011-07-03 04:33:19 UTC (rev 4622)
@@ -88,7 +88,7 @@
ORDER BY suppname";
} else {
if (mb_strlen($_POST['Keywords']) > 0) {
- $_POST['Keywords'] = strtoupper($_POST['Keywords']);
+ $_POST['Keywords'] = mb_strtoupper($_POST['Keywords']);
//insert wildcard characters in spaces
$SearchString = '%' . str_replace(' ', '%', $_POST['Keywords']) . '%';
$SQL = "SELECT supplierid,
@@ -102,7 +102,7 @@
WHERE suppname " . LIKE . " '" . $SearchString . "'
ORDER BY suppname";
} elseif (mb_strlen($_POST['SupplierCode']) > 0) {
- $_POST['SupplierCode'] = strtoupper($_POST['SupplierCode']);
+ $_POST['SupplierCode'] = mb_strtoupper($_POST['SupplierCode']);
$SQL = "SELECT supplierid,
suppname,
currcode,
Modified: trunk/SelectWorkOrder.php
===================================================================
--- trunk/SelectWorkOrder.php 2011-07-03 03:35:49 UTC (rev 4621)
+++ trunk/SelectWorkOrder.php 2011-07-03 04:33:19 UTC (rev 4622)
@@ -89,9 +89,9 @@
}
if (isset($_POST['StockID'])){
- $StockID = trim(strtoupper($_POST['StockID']));
+ $StockID = trim(mb_strtoupper($_POST['Stoc...
[truncated message content] |
