@@ -, +, @@ after clicking 'Delete' and before confirming delete --- admin/aqbudgetperiods.pl | 15 ++++++++++----- .../prog/en/modules/admin/aqbudgetperiods.tt | 4 ++++ 2 files changed, 14 insertions(+), 5 deletions(-) --- a/admin/aqbudgetperiods.pl +++ a/admin/aqbudgetperiods.pl @@ -127,7 +127,6 @@ elsif ( $op eq 'add_validate' ) { #-------------------------------------------------- elsif ( $op eq 'delete_confirm' ) { ## delete a budget period (preparation) - my $dbh = C4::Context->dbh; my $funds = GetBudgets({ budget_period_id => $budget_period_id }); my $fund_count = scalar @$funds; if ( $fund_count > 0 ) { @@ -143,10 +142,16 @@ elsif ( $op eq 'delete_confirm' ) { } elsif ( $op eq 'delete_confirmed' ) { -## delete the budget period record - - my $data = GetBudgetPeriod( $budget_period_id); - DelBudgetPeriod($budget_period_id); + ## confirm no funds have been added to budget + my $funds = GetBudgets({ budget_period_id => $budget_period_id }); + my $fund_count = scalar @$funds; + if ( $fund_count > 0 ) { + $template->param( failed_delete_funds_exist => 1 ); + } else { + ## delete the budget period record + my $data = GetBudgetPeriod( $budget_period_id); + DelBudgetPeriod($budget_period_id); + } $op='else'; } --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt @@ -542,6 +542,10 @@ [% IF ( else ) %]

Budgets administration

+ [% IF ( failed_delete_funds_exist ) %] +
Failed to delete budget because funds exist.
+ [% END %] + [% INCLUDE 'budgets-active-currency.inc' %]
--