From 8ed176e3573df86dbe4da1f4f1a91f6229452c29 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Tue, 8 Mar 2016 10:15:32 +0000 Subject: [PATCH] Bug 15084: typo currency vs currency_code The DB column is currency.currency not currency.currency_code. Test plan: Delete a currency Without this patch, you will get a warning in the logs: No method currency_code! at /home/koha/src/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt line 148. And the currency won't be deleted. With this patch, it will! It also changes the value of the delete op. --- admin/currency.pl | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/admin/currency.pl b/admin/currency.pl index 9c8f825..4d791db 100755 --- a/admin/currency.pl +++ b/admin/currency.pl @@ -98,7 +98,7 @@ if ( $op eq 'add_form' ) { currency => $currency, nb_of_orders => $nb_of_orders, ); -} elsif ( $op eq 'delete' ) { +} elsif ( $op eq 'delete_confirmed' ) { my $currency = Koha::Acquisition::Currencies->find($currency_code); my $deleted = eval { $currency->delete; }; diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt index 305e471..8fb7152 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt @@ -145,7 +145,7 @@
- +
-- 2.7.0