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

(-)a/acqui/orderreceive.pl (-3 / +12 lines)
Lines 70-75 use C4::Auth; Link Here
70
use C4::Output;
70
use C4::Output;
71
use C4::Dates qw/format_date/;
71
use C4::Dates qw/format_date/;
72
use C4::Bookseller qw/ GetBookSellerFromId /;
72
use C4::Bookseller qw/ GetBookSellerFromId /;
73
use C4::Budgets qw/ GetBudget /;
73
use C4::Members;
74
use C4::Members;
74
use C4::Branch;    # GetBranches
75
use C4::Branch;    # GetBranches
75
use C4::Items;
76
use C4::Items;
Lines 133-138 if ( $count == 1 ) { Link Here
133
    if ( @$results[0]->{'unitprice'} == 0 ) {
134
    if ( @$results[0]->{'unitprice'} == 0 ) {
134
        @$results[0]->{'unitprice'} = '';
135
        @$results[0]->{'unitprice'} = '';
135
    }
136
    }
137
    
138
    my $authorisedby = @$results[0]->{'authorisedby'};
139
    my $member = GetMember( borrowernumber => $authorisedby );
140
141
    my $budget = GetBudget( @$results[0]->{'budget_id'} );
142
136
    $template->param(
143
    $template->param(
137
        count                 => 1,
144
        count                 => 1,
138
        biblionumber          => @$results[0]->{'biblionumber'},
145
        biblionumber          => @$results[0]->{'biblionumber'},
Lines 148-164 if ( $count == 1 ) { Link Here
148
        copyrightdate         => @$results[0]->{'copyrightdate'},
155
        copyrightdate         => @$results[0]->{'copyrightdate'},
149
        isbn                  => @$results[0]->{'isbn'},
156
        isbn                  => @$results[0]->{'isbn'},
150
        seriestitle           => @$results[0]->{'seriestitle'},
157
        seriestitle           => @$results[0]->{'seriestitle'},
151
        bookfund              => @$results[0]->{'bookfundid'},
158
        bookfund              => $budget->{budget_name},
152
        quantity              => @$results[0]->{'quantity'},
159
        quantity              => @$results[0]->{'quantity'},
153
        quantityreceivedplus1 => @$results[0]->{'quantityreceived'} + 1,
160
        quantityreceivedplus1 => @$results[0]->{'quantityreceived'} + 1,
154
        quantityreceived      => @$results[0]->{'quantityreceived'},
161
        quantityreceived      => @$results[0]->{'quantityreceived'},
155
        rrp                   => @$results[0]->{'rrp'},
162
        rrp                   => @$results[0]->{'rrp'},
156
        ecost                 => @$results[0]->{'ecost'},
163
        ecost                 => @$results[0]->{'ecost'},
157
        unitprice             => @$results[0]->{'unitprice'},
164
        unitprice             => @$results[0]->{'unitprice'},
165
        memberfirstname       => $member->{firstname},
166
        membersurname         => $member->{surname},
158
        invoice               => $invoice,
167
        invoice               => $invoice,
159
        datereceived          => $datereceived->output(),
168
        datereceived          => $datereceived->output(),
160
        datereceived_iso          => $datereceived->output('iso'),
169
        datereceived_iso      => $datereceived->output('iso'),
161
        notes                       =>              $order->{notes}
170
        notes                 => $order->{notes}
162
    );
171
    );
163
}
172
}
164
else {
173
else {
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt (-2 / +3 lines)
Lines 89-95 Link Here
89
    <fieldset class="rows">
89
    <fieldset class="rows">
90
    <legend>Accounting details</legend>
90
    <legend>Accounting details</legend>
91
       <ol>
91
       <ol>
92
       <li><label for="datereceived">Date received: </label><span class="label"> [% datereceived %] </span></li>
92
       <li><label for="datereceived">Date received: </label><span> [% datereceived %] </span></li>
93
       <li><label for="bookfund">Budget: </label><span> [% bookfund %] </span></li>
94
       <li><label for="creator">Created by: </label><span> [% IF ( memberfirstname ) %][% memberfirstname %][% END %] [% membersurname %] </span></li>
93
       <li><label for="quantityto">Quantity to receive: </label><span class="label">
95
       <li><label for="quantityto">Quantity to receive: </label><span class="label">
94
           [% IF ( edit ) %]
96
           [% IF ( edit ) %]
95
               <input type="text" name="quantity" value="[% quantity %]" />
97
               <input type="text" name="quantity" value="[% quantity %]" />
96
- 

Return to bug 3184