use C4::Auth;
use C4::Budgets;
use C4::Input;
-use C4::Dates;
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 $budget_name;
-my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
+my ( $template, $loggedinuser, $cookie, $userflags ) = get_template_and_user(
{
template_name => "acqui/neworderempty.tmpl",
query => $input,
}
);
+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 $budget = GetBudget($budget_id);
# build budget list
my $budget_loop = [];
-my $budgets = GetBudgetHierarchy(q{},$borrower->{branchcode},$borrower->{borrowernumber});
+my $budgets = GetBudgetHierarchy;
foreach my $r (@{$budgets}) {
+ next unless (CanUserUseBudget($borrower, $r, $userflags));
if (!defined $r->{budget_amount} || $r->{budget_amount} == 0) {
next;
}
};
}
+@{$budget_loop} =
+ sort { uc( $a->{b_txt}) cmp uc( $b->{b_txt}) } @{$budget_loop};
if ($close) {
$budget_id = $data->{'budget_id'};
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) {
}
if (C4::Context->preference('AcqCreateItem') eq 'ordering' && !$ordernumber) {
- # prepare empty item form
- my $cell = PrepareItemrecordDisplay('','','','ACQ');
-# warn "==> ".Data::Dumper::Dumper($cell);
- unless ($cell) {
- $cell = PrepareItemrecordDisplay('','','','');
+ # Check if ACQ framework exists
+ my $marc = GetMarcStructure(1, 'ACQ');
+ unless($marc) {
$template->param('NoACQframework' => 1);
}
- my @itemloop;
- push @itemloop,$cell;
-
- $template->param(items => \@itemloop);
+ $template->param(
+ AcqCreateItemOrdering => 1,
+ UniqueItemFields => C4::Context->preference('UniqueItemFields'),
+ );
}
# 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(
basketbooksellernote => $basket->{booksellernote},
basketcontractno => $basket->{contractnumber},
basketcontractname => $contract->{contractname},
- creationdate => C4::Dates->new($basket->{creationdate},'iso')->output,
+ creationdate => $basket->{creationdate},
authorisedby => $basket->{'authorisedby'},
authorisedbyname => $basket->{'authorisedbyname'},
- closedate => C4::Dates->new($basket->{'closedate'},'iso')->output,
+ closedate => $basket->{'closedate'},
# 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'},
+ ean => $data->{'ean'},
seriestitle => $data->{'seriestitle'},
itemtypeloop => \@itemtypes,
quantity => $data->{'quantity'},
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'}||0),
notes => $data->{'notes'},
publishercode => $data->{'publishercode'},
+ barcode_subfield => $barcode_subfield,
import_batch_id => $import_batch_id,
# CHECKME: gst-stuff needs verifing, mason.
gstrate => $bookseller->{'gstrate'} // C4::Context->preference("gist") // 0,
gstreg => $bookseller->{'gstreg'},
+ (uc(C4::Context->preference("marcflavour"))) => 1
);
output_html_with_http_headers $input, $cookie, $template->output;
}
}
# 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;
booksellerid => $basket->{'booksellerid'},
breedingid => $params->{'breedingid'},
duplicatetitle => $duplicatetitle,
+ (uc(C4::Context->preference("marcflavour"))) => 1
);
output_html_with_http_headers $input, $cookie, $template->output;