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

(-)a/acqui/addorder.pl (-1 / +73 lines)
Lines 126-131 use C4::Auth; # get_template_and_user Link Here
126
use C4::Acquisition;	# NewOrder DelOrder ModOrder
126
use C4::Acquisition;	# NewOrder DelOrder ModOrder
127
use C4::Suggestions;	# ModStatus
127
use C4::Suggestions;	# ModStatus
128
use C4::Biblio;			# AddBiblio TransformKohaToMarc
128
use C4::Biblio;			# AddBiblio TransformKohaToMarc
129
use C4::Budgets;
129
use C4::Items;
130
use C4::Items;
130
use C4::Output;
131
use C4::Output;
131
132
Lines 135-141 use C4::Output; Link Here
135
# not just blindly call C4 functions and print a redirect.  
136
# not just blindly call C4 functions and print a redirect.  
136
137
137
my $input = new CGI;
138
my $input = new CGI;
138
### $input 
139
140
# Check if order total amount exceed allowed budget
141
my $confirm_budget_exceeding = $input->param('confirm_budget_exceeding');
142
unless($confirm_budget_exceeding) {
143
    my $budget_id = $input->param('budget_id');
144
    my $total = $input->param('total');
145
    my $budget = GetBudget($budget_id);
146
    my $budget_spent = GetBudgetSpent($budget_id);
147
    my $budget_ordered = GetBudgetOrdered($budget_id);
148
    my $budget_used = $budget_spent + $budget_ordered;
149
    my $budget_remaining = $budget->{budget_amount} - $budget_used;
150
    my $budget_encumbrance = $budget->{budget_amount} * $budget->{budget_encumb} / 100;
151
    my $budget_expenditure = $budget->{budget_expend};
152
153
    if ( $total > $budget_remaining
154
      || ( ($budget_encumbrance+0) && ($budget_used + $total) > $budget_encumbrance)
155
      || ( ($budget_expenditure+0) && ($budget_used + $total) > $budget_expenditure) )
156
    {
157
        my ($template, $loggedinuser, $cookie) = get_template_and_user({
158
            template_name   => "acqui/addorder.tmpl",
159
            query           => $input,
160
            type            => "intranet",
161
            authnotrequired => 0,
162
            flagsrequired   => {acquisition => 'order_manage'},
163
        });
164
165
        my $url = $input->referer();
166
        unless ( defined $url ) {
167
            my $basketno = $input->param('basketno');
168
            $url = "/cgi-bin/koha/acqui/basket.pl?basketno=$basketno";
169
        }
170
171
        my $vars = $input->Vars;
172
        my @vars_loop;
173
        foreach (keys %$vars) {
174
            push @vars_loop, {
175
                name => $_,
176
                values => [$input->param($_)],
177
            };
178
        }
179
180
        if( ($budget_encumbrance+0) && ($budget_used + $total) > $budget_encumbrance
181
          && $total <= $budget_remaining)
182
        {
183
            $template->param(
184
                encumbrance_exceeded => 1,
185
                encumbrance => sprintf("%.2f", $budget->{'budget_encumb'}),
186
            );
187
        }
188
        if( ($budget_expenditure+0) && ($budget_used + $total) > $budget_expenditure
189
          && $total <= $budget_remaining )
190
        {
191
            my $currency = GetCurrency;
192
            $template->param(
193
                expenditure_exceeded => 1,
194
                expenditure => sprintf("%.2f", $budget_expenditure),
195
                currency => ($currency) ? $currency->{'symbol'} : '',
196
            );
197
        }
198
        if($total > $budget_remaining){
199
            $template->param(budget_exceeded => 1);
200
        }
201
202
        $template->param(
203
            not_enough_budget => 1,
204
            referer => $url,
205
            vars_loop => \@vars_loop,
206
        );
207
        output_html_with_http_headers $input, $cookie, $template->output;
208
        exit;
209
    }
210
}
139
211
140
# get_template_and_user used only to check auth & get user id
212
# get_template_and_user used only to check auth & get user id
141
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
213
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
(-)a/admin/aqbudgets.pl (-1 / +1 lines)
Lines 137-143 if ($op eq 'add_form') { Link Here
137
        $dropbox_disabled = BudgetHasChildren($budget_id);
137
        $dropbox_disabled = BudgetHasChildren($budget_id);
138
        my $borrower = &GetMember( borrowernumber=>$budget->{budget_owner_id} );
138
        my $borrower = &GetMember( borrowernumber=>$budget->{budget_owner_id} );
139
        $budget->{budget_owner_name} = $borrower->{'firstname'} . ' ' . $borrower->{'surname'};
139
        $budget->{budget_owner_name} = $borrower->{'firstname'} . ' ' . $borrower->{'surname'};
140
        $$budget{$_}= sprintf("%.2f", $budget->{$_}) for grep{/amount/} keys %$budget;
140
        $$budget{$_}= sprintf("%.2f", $budget->{$_}) for grep{ /amount|encumb|expend/ } keys %$budget;
141
    }
