[Web-erp-svn] SF.net SVN: web-erp:[4700] trunk/GLAccountReport.php

[<ex...@us...>]

Revision: 4700
          http://web-erp.svn.sourceforge.net/web-erp/?rev=4700&view=rev
Author:   exsonqu
Date:     2011-09-22 02:32:05 +0000 (Thu, 22 Sep 2011)
Log Message:
-----------
number_format for locale and bug fixed for right field name

Modified Paths:
--------------
    trunk/GLAccountReport.php

Modified: trunk/GLAccountReport.php
===================================================================
--- trunk/GLAccountReport.php	2011-09-21 09:41:21 UTC (rev 4699)
+++ trunk/GLAccountReport.php	2011-09-22 02:32:05 UTC (rev 4700)
@@ -72,7 +72,7 @@
 
 		} else {
 	 		$sql= "SELECT gltrans.type,
-						gltrans.typename,
+						typename,
 						gltrans.typeno,
 						gltrans.trandate,
 						gltrans.narrative,
@@ -121,9 +121,9 @@
 			$LeftOvers = $pdf->addTextWrap($Left_Margin,$YPos,150,$FontSize, _('Brought Forward Balance'));
 
 			if ($RunningTotal < 0 ){ //its a credit balance b/fwd
-   			   $LeftOvers = $pdf->addTextWrap(210,$YPos,50,$FontSize, locale_number_format(-$RunningTotal,2) , 'right');
+   			   $LeftOvers = $pdf->addTextWrap(210,$YPos,50,$FontSize, locale_money_format(-$RunningTotal,2) , 'right');
 			} else { //its a debit balance b/fwd
-               $LeftOvers = $pdf->addTextWrap(160,$YPos,50,$FontSize, locale_number_format($RunningTotal,2) , 'right');
+               $LeftOvers = $pdf->addTextWrap(160,$YPos,50,$FontSize, locale_money_format($RunningTotal,2) , 'right');
 			}
 		}
 		$PeriodTotal = 0;
@@ -150,9 +150,9 @@
            			$YPos -=$line_height;
                 	$LeftOvers = $pdf->addTextWrap($Left_Margin,$YPos,150,$FontSize, _('Period Total'));
 					if ($PeriodTotal < 0 ){ //its a credit balance b/fwd
-	                   $LeftOvers = $pdf->addTextWrap(210,$YPos,50,$FontSize, locale_number_format(-$PeriodTotal,$_SESSION['CompanyRecord']['decimalplaces']) , 'right');
+	                   $LeftOvers = $pdf->addTextWrap(210,$YPos,50,$FontSize, locale_money_format(-$PeriodTotal,$_SESSION['CompanyRecord']['decimalplaces']) , 'right');
                     } else { //its a debit balance b/fwd
-                       $LeftOvers = $pdf->addTextWrap(160,$YPos,50,$FontSize, locale_number_format($PeriodTotal,$_SESSION['CompanyRecord']['decimalplaces']) , 'right');
+                       $LeftOvers = $pdf->addTextWrap(160,$YPos,50,$FontSize, locale_money_format($PeriodTotal,$_SESSION['CompanyRecord']['decimalplaces']) , 'right');
 					}
 				}
 				$PeriodNo = $myrow['periodno'];
@@ -163,10 +163,10 @@
 			$PeriodTotal += $myrow['amount'];
 
 			if($myrow['amount']>=0){
-				$DebitAmount = locale_number_format($myrow['amount'],$_SESSION['CompanyRecord']['decimalplaces']);
+				$DebitAmount = locale_money_format($myrow['amount'],$_SESSION['CompanyRecord']['decimalplaces']);
 				$CreditAmount = '';
 			} elseif ($myrow['amount']<0){
-				$CreditAmount = locale_number_format(-$myrow['amount'],$_SESSION['CompanyRecord']['decimalplaces']);
+				$CreditAmount = locale_money_format(-$myrow['amount'],$_SESSION['CompanyRecord']['decimalplaces']);
 				$DebitAmount = '';
 			}
 
@@ -202,9 +202,9 @@
 			$LeftOvers = $pdf->addTextWrap($Left_Margin,$YPos,150,$FontSize, _('Balance C/Fwd'));
 		}
 		if ($RunningTotal < 0){
-		   $LeftOvers = $pdf->addTextWrap(210,$YPos,50,$FontSize, locale_number_format(-$RunningTotal,$_SESSION['CompanyRecord']['decimalplaces']) , 'right');
+		   $LeftOvers = $pdf->addTextWrap(210,$YPos,50,$FontSize, locale_money_format(-$RunningTotal,$_SESSION['CompanyRecord']['decimalplaces']) , 'right');
 		} else { //its a debit balance b/fwd
-           $LeftOvers = $pdf->addTextWrap(160,$YPos,50,$FontSize, locale_number_format($RunningTotal,$_SESSION['CompanyRecord']['decimalplaces']) , 'right');
+           $LeftOvers = $pdf->addTextWrap(160,$YPos,50,$FontSize, locale_money_format($RunningTotal,$_SESSION['CompanyRecord']['decimalplaces']) , 'right');
         }
        	$YPos -=$line_height;
        	//draw a line under each account printed
@@ -354,4 +354,4 @@
 
 	$YPos =$YPos - (2*$line_height);
 }
-?>
\ No newline at end of file
+?>

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