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

[<tim...@us...>]

Revision: 8249
          http://weberp.svn.sourceforge.net/weberp/?rev=8249&view=rev
Author:   tim_schofield
Date:     2011-10-06 21:20:21 +0000 (Thu, 06 Oct 2011)
Log Message:
-----------
Show numbers in correct formatting for the users locale

Modified Paths:
--------------
    trunk/GLJournal.php
    trunk/GLProfit_Loss.php

Modified: trunk/GLJournal.php
===================================================================
--- trunk/GLJournal.php	2011-10-06 21:20:09 UTC (rev 8248)
+++ trunk/GLJournal.php	2011-10-06 21:20:21 UTC (rev 8249)
@@ -95,7 +95,7 @@
 							'" . ($PeriodNo + 1) . "',
 							'" . $JournalItem->GLCode . "',
 							'Reversal - " . $JournalItem->Narrative . "',
-							'" . -($JournalItem->Amount) ."',
+							-" . $JournalItem->Amount .",
 							'".$JournalItem->tag."'
 						)";
 
@@ -136,9 +136,9 @@
 		$_POST['GLCode'] = $extract[0];
 	}
 	if($_POST['Debit']>0) {
-		$_POST['GLAmount'] = $_POST['Debit'];
+		$_POST['GLAmount'] = filter_currency_input($_POST['Debit']);
 	} elseif($_POST['Credit']>0) {
-		$_POST['GLAmount'] = '-' . $_POST['Credit'];
+		$_POST['GLAmount'] = '-' . filter_currency_input($_POST['Credit']);
 	}
 	if ($_POST['GLManualCode'] != '' AND is_numeric($_POST['GLManualCode'])){
 		// If a manual code was entered need to check it exists and isnt a bank account
@@ -369,12 +369,12 @@
 	echo '<td>' . $JournalItem->tag . ' - ' . $tagdescription . '</td>';
 	echo '<td>' . $JournalItem->GLCode . ' - ' . $JournalItem->GLActName . '</td>';
 	if($JournalItem->Amount>0) {
-		echo '<td class="number">' . number_format($JournalItem->Amount,2) . '</td><td></td>';
+		echo '<td class="number">' . locale_money_format($JournalItem->Amount,$_SESSION['CompanyRecord']['currencydefault']) . '</td><td></td>';
 		$debittotal=$debittotal+$JournalItem->Amount;
 	} elseif($JournalItem->Amount<0) {
 		$credit=(-1 * $JournalItem->Amount);
 		echo '<td></td>
-			<td class="number">' . number_format($credit,2) . '</td>';
+			<td class="number">' . locale_money_format($credit,$_SESSION['CompanyRecord']['currencydefault']) . '</td>';
 		$credittotal=$credittotal+$credit;
 	}
 
@@ -385,11 +385,11 @@
 
 echo '<tr class="EvenTableRows"><td></td>
 		<td class="number"><b>' . _('Total') .  '</b></td>
-		<td class="number"><b>' . number_format($debittotal,2) . '</b></td>
-		<td class="number"><b>' . number_format($credittotal,2) . '</b></td></tr>';
+		<td class="number"><b>' . locale_money_format($debittotal,$_SESSION['CompanyRecord']['currencydefault']) . '</b></td>
+		<td class="number"><b>' . locale_money_format($credittotal,$_SESSION['CompanyRecord']['currencydefault']) . '</b></td></tr>';
 if ($debittotal!=$credittotal) {
 	echo '<td align="center" style="background-color: #fddbdb"><b>' . _('Required to balance') .' - </b>' .
-		number_format(abs($debittotal-$credittotal),2);
+		locale_money_format(abs($debittotal-$credittotal),$_SESSION['CompanyRecord']['currencydefault']);
 }
 if ($debittotal>$credittotal) {
 	echo ' ' . _('Credit') . '</td></tr>';

Modified: trunk/GLProfit_Loss.php
===================================================================
--- trunk/GLProfit_Loss.php	2011-10-06 21:20:09 UTC (rev 8248)
+++ trunk/GLProfit_Loss.php	2011-10-06 21:20:21 UTC (rev 8249)
@@ -224,9 +224,9 @@
 							$YPos -= (2 * $line_height);
 						} else { /*Costs */
 							$LeftOvers = $pdf->addTextWrap($Left_Margin +($Level*10),$YPos,200 -($Level*10),$FontSize,$ActGrpLabel);
-							$LeftOvers = $pdf->addTextWrap($Left_Margin+310,$YPos,70,$FontSize,locale_money_format($GrpPrdActual[$Level]$_SESSION['CompanyRecord']['currencydefault']),'right');
-							$LeftOvers = $pdf->addTextWrap($Left_Margin+370,$YPos,70,$FontSize,locale_money_format($GrpPrdBudget[$Level]$_SESSION['CompanyRecord']['currencydefault']),'right');
-							$LeftOvers = $pdf->addTextWrap($Left_Margin+430,$YPos,70,$FontSize,locale_money_format($GrpPrdLY[$Level]$_SESSION['CompanyRecord']['currencydefault']),'right');
+							$LeftOvers = $pdf->addTextWrap($Left_Margin+310,$YPos,70,$FontSize,locale_money_format($GrpPrdActual[$Level], $_SESSION['CompanyRecord']['currencydefault']),'right');
+							$LeftOvers = $pdf->addTextWrap($Left_Margin+370,$YPos,70,$FontSize,locale_money_format($GrpPrdBudget[$Level], $_SESSION['CompanyRecord']['currencydefault']),'right');
+							$LeftOvers = $pdf->addTextWrap($Left_Margin+430,$YPos,70,$FontSize,locale_money_format($GrpPrdLY[$Level], $_SESSION['CompanyRecord']['currencydefault']),'right');
 							$YPos -= (2 * $line_height);
 						}
 						$GrpPrdLY[$Level] = 0;

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