Menu
▾
▴
[Web-erp-svn] SF.net SVN: web-erp:[4688] trunk
|
From: <fox...@us...> - 2011-09-12 23:37:59
|
Revision: 4688
http://web-erp.svn.sourceforge.net/web-erp/?rev=4688&view=rev
Author: foxdeluxe
Date: 2011-09-12 23:37:53 +0000 (Mon, 12 Sep 2011)
Log Message:
-----------
number formatting
Modified Paths:
--------------
trunk/AgedDebtors.php
trunk/AgedSuppliers.php
Modified: trunk/AgedDebtors.php
===================================================================
--- trunk/AgedDebtors.php 2011-09-12 08:57:11 UTC (rev 4687)
+++ trunk/AgedDebtors.php 2011-09-12 23:37:53 UTC (rev 4688)
@@ -291,11 +291,11 @@
while ($AgedAnalysis = DB_fetch_array($CustomerResult,$db)){
$DecimalPlaces = $AgedAnalysis['decimalplaces'];
- $DisplayDue = locale_number_format($AgedAnalysis['due']-$AgedAnalysis['overdue1'],$DecimalPlaces);
- $DisplayCurrent = locale_number_format($AgedAnalysis['balance']-$AgedAnalysis['due'],$DecimalPlaces);
- $DisplayBalance = locale_number_format($AgedAnalysis['balance'],$DecimalPlaces);
- $DisplayOverdue1 = locale_number_format($AgedAnalysis['overdue1']-$AgedAnalysis['overdue2'],$DecimalPlaces);
- $DisplayOverdue2 = locale_number_format($AgedAnalysis['overdue2'],$DecimalPlaces);
+ $DisplayDue = locale_money_format($AgedAnalysis['due']-$AgedAnalysis['overdue1'],$DecimalPlaces);
+ $DisplayCurrent = locale_money_format($AgedAnalysis['balance']-$AgedAnalysis['due'],$DecimalPlaces);
+ $DisplayBalance = locale_money_format($AgedAnalysis['balance'],$DecimalPlaces);
+ $DisplayOverdue1 = locale_money_format($AgedAnalysis['overdue1']-$AgedAnalysis['overdue2'],$DecimalPlaces);
+ $DisplayOverdue2 = locale_money_format($AgedAnalysis['overdue2'],$DecimalPlaces);
$TotBal += $AgedAnalysis['balance'];
$TotDue += ($AgedAnalysis['due']-$AgedAnalysis['overdue1']);
@@ -384,11 +384,11 @@
$DisplayTranDate = ConvertSQLDate($DetailTrans['trandate']);
$LeftOvers = $pdf->addTextWrap($Left_Margin+125,$YPos,75,$FontSize,$DisplayTranDate,'left');
- $DisplayDue = locale_number_format($DetailTrans['due']-$DetailTrans['overdue1'],$DecimalPlaces);
- $DisplayCurrent = locale_number_format($DetailTrans['balance']-$DetailTrans['due'],$DecimalPlaces);
- $DisplayBalance = locale_number_format($DetailTrans['balance'],$DecimalPlaces);
- $DisplayOverdue1 = locale_number_format($DetailTrans['overdue1']-$DetailTrans['overdue2'],$DecimalPlaces);
- $DisplayOverdue2 = locale_number_format($DetailTrans['overdue2'],$DecimalPlaces);
+ $DisplayDue = locale_money_format($DetailTrans['due']-$DetailTrans['overdue1'],$DecimalPlaces);
+ $DisplayCurrent = locale_money_format($DetailTrans['balance']-$DetailTrans['due'],$DecimalPlaces);
+ $DisplayBalance = locale_money_format($DetailTrans['balance'],$DecimalPlaces);
+ $DisplayOverdue1 = locale_money_format($DetailTrans['overdue1']-$DetailTrans['overdue2'],$DecimalPlaces);
+ $DisplayOverdue2 = locale_money_format($DetailTrans['overdue2'],$DecimalPlaces);
$LeftOvers = $pdf->addTextWrap(220,$YPos,60,$FontSize,$DisplayBalance,'right');
$LeftOvers = $pdf->addTextWrap(280,$YPos,60,$FontSize,$DisplayCurrent,'right');
@@ -418,11 +418,11 @@
$pdf->line($Page_Width-$Right_Margin, $YPos+10 ,220, $YPos+10);
}
- $DisplayTotBalance = locale_number_format($TotBal,$DecimalPlaces);
- $DisplayTotDue = locale_number_format($TotDue,$DecimalPlaces);
- $DisplayTotCurrent = locale_number_format($TotCurr,$DecimalPlaces);
- $DisplayTotOverdue1 = locale_number_format($TotOD1,$DecimalPlaces);
- $DisplayTotOverdue2 = locale_number_format($TotOD2,$DecimalPlaces);
+ $DisplayTotBalance = locale_money_format($TotBal,$DecimalPlaces);
+ $DisplayTotDue = locale_money_format($TotDue,$DecimalPlaces);
+ $DisplayTotCurrent = locale_money_format($TotCurr,$DecimalPlaces);
+ $DisplayTotOverdue1 = locale_money_format($TotOD1,$DecimalPlaces);
+ $DisplayTotOverdue2 = locale_money_format($TotOD2,$DecimalPlaces);
$LeftOvers = $pdf->addTextWrap(220,$YPos,60,$FontSize,$DisplayTotBalance,'right');
$LeftOvers = $pdf->addTextWrap(280,$YPos,60,$FontSize,$DisplayTotCurrent,'right');
@@ -516,4 +516,4 @@
}
include('includes/footer.inc');
} /*end of else not PrintPDF */
-?>
\ No newline at end of file
+?>
Modified: trunk/AgedSuppliers.php
===================================================================
--- trunk/AgedSuppliers.php 2011-09-12 08:57:11 UTC (rev 4687)
+++ trunk/AgedSuppliers.php 2011-09-12 23:37:53 UTC (rev 4688)
@@ -126,11 +126,11 @@
While ($AgedAnalysis = DB_fetch_array($SupplierResult,$db)){
- $DisplayDue = locale_number_format($AgedAnalysis['due']-$AgedAnalysis['overdue1'],2);
- $DisplayCurrent = locale_number_format($AgedAnalysis['balance']-$AgedAnalysis['due'],2);
- $DisplayBalance = locale_number_format($AgedAnalysis['balance'],2);
- $DisplayOverdue1 = locale_number_format($AgedAnalysis['overdue1']-$AgedAnalysis['overdue2'],2);
- $DisplayOverdue2 = locale_number_format($AgedAnalysis['overdue2'],2);
+ $DisplayDue = locale_money_format($AgedAnalysis['due']-$AgedAnalysis['overdue1'],2);
+ $DisplayCurrent = locale_money_format($AgedAnalysis['balance']-$AgedAnalysis['due'],2);
+ $DisplayBalance = locale_money_format($AgedAnalysis['balance'],2);
+ $DisplayOverdue1 = locale_money_format($AgedAnalysis['overdue1']-$AgedAnalysis['overdue2'],2);
+ $DisplayOverdue2 = locale_money_format($AgedAnalysis['overdue2'],2);
$TotBal += $AgedAnalysis['balance'];
$TotDue += ($AgedAnalysis['due']-$AgedAnalysis['overdue1']);
@@ -204,11 +204,11 @@
$DisplayTranDate = ConvertSQLDate($DetailTrans['trandate']);
$LeftOvers = $pdf->addTextWrap($Left_Margin+105,$YPos,70,$FontSize,$DisplayTranDate,'left');
- $DisplayDue = locale_number_format($DetailTrans['due']-$DetailTrans['overdue1'],2);
- $DisplayCurrent = locale_number_format($DetailTrans['balance']-$DetailTrans['due'],2);
- $DisplayBalance = locale_number_format($DetailTrans['balance'],2);
- $DisplayOverdue1 = locale_number_format($DetailTrans['overdue1']-$DetailTrans['overdue2'],2);
- $DisplayOverdue2 = locale_number_format($DetailTrans['overdue2'],2);
+ $DisplayDue = locale_money_format($DetailTrans['due']-$DetailTrans['overdue1'],2);
+ $DisplayCurrent = locale_money_format($DetailTrans['balance']-$DetailTrans['due'],2);
+ $DisplayBalance = locale_money_format($DetailTrans['balance'],2);
+ $DisplayOverdue1 = locale_money_format($DetailTrans['overdue1']-$DetailTrans['overdue2'],2);
+ $DisplayOverdue2 = locale_money_format($DetailTrans['overdue2'],2);
$LeftOvers = $pdf->addTextWrap(220,$YPos,60,$FontSize,$DisplayBalance,'right');
$LeftOvers = $pdf->addTextWrap(280,$YPos,60,$FontSize,$DisplayCurrent,'right');
@@ -238,11 +238,11 @@
$pdf->line($Page_Width-$Right_Margin, $YPos+10 ,220, $YPos+10);
}
- $DisplayTotBalance = locale_number_format($TotBal,2);
- $DisplayTotDue = locale_number_format($TotDue,2);
- $DisplayTotCurrent = locale_number_format($TotCurr,2);
- $DisplayTotOverdue1 = locale_number_format($TotOD1,2);
- $DisplayTotOverdue2 = locale_number_format($TotOD2,2);
+ $DisplayTotBalance = locale_money_format($TotBal,2);
+ $DisplayTotDue = locale_money_format($TotDue,2);
+ $DisplayTotCurrent = locale_money_format($TotCurr,2);
+ $DisplayTotOverdue1 = locale_money_format($TotOD1,2);
+ $DisplayTotOverdue2 = locale_money_format($TotOD2,2);
$LeftOvers = $pdf->addTextWrap(220,$YPos,60,$FontSize,$DisplayTotBalance,'right');
$LeftOvers = $pdf->addTextWrap(280,$YPos,60,$FontSize,$DisplayTotCurrent,'right');
@@ -314,4 +314,4 @@
include('includes/footer.inc');
} /*end of else not PrintPDF */
-?>
\ No newline at end of file
+?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
