SF.net SVN: ledger-smb:[5020] trunk

[..hidden..]

Revision: 5020
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=5020&view=rev
Author:   einhverfr
Date:     2012-07-20 11:39:44 +0000 (Fri, 20 Jul 2012)
Log Message:
-----------
Merging from branches/1.3

Modified Paths:
--------------
    trunk/Changelog
    trunk/LedgerSMB/Form.pm

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


Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3:3711-4998
   + /branches/1.3:3711-5019

Modified: trunk/Changelog
===================================================================
--- trunk/Changelog	2012-07-20 11:33:51 UTC (rev 5019)
+++ trunk/Changelog	2012-07-20 11:39:44 UTC (rev 5020)
@@ -74,6 +74,9 @@
 Initial Release:  Monday, Oct 12 2011
 Supported Presently
 
+Changelog for 1.3.21
+* Added a default numberformat in Form.pm (Chris T)
+
 Changelog for 1.3.20
 * Fixes for es_AR translation, duplicate keys removed (Andres B)
 * Demo templates provide better handling of paragraph breaks in notes (Chris T)

Modified: trunk/LedgerSMB/Form.pm
===================================================================
--- trunk/LedgerSMB/Form.pm	2012-07-20 11:33:51 UTC (rev 5019)
+++ trunk/LedgerSMB/Form.pm	2012-07-20 11:39:44 UTC (rev 5020)
@@ -846,13 +846,14 @@
 
     $self = "" unless defined $self;
     my $negative;
-    $myconfig = "" unless defined $myconfig;
+    $myconfig = {} unless defined $myconfig;
     $amount = "" unless defined $amount;
     $places = "0" unless defined $places;
     $dash = "" unless defined $dash;
     if ($self->{money_precision}){
        $places= $self->{money_precision};
     }
+    $myconfig->{numberformat} = '1000.00' unless $myconfig->{numberformat};
     $amount = $self->parse_amount( $myconfig, $amount );
     return $amount->to_output({
                places => $places,

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