141
    }
142
142
143
    # build budget hierarchy
143
    # build budget hierarchy
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorder.tt (+41 lines)
Line 0 Link Here
1
[% INCLUDE "doc-head-open.inc" %]
2
<title>Koha &rsaquo; Acquisition &rsaquo; Add order</title>
3
[% INCLUDE "doc-head-close.inc" %]
4
</head>
5
6
<body>
7
[% INCLUDE "header.inc" %]
8
9
<div id="doc3" class="yui-t7">
10
11
<div id="bd">
12
  <div id="yui-main">
13
    <div class="yui-b">
14
      [% IF (not_enough_budget) %]
15
        <form action="/cgi-bin/koha/acqui/addorder.pl" method="post">
16
          [% FOREACH var IN vars_loop %]
17
            [% FOREACH val IN var.values %]
18
              <input type="hidden" name="[% var.name %]" value="[% val |html %]" />
19
            [% END %]
20
          [% END %]
21
          <input type="hidden" name="confirm_budget_exceeding" value="1" />
22
          <div class="dialog">
23
            [% IF (budget_exceeded) %]
24
              <p>Warning! Order total amount exceeds allowed budget.</p>
25
            [% END %]
26
            [% IF (encumbrance_exceeded) %]
27
              <p>Warning! You will exceed [% encumbrance %]% of your fund.</p>
28
            [% END %]
29
            [% IF (expenditure_exceeded) %]
30
              <p>Warning! You will exceed maximum limit ([% expenditure %][% IF (currency) %] [% currency %][% END %]) for your fund.</p>
31
            [% END %]
32
            <p>Do you want to confirm this order?</p>
33
            <input type="submit" class="approve" value="Yes, I confirm" />
34
            <input type="button" class="deny" value="No, I don't confirm" onclick="window.location.href = '[% referer %]'" />
35
          </div>
36
        </form>
37
      [% END %]
38
    </div>
39
  </div>
40
</div>
41
[% INCLUDE "intranet-bottom.inc" %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt (-7 / +8 lines)
Lines 352-365 Link Here
352
    <input type="text" name="budget_amount" id="budget_amount" value="[% budget_amount %]" size="8" />
352
    <input type="text" name="budget_amount" id="budget_amount" value="[% budget_amount %]" size="8" />
353
    </li>
353
    </li>
354
354
355
    <li style="display:none;">
355
    <li>
356
    <label for="budget_encumb">Encumbrance: </label>
356
      <label for="budget_encumb">Warning at (%): </label>
357
    <input type="text" name="budget_encumb" id="budget_encumb" value="[% budget_encumb %]" size="8" />
357
      <input type="text" name="budget_encumb" id="budget_encumb" value="[% budget_encumb %]" size="10" />
358
      <span style="color:grey">0 to disable</span>
358
    </li>
359
    </li>
359
360
360
    <li style="display:none;">
361
    <li>
361
    <label for="budget_expend">Expenditure: </label>
362
      <label for="budget_expend">Warning at (amount): </label>
362
    <input type="text" name="budget_expend" id="budget_expend" value="[% budget_expend %]" size="8" />
363
      <input type="text" name="budget_expend" id="budget_expend" value="[% budget_expend %]" size="10" /><input type="hidden" name="budget_owner_id" id="budget_owner_id" value="[% budget_owner_id %]" />
364
      <span style="color:grey">0 to disable</span>
363
    </li>
365
    </li>
364
366
365
    <li>
367
    <li>
366
- 

Return to bug 9822