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

(-)a/acqui/neworderempty.pl (-4 / +4 lines)
Lines 135-143 if(!$basketno) { Link Here
135
}
135
}
136
136
137
our $basket = GetBasket($basketno);
137
our $basket = GetBasket($basketno);
138
my $basketobj = Koha::Acquisition::Baskets->find( $basketno );
138
my $basketobj = Koha::Acquisition::Baskets->find($basketno);
139
$booksellerid = $basket->{booksellerid} unless $booksellerid;
139
$booksellerid = $basket->{booksellerid} unless $booksellerid;
140
my $bookseller = Koha::Acquisition::Booksellers->find( $booksellerid );
140
my $bookseller = Koha::Acquisition::Booksellers->find($booksellerid);
141
$data = GetOrder($ordernumber) if $ordernumber;
141
142
142
output_and_exit( $input, $cookie, $template, 'unknown_basket') unless $basketobj;
143
output_and_exit( $input, $cookie, $template, 'unknown_basket') unless $basketobj;
143
output_and_exit( $input, $cookie, $template, 'unknown_vendor') unless $bookseller;
144
output_and_exit( $input, $cookie, $template, 'unknown_vendor') unless $bookseller;
Lines 150-156 $template->param( Link Here
150
    name         => $bookseller->name,
151
    name         => $bookseller->name,
151
);
152
);
152
output_and_exit( $input, $cookie, $template, 'order_cannot_be_edited' )
153
output_and_exit( $input, $cookie, $template, 'order_cannot_be_edited' )
153
    if $ordernumber and $basketobj->closedate;
154
    if $ordernumber and ( $basketobj->closedate || $data->{orderstatus} eq "complete" );
154
155
155
my $contract = GetContract({
156
my $contract = GetContract({
156
    contractnumber => $basket->{contractnumber}
157
    contractnumber => $basket->{contractnumber}
Lines 259-265 if ( not $ordernumber ) { # create order Link Here
259
    }
260
    }
260
}
261
}
261
else {    #modify order
262
else {    #modify order
262
    $data   = GetOrder($ordernumber);
263
    $budget_id = $data->{'budget_id'};
263
    $budget_id = $data->{'budget_id'};
264
264
265
    $template->param(
265
    $template->param(
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/blocking_errors.inc (-1 / +1 lines)
Lines 14-20 Link Here
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' %]
16
    [% CASE 'order_cannot_be_edited' %]
17
        <div class="dialog message">This order cannot be edited, the basket is closed.</div>
17
        <div class="dialog message">This order cannot be edited, the basket is closed or the order was already received.</div>
18
    [% CASE 'wrong_csrf_token' %]
18
    [% CASE 'wrong_csrf_token' %]
19
        <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>
20
    [% CASE 'budget_is_locked' %]
20
    [% CASE 'budget_is_locked' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt (-2 / +1 lines)
Lines 656-663 Link Here
656
                                                        [% IF ( active ) %]
656
                                                        [% IF ( active ) %]
657
                                                            [% UNLESS ( closedate ) %]
657
                                                            [% UNLESS ( closedate ) %]
658
                                                                <td>
658
                                                                <td>
659
                                                                    <a href="neworderempty.pl?ordernumber=[% books_loo.ordernumber | uri %]&amp;booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]">Modify</a>
660
                                                                    [% UNLESS (books_loo.order_received) %]
659
                                                                    [% UNLESS (books_loo.order_received) %]
660
                                                                        <a href="neworderempty.pl?ordernumber=[% books_loo.ordernumber | uri %]&amp;booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]">Modify</a>
661
                                                                        <br />
661
                                                                        <br />
662
                                                                        <a href="#" class="transfer_order" data-ordernumber="[% books_loo.ordernumber | html %]">Transfer</a>
662
                                                                        <a href="#" class="transfer_order" data-ordernumber="[% books_loo.ordernumber | html %]">Transfer</a>
663
                                                                    [% END %]
663
                                                                    [% END %]
664
- 

Return to bug 34469