@@ -, +, @@ actual cost of an order following the receival of the order --- acqui/addorder.pl | 7 +++---- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) --- a/acqui/addorder.pl +++ a/acqui/addorder.pl @@ -131,7 +131,6 @@ use C4::Output; use Koha::Acquisition::Currencies; use Koha::Acquisition::Orders; use C4::Barcodes; -use Data::Dumper; ### "-------------------- addorder.pl ----------" # FIXME: This needs to do actual error checking and possibly return user to the same form, @@ -268,12 +267,12 @@ if ( $basket->{is_standing} || $orderinfo->{quantity} ne '0' ) { $orderinfo->{unitprice} = $orderinfo->{ecost} if not defined $orderinfo->{unitprice} or $orderinfo->{unitprice} eq ''; my $modify = $input->param('modify'); - if ($orderinfo->{ordernumber} && !$modify) { + if (!$modify) { $orderinfo = C4::Acquisition::populate_order_with_prices( { order => $orderinfo, booksellerid => $orderinfo->{booksellerid}, - receiving => 1, + ordering => 1, } ); } elsif ( $modify ) { @@ -281,7 +280,7 @@ if ( $basket->{is_standing} || $orderinfo->{quantity} ne '0' ) { { order => $orderinfo, booksellerid => $orderinfo->{booksellerid}, - ordering => 1, + receiving => 1, } ); } --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt @@ -487,7 +487,7 @@ [% IF ( active ) %] [% UNLESS ( closedate ) %] - Modify + Modify [% UNLESS (books_loo.order_received) %]
Transfer --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt @@ -275,7 +275,7 @@ [% END %] - [% order.ordernumber %] + [% order.ordernumber %] [% IF (order.parent_ordernumber && (order.parent_ordernumber != order.ordernumber)) %] ([% order.parent_ordernumber %]) [% END %] --