@@ -, +, @@ file to be displayed after users have created a budget in the add budget form also in the onboardinginclude.inc --- admin/aqbudgetperiods.pl | 6 +- .../prog/en/includes/onboardinginclude.inc | 128 +++++++++++++-------- .../prog/en/modules/acqui/acqui-home.tt | 7 ++ .../prog/en/modules/admin/aqbudgetperiods.tt | 2 +- 4 files changed, 95 insertions(+), 48 deletions(-) --- a/admin/aqbudgetperiods.pl +++ a/admin/aqbudgetperiods.pl @@ -113,14 +113,16 @@ 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); - } + print $input->redirect("/cgi-bin/koha/acqui/acqui-home.pl?step=2"); + exit; +} $op='else'; } --- 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 %] - -[% step = 1 %] - -
- ×

-[% IF displayonboardscreen == "acquisitions" %] -

Create a budget

-
-
+
+ ×

+ [% IF displayonboardscreen == "acquisitions" %] + [% IF step == 2 %] + +
+ [% IF ( budget_id ) %]Modify[% ELSE %]Add[% END %] Fund + [% IF ( budget_period_description ) %] + [% budget_name %] for Budget '[% budget_period_description %]' + [% END %] + - +
    -
  1. - - -
    [% INCLUDE 'date-format.inc' %]
    + [% IF ( budget_parent_id ) %] +
  2. + Fund parent: + [% budget_parent_name %] + [% budget_parent_id %] - [% budget_parent_name %] +
  3. + [% END %] -
  4. - - -
    [% INCLUDE 'date-format.inc' %]
    -
  5. +
  6. + + +
  7. -
  8. - - -
  9. +
  10. + + +
  11. -
  12. - - -
  13. +
  14. + + +
  15. -
  16. - - [% IF ( budget_period_active ) %][% ELSE %] [% END %] -
  17. -
- +
+ Cancel + +
+ + + [% ELSE %] +

Create a budget

+
+
+ + +
    +
  1. + + +
    [% INCLUDE 'date-format.inc' %]
    +
  2. + +
  3. + + +
    [% INCLUDE 'date-format.inc' %]
    +
  4. + +
  5. + + +
  6. + +
  7. + + +
  8. + +
  9. + + [% IF ( budget_period_active ) %][% ELSE %] [% END %] +
  10. +
+
+ +
+ + + + Cancel +
+
+
+ [% END %] -
- - Cancel - - -
[% ELSIF displayonboardscreen == "label" %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt @@ -1,5 +1,9 @@ [% USE Price %] [% USE Branches %] +[% USE Koha %] +[% USE KohaDates %] +[% USE Branches %] + [% INCLUDE 'doc-head-open.inc' %] Koha › Acquisitions [% INCLUDE 'doc-head-close.inc' %] @@ -9,6 +13,9 @@ +[% INCLUDE 'calendar.inc' %] + +