@@ -, +, @@ --- acqui/orderreceive.pl | 13 ------------- .../prog/en/modules/acqui/orderreceive.tt | 21 +++++++++++---------- 2 files changed, 11 insertions(+), 23 deletions(-) --- a/acqui/orderreceive.pl +++ a/acqui/orderreceive.pl @@ -114,18 +114,6 @@ unless($acq_fw) { $template->param('NoACQframework' => 1); } -my $AcqCreateItem = $basket->effective_create_items; -if ($AcqCreateItem eq 'receiving') { - $template->param( - AcqCreateItemReceiving => 1, - UniqueItemFields => C4::Context->preference('UniqueItemFields'), - ); -} elsif ($AcqCreateItem eq 'ordering') { - my $fw = ($acq_fw) ? 'ACQ' : ''; - my $items = $order->items; - $template->param(items => $items); -} - my $suggestion = GetSuggestionInfoFromBiblionumber($order->{biblionumber}); my $creator = Koha::Patrons->find( $order->created_by ); @@ -161,7 +149,6 @@ if ( $order->subscriptionid ) { } $template->param( - AcqCreateItem => $AcqCreateItem, count => 1, order => $order, name => $bookseller->name, --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt @@ -19,6 +19,7 @@
+ [% AcqCreateItem = order.basket.effective_create_items %]
@@ -111,7 +112,7 @@ - [% ELSIF (AcqCreateItemReceiving) %] + [% ELSIF (AcqCreateItem == 'receiving') %]