[Weberp-cvs] SF.net SVN: web-erp:[3662] trunk

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

Revision: 3662
          http://web-erp.svn.sourceforge.net/web-erp/?rev=3662&view=rev
Author:   tim_schofield
Date:     2010-07-25 22:07:39 +0000 (Sun, 25 Jul 2010)

Log Message:
-----------
Correctly show decimal places<

Modified Paths:
--------------
    trunk/PrintCustTrans.php
    trunk/doc/Change.log.html

Property Changed:
----------------
    trunk/


Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/utf-8:3087
/branches/utf-8_xfer:3160-3162
   + /branches/utf-8:3087
/branches/utf-8_xfer:3160-3162


Modified: trunk/PrintCustTrans.php
===================================================================
--- trunk/PrintCustTrans.php	2010-07-25 21:49:42 UTC (rev 3661)
+++ trunk/PrintCustTrans.php	2010-07-25 22:07:39 UTC (rev 3662)
@@ -197,7 +197,8 @@
 						((1 - stockmoves.discountpercent) * stockmoves.price * ' . $ExchRate . '* -stockmoves.qty) AS fxnet,
 						(stockmoves.price * ' . $ExchRate . ') AS fxprice,
 						stockmoves.narrative,
-						stockmaster.units
+						stockmaster.units,
+						stockmaster.decimalplaces
 					FROM stockmoves,
 						stockmaster
 					WHERE stockmoves.stockid = stockmaster.stockid
@@ -213,7 +214,8 @@
 						((1 - stockmoves.discountpercent) * stockmoves.price * ' . $ExchRate . ' * stockmoves.qty) AS fxnet,
 						(stockmoves.price * ' . $ExchRate . ') AS fxprice,
 						stockmoves.narrative,
-						stockmaster.units
+						stockmaster.units,
+						stockmaster.decimalplaces
 					FROM stockmoves,
 						stockmaster
 					WHERE stockmoves.stockid = stockmaster.stockid
@@ -252,8 +254,8 @@
 					$DisplayQty = $myrow2['quantity'];
 					$LeftOvers = $pdf->addTextWrap($FormDesign->Data->Column1->x, $YPos,$FormDesign->Data->Column1->Length, $FormDesign->Data->Column1->FontSize, $myrow2['stockid']);
 					$LeftOvers = $pdf->addTextWrap($FormDesign->Data->Column2->x, $YPos,$FormDesign->Data->Column2->Length, $FormDesign->Data->Column2->FontSize, $myrow2['description']);
-					$LeftOvers = $pdf->addTextWrap($FormDesign->Data->Column3->x, $YPos,$FormDesign->Data->Column3->Length, $FormDesign->Data->Column3->FontSize, $DisplayPrice, 'right');
-					$LeftOvers = $pdf->addTextWrap($FormDesign->Data->Column4->x, $YPos,$FormDesign->Data->Column4->Length, $FormDesign->Data->Column4->FontSize, $DisplayQty, 'right');
+					$LeftOvers = $pdf->addTextWrap($FormDesign->Data->Column3->x, $YPos,$FormDesign->Data->Column3->Length, $FormDesign->Data->Column3->FontSize, number_format($DisplayPrice,4), 'right');
+					$LeftOvers = $pdf->addTextWrap($FormDesign->Data->Column4->x, $YPos,$FormDesign->Data->Column4->Length, $FormDesign->Data->Column4->FontSize, number_format($DisplayQty,$myrow2['decimalplaces']), 'right');
 					$LeftOvers = $pdf->addTextWrap($FormDesign->Data->Column5->x, $YPos,$FormDesign->Data->Column5->Length, $FormDesign->Data->Column5->FontSize, $myrow2['units'], 'centre');
 					$LeftOvers = $pdf->addTextWrap($FormDesign->Data->Column6->x, $YPos,$FormDesign->Data->Column6->Length, $FormDesign->Data->Column6->FontSize, $DisplayDiscount, 'right');
 					$LeftOvers = $pdf->addTextWrap($FormDesign->Data->Column7->x, $YPos,$FormDesign->Data->Column7->Length, $FormDesign->Data->Column7->FontSize, $DisplayNet, 'right');

Modified: trunk/doc/Change.log.html
===================================================================
--- trunk/doc/Change.log.html	2010-07-25 21:49:42 UTC (rev 3661)
+++ trunk/doc/Change.log.html	2010-07-25 22:07:39 UTC (rev 3662)
@@ -1,8 +1,9 @@
 <p><font SIZE=4 COLOR=BLUE><b>webERP Change Log</b></font></p>
 <p></p>
-<p>25/07/10 Phil: SelectContract.php new script to select a contract
-<p>25/07/10 Phil: ContractOtherReqts.php new script to enter other requirements for a contract
-<p>25/07/10 Phil: Contracts.php and includes/DefineContractClass.php debugging 
+<p>25/07/10 Tim: PrintCustTrans.php - Correctly show decimal places</p>
+<p>25/07/10 Phil: SelectContract.php new script to select a contract</p>
+<p>25/07/10 Phil: ContractOtherReqts.php new script to enter other requirements for a contract</p>
+<p>25/07/10 Phil: Contracts.php and includes/DefineContractClass.php debugging</p>
 <p>22/07/10 Tim: GLAccountInquiry.php - Add in running balance. Cumulative for BS account, and period for PL accounts.</p>
 <p>22/07/10 Simon Peter Otandeka: FixedAssetList.php - New script that provides a simple list of assets and their properties.</p>
 <p>22/07/10 Tim: FixedAssetJournal.php - Corrections to depreciation calculation layout changes, and sql quoting</p>


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