Attachment #168050 for bug #27063

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

Lines 215-222 sub Z3950Search { Link Here

(-)a/C4/Breeding.pm (-2 / +3 lines)
215		215
216	$template->param(	216	$template->param(
217	breeding_loop => \@breeding_loop,	217	breeding_loop => \@breeding_loop,
218	servers => \@servers,	218	servers => \@servers,
219	errconn => \@errconn	219	errconn => \@errconn,
		220	ordernumber => $pars->{ordernumber},
220	);	221	);
221	}	222	}
222		223

Lines 443-448 sub duplicate_to { Link Here

(-)a/Koha/Acquisition/Order.pm (-1 / +8 lines)
443	my ( $self, $basket, $default_values ) = @_;	443	my ( $self, $basket, $default_values ) = @_;
444	my $new_order;	444	my $new_order;
445	$default_values //= {};	445	$default_values //= {};
		446	my $linking_ordernumber = $default_values->{linking_ordernumber} \|\| undef;
		447	delete $default_values->{linking_ordernumber};
446	Koha::Database->schema->txn_do(	448	Koha::Database->schema->txn_do(
447	sub {	449	sub {
448	my $order_info = $self->unblessed;	450	my $order_info = $self->unblessed;
Lines 471-477 sub duplicate_to { Link Here
471	$order_info->{created_by} = $userenv->{number};	473	$order_info->{created_by} = $userenv->{number};
472	$order_info->{basketno} = $basket->basketno;	474	$order_info->{basketno} = $basket->basketno;
473		475
474	$new_order = Koha::Acquisition::Order->new($order_info)->store;	476	if ($linking_ordernumber) {
		477	delete $order_info->{ordernumber};
		478	$new_order = Koha::Acquisition::Orders->find($linking_ordernumber)->update($order_info);
		479	} else {
		480	$new_order = Koha::Acquisition::Order->new($order_info)->store;
		481	}
475		482
476	if ( ! $self->subscriptionid && $self->basket->effective_create_items eq 'ordering') { # Do copy items if not a subscription order AND if items are created on ordering	483	if ( ! $self->subscriptionid && $self->basket->effective_create_items eq 'ordering') { # Do copy items if not a subscription order AND if items are created on ordering
477	my $items = $self->items;	484	my $items = $self->items;

Lines 67-72 my $filters = { Link Here

(-)a/acqui/duplicate_orders.pl (+8 lines)
67	created_by => [$input->multi_param('created_by')]	67	created_by => [$input->multi_param('created_by')]
68	};	68	};
69		69
		70	my $linking_ordernumber = scalar $input->param('linking_ordernumber');
		71
70	my $from_placed_on =	72	my $from_placed_on =
71	eval { dt_from_string( scalar $input->param('from') ) } \|\| dt_from_string;	73	eval { dt_from_string( scalar $input->param('from') ) } \|\| dt_from_string;
72	my $to_placed_on =	74	my $to_placed_on =
Lines 124-129 elsif ( $op eq 'cud-batch_edit' ) { Link Here
124	$template->param(	126	$template->param(
125	currencies => Koha::Acquisition::Currencies->search,	127	currencies => Koha::Acquisition::Currencies->search,
126	budget_loop => $budget_loop,	128	budget_loop => $budget_loop,
		129	linking_ordernumber => $linking_ordernumber,
127	);	130	);
128	}	131	}
129	elsif ( $op eq 'cud-do_duplicate' ) {	132	elsif ( $op eq 'cud-do_duplicate' ) {
Lines 137-142 elsif ( $op eq 'cud-do_duplicate' ) { Link Here
137	$default_values->{$field} = $input->param("all_$field");	140	$default_values->{$field} = $input->param("all_$field");
138	}	141	}
139		142
		143	if ( $linking_ordernumber ) {
		144	$default_values->{linking_ordernumber} = $linking_ordernumber;
		145	}
		146
140	@ordernumbers = $input->multi_param('ordernumber');	147	@ordernumbers = $input->multi_param('ordernumber');
141	my @new_ordernumbers;	148	my @new_ordernumbers;
142	for my $ordernumber (@ordernumbers) {	149	for my $ordernumber (@ordernumbers) {
Lines 173-178 $template->param( Link Here
173	bp_loop => $bp_loop,	180	bp_loop => $bp_loop,
174	ordernumbers => \@ordernumbers,	181	ordernumbers => \@ordernumbers,
175	op => $op,	182	op => $op,
		183	linking_ordernumber => $linking_ordernumber,
176	);	184	);
177		185
178	output_html_with_http_headers $input, $cookie, $template->output;	186	output_html_with_http_headers $input, $cookie, $template->output;




my $bookseller = Koha::Acquisition::Booksellers->find($booksellerid);
$data = GetOrder($ordernumber) if $ordernumber;

my $newdata;

# re-linking order to a different record
if ( $biblionumber and $biblionumber != $data->{biblionumber} ) {
    $newdata = GetBiblioData($biblionumber);
} elsif ( $suggestionid and $ordernumber ) {
    $newdata = GetSuggestion($suggestionid);
} elsif ( $ordernumber and $input->param('relink') ) {
    $newdata = {};
}
if ($newdata) {
    $data->{biblionumber}     = $biblionumber;
    $data->{title}            = $newdata->{title}            || "";
    $data->{author}           = $newdata->{author}           || "";
    $data->{publishercode}    = $newdata->{publishercode}    || "";
    $data->{editionstatement} = $newdata->{editionstatement} || "";
    $data->{publicationyear}  = $newdata->{publicationyear}  || "";
    $data->{isbn}             = $newdata->{isbn}             || "";
    $data->{seriestitle}      = $newdata->{seriestitle}      || "";
    $data->{copyrightdate}    = $newdata->{copyrightdate}    || "";
}

output_and_exit( $input, $cookie, $template, 'unknown_basket') unless $basketobj;
output_and_exit( $input, $cookie, $template, 'unknown_vendor') unless $bookseller;


Lines 37-42 my $branch = $query->param('branch_filter'); Link Here

(-)a/acqui/newordersubscription.pl (+2 lines)
37	my $routing = $query->param('routing') \|\| C4::Context->preference("RoutingSerials");	37	my $routing = $query->param('routing') \|\| C4::Context->preference("RoutingSerials");
38	my $searched = $query->param('searched');	38	my $searched = $query->param('searched');
39	my $biblionumber = $query->param('biblionumber');	39	my $biblionumber = $query->param('biblionumber');
		40	my $ordernumber = $query->param('ordernumber');
40		41
41	my $basketno = $query->param('basketno');	42	my $basketno = $query->param('basketno');
42	my $booksellerid = $query->param('booksellerid');	43	my $booksellerid = $query->param('booksellerid');
Lines 88-92 $template->param( Link Here
88	basketno => $basket->{basketno},	89	basketno => $basket->{basketno},
89	basketname => $basket->{basketname},	90	basketname => $basket->{basketname},
90	booksellername => $bookseller->name,	91	booksellername => $bookseller->name,
		92	ordernumber => $ordernumber,
91	);	93	);
92	output_html_with_http_headers $query, $cookie, $template->output;	94	output_html_with_http_headers $query, $cookie, $template->output;





# getting the CGI params
my $basketno        = $input->param('basketno');
my $booksellerid    = $input->param('booksellerid');
my $author          = $input->param('author');
my $title           = $input->param('title');
my $publishercode   = $input->param('publishercode');
my $op              = $input->param('op');
my $suggestionid    = $input->param('suggestionid');
my $duplicateNumber = $input->param('duplicateNumber');
my $uncertainprice  = $input->param('uncertainprice');
my $ordernumber     = $input->param('ordernumber') || undef;

$op = 'else' unless $op;



my $vendor = Koha::Acquisition::Booksellers->find( $booksellerid );
$template->param(
    suggestions  => $suggestions,
    basketno     => $basketno,
    booksellerid => $booksellerid,
    name         => $vendor->name,
    "op_$op"     => 1,
    ordernumber  => $ordernumber,
);

output_html_with_http_headers $input, $cookie, $template->output;




my $basketno        = $input->param('basketno');
my $page            = $input->param('current_page') || 1;
$page               = $input->param('goto_page') if $input->param('changepage_goto');
my $ordernumber     = $input->param('ordernumber');

# get framework list
my $frameworks = Koha::BiblioFrameworks->search({}, { order_by => ['frameworktext'] });

    $template->param(
        serverloop   => [ $rs->all ],
        opsearch     => "cud-search",
        ordernumber  => $ordernumber,
    );
    output_html_with_http_headers $input, $cookie, $template->output;
    exit;

    exit;
}

my $pars = {
    biblionumber    => $biblionumber,
    page            => $page,
    id              => \@id,
    isbn            => $isbn,
    issn            => $issn,
    title           => $title,
    author          => $author,
    dewey           => $dewey,
    subject         => $subject,
    lccall          => $lccall,
    controlnumber   => $controlnumber,
    stdid           => $stdid,
    srchany         => $srchany,
    publicationyear => $publicationyear,
    ordernumber     => $ordernumber,
};
Z3950Search($pars, $template);
output_html_with_http_headers $input, $cookie, $template->output;

Lines 43-48 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/subscriptions-search.inc (+3 lines)
43	[% IF (basketno) %]	43	[% IF (basketno) %]
44	<input type="hidden" name="basketno" value="[% basketno \| html %]" />	44	<input type="hidden" name="basketno" value="[% basketno \| html %]" />
45	[% END %]	45	[% END %]
		46	[% IF ordernumber %]
		47	<input type="hidden" name="ordernumber" value="[% ordernumber \| html %]" />
		48	[% END %]
46	</div>	49	</div>
47	</fieldset>	50	</fieldset>
48	<fieldset class="action">	51	<fieldset class="action">

Lines 910-916 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt (-1 / +1 lines)
910	</li>	910	</li>
911	<li><a href="/cgi-bin/koha/acqui/newordersuggestion.pl?booksellerid=[% booksellerid \| uri %]&basketno=[% basket.basketno \| uri %]">From a suggestion</a></li>	911	<li><a href="/cgi-bin/koha/acqui/newordersuggestion.pl?booksellerid=[% booksellerid \| uri %]&basketno=[% basket.basketno \| uri %]">From a suggestion</a></li>
912	<li><a href="/cgi-bin/koha/acqui/newordersubscription.pl?booksellerid=[% booksellerid \| uri %]&basketno=[% basket.basketno \| uri %]">From a subscription</a></li>	912	<li><a href="/cgi-bin/koha/acqui/newordersubscription.pl?booksellerid=[% booksellerid \| uri %]&basketno=[% basket.basketno \| uri %]">From a subscription</a></li>
913	<li><a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% booksellerid \| uri %]&basketno=[% basket.basketno \| uri %]">From a new (empty) record</a></li>	913	<li><a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% booksellerid \| uri %]&basketno=[% basket.basketno \| uri %]&relink=1">From a new (empty) record</a></li>
914	<li><a href="/cgi-bin/koha/acqui/duplicate_orders.pl?basketno=[% basket.basketno \| uri %]">From existing orders (copy)</a></li>	914	<li><a href="/cgi-bin/koha/acqui/duplicate_orders.pl?basketno=[% basket.basketno \| uri %]">From existing orders (copy)</a></li>
915	<li><a href="/cgi-bin/koha/acqui/z3950_search.pl?booksellerid=[% booksellerid \| uri %]&basketno=[% basket.basketno \| uri %]">From an external source</a></li>	915	<li><a href="/cgi-bin/koha/acqui/z3950_search.pl?booksellerid=[% booksellerid \| uri %]&basketno=[% basket.basketno \| uri %]">From an external source</a></li>
916	</ul>	916	</ul>

Lines 71-76 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt (+24 lines)
71	<input type="hidden" name="basketno" value="[% basket.basketno \| html %]" />	71	<input type="hidden" name="basketno" value="[% basket.basketno \| html %]" />
72		72
73	<input type="hidden" name="ordernumbers" value="[% ordernumbers.join(',') \| html %]" />	73	<input type="hidden" name="ordernumbers" value="[% ordernumbers.join(',') \| html %]" />
		74	[% IF linking_ordernumber %]
		75	<input type="hidden" name="linking_ordernumber" value="[% linking_ordernumber \| html %]" />
		76	[% END %]
74	</div>	77	</div>
75	</fieldset>	78	</fieldset>
76	<fieldset class="action"><input type="submit" class="btn btn-primary" value="Search" /></fieldset>	79	<fieldset class="action"><input type="submit" class="btn btn-primary" value="Search" /></fieldset>
Lines 139-144 Link Here
139	<form method="post" action="/cgi-bin/koha/acqui/duplicate_orders.pl">	142	<form method="post" action="/cgi-bin/koha/acqui/duplicate_orders.pl">
140	[% INCLUDE 'csrf-token.inc' %]	143	[% INCLUDE 'csrf-token.inc' %]
141	<div id="orders_to_copy" class="page-section">	144	<div id="orders_to_copy" class="page-section">
		145	[% IF linking_ordernumber %]
		146	<div class="dialog message">Only one order can be selected for duplication when linking to an existing order.</div>
		147	[% END %]
142	<table id="table_orders">	148	<table id="table_orders">
143	<caption>	149	<caption>
144	<span class="actions"><a href="#" id="select_all"><i class="fa fa-check"></i> Select all</a>	150	<span class="actions"><a href="#" id="select_all"><i class="fa fa-check"></i> Select all</a>
Lines 178-183 Link Here
178	<fieldset class="action">	184	<fieldset class="action">
179	<input type="hidden" name="op" value="cud-batch_edit" />	185	<input type="hidden" name="op" value="cud-batch_edit" />
180	<input type="hidden" name="basketno" value="[% basket.basketno \| html %]" />	186	<input type="hidden" name="basketno" value="[% basket.basketno \| html %]" />
		187	[% IF linking_ordernumber %]
		188	<input type="hidden" name="linking_ordernumber" value="[% linking_ordernumber \| html %]" />
		189	[% END %]
181	<button type="submit" class="btn btn-primary go_to_batch_edit">Next <i class="fa fa-fw fa-arrow-right"></i></button>	190	<button type="submit" class="btn btn-primary go_to_batch_edit">Next <i class="fa fa-fw fa-arrow-right"></i></button>
182	</fieldset>	191	</fieldset>
183	</form>	192	</form>
Lines 259-264 Link Here
259	<input type="hidden" name="basketno" value="[% basket.basketno \| html %]" />	268	<input type="hidden" name="basketno" value="[% basket.basketno \| html %]" />
260	<!-- origquantityrec only here for javascript compatibility (additem.js needs it, useless here, useful when receiveing an order -->	269	<!-- origquantityrec only here for javascript compatibility (additem.js needs it, useless here, useful when receiveing an order -->
261	<input id="origquantityrec" readonly="readonly" type="hidden" name="origquantityrec" value="1" />	270	<input id="origquantityrec" readonly="readonly" type="hidden" name="origquantityrec" value="1" />
		271	[% IF linking_ordernumber %]
		272	<input type="hidden" name="linking_ordernumber" value="[% linking_ordernumber \| html %]" />
		273	[% END %]
262	<button type="submit" class="btn btn-primary">Duplicate orders</button>	274	<button type="submit" class="btn btn-primary">Duplicate orders</button>
263	<a class="cancel" href="/cgi-bin/koha/acqui/duplicate_orders.pl?basketno=[% basket.basketno \| html %]">Cancel</a>	275	<a class="cancel" href="/cgi-bin/koha/acqui/duplicate_orders.pl?basketno=[% basket.basketno \| html %]">Cancel</a>
264	</fieldset>	276	</fieldset>
Lines 435-440 Link Here
435	$("input[name='copy_existing_value']").each(function(){	447	$("input[name='copy_existing_value']").each(function(){
436	render_disabled(this);	448	render_disabled(this);
437	});	449	});
		450
		451	[% IF linking_ordernumber %]
		452	$("input[type='checkbox'][name='ordernumber']").on("click", function() {
		453	var checkbox_count = $("input[type='checkbox'][name='ordernumber']:checked").length;
		454	if ( checkbox_count < 1 ) {
		455	$("input[type='checkbox'][name='ordernumber']").removeAttr("disabled");
		456	} else {
		457	$("input[type='checkbox'][name='ordernumber']").prop("disabled","disabled");
		458	$("input[type='checkbox'][name='ordernumber']:checked").removeAttr("disabled");
		459	}
		460	});
		461	[% END %]
438	});	462	});
439	function render_disabled (elt) {	463	function render_disabled (elt) {
440	var field = $(elt).val();	464	var field = $(elt).val();

Lines 91-97 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt (+4 lines)
91	Outstanding order	91	Outstanding order
92	[% END %]	92	[% END %]
93	[% IF not sub.aqbooksellerid \|\| booksellerid == sub.aqbooksellerid %]	93	[% IF not sub.aqbooksellerid \|\| booksellerid == sub.aqbooksellerid %]
		94	[% IF ordernumber %]
		95	<a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% booksellerid \| uri %]&basketno=[% basketno \| uri %]&biblionumber=[% sub.biblionumber \| uri %]&from_subscriptionid=[% sub.subscriptionid \| uri %]&ordernumber=[% ordernumber \| uri %]" title="Order this one" class="btn btn-default btn-xs">
		96	[% ELSE %]
94	<a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% booksellerid \| uri %]&basketno=[% basketno \| uri %]&biblionumber=[% sub.biblionumber \| uri %]&from_subscriptionid=[% sub.subscriptionid \| uri %]" title="Order this one" class="btn btn-default btn-xs">	97	<a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% booksellerid \| uri %]&basketno=[% basketno \| uri %]&biblionumber=[% sub.biblionumber \| uri %]&from_subscriptionid=[% sub.subscriptionid \| uri %]" title="Order this one" class="btn btn-default btn-xs">
		98	[% END %]
95	<i class="fa fa-plus"></i> [% tp('verb', 'Order') \| html %]	99	<i class="fa fa-plus"></i> [% tp('verb', 'Order') \| html %]
96	</a>	100	</a>
97	[% ELSE %]	101	[% ELSE %]

Lines 101-109 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt (-2 / +10 lines)
101	</td>	101	</td>
102	<td class="actions">	102	<td class="actions">
103	[% IF ( suggestion.biblionumber ) %]	103	[% IF ( suggestion.biblionumber ) %]
104	<a href="neworderempty.pl?booksellerid=[% booksellerid \| uri %]&basketno=[% basketno \| uri %]&suggestionid=[% suggestion.suggestionid \| uri %]&biblio=[% suggestion.biblionumber \| uri %]" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> [% tp('verb', 'Order') \| html %]</a>	104	[% IF ordernumber %]
		105	<a href="neworderempty.pl?booksellerid=[% booksellerid \| uri %]&basketno=[% basketno \| uri %]&suggestionid=[% suggestion.suggestionid \| uri %]&biblio=[% suggestion.biblionumber \| uri %]&ordernumber=[% ordernumber \| uri %]" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> [% tp('verb', 'Order') \| html %]</a>
		106	[% ELSE %]
		107	<a href="neworderempty.pl?booksellerid=[% booksellerid \| uri %]&basketno=[% basketno \| uri %]&suggestionid=[% suggestion.suggestionid \| uri %]&biblio=[% suggestion.biblionumber \| uri %]" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> [% tp('verb', 'Order') \| html %]</a>
		108	[% END %]
105	[% ELSE %]	109	[% ELSE %]
106	<a href="neworderempty.pl?booksellerid=[% booksellerid \| uri %]&basketno=[% basketno \| uri %]&suggestionid=[% suggestion.suggestionid \| uri %]" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> [% tp('verb', 'Order') \| html %]</a>	110	[% IF ordernumber %]
		111	<a href="neworderempty.pl?booksellerid=[% booksellerid \| uri %]&basketno=[% basketno \| uri %]&suggestionid=[% suggestion.suggestionid \| uri %]&ordernumber=[% ordernumber \| uri %]" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> [% tp('verb', 'Order') \| html %]</a>
		112	[% ELSE %]
		113	<a href="neworderempty.pl?booksellerid=[% booksellerid \| uri %]&basketno=[% basketno \| uri %]&suggestionid=[% suggestion.suggestionid \| uri %]" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> [% tp('verb', 'Order') \| html %]</a>
		114	[% END %]
107	[% END %]	115	[% END %]
108	</td>	116	</td>
109	</tr>	117	</tr>

Lines 128-133 tr.selected td { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt (-2 / +8 lines)
128	<input type="hidden" name="biblionumber" value="[% biblionumber \| html %]" />	128	<input type="hidden" name="biblionumber" value="[% biblionumber \| html %]" />
129	<input type="hidden" name="basketno" value="[% basketno \| html %]" />	129	<input type="hidden" name="basketno" value="[% basketno \| html %]" />
130	<input type="hidden" name="booksellerid" value="[% booksellerid \| html %]" />	130	<input type="hidden" name="booksellerid" value="[% booksellerid \| html %]" />
		131	<input type="hidden" name="ordernumber" value="[% ordernumber \| html %]" />
131	</div> <!-- /.col-sm-6 -->	132	</div> <!-- /.col-sm-6 -->
132	<div class="col-sm-6">	133	<div class="col-sm-6">
133	<h2>Search targets</h2>	134	<h2>Search targets</h2>
Lines 220-226 tr.selected td { Link Here
220	<ul class="dropdown-menu pull-right" role="menu" aria-labelledby="z3950preview[% breeding_loo.breedingid \| html %]">	221	<ul class="dropdown-menu pull-right" role="menu" aria-labelledby="z3950preview[% breeding_loo.breedingid \| html %]">
221	<li><a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% breeding_loo.breedingid \| uri %]" title="MARC" class="previewData" data-action="show_marc"><i class="fa-solid fa-eye"></i> MARC</a></li>	222	<li><a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% breeding_loo.breedingid \| uri %]" title="MARC" class="previewData" data-action="show_marc"><i class="fa-solid fa-eye"></i> MARC</a></li>
222	<li><a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&importid=[% breeding_loo.breedingid \| uri %]" title="Card" class="previewData" data-action="show_card"><i class="fa-solid fa-eye"></i> Card</a></li>	223	<li><a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&importid=[% breeding_loo.breedingid \| uri %]" title="Card" class="previewData" data-action="show_card"><i class="fa-solid fa-eye"></i> Card</a></li>
223	<li><a href="/cgi-bin/koha/acqui/neworderempty.pl?frameworkcode=[% frameworkcode \| uri %]&breedingid=[% breeding_loo.breedingid \| uri %]&booksellerid=[% booksellerid \| uri %]&basketno=[% basketno \| uri %]" class="chosen" title="[% tp('verb', 'Order') \| html %]" data-action="order"><i class="fa fa-plus"></i> [% tp('verb', 'Order') \| html %]</a></li>	224	<li>
		225	[% IF ordernumber %]
		226	<a href="/cgi-bin/koha/acqui/neworderempty.pl?frameworkcode=[% frameworkcode \| uri %]&breedingid=[% breeding_loo.breedingid \| uri %]&booksellerid=[% booksellerid \| uri %]&basketno=[% basketno \| uri %]&ordernumber=[% ordernumber \| uri %]" class="chosen" title="[% tp('verb', 'Order') \| html %]" data-action="order"><i class="fa fa-plus"></i> [% tp('verb', 'Order') \| html %]</a>
		227	[% ELSE %]
		228	<a href="/cgi-bin/koha/acqui/neworderempty.pl?frameworkcode=[% frameworkcode \| uri %]&breedingid=[% breeding_loo.breedingid \| uri %]&booksellerid=[% booksellerid \| uri %]&basketno=[% basketno \| uri %]" class="chosen" title="[% tp('verb', 'Order') \| html %]" data-action="order"><i class="fa fa-plus"></i> [% tp('verb', 'Order') \| html %]</a>
		229	[% END %]
		230	</li>
224	</ul>	231	</ul>
225	</div>	232	</div>
226	</td>	233	</td>
227	-

Return to bug 27063

Lines 146-151 $booksellerid = $basket->{booksellerid} unless $booksellerid; Link Here

(-)a/acqui/neworderempty.pl (+22 lines)
146	my $bookseller = Koha::Acquisition::Booksellers->find($booksellerid);	146	my $bookseller = Koha::Acquisition::Booksellers->find($booksellerid);
147	$data = GetOrder($ordernumber) if $ordernumber;	147	$data = GetOrder($ordernumber) if $ordernumber;
148		148
		149	my $newdata;
		150
		151	# re-linking order to a different record
		152	if ( $biblionumber and $biblionumber != $data->{biblionumber} ) {
		153	$newdata = GetBiblioData($biblionumber);
		154	} elsif ( $suggestionid and $ordernumber ) {
		155	$newdata = GetSuggestion($suggestionid);
		156	} elsif ( $ordernumber and $input->param('relink') ) {
		157	$newdata = {};
		158	}
		159	if ($newdata) {
		160	$data->{biblionumber} = $biblionumber;
		161	$data->{title} = $newdata->{title} \|\| "";
		162	$data->{author} = $newdata->{author} \|\| "";
		163	$data->{publishercode} = $newdata->{publishercode} \|\| "";
		164	$data->{editionstatement} = $newdata->{editionstatement} \|\| "";
		165	$data->{publicationyear} = $newdata->{publicationyear} \|\| "";
		166	$data->{isbn} = $newdata->{isbn} \|\| "";
		167	$data->{seriestitle} = $newdata->{seriestitle} \|\| "";
		168	$data->{copyrightdate} = $newdata->{copyrightdate} \|\| "";
		169	}
		170
149	output_and_exit( $input, $cookie, $template, 'unknown_basket') unless $basketobj;	171	output_and_exit( $input, $cookie, $template, 'unknown_basket') unless $basketobj;
150	output_and_exit( $input, $cookie, $template, 'unknown_vendor') unless $bookseller;	172	output_and_exit( $input, $cookie, $template, 'unknown_vendor') unless $bookseller;
151		173

Lines 103-116 my $input = CGI->new; Link Here

(-)a/acqui/newordersuggestion.pl (-7 / +9 lines)
103		103
104	# getting the CGI params	104	# getting the CGI params
105	my $basketno = $input->param('basketno');	105	my $basketno = $input->param('basketno');
106	my $booksellerid = $input->param('booksellerid');	106	my $booksellerid = $input->param('booksellerid');
107	my $author = $input->param('author');	107	my $author = $input->param('author');
108	my $title = $input->param('title');	108	my $title = $input->param('title');
109	my $publishercode = $input->param('publishercode');	109	my $publishercode = $input->param('publishercode');
110	my $op = $input->param('op');	110	my $op = $input->param('op');
111	my $suggestionid = $input->param('suggestionid');	111	my $suggestionid = $input->param('suggestionid');
112	my $duplicateNumber = $input->param('duplicateNumber');	112	my $duplicateNumber = $input->param('duplicateNumber');
113	my $uncertainprice = $input->param('uncertainprice');	113	my $uncertainprice = $input->param('uncertainprice');
		114	my $ordernumber = $input->param('ordernumber') \|\| undef;
114		115
115	$op = 'else' unless $op;	116	$op = 'else' unless $op;
116		117
Lines 140-150 my $suggestions = [ Koha::Suggestions->search_limited( Link Here
140		141
141	my $vendor = Koha::Acquisition::Booksellers->find( $booksellerid );	142	my $vendor = Koha::Acquisition::Booksellers->find( $booksellerid );
142	$template->param(	143	$template->param(
143	suggestions => $suggestions,	144	suggestions => $suggestions,
144	basketno => $basketno,	145	basketno => $basketno,
145	booksellerid => $booksellerid,	146	booksellerid => $booksellerid,
146	name => $vendor->name,	147	name => $vendor->name,
147	"op_$op" => 1,	148	"op_$op" => 1,
		149	ordernumber => $ordernumber,
148	);	150	);
149		151
150	output_html_with_http_headers $input, $cookie, $template->output;	152	output_html_with_http_headers $input, $cookie, $template->output;

Lines 50-55 my $booksellerid = $input->param('booksellerid'); Link Here

(-)a/acqui/z3950_search.pl (-15 / +18 lines)
50	my $basketno = $input->param('basketno');	50	my $basketno = $input->param('basketno');
51	my $page = $input->param('current_page') \|\| 1;	51	my $page = $input->param('current_page') \|\| 1;
52	$page = $input->param('goto_page') if $input->param('changepage_goto');	52	$page = $input->param('goto_page') if $input->param('changepage_goto');
		53	my $ordernumber = $input->param('ordernumber');
53		54
54	# get framework list	55	# get framework list
55	my $frameworks = Koha::BiblioFrameworks->search({}, { order_by => ['frameworktext'] });	56	my $frameworks = Koha::BiblioFrameworks->search({}, { order_by => ['frameworktext'] });
Lines 99-104 if ( $op ne "cud-do_search" ) { Link Here
99	$template->param(	100	$template->param(
100	serverloop => [ $rs->all ],	101	serverloop => [ $rs->all ],
101	opsearch => "cud-search",	102	opsearch => "cud-search",
		103	ordernumber => $ordernumber,
102	);	104	);
103	output_html_with_http_headers $input, $cookie, $template->output;	105	output_html_with_http_headers $input, $cookie, $template->output;
104	exit;	106	exit;
Lines 111-131 if (@id==0) { Link Here
111	exit;	113	exit;
112	}	114	}
113		115
114	my $pars= {	116	my $pars = {
115	biblionumber => $biblionumber,	117	biblionumber => $biblionumber,
116	page => $page,	118	page => $page,
117	id => \@id,	119	id => \@id,
118	isbn => $isbn,	120	isbn => $isbn,
119	issn => $issn,	121	issn => $issn,
120	title => $title,	122	title => $title,
121	author => $author,	123	author => $author,
122	dewey => $dewey,	124	dewey => $dewey,
123	subject => $subject,	125	subject => $subject,
124	lccall => $lccall,	126	lccall => $lccall,
125	controlnumber => $controlnumber,	127	controlnumber => $controlnumber,
126	stdid => $stdid,	128	stdid => $stdid,
127	srchany => $srchany,	129	srchany => $srchany,
128	publicationyear => $publicationyear,	130	publicationyear => $publicationyear,
		131	ordernumber => $ordernumber,
129	};	132	};
130	Z3950Search($pars, $template);	133	Z3950Search($pars, $template);
131	output_html_with_http_headers $input, $cookie, $template->output;	134	output_html_with_http_headers $input, $cookie, $template->output;