@@ -, +, @@ --- acqui/addorderiso2709.pl | 13 +++++++++++-- acqui/basket.pl | 3 ++- .../prog/en/modules/acqui/addorderiso2709.tt | 8 +++++++- .../intranet-tmpl/prog/en/modules/acqui/basket.tt | 4 ++++ 4 files changed, 24 insertions(+), 4 deletions(-) --- a/acqui/addorderiso2709.pl +++ a/acqui/addorderiso2709.pl @@ -58,6 +58,7 @@ my ($template, $loggedinuser, $cookie, $userflags) = get_template_and_user({ my $cgiparams = $input->Vars; my $op = $cgiparams->{'op'}; my $booksellerid = $input->param('booksellerid'); +my $allmatch = $input->param('allmatch'); my $bookseller = GetBookSellerFromId($booksellerid); my $data; @@ -122,6 +123,7 @@ if ($op eq ""){ $template->param("batch_details" => 1, "basketno" => $cgiparams->{'basketno'}, loop_currencies => \@loop_currency, + "allmatch" => $allmatch, ); import_biblios_list($template, $cgiparams->{'import_batch_id'}); if ( C4::Context->preference('AcqCreateItem') eq 'ordering' && !$ordernumber ) { @@ -157,14 +159,16 @@ if ($op eq ""){ # retrieve the file you want to import my $import_batch_id = $cgiparams->{'import_batch_id'}; my $biblios = GetImportRecordsRange($import_batch_id); + my $duplinbatch; + my $imported = 0; for my $biblio (@$biblios){ # 1st insert the biblio, or find it through matcher my ( $marcblob, $encoding ) = GetImportRecordMarc( $biblio->{'import_record_id'} ); my $marcrecord = MARC::Record->new_from_usmarc($marcblob) || die "couldn't translate marc information"; my $match = GetImportRecordMatches( $biblio->{'import_record_id'}, 1 ); my $biblionumber=$#$match > -1?$match->[0]->{'biblionumber'}:0; - unless ( $biblionumber ) { + $duplinbatch=$import_batch_id and next if FindDuplicate($marcrecord); # add the biblio my $bibitemnum; @@ -261,9 +265,14 @@ if ($op eq ""){ } else { SetImportRecordStatus( $biblio->{'import_record_id'}, 'imported' ); } + $imported++; } # go to basket page - print $input->redirect("/cgi-bin/koha/acqui/basket.pl?basketno=".$cgiparams->{'basketno'}); + if ( $imported ) { + print $input->redirect("/cgi-bin/koha/acqui/basket.pl?basketno=".$cgiparams->{'basketno'}."&duplinbatch=$duplinbatch"); + } else { + print $input->redirect("/cgi-bin/koha/acqui/addorderiso2709.pl?import_batch_id=$import_batch_id&basketno=".$cgiparams->{'basketno'}."&booksellerid=$booksellerid&allmatch=1"); + } exit; } --- a/acqui/basket.pl +++ a/acqui/basket.pl @@ -68,7 +68,7 @@ the supplier this script have to display the basket. my $query = new CGI; our $basketno = $query->param('basketno'); my $booksellerid = $query->param('booksellerid'); - +my $duplinbatch = $query->param('duplinbatch'); my ( $template, $loggedinuser, $cookie, $userflags ) = get_template_and_user( { template_name => "acqui/basket.tmpl", @@ -429,6 +429,7 @@ if ( $op eq 'delete_confirm' ) { grouped => $basket->{basketgroupid}, unclosable => @orders ? 0 : 1, has_budgets => $has_budgets, + duplinbatch => $duplinbatch, ); } --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt @@ -52,6 +52,12 @@
Import all the lines in the basket with the following parameters:
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt @@ -393,6 +393,10 @@Some records have not been automatically added because they match an existing record in your catalog:
+