diff --git a/acqui/neworderempty.pl b/acqui/neworderempty.pl index bc5b35d8d9..2557a4c51b 100755 --- a/acqui/neworderempty.pl +++ b/acqui/neworderempty.pl @@ -135,9 +135,10 @@ if(!$basketno) { } our $basket = GetBasket($basketno); -my $basketobj = Koha::Acquisition::Baskets->find( $basketno ); +my $basketobj = Koha::Acquisition::Baskets->find($basketno); $booksellerid = $basket->{booksellerid} unless $booksellerid; -my $bookseller = Koha::Acquisition::Booksellers->find( $booksellerid ); +my $bookseller = Koha::Acquisition::Booksellers->find($booksellerid); +$data = GetOrder($ordernumber) if $ordernumber; output_and_exit( $input, $cookie, $template, 'unknown_basket') unless $basketobj; output_and_exit( $input, $cookie, $template, 'unknown_vendor') unless $bookseller; @@ -150,7 +151,7 @@ $template->param( name => $bookseller->name, ); output_and_exit( $input, $cookie, $template, 'order_cannot_be_edited' ) - if $ordernumber and $basketobj->closedate; + if $ordernumber and ( $basketobj->closedate || $data->{orderstatus} eq "complete" ); my $contract = GetContract({ contractnumber => $basket->{contractnumber} @@ -259,7 +260,6 @@ if ( not $ordernumber ) { # create order } } else { #modify order - $data = GetOrder($ordernumber); $budget_id = $data->{'budget_id'}; $template->param( diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/blocking_errors.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/blocking_errors.inc index 1821f54817..b596390fd5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/blocking_errors.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/blocking_errors.inc @@ -14,7 +14,7 @@ [% CASE 'unknown_vendor' %]
Vendor not found.
[% CASE 'order_cannot_be_edited' %] -
This order cannot be edited, the basket is closed.
+
This order cannot be edited, the basket is closed or the order was already received.
[% CASE 'wrong_csrf_token' %]
The form submission failed (Wrong CSRF token). Try to come back, refresh the page, then try again.
[% CASE 'budget_is_locked' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt index 604d1a2f36..9dc8ccff0c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt @@ -656,8 +656,8 @@ [% IF ( active ) %] [% UNLESS ( closedate ) %] - Modify [% UNLESS (books_loo.order_received) %] + Modify
Transfer [% END %]