Lines 120-125
my %foot;
Link Here
|
120 |
my $total_gste = 0; |
120 |
my $total_gste = 0; |
121 |
my $total_gsti = 0; |
121 |
my $total_gsti = 0; |
122 |
|
122 |
|
|
|
123 |
my $subtotal_for_funds; |
123 |
for my $order ( @orders ) { |
124 |
for my $order ( @orders ) { |
124 |
$order = C4::Acquisition::populate_order_with_prices({ order => $order, booksellerid => $bookseller->{id}, receiving => 1, ordering => 1 }); |
125 |
$order = C4::Acquisition::populate_order_with_prices({ order => $order, booksellerid => $bookseller->{id}, receiving => 1, ordering => 1 }); |
125 |
$order->{'unitprice'} += 0; |
126 |
$order->{'unitprice'} += 0; |
Lines 162-169
for my $order ( @orders ) {
Link Here
|
162 |
} |
163 |
} |
163 |
} |
164 |
} |
164 |
|
165 |
|
165 |
my $budget = GetBudget( $line{budget_id} ); |
166 |
my $budget_name = GetBudgetName( $line{budget_id} ); |
166 |
$line{budget_name} = $budget->{'budget_name'}; |
167 |
$line{budget_name} = $budget_name; |
|
|
168 |
|
169 |
$subtotal_for_funds->{ $line{budget_name} }{ecost} += $order->{ecost} * $order->{quantity}; |
170 |
$subtotal_for_funds->{ $line{budget_name} }{unitprice} += $order->{total}; |
167 |
|
171 |
|
168 |
push @loop_received, \%line; |
172 |
push @loop_received, \%line; |
169 |
} |
173 |
} |
Lines 261-268
unless( defined $invoice->{closedate} ) {
Link Here
|
261 |
$line{holds} = $holds; |
265 |
$line{holds} = $holds; |
262 |
$line{holds_on_order} = $itemholds?$itemholds:$holds if $line{left_holds_on_order}; |
266 |
$line{holds_on_order} = $itemholds?$itemholds:$holds if $line{left_holds_on_order}; |
263 |
|
267 |
|
264 |
my $budget = GetBudget( $line{budget_id} ); |
268 |
my $budget_name = GetBudgetName( $line{budget_id} ); |
265 |
$line{budget_name} = $budget->{'budget_name'}; |
269 |
$line{budget_name} = $budget_name; |
266 |
|
270 |
|
267 |
push @loop_orders, \%line; |
271 |
push @loop_orders, \%line; |
268 |
} |
272 |
} |
Lines 287-292
$template->param(
Link Here
|
287 |
(uc(C4::Context->preference("marcflavour"))) => 1, |
291 |
(uc(C4::Context->preference("marcflavour"))) => 1, |
288 |
total_gste => $total_gste, |
292 |
total_gste => $total_gste, |
289 |
total_gsti => $total_gsti, |
293 |
total_gsti => $total_gsti, |
|
|
294 |
subtotal_for_funds => $subtotal_for_funds, |
290 |
sticky_filters => $sticky_filters, |
295 |
sticky_filters => $sticky_filters, |
291 |
); |
296 |
); |
292 |
output_html_with_http_headers $input, $cookie, $template->output; |
297 |
output_html_with_http_headers $input, $cookie, $template->output; |