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

(-)a/acqui/orderreceive.pl (-1 / +5 lines)
Lines 228-235 $template->param( Link Here
228
228
229
my $borrower = GetMember( 'borrowernumber' => $loggedinuser );
229
my $borrower = GetMember( 'borrowernumber' => $loggedinuser );
230
my @budget_loop;
230
my @budget_loop;
231
my $periods = GetBudgetPeriods( { 'budget_period_active' => 1 } );
231
my $periods = GetBudgetPeriods( );
232
foreach my $period (@$periods) {
232
foreach my $period (@$periods) {
233
    if ($period->{'budget_period_id'} == $budget->{'budget_period_id'}) {
234
        $template->{'VARS'}->{'budget_period_description'} = $period->{'budget_period_description'};
235
    }
236
    next if $period->{'budget_period_locked'} || !$period->{'budget_period_description'};
233
    my $budget_hierarchy = GetBudgetHierarchy( $period->{'budget_period_id'} );
237
    my $budget_hierarchy = GetBudgetHierarchy( $period->{'budget_period_id'} );
234
    my @funds;
238
    my @funds;
235
    foreach my $r ( @{$budget_hierarchy} ) {
239
    foreach my $r ( @{$budget_hierarchy} ) {
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt (-3 / +3 lines)
Lines 266-272 Link Here
266
       <ol>
266
       <ol>
267
       <li><label for="datereceived">Date received: </label><span> [% datereceived %] </span></li>
267
       <li><label for="datereceived">Date received: </label><span> [% datereceived %] </span></li>
268
       <li><label for="bookfund">Fund: </label><select id="bookfund" name="bookfund">
268
       <li><label for="bookfund">Fund: </label><select id="bookfund" name="bookfund">
269
            <option value="">Keep current ([% bookfund %])</option>
269
            <option value="">Keep current ([% budget_period_description %] - [% bookfund %])</option>
270
            [% FOREACH period IN budget_loop %]
270
            [% FOREACH period IN budget_loop %]
271
                <optgroup label="[% period.description %]">
271
                <optgroup label="[% period.description %]">
272
                [% FOREACH fund IN period.funds %]
272
                [% FOREACH fund IN period.funds %]
Lines 277-283 Link Here
277
                    [% END %]
277
                    [% END %]
278
                [% END %]
278
                [% END %]
279
            [% END %]
279
            [% END %]
280
       </select> (Current: [% bookfund %])</li>
280
       </select></li>
281
       <li><label>&nbsp;</label><span>(Current: [% budget_period_description %] - [% bookfund %])</span></li>
281
       <li><label for="creator">Created by: </label><span> [% IF ( memberfirstname and membersurname ) %][% IF ( memberfirstname ) %][% memberfirstname %][% END %] [% membersurname %][% ELSE %]No name[% END %]</span></li>
282
       <li><label for="creator">Created by: </label><span> [% IF ( memberfirstname and membersurname ) %][% IF ( memberfirstname ) %][% memberfirstname %][% END %] [% membersurname %][% ELSE %]No name[% END %]</span></li>
282
       <li><label for="quantity_to_receive">Quantity to receive: </label><span class="label">
283
       <li><label for="quantity_to_receive">Quantity to receive: </label><span class="label">
283
           [% IF ( edit and not subscriptionid) %]
284
           [% IF ( edit and not subscriptionid) %]
284
- 

Return to bug 10403