From: <dai...@us...> - 2014-08-14 09:12:42
|
Revision: 6816 http://sourceforge.net/p/web-erp/reponame/6816 Author: daintree Date: 2014-08-14 09:12:29 +0000 (Thu, 14 Aug 2014) Log Message: ----------- Kelo: fix SupplierBalsAtPeriodEnd Modified Paths: -------------- trunk/SupplierBalsAtPeriodEnd.php trunk/doc/Change.log Modified: trunk/SupplierBalsAtPeriodEnd.php =================================================================== --- trunk/SupplierBalsAtPeriodEnd.php 2014-08-14 08:45:43 UTC (rev 6815) +++ trunk/SupplierBalsAtPeriodEnd.php 2014-08-14 09:12:29 UTC (rev 6816) @@ -77,8 +77,7 @@ $FXBalance = $SupplierBalances['fxbalance'] - $SupplierBalances['fxafterdatetrans']; if (ABS($Balance)>0.009 OR ABS($FXBalance)>0.009) { - - $DisplayBalance = locale_number_format($SupplierBalances['balance'] - $SupplierBalances['afterdatetrans'],$_SESSION['CompanyRecord']['decimalplaces']); + $DisplayBalance = locale_number_format($SupplierBalances['balance'] - $SupplierBalances['afterdatetrans'] + $SupplierBalances['afterdatediffonexch'],$_SESSION['CompanyRecord']['decimalplaces']); $DisplayFXBalance = locale_number_format($SupplierBalances['fxbalance'] - $SupplierBalances['fxafterdatetrans'],$SupplierBalances['currdecimalplaces']); $TotBal += $Balance; Modified: trunk/doc/Change.log =================================================================== --- trunk/doc/Change.log 2014-08-14 08:45:43 UTC (rev 6815) +++ trunk/doc/Change.log 2014-08-14 09:12:29 UTC (rev 6816) @@ -1,5 +1,6 @@ webERP Change Log +13/08/14 kelo: SupplierBalsAtPeriodEnd.php fix calculation to take into account fx differences on after date transactions 13/08/14 RChacon: includes/DatabaseTranslations.php used to store the fields of tables that are used from the database so that they can be translated in particular systypes for the types of transactions invoice credit note payment receipt etc. Can be extended for scripts and other tables where the data from the table is static and used to display 13/08/14 RChacon: In CustomerInquiry.php: Adds class ascending and reorganizes columns Date, Type, Number and Reference; Regroups table-datacel format-strings, completes the datacel quantity by table-row; makes translatable the systypes.typename. 12/08/14 RChacon: In SupplierInquiry.php: makes the field systypes.typename be translatable. |