SF.net SVN: ledger-smb:[5176] tags/1.3.23

[..hidden..]

Revision: 5176
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=5176&view=rev
Author:   ehuelsmann
Date:     2012-11-09 12:58:18 +0000 (Fri, 09 Nov 2012)
Log Message:
-----------
Revert changes to the tag.

Modified Paths:
--------------
    tags/1.3.23/UI/setup/upgrade_info.html
    tags/1.3.23/scripts/setup.pl

Modified: tags/1.3.23/UI/setup/upgrade_info.html
===================================================================
--- tags/1.3.23/UI/setup/upgrade_info.html	2012-11-09 12:51:33 UTC (rev 5175)
+++ tags/1.3.23/UI/setup/upgrade_info.html	2012-11-09 12:58:18 UTC (rev 5176)
@@ -13,33 +13,27 @@
 } ?>
 <div class="form">
 <div class="input_row">
-<?lsmb INCLUDE select element_data = {
-                          options = countries
-                       value_attr = 'code'
-                        text_attr = 'country'
+<?lsmb INCLUDE input element_data = {
                             name  = 'default_country'
+                            type  = 'text'
                            label  = text('Default Country') #'
                             class = 'country'
 } ?>
 </div>
 <div class="input_row">
-<?lsmb INCLUDE select element_data = {
+<?lsmb INCLUDE input element_data = {
                             name  = 'default_ar'
+                            type  = 'text'
                            label  = text('Default AR') #'
                             class = 'accno'
-                            options = ar_accounts
-                            value_attr = 'accno'
-                            text_attr = 'desc'
 } ?>
 </div>
 <div class="input_row">
-<?lsmb INCLUDE select element_data = {
+<?lsmb INCLUDE input element_data = {
                             name  = 'default_ap'
+                            type  = 'text'
                            label  = text('Default AP') #'
                             class = 'accno'
-                            options = ap_accounts
-                            value_attr = 'accno'
-                            text_attr = 'desc'
 } ?>
 </div>
 <div class="input_row">

Modified: tags/1.3.23/scripts/setup.pl
===================================================================
--- tags/1.3.23/scripts/setup.pl	2012-11-09 12:51:33 UTC (rev 5175)
+++ tags/1.3.23/scripts/setup.pl	2012-11-09 12:58:18 UTC (rev 5176)
@@ -1,3 +1,4 @@
+
 =head1 NAME
 
 LedgerSMB::Scripts::setup
@@ -18,7 +19,6 @@
 #
 package LedgerSMB::Scripts::setup;
 
-use Locale::Country;
 use LedgerSMB::Auth;
 use LedgerSMB::Database;
 use strict;
@@ -346,34 +346,6 @@
 
 }
 
-=item _get_linked_accounts
-
-Returns an array of hashrefs with keys ('id', 'accno', 'desc') identifying
-the accounts.
-
-Assumes a connected database.
-
-=cut
-
-sub _get_linked_accounts {
-    my ($request, $link) = @_;
-    my @accounts;
-
-    my $sth = $request->{dbh}->prepare("select id, accno, description
-                                          from chart
-                                         where link = '$link'");
-    $sth->execute();
-    while (my $row = $sth->fetchrow_hashref('NAME_lc')) {
-        push @accounts, { accno => $row->{accno},
-                          desc => "$row->{accno} - $row->{description}",
-                          id => $row->{id}
-        };
-    }
-
-    return @accounts;
-}
-
-
 =item upgrade 
 
 Beginning of the upgrade from 1.2 logic
@@ -459,22 +431,6 @@
              _failed_check($request, $check, $sth);
         }
     }
-
-    @{$request->{ar_accounts}} = _get_linked_accounts($request, "AR");
-    @{$request->{ap_accounts}} = _get_linked_accounts($request, "AP");
-    unshift @{$request->{ar_accounts}}, {};
-    unshift @{$request->{ap_accounts}}, {};
-
-    @{$request->{countries}} = ();
-    foreach my $iso2 (all_country_codes()) {
-        push @{$request->{countries}}, { code    => uc($iso2),
-                                         country => code2country($iso2) };
-    }
-    @{$request->{countries}} =
-        sort { $a->{country} cmp $b->{country} } @{$request->{countries}};
-    unshift @{$request->{countries}}, {};
-
-
     my $template = LedgerSMB::Template->new(
             path => 'UI/setup',
             template => 'upgrade_info',

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