From c20496aea938e1faaa53daff5e2cf3d697b0eac9 Mon Sep 17 00:00:00 2001 From: Julian Maurice Date: Thu, 14 Apr 2016 14:29:38 +0200 Subject: [PATCH] Bug 15962: Block the currency deletion if used A currency should not be deleted if used by a vendor or a basket. Test plan: 1/ Add a new currency 2/ Create a vendor using this currency 3/ Create a basket using this currency 4/ Try to delete the currency 5/ Delete the basket 6/ Try to delete the currency 7/ Delete the vendor 8/ Delete the currency Signed-off-by: Julian Maurice --- admin/currency.pl | 18 ++++++++++-------- .../intranet-tmpl/prog/en/modules/admin/currency.tt | 11 +++++++++-- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/admin/currency.pl b/admin/currency.pl index f62f761..d0c4be3 100755 --- a/admin/currency.pl +++ b/admin/currency.pl @@ -132,21 +132,23 @@ sub delete_confirm { my $curr = shift; $template->param( delete_confirm => 1 ); - my $total_row = $dbh->selectrow_hashref( - 'select count(*) as total from aqbooksellers where currency=?', - {}, $curr ); + my ($nb_of_vendors) = $dbh->selectrow_array(q{ + select count(*) from aqbooksellers + where listprice = ? or invoiceprice = ? + }, {}, $curr, $curr); + my ($nb_of_orders) = $dbh->selectrow_array(q{ + select count(*) from aqorders + where currency = ? + }, {}, $curr); my $curr_ref = $dbh->selectrow_hashref( 'select currency,rate from currency where currency=?', {}, $curr ); - if ( $total_row->{total} ) { - $template->param( totalgtzero => 1 ); - } - $template->param( rate => $curr_ref->{rate}, - total => $total_row->{total} + nb_of_orders => $nb_of_orders, + nb_of_vendors => $nb_of_vendors, ); return; 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 6c94bb2..0e204d8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt @@ -125,10 +125,17 @@ [% END %] [% IF ( delete_confirm ) %] - [% IF ( totalgtzero ) %] + [% IF ( nb_of_orders or nb_of_vendors ) %]

Cannot delete currency '[% searchfield %]'

-

This currency is used [% total %] times. Deletion not possible

+

+ [% IF nb_of_orders %] + This currency is used by [% nb_of_orders %] orders. + [% ELSIF nb_of_vendors %] + This currency is used by [% nb_of_vendors %] vendors. + [% END %] + Deletion not possible +

-- 2.1.4