X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;ds=sidebyside;f=admin%2Fcurrency.pl;h=abbdca28312774ce253ce1a3af3285697a1c7730;hb=5d6c092921919526ade501facb1220f8a108a08f;hp=e24f6b6fc94df801140f63f8b7cbb2c2773faa51;hpb=413a1e1e61b343db47b9b6fdecf3d981d87013ef;p=koha_fer

diff --git a/admin/currency.pl b/admin/currency.pl
index e24f6b6fc9..abbdca2831 100755
--- a/admin/currency.pl
+++ b/admin/currency.pl
@@ -57,7 +57,7 @@ our ($template, $loggedinuser, $cookie) = get_template_and_user({
     template_name => 'admin/currency.tmpl',
     query => $input,
     type => 'intranet',
-    flagsrequired => {parameters => 1},
+    flagsrequired => {parameters => 'parameters_remaining_permissions'},
     authnotrequired => 0,
 });
 
@@ -162,15 +162,16 @@ sub add_form {
     $template->param( add_form => 1 );
 
     #---- if primkey exists, it's a modify action, so read values to modify...
+    my $date;
     if ($curr) {
         my $curr_rec =
           $dbh->selectrow_hashref( 'select * from currency where currency=?',
             {}, $curr );
         for ( keys %{$curr_rec} ) {
+            if($_ eq "timestamp"){ $date = $curr_rec->{$_}; }
             $template->param( $_ => $curr_rec->{$_} );
         }
     }
-    my $date = $template->param('timestamp');
     if ($date) {
         $template->param( 'timestamp' => format_date($date) );
     }
@@ -184,6 +185,7 @@ sub add_validate {
     my $rec = {
         rate     => $input->param('rate'),
         symbol   => $input->param('symbol') || q{},
+        isocode  => $input->param('isocode') || q{},
         active   => $input->param('active') || 0,
         currency => $input->param('currency'),
     };
@@ -197,20 +199,22 @@ sub add_validate {
         {}, $input->param('currency') );
     if ($row_count) {
         $dbh->do(
-q|UPDATE currency SET rate = ?, symbol = ?, active = ? WHERE currency = ? |,
+q|UPDATE currency SET rate = ?, symbol = ?, isocode = ?, active = ? WHERE currency = ? |,
             {},
             $rec->{rate},
             $rec->{symbol},
+            $rec->{isocode},
             $rec->{active},
             $rec->{currency}
         );
     } else {
         $dbh->do(
-q|INSERT INTO currency (currency, rate, symbol, active) VALUES (?,?,?,?) |,
+q|INSERT INTO currency (currency, rate, symbol, isocode, active) VALUES (?,?,?,?,?) |,
             {},
             $rec->{currency},
             $rec->{rate},
             $rec->{symbol},
+            $rec->{isocode},
             $rec->{active}
         );