Menu
▾
▴
[Web-erp-svn] SF.net SVN: web-erp:[4674] trunk
|
From: <dai...@us...> - 2011-09-02 10:39:00
|
Revision: 4674
http://web-erp.svn.sourceforge.net/web-erp/?rev=4674&view=rev
Author: daintree
Date: 2011-09-02 10:38:54 +0000 (Fri, 02 Sep 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/Logout.php
trunk/SelectOrderItems.php
trunk/includes/LanguageSetup.php
trunk/includes/MiscFunctions.php
trunk/includes/session.inc
Modified: trunk/Logout.php
===================================================================
--- trunk/Logout.php 2011-09-02 09:35:59 UTC (rev 4673)
+++ trunk/Logout.php 2011-09-02 10:38:54 UTC (rev 4674)
@@ -1,7 +1,7 @@
<?php
-/* $Revision: 1.17 $ */
+
/* $Id$*/
-//$PageSecurity =1;
+
$AllowAnyone=True; /* Allow all users to log off */
include('includes/session.inc');
Modified: trunk/SelectOrderItems.php
===================================================================
--- trunk/SelectOrderItems.php 2011-09-02 09:35:59 UTC (rev 4673)
+++ trunk/SelectOrderItems.php 2011-09-02 10:38:54 UTC (rev 4674)
@@ -859,7 +859,7 @@
if (!isset($Offset) or $Offset<0) {
$Offset=0;
}
- $SQL = $SQL . " LIMIT " . $_SESSION['DefaultDisplayRecordsMax'] . " OFFSET " . locale_number_format($_SESSION['DefaultDisplayRecordsMax']*$Offset);
+ $SQL = $SQL . " LIMIT " . $_SESSION['DefaultDisplayRecordsMax'] . " OFFSET " . number_format($_SESSION['DefaultDisplayRecordsMax']*$Offset);
$ErrMsg = _('There is a problem selecting the part records to display because');
$DbgMsg = _('The SQL used to get the part selection was');
@@ -1147,7 +1147,7 @@
if ($_SESSION['CheckCreditLimits'] > 0 AND $AlreadyWarnedAboutCredit==false){ /*Check credit limits is 1 for warn
breach their credit limit and 2 for prohibit sales */
- $DifferenceInOrderValue = ($Quantity*$Price*(1-$DiscountPercentage/100)) - ($OrderLine->Quantity*$OrderLine->Price*(1-$OrderLine->DiscountPercentage));
+ $DifferenceInOrderValue = ($Quantity*$Price*(1-$DiscountPercentage/100)) - ($OrderLine->Quantity*$OrderLine->Price*(1-$OrderLine->DiscountPercent));
$_SESSION['Items'.$identifier]->CreditAvailable -= $DifferenceInOrderValue;
@@ -1610,7 +1610,7 @@
<td class="number">%s</td>
<td class="number">%s</td>
<td class="number">%s</td>
- <td><font size=1><input class="number" tabindex='.locale_number_format($j+7).' type="textbox" size=6 name="itm'.$myrow['stockid'].'" value=0>
+ <td><font size=1><input class="number" tabindex='. number_format($j+7).' type="textbox" size=6 name="itm'.$myrow['stockid'].'" value=0>
</td>
</tr>',
$myrow['stockid'],
@@ -1627,7 +1627,7 @@
#end of page full new headings if
}
#end of while loop for Frequently Ordered Items
- echo '<td style="text-align:center" colspan=8><input type="hidden" name="order_items" value=1><input tabindex='.locale_number_format($j+8).' type="submit" value="'._('Add to Sales Order').'"></td>';
+ echo '<td style="text-align:center" colspan=8><input type="hidden" name="order_items" value=1><input tabindex='.number_format($j+8).' type="submit" value="'._('Add to Sales Order').'"></td>';
echo '</table>';
} //end of if Frequently Ordered Items > 0
echo '<p><div class="centre"><b><p>' . $msg . '</b></p>';
@@ -1692,9 +1692,9 @@
echo '<form action="' . $_SERVER['PHP_SELF'] . '?identifier='.$identifier . '" method=post name="orderform">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<table class="table1">';
- echo '<tr><td colspan=><input type="hidden" name="previous" value='.locale_number_format($Offset-1).'><input tabindex='.locale_number_format($j+8).' type="submit" name="Prev" value="'._('Prev').'"></td>';
- echo '<td style="text-align:center" colspan=6><input type="hidden" name="order_items" value=1><input tabindex='.locale_number_format($j+9).' type="submit" value="'._('Add to Sales Order').'"></td>';
- echo '<td colspan=><input type="hidden" name="nextlist" value='.locale_number_format($Offset+1).'><input tabindex='.locale_number_format($j+10).' type="submit" name="Next" value="'._('Next').'"></td></tr>';
+ echo '<tr><td colspan=><input type="hidden" name="previous" value='.number_format($Offset-1).'><input tabindex='.number_format($j+8).' type="submit" name="Prev" value="'._('Prev').'"></td>';
+ echo '<td style="text-align:center" colspan=6><input type="hidden" name="order_items" value=1><input tabindex='.number_format($j+9).' type="submit" value="'._('Add to Sales Order').'"></td>';
+ echo '<td colspan=><input type="hidden" name="nextlist" value='.number_format($Offset+1).'><input tabindex='.number_format($j+10).' type="submit" name="Next" value="'._('Next').'"></td></tr>';
$TableHeader = '<tr>
<th>' . _('Code') . '</th>
<th>' . _('Description') . '</th>
@@ -1793,7 +1793,7 @@
<td class="number">%s</td>
<td class="number">%s</td>
<td class="number">%s</td>
- <td><font size=1><input class="number" tabindex='.locale_number_format($j+7).' type="textbox" size=6 name="itm'.$myrow['stockid'].'" value=0>
+ <td><font size=1><input class="number" tabindex='.number_format($j+7).' type="textbox" size=6 name="itm'.$myrow['stockid'].'" value=0>
</td>
</tr>',
$myrow['stockid'],
@@ -1810,9 +1810,9 @@
#end of page full new headings if
}
#end of while loop
- echo '<tr><td><input type="hidden" name="previous" value='.locale_number_format($Offset-1).'><input tabindex='.locale_number_format($j+7).' type="submit" name="Prev" value="'._('Prev').'"></td>';
- echo '<td style="text-align:center" colspan=6><input type="hidden" name="order_items" value=1><input tabindex='.locale_number_format($j+8).' type="submit" value="'._('Add to Sales Order').'"></td>';
- echo '<td><input type="hidden" name="nextlist" value='.locale_number_format($Offset+1).'><input tabindex='.locale_number_format($j+9).' type="submit" name="Next" value="'._('Next').'"></td></tr>';
+ echo '<tr><td><input type="hidden" name="previous" value='. number_format($Offset-1).'><input tabindex='. number_format($j+7).' type="submit" name="Prev" value="'._('Prev').'"></td>';
+ echo '<td style="text-align:center" colspan=6><input type="hidden" name="order_items" value=1><input tabindex='. number_format($j+8).' type="submit" value="'._('Add to Sales Order').'"></td>';
+ echo '<td><input type="hidden" name="nextlist" value='.number_format($Offset+1).'><input tabindex='.number_format($j+9).' type="submit" name="Next" value="'._('Next').'"></td></tr>';
echo '</table></form>';
echo $jsCall;
Modified: trunk/includes/LanguageSetup.php
===================================================================
--- trunk/includes/LanguageSetup.php 2011-09-02 09:35:59 UTC (rev 4673)
+++ trunk/includes/LanguageSetup.php 2011-09-02 10:38:54 UTC (rev 4674)
@@ -46,7 +46,6 @@
bindtextdomain ('messages', $PathPrefix . 'locale');
textdomain ('messages');
bind_textdomain_codeset('messages', 'UTF-8');
- $locale_info = localeconv();
} else {
/*
@@ -84,10 +83,5 @@
}
}
-if (!function_exists('locale_number_format')){
- function locale_number_format($Number, $DecimalPlaces) {
- $LocaleInfo = localeconv();
- return locale_number_format($Number, $DecimalPlaces, $LocaleInfo['decimal_point'], $LocaleInfo['thousands_sep']);
- }
-}
+
?>
\ No newline at end of file
Modified: trunk/includes/MiscFunctions.php
===================================================================
--- trunk/includes/MiscFunctions.php 2011-09-02 09:35:59 UTC (rev 4673)
+++ trunk/includes/MiscFunctions.php 2011-09-02 10:38:54 UTC (rev 4674)
@@ -304,7 +304,7 @@
}
function http_file_exists($url) {
- $f=@fopen($url,"r");
+ $f=@fopen($url,'r');
if($f) {
fclose($f);
return true;
@@ -312,4 +312,9 @@
return false;
}
+function locale_number_format($Number, $DecimalPlaces) {
+ $LocaleInfo = localeconv();
+ return number_format($Number, $DecimalPlaces, $LocaleInfo['decimal_point'], $LocaleInfo['thousands_sep']);
+}
+
?>
Modified: trunk/includes/session.inc
===================================================================
--- trunk/includes/session.inc 2011-09-02 09:35:59 UTC (rev 4673)
+++ trunk/includes/session.inc 2011-09-02 10:38:54 UTC (rev 4674)
@@ -89,7 +89,6 @@
$theme = (isset($_SESSION['Theme'])) ? $_SESSION['Theme'] : 'silverwolf';
switch ($rc) {
case UL_OK;
- include($PathPrefix . 'includes/LanguageSetup.php');
break;
case UL_SHOWLOGIN:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
