Bug 3638 Self Check Should Capture Hold Items

[koha.git] / admin / currency.pl

diff --git a/admin/currency.pl b/admin/currency.pl
index 003ff89..e24f6b6 100755 (executable)
--- a/admin/currency.pl
+++ b/admin/currency.pl
@@ -46,14 +46,14 @@ use C4::Dates qw(format_date);
 use C4::Output;
 use C4::Budgets qw/GetCurrency GetCurrencies/;
 
-my $input = CGI->new;
+our $input = CGI->new;
 my $searchfield = $input->param('searchfield') || $input->param('description') || q{};
-my $offset      = $input->param('offset') || 0;
+our $offset      = $input->param('offset') || 0;
 my $op          = $input->param('op')     || q{};
 my $script_name = '/cgi-bin/koha/admin/currency.pl';
-my $pagesize = 20;
+our $pagesize = 20;
 
-my ($template, $loggedinuser, $cookie) = get_template_and_user({
+our ($template, $loggedinuser, $cookie) = get_template_and_user({
     template_name => 'admin/currency.tmpl',
     query => $input,
     type => 'intranet',
@@ -67,7 +67,7 @@ $searchfield=~ s/\,//g;
 $template->param(searchfield => $searchfield,
         script_name => $script_name);
 
-my $dbh = C4::Context->dbh;
+our $dbh = C4::Context->dbh;
 
 if ( $op eq 'add_form' ) {
     add_form($searchfield);
@@ -181,9 +181,6 @@ sub add_form {
 sub add_validate {
     $template->param( add_validate => 1 );
 
-    if ( $input->param('active') == 1 ) {
-        $dbh->do('UPDATE currency SET active = 0');
-    }
     my $rec = {
         rate     => $input->param('rate'),
         symbol   => $input->param('symbol') || q{},
@@ -191,6 +188,10 @@ sub add_validate {
         currency => $input->param('currency'),
     };
 
+    if ( $rec->{active} == 1 ) {
+        $dbh->do('UPDATE currency SET active = 0');
+    }
+
     my ($row_count) = $dbh->selectrow_array(
         'select count(*) as count from currency where currency = ?',
         {}, $input->param('currency') );