X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=acqui%2Fneworderempty.pl;h=85e096234973e9215e726d28215cb85cdd8ba0fb;hb=f59484df2246c0ee11c5d44f2dca762908864fe8;hp=93794eab0275dab3b4593821e991de9e3c1a82c7;hpb=138f14c2b971f7f539bc11081f8be3cc8742de78;p=koha.git diff --git a/acqui/neworderempty.pl b/acqui/neworderempty.pl index 93794eab02..85e0962349 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,29 +68,30 @@ 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; use C4::Search qw/FindDuplicate/; #needed for z3950 import: use C4::ImportBatch qw/GetImportRecordMarc SetImportRecordStatus/; +use Koha::Acquisition::Booksellers; +use Koha::Acquisition::Currencies; +use Koha::ItemTypes; +use Koha::Patrons; + our $input = new CGI; my $booksellerid = $input->param('booksellerid'); # FIXME: else ERROR! my $budget_id = $input->param('budget_id') || 0; @@ -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, @@ -130,9 +131,11 @@ if(!$basketno) { our $basket = GetBasket($basketno); $booksellerid = $basket->{booksellerid} unless $booksellerid; -my $bookseller = GetBookSellerFromId($booksellerid); +my $bookseller = Koha::Acquisition::Booksellers->find( $booksellerid ); -my $contract = &GetContract($basket->{contractnumber}); +my $contract = GetContract({ + contractnumber => $basket->{contractnumber} +}); #simple parameters reading (all in one :-) our $params = $input->Vars; @@ -151,10 +154,10 @@ if ( $ordernumber eq '' and defined $params->{'breedingid'}){ #look for duplicates ($biblionumber,$duplicatetitle) = FindDuplicate($marcrecord); if($biblionumber && !$input->param('use_external_source')) { - #if duplicate record found and user did not decide yet, first warn user - #and let him choose between using new record or existing record - Load_Duplicate($duplicatetitle); - exit; + #if duplicate record found and user did not decide yet, first warn user + #and let them choose between using a new record or an existing record + Load_Duplicate($duplicatetitle); + exit; } #from this point: add a new record if (C4::Context->preference("BiblioAddsAuthorities")){ @@ -170,6 +173,7 @@ if ( $ordernumber eq '' and defined $params->{'breedingid'}){ +my ( @order_user_ids, @order_users ); if ( $ordernumber eq '' ) { # create order $new = 'yes'; @@ -192,126 +196,56 @@ else { #modify order $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) { + # FIXME Could be improved with search -in + my $order_patron = Koha::Patrons->find( $order_user_id ); + push @order_users, $order_patron if $order_patron; } } -my @rates = GetCurrencies(); - -# ## @rates +my $suggestion; +$suggestion = GetSuggestionInfo($suggestionid) if $suggestionid; -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, - } -} - -# build branches list -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 ) { - my %row = ( - value => $thisbranch, - branchname => $branches->{$thisbranch}->{'branchname'}, - ); - $row{'selected'} = 1 if( $thisbranch && $data->{branchcode} && $thisbranch eq $data->{branchcode}) ; - push @branchloop, \%row; -} -$template->param( branchloop => \@branchloop ); +my @currencies = Koha::Acquisition::Currencies->search; +my $active_currency = Koha::Acquisition::Currencies->get_active; # build bookfund list -my $borrower= GetMember('borrowernumber' => $loggedinuser); -my ( $flags, $homebranch )= ($borrower->{'flags'},$borrower->{'branchcode'}); +my $patron = Koha::Patrons->find( $loggedinuser )->unblessed; my $budget = GetBudget($budget_id); # build budget list my $budget_loop = []; my $budgets = GetBudgetHierarchy; foreach my $r (@{$budgets}) { - next unless (CanUserUseBudget($borrower, $r, $userflags)); - if (!defined $r->{budget_amount} || $r->{budget_amount} == 0) { + next unless (CanUserUseBudget($patron, $r, $userflags)); + if (!defined $r->{budget_amount} || $r->{budget_amount} <0) { next; } 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, + b_level => $r->{budget_level}, }; } -@{$budget_loop} = - sort { uc( $a->{b_txt}) cmp uc( $b->{b_txt}) } @{$budget_loop}; - if ($close) { $budget_id = $data->{'budget_id'}; $budget_name = $budget->{'budget_name'}; } -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 - my $marc = GetMarcStructure(1, 'ACQ'); + my $marc = GetMarcStructure(1, 'ACQ', { unsafe => 1 } ); unless($marc) { $template->param('NoACQframework' => 1); } @@ -322,7 +256,7 @@ 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; @@ -330,7 +264,7 @@ if ( defined $subscriptionid ) { $budget_id = $lastOrderReceived->{budgetid}; $data->{listprice} = $lastOrderReceived->{listprice}; $data->{uncertainprice} = $lastOrderReceived->{uncertainprice}; - $data->{gstrate} = $lastOrderReceived->{gstrate}; + $data->{tax_rate} = $lastOrderReceived->{tax_rate_on_ordering}; $data->{discount} = $lastOrderReceived->{discount}; $data->{rrp} = $lastOrderReceived->{rrp}; $data->{ecost} = $lastOrderReceived->{ecost}; @@ -360,11 +294,17 @@ my @gst_values = map { option => $_ + 0.0 }, split( '\|', C4::Context->preference("gist") ); +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'}, @@ -381,19 +321,20 @@ $template->param( firstnamesuggestedby => $suggestion->{firstnamesuggestedby}, biblionumber => $biblionumber, uncertainprice => $data->{'uncertainprice'}, - authorisedbyname => $borrower->{'firstname'} . " " . $borrower->{'surname'}, - discount_2dp => sprintf( "%.2f", $bookseller->{'discount'} ) , # for display - discount => $bookseller->{'discount'}, + 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, + listincgst => $bookseller->listincgst, + invoiceincgst => $bookseller->invoiceincgst, + name => $bookseller->name, + 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'}, @@ -404,12 +345,11 @@ $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'}, + tax_rate => $data->{tax_rate_on_ordering} ? $data->{tax_rate_on_ordering}+0.0 : $bookseller->tax_rate ? $bookseller->tax_rate+0.0 : 0, listprice => sprintf( "%.2f", $data->{listprice} || $data->{price} || $listprice), total => sprintf( "%.2f", ($data->{ecost} || 0) * ($data->{'quantity'} || 0) ), ecost => sprintf( "%.2f", $data->{ecost} || 0), @@ -419,6 +359,8 @@ $template->param( 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 ); @@ -536,7 +478,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,