X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=acqui%2Fneworderempty.pl;h=da5acd5cdd96011a6e4dd380cba7d0098ef2dfc4;hb=ba9b55d5ca56231c887cc3d818071f72e390a8a7;hp=90b4732c81111add961223d02d6b82f0ef8c3404;hpb=3b8a750ee2646bbf72767c49c6e96ee48c753918;p=koha.git diff --git a/acqui/neworderempty.pl b/acqui/neworderempty.pl index 90b4732c81..da5acd5cdd 100755 --- a/acqui/neworderempty.pl +++ b/acqui/neworderempty.pl @@ -7,18 +7,18 @@ # # This file is part of Koha. # -# Koha is free software; you can redistribute it and/or modify it under the -# terms of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. +# Koha is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. # -# Koha is distributed in the hope that it will be useful, but WITHOUT ANY -# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR -# A PARTICULAR PURPOSE. See the GNU General Public License for more details. +# Koha is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. # -# You should have received a copy of the GNU General Public License along -# with Koha; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +# You should have received a copy of the GNU General Public License +# along with Koha; if not, see . =head1 NAME @@ -68,21 +68,18 @@ the item's id in the breeding reservoir use warnings; use strict; -use CGI; +use CGI qw ( -utf8 ); use C4::Context; -use C4::Input; use C4::Auth; use C4::Budgets; -use C4::Input; -use C4::Bookseller qw/ GetBookSellerFromId /; use C4::Acquisition; +use C4::Contract; use C4::Suggestions; # GetSuggestion 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; @@ -91,13 +88,16 @@ use C4::Search qw/FindDuplicate/; #needed for z3950 import: use C4::ImportBatch qw/GetImportRecordMarc SetImportRecordStatus/; +use Koha::Acquisition::Bookseller; +use Koha::Acquisition::Currencies; +use Koha::ItemTypes; + our $input = new CGI; my $booksellerid = $input->param('booksellerid'); # 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 $bookseller = GetBookSellerFromId($booksellerid); # FIXME: else ERROR! my $ordernumber = $input->param('ordernumber') || ''; our $biblionumber = $input->param('biblionumber'); our $basketno = $input->param('basketno'); @@ -105,6 +105,7 @@ my $suggestionid = $input->param('suggestionid'); my $close = $input->param('close'); my $uncertainprice = $input->param('uncertainprice'); my $import_batch_id = $input->param('import_batch_id'); # if this is filled, we come from a staged file, and we will return here after saving the order ! +my $subscriptionid = $input->param('subscriptionid'); my $data; my $new = 'no'; @@ -112,7 +113,7 @@ my $budget_name; our ( $template, $loggedinuser, $cookie, $userflags ) = get_template_and_user( { - template_name => "acqui/neworderempty.tmpl", + template_name => "acqui/neworderempty.tt", query => $input, type => "intranet", authnotrequired => 0, @@ -129,7 +130,12 @@ if(!$basketno) { } our $basket = GetBasket($basketno); -my $contract = &GetContract($basket->{contractnumber}); +$booksellerid = $basket->{booksellerid} unless $booksellerid; +my $bookseller = Koha::Acquisition::Bookseller->fetch({ id => $booksellerid }); + +my $contract = GetContract({ + contractnumber => $basket->{contractnumber} +}); #simple parameters reading (all in one :-) our $params = $input->Vars; @@ -167,6 +173,7 @@ if ( $ordernumber eq '' and defined $params->{'breedingid'}){ +my ( @order_user_ids, @order_users ); if ( $ordernumber eq '' ) { # create order $new = 'yes'; @@ -179,6 +186,7 @@ if ( $ordernumber eq '' ) { # create order # otherwise, retrieve suggestion information. if ($suggestionid) { $data = ($biblionumber) ? GetBiblioData($biblionumber) : GetSuggestion($suggestionid); + $budget_id ||= $data->{'budgetid'} // 0; } } else { #modify order @@ -186,52 +194,28 @@ else { #modify order $biblionumber = $data->{'biblionumber'}; $budget_id = $data->{'budget_id'}; - #get basketno and supplierno. too! - my $data2 = GetBasket( $data->{'basketno'} ); - $basketno = $data2->{'basketno'}; - $booksellerid = $data2->{'booksellerid'}; -} + $basket = GetBasket( $data->{'basketno'} ); + $basketno = $basket->{'basketno'}; -my $suggestion; -$suggestion = GetSuggestionInfo($suggestionid) if $suggestionid; - -# get currencies (for change rates calcs if needed) -my $active_currency = GetCurrency(); -my $default_currency; -if (! $data->{currency} ) { # New order no currency set - if ( $bookseller->{listprice} ) { - $default_currency = $bookseller->{listprice}; - } - else { - $default_currency = $active_currency->{currency}; + @order_user_ids = GetOrderUsers($ordernumber); + foreach my $order_user_id (@order_user_ids) { + my $order_user = GetMember(borrowernumber => $order_user_id); + push @order_users, $order_user if $order_user; } } -my @rates = GetCurrencies(); +my $suggestion; +$suggestion = GetSuggestionInfo($suggestionid) if $suggestionid; -# ## @rates - -my @loop_currency = (); -for my $curr ( @rates ) { - my $selected; - if ($data->{currency} ) { - $selected = $curr->{currency} eq $data->{currency}; - } - else { - $selected = $curr->{currency} eq $default_currency; - } - push @loop_currency, { - currcode => $curr->{currency}, - rate => $curr->{rate}, - selected => $selected, - } -} +my @currencies = Koha::Acquisition::Currencies->search; +my $active_currency = Koha::Acquisition::Currencies->get_active; # build branches list -my $onlymine=C4::Context->preference('IndependantBranches') && - C4::Context->userenv && - C4::Context->userenv->{flags}!=1 && - C4::Context->userenv->{branch}; +my $onlymine = + C4::Context->preference('IndependentBranches') + && C4::Context->userenv + && !C4::Context->IsSuperLibrarian() + && C4::Context->userenv->{branch}; my $branches = GetBranches($onlymine); my @branchloop; foreach my $thisbranch ( sort {$branches->{$a}->{'branchname'} cmp $branches->{$b}->{'branchname'}} keys %$branches ) { @@ -260,6 +244,8 @@ foreach my $r (@{$budgets}) { push @{$budget_loop}, { b_id => $r->{budget_id}, b_txt => $r->{budget_name}, + b_sort1_authcat => $r->{'sort1_authcat'}, + b_sort2_authcat => $r->{'sort2_authcat'}, b_active => $r->{budget_period_active}, b_sel => ( $r->{budget_id} == $budget_id ) ? 1 : 0, }; @@ -274,37 +260,8 @@ if ($close) { } -my $CGIsort1; -if ($budget) { # its a mod .. - if ( defined $budget->{'sort1_authcat'} ) { # with custom Asort* planning values - $CGIsort1 = GetAuthvalueDropbox( $budget->{'sort1_authcat'}, $data->{'sort1'} ); - } -} elsif(@{$budgets}){ - $CGIsort1 = GetAuthvalueDropbox( @$budgets[0]->{'sort1_authcat'}, '' ); -} - -# if CGIsort is successfully fetched, the use it -# else - failback to plain input-field -if ($CGIsort1) { - $template->param( CGIsort1 => $CGIsort1 ); -} else { - $template->param( sort1 => $data->{'sort1'} ); -} - -my $CGIsort2; -if ($budget) { - if ( defined $budget->{'sort2_authcat'} ) { - $CGIsort2 = GetAuthvalueDropbox( $budget->{'sort2_authcat'}, $data->{'sort2'} ); - } -} elsif(@{$budgets}) { - $CGIsort2 = GetAuthvalueDropbox( @$budgets[0]->{sort2_authcat}, '' ); -} - -if ($CGIsort2) { - $template->param( CGIsort2 => $CGIsort2 ); -} else { - $template->param( sort2 => $data->{'sort2'} ); -} +$template->param( sort1 => $data->{'sort1'} ); +$template->param( sort2 => $data->{'sort2'} ); if (C4::Context->preference('AcqCreateItem') eq 'ordering' && !$ordernumber) { # Check if ACQ framework exists @@ -319,7 +276,28 @@ if (C4::Context->preference('AcqCreateItem') eq 'ordering' && !$ordernumber) { } # 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; -@itemtypes = C4::ItemType->all unless C4::Context->preference('item-level_itypes'); +@itemtypes = Koha::ItemTypes->search unless C4::Context->preference('item-level_itypes'); + +if ( defined $subscriptionid ) { + my $lastOrderReceived = GetLastOrderReceivedFromSubscriptionid $subscriptionid; + if ( defined $lastOrderReceived ) { + $budget_id = $lastOrderReceived->{budgetid}; + $data->{listprice} = $lastOrderReceived->{listprice}; + $data->{uncertainprice} = $lastOrderReceived->{uncertainprice}; + $data->{gstrate} = $lastOrderReceived->{gstrate}; + $data->{discount} = $lastOrderReceived->{discount}; + $data->{rrp} = $lastOrderReceived->{rrp}; + $data->{ecost} = $lastOrderReceived->{ecost}; + $data->{quantity} = $lastOrderReceived->{quantity}; + $data->{unitprice} = $lastOrderReceived->{unitprice}; + $data->{order_internalnote} = $lastOrderReceived->{order_internalnote}; + $data->{order_vendornote} = $lastOrderReceived->{order_vendornote}; + $data->{sort1} = $lastOrderReceived->{sort1}; + $data->{sort2} = $lastOrderReceived->{sort2}; + + $basket = GetBasket( $input->param('basketno') ); + } +} # Find the items.barcode subfield for barcode validations my (undef, $barcode_subfield) = GetMarcFromKohaField('items.barcode', ''); @@ -333,16 +311,20 @@ $template->param( # get option values for gist syspref my @gst_values = map { - option => $_ + option => $_ + 0.0 }, split( '\|', C4::Context->preference("gist") ); -my $cur = GetCurrency(); +my $quantity = $input->param('rr_quantity_to_order') ? + $input->param('rr_quantity_to_order') : + $data->{'quantity'}; +$quantity //= 0; $template->param( existing => $biblionumber, ordernumber => $ordernumber, # basket informations basketno => $basketno, + basket => $basket, basketname => $basket->{'basketname'}, basketnote => $basket->{'note'}, booksellerid => $basket->{'booksellerid'}, @@ -359,19 +341,20 @@ $template->param( firstnamesuggestedby => $suggestion->{firstnamesuggestedby}, biblionumber => $biblionumber, uncertainprice => $data->{'uncertainprice'}, - authorisedbyname => $borrower->{'firstname'} . " " . $borrower->{'surname'}, - biblioitemnumber => $data->{'biblioitemnumber'}, discount_2dp => sprintf( "%.2f", $bookseller->{'discount'} ) , # for display discount => $bookseller->{'discount'}, orderdiscount_2dp => sprintf( "%.2f", $data->{'discount'} || 0 ), orderdiscount => $data->{'discount'}, + order_internalnote => $data->{'order_internalnote'}, + order_vendornote => $data->{'order_vendornote'}, listincgst => $bookseller->{'listincgst'}, invoiceincgst => $bookseller->{'invoiceincgst'}, name => $bookseller->{'name'}, - cur_active_sym => $active_currency->{'symbol'}, - cur_active => $active_currency->{'currency'}, - loop_currencies => \@loop_currency, - currency_rate => $cur->{rate}, + cur_active_sym => $active_currency->symbol, + cur_active => $active_currency->currency, + currencies => \@currencies, + currency => $data->{currency}, + vendor_currency => $bookseller->{listprice}, orderexists => ( $new eq 'yes' ) ? 0 : 1, title => $data->{'title'}, author => $data->{'author'}, @@ -382,20 +365,22 @@ $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, - gstreg => $bookseller->{'gstreg'}, listprice => sprintf( "%.2f", $data->{listprice} || $data->{price} || $listprice), total => sprintf( "%.2f", ($data->{ecost} || 0) * ($data->{'quantity'} || 0) ), ecost => sprintf( "%.2f", $data->{ecost} || 0), unitprice => sprintf( "%.2f", $data->{unitprice} || 0), - notes => $data->{'notes'}, publishercode => $data->{'publishercode'}, barcode_subfield => $barcode_subfield, import_batch_id => $import_batch_id, + subscriptionid => $subscriptionid, + acqcreate => C4::Context->preference("AcqCreateItem") eq "ordering" ? 1 : "", + users_ids => join(':', @order_user_ids), + users => \@order_users, (uc(C4::Context->preference("marcflavour"))) => 1 ); @@ -513,7 +498,7 @@ sub Load_Duplicate { my ($duplicatetitle)= @_; ($template, $loggedinuser, $cookie) = get_template_and_user( { - template_name => "acqui/neworderempty_duplicate.tmpl", + template_name => "acqui/neworderempty_duplicate.tt", query => $input, type => "intranet", authnotrequired => 0,