use C4::Bookseller qw/ GetBookSellerFromId /;
use C4::Acquisition;
use C4::Suggestions; # GetSuggestion
-use C4::Biblio; # GetBiblioData
+use C4::Biblio; # GetBiblioData GetMarcPrice
+use C4::Items; #PrepareItemRecord
use C4::Output;
use C4::Input;
use C4::Koha;
use C4::Branch; # GetBranches
use C4::Members;
-use C4::Search qw/FindDuplicate BiblioAddAuthorities/;
+use C4::Search qw/FindDuplicate/;
#needed for z3950 import:
use C4::ImportBatch qw/GetImportRecordMarc SetImportRecordStatus/;
my $input = new CGI;
my $booksellerid = $input->param('booksellerid'); # FIXME: else ERROR!
-my $budget_id = $input->param('budget_id') || 0; # FIXME: else ERROR!
+my $budget_id = $input->param('budget_id') || 0;
my $title = $input->param('title');
my $author = $input->param('author');
my $publicationyear = $input->param('publicationyear');
}
);
+my $marcflavour = C4::Context->preference('marcflavour');
+
+if(!$basketno) {
+ my $order = GetOrder($ordernumber);
+ $basketno = $order->{'basketno'};
+}
+
my $basket = GetBasket($basketno);
my $contract = &GetContract($basket->{contractnumber});
}
#from this point: add a new record
if (C4::Context->preference("BiblioAddsAuthorities")){
- my ($countlinked,$countcreated)=BiblioAddAuthorities($marcrecord, $params->{'frameworkcode'});
+ my $headings_linked=BiblioAutoLink($marcrecord, $params->{'frameworkcode'});
}
my $bibitemnum;
$params->{'frameworkcode'} or $params->{'frameworkcode'} = "";
( $biblionumber, $bibitemnum ) = AddBiblio( $marcrecord, $params->{'frameworkcode'} );
# get the price if there is one.
- # filter by storing only the 1st number
- # we suppose the currency is correct, as we have no possibilities to get it.
- if ($marcrecord->subfield("345","d")) {
- $listprice = $marcrecord->subfield("345","d");
- if ($listprice =~ /^([\d\.,]*)/) {
- $listprice = $1;
- $listprice =~ s/,/\./;
- } else {
- $listprice = 0;
- }
- }
- elsif ($marcrecord->subfield("010","d")) {
- $listprice = $marcrecord->subfield("010","d");
- if ($listprice =~ /^([\d\.,]*)/) {
- $listprice = $1;
- $listprice =~ s/,/\./;
- } else {
- $listprice = 0;
- }
- }
+ $listprice = GetMarcPrice($marcrecord, $marcflavour);
SetImportRecordStatus($params->{'breedingid'}, 'imported');
}
$booksellerid = $data2->{'booksellerid'};
}
+my $suggestion;
+$suggestion = GetSuggestionInfo($suggestionid) if $suggestionid;
+
# get currencies (for change rates calcs if needed)
my $active_currency = GetCurrency();
my $default_currency;
my $CGIsort1;
if ($budget) { # its a mod ..
if ( defined $budget->{'sort1_authcat'} ) { # with custom Asort* planning values
- $CGIsort1 = GetAuthvalueDropbox( 'sort1', $budget->{'sort1_authcat'}, $data->{'sort1'} );
+ $CGIsort1 = GetAuthvalueDropbox( $budget->{'sort1_authcat'}, $data->{'sort1'} );
}
-} elsif(scalar(@$budgets)){
- $CGIsort1 = GetAuthvalueDropbox( 'sort1', @$budgets[0]->{'sort1_authcat'}, '' );
+} elsif(@{$budgets}){
+ $CGIsort1 = GetAuthvalueDropbox( @$budgets[0]->{'sort1_authcat'}, '' );
}else{
- $CGIsort1 = GetAuthvalueDropbox( 'sort1','', '' );
+ $CGIsort1 = GetAuthvalueDropbox( '', '' );
}
# if CGIsort is successfully fetched, the use it
my $CGIsort2;
if ($budget) {
if ( defined $budget->{'sort2_authcat'} ) {
- $CGIsort2 = GetAuthvalueDropbox( 'sort2', $budget->{'sort2_authcat'}, $data->{'sort2'} );
+ $CGIsort2 = GetAuthvalueDropbox( $budget->{'sort2_authcat'}, $data->{'sort2'} );
}
-} elsif(scalar(@$budgets)) {
- $CGIsort2 = GetAuthvalueDropbox( 'sort2', @$budgets[0]->{sort2_authcat}, '' );
+} elsif(@{$budgets}) {
+ $CGIsort2 = GetAuthvalueDropbox( @$budgets[0]->{sort2_authcat}, '' );
}else{
- $CGIsort2 = GetAuthvalueDropbox( 'sort2','', '' );
+ $CGIsort2 = GetAuthvalueDropbox( '', '' );
}
if ($CGIsort2) {
$template->param(items => \@itemloop);
}
# Get the item types list, but only if item_level_itype is YES. Otherwise, it will be in the item, no need to display it in the biblio
-my @itemtypes = C4::ItemType->all unless C4::Context->preference('item-level_itypes');
+my @itemtypes;
+@itemtypes = C4::ItemType->all unless C4::Context->preference('item-level_itypes');
+
+# Find the items.barcode subfield for barcode validations
+my (undef, $barcode_subfield) = GetMarcFromKohaField('items.barcode', '');
# fill template
$template->param(
authorisedbyname => $basket->{'authorisedbyname'},
closedate => C4::Dates->new($basket->{'closedate'},'iso')->output,
# order details
- suggestionid => $suggestionid,
+ suggestionid => $suggestion->{suggestionid},
+ surnamesuggestedby => $suggestion->{surnamesuggestedby},
+ firstnamesuggestedby => $suggestion->{firstnamesuggestedby},
biblionumber => $biblionumber,
uncertainprice => $data->{'uncertainprice'},
authorisedbyname => $borrower->{'firstname'} . " " . $borrower->{'surname'},
title => $data->{'title'},
author => $data->{'author'},
publicationyear => $data->{'publicationyear'} ? $data->{'publicationyear'} : $data->{'copyrightdate'},
+ editionstatement => $data->{'editionstatement'},
budget_loop => $budget_loop,
isbn => $data->{'isbn'},
seriestitle => $data->{'seriestitle'},
listprice => sprintf("%.2f", $data->{'listprice'}||$data->{'price'}||$listprice),
total => sprintf("%.2f", ($data->{'ecost'}||0)*($data->{'quantity'}||0) ),
ecost => $data->{'ecost'},
+ unitprice => sprintf("%.2f", $data->{'unitprice'}),
notes => $data->{'notes'},
publishercode => $data->{'publishercode'},
+ barcode_subfield => $barcode_subfield,
import_batch_id => $import_batch_id,
}
}
# fix the unimarc 100 coded field (with unicode information)
- if (C4::Context->preference('marcflavour') eq 'UNIMARC' && $record->subfield(100,'a')) {
+ if ($marcflavour eq 'UNIMARC' && $record->subfield(100,'a')) {
my $f100a=$record->subfield(100,'a');
my $f100 = $record->field(100);
my $f100temp = $f100->as_string;