SF.net SVN: ledger-smb:[4678] branches/1.3

[..hidden..]

Revision: 4678
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=4678&view=rev
Author:   einhverfr
Date:     2012-04-25 02:30:57 +0000 (Wed, 25 Apr 2012)
Log Message:
-----------
fixing 3513760, default country not being respected by new user screen

Modified Paths:
--------------
    branches/1.3/Changelog
    branches/1.3/scripts/admin.pl

Modified: branches/1.3/Changelog
===================================================================
--- branches/1.3/Changelog	2012-04-25 02:20:37 UTC (rev 4677)
+++ branches/1.3/Changelog	2012-04-25 02:30:57 UTC (rev 4678)
@@ -9,6 +9,7 @@
 * Corrected permissions issue creating pricelist (Chris T, 3513861)
 * Correcting ordering of aging reports so currencies are clustered (Chris T)
 * Fixed curr totals not showing for aging rpts (Chris T, 3512591, h/t John L)
+* Fixed new user screen not respecting default country (Chris T, 3513760)
 
 Changelog for 1.3.15
 * Update WX POS (almost there) - readme and code  (Andres B, item 3516949)

Modified: branches/1.3/scripts/admin.pl
===================================================================
--- branches/1.3/scripts/admin.pl	2012-04-25 02:20:37 UTC (rev 4677)
+++ branches/1.3/scripts/admin.pl	2012-04-25 02:30:57 UTC (rev 4678)
@@ -164,6 +164,8 @@
     #my ($request) = @_;
     my $request = shift @_;
     my $admin = LedgerSMB::DBObject::Admin->new(base=>$request, copy=>'all');
+
+    my $setting = LedgerSMB::Setting->new(base => $request, copy => 'base');
     
     my @sal = $admin->get_salutations();
     
@@ -182,6 +184,7 @@
     
         $template->render(
             {
+                default_country => $setting->get('default_country'),
                 salutations=>..hidden..,
                 roles=>$groups,
                 countries=>$admin->get_countries(),

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