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

(-)a/acqui/neworderempty.pl (-4 / +10 lines)
Lines 135-140 my $bookseller = Koha::Acquisition::Booksellers->find( $booksellerid ); Link Here
135
output_and_exit( $input, $cookie, $template, 'unknown_basket') unless $basketobj;
135
output_and_exit( $input, $cookie, $template, 'unknown_basket') unless $basketobj;
136
output_and_exit( $input, $cookie, $template, 'unknown_vendor') unless $bookseller;
136
output_and_exit( $input, $cookie, $template, 'unknown_vendor') unless $bookseller;
137
137
138
$template->param(
139
    ordernumber  => $ordernumber,
140
    basketno     => $basketno,
141
    basket       => $basket,
142
    booksellerid => $basket->{'booksellerid'},
143
    name         => $bookseller->name,
144
);
145
output_and_exit( $input, $cookie, $template, 'order_cannot_be_edited' )
146
    if $ordernumber and $basketobj->closedate;
147
138
my $contract = GetContract({
148
my $contract = GetContract({
139
    contractnumber => $basket->{contractnumber}
149
    contractnumber => $basket->{contractnumber}
140
});
150
});
Lines 408-417 $quantity //= 0; Link Here
408
# fill template
418
# fill template
409
$template->param(
419
$template->param(
410
    existing         => $biblionumber,
420
    existing         => $biblionumber,
411
    ordernumber           => $ordernumber,
412
    # basket informations
421
    # basket informations
413
    basketno             => $basketno,
414
    basket               => $basket,
415
    basketname           => $basket->{'basketname'},
422
    basketname           => $basket->{'basketname'},
416
    basketnote           => $basket->{'note'},
423
    basketnote           => $basket->{'note'},
417
    booksellerid         => $basket->{'booksellerid'},
424
    booksellerid         => $basket->{'booksellerid'},
Lines 436-442 $template->param( Link Here
436
    order_vendornote     => $data->{'order_vendornote'},
443
    order_vendornote     => $data->{'order_vendornote'},
437
    listincgst       => $bookseller->listincgst,
444
    listincgst       => $bookseller->listincgst,
438
    invoiceincgst    => $bookseller->invoiceincgst,
445
    invoiceincgst    => $bookseller->invoiceincgst,
439
    name             => $bookseller->name,
440
    cur_active_sym   => $active_currency->symbol,
446
    cur_active_sym   => $active_currency->symbol,
441
    cur_active       => $active_currency->currency,
447
    cur_active       => $active_currency->currency,
442
    currencies       => \@currencies,
448
    currencies       => \@currencies,
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/blocking_errors.inc (-1 / +2 lines)
Lines 13-18 Link Here
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