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

[..hidden..]

Revision: 3747
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=3747&view=rev
Author:   einhverfr
Date:     2011-09-25 04:56:58 +0000 (Sun, 25 Sep 2011)
Log Message:
-----------
Merging from branches/1.3

Modified Paths:
--------------
    trunk/bin/oe.pl
    trunk/scripts/setup.pl

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


Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3:3711-3743
   + /branches/1.3:3711-3746

Modified: trunk/bin/oe.pl
===================================================================
--- trunk/bin/oe.pl	2011-09-25 04:56:12 UTC (rev 3746)
+++ trunk/bin/oe.pl	2011-09-25 04:56:58 UTC (rev 3747)
@@ -821,8 +821,9 @@
 
         if ( $form->{id} ) {
 
+            $a{'e_mail'}                = 1;
             $a{'delete'}                = 1;
-            $a{'print'}                = 1;
+            $a{'print'}                 = 1;
             $a{'save_as_new'}           = 1;
             $a{'print_and_save_as_new'} = 1 if ${LedgerSMB::Sysconfig::latex};
 

Modified: trunk/scripts/setup.pl
===================================================================
--- trunk/scripts/setup.pl	2011-09-25 04:56:12 UTC (rev 3746)
+++ trunk/scripts/setup.pl	2011-09-25 04:56:58 UTC (rev 3747)
@@ -328,7 +328,7 @@
     closedir(COA); 
 
     $request->{coa_lcs} =[];
-    foreach my $lcs (@coa){
+    foreach my $lcs (sort @coa){
          push @{$request->{coa_lcs}}, {code => $lcs};
     } 
 
@@ -424,20 +424,20 @@
            $template->render($request);
         } else {
             opendir(COA, "sql/coa/$request->{coa_lc}/chart");
-            my @coa = grep !/^(\.|[Ss]ample.*)/, readdir(COA);
+            my @coa = sort (grep !/^(\.|[Ss]ample.*)/, readdir(COA));
             $request->{charts} = [];
-            for my $chart (@coa){
+            for my $chart (sort @coa){
                 push @{$request->{charts}}, {name => $chart};
             }
        }
     } else {
         #COA Directories
         opendir(COA, 'sql/coa');
-        my @coa = grep !/^(\.|[Ss]ample.*)/, readdir(COA);
+        my @coa = sort(grep !/^(\.|[Ss]ample.*)/, readdir(COA));
         closedir(COA); 
 
         $request->{coa_lcs} =[];
-        foreach my $lcs (@coa){
+        foreach my $lcs (sort {$a cmp $b} @coa){
              push @{$request->{coa_lcs}}, {code => $lcs};
         } 
     }

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