@@ -, +, @@ staged file --- acqui/addorderiso2709.pl | 12 +++++++++++- acqui/basket.pl | 2 ++ .../intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt | 6 ++++++ koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt | 4 ++++ 4 files changed, 23 insertions(+), 1 deletion(-) --- a/acqui/addorderiso2709.pl +++ a/acqui/addorderiso2709.pl @@ -60,6 +60,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 = Koha::Acquisition::Bookseller->fetch({ id => $booksellerid }); my $data; @@ -123,6 +124,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' ) { @@ -157,6 +159,8 @@ 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; my @import_record_id_selected = $input->param("import_record_id"); my @quantities = $input->param('quantity'); my @prices = $input->param('price'); @@ -181,6 +185,7 @@ if ($op eq ""){ # 1st insert the biblio, or find it through matcher unless ( $biblionumber ) { + $duplinbatch=$import_batch_id and next if FindDuplicate($marcrecord); # add the biblio my $bibitemnum; @@ -284,9 +289,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,6 +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( { @@ -431,6 +432,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 @@ -158,6 +158,12 @@
+ [% IF ( allmatch ) %]
+

No records imported

+ No record have been imported because they all match an existing record in your catalog.
You'll have to treat them individually. +
+ [% END %] + [% IF ( batch_details ) %]

Add orders from [% comments %] ([% file_name %] staged on [% upload_timestamp | $KohaDates with_hours => 1 %]) --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt @@ -380,6 +380,10 @@

[% END %] + [% IF ( duplinbatch ) %]
+

Duplicate warning

+

Some records have not been automatically added because they match an existing record in your catalog:Display them

+
[% END %] [% UNLESS ( delete_confirm ) %]
--