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