@@ -, +, @@ onboardinginclude2.inc which contain the budget and fund creation forms respectively --- acqui/acqui-home.pl | 9 ++ admin/aqbudgetperiods.pl | 8 +- admin/aqbudgets.pl | 5 ++ .../prog/en/includes/onboardinginclude.inc | 97 ++++++++++------------ .../prog/en/includes/onboardinginclude2.inc | 62 ++++++++++++++ .../prog/en/modules/acqui/acqui-home.tt | 15 +++- .../prog/en/modules/admin/aqbudgetperiods.tt | 2 +- .../prog/en/modules/admin/aqbudgets.tt | 2 +- 8 files changed, 142 insertions(+), 58 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/onboardinginclude2.inc --- a/acqui/acqui-home.pl +++ a/acqui/acqui-home.pl @@ -66,6 +66,15 @@ my $totspent_active = 0; my $totordered_active = 0; my $totavail_active = 0; +my $budgets = GetBudgetPeriod(1); +if ($budgets > 0){ + my $stepfund = 2; + $template->param( stepfund => $stepfund ); +} else { + my $stepfund = 1; + $template->param( stepfund => $stepfund ); +} + my @budget_loop; foreach my $budget ( @{$budget_arr} ) { next unless (CanUserUseBudget($loggedinuser, $budget, $userflags)); --- a/admin/aqbudgetperiods.pl +++ a/admin/aqbudgetperiods.pl @@ -113,14 +113,18 @@ if ( $op eq 'add_form' ) { elsif ( $op eq 'add_validate' ) { ## add or modify a budget period (confirmation) - ## update budget period data +## update budget period data if ( $budget_period_id ne '' ) { $$budget_period_hashref{$_}||=0 for qw(budget_period_active budget_period_locked); my $status=ModBudgetPeriod($budget_period_hashref); } else { # ELSE ITS AN ADD my $budget_period_id=AddBudgetPeriod($budget_period_hashref); - } + my $stepfund = $input->param( 'step' ); + $template->param( stepfund => $stepfund ); + print $input->redirect("/cgi-bin/koha/acqui/acqui-home.pl"); + exit; +} $op='else'; } --- a/admin/aqbudgets.pl +++ a/admin/aqbudgets.pl @@ -180,6 +180,7 @@ if ($op eq 'add_form') { # END $OP eq ADD_FORM #---------------------- DEFAULT DISPLAY BELOW --------------------- + # called by default form, used to confirm deletion of data in DB } elsif ($op eq 'delete_confirm') { @@ -221,6 +222,10 @@ if ($op eq 'add_form') { $budget_hash->{budget_id} = AddBudget( $budget_hash ); ModBudgetUsers($budget_hash->{budget_id}, @budgetusersid); $budget_modified = 1; + + print $input->redirect("/cgi-bin/koha/acqui/acqui-home.pl"); + exit; + } my $set_owner_to_children = $input->param('set_owner_to_children'); --- a/koha-tmpl/intranet-tmpl/prog/en/includes/onboardinginclude.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/onboardinginclude.inc @@ -1,7 +1,3 @@ -[% USE Koha %] -[% USE KohaDates %] -[% USE Branches %] - +