4d67e69107
- all items attached to the order are deleted - if there is no more items, and if the biblio is not in other orders and no subscriptions and no holds then the biblio is proposed to deletion Now whe have 2 links : "delete order" and "delete order and catalog record", the second one appears only if the deletion is possible. Note that if an hold is related to the item or if the item is unique for the biblio the link "Delete order" is canceled due to hold remaining. On mouse over explanations are shown with count. More lines of warnings with count are shown depending of the case. Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Configuration: AcqCreateItem = on order Test cases and results: 1) Order new record with 2 items a) From basket - delete order: only deletes items, OK! - delete order and catalog record: deletes record and items, OK b) From shipment/receive - delete order: only deletes items, OK! 2) Order 1 additional item for existing record with 1 item a) From basket: - delete order: works, existing item and record remain, OK - Can't delete order and catalog record, 1 item left, OK! 3) Order new record with 1 item, title level hold on record a) From basket: - delete order: not possible, OK! - delete orer and catalog record: not possible, OK! b) From shipment/receive page - Cancel: Deletes order, record and hold silently. NO WARNING. NOT OK. See note below. 4) Order 1 additional item for existing record with 1 item, item level hold on existing item a) From basket: - delete order: works, hold and existing item remain, OK! - delete order and catalog record: not possible, OK! b) From shipment/receive page - Cancel: on order item is deleted, other item and hold remain. 5) Order new serial record, create subscription a) From basket: - delete order: works, record and subscription remain, OK! - delete order and catalog record: not possible, OK! b) From shipment/receive page: - Cancel: Subscription and record are silently deleted. NOT OK. 6) Order additional item for existing record with other on order items a) From basket: - delete order: works, existing on order items remain, OK! - delete order and catalog record: not possible, OK! b) From shipment: - Cancel: deletes order and ordered item. OK. Changes made: I changed the wording of the error messages a bit in the template. I changed the message 'Can't delete order and catalog record' to not be shown as a link, as the link does nothing. Tooltip still appears. I attached a screenshot to the bug showing some of my changes. Hope that's ok. Necessary enhancements: Cancelling orders when receiving items should work the same as from the basket summary page. We need the same checks and messages there before deleting records and items automatically. I am signing off on this, but to go into Koha it needs a follow-up for the order receive page. Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
380 lines
16 KiB
Perl
Executable file
380 lines
16 KiB
Perl
Executable file
#!/usr/bin/perl
|
|
|
|
#script to show display basket of orders
|
|
|
|
# Copyright 2000 - 2004 Katipo
|
|
# Copyright 2008 - 2009 BibLibre SARL
|
|
#
|
|
# 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 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.
|
|
|
|
use strict;
|
|
use warnings;
|
|
use C4::Auth;
|
|
use C4::Koha;
|
|
use C4::Output;
|
|
use CGI;
|
|
use C4::Acquisition;
|
|
use C4::Budgets;
|
|
use C4::Bookseller qw( GetBookSellerFromId);
|
|
use C4::Dates qw/format_date/;
|
|
use C4::Debug;
|
|
use C4::Biblio;
|
|
use C4::Members qw/GetMember/; #needed for permissions checking for changing basketgroup of a basket
|
|
use C4::Items;
|
|
=head1 NAME
|
|
|
|
basket.pl
|
|
|
|
=head1 DESCRIPTION
|
|
|
|
This script display all informations about basket for the supplier given
|
|
on input arg. Moreover, it allows us to add a new order for this supplier from
|
|
an existing record, a suggestion or a new record.
|
|
|
|
=head1 CGI PARAMETERS
|
|
|
|
=over 4
|
|
|
|
=item $basketno
|
|
|
|
The basket number.
|
|
|
|
=item supplierid
|
|
|
|
the supplier this script have to display the basket.
|
|
|
|
=item order
|
|
|
|
=back
|
|
|
|
=cut
|
|
|
|
my $query = new CGI;
|
|
my $basketno = $query->param('basketno');
|
|
my $booksellerid = $query->param('supplierid');
|
|
|
|
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
|
|
{
|
|
template_name => "acqui/basket.tmpl",
|
|
query => $query,
|
|
type => "intranet",
|
|
authnotrequired => 0,
|
|
flagsrequired => { acquisition => 'order_manage' },
|
|
debug => 1,
|
|
}
|
|
);
|
|
|
|
my $basket = GetBasket($basketno);
|
|
|
|
# FIXME : what about the "discount" percentage?
|
|
# FIXME : the query->param('supplierid') below is probably useless. The bookseller is always known from the basket
|
|
# if no booksellerid in parameter, get it from basket
|
|
# warn "=>".$basket->{booksellerid};
|
|
$booksellerid = $basket->{booksellerid} unless $booksellerid;
|
|
my ($bookseller) = GetBookSellerFromId($booksellerid);
|
|
my $op = $query->param('op');
|
|
if (!defined $op) {
|
|
$op = q{};
|
|
}
|
|
|
|
my $confirm_pref= C4::Context->preference("BasketConfirmations") || '1';
|
|
$template->param( skip_confirm_reopen => 1) if $confirm_pref eq '2';
|
|
|
|
if ( $op eq 'delete_confirm' ) {
|
|
my $basketno = $query->param('basketno');
|
|
DelBasket($basketno);
|
|
$template->param( delete_confirmed => 1 );
|
|
} elsif ( !$bookseller ) {
|
|
$template->param( NO_BOOKSELLER => 1 );
|
|
} elsif ( $op eq 'del_basket') {
|
|
$template->param( delete_confirm => 1 );
|
|
if ( C4::Context->preference("IndependantBranches") ) {
|
|
my $userenv = C4::Context->userenv;
|
|
unless ( $userenv->{flags} == 1 ) {
|
|
my $validtest = ( $basket->{creationdate} eq '' )
|
|
|| ( $userenv->{branch} eq $basket->{branch} )
|
|
|| ( $userenv->{branch} eq '' )
|
|
|| ( $basket->{branch} eq '' );
|
|
unless ($validtest) {
|
|
print $query->redirect("../mainpage.pl");
|
|
exit 1;
|
|
}
|
|
}
|
|
}
|
|
$basket->{creationdate} = "" unless ( $basket->{creationdate} );
|
|
$basket->{authorisedby} = $loggedinuser unless ( $basket->{authorisedby} );
|
|
my $contract = &GetContract($basket->{contractnumber});
|
|
$template->param(
|
|
basketno => $basketno,
|
|
basketname => $basket->{'basketname'},
|
|
basketnote => $basket->{note},
|
|
basketbooksellernote => $basket->{booksellernote},
|
|
basketcontractno => $basket->{contractnumber},
|
|
basketcontractname => $contract->{contractname},
|
|
creationdate => format_date( $basket->{creationdate} ),
|
|
authorisedby => $basket->{authorisedby},
|
|
authorisedbyname => $basket->{authorisedbyname},
|
|
closedate => format_date( $basket->{closedate} ),
|
|
active => $bookseller->{'active'},
|
|
booksellerid => $bookseller->{'id'},
|
|
name => $bookseller->{'name'},
|
|
address1 => $bookseller->{'address1'},
|
|
address2 => $bookseller->{'address2'},
|
|
address3 => $bookseller->{'address3'},
|
|
address4 => $bookseller->{'address4'},
|
|
);
|
|
} elsif ($op eq 'attachbasket' && $template->{'VARS'}->{'CAN_user_acquisition_group_manage'} == 1) {
|
|
print $query->redirect('/cgi-bin/koha/acqui/basketgroup.pl?basketno=' . $basket->{'basketno'} . '&op=attachbasket&booksellerid=' . $booksellerid);
|
|
# check if we have to "close" a basket before building page
|
|
} elsif ($op eq 'export') {
|
|
print $query->header(
|
|
-type => 'text/csv',
|
|
-attachment => 'basket' . $basket->{'basketno'} . '.csv',
|
|
);
|
|
print GetBasketAsCSV($query->param('basketno'));
|
|
exit;
|
|
} elsif ($op eq 'close') {
|
|
my $confirm = $query->param('confirm') || $confirm_pref eq '2';
|
|
if ($confirm) {
|
|
my $basketno = $query->param('basketno');
|
|
my $booksellerid = $query->param('booksellerid');
|
|
$basketno =~ /^\d+$/ and CloseBasket($basketno);
|
|
# if requested, create basket group, close it and attach the basket
|
|
if ($query->param('createbasketgroup')) {
|
|
my $basketgroupid = NewBasketgroup( { name => $basket->{basketname},
|
|
booksellerid => $booksellerid,
|
|
closed => 1,
|
|
});
|
|
ModBasket( { basketno => $basketno,
|
|
basketgroupid => $basketgroupid } );
|
|
print $query->redirect('/cgi-bin/koha/acqui/basketgroup.pl?booksellerid='.$booksellerid.'&closed=1');
|
|
} else {
|
|
print $query->redirect('/cgi-bin/koha/acqui/booksellers.pl?supplierid=' . $booksellerid);
|
|
}
|
|
exit;
|
|
} else {
|
|
$template->param(confirm_close => "1",
|
|
booksellerid => $booksellerid,
|
|
basketno => $basket->{'basketno'},
|
|
basketname => $basket->{'basketname'},
|
|
basketgroupname => $basket->{'basketname'});
|
|
|
|
}
|
|
} elsif ($op eq 'reopen') {
|
|
my $basket;
|
|
$basket->{basketno} = $query->param('basketno');
|
|
$basket->{closedate} = undef;
|
|
ModBasket($basket);
|
|
print $query->redirect('/cgi-bin/koha/acqui/basket.pl?basketno='.$basket->{'basketno'})
|
|
} else {
|
|
# get librarian branch...
|
|
if ( C4::Context->preference("IndependantBranches") ) {
|
|
my $userenv = C4::Context->userenv;
|
|
unless ( $userenv->{flags} == 1 ) {
|
|
my $validtest = ( $basket->{creationdate} eq '' )
|
|
|| ( $userenv->{branch} eq $basket->{branch} )
|
|
|| ( $userenv->{branch} eq '' )
|
|
|| ( $basket->{branch} eq '' );
|
|
unless ($validtest) {
|
|
print $query->redirect("../mainpage.pl");
|
|
exit 1;
|
|
}
|
|
}
|
|
}
|
|
#if the basket is closed,and the user has the permission to edit basketgroups, display a list of basketgroups
|
|
my $basketgroups;
|
|
my $member = GetMember(borrowernumber => $loggedinuser);
|
|
if ($basket->{closedate} && haspermission({ acquisition => 'group_manage'} )) {
|
|
$basketgroups = GetBasketgroups($basket->{booksellerid});
|
|
for my $bg ( @{$basketgroups} ) {
|
|
if ($basket->{basketgroupid} && $basket->{basketgroupid} == $bg->{id}){
|
|
$bg->{default} = 1;
|
|
}
|
|
}
|
|
my %emptygroup = ( id => undef,
|
|
name => "No group");
|
|
if ( ! $basket->{basketgroupid} ) {
|
|
$emptygroup{default} = 1;
|
|
$emptygroup{nogroup} = 1;
|
|
}
|
|
unshift( @$basketgroups, \%emptygroup );
|
|
}
|
|
# if new basket, pre-fill infos
|
|
$basket->{creationdate} = "" unless ( $basket->{creationdate} );
|
|
$basket->{authorisedby} = $loggedinuser unless ( $basket->{authorisedby} );
|
|
$debug
|
|
and warn sprintf
|
|
"loggedinuser: $loggedinuser; creationdate: %s; authorisedby: %s",
|
|
$basket->{creationdate}, $basket->{authorisedby};
|
|
|
|
#to get active currency
|
|
my $cur = GetCurrency();
|
|
|
|
|
|
my @results = GetOrders( $basketno );
|
|
|
|
my $gist = $bookseller->{gstrate} // C4::Context->preference("gist") // 0;
|
|
$gist = 0 if $gist == 0.0000;
|
|
my $discount = $bookseller->{'discount'} / 100;
|
|
my $total_rrp; # RRP Total, its value will be assigned to $total_rrp_gsti or $total_rrp_gste depending of $bookseller->{'listincgst'}
|
|
my $total_rrp_gsti; # RRP Total, GST included
|
|
my $total_rrp_gste; # RRP Total, GST excluded
|
|
my $gist_rrp;
|
|
my $total_rrp_est;
|
|
|
|
my $qty_total;
|
|
my @books_loop;
|
|
|
|
for my $order ( @results ) {
|
|
my $rrp = $order->{'listprice'} || 0;
|
|
my $qty = $order->{'quantity'} || 0;
|
|
if (!defined $order->{quantityreceived}) {
|
|
$order->{quantityreceived} = 0;
|
|
}
|
|
for ( qw(rrp ecost quantityreceived)) {
|
|
if (!defined $order->{$_}) {
|
|
$order->{$_} = 0;
|
|
}
|
|
}
|
|
|
|
my $budget = GetBudget( $order->{'budget_id'} );
|
|
$rrp = ConvertCurrency( $order->{'currency'}, $rrp );
|
|
|
|
$total_rrp += $qty * $order->{'rrp'};
|
|
my $line_total = $qty * $order->{'ecost'};
|
|
$total_rrp_est += $qty * $order->{'ecost'};
|
|
# FIXME: what about the "actual cost" field?
|
|
$qty_total += $qty;
|
|
my %line = %{ $order };
|
|
my $biblionumber = $order->{'biblionumber'};
|
|
my $countbiblio = CountBiblioInOrders($biblionumber);
|
|
my $ordernumber = $order->{'ordernumber'};
|
|
my @subscriptions = GetSubscriptionsId ($biblionumber);
|
|
my $itemcount = GetItemsCount($biblionumber);
|
|
my $holds = GetHolds ($biblionumber);
|
|
my @items = GetItemnumbersFromOrder( $ordernumber );
|
|
my $itemholds;
|
|
foreach my $item (@items){
|
|
my $nb = GetItemHolds($biblionumber, $item);
|
|
if ($nb){
|
|
$itemholds += $nb;
|
|
}
|
|
}
|
|
# if the biblio is not in other orders and if there is no items elsewhere and no subscriptions and no holds we can then show the link "Delete order and Biblio" see bug 5680
|
|
$line{can_del_bib} = 1 if $countbiblio <= 1 && $itemcount == scalar @items && !(@subscriptions) && !($holds);
|
|
$line{items} = ($itemcount) - (scalar @items);
|
|
$line{left_item} = 1 if $line{items} >= 1;
|
|
$line{left_biblio} = 1 if $countbiblio > 1;
|
|
$line{biblios} = $countbiblio - 1;
|
|
$line{left_subscription} = 1 if scalar @subscriptions >= 1;
|
|
$line{subscriptions} = scalar @subscriptions;
|
|
$line{left_holds} = 1 if $holds >= 1;
|
|
$line{left_holds_on_order} = 1 if $line{left_holds}==1 && ($line{items} == 0 || $itemholds );
|
|
$line{holds} = $holds;
|
|
$line{holds_on_order} = $itemholds?$itemholds:$holds if $line{left_holds_on_order};
|
|
$line{order_received} = ( $qty == $order->{'quantityreceived'} );
|
|
$line{basketno} = $basketno;
|
|
$line{budget_name} = $budget->{budget_name};
|
|
$line{rrp} = sprintf( "%.2f", $line{'rrp'} );
|
|
$line{ecost} = sprintf( "%.2f", $line{'ecost'} );
|
|
$line{line_total} = sprintf( "%.2f", $line_total );
|
|
if ($line{uncertainprice}) {
|
|
$template->param( uncertainprices => 1 );
|
|
$line{rrp} .= ' (Uncertain)';
|
|
}
|
|
if ($line{'title'}){
|
|
my $volume = $order->{'volume'};
|
|
my $seriestitle = $order->{'seriestitle'};
|
|
$line{'title'} .= " / $seriestitle" if $seriestitle;
|
|
$line{'title'} .= " / $volume" if $volume;
|
|
} else {
|
|
$line{'title'} = "Deleted bibliographic notice, can't find title.";
|
|
}
|
|
push @books_loop, \%line;
|
|
}
|
|
|
|
my $total_est_gste;
|
|
my $total_est_gsti;
|
|
my $gist_est;
|
|
if ($gist){ # if we have GST
|
|
if ( $bookseller->{'listincgst'} ) { # if prices already includes GST
|
|
$total_rrp_gsti = $total_rrp; # we know $total_rrp_gsti
|
|
$total_rrp_gste = $total_rrp_gsti / ( $gist + 1 ); # and can reverse compute other values
|
|
$gist_rrp = $total_rrp_gsti - $total_rrp_gste; #
|
|
$total_est_gste = $total_rrp_gste - ( $total_rrp_gste * $discount );
|
|
$total_est_gsti = $total_rrp_est;
|
|
} else { # if prices does not include GST
|
|
$total_rrp_gste = $total_rrp; # then we use the common way to compute other values
|
|
$gist_rrp = $total_rrp_gste * $gist; #
|
|
$total_rrp_gsti = $total_rrp_gste + $gist_rrp; #
|
|
$total_est_gste = $total_rrp_est;
|
|
$total_est_gsti = $total_rrp_gsti - ( $total_rrp_gsti * $discount );
|
|
}
|
|
$gist_est = $gist_rrp - ( $gist_rrp * $discount );
|
|
} else {
|
|
$total_rrp_gsti = $total_rrp;
|
|
$total_est_gsti = $total_rrp_est;
|
|
}
|
|
|
|
my $contract = &GetContract($basket->{contractnumber});
|
|
my @orders = GetOrders($basketno);
|
|
|
|
my $borrower= GetMember('borrowernumber' => $loggedinuser);
|
|
my $budgets = GetBudgetHierarchy(q{},$borrower->{branchcode},$borrower->{borrowernumber});
|
|
my $has_budgets = 0;
|
|
foreach my $r (@{$budgets}) {
|
|
if (!defined $r->{budget_amount} || $r->{budget_amount} == 0) {
|
|
next;
|
|
}
|
|
$has_budgets = 1;
|
|
last;
|
|
}
|
|
|
|
$template->param(
|
|
basketno => $basketno,
|
|
basketname => $basket->{'basketname'},
|
|
basketnote => $basket->{note},
|
|
basketbooksellernote => $basket->{booksellernote},
|
|
basketcontractno => $basket->{contractnumber},
|
|
basketcontractname => $contract->{contractname},
|
|
creationdate => C4::Dates->new($basket->{creationdate},'iso')->output,
|
|
authorisedby => $basket->{authorisedby},
|
|
authorisedbyname => $basket->{authorisedbyname},
|
|
closedate => C4::Dates->new($basket->{closedate},'iso')->output,
|
|
active => $bookseller->{'active'},
|
|
booksellerid => $bookseller->{'id'},
|
|
name => $bookseller->{'name'},
|
|
entrydate => C4::Dates->new($results[0]->{'entrydate'},'iso')->output,
|
|
books_loop => \@books_loop,
|
|
gist_rate => sprintf( "%.2f", $gist * 100 ) . '%',
|
|
total_rrp_gste => sprintf( "%.2f", $total_rrp_gste ),
|
|
total_est_gste => sprintf( "%.2f", $total_est_gste ),
|
|
gist_est => sprintf( "%.2f", $gist_est ),
|
|
gist_rrp => sprintf( "%.2f", $gist_rrp ),
|
|
total_rrp_gsti => sprintf( "%.2f", $total_rrp_gsti ),
|
|
total_est_gsti => sprintf( "%.2f", $total_est_gsti ),
|
|
# currency => $bookseller->{'listprice'},
|
|
currency => $cur->{'currency'},
|
|
qty_total => $qty_total,
|
|
GST => $gist,
|
|
basketgroups => $basketgroups,
|
|
grouped => $basket->{basketgroupid},
|
|
unclosable => @orders ? 0 : 1,
|
|
has_budgets => $has_budgets,
|
|
);
|
|
}
|
|
|
|
output_html_with_http_headers $query, $cookie, $template->output;
|