diff --git a/acqui/neworderempty.pl b/acqui/neworderempty.pl index 93794eab02..f82b1ab54c 100755 --- a/acqui/neworderempty.pl +++ b/acqui/neworderempty.pl @@ -360,6 +360,14 @@ my @gst_values = map { option => $_ + 0.0 }, split( '\|', C4::Context->preference("gist") ); +my $quantity = $data->{'quantity'}; +{ + defined($quantity) && last; + my $rr_quantity_to_order = $input->param('rr_quantity_to_order'); + (defined($rr_quantity_to_order) && $rr_quantity_to_order) || last; + $quantity = $rr_quantity_to_order; +} + $template->param( existing => $biblionumber, ordernumber => $ordernumber, @@ -404,8 +412,8 @@ $template->param( ean => $data->{'ean'}, seriestitle => $data->{'seriestitle'}, itemtypeloop => \@itemtypes, - quantity => $data->{'quantity'}, - quantityrec => $data->{'quantity'}, + quantity => $quantity, + quantityrec => $quantity, rrp => $data->{'rrp'}, gst_values => \@gst_values, gstrate => $data->{gstrate} ? $data->{gstrate}+0.0 : $bookseller->{gstrate} ? $bookseller->{gstrate}+0.0 : 0, diff --git a/circ/reserveratios.pl b/circ/reserveratios.pl index bb5eb24d90..f7abddb43e 100755 --- a/circ/reserveratios.pl +++ b/circ/reserveratios.pl @@ -30,6 +30,7 @@ use C4::Auth; use C4::Dates qw/format_date format_date_in_iso/; use C4::Debug; use C4::Biblio qw/GetMarcBiblio GetRecordValue GetFrameworkCode/; +use C4::Acquisition qw/GetOrdersByBiblionumber/; my $input = new CGI; my $startdate = $input->param('from'); @@ -47,6 +48,12 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user( } ); +my $booksellerid = $input->param('booksellerid') // ''; +my $basketno = $input->param('basketno') // ''; +if ($booksellerid && $basketno) { + $template->param( booksellerid => $booksellerid, basketno => $basketno ); +} + my ( $year, $month, $day ) = Today(); my $todaysdate = sprintf("%-04.4d-%-02.2d-%02.2d", $year, $month, $day); # Find yesterday for the default shelf pull start and end dates @@ -159,6 +166,15 @@ while ( my $data = $sth->fetchrow_hashref ) { ); } +{ + for my $rd ( @reservedata ) { + $rd->{biblionumber} || next; + my $pcnt = CountPendingOrdersByBiblionumber( $rd->{biblionumber} ); + $pcnt || next; + $rd->{pendingorders} = $pcnt; + } +} + $template->param( ratio_atleast1 => $ratio_atleast1, todaysdate => format_date($todaysdate), @@ -169,3 +185,17 @@ $template->param( ); output_html_with_http_headers $input, $cookie, $template->output; + +sub CountPendingOrdersByBiblionumber { + my $biblionumber = shift; + my @orders = GetOrdersByBiblionumber( $biblionumber ); + scalar(@orders) || return(0); + my $cnt=0; for my $order ( @orders ) { + defined($order->{datecancellationprinted}) && $order->{datecancellationprinted} && next; + my $onum = $order->{quantity} // 0; + my $rnum = $order->{quantityreceived} // 0; + $rnum >= $onum && next; + $cnt+=$onum; $cnt-=$rnum; + } + $cnt; +} diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-add-to-basket.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-add-to-basket.inc index 46f84006bb..8e2961b6df 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-add-to-basket.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-add-to-basket.inc @@ -17,6 +17,7 @@
[% reserveloo.location %]
[% reserveloo.itype %]
[% reserveloo.listcall %]
[% reserveloo.ratiocalc %] to order
[% END %][% IF ( CAN_user_acquisition && basketno && booksellerid ) %][% END %][% reserveloo.ratiocalc %] to order[% IF ( CAN_user_acquisition && basketno && booksellerid ) %][% END %]
+ [% IF ( reserveloo.pendingorders ) %]
[% reserveloo.pendingorders %] pending[% END %]