View | Details | Raw Unified | Return to bug 18002
Collapse All | Expand All

(-)a/acqui/acqui-home.pl (-9 / +9 lines)
Lines 66-71 my $totspent_active = 0; Link Here
66
my $totordered_active   = 0;
66
my $totordered_active   = 0;
67
my $totavail_active     = 0;
67
my $totavail_active     = 0;
68
68
69
my $budgets = GetBudgetPeriod(1);
70
if ($budgets > 0){
71
    my $stepfund = 2;
72
    $template->param( stepfund => $stepfund );
73
} else  {
74
    my $stepfund = 1;
75
    $template->param( stepfund => $stepfund );
76
}
77
69
my @budget_loop;
78
my @budget_loop;
70
foreach my $budget ( @{$budget_arr} ) {
79
foreach my $budget ( @{$budget_arr} ) {
71
    next unless (CanUserUseBudget($loggedinuser, $budget, $userflags));
80
    next unless (CanUserUseBudget($loggedinuser, $budget, $userflags));
Lines 107-121 foreach my $budget ( @{$budget_arr} ) { Link Here
107
    push @budget_loop, $budget;
116
    push @budget_loop, $budget;
108
}
117
}
109
118
110
my $budgets = GetBudgetPeriod();
111
if ($budgets > 0) {
112
    my $stepfund = 2;
113
    $template->param( stepfund => $stepfund );
114
}else{
115
    my $stepfund = 1;
116
    $template->param( stepfund => $stepfund );
117
}
118
119
$template->param(
119
$template->param(
120
    type          => 'intranet',
120
    type          => 'intranet',
121
    loop_budget   => \@budget_loop,
121
    loop_budget   => \@budget_loop,
(-)a/admin/aqbudgetperiods.pl (-2 / +2 lines)
Lines 120-127 elsif ( $op eq 'add_validate' ) { Link Here
120
	} 
120
	} 
121
	else {    # ELSE ITS AN ADD
121
	else {    # ELSE ITS AN ADD
122
		my $budget_period_id=AddBudgetPeriod($budget_period_hashref);
122
		my $budget_period_id=AddBudgetPeriod($budget_period_hashref);
123
    my $step= $input->param( 'step' );
123
    my $stepfund = $input->param( 'step' );
124
    $template->param( step => $step);
124
    $template->param( stepfund => $stepfund );
125
    print $input->redirect("/cgi-bin/koha/acqui/acqui-home.pl");
125
    print $input->redirect("/cgi-bin/koha/acqui/acqui-home.pl");
126
    exit;
126
    exit;
127
}
127
}
(-)a/admin/aqbudgets.pl (+5 lines)
Lines 180-185 if ($op eq 'add_form') { Link Here
180
                                                    # END $OP eq ADD_FORM
180
                                                    # END $OP eq ADD_FORM
181
#---------------------- DEFAULT DISPLAY BELOW ---------------------
181
#---------------------- DEFAULT DISPLAY BELOW ---------------------
182
182
183
183
# called by default form, used to confirm deletion of data in DB
184
# called by default form, used to confirm deletion of data in DB
184
} elsif ($op eq 'delete_confirm') {
185
} elsif ($op eq 'delete_confirm') {
185
186
Lines 221-226 if ($op eq 'add_form') { Link Here
221
        $budget_hash->{budget_id} = AddBudget( $budget_hash );
222
        $budget_hash->{budget_id} = AddBudget( $budget_hash );
222
        ModBudgetUsers($budget_hash->{budget_id}, @budgetusersid);
223
        ModBudgetUsers($budget_hash->{budget_id}, @budgetusersid);
223
        $budget_modified = 1;
224
        $budget_modified = 1;
225
226
        print $input->redirect("/cgi-bin/koha/acqui/acqui-home.pl");
227
        exit;
228
224
    }
229
    }
225
230
226
    my $set_owner_to_children = $input->param('set_owner_to_children');
231
    my $set_owner_to_children = $input->param('set_owner_to_children');
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/onboardinginclude2.inc (-12 / +17 lines)
Lines 25-38 Link Here
25
            <input type="hidden" name="op" value="add_validate" />
25
            <input type="hidden" name="op" value="add_validate" />
26
            <input type="hidden" name="checked" value="0" />
26
            <input type="hidden" name="checked" value="0" />
27
            <ol>
27
            <ol>
28
                [% IF ( budget_parent_id ) %]
28
                [% budget_parent_id = 0 %]
29
                    <li>
29
                <li>
30
                        <span class="label">Fund parent: </span>
30
                     <span class="label">Fund parent: </span>
31
                        [% budget_parent_name %]
31
                     [% budget_parent_name %]
32
                        [% budget_parent_id %] - [% budget_parent_name %]
32
                     [% budget_parent_id %] - [% budget_parent_name %]
33
                        <input type="hidden" name="budget_parent_id" value="[% budget_parent_id %]" />
33
                     <input type="hidden" name="budget_parent_id" value= NULL />
34
                    </li>
34
                </li>
35
                [% END %]
36
                <li>
35
                <li>
37
                    <label class="required"  for="budget_code">Fund code: </label>
36
                    <label class="required"  for="budget_code">Fund code: </label>
38
                    <input type="text" name="budget_code" id="budget_code" value="[% budget_code %]" size="30" />
37
                    <input type="text" name="budget_code" id="budget_code" value="[% budget_code %]" size="30" />
Lines 48-57 Link Here
48
                    <input type="text" name="budget_amount" id="budget_amount" value="[% budget_amount | $Price on_editing => 1 %]" size="8" />
47
                    <input type="text" name="budget_amount" id="budget_amount" value="[% budget_amount | $Price on_editing => 1 %]" size="8" />
49
                </li>
48
                </li>
50
49
51
                <fieldset class="action">
50
                <input type="hidden" name="budget_owner_id" id="budget_owner_id" value="0" />
52
                    <input type="submit" value="Submit" /> <a class="cancel" href="/cgi-bin/koha/admin/aqbudgets.pl">Cancel</a>
51
53
                    <input type="hidden" name="budget_period_id" value="[% budget_period_id %]" />
52
                [% IF ( budget_id ) %]
54
                </fieldset>
53
                    <input type="hidden" name="budget_id" value="[% budget_id %]" />
54
                [% END %]
55
56
        </fieldset>
57
        <fieldset class="action">
58
            <input type="submit" value="Submit" /> <a class="cancel" href="/cgi-bin/koha/admin/aqbudgets.pl">Cancel</a>
59
            <input type="hidden" name="budget_period_id" value="1" />
55
        </fieldset>
60
        </fieldset>
56
    </form>
61
    </form>
57
</div>
62
</div>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt (-2 / +1 lines)
Lines 453-459 var MSG_PARENT_BENEATH_BUDGET = "- " + _("New budget-parent is beneath budget") Link Here
453
453
454
<!-- ********************************************************************************************** -->
454
<!-- ********************************************************************************************** -->
455
<!-- create add/mod entry form -->
455
<!-- create add/mod entry form -->
456
[% IF op == 'add_form' && !error_not_authorised_to_modify %]
456
[% IF op == 'add_form' %]
457
<form action="/cgi-bin/koha/admin/aqbudgets.pl" id="edit_fund" name="Aform" method="post">
457
<form action="/cgi-bin/koha/admin/aqbudgets.pl" id="edit_fund" name="Aform" method="post">
458
    <fieldset class="rows">
458
    <fieldset class="rows">
459
    <legend>[% IF ( budget_id ) %]Modify[% ELSE %]Add[% END %] Fund
459
    <legend>[% IF ( budget_id ) %]Modify[% ELSE %]Add[% END %] Fund
460
- 

Return to bug 18002