Attachment #107624 for bug #10921

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




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

$template->param(
    ordernumber  => $ordernumber,
    basketno     => $basketno,
    basket       => $basket,
    booksellerid => $basket->{'booksellerid'},
    name         => $bookseller->name,
);
output_and_exit( $input, $cookie, $template, 'order_cannot_be_edited' )
    if $ordernumber and $basketobj->closedate;

my $contract = GetContract({
    contractnumber => $basket->{contractnumber}
});

# fill template
$template->param(
    existing         => $biblionumber,
    ordernumber           => $ordernumber,
    # basket informations
    basketno             => $basketno,
    basket               => $basket,
    basketname           => $basket->{'basketname'},
    basketnote           => $basket->{'note'},
    booksellerid         => $basket->{'booksellerid'},

    order_vendornote     => $data->{'order_vendornote'},
    listincgst       => $bookseller->listincgst,
    invoiceincgst    => $bookseller->invoiceincgst,
    name             => $bookseller->name,
    cur_active_sym   => $active_currency->symbol,
    cur_active       => $active_currency->currency,
    currencies       => \@currencies,

Lines 13-18 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/blocking_errors.inc (-1 / +2 lines)
13	<div class="dialog message">Basket not found.</div>	13	<div class="dialog message">Basket not found.</div>
14	[% CASE 'unknown_vendor' %]	14	[% CASE 'unknown_vendor' %]
15	<div class="dialog message">Vendor not found.</div>	15	<div class="dialog message">Vendor not found.</div>
		16	[% CASE 'order_cannot_be_edited' %]
		17	<div class="dialog message">This order cannot be edited, the basket is closed.</div>
16	[% CASE 'wrong_csrf_token' %]	18	[% CASE 'wrong_csrf_token' %]
17	<div class="dialog message">The form submission failed (Wrong CSRF token). Try to come back, refresh the page, then try again.</div>	19	<div class="dialog message">The form submission failed (Wrong CSRF token). Try to come back, refresh the page, then try again.</div>
18	[% CASE 'budget_is_locked' %]	20	[% CASE 'budget_is_locked' %]
19	-

Return to bug 10921

Lines 136-141 my $bookseller = Koha::Acquisition::Booksellers->find( $booksellerid ); Link Here

(-)a/acqui/neworderempty.pl (-4 / +10 lines)
136	output_and_exit( $input, $cookie, $template, 'unknown_basket') unless $basketobj;	136	output_and_exit( $input, $cookie, $template, 'unknown_basket') unless $basketobj;
137	output_and_exit( $input, $cookie, $template, 'unknown_vendor') unless $bookseller;	137	output_and_exit( $input, $cookie, $template, 'unknown_vendor') unless $bookseller;
138		138
		139	$template->param(
		140	ordernumber => $ordernumber,
		141	basketno => $basketno,
		142	basket => $basket,
		143	booksellerid => $basket->{'booksellerid'},
		144	name => $bookseller->name,
		145	);
		146	output_and_exit( $input, $cookie, $template, 'order_cannot_be_edited' )
		147	if $ordernumber and $basketobj->closedate;
		148
139	my $contract = GetContract({	149	my $contract = GetContract({
140	contractnumber => $basket->{contractnumber}	150	contractnumber => $basket->{contractnumber}
141	});	151	});
Lines 407-416 $quantity //= 0; Link Here
407	# fill template	417	# fill template
408	$template->param(	418	$template->param(
409	existing => $biblionumber,	419	existing => $biblionumber,
410	ordernumber => $ordernumber,
411	# basket informations	420	# basket informations
412	basketno => $basketno,
413	basket => $basket,
414	basketname => $basket->{'basketname'},	421	basketname => $basket->{'basketname'},
415	basketnote => $basket->{'note'},	422	basketnote => $basket->{'note'},
416	booksellerid => $basket->{'booksellerid'},	423	booksellerid => $basket->{'booksellerid'},
Lines 435-441 $template->param( Link Here
435	order_vendornote => $data->{'order_vendornote'},	442	order_vendornote => $data->{'order_vendornote'},
436	listincgst => $bookseller->listincgst,	443	listincgst => $bookseller->listincgst,
437	invoiceincgst => $bookseller->invoiceincgst,	444	invoiceincgst => $bookseller->invoiceincgst,
438	name => $bookseller->name,
439	cur_active_sym => $active_currency->symbol,	445	cur_active_sym => $active_currency->symbol,
440	cur_active => $active_currency->currency,	446	cur_active => $active_currency->currency,
441	currencies => \@currencies,	447	currencies => \@currencies